typos

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

9 files changed, 16 insertions, 16 deletions

diff --git a/protocols/Sametime/res/resource.rc b/protocols/Sametime/res/resource.rc
index c520f68bf6..b0b55f294c 100644
--- a/protocols/Sametime/res/resource.rc
+++ b/protocols/Sametime/res/resource.rc
@@ -45,7 +45,7 @@ BEGIN
     GROUPBOX        "Error display",IDC_STATIC,7,143,153,53

     CONTROL         "Use message boxes",IDC_RAD_ERRMB,"Button",BS_AUTORADIOBUTTON | WS_GROUP,10,156,145,10

     CONTROL         "Use popups",IDC_RAD_ERRPOP,"Button",BS_AUTORADIOBUTTON,10,169,145,10

-    CONTROL         "Use system tray baloons",IDC_RAD_ERRBAL,"Button",BS_AUTORADIOBUTTON,10,182,145,10

+    CONTROL         "Use system tray balloons",IDC_RAD_ERRBAL,"Button",BS_AUTORADIOBUTTON,10,182,145,10

     GROUPBOX        "Contacts",IDC_STATIC,166,7,150,91

     CONTROL         "Get contacts from server",IDC_CHK_GETSERVERCONTACTS,

                     "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,171,15,139,15

diff --git a/protocols/Skype/src/skype_chat.cpp b/protocols/Skype/src/skype_chat.cpp
index 6a0f068fcf..2f2f166566 100644
--- a/protocols/Skype/src/skype_chat.cpp
+++ b/protocols/Skype/src/skype_chat.cpp
@@ -30,8 +30,8 @@ static struct gc_item crListItems[] =
 	{ LPGENT("&Kick"),                ICM_KICK,               MENU_ITEM      },

 	{ LPGENT("Outlaw (&ban)"),        ICM_BAN,                MENU_ITEM      },	

 	{ NULL,                           0,                      MENU_SEPARATOR },

-	{ LPGENT("Copy &skypename"),      ICM_COPY_SID,           MENU_ITEM      },

-	{ LPGENT("Copy room &uri"),       ICM_COPY_URI,           MENU_ITEM      }

+	{ LPGENT("Copy &Skype name"),      ICM_COPY_SID,           MENU_ITEM      },

+	{ LPGENT("Copy room &URI"),       ICM_COPY_URI,           MENU_ITEM      }

 };

 

 static void CheckChatMenuItem(CHAT_LIST_MENU checkedId)

