spelling correction (e.g. twitter -> Twitter)

git-svn-id: http://svn.miranda-ng.org/main/trunk@7350 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

17 files changed, 28 insertions, 28 deletions

diff --git a/plugins/AvatarHistory/res/AvatarHistory.rc b/plugins/AvatarHistory/res/AvatarHistory.rc
index 7d54d3ca9c..6b7b47772e 100644
--- a/plugins/AvatarHistory/res/AvatarHistory.rc
+++ b/plugins/AvatarHistory/res/AvatarHistory.rc
@@ -109,21 +109,21 @@ CAPTION "Avatar History: Select how to store history avatars"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0

 BEGIN

     LTEXT           "Please select how the avatar history should be stored. This setting CANNOT be changed in future, because it would cause all previous history to be lost.",IDC_STATIC,15,7,416,23

-    CONTROL         "Store history in miranda history and all history avatars in same folder",IDC_MIR_SAME,

+    CONTROL         "Store history in Miranda history and all history avatars in same folder",IDC_MIR_SAME,

                     "Button",BS_AUTORADIOBUTTON | WS_GROUP,15,32,416,11

-    CONTROL         "Store history in miranda history and history avatars in per protocol folders",IDC_MIR_PROTO,

+    CONTROL         "Store history in Miranda history and history avatars in per protocol folders",IDC_MIR_PROTO,

                     "Button",BS_AUTORADIOBUTTON,15,66,416,11

-    CONTROL         "Store history in miranda history and history avatars in per contact folders using shortcuts",IDC_MIR_SHORT,

+    CONTROL         "Store history in Miranda history and history avatars in per contact folders using shortcuts",IDC_MIR_SHORT,

                     "Button",BS_AUTORADIOBUTTON,15,99,416,11

     CONTROL         "Store history avatars in per contact folders using shortcuts",IDC_SHORT,

                     "Button",BS_AUTORADIOBUTTON,15,140,416,11

     CONTROL         "Store history avatars in per contact folders",IDC_DUP,

                     "Button",BS_AUTORADIOBUTTON,15,181,416,11

-    LTEXT           "History is stored inside miranda db. It can be seen by History++ or Avatar History internal viewer.",IDC_STATIC,15,44,416,10

+    LTEXT           "History is stored inside Miranda database. It can be seen by History++ or Avatar History internal viewer.",IDC_STATIC,15,44,416,10

     LTEXT           "All avatars are stored as <Profile>\\Avatars History\\<Avatar Hash>",IDC_STATIC,15,54,416,10

-    LTEXT           "History is stored inside miranda db. It can be seen by History++ or Avatar History internal viewer.",IDC_STATIC,15,77,416,10

+    LTEXT           "History is stored inside Miranda database. It can be seen by History++ or Avatar History internal viewer.",IDC_STATIC,15,77,416,10

     LTEXT           "All avatars are stored as <Profile>\\Avatars History\\<Protocol>\\<Avatar Hash>",IDC_STATIC,15,87,416,10

-    LTEXT           "History is stored inside miranda db. It can be seen by History++ or Avatar History internal viewer.",IDC_STATIC,15,110,416,10

+    LTEXT           "History is stored inside Miranda database. It can be seen by History++ or Avatar History internal viewer.",IDC_STATIC,15,110,416,10

     LTEXT           "All avatars are stored as <Profile>\\Avatars History\\<Protocol>\\<Avatar Hash> and have a shortcut per history entry in <Profile>\\Avatars History\\<Protocol>\\<Contact ID>\\<Timestamp>",IDC_STATIC,15,120,416,18

     LTEXT           "History is stored only in disk. It can be seen by Avatar History internal viewer.",IDC_STATIC,15,151,416,10

     LTEXT           "All avatars are stored as <Profile>\\Avatars History\\<Protocol>\\<Avatar Hash> and have a shortcut per history entry in <Profile>\\Avatars History\\<Protocol>\\<Contact ID>\\<Timestamp>",IDC_STATIC,15,161,416,18

