langpacks/english: updated

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

32 files changed, 89 insertions, 92 deletions

diff --git a/langpacks/english/Plugins/AdvancedAutoAway.txt b/langpacks/english/Plugins/AdvancedAutoAway.txt
index d0ec430e76..f803a30d21 100644
--- a/langpacks/english/Plugins/AdvancedAutoAway.txt
+++ b/langpacks/english/Plugins/AdvancedAutoAway.txt
@@ -63,17 +63,17 @@
 [Automatically dial on startup]

 [Automatically hang up on exit]

 [Dial-up (experimental)]

-[Background colour]

-[Text colour]

-[Use Windows colours]

-[Use default colours]

+[Background color]

+[Text color]

+[Use Windows colors]

+[Use default colors]

 [Delay]

 [On left click]

 [On right click]

 [Do nothing]

 [Close popup]

 [Cancel reconnecting]

-[Colours]

+[Colors]

 [Preview]

 [Events]

 [Show when connection is lost]

diff --git a/langpacks/english/Plugins/AvatarHistory.txt b/langpacks/english/Plugins/AvatarHistory.txt
index 73322a9e02..95df156ec4 100644
--- a/langpacks/english/Plugins/AvatarHistory.txt
+++ b/langpacks/english/Plugins/AvatarHistory.txt
@@ -22,11 +22,11 @@
 [Enable tracking for these protocols:]

 [MetaContacts have special handling: the info is always copied from subcontacts (notifications from a meta are ignored)]

 [Show popup when a contact change his avatar]

-[Colours]

-[Background colour]

-[Text colour]

-[Use Windows colours]

-[Use default colours]

+[Colors]

+[Background color]

+[Text color]

+[Use Windows colors]

+[Use default colors]

 [Delay]

 [From Popup plugin]

 [Custom]

diff --git a/langpacks/english/Plugins/ChangeKeyboardLayout.txt b/langpacks/english/Plugins/ChangeKeyboardLayout.txt
index d52186a5d1..721f749d1b 100644
--- a/langpacks/english/Plugins/ChangeKeyboardLayout.txt
+++ b/langpacks/english/Plugins/ChangeKeyboardLayout.txt
@@ -25,10 +25,10 @@
 [Leave as it is]

 [Set Caps Lock state when inverting lettercase:]

 [Change active keyboard layout in system]

-[Colours]

-[Popup colours]

-[Windows colours]

-[Custom colours]

+[Colors]

+[Popup colors]

+[Windows colors]

+[Custom colors]

 [Back]

 [Text]

 [Timeout]

diff --git a/langpacks/english/Plugins/ClientChangeNotify.txt b/langpacks/english/Plugins/ClientChangeNotify.txt
index 07155db072..76f5d52e8c 100644
--- a/langpacks/english/Plugins/ClientChangeNotify.txt
+++ b/langpacks/english/Plugins/ClientChangeNotify.txt
@@ -24,7 +24,7 @@
 [Sec]

 [0 = Default]

 [-1 = Infinite]

-[Colours]

+[Colors]

 [Background]

 [Use default]

 [Text]

diff --git a/langpacks/english/Plugins/Clist_modern.txt b/langpacks/english/Plugins/Clist_modern.txt
index f5966d4a7b..bcf4f8391b 100644
--- a/langpacks/english/Plugins/Clist_modern.txt
+++ b/langpacks/english/Plugins/Clist_modern.txt
@@ -31,8 +31,8 @@
 [Show protocol names]

 [Show status text]

 [Settings]

-[Background colour:]

-[Selection colour:]

+[Background color:]

+[Selection color:]

 [Use background bitmap]

 [Stretch to width]

 [Stretch to height]

@@ -55,7 +55,7 @@
 [Paste]

 [Object properties]

 [Type]

-[Colour]

+[Color]

 [Alpha]

 [Image file and fitting mode]

 [File]

@@ -351,7 +351,7 @@
 [Contact names]

 [Row Items]

 [Frame texts]