diff --git a/protocols/Skype/src/skype_instances.cpp b/protocols/Skype/src/skype_instances.cpp
index b5cf2c4494..66b8447fbc 100644
--- a/protocols/Skype/src/skype_instances.cpp
+++ b/protocols/Skype/src/skype_instances.cpp
@@ -12,7 +12,7 @@ CSkypeProto* CSkypeProto::InitSkypeProto(const char* protoName, const wchar_t* u
 	if (CSkypeProto::instanceList.getCount() > 0) 

 	{

 		CSkypeProto::ShowNotification(

-			::TranslateT("Skype protocol plugin only permits you to login to one account at a time. Adding multiple accounts is prohibited in the licence agreement and standard distribution terms of SkypeKit."),

+			::TranslateT("Skype protocol plugin only permits you to login to one account at a time. Adding multiple accounts is prohibited in the license agreement and standard distribution terms of SkypeKit."),

 			MB_ICONERROR);

 		return NULL;

 	}

diff --git a/protocols/Tlen/res/tlen.rc b/protocols/Tlen/res/tlen.rc
index 2e07488fab..8cb7316bd8 100644
--- a/protocols/Tlen/res/tlen.rc
+++ b/protocols/Tlen/res/tlen.rc
@@ -312,7 +312,7 @@ BEGIN
                     WS_VSCROLL | WS_TABSTOP

     LTEXT           "School:",IDC_STATIC,15,150,50,8

     EDITTEXT        IDC_SCHOOL,65,148,91,12,ES_AUTOHSCROLL

-    GROUPBOX        "Extra Search Criterias",IDC_EXTRAGROUP,171,7,156,67

+    GROUPBOX        "Extra Search Criteria",IDC_EXTRAGROUP,171,7,156,67

     LTEXT           "Status:",IDC_STATIC,177,22,50,8

     COMBOBOX        IDC_STATUS,227,20,91,113,CBS_DROPDOWNLIST | WS_VSCROLL |

                     WS_TABSTOP

diff --git a/protocols/Xfire/res/resource.rc b/protocols/Xfire/res/resource.rc
index 477bf5a5a8..2ffca6f15a 100644
--- a/protocols/Xfire/res/resource.rc
+++ b/protocols/Xfire/res/resource.rc
@@ -110,7 +110,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN

     GROUPBOX        "Options",IDC_GRP1,2,1,300,152

     GROUPBOX        "More options",IDC_GRP5,2,155,300,71

-    RTEXT           "Display Error and Infomessage:",IDC_STC12,4,209,144,9,NOT WS_GROUP

+    RTEXT           "Display Error and Info message:",IDC_STC12,4,209,144,9,NOT WS_GROUP

     COMBOBOX        IDC_NOMSG,152,207,142,61,CBS_DROPDOWNLIST | WS_TABSTOP

     CONTROL         "Tree1",IDC_TREE,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | TVS_FULLROWSELECT | WS_BORDER | WS_HSCROLL | WS_TABSTOP,6,11,292,138

     RTEXT           "Main group for clan groups:",IDC_STC25,4,194,144,9,NOT WS_GROUP

@@ -147,7 +147,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN

     GROUPBOX        "Status Message",IDC_GRP1,2,1,300,214

     CONTROL         "Enable",IDC_ENABLESTSMSG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,14,132,9

-    LTEXT           "With this feature, following status message will be set on your other protocol plugins, if you are ingame. So your other buddies can also see what you play. It will also change the status to occupied, if this option is enabled.",IDC_STC28,10,38,286,24,NOT WS_GROUP

+    LTEXT           "With this feature, following status message will be set on your other protocol plugins, if you are in game. So your other buddies can also see what you play. It will also change the status to occupied, if this option is enabled.",IDC_STC28,10,38,286,24,NOT WS_GROUP

     LTEXT           "Following Variables are available: %myxfiregame%, %myxfirevoice%, %myxfireserverip%, %myxfirevoiceip%",IDC_STC29,10,96,286,19,NOT WS_GROUP

     EDITTEXT        IDC_STATUSMSG,8,131,286,70,ES_MULTILINE | NOT WS_BORDER,WS_EX_CLIENTEDGE

     LTEXT           "Status message:",IDC_STC30,10,118,94,9,NOT WS_GROUP

@@ -191,7 +191,7 @@ BEGIN
     LTEXT           "Username:",IDC_STC2,8,18,36,9,NOT WS_GROUP

     LTEXT           "Nick:",IDC_STC3,8,9,32,9,NOT WS_GROUP

     GROUPBOX        "Game",IDC_GRP2,2,44,220,32

-    GROUPBOX        "Voicechat",IDC_GRP3,2,77,220,33

+    GROUPBOX        "Voice chat",IDC_GRP3,2,77,220,33

     LTEXT           "Name:",IDC_STC4,30,53,36,9,NOT WS_GROUP

     EDITTEXT        IDC_GAME,54,53,134,9,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER

     LTEXT           "IP:",IDC_STC5,30,64,18,9,NOT WS_GROUP

@@ -243,7 +243,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIB
 CAPTION "New xfire_games.ini"

 FONT 8, "MS Sans Serif", 0, 0, 0x1

 BEGIN

-    LTEXT           "There is a new XFire gamelist online, do you want to update now?",IDC_STC34,30,5,154,19,NOT WS_GROUP

+    LTEXT           "There is a new XFire game list online, do you want to update now?",IDC_STC34,30,5,154,19,NOT WS_GROUP

     ICON            IDI_TM,IDC_IMG2,4,3,22,19,SS_CENTERIMAGE

     LTEXT           "New supported games:",IDC_STC35,6,29,124,9,NOT WS_GROUP

     DEFPUSHBUTTON   "Update",IDOK,36,88,50,15

diff --git a/protocols/Xfire/src/main.cpp b/protocols/Xfire/src/main.cpp
index b08edd0f1f..ef46e4020b 100644
--- a/protocols/Xfire/src/main.cpp
+++ b/protocols/Xfire/src/main.cpp
@@ -420,7 +420,7 @@ void XFireClient::sendmsg(char*usr,char*cmsg) {
 			  for(int i=0;i<claninv->numberOfInv;i++)

 			  {

 				  char msg[XFIRE_MAX_STATIC_STRING_LEN];

-				  mir_snprintf(msg, SIZEOF(msg), Translate("%s (Nickname: %s) has invited you to join the %s clan. Message: %s%sPlease go to the XFireclan-Site to accept the Invitation."),claninv->invitefromusername[i].c_str(),

+				  mir_snprintf(msg, SIZEOF(msg), Translate("%s (Nickname: %s) has invited you to join the %s clan. Message: %s%sPlease go to the XFire clan site to accept the Invitation."),claninv->invitefromusername[i].c_str(),

 																								claninv->invitefrom[i].c_str(),

 																								claninv->clanname[i].c_str(),

 																								claninv->invitemsg[i].c_str(),"\n");

diff --git a/protocols/Xfire/src/options.cpp b/protocols/Xfire/src/options.cpp
index c8b4bd153e..559c1ed0c7 100644
--- a/protocols/Xfire/src/options.cpp
+++ b/protocols/Xfire/src/options.cpp
@@ -85,12 +85,12 @@ static mytreeitem mytree[] = {
 	{LPGENT("Display popup if someone starts a game"),"gamepopup",0,0},

 	{LPGENT("Don't automatically create clan groups"),"noclangroups",0,0},

 	{LPGENT("Enable MBot support"),"mbotsupport",0,0},

-	{LPGENT("Gamedetection"),"",1,0},

+	{LPGENT("Game detection"),"",1,0},

 	/*{"Scan for games on every Miranda start","scanalways",0},*/

 	{LPGENT("Disable game detection"),"nogamedetect",0,0},

 	/*{"Enable server IP/Port detection","ipportdetec",0},*/

 	/*{"Enable TeamSpeak2/Ventrilo detection","",0},*/

-	{LPGENT("Use TSRemote.dll to get teamspeak server info"),"ts2useremote",0,0},

+	{LPGENT("Use TSRemote.dll to get TeamSpeak server info"),"ts2useremote",0,0},

 	{LPGENT("Disable popups when ingame"),"nopopups",0,0},

 	{LPGENT("Disable sound events when ingame"),"nosoundev",0,0},

 	{LPGENT("Files"),"",1,0},

@@ -363,7 +363,7 @@ static INT_PTR CALLBACK DlgProcOpts3(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 			SendMessage(hwndDlg, DM_REBUILD_TREE, 0, 0);

 

 			SendDlgItemMessage( hwndDlg, IDC_NOMSG, CB_ADDSTRING, 0, (LPARAM)TranslateT("Hidden" ));

-			SendDlgItemMessage( hwndDlg, IDC_NOMSG, CB_ADDSTRING, 0, (LPARAM)TranslateT("Messagebox" ));

+			SendDlgItemMessage( hwndDlg, IDC_NOMSG, CB_ADDSTRING, 0, (LPARAM)TranslateT("Message box" ));

 			SendDlgItemMessage( hwndDlg, IDC_NOMSG, CB_ADDSTRING, 0, (LPARAM)TranslateT("Popup" ));

 

 			//scanalways

diff --git a/protocols/Yahoo/res/Yahoo.rc b/protocols/Yahoo/res/Yahoo.rc
index f903d01eee..a9072b97d2 100644
--- a/protocols/Yahoo/res/Yahoo.rc
+++ b/protocols/Yahoo/res/Yahoo.rc
@@ -31,7 +31,7 @@ BEGIN
     GROUPBOX        "Expert",IDC_STATIC,8,84,280,80
     CONTROL         "Use Yahoo Address Book (YAB)",IDC_USE_YAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,104,260,10
     CONTROL         "Show Avatars",IDC_SHOW_AVATARS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,114,260,10
-    CONTROL         "AutoLogin to Yahoo Website(s)",IDC_MAIL_AUTOLOGIN,
+    CONTROL         "Auto login to Yahoo Website(s)",IDC_MAIL_AUTOLOGIN,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,124,260,10
     CONTROL         "Display Yahoo notifications",IDC_DISABLEYAHOOMAIL,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,134,260,10
diff --git a/protocols/Yahoo/src/yahoo.cpp b/protocols/Yahoo/src/yahoo.cpp
index 51e1ea569b..0ac5740c41 100644
--- a/protocols/Yahoo/src/yahoo.cpp
+++ b/protocols/Yahoo/src/yahoo.cpp
@@ -984,10 +984,10 @@ void CYahooProto::ext_mail_notify(const char *from, const char *subj, int cnt)
 			

 			if (from == NULL) {

 				mir_sntprintf(title, SIZEOF(title), _T("%s: %s"), m_tszUserName, TranslateT("New Mail"));

-				mir_sntprintf(z, SIZEOF(z), TranslateT("You have %i unread msgs"), cnt);

+				mir_sntprintf(z, SIZEOF(z), TranslateT("You have %i unread messages"), cnt);

 			}

 			else {

-				mir_sntprintf(title, SIZEOF(title), TranslateT("New Mail (%i msgs)"), cnt);

+				mir_sntprintf(title, SIZEOF(title), TranslateT("New Mail (%i messages)"), cnt);

 

 				ptrT tszFrom( mir_utf8decodeT(from));

 				ptrT tszSubj( mir_utf8decodeT(subj));