diff --git a/plugins/Folders/src/dlg_handlers.cpp b/plugins/Folders/src/dlg_handlers.cpp
index efd72f889b..f90dcb5485 100644
--- a/plugins/Folders/src/dlg_handlers.cpp
+++ b/plugins/Folders/src/dlg_handlers.cpp
@@ -129,9 +129,9 @@ static INT_PTR CALLBACK DlgProcVariables(HWND hWnd, UINT msg, WPARAM wParam, LPA
 			TranslateT("be saved to the database, they will only be valid for this session."),

 			TranslateT("Variable string"),

 			TranslateT("What it expands to:"),

-			TranslateT("Expands to your miranda path (e.g: c:\\program files\\miranda ng)."),

+			TranslateT("Expands to your Miranda path (e.g: c:\\program files\\miranda ng)."),

 			TranslateT("Expands to your profile path - the value found in mirandaboot.ini,"),

-			TranslateT("ProfileDir section (usually inside miranda\'s folder)."),

+			TranslateT("ProfileDir section (usually inside Miranda\'s folder)."),

 			TranslateT("Expands to your current profile name without the extenstion."),

 			TranslateT("(e.g.default if your your profile is default.dat)."),

 			TranslateT("Environment variables"),

@@ -142,7 +142,7 @@ static INT_PTR CALLBACK DlgProcVariables(HWND hWnd, UINT msg, WPARAM wParam, LPA
 			TranslateT("instead of expanding to Miranda\'s profile path."),

 			TranslateT("Examples:"),

 			TranslateT("If the value for the ProfileDir inside mirandaboot.ini, ProfileDir section is \'.\\profiles\\', current"),

-			TranslateT("profile is \'default.dat\' and miranda\'s path is \'c:\\program files\\miranda ng\\' then:"),

+			TranslateT("profile is \'default.dat\' and Miranda\'s path is \'c:\\program files\\miranda ng\\' then:"),

 			TranslateT("will expand to \'c:\\program files\\miranda ng\'"),

 			TranslateT("will expand to \'c:\\program files\\miranda ng\\profiles\'"),

 			TranslateT("will expand to \'default\'"),

diff --git a/plugins/HTTPServer/src/GuiElements.cpp b/plugins/HTTPServer/src/GuiElements.cpp
index 2d6ff38bdb..3da5724ff3 100644
--- a/plugins/HTTPServer/src/GuiElements.cpp
+++ b/plugins/HTTPServer/src/GuiElements.cpp
@@ -1240,14 +1240,14 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 							bool bNew = IsDlgButtonChecked(hwndDlg, IDC_ADD_STATISTICS_MENU_ITEM) == BST_CHECKED;

 							if (b != bNew) {

 								db_set_b(NULL, MODULE, "AddStatisticsMenuItem", bNew);

-								MessageBox(hwndDlg, TranslateT("You need to restart miranda to change the main menu"), MSG_BOX_TITEL, MB_OK);

+								MessageBox(hwndDlg, TranslateT("You need to restart Miranda to change the main menu"), MSG_BOX_TITEL, MB_OK);

 							}

 

 							b = db_get_b(NULL, MODULE, "AddAcceptConMenuItem", 1) != 0;

 							bNew = IsDlgButtonChecked(hwndDlg, IDC_ACCEPT_COM_MENU_ITEM) == BST_CHECKED;

 							if (b != bNew) {

 								db_set_b(NULL, MODULE, "AddAcceptConMenuItem", bNew);

-								MessageBox(hwndDlg, TranslateT("You need to restart miranda to change the main menu"), MSG_BOX_TITEL, MB_OK);

+								MessageBox(hwndDlg, TranslateT("You need to restart Miranda to change the main menu"), MSG_BOX_TITEL, MB_OK);

 							}

 

 							bNew = IsDlgButtonChecked(hwndDlg, IDC_WRITE_LOG_FILE) == BST_CHECKED;

diff --git a/plugins/HistoryPlusPlus/hpp_events.pas b/plugins/HistoryPlusPlus/hpp_events.pas
index e178ee01ce..69cc3aef2c 100644
--- a/plugins/HistoryPlusPlus/hpp_events.pas
+++ b/plugins/HistoryPlusPlus/hpp_events.pas
@@ -889,7 +889,7 @@ end;
 procedure GetEventTextForICQClientChange(EventInfo: TDBEventInfo; var Hi: THistoryItem);

 begin

   hi.Text := GetEventTextForICQSystem(EventInfo,

-    TranslateW('User %s (%d) changed icq client: %s'));

+    TranslateW('User %s (%d) changed ICQ client: %s'));

 end;

 

 procedure GetEventTextForICQCheckStatus(EventInfo: TDBEventInfo; var Hi: THistoryItem);

diff --git a/plugins/Msg_Export/res/resource.rc b/plugins/Msg_Export/res/resource.rc
index 73ac39329c..f540ccaba9 100755
--- a/plugins/Msg_Export/res/resource.rc
+++ b/plugins/Msg_Export/res/resource.rc
@@ -58,7 +58,7 @@ BEGIN
     PUSHBUTTON      "Browse",IDC_EXPORT_DIR_BROWSE,141,11,43,14

     COMBOBOX        IDC_DEFAULT_FILE,53,29,83,112,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP

     CONTROL         "Use internal viewer",IDC_USE_INTERNAL_VIEWER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,61,78,10

-    CONTROL         "Replace miranda history",IDC_REPLACE_MIRANDA_HISTORY,

+    CONTROL         "Replace Miranda history",IDC_REPLACE_MIRANDA_HISTORY,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,91,61,90,10

     COMBOBOX        IDC_FILE_VIEWER,11,75,125,89,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP

     PUSHBUTTON      "Browse",IDC_FILE_VIEWER_BROWSE,141,74,43,14

diff --git a/plugins/Msg_Export/src/options.cpp b/plugins/Msg_Export/src/options.cpp
index 80c685abc9..4f6cd64214 100755
--- a/plugins/Msg_Export/src/options.cpp
+++ b/plugins/Msg_Export/src/options.cpp
@@ -393,7 +393,7 @@ BOOL bApplyChanges( HWND hwndDlg )
 	if (bReplaceHistory != bNewRp )

 	{

 		bReplaceHistory = bNewRp;

-		MessageBox(hwndDlg, TranslateT("You need to restart miranda to change the history function"), MSG_BOX_TITEL, MB_OK);

+		MessageBox(hwndDlg, TranslateT("You need to restart Miranda to change the history function"), MSG_BOX_TITEL, MB_OK);

 	}

 

 	bAppendNewLine = IsDlgButtonChecked(hwndDlg, IDC_APPEND_NEWLINE) == BST_CHECKED;

diff --git a/plugins/New_GPG/res/new_gpg.rc b/plugins/New_GPG/res/new_gpg.rc
index cdf91e48a4..54d3bebfeb 100644
--- a/plugins/New_GPG/res/new_gpg.rc
+++ b/plugins/New_GPG/res/new_gpg.rc
@@ -224,7 +224,7 @@ BEGIN
     CONTROL         "Turn on debug log",IDC_DEBUG_LOG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,181,159,89,10

     EDITTEXT        IDC_LOG_FILE_EDIT,11,157,98,14,ES_AUTOHSCROLL

     PUSHBUTTON      "Browse",IDC_LOG_FILE_SET,119,156,50,14

-    CONTROL         "Use jabber api on Miranda NG (recomended)",IDC_JABBER_API,

+    CONTROL         "Use Jabber api on Miranda NG (recomended)",IDC_JABBER_API,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,175,251,10

     LTEXT           "Default key",IDC_CURRENT_KEY,12,196,170,8

     CONTROL         "Encrypt file transfers",IDC_FILE_TRANSFERS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,185,137,10

diff --git a/plugins/NoHistory/src/Version.h b/plugins/NoHistory/src/Version.h
index 33043a3d21..3cf477eec9 100644
--- a/plugins/NoHistory/src/Version.h
+++ b/plugins/NoHistory/src/Version.h
@@ -7,7 +7,7 @@
 

 #define __PLUGIN_NAME				"NoHistory"

 #define __FILENAME					"NoHistory.dll"

-#define __DESCRIPTION 				"Prevent miranda from storing any history."

+#define __DESCRIPTION 				"Prevent Miranda from storing any history."

 #define __AUTHOR					"Scott Ellis, NightFox"

 #define __AUTHOREMAIL				"mail@scottellis.com.au; nightfox@myied.org"

 #define __AUTHORWEB					"http://miranda-ng.org/p/NoHistory/"

diff --git a/plugins/SendScreenshotPlus/src/Main.cpp b/plugins/SendScreenshotPlus/src/Main.cpp
index 4b0a73d45a..9c07123015 100644
--- a/plugins/SendScreenshotPlus/src/Main.cpp
+++ b/plugins/SendScreenshotPlus/src/Main.cpp
@@ -329,19 +329,19 @@ void AddMenuItems(void)
 int RegisterServices(){
 	hsvc_SendScreenshot = CreateServiceFunction(MS_SENDSS_OPENDIALOG, service_OpenCaptureDialog);
 	if (!hsvc_SendScreenshot)
-		MessageBoxEx(NULL, TranslateT("Could not register miranda service."), _T("MS_SENDSS_OPENDIALOG"), MB_OK | MB_ICONERROR | MB_APPLMODAL, 0);
+		MessageBoxEx(NULL, TranslateT("Could not register Miranda service."), _T("MS_SENDSS_OPENDIALOG"), MB_OK | MB_ICONERROR | MB_APPLMODAL, 0);
 
 	hsvc_SendDesktop = CreateServiceFunction(MS_SENDSS_SENDDESKTOP, service_CaptureAndSendDesktop);
 	if (!hsvc_SendDesktop)
-		MessageBoxEx(NULL, TranslateT("Could not register miranda service."), _T("MS_SENDSS_SENDDESKTOP"), MB_OK | MB_ICONERROR | MB_APPLMODAL, 0);
+		MessageBoxEx(NULL, TranslateT("Could not register Miranda service."), _T("MS_SENDSS_SENDDESKTOP"), MB_OK | MB_ICONERROR | MB_APPLMODAL, 0);
 
 	hsvc_EditBitmap = CreateServiceFunction(MS_SENDSS_EDITBITMAP, service_EditBitmap);
 	if (!hsvc_EditBitmap)
-		MessageBoxEx(NULL, TranslateT("Could not register miranda service."), _T("MS_SENDSS_EDITBITMAP"), MB_OK | MB_ICONERROR | MB_APPLMODAL, 0);
+		MessageBoxEx(NULL, TranslateT("Could not register Miranda service."), _T("MS_SENDSS_EDITBITMAP"), MB_OK | MB_ICONERROR | MB_APPLMODAL, 0);
 
 	hsvc_Send2ImageShack = CreateServiceFunction(MS_SENDSS_SEND2IMAGESHACK, service_Send2ImageShack);
 	if (!hsvc_Send2ImageShack)
-		MessageBoxEx(NULL, TranslateT("Could not register miranda service."), _T("MS_SENDSS_SEND2IMAGESHACK"), MB_OK | MB_ICONERROR | MB_APPLMODAL, 0);
+		MessageBoxEx(NULL, TranslateT("Could not register Miranda service."), _T("MS_SENDSS_SEND2IMAGESHACK"), MB_OK | MB_ICONERROR | MB_APPLMODAL, 0);
 
 	return 0;
 }
diff --git a/plugins/YahooGroups/res/YahooGroups.rc b/plugins/YahooGroups/res/YahooGroups.rc
index 9d81b51149..fce62967f8 100644
--- a/plugins/YahooGroups/res/YahooGroups.rc
+++ b/plugins/YahooGroups/res/YahooGroups.rc
@@ -57,7 +57,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM
 CAPTION "Dialog"

 FONT 8, "MS Shell Dlg", 400, 0, 0x1

 BEGIN

-    PUSHBUTTON      "Move yahoo contacts to groups now",IDC_YAHOOGROUPS,4,5,223,14

+    PUSHBUTTON      "Move Yahoo contacts to groups now",IDC_YAHOOGROUPS,4,5,223,14

     CONTROL         "Move Yahoo contacts automatically on startup",IDC_MOVEAUTOMATICALLY,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,25,223,10

 END

diff --git a/protocols/FacebookRM/src/communication.cpp b/protocols/FacebookRM/src/communication.cpp
index bc18e52ddb..85547d09bb 100644
--- a/protocols/FacebookRM/src/communication.cpp
+++ b/protocols/FacebookRM/src/communication.cpp
@@ -1260,7 +1260,7 @@ bool facebook_client::send_message(std::string message_recipient, std::string me
 

   	case 1356026: // Contact has alternative client

 	{

-		client_notify(TranslateT("Need confirmation for sending messages to other clients.\nOpen facebook website and try to send message to this contact again!"));

+		client_notify(TranslateT("Need confirmation for sending messages to other clients.\nOpen Facebook website and try to send message to this contact again!"));

 		return false;

 	} break;

  

diff --git a/protocols/IRCG/src/commandmonitor.cpp b/protocols/IRCG/src/commandmonitor.cpp
index 9e4218f3dd..b45e26a22f 100644
--- a/protocols/IRCG/src/commandmonitor.cpp
+++ b/protocols/IRCG/src/commandmonitor.cpp
@@ -756,7 +756,7 @@ bool CIrcProto::IsCTCP(const CIrcMessage* pmsg)
 	// exploit???

 	if ( mess.Find(1) != -1 || mess.Find( _T("%newl")) != -1 ) {

 		TCHAR temp[4096];

-		mir_sntprintf(temp, SIZEOF(temp), TranslateT( "CTCP ERROR: Malformed CTCP command received from %s!%s@%s. Possible attempt to take control of your irc client registered"), pmsg->prefix.sNick.c_str(), pmsg->prefix.sUser.c_str(), pmsg->prefix.sHost.c_str());

+		mir_sntprintf(temp, SIZEOF(temp), TranslateT( "CTCP ERROR: Malformed CTCP command received from %s!%s@%s. Possible attempt to take control of your IRC client registered"), pmsg->prefix.sNick.c_str(), pmsg->prefix.sUser.c_str(), pmsg->prefix.sHost.c_str());

 		DoEvent( GC_EVENT_INFORMATION, 0, m_info.sNick.c_str(), temp, NULL, NULL, NULL, true, false); 

 		return true;

 	}

diff --git a/protocols/Twitter/res/twitter.rc b/protocols/Twitter/res/twitter.rc
index 6b6e88fc56..e6f813dee1 100644
--- a/protocols/Twitter/res/twitter.rc
+++ b/protocols/Twitter/res/twitter.rc
@@ -62,7 +62,7 @@ BEGIN
     EDITTEXT        IDC_GROUP,54,49,131,12,ES_AUTOHSCROLL

     LTEXT           "Default group:",IDC_STATIC,0,50,54,14

     LTEXT           "Username:",IDC_STATIC,0,9,51,13

-    LTEXT           "[Sign in to link your twitter account]",IDC_USERNAME,55,9,122,15

+    LTEXT           "[Sign in to link your Twitter account]",IDC_USERNAME,55,9,122,15

 END

 

 IDD_TWEET DIALOGEX 0, 0, 186, 64

diff --git a/protocols/Twitter/src/connection.cpp b/protocols/Twitter/src/connection.cpp
index fa16504164..cb54b8b00e 100644
--- a/protocols/Twitter/src/connection.cpp
+++ b/protocols/Twitter/src/connection.cpp
@@ -309,7 +309,7 @@ bool TwitterProto::NegotiateConnection()
 	debugLogA("**NegotiateConnection - sending set_cred: no pin");*/

 

 	if (screenName.empty()) {

-		ShowPopup(TranslateT("You're missing the Nick key in the database. This isn't really a big deal, but you'll notice some minor quirks (self contact in list, no group chat outgoing message highlighting, etc). To fix it either add it manually or reset your twitter account in the miranda account options"));

+		ShowPopup(TranslateT("You're missing the Nick key in the database. This isn't really a big deal, but you'll notice some minor quirks (self contact in list, no group chat outgoing message highlighting, etc). To fix it either add it manually or reset your Twitter account in the Miranda account options"));

 		debugLogA( _T("**NegotiateConnection - Missing the Nick key in the database.  Everything will still work, but it's nice to have"));

 	}

 

diff --git a/protocols/Xfire/res/resource.rc b/protocols/Xfire/res/resource.rc
index 16ee9ca595..3ef11bb666 100644
--- a/protocols/Xfire/res/resource.rc
+++ b/protocols/Xfire/res/resource.rc
@@ -134,7 +134,7 @@ BEGIN
     PUSHBUTTON      "",IDC_REMUSER,138,42,16,15,BS_ICON

     LTEXT           "This list contains all your blocked Xfire users. You can remove one, if you wanna allow him to send you a friend request.",IDC_STC9,160,12,136,74,NOT WS_GROUP

     LTEXT           "You can simply block someone, if you right click on his friend request in clist and choose Block User...",IDC_STC19,160,48,130,39,NOT WS_GROUP

-    LTEXT           "This file is used for the game search, game detection and game ID resolving. It contains all xfire supported games.",IDC_STC20,92,105,206,28,NOT WS_GROUP

+    LTEXT           "This file is used for the game search, game detection and game ID resolving. It contains all Xfire supported games.",IDC_STC20,92,105,206,28,NOT WS_GROUP

     LTEXT           "This file contains all original game icons. You can also activate the option for icon downloading, if you don't have it.",IDC_STC21,92,136,206,30,NOT WS_GROUP

     LTEXT           "Be sure you put these files in following folder:",IDC_STC24,7,171,290,9,NOT WS_GROUP

     EDITTEXT        IDC_FILESSHOULDBE,7,183,290,13,ES_READONLY | NOT WS_BORDER,WS_EX_CLIENTEDGE

diff --git a/protocols/Xfire/src/iniupdater.cpp b/protocols/Xfire/src/iniupdater.cpp
index e19a437cb8..5913ffb4ec 100644
--- a/protocols/Xfire/src/iniupdater.cpp
+++ b/protocols/Xfire/src/iniupdater.cpp
@@ -82,7 +82,7 @@ void UpdateMyXFireIni(LPVOID dummy) {
 				if(db_get_b(NULL,protocolname,"dontaskforupdate",0)==0) MSGBOX(Translate("The xfire_games.ini was updated."));

 			}

 			else

-				MSGBOX(Translate("Error during xfire_games Update."));

+				MSGBOX(Translate("Error during xfire_games.ini update."));

 		}

 	}

 }

