- langpacks/english: updated

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

54 files changed, 121 insertions, 135 deletions

diff --git a/langpacks/english/Plugins/AIM.txt b/langpacks/english/Plugins/AIM.txt
index 6d4b867ccb..a47c8fcb58 100644
--- a/langpacks/english/Plugins/AIM.txt
+++ b/langpacks/english/Plugins/AIM.txt
@@ -155,7 +155,6 @@
 [[Auto-Response]:]

 [Contact tried to open an audio/video conference (currently not supported)]

 [No information has been provided by the server.]

-[Successfully removed buddy from list.]

 [Item you want to delete not found in list.]

 [Failed to add buddy to list: Item already exist.]

 [Error adding buddy(invalid id?, already in list?)]

@@ -163,7 +162,6 @@
 [Error? Attempting to add ICQ contact to an AIM list.]

 [Cannot add this buddy because it requires authorization.]

 [Unknown error when adding buddy to list. Error code %#x]

-[Successfully modified group.]

 [Item you want to modify not found in list.]

 [Unknown error when attempting to modify a group. Error code %#x]

 [You've got mail! Checked at]

diff --git a/langpacks/english/Plugins/AdvancedAutoAway.txt b/langpacks/english/Plugins/AdvancedAutoAway.txt
index e3732aceff..b2dc6bcc79 100644
--- a/langpacks/english/Plugins/AdvancedAutoAway.txt
+++ b/langpacks/english/Plugins/AdvancedAutoAway.txt
@@ -53,8 +53,10 @@
 [ms]

 [Set after]

 [Timeout]

+[s]

 [Set window location]

 [Set window size]

+[x]

 [Allow override]

 [Note: status profiles can be created in the 'Status Profiles' options screen]

 [Window on startup]

diff --git a/langpacks/english/Plugins/Alarms.txt b/langpacks/english/Plugins/Alarms.txt
index cb63962fd2..cf7a2fb2f7 100644
--- a/langpacks/english/Plugins/Alarms.txt
+++ b/langpacks/english/Plugins/Alarms.txt
@@ -57,7 +57,6 @@
 [Dismiss]

 [Snooze]

 [Static]

-[...]

 [Reminder Frame Context]

 [&Suspend]

 [&Edit...]

diff --git a/langpacks/english/Plugins/AssocMgr.txt b/langpacks/english/Plugins/AssocMgr.txt
index cf6a8acf55..485d32b48e 100644
--- a/langpacks/english/Plugins/AssocMgr.txt
+++ b/langpacks/english/Plugins/AssocMgr.txt
@@ -43,6 +43,3 @@
 [MSN Link Protocol]

 [Gadu-Gadu Link Protocol]

 [Jabber Link Protocol]

-[Testing Service]

-[Miranda Installer Package (demo purpose)]

-[&Install]

diff --git a/langpacks/english/Plugins/BasicHistory.txt b/langpacks/english/Plugins/BasicHistory.txt
index 119c7f4277..fdcac7e07a 100644
--- a/langpacks/english/Plugins/BasicHistory.txt
+++ b/langpacks/english/Plugins/BasicHistory.txt
@@ -18,7 +18,6 @@
 [Delete filter]

 [Add event]

 [Delete event]

-[...]

 [WinSCP path]

 [WinSCP log path]

 [New messages on top]

diff --git a/langpacks/english/Plugins/Boltun.txt b/langpacks/english/Plugins/Boltun.txt
index 01c4074cce..ea2a78e675 100644
--- a/langpacks/english/Plugins/Boltun.txt
+++ b/langpacks/english/Plugins/Boltun.txt
@@ -21,7 +21,6 @@
 [Typing time (for a message of 4 words):]

 [Thinking time:]

 [Engine]

-[...]

 [Base of remarks]

 [Reload]

 [Stay silent, if have no good aswers]

diff --git a/langpacks/english/Plugins/Clist_blind.txt b/langpacks/english/Plugins/Clist_blind.txt
index 5cca476448..a286db92e6 100644
--- a/langpacks/english/Plugins/Clist_blind.txt
+++ b/langpacks/english/Plugins/Clist_blind.txt
@@ -59,7 +59,6 @@
 [Transparent contact list]

 [Inactive opacity:]

 [Active opacity:]

-[000%]

 [Show menu bar]

 [Easy move]

 [Show title bar]

@@ -88,7 +87,6 @@
 [Make sections equal width]

 [Show bevels on panels]

 [Show resize grip indicator]

-[&¤]

 [E&xit]

 [&Status]

 [&Offline\tCtrl+0]

diff --git a/langpacks/english/Plugins/Clist_modern.txt b/langpacks/english/Plugins/Clist_modern.txt
index dbc186e6a0..9ae55067ed 100644
--- a/langpacks/english/Plugins/Clist_modern.txt
+++ b/langpacks/english/Plugins/Clist_modern.txt
@@ -23,7 +23,6 @@
 [Fade contact list in/out]

 [Transparent contact list]

 [Inactive opacity:]

-[000%]

 [Active opacity:]

 [Show Avatars]

 [Animate Avatars]

@@ -35,7 +34,6 @@
 [Background colour:]

 [Selection colour:]

 [Use background bitmap]

-[...]

 [Stretch to width]

 [Stretch to height]

 [Tile horizontally]

@@ -306,7 +304,6 @@
 [Move up]

 [Move down]

 [OPTION PAGE IS UNDER CONSTRUCTION Please DO NOT notice about any issues here.\n Only high-level design comments are applicable.]

-[&¤]

 [E&xit]

 [&Status]

 [&Offline\tCtrl+0]

diff --git a/langpacks/english/Plugins/Clist_mw.txt b/langpacks/english/Plugins/Clist_mw.txt
index d399c5a40f..31f0665fb0 100644
--- a/langpacks/english/Plugins/Clist_mw.txt
+++ b/langpacks/english/Plugins/Clist_mw.txt
@@ -11,7 +11,6 @@
 [Background colour:]

 [Selection colour:]

 [Use background bitmap]

-[...]

 [Stretch to width]

 [Stretch to height]

 [Tile horizontally]

@@ -77,7 +76,6 @@
 [Transparent contact list]

 [Inactive opacity:]

 [Active opacity:]

-[000%]

 [Show menu bar]

 [Easy move]

 [Show title bar]

@@ -125,7 +123,6 @@
 [Show bevel effect on panels]

 [Use connecting Icon]

 [Use New Drawer for StatusBar]

-[&¤]

 [E&xit]

 [&Status]

 [&Offline\tCtrl+0]

diff --git a/langpacks/english/Plugins/Clist_nicer.txt b/langpacks/english/Plugins/Clist_nicer.txt
index 5d1937d90f..3f23257eeb 100644
--- a/langpacks/english/Plugins/Clist_nicer.txt
+++ b/langpacks/english/Plugins/Clist_nicer.txt
@@ -22,7 +22,6 @@
 [Only show contact floaters when contact list is hidden or minimized]

 [Padding]

 [Enable floating contacts (required restart)]

-[000%]

 [Opacity]

 [Width]

 [Snap to edges (hold CTRL for snap between floaters)]

@@ -164,7 +163,6 @@
 [Use Windows colours]

 [Background colour]

 [Use background image]

-[...]

 [Stretch to width]

 [Stretch to height]

 [Tile horizontally]

@@ -247,7 +245,6 @@
 [Show 2nd line:]

 [Draw overlay icon on avatar]

 [Show local time]

-[&¤]

 [E&xit]

 [&Status]

 [&Offline\tCtrl+0]

@@ -314,7 +311,6 @@
 [Sunken]

 [Bumped]

 [Etched]

-[Image items]

 ;file \plugins\Clist_nicer\src\CLCButton.cpp

 [Show menu]

 [Show / hide offline contacts]

diff --git a/langpacks/english/Plugins/Cln_skinedit.txt b/langpacks/english/Plugins/Cln_skinedit.txt
index b02c9905f4..14bcfb643e 100644
--- a/langpacks/english/Plugins/Cln_skinedit.txt
+++ b/langpacks/english/Plugins/Cln_skinedit.txt
@@ -39,4 +39,3 @@
 [Sunken]

 [Bumped]

 [Etched]

-[Image items]

diff --git a/langpacks/english/Plugins/DbEditorPP.txt b/langpacks/english/Plugins/DbEditorPP.txt
index 8b94c8d86f..3a8ba14901 100644
--- a/langpacks/english/Plugins/DbEditorPP.txt
+++ b/langpacks/english/Plugins/DbEditorPP.txt
@@ -147,8 +147,6 @@
 [Export to file]

 [Error Loading Module List]

 [Couldn't open file for writing]

-[Do you want to overwrite it "%s"?]

-[Contact already exists]

 [Import from files]

 ;file \plugins\DbEditorPP\src\findwindow.cpp

 [Enter a string to search the DB for]

diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt
index 22c545bd5b..ee45957a5c 100644
--- a/langpacks/english/Plugins/Facebook.txt
+++ b/langpacks/english/Plugins/Facebook.txt
@@ -11,7 +11,6 @@
 [Password:]

 [Create a new Facebook account]

 [What's on your mind?]

-[420]

 [Share]

 [Cancel]

 [User Details]

diff --git a/langpacks/english/Plugins/FileAsMessage.txt b/langpacks/english/Plugins/FileAsMessage.txt
index 28fab7ab8e..96f9c58f92 100644
--- a/langpacks/english/Plugins/FileAsMessage.txt
+++ b/langpacks/english/Plugins/FileAsMessage.txt
@@ -4,7 +4,6 @@
 [fileAsMessage]

 [Filename:]

 [Size:]

-[...]

 [Chunk size]

 [ms]

 [Delays between sends]

diff --git a/langpacks/english/Plugins/Fingerprint.txt b/langpacks/english/Plugins/Fingerprint.txt
index 59c748463b..1d6c9a457c 100644
--- a/langpacks/english/Plugins/Fingerprint.txt
+++ b/langpacks/english/Plugins/Fingerprint.txt
@@ -10,7 +10,6 @@
 [Fingerprint overlays icons]

 [Miranda clients]

 [Miranda packs overlays]

-[Use alternative (old style) overlays]

 [Show Miranda version at Overlay#2]

 [Resource overlays]

 [Platform overlays]

@@ -33,6 +32,108 @@
 [Multi-protocol clients]

 [Other (rare) protocols]

 [Other icons]

+;file \plugins\FingerprintNG\src\finger_groups.h

+[Client icons]

+[Pack overlays]

+[Multi-proto clients]

+[Other protocols]

+[Overlays]

+[Resource]

+[Platform]

+[Security]

+[Protocol]

+;file \plugins\FingerprintNG\src\masks.cpp

+[MirandaNG stable]

+[MirandaIM (old versions)]

+[Miranda (unknown)]

+[spam client]

+[PHP Jabber Client]

+[MP3 Script for mIRC]

+[Mail.Ru Agent (official)]

+[Mail.Ru (unknown client)]

+[TM 2008 and >]

+[Gadu-Gadu client]

+[Tlen.pl client]

+[Python-based clients]

+[Jabber client]

+[XMPP client]

+[Client not found]

+[Unknown client]

+[Undetected client]

+[AIM overlay]

+[ICQJ Plus Mod overlay]

+[ICQJ overlay]

+[IRC overlay]

+[JGmail overlay]

+[JGTalk overlay]

+[Jabber overlay]

+[MSN overlay]

+[QQ overlay]

+[Tlen.pl overlay]

+[Yahoo overlay]

+[Mail.Ru Agent overlay]

+[ICQ 2003 overlay]

+[ICQ Lite 4 overlay]

+[ICQ v5.x overlay]

+[ICQ v6.x overlay]

+[ICQ v7.x overlay]

+[ICQ v8.x overlay]

+[Yahoo v11.x overlay]

+[Yahoo v10.x overlay]

+[Yahoo v9.x overlay]

+[Gadu-Gadu v11 client]

+[Gadu-Gadu v10 client]

+[Gadu-Gadu v9 client]

+[Gadu-Gadu v8 client]

+[Tlen 7.x overlay]

+[Tlen 6.x overlay]

+[Tlen 5.x overlay]

+[TM/QQ 2012 overlay]

+[TM/QQ 2011 overlay]

+[TM/QQ 2010 overlay]

+[TM/QQ 2009 overlay]

+[TM/QQ 2008 overlay]

+[TM/QQ 2007 overlay]

+[TM/QQ 2006 overlay]

+[TM/QQ 2005 overlay]

+[QQ 2004 overlay]

+[TM 3.x / QQ 2003 overlay]

+[TM 2.x overlay]

+[TM 1.x overlay]

+[QQ 2000 overlay]

+[Windows overlay]

+[iOS overlay (iPhone/iPad)]

+[MacOS overlay]

+[Linux overlay]

+[Flash overlay]

+[Java overlay]

+[Symbian overlay]

+[Amiga overlay]

+[Android overlay]

+[debug overlay]

+[office overlay]

+[mobile overlay]

+[home overlay]

+[work overlay]

+[notebook overlay]

+[MirandaNG v0.6 #2 overlay]

+[MirandaNG v0.5 #2 overlay]

+[MirandaNG v0.4 #2 overlay]

+[MirandaNG v0.3 #2 overlay]

+[MirandaNG v0.2 #2 overlay]

+[MirandaNG v0.1 #2 overlay]

+[MirandaIM v0.10 #2 overlay]

+[MirandaIM v0.9 #2 overlay]

+[MirandaIM v0.8 #2 overlay]

+[MirandaIM v0.7 #2 overlay]

+[MirandaIM v0.6 #2 overlay]

+[MirandaIM v0.5 #2 overlay]

+[MirandaIM v0.4 #2 overlay]

+[x64 overlay]

+[x32 overlay]

+[NewGPG overlay]

+[MirOTR overlay]

+[SecureIM overlay]

 ;file \plugins\FingerprintNG\src\options.cpp

 [Icons]

 [Fingerprint]

diff --git a/langpacks/english/Plugins/FltContacts.txt b/langpacks/english/Plugins/FltContacts.txt
index 6fd7b956be..559e858b06 100644
--- a/langpacks/english/Plugins/FltContacts.txt
+++ b/langpacks/english/Plugins/FltContacts.txt
@@ -36,7 +36,6 @@
 [Bold]

 [Italic]

 [Underline]

-[100 %]

 [Border]

 [Draw border]

 [Left-top edges color:]

@@ -44,16 +43,12 @@
 [Background]

 [Background colour:]

 [Use background bitmap]

-[...]

 [Stretch to width]

 [Stretch to height]

 [Tile horizontally]

 [Tile vertically]

 [Stretch proportionally]

 [Opacity:]

-;file \plugins\FloatingContacts\src\bitmap_funcs.cpp

-[You need the png2dib plugin v. 0.1.3.x or later to process PNG images]

-[Error]

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

 [Remove thumb]

 [Show all thumbs]

diff --git a/langpacks/english/Plugins/GG.txt b/langpacks/english/Plugins/GG.txt
index e32c0999f6..0de9dd4d8a 100644
--- a/langpacks/english/Plugins/GG.txt
+++ b/langpacks/english/Plugins/GG.txt
@@ -14,12 +14,10 @@
 [Remove account]

 [Change password]

 [Retrieve password]

-[Change e-mail]

 [Options]

 [Friends only]

 [Show offline users with status message as invisible in contact list]

 [After disconnection leave away message of status:]

-[Ignore incoming conference messages]

 [Receive image and after image is received use:]

 [Show links from unknown contacts]

 [Enable avatars]

@@ -34,15 +32,14 @@
 [Automatically reconnect after unintentional disconnection]

 [Send messages slower, but with full acknowledgement]

 [Manually specify connection servers' hosts]

-[Host:]

-[Port:]

 [* new line is separator\n** hostname:port format]

 [Use SSL secure connection]

 [File Transfer]

 [Use direct connections]

+[Port:]

 [Use forwarding]

+[Host:]

 [Number:]

-[Version:]

 [Internal IP:]

 [First name:]

 [Last name:]

diff --git a/langpacks/english/Plugins/ICQ.txt b/langpacks/english/Plugins/ICQ.txt
index 41833354eb..cfb6bec13c 100644
--- a/langpacks/english/Plugins/ICQ.txt
+++ b/langpacks/english/Plugins/ICQ.txt
@@ -216,7 +216,6 @@
 [Angola]

 [Anguilla]

 [Antigua and Barbuda]

-[Antilles]

 [Argentina]

 [Armenia]

 [Aruba]

@@ -232,7 +231,6 @@
 [Bahrain]

 [Bangladesh]

 [Barbados]

-[Barbuda]

 [Belarus]

 [Belgium]

 [Belize]

@@ -258,7 +256,6 @@
 [Chad]

 [Chile, Republic of]

 [China]

-[Cocos (Keeling) Islands]

 [Colombia]

 [Comoros]

 [Congo, Democratic Republic of (Zaire)]

@@ -369,7 +366,6 @@
 [Netherlands (Bonaire Island)]

 [Netherlands (Saba Island)]

 [Netherlands (St. Eustatius Island)]

-[Nevis]

 [New Caledonia]

 [New Zealand]

 [Nicaragua]

@@ -392,18 +388,15 @@
 [Qatar]

 [Reunion Island]

 [Romania]

-[Rota Island]

 [Russia]

 [Rwanda]

 [Samoa (USA)]

 [Samoa, Western]

 [Saint Helena]

-[Saint Kitts]

 [Saint Kitts and Nevis]

 [Saint Lucia]

 [Saint Pierre and Miquelon]

 [Saint Vincent and the Grenadines]

-[Saipan Island]

 [San Marino]

 [Sao Tome and Principe]

 [Saudi Arabia]

@@ -430,7 +423,6 @@
 [Tajikistan]

 [Tanzania]

 [Thailand]

-[Tinian Island]

 [Timor, East]

 [Togo]

 [Tokelau]

diff --git a/langpacks/english/Plugins/IEView.txt b/langpacks/english/Plugins/IEView.txt
index 5971d16386..d62a8481f7 100644
--- a/langpacks/english/Plugins/IEView.txt
+++ b/langpacks/english/Plugins/IEView.txt
@@ -30,7 +30,6 @@
 [Use Templates]

 [Background image]

 [Scroll with text]

-[...]

 [Template Options]

 [Use message grouping]

 [Show nicknames]

@@ -60,7 +59,6 @@
 [Group Chats]

 [History]

 [Default]

-[protocol]

 [Message Sessions]

 [IEView]

 [Skins]

diff --git a/langpacks/english/Plugins/IRC.txt b/langpacks/english/Plugins/IRC.txt
index ce98d4c73d..c6e6272c6b 100644
--- a/langpacks/english/Plugins/IRC.txt
+++ b/langpacks/english/Plugins/IRC.txt
@@ -31,7 +31,6 @@
 [Full name (e-mail)]

 [Password]

 [Server name]

-[->]

 [Alternative nick]

 [Ident]

 [System]

diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index 1570bedd40..65c8668929 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -405,6 +405,10 @@
 [Deny Presences (in)]

 [Deny Presences (out)]

 [Deny Queries]

+[Protocols]

+[Dialogs]

+[Discovery]

+[Privacy]

 ;file \protocols\JabberG\src\jabber_iqid.cpp

 [Authentication failed for]

 [Jabber Authentication]

diff --git a/langpacks/english/Plugins/KeepStatus.txt b/langpacks/english/Plugins/KeepStatus.txt
index 27ffe5585f..3cf8345efb 100644
--- a/langpacks/english/Plugins/KeepStatus.txt
+++ b/langpacks/english/Plugins/KeepStatus.txt
@@ -53,8 +53,10 @@
 [ms]

 [Set after]

 [Timeout]

+[s]

 [Set window location]

 [Set window size]

+[x]

 [Allow override]

 [Note: status profiles can be created in the 'Status Profiles' options screen]

 [Window on startup]

@@ -150,7 +152,6 @@
 [%s Login error (next retry (%d) in %ds)]

 [%s Status error (next retry (%d) in %ds)]

 [Status error (next retry (%d) in %ds)]

-[%s\t(will be set to %s)\r\n]

 [will be set to]

 [Resetting status... (last try (%d))%s]

 [Resetting status... (next retry (%d) in %ds)%s]

diff --git a/langpacks/english/Plugins/KeyboardNotify.txt b/langpacks/english/Plugins/KeyboardNotify.txt
index 588fe18134..7faedc8bf4 100644
--- a/langpacks/english/Plugins/KeyboardNotify.txt
+++ b/langpacks/english/Plugins/KeyboardNotify.txt
@@ -22,7 +22,6 @@
 [Screen Saver is running]

 [Workstation is Locked (2000/XP)]

 [Defined programs are running]

-[...]

 [All other situations]

 [Only notify if status is]

 [Online]

diff --git a/langpacks/english/Plugins/LangMan.txt b/langpacks/english/Plugins/LangMan.txt
index 819d55167f..846b1c8402 100644
--- a/langpacks/english/Plugins/LangMan.txt
+++ b/langpacks/english/Plugins/LangMan.txt
@@ -25,10 +25,8 @@
 [Date:]

 [Version:]

 [Locale:]

-[Not included:]

 [Download more Language Packs]

 [Please restart Miranda NG for your changes to take effect.]

-[Check for new &versions of Language Packs periodically]

 [&Download Language]

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

 [Reload langpack]

diff --git a/langpacks/english/Plugins/MRA.txt b/langpacks/english/Plugins/MRA.txt
index 6fb647a783..f645f76e28 100644
--- a/langpacks/english/Plugins/MRA.txt
+++ b/langpacks/english/Plugins/MRA.txt
@@ -12,7 +12,6 @@
 [Configuration]

 [Login Server:]

 [Port:]

-[(2042, 443, 110, 25)]

 [Default]

 [Automatically request authorization on logon]

 [Automatically add contacts to server list on logon]

@@ -45,7 +44,6 @@
 [Remember]

 [Enable avatars support (loading)]

 [Server:]

-[(80, 443, 2041)]

 [Updates check interval, min]

 [Return absolute path]

 [Delete avatar file with contact]

@@ -94,7 +92,6 @@
 [Cancel]

 [Notify]

 [Writed:]

-[0/500]

 [Select e-mail]

 ;file \protocols\MRA\src\MraAntiSpam.cpp

 [Spam bot blocked]

diff --git a/langpacks/english/Plugins/MSN.txt b/langpacks/english/Plugins/MSN.txt
index 65ca7dda17..47258db22c 100644
--- a/langpacks/english/Plugins/MSN.txt
+++ b/langpacks/english/Plugins/MSN.txt
@@ -16,13 +16,10 @@
 [Disable all contacts not included into my contact list]

 [Manage server groups]

 [Run the following application when new Hotmail arrives]

-[...]

 [Allow people on my contact list send messages to mobile device]

 [Connection settings]

 [Direct:]

-[ 1863]

 [Gateway:]

-[ 80]

 [Reset]

 [Notify me when a message delivery has failed]

 [Incoming file transfers]

@@ -141,7 +138,6 @@
 ;file \protocols\MSN\src\msn_p2p.cpp

 [Contact tried to send its webcam data (currently not supported)]

 [Contact tried to view our webcam data (currently not supported)]

-[Contact tried to share media with us (currently not supported)]

 ;file \protocols\MSN\src\msn_proto.cpp

 [Live Mail]

 [Live Alert]

diff --git a/langpacks/english/Plugins/MirOTR.txt b/langpacks/english/Plugins/MirOTR.txt
index 2d2de184b1..c51f95b128 100644
--- a/langpacks/english/Plugins/MirOTR.txt
+++ b/langpacks/english/Plugins/MirOTR.txt
@@ -78,9 +78,6 @@
 [Unknown]

 [OTR: %s (%s)]

 [OTR %s (%s)]

-[OTR New Fingerprint]

-[OTR encrypted session with '%s'.\n\nFingerprint is UNVERIFIED.\n\n%s\n\nVerify?]

-[A new fingerprint has been recieved from '%s'\n\n%s\n\nDo you trust it?]

 [OTR encrypted session with '%s' is now using a VERIFIED fingerprint]

 [OTR encrypted session with '%s' is now using a NOT VERIFIED fingerprint]

 [OTR unverified]

@@ -137,10 +134,3 @@
 [OTR Status]

 ;file \plugins\MirOTR\MirOTR\src\options.cpp

 [Services]

-;file \plugins\MirOTR\MirOTR\src\otr.cpp

-[Would you like to generate a new private key for this protocol?]

-[Generating new private key.]

-[Please wait.]

-[Would you like to save the current fingerprint list?]

-[OTR Log Message]

-;file \plugins\MirOTR\MirOTR\src\svcs_proto.cpp

diff --git a/langpacks/english/Plugins/NewXstatusNotify.txt b/langpacks/english/Plugins/NewXstatusNotify.txt
index 83143906ff..a2f9935610 100644
--- a/langpacks/english/Plugins/NewXstatusNotify.txt
+++ b/langpacks/english/Plugins/NewXstatusNotify.txt
@@ -29,7 +29,6 @@
 [Enable]

 [Go to Customize -> Sound to select the sounds]

 [Extra status]

-[...]

 [Open]

 [Status message]

 [IndSndList]

diff --git a/langpacks/english/Plugins/NewsAggregator.txt b/langpacks/english/Plugins/NewsAggregator.txt
index f2dbc61a54..18537d4ceb 100644
--- a/langpacks/english/Plugins/NewsAggregator.txt
+++ b/langpacks/english/Plugins/NewsAggregator.txt
@@ -66,8 +66,6 @@
 [Enable/disable auto update]

 ;file \plugins\NewsAggregator\Src\Utils.cpp

 [NewsAggregator HTTP connection]

-[Cannot upload VersionInfo. Incorrect username or password]

-[Cannot upload VersionInfo. Unknown error]

 [Feed]

 [%s\nis a valid feed's address.]

 [New Aggregator]

diff --git a/langpacks/english/Plugins/NotesReminders.txt b/langpacks/english/Plugins/NotesReminders.txt
index aabf119b39..6b6870506f 100644
--- a/langpacks/english/Plugins/NotesReminders.txt
+++ b/langpacks/english/Plugins/NotesReminders.txt
@@ -18,11 +18,8 @@
 [Add Reminder closes dialog]

 [Use MCI to play alert sounds]

 [Note Transparency (Minimum Win 2k/XP)]

-[0%]

-[100%]

 [Send Reminders through E-mail / SMS :]

 [Open links with this program instead:]

-[...]

 [Reset to defaults]

 [(Using MCI allows different sounds to be played simultaneously, may not be needed or desired when a custom sound plugin is installed.)]

 [Add Reminder]

diff --git a/langpacks/english/Plugins/NotifyAnything.txt b/langpacks/english/Plugins/NotifyAnything.txt
index 77c01b1993..9c140ced27 100644
--- a/langpacks/english/Plugins/NotifyAnything.txt
+++ b/langpacks/english/Plugins/NotifyAnything.txt
@@ -14,7 +14,6 @@
 [(Default is 12001)]

 [Allow actions to execute programs]

 [Password:]

-[...]

 ;file \plugins\NotifyAnything\src\common.h

 [NotifyAnything]

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

diff --git a/langpacks/english/Plugins/Nudge.txt b/langpacks/english/Plugins/Nudge.txt
index 05168d51a0..73d60d8de3 100644
--- a/langpacks/english/Plugins/Nudge.txt
+++ b/langpacks/english/Plugins/Nudge.txt
@@ -9,6 +9,7 @@
 [Enable message window shaking]

 [Show as status change]

 [Auto resend nudge after]

+[s]

 [Enable popup notification]

 [Respect ignore settings (status changes)]

 [Sending text]

diff --git a/langpacks/english/Plugins/Omegle.txt b/langpacks/english/Plugins/Omegle.txt
index 36cf059b4f..347fb5d752 100644
--- a/langpacks/english/Plugins/Omegle.txt
+++ b/langpacks/english/Plugins/Omegle.txt
@@ -28,10 +28,8 @@
 [You]

 ;file \protocols\Omegle\src\communication.cpp

 [Connection error.]

-[Chosing server: ]

 [Connected to server %s. There are %s users online now.]

 [Connected to server %s.]

-[On whole Omegle are %s strangers online now.]

 [Stranger 1]

 [Stranger 2]

 [Stranger]

@@ -46,7 +44,6 @@
 [We are already waiting for new stranger...]

 [Connecting...]

 [Waiting for Stranger...]

-[We are disconnecting now, wait...]

 ;file \protocols\Omegle\src\proto.cpp

 [%s server connection]

 [Unable to get Netlib connection for Omegle]

diff --git a/langpacks/english/Plugins/Ping.txt b/langpacks/english/Plugins/Ping.txt
index 12e294a701..b9f4565c30 100644
--- a/langpacks/english/Plugins/Ping.txt
+++ b/langpacks/english/Plugins/Ping.txt
@@ -59,7 +59,6 @@
 [Hosts]

 ;file \plugins\Ping\src\ping.cpp

 [Ping Plugin]

-[Failed to initialize. Plugin disabled.]

 ;file \plugins\Ping\src\pinggraph.cpp

 [Show grid lines]

 [Show stats]

diff --git a/langpacks/english/Plugins/PopUp.txt b/langpacks/english/Plugins/PopUp.txt
index d036a9e663..e59c4a7269 100644
--- a/langpacks/english/Plugins/PopUp.txt
+++ b/langpacks/english/Plugins/PopUp.txt
@@ -23,7 +23,6 @@
 [Round corners by]

 [pixels]

 [Avatar size:]

-[32]

 [Enable avatar updates]

 [Multimonitor (98/ME/2000/XP)]

 [Start the popups in the monitor with]

@@ -33,7 +32,6 @@
 [Enable Win 9x/Me transparency]

 [Use transparency (Windows 2000+)]

 [opacity:]

-[100%]

 [Opaque popups under cursor]

 [Slide Popup]

 [Effect:]

@@ -99,7 +97,6 @@
 [Minimum width]

 [Maximum width]

 [Position:]

-[...]

 [Layout:]

 [Reorder Popups]

 [Disable when:]

@@ -116,8 +113,6 @@
 [Pin popup]

 [Copy to clipboard]

 [Action]

-;file \plugins\Popup\src\bitmap_funcs.cpp

-[You need the png2dib plugin v. 0.1.3.x or later to process PNG images]

 ;file \plugins\Popup\src\config.cpp

 [The Jabberwocky]

 [`Twas brillig, and the slithy toves\r\nDid gyre and gimble in the wabe:\r\nAll mimsy were the borogoves,\r\nAnd the mome raths outgrabe.\r\n\t[b][i]Lewis Carroll, 1855[/i][/b]]

diff --git a/langpacks/english/Plugins/Scriver.txt b/langpacks/english/Plugins/Scriver.txt
index 1e7a2003d3..72c375de41 100644
--- a/langpacks/english/Plugins/Scriver.txt
+++ b/langpacks/english/Plugins/Scriver.txt
@@ -35,7 +35,6 @@
 [Show progress indicator]

 [Enable transparency]

 [active]

-[100%]

 [inactive]

 [Min input area size]

 [lines]

@@ -112,7 +111,6 @@
 [Words to highlight (wildcards allowed)]

 [Save logs]

 [Location]

-[...]

 [Trim to]

 [kB]

 [Group Chat]

@@ -486,7 +484,6 @@
 [Underline]

 [Text color]

 [Background color]

-[Font size]

 [Filter]

 [Manager]

 [Nick list]

diff --git a/langpacks/english/Plugins/SecureIM.txt b/langpacks/english/Plugins/SecureIM.txt
index a5093a50da..19b3e39d5b 100644
--- a/langpacks/english/Plugins/SecureIM.txt
+++ b/langpacks/english/Plugins/SecureIM.txt
@@ -41,7 +41,6 @@
 [Load &Private key]

 [Basic]

 [Executable:]

-[...]

 [Home Directory:]

 [Temp Dir:]

 [Key Assignment]

@@ -78,7 +77,6 @@
 [PGP SecureIM]

 [GPG SecureIM]

 [RSA/AES SecureIM]

-[RSA SecureIM]

 [Status]

 [Always Try to Establish Secure IM]

 [Secure IM Enabled]

diff --git a/langpacks/english/Plugins/SendSS.txt b/langpacks/english/Plugins/SendSS.txt
index b2dd49f8f2..0266aacaef 100644
--- a/langpacks/english/Plugins/SendSS.txt
+++ b/langpacks/english/Plugins/SendSS.txt
@@ -33,14 +33,6 @@
 [Size (HxW) :]

 [Target Tool]

 ;file \plugins\SendScreenshotPlus\src\CSend.cpp

-[Unable to initiate transfer.]

-[Initialising...]

-[Connecting...]

-[Connecting to proxy...]

-[Waiting for connection...]

-[Connected]

-[Decision sent]

-[Moving to next file...]

 [GCHAT error]

 [An unknown error has occured.]

 [Error]

diff --git a/langpacks/english/Plugins/SmileyAdd.txt b/langpacks/english/Plugins/SmileyAdd.txt
index 6aac4bc729..ab6e90e3a6 100644
--- a/langpacks/english/Plugins/SmileyAdd.txt
+++ b/langpacks/english/Plugins/SmileyAdd.txt
@@ -8,7 +8,6 @@
 ;file \plugins\SmileyAdd\res\resource.rc

 [Smiley Categories]

 [Specify Smiley Pack for each category]

-[...]

 [Name:]

 [Author:]

 [Version:]

diff --git a/langpacks/english/Plugins/SplashScreen.txt b/langpacks/english/Plugins/SplashScreen.txt
index 064370ec2f..fb3f3e8e3e 100644
--- a/langpacks/english/Plugins/SplashScreen.txt
+++ b/langpacks/english/Plugins/SplashScreen.txt
@@ -10,7 +10,6 @@
 [Splash Options]

 [Show splash]

 [Show random splash]

-[...]

 [Play sound]

 [Loop sound]

 [Show Miranda Version]

diff --git a/langpacks/english/Plugins/StartupStatus.txt b/langpacks/english/Plugins/StartupStatus.txt
index f211ab67b1..0493663ddb 100644
--- a/langpacks/english/Plugins/StartupStatus.txt
+++ b/langpacks/english/Plugins/StartupStatus.txt
@@ -53,8 +53,10 @@
 [ms]

 [Set after]

 [Timeout]

+[s]

 [Set window location]

 [Set window size]

+[x]

 [Allow override]

 [Note: status profiles can be created in the 'Status Profiles' options screen]

 [Window on startup]

diff --git a/langpacks/english/Plugins/StopSpamMod.txt b/langpacks/english/Plugins/StopSpamMod.txt
index 8e84c755c3..d651d717f3 100644
--- a/langpacks/english/Plugins/StopSpamMod.txt
+++ b/langpacks/english/Plugins/StopSpamMod.txt
@@ -13,10 +13,6 @@
 [Auth. request reply:]

 [Vars]

 [Available accounts:]

-[>>>>]

-[>>]

-[<<]

-[<<<<]

 [Filtered accounts:]

 [Do not send more than ]

 [ questions to one contact (0 - for no limit)]

diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index 38473aff3f..b058603a3d 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -29,7 +29,6 @@
 [Log files]

 [Enable logging to disk]

 [Log directory]

-[...]

 [Maximum size for log files (in kB)]

 [Group chat log formatting]

 [Your name]

@@ -139,7 +138,6 @@
 [Load only actual history]

 [Always trim message log to]

 [Events]

-[   ]

 [Only show tab bar when it's needed]

 [Container stays on top]

 [Vertical maximize]

@@ -535,7 +533,6 @@
 [On, if present, always in bottom display]

 [Don't show them]

 ;file \plugins\TabSRMM\src\controls.cpp

-[&Main]

 [&User]

 [&Room]

 [Sounds are %s. Click to toggle status, hold SHIFT and click to set for all open containers]

@@ -896,7 +893,6 @@
 [Support BBCode formatting]

 [Place a separator in the log after a window lost its foreground status]

 [Only place a separator when an incoming event is announced with a popup]

-[Support Math Module plugin]

 [Show events at the new line (IEView Compatibility Mode)]

 [Underline timestamp/nickname (IEView Compatibility Mode)]

 [Show timestamp after nickname (IEView Compatibility Mode)]

@@ -956,13 +952,12 @@
 [%s is now known as %s]

 [You are now known as %s]

 [%s kicked %s]

-[Notice from %s]

+[Notice from %s: ]

 [The topic is '%s%s']

 [ (set by %s on %s)]

 [ (set by %s)]

 [%s enables '%s' status for %s]

 [%s disables '%s' status for %s]

-[Notice from %s: ]

 [<invalid>]

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

 [Add user to highlight list]

@@ -1151,6 +1146,7 @@
 [%s has joined %s]

 [%s has left %s]

 [%s kicked %s from %s]

+[Notice from %s]

 [Topic change in %s]

 [Information in %s]

 [%s enables '%s' status for %s in %s]

diff --git a/langpacks/english/Plugins/Tlen.txt b/langpacks/english/Plugins/Tlen.txt
index 99de756945..51d269212a 100644
--- a/langpacks/english/Plugins/Tlen.txt
+++ b/langpacks/english/Plugins/Tlen.txt
@@ -93,7 +93,6 @@
 [Advanced]

 [Notifications]

 [Network]

-[PopUps]

 [These changes will take effect the next time you connect to the Tlen network.]

 [Tlen Protocol Option]

 [Accept all alerts]

@@ -108,7 +107,6 @@
 [Ignore images from unauthorized contacts]

 [Ignore all images]

 [<Last message>]

-[<Ask me>]

 [Online]

 [Away]

 [NA]

diff --git a/langpacks/english/Plugins/TooltipNotify.txt b/langpacks/english/Plugins/TooltipNotify.txt
index dd48a219cc..7d642d832b 100644
--- a/langpacks/english/Plugins/TooltipNotify.txt
+++ b/langpacks/english/Plugins/TooltipNotify.txt
@@ -35,7 +35,6 @@
 [Preview]

 [Translucency options (Windows 2000/XP only)]

 [Transparent tooltip]

-[000%]

 [Contacts]

 [Idle]

 ;file \plugins\TooltipNotify\src\TooltipNotify.cpp

diff --git a/langpacks/english/Plugins/TopToolBar.txt b/langpacks/english/Plugins/TopToolBar.txt
index a80ba4dcea..692dd049de 100644
--- a/langpacks/english/Plugins/TopToolBar.txt
+++ b/langpacks/english/Plugins/TopToolBar.txt
@@ -19,7 +19,6 @@
 [Add Launch]

 [Del Sep/Launch Button]

 [Name: ]

-[...]

 [Path:]

 [Set]

 ;file \plugins\TopToolBar\src\toolbar.cpp

diff --git a/langpacks/english/Plugins/Twitter.txt b/langpacks/english/Plugins/Twitter.txt
index cc07c90704..cac615fd4b 100644
--- a/langpacks/english/Plugins/Twitter.txt
+++ b/langpacks/english/Plugins/Twitter.txt
@@ -42,9 +42,7 @@
 ;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)]

 [Failed to get Twitter Access Tokens, please go offline and try again.  If this keeps happening, check your internet connection.]

-[Please enter a password.]

 [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]

-[Something went wrong with authorisation, OAuth keys have been reset.  Please try to reconnect.  If problems persist, please se your doctor]

 ;file \protocols\Twitter\src\proto.cpp

 [Send Tweet...]

 [Network]

diff --git a/langpacks/english/Plugins/UInfoEx.txt b/langpacks/english/Plugins/UInfoEx.txt
index f71e4aa508..9c1c946e5a 100644
--- a/langpacks/english/Plugins/UInfoEx.txt
+++ b/langpacks/english/Plugins/UInfoEx.txt
@@ -27,9 +27,6 @@
 [Marital status:]

 [Partner:]

 [Language skills]

-[1.:]

-[2.:]

-[3.:]

 [Street:]

 [Postal code:]

 [City:]

@@ -38,7 +35,6 @@
 [Contact added to ContactList:]

 [Just from the beginning.]

 [Your contact's local time is:]

-[00:00]

 [Timezone:]

 [Company:]

 [Department:]

@@ -71,6 +67,7 @@
 [Play sound]

 [Use ignore list]

 [Birthday popup colours]

+[r]

 [Background colour]

 [Text colour]

 [Use Windows colours]

@@ -189,7 +186,6 @@
 [Capricorn]

 [Aquarius]

 [Pisces]

-[Unknown]

 [%s provides a new birthday via protocol.\nIt is %s. The old one was %s.\n\nDo you want to use this as the new birthday for this contact?]

 [Update custom birthday]

 [Keeps your custom birthday up to date.]

@@ -212,7 +208,6 @@
 [Edit E-Mail]

 [Edit Phone Number]

 [The phone number should start with a + and consist of\nnumbers, spaces, brackets and hyphens only.]

-[Syntax Error]

 [Choose the item to display.]

 [Edit the currently displayed item.]

 [Add a new custom item.]

diff --git a/langpacks/english/Plugins/Weather.txt b/langpacks/english/Plugins/Weather.txt
index ed54d78217..33c8c29ebb 100644
--- a/langpacks/english/Plugins/Weather.txt
+++ b/langpacks/english/Plugins/Weather.txt
@@ -45,6 +45,7 @@
 [3 chars]

 [Elevation]

 [ft]

+[m]

 [Do not append units to values]

 [Do not display fractional values]

 [Frame]

@@ -241,8 +242,6 @@
 [%c\tcurrent condition\n%d\tcurrent date\n%e\tdewpoint\n%f\tfeel-like temp\n%h\ttoday's high\n%i\twind direction\n%l\ttoday's low\n%m\thumidity\n%n\tstation name\n%p\tpressure\n%r\tsunrise time\n%s\tstation ID\n%t\ttemperature\n%u\tupdate time\n%v\tvisibility\n%w\twind speed\n%y\tsun set]

 [Weather Protocol Text Preview]

 ;file \plugins\Weather\src\weather_popup.cpp

-[This is the name of the city]

-[Here is a short weather description]

 [%c\tcurrent condition\n%d\tcurrent date\n%e\tdewpoint\n%f\tfeel-like temperature\n%h\ttoday's high\n%i\twind direction\n%l\ttoday's low\n%m\thumidity\n%n\tstation name\n%p\tpressure\n%r\tsunrise time\n%s\tstation ID\n%t\ttemperature\n%u\tupdate time\n%v\tvisibility\n%w\twind speed\n%y\tsun set]

 [%[..]\tcustom variables]

 ;file \plugins\Weather\src\weather_svcs.cpp

diff --git a/langpacks/english/Plugins/WhenWasIt.txt b/langpacks/english/Plugins/WhenWasIt.txt
index 030f2a485d..78b389daa8 100644
--- a/langpacks/english/Plugins/WhenWasIt.txt
+++ b/langpacks/english/Plugins/WhenWasIt.txt
@@ -8,7 +8,6 @@
 [Notifies you of upcoming birthdays.]

 ;file \plugins\WhenWasIt\res\WhenWasIt.rc

 [Notify of birthdays:]

-[  ]

 [Popups]

 [Popup timeout:]

 [Preview]

diff --git a/langpacks/english/Plugins/WhoUsesMyFiles.txt b/langpacks/english/Plugins/WhoUsesMyFiles.txt
index 0e8bb7f88d..bc5f9ac03a 100644
--- a/langpacks/english/Plugins/WhoUsesMyFiles.txt
+++ b/langpacks/english/Plugins/WhoUsesMyFiles.txt
@@ -17,7 +17,6 @@
 [Choose colors]

 [File access filter && logging settings]

 [Please note that this settings has effect only with PopUps Interoperability plugin version 1.0.1.9 or higher]

-[...]

 [Log into text file]

 [Log folders access]

 [Alerts on folders access]

diff --git a/langpacks/english/Plugins/Xfire.txt b/langpacks/english/Plugins/Xfire.txt
index 1ad62ba440..d5e8489849 100644
--- a/langpacks/english/Plugins/Xfire.txt
+++ b/langpacks/english/Plugins/Xfire.txt
@@ -61,9 +61,7 @@
 [Name:]

 [Unreal Tournament 2004]

 [IP:]

-[255.255.255.255]

 [Port:]

-[27770]

 [Userdetails]

 [dufte]

 [Copy]

diff --git a/langpacks/english/Plugins/YAMN.txt b/langpacks/english/Plugins/YAMN.txt
index ea974bf59c..ed0672da96 100644
--- a/langpacks/english/Plugins/YAMN.txt
+++ b/langpacks/english/Plugins/YAMN.txt
@@ -23,7 +23,6 @@
 [Tray Icon]

 [Keyboard Flash]

 [Execute Application]

-[...]

 [Use contact notification for this account]

 [Replace nick name]

 [Disable Events]

diff --git a/langpacks/english/Plugins/Yahoo.txt b/langpacks/english/Plugins/Yahoo.txt
index 611db0d3f9..8496a7ea76 100644
--- a/langpacks/english/Plugins/Yahoo.txt
+++ b/langpacks/english/Plugins/Yahoo.txt
@@ -46,9 +46,6 @@
 [&Cancel]

 [Invitation reason]

 [Add]

-;file \protocols\Yahoo\src\avatar.cpp

-[Yahoo Error]

-[Avatar upload failed!?!]

 ;file \protocols\Yahoo\src\chat.cpp

 [[miranda] Got conference invite to room: %s with msg: %s]

 [%s denied invitation with message: %s]

@@ -69,6 +66,7 @@
 [Set Status]

 [Calendar]

 ;file \protocols\Yahoo\src\im.cpp

+[Yahoo Error]

 [The message send timed out.]

 [Message is too long: Yahoo messages are limited by 800 UTF8 chars]

 ;file \protocols\Yahoo\src\links.cpp

@@ -76,9 +74,8 @@
 ;file \protocols\Yahoo\src\main.cpp

 [YAHOO plugin HTTP connections]

 ;file \protocols\Yahoo\src\options.cpp

-[The changes you have made require you to restart Miranda NG before they take effect]

-[YAHOO Options]

 [The changes you have made require you to reconnect to the Yahoo network before they take effect]

+[YAHOO Options]

 [You need to be connected to Yahoo to add to Ignore List.]

 [Yahoo Ignore]

 [Please enter a valid buddy name to ignore.]

@@ -106,7 +103,6 @@
 [&Address Book]

 [&Calendar]

 [Create Conference]

-[&Refresh]

 [&Show Profile]

 ;file \protocols\Yahoo\src\webcam.cpp

 [[miranda] Got webcam invite. (not currently supported)]

@@ -126,7 +122,6 @@
 [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.]

-[You have been logged out of the yahoo service.]

 [Could not connect to the Yahoo service. Check your server/port and proxy settings.]

 [Could not log in, unknown reason: %d.]

 [Unknown error %s]