-[Special colours]

+[Special colors]

 [Standard contacts]

 [Away contacts]

 [DND contacts]

@@ -383,7 +383,7 @@
 [Selected menu text]

 [Frame title text]

 [Statusbar text]

-[3rd party frames transparent back colour]

+[3rd party frames transparent back color]

 [General]

 [List]

 [Window]

diff --git a/langpacks/english/Plugins/Clist_mw.txt b/langpacks/english/Plugins/Clist_mw.txt
index 6d04425f0f..e0cccfba7d 100644
--- a/langpacks/english/Plugins/Clist_mw.txt
+++ b/langpacks/english/Plugins/Clist_mw.txt
@@ -8,8 +8,8 @@
 [Displays contacts, event notifications, protocol status with MW modifications.]

 ;file \plugins\Clist_mw\res\resource.rc

 [Settings]

-[Background colour:]

-[Selection colour:]

+[Background color:]

+[Selection color:]

 [Use background bitmap]

 [Stretch to width]

 [Stretch to height]

diff --git a/langpacks/english/Plugins/Clist_nicer.txt b/langpacks/english/Plugins/Clist_nicer.txt
index bd3b609700..20641607f9 100644
--- a/langpacks/english/Plugins/Clist_nicer.txt
+++ b/langpacks/english/Plugins/Clist_nicer.txt
@@ -139,8 +139,8 @@
 [Hide vertical scroll bar]

 [Grey out entire list when:]

 [Contact List Background]

-[Use Windows colours]

-[Background colour]

+[Use Windows colors]

+[Background color]

 [Use background image]

 [Stretch to width]

 [Stretch to height]

diff --git a/langpacks/english/Plugins/ConnectionNotify.txt b/langpacks/english/Plugins/ConnectionNotify.txt
index 92f1a6003b..e494d82a76 100644
--- a/langpacks/english/Plugins/ConnectionNotify.txt
+++ b/langpacks/english/Plugins/ConnectionNotify.txt
@@ -7,7 +7,7 @@
 ;============================================================

 [Notify with popup if some connection established]

 ;file \plugins\ConnectionNotify\res\ConnectionNotify.rc

-[Set popup colours]

+[Set popup colors]

 [Popup options]

 [Background]

 [Text]

diff --git a/langpacks/english/Plugins/DbEditorPP.txt b/langpacks/english/Plugins/DbEditorPP.txt
index 7db421bbec..b5c853020f 100644
--- a/langpacks/english/Plugins/DbEditorPP.txt
+++ b/langpacks/english/Plugins/DbEditorPP.txt
@@ -32,7 +32,7 @@
 [Put a space or comma between each module name]

 [Changes to this list will take effect next time miranda starts]

 [Popup timeout (0 for infinite)]

-[Background colour]

+[Background color]

 [If the module name has a space in it, put a \\ before the space. eg "aaa\\ bbb"]

 [Add a module to contact]

 [Add a module named]

diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt
index 64ad26e507..7b3d5b39b5 100644
--- a/langpacks/english/Plugins/Facebook.txt
+++ b/langpacks/english/Plugins/Facebook.txt
@@ -105,6 +105,7 @@
 [User sent you %s:]

 [Message read: %s by %s]

 [Message read: %s]

+[%s and more (%d)]

 ;file \protocols\FacebookRM\src\messages.cpp

 [You cannot send messages when you are offline.]

 ;file \protocols\FacebookRM\src\process.cpp