diff --git a/protocols/Xfire/src/main.cpp b/protocols/Xfire/src/main.cpp
index 9adbe4290b..044096aa0b 100644
--- a/protocols/Xfire/src/main.cpp
+++ b/protocols/Xfire/src/main.cpp
@@ -1050,7 +1050,7 @@ extern "C" __declspec(dllexport) int  Load(void)
 		db_set_b(NULL,protocolname,"xfiresitegameico",1);

 		db_set_b(NULL,protocolname,"recprotoverchg",1);

 

-		if(MessageBoxA(NULL,Translate("It seems that is the first time you use this plugin. Do you want to automatically download the latest available xfire_games.ini and icons.dll?\r\nWithout the ini xfire can't detect any games on your computer."),"Miranda XFire Protocol Plugin",MB_YESNO|MB_ICONQUESTION)==IDYES)

+		if(MessageBoxA(NULL,Translate("It seems that is the first time you use this plugin. Do you want to automatically download the latest available xfire_games.ini and icons.dll?\r\nWithout the xfire_games.ini Xfire can't detect any games on your computer."),"Miranda XFire Protocol Plugin",MB_YESNO|MB_ICONQUESTION)==IDYES)

 		{

 			db_set_b(NULL,protocolname,"autoiniupdate",1);

 			db_set_b(NULL,protocolname,"autoicodllupdate",1);