47 files changed, 118 insertions, 152 deletions
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 07f5b6be81..82a06f0653 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -199,7 +199,6 @@
 [Accounts]
 [Accounts\nConfigure your IM accounts]
 [Account information:]
-[Welcome to Miranda NG's account manager!\nHere you can set up your IM accounts.\n\nSelect an account from the list on the left to see the available options.  Alternatively, just click on the Plus sign underneath the list to set up a new IM account.]
 [Additional:]
 [Configure network...]
 [Get more protocols...]
@@ -458,7 +457,6 @@
 [File(s):]
 [&Choose Again...]
 [Total size:]
-[6]
 [&D]
 [&H]
 [Incoming File Transfer]
@@ -897,6 +895,7 @@
 [Offline]
 [Online]
 [Away]
+[NA]
 [Occupied]
 [DND]
 [Free for chat]
@@ -937,6 +936,7 @@
 ;file \src\core\stdfile\filexferdlg.cpp
 [This file has not yet been scanned for viruses. Are you certain you want to open it?]
 [File Received]
+[of]
 [Request sent, waiting for acceptance...]
 [Waiting for connection...]
 [Unable to initiate transfer.]
@@ -1208,6 +1208,10 @@
 [Do you want to restart it now?]
 [Plugins]
 ;file \src\modules\protocols\protoopts.cpp
+[WARNING! The account is going to be deleted. It means that all its settings, contacts and histories will be also erased.\n\nAre you absolutely sure?]
+[Your account was successfully upgraded. To activate it, restart of Miranda is needed.\n\nIf you want to restart Miranda now, press Yes, if you want to upgrade another account, press No]
+[This account uses legacy protocol plugin. Use Miranda NG options dialogs to change it's preferences.]
+[Welcome to Miranda NG's account manager!\n Here you can set up your IM accounts.\n\n Select an account from the list on the left to see the available options. Alternatively, just click on the Plus sign underneath the list to set up a new IM account.]
 [Create new account]
 [Editing account]
 [Upgrading account]
@@ -1266,6 +1270,7 @@
 [Main Menu]
 [Leave chat]
 [Move to Group]
+[On]
 [Off]
 [Running core plugin]
 [Non-loadable plugin]
diff --git a/langpacks/english/Langpack_english.txt b/langpacks/english/Langpack_english.txt
index 78440fff5a..efd1f9f87a 100644
--- a/langpacks/english/Langpack_english.txt
+++ b/langpacks/english/Langpack_english.txt
@@ -199,7 +199,6 @@
 [Accounts]
 [Accounts\nConfigure your IM accounts]
 [Account information:]
-[Welcome to Miranda NG's account manager!\nHere you can set up your IM accounts.\n\nSelect an account from the list on the left to see the available options.  Alternatively, just click on the Plus sign underneath the list to set up a new IM account.]
 [Additional:]
 [Configure network...]
 [Get more protocols...]
@@ -458,7 +457,6 @@
 [File(s):]
 [&Choose Again...]
 [Total size:]
-[6]
 [&D]
 [&H]
 [Incoming File Transfer]
@@ -897,6 +895,7 @@
 [Offline]
 [Online]
 [Away]
+[NA]
 [Occupied]
 [DND]
 [Free for chat]
@@ -937,6 +936,7 @@
 ;file \src\core\stdfile\filexferdlg.cpp
 [This file has not yet been scanned for viruses. Are you certain you want to open it?]
 [File Received]
+[of]
 [Request sent, waiting for acceptance...]
 [Waiting for connection...]
 [Unable to initiate transfer.]
@@ -1208,6 +1208,10 @@
 [Do you want to restart it now?]
 [Plugins]
 ;file \src\modules\protocols\protoopts.cpp
+[WARNING! The account is going to be deleted. It means that all its settings, contacts and histories will be also erased.\n\nAre you absolutely sure?]
+[Your account was successfully upgraded. To activate it, restart of Miranda is needed.\n\nIf you want to restart Miranda now, press Yes, if you want to upgrade another account, press No]
+[This account uses legacy protocol plugin. Use Miranda NG options dialogs to change it's preferences.]
+[Welcome to Miranda NG's account manager!\n Here you can set up your IM accounts.\n\n Select an account from the list on the left to see the available options. Alternatively, just click on the Plus sign underneath the list to set up a new IM account.]
 [Create new account]
 [Editing account]
 [Upgrading account]
@@ -1266,6 +1270,7 @@
 [Main Menu]
 [Leave chat]
 [Move to Group]
+[On]
 [Off]
 [Running core plugin]
 [Non-loadable plugin]
@@ -1521,11 +1526,8 @@
 [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]
@@ -1709,6 +1711,7 @@
 [Message]
 [Room]
 ;file \protocols\AimOscar\src\chat.cpp
+[Me]
 [Others]
 [&Invite user...]
 [&Leave chat session]
@@ -2079,7 +2082,6 @@
 [Shutdown when Miranda NG becomes &idle]
 [Configure]
 [Shutdown when &prozessor usage drops below:]
-[%]
 [(current: 0%)]
 [Shutdown when all contacts are &offline]
 [Shutdown when all &file transfers are finished]
@@ -2172,8 +2174,6 @@
 [Avatar History]
 [Static]
 [Open Folder]
-[<]
-[>]
 [Store this user's old avatars in disk]
 [Log this user's avatars changes to history]
 [Show popups for this user]
@@ -2322,7 +2322,6 @@
 [Avatar]
 [Fatal error, image services not found. Avatar services will be disabled.]
 [Avatar Service]
-[Global avatar]
 ;file \plugins\AVS\src\options.cpp
 [Set avatar options for %s]
 [Delete picture file from disk (may be necessary to force a reload, but will delete local pictures)?]
@@ -2427,6 +2426,7 @@
 [Default history events]
 [History for %s]
 [System]
+[Me]
 [Invalid Message]
 [Authorisation request by %s (%s%d): %s]
 ;file \plugins\BasicHistory\src\ExportManager.cpp
@@ -2598,7 +2598,6 @@
 [Output device:]
 [Volume:]
 [Quiet time:]
-[-]
 [download bass library]
 [Play only if]
 [Offline]
@@ -2811,7 +2810,6 @@
 [Strings for keyboard layouts]
 [EN]
 [Default]
-[+]
 [Invert current state]
 [Switch off]
 [Leave as it is]
@@ -3023,6 +3021,7 @@
 [Offline]
 [Online]
 [Away]
+[NA]
 [Occupied]
 [DND]
 [Free for chat]
@@ -3115,8 +3114,6 @@
 [W x H: 0 x 0 pixels]
 [Available view modes]
 [Include protocols]
-[+]
-[-]
 [New]
 [Include groups]
 [Show contacts in groups]
@@ -3393,10 +3390,10 @@
 [Changing MetaContacts (Moving)]
 [Do You want contact '%s' to be added to MetaContact '%s'?]
 ;file \plugins\Clist_modern\src\modern_clcopts.cpp
-[Contact List/Contact names]
-[Contact List/Row Items]
-[Contact List/Frame texts]
-[Contact List/Special colours]
+[Contact names]
+[Row Items]
+[Frame texts]
+[Special colours]
 [Standard contacts]
 [Away contacts]
 [DND contacts]
@@ -3438,6 +3435,7 @@
 [Offline]
 [Online]
 [Away]
+[NA]
 [Occupied]
 [DND]
 [Free for chat]
@@ -3565,6 +3563,7 @@
 ;file \plugins\Clist_modern\src\modern_viewmodebar.cpp
 [Ungrouped contacts]
 [And]
+[Or]
 [Older than]
 [Newer than]
 [Minutes]
@@ -3710,7 +3709,6 @@
 [Right click opens status menu]
 [Right click opens Miranda menu]
 [Make sections equal width]
-[-]
 [Show size grip]
 [Show bevel effect on panels]
 [Use connecting Icon]
@@ -3769,6 +3767,7 @@
 [Offline]
 [Online]
 [Away]
+[NA]
 [Occupied]
 [DND]
 [Free for chat]
@@ -4007,8 +4006,6 @@
 [Mark protocols locked from global status changes]
 [Available view modes]
 [Include protocols]
-[+]
-[-]
 [New]
 [Include groups]
 [Include status modes]
@@ -4156,6 +4153,7 @@
 [Offline]
 [Online]
 [Away]
+[NA]
 [Occupied]
 [DND]
 [Free for chat]
@@ -4248,6 +4246,7 @@
 ;file \plugins\Clist_nicer\src\viewmodes.cpp
 [Ungrouped contacts]
 [And]
+[Or]
 [Older than]
 [Newer than]
 [Minutes]
@@ -4485,7 +4484,6 @@
 ;file \plugins\ContactsPlus\res\contacts.rc
 [Send contacts]
 [&A]
-[6]
 [&D]
 [&H]
 [Choose contacts to be send:]
@@ -4596,15 +4594,6 @@
 [This plugin offers simple management functions to keep your extra statuses on one place.]
 ;file \plugins\CSList\res\cslist.rc
 [Custom Status List]
-[A]
-[M]
-[D]
-[F]
-[U]
-[I]
-[N]
-[C]
-[O]
 [No items available in the database.\nClick the Add button to define some.]
 [Add/Modify Custom Status]
 [Add/Modify]
@@ -5842,6 +5831,7 @@
 [List import successful.]
 [List remove successful.]
 [List export successful.]
+[Me]
 [Unknown client]
 [You have logged in at another location]
 [You are logged in at another location]
@@ -6478,7 +6468,6 @@
 [Total connection limit]
 [Connections per user limit]
 [Default download limit]
-[1]
 [&Edit share]
 [&Remove share]
 [&Open in Browser]
@@ -7843,7 +7832,6 @@
 [Away Info]
 [The server returned the following information. Please note that this information might be misleading and/or falsified]
 [CTCP information]
-[-]
 [Question]
 [&OK]
 [&Cancel]
@@ -7867,9 +7855,7 @@
 [Filter by]
 [C&onnect]
 [&Save]
-[@]
 [Hostmask]
-[!]
 [&Clear all]
 [Online detection mode]
 [Basic]
@@ -8209,7 +8195,6 @@
 [Resource:]
 [Register new user]
 [Use custom connection host and port:]
-[:]
 [Use Domain Login]
 [Go]
 [Search service]
@@ -8484,6 +8469,7 @@
 [&Send presence]
 [Online]
 [Away]
+[NA]
 [DND]
 [Free for chat]
 [&Leave chat session]
@@ -8644,6 +8630,7 @@
 ;file \protocols\JabberG\src\jabber_message_handlers.cpp
 ;file \protocols\JabberG\src\jabber_misc.cpp
 [CHAT plugin is required for conferences. Install it before chatting]
+[To]
 [From]
 [Both]
 [Errors]
@@ -8860,12 +8847,14 @@
 [Miranda NG core version]
 [Unicode build]
 [Yes]
+[No]
 [Alpha build]
 [Debug build]
 [Mood]
 [Activity]
 [Tune]
 [both]
+[to]
 [none]
 [Last logoff time]
 [Uptime]
@@ -9121,11 +9110,8 @@
 [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]
@@ -9701,7 +9687,9 @@
 ;file \plugins\MetaContacts\src\edit.cpp
 [(Unknown Contact)]
 [Yes]
+[No]
 [Contact]
+[Id]
 [Protocol]
 [Send Offline]
 [Delete MetaContact?]
@@ -9827,6 +9815,7 @@
 [Start OTR]
 [Stop OTR]
 [Yes]
+[No]
 [OTR status (Click for more options)]
 [OTR Encryption: Disabled]
 [OTR Encryption: UNVERIFIED]
@@ -9932,7 +9921,6 @@
 ;langpack template for ModernOpt
 ;file \plugins\ModernOpt\res\resource.rc
 [Visit official Miranda NG website]
-[`]
 [Sample page]
 [Miranda NG Options]
 [Use arrow keys to choose category]
@@ -9984,7 +9972,6 @@
 [Nickname:]
 [First name:]
 [Last name:]
-[@]
 [Gender:]
 [Age:]
 [from:]
@@ -10275,7 +10262,6 @@
 [User &Details]
 [Export selected]
 [Set to default filename]
-[1]
 [Copy]
 ;file \plugins\Msg_Export\src\FileViewer.cpp
 [Failed to write to the RichEdit the buffer was to small.]
@@ -10454,6 +10440,7 @@
 [Add]
 ;file \protocols\MSN\src\msn_chat.cpp
 [Chat #]
+[Me]
 [Others]
 [&Invite user...]
 [&Leave chat session]
@@ -10735,7 +10722,6 @@
 [Display news using the following format:]
 [All item's tags are valid. Put them between #. Example: #<author>#]
 [Reset]
-[?]
 [0 - check manually]
 ;file \plugins\NewsAggregator\Src\Icons.cpp
 [Protocol icon]
@@ -11415,7 +11401,6 @@
 [Enable message window shaking]
 [Show as status change]
 [Auto resend nudge after]
-[s]
 [Enable popup notification]
 [Respect ignore settings (status changes)]
 [Sending text]
@@ -11914,7 +11899,6 @@
 [Time (out):]
 [Limit window amount to:]
 [Skins]
-[R]
 [* - built-in skins]
 [Skin options]
 [Preview]
@@ -12013,8 +11997,6 @@
 [Enable &popup module]
 [Disable &popup module]
 [Error: I could not register the PopUp Window class.\r\nThe plugin will not operate.]
-[PopUps]
-[PopUp]
 ;file \plugins\Popup\src\opt_adv.cpp
 [No effect]
 [Fade in/out]
@@ -12110,8 +12092,6 @@
 #muuid {37ed754b-6cf9-40ed-9eb6-0fef8e822475}
 ;langpack template for QuickMessages
 ;file \plugins\QuickMessages\res\quickmessages.rc
-[+]
-[-]
 [Button Right-Click value]
 [Button Left-Click menu]
 [Buttons]
@@ -12123,7 +12103,6 @@
 [Enable QuickMenu]
 [Consider as ServiceName]
 [You have changed the plugin settings via database.\nThis requires restart!]
-[?]
 [Quick Messages Help]
 [- Selected text]
 [List of variables:]
@@ -12733,6 +12712,7 @@
 [Last message received on %s at %s.]
 ;file \plugins\Scriver\src\msglog.cpp
 [Unknown Contact]
+[Me]
 [O Lord, bless this Thy hand grenade that with it Thou mayest blow Thine enemies]
 [to tiny bits, in Thy mercy]
 [My Contact]
@@ -12791,6 +12771,7 @@
 [Offline]
 [Online]
 [Away]
+[NA]
 [Occupied]
 [DND]
 [Free for chat]
@@ -13107,6 +13088,7 @@
 [Nickname]
 [Name]
 [Password is too short!]
+[ON]
 [Off]
 [Keyrings loaded.]
 [Keyrings not loaded!]
@@ -13336,7 +13318,6 @@
 [Time (secs) :]
 [&Format :]
 [Send B&y :]
-[?]
 [E&xplore]
 [&Fill description textbox.]
 [Delete &after send]
@@ -13392,6 +13373,7 @@
 ;file \plugins\SendScreenshotPlus\src\dlg_msgbox.cpp
 [Retry]
 [Yes]
+[No]
 [Abord]
 [Ignore]
 ;file \plugins\SendScreenshotPlus\src\global.h
@@ -13759,8 +13741,6 @@
 [Author:]
 [Version:]
 [Preview]
-[+]
-[-]
 [Display]
 [Replace only smileys surrounded by spaces]
 [Scale smiley to textheight]
@@ -14068,11 +14048,8 @@
 [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]
@@ -15072,6 +15049,12 @@
 [Frame 2]
 [Frame 3]
 [Frame 4]
+[Toolbar]
+[Message Log]
+[Animated Tray]
+[Clock symbol (for the info panel clock)]
+[Feature disabled (used as overlay)]
+[Feature enabled (used as overlay)]
 ;file \plugins\TabSRMM\src\selectcontainer.cpp
 [Select container for %s]
 [You cannot delete the default container]
@@ -15213,8 +15196,6 @@
 ;file \plugins\TabSRMM\src\typingnotify.cpp
 [Disable &typing notification]
 [Enable &typing notification]
-[Warning: Popup plugin not found.]
-[Warning: Current Popup plugin version is not supported.]
 [...is typing a message.]
 [...has stopped typing.]
 [Contact started typing]
@@ -15226,7 +15207,6 @@
 [Force History++]
 [Force IEView]
 [Set messaging options for %s]
-[Message Log]
 ;file \plugins\TabSRMM\src\utils.cpp
 [Important release notes|A test warning message]
 [Icon pack version check|The installed icon pack is outdated and might be incompatible with TabSRMM version 3.\n\n\\b1Missing or misplaced icons are possible issues with the currently installed icon pack.\\b0]
@@ -15266,29 +15246,26 @@
 [Add user to highlight list]
 [Edit user highlight list]
 ;file \plugins\TabSRMM\src\chat\options.cpp
-[TabSRMM/Group Chats]
 [Group chat log background]
-[TabSRMM]
 [Input area background]
 [Log background]
-[TabSRMM/Single Messaging]
+[Single Messaging]
 [Outgoing background]
 [Incoming background]
 [Status background]
 [Incoming background(old)]
 [Outgoing background(old)]
 [Horizontal Grid Lines]
-[TabSRMM/Info Panel]
+[Info Panel]
 [Panel background low]
 [Panel background high]
-[TabSRMM/Common colors]
+[Common colors]
 [Toolbar background high]
 [Toolbar background low]
 [Window fill color]
 [Text area borders]
 [Aero glow effect]
 [Generic text color (only when fill color is set)]
-[TabSRMM/Tabs]
 [Normal text]
 [Active text]
 [Hovered text]
@@ -15394,6 +15371,8 @@
 [Topic (10x10)]
 [Highlight (10x10)]
 [Information (10x10)]
+[Group chat windows]
+[Group chat log]
 [Appearance and functionality of chat room windows]
 [Appearance of the message log]
 [Channel operators]
@@ -15404,6 +15383,8 @@
 [Selection background]
 [Selected text]
 [Incremental search highlight]
+[Fields background]
+[Userlist background]
 [nick of current contact (if defined)]
 [protocol name of current contact (if defined). Account name is used when protocol supports multiaccounts]
 [UserID of current contact (if defined). It is like UIN Number for ICQ, JID for Jabber, etc.]
@@ -15667,6 +15648,7 @@
 [%sys:uidname|UID^!MetaContacts%:]
 [Idle]
 [Idle:]
+[IP]
 [IP:]
 [IP internal]
 [IP internal:]
@@ -15961,6 +15943,7 @@
 [<Ask me>]
 [Online]
 [Away]
+[NA]
 [DND]
 [Free for chat]
 [Invisible]
@@ -16103,6 +16086,7 @@
 [Invisible]
 [Not Idle]
 [Unknown]
+[is]
 #muuid {f593c752-51d8-4d46-ba27-37577953f55c}
 ;============================================================
 ;  File: TopToolBar.dll
@@ -16145,7 +16129,6 @@
 [Selected totals]
 [Accounts]
 [Units]
-[0]
 [Clear statistics]
 [Notification]
 [Notify me on every]
@@ -16165,6 +16148,8 @@
 [Display traffic for current]
 ;file \plugins\TrafficCounter\src\statistics.c
 [Bytes]
+[KB]
+[MB]
 [Adaptive]
 [Hourly]
 [Daily]
@@ -16368,7 +16353,6 @@
 [Play sound]
 [Use ignore list]
 [Birthday popup colours]
-[r]
 [Background colour]
 [Text colour]
 [Use Windows colours]
@@ -16394,7 +16378,6 @@
 [Upcoming anniversaries\nThis list gives you some overview about all your contact's anniversaries.]
 [Statistics:]
 [with birthday:]
-[0]
 [female:]
 [male:]
 [number of contacts:]
@@ -16503,7 +16486,6 @@
 [Creating unique name for a page failed with %d and error code %d]
 [Creating the label for a page failed with %d and error code %d]
 [The dialog template type is no longer supported]
-[UserInfoEx/TreeView]
 ;file \plugins\UserInfoEx\src\ctrl_annivedit.cpp
 [Add a new anniversary]
 [Delete an existing anniversary]
@@ -16537,6 +16519,7 @@
 ;file \plugins\UserInfoEx\src\dlg_msgbox.cpp
 [Retry]
 [Yes]
+[No]
 [Abord]
 [Ignore]
 [Error]
@@ -16584,7 +16567,6 @@
 [&Export Group]
 [&Import Group]
 [Ex-/Import]
-[Extended UserInfo]
 ;file \plugins\UserInfoEx\src\psp_about.cpp
 [My Notes:]
 [About:]
@@ -16601,8 +16583,6 @@
 [Tertiary e-mail]
 [Address & Contact]
 [Company]
-[Fax]
-[Cellular]
 ;file \plugins\UserInfoEx\src\psp_options.cpp
 [Question]
 [This will delete all settings, you've made!\nAll TreeView settings, window positions and any other settings!\n\nAre you sure to procceed?]
@@ -16829,6 +16809,7 @@
 ;file \plugins\UserInfoEx\src\svc_reminder.cpp
 [%s has %s today.]
 [an anniversary]
+[He]
 [She]
 [He/She]
 [%s has the following anniversaries:\0]
@@ -17537,7 +17518,6 @@
 [3 chars]
 [Elevation]
 [ft]
-[m]
 [Do not append units to values]
 [Do not display fractional values]
 [Frame]
@@ -17551,7 +17531,6 @@
 [Use external file]
 [Overwrite file upon update]
 [Path:]
-[6]
 [Link Settings]
 [More Info URL]
 [Weather Map]
@@ -17683,6 +17662,9 @@
 [Text Files]
 [All Files]
 ;file \plugins\Weather\src\weather_conv.cpp
+[mb]
+[in]
+[mm]
 [<unknown time>]
 [<Error>]
 [HTTP Error %i]
@@ -17863,6 +17845,7 @@
 [%s had birthday yesterday.]
 [%s has birthday today (Should not happen, please report).]
 [Birthday - %s]
+[He]
 [She]
 [He/She]
 [%s\n%s will be %d years old.]
@@ -18011,7 +17994,6 @@
 [Browse ...]
 [Launcher exe (optional):]
 [Game id:]
-[?]
 [Send game id:]
 [Statusmessage for Xfire, if this game will be started:]
 [Parameter:]
@@ -18123,6 +18105,7 @@
 [Hidden]
 [Messagebox]
 [Popup]
+[No]
 [On every start]
 [Daily]
 [<Root Group>]
@@ -18200,6 +18183,7 @@
 ;file \protocols\Yahoo\src\chat.cpp
 [[miranda] Got conference invite to room: %s with msg: %s]
 [%s denied invitation with message: %s]
+[Me]
 [Others]
 [&Invite user...]
 [&Leave chat session]
@@ -18239,6 +18223,7 @@
 ;file \protocols\Yahoo\src\proto.cpp
 [New E-mail available in Inbox]
 [%s plugin connections]
+[ID]
 [Please enter your yahoo id in Options/Network/Yahoo]
 [Please enter your yahoo password in Options/Network/Yahoo]
 [Yahoo Login Error]
@@ -18328,10 +18313,8 @@
 [Message notification if failed]
 [Tray icon notification if failed]
 [Reset counter]
-[-]
 [Default]
 [Status:]
-[+]
 [Account]
 [APOP]
 [Name:]
diff --git a/langpacks/english/Plugins/AIM.txt b/langpacks/english/Plugins/AIM.txt
index 2b014c1614..6d4b867ccb 100644
--- a/langpacks/english/Plugins/AIM.txt
+++ b/langpacks/english/Plugins/AIM.txt
@@ -72,6 +72,7 @@
 [Message]
 [Room]
 ;file \protocols\AimOscar\src\chat.cpp
+[Me]
 [Others]
 [&Invite user...]
 [&Leave chat session]
diff --git a/langpacks/english/Plugins/AVS.txt b/langpacks/english/Plugins/AVS.txt
index 2102bb11b0..bd142bbdb0 100644
--- a/langpacks/english/Plugins/AVS.txt
+++ b/langpacks/english/Plugins/AVS.txt
@@ -64,7 +64,6 @@
 [Avatar]
 [Fatal error, image services not found. Avatar services will be disabled.]
 [Avatar Service]
-[Global avatar]
 ;file \plugins\AVS\src\options.cpp
 [Set avatar options for %s]
 [Delete picture file from disk (may be necessary to force a reload, but will delete local pictures)?]
diff --git a/langpacks/english/Plugins/AdvancedAutoAway.txt b/langpacks/english/Plugins/AdvancedAutoAway.txt
index 9001632c17..e3732aceff 100644
--- a/langpacks/english/Plugins/AdvancedAutoAway.txt
+++ b/langpacks/english/Plugins/AdvancedAutoAway.txt
@@ -53,11 +53,8 @@
 [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/AutoShutdown.txt b/langpacks/english/Plugins/AutoShutdown.txt
index 0a6d2ef895..47007153d9 100644
--- a/langpacks/english/Plugins/AutoShutdown.txt
+++ b/langpacks/english/Plugins/AutoShutdown.txt
@@ -27,7 +27,6 @@
 [Shutdown when Miranda NG becomes &idle]
 [Configure]
 [Shutdown when &prozessor usage drops below:]
-[%]
 [(current: 0%)]
 [Shutdown when all contacts are &offline]
 [Shutdown when all &file transfers are finished]
diff --git a/langpacks/english/Plugins/AvatarHistory.txt b/langpacks/english/Plugins/AvatarHistory.txt
index 124f56296e..bd07281a31 100644
--- a/langpacks/english/Plugins/AvatarHistory.txt
+++ b/langpacks/english/Plugins/AvatarHistory.txt
@@ -14,8 +14,6 @@
 [Avatar History]
 [Static]
 [Open Folder]
-[<]
-[>]
 [Store this user's old avatars in disk]
 [Log this user's avatars changes to history]
 [Show popups for this user]
diff --git a/langpacks/english/Plugins/BASS_interface.txt b/langpacks/english/Plugins/BASS_interface.txt
index e292cda3eb..b343119852 100644
--- a/langpacks/english/Plugins/BASS_interface.txt
+++ b/langpacks/english/Plugins/BASS_interface.txt
@@ -14,7 +14,6 @@
 [Output device:]
 [Volume:]
 [Quiet time:]
-[-]
 [download bass library]
 [Play only if]
 [Offline]
diff --git a/langpacks/english/Plugins/BasicHistory.txt b/langpacks/english/Plugins/BasicHistory.txt
index 27e3a4d979..119c7f4277 100644
--- a/langpacks/english/Plugins/BasicHistory.txt
+++ b/langpacks/english/Plugins/BasicHistory.txt
@@ -94,6 +94,7 @@
 [Default history events]
 [History for %s]
 [System]
+[Me]
 [Invalid Message]
 [Authorisation request by %s (%s%d): %s]
 ;file \plugins\BasicHistory\src\ExportManager.cpp
diff --git a/langpacks/english/Plugins/CSList.txt b/langpacks/english/Plugins/CSList.txt
index 182d533932..06dae6eb61 100644
--- a/langpacks/english/Plugins/CSList.txt
+++ b/langpacks/english/Plugins/CSList.txt
@@ -8,15 +8,6 @@
 [This plugin offers simple management functions to keep your extra statuses on one place.]
 ;file \plugins\CSList\res\cslist.rc
 [Custom Status List]
-[A]
-[M]
-[D]
-[F]
-[U]
-[I]
-[N]
-[C]
-[O]
 [No items available in the database.\nClick the Add button to define some.]
 [Add/Modify Custom Status]
 [Add/Modify]
diff --git a/langpacks/english/Plugins/ChangeKeyboardLayout.txt b/langpacks/english/Plugins/ChangeKeyboardLayout.txt
index bd8fe32c12..35cf20cc47 100644
--- a/langpacks/english/Plugins/ChangeKeyboardLayout.txt
+++ b/langpacks/english/Plugins/ChangeKeyboardLayout.txt
@@ -20,7 +20,6 @@
 [Strings for keyboard layouts]
 [EN]
 [Default]
-[+]
 [Invert current state]
 [Switch off]
 [Leave as it is]
diff --git a/langpacks/english/Plugins/Clist_blind.txt b/langpacks/english/Plugins/Clist_blind.txt
index b34601b43f..5cca476448 100644
--- a/langpacks/english/Plugins/Clist_blind.txt
+++ b/langpacks/english/Plugins/Clist_blind.txt
@@ -120,6 +120,7 @@
 [Offline]
 [Online]
 [Away]
+[NA]
 [Occupied]
 [DND]
 [Free for chat]
diff --git a/langpacks/english/Plugins/Clist_modern.txt b/langpacks/english/Plugins/Clist_modern.txt
index 4db74815d9..dbc186e6a0 100644
--- a/langpacks/english/Plugins/Clist_modern.txt
+++ b/langpacks/english/Plugins/Clist_modern.txt
@@ -73,8 +73,6 @@
 [W x H: 0 x 0 pixels]
 [Available view modes]
 [Include protocols]
-[+]
-[-]
 [New]
 [Include groups]
 [Show contacts in groups]
@@ -351,10 +349,10 @@
 [Changing MetaContacts (Moving)]
 [Do You want contact '%s' to be added to MetaContact '%s'?]
 ;file \plugins\Clist_modern\src\modern_clcopts.cpp
-[Contact List/Contact names]
-[Contact List/Row Items]
-[Contact List/Frame texts]
-[Contact List/Special colours]
+[Contact names]
+[Row Items]
+[Frame texts]
+[Special colours]
 [Standard contacts]
 [Away contacts]
 [DND contacts]
@@ -396,6 +394,7 @@
 [Offline]
 [Online]
 [Away]
+[NA]
 [Occupied]
 [DND]
 [Free for chat]
@@ -523,6 +522,7 @@
 ;file \plugins\Clist_modern\src\modern_viewmodebar.cpp
 [Ungrouped contacts]
 [And]
+[Or]
 [Older than]
 [Newer than]
 [Minutes]
diff --git a/langpacks/english/Plugins/Clist_mw.txt b/langpacks/english/Plugins/Clist_mw.txt
index 0bfaf8416a..d399c5a40f 100644
--- a/langpacks/english/Plugins/Clist_mw.txt
+++ b/langpacks/english/Plugins/Clist_mw.txt
@@ -121,7 +121,6 @@
 [Right click opens status menu]
 [Right click opens Miranda menu]
 [Make sections equal width]
-[-]
 [Show size grip]
 [Show bevel effect on panels]
 [Use connecting Icon]
@@ -180,6 +179,7 @@
 [Offline]
 [Online]
 [Away]
+[NA]
 [Occupied]
 [DND]
 [Free for chat]
diff --git a/langpacks/english/Plugins/Clist_nicer.txt b/langpacks/english/Plugins/Clist_nicer.txt
index ea7cf53e28..5d1937d90f 100644
--- a/langpacks/english/Plugins/Clist_nicer.txt
+++ b/langpacks/english/Plugins/Clist_nicer.txt
@@ -188,8 +188,6 @@
 [Mark protocols locked from global status changes]
 [Available view modes]
 [Include protocols]
-[+]
-[-]
 [New]
 [Include groups]
 [Include status modes]
@@ -337,6 +335,7 @@
 [Offline]
 [Online]
 [Away]
+[NA]
 [Occupied]
 [DND]
 [Free for chat]
@@ -429,6 +428,7 @@
 ;file \plugins\Clist_nicer\src\viewmodes.cpp
 [Ungrouped contacts]
 [And]
+[Or]
 [Older than]
 [Newer than]
 [Minutes]
diff --git a/langpacks/english/Plugins/Contacts.txt b/langpacks/english/Plugins/Contacts.txt
index bc17ebe55b..1b9c32cdcc 100644
--- a/langpacks/english/Plugins/Contacts.txt
+++ b/langpacks/english/Plugins/Contacts.txt
@@ -9,7 +9,6 @@
 ;file \plugins\ContactsPlus\res\contacts.rc
 [Send contacts]
 [&A]
-[6]
 [&D]
 [&H]
 [Choose contacts to be send:]
diff --git a/langpacks/english/Plugins/GG.txt b/langpacks/english/Plugins/GG.txt
index 01b89586a8..e32c0999f6 100644
--- a/langpacks/english/Plugins/GG.txt
+++ b/langpacks/english/Plugins/GG.txt
@@ -105,6 +105,7 @@
 [List import successful.]
 [List remove successful.]
 [List export successful.]
+[Me]
 [Unknown client]
 [You have logged in at another location]
 [You are logged in at another location]
diff --git a/langpacks/english/Plugins/HTTPServer.txt b/langpacks/english/Plugins/HTTPServer.txt
index 81e47b3dcf..456aff5535 100644
--- a/langpacks/english/Plugins/HTTPServer.txt
+++ b/langpacks/english/Plugins/HTTPServer.txt
@@ -35,7 +35,6 @@
 [Total connection limit]
 [Connections per user limit]
 [Default download limit]
-[1]
 [&Edit share]
 [&Remove share]
 [&Open in Browser]
diff --git a/langpacks/english/Plugins/IRC.txt b/langpacks/english/Plugins/IRC.txt
index 2bee99c8f1..ce98d4c73d 100644
--- a/langpacks/english/Plugins/IRC.txt
+++ b/langpacks/english/Plugins/IRC.txt
@@ -63,7 +63,6 @@
 [Away Info]
 [The server returned the following information. Please note that this information might be misleading and/or falsified]
 [CTCP information]
-[-]
 [Question]
 [&OK]
 [&Cancel]
@@ -87,9 +86,7 @@
 [Filter by]
 [C&onnect]
 [&Save]
-[@]
 [Hostmask]
-[!]
 [&Clear all]
 [Online detection mode]
 [Basic]
diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index 9914604b54..1570bedd40 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -18,7 +18,6 @@
 [Resource:]
 [Register new user]
 [Use custom connection host and port:]
-[:]
 [Use Domain Login]
 [Go]
 [Search service]
@@ -293,6 +292,7 @@
 [&Send presence]
 [Online]
 [Away]
+[NA]
 [DND]
 [Free for chat]
 [&Leave chat session]
@@ -453,6 +453,7 @@
 ;file \protocols\JabberG\src\jabber_message_handlers.cpp
 ;file \protocols\JabberG\src\jabber_misc.cpp
 [CHAT plugin is required for conferences. Install it before chatting]
+[To]
 [From]
 [Both]
 [Errors]
@@ -669,12 +670,14 @@
 [Miranda NG core version]
 [Unicode build]
 [Yes]
+[No]
 [Alpha build]
 [Debug build]
 [Mood]
 [Activity]
 [Tune]
 [both]
+[to]
 [none]
 [Last logoff time]
 [Uptime]
diff --git a/langpacks/english/Plugins/KeepStatus.txt b/langpacks/english/Plugins/KeepStatus.txt
index 808df64f34..27ffe5585f 100644
--- a/langpacks/english/Plugins/KeepStatus.txt
+++ b/langpacks/english/Plugins/KeepStatus.txt
@@ -53,11 +53,8 @@
 [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/MRA.txt b/langpacks/english/Plugins/MRA.txt
index 7f1578a213..6fb647a783 100644
--- a/langpacks/english/Plugins/MRA.txt
+++ b/langpacks/english/Plugins/MRA.txt
@@ -31,7 +31,6 @@
 [Nickname:]
 [First name:]
 [Last name:]
-[@]
 [Gender:]
 [Age:]
 [from:]
diff --git a/langpacks/english/Plugins/MSN.txt b/langpacks/english/Plugins/MSN.txt
index a68d9b5605..65ca7dda17 100644
--- a/langpacks/english/Plugins/MSN.txt
+++ b/langpacks/english/Plugins/MSN.txt
@@ -65,6 +65,7 @@
 [Add]
 ;file \protocols\MSN\src\msn_chat.cpp
 [Chat #]
+[Me]
 [Others]
 [&Invite user...]
 [&Leave chat session]
diff --git a/langpacks/english/Plugins/MetaContacts.txt b/langpacks/english/Plugins/MetaContacts.txt
index 201bb3f0e1..fac14c1b24 100644
--- a/langpacks/english/Plugins/MetaContacts.txt
+++ b/langpacks/english/Plugins/MetaContacts.txt
@@ -76,7 +76,9 @@
 ;file \plugins\MetaContacts\src\edit.cpp
 [(Unknown Contact)]
 [Yes]
+[No]
 [Contact]
+[Id]
 [Protocol]
 [Send Offline]
 [Delete MetaContact?]
diff --git a/langpacks/english/Plugins/MirOTR.txt b/langpacks/english/Plugins/MirOTR.txt
index 16955bc58b..2d2de184b1 100644
--- a/langpacks/english/Plugins/MirOTR.txt
+++ b/langpacks/english/Plugins/MirOTR.txt
@@ -52,6 +52,7 @@
 [Start OTR]
 [Stop OTR]
 [Yes]
+[No]
 [OTR status (Click for more options)]
 [OTR Encryption: Disabled]
 [OTR Encryption: UNVERIFIED]
diff --git a/langpacks/english/Plugins/ModernOpt.txt b/langpacks/english/Plugins/ModernOpt.txt
index d2100dcc9c..33d7179b82 100644
--- a/langpacks/english/Plugins/ModernOpt.txt
+++ b/langpacks/english/Plugins/ModernOpt.txt
@@ -2,7 +2,6 @@
 ;langpack template for ModernOpt
 ;file \plugins\ModernOpt\res\resource.rc
 [Visit official Miranda NG website]
-[`]
 [Sample page]
 [Miranda NG Options]
 [Use arrow keys to choose category]
diff --git a/langpacks/english/Plugins/Msg_Export.txt b/langpacks/english/Plugins/Msg_Export.txt
index b207d4df09..71bdbe7669 100644
--- a/langpacks/english/Plugins/Msg_Export.txt
+++ b/langpacks/english/Plugins/Msg_Export.txt
@@ -40,7 +40,6 @@
 [User &Details]
 [Export selected]
 [Set to default filename]
-[1]
 [Copy]
 ;file \plugins\Msg_Export\src\FileViewer.cpp
 [Failed to write to the RichEdit the buffer was to small.]
diff --git a/langpacks/english/Plugins/NewsAggregator.txt b/langpacks/english/Plugins/NewsAggregator.txt
index 3613d39d24..f2dbc61a54 100644
--- a/langpacks/english/Plugins/NewsAggregator.txt
+++ b/langpacks/english/Plugins/NewsAggregator.txt
@@ -29,7 +29,6 @@
 [Display news using the following format:]
 [All item's tags are valid. Put them between #. Example: #<author>#]
 [Reset]
-[?]
 [0 - check manually]
 ;file \plugins\NewsAggregator\Src\Icons.cpp
 [Protocol icon]
diff --git a/langpacks/english/Plugins/Nudge.txt b/langpacks/english/Plugins/Nudge.txt
index 73d60d8de3..05168d51a0 100644
--- a/langpacks/english/Plugins/Nudge.txt
+++ b/langpacks/english/Plugins/Nudge.txt
@@ -9,7 +9,6 @@
 [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/PopUp.txt b/langpacks/english/Plugins/PopUp.txt
index b4250e1884..d036a9e663 100644
--- a/langpacks/english/Plugins/PopUp.txt
+++ b/langpacks/english/Plugins/PopUp.txt
@@ -42,7 +42,6 @@
 [Time (out):]
 [Limit window amount to:]
 [Skins]
-[R]
 [* - built-in skins]
 [Skin options]
 [Preview]
@@ -141,8 +140,6 @@
 [Enable &popup module]
 [Disable &popup module]
 [Error: I could not register the PopUp Window class.\r\nThe plugin will not operate.]
-[PopUps]
-[PopUp]
 ;file \plugins\Popup\src\opt_adv.cpp
 [No effect]
 [Fade in/out]
diff --git a/langpacks/english/Plugins/QuickMessages.txt b/langpacks/english/Plugins/QuickMessages.txt
index 32829bb564..59a67039c0 100644
--- a/langpacks/english/Plugins/QuickMessages.txt
+++ b/langpacks/english/Plugins/QuickMessages.txt
@@ -1,8 +1,6 @@
 #muuid {37ed754b-6cf9-40ed-9eb6-0fef8e822475}
 ;langpack template for QuickMessages
 ;file \plugins\QuickMessages\res\quickmessages.rc
-[+]
-[-]
 [Button Right-Click value]
 [Button Left-Click menu]
 [Buttons]
@@ -14,7 +12,6 @@
 [Enable QuickMenu]
 [Consider as ServiceName]
 [You have changed the plugin settings via database.\nThis requires restart!]
-[?]
 [Quick Messages Help]
 [- Selected text]
 [List of variables:]
diff --git a/langpacks/english/Plugins/Scriver.txt b/langpacks/english/Plugins/Scriver.txt
index affd5415d3..1e7a2003d3 100644
--- a/langpacks/english/Plugins/Scriver.txt
+++ b/langpacks/english/Plugins/Scriver.txt
@@ -260,6 +260,7 @@
 [Last message received on %s at %s.]
 ;file \plugins\Scriver\src\msglog.cpp
 [Unknown Contact]
+[Me]
 [O Lord, bless this Thy hand grenade that with it Thou mayest blow Thine enemies]
 [to tiny bits, in Thy mercy]
 [My Contact]
@@ -318,6 +319,7 @@
 [Offline]
 [Online]
 [Away]
+[NA]
 [Occupied]
 [DND]
 [Free for chat]
diff --git a/langpacks/english/Plugins/SecureIM.txt b/langpacks/english/Plugins/SecureIM.txt
index 7718298bbd..a5093a50da 100644
--- a/langpacks/english/Plugins/SecureIM.txt
+++ b/langpacks/english/Plugins/SecureIM.txt
@@ -127,6 +127,7 @@
 [Nickname]
 [Name]
 [Password is too short!]
+[ON]
 [Off]
 [Keyrings loaded.]
 [Keyrings not loaded!]
diff --git a/langpacks/english/Plugins/SendSS.txt b/langpacks/english/Plugins/SendSS.txt
index 62d0340598..b2dd49f8f2 100644
--- a/langpacks/english/Plugins/SendSS.txt
+++ b/langpacks/english/Plugins/SendSS.txt
@@ -18,7 +18,6 @@
 [Time (secs) :]
 [&Format :]
 [Send B&y :]
-[?]
 [E&xplore]
 [&Fill description textbox.]
 [Delete &after send]
@@ -74,6 +73,7 @@
 ;file \plugins\SendScreenshotPlus\src\dlg_msgbox.cpp
 [Retry]
 [Yes]
+[No]
 [Abord]
 [Ignore]
 ;file \plugins\SendScreenshotPlus\src\global.h
diff --git a/langpacks/english/Plugins/SmileyAdd.txt b/langpacks/english/Plugins/SmileyAdd.txt
index d92781719d..6aac4bc729 100644
--- a/langpacks/english/Plugins/SmileyAdd.txt
+++ b/langpacks/english/Plugins/SmileyAdd.txt
@@ -13,8 +13,6 @@
 [Author:]
 [Version:]
 [Preview]
-[+]
-[-]
 [Display]
 [Replace only smileys surrounded by spaces]
 [Scale smiley to textheight]
diff --git a/langpacks/english/Plugins/StartupStatus.txt b/langpacks/english/Plugins/StartupStatus.txt
index 4f69ea69e2..f211ab67b1 100644
--- a/langpacks/english/Plugins/StartupStatus.txt
+++ b/langpacks/english/Plugins/StartupStatus.txt
@@ -53,11 +53,8 @@
 [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/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index f71e2f2c07..38473aff3f 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -771,6 +771,12 @@
 [Frame 2]
 [Frame 3]
 [Frame 4]
+[Toolbar]
+[Message Log]
+[Animated Tray]
+[Clock symbol (for the info panel clock)]
+[Feature disabled (used as overlay)]
+[Feature enabled (used as overlay)]
 ;file \plugins\TabSRMM\src\selectcontainer.cpp
 [Select container for %s]
 [You cannot delete the default container]
@@ -912,8 +918,6 @@
 ;file \plugins\TabSRMM\src\typingnotify.cpp
 [Disable &typing notification]
 [Enable &typing notification]
-[Warning: Popup plugin not found.]
-[Warning: Current Popup plugin version is not supported.]
 [...is typing a message.]
 [...has stopped typing.]
 [Contact started typing]
@@ -925,7 +929,6 @@
 [Force History++]
 [Force IEView]
 [Set messaging options for %s]
-[Message Log]
 ;file \plugins\TabSRMM\src\utils.cpp
 [Important release notes|A test warning message]
 [Icon pack version check|The installed icon pack is outdated and might be incompatible with TabSRMM version 3.\n\n\\b1Missing or misplaced icons are possible issues with the currently installed icon pack.\\b0]
@@ -965,29 +968,26 @@
 [Add user to highlight list]
 [Edit user highlight list]
 ;file \plugins\TabSRMM\src\chat\options.cpp
-[TabSRMM/Group Chats]
 [Group chat log background]
-[TabSRMM]
 [Input area background]
 [Log background]
-[TabSRMM/Single Messaging]
+[Single Messaging]
 [Outgoing background]
 [Incoming background]
 [Status background]
 [Incoming background(old)]
 [Outgoing background(old)]
 [Horizontal Grid Lines]
-[TabSRMM/Info Panel]
+[Info Panel]
 [Panel background low]
 [Panel background high]
-[TabSRMM/Common colors]
+[Common colors]
 [Toolbar background high]
 [Toolbar background low]
 [Window fill color]
 [Text area borders]
 [Aero glow effect]
 [Generic text color (only when fill color is set)]
-[TabSRMM/Tabs]
 [Normal text]
 [Active text]
 [Hovered text]
@@ -1093,6 +1093,8 @@
 [Topic (10x10)]
 [Highlight (10x10)]
 [Information (10x10)]
+[Group chat windows]
+[Group chat log]
 [Appearance and functionality of chat room windows]
 [Appearance of the message log]
 [Channel operators]
@@ -1103,6 +1105,8 @@
 [Selection background]
 [Selected text]
 [Incremental search highlight]
+[Fields background]
+[Userlist background]
 [nick of current contact (if defined)]
 [protocol name of current contact (if defined). Account name is used when protocol supports multiaccounts]
 [UserID of current contact (if defined). It is like UIN Number for ICQ, JID for Jabber, etc.]
diff --git a/langpacks/english/Plugins/Tipper.txt b/langpacks/english/Plugins/Tipper.txt
index e97a184871..6b2ce29179 100644
--- a/langpacks/english/Plugins/Tipper.txt
+++ b/langpacks/english/Plugins/Tipper.txt
@@ -180,6 +180,7 @@
 [%sys:uidname|UID^!MetaContacts%:]
 [Idle]
 [Idle:]
+[IP]
 [IP:]
 [IP internal]
 [IP internal:]
diff --git a/langpacks/english/Plugins/Tlen.txt b/langpacks/english/Plugins/Tlen.txt
index a246687776..99de756945 100644
--- a/langpacks/english/Plugins/Tlen.txt
+++ b/langpacks/english/Plugins/Tlen.txt
@@ -111,6 +111,7 @@
 [<Ask me>]
 [Online]
 [Away]
+[NA]
 [DND]
 [Free for chat]
 [Invisible]
diff --git a/langpacks/english/Plugins/TooltipNotify.txt b/langpacks/english/Plugins/TooltipNotify.txt
index c14cb11cdc..dd48a219cc 100644
--- a/langpacks/english/Plugins/TooltipNotify.txt
+++ b/langpacks/english/Plugins/TooltipNotify.txt
@@ -55,3 +55,4 @@
 [Invisible]
 [Not Idle]
 [Unknown]
+[is]
diff --git a/langpacks/english/Plugins/TrafficCounter.txt b/langpacks/english/Plugins/TrafficCounter.txt
index d80320d1cb..262f575bbf 100644
--- a/langpacks/english/Plugins/TrafficCounter.txt
+++ b/langpacks/english/Plugins/TrafficCounter.txt
@@ -9,7 +9,6 @@
 [Selected totals]
 [Accounts]
 [Units]
-[0]
 [Clear statistics]
 [Notification]
 [Notify me on every]
@@ -29,6 +28,8 @@
 [Display traffic for current]
 ;file \plugins\TrafficCounter\src\statistics.c
 [Bytes]
+[KB]
+[MB]
 [Adaptive]
 [Hourly]
 [Daily]
diff --git a/langpacks/english/Plugins/UInfoEx.txt b/langpacks/english/Plugins/UInfoEx.txt
index a83d053dd6..f71e4aa508 100644
--- a/langpacks/english/Plugins/UInfoEx.txt
+++ b/langpacks/english/Plugins/UInfoEx.txt
@@ -71,7 +71,6 @@
 [Play sound]
 [Use ignore list]
 [Birthday popup colours]
-[r]
 [Background colour]
 [Text colour]
 [Use Windows colours]
@@ -97,7 +96,6 @@
 [Upcoming anniversaries\nThis list gives you some overview about all your contact's anniversaries.]
 [Statistics:]
 [with birthday:]
-[0]
 [female:]
 [male:]
 [number of contacts:]
@@ -206,7 +204,6 @@
 [Creating unique name for a page failed with %d and error code %d]
 [Creating the label for a page failed with %d and error code %d]
 [The dialog template type is no longer supported]
-[UserInfoEx/TreeView]
 ;file \plugins\UserInfoEx\src\ctrl_annivedit.cpp
 [Add a new anniversary]
 [Delete an existing anniversary]
@@ -240,6 +237,7 @@
 ;file \plugins\UserInfoEx\src\dlg_msgbox.cpp
 [Retry]
 [Yes]
+[No]
 [Abord]
 [Ignore]
 [Error]
@@ -287,7 +285,6 @@
 [&Export Group]
 [&Import Group]
 [Ex-/Import]
-[Extended UserInfo]
 ;file \plugins\UserInfoEx\src\psp_about.cpp
 [My Notes:]
 [About:]
@@ -304,8 +301,6 @@
 [Tertiary e-mail]
 [Address & Contact]
 [Company]
-[Fax]
-[Cellular]
 ;file \plugins\UserInfoEx\src\psp_options.cpp
 [Question]
 [This will delete all settings, you've made!\nAll TreeView settings, window positions and any other settings!\n\nAre you sure to procceed?]
@@ -532,6 +527,7 @@
 ;file \plugins\UserInfoEx\src\svc_reminder.cpp
 [%s has %s today.]
 [an anniversary]
+[He]
 [She]
 [He/She]
 [%s has the following anniversaries:\0]
diff --git a/langpacks/english/Plugins/Weather.txt b/langpacks/english/Plugins/Weather.txt
index b929011a1d..ed54d78217 100644
--- a/langpacks/english/Plugins/Weather.txt
+++ b/langpacks/english/Plugins/Weather.txt
@@ -45,7 +45,6 @@
 [3 chars]
 [Elevation]
 [ft]
-[m]
 [Do not append units to values]
 [Do not display fractional values]
 [Frame]
@@ -59,7 +58,6 @@
 [Use external file]
 [Overwrite file upon update]
 [Path:]
-[6]
 [Link Settings]
 [More Info URL]
 [Weather Map]
@@ -191,6 +189,9 @@
 [Text Files]
 [All Files]
 ;file \plugins\Weather\src\weather_conv.cpp
+[mb]
+[in]
+[mm]
 [<unknown time>]
 [<Error>]
 [HTTP Error %i]
diff --git a/langpacks/english/Plugins/WhenWasIt.txt b/langpacks/english/Plugins/WhenWasIt.txt
index 49bb3cc7d1..030f2a485d 100644
--- a/langpacks/english/Plugins/WhenWasIt.txt
+++ b/langpacks/english/Plugins/WhenWasIt.txt
@@ -101,6 +101,7 @@
 [%s had birthday yesterday.]
 [%s has birthday today (Should not happen, please report).]
 [Birthday - %s]
+[He]
 [She]
 [He/She]
 [%s\n%s will be %d years old.]
diff --git a/langpacks/english/Plugins/Xfire.txt b/langpacks/english/Plugins/Xfire.txt
index 0aad7b86da..1ad62ba440 100644
--- a/langpacks/english/Plugins/Xfire.txt
+++ b/langpacks/english/Plugins/Xfire.txt
@@ -84,7 +84,6 @@
 [Browse ...]
 [Launcher exe (optional):]
 [Game id:]
-[?]
 [Send game id:]
 [Statusmessage for Xfire, if this game will be started:]
 [Parameter:]
@@ -196,6 +195,7 @@
 [Hidden]
 [Messagebox]
 [Popup]
+[No]
 [On every start]
 [Daily]
 [<Root Group>]
diff --git a/langpacks/english/Plugins/YAMN.txt b/langpacks/english/Plugins/YAMN.txt
index ec27e57ccb..ea974bf59c 100644
--- a/langpacks/english/Plugins/YAMN.txt
+++ b/langpacks/english/Plugins/YAMN.txt
@@ -42,10 +42,8 @@
 [Message notification if failed]
 [Tray icon notification if failed]
 [Reset counter]
-[-]
 [Default]
 [Status:]
-[+]
 [Account]
 [APOP]
 [Name:]
diff --git a/langpacks/english/Plugins/Yahoo.txt b/langpacks/english/Plugins/Yahoo.txt
index d04a85dfa3..611db0d3f9 100644
--- a/langpacks/english/Plugins/Yahoo.txt
+++ b/langpacks/english/Plugins/Yahoo.txt
@@ -52,6 +52,7 @@
 ;file \protocols\Yahoo\src\chat.cpp
 [[miranda] Got conference invite to room: %s with msg: %s]
 [%s denied invitation with message: %s]
+[Me]
 [Others]
 [&Invite user...]
 [&Leave chat session]
@@ -91,6 +92,7 @@
 ;file \protocols\Yahoo\src\proto.cpp
 [New E-mail available in Inbox]
 [%s plugin connections]
+[ID]
 [Please enter your yahoo id in Options/Network/Yahoo]
 [Please enter your yahoo password in Options/Network/Yahoo]
 [Yahoo Login Error]