diff --git a/langpacks/english/Plugins/FltContacts.txt b/langpacks/english/Plugins/FltContacts.txt
index e7a4d13188..9b4247a7d4 100644
--- a/langpacks/english/Plugins/FltContacts.txt
+++ b/langpacks/english/Plugins/FltContacts.txt
@@ -32,7 +32,7 @@
 [Left-top edge's color:]

 [Right-bottom edge's color:]

 [Background]

-[Background colour:]

+[Background color:]

 [Use background bitmap]

 [Stretch to width]

 [Stretch to height]

diff --git a/langpacks/english/Plugins/ICQ.txt b/langpacks/english/Plugins/ICQ.txt
index 8593e05c6c..b3fb6eca7d 100644
--- a/langpacks/english/Plugins/ICQ.txt
+++ b/langpacks/english/Plugins/ICQ.txt
@@ -94,7 +94,7 @@
 [&Use Windows colors]

 [Use system &icons]

 [Previe&w]

-[Use default colours]

+[Use default colors]

 [UIN:]

 [External IP:]

 [Internal IP:]

diff --git a/langpacks/english/Plugins/KeepStatus.txt b/langpacks/english/Plugins/KeepStatus.txt
index 98bff1f385..7970a9cce2 100644
--- a/langpacks/english/Plugins/KeepStatus.txt
+++ b/langpacks/english/Plugins/KeepStatus.txt
@@ -63,17 +63,17 @@
 [Automatically dial on startup]

 [Automatically hang up on exit]

 [Dial-up (experimental)]

-[Background colour]

-[Text colour]

-[Use Windows colours]

-[Use default colours]

+[Background color]

+[Text color]

+[Use Windows colors]

+[Use default colors]

 [Delay]

 [On left click]

 [On right click]

 [Do nothing]

 [Close popup]

 [Cancel reconnecting]

-[Colours]

+[Colors]

 [Preview]

 [Events]

 [Show when connection is lost]

diff --git a/langpacks/english/Plugins/LinkList.txt b/langpacks/english/Plugins/LinkList.txt
index 5ca03aac5e..eb12b727bf 100644
--- a/langpacks/english/Plugins/LinkList.txt
+++ b/langpacks/english/Plugins/LinkList.txt
@@ -20,14 +20,14 @@
 [Web addresses only]

 [Deep search]

 [Static]

-[Colour Select]

+[Color Select]

 [Incoming messages]

 [Plugin Default]

 [Preview]

 [Outgoing messages]

-[Backgroundcolour]

+[Background color]

 [Use Miranda Settings]

-[Textcolour]

+[Text color]

 [General Settings]

 [Open links always in a new window]

 [Update list on new events]

diff --git a/langpacks/english/Plugins/LotusNotify.txt b/langpacks/english/Plugins/LotusNotify.txt
index 582a953d9d..62657c1053 100644
--- a/langpacks/english/Plugins/LotusNotify.txt
+++ b/langpacks/english/Plugins/LotusNotify.txt
@@ -9,7 +9,7 @@
 ;file \plugins\LotusNotify\res\LotusNotify.rc

 [Show again if still unread]

 [Show error messages]

-[Set popup colours]

+[Set popup colors]

 [Popup options]

 [Background]

 [Text]

diff --git a/langpacks/english/Plugins/MRA.txt b/langpacks/english/Plugins/MRA.txt
index 0f33d10e21..ff4e244827 100644
--- a/langpacks/english/Plugins/MRA.txt
+++ b/langpacks/english/Plugins/MRA.txt
@@ -24,7 +24,7 @@
 [Click to Inbox]

 [Show received formatted text (receive RTF)]

 [Send formatted text (send RTF)]

-[Background colour]

+[Background color]

 [Font]

 [Summary]

 [Nickname:]

diff --git a/langpacks/english/Plugins/NewXstatusNotify.txt b/langpacks/english/Plugins/NewXstatusNotify.txt
index 3bacb331be..a9deeb80d3 100644
--- a/langpacks/english/Plugins/NewXstatusNotify.txt
+++ b/langpacks/english/Plugins/NewXstatusNotify.txt
@@ -48,10 +48,10 @@
 [Enable all]

 [Background]

 [Text]

-[Colours]

-[Use custom colours]

-[Use Windows colours]

-[Use Popup colours]

+[Colors]

+[Use custom colors]

+[Use Windows colors]

+[Use Popup colors]

 [Popup text]

 [Read status message]

 [Show previous status too]

diff --git a/langpacks/english/Plugins/New_GPG.txt b/langpacks/english/Plugins/New_GPG.txt
index 227f02de08..c4469792f9 100644
--- a/langpacks/english/Plugins/New_GPG.txt
+++ b/langpacks/english/Plugins/New_GPG.txt
@@ -189,7 +189,6 @@
 [Where is no public or private key.]

 ;file \plugins\New_GPG\src\utilities.cpp

 [Do you want to toggle encryption for all subcontacts ?]

-[Send publick key]

 [Target file exists, do you want to replace it ?]

 [Capability to decrypt file not found on other side\nRecipient may be unable to decrypt file(s)\nDo you want to encrypt file(s) anyway?]

 [Filetransfer warning]

diff --git a/langpacks/english/Plugins/PackUpdater.txt b/langpacks/english/Plugins/PackUpdater.txt
index 5186d40d77..87a129f146 100644
--- a/langpacks/english/Plugins/PackUpdater.txt
+++ b/langpacks/english/Plugins/PackUpdater.txt
@@ -29,10 +29,10 @@
 [Message boxes (*)]

 [Back]

 [Text]

-[Colours]

+[Colors]

 [Use cus&tom colors]

-[Use &Windows colours]

-[Use Pop&up colours]

+[Use &Windows colors]

+[Use Pop&up colors]

 [Preview]

 [Click action]

 [On left click]

diff --git a/langpacks/english/Plugins/Ping.txt b/langpacks/english/Plugins/Ping.txt
index cab0c02de7..6b54de0257 100644
--- a/langpacks/english/Plugins/Ping.txt
+++ b/langpacks/english/Plugins/Ping.txt
@@ -21,7 +21,7 @@
 [Browse...]

 [Interface]

 [Do not change icon when testing]

-[Use the Customize/Fonts options to change text size and colour.]

+[Use the Customize/Fonts options to change text size and color.]

 [Indent:]

 [Row height:]

 [Repeats for success/failure:]

diff --git a/langpacks/english/Plugins/PluginUpdater.txt b/langpacks/english/Plugins/PluginUpdater.txt
index cbe79582c8..845d10929b 100644
--- a/langpacks/english/Plugins/PluginUpdater.txt
+++ b/langpacks/english/Plugins/PluginUpdater.txt
@@ -32,10 +32,10 @@
 [Progress dialogs]

 [Back]

 [Text]

-[Colours]

+[Colors]

 [Use cus&tom colors]

-[Use &Windows colours]

-[Use Pop&up colours]

+[Use &Windows colors]

+[Use Pop&up colors]

 [Preview]

 [Click action]

 [On left click]

diff --git a/langpacks/english/Plugins/Popup.txt b/langpacks/english/Plugins/Popup.txt
index 8d9373b6c2..94bbb7ca80 100644
--- a/langpacks/english/Plugins/Popup.txt
+++ b/langpacks/english/Plugins/Popup.txt
@@ -197,7 +197,7 @@
 [Drop shadow effect]

 [non rectangular]

 [Enable Aero Glass (Vista+)]

-[Use Windows colours]

+[Use Windows colors]

 [Use advanced text render]

 [Global settings]

 [Refresh List]

diff --git a/langpacks/english/Plugins/Quotes.txt b/langpacks/english/Plugins/Quotes.txt
index d5edc2fd84..81d85c4a30 100644
--- a/langpacks/english/Plugins/Quotes.txt
+++ b/langpacks/english/Plugins/Quotes.txt
@@ -38,11 +38,11 @@
 [Get data from:]

 [Filter:]

 [Popup Window Settings]

-[Colours]

-[Use default colours]

-[Use user-defined colours]

-[Background colour]

-[Text colour]

+[Colors]

+[Use default colors]

+[Use user-defined colors]

+[Background color]

+[Text color]

 [Delay]

 [From Popup plugin]

 [Custom]

diff --git a/langpacks/english/Plugins/Scriver.txt b/langpacks/english/Plugins/Scriver.txt
index c2a17f83b1..e17b6c8873 100644
--- a/langpacks/english/Plugins/Scriver.txt
+++ b/langpacks/english/Plugins/Scriver.txt
@@ -121,8 +121,8 @@
 [kB]

 [Group Chat]

 [Use same style as in the message log]

-[Use default colours]

-[Use custom colours]

+[Use default colors]

+[Use custom colors]

 [Text]

 [Background]

 [Timeout (s)]

@@ -177,8 +177,8 @@
 [Outgoing message (10x10)]

 [Notice (10x10)]

 [Window Icon]

-[Text colour]

-[Background colour]

+[Text color]

+[Background color]

 [Bold]

 [Italics]

 [Underlined]

@@ -389,7 +389,7 @@
 [Add ':' to auto-completed names]

 [Prefix all events with a timestamp]

 [Only prefix with timestamp if it has changed]

-[Timestamp has same colour as event]

+[Timestamp has same color as event]

 [Indent the second line of a message]

 [Limit user names to 20 characters]

 [Strip colors from messages]

@@ -491,8 +491,6 @@
 ;file \plugins\Scriver\src\chat\window.cpp

 [Italic]

 [Underline]

-[Text color]

-[Background color]

 [Filter]

 [Manager]

 [Nick list]

diff --git a/langpacks/english/Plugins/StartupStatus.txt b/langpacks/english/Plugins/StartupStatus.txt
index 1ce93e16b3..c6e26d2b25 100644
--- a/langpacks/english/Plugins/StartupStatus.txt
+++ b/langpacks/english/Plugins/StartupStatus.txt
@@ -63,17 +63,17 @@
 [Automatically dial on startup]

 [Automatically hang up on exit]

 [Dial-up (experimental)]

-[Background colour]

-[Text colour]

-[Use Windows colours]

-[Use default colours]

+[Background color]

+[Text color]

+[Use Windows colors]

+[Use default colors]

 [Delay]

 [On left click]

 [On right click]

 [Do nothing]

 [Close popup]

 [Cancel reconnecting]

-[Colours]

+[Colors]

 [Preview]

 [Events]

 [Show when connection is lost]

diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index 87b088f4ea..33eb6c2aa1 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -252,8 +252,8 @@
 [...is &typing]

 [...stopped t&yping]

 [Back]

-[U&se Popup colours]

-[&Use Windows colours]

+[U&se Popup colors]

+[&Use Windows colors]

 [Only &one popup for each contact]

 [Show &entry in the main menu]

 [...is typing]

@@ -745,7 +745,7 @@
 [Font face]

 [Font color]

 [Format strike-through]

-[Background colour]

+[Background color]

 [Room settings]

 [Event filter]

 [Nick list]

@@ -944,7 +944,6 @@
 [Open chat window]

 ;file \plugins\TabSRMM\src\chat\colorchooser.cpp

 [Text color]

-[Background color]

 ;file \plugins\TabSRMM\src\chat\log.cpp

 [%s has joined]

 [You have joined %s]

diff --git a/langpacks/english/Plugins/Tlen.txt b/langpacks/english/Plugins/Tlen.txt
index 9456140ee4..e22429ba75 100644
--- a/langpacks/english/Plugins/Tlen.txt
+++ b/langpacks/english/Plugins/Tlen.txt
@@ -37,7 +37,7 @@
 [Proxy requires authorization]

 [Mail Notification]

 [Enable incoming mail notification]

-[Colours]

+[Colors]

 [Background]

 [Text]

 [Delay]

diff --git a/langpacks/english/Plugins/TrafficCounter.txt b/langpacks/english/Plugins/TrafficCounter.txt
index e1de7f87aa..b17391e088 100644
--- a/langpacks/english/Plugins/TrafficCounter.txt
+++ b/langpacks/english/Plugins/TrafficCounter.txt
@@ -15,8 +15,8 @@
 [Notify me on every]

 [kilobytes]

 [minutes]

-[Background colour:]

-[Text colour:]

+[Background color:]

+[Text color:]

 [Reset to default]

 [Popup timeout]

 [From Popup plugin]

diff --git a/langpacks/english/Plugins/UInfoEx.txt b/langpacks/english/Plugins/UInfoEx.txt
index 68ea484dec..17b1d96dfa 100644
--- a/langpacks/english/Plugins/UInfoEx.txt
+++ b/langpacks/english/Plugins/UInfoEx.txt
@@ -66,18 +66,18 @@
 [Automatically backup and keep protocol based birthdays up to date]

 [Play sound]

 [Use ignore list]

-[Birthday popup colours]

+[Birthday popup colors]

 [r]

-[Background colour]

-[Text colour]

-[Use Windows colours]

-[Use default colours]

+[Background color]

+[Text color]

+[Use Windows colors]

+[Use default colors]

 [Delay]

 [From Popup plugin]

 [Custom]

 [Permanent]

 [Show reminder messages as popups (if reminder is enabled)]

-[Anniversary popup colours]

+[Anniversary popup colors]

 [Replace progress dialogs with popups]

 [Replace message boxes with popups]

 [Preview]

@@ -115,12 +115,12 @@
 [Custom information]

 [Overwritten information]

 [Changed information]

-[Enable colours to give information about information's status.]

+[Enable colors to give information about information's status.]

 [Make protocol based contact information readonly.]

 [Enable groups in details dialog's treeview.]

 [Sort all tree items alphabetically.]

 [Info of a MetaContact's SubContact]

-[Colours]

+[Colors]

 [Common]

 [Change my ICQ details with UserInfoEx. (Disabled if ICQ doesn't support it)]

 [TreeView]

diff --git a/langpacks/english/Plugins/Weather.txt b/langpacks/english/Plugins/Weather.txt
index be6fd42b2e..ed28b13eb4 100644
--- a/langpacks/english/Plugins/Weather.txt
+++ b/langpacks/english/Plugins/Weather.txt
@@ -71,10 +71,10 @@
 [Popup Options]

 [Enable popups]

 [Popup only when condition changes]

-[Colours]

-[Background colour]

-[Text colour]

-[Use Windows colours]

+[Colors]

+[Background color]

+[Text color]

+[Use Windows colors]

 [Popup Actions]

 [Left Click]

 [Right Click]

diff --git a/langpacks/english/Plugins/YAMN.txt b/langpacks/english/Plugins/YAMN.txt
index e144903dd1..732471a810 100644
--- a/langpacks/english/Plugins/YAMN.txt
+++ b/langpacks/english/Plugins/YAMN.txt
@@ -75,7 +75,7 @@
 [Popup]

 [Single popup]

 [Multi popup]

-[Use custom colour]

+[Use custom color]

 [No new mail notifications]

 [Popup if no mail]

 [Persistant message]

@@ -83,8 +83,8 @@
 [Popup notification if failed]

 [..s Popup duration]

 [Preview]

-[Background colour]

-[Text colour]

+[Background color]

+[Text color]

 ;file \plugins\YAMN\src\main.cpp

 [Check &mail (All Account)]

 [Check &mail (This Account)]

diff --git a/langpacks/english/Plugins/YAPP.txt b/langpacks/english/Plugins/YAPP.txt
index 8c03d3036c..665ac0c548 100644
--- a/langpacks/english/Plugins/YAPP.txt
+++ b/langpacks/english/Plugins/YAPP.txt
@@ -29,8 +29,8 @@
 [Text indent:]

 [Padding:]

 [Round corners (avatar)]

-[Text colour:]

-[Background colour:]

+[Text color:]

+[Background color:]

 [Set timeout]

 [Timeout value (0 = default):]

 ;file \plugins\YAPP\src\icons.cpp