English US correction (patch by RMN)

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

21 files changed, 41 insertions, 40 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.]