- lpgen.js: updated

- langpacks/english: updated

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

102 files changed, 119 insertions, 1584 deletions

diff --git a/langpacks/english/Plugins/AIM.txt b/langpacks/english/Plugins/AIM.txt
index b39550268b..0c9f6f6b73 100644
--- a/langpacks/english/Plugins/AIM.txt
+++ b/langpacks/english/Plugins/AIM.txt
@@ -5,7 +5,7 @@
 ;  Version: 0.11.0.1

 ;  Authors: Boris Krasnovskiy, Aaron Myles Landwehr

 ;============================================================

-[Provides support for AOL Instant Messenger (AIM) protocol.]

+[AOL Instant Messenger (AIM) protocol support for Miranda NG.]

 ;file \protocols\AimOscar\res\aim.rc

 [AIM User Details]

 [Screen Name:]

@@ -74,7 +74,6 @@
 [.jpg]

 [%%miranda_avatarcache%%\\%s]

 [%miranda_avatarcache%]

-[%s\\%s]

 [\\%s]

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

 [Others]

@@ -147,16 +146,10 @@
 [DNS Fail.]

 ;file \protocols\AimOscar\src\file.cpp

 [Failed to open file: %s : %s]

-[%s%s]

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

 [addbuddy?]

-[screenname=]

-[groupname=]

 [goim?]

-[message=]

 [gochat?]

-[roomname=]

-[exchange=]

 [AIM Link Protocol]

 ;file \protocols\AimOscar\src\popup.cpp

 [%s Protocol]

@@ -166,7 +159,6 @@
 [%s server connection]

 [%s Client-to-client connection]

 ;file \protocols\AimOscar\src\server.cpp

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

@@ -238,6 +230,4 @@
 [Please, enter a password in the options dialog.]

 [%miranda_userdata%]

 [Failed to open file: %s %s]

-[away.html]

 [open]

-[profile.html]

diff --git a/langpacks/english/Plugins/AVS.txt b/langpacks/english/Plugins/AVS.txt
index c6923d2c03..f471908707 100644
--- a/langpacks/english/Plugins/AVS.txt
+++ b/langpacks/english/Plugins/AVS.txt
@@ -44,7 +44,6 @@
 ;file \plugins\AVS\src\acc.cpp

 [Protocols have different avatars]

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

-[%s\\%s]

 [AVS-HASH-%x]

 [%s@%s]

 [SHELLDLL_DefView]

@@ -59,36 +58,21 @@
 [.jpeg]

 [.rle]

 [All Files]

-[ (*.bmp;*.jpg;*.gif;*.png]

-[;*.swf]

-[;*.xml]

-[*.BMP;*.RLE;*.JPG;*.JPEG;*.GIF;*.PNG]

-[;*.SWF]

-[;*.XML]

 [Windows Bitmaps]

 [ (*.bmp;*.rle)]

-[*.BMP;*.RLE]

 [JPEG Bitmaps]

 [ (*.jpg;*.jpeg)]

-[*.JPG;*.JPEG]

 [GIF Bitmaps]

 [ (*.gif)]

-[*.GIF]

 [PNG Bitmaps]

 [ (*.png)]

-[*.PNG]

 [Flash Animations]

 [ (*.swf)]

-[*.SWF]

 [XML Files]

 [ (*.xml)]

-[*.XML]

 [GlobalAvatar]

-[%s\\my_global_avatar%s]

-[%s\\my_global_avatar.png]

 [Set My Avatar]

 [Set My Avatar for %s]

-[%s%s]

 [mir_av_]

 [Global avatar for %s accounts]

 [avs_loaderthread_%d]

@@ -100,7 +84,6 @@
 [Own Avatars]

 [Avatar]

 [gdi32]

-[msimg32.dll]

 [%miranda_userdata%]

 [Fatal error, image services not found. Avatar services will be disabled.]

 [Avatar Service]

diff --git a/langpacks/english/Plugins/AdvancedAutoAway.txt b/langpacks/english/Plugins/AdvancedAutoAway.txt
index 5667477925..0c04e71960 100644
--- a/langpacks/english/Plugins/AdvancedAutoAway.txt
+++ b/langpacks/english/Plugins/AdvancedAutoAway.txt
@@ -11,5 +11,4 @@
 [General]

 [Rules]

 [Status Messages]

-[uxtheme.dll]

 [Auto Away]

diff --git a/langpacks/english/Plugins/Alarms.txt b/langpacks/english/Plugins/Alarms.txt
index 42583744d6..d44a0f05c6 100644
--- a/langpacks/english/Plugins/Alarms.txt
+++ b/langpacks/english/Plugins/Alarms.txt
@@ -75,9 +75,7 @@
 [Title]

 [Background]

 [Window]

-[user32.dll]

 ;file \plugins\Alarms\src\frame.cpp

-[LISTBOX]

 [%dh %dm]

 [%dm]

 [Events]

diff --git a/langpacks/english/Plugins/AssocMgr.txt b/langpacks/english/Plugins/AssocMgr.txt
index 9a57e6c30a..12a146dd1e 100644
--- a/langpacks/english/Plugins/AssocMgr.txt
+++ b/langpacks/english/Plugins/AssocMgr.txt
@@ -35,46 +35,33 @@
 [MirandaDdeMsgWindow]

 [file]

 [url]

-[miranda32.exe]

 ;file \plugins\AssocMgr\src\dde.h

 [Miranda]

 [OpenAssoc]

 [url,"%l"]

 [file,"%1"]

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

-[AssocMgr-Readme.txt]

 [Docs\\]

-[AssocMgr-License.txt]

-[AssocMgr-SDK.zip]

 ;file \plugins\AssocMgr\src\reg.cpp

 [Access failed:\n%.64hs(%.128s)\n%.250hs(%u)\n%.256hs (%u)]

 [Registry Warning]

-["%s" "%hs"]

-[rundll32.exe %s,WaitForDDE "%hs"]

+[rundll32.exe %s,WaitForDDE "/profile:%s"]

 [.exe]

-[rundll32.exe]

-[rundll.exe]

 [.dll]

 [%s,%i]

-[Opera.exe]

 [Path]

-[\\operadef6.ini]

 [System]

 [Multi User]

 [%APPDATA%\\Opera]

-[\\profile\\opera6.ini]

 [Trusted Protocols]

-[1,0,]

 [File Types Section Info]

 [Version]

-[4,,,,%.15hs,|%.128s (%.16hs)]

 [File Types]

 [File Types Extension]

 [Software\\Classes]

 [URL:]

 [DefaultIcon]

 [URL Protocol]

-[CLSID]

 [EditFlags]

 [shell]

 [open]

diff --git a/langpacks/english/Plugins/AutoRun.txt b/langpacks/english/Plugins/AutoRun.txt
index 45d1aed4bf..8fbcf3dd3b 100644
--- a/langpacks/english/Plugins/AutoRun.txt
+++ b/langpacks/english/Plugins/AutoRun.txt
@@ -13,6 +13,5 @@
 ;file \plugins\AutoRun\src\autorun.h

 [Software\\Microsoft\\Windows\\CurrentVersion\\Run]

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

-["%s" "%s"]

 [MirandaNG]

 [Services]

diff --git a/langpacks/english/Plugins/AutoShutdown.txt b/langpacks/english/Plugins/AutoShutdown.txt
index 06bbb16982..27fac413a5 100644
--- a/langpacks/english/Plugins/AutoShutdown.txt
+++ b/langpacks/english/Plugins/AutoShutdown.txt
@@ -1,7 +1,7 @@
 #muuid {9de24579-5c5c-49aa-80e8-4d38e4344e63}

 ;============================================================

 ;  File: AutoShutdown.dll

-;  Plugin: AutoShutdown

+;  Plugin: Auto shutdown

 ;  Version: 1.4.0.2

 ;  Authors: H. Herkenrath

 ;============================================================

@@ -82,13 +82,11 @@
 [NoLogOff]

 [Software\\Microsoft\\Windows\\CurrentVersion\\Policies\\System]

 [DisableLockWorkstation]

-[LOGIN.SCR]

 [RASAPI32]

 [.DLL]

 [Control Panel\\Desktop]

 [ScreenSaveActive]

 [ScreenSaverIsSecure]

-[SCRNSAVE.EXE]

 [Automatic Shutdown Error]

 [The shutdown process failed!\nReason: %s]

 [Unknown]

@@ -111,7 +109,7 @@
 [Hibernate mode]

 [Lock workstation]

 [Hang up dialup connections]

-[Sets all Miranda NG protocols to offline and closes Miranda IM.]

+[Sets all Miranda NG protocols to offline and closes Miranda NG.]

 [Sets all Miranda NG protocols to offline.]

 [Logs the current Windows user off so that another user can log in.]

 [Shuts down Windows and then restarts Windows.]

diff --git a/langpacks/english/Plugins/AvatarHistory.txt b/langpacks/english/Plugins/AvatarHistory.txt
index d7e00fa2f2..c346a57813 100644
--- a/langpacks/english/Plugins/AvatarHistory.txt
+++ b/langpacks/english/Plugins/AvatarHistory.txt
@@ -60,9 +60,6 @@
 [Are you sure you wish to delete this archived avatar?\nThis will delete the shortcut and the bitmap file.\nWARNING:This can affect more than one shortcut!]

 [explore]

 [open]

-[%s\\*.lnk]

-[%s\\%s]

-[d s]

 [avatar path is null.]

 [View Avatar History]

 [Save Avatar for %s]

@@ -71,10 +68,8 @@
 [Avatar History]

 [Contact changed avatar]

 [Contact removed avatar]

-[%s\\Avatars History]

 [Avatars]

 [\\Avatars History]

-[%s.%s.lnk]

 [Avatar History: Unable to create shortcut]

 [AVH Debug: Shortcut created successfully]

 [%s.%s]

@@ -87,7 +82,6 @@
 [Hashes are the same... skipping]

 [Avatar History: Unable to save avatar]

 [AVH Debug: File copied successfully]

-[%s\\%s.*]

 [.png]

 [.bmp]

 [.gif]

@@ -96,12 +90,10 @@
 [Unknown UIN]

 [GetHistoryFolder]

 [Unknown Protocol]

-[%s\\]

 [CreateDirectory]

 [Path: %s\nProto: ]

 [\nUIN: %s]

 [AVH Debug: GetContactFolder]

-[%s\\%04d-%02d-%02d %02dh%02dm%02ds]

 [AVH Debug: GetOldStyleAvatarName]

 [CreateShortcut]

 ;file \plugins\AvatarHistory\src\AvatarHistory.h

@@ -122,5 +114,4 @@
 [Test description]

 ;file \plugins\AvatarHistory\src\popup.cpp

 [static]

-[_PopupWindow]

 [ Error]

diff --git a/langpacks/english/Plugins/BASS_interface.txt b/langpacks/english/Plugins/BASS_interface.txt
index deee998958..b11b2a9953 100644
--- a/langpacks/english/Plugins/BASS_interface.txt
+++ b/langpacks/english/Plugins/BASS_interface.txt
@@ -19,9 +19,9 @@
 ;file \plugins\BASS_interface\src\Main.cpp

 [HH:mm]

 [un4seen's bass version: %d.%d.%d.%d]

-[--default device--]

 [Audio device is opened]

 [Audio device is closed]

 [Customize]

 [Open/close audio device]

-[Plugins\\Bass\\Bass.dll]

+[BassInterfaceFrame]

+[Bass Interface]

diff --git a/langpacks/english/Plugins/BasicHistory.txt b/langpacks/english/Plugins/BasicHistory.txt
index 8b809134d1..c8d3b8c689 100644
--- a/langpacks/english/Plugins/BasicHistory.txt
+++ b/langpacks/english/Plugins/BasicHistory.txt
@@ -86,19 +86,14 @@
 [Find Previous]

 [Plus in export]

 [Minus in export]

-[\\WinSCP\\WinSCP.exe]

-[%miranda_logpath%\\BasicHistory\\ftplog.txt]

 [History]

 ;file \plugins\BasicHistory\src\BinaryExport.h

 [bin]

-;file \plugins\BasicHistory\src\DatExport.h

-[dat]

 ;file \plugins\BasicHistory\src\EventList.cpp

 [All events]

 [Default history events]

 [History for %s]

 [System]

-[d t]

 [Invalid Message]

 [Authorisation request by %s (%s%d): %s]

 [%016llx]

@@ -110,7 +105,6 @@
 [<ext>]

 [File do not contain selected contact]

 [File is corrupted]

-[d s]

 ;file \plugins\BasicHistory\src\HistoryWindow.cpp

 [This operation will PERMANENTLY REMOVE all history for this contact.\nAre you sure you want to do this?]

 [Are You sure?]

@@ -124,13 +118,6 @@
 [Reply &Quoted]

 [Delete Group]

 [Options]

-[d s ]

-[d s\n]

-[d t ]

-[d t\n]

-[s\n]

-[t\n]

-[%s\n]

 [Filters]

 [Fonts & Colors]

 [Icons]

@@ -156,34 +143,12 @@
 [Contacts recieved]

 [SMTP Simple Email]

 [SMS message]

-[UTF-8]

-[windows-1250]

-[windows-1251]

-[windows-1252]

-[windows-1253]

-[windows-1254]

-[windows-1255]

-[windows-1256]

-[windows-1257]

-[windows-1258]

-[iso-8859-1]

-[iso-8859-2]

-[iso-8859-3]

-[iso-8859-4]

-[iso-8859-5]

-[iso-8859-6]

-[iso-8859-7]

-[iso-8859-8]

-[iso-8859-9]

-[iso-8859-13]

-[iso-8859-15]

 [Group list]

 [Messages]

 [Searching]

 [Scheduler]

 [Advanced]

 [>> Outgoing timestamp]

-[MS Shell Dlg 2]

 [Outgoing background]

 [<< Incoming timestamp]

 [Incoming background]

@@ -219,16 +184,11 @@
 [Enter filter name]

 [Filter name exists]

 [Event already exists]

-[WinSCP.exe]

-[exe]

 [Browse WinSCP file]

-[ftplog.txt]

-[txt]

 [Save WinSCP log file]

 [%d;%s]

 [You've entered invalid codepage. Select codepage from combo box or enter correct number.]

 [Invalid codepage]

-[css]

 [Browse CSS file]

 [Export and Delete]

 [Import and Marge]

@@ -259,19 +219,10 @@
 [Import from]

 [** Use <date> to insert date, <ext> to insert extension, <contact> to insert contact name]

 ;file \plugins\BasicHistory\src\Options.h

-[_<contact>_<date>.<ext>]

 ;file \plugins\BasicHistory\src\PlainHtmlExport.cpp

-[<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">\n]

-[<html><head>\n<meta http-equiv="Content-Type" content="text/html; charset=]

-[">\n]

 [<title>]

 [History Log]

-[] - []

-[]</title>\n]

 [<style type="text/css"><!--\n]

-[h3 { color: #666666; text-align: center; font-family: Verdana, Helvetica, Arial, sans-serif; font-size: 16pt; }\n]

-[h4 { text-align: center; font-family: Verdana, Helvetica, Arial, sans-serif; font-size: 14pt; }\n]

-[h6 { font-weight: normal; color: #000000; text-align: center; font-family: Verdana, Helvetica, Arial, sans-serif; font-size: 8pt; }\n]

 [.mes { border-top-width: 1px; border-right-width: 0px; border-bottom-width: 0px;border-left-width: 0px; border-top-style: solid; border-right-style: solid; border-bottom-style: solid; border-left-style: solid; border-top-color: #666666; border-bottom-color: #666666; padding: 4px; color: #000000; font: normal normal normal 8pt normal Tahoma, Tahoma, Verdana, Arial, sans-serif; text-decoration: none; }\n]

 [.text { clear: both; }\n]

 [.nick { float: left; font: normal normal bold 8pt normal Tahoma, Tahoma, Verdana, Arial, sans-serif; text-decoration: none; }\n]

@@ -285,31 +236,16 @@
 [.mes#event1 { background-color: #EEEEEE; }\n]

 [.mes#event2 { background-color: #CCD9F4; }\n]

 [.mes#session { background-color: #FFFDD7; }\n]

-[--></style>\n</head><body>\n<h4>]

-[</h4>\n<h3>]

 [) - ]

 [ - ]

 [)</h3>\n]

-[</h3>\n]

 [<h6>]

 [Filter:]

-[</h6>\n]

-[<div class=mes></div>\n</body></html>\n]

-[<div class=mes id=session>\n]

 [Conversation started at %s]

-[<div class=text>]

-[</div>\n]

 [out]

 [inc]

-[<div class=mes id=event]

 [>\n]

-[<div class=nick id=]

-[:</div>\n]

-[<div class=date id=]

-[<div class=text>\n]

 [\n</div>\n]

-;file \plugins\BasicHistory\src\PlainHtmlExport.h

-[html]

 ;file \plugins\BasicHistory\src\RichHtmlExport.cpp

 [&<>\t\r\n]

 [&amp;]

@@ -317,62 +253,25 @@
 [&gt;]

 [<br>]

 ['" []<>\r\n]

-[://]

-[<a class=url target=_blank href="]

-[</a>]

-[_files]

-[\\history.css]

-[\\history.js]

-[\\pnode.ico]

-[\\mnode.ico]

-[\\event0.ico]

-[\\event1.ico]

 [<link rel="Stylesheet" href="]

 [\\history.css" type="text/css">\n]

 [<script type="text/javascript" src="]

 [\\history.js"></script>\n]

-[</head><body>\n]

-[<span id="menubar">\n]

-[<a class=mainmenu onmouseover='this.className="mainmenusel";' href="javascript:void(0)" onClick="ShowMenu(1)" onMouseOut='HideMenu();this.className="mainmenu";'>]

 [Menu]

-[</a></span>\n]

-[<span class=floatmenu id=L1 onmouseover=clearTimeout(timer) onmouseout=HideMenu()>\n]

-[<table><tr>\n]

-[<td class=menuitemunsel onmouseover='this.className="menuitemsel"' onmouseout='this.className="menuitemunsel"'>\n]

-[<a class=menuitem onmouseover=ShowMenu(1) href="javascript:void(0)" onclick=OpenAll(1)>]

 [Open all]

-[</a>\n]

-[</td></tr><tr>\n]

-[<a class=menuitem onmouseover=ShowMenu(1) href="javascript:void(0)" onclick=OpenAll(0)>]

 [Close all]

-[</td></tr></table></span>\n]

 [<script language="JavaScript">\n]

-[<!--\n]

 [var menu = document.getElementById("menubar\]

 [if(menu != null)\n]

 [  menu.style.visibility = "visible";\n]

-[// -->\n]

-[</script>\n]

 [<h4>]

-[<div class=mes id=bottom></div>\n</body></html>\n]

-[<span class=eventimg id=]

 [><img src="]

 [\\pnode.ico" class=sessionimage width="16" height="16" onclick="toggleFolder('group]

 [', this)"/>]

-[<img src="]

 [\\event]

 [.ico" class=sessionimage width="16" height="16" onclick="toggleFolder('group]

 [', this)"/></span>\n]

-[<span class=date id=]

-[</span>\n<span class=text>\n]

-[</span>\n</div>\n]

-[<div class=group id=group]

-[<div class=eventimg id=]

 [.ico" class=sessionimage width="16" height="16"/></div>\n]

-[<img class=smiley src="]

-[" alt="]

-["/>]

-;file \plugins\BasicHistory\src\RichHtmlExport.h

 ;file \plugins\BasicHistory\src\Scheduler.cpp

 [History task]

 [Contacts]

@@ -397,15 +296,10 @@
 [Task finished]

 [Task '%s' execution failed]

 [Task '%s' finished successfully]

-[\\script.sc]

-["%s" /nointeractiveinput /log="%s" /script=script.sc]

 [Task '%s' execution failed:]

 ;file \plugins\BasicHistory\src\Searcher.cpp

-["%s" not found]

 [Search]

 [You have reached the end of the group.]

 [You have reached the end of the history.]

 ;file \plugins\BasicHistory\src\TxtExport.cpp

-[###]

 [)\n]

-;file \plugins\BasicHistory\src\TxtExport.h

diff --git a/langpacks/english/Plugins/Boltun.txt b/langpacks/english/Plugins/Boltun.txt
index c6b577d709..f200209016 100644
--- a/langpacks/english/Plugins/Boltun.txt
+++ b/langpacks/english/Plugins/Boltun.txt
@@ -72,5 +72,4 @@
 [NOTHING(4)]

 [>>Availabe:]

 [>>Result:]

-[: - ]

 [ \t\n\r,./?\\|;:'"~!#^&*()_-+=[{]}—]

diff --git a/langpacks/english/Plugins/BossKey.txt b/langpacks/english/Plugins/BossKey.txt
index 337cc47491..bcddbc0e96 100644
--- a/langpacks/english/Plugins/BossKey.txt
+++ b/langpacks/english/Plugins/BossKey.txt
@@ -39,7 +39,6 @@
 [Miranda NG is locked.\nEnter password to unlock it.]

 [Password is not correct!\nPlease, enter correct password.]

 [Miranda NG]

-[%s%s%s%s%s]

 [Ctrl + ]

 [Shift + ]

 [Alt + ]

@@ -48,8 +47,6 @@
 [%s [%s]]

 [Hide]

 [Hide/Show Miranda]

-[wtsapi32.dll]

-[dwmapi.dll]

 [bosskeyname]

 [BossKey\tget the BossKey name]

 ;file \plugins\BossKeyPlus\src\BossKey.h

diff --git a/langpacks/english/Plugins/ChangeKeyboardLayout.txt b/langpacks/english/Plugins/ChangeKeyboardLayout.txt
index a75cd3f8ae..c5607be31c 100644
--- a/langpacks/english/Plugins/ChangeKeyboardLayout.txt
+++ b/langpacks/english/Plugins/ChangeKeyboardLayout.txt
@@ -52,6 +52,4 @@
 ;file \plugins\ChangeKeyboardLayout\src\options.cpp

 [Ghbdtn? rfr ltkf&]

 ;file \plugins\ChangeKeyboardLayout\src\text_operations.cpp

-[RICHEDIT]

 [\n\n]

-[:\n]

diff --git a/langpacks/english/Plugins/ClientChangeNotify.txt b/langpacks/english/Plugins/ClientChangeNotify.txt
index 02d7ca8d22..4f24cf5750 100644
--- a/langpacks/english/Plugins/ClientChangeNotify.txt
+++ b/langpacks/english/Plugins/ClientChangeNotify.txt
@@ -32,10 +32,8 @@
 [(you have to install pcre.dll or pcre3.dll to use regular expressions here)]

 ;file \plugins\ClientChangeNotify\src\ClientChangeNotify.cpp

 [static]

-[_MenuWindow]

 [changed client to %s (was %s)]

 [changed client to %s]

-[Miranda IM 0.6.0.1 (ICQ v0.3.7 alpha)]

 [%s (was %s)]

 [) changed client to ]

 [Client change notifications:]

@@ -48,10 +46,7 @@
 [PopUps]

 [ClientChangeNotify: Client changed]

 [ClientChangeNotify]

-[ClientChangeNotify?puts(p,?dbsetting(%subject%,Protocol,p))?if2(_?dbsetting(,?get(p),?pinfo(?get(p),uidsetting)),).log]

 [`[`!cdate()-!ctime()`]`  ?cinfo(%subject%,display) (?cinfo(%subject%,id)) changed client to %extratext%]

-[/Miranda[0-9A-F]{8}/]

-[/[0-9A-F]{8}(\\W|$)/]

 ;file \plugins\ClientChangeNotify\src\Misc.h

 [open]

 [Error #%d]

diff --git a/langpacks/english/Plugins/Clist_blind.txt b/langpacks/english/Plugins/Clist_blind.txt
index c4b2b7b6df..fbea1f03a8 100644
--- a/langpacks/english/Plugins/Clist_blind.txt
+++ b/langpacks/english/Plugins/Clist_blind.txt
@@ -77,7 +77,7 @@
 [Show protocol names]

 [Show status text]

 [Right click opens status menu]

-[Right click opens Miranda IM menu]

+[Right click opens Miranda NG menu]

 [Make sections equal width]

 [Show bevels on panels]

 [Show resize grip indicator]

@@ -123,7 +123,6 @@
 [Global]

 ;file \plugins\Clist_blind\src\cluiopts.cpp

 ;file \plugins\Clist_blind\src\init.cpp

-[LISTBOX]

 [Unknown Protocol]

 [%name%]

 [%count%]

diff --git a/langpacks/english/Plugins/Clist_modern.txt b/langpacks/english/Plugins/Clist_modern.txt
index 2a2e1291bc..7de5e06291 100644
--- a/langpacks/english/Plugins/Clist_modern.txt
+++ b/langpacks/english/Plugins/Clist_modern.txt
@@ -334,28 +334,6 @@
 ;file \plugins\Clist_modern\src\modern_cachefuncs.cpp

 [%s: %s]

 [%s - %s]

-[[b]]

-[[/b]]

-[[u]]

-[[/u]]

-[[i]]

-[[/i]]

-[<b>]

-[</b>]

-[<u>]

-[</u>]

-[<i>]

-[</i>]

-[[B]]

-[[U]]

-[[I]]

-[<B>]

-[</B>]

-[<U>]

-[</U>]

-[<I>]

-[</I>]

-[*.gif]

 ;file \plugins\Clist_modern\src\modern_clc.cpp

 [Contact List/Avatar Overlay]

 [Contact List/Status Overlay]

@@ -371,10 +349,7 @@
 [Do You want contact '%s' to be removed from MetaContact '%s' and added to '%s'?]

 [Changing MetaContacts (Moving)]

 [Do You want contact '%s' to be added to MetaContact '%s'?]

-[%s\\%s]

 ;file \plugins\Clist_modern\src\modern_clcitems.cpp

-[-@-HIDDEN-GROUP-@-]

-[#%s]

 [%s|]

 ;file \plugins\Clist_modern\src\modern_clcopts.cpp

 [Contact List/Contact names]

@@ -398,21 +373,17 @@
 [Invisible]

 [Out to lunch]

 [On the phone]

-[shlwapi]

 [Name]

 [Name (use locale settings)]

 [Last message time]

 [Account Name]

 [Rate]

-[-Nothing-]

 [Global]

 [Hide to tray]

 [Behind left edge]

 [Behind right edge]

 [Progman]

 [Fonts]

-;file \plugins\Clist_modern\src\modern_clcutils.cpp

-[EDIT]

 ;file \plugins\Clist_modern\src\modern_clistevents.cpp

 [%s: %s (%s)]

 [EventArea]

@@ -422,8 +393,6 @@
 [&Contact rate]

 [%s (%s)]

 [Show even if offline]

-;file \plugins\Clist_modern\src\modern_clistmod.cpp

-[kernel32]

 ;file \plugins\Clist_modern\src\modern_clistopts.cpp

 [Avatar]

 [Icon]

@@ -447,8 +416,6 @@
 [&Options...]

 [&About]

 ;file \plugins\Clist_modern\src\modern_clui.cpp

-[user32.dll]

-[dwmapi.dll]

 [Show Contact &Avatar]

 [Hide Contact &Avatar]

 [My Contacts]

@@ -475,8 +442,6 @@
 [SubContainerWindow]

 [FramesContainer]

 [Shell_TrayWnd]

-;file \plugins\Clist_modern\src\modern_docking.cpp

-[user32]

 ;file \plugins\Clist_modern\src\modern_groupmenu.cpp

 [GroupMenu]

 [SubGroupMenu]

@@ -525,7 +490,6 @@
 [vCenter]

 [bottom]

 ;file \plugins\Clist_modern\src\modern_skineditor.cpp

-[- Empty - (do not draw this object)]

 [Solid fill object]

 [Image (draw image)]

 [Fragment (draw portion of image)]

@@ -537,15 +501,10 @@
 ;file \plugins\Clist_modern\src\modern_skinengine.cpp

 [Skin_Description_Section]

 [SkinFolder]

-[ImgDecoder.dll]

 [Profile]

 ;file \plugins\Clist_modern\src\modern_skinopt.cpp

-[fyr.mirandaim.ru]

 [%s (*.msf)%c*.MSF%c%c]

 [Miranda skin file]

-[JID: fyr@jabber.ru]

-[%s\\*.msf]

-[%s\\*]

 [%Default Skin%]

 [%%Default Skin%%]

 ;file \plugins\Clist_modern\src\modern_statusbar.cpp

@@ -555,7 +514,6 @@
 [Right]

 [Bottom]

 ;file \plugins\Clist_modern\src\modern_toolbar.cpp

-[icons\\toolbar_icons.dll]

 [Toolbar]

 [To view a toolbar in Clist Modern you need the TopToolBar plugin. Click Yes to download it or Cancel to continue]

 [Toolbar upgrade]

@@ -584,13 +542,8 @@
 [Setup view modes]

 [Clear view mode and return to default display]

 [Reset view mode]

-[clisticons.dll]

-[CLVMFrameWindow]

 [View modes]

 [View Modes]

-;file \plugins\Clist_modern\src\hdr\modern_cluiframes.h

-[CLUIFrameSubContainer]

-[CLUIFrameTitleBar]

 ;file \plugins\Clist_modern\src\hdr\modern_effectenum.h

 [Shadow at left]

 [Shadow at right]

diff --git a/langpacks/english/Plugins/Clist_mw.txt b/langpacks/english/Plugins/Clist_mw.txt
index 51d73f187f..41e6e1c7d5 100644
--- a/langpacks/english/Plugins/Clist_mw.txt
+++ b/langpacks/english/Plugins/Clist_mw.txt
@@ -167,7 +167,6 @@
 ;file \plugins\Clist_mw\src\clistopts.cpp

 [Global]

 ;file \plugins\Clist_mw\src\clistsettings.cpp

-[_NoProtocol_]

 [(Unknown Contact)]

 ;file \plugins\Clist_mw\src\clisttray.cpp

 [&Find/Add Contacts...]

@@ -178,8 +177,6 @@
 ;file \plugins\Clist_mw\src\clui.cpp

 [My Contacts]

 ;file \plugins\Clist_mw\src\cluiopts.cpp

-;file \plugins\Clist_mw\src\cluiservices.cpp

-[%s%s]

 ;file \plugins\Clist_mw\src\groupmenu.cpp

 [&New SubGroup]

 ;file \plugins\Clist_mw\src\keyboard.cpp

@@ -209,10 +206,7 @@
 [Visible]

 [Show TitleBar]

 [Floating]

-[TitleBarFont]

 [FramesContainer]

-;file \plugins\Clist_mw\src\CLUIFrames\cluiframes.h

-[CLUIFrameTitleBar]

 ;file \plugins\Clist_mw\src\CLUIFrames\statusbar.cpp

 [Statushelper]

 [Status]

diff --git a/langpacks/english/Plugins/Clist_nicer.txt b/langpacks/english/Plugins/Clist_nicer.txt
index a108dfae78..d50a81a8e2 100644
--- a/langpacks/english/Plugins/Clist_nicer.txt
+++ b/langpacks/english/Plugins/Clist_nicer.txt
@@ -33,7 +33,7 @@
 [ms]

 [OK]

 [Clist Nicer+]

-[Copyright © 2004-2010 by the Miranda IM project, 2012 by the Miranda NG project. More detailed copyright information can be found in the included README file.]

+[Copyright © 2004-2010 by the Miranda IM project, 2012-2013 by the Miranda NG project. More detailed copyright information can be found in the included README file.]

 [Version]

 [Support and latest version information]

 [No]

@@ -357,12 +357,7 @@
 [Floating contacts]

 [Skins]

 [Contact list]

-;file \plugins\Clist_nicer\src\clcutils.cpp

-[%s\\%s]

-[RichEdit20W]

-[EDIT]

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

-[CLCButtonClass]

 [FOO]

 [Add permanently]

 [Revert to default]

@@ -388,10 +383,7 @@
 [EventArea]

 [Event Area]

 [My Contacts]

-[CList - Nicer/Default]

-[CList - Nicer/Overlay Icons]

 [%s Connecting]

-[CList - Nicer/Connecting Icons]

 [Menu]

 [Open main menu]

 [Set status modes]

@@ -409,10 +401,7 @@
 [Thin border]

 [No border]

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

-[\\uxtheme.dll]

-[\\dwmapi.dll]

 [An application error has occured: %s]

-[%s\n\n(%s)]

 [TabSRMM runtime error]

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

 [The clist cannot be docked when using the default title bar and border. Use a toolwindow or borderless style instead.]

@@ -447,10 +436,8 @@
 [Clear current View Mode]

 [Select a view mode]

 [Clear view mode and return to default display]

-[CLVMFrameWindow]

 [View modes]

 [View Modes]

-[CLVM]

 ;file \plugins\Clist_nicer\src\CLUIFrames\cluiframes.cpp

 [&FrameTitle]

 [&Visible]

@@ -478,8 +465,6 @@
 [Floating]

 [mf_update_evt_%d]

 [FramesContainer]

-;file \plugins\Clist_nicer\src\CLUIFrames\cluiframes.h

-[CLUIFrameTitleBar]

 ;file \plugins\Clist_nicer\src\CLUIFrames\groupmenu.cpp

 [&Find/Add Contacts...]

 [&Main Menu]

diff --git a/langpacks/english/Plugins/CmdLine.txt b/langpacks/english/Plugins/CmdLine.txt
index 6def75f7bf..37b91e57fc 100644
--- a/langpacks/english/Plugins/CmdLine.txt
+++ b/langpacks/english/Plugins/CmdLine.txt
@@ -53,7 +53,6 @@
 [%s proxy server: %s %s:%d.]

 [%s proxy set to %s %s:%d.]

 [%s The port or the proxy type parameter is invalid.]

-[[me]]

 [No unread messages found.]

 [%s:%s - %d unread events.]

 [Contact '%s' has '%d' events in history.]

diff --git a/langpacks/english/Plugins/Console.txt b/langpacks/english/Plugins/Console.txt
index bd2448c5a3..a00d415a07 100644
--- a/langpacks/english/Plugins/Console.txt
+++ b/langpacks/english/Plugins/Console.txt
@@ -33,7 +33,6 @@
 [*** Console paused ***]

 [*** Console resumed ***]

 [*** Console cleared ***]

-[%s\n]

 [%s - %s\\%s]

 [Miranda Console]

 [Services]

@@ -44,7 +43,5 @@
 [&Help]

 [Text Files (*.txt)]

 [All Files]

-[*.TXT]

 [Save selection to file]

 [Save log to file]

-[txt]

diff --git a/langpacks/english/Plugins/CrashDumper.txt b/langpacks/english/Plugins/CrashDumper.txt
index 36fa69b353..f09417f00c 100644
--- a/langpacks/english/Plugins/CrashDumper.txt
+++ b/langpacks/english/Plugins/CrashDumper.txt
@@ -27,7 +27,6 @@
 [Version Information To File]

 [Show Version Information]

 [Upload Version Information]

-[%miranda_profilename%.dat]

 [%miranda_userdata%]

 [Version Information]

 [Copy to clipboard]

@@ -36,7 +35,6 @@
 [Show with DLLs]

 [Upload]

 [Open crash report directory]

-[Open miranda-vi.org]

 [Copy Version Info to clipboard]

 [Show Version Info]

 ;file \plugins\CrashDumper\src\dumper.cpp

diff --git a/langpacks/english/Plugins/DbChecker.txt b/langpacks/english/Plugins/DbChecker.txt
index 09d170d076..22c635ef7d 100644
--- a/langpacks/english/Plugins/DbChecker.txt
+++ b/langpacks/english/Plugins/DbChecker.txt
@@ -60,40 +60,27 @@
 [Database Checker cannot find a suitable database plugin to open '%s'.]

 [Error]

 [Database driver '%s' doesn't support checking.]

-[\\mirandaboot.ini]

 [Database]

 [ProfileDir]

 [./Profiles]

-[%s%s]

 [.dat]

 [%.2lf MB]

 [\\*.*]

-[%s\\%s\\%s.dat]

 [Total size]

 [Wasted]

 [\\Profiles]

-[[ini]\\]

-[[prf]\\]

-[[.]\\]

-[Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\miranda32.exe]

 [Path]

-[[reg]\\]

 [Miranda Databases (*.dat)\0*.DAT\0All Files (*)\0*\0]

 [Miranda Databases (*.dat)]

 [All Files]

-[*.DAT]

-[dat]

 ;file \plugins\DbChecker\src\wizard.cpp

 ;file \plugins\DbChecker\src\worker.cpp

 [Errors were encountered, however you selected not to backup the original database. It is strongly recommended that you do so in case important data was omitted. Do you wish to keep a backup of the original database?]

-[%s\\Backup of %s]

-[%s\\Backup (%d) of %s]

 [Unable to rename original file]

 [Unable to delete original file]

 [Unable to rename output file]

 [Database worker thread activated]

 [<check only>]

-[ (Output).dat]

 [Can't create output file (%u)]

 [Processing aborted by user]

 [Elapsed time: %d sec]

diff --git a/langpacks/english/Plugins/DbEditorPP.txt b/langpacks/english/Plugins/DbEditorPP.txt
index 16ac05b0fd..99ca8aa69e 100644
--- a/langpacks/english/Plugins/DbEditorPP.txt
+++ b/langpacks/english/Plugins/DbEditorPP.txt
@@ -169,9 +169,6 @@
 [Type]

 [Size]

 [BLOB]

-[BYTE]

-[WORD]

-[DWORD]

 [STRING]

 [UNICODE]

 [<unsupported>]

diff --git a/langpacks/english/Plugins/Db_autobackups.txt b/langpacks/english/Plugins/Db_autobackups.txt
index aa66c9d810..a601cf2b17 100644
--- a/langpacks/english/Plugins/Db_autobackups.txt
+++ b/langpacks/english/Plugins/Db_autobackups.txt
@@ -22,14 +22,9 @@
 ;file \plugins\Db_autobackups\src\backup.cpp

 [%s (*.dat)]

 [Miranda Databases]

-[*.dat]

 [%s (*.*)]

 [All Files]

-[dat]

-[%s\\*]

 [.bak]

-[%s\\%s]

-[%s\\%s_%02d.%02d.%02d@%02d-%02d-%02d_%s.bak]

 [Backup in Progress]

 [Rotating backup files...]

 [Copying database file...]

@@ -41,8 +36,6 @@
 [%miranda_userdata%]

 [Database/Database Backups]

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

-[%s%s]

-[%s\\]

 [%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s]

 [%miranda_path%]

 [path to root miranda folder]

@@ -56,9 +49,7 @@
 [%username%]

 [username for currently logged-on Windows user]

 [%mydocuments%]

-["My Documents" folder for currently logged-on Windows user]

 [%desktop%]

-["Desktop" folder for currently logged-on Windows user]

 [%xxxxxxx%]

 [any environment variable defined in current Windows session (like %systemroot%, %allusersprofile%, etc.)]

 [Variables]

diff --git a/langpacks/english/Plugins/Dbx_mmap_SA.txt b/langpacks/english/Plugins/Dbx_mmap_SA.txt
index 2fb0e4a60d..e92de16c58 100644
--- a/langpacks/english/Plugins/Dbx_mmap_SA.txt
+++ b/langpacks/english/Plugins/Dbx_mmap_SA.txt
@@ -55,7 +55,6 @@
 [Name]

 [Version]

 [%d.%d.%d.%d]

-[%s\n%s]

 [Please type in your password for]

 [Too many errors!]

 [Password is not correct!]

@@ -66,13 +65,10 @@
 ;file \plugins\Dbx_mmap_SA\src\init.cpp

 [db3x secure mmap database support]

 ;file \plugins\Dbx_mmap_SA\src\security.cpp

-[cryptors\\*.dll]

 [cryptors\\%s]

 [Sorry, but your database encrypted with unknown module]

 [Error]

 [Crypto modules not found]

-[Crypto module hasn't been chosen, using first one found]

-[Notice]

 [DB is already secured!]

 [current database]

 [Set Password]

diff --git a/langpacks/english/Plugins/Dbx_tree.txt b/langpacks/english/Plugins/Dbx_tree.txt
index e1d24742d5..18032c3020 100644
--- a/langpacks/english/Plugins/Dbx_tree.txt
+++ b/langpacks/english/Plugins/Dbx_tree.txt
@@ -22,8 +22,6 @@
 [WriteFile failed]

 [SetEndOfFile failed]

 [FlushFileBuffers failed]

-;file \plugins\Dbx_tree\src\EncryptionManager.cpp

-[\\plugins\\encryption\\*.dll]

 ;file \plugins\Dbx_tree\src\FileAccess.cpp

 [.jrn]

 [Couldn't flush the journal because ReadFile failed!]

@@ -36,9 +34,6 @@
 [Journal "%s" was found on start.\nBackups "%s"and "%s" could not be created in "%s".]

 ;file \plugins\Dbx_tree\src\FileBTree.h

 [Signature check failed]

-;file \plugins\Dbx_tree\src\Logger.cpp

-[[%s - %s]\n%s\n\nSystem Error Code: %d\n%s\n\n]

-[[%s - %s]\n%s\n\n]

 ;file \plugins\Dbx_tree\src\MappedMemory.cpp

 [Cannot set end of file]

 [CreateFileMapping failed]

diff --git a/langpacks/english/Plugins/FTPFile.txt b/langpacks/english/Plugins/FTPFile.txt
index 03e0a1e579..867524c9dc 100644
--- a/langpacks/english/Plugins/FTPFile.txt
+++ b/langpacks/english/Plugins/FTPFile.txt
@@ -87,12 +87,10 @@
 [File upload complete]

 [Upload canceled]

 [FTP File YM won't be loaded because libcurl.dll is missing or wrong version!]

-[uxtheme.dll]

 ;file \plugins\FTPFileYM\src\job_generic.cpp

 [All Files (*.*)\0*.*\0]

 [FTP File - Select files]

 [FTP File - Select a folder]

-[%s\\%s]

 [Folder not found!]

 [*.*]

 [The selected folder does not contain any files.\nFTP File sends files only from the selected folder, not from subfolders.]

@@ -106,7 +104,6 @@
 [UNKNOWN]

 ;file \plugins\FTPFileYM\src\job_packer.cpp

 [archive]

-[%s%s.zip]

 [Error occured when zipping the file(s).]

 [%0.1f kB/s]

 [%0.1f%% (%d kB/%d kB)]

@@ -124,10 +121,6 @@
 [WAITTING...]

 [Download link:]

 [Do you really want to cancel running upload?]

-[%s\r\nSpeed: %s\r\nCompleted: %s\r\nRemaining: %s]

-;file \plugins\FTPFileYM\src\libcurl.cpp

-[libcurl.dll]

-[plugins\\libcurl.dll]

 ;file \plugins\FTPFileYM\src\manager.cpp

 [You have to fill and enable at least one FTP server in setting.]

 [Clear All]

@@ -144,5 +137,4 @@
 [Advanced]

 ;file \plugins\FTPFileYM\src\serverlist.cpp

 ;file \plugins\FTPFileYM\src\utils.cpp

-[file.zip]

 [...]

diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt
index 21c656ec6c..4d25daae96 100644
--- a/langpacks/english/Plugins/Facebook.txt
+++ b/langpacks/english/Plugins/Facebook.txt
@@ -5,7 +5,7 @@
 ;  Version: 0.0.9.2

 ;  Authors: Michal Zelinka, Robert Posel

 ;============================================================

-[Facebook protocol plugin for Miranda NG.]

+[Facebook protocol support for Miranda NG.]

 ;file \protocols\FacebookRM\res\facebook.rc

 [E-mail:]

 [Password:]

diff --git a/langpacks/english/Plugins/FavContacts.txt b/langpacks/english/Plugins/FavContacts.txt
index 88573b7227..dfc55fd330 100644
--- a/langpacks/english/Plugins/FavContacts.txt
+++ b/langpacks/english/Plugins/FavContacts.txt
@@ -30,7 +30,6 @@
 [Selected second line (color)]

 [Background]

 [Selected background]

-[MS Shell Dlg]

 [Contacts]

 [Favourites]

 [FavContactsMenuHostWnd]

diff --git a/langpacks/english/Plugins/Fingerprint.txt b/langpacks/english/Plugins/Fingerprint.txt
index e3b56044e4..be0db03bf1 100644
--- a/langpacks/english/Plugins/Fingerprint.txt
+++ b/langpacks/english/Plugins/Fingerprint.txt
@@ -55,32 +55,14 @@
 [Client icons/Overlays/Platform]

 [Client icons/Overlays/Protocol]

 [Client icons]

-;file \plugins\FingerprintNG\src\global.h

-[Icons\\Fp_icons.dll]

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

-[|^*Mask*|*names*]

 [Icon caption]

-[|Miranda*NG*0.92.3.1504*]

-[|Miranda*NG*0.93.1.1649*]

-[|Miranda*NG*0.93.2.1746*]

-[|Miranda*NG*0.93.3.2110*]

-[|Miranda*NG*0.93.4.2450*]

-[|Miranda*NG*stable*]

 [MirandaNG stable]

-[|*nightly.miranda.im*]

-[|*Miranda*NG*]

 [MirandaNG]

 [Miranda*IM*0.10.*]

 [MirandaIM v0.10.x.x]

-[|*Miranda*IM*0.9*]

-[|*miranda-im.org/caps#*0.9*]

 [MirandaIM v0.9.x.x]

-[|^Miranda*0.7*Jabb*]

-[|*Miranda*0.8*]

-[|*miranda-im.org/caps#*0.8*]

 [MirandaIM v0.8.x.x]

-[|*Miranda*0.7*]

-[|*miranda-im.org/caps#*0.7*]

 [MirandaIM v0.7.x.x]

 [*Miranda*0.6*]

 [MirandaIM v0.6.x.x]

@@ -92,13 +74,8 @@
 [MirandaIM (old versions)]

 [*Miranda*]

 [Miranda (unknown)]

-[|*Pocket*Web*|*1&1*|*1*?nd*1]

-[1&1]

 [*Asia*]

 [Asia]

-[|*Adium*]

-[|*VUFD6HcFmUT2NxJkBGCiKlZnS3M=*]

-[|*DdnydQG7RGhP9E3k9Sf+b+bF0zo=*]

 [Adium]

 [*Agile Messenger*]

 [Agile Messenger]

@@ -106,7 +83,6 @@
 [Appolo IM]

 [*Ayttm*]

 [Ayttm]

-[|*Bayan*ICQ*|*barobin*]

 [BayanICQ]

 [*Beejive*]

 [BeejiveIM]

@@ -114,7 +90,6 @@
 [Bimoid]

 [*BitlBee*]

 [BitlBee]

-[|*Berry*|*ICS?\?\?\?\?\?\?\?]

 [BlackBerry]

 [*Buddycloud*]

 [Buddycloud]

@@ -140,7 +115,6 @@
 [Empathy]

 [*Eyeball*]

 [Eyeball Chat]

-[|*eBuddy*|*eMessenger*]

 [eBuddy Messenger]

 [*eM*Client*]

 [eM Client]

@@ -162,22 +136,18 @@
 [GNU Gadu]

 [*IM2*]

 [IM2]

-[|IM+*|IMPLUS*|*IM plus*|@mobile]

-[|*+umBU9yx9Cu+R8jvPWIZ3vWD59M=*]

 [IM+]

 [*IMVU*]

 [IMVU]

 [*IMadering*]

 [IMadering]

 [*imo.im*]

-[Imo.im]

 [*Inlux*]

 [Inlux Messenger]

 [*Instantbird*]

 [Instantbird]

 [*iCall*]

 [iCall]

-[|*iChat*|**imagent*|*iMessages*]

 [iChat]

 [*irssi*]

 [irssi]

@@ -189,7 +159,6 @@
 [Jabbear]

 [*Jabbin*]

 [Jabbin]

-[|Jasmine*IM*|*jasmineicq.ru/caps*]

 [Jasmine IM]

 [*Jimm*Aspro*]

 [Jimm Aspro]

@@ -201,8 +170,6 @@
 [KoolIM]

 [*Kopete*]

 [Kopete]

-[|*LeechCraft*]

-[|*aNjQWbtza2QtXemMfBS2bwNOtcQ=*]

 [LeechCraft]

 [*MDC*]

 [MDC]

@@ -210,7 +177,6 @@
 [Meebo]

 [Meetro*]

 [Meetro]

-[|mChat*|gsICQ*|*mchat.mgslab.com*]

 [mChat]

 [*Nimbuzz*]

 [Nimbuzz]

@@ -226,19 +192,14 @@
 [Proteus]

 [QIP *Android*]

 [QIP Mobile Android]

-[|QIP*iOS*|QIP*iphone*|QIP*apple*]

 [QIP Mobile iOS]

 [*QIP*Symbian*]

 [QIP Mobile Symbian]

 [*QIP*Java*]

 [QIP Mobile Java]

-[|QIP *PDA*|*pda.qip.ru*|*QIP Mobile*]

 [QIP Mobile]

-[|QIP 2012*|http://qip.ru/caps*]

 [QIP 2012]

-[|QIP 2010*|http://2010.qip.ru*]

 [QIP 2010]

-[|QIP Infium*|http://*qip*]

 [QIP Infium]

 [*qutIM*]

 [qutIM]

@@ -248,13 +209,11 @@
 [Qnext]

 [*SAPO*]

 [SAPO Messenger]

-[|^*Simp*|*SIM*]

 [SIM]

 [*Salut*Toi*]

 [Salut a Toi]

 [*Shaim*]

 [Shaim]

-[|SieJC*|Nat*ICQ*|Siemens*Client*]

 [Siemens ICQ / Jabber client]

 [Slick*]

 [Slick]

@@ -294,7 +253,6 @@
 [GnomeICU]

 [*Icy*Juice*]

 [Icy Juice]

-[|*Jimm*|mobicq*]

 [Jimm]

 [Licq*]

 [Licq]

@@ -302,7 +260,6 @@
 [LocID]

 [QIP*2005*]

 [QIP 2005]

-[|R&Q*|&RQ*]

 [R&Q]

 [Smart*ICQ*]

 [SmartICQ]

@@ -314,15 +271,12 @@
 [LibICQ/JIT]

 [*TICQ*Client*]

 [TICQClient (Delphi lib)]

-[|ICQ?|ICQ?.?|ICQ *|ICQ2*|ICQ]

 [ICQ client]

 [*Akeni*]

 [Akeni]

 [*Ambrosia*]

 [Ambrosia XMPP Server]

-[|*Anothrbot*|*Anothr Rss Bot*]

 [Anothr Rss Bot]

-[|*aqq.eu*|aqq*]

 [Aqq]

 [*Barn*Owl*]

 [BarnOwl]

@@ -334,11 +288,9 @@
 [BitWise]

 [*Bombus*]

 [Bombus]

-[|*Bombus*mod*|*bombusmod*]

 [BombusMod]

 [*Bombus*NG*]

 [Bombus NG]

-[|*Bombusmod-qd*|*bombus*qd*]

 [Bombus QD]

 [*Bow*line*]

 [Bowline]

@@ -380,18 +332,14 @@
 [EMess]

 [*Elmer*]

 [Elmer Bot]

-[|*Jabber.el*|*Emacs*]

 [Emacs (Jabber.el)]

 [*Exodus*]

 [Exodus]

 [*GCN*]

 [GCN]

-[|*gmail.*|GMail*]

 [GMail]

 [*GOIM*]

 [GOIM]

-[|*Talk.v*|*Google*Talk*]

-[|*Gtalk*|*-iPhon*]

 [GoogleTalk aka GTalk]

 [*Talk*Gadget*]

 [GTalk Gadget]

@@ -401,7 +349,6 @@
 [Gajim]

 [*Gibber*]

 [Gibberbot]

-[|glu*|*glu.net*]

 [Glu]

 [*Gnome*]

 [Gnome]

@@ -437,7 +384,6 @@
 [JMC (Jabber Mix Client)]

 [*JWChat*]

 [JWChat]

-[|*JWGC*|Jabber *Gram*]

 [Jabber WindowGram Client]

 [*Jabba*]

 [Jabba]

@@ -453,13 +399,11 @@
 [JabberNaut]

 [*Zilla*]

 [JabberZilla]

-[|*Jabber*Net*|*cursive.net*|*csharp*]

 [Jabber-Net]

 [Jabberwocky*]

 [Jabberwocky (Amiga)]

 [*Jabbroid*]

 [Jabbroid]

-[|*Jajc*|Just Another Jabber Client]

 [JAJC]

 [*Jeti*]

 [Jeti]

@@ -487,7 +431,6 @@
 [M8Jabber]

 [*mcabber*]

 [MCabber]

-[|*MGTalk*|*Mobile?\?\?\?\?\?\?\?]

 [MGTalk]

 [*MUCkl*]

 [MUCkl]

@@ -517,7 +460,6 @@
 [Fire]

 [*Paltalk*]

 [Paltalk]

-[|*Pandion*|*Пандион*]

 [Pandion]

 [*Papla*]

 [Papla]

@@ -525,12 +467,10 @@
 [Poezio]

 [*Prosody*]

 [Prosody]

-[|*PSI+*|*psi-dev.googlecode*]

 [PSI+]

 [*Psi*]

 [PSI]

 [*Psto*]

-[Psto.net]

 [*Psyc*]

 [Psyc]

 [*Pygeon*]

@@ -539,7 +479,6 @@
 [QTJim]

 [*Qute*Com*]

 [QuteCom]

-[|*WTalkProxy0_0*|*talk.xiaonei.com*]

 [RenRen]

 [*SBot*]

 [SBot]

@@ -550,12 +489,9 @@
 [Sky*Mess*]

 [Sky Messager]

 [*Sky*Messager*]

-[|*xabber*]

-[|*bWG06mEjKFM5ygtd84Ov95P8VH0=*]

 [xabber]

 [*Gabble*]

 [Gabble]

-[|*igniterealtime.*smack*|*smack*]

 [Smack]

 [*SoapBox*]

 [SoapBox]

@@ -579,7 +515,6 @@
 [Talkonaut]

 [*Tapioca*]

 [Tapioca]

-[|*teabot*|*teabot.org/bot*]

 [Teabot]

 [*Telepathy*]

 [Telepathy]

@@ -647,7 +582,6 @@
 [iMov]

 [*jTalk*]

 [jTalk]

-[|*jdisk*|*jabber*Disk*]

 [jabberDisk]

 [*jabbim*]

 [Jabbim]

@@ -659,7 +593,6 @@
 [Jrudevels]

 [*juick*]

 [Juick]

-[|^*smack*|*kf*]

 [kf jabber]

 [*laffer*]

 [Laffer]

@@ -675,7 +608,6 @@
 [myJabber]

 [*orkut*]

 [orkut]

-[|*PJC*|*pjc.googlecode.com*]

 [PHP Jabber Client]

 [*saje*]

 [saje]

@@ -695,8 +627,6 @@
 [xeus 2]

 [*xeus*]

 [xeus]

-[|*yandex*|*yaonline*]

-[|*Я.Онлайн*|*Яндек�*]

 [Ya.Online]

 [*yaxim*]

 [yaxim]

@@ -814,7 +744,6 @@
 [eMule MorphXT]

 [eMule*Neo*]

 [eMule Neo]

-[|eMule*plus*|eMule*+*]

 [eMule+]

 [eMule*Xtreme*]

 [eMule Xtreme]

@@ -830,7 +759,6 @@
 [AIM Triton]

 [AIM*Mac*]

 [AIM for MacOS]

-[|AIM*Mobile*|AIM*gprs*|Aim*sms*]

 [AIM Mobile]

 [*naim*]

 [Naim]

@@ -846,7 +774,6 @@
 [Windows Live 10]

 [WLM*9*]

 [Windows Live v9.x]

-[|WLM*8.*|MSN*8.*]

 [Windows Live v8.x]

 [MSN*7.*]

 [MSN Messenger v7.x]

@@ -860,21 +787,13 @@
 [aMSN]

 [WebMessenger*]

 [WebMessenger]

-[|WLM*|MSN*|Windows Live*]

 [MSN]

-[|magent*|Mail.ru Agent*official*]

-[|Mail.ru Agent*PC*]

-[|*agent.mail.ru*]

 [Mail.Ru Agent (official)]

-[|wmagent*|MobileAgent*]

-[|sagent*|Mail.ru Agent*Symbian*]

-[|jagent*]

 [Mail.Ru Mobile Agent]

 [Web Agent*]

 [Mail.Ru Web Agent]

 [Mail.ru Agent*]

 [Mail.Ru (unknown client)]

-[|Yahoo*Go*|Yahoo*Mobile*]

 [Yahoo! Go Mobile]

 [*Yahoo*PingBox*]

 [Yahoo PingBox]

@@ -890,7 +809,6 @@
 [GisMeteo]

 [*intellicast*]

 [Intellicast]

-[|*meteo-gid*|*meteogid*]

 [Meteo-Gid]

 [*meteonovosti*]

 [Meteonovosti]

@@ -911,7 +829,6 @@
 [*weather*]

 [Weather]

 [*RSS*0.9*]

-[RSS 0.9x]

 [*RSS*2.*]

 [RSS 2]

 [*RSS*1.*]

@@ -920,7 +837,6 @@
 [Atom 3]

 [*Atom*1.*]

 [Atom 1]

-[|Mobile*QQ*|iPhone*QQ*|QQ WAP*]

 [Mobile QQ]

 [QQ*Concept*]

 [QQ Concept]

@@ -928,7 +844,6 @@
 [QQ CRM]

 [QQ*Silverlight*]

 [QQ Silverlight]

-[|TM2008*|TM2009*|TM2010*]

 [TM 2008 and >]

 [TM*]

 [QQ*International*]

@@ -938,7 +853,6 @@
 [WebQQ*]

 [WebQQ]

 [QQ*]

-[|Gadu-Gadu*|GG*]

 [Gadu-Gadu client]

 [*Tlen*]

 [Tlen.pl client]

@@ -946,25 +860,20 @@
 [Android]

 [*Facebook*]

 [Facebook]

-[|*Pidgin*|*libpurple*|Purple*]

 [Pidgin (libpurple)]

-[|*Python*|Py*|*ταλιςμαη*]

 [Python-based clients]

 [*Jabber*client*]

 [Jabber client]

-[|*XMPP*|Mrim*|*DRQZ00fz5WPn1gH+*]

 [XMPP client]

 [*Twitter*]

 [Twitter]

 [*Skype**]

 [Skype]

-[|*VKontakte*|*vk.com*]

 [VKontakte]

 [*Xfire*]

 [Xfire]

 [Notfound]

 [Client not found]

-[|*Unknown*|...]

 [Unknown client]

 [Undetected client]

 [*AF*Pack*]

@@ -992,9 +901,7 @@
 [HotCoffee]

 [*HierOS*]

 [HierOS]

-[|*miranda*[ice*]|*induction*]

 [iCE / Induction]

-[|*KDL*|*КДЛ*]

 [KDL]

 [*Kolich*]

 [Kolich]

@@ -1004,7 +911,6 @@
 [Lenin pack]

 [*[Lpack*]*]

 [Lestat pack]

-[|*Miranda*LS*|*LexSys*]

 [LexSys]

 [*MDpack*]

 [MDpack]

@@ -1024,7 +930,6 @@
 [Robyer pack]

 [*sss*pack*]

 [SSS build]

-[|^*sss*|*[S7*pack]*|*[*S7*]*]

 [Se7ven]

 [*Spellhowler*]

 [xSpellhowleRx pack]

@@ -1046,37 +951,23 @@
 [Dmikos]

 [*zeleboba*]

 [zeleboba's]

-[|^AIM*|*AIM*]

 [AIM overlay]

-[|^ICQ|^ICQ*|*ICQ*Plus*]

 [ICQJ Plus Mod overlay]

-[|^ICQ|^ICQ*|*ICQ*]

 [ICQJ overlay]

-[|^IRC*|Miranda*IRC*]

 [IRC overlay]

 [*JGmail*]

 [JGmail overlay]

 [*JGTalk*]

 [JGTalk overlay]

-[|^jabber*|Miranda*Jabber*|py*jabb*]

 [Jabber overlay]

-[|^MSN*|*Miranda*MSN*]

 [MSN overlay]

-[|Miranda*QQ*|MIM*QQ*]

 [QQ overlay]

-[|^tlen*|*tlen*]

 [Tlen.pl overlay]

-[|^Yahoo*|*yahoo*]

 [Yahoo overlay]

-[|^MRA*|^Mail.ru*]

-[|*MRA*|*Mail.ru*IM*|Mrim*]

-[|*DRQZ00fz5WPn1gH+*|*nxthUwJANorB6+*]

 [Mail.Ru Agent overlay]

 [ICQ*2003*]

 [ICQ 2003 overlay]

-[|ICQ*4*|ICQ*lite*4*]

 [ICQ Lite 4 overlay]

-[|ICQ*5*|ICQ*lite*5*|icq5*]

 [ICQ v5.x overlay]

 [ICQ*6*]

 [ICQ v6.x overlay]

@@ -1090,13 +981,9 @@
 [Yahoo v10.x overlay]

 [*Yahoo 9*]

 [Yahoo v9.x overlay]

-[|Gadu-Gadu*11*|GG*11*]

 [Gadu-Gadu v11 client]

-[|Gadu-Gadu*10*|GG*10]

 [Gadu-Gadu v10 client]

-[|Gadu-Gadu*9*|GG*9*]

 [Gadu-Gadu v9 client]

-[|Gadu-Gadu*8*|GG*8*]

 [Gadu-Gadu v8 client]

 [Tlen Protocol 1?]

 [Tlen 8.x overlay]

@@ -1106,25 +993,16 @@
 [Tlen 6.x overlay]

 [Tlen Protocol 7]

 [Tlen 5.x overlay]

-[|QQ2012*|TM2012*]

 [TM/QQ 2012 overlay]

-[|QQ2011*|TM2011*]

 [TM/QQ 2011 overlay]

-[|QQ2010*|TM2010*]

 [TM/QQ 2010 overlay]

-[|QQ2009*|TM2009*]

 [TM/QQ 2009 overlay]

-[|QQ2008*|TM2008*]

 [TM/QQ 2008 overlay]

-[|QQ2007*|TM2007*]

 [TM/QQ 2007 overlay]

-[|QQ2006*|TM2006*]

 [TM/QQ 2006 overlay]

-[|QQ2005*|TM2005*]

 [TM/QQ 2005 overlay]

 [QQ2004*]

 [QQ 2004 overlay]

-[|QQ2003*|TM 3.*]

 [TM 3.x / QQ 2003 overlay]

 [TM 2.*]

 [TM 2.x overlay]

@@ -1132,37 +1010,22 @@
 [TM 1.x overlay]

 [QQ2000*]

 [QQ 2000 overlay]

-[|*Win*|* WM *|wmagent*|*Vista*]

 [Windows overlay]

-[|*ipad*|*iphone*]

 [iOS overlay (iPhone/iPad)]

-[|^*smack*|* Mac *|*mac*]

 [MacOS overlay]

 [*Linux*]

 [Linux overlay]

-[|*Flash*|*Web*ICQ*]

 [Flash overlay]

-[|*Java*|jagent*|ICQ2Go!*]

 [Java overlay]

-[|*Symbian*|sagent*]

 [Symbian overlay]

 [*Amiga*]

 [Amiga overlay]

 [Android overlay]

-[|*[*debug*]*|*test*|*те�т*]

 [debug overlay]

-[|*[*office*]*|*[*офи�*]*]

 [office overlay]

-[|*[*mobile*]*|*[*pda*]*]

 [mobile overlay]

-[|*[*home*]*|*[*дом*]*|*[*хоме*]*]

 [home overlay]

-[|*[*work*]*|*wrk*]

-[|*[*работа*]*|*ворк*]

 [work overlay]

-[|*[*note*]*|*[*laptop*]*|*ноут*]

-[|*[*кирпич*]*|*[*portable*]*]

-[|*[*flash*]*|*[*usb*]*]

 [notebook overlay]

 [*Miranda*NG*\?.\?\?.9.*]

 [MirandaNG v0.9 #2 overlay]

@@ -1196,9 +1059,7 @@
 [MirandaIM v0.5 #2 overlay]

 [*Miranda*0.4.*]

 [MirandaIM v0.4 #2 overlay]

-[|*x64*|*64*bit*]

 [x64 overlay]

-[|*x32*|*32*bit*|*x86*]

 [x32 overlay]

 [*unicode*]

 [Unicode overlay]

diff --git a/langpacks/english/Plugins/FlashAvatars.txt b/langpacks/english/Plugins/FlashAvatars.txt
index 5a4f78c6d8..df4f9557de 100644
--- a/langpacks/english/Plugins/FlashAvatars.txt
+++ b/langpacks/english/Plugins/FlashAvatars.txt
@@ -2,9 +2,7 @@
 ;langpack template for FlashAvatars

 ;file \plugins\FlashAvatars\src\cflash.cpp

 [%miranda_avatarcache%]

-[%s\\%s]

 [Flash]

-[%s\\%s.swf]

 [Flash.ocx not registered!]

 [You don't have installed ShockwaveFlash interface in your system.]

 [Bugged Flash detected!]

@@ -13,7 +11,6 @@
 [AtlAxWin]

 [atl]

 [Flash Avatars]

-[%s\\%s\\]

 [Flash\\]

 ;file \plugins\FlashAvatars\src\TigerHash.h

 [ABCDEFGHIJKLMNOPQRSTUVWXYZ234567]

diff --git a/langpacks/english/Plugins/FltContacts.txt b/langpacks/english/Plugins/FltContacts.txt
index eb6b4c6c8a..06b87862a8 100644
--- a/langpacks/english/Plugins/FltContacts.txt
+++ b/langpacks/english/Plugins/FltContacts.txt
@@ -56,7 +56,6 @@
 ;file \plugins\FloatingContacts\src\fltcont.h

 [MirandaThumbsWnd]

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

-[user32.dll]

 [Remove thumb]

 [Show all thumbs]

 [Hide all thumbs]

@@ -71,7 +70,6 @@
 [Contact List]

 [Main Features]

 [Appearance]

-[shlwapi]

 [Sample]

 [<none>]

 [<Contact List Text>]

diff --git a/langpacks/english/Plugins/Folders.txt b/langpacks/english/Plugins/Folders.txt
index c7f053ccbf..e7dbd827d0 100644
--- a/langpacks/english/Plugins/Folders.txt
+++ b/langpacks/english/Plugins/Folders.txt
@@ -15,7 +15,7 @@
 ;file \plugins\Folders\src\dlg_handlers.cpp

 [Some changes weren't saved. Apply the changes now ?]

 [Changes not saved]

-[\\r\nDon't forget to click on Apply to save the changes. If you don't then the changes won't\r\n\\r\nbe saved to the database, they will only be valid for this session.\r\n\r\n\\r\nVariable string\t\tWhat it expands to:\r\n\\r\n%miranda_path%\tExpands to your miranda path (e.g: c:\\program files\\miranda im).\r\n\\r\n%profile_path%\t\tExpands to your profile path - the value found in mirandaboot.ini,\r\n\\r\n\t\t\tProfileDir section (usually inside miranda's folder).\r\n\\r\n%current_profile%\tExpands to your current profile name without the extenstion.\r\n\\r\n\t\t\t(e.g.default if your your profile is default.dat).\r\n\r\n\r\n\\r\nEnvironment variables\r\n\\r\nThe plugin can also expand environment variables; the variables are specified like in any other\r\n\\r\nprogram that can use environment variables, i.e. %<env variable>%.\r\n\\r\nNote: Environment variables are expanded before any Miranda variables. So if you have, for\r\n\\r\nexample, %profile_path% defined as a system variable then it will be expanded to that value\r\n\\r\ninstead of expanding to Miranda’s profile path.\r\n\r\n\\r\nExamples:\r\n\\r\nIf the value for the ProfileDir inside mirandaboot.ini, ProfileDir section is '.\\profiles\', current\r\n\\r\nprofile is 'default.dat' and miranda's path is 'c:\\program files\\miranda im\' then:\r\n\\r\n%miranda_path%\t\t\twill expand to 'c:\\program files\\miranda im\'\r\n\\r\n%profile_path%\t\t\twill expand to 'c:\\program files\\miranda im\\profiles\'\r\n\\r\n%current_profile%\t\t\twill expand to 'default'\r\n\\r\n%temp%\t\t\t\twill expand to the temp folder of the current user.\r\n\\r\n%profile_path%\\%current_profile%\twill expand to 'c:\\program files\\miranda im\\profiles\\default\'\r\n\\r\n%miranda_path%\\plugins\\config\twill expand to 'c:\\program files\\miranda im\\plugins\\config\'\r\n\\r\n'   %miranda_path%\\\\\\\\     '\t\twill expand to 'c:\\program files\\miranda im\'\r\n\\r\nnotice that the spaces at the beginning and the end of the string are trimmed, as well as the last]

+[\\r\nDon't forget to click on Apply to save the changes. If you don't then the changes won't\r\n\\r\nbe saved to the database, they will only be valid for this session.\r\n\r\n\\r\nVariable string\t\tWhat it expands to:\r\n\\r\n%miranda_path%\tExpands to your miranda path (e.g: c:\\program files\\miranda ng).\r\n\\r\n%profile_path%\t\tExpands to your profile path - the value found in mirandaboot.ini,\r\n\\r\n\t\t\tProfileDir section (usually inside miranda's folder).\r\n\\r\n%current_profile%\tExpands to your current profile name without the extenstion.\r\n\\r\n\t\t\t(e.g.default if your your profile is default.dat).\r\n\r\n\r\n\\r\nEnvironment variables\r\n\\r\nThe plugin can also expand environment variables; the variables are specified like in any other\r\n\\r\nprogram that can use environment variables, i.e. %<env variable>%.\r\n\\r\nNote: Environment variables are expanded before any Miranda variables. So if you have, for\r\n\\r\nexample, %profile_path% defined as a system variable then it will be expanded to that value\r\n\\r\ninstead of expanding to Miranda’s profile path.\r\n\r\n\\r\nExamples:\r\n\\r\nIf the value for the ProfileDir inside mirandaboot.ini, ProfileDir section is '.\\profiles\', current\r\n\\r\nprofile is 'default.dat' and miranda's path is 'c:\\program files\\miranda ng\' then:\r\n\\r\n%miranda_path%\t\t\twill expand to 'c:\\program files\\miranda ng\'\r\n\\r\n%profile_path%\t\t\twill expand to 'c:\\program files\\miranda ng\\profiles\'\r\n\\r\n%current_profile%\t\t\twill expand to 'default'\r\n\\r\n%temp%\t\t\t\twill expand to the temp folder of the current user.\r\n\\r\n%profile_path%\\%current_profile%\twill expand to 'c:\\program files\\miranda ng\\profiles\\default\'\r\n\\r\n%miranda_path%\\plugins\\config\twill expand to 'c:\\program files\\miranda ng\\plugins\\config\'\r\n\\r\n%miranda_path%\t\t\twill expand to 'c:\\program files\\miranda ng\'\r\n\r\n\\r\nNotice that the spaces at the beginning and the end of the string are trimmed, as well as the last.]

 ;file \plugins\Folders\src\folderItem.cpp

 [explore]

 ;file \plugins\Folders\src\hooked_events.cpp

diff --git a/langpacks/english/Plugins/GG.txt b/langpacks/english/Plugins/GG.txt
index 932e5f395c..148c176072 100644
--- a/langpacks/english/Plugins/GG.txt
+++ b/langpacks/english/Plugins/GG.txt
@@ -77,7 +77,6 @@
 [Sign out all sessions]

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

 [%miranda_avatarcache%]

-[%s\\%s]

 [Can not create avatars cache directory. ERROR: %d: %s\n%s]

 [jpg]

 [gif]

@@ -118,7 +117,6 @@
 [Female]

 [GMT%+d:%02d]

 [GMT]

-[???]

 [<not specified>]

 [Network]

 [General]

@@ -153,14 +151,12 @@
 [HTTP failed reading]

 [HTTP failed writing]

 [Unknown HTTP error]

-[%s\\*.(null)]

 [&Unblock]

 [&Block]

 [Contact list]

 ;file \protocols\Gadu-Gadu\src\gg_proto.cpp

 [%s connection]

 [%miranda_userdata%]

-[%s\\%s\\ImageCache]

 [Gadu-Gadu Number]

 [%d %d]

 ;file \protocols\Gadu-Gadu\src\groupchat.cpp

@@ -194,7 +190,6 @@
 ;file \protocols\Gadu-Gadu\src\image.cpp

 [&Image]

 [Image files (*.bmp,*.gif,*.jpeg,*.jpg,*.png)]

-[*.bmp;*.gif;*.jpeg;*.jpg;*.png]

 [w+b]

 [Image cannot be written to disk.]

 [Delete image from the list]

@@ -209,7 +204,6 @@
 [\\%s]

 [%.*s (%u)%s]

 [Cannot save received image to file. ERROR: %d: %s\n%s]

-[[img]%s[/img]]

 [.bmp]

 [.gif]

 [.jpg]

@@ -222,10 +216,8 @@
 [List cannot be removeed because of error: %s (Error: %d)]

 [Text files]

 [ (*.txt)]

-[*.TXT]

 [All Files]

 [ (*)]

-[txt]

 [List cannot be imported from file "%s" because of error:\n\t%s (Error: %d)]

 [contacts]

 [.txt]

@@ -246,6 +238,13 @@
 [Notify]

 [Error]

 ;file \protocols\Gadu-Gadu\src\services.cpp

+[.jpeg]

+[.ico]

+[.rle]

+[.swf]

+[.xml]

+[Can not remove old avatar file before refresh. ERROR: %d: %s\n%s]

+[Can not remove old avatar file. ERROR: %d: %s\n%s]

 [To remove your Gadu-Gadu avatar, you must use the gg.pl website.]

 ;file \protocols\Gadu-Gadu\src\sessions.cpp

 [Client Name]

@@ -257,8 +256,6 @@
 [You have to be logged in to view concurrent sessions.]

 [Copy Text]

 [Whois]

-[%s\t%s\t%s]

-[http://whois.domaintools.com/%s]

 [Concurrent &sessions]

 ;file \protocols\Gadu-Gadu\src\token.cpp

 [Token retrieval failed because of error:\n\t%s]

diff --git a/langpacks/english/Plugins/GTalkExt.txt b/langpacks/english/Plugins/GTalkExt.txt
index 1f2ce159c4..aeba9f632c 100644
--- a/langpacks/english/Plugins/GTalkExt.txt
+++ b/langpacks/english/Plugins/GTalkExt.txt
@@ -20,7 +20,7 @@
 [Text color]

 [Timeout]

 [If both colors set to the same value, default colors will be used]

-[0 means default timeout]

+[0 means default timeout,\n-1 means no timeout]

 [Test]

 ;file \protocols\GTalkExt\src\avatar.cpp

 [PNG]

@@ -29,7 +29,6 @@
 [mir_%d]

 [google:mail:notify]

 [google:setting]

-[http://jabber.org/protocol/disco#info]

 [%s/#inbox/%x%08x]

 [%s/h/?v=c&th=%x%08x]

 [type]

@@ -61,24 +60,15 @@
 [true]

 [%x%08x]

 ;file \protocols\GTalkExt\src\inbox.cpp

-[gmail.com]

-[googlemail.com]

-[https://mail.google.com/%s%s/#inbox]

 [mail]

 ;file \protocols\GTalkExt\src\menu.cpp

 [Open mailbox]

 ;file \protocols\GTalkExt\src\notifications.cpp

 [AntiShittyFullscreenDetectionWindowClass]

 [You've received an e-mail\n%s unread threads]

-[{DB5CE833-C3AC-4851-831C-DDEBD9FA0508}]

-[{87CBD2BC-8806-413C-8FD5-1D61ABCA4AF8}]

-[{B9B00536-86A0-4BCE-B2FE-4ABD409C22AE}]

-[{7A60EA87-3E77-41DF-8A69-59B147F0C9C6}]

 [%s [%s]]

 [    %s <%s>\n]

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

-[{BF447EBA-27AE-4DB7-893C-FC42A3F74D75}]

-[{5EE59FE5-679A-4A29-B0A1-03092E7AC20E}]

 [PopUps]

 [Network]

 [Why C sucks]

@@ -100,5 +90,4 @@
 [ColourPicker]

 ;file \protocols\GTalkExt\src\tipper_items.cpp

 [%raw:]

-[/UnreadThreads%]

 [Unread threads:]

diff --git a/langpacks/english/Plugins/ICQ.txt b/langpacks/english/Plugins/ICQ.txt
index 9fa7609a62..01554699f2 100644
--- a/langpacks/english/Plugins/ICQ.txt
+++ b/langpacks/english/Plugins/ICQ.txt
@@ -202,9 +202,7 @@
 ;file \protocols\IcqOscarJ\src\icq_avatar.cpp

 [%%miranda_avatarcache%%\\]

 [%miranda_avatarcache%]

-[%s\\]

 [avatar]

-[_avt]

 [.jpg]

 [.gif]

 [.png]

@@ -471,10 +469,6 @@
 [Montenegro, Republic of]

 [Zambia]

 [Zimbabwe]

-[50's]

-[60's]

-[70's]

-[80's]

 [Art]

 [Astronomy]

 [Audio and Visual]

@@ -666,13 +660,6 @@
 [Trade and Business Org.]

 [Union]

 [Volunteer Org.]

-[13-17]

-[18-22]

-[23-29]

-[30-39]

-[40-49]

-[50-59]

-[60-above]

 [Single]

 [Close relationships]

 [Engaged]

@@ -760,8 +747,6 @@
 [You have to be online to sychronize the server-list !]

 [** All contacts **]

 ;file \protocols\IcqOscarJ\src\icq_xstatus.cpp

-[\\xstatus_ICQ.dll]

-[\\xstatus_icons.dll]

 [\\Icons]

 [\\Plugins]

 [Angry]

@@ -1024,10 +1009,6 @@
 [Upload in progress...]

 [Upload complete]

 [Upload FAILED]

-;file \protocols\IcqOscarJ\src\changeinfo\editlist.cpp

-[LISTBOX]

-;file \protocols\IcqOscarJ\src\changeinfo\editstring.cpp

-[EDIT]

 ;file \protocols\IcqOscarJ\src\changeinfo\upload.cpp

 [You are not currently connected to the ICQ network. You must be online in order to update your information on the server.]

 ;file \protocols\IcqOscarJ\src\UI\askauthentication.cpp

diff --git a/langpacks/english/Plugins/IEView.txt b/langpacks/english/Plugins/IEView.txt
index df1b5d8d25..53bcf91411 100644
--- a/langpacks/english/Plugins/IEView.txt
+++ b/langpacks/english/Plugins/IEView.txt
@@ -39,8 +39,6 @@
 [Show date]

 [Use long date format]

 [Use relative timestamp]

-;file \plugins\IEView\src\ChatHTMLBuilder.cpp

-[[%H:%M]]

 ;file \plugins\IEView\src\HistoryHTMLBuilder.cpp

 [Outgoing File Transfer]

 [Incoming File Transfer]

@@ -64,15 +62,10 @@
 [Message Sessions]

 [IEView]

 [Skins]

-[320 x 205]

-[480 x 385]

-[560 x 349]

-[640 x 390]

 [Template]

 [All Files]

 [All Images]

 [Style Sheet]

-[uxtheme.dll]

 ;file \plugins\IEView\src\ScriverHTMLBuilder.cpp

 [Today]

 [Yesterday]

@@ -81,4 +74,3 @@
 ;file \plugins\IEView\src\TabSRMMHTMLBuilder.cpp

 ;file \plugins\IEView\src\TemplateHTMLBuilder.cpp

 [.xml]

-[http://]

diff --git a/langpacks/english/Plugins/IRC.txt b/langpacks/english/Plugins/IRC.txt
index b6d353bdca..220a6f1bda 100644
--- a/langpacks/english/Plugins/IRC.txt
+++ b/langpacks/english/Plugins/IRC.txt
@@ -145,17 +145,12 @@
 [Password:]

 [Alternate nick]

 ;file \protocols\IRCG\src\clist.cpp

-[/PRIVMSG %s \001VERSION\001]

 [CTCP chat request from %s]

 ;file \protocols\IRCG\src\commandmonitor.cpp

-[/MODE %s -i]

 [PING %s]

 [PING %u]

 [PONG %s]

-[/JOIN %s %s]

-[/JOIN %s]

 [%s sets mode %s]

-[/MODE %s]

 [Your host is %99[^ \x5b,], running version %99s]

 [PING]

 [%newl]

@@ -163,25 +158,19 @@
 [dcc]

 [PRIVMSG]

 [finger]

-[/NOTICE %s \001FINGER %s (%s)\001]

 [CTCP FINGER requested by %s]

 [version]

-[/NOTICE %s \001VERSION Miranda NG %s (IRC v.%s%s), (c) 2003-09 J.Persson, G.Hazan\001]

 [%mirver]

 [%version]

 [ Unicode]

 [CTCP VERSION requested by %s]

 [source]

-[/NOTICE %s \001SOURCE Get Miranda IRC here: http://miranda-ng.org/ \001]

 [CTCP SOURCE requested by %s]

 [userinfo]

-[/NOTICE %s \001USERINFO %s\001]

 [CTCP USERINFO requested by %s]

 [ping]

-[/NOTICE %s \001%s\001]

 [CTCP PING requested by %s]

 [time]

-[/NOTICE %s \001TIME %s\001]

 [CTCP TIME requested by %s]

 [chat]

 [send]

@@ -192,7 +181,6 @@
 [DCC: Reverse file transfer request from %s denied [No local IP]]

 [DCC ERROR: Malformed CTCP request from %s [%s]]

 [DCC: File transfer resume request from %s denied]

-[/PRIVMSG %s \001DCC ACCEPT %s\001]

 [CTCP %s requested by %s]

 [NOTICE]

 [%u second]

@@ -209,21 +197,13 @@
 [Downloading list - %u channels]

 [Done: %u channels]

 [(probably truncated by server)]

-[367]

-[346]

-[348]

 [   - ]

 [ -  ( ]

-[368]

-[347]

-[349]

-[%s\r\n]

 [%ud, %uh, %um, %us]

 [%uh, %um, %us]

 [%um, %us]

 [%us]

 [online since %s, idle %s]

-[330]

 [is an identified user]

 [is a registered nick]

 [Change nickname]

@@ -232,46 +212,23 @@
 [USERHOST]

 [IRC error]

 [%s %s %s %s ]

-[/IGNORE %question="]

 [Please enter the hostmask (nick!user@host)\nNOTE! Contacts on your contact list are never ignored]

-[","]

 [Ignore]

-[","*!*@]

 [ +qnidcm]

 [ +qnidc]

-[/UNIGNORE *!*@]

-[/MODE ]

 [ +b *!*@]

-[/MODE %s +b *!*@%s%%newl/KICK %s %s]

-[/MODE %s +b *!*@%s%%newl/KICK %s %s %%question="%s","%s","%s"]

 [Please enter the reason]

 [Ban'n Kick]

 [Jerk]

 [Try server %99[^ ,], port %19s]

-[CHANTYPES=]

-[CHANMODES=]

-[PREFIX=]

 [\0035\002]

 [*Disconnected*]

-[/AWAY %s]

 [The usage of /AWAY in your perform buffer is restricted\n as IRC sends this command automatically.]

 [IRC Error]

-[/away]

 ;file \protocols\IRCG\src\input.cpp

-[!_nick_!]

-[/quit]

-[/privmsg]

-[/part]

-[/topic]

-[/notice]

-[/kick]

-[/nick]

 [\r\n]

 [\r\r]

 [%question]

-[#$%u]

-[$%u-]

-[$%u]

 [%mnick]

 [%anick]

 [%awaymsg]

@@ -284,73 +241,35 @@
 [%underline]

 [%italics]

 [The buddy check function is disabled]

-[/servershow]

-[/serverhide]

-[/sleep]

-[/wait]

 [Incorrect parameters. Usage: /sleep [ms], ms should be greater than 0 and less than 4000.]

-[/clear]

 [server]

-[/ignore]

 [Ignore system is enabled]

 [Ignore system is disabled]

 [off]

-[!*@*]

 [qnidc]

 [%s on %s is now ignored (+%s)]

-[/unignore]

 [%s is not ignored now]

 [%s was not ignored]

-[/userhost]

-[/joinx]

-[/joinm]

-[/nusers]

 [users: %u]

-[/echo]

 [Outgoing commands are shown]

 [Outgoing commands are not shown]

-[/buddycheck]

 [The buddy check function is enabled]

 [The time interval for the buddy check function is now at default setting]

 [The time interval for the buddy check function is now %u seconds]

-[/whois]

-[/channelmanager]

-[/who]

-[/hop]

-[/PART %s]

-[/list]

 [This command is not recommended on a network of this size!\r\nIt will probably cause high CPU usage and/or high bandwidth\r\nusage for around %u to %u minute(s).\r\n\r\nDo you want to continue?]

 [IRC warning]

-[/lusers]

 [Aborted]

-[/me]

-[\001ACTION %s\001]

-[/ame]

-[/ME ]

-[/amsg]

-[/msg]

-[/PRIVMSG %s]

-[/query]

-[/ctcp]

-[/PRIVMSG %s \001%s %u\001]

-[/PRIVMSG %s \001%s\001]

 [CTCP %s request sent to %s]

-[/dcc]

 [DCC ERROR: Unable to automatically resolve external IP]

-[/CTCP %s DCC CHAT chat %u %u]

 [DCC CHAT request sent to %s]

 [DCC ERROR: Unable to bind port]

 [Input command]

 [Please enter the reply]

-[/raw]

-[/quote]

-[/PRIVMSG ]

 ;file \protocols\IRCG\src\irc.h

 [Network log]

 ;file \protocols\IRCG\src\irclib.cpp

 [QUIT]

 [\0035%s \002%s\002 (]

-[: %u).]

 [Failed to connect to]

 [NICK %s\r\n]

 [Miranda]

@@ -358,32 +277,21 @@
 [USER %s %s %s :%s\r\n]

 [QUIT :%s\r\n]

 [DCC ERROR: Unable to bind local port for passive filetransfer]

-[/CTCP %s DCC SEND %s %u %u %I64u %s]

 ;file \protocols\IRCG\src\ircproto.cpp

 [%s server connection]

 [%s client-to-client connections]

 [The IRC protocol depends on another plugin called 'Chat'\n\nDo you want to download it from the Miranda NG web site now?]

 [Information]

 [%%miranda_path%%\\Plugins\\]

-[_perform.ini]

-[%s%u]

 [Miranda%u]

-[/PRIVMSG %s \001DCC RESUME %s 0 %I64u %s\001]

-[/PRIVMSG %s \001DCC RESUME %s %u %I64u\001]

 [Nickname]

 [DCC ERROR: No valid files specified]

-[/CTCP %s DCC SEND %s 200 0 %I64u %u]

 [DCC reversed file transfer request sent to %s [%s]]

-[/NOTICE %s I am sending the file '\002%s\002' (%I64u kB) to you, please accept it. [Reverse transfer]]

-[/CTCP %s DCC SEND %s %u %u %I64u]

 [DCC file transfer request sent to %s [%s]]

-[/NOTICE %s I am sending the file '\002%s\002' (%I64u kB) to you, please accept it. [IP: %s]]

 [DCC ERROR: Unable to bind local port]

-[/DCC SEND %s ]

 [The protocol is not online]

 [The dcc chat connection is not active]

 [Please choose an IRC-network to go online. This network will be the default.]

-[/AWAY]

 [WHOIS ]

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

 [Main]

@@ -423,13 +331,10 @@
 [Delete this network]

 [Do you want to delete\r\n%s]

 [Delete server]

-[4096]

 [<Resolved IP: ]

 [Click to set commands that will be performed for this event]

 [Click to delete the commands for this event]

 [Default ANSI codepage]

-[UTF-8]

-[_ignore.ini]

 [Add new ignore]

 [Edit this ignore]

 [Delete this ignore]

@@ -440,11 +345,6 @@
 [DCC'n CTCP]

 [Advanced]

 [UNIX]

-[113]

-[/op /mode ## +ooo $1 $2 $3\r\n/dop /mode ## -ooo $1 $2 $3\r\n/voice /mode ## +vvv $1 $2 $3\r\n/dvoice /mode ## -vvv $1 $2 $3\r\n/j /join #$1 $2-\r\n/p /part ## $1-\r\n/w /whois $1\r\n/k /kick ## $1 $2-\r\n/q /query $1\r\n/logon /log on ##\r\n/logoff /log off ##\r\n/save /log buffer $1\r\n/slap /me slaps $1 around a bit with a large trout]

-[%miranda_path%\\Plugins\\IRC_servers.ini]

-[%temp%\\default_servers.ini]

-[TEXT]

 ;file \protocols\IRCG\src\output.cpp

 [WALLOPS]

 [WallOps from %s: ]

@@ -456,9 +356,6 @@
 [CTCP %s reply sent to %s: %s]

 [Notice to %s: ]

 [ : ]

-[303]

-[\001]

-[515]

 ;file \protocols\IRCG\src\services.cpp

 [&Quick connect]

 [&Join channel]

@@ -470,15 +367,9 @@
 [Di&sconnect]

 [&Add to ignore list]

 [%s (%s) is requesting a client-to-client chat connection.]

-[/PART %s %s]

-[/CHANNELMANAGER]

-[/WHOIS %s %s]

-[/IGNORE %%question="%s","%s","*!*@]

-[" %s]

 [Please enter the hostmask (nick!user@host) \nNOTE! Contacts on your contact list are never ignored]

 [Join channel]

 [Please enter a channel to join]

-[/LIST]

 [Change nick name]

 [Please enter a unique nickname]

 [\002]

@@ -491,75 +382,32 @@
 [\00399,]

 [\003%u,99]

 [ - ]

-[/QUERY %s]

-[/SERVERSHOW]

-[/nickserv REGISTER %%question="%s","%s"]

 [Please enter your authentification code]

 [Authentificate nick]

-[/nickserv AUTH %%question="%s","%s"]

 [Are you sure you want to unregister your current nick?]

 [Delete nick]

-[/nickserv DROP]

 [Identify nick]

 [Please enter your password]

-[/nickserv IDENTIFY %question="%s","%s"]

-[/nickserv SENDPASS %s]

-[/nickserv SET PASSWORD %%question="%s","%s"]

 [Please enter your new password]

 [Set new password]

-[/nickserv SET LANGUAGE %%question="%s","%s"]

 [Please enter desired languageID (numeric value, depends on server)]

 [Change language of NickServ messages]

-[/nickserv SET URL %%question="%s","%s"]

 [Please enter URL that will be linked to your nick]

 [Set URL, linked to nick]

-[/nickserv SET EMAIL %%question="%s","%s"]

 [Please enter your e-mail, that will be linked to your nick]

 [Set e-mail, linked to nick]

-[/nickserv SET INFO %%question="%s","%s"]

 [Please enter some information about your nick]

 [Set information for nick]

-[/nickserv SET KILL OFF]

-[/nickserv SET KILL ON]

-[/nickserv SET KILL QUICK]

-[/nickserv SET PRIVATE ON]

-[/nickserv SET PRIVATE OFF]

-[/nickserv SET HIDE EMAIL ON]

-[/nickserv SET HIDE EMAIL OFF]

-[/nickserv SET SECURE ON]

-[/nickserv SET SECURE OFF]

-[/nickserv LINK %%question="%s","%s"]

 [Please enter nick you want to link to your current nick]

 [Link another nick to current nick]

 [Please enter nick you want to unlink from your current nick]

 [Unlink another nick from current nick]

 [Please enter nick you want to set as your main nick]

 [Set main nick]

-[/nickserv LISTLINKS]

-[/nickserv LISTCHANS]

-[/MODE %s +o %s]

-[/MODE %s -o %s]

-[/MODE %s +v %s]

-[/MODE %s -v %s]

-[/KICK %s %s]

-[/KICK %s %s %%question="%s","%s","%s"]

 [Kick]

-[/DCC CHAT %s]

-[/DCC SEND %s]

-[/MODE %s +h %s]

-[/MODE %s -h %s]

-[/MODE %s +q %s]

-[/MODE %s -q %s]

-[/MODE %s +a %s]

-[/MODE %s -a %s]

-[/NOTICE %s %%question="%s","%s"]

 [Please enter the notice text]

-[/INVITE %s %%question="%s","%s"]

 [Please enter the channel name to invite to]

 [Invite to channel]

-[/slap %s]

-[/nickserv INFO %s ALL]

-[/nickserv GHOST %s]

 [NickServ]

 [Register nick]

 [Auth nick]

@@ -610,9 +458,7 @@
 [Add to &ignore list]

 [&Add User]

 [\0033%s \002%s\002 (]

-[: %u)]

 [Connecting to]

-[: %u, try %u)]

 [Reconnecting to]

 ;file \protocols\IRCG\src\tools.cpp

 [\r\n\r\n]

@@ -623,15 +469,9 @@
 ;file \protocols\IRCG\src\userinfo.cpp

 ;file \protocols\IRCG\src\windows.cpp

 [Please wait...]

-[/PRIVMSG %s \001PING %u\001]

-[/PRIVMSG %s \001USERINFO\001]

-[/PRIVMSG %s \001TIME\001]

-[/NICK %s]

 [Channel]

 [Mode]

 [%s - Filtered - %d items]

-[/JOIN #%s]

-[---- Not listed server ----]

 [Type new server address here]

 [Miranda IRC]

 [Add ban/invite/exception]

@@ -645,15 +485,8 @@
 [Add invite]

 [Add exception]

 [Please enter the hostmask (nick!user@host)]

-[/MODE %s %s %s]

 [Edit ban]

 [Edit invite?]

 [Edit exception?]

-[/MODE %s -%s %s%s/MODE %s +%s %s]

-[/mode ]

-[%s-%s]

 [%s+%s]

-[/TOPIC %s %s]

 [%s %s %s]

-[/MODE]

-[/MODE %s +b]

diff --git a/langpacks/english/Plugins/Import.txt b/langpacks/english/Plugins/Import.txt
index 3770e34db9..327714e072 100644
--- a/langpacks/english/Plugins/Import.txt
+++ b/langpacks/english/Plugins/Import.txt
@@ -73,9 +73,6 @@
 [Import...]

 [&Import...]

 ;file \plugins\Import\src\miranda.cpp

-[%s\\*.*]

-[%s\\%s\\%s.dat]

-[%s.dat]

 [%miranda_path%\\Profiles]

 [%miranda_path%]

 [%miranda_profile%]

@@ -85,7 +82,6 @@
 [%s (*.dat, *.bak)%c*.dat;*.bak%c%s (*.*)%c*.*%c%c]

 [Miranda NG database]

 [All Files]

-[dat]

 ;file \plugins\Import\src\utils.cpp

 [Skipping duplicate group %s.]

 ;file \plugins\Import\src\wizard.cpp

diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index 85c99db353..5308c48977 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -203,7 +203,6 @@
 [%d.%d.%d.%d]

 ;file \protocols\JabberG\src\jabber.h

 [I'm happy Miranda NG user. Get it at http://miranda-ng.org/.]

-[/me slaps %s around a bit with a large trout]

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

 [get]

 [node]

@@ -212,7 +211,6 @@
 [set]

 [command]

 [action]

-[execute]

 [type]

 [error]

 [code]

@@ -224,7 +222,6 @@
 [Not supported]

 [status]

 [completed]

-[executing]

 [Done]

 [from]

 [sessionid]

@@ -274,11 +271,8 @@
 [Bytestream Proxy not available]

 [sid]

 [streamhost]

-[%s%s%s]

-[ftproxy_%d]

 [auth]

 [not-acceptable]

-[urn:ietf:params:xml:ns:xmpp-stanzas]

 [cancel]

 [item-not-found]

 [activate]

@@ -326,18 +320,6 @@
 [Supports Jingle]

 [Supports Roster Exchange]

 [Supports GTalk private multi-user chat]

-[field[@var='FORM_TYPE']/value]

-[urn:xmpp:dataforms:softwareinfo]

-[field[@var='os']/value]

-[field[@var='os_version']/value]

-[field[@var='software']/value]

-[field[@var='software_version']/value]

-[field[@var='x-miranda-core-version']/value]

-[field[@var='x-miranda-core-is-unicode']/value]

-[field[@var='x-miranda-is-unicode']/value]

-[field[@var='x-miranda-core-is-alpha']/value]

-[field[@var='x-miranda-is-alpha']/value]

-[field[@var='x-miranda-jabber-is-debug']/value]

 [feature]

 [var]

 [%s/%s]

@@ -346,8 +328,6 @@
 [BombusMod]

 [neos]

 [sim]

-[http://miranda-im.org/caps]

-[0.7.0.13]

 [identity]

 [category]

 [client]

@@ -371,14 +351,11 @@
 [image/jpeg]

 [%%TEMP%%\\captcha.%s]

 [captcha]

-[urn:xmpp:captcha]

 [submit]

 [challenge]

 [message]

 [modify]

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

-[http://jabber.org/protocol/muc#admin]

-[http://jabber.org/protocol/muc#owner]

 [None]

 [Member]

 [Admin]

@@ -446,16 +423,13 @@
 [Copy &nickname]

 [Copy real &JID]

 [Copy in-room JID]

-[http://]

 [Real &JID: %s]

 [invite]

 [reason]

-[%s\n%s]

 [Send groupchat invitation.]

 [%s (%s)]

 [not on roster]

 [Member Info:]

-[%s\n%s %s %s]

 [Member Information]

 [Real JID not available]

 [affiliation]

@@ -527,7 +501,6 @@
 [gateway]

 [aim]

 [gadu-gadu]

-[http-ws]

 [icq]

 [msn]

 [sms]

@@ -543,7 +516,6 @@
 [leaf]

 [proxy]

 [bytestreams]

-[pubsub]

 [collection]

 [pep]

 [service]

@@ -605,7 +577,6 @@
 [subscribe]

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

 [desc]

-[%s\\%s]

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

 [text-private]

 [text-multi]

@@ -688,142 +659,73 @@
 [The text of a welcome message]

 [whitelistjids]

 [A list of entities with whom communication is allowed]

-[muc#register_first]

 [First Name]

-[muc#register_last]

 [Last Name]

-[muc#register_roomnick]

 [Desired Nickname]

-[muc#register_url]

 [Your URL]

-[muc#register_email]

 [Email Address]

-[muc#register_faqentry]

 [FAQ Entry]

-[muc#roomconfig_allowinvites]

 [Whether to Allow Occupants to Invite Others]

-[muc#roomconfig_changesubject]

 [Whether to Allow Occupants to Change Subject]

-[muc#roomconfig_enablelogging]

 [Whether to Enable Logging of Room Conversations]

-[muc#roomconfig_lang]

 [Natural Language for Room Discussions]

-[muc#roomconfig_maxusers]

 [Maximum Number of Room Occupants]

-[muc#roomconfig_membersonly]

 [Whether an Make Room Members-Only]

-[muc#roomconfig_moderatedroom]

 [Whether to Make Room Moderated]

-[muc#roomconfig_passwordprotectedroom]

 [Whether a Password is Required to Enter]

-[muc#roomconfig_persistentroom]

 [Whether to Make Room Persistent]

-[muc#roomconfig_presencebroadcast]

 [Roles for which Presence is Broadcast]

-[muc#roomconfig_publicroom]

 [Whether to Allow Public Searching for Room]

-[muc#roomconfig_roomadmins]

 [Full List of Room Admins]

-[muc#roomconfig_roomdesc]

 [Short Description of Room]

-[muc#roomconfig_roomname]

 [Natural-Language Room Name]

-[muc#roomconfig_roomowners]

 [Full List of Room Owners]

-[muc#roomconfig_roomsecret]

 [The Room Password]

-[muc#roomconfig_whois]

 [Affiliations that May Discover Real JIDs of Occupants]

-[pubsub#access_model]

 [Precondition: node configuration with the specified access model]

-[pubsub#allow]

 [Whether to allow the subscription]

-[pubsub#subid]

 [The SubID of the subscription]

-[pubsub#node]

 [The NodeID of the relevant node]

-[pubsub#subscriber_jid]

 [The address (JID) of the subscriber]

-[pubsub#deliver]

 [Whether an entity wants to receive or disable notifications]

-[pubsub#digest]

 [Whether an entity wants to receive digests (aggregations) of notifications or all notifications individually]

-[pubsub#digest_frequency]

 [The minimum number of milliseconds between sending any two notification digests]

-[pubsub#expire]

 [The DateTime at which a leased subscription will end or has ended]

-[pubsub#include_body]

 [Whether an entity wants to receive an XMPP message body in addition to the payload format]

-[pubsub#show-values]

 [The presence states for which an entity wants to receive notifications]

-[pubsub#subscription_type]

-[pubsub#subscription_depth]

 [Who may subscribe and retrieve items]

-[pubsub#body_xslt]

 [The URL of an XSL transformation which can be applied to payloads in order to generate an appropriate message body element.]

-[pubsub#collection]

 [The collection with which a node is affiliated]

-[pubsub#dataform_xslt]

 [The URL of an XSL transformation which can be applied to the payload format in order to generate a valid Data Forms result that the client could display using a generic Data Forms rendering engine]

-[pubsub#deliver_payloads]

 [Whether to deliver payloads with event notifications]

-[pubsub#itemreply]

 [Whether owners or publisher should receive replies to items]

-[pubsub#children_association_policy]

 [Who may associate leaf nodes with a collection]

-[pubsub#children_association_whitelist]

 [The list of JIDs that may associated leaf nodes with a collection]

-[pubsub#children]

 [The child nodes (leaf or collection) associated with a collection]

-[pubsub#children_max]

 [The maximum number of child nodes that can be associated with a collection]

-[pubsub#max_items]

 [The maximum number of items to persist]

-[pubsub#max_payload_size]

 [The maximum payload size in bytes]

-[pubsub#node_type]

 [Whether the node is a leaf (default) or a collection]

-[pubsub#notify_config]

 [Whether to notify subscribers when the node configuration changes]

-[pubsub#notify_delete]

 [Whether to notify subscribers when the node is deleted]

-[pubsub#notify_retract]

 [Whether to notify subscribers when items are removed from the node]

-[pubsub#persist_items]

 [Whether to persist items to storage]

-[pubsub#presence_based_delivery]

 [Whether to deliver notifications to available users only]

-[pubsub#publish_model]

 [The publisher model]

-[pubsub#replyroom]

 [The specific multi-user chat rooms to specify for replyroom]

-[pubsub#replyto]

 [The specific JID(s) to specify for replyto]

-[pubsub#roster_groups_allowed]

 [The roster group(s) allowed to subscribe and retrieve items]

-[pubsub#send_item_subscribe]

 [Whether to send items to new subscribers]

-[pubsub#subscribe]

 [Whether to allow subscriptions]

-[pubsub#title]

 [A friendly name for the node]

-[pubsub#type]

 [The type of node data, usually specified by the namespace of the payload (if any); MAY be list-single rather than text-single]

-[pubsub#contact]

 [The JIDs of those to contact with questions]

-[pubsub#creation_date]

 [The datetime when the node was created]

-[pubsub#creator]

 [The JID of the node creator]

-[pubsub#description]

 [A description of the node]

-[pubsub#language]

 [The default language of the node]

-[pubsub#num_subscribers]

 [The number of subscribers to the node]

-[pubsub#owner]

 [The JIDs of those with an affiliation of owner]

-[pubsub#publisher]

 [The JIDs of those with an affiliation of publisher]

 [The name of the node]

 [Payload type]

@@ -871,9 +773,7 @@
 [Another resource with which to continue the session]

 [disclosure]

 [Disclosure of content, decryption keys or identities]

-[http://jabber.org/protocol/chatstates]

 [Whether may send Chat State Notifications per XEP-0085]

-[http://jabber.org/protocol/xhtml-im]

 [Whether allowed to use XHTML-IM formatting per XEP-0071]

 [language]

 [Primary written language of the chat (each value appears in order of preference and conforms to RFC 4646 and the IANA registry)]

@@ -885,23 +785,9 @@
 [Minimum security level]

 [terminate]

 [Whether to terminate the session]

-[urn:xmpp:receipts]

 [Whether to enable Message Receipts per XEP-0184]

-[http://jabber.org/network/serverinfo]

-[http://jabber.org/protocol/admin]

-[http://jabber.org/protocol/muc#register]

-[http://jabber.org/protocol/muc#roomconfig]

-[http://jabber.org/protocol/pubsub#publish-options]

-[http://jabber.org/protocol/pubsub#subscribe_authorization]

-[http://jabber.org/protocol/pubsub#subscribe_options]

-[http://jabber.org/protocol/pubsub#node_config]

-[http://jabber.org/protocol/pubsub#meta-data]

-[http://jabber.org/protocol/rc]

 [jabber:iq:register]

-[urn:xmpp:ssn]

 [text-single]

-[listbox]

-[combobox]

 [JabberDataFormControl]

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

 [JabberInfoFrameClass]

@@ -913,7 +799,6 @@
 [size]

 [form]

 [stream-method]

-[data]

 [seq]

 [amp]

 [rule]

@@ -943,7 +828,6 @@
 [away]

 [dnd]

 [has set the subject to:]

-[/me ]

 [jabber:x:delay]

 [stamp]

 [Incoming groupchat invitation.]

@@ -953,12 +837,10 @@
 [block-size]

 [stanza]

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

-[|*icq*|jit*]

 [msn*]

 [yahoo*]

 [mrim*]

 [aim*]

-[|gg*|gadu*]

 [tv*]

 [dict*]

 [weather*]

@@ -966,7 +848,6 @@
 [sms*]

 [smtp*]

 [gtalk.*.*]

-[|xmpp.*.*|j2j.*.*]

 [disk*]

 [irc*]

 [rss*]

@@ -974,7 +855,6 @@
 [studivz*]

 [schuelervz*]

 [meinvz*]

-[|fb*|facebook*]

 [Protocols/Jabber/Accounts]

 [Status Icons/%s/]

 [ %s]

@@ -1040,7 +920,6 @@
 [Authentication failed for]

 [Jabber Authentication]

 [session]

-[urn:ietf:params:xml:ns:xmpp-session]

 [both]

 [vz:img]

 [Registration successful]

@@ -1050,7 +929,6 @@
 [%d-%d-%d]

 [GENDER]

 [ADR]

-[%s\r\n%s]

 [TEL]

 [ORG]

 [ROLE]

@@ -1087,7 +965,6 @@
 [%+03d:%02d]

 [utc]

 [tzo]

-[%.4i%.2i%.2iT%.2i:%.2i:%.2i]

 [display]

 [File transfer refused]

 [Ad-hoc commands]

@@ -1135,19 +1012,12 @@
 [CHAT plugin is required for conferences. Install it before chatting]

 [%%miranda_avatarcache%%\\Jabber]

 [%miranda_avatarcache%]

-[%s\\Jabber]

 [%s@]

 [ avatar.]

-[http://miranda-im.org]

 [Miranda IM Jabber]

-[http://miranda-ng.org]

-[http://www.google.com]

 [GTalk]

-[http://mail.google.com]

 [GMail]

-[http://talk.google.com/xmpp/bot]

 [GTalk Bot]

-[http://www.android.com]

 [Android]

 [(SecureIM)]

 [ (SecureIM)]

@@ -1360,7 +1230,6 @@
 [Zhuang; Chuang]

 [Zulu]

 [%s@%s]

-[jabber.org]

 [Office]

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

 [Jabber Protocol Option]

@@ -1421,14 +1290,10 @@
 [XML for MS Excel (UTF-8 encoded)]

 [xml]

 [Workbook]

-[urn:schemas-microsoft-com:office:spreadsheet]

 [xmlns:o]

-[urn:schemas-microsoft-com:office:office]

 [xmlns:x]

-[urn:schemas-microsoft-com:office:excel]

 [xmlns:ss]

 [xmlns:html]

-[http://www.w3.org/TR/REC-html40]

 [ExcelWorkbook]

 [Worksheet]

 [ss:Name]

@@ -1450,7 +1315,6 @@
 [LiveJournal Talk]

 [Facebook Chat]

 [Vkontakte]

-[S.ms]

 [Some changes will take effect the next time you connect to the Jabber network.]

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

 [%s %s@]

@@ -1538,14 +1402,12 @@
 [add]

 [No compatible file transfer machanism exist]

 [Protocol is offline or no jid]

-[[This message is encrypted.]]

 [jabber:x:encrypted]

 [): ]

 [paused]

 [composing]

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

 [rid]

-[http://jabber.org/protocol/httpbind]

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

 [%u%u]

 [bad-sessionid]

@@ -1586,10 +1448,7 @@
 [addresses]

 [ofrom]

 [oto]

-[%.4i-%.2i-%.2iT%.2i:%.2i:%.2iZ]

-[urn:xmpp:delay]

 [%d message(s) forwarded]

-[user32.dll]

 [Workstation successfully locked]

 [Error %d occured during workstation lock]

 [Confirmation needed]

@@ -1599,8 +1458,6 @@
 [There is no groupchats to leave]

 [Choose the groupchats you want to leave]

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

-[STATIC]

-[EDIT]

 [Error %s %s\r\nPlease select other server]

 [Error Unknown reply recieved\r\nPlease select other server]

 [fullname]

@@ -1614,7 +1471,6 @@
 [Negotiate]

 [GSSAPI]

 [NTLM]

-[secur32.dll]

 [xmpp/%s/%s@%s]

 [xmpp/%s@%s]

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

@@ -1629,46 +1485,32 @@
 [Out to lunch]

 [Idle]

 [ | ]

-[%s%s%s%s]

-[<b>]

-[</b>\t]

-[%s%s\t%s]

 [Nick:]

 [Status:]

 [Status text:]

 [Real JID:]

-[body=]

 [join]

 [disco]

-[node=]

 [sendfile]

 [attention]

 [not-authorized]

-[urn:ietf:params:xml:xmpp-stanzas]

 [thread]

 [bcdfghjklmnpqrstvwxz0123456789]

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

 [Enter password for]

-[1.0]

 [encoding]

-[UTF-8]

 [stream:stream]

 [jabber:client]

 [xmlns:stream]

-[http://etherx.jabber.org/streams]

-[/%s]

 [Error: Not enough memory]

 [Error: Cannot connect to the server]

 [Error: Connection lost]

 [Requesting registration instruction...]

-[urn:ietf:params:xml:ns:xmpp-sasl]

 [mechanism]

 [starttls]

-[urn:ietf:params:xml:ns:xmpp-tls]

 [compression]

 [zlib]

 [compress]

-[http://jabber.org/protocol/compress]

 [mechanisms]

 [PLAIN]

 [DIGEST-MD5]

@@ -1677,8 +1519,6 @@
 [hostname]

 [register]

 [bind]

-[urn:ietf:params:xml:ns:xmpp-bind]

-[%s\r\n]

 [conflict]

 [see-other-host]

 [response]

@@ -1695,7 +1535,6 @@
 [Message redirected from: %s\r\n%s]

 [user:x]

 [xmlns:user]

-[-----BEGIN PGP MESSAGE-----\r\n\r\n]

 [\r\n-----END PGP MESSAGE-----\r\n]

 [user:invite]

 [user:reason]

@@ -1711,7 +1550,6 @@
 [initiator]

 [unsupported-applications]

 [unknown-session]

-[urn:xmpp:jingle:errors:1]

 [service-unavailable]

 [Sending registration information...]

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

@@ -1746,11 +1584,8 @@
 [Copy only this value]

 [BMP %s (*.bmp)]

 [format]

-[*.BMP]

 [GIF %s (*.gif)]

-[*.GIF]

 [JPEG %s (*.jpg;*.jpeg)]

-[*.JPG;*.JPEG]

 [%s (*.*)]

 [Unknown format]

 [*.*]

@@ -1786,7 +1621,6 @@
 [priority]

 [photo]

 [show]

-[http://talk.google.com/xmpp/bot/caps]

 [Advanced Status]

 [Set mood...]

 [Set activity...]

@@ -1795,8 +1629,6 @@
 [%s (%d)]

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

 [prodid]

-[-//HandGen//NONSGML vGen v1.0//EN]

-[2.0]

 [Male]

 [Female]

 [.\\]

@@ -2011,7 +1843,6 @@
 [%s - %s]

 [listening_to]

 [Listening To]

-[..\\Icons\\xstatus_jabber.dll]

 [Protocols/Jabber/Moods]

 [Protocols/Jabber/Activities]

 ;file \protocols\JabberG\src\jabber_xstatus.h

diff --git a/langpacks/english/Plugins/KeepStatus.txt b/langpacks/english/Plugins/KeepStatus.txt
index 8ff463996a..459886b8fd 100644
--- a/langpacks/english/Plugins/KeepStatus.txt
+++ b/langpacks/english/Plugins/KeepStatus.txt
@@ -9,14 +9,12 @@
 [Protocol]

 [<from trigger>]

 ;file \plugins\StatusPlugins\KeepStatus\keepstatus.cpp

-[STATIC]

 [KeepStatus]

 [%s Connected from another location]

 [%s Login error, cancel reconnecting]

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

@@ -28,6 +26,5 @@
 [Basic]

 [Advanced]

 [You broke the Internet!]

-[uxtheme.dll]

 [Status]

 [PopUps]

diff --git a/langpacks/english/Plugins/KeyboardNotify.txt b/langpacks/english/Plugins/KeyboardNotify.txt
index 27e951a4b9..cd3c11ff92 100644
--- a/langpacks/english/Plugins/KeyboardNotify.txt
+++ b/langpacks/english/Plugins/KeyboardNotify.txt
@@ -94,7 +94,6 @@
 [\\\\.\\Kbd%d]

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

 [screen-saver]

-[user32]

 [%s/FlashEvent]

 [%s/ExitEvent]

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

@@ -112,15 +111,9 @@
 [Protocol]

 [Keyboard Notify Theme]

 [ (*.knt)]

-[*.knt]

 [All Files]

 [*.*]

 [knt]

 [\n; Automatically generated Keyboard Notify Theme file\n\n\n]

-[[%s]\n]

-[0\n\n]

-[%s\n\n]

 [\n; End of automatically generated Keyboard Notify Theme file\n]

 [None]

-;file \plugins\KeyboardNotify\src\utils.cpp

-[%s\\%s]

diff --git a/langpacks/english/Plugins/LangMan.txt b/langpacks/english/Plugins/LangMan.txt
index 8b2a0d31b0..344052eff7 100644
--- a/langpacks/english/Plugins/LangMan.txt
+++ b/langpacks/english/Plugins/LangMan.txt
@@ -31,25 +31,17 @@
 ;file \plugins\LangMan\src\langpack.cpp

 [Plugins\\Language\\]

 [English (default)]

-[%s\\Plugins\\%s]

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

-[The Language Pack Manager Plugin can not be loaded. It requires Miranda IM %hs or later.]

-[Language Pack Manager Plugin]

 [Reload langpack]

-[LangMan-Readme.txt]

 [Docs\\]

-[LangMan-License.txt]

-[LangMan-SDK.zip]

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

 [UXTHEME]

-[%s\\Plugins\\*.dll]

 [%hs (%s)]

 [All installed plugins are included.]

 [(incompatible)]

 [Unknown]

 [Current]

 [Installed Languages]

-[langpack_*.txt]

 [File]

 [built-in]

 [&Remove...]

diff --git a/langpacks/english/Plugins/Libgcrypt.txt b/langpacks/english/Plugins/Libgcrypt.txt
index 97a30dd60d..8169b2d6e6 100644
--- a/langpacks/english/Plugins/Libgcrypt.txt
+++ b/langpacks/english/Plugins/Libgcrypt.txt
@@ -1,7 +1,5 @@
 ;#muuid not found, please specify manually!

 ;langpack template for Libgcrypt

 ;file \plugins\MirOTR\libgcrypt-1.4.6\random\rndw32.c

-[$M$B$M$5$S$D$]

 [Global]

-[SYSTEM\\CurrentControlSet\\Control\\ProductOptions]

 [ProductType]

diff --git a/langpacks/english/Plugins/LinkList.txt b/langpacks/english/Plugins/LinkList.txt
index 858ea82518..2cd8388831 100644
--- a/langpacks/english/Plugins/LinkList.txt
+++ b/langpacks/english/Plugins/LinkList.txt
@@ -46,7 +46,6 @@
 [Copy to Clipboard]

 [Show Message]

 ;file \plugins\HistoryLinkListPlus\src\linklist.cpp

-[RICHED32.DLL]

 [Unable to load the Rich Edit control!]

 [Error]

 [&Create Linklist]

@@ -63,11 +62,7 @@
 [mailto:]

 [%s: %s]

 ;file \plugins\HistoryLinkListPlus\src\linklist_fct.cpp

-[http://]

-[ftp://]

-[https://]

 [www.]

-[ftp.]

 [icq#]

 [gopher://]

 [news://]

@@ -76,7 +71,6 @@
 [.com/]

 [.net/]

 [.org/]

-[.co.uk]

 [.ru]

 [d-t]

 [Arial]

@@ -85,22 +79,9 @@
 [Courier]

 [Processing list...]

 [\n\n]

-[[mail]]

-[[URL ]]

-[[file]]

-[[UNK ]]

-[%s%s%s%s%s%s%s\n]

-[[in ]]

-[[out]]

 [No messages found!\nPlease change current filter options.]

-[___________________________________________\n]

 [\n[in ] ]

 [URL   ]

-[08:15 http://miranda-ng.org\n]

-[http://miranda-ng.org\n]

-[[out] ]

-[08:16 http://miranda-ng.org\n]

 [%s: %s %s]

-[*.rtf]

 [RTF File\0*.rtf\0All Files\0*.*\0\0]

 [Save RTF File]

diff --git a/langpacks/english/Plugins/ListeningTo.txt b/langpacks/english/Plugins/ListeningTo.txt
index ccd54f5702..451e12e078 100644
--- a/langpacks/english/Plugins/ListeningTo.txt
+++ b/langpacks/english/Plugins/ListeningTo.txt
@@ -94,15 +94,8 @@
 [Format]

 [Players]

 ;file \plugins\ListeningTo\src\players\foobar.cpp

-[{DA7CD0DE-1602-45e6-89A1-C2CA151E008E}/1]

-[{DA7CD0DE-1602-45e6-89A1-C2CA151E008E}]

-[{97E27FAA-C0B3-4b8e-A693-ED7881E99FC1}]

-[{E7076D1C-A7BF-4f39-B771-BCBE88F2A2A8}]

 [foobar2000]

 ;file \plugins\ListeningTo\src\players\generic.cpp

-[[%08u - %08u] [%s] ]

-[c:\\miranda_listeningto.log.txt]

-[%s\r\n]

 [GenericPlayer]

 [Miranda ListeningTo receiver]

 [ProcessReceived]

@@ -146,8 +139,6 @@
 [WindowsMediaPlayer]

 [Miranda ListeningTo WMP receiver]

 [WMP : New data: [%d] %s]

-;file \plugins\ListeningTo\src\players\foo_mlt\foobar2000\helpers\win32_misc.cpp

-[ntdll.dll]

 ;file \plugins\ListeningTo\src\players\foo_mlt\pfc\profiler.cpp

 [unexpected profiler failure\n]

 ;file \plugins\ListeningTo\src\players\winamp_mlt\mlt_winamp.cpp

diff --git a/langpacks/english/Plugins/MRA.txt b/langpacks/english/Plugins/MRA.txt
index dd221993eb..36e8619461 100644
--- a/langpacks/english/Plugins/MRA.txt
+++ b/langpacks/english/Plugins/MRA.txt
@@ -108,11 +108,8 @@
 [plugin connections]

 [%%miranda_avatarcache%%\\%s]

 [%miranda_avatarcache%]

-[%s\\%s\\]

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

 [get]

-;file \protocols\MRA\src\MraConstans.h

-[_default.jpg]

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

 [No description given]

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

@@ -121,7 +118,6 @@
 [%s connection]

 [E-mail address]

 [%04ld.%02ld.%02ld %02ld:%02ld: ]

-[%s%s]

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

 [Network]

 [Account]

diff --git a/langpacks/english/Plugins/MSN.txt b/langpacks/english/Plugins/MSN.txt
index 0634a44fc3..9498f3dbc1 100644
--- a/langpacks/english/Plugins/MSN.txt
+++ b/langpacks/english/Plugins/MSN.txt
@@ -86,7 +86,6 @@
 ;file \protocols\MSN\src\msn_errors.cpp

 [User not online]

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

-[contact=]

 [add?]

 [chat?]

 [voice?]

@@ -116,7 +115,6 @@
 ;file \protocols\MSN\src\msn_misc.cpp

 [%%miranda_userdata%%\\Avatars\\%s]

 [%miranda_userdata%]

-[%s\\Avatars\\%s]

 [\\%s.]

 [\\%s avatar.]

 [\\%s]

@@ -128,18 +126,7 @@
 [.gif]

 [.bmp]

 [.png]

-[%s\\%s\\CustomSmiley]

 [\\%s.%s]

-[{0}]

-[{1}]

-[{2}]

-[{3}]

-[{4}]

-[{5}]

-[{6}]

-[{7}]

-[{8}]

-[{0} - {1}]

 [Miranda]

 [%s/%s]

 [Notify]

@@ -182,14 +169,11 @@
 [%s plugin HTTPS connections]

 [%s plugin connections]

 [Contact already in your contact list]

-[%s\\%s]

 [Protocol is offline]

 [You cannot send message to yourself]

 [Message is too long: SMS page limited to 133 UTF8 chars]

 [Message is too long: MSN messages are limited by 1202 UTF8 chars]

 [Offline messaging is not allowed for LCS contacts]

-;file \protocols\MSN\src\msn_soapstore.cpp

-[miranda_avatar.tmp]

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

 [Music]

 [No Title]

diff --git a/langpacks/english/Plugins/MirOTR.txt b/langpacks/english/Plugins/MirOTR.txt
index bfacbd29ba..13558732d2 100644
--- a/langpacks/english/Plugins/MirOTR.txt
+++ b/langpacks/english/Plugins/MirOTR.txt
@@ -74,7 +74,6 @@
 [OTR encrypted session with '%s' could not be started]

 [OTR could not encrypt when sending message]

 [OTR Information]

-[[OTR INFO] ]

 [Authentication from %s]

 [Authenticae %s]

 [Unknown]

@@ -169,7 +168,5 @@
 ;file \plugins\MirOTR\MirOTR\src\utils.cpp

 [%02X]

 [%s Message]

-[%s\r\n%s]

 [%s Warning]

 [%s Error]

-[%s%s]

diff --git a/langpacks/english/Plugins/MobileState.txt b/langpacks/english/Plugins/MobileState.txt
index 819b9f4b39..5b6f6a42ae 100644
--- a/langpacks/english/Plugins/MobileState.txt
+++ b/langpacks/english/Plugins/MobileState.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: MobileState.dll

 ;  Plugin: Mobile State

-;  Version: 0.0.1.0

+;  Version: 0.0.1.1

 ;  Authors: Robert Pösel

 ;============================================================

 [Plugin shows mobile icon in contact list next to contacts which are using mobile client.]

diff --git a/langpacks/english/Plugins/ModernOpt.txt b/langpacks/english/Plugins/ModernOpt.txt
index b7079eb22a..d147240131 100644
--- a/langpacks/english/Plugins/ModernOpt.txt
+++ b/langpacks/english/Plugins/ModernOpt.txt
@@ -43,5 +43,4 @@
 [Update]

 [Download]

 ;file \plugins\ModernOpt\src\mopt_selector.cpp

-[%s\\%s]

 [*.*]

diff --git a/langpacks/english/Plugins/Msg_Export.txt b/langpacks/english/Plugins/Msg_Export.txt
index ff747381c0..ab1c858827 100644
--- a/langpacks/english/Plugins/Msg_Export.txt
+++ b/langpacks/english/Plugins/Msg_Export.txt
@@ -21,8 +21,8 @@
 [&Find...]

 [&External]

 [&Close]

-[Prompt for action]

 [When filename changes]

+[Prompt for action]

 [Rename file]

 [Do nothing]

 [When user is deleted]

@@ -62,13 +62,11 @@
 [Failed to HookEvent ME_DB_EVENT_ADDED]

 [Failed to HookEvent ME_DB_CONTACT_DELETED]

 [Failed to HookEvent ME_OPT_INITIALISE]

-[View &History]

 [Open E&xported History]

 [Failed to add menu item Open Exported History\nCallService(MS_CLIST_ADDCONTACTMENUITEM,...)]

+[Failed to HookEvent ME_SYSTEM_SHUTDOWN]

 [Failed to HookEvent ME_SYSTEM_MODULESLOADED]

 [%dbpath%\\MsgExport\\]

-[%nick%.txt]

-[d s]

 [Failed to replace Miranda History.\r\nThis is most likely due to changes in Miranda.]

 [Failed to CreateServiceFunction MS_SHOW_EXPORT_HISTORY]

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

@@ -86,22 +84,8 @@
 [C:\\Backup\\MsgExport\\]

 [%dbpath%\\MsgExport\\%group% - ]

 [%dbpath%\\MsgExport\\%group%\\]

-[%UIN%.txt]

-[%group%.txt]

-[%e-mail%.txt]

-[%identifier%.txt]

-[%year%-%month%-%day%.txt]

-[%group%\\%nick%.txt]

-[%group%\\%UIN%.txt]

-[%group%\\%identifier%.txt]

-[%protocol%\\%nick%.txt]

-[History.txt]

-[d t]

-[d m]

 [D s]

 [D m :]

-[C:\\Windows\\Notepad.exe]

-[C:\\WinNT\\Notepad.exe]

 [You have unapplyed changes do you wish to apply these first ?]

 [Executable files (*.exe;*.com;*.bat;*.cmd)\0*.exe;*.com;*.bat;*.cmd\0All files(*.*)\0*.*\0]

 [Failed to get the shells allocator !]

@@ -136,26 +120,21 @@
 [(Unknown Contact)]

 [File name for the user "%s" has changed !\n\nfrom:\t%s\nto:\t%s\n\nDo you wish to rename file ?]

 [Failed to rename file\n\nfrom:\t%s\nto:\t%s\n\nFailed with error: %s]

-[:\\]

 [%UIN%]

 [%protocol%]

 [%identifier%]

 [%group%]

-[/*?<>|"]

 [%year%]

 [%month%]

 [%day%]

-[%.2d]

 [\nError :]

 [Message has not been saved !\n]

 [Do you wish to save debug information ?]

-[DebugInfo.txt]

 [All\0*.*\0Text\0*.TXT\0\0]

 [TXT]

 [Failed to open or create file :\n]

 [Failed to move to the end of the file :\n]

 [Failed to UTF8 byte order code to file :\n]

-[------------------------------------------------\r\n]

 [      History for\r\n]

 [User      : %User%\r\n]

 [Protocol  : %Proto%\r\n]

@@ -170,7 +149,6 @@
 [State     : %State%\r\n]

 [Phone     : %Phone%\r\n]

 [Homepage  : %Homepage%\r\n]

-[- About -\r\n%About%\r\n]

 [%User%]

 [%Proto%]

 [%Age%]

@@ -203,6 +181,5 @@
 [Failed to write Unknown event to the file :\n]

 [Programming error writing UTF8 string to ansi file]

 [Programming error on line __LINE__ please report this]

-[%s\r\n%s]

 [User has been deleted do you want to delete the file ?]

 [Failed to delete the file]

diff --git a/langpacks/english/Plugins/MyDetails.txt b/langpacks/english/Plugins/MyDetails.txt
index 52e0ffb395..29065765bc 100644
--- a/langpacks/english/Plugins/MyDetails.txt
+++ b/langpacks/english/Plugins/MyDetails.txt
@@ -67,7 +67,6 @@
 [Status Message]

 [Listening To]

 [My Details]

-[Tahoma]

 [Show My Details]

 [ ...]

 [Enable Listening To for %s]

diff --git a/langpacks/english/Plugins/NewEventNotify.txt b/langpacks/english/Plugins/NewEventNotify.txt
index 67c7027b2e..b98a4e1dd0 100644
--- a/langpacks/english/Plugins/NewEventNotify.txt
+++ b/langpacks/english/Plugins/NewEventNotify.txt
@@ -38,11 +38,9 @@
 ;file \plugins\NewEventNotify\src\main.cpp

 [%s  (%s)]

 [TMsgWindow]

-[[%s  (%s)]]

 [TfrmContainer]

 [%s (%s): %s]

 [Message Session]

-[#32770]

 [Message Received]

 ;file \plugins\NewEventNotify\src\menuitem.cpp

 [PopUps]

@@ -58,12 +56,8 @@
 [This is a sample other event ;-D]

 [Plugin Test]

 [\0\0]

-[[b]%s %d[/b]\n]

 [Number of new message: ]

 [%s...\n]

 [%Y.%m.%d]

 [ %H:%M]

 [%s[b][i]%s[/i][/b]\n]

-[%s%s]

-[%s\n]

-[%s\n...]

diff --git a/langpacks/english/Plugins/NewXstatusNotify.txt b/langpacks/english/Plugins/NewXstatusNotify.txt
index beb7ded4ed..ce2a66b048 100644
--- a/langpacks/english/Plugins/NewXstatusNotify.txt
+++ b/langpacks/english/Plugins/NewXstatusNotify.txt
@@ -117,52 +117,42 @@
 [(F) is back online!]

 [(U) is back online!]

 [User: Online]

-[global.wav]

 [(M) went offline! :(]

 [(F) went offline! :(]

 [(U) went offline! :(]

 [User: Offline]

-[offline.wav]

 [(M) hides in shadows...]

 [(F) hides in shadows...]

 [(U) hides in shadows...]

 [User: Invisible]

-[invisible.wav]

 [(M) feels talkative!]

 [(F) feels talkative!]

 [(U) feels talkative!]

 [User: Free For Chat]

-[free4chat.wav]

 [(M) went Away]

 [(F) went Away]

 [(U) went Away]

 [User: Away]

-[away.wav]

 [(M) isn't there anymore!]

 [(F) isn't there anymore!]

 [(U) isn't there anymore!]

 [User: Not Available]

-[na.wav]

 [(M) has something else to do.]

 [(F) has something else to do.]

 [(U) has something else to do.]

 [User: Occupied]

-[occupied.wav]

 [(M) doesn't want to be disturbed!]

 [(F) doesn't want to be disturbed!]

 [(U) doesn't want to be disturbed!]

 [User: Do Not Disturb]

-[dnd.wav]

 [(M) is eating something]

 [(F) is eating something]

 [(U) is eating something]

 [User: Out To Lunch]

-[lunch.wav]

 [(M) had to answer the phone]

 [(F) had to answer the phone]

 [(U) had to answer the phone]

 [User: On The Phone]

-[phone.wav]

 [Enable status notification]

 [Disable status notification]

 [PopUps]

diff --git a/langpacks/english/Plugins/New_GPG.txt b/langpacks/english/Plugins/New_GPG.txt
index a290c00009..b4103bc192 100644
--- a/langpacks/english/Plugins/New_GPG.txt
+++ b/langpacks/english/Plugins/New_GPG.txt
@@ -40,11 +40,14 @@
 [Default password]

 [Import]

 [Select keyserver for key search:]

+[Decrypt]

+[Recieved encrypted file form contact whith disabled encryption.]

+[Remember choice]

 [Userlist:]

 [Export PubKey]

 [Select own key]

 [Turn on debug log]

-[Use jabber api on Miranda IM >= 0.9 (recomended)]

+[Use jabber api on Miranda NG (recomended)]

 [Default key]

 [Encrypt file transfers]

 [Automatic key exchange]

@@ -57,15 +60,10 @@
 [Strip all tags in outgoing messages]

 [Turn on presence signing (Jabber) (required by xep 0-27)]

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

-[" --homedir "]

-[--display-charset utf-8 ]

-[-z 9 ]

 [LANGUAGE=en@quot\0LC_ALL=English\0]

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

 [<GPGdec>]

-[</GPGdec>]

 [<GPGenc>]

-[</GPGenc>]

 [Arial]

 [GPG Turn off encryption]

 [GPG Turn on encryption]

@@ -75,49 +73,36 @@
 [Send public key]

 [Export GPG Public keys from all users]

 [Import GPG Public keys from all users]

-;file \plugins\New_GPG\src\log.cpp

-[C:\\GPGdebug.log]

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

 [Set own key]

 [Key ID]

 [Email]

 [Name]

 [Creation date]

+[Expire date]

 [Key length]

 [Accounts]

-[--batch --list-secret-keys]

 [Default]

 [key id]

 [not set]

-[--batch -a --export ]

 [Default private key id]

-[--batch --fingerprint ]

-[--batch --delete-secret-and-public-key --fingerprint ]

 [\\new_key]

 [Failed to open file]

 [Error]

-[--batch --yes --gen-key "]

 [Generating new random key, please wait]

-[\\GnuPG\\gpg.exe]

-[\\GnuPG\\gnupg.nls\\en@quot.mo]

-[GnuPG\\gpg.exe]

 [gpg binary found in miranda folder, but english locale does not exists.\nit's highly recommended to place \\gnupg.nls\\en@quot.mo in gnupg folder under miranda root.\nwithout this file you may expirense many problem with gpg output on non english systems.\nand plugin may completely do not work.\nyou have beed warned.]

 [Warning]

 [Software\\GNU\\GnuPG]

 [gpgProgram]

 [wrong gpg binary location found in system.\nplease choose another location]

-[--version]

 [This is not gnupg binary !\nrecommended to use GnuPG v1.x.x with this plugn.]

 [Unsupported gnupg version found, use at you own risk!\nrecommended to use GnuPG v1.x.x with this plugn.]

+[found "gpg" directory in MIranda root.\nassuming it's gpg home directory.\ngpg home directory set.]

+[Info]

 [APPDATA]

 [\\GnuPG]

 [gpg]

 [Your GPG version is supported. The language file was found.\nGPG plugin should work fine.\nPress OK to continue.]

-[Info]

-[Choose gpg.exe]

-[*.exe]

-[EXE Executables]

-[gpg.exe]

 [Set home diractory]

 [gpg binary does not exists.\nplease choose another location]

 [please choose gpg binary location]

@@ -137,14 +122,9 @@
 [Name cannot contain '(' or ]

 [Invalid Email]

 [Generating new key, please wait...]

-[--list-secret-keys]

 [Expiration date]

-[--batch --list-keys]

 [Failed to export public key.]

-[subkeys.pgp.net]

-[keys.gnupg.net]

 [ --keyserver "]

-[" --recv-keys ]

 [access_test\n]

 [TEMP]

 [GPG binary is set and valid (this is good).\n]

@@ -157,37 +137,27 @@
 [GPG plugin problems]

 [\\tmp]

 [Your secret key whith id: ]

-[You have not set public key for gpg, it's recommended to do it.\nDo you want to do it now ?]

-[Own public key warning]

+[ for account ]

 [ deleted from gpg secret keyring\nDo you want to set another key ?]

 [Own secret key warning]

+[ expired and will not work\nDo you want to set another key ?]

+[You didn't set a private key.\nWould you like to set it now?]

+[Own private key warning]

 [Do you want load key for all subcontacts ?]

 [Metacontact detected]

-[temporary_exported.asc]

 [ --batch ]

 [ --import "]

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

-[-----BEGIN PGP MESSAGE-----]

-[-----END PGP MESSAGE-----]

 [We received encrypted message from contact with encryption turned off.\nDo you want turn on encryption for this contact ?]

 [Do you want try to decrypt encrypted message ?]

 [\\tmp\\]

-[--batch ]

-[--passphrase "]

-[--output "]

 [ -d -a "]

-[-----PGP KEY RESPONSE-----]

-[-----END PGP PUBLIC KEY BLOCK-----]

-[-----BEGIN PGP PUBLIC KEY BLOCK-----]

+[failed to decrypt message, GPG returned error, turn on debug log for more details]

 [.asc]

-[-----BEGIN PGP PRIVATE KEY BLOCK-----]

-[-----END PGP PRIVATE KEY BLOCK-----]

 [GPG_Key_Auto_Exchange:0]

 [\r\n]

-[--comment "" --no-version ]

-[--trust-model always ]

-[--batch --yes -e -a -t -r ]

 [We trying to encrypt with untrusted key, do you want to trust this key permanently ?]

+[failed o encrypt message, GPG returned error, turn on debug log for more details]

 [Something wrong, gpg does not understand us, aborting encryption.]

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

 [Services]

@@ -197,7 +167,6 @@
 [Advanced]

 [Contact]

 [Protocol]

-[c:\\GPGdebug.log]

 [This key not used by any contact, do you want to remove it from public keyring ?]

 [Key info]

 [ --batch --yes --delete-key ]

@@ -230,8 +199,6 @@
 [ -o ]

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

 [ -d "]

-[--batch --yes -r ]

-[%s.gpg]

 [ --trust-model always ]

 [ -o "]

 [ -e "]

@@ -243,16 +210,12 @@
 [xmlns]

 [jabber:x:encrypted]

 [status]

-[--local-user ]

 [ --default-key ]

 [ --batch --yes -a -b -s "]

-[-----BEGIN PGP SIGNATURE-----]

-[-----END PGP SIGNATURE-----]

 [jabber:x:signed]

-[-----BEGIN PGP SIGNATURE-----\n\n]

 [\n-----END PGP SIGNATURE-----\n]

 [from]

-[Indicates that gpg installed and configured to public key auto exchange (currently implemented in new_gpg Miranda IM plugin)]

+[Indicates that gpg installed and configured to public key auto exchange (currently implemented in new_gpg plugin for Miranda IM and Miranda NG)]

 [GPG_Key_Auto_Exchange:0\0\0]

 [Choose file to export public keys]

 [Any file]

diff --git a/langpacks/english/Plugins/NewsAggregator.txt b/langpacks/english/Plugins/NewsAggregator.txt
index afcd5478f2..872db10cd9 100644
--- a/langpacks/english/Plugins/NewsAggregator.txt
+++ b/langpacks/english/Plugins/NewsAggregator.txt
@@ -1,7 +1,7 @@
 #muuid {56cc3f29-ccbf-4546-a8ba-9856248a412a}

 ;============================================================

 ;  File: NewsAggregator.dll

-;  Plugin: News Aggregator

+;  Plugin: News aggregator

 ;  Version: 0.0.0.1

 ;  Authors: Mataes, FREAK_THEMIGHTY

 ;============================================================

@@ -12,6 +12,7 @@
 [Remove]

 [Import]

 [Export]

+[Retrieve news at startup]

 [OK]

 [Cancel]

 [General Settings]

@@ -36,6 +37,8 @@
 [Add Feed]

 [Import Feeds]

 [Export Feeds]

+[Auto Update Enabled]

+[Auto Update Disabled]

 [News Aggregator]

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

 [Check feed]

@@ -43,36 +46,31 @@
 ;file \plugins\NewsAggregator\Src\NewsAggregator.cpp

 [\\Avatars\\]

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

-[http://]

 [Enter Feed name]

 [Error]

 [Enter Feed URL]

 [Enter checking interval]

 [Enter message format]

-[%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s]

-[#<title>#]

+[%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s]

 [The title of the item.]

-[#<description>#]

 [The item synopsis.]

-[#<link>#]

 [The URL of the item.]

-[#<author>#]

 [Email address of the author of the item.]

-[#<comments>#]

 [URL of a page for comments relating to the item.]

-[#<guid>#]

 [A string that uniquely identifies the item.]

-[#<category>#]

 [Specify one or more categories that the item belongs to.]

 [Feed Tag Help]

 [Are you sure?]

 [Tags Mask Reset]

 [Wait...]

 [Change Feed]

+[%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s]

 [Contact deleting]

 [Network]

+;file \plugins\NewsAggregator\Src\Services.cpp

+[Enable/disable auto update]

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

-[NewsAggr HTTP connection]

+[NewsAggregator HTTP connection]

 [.jpg]

 [.jpeg]

 [.png]

@@ -103,10 +101,8 @@
 [rss]

 [rdf]

 [title]

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

 [New Aggregator]

 [feed]

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

 [version]

 [RSS %s]

 [RSS 1.0]

@@ -117,7 +113,6 @@
 [category]

 [image]

 [url]

-[%s\\%s.%s]

 [lastBuildDate]

 [item]

 [pubDate]

diff --git a/langpacks/english/Plugins/NotesReminders.txt b/langpacks/english/Plugins/NotesReminders.txt
index 7f48f8a8a3..3e5766aa75 100644
--- a/langpacks/english/Plugins/NotesReminders.txt
+++ b/langpacks/english/Plugins/NotesReminders.txt
@@ -103,10 +103,7 @@
 [Vie&w Notes]

 [&Delete All Notes]

 [&Bring All to Front]

-[RICHED20.DLL]

 [Miranda could not load the Note & Reminders plugin, RICHED20.DLL is missing. If you are using Windows 95 or WINE please make sure you have riched20.dll installed. Press 'Yes' to continue loading Miranda.]

-[user32.dll]

-[kernel32.dll]

 ;file \plugins\NotesAndReminders\src\notes.cpp

 [MIM_StickyNote]

 [Black]

@@ -143,9 +140,7 @@
 [Small Fonts]

 [Sticky Note Background Color]

 [Terminal]

-[MS Serif]

 [Sticky Note Body]

-[Tahoma]

 [System]

 [Executable Files\0*.exe\0All Files\0*.*\0\0]

 [Select Executable]

diff --git a/langpacks/english/Plugins/PManagerEx.txt b/langpacks/english/Plugins/PManagerEx.txt
index 6183de7055..9d7d01cbdb 100644
--- a/langpacks/english/Plugins/PManagerEx.txt
+++ b/langpacks/english/Plugins/PManagerEx.txt
@@ -2,12 +2,9 @@
 ;langpack template for PManagerEx

 ;file \plugins\ProfileManager\src\pmanagerEx.cpp

 [open]

-[/ForceShowPM]

 [Miranda NG will exit and Database checker will start.\n\nAre you sure you want to do this?]

 [Check Database]

-["%s" /restart:%d /svc:dbchecker]

 [%miranda_profilename%]

-["%s" /restart:%d /profile=%s]

 [Database]

 [Load profile]

 [Change profile]

diff --git a/langpacks/english/Plugins/PackUpdater.txt b/langpacks/english/Plugins/PackUpdater.txt
index 34b6184990..1c2286d943 100644
--- a/langpacks/english/Plugins/PackUpdater.txt
+++ b/langpacks/english/Plugins/PackUpdater.txt
@@ -5,7 +5,7 @@
 ;  Version: 0.0.1.1

 ;  Authors: Mataes, ZERO_BiT

 ;============================================================

-[Simple updater for Miranda IM premodified packs.]

+[Simple updater for Miranda NG premodified packs.]

 ;file \plugins\PackUpdater\Res\Resource.rc

 [Update]

 [View info]

@@ -52,20 +52,12 @@
 [Component Name]

 [Current Version]

 [New Version]

-[%s\\Pack]

-[%s\\Plugins]

-[%s\\Icons]

-[%s\\Others]

-[%s\\Backups]

-[%s\\%s]

 [.html]

 [Downloading pack updates...]

 [Downloading update...]

-[Downloads complete. Start updating? All your data will be saved and Miranda IM will be closed.]

-[Download complete. Start updating? All your data will be saved and Miranda IM will be closed.]

+[Downloads complete. Start updating? All your data will be saved and Miranda NG will be closed.]

+[Download complete. Start updating? All your data will be saved and Miranda NG will be closed.]

 [%miranda_path%\\Plugins]

-[%s\\%s\\%s]

-[%s\\Backups\\%s]

 [%miranda_path%\\Icons]

 [%miranda_path%]

 [You have chosen not to install the pack update immediately.\nYou can install it manually from this location:\n\n%s]

@@ -86,7 +78,6 @@
 [Pack Updater HTTP connection]

 [%d.%d.%d.%d]

 [URL for checking updates not found.]

-[%s\\tmp.ini]

 [Downloading version info...]

 [FileInfo_%d]

 [FileVersion]

@@ -103,7 +94,7 @@
 [Plugins\\%s\\%s]

 [%SystemRoot%]

 [%ProgramFiles%]

-[Update is not possible!\nYou have no Administrator's rights.\nPlease run Miranda IM with Administrator's rights.]

+[Update is not possible!\nYou have no Administrator's rights.\nPlease run Miranda NG with Administrator's rights.]

 [No updates found.]

 [No files for update.]

 [Update checking already started!]

diff --git a/langpacks/english/Plugins/PasteIt.txt b/langpacks/english/Plugins/PasteIt.txt
index 705b56b276..ab37f7331e 100644
--- a/langpacks/english/Plugins/PasteIt.txt
+++ b/langpacks/english/Plugins/PasteIt.txt
@@ -36,7 +36,6 @@
 [Recode]

 ;file \plugins\PasteIt\src\Options.cpp

 [Use default codepage]

-[UTF-8]

 [Thai]

 [Japanese]

 [Simplified Chinese]

@@ -53,9 +52,6 @@
 [Baltic]

 [Vietnamese]

 [Korean (Johab)]

-[UTF-7]

-[UTF-16]

-[UTF-16BE]

 [You've entered invalid codepage. Select codepage from combo box or enter correct number.]

 [Invalid codepage]

 [Paste It]

@@ -80,35 +76,15 @@
 [Cannot open file '%s']

 [File '%s' is empty]

 ;file \plugins\PasteIt\src\PasteToWeb1.cpp

-[api_option=paste&api_paste_private=]

-[&api_paste_expire_date=]

-[&api_dev_key=dcba056bf9cc71729fdad76dddcb0dcd&api_paste_format=]

-[&api_user_key=]

-[&api_paste_code=]

 [Error during sending text to web page: %s]

 [Error during sending text to web page]

-[api_user_name=]

-[&api_user_password=]

 [&api_dev_key=dcba056bf9cc71729fdad76dddcb0dcd]

 [Error during getting user key from web page: %s]

 [Paste expire date]

 [Never]

-[10 minutes]

-[1 hour]

-[1 day]

-[1 month]

-;file \plugins\PasteIt\src\PasteToWeb1.h

-[pastebin.com]

 ;file \plugins\PasteIt\src\PasteToWeb2.cpp

-[<?xml version="1.0"?>\r\n<methodCall><methodName>create_paste</methodName><params><param><value>]

-[</value></param><param><value>]

-[</value></param><param><value></value></param><param><value>]

-[</value></param><param><value></value></param><param><value><double>1.5</double></value></param></params></methodCall>]

 [methodResponse]

 [params/param/value/array/data/value/int]

 [params/param/value/array/data]

 [value]

 [string]

-[<?xml version="1.0"?>\r\n<methodCall><methodName>types</methodName></methodCall>]

-;file \plugins\PasteIt\src\PasteToWeb2.h

-[wklej.to]

diff --git a/langpacks/english/Plugins/Ping.txt b/langpacks/english/Plugins/Ping.txt
index 648feebf4b..dc9d913e9b 100644
--- a/langpacks/english/Plugins/Ping.txt
+++ b/langpacks/english/Plugins/Ping.txt
@@ -46,9 +46,6 @@
 [Enable all pings]

 [Options...]

 [Hosts...]

-;file \plugins\Ping\src\icmp.cpp

-[IPHLPAPI.DLL]

-[ICMP.DLL]

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

 [edit]

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

@@ -66,7 +63,6 @@
 [Failed to initialize. Plugin disabled.]

 [Local\\ThreadWaitEvent]

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

-[BUTTON]

 [Show grid lines]

 [Show stats]

 [%d ms]

@@ -81,8 +77,6 @@
 [Disable]

 [enabled]

 [double clicked]

-[user32.dll]

-[WindowClass]

 [Ping]

 [List]

 [Background]

diff --git a/langpacks/english/Plugins/PluginUpdater.txt b/langpacks/english/Plugins/PluginUpdater.txt
index de3c895f85..41b9fdcb8d 100644
--- a/langpacks/english/Plugins/PluginUpdater.txt
+++ b/langpacks/english/Plugins/PluginUpdater.txt
@@ -48,8 +48,6 @@
 [Boxes]

 [PopUps]

 ;file \plugins\PluginUpdater\src\Notifications.cpp

-[%s\\Backups]

-[%s\\Temp]

 [Skipped.]

 [Will be deleted!]

 [Downloading...]

@@ -59,7 +57,6 @@
 [Download complete. Start updating? All your data will be saved and Miranda NG will be closed.]

 [You have chosen not to install the plugin updates immediately.\nYou can install it manually from this location:\n\n%s]

 [%miranda_path%]

-[%s\\%s]

 [.test]

 [Component Name]

 [State]

@@ -74,86 +71,19 @@
 [Test]

 [Services]

 ;file \plugins\PluginUpdater\src\PluginUpdater.cpp

-[%miranda_userdata%\"DEFAULT_UPDATES_FOLDER)));\r\n		lstrcpyn(tszRoot, tszFolder, SIZEOF(tszRoot));\r\n	}\r\n\r\n	LoadOptions();\r\n	InitPopupList();\r\n	NetlibInit();\r\n	IcoLibInit();\r\n\r\n	// Add cheking update menu item\r\n	hCheckUpdates = CreateServiceFunction(MODNAME"/CheckUpdates", MenuCommand);\r\n\r\n	CLISTMENUITEM mi = { sizeof(mi) };\r\n	mi.position = -0x7FFFFFFF;\r\n	mi.flags = CMIF_ICONFROMICOLIB;\r\n	mi.icolibItem = Skin_GetIconHandle("check_update]

+[%miranda_path%\"DEFAULT_UPDATES_FOLDER)));\r\n		lstrcpyn(tszRoot, tszFolder, SIZEOF(tszRoot));\r\n	}\r\n\r\n	LoadOptions();\r\n	InitPopupList();\r\n	NetlibInit();\r\n	IcoLibInit();\r\n\r\n	// Add cheking update menu item\r\n	hCheckUpdates = CreateServiceFunction(MODNAME"/CheckUpdates", MenuCommand);\r\n\r\n	CLISTMENUITEM mi = { sizeof(mi) };\r\n	mi.position = -0x7FFFFFFF;\r\n	mi.flags = CMIF_ICONFROMICOLIB;\r\n	mi.icolibItem = Skin_GetIconHandle("check_update]

 [Check for plugin updates]

 ;file \plugins\PluginUpdater\src\Scanner.cpp

-[svc_dbepp.dll]

-[Plugins\\dbeditorpp.dll]

-[svc_crshdmp.dll]

-[Plugins\\crashdumper.dll]

-[svc_vi.dll]

-[Plugins\\versioninfo.dll]

-[crashrpt.dll]

-[advsplashscreen.dll]

-[Plugins\\splashscreen.dll]

-[import_sa.dll]

-[Plugins\\import.dll]

-[newnr.dll]

-[Plugins\\notesreminders.dll]

-[dbtool.exe]

-[Plugins\\dbchecker.dll]

-[dbtool_sa.exe]

-[bclist.dll]

-[Plugins\\Clist_blind.dll]

-[clienticons_general.dll]

-[Icons\\fp_icons.dll]

-[clienticons_miranda.dll]

-[fp_icq.dll]

-[fp_jabber.dll]

-[clienticons_aim.dll]

-[clienticons_gadu.dll]

-[clienticons_gg.dll]

-[clienticons_icq.dll]

-[clienticons_irc.dll]

-[clienticons_jabber.dll]

-[clienticons_mra.dll]

-[clienticons_msn.dll]

-[clienticons_multiproto.dll]

-[clienticons_multiprotocols.dll]

-[clienticons_others.dll]

-[clienticons_overlays.dll]

-[clienticons_packs.dll]

-[clienticons_qq.dll]

-[clienticons_rss.dll]

-[clienticons_skype.dll]

-[clienticons_tlen.dll]

-[clienticons_voip.dll]

-[clienticons_weather.dll]

-[clienticons_yahoo.dll]

-[fp_aim.dll]

-[fp_c6_mra_skype.dll]

-[fp_gg.dll]

-[fp_irc.dll]

-[fp_msn.dll]

-[fp_packs.dll]

-[fp_qq.dll]

-[fp_rss.dll]

-[fp_tlen.dll]

-[fp_weather.dll]

-[fp_yahoo.dll]

-[clist_classic.dll]

-[chat.dll]

-[gender.dll]

-[srmm.dll]

-[extraicons.dll]

-[%s\\*]

 [.dll]

 [.exe]

-[%s\\Temp\\%s.zip]

-[%s/%s.zip]

 [platform]

 [Downloading version info...]

-[%s/hashes.zip]

-[%s\\hashes.zip]

 [An error occured while downloading the update.]

-[%s\\hashes.txt]

 [No updates found.]

 [Update checking already started!]

-;file \plugins\PluginUpdater\src\unzipfile.cpp

 ;file \plugins\PluginUpdater\src\Utils.cpp

 ['Yes' Button]

 ['No' Button]

 [Plugin Updater HTTP connection]

-["%s" /restart:%d /profile=%s]

 ;file \plugins\PluginUpdater\src\Minizip\ioapi.c

 [r+b]

diff --git a/langpacks/english/Plugins/PopUp.txt b/langpacks/english/Plugins/PopUp.txt
index bce70b075e..66e3ac07e7 100644
--- a/langpacks/english/Plugins/PopUp.txt
+++ b/langpacks/english/Plugins/PopUp.txt
@@ -138,7 +138,6 @@
 [This is a warning message]

 [This is an error message]

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

-[Tahoma]

 [Hovered Action]

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

 [Popup History is disabled]

@@ -155,7 +154,6 @@
 [Enable &popup module]

 [Disable &popup module]

 [dir]

-[dwmapi.dll]

 [Error: I could not register the PopUp Window class.\r\n]

 [The plugin will not operate.]

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

@@ -167,16 +165,6 @@
 [CLASS Plugins]

 [Ph'nglui mglw'nafh Cthulhu R'lyeh wgah'nagl fhtagn!]

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

-[/Offline]

-[/Online]

-[/Invisible]

-[/Away]

-[/NA]

-[/Occupied]

-[/DND]

-[/Free for chat]

-[/Out to lunch]

-[/On the phone]

 [Width]

 [upper left corner]

 [lower left corner]

@@ -196,7 +184,6 @@
 [Cancel]

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

 [Failed to register %s class.]

-[#32770]

 [PopupPlusDlgBox]

 [Skin preview]

 [Just take a look at this skin... ;)]

@@ -215,7 +202,6 @@
 [Failed to GetClassInfoExW from EDIT class.]

 [Failed to register custom edit box window class.\r\n\r\ncbSize: %i\r\nstyle: %p\r\nlpfnWndProc: %i\r\ncbClsExtra: %i\r\ncbWndExtra: %i\r\nhInstance: %i\r\nhIcon: %i\r\nhCursor: %i\r\nhbrBackground: %i\r\nlpszMenuName: %s\r\nlpszClassName: %s\r\nhIconSm: %i\r\n]

 [PopupMenuHostWnd]

-[%s\n\n%s]

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

 [WorkerW]

 [Error]

diff --git a/langpacks/english/Plugins/QuickContacts.txt b/langpacks/english/Plugins/QuickContacts.txt
index 4621d7acc0..20ab7bd4c3 100644
--- a/langpacks/english/Plugins/QuickContacts.txt
+++ b/langpacks/english/Plugins/QuickContacts.txt
@@ -27,7 +27,6 @@
 [Show all contacts]

 [Quick Contacts...]

 [%s (%s)]

-[STATIC]

 [Ctrl+A]

 [Send message]

 [Ctrl+V]

diff --git a/langpacks/english/Plugins/QuickMessages.txt b/langpacks/english/Plugins/QuickMessages.txt
index ed070242bb..5b9bd231c7 100644
--- a/langpacks/english/Plugins/QuickMessages.txt
+++ b/langpacks/english/Plugins/QuickMessages.txt
@@ -35,7 +35,6 @@
 [Quick Messages]

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

 [Enter Value]

-[---]

 [Congratulation!\n\\r\n								   You have clicked this button 100 times!\n\\r\n								   There was access violation at this point...\n\\r\n								   And now function for freeing resources must be called...\n\\r\n								   But no! there's only break :D]

 [You win!]

 [New Button]

diff --git a/langpacks/english/Plugins/QuickReplies.txt b/langpacks/english/Plugins/QuickReplies.txt
index 69af095111..446bbc6772 100644
--- a/langpacks/english/Plugins/QuickReplies.txt
+++ b/langpacks/english/Plugins/QuickReplies.txt
@@ -16,7 +16,6 @@
 ;file \plugins\QuickReplies\src\events.cpp

 [Button]

 [Quick Replies\r\nLeft button - open menu\r\nRight button - options page]

-[---]

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

 [\r\n]

 [Message Sessions]

diff --git a/langpacks/english/Plugins/Quotes.txt b/langpacks/english/Plugins/Quotes.txt
index 574b7276e4..83e3382732 100644
--- a/langpacks/english/Plugins/Quotes.txt
+++ b/langpacks/english/Plugins/Quotes.txt
@@ -77,7 +77,6 @@
 ;file \plugins\Quotes\src\CurrencyConverter.cpp

 [Info provided by]

 [ <a href="]

-[</a>]

 [Enter positive number.]

 [open]

 ;file \plugins\Quotes\src\Forex.cpp

@@ -121,11 +120,9 @@
 [utf8]

 [blob]

 [Xml File (*.xml)]

-[*.xml]

 [All files (*.*)]

 [*.*]

 [xml]

-[CList]

 [Group]

 ;file \plugins\Quotes\src\Locale.cpp

 [Control Panel\\International]

@@ -143,7 +140,6 @@
 [sShortTime]

 [sTimeFormat]

 ;file \plugins\Quotes\src\Log.cpp

-[Quotes.log]

 [ ================================>\n]

 [\n\n]

 ;file \plugins\Quotes\src\ModuleInfo.cpp

@@ -181,31 +177,19 @@
 [stock]

 [oldPrice]

 ;file \plugins\Quotes\src\QuotesProviderGoogle.cpp

-[?a=]

-[&from=]

-[&to=]

 [currency_converter_result]

 [Error occurred during html parsing.]

 [Error occurred during site access.]

 ;file \plugins\Quotes\src\QuotesProviderGoogleFinance.cpp

-[?q=]

 [ref_]

-[_ecp]

-[_cp]

 [setCompanyId(]

 [var _companyName = ]

 [Open]

 [snap-data]

 ;file \plugins\Quotes\src\QuotesProviderVisitorDbSettings.cpp

 [%r>%p]

-[%s\\t%t\\t%r\\n]

 [%s %r]

 [\\nCurrent = %r\\nPrevious = %p]

-[Dukascopy.xml]

-[1 %f = %r %i]

-[Google.xml]

-[GoogleFinance.xml]

-[Yahoo.xml]

 ;file \plugins\Quotes\src\QuotesProviderVisitorFormater.cpp

 ;file \plugins\Quotes\src\QuotesProviderVisitorFormatSpecificator.cpp

 [Quote Symbol]

@@ -235,13 +219,11 @@
 [Previous Close]

 [Change]

 ;file \plugins\Quotes\src\QuotesProviderYahoo.cpp

-[dioksin.txt?s=]

 [&f=snl1ohgpc1]

 ;file \plugins\Quotes\src\SettingsDlg.cpp

 [%quotename%]

 [%miranda_userdata%]

 [Log Files (*.txt,*.log)]

-[*.txt;*.log]

 [log]

 [Enter integer value]

 [Enter log file name.]

@@ -253,6 +235,4 @@
 [\r\n]

 ;file \plugins\Quotes\src\XMLEngineMI.cpp

 [version]

-[1.0]

 [encoding]

-[UTF-8]

diff --git a/langpacks/english/Plugins/Restart.txt b/langpacks/english/Plugins/Restart.txt
index 1602f39d45..9910881894 100644
--- a/langpacks/english/Plugins/Restart.txt
+++ b/langpacks/english/Plugins/Restart.txt
@@ -2,5 +2,4 @@
 ;langpack template for Restart

 ;file \plugins\Restart\src\restart.cpp

 [%miranda_profilename%]

-["%s" /restart:%d /profile=%s]

 [Restart]

diff --git a/langpacks/english/Plugins/SMS.txt b/langpacks/english/Plugins/SMS.txt
new file mode 100644
index 0000000000..75d57ac0f9
--- /dev/null
+++ b/langpacks/english/Plugins/SMS.txt
@@ -0,0 +1,44 @@
+;#muuid not found, please specify manually!

+;============================================================

+;  File: sms.dll

+;  Plugin: SMS plugin

+;  Version: 0.2.5.3

+;  Authors: Richard Hughes, Improved by Ariel Shulman, rewritten by Rozhuk Ivan

+;============================================================

+[Send SMS text messages to mobile phones through the IM networks.]

+;file \plugins\SMS\res\resource.rc

+[&Reply]

+[&Close]

+[Read Next]

+[From:]

+[Message received:]

+[Number:]

+[To:]

+[Add number to list]

+[&H]

+[Save number]

+[Multiple >>]

+[Enter message:]

+[Chars:]

+[%d/160]

+[&Send]

+[&Try again]

+[&Cancel]

+[The SMS message send timed out]

+[SMS Plugin]

+[Begining]

+[End]

+[Put signature at the:]

+[Use Signature]

+[Show server notifications]

+[Auto popup on new message]

+[Save window position per contact]

+[&OK]

+[Message ID:]

+[Source:]

+[Network:]

+;file \plugins\SMS\src\SMSConstans.h

+[Arial]

+;file \plugins\SMS\src\SMS_svc.cpp

+[Incoming SMS Message]

+[Incoming SMS Confirmation]

diff --git a/langpacks/english/Plugins/Scriver.txt b/langpacks/english/Plugins/Scriver.txt
index 58f5c2c317..9e40dd88ff 100644
--- a/langpacks/english/Plugins/Scriver.txt
+++ b/langpacks/english/Plugins/Scriver.txt
@@ -322,7 +322,6 @@
 [%s is typing a message]

 [Typing Notification]

 [Miranda could not load the built-in message module, riched20.dll is missing. If you are using Windows 95 or WINE please make sure you have riched20.dll installed. Press 'Yes' to continue loading Miranda.]

-[user32]

 [Instant messages]

 [Incoming (Focused Window)]

 [Incoming (Unfocused Window)]

@@ -344,9 +343,6 @@
 ;file \plugins\Scriver\src\sendqueue.cpp

 [The message send timed out.]

 ;file \plugins\Scriver\src\utils.cpp

-[:;,.!?'"><()[]- \r\n]

-;file \plugins\Scriver\src\chat\chat.h

-[%miranda_logpath%\\%proto%\\%userid%.log]

 ;file \plugins\Scriver\src\chat\clist.cpp

 [Chat rooms]

 [Join chat]

@@ -355,7 +351,6 @@
 ;file \plugins\Scriver\src\chat\log.cpp

 [%%%c#%02X%02X%02X]

 [%%%c]

-[: %s]

 [%s ]

 [%s has joined]

 [You have joined %s]

@@ -368,7 +363,6 @@
 [The topic is '%s%s']

 [ (set by %s on %s)]

 [ (set by %s)]

-[--> %s]

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

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

 ;file \plugins\Scriver\src\chat\main.cpp

@@ -454,9 +448,7 @@
 [%username%]

 [username for currently logged-on Windows user]

 [%mydocuments%]

-["My Documents" folder for currently logged-on Windows user]

 [%desktop%]

-["Desktop" folder for currently logged-on Windows user]

 [%xxxxxxx%]

 [any environment variable defined in current Windows session (like %systemroot%, %allusersprofile%, etc.)]

 [%d%]

@@ -484,10 +476,7 @@
 [Default events to show in new chat rooms if the 'event filter' is enabled]

 [Select Folder]

 [PopUps]

-[[%H:%M]]

-[[%d %b %y %H:%M]]

 [%n:]

-[MS Shell Dlg]

 [Group chats]

 [Message is highlighted]

 [User has performed an action]

@@ -517,12 +506,10 @@
 [Notice from %s: %s]

 [The topic is '%s']

 [The topic is '%s' (set by %s)]

-[:,.!?;'>)]

 [ab+]

 [%s * %s]

 [%s %c %s\r\n]

 [%s %s\r\n]

-[%userid%.log]

 [%#d]

 [%#m]

 [mon]

@@ -549,7 +536,6 @@
 [Show/hide the nicklist (CTRL+N)]

 [Control this room (CTRL+O)]

 [Enable/disable the event filter (CTRL+F)]

-[/topic]

 [%s: %s\r\n%s: %s\r\n%s: %s]

 [AQG_glo']

 [%s: Chat Room (%u user)]

diff --git a/langpacks/english/Plugins/SecureIM.txt b/langpacks/english/Plugins/SecureIM.txt
index 9fa1570ceb..4bfcde82ba 100644
--- a/langpacks/english/Plugins/SecureIM.txt
+++ b/langpacks/english/Plugins/SecureIM.txt
@@ -89,7 +89,6 @@
 [Import public key]

 [Delete public key]

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

-[comctl32.dll]

 [Incoming Secure Message]

 [Outgoing Secure Message]

 [SecureIM status]

@@ -100,8 +99,6 @@
 ;file \plugins\SecureIM\src\options.cpp

 [ASC files\0*.asc\0All files (*.*)\0*.*\0]

 [Open Key File]

-[rsa_pub.asc]

-[rsa_priv.asc]

 [Save Private Key File]

 [Save Public Key File]

 [Load Private Key File]

@@ -109,6 +106,3 @@
 [Services]

 ;file \plugins\SecureIM\src\popupOptions.cpp

 [PopUps]

-;file \plugins\SecureIM\src\rtfconv.cpp

-[rtfconv.dll]

-[plugins\\rtfconv.dll]

diff --git a/langpacks/english/Plugins/SeenPlugin.txt b/langpacks/english/Plugins/SeenPlugin.txt
index 2a1aeba961..135ef581b8 100644
--- a/langpacks/english/Plugins/SeenPlugin.txt
+++ b/langpacks/english/Plugins/SeenPlugin.txt
@@ -43,8 +43,8 @@
 ;file \plugins\SeenPlugin\src\history.cpp

 [%s: %s]

 [last seen history]

-[User Menu]

 [View User's Details]

+[User Menu]

 [Send Instant Message]

 [Date: %d.%m.%y(%Y) \n Date desc: %W - %w - %E - %e \n Time: %H:%M:%S (%h-%p) \n user: %n - %u \n Status: %s \n IP: %i - %r]

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

@@ -63,7 +63,6 @@
 [ [%i]]

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

 [Last Seen Variables]

-[uxtheme.dll]

 [Contacts]

 [PopUps]

 ;file \plugins\SeenPlugin\src\seen.h

@@ -71,7 +70,6 @@
 [%n is %s (%u)]

 [%i(%r)%bWas %o]

 [Name:%t%N%bStatus:%t%s%bDay:%t%d.%m.%Y%bTime:%t%H:%M:%S%bPrevious Status:%t%o%b%b%P ID:%t%u%bExternal IP:%t%i%bInternal IP:%t%r%bClientID: %t%C%b%bStatus Message:%t%T]

-[-- Date --]

 [year (4 digits)]

 [year (2 digits)]

 [month]

@@ -80,13 +78,11 @@
 [day]

 [weekday (full)]

 [weekday (abbreviated)]

-[-- Time --]

 [hours (24)]

 [hours (12)]

 [AM/PM]

 [minutes]

 [seconds]

-[-- User --]

 [username]

 [nick]

 [UIN/handle]

@@ -98,7 +94,6 @@
 [internal IP]

 [Client info]

 [Protocol]

-[-- Format --]

 [tabulator]

 [line break]

 [Note:]

@@ -147,7 +142,6 @@
 [<never seen>]

 [%04i]

 [%02i]

-[---]

 [Idle]

 [ProtoUnknown]

 [\x0D\x0A]

diff --git a/langpacks/english/Plugins/SendSS.txt b/langpacks/english/Plugins/SendSS.txt
index 47e9310a27..793d36b8d7 100644
--- a/langpacks/english/Plugins/SendSS.txt
+++ b/langpacks/english/Plugins/SendSS.txt
@@ -51,7 +51,6 @@
 [MAPI error (%i):\n%s.]

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

 [Email transfer]

-[MAPI32.DLL]

 [A recipient matched more than one of the recipient descriptor structures and MAPI_DIALOG was not set]

 [The specified attachment was not found]

 [The specified attachment could not be opened]

@@ -88,7 +87,6 @@
 [SendScreenshot - Error]

 [UInfoButtonClass]

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

-[sendss.dll]

 [Fatal error, image services not found. Send Screenshot will be disabled.]

 [\\Screenshots]

 [SendSS HTTP connections]

@@ -105,15 +103,11 @@
 [Can not retrieve Screenshot path.]

 [Could not create Screenshot folder (error code: %d):\n%s\nDo you have write permissions?]

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

-[Icons\\uinfoex_icons.dll]

-[Plugins\\uinfoex_icons.dll]

-[Customize\\Icons\\uinfoex_icons.dll]

 [Warning: Your current IconPack's version differs from the one UserInfoEx is designed for.\nSome icons may not be displayed correctly]

 [Warning: No IconPack found in one of the following directories: 'customize\\icons', 'icons' or 'plugins'!]

 [Plugins\\]

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

 [\r\n\r\n]

-[TEXT]

 [Credits]

 [< Copyright]

 [Copyright]

@@ -146,11 +140,9 @@
 [Cant create a Screenshot]

 [Select a target window.]

 [explore]

-[shot%.5ld]

 [Screenshot ]

 [for Client area ]

 [of "]

-[" Window]

 [png]

 [jpg]

 [bmp]

diff --git a/langpacks/english/Plugins/SimpleAR.txt b/langpacks/english/Plugins/SimpleAR.txt
index 6dad66c913..768c221f53 100644
--- a/langpacks/english/Plugins/SimpleAR.txt
+++ b/langpacks/english/Plugins/SimpleAR.txt
@@ -26,7 +26,6 @@
 [Turn on Autoanswer]

 [Dear %user%, the owner left the following message:]

 [%user%]

-[%s\r\n\r\n%s]

 ;file \plugins\SimpleAR\src\Options.cpp

 [Simple Auto Replier]

 [Plugins]

diff --git a/langpacks/english/Plugins/SimpleStatusMsg.txt b/langpacks/english/Plugins/SimpleStatusMsg.txt
index aedfb06f46..00e4f1f7f4 100644
--- a/langpacks/english/Plugins/SimpleStatusMsg.txt
+++ b/langpacks/english/Plugins/SimpleStatusMsg.txt
@@ -109,12 +109,10 @@
 [%s (locked)]

 [winampsong]

 [External Applications\tretrieves song name of the song currently playing in Winamp (Simple Status Message compatible)]

-[date]

 [Miranda Related\tget the date (Simple Status Message compatible)]

 ;file \plugins\SimpleStatusMsg\src\msgbox.cpp

 [<startup>]

 [<current>]

-[## %s ##]

 [Add to Predefined]

 [Delete Selected]

 [OK (%d)]

diff --git a/langpacks/english/Plugins/SmileyAdd.txt b/langpacks/english/Plugins/SmileyAdd.txt
index 292fa97c39..aa317b61cb 100644
--- a/langpacks/english/Plugins/SmileyAdd.txt
+++ b/langpacks/english/Plugins/SmileyAdd.txt
@@ -36,15 +36,10 @@
 ;file \plugins\SmileyAdd\src\customsmiley.cpp

 [\\*.*]

 ;file \plugins\SmileyAdd\src\dlgboxsubclass.cpp

-[#32770]

-[RichEdit20A]

-[RichEdit20W]

-[RICHEDIT50W]

 [Edit]

 [Show Smiley Selection Window]

 ;file \plugins\SmileyAdd\src\download.cpp

 [.*/(.*)]

-[%s\\%s\\]

 [\\SmileyCache]

 [%miranda_userdata%\\SmileyCache]

 [SmileyAdd HTTP connections]

@@ -57,9 +52,7 @@
 [GDI+ can be downloaded here: http://www.microsoft.com/downloads]

 [Miranda SmileyAdd]

 ;file \plugins\SmileyAdd\src\imagecache.cpp

-[#%d]

 [dll]

-[exe]

 [ico]

 [icl]

 [tif]

@@ -76,12 +69,10 @@
 [Bottom]

 [Smiley Packs]

 [ (*.msl;*.asl;*.xep)]

-[*.msl;*.asl;*.xep]

 [All Files]

 [ (*.*)]

 [*.*]

 [msl]

-[-filename]

 ;file \plugins\SmileyAdd\src\services.cpp

 [<None>]

 [Standard]

@@ -93,7 +84,6 @@
 [hContact]

 [(.*)\\|(.*)\\|(.*)]

 [(?:ftp|https|http|file|aim|webcal|irc|msnim|xmpp|gopher|mailto|news|nntp|telnet|wais|prospero)://?[\\w.?%:/$+;]*]

-[[\\s"][a-zA-Z]:[\\\\/][\\w.\\-\\\\/]*]

 [\\d{1,2}:\\d{2}:\\d{2}|\\d{1,2}:\\d{2}]

 [\\s+]

 [%%_{1,2}%%]

@@ -113,12 +103,10 @@
 [^\\s*(Selection|Window)Size\\s*=\\s*(\\d+)\\s*,\\s*(\\d+)]

 [Selection]

 [Window]

-[^\\s*Smiley(\\*)?\\s*=]

 [(?:\\s*"(.*)\]

 [(?:[\\s,]+(\\-?\\d+))]

 [(?:[\\s,]+(R|S)?"(.*?)\]

 [(?:[\\s,]+"(.*?)\]

-[http://]

 [Smiley #%u in file %s for Smiley Pack %s not found.]

 [&lt;]

 [&gt;]

@@ -130,12 +118,9 @@
 [<PasteText>\\s*"(.*?)"\\s*</PasteText>]

 [<images>(.*?)</images>]

 [<Image>(.*?)</Image>]

-[<!\\[CDATA\\[(.*?)\\]\\]>]

 [Test String]

 [Regular Expression "%s" in smiley pack "%s" could produce "empty matches".]

 [Regular Expression "%s" in smiley pack "%s" malformed.]

-;file \plugins\SmileyAdd\src\smileys.h

-[Smileys\\nova\\default.msl]

 ;file \plugins\SmileyAdd\src\smltool.cpp

 [d'Oh!]

 [SmileyTool]

diff --git a/langpacks/english/Plugins/SpellChecker.txt b/langpacks/english/Plugins/SpellChecker.txt
index 7ac2d25f4c..c55d1f9390 100644
--- a/langpacks/english/Plugins/SpellChecker.txt
+++ b/langpacks/english/Plugins/SpellChecker.txt
@@ -40,8 +40,6 @@
 [Wrong Correction]

 [The correction can't be empty!]

 [The correction can't be equal to the wrong word!]

-;file \plugins\SpellChecker\src\autoreplace.cpp

-[-_.!@#$%&*()[]{}<>:?/\\=+]

 ;file \plugins\SpellChecker\src\commons.h

 [%miranda_path%\\Icons]

 [%miranda_userdata%\\Dictionaries]

@@ -51,21 +49,14 @@
 [Tagalog (Philippines)]

 [de_frami_neu]

 [German (Germany)]

-[%s\\%s.cdic]

 [%s_%s]

 [%s (%s)]

 [%s [%s]]

-[%s\\*.dic]

-[%s\\%s]

 [.aff]

 [Thunderbird]

-[thunderbird.exe]

 [Firefox]

-[firefox.exe]

-[SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\%s]

 [Software\\Microsoft\\Windows\\ShellNoRoam\\MUICache]

 [Path]

-[%s\\Dictionaries]

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

 [Message Sessions]

 [Auto-replacements]

@@ -82,9 +73,7 @@
 [Dictionaries]

 [Custom Dictionaries]

 [Flags DLL]

-[%s\\flags_icons.dll]

 [Spell Checker/Flags]

-[%s\\%s.ar]

 [Enable/disable spell checker]

 [Enabled]

 [Disabled]

diff --git a/langpacks/english/Plugins/SplashScreen.txt b/langpacks/english/Plugins/SplashScreen.txt
index af2f085398..ac6bf1c93a 100644
--- a/langpacks/english/Plugins/SplashScreen.txt
+++ b/langpacks/english/Plugins/SplashScreen.txt
@@ -1,6 +1,6 @@
-;#muuid not found, please specify manually!

+#muuid {c64cc8e0-cf03-474a-8b11-8bd4565ccf04}

 ;============================================================

-;  File: AdvSplashScreen.dll

+;  File: SplashScreen.dll

 ;  Plugin: Splash Screen

 ;  Version: 0.1.2.3

 ;  Authors: nullbie, Thief

@@ -34,20 +34,13 @@
 [%s:\t\t%s\n]

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

 [%miranda_path%]

-[%s\\plugins\\advaimg.dll]

-[%s\\%s.log]

 [Miranda version]

 [Dll Name]

 [Advaimg path]

-[user32.dll]

 [Your advaimg.dll is either obsolete or damaged. Get latest from Miranda alpha builds.]

 [Error]

 [Loading advaimg]

-[splash\\splash.png]

-[%s\\%s]

-[sounds\\startup.wav]

 [SoundFilePath]

-[%s\\*.*]

 [Found file]

 [Extention]

 [.bmp]

@@ -91,16 +84,10 @@
 [On Modules Loaded timer]

 [On Modules Loaded workaround]

 [WM_DESTROY]

-[WM_PAINT]

-[painting..]

-[open "%s" type mpegvideo alias song1]

-[play song1]

-[%s%s]

 [Verdana]

 [Timer TimeToShow]

 [set]

 [Timer Modules loaded]

-[close song1]

 [Thread]

 [start]

 [Preview]

diff --git a/langpacks/english/Plugins/StartupStatus.txt b/langpacks/english/Plugins/StartupStatus.txt
index 893e45ff1d..5cc1a060df 100644
--- a/langpacks/english/Plugins/StartupStatus.txt
+++ b/langpacks/english/Plugins/StartupStatus.txt
@@ -28,8 +28,6 @@
 [Status Profiles]

 ;file \plugins\StatusPlugins\StartupStatus\profiles.cpp

 [There is a maximum of 6 menu items]

-[STATIC]

-;file \plugins\StatusPlugins\StartupStatus\startupstatus.cpp

 ;file \plugins\StatusPlugins\StartupStatus\toolbars.cpp

 [Pressed toolbar icon]

 [Released toolbar icon]

diff --git a/langpacks/english/Plugins/StopSpamMod.txt b/langpacks/english/Plugins/StopSpamMod.txt
index 0b21541af7..e321c9d164 100644
--- a/langpacks/english/Plugins/StopSpamMod.txt
+++ b/langpacks/english/Plugins/StopSpamMod.txt
@@ -64,12 +64,10 @@
 ;file \plugins\StopSpamMod\src\stopspam.cpp

 [ICQ]

 [X+-/*]

-[+-/*]

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

 [Mark for delete]

 [Deleted]

 [Not In List]

-[http]

 [www]

 [.ru]

 [.com]

diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index 6d64b36cdd..ea0390f871 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -275,7 +275,7 @@
 [Bottom tabs vertical adjustment:]

 [NOTE: some settings will not affect open containers.]

 [Tab layout tweaks]

-[Copyright © 2004-2010 by the Miranda IM project, 2012 by the Miranda NG project. More detailed copyright information can be found in the included README file.]

+[Copyright 2004-2011 by the Miranda IM project, 2012-2013 by the Miranda NG project. More detailed copyright information can be found in the included README file.]

 [Support and latest version information]

 [Selected skin]

 [Rescan]

@@ -507,7 +507,6 @@
 [Globally OFF]

 [On, if present, always in bottom display]

 [Don't show them]

-[http://miranda.or.at/TabSRMM/TitleBarFormatting]

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

 [&Main]

 [&File]

@@ -539,15 +538,11 @@
 [%s: %s (%s) [%d]]

 [(undef)]

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

-[%s%c*.rtf%c%c]

 [Rich Edit file]

-[%s.rtf]

-[%s%s\\]

 [\\Saved message logs]

 [rtf]

 [Configuration issue|The unattended send feature is disabled. The \\b1 send later\\b0  and \\b1 send to multiple contacts\\b0  features depend on it.\n\nYou must enable it under \\b1Options->Message Sessions->Advanced tweaks\\b0. Changing this option requires a restart.]

 [You cannot edit user notes when there are unsent messages]

-[0000%s]

 [%s is typing a message.]

 [UID: %s]

 [Last received: %s at %s]

@@ -560,7 +555,6 @@
 [UID: %s (SHIFT click -> copy to clipboard)\nClick for User's Details\nClick dropdown to change this contact's favorite status.]

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

 [%n (%s)]

-[%s\n\n(%s)]

 [TabSRMM runtime error]

 [Instant messages]

 [Incoming (Focused Window)]

@@ -575,7 +569,6 @@
 [&Messaging settings...]

 [&Send later job list...]

 [SideBarClass]

-[RichEditTipClass]

 [Message from %s]

 [signed off.]

 [signed on and is now %s.]

@@ -609,9 +602,9 @@
 [Chit chatting]

 [Crashing]

 [Going to toilet]

+[%s    Idle: %dh,%02dm]

 [  Client: %s]

 [  Client not cached yet]

-[%s    Idle: %dh,%02dm]

 [Topic is: %s]

 [no topic set.]

 [Open User Details...]

@@ -622,7 +615,6 @@
 [Copy To Clipboard]

 [\\tab \\ul\\b Status message:\\ul0\\b0 \\par %s]

 [\\par\\par\\tab \\ul\\b Extended status information:\\ul0\\b0 \\par ]

-[%s%s%s]

 [ / ]

 [\\par\\par\\tab \\ul\\b Listening to:\\ul0\\b0 \\par %s]

 [\\par\\par\\ul\\b Client:\\ul0\\b0  %s]

@@ -642,18 +634,11 @@
 [Use Global Setting]

 [Show always (if present)]

 [Never show it at all]

-[%s%s]

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

-[%s\\%s]

 [%stabSRMM]

 [%sLogs\\]

-[%s\\skins\\]

-[%s\\Saved Contact Pictures]

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

 [Insert [img] tag / surround selected text with [img][/img]]

-[[img]%s[/img]]

-[[img]]

-[[/img]]

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

 [Add this contact permanently to your contact list]

 [Do not add this contact permanently]

@@ -684,19 +669,13 @@
 [Save contact picture]

 [My Avatar_%s]

 [%s_%s]

-[%s.png]

 [png]

-[%s%c*.bmp;*.png;*.jpg;*.gif%c%c]

 [Image files]

 [The file exists. Do you want to overwrite it?]

 [Set Your Avatar...]

 [ | ]

-[%s%s %d/%d]

 [\\pard]

 [\\cf]

-[[/color][color=%s]]

-[[color=%s]]

-[[/color]]

 [\\highlight]

 [\\par]

 [\\line]

@@ -708,26 +687,16 @@
 [\\lquote]

 [\\rquote]

 [\\b]

-[[b]]

-[[/b]]

 [\\i]

-[[i]]

-[[/i]]

 [\\strike]

-[[s]]

-[[/s]]

 [\\ul]

-[[u]]

-[[/u]]

 [\\tab]

 [ !$%()#*"']

 [ !§$%&()#*]

-[%04.04x]

 [MIME\\Database\\Rfc1766]

 [The 'paste and send' feature is disabled. You can enable it on the 'General' options page in the 'Sending Messages' section]

 [Either the nudge plugin is not installed or the contact's protocol does not support sending a nudge event.]

 ['(Unknown Contact)']

-[%s%c*.jpg%c%c]

 [JPEG-compressed images]

 [jpg]

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

@@ -812,7 +781,6 @@
 [The image service plugin (advaimg.dll) is not properly installed.\n\nTabSRMM is disabled.]

 [TabSRMM fatal error]

 [Warning: trying to create duplicate window]

-[_U_]

 [%s (%s)  ]

 [%s   ]

 [Image tag]

@@ -845,8 +813,6 @@
 [Frame 2]

 [Frame 3]

 [Frame 4]

-[icons\\tabsrmm_icons.dll]

-[plugins\\tabsrmm.dll]

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

 [Select container for %s]

 [You cannot delete the default container]

@@ -929,14 +895,9 @@
 ;file \plugins\TabSRMM\src\themeio.cpp

 [TabSRMM Theme]

 [Cookie]

-[%s%c*.tabsrmm%c%c]

 [tabSRMM themes]

 [tabsrmm]

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

-[tabskin_aero.png]

-[tabskin_aero_glow.png]

-[tabskin_aero_button.png]

-[unknown.png]

 [No effect]

 [Milky Glass]

 [Carbon]

@@ -945,7 +906,6 @@
 [Custom (use own gradient colors)]

 [Container]

 [Toolbar]

-[{-}Buttonpressed]

 [Buttonnotpressed]

 [Buttonmouseover]

 [Infopanelfield]

@@ -982,7 +942,6 @@
 [Glyph]

 [%d,%d,%d,%d]

 [Image]

-[%s\\%s%s]

 [Alpha]

 [Fillcolor]

 [Colorkey]

@@ -991,8 +950,6 @@
 [All message containers need to close before the skin can be changed\nProceed?]

 [Change skin]

 [none]

-[%s\\%s\\%s]

-[%6.6x]

 [Color1]

 [Color2]

 [COLOR2_TRANSPARENT]

@@ -1004,7 +961,6 @@
 [Radius]

 [Textcolor]

 [ffffffff]

-[$glyphs]

 [Item%d]

 [Width]

 [xoff]

@@ -1016,16 +972,13 @@
 [Action]

 [service]

 [protoservice]

-[database]

 [PassContact]

 [Tip]

 [Label]

 [NormalGlyph]

-[0, 0, 0, 0]

 [PressedGlyph]

 [HoverGlyph]

 [Signature]

-[000000]

 [Avatars]

 [BorderColor]

 [SideBarBG]

@@ -1038,11 +991,6 @@
 [WindowFrame]

 [Caption]

 [bottom]

-[TitleButtonWidth]

-[TitleButtonHeight]

-[TitleButtonTopOffset]

-[TitleBarRightOffset]

-[TitleBarLeftOffset]

 [CaptionOffset]

 [CaptionPadding]

 [SidebarTop]

@@ -1060,14 +1008,6 @@
 [FontColor]

 [ButtonArea]

 [top]

-[%scustom_unknown.png]

-[%sunknown.png]

-[%scustom_tabskin_aero.png]

-[%stabskin_aero.png]

-[%scustom_tabskin_aero_glow.png]

-[%stabskin_aero_glow.png]

-[%scustom_tabskin_aero_button.png]

-[%stabskin_aero_button.png]

 [SKIN_GLYPH]

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

 [Message window tweaks]

@@ -1080,6 +1020,7 @@
 [Disable error popups on sending failures]

 [Automatic keyboard layout: Do not load the system default for new contacts]

 [Enable unattended send (experimental feature, required for multisend and send later) (*)]

+[Show client description in info panel]

 [Show a preview of the event]

 [Don't announce event when message dialog is open]

 [Don't announce events from RSS protocols]

@@ -1173,24 +1114,8 @@
 [Set messaging options for %s]

 [Message Log]

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

-[[color=]

-[b1 ]

-[i1 ]

-[u1 ]

-[s1 ]

-[c1 ]

-[b0 ]

-[i0 ]

-[u0 ]

-[s0 ]

-[c0 ]

-[~-+]

-[+-~]

 [\xAA]

-[cxxx ]

 [%02d]

-[##col##%06u:%04u]

-[://]

 [*/_]

 [%%%]

 [%s...]

@@ -1210,8 +1135,6 @@
 [Closing options dialog|To reflect the changes done by importing a theme in the options dialog, the dialog must be closed after loading a theme \\b1 and unsaved changes might be lost\\b0 .\n\nDo you want to continue?]

 [Loading a theme|Loading a color and font theme can overwrite the settings defined by your skin.\n\nDo you want to continue?]

 [TabSRMM warning message]

-;file \plugins\TabSRMM\src\chat\chat.h

-[%miranda_logpath%\\%proto%\\%userid%.log]

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

 [Chat rooms]

 [Join chat]

@@ -1222,7 +1145,6 @@
 ;file \plugins\TabSRMM\src\chat\log.cpp

 [%%%c#%02X%02X%02X]

 [%%%c]

-[: %s]

 [%s ]

 [%s has joined]

 [You have joined %s]

@@ -1235,14 +1157,9 @@
 [The topic is '%s%s']

 [ (set by %s on %s)]

 [ (set by %s)]

-[--> %s]

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

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

-[~~++#%s#++~~]

 [Notice from %s: ]

-[#++~~]

-[~~++#]

-[~-+%d+-~]

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

 [PERF text match: %d ticks = %f msec (%d words, %d patterns)]

 [Add user to highlight list]

@@ -1411,9 +1328,7 @@
 [%username%]

 [username for currently logged-on Windows user]

 [%mydocuments%]

-["My Documents" folder for currently logged-on Windows user]

 [%desktop%]

-["Desktop" folder for currently logged-on Windows user]

 [%xxxxxxx%]

 [any environment variable defined in current Windows session (like %systemroot%, %allusersprofile%, etc.)]

 [%d%]

@@ -1437,18 +1352,14 @@
 [%weekday%]

 [full weekday name]

 [Variables]

-[%s%c*.*%c%c]

 [All Files]

 [log]

 [Select Folder]

 [No markers]

 [Show as icons]

 [Show as text symbols]

-[[%H:%M]]

-[[%d %b %y %H:%M]]

 [%n:]

 [AQGglo]

-[MS Shell Dlg]

 [Message is highlighted]

 [User has performed an action]

 [User has kicked some other user]

@@ -1472,7 +1383,6 @@
 [Information in %s]

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

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

-[%s%s says:%s %s]

 [%s %s]

 [%s has left (%s)]

 [%s has disconnected (%s)]

@@ -1485,13 +1395,10 @@
 [%s %c %s\r\n]

 [%s %s\r\n]

 [%Y%m%d-%H%M%S]

-[%s%sarchived\\]

-[%s%s-%s%s]

 [Look up '%s':]

 [No word to look up]

 [Highlight User...]

 [Edit Highlight List...]

-[UTF-8]

 [%a%d%m%Y]

 [%#d]

 [%#m]

@@ -1500,13 +1407,10 @@
 [yyyy]

 [wday]

 [weekday]

-[%userid%.log]

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

-[/topic]

 [%s: %s\r\n%s: %s\r\n%s: %s]

 [Nick name]

 [Unique Id]

-[<b>%s:</b>\t%s\n<b>%s:</b>\t%s\n<b>%s:</b>\t%s]

 [Nick]

 [Unique id]

 [%s: Chat Room (%u user%s)]

@@ -1521,8 +1425,6 @@
 [minutes]

 [minute]

 [, %d %s idle]

-[http://www.google.com/search?q=%s]

-[http://en.wikipedia.org/wiki/%s]

 [%s:]

 [%s: ]

 [The filter canoot be enabled, because there are no event types selected either global or for this chat room]

@@ -1533,7 +1435,6 @@
 ;file \plugins\TabSRMM\src\include\taskbar.h

 [TabSRMM_DWMProxy]

 ;file \plugins\TabSRMM\src\include\utils.h

-[{\\rtf1\\ansi\\deff0\\pard\\li%u\\fi-%u\\ri%u\\tx%u]

 [red]

 [blue]

 [green]

diff --git a/langpacks/english/Plugins/Tipper.txt b/langpacks/english/Plugins/Tipper.txt
index 87f353eb77..982789ee68 100644
--- a/langpacks/english/Plugins/Tipper.txt
+++ b/langpacks/english/Plugins/Tipper.txt
@@ -94,9 +94,6 @@
 [Hide offline protocols]

 [Hide offline]

 [Append protocol name]

-;file \plugins\TipperYM\src\message_pump.cpp

-[user32.dll]

-[dwmapi.dll]

 ;file \plugins\TipperYM\src\mir_smileys.cpp

 [Tipper smileys]

 [...]

@@ -108,13 +105,11 @@
 [%sys:status_msg%]

 [You must enter a label]

 [Invalid Substitution]

-[--------------------------------------]

 [<No Label>]

 [Add item]

 [Add separator]

 [Move up]

 [Move down]

-[---------------------------------]

 [Icon on left]

 [Icon on right]

 [No icon]

@@ -179,7 +174,6 @@
 [%s (%s)]

 [Other]

 [Miranda uptime:]

-[<b>]

 ;file \plugins\TipperYM\src\popwin.h

 [MimTTClass]

 ;file \plugins\TipperYM\src\preset_items.cpp

@@ -228,58 +222,40 @@
 [XStatus text]

 [XStatus text:]

 [%raw:/XStatusMsg%]

-[[jabber.dll] Activity title]

 [Activity title:]

 [%raw:AdvStatus/?dbsetting(%subject%,Protocol,p)/activity/title%]

-[[jabber.dll] Activity text]

 [Activity text:]

 [%raw:AdvStatus/?dbsetting(%subject%,Protocol,p)/activity/text%]

-[[menuex.dll] Logon time]

 [Logon time:]

 [%logon_date% @ %logon_time% (%logon_ago%)]

-[[menuex.dll] Logoff time]

 [Logoff time:]

 [%logoff_date% @ %logoff_time% (%logoff_ago%)]

-[[seenplugin.dll] Last seen time]

 [Last seen time:]

 [%lastseen_date% @ %lastseen_time%]

-[[seenplugin.dll] Last seen status]

 [Last seen status:]

 [%lastseen_status% (%lastseen_ago% ago)]

-[[weather.dll] Condition]

 [Condition:]

 [%raw:Current/Condition%]

-[[weather.dll] Humidity]

 [Humidity:]

 [%raw:Current/Humidity%]

-[[weather.dll] Max/Min temperature]

 [Max/Min:]

 [%raw:Current/High%/%raw:Current/Low%]

-[[weather.dll] Moon]

 [Moon:]

 [%raw:Current/Moon%]

-[[weather.dll] Pressure]

 [Pressure:]

 [%raw:Current/Pressure% (%raw:Current/Pressure Tendency%)]

-[[weather.dll] Sunrise]

 [Sunrise:]

 [%raw:Current/Sunrise%]

-[[weather.dll] Sunset]

 [Sunset:]

 [%raw:Current/Sunset%]

-[[weather.dll] Temperature]

 [Temperature:]

 [%raw:Current/Temperature%]

-[[weather.dll] Update time]

 [Update time:]

 [%raw:Current/Update%]

-[[weather.dll] UV Index]

 [UV Index:]

 [%raw:Current/UV% - %raw:Current/UVI%]

-[[weather.dll] Visibility]

 [Visibility:]

 [%raw:Current/Visibility%]

-[[weather.dll] Wind]

 [Wind:]

 [%raw:Current/Wind Direction% (%raw:Current/Wind Direction DEG%)/%raw:Current/Wind Speed%]

 [gender]

@@ -301,21 +277,10 @@
 [logoff_time]

 [logoff_ago]

 ;file \plugins\TipperYM\src\skin_parser.cpp

-[# Solid color fill]

 [*.*]

-[*.tsf]

 [author]

 [preview]

-[%s\\%s\\%s]

 [image]

-[TM_NONE]

-[TM_CENTRE]

-[TM_STRECH_ALL]

-[TM_STRECH_HORIZONTAL]

-[TM_STRECH_VERTICAL]

-[TM_TILE_ALL]

-[TM_TILE_HORIZONTAL]

-[TM_TILE_VERTICAL]

 [left]

 [top]

 [right]

@@ -343,21 +308,7 @@
 [opacity]

 [enable-coloring]

 [false]

-[[about]]

-[[other]]

-[[background]]

-[[sidebar]]

-[[fonts]]

-[[appearance]]

 ;file \plugins\TipperYM\src\subst.cpp

-[[b]]

-[[i]]

-[[/b]]

-[[/i]]

-[[color]

-[[/color]]

-[[size]

-[[/size]]

 [uid]

 [proto]

 [account]

@@ -388,35 +339,19 @@
 [Values]

 [Tray title]

 ;file \plugins\TipperYM\src\translations.cpp

-[[No translation]]

 [Yes]

 [Female]

 [Male]

 [%u.%u.%u.%u]

 [%dy %dd %dh %dm]

 [%dd]

-[WORD to status description]

-[DWORD timestamp to time]

-[DWORD timestamp to time difference]

-[BYTE to Yes/No]

-[BYTE to Male/Female (ICQ)]

-[WORD to country name]

-[DWORD to ip address]

 [<prefix>Day|Month|Year to date]

 [<prefix>Day|Month|Year to age]

 [<prefix>Hours|Minutes|Seconds to time]

 [<prefix>Day|Month|Year|Hours|Minutes|Seconds to time difference]

 [<prefix>Day|Month to days to next birthday]

-[DWORD timestamp to time (no seconds)]

 [<prefix>Hours|Minutes to time]

-[DWORD timestamp to date (short)]

-[DWORD timestamp to date (long)]

 [xStatus: empty xStatus name to default name]

-[DWORD seconds to time difference]

-[BYTE timezone to time]

-[WORD to name of a day (0..6, 0 is Sunday)]

-[WORD to name of a month (1..12, 1 is January)]

-[BYTE to language (ICQ)]

 ;file \plugins\TipperYM\src\translations.h

 [Afrikaans]

 [Albanian]

diff --git a/langpacks/english/Plugins/Tlen.txt b/langpacks/english/Plugins/Tlen.txt
index 8224f8cefb..cece615e0c 100644
--- a/langpacks/english/Plugins/Tlen.txt
+++ b/langpacks/english/Plugins/Tlen.txt
@@ -110,8 +110,6 @@
 [DND]

 [Free for chat]

 [Invisible]

-[tlen.pl]

-[s1.tlen.pl]

 [Forwarding]

 [SOCKS4]

 [SOCKS5]

@@ -145,7 +143,6 @@
 [Incoming mail]

 [Alert]

 ;file \protocols\Tlen\src\tlen_file.cpp

-[1 File]

 [%d Files]

 ;file \protocols\Tlen\src\tlen_muc.cpp

 [You have been kicked. Reason: %s ]

@@ -201,9 +198,5 @@
 [...Error...]

 [...Denied...]

 [DISPLAY]

-[8000 Hz / 13.8 kbps]

-[11025 Hz / 19.1 kbps]

-[22050 Hz / 36.8 kbps]

-[44100 Hz / 72 kbps]

 [...???...]

 [Default]

diff --git a/langpacks/english/Plugins/TooltipNotify.txt b/langpacks/english/Plugins/TooltipNotify.txt
index b052d6011e..5a420492a1 100644
--- a/langpacks/english/Plugins/TooltipNotify.txt
+++ b/langpacks/english/Plugins/TooltipNotify.txt
@@ -36,11 +36,8 @@
 [000%]

 [Contacts]

 [Idle]

-;file \plugins\TooltipNotify\src\Settings.h

-[Tahoma]

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

 [MimTooltipNotify]

-[user32.dll]

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

 [Tooltip Notify]

 [Other Status]

@@ -60,6 +57,5 @@
 [Invisible]

 [Not Idle]

 [Unknown]

-[%s%s%s]

 [%.0s%.0s%s]

 [ %s %s]

diff --git a/langpacks/english/Plugins/TopToolBar.txt b/langpacks/english/Plugins/TopToolBar.txt
index b4baf6eb83..f43e071e14 100644
--- a/langpacks/english/Plugins/TopToolBar.txt
+++ b/langpacks/english/Plugins/TopToolBar.txt
@@ -26,13 +26,8 @@
 ;file \plugins\TopToolBar\src\toolbar.cpp

 [Default]

 [Execute Path]

-[Frames service has not been found, so plugin will be disabled.\nTo run it you need to install and / or enable contact list plugin that supports it:\n- Modern contact list\n- MultiWindow (MW)\n- Nicer+\nYou can get them at http://miranda-ng.org]

 [TopToolBar]

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

 [Toolbar]

-;file \plugins\TopToolBar\src\topbutton.cpp

-[STATIC]

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

-[------------------]

-[exe]

 [Contact List]

diff --git a/langpacks/english/Plugins/TrafficCounter.txt b/langpacks/english/Plugins/TrafficCounter.txt
index be3077e4f1..db73ee7d65 100644
--- a/langpacks/english/Plugins/TrafficCounter.txt
+++ b/langpacks/english/Plugins/TrafficCounter.txt
@@ -51,14 +51,11 @@
 [%s - %s]

 [m:ss]

 [h:mm:ss]

-[d hh:mm:ss]

 [%miranda_userdata%\\statistics]

-[%s\\%S.stat]

 [Couldn't read statistics file]

 [Traffic Counter]

 ;file \plugins\TrafficCounter\src\TrafficCounter.c

 [TrafficCounterWnd]

-[{I4}\x0D\x0A\x0A\\r\n{R65}?tc_GetTraffic(%extratext%,now,sent,d)\x0D\x0A\x0A\\r\n{R115}?tc_GetTraffic(%extratext%,now,received,d)\x0D\x0A\x0A\\r\n{R165}?tc_GetTraffic(%extratext%,total,both,d)\x0D\x0A\x0A\\r\n{L180}?if3(?tc_GetTime(%extratext%,now,hh:mm:ss),)\x0D\x0A\x0A\\r\n{L230}?if3(?tc_GetTime(%extratext%,total,d hh:mm),)]

 [Font]

 [Arial]

 [Hide traffic window]

@@ -73,7 +70,6 @@
 [General/]

 [Draw frame as skin element]

 [Show tooltip in traffic window]

-["Toggle traffic counter" in main menu]

 [Visible accounts/]

 [Summary traffic for visible accounts]

 [Overall traffic]

diff --git a/langpacks/english/Plugins/TranslitSwitcher.txt b/langpacks/english/Plugins/TranslitSwitcher.txt
index 549eb7528c..a3b7e6cae5 100644
--- a/langpacks/english/Plugins/TranslitSwitcher.txt
+++ b/langpacks/english/Plugins/TranslitSwitcher.txt
@@ -14,7 +14,6 @@
 [TExtHistoryGrid.UnicodeClass]

 [Internet Explorer_Server]

 [TranslitSwitcher]

-[RichEdit20W]

 [%s %s]

 ;file \plugins\TranslitSwitcher\src\TranslitSwitcher.cpp

 [Switch Layout and Send]

diff --git a/langpacks/english/Plugins/Twitter.txt b/langpacks/english/Plugins/Twitter.txt
index 819f42316d..97f805ddfa 100644
--- a/langpacks/english/Plugins/Twitter.txt
+++ b/langpacks/english/Plugins/Twitter.txt
@@ -5,7 +5,7 @@
 ;  Version: 1.1.0.0

 ;  Authors: dentist, omniwolf, Thief

 ;============================================================

-[Twitter protocol plugin for Miranda NG.]

+[Twitter protocol support for Miranda NG.]

 ;file \protocols\Twitter\res\twitter.rc

 [Server:]

 [Create a new Twitter account]

@@ -95,10 +95,8 @@
 [***** Error searching for contacts: %s]

 ;file \protocols\Twitter\src\Debug.c

 [\r\n]

-[_DEBUG FORMATTING ERROR\r\n]

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

 [%miranda_avatarcache%]

-[http://api.twitter.com/oauth/authorize?oauth_token=%s]

 [Send Tweet...]

 [Network]

 [Basic]

@@ -116,9 +114,6 @@
 [Visit Homepage]

 [Reply...]

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

-[https://api.twitter.com/]

-[https://identi.ca/api/]

-[140]

 [Send Tweet for %s]

 [Dorothy Parker]

 [If, with the literate, I am\n]

diff --git a/langpacks/english/Plugins/UInfoEx.txt b/langpacks/english/Plugins/UInfoEx.txt
index 76fa5b81ed..91ae6c339e 100644
--- a/langpacks/english/Plugins/UInfoEx.txt
+++ b/langpacks/english/Plugins/UInfoEx.txt
@@ -196,7 +196,6 @@
 [Button]

 [%s %d\\%s]

 [%s %d]

-[%s\\%s]

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

@@ -209,8 +208,6 @@
 [Edit E-Mail]

 [Edit Phone Number]

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

-[+%u (%s) %s]

-[0123456789]

 [none]

 [Edit]

 [Choose the item to display.]

@@ -229,7 +226,6 @@
 [mailto:]

 ;file \plugins\UserInfoEx\src\ctrl_tzcombo.cpp

 [<Unspecified>]

-[--:--]

 ;file \plugins\UserInfoEx\src\dlg_anniversarylist.cpp

 [ETA]

 [Contact]

@@ -273,7 +269,6 @@
 [Segoe UI]

 [Owner]

 [Edit Contact Information]

-[%s\n%s]

 [Upload ICQ Details]

 [Upload failed]

 [Your details were not uploaded successfully.\nThey were written to database only.]

@@ -281,9 +276,6 @@
 [miranda]

 [Fatal error, image services not found. Flags Module will be disabled.]

 ;file \plugins\UserInfoEx\src\mir_icolib.cpp

-[Icons\\uinfoex_icons.dll]

-[Plugins\\uinfoex_icons.dll]

-[Customize\\Icons\\uinfoex_icons.dll]

 [Warning: Your current IconPack's version differs from the one UserInfoEx is designed for.\nSome icons may not be displayed correctly]

 [Warning: No IconPack found in one of the following directories: 'customize\\icons', 'icons' or 'plugins'!]

 ;file \plugins\UserInfoEx\src\mir_menuitems.cpp

@@ -342,10 +334,8 @@
 [Past]

 [Affiliation]

 [Interest]

-[EDIT]

 [Sorry, but there is a problem with adding a new item of type "%s"]

 [<empty>]

-[LISTBOX]

 [Add Affliation]

 [Edit Category]

 [Edit Value]

@@ -481,10 +471,6 @@
 [Parties]

 [Women]

 [Social science]

-[60's]

-[70's]

-[80's]

-[50's]

 [Finance and corporate]

 [Entertainment]

 [Consumer electronics]

@@ -541,7 +527,6 @@
 [User has no valid homepage]

 [View Homepage]

 ;file \plugins\UserInfoEx\src\svc_refreshci.cpp

-[[b]%s (%S)...[/b]\n%d Contacts remaning]

 [Abort Refreshing Contact Details]

 [Do you want to cancel the current refresh procedure?]

 [Miranda must be online for refreshing contact information!]

@@ -638,7 +623,6 @@
 [all Contacts]

 [Select a destination file...]

 [Import User Details from VCard]

-[%s%s%s]

 ;file \plugins\UserInfoEx\src\ex_import\svc_ExImXML.cpp

 [Can't create xml file!\n%S]

 [Export took %f msec]

diff --git a/langpacks/english/Plugins/UserGuide.txt b/langpacks/english/Plugins/UserGuide.txt
index 8994beccce..5a206bfec6 100644
--- a/langpacks/english/Plugins/UserGuide.txt
+++ b/langpacks/english/Plugins/UserGuide.txt
@@ -2,6 +2,5 @@
 ;langpack template for UserGuide

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

 [%miranda_path%\\Plugins]

-[UserGuide.chm]

 [open]

 [User Guide]

diff --git a/langpacks/english/Plugins/Variables.txt b/langpacks/english/Plugins/Variables.txt
index 8a7352543d..98a2f4e4e6 100644
--- a/langpacks/english/Plugins/Variables.txt
+++ b/langpacks/english/Plugins/Variables.txt
@@ -46,20 +46,11 @@
 [Winamp v1.x]

 [ - Winamp]

 [Stopped]

-[[Stopped]]

-[[Paused]]

 [Paused]

 [Playing]

 ;file \plugins\Variables\src\parse_metacontacts.cpp

 ;file \plugins\Variables\src\parse_miranda.cpp

-[d s]

 [%%%s%%]

-[miranda_path]

-[miranda_profile]

-[miranda_profilename]

-[miranda_userdata]

-[miranda_avatarcache]

-[miranda_logpath]

 [appdata]

 [username]

 [mydocuments]

@@ -70,13 +61,7 @@
 ;file \plugins\Variables\src\parse_system.cpp

 [\\Processor(_Total)\\% Processor Time]

 [\\Process(%s)\\%% Processor Time]

-[%.0f]

-[HKEY_CLASSES_ROOT]

-[HKEY_CURRENT_USER]

-[HKEY_LOCAL_MACHINE]

-[HKEY_USERS]

 [\\System\\System Up Time]

 ;file \plugins\Variables\src\tokenregister.cpp

 [alias]

 ;file \plugins\Variables\src\variables.cpp

-[uxtheme.dll]

diff --git a/langpacks/english/Plugins/VersionInfo.txt b/langpacks/english/Plugins/VersionInfo.txt
index e46871efe1..1cdfb952b6 100644
--- a/langpacks/english/Plugins/VersionInfo.txt
+++ b/langpacks/english/Plugins/VersionInfo.txt
@@ -39,9 +39,7 @@
 ;file \plugins\VersionInfo\src\CPlugin.cpp

 [%d.%d.%d.%d]

 [ v.]

-[] - ]

 [unicode]

-[2in1]

 [\r\n]

 ;file \plugins\VersionInfo\src\CVersionInfo.cpp

 [dd' 'MMM' 'yyyy]

@@ -74,7 +72,6 @@
 [Microsoft Windows XP]

 [Microsoft Windows 2003 R2]

 [Microsoft Windows 2003]

-[%miranda_userdata%\\%miranda_profilename%.dat]

 [%.2f KBytes]

 [<error ]

 [ at FileOpen>]

@@ -85,12 +82,10 @@
 [Error at RegOpenKeyEx()]

 [Missing functions in kernel32.dll (GetUserDefaultUILanguage, GetSystemDefaultUILanguage)]

 [ | ]

-[langpack_*.txt]

 [N/A]

 [<unknown>]

 [ v. ]

 [<error> Could not open file " + std::tstring(data.cFileName));\r\n			}\r\n			FindClose(hLangpack);\r\n		}\r\n		else lpzLangpackInfo = _T("No language pack installed]

-[\\Plugins\\*.dll]

 [\\Plugins\\]

 [dll]

 [    Error %ld - %s]

@@ -102,14 +97,9 @@
 [ at MapAndLoad()>\r\n]

 [ at ImageDirectoryEntryToDataEx()>\r\n]

 [    Plugin statically links to missing dll file: ]

-[[b]]

-[[/b]]

-[[size=1]]

-[[quote]]

 [Miranda NG - VersionInformation plugin by Hrk, modified by Eblis\r\n]

 [Miranda's homepage: http://miranda-ng.org/\r\n]

 [Miranda tools: http://miranda-ng.org/\r\n\r\n]

-[<hr />]

 [<blockquote>]

 [dd' 'MMMM' 'yyyy]

 [Report generated at: ]

@@ -122,7 +112,6 @@
 [ MBytes\r\n]

 [Operating System: ]

 [ [version: ]

-[]\r\n]

 [Shell: ]

 [, Internet Explorer ]

 [Administrator privileges: ]

@@ -140,24 +129,14 @@
 [, modified: ]

 [Nightly: ]

 [Unicode core: ]

-[</blockquote>]

 [\r\nEnd of report.\r\n]

 [If you are going to use this report to submit a bug, remember to check the website for questions or help the developers may need.\r\nIf you don't check your bug report and give feedback, it will not be fixed!]

-[[/size]]

-[[/quote]]

 [ (%u)]

-[<b><font size="-1" color="DarkGreen">]

 [Active Plugins]

-[</font></b>]

 [<font size="-2" color="black">]

-[</font>]

-[<b><font size="-1" color="DarkRed">]

 [Inactive Plugins]

-[<b><font size="-1"><font color="Red">]

 [Unloadable Plugins]

 [%miranda_path%]

-[\\VersionInfo.txt]

-[VersionInfo.txt]

 [Information successfully written to file: "%s".]

 [Error during the creation of file "%s". Disk may be full or write protected.]

 [VersionInfo]

@@ -166,7 +145,6 @@
 ;file \plugins\VersionInfo\src\dlgHandlers.cpp

 [%s | %s]

 [Customize using folders plugin]

-[vi.cass.cz]

 [Are you sure you want to enable this option ?\nPlease only enable this option if you really know what you're doing and what the option is for or if someone asked you to do it.]

 [Show plugin UUIDs ?]

 ;file \plugins\VersionInfo\src\hooked_events.cpp

@@ -175,16 +153,10 @@
 ;file \plugins\VersionInfo\src\main.cpp

 ;file \plugins\VersionInfo\src\utils.cpp

 [Ok, something went wrong in the "%s" setting. Report back the following values:\nFacility: %X\nError code: %X\nLine number: %d]

-[%s\\Plugins\\%s]

-[SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\IniFileMapping\\system.ini\\boot]

 [Shell]

 [sys:]

-[SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon]

-[\\system.ini]

 [boot]

 [shell]

 [<not installed>]

-[SOFTWARE\\Microsoft\\Internet Explorer]

 [Build]

 [<unknown version>]

-[{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}]

diff --git a/langpacks/english/Plugins/Watrack_MPD.txt b/langpacks/english/Plugins/Watrack_MPD.txt
index 6aec044186..c109f00399 100644
--- a/langpacks/english/Plugins/Watrack_MPD.txt
+++ b/langpacks/english/Plugins/Watrack_MPD.txt
@@ -4,8 +4,6 @@
 [MPD Host]

 [Port]

 [Password]

-;file \plugins\Watrack_MPD\src\init.c

-[127.0.0.1]

 ;file \plugins\Watrack_MPD\src\main.c

 [mpd is a nice music player for *nix which have not any gui, just daemon.\nuses very small amount of ram, cpu.]

 [Unknown track]

diff --git a/langpacks/english/Plugins/Weather.txt b/langpacks/english/Plugins/Weather.txt
index b78356d7fc..5f33abf180 100644
--- a/langpacks/english/Plugins/Weather.txt
+++ b/langpacks/english/Plugins/Weather.txt
@@ -130,6 +130,9 @@
 [To old setting]

 [To default]

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

+[Enable/disable auto update]

+[Auto Update Enabled]

+[Auto Update Disabled]

 [Weather Condition Changed]

 [Weather Alert Issued]

 [%s__PopupWindow]

@@ -191,20 +194,16 @@
 [Reset to default]

 [Text Files]

 [ (*.txt)]

-[*.txt]

 [All Files]

 [ (*.*)]

 [*.*]

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

 [%i.%i]

-[%s%sC]

-[%s%sF]

 [KPA]

 [HPA]

 [TORR]

 [%i.%i %s]

 [%i %s]

-["\r\nvoid GetSpeed(TCHAR *tempchar, TCHAR *unit, TCHAR *str) \r\n{\r\n	// unit can be km/h, mph, m/s, knots\r\n	double tempunit;\r\n	TCHAR tstr[20];\r\n\r\n	str[0] = 0;\r\n\r\n	// convert the string into an integer (always positive)\r\n	// if the result is 0, then the string is not a number, return _T(""\r\n	tempunit = _ttof(tempchar);\r\n	if (tempunit == 0 && tempchar[0] != '0]

 [KM/H]

 [M/S]

 [MPH]

@@ -247,7 +246,6 @@
 [wintry]

 [drizzle]

 [rain]

-[# Weather <condition name> <counter> #"\r\n			mir_sntprintf(LangPackStr, SIZEOF(LangPackStr), _T("# Weather %s %i #]

 [%20"\r\n// dis = original string\r\n// return value = the modified string with space -> _T("%20"\r\nchar *GetSearchStr(char *dis) \r\n{\r\n	char *pstr = dis;\r\n	size_t len = strlen(dis);\r\n	while (*pstr != 0)\r\n	{\r\n		if (*pstr == ' ]

 [%20]

 [\r\n]

@@ -282,12 +280,6 @@
 [No Popup]

 [Edit Settings]

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

-[1.0]

-[1.1]

-[1.1a]

-[1.2]

-[1.3]

-[1.4]

 [Name]

 [Author]

 [File Version]

@@ -306,24 +298,19 @@
 [INI Version:]

 [File Name:]

 [Item Count:]

-[%s\t%i\n]

 [Memory Used:]

-[%s\t%i ]

 [bytes]

 [Description:]

 [Here is a list of custom variables that are currently available]

 [%c[%s]]

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

 [ID Search - Station Name]

-[\\Plugins\\Weather\\*.ini]

-[SAMPLE_INI.INI]

 [No update data file is found.  Please check your Plugins\\Weather directory.]

 [Invalid ini format for: %s]

 [Name Search Single Result - Station Name]

 [Name Search Single Result - Station ID]

 [Name Search Multiple Result - Station Name]

 [Name Search Multiple Result - Station ID]

-[http://miranda-ng.org/]

 [\\Plugins\\weather\\]

 [All update data has been reloaded.]

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

@@ -331,7 +318,6 @@
 [Frame Title Font]

 [Weather: %s]

 [WeatherFrame]

-[user32.dll]

 [Frame Background]

 [Verdana]

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

@@ -353,10 +339,6 @@
 [SShower]

 [RShower]

 [PCloudy]

-[%s\\Plugins\\Weather\\%s.png]

-[%s\\Plugins\\Weather\\%s.gif]

-[Auto Update Enabled]

-[Auto Update Disabled]

 [Disable &weather notification]

 [Enable &weather notification]

 [Update Weather]

@@ -383,7 +365,6 @@
 [Cond]

 [ & ]

 [Alert]

-[#%s Weather]

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

 [Current condition for %n]

 [%c     %t]

@@ -395,4 +376,3 @@
 [More Info]

 [No information available.\r\nPlease update weather condition first.]

 [%c, %t]

-[%s\n%s]

diff --git a/langpacks/english/Plugins/WhenWasIt.txt b/langpacks/english/Plugins/WhenWasIt.txt
index e43e0dec89..6b56f997e9 100644
--- a/langpacks/english/Plugins/WhenWasIt.txt
+++ b/langpacks/english/Plugins/WhenWasIt.txt
@@ -94,8 +94,6 @@
 [Birthday - %s]

 [She]

 [He/She]

-[%s\n%s will be %d years old.]

-[%s\n%s just turned %d.]

 ;file \plugins\WhenWasIt\src\services.cpp

 [Starting to refresh user details]

 [Done refreshing user details]

diff --git a/langpacks/english/Plugins/Xfire.txt b/langpacks/english/Plugins/Xfire.txt
index a3e379b3ba..6b6d49a382 100644
--- a/langpacks/english/Plugins/Xfire.txt
+++ b/langpacks/english/Plugins/Xfire.txt
@@ -156,7 +156,6 @@
 [Unable to connect to XFire.]

 [No Loginname is set!]

 [No Password is set!]

-[Last game: %s playtime: %.2d:%.2d:%.2d]

 [%s is playing %s.]

 [%s is playing %s on server %d.%d.%d.%d:%d.]

 [Playing]

diff --git a/langpacks/english/Plugins/YAMN.txt b/langpacks/english/Plugins/YAMN.txt
index 09a33759e5..0ca88bd6cf 100644
--- a/langpacks/english/Plugins/YAMN.txt
+++ b/langpacks/english/Plugins/YAMN.txt
@@ -113,21 +113,13 @@
 [Browsing account %s]

 [(null)]

 [debug- WriteAccount...]

-;file \plugins\YAMN\src\debug.cpp

-[%s\\yamn-debug.synchro.log]

-[%s\\yamn-debug.comm.log]

-[%s\\yamn-debug.decode.log]

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

-[\\*.book]

 [%miranda_userdata%]

 [Check mail]

 [Launch application]

 [Connect Fail]

-[\\Plugins\\YAMN\\*.dll]

 [dll]

 [\\Plugins\\YAMN\\]

-;file \plugins\YAMN\src\protoplugin.cpp

-[%s\\yamn-accounts.%s.%s.book]

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

 [Nick]

 [No new mail message]

@@ -135,7 +127,6 @@
 [Unknown error]

 [ - connection error]

 ;file \plugins\YAMN\src\browser\mailbrowser.cpp

-[- new mail message(s)]

 [%s : %d new mail message(s), %d total]

 [%d new mail message(s), %d total]

 [No new mail message, %d spam(s)]

@@ -146,7 +137,6 @@
 [\t%s\r\n]

 [Do you really want to delete %d selected mails?]

 [Delete confirmation]

-[%s\t%s\t%s\t%s\r\n]

 ;file \plugins\YAMN\src\mails\mime.cpp

 [Translate header error]

 [Part]

@@ -161,7 +151,6 @@
 [YAMN (internal POP3) read error]

 [Error reading account file. Account file corrupted.]

 [Memory allocation error while data reading]

-[%s\n%s]

 [Reading file error. File already in use?]

 [Error while copying data to disk occured. File in use?]

 [POP3 plugin- write file error]

diff --git a/langpacks/english/Plugins/YAPP.txt b/langpacks/english/Plugins/YAPP.txt
index d1babd4312..c9dc08ae93 100644
--- a/langpacks/english/Plugins/YAPP.txt
+++ b/langpacks/english/Plugins/YAPP.txt
@@ -63,14 +63,9 @@
 [PopUps]

 [Settings]

 [Classes]

-;file \plugins\YAPP\src\popwin.cpp

-[user32.dll]

 ;file \plugins\YAPP\src\popwin.h

 [YAPPWindowClass]

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

-[CreatePopupA]

-[CreatePopupExA]

-[CreatePopupW]

 [Disable Popups]

 [Enable Popups]

 [Warning]

diff --git a/langpacks/english/Plugins/Yahoo.txt b/langpacks/english/Plugins/Yahoo.txt
index 2a275f0790..453c2aac70 100644
--- a/langpacks/english/Plugins/Yahoo.txt
+++ b/langpacks/english/Plugins/Yahoo.txt
@@ -48,13 +48,11 @@
 [Avatar upload failed!?!]

 [%%miranda_avatarcache%%\\]

 [%miranda_avatarcache%]

-[%s\\]

 [\\%lX]

 [ avatar]

 [.swf]

 [.png]

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

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

 [%s denied invitation with message: %s]

 [Others]

 [&Invite user...]

@@ -63,8 +61,6 @@
 [User &history]

 [Join My Conference...]

 [No, thank you...]

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

-[%s\\%s]

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

 [Main]

 [Mail]

@@ -84,7 +80,9 @@
 ;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]

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

 [Yahoo Ignore]

 [Please enter a valid buddy name to ignore.]

@@ -97,6 +95,7 @@
 [Ignore List]

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

 [New E-mail available in Inbox]

+[%s plugin connections]

 [Please enter your yahoo id in Options/Network/Yahoo]

 [Please enter your yahoo password in Options/Network/Yahoo]

 [Yahoo Login Error]

@@ -108,16 +107,27 @@
 ;file \protocols\Yahoo\src\services.cpp

 [You need to be connected to set the custom message]

 [You need to be connected to refresh your buddy list]

+[Set &Custom Status]

+[&Edit My Profile]

+[&My Profile]

+[&Yahoo Mail]

+[&Address Book]

+[&Calendar]

 [Create Conference]

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

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

+[&Refresh]

+[&Show Profile]

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

 [Calendar Reminder]

 [%s has rejected your request and sent the following message:]

+[Invalid Contact]

+[The id you tried to add is invalid.]

+[Unknown Error??.]

+[%s: %s]

 [New Mail]

 [You Have %i unread msgs]

 [New Mail (%i msgs)]

 [From: %s\nSubject: %s]

+[Yahoo System Message]

 [Yahoo Ping Error]

 [Could not log into Yahoo service - username not recognised.  Please verify that your username is correctly typed.]

 [Could not log into Yahoo service - password incorrect.  Please verify that your username and password are correctly typed.]

diff --git a/langpacks/english/Plugins/historypp.txt b/langpacks/english/Plugins/historypp.txt
index 824d138421..af50f54af8 100644
--- a/langpacks/english/Plugins/historypp.txt
+++ b/langpacks/english/Plugins/historypp.txt
@@ -81,7 +81,6 @@
 [Continued from the top]

 [Continued from the bottom]

 [Search: %s (F3 to find next)]

-["%s" not found]

 [You have entered the wrong password]

 [%0.1n h]

 [%d min]

diff --git a/langpacks/english/Plugins/mTextControl.txt b/langpacks/english/Plugins/mTextControl.txt
index 59f596cb38..83d726090d 100644
--- a/langpacks/english/Plugins/mTextControl.txt
+++ b/langpacks/english/Plugins/mTextControl.txt
@@ -7,27 +7,4 @@
 ;============================================================

 ;file \plugins\mTextControl\src\fancy_rtf.cpp

 [icon]

-[[b]]

-[[/b]]

-[[i]]

-[[/i]]

-[[u]]

-[[/u]]

-[[s]]

-[[/s]]

-[[color=]

-[[/color]]

-[[$hicon=]

-[[url]]

-[[/url]]

-[[url=]

-;file \plugins\mTextControl\src\FormattedTextDraw.cpp

-[MS Shell Dlg]

 ;file \plugins\mTextControl\src\ImageDataObjectHlp.cpp

-[riched20.dll]

-;file \plugins\mTextControl\src\main.cpp

-[msftedit.dll]

-;file \plugins\mTextControl\src\richeditutils.cpp

-[NBRichEditProxyWndClass]

-;file \plugins\mTextControl\src\textcontrol.cpp

-[Tahoma]