diff options
| author | Vadim Dashevskiy <watcherhd@gmail.com> | 2013-10-09 08:46:25 +0000 |
|---|---|---|
| committer | Vadim Dashevskiy <watcherhd@gmail.com> | 2013-10-09 08:46:25 +0000 |
| commit | 2ff607d58d8889248484d3bcd4eb123a13c0a164 (patch) | |
| tree | e4d9a9617e0d7d1cfe249d00aa2eaaf85c0c286e | |
| parent | 9aac6d3df840fb35a4798f25929bd7187f1c65a9 (diff) | |
English US correction (patch by RMN)
git-svn-id: http://svn.miranda-ng.org/main/trunk@6413 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
51 files changed, 81 insertions, 80 deletions
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt index fc9461fd18..bf60772281 100644 --- a/langpacks/english/=CORE=.txt +++ b/langpacks/english/=CORE=.txt @@ -405,7 +405,7 @@ [Hide vertical scroll bar]
[Row height:]
[Gamma correction]
-[Grey out entire list when:]
+[Gray out entire list when:]
[Contact List Background]
[Background color]
[Selection color]
@@ -567,7 +567,7 @@ [Flash in the system tray and in the contact list]
[Show balloon popup]
[Save the window position for each contact]
-[Message window behaviour:]
+[Message window behavior:]
[Messaging:]
[&Open link]
[Paste && Send]
@@ -921,7 +921,7 @@ [My Received Files]
[View User's History]
[User Menu]
-[Cancelled]
+[Canceled]
;file \src\core\stdfile\filesenddlg.cpp
[%d files]
[%d directories]
@@ -938,7 +938,7 @@ [Connecting...]
[Connecting to proxy...]
[Connected]
-[Initialising...]
+[Initializing...]
[Moving to next file...]
[File already exists]
[Sending...]
diff --git a/langpacks/english/Plugins/BasicHistory.txt b/langpacks/english/Plugins/BasicHistory.txt index d28a8877de..6eafaa37a4 100644 --- a/langpacks/english/Plugins/BasicHistory.txt +++ b/langpacks/english/Plugins/BasicHistory.txt @@ -95,7 +95,7 @@ [System]
[Me]
[Invalid Message]
-[Authorisation request by %s (%s%d): %s]
+[Authorization request by %s (%s%d): %s]
;file \plugins\BasicHistory\src\ExportManager.cpp
[%s Files (*.%s)]
[Import]
diff --git a/langpacks/english/Plugins/CSList.txt b/langpacks/english/Plugins/CSList.txt index 9bf037a5e5..cd005ed783 100644 --- a/langpacks/english/Plugins/CSList.txt +++ b/langpacks/english/Plugins/CSList.txt @@ -25,7 +25,7 @@ [Modify]
[Warning]
[This field doesn't accept string longer than %d characters. The string will be truncated.]
-[Favourites]
+[Favorites]
[Regular statuses]
[Title]
[Message]
@@ -38,7 +38,7 @@ [Delete selected item]
[Remove]
[Set/unset current item as favorite]
-[Favourite]
+[Favorite]
[Undo changes]
[Import statuses from database]
[Import]
diff --git a/langpacks/english/Plugins/Clist_modern.txt b/langpacks/english/Plugins/Clist_modern.txt index cf905a8e40..f0d47f0c13 100644 --- a/langpacks/english/Plugins/Clist_modern.txt +++ b/langpacks/english/Plugins/Clist_modern.txt @@ -8,7 +8,7 @@ [Displays contacts, event notifications, protocol status with advantage visual modifications. Supported MW modifications, enhanced metacontact cooperation.]
;file \plugins\Clist_modern\res\resource.rc
[Transparency:]
-[Window behaviour:]
+[Window behavior:]
[List sorting:]
[Status bar:]
[List content:]
@@ -96,7 +96,7 @@ [Multiline status bar:]
[Accounts per line]
[* To increase Status Bar height:\nSet in Main menu: Frames->Status Bar->Show TitleBar then pull appeared title of status bar up or down.]
-[Hold [Shift] to inverse [Right Click] behaviour]
+[Hold [Shift] to inverse [Right Click] behavior]
[[Ctrl]+[Left Click] to filter only protocol. Click on empty space to show all]
[Set options per account]
[Enable custom account settings]
@@ -140,7 +140,7 @@ [maximum]
[% of screen]
[Size upwards]
-[Behaviour]
+[Behavior]
[Lock manual resize]
[Drag to]
[Easy Scroll]
diff --git a/langpacks/english/Plugins/Clist_mw.txt b/langpacks/english/Plugins/Clist_mw.txt index 6cdde4c627..b299646300 100644 --- a/langpacks/english/Plugins/Clist_mw.txt +++ b/langpacks/english/Plugins/Clist_mw.txt @@ -101,7 +101,7 @@ [Time:]
[milliseconds]
[Left margin:]
-[Grey out entire list when:]
+[Gray out entire list when:]
[Dim idle contacts]
[Hide vertical scrollbar]
[Contact List Background]
diff --git a/langpacks/english/Plugins/Clist_nicer.txt b/langpacks/english/Plugins/Clist_nicer.txt index 20641607f9..fd6650497c 100644 --- a/langpacks/english/Plugins/Clist_nicer.txt +++ b/langpacks/english/Plugins/Clist_nicer.txt @@ -137,7 +137,7 @@ [Time:]
[milliseconds]
[Hide vertical scroll bar]
-[Grey out entire list when:]
+[Gray out entire list when:]
[Contact List Background]
[Use Windows colors]
[Background color]
diff --git a/langpacks/english/Plugins/FavContacts.txt b/langpacks/english/Plugins/FavContacts.txt index 1216006b88..f972360235 100644 --- a/langpacks/english/Plugins/FavContacts.txt +++ b/langpacks/english/Plugins/FavContacts.txt @@ -1,11 +1,11 @@ #muuid {ce2c0401-f9e0-40d7-8e95-1a4197d7ab04}
;============================================================
; File: FavContacts.dll
-; Plugin: Favourite contacts
+; Plugin: Favorite contacts
; Version: 0.0.0.6
; Authors: Victor Pavlychko
;============================================================
-[Favourite contacts menu.]
+[Favorite contacts menu.]
;file \plugins\FavContacts\res\resource.rc
[Customize]
[Show second line]
@@ -17,7 +17,7 @@ [Use system colors and fonts]
[Hotkey shows menu centered on screen]
[Menu item preview:]
-[Favourite Contacts]
+[Favorite Contacts]
[Enable groups]
[Multicolumn menu]
[Configure fonts and colors...]
@@ -28,7 +28,7 @@ ;file \plugins\FavContacts\src\favlist.h
[<no group>]
;file \plugins\FavContacts\src\main.cpp
-[Favourite Contact]
+[Favorite Contact]
[Regular Contact]
[Contact name]
[Second line]
@@ -36,7 +36,8 @@ [Selected second line (color)]
[Background]
[Selected background]
-[Show favourite contacts]
+[Favourite Contacts]
+[Show favorite contacts]
[Contacts]
-[Favourites]
-[&Favourite Contacts...]
+[Favorites]
+[&Favorite Contacts...]
diff --git a/langpacks/english/Plugins/FileAsMessage.txt b/langpacks/english/Plugins/FileAsMessage.txt index d7d69aa451..8be44417ca 100644 --- a/langpacks/english/Plugins/FileAsMessage.txt +++ b/langpacks/english/Plugins/FileAsMessage.txt @@ -34,7 +34,7 @@ [Sent successfully]
[Unknown command for "File As Message" was received]
[Incoming file request. Do you want to proceed?]
-[Cancelled by remote user]
+[Canceled by remote user]
[New incoming file request. Do you want to proceed?]
[Paused, because connection dropped]
[Failed on file initialization]
@@ -43,7 +43,7 @@ [Select a file]
[Save as]
[Can't get a file size]
-[Cancelled by user]
+[Canceled by user]
[Transfer is in progress. Do you really want to close?]
;file \plugins\FileAsMessage\src\main.cpp
[Play]
diff --git a/langpacks/english/Plugins/ICQ.txt b/langpacks/english/Plugins/ICQ.txt index 22c4c18348..4328177e53 100644 --- a/langpacks/english/Plugins/ICQ.txt +++ b/langpacks/english/Plugins/ICQ.txt @@ -77,7 +77,7 @@ [Allow others to view my primary e-mail address]
[Only reply to status message requests from users on my contact list]
[Only reply to status message request from visible contacts]
-[Some options are greyed out because they can only be changed when you are online.]
+[Some options are grayed out because they can only be changed when you are online.]
[Options]
[Enable popup support]
[Display errors using popups]
@@ -118,7 +118,7 @@ [Company:]
[Department:]
[Position:]
-[Organisation:]
+[Organization:]
[Location]
[Language:]
[Country:]
diff --git a/langpacks/english/Plugins/IEView.txt b/langpacks/english/Plugins/IEView.txt index f94bb20ba8..f5f02deb11 100644 --- a/langpacks/english/Plugins/IEView.txt +++ b/langpacks/english/Plugins/IEView.txt @@ -45,7 +45,7 @@ [URL received]
;file \plugins\IEView\src\HTMLBuilder.cpp
[(Unknown Contact)]
-[ requested authorisation]
+[ requested authorization]
[ was added.]
;file \plugins\IEView\src\IEView.cpp
[IID_IOleObject failed.]
diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt index 99869b7e96..b02f71466a 100644 --- a/langpacks/english/Plugins/Jabber.txt +++ b/langpacks/english/Plugins/Jabber.txt @@ -188,7 +188,7 @@ [Service Discovery]
[View as tree]
[View as list]
-[Favourites]
+[Favorites]
[Refresh]
[Node:]
[Change %s Message]
diff --git a/langpacks/english/Plugins/ModernOpt.txt b/langpacks/english/Plugins/ModernOpt.txt index 4296be683f..6ca56f8955 100644 --- a/langpacks/english/Plugins/ModernOpt.txt +++ b/langpacks/english/Plugins/ModernOpt.txt @@ -24,7 +24,7 @@ [Style]
[Change the look of Miranda NG according to your taste.]
[Contacts]
-[Configure behaviour of your contact list.]
+[Configure behavior of your contact list.]
[Chats]
[Customize look&&feel of your chat windows here.]
[Ignore]
diff --git a/langpacks/english/Plugins/NewEventNotify.txt b/langpacks/english/Plugins/NewEventNotify.txt index e53f5ff155..32622091f9 100644 --- a/langpacks/english/Plugins/NewEventNotify.txt +++ b/langpacks/english/Plugins/NewEventNotify.txt @@ -46,7 +46,7 @@ ;file \plugins\NewEventNotify\src\neweventnotify.h
[Contacts]
[You were added!]
-[Requests your authorisation]
+[Requests your authorization]
[ICQ Web pager]
[ICQ Email express]
[Unknown Event]
diff --git a/langpacks/english/Plugins/Popup.txt b/langpacks/english/Plugins/Popup.txt index 94bbb7ca80..1b4b07ac20 100644 --- a/langpacks/english/Plugins/Popup.txt +++ b/langpacks/english/Plugins/Popup.txt @@ -132,7 +132,7 @@ ;file \plugins\Popup\src\icons.cpp
[Popups are enabled]
[Popups are disabled]
-[With "favourite" overlay]
+[With "favorite" overlay]
[With "fullscreen" overlay]
[Refresh skin list]
[Popup Placement]
@@ -213,9 +213,9 @@ [The skin you are trying to load is designed\r\nfor newer version of Popup Plus. And will not\r\ndisplay properly.\r\n\r\nPlease choose another skin.]
;file \plugins\Popup\src\srmm_menu.cpp
[Auto]
-[Favourite]
+[Favorite]
[Block]
[Popup Mode: Auto]
-[Popup Mode: Favourite]
+[Popup Mode: Favorite]
[Popup Mode: Ignore fullscreen]
[Popup Mode: Block contact]
diff --git a/langpacks/english/Plugins/Scriver.txt b/langpacks/english/Plugins/Scriver.txt index 21df7b6aec..83c2485a62 100644 --- a/langpacks/english/Plugins/Scriver.txt +++ b/langpacks/english/Plugins/Scriver.txt @@ -7,7 +7,7 @@ ;============================================================
[Scriver - send and receive instant messages.]
;file \plugins\Scriver\res\resource.rc
-[Behaviour]
+[Behavior]
[Automatically pop up the window when]
[and stay minimized]
[Cascade new windows]
diff --git a/langpacks/english/Plugins/SimpleStatusMsg.txt b/langpacks/english/Plugins/SimpleStatusMsg.txt index 19beb1e5d0..f8928ae433 100644 --- a/langpacks/english/Plugins/SimpleStatusMsg.txt +++ b/langpacks/english/Plugins/SimpleStatusMsg.txt @@ -14,7 +14,7 @@ [%s Message (%s)]
[OK]
[Retrieving status message for %s...]
-[Behaviour on status change]
+[Behavior on status change]
[Apply to all]
[Max length:]
[Pop up dialog box]
diff --git a/langpacks/english/Plugins/Skype.txt b/langpacks/english/Plugins/Skype.txt index a1edfd57ed..a2c1d12b07 100644 --- a/langpacks/english/Plugins/Skype.txt +++ b/langpacks/english/Plugins/Skype.txt @@ -212,8 +212,8 @@ ;file \protocols\Skype\src\skype_proto.cpp
[Skype name]
;file \protocols\Skype\src\skype_transfers.cpp
-[SENDER_NOT_AUTHORISED]
-[REMOTELY_CANCELLED]
+[SENDER_NOT_AUTHORIZED]
+[REMOTELY_CANCELED]
[FAILED_READ]
[FAILED_REMOTE_READ]
[FAILED_WRITE]
diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt index 7facfbe68f..07e9635f40 100644 --- a/langpacks/english/Plugins/TabSRMM.txt +++ b/langpacks/english/Plugins/TabSRMM.txt @@ -531,7 +531,7 @@ [Session list.\nClick left for a list of open sessions.\nClick right to access favorites and quickly configure message window behavior]
[There are %d pending send jobs. Message length: %d bytes, message length limit: %d bytes\n\n%d messages are queued for later delivery]
;file \plugins\TabSRMM\src\eventpopups.cpp
-[One of your popup actions is set to DISMISS EVENT.\nNote that this options may have unwanted side effects as it REMOVES the event from the unread queue.\nThis may lead to events not showing up as "new". If you don't want this behaviour, please review the Event Notifications settings page.]
+[One of your popup actions is set to DISMISS EVENT.\nNote that this options may have unwanted side effects as it REMOVES the event from the unread queue.\nThis may lead to events not showing up as "new". If you don't want this behavior, please review the Event Notifications settings page.]
[Incoming file]
[No description given]
[Incoming file (invalid format]
@@ -868,7 +868,7 @@ [Timeout actions (popups only)]
[Combine notifications for the same contact]
[Remove popups under following conditions]
-[Message window behaviour]
+[Message window behavior]
[Sending messages]
[Send on SHIFT - Enter]
[Send message on 'Enter']
diff --git a/langpacks/english/Plugins/Tipper.txt b/langpacks/english/Plugins/Tipper.txt index 9622eb6cb1..47eda88618 100644 --- a/langpacks/english/Plugins/Tipper.txt +++ b/langpacks/english/Plugins/Tipper.txt @@ -89,7 +89,7 @@ [Get more skins]
[Enable tray tooltips]
[Handle tray tooltips by Tipper]
-[Favourite contacts]
+[Favorite contacts]
[Expand to second level after:]
[ms]
[First level tooltip]
@@ -116,7 +116,7 @@ [Top right]
[Top left]
[Top]
-[Centre]
+[Center]
[Bottom]
[Left]
[Right]
diff --git a/langpacks/english/Plugins/Twitter.txt b/langpacks/english/Plugins/Twitter.txt index 380763a048..56ccde4295 100644 --- a/langpacks/english/Plugins/Twitter.txt +++ b/langpacks/english/Plugins/Twitter.txt @@ -40,7 +40,7 @@ [OK]
[Enter the PIN provided by Twitter to complete your sign in. This is a one time process until you recreate your Miranda Twitter account.]
;file \protocols\Twitter\src\connection.cpp
-[OAuth variables are out of sequence, they have been reset. Please reconnect and reauthorise Miranda to Twitter.com (do the PIN stuff again)]
+[OAuth variables are out of sequence, they have been reset. Please reconnect and reauthorize Miranda to Twitter.com (do the PIN stuff again)]
[Failed to get Twitter Access Tokens, please go offline and try again. If this keeps happening, check your internet connection.]
[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]
;file \protocols\Twitter\src\proto.cpp
diff --git a/langpacks/english/Plugins/Yahoo.txt b/langpacks/english/Plugins/Yahoo.txt index cae9a77815..c95f237202 100644 --- a/langpacks/english/Plugins/Yahoo.txt +++ b/langpacks/english/Plugins/Yahoo.txt @@ -119,7 +119,7 @@ [From: %s\nSubject: %s]
[Yahoo System Message]
[Yahoo Ping Error]
-[Could not log into Yahoo service - username not recognised. Please verify that your username is correctly typed.]
+[Could not log into Yahoo service - username not recognized. Please verify that your username is correctly typed.]
[Could not log into Yahoo service - password incorrect. Please verify that your username and password are correctly typed.]
[Could not log into Yahoo service. Your account has been locked.\nVisit %s to reactivate it.]
[You have been logged out of the yahoo service, possibly due to a duplicate login.]
diff --git a/plugins/BasicHistory/src/EventList.cpp b/plugins/BasicHistory/src/EventList.cpp index 44ba5db4cc..4f98cb34e7 100644 --- a/plugins/BasicHistory/src/EventList.cpp +++ b/plugins/BasicHistory/src/EventList.cpp @@ -557,7 +557,7 @@ static void GetAuthRequestDescription( DBEVENTINFO *dbei, TCHAR* buf, int cbBuf allName += _T(", ");
}
- mir_sntprintf(buf, cbBuf, TranslateT("Authorisation request by %s (%s%d): %s"),
+ mir_sntprintf(buf, cbBuf, TranslateT("Authorization request by %s (%s%d): %s"),
(newNick[0] == 0 ? (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM) hContact, GCDNF_TCHAR) : newNick),
allName.c_str(), uin, newReason);
mir_free( newNick );
diff --git a/plugins/CSList/src/cslist.cpp b/plugins/CSList/src/cslist.cpp index 067dec2125..75bd6d6ddb 100644 --- a/plugins/CSList/src/cslist.cpp +++ b/plugins/CSList/src/cslist.cpp @@ -598,7 +598,7 @@ CSListView::CSListView(HWND hwnd, CSWindow* parent) lg.cbSize = sizeof(LVGROUP);
lg.mask = LVGF_HEADER | LVGF_GROUPID;
- lg.pszHeader = TranslateT("Favourites");
+ lg.pszHeader = TranslateT("Favorites");
lg.iGroupId = 0;
ListView_InsertGroup( m_handle, -1, &lg );
diff --git a/plugins/CSList/src/cslist.h b/plugins/CSList/src/cslist.h index 35bafb8b4b..1a816acc69 100644 --- a/plugins/CSList/src/cslist.h +++ b/plugins/CSList/src/cslist.h @@ -148,7 +148,7 @@ static struct CSForm { // icons + buttons { IDC_ADD, LPGENT("Add new item"), LPGENT("Add"), "add", IDI_ADD },
{ IDC_MODIFY, LPGENT("Modify selected item"), LPGENT("Modify"), "modify", IDI_MODIFY },
{ IDC_REMOVE, LPGENT("Delete selected item"), LPGENT("Remove"), "remove", IDI_REMOVE },
- { IDC_FAVOURITE, LPGENT("Set/unset current item as favorite"), LPGENT("Favourite"), "favourite", IDI_FAVOURITE },
+ { IDC_FAVOURITE, LPGENT("Set/unset current item as favorite"), LPGENT("Favorite"), "favourite", IDI_FAVOURITE },
{ IDC_UNDO, LPGENT("Undo changes"), LPGENT("Undo changes"), "undo", IDI_UNDO },
{ IDC_IMPORT, LPGENT("Import statuses from database"), LPGENT("Import"), "import", IDI_IMPORT },
{ IDC_FILTER, LPGENT("Filter list"), LPGENT("Filter"), "filter", IDI_FILTER },
diff --git a/plugins/Clist_modern/res/resource.rc b/plugins/Clist_modern/res/resource.rc index bed82122c8..6399744f98 100644 --- a/plugins/Clist_modern/res/resource.rc +++ b/plugins/Clist_modern/res/resource.rc @@ -84,7 +84,7 @@ EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
LTEXT "Transparency:",IDC_TXT_TITLE2,0,78,184,8
- LTEXT "Window behaviour:",IDC_TXT_TITLE1,1,0,182,8
+ LTEXT "Window behavior:",IDC_TXT_TITLE1,1,0,182,8
LTEXT "List sorting:",IDC_TXT_TITLE4,184,88,183,8
LTEXT "Status bar:",IDC_TXT_TITLE5,0,39,184,8
LTEXT "List content:",IDC_TXT_TITLE3,184,0,183,8
@@ -310,7 +310,7 @@ BEGIN EDITTEXT IDC_MULTI_COUNT,93,148,48,12,ES_NUMBER
CONTROL "",IDC_MULTI_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,129,148,11,12
LTEXT "* To increase Status Bar height:\nSet in Main menu: Frames->Status Bar->Show TitleBar then pull appeared title of status bar up or down.",IDC_STATIC,27,163,123,42,WS_DISABLED
- LTEXT "Hold [Shift] to inverse [Right Click] behaviour",IDC_STATIC,27,207,267,8,WS_DISABLED
+ LTEXT "Hold [Shift] to inverse [Right Click] behavior",IDC_STATIC,27,207,267,8,WS_DISABLED
LTEXT "[Ctrl]+[Left Click] to filter only protocol. Click on empty space to show all",IDC_STATIC,27,216,267,8,WS_DISABLED
CONTROL "Set options per account",IDC_STATUSBAR_PER_PROTO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,12,134,10
COMBOBOX IDC_STATUSBAR_PROTO_LIST,160,23,134,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
@@ -401,7 +401,7 @@ BEGIN CONTROL "Spin1",IDC_MAXSIZESPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_HOTTRACK,92,125,9,14
LTEXT "% of screen",IDC_STATIC22,207,128,47,8
CONTROL "Size upwards",IDC_AUTOSIZEUPWARD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,143,230,8,WS_EX_TRANSPARENT
- GROUPBOX "Behaviour",IDC_STWINDOWGROUP2,0,12,258,142,0,WS_EX_TRANSPARENT
+ GROUPBOX "Behavior",IDC_STWINDOWGROUP2,0,12,258,142,0,WS_EX_TRANSPARENT
CONTROL "Lock manual resize",IDC_LOCKSIZING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,102,240,12
GROUPBOX "Drag to",IDC_STATIC,0,158,124,61
CONTROL "Easy Scroll",IDC_DRAGTOSCROLL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,181,108,8
diff --git a/plugins/Clist_modern/src/modern_clcopts.cpp b/plugins/Clist_modern/src/modern_clcopts.cpp index 95ed4040ab..14cb048684 100644 --- a/plugins/Clist_modern/src/modern_clcopts.cpp +++ b/plugins/Clist_modern/src/modern_clcopts.cpp @@ -255,7 +255,7 @@ static clist_opt_items[] = { LPGEN("Tray"), IDD_OPT_TRAY, DlgProcTrayOpts, 0 },
{ LPGEN("List"), IDD_OPT_CLC, DlgProcClistListOpts, 0 },
{ LPGEN("Window"), IDD_OPT_CLUI, DlgProcClistWindowOpts, 0 },
- { LPGEN("Behaviour"), IDD_OPT_CLUI_2, DlgProcClistBehaviourOpts, 0 },
+ { LPGEN("Behavior"), IDD_OPT_CLUI_2, DlgProcClistBehaviourOpts, 0 },
{ LPGEN("Status Bar"), IDD_OPT_SBAR, DlgProcSBarOpts, 0},
{ LPGEN("Additional stuff"), IDD_OPT_META_CLC, DlgProcClistAdditionalOpts, 0 }
};
diff --git a/plugins/Clist_mw/res/resource.rc b/plugins/Clist_mw/res/resource.rc index 7e136ef259..bb25608fea 100644 --- a/plugins/Clist_mw/res/resource.rc +++ b/plugins/Clist_mw/res/resource.rc @@ -250,7 +250,7 @@ BEGIN EDITTEXT IDC_LEFTMARGIN,215,180,31,12,ES_RIGHT | ES_NUMBER
CONTROL "Spin1",IDC_LEFTMARGINSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,240,180,10,14
LTEXT "pixels",IDC_STATIC,250,180,54,8
- CONTROL "Grey out entire list when:",IDC_GREYOUT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,165,195,139,10
+ CONTROL "Gray out entire list when:",IDC_GREYOUT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,165,195,139,10
CONTROL "Tree1",IDC_GREYOUTOPTS,"SysTreeView32",TVS_DISABLEDRAGDROP | TVS_NOTOOLTIPS | TVS_NONEVENHEIGHT | WS_BORDER | WS_TABSTOP,165,205,139,30
CONTROL "Dim idle contacts",IDC_IDLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,102,153,10
CONTROL "Hide vertical scrollbar",IDC_NOSCROLLBAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,165,160,140,10
diff --git a/plugins/Clist_nicer/res/resource.rc b/plugins/Clist_nicer/res/resource.rc index e4d2d95b4d..12924cf03b 100644 --- a/plugins/Clist_nicer/res/resource.rc +++ b/plugins/Clist_nicer/res/resource.rc @@ -319,7 +319,7 @@ BEGIN CONTROL "Spin1",IDC_SMOOTHTIMESPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,96,138,11,14
LTEXT "milliseconds",IDC_STATIC12,114,137,73,8,SS_CENTERIMAGE
CONTROL "Hide vertical scroll bar",IDC_NOSCROLLBAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,152,282,10
- CONTROL "Grey out entire list when:",IDC_GREYOUT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,168,282,10
+ CONTROL "Gray out entire list when:",IDC_GREYOUT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,168,282,10
CONTROL "Tree1",IDC_GREYOUTOPTS,"SysTreeView32",TVS_DISABLEDRAGDROP | TVS_NOTOOLTIPS | TVS_NONEVENHEIGHT | WS_BORDER | WS_HSCROLL | WS_TABSTOP,11,181,182,39
END
diff --git a/plugins/FileAsMessage/src/dialog.cpp b/plugins/FileAsMessage/src/dialog.cpp index 2d85115b2a..f007b11178 100644 --- a/plugins/FileAsMessage/src/dialog.cpp +++ b/plugins/FileAsMessage/src/dialog.cpp @@ -813,7 +813,7 @@ void FILEECHO::perform(char *str) {
if(iState & (STATE_PRERECV|STATE_REQSENT|STATE_OPERATE|STATE_ACKREQ|STATE_PAUSED))
{
- char *msg = Translate("Cancelled by remote user");
+ char *msg = Translate("Canceled by remote user");
SetDlgItemText(hDlg, IDC_STATUS, msg);
MakePopupMsg(hDlg, hContact, msg);
destroyTransfer();
@@ -832,7 +832,7 @@ void FILEECHO::perform(char *str) {
if(iState & (STATE_PRERECV|STATE_REQSENT|STATE_OPERATE|STATE_ACKREQ|STATE_PAUSED))
{
- char *msg = Translate("Cancelled by remote user");
+ char *msg = Translate("Canceled by remote user");
SetDlgItemText(hDlg, IDC_STATUS, msg);
MakePopupMsg(hDlg, hContact, msg);
destroyTransfer();
@@ -1200,7 +1200,7 @@ INT_PTR CALLBACK DialogProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam case IDCANCEL:
if(dat->iState == STATE_PRERECV)
{
- SetDlgItemText(hDlg, IDC_STATUS, Translate("Cancelled by user"));
+ SetDlgItemText(hDlg, IDC_STATUS, Translate("Canceled by user"));
dat->sendCmd(0, CMD_CANCEL, "", NULL);
dat->setState(STATE_CANCELLED);
}
@@ -1209,7 +1209,7 @@ INT_PTR CALLBACK DialogProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam if(MessageBox(hDlg, Translate("Transfer is in progress. Do you really want to close?"),
Translate(SERVICE_TITLE), MB_ICONWARNING|MB_YESNO|MB_DEFBUTTON2) == IDYES)
{
- SetDlgItemText(hDlg, IDC_STATUS, Translate("Cancelled by user"));
+ SetDlgItemText(hDlg, IDC_STATUS, Translate("Canceled by user"));
dat->setState(STATE_CANCELLED);
dat->sendCmd(0, CMD_CANCEL, "", NULL);
dat->destroyTransfer();
diff --git a/plugins/HistoryPlusPlus/hpp_events.pas b/plugins/HistoryPlusPlus/hpp_events.pas index 7c7ff4da53..0201e7b6b0 100644 --- a/plugins/HistoryPlusPlus/hpp_events.pas +++ b/plugins/HistoryPlusPlus/hpp_events.pas @@ -700,7 +700,7 @@ begin ReasonW := ReasonUTF
else
ReasonW := ReasonACP;
- Hi.Text := Format(TranslateW('Authorisation request by %s (%s%d): %s'),
+ Hi.Text := Format(TranslateW('Authorization request by %s (%s%d): %s'),
[NickW, AnsiToWideString(Name + Email, hppCodepage), uin, ReasonW]);
end;
diff --git a/plugins/IEView/src/HTMLBuilder.cpp b/plugins/IEView/src/HTMLBuilder.cpp index 425db0a236..684516e9a4 100644 --- a/plugins/IEView/src/HTMLBuilder.cpp +++ b/plugins/IEView/src/HTMLBuilder.cpp @@ -392,7 +392,7 @@ void HTMLBuilder::appendEventOld(IEView *view, IEVIEWEVENT *event) }
else if (dbei.eventType == EVENTTYPE_AUTHREQUEST) {
//blob is: uin(DWORD), hContact(DWORD), nick(ASCIIZ), first(ASCIIZ), last(ASCIIZ), email(ASCIIZ)
- eventData->ptszText = mir_tstrdup(TranslateT(" requested authorisation"));
+ eventData->ptszText = mir_tstrdup(TranslateT(" requested authorization"));
eventData->ptszNick = DbGetEventStringT(&dbei, (char *)dbei.pBlob + 8);
eventData->iType = IEED_EVENT_SYSTEM;
}
diff --git a/plugins/ModernOpt/src/modernopt.cpp b/plugins/ModernOpt/src/modernopt.cpp index 0f82e52e50..67cdccbfcd 100644 --- a/plugins/ModernOpt/src/modernopt.cpp +++ b/plugins/ModernOpt/src/modernopt.cpp @@ -71,7 +71,7 @@ struct ModernOptMainPageInfo g_ModernOptPages[MODERNOPT_PAGE_COUNT] = {0, FALSE, IDI_MIRANDA, LPGENT("Home"), LPGENT("Miranda NG configuration center")},
{IDC_BTN_ACCOUNTS, TRUE, IDI_BIG_NETWORK, LPGENT("Accounts"), LPGENT("Setup your account information to start messaging.")},
{IDC_BTN_SKINS, TRUE, IDI_BIG_SKINS, LPGENT("Style"), LPGENT("Change the look of Miranda NG according to your taste.")},
- {IDC_BTN_CLIST, TRUE, IDI_BIG_BUDDYLIST, LPGENT("Contacts"), LPGENT("Configure behaviour of your contact list.")},
+ {IDC_BTN_CLIST, TRUE, IDI_BIG_BUDDYLIST, LPGENT("Contacts"), LPGENT("Configure behavior of your contact list.")},
{IDC_BTN_MESSAGING, TRUE, IDI_BIG_MESSAGE, LPGENT("Chats"), LPGENT("Customize look&&feel of your chat windows here.")},
{IDC_BTN_IGNORE, TRUE, IDI_BIG_IGNORE, LPGENT("Ignore"), LPGENT("Ban those users and events, you are annoyed with.")},
{IDC_BTN_STATUS, TRUE, IDI_BIG_STATUS, LPGENT("Status"), LPGENT("Set your status messages and idle reporting.")},
diff --git a/plugins/NewEventNotify/src/neweventnotify.h b/plugins/NewEventNotify/src/neweventnotify.h index 6884cb121d..0a32d8652f 100644 --- a/plugins/NewEventNotify/src/neweventnotify.h +++ b/plugins/NewEventNotify/src/neweventnotify.h @@ -129,7 +129,7 @@ #define POPUP_COMMENT_FILE LPGEN("File")
#define POPUP_COMMENT_CONTACTS LPGEN("Contacts")
#define POPUP_COMMENT_ADDED LPGEN("You were added!")
-#define POPUP_COMMENT_AUTH LPGEN("Requests your authorisation")
+#define POPUP_COMMENT_AUTH LPGEN("Requests your authorization")
#define POPUP_COMMENT_WEBPAGER LPGEN("ICQ Web pager")
#define POPUP_COMMENT_EMAILEXP LPGEN("ICQ Email express")
#define POPUP_COMMENT_OTHER LPGEN("Unknown Event")
diff --git a/plugins/Popup/src/icons.cpp b/plugins/Popup/src/icons.cpp index 9412e3a66a..5c0d18e813 100644 --- a/plugins/Popup/src/icons.cpp +++ b/plugins/Popup/src/icons.cpp @@ -32,7 +32,7 @@ static IconItem iconList[] = // common popup
{ LPGEN("Popups are enabled"), ICO_POPUP_ON, IDI_POPUP },
{ LPGEN("Popups are disabled"), ICO_POPUP_OFF, IDI_NOPOPUP },
- { LPGEN("With \"favourite\" overlay"), ICO_FAV, IDI_PU_FAVOURITE },
+ { LPGEN("With \"favorite\" overlay"), ICO_FAV, IDI_PU_FAVOURITE },
{ LPGEN("With \"fullscreen\" overlay"), ICO_FULLSCREEN, IDI_PU_FULLSCREEN },
{ LPGEN("Popup History"), ICO_HISTORY, IDI_HISTORY },
diff --git a/plugins/Popup/src/srmm_menu.cpp b/plugins/Popup/src/srmm_menu.cpp index 336b389975..cf4d75738c 100644 --- a/plugins/Popup/src/srmm_menu.cpp +++ b/plugins/Popup/src/srmm_menu.cpp @@ -83,7 +83,7 @@ static int SrmmMenu_ProcessIconClick(WPARAM wParam, LPARAM lParam) HMENU hMenu = CreatePopupMenu();
AppendMenu(hMenu, MF_STRING, 1+PU_SHOWMODE_AUTO, TranslateT("Auto"));
- AppendMenu(hMenu, MF_STRING, 1+PU_SHOWMODE_FAVORITE, TranslateT("Favourite"));
+ AppendMenu(hMenu, MF_STRING, 1+PU_SHOWMODE_FAVORITE, TranslateT("Favorite"));
AppendMenu(hMenu, MF_STRING, 1+PU_SHOWMODE_FULLSCREEN, TranslateT("Ignore fullscreen"));
AppendMenu(hMenu, MF_STRING, 1+PU_SHOWMODE_BLOCK, TranslateT("Block"));
@@ -114,7 +114,7 @@ void SrmmMenu_Load() Srmm_AddIcon(&sid);
sid.dwId = 1;
- sid.szTooltip = LPGEN("Popup Mode: Favourite");
+ sid.szTooltip = LPGEN("Popup Mode: Favorite");
sid.hIcon = sid.hIconDisabled = IcoLib_GetIcon(ICO_FAV,0);
Srmm_AddIcon(&sid);
diff --git a/plugins/Scriver/res/resource.rc b/plugins/Scriver/res/resource.rc index 04a21d63d4..460fc93cd9 100644 --- a/plugins/Scriver/res/resource.rc +++ b/plugins/Scriver/res/resource.rc @@ -20,7 +20,7 @@ STYLE DS_FIXEDSYS | WS_CHILD | WS_VISIBLE EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- GROUPBOX "Behaviour",IDC_STATIC,0,0,304,176
+ GROUPBOX "Behavior",IDC_STATIC,0,0,304,176
CONTROL "Automatically pop up the window when",
IDC_AUTOPOPUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,12,
155,10
diff --git a/plugins/SimpleStatusMsg/res/resource.rc b/plugins/SimpleStatusMsg/res/resource.rc index 8b5f91b33e..9c48274f20 100644 --- a/plugins/SimpleStatusMsg/res/resource.rc +++ b/plugins/SimpleStatusMsg/res/resource.rc @@ -92,7 +92,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
- GROUPBOX "Behaviour on status change",IDC_STATIC,4,2,300,58,WS_GROUP
+ GROUPBOX "Behavior on status change",IDC_STATIC,4,2,300,58,WS_GROUP
COMBOBOX IDC_CBOPTPROTO,13,15,106,97,CBS_DROPDOWNLIST | WS_TABSTOP
PUSHBUTTON "Apply to all",IDC_BOPTPROTO,123,15,60,13
LTEXT "Max length:",IDC_MAXLENGTH,198,17,63,8
diff --git a/plugins/TabSRMM/src/eventpopups.cpp b/plugins/TabSRMM/src/eventpopups.cpp index d27087dae1..98bff873bf 100644 --- a/plugins/TabSRMM/src/eventpopups.cpp +++ b/plugins/TabSRMM/src/eventpopups.cpp @@ -70,7 +70,7 @@ static void PU_CleanUp() static void CheckForRemoveMask()
{
if (!M.GetByte(MODULE, "firsttime", 0) && (nen_options.maskActL & MASK_REMOVE || nen_options.maskActR & MASK_REMOVE || nen_options.maskActTE & MASK_REMOVE)) {
- MessageBoxA(0, Translate("One of your popup actions is set to DISMISS EVENT.\nNote that this options may have unwanted side effects as it REMOVES the event from the unread queue.\nThis may lead to events not showing up as \"new\". If you don't want this behaviour, please review the Event Notifications settings page."), "tabSRMM Warning Message", MB_OK | MB_ICONSTOP);
+ MessageBoxA(0, Translate("One of your popup actions is set to DISMISS EVENT.\nNote that this options may have unwanted side effects as it REMOVES the event from the unread queue.\nThis may lead to events not showing up as \"new\". If you don't want this behavior, please review the Event Notifications settings page."), "tabSRMM Warning Message", MB_OK | MB_ICONSTOP);
db_set_b(0, MODULE, "firsttime", 1);
}
}
diff --git a/plugins/TabSRMM/src/translator.cpp b/plugins/TabSRMM/src/translator.cpp index d386f699d5..4381448772 100644 --- a/plugins/TabSRMM/src/translator.cpp +++ b/plugins/TabSRMM/src/translator.cpp @@ -92,7 +92,7 @@ TOptionListGroup m_lvGroupsNEN[] = { };
TOptionListGroup m_lvGroupsMsg[] = {
- 0, LPGENT("Message window behaviour"),
+ 0, LPGENT("Message window behavior"),
0, LPGENT("Sending messages"),
0, LPGENT("Other options"),
0, NULL
diff --git a/plugins/TipperYM/res/resource.rc b/plugins/TipperYM/res/resource.rc index 9eedb29634..7b64e7967e 100644 --- a/plugins/TipperYM/res/resource.rc +++ b/plugins/TipperYM/res/resource.rc @@ -218,7 +218,7 @@ BEGIN CONTROL "Handle tray tooltips by Tipper",IDC_CHK_HANDLEBYTIPPER,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,25,142,10
CONTROL "",IDC_TREE_SECOND_ITEMS,"SysTreeView32",TVS_NOTOOLTIPS | TVS_NOHSCROLL | WS_BORDER | WS_TABSTOP,161,133,120,72
- PUSHBUTTON "Favourite contacts",IDC_BTN_FAVCONTACTS,93,218,113,12
+ PUSHBUTTON "Favorite contacts",IDC_BTN_FAVCONTACTS,93,218,113,12
CONTROL "Expand to second level after:",IDC_CHK_EXPAND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,162,14,128,10
EDITTEXT IDC_ED_EXPANDTIME,171,29,37,12,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER,WS_EX_RIGHT
CONTROL "",IDC_SPIN_EXPANDTIME,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,198,28,11,12
@@ -233,7 +233,7 @@ END IDD_FAVCONTACTS DIALOGEX 0, 0, 140, 213
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Favourite contacts"
+CAPTION "Favorite contacts"
FONT 8, "Tahoma", 400, 0, 0xEE
BEGIN
DEFPUSHBUTTON "OK",IDC_BTN_OK,74,192,50,14
diff --git a/plugins/TipperYM/src/options.cpp b/plugins/TipperYM/src/options.cpp index f5d3512084..6a8ee4e2c9 100644 --- a/plugins/TipperYM/src/options.cpp +++ b/plugins/TipperYM/src/options.cpp @@ -1358,7 +1358,7 @@ INT_PTR CALLBACK DlgProcOptsAppearance(HWND hwndDlg, UINT msg, WPARAM wParam, LP SendDlgItemMessage(hwndDlg, IDC_CMB_POS, CB_SETCURSEL, (int)opt.pos, 0);
SendDlgItemMessage(hwndDlg, IDC_CMB_LV, CB_ADDSTRING, 0, (LPARAM)TranslateT("Top"));
- SendDlgItemMessage(hwndDlg, IDC_CMB_LV, CB_ADDSTRING, 0, (LPARAM)TranslateT("Centre"));
+ SendDlgItemMessage(hwndDlg, IDC_CMB_LV, CB_ADDSTRING, 0, (LPARAM)TranslateT("Center"));
SendDlgItemMessage(hwndDlg, IDC_CMB_LV, CB_ADDSTRING, 0, (LPARAM)TranslateT("Bottom"));
switch (opt.iLabelValign)
{
@@ -1368,7 +1368,7 @@ INT_PTR CALLBACK DlgProcOptsAppearance(HWND hwndDlg, UINT msg, WPARAM wParam, LP }
SendDlgItemMessage(hwndDlg, IDC_CMB_VV, CB_ADDSTRING, 0, (LPARAM)TranslateT("Top"));
- SendDlgItemMessage(hwndDlg, IDC_CMB_VV, CB_ADDSTRING, 0, (LPARAM)TranslateT("Centre"));
+ SendDlgItemMessage(hwndDlg, IDC_CMB_VV, CB_ADDSTRING, 0, (LPARAM)TranslateT("Center"));
SendDlgItemMessage(hwndDlg, IDC_CMB_VV, CB_ADDSTRING, 0, (LPARAM)TranslateT("Bottom"));
switch (opt.iValueValign)
{
diff --git a/plugins/TipperYM/src/options.h b/plugins/TipperYM/src/options.h index 86276ae026..32c2009b8a 100644 --- a/plugins/TipperYM/src/options.h +++ b/plugins/TipperYM/src/options.h @@ -86,7 +86,7 @@ static TCHAR* trayTipItems[TRAYTIP_ITEMS_COUNT] = LPGENT("Status message"),
LPGENT("Extra status"),
LPGENT("Listening to"),
- LPGENT("Favourite contacts"),
+ LPGENT("Favorite contacts"),
LPGENT("Miranda uptime"),
LPGENT("Clist event")
};
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) {
diff --git a/src/core/stdclist/res/resource.rc b/src/core/stdclist/res/resource.rc index acc6d9d114..74d0230965 100644 --- a/src/core/stdclist/res/resource.rc +++ b/src/core/stdclist/res/resource.rc @@ -171,7 +171,7 @@ BEGIN CONTROL "Spin1",IDC_ROWHEIGHTSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,240,176,10,14
LTEXT "pixels",IDC_STATIC,250,178,54,8
CONTROL "Gamma correction",IDC_GAMMACORRECT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,164,190,140,10
- CONTROL "Grey out entire list when:",IDC_GREYOUT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,164,202,139,10
+ CONTROL "Gray out entire list when:",IDC_GREYOUT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,164,202,139,10
CONTROL "Tree1",IDC_GREYOUTOPTS,"SysTreeView32",TVS_DISABLEDRAGDROP | TVS_NOTOOLTIPS | WS_BORDER | WS_HSCROLL | WS_TABSTOP,164,212,141,32
END
diff --git a/src/core/stdfile/filerecvdlg.cpp b/src/core/stdfile/filerecvdlg.cpp index c5dba47f70..75139e7afd 100644 --- a/src/core/stdfile/filerecvdlg.cpp +++ b/src/core/stdfile/filerecvdlg.cpp @@ -388,7 +388,7 @@ INT_PTR CALLBACK DlgProcRecvFile(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l break;
case IDCANCEL:
- if (dat->fs) CallContactService(dat->hContact, PSS_FILEDENYT, (WPARAM)dat->fs, (LPARAM)TranslateT("Cancelled"));
+ if (dat->fs) CallContactService(dat->hContact, PSS_FILEDENYT, (WPARAM)dat->fs, (LPARAM)TranslateT("Canceled"));
dat->fs = NULL; /* the protocol will free the handle */
DestroyWindow(hwndDlg);
break;
diff --git a/src/core/stdfile/filexferdlg.cpp b/src/core/stdfile/filexferdlg.cpp index e53c832563..6ab057b167 100644 --- a/src/core/stdfile/filexferdlg.cpp +++ b/src/core/stdfile/filexferdlg.cpp @@ -529,7 +529,7 @@ INT_PTR CALLBACK DlgProcFileTransfer(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR case ACKRESULT_CONNECTPROXY: SetFtStatus(hwndDlg, LPGENT("Connecting to proxy..."), FTS_TEXT); break;
case ACKRESULT_CONNECTED: SetFtStatus(hwndDlg, LPGENT("Connected"), FTS_TEXT); break;
case ACKRESULT_LISTENING: SetFtStatus(hwndDlg, LPGENT("Waiting for connection..."), FTS_TEXT); break;
- case ACKRESULT_INITIALISING: SetFtStatus(hwndDlg, LPGENT("Initialising..."), FTS_TEXT); break;
+ case ACKRESULT_INITIALISING: SetFtStatus(hwndDlg, LPGENT("Initializing..."), FTS_TEXT); break;
case ACKRESULT_NEXTFILE:
SetFtStatus(hwndDlg, LPGENT("Moving to next file..."), FTS_TEXT);
SetDlgItemTextA(hwndDlg, IDC_FILENAME, "");
diff --git a/src/core/stdmsg/res/resource.rc b/src/core/stdmsg/res/resource.rc index 8a48731cbf..f97e42701d 100644 --- a/src/core/stdmsg/res/resource.rc +++ b/src/core/stdmsg/res/resource.rc @@ -175,7 +175,7 @@ BEGIN CONTROL "Limit avatar height to",IDC_LIMITAVATARH,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,236,166,26,10
EDITTEXT IDC_AVATARHEIGHT,242,178,12,13,ES_AUTOHSCROLL | NOT WS_VISIBLE
LTEXT "pixels",IDC_STATIC,271,177,8,8,NOT WS_VISIBLE
- LTEXT "Message window behaviour:",IDC_TXT_TITLE1,1,0,183,8
+ LTEXT "Message window behavior:",IDC_TXT_TITLE1,1,0,183,8
LTEXT "Messaging:",IDC_TXT_TITLE3,1,64,368,8
END
|