From 2ff607d58d8889248484d3bcd4eb123a13c0a164 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Wed, 9 Oct 2013 08:46:25 +0000 Subject: English US correction (patch by RMN) git-svn-id: http://svn.miranda-ng.org/main/trunk@6413 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/IcqOscarJ/res/resources.rc | 4 ++-- protocols/JabberG/res/jabber.rc | 2 +- protocols/Skype/src/skype_transfers.cpp | 4 ++-- protocols/Twitter/src/connection.cpp | 2 +- protocols/Yahoo/src/yahoo.cpp | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) (limited to 'protocols') diff --git a/protocols/IcqOscarJ/res/resources.rc b/protocols/IcqOscarJ/res/resources.rc index 796b889cc2..0b92eef852 100644 --- a/protocols/IcqOscarJ/res/resources.rc +++ b/protocols/IcqOscarJ/res/resources.rc @@ -189,7 +189,7 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,21,176,281,10 CONTROL "Only reply to status message request from visible contacts",IDC_STATUSMSG_VISIBLE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,33,192,269,10 - CTEXT "Some options are greyed out because they can only be changed when you are online.",IDC_STATIC_NOTONLINE,4,215,302,8 + CTEXT "Some options are grayed out because they can only be changed when you are online.",IDC_STATIC_NOTONLINE,4,215,302,8 END IDD_OPT_POPUPS DIALOGEX 0, 0, 314, 251 @@ -291,7 +291,7 @@ BEGIN EDITTEXT IDC_DEPARTMENT,65,177,91,12,ES_AUTOHSCROLL LTEXT "Position:",IDC_STATIC,15,194,50,8 EDITTEXT IDC_POSITION,65,192,91,12,ES_AUTOHSCROLL - LTEXT "Organisation:",IDC_STATIC,15,209,50,8 + LTEXT "Organization:",IDC_STATIC,15,209,50,8 COMBOBOX IDC_ORGANISATION,65,207,91,99,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "Keywords:",IDC_STATIC,24,224,41,8 EDITTEXT IDC_ORGKEYWORDS,65,222,91,12,ES_AUTOHSCROLL diff --git a/protocols/JabberG/res/jabber.rc b/protocols/JabberG/res/jabber.rc index 90d1c1e05a..79782e2b6a 100644 --- a/protocols/JabberG/res/jabber.rc +++ b/protocols/JabberG/res/jabber.rc @@ -618,7 +618,7 @@ BEGIN CONTROL "View as tree",IDC_BTN_VIEWTREE,"MButtonClass",WS_TABSTOP,5,5,16,14 CONTROL "View as list",IDC_BTN_VIEWLIST,"MButtonClass",WS_TABSTOP,21,5,16,14 CONTROL "Home",IDC_BTN_NAVHOME,"MButtonClass",WS_TABSTOP,42,5,16,14 - CONTROL "Favourites",IDC_BTN_FAVORITE,"MButtonClass",WS_TABSTOP,58,5,16,14 + CONTROL "Favorites",IDC_BTN_FAVORITE,"MButtonClass",WS_TABSTOP,58,5,16,14 CONTROL "Refresh",IDC_BTN_REFRESH,"MButtonClass",WS_TABSTOP,74,5,16,14 LTEXT "JID:",IDC_STATIC,95,5,14,14,SS_CENTERIMAGE COMBOBOX IDC_COMBO_JID,112,6,99,70,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP diff --git a/protocols/Skype/src/skype_transfers.cpp b/protocols/Skype/src/skype_transfers.cpp index b97e1290d3..227edaeea6 100644 --- a/protocols/Skype/src/skype_transfers.cpp +++ b/protocols/Skype/src/skype_transfers.cpp @@ -3,8 +3,8 @@ wchar_t *CSkypeProto::TransferFailureReasons[] = { LPGENW("") /* --- */, - LPGENW("SENDER_NOT_AUTHORISED") /* SENDER_NOT_AUTHORISED */, - LPGENW("REMOTELY_CANCELLED") /* REMOTELY_CANCELLED */, + LPGENW("SENDER_NOT_AUTHORIZED") /* SENDER_NOT_AUTHORISED */, + LPGENW("REMOTELY_CANCELED") /* REMOTELY_CANCELLED */, LPGENW("FAILED_READ") /* FAILED_READ */, LPGENW("FAILED_REMOTE_READ") /* FAILED_REMOTE_READ */, LPGENW("FAILED_WRITE") /* FAILED_WRITE */, diff --git a/protocols/Twitter/src/connection.cpp b/protocols/Twitter/src/connection.cpp index bad727f993..0af2eb2e15 100644 --- a/protocols/Twitter/src/connection.cpp +++ b/protocols/Twitter/src/connection.cpp @@ -218,7 +218,7 @@ bool TwitterProto::NegotiateConnection() db_free(&dbv); } else { - ShowPopup(TranslateT("OAuth variables are out of sequence, they have been reset. Please reconnect and reauthorise Miranda to Twitter.com (do the PIN stuff again)")); + ShowPopup(TranslateT("OAuth variables are out of sequence, they have been reset. Please reconnect and reauthorize Miranda to Twitter.com (do the PIN stuff again)")); LOG( _T("**NegotiateConnection - We don't have a PIN? this doesn't make sense. Resetting OAuth keys and setting offline.")); resetOAuthKeys(); diff --git a/protocols/Yahoo/src/yahoo.cpp b/protocols/Yahoo/src/yahoo.cpp index d8c321b201..d7e797fa79 100644 --- a/protocols/Yahoo/src/yahoo.cpp +++ b/protocols/Yahoo/src/yahoo.cpp @@ -1121,7 +1121,7 @@ void CYahooProto::ext_login_response(int succ, const char *url) } if (succ == YAHOO_LOGIN_UNAME) { - mir_sntprintf(buff, SIZEOF(buff), TranslateT("Could not log into Yahoo service - username not recognised. Please verify that your username is correctly typed.")); + mir_sntprintf(buff, SIZEOF(buff), TranslateT("Could not log into Yahoo service - username not recognized. Please verify that your username is correctly typed.")); ProtoBroadcastAck(NULL, ACKTYPE_LOGIN, ACKRESULT_FAILED, NULL, LOGINERR_BADUSERID); } else if (succ == YAHOO_LOGIN_PASSWD) { -- cgit v1.2.3