- langpacks/en: updated

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

18 files changed, 231 insertions, 156 deletions

diff --git a/langpacks/en/Langpack_english.txt b/langpacks/en/Langpack_english.txt
index c15576cb28..201919e270 100644
--- a/langpacks/en/Langpack_english.txt
+++ b/langpacks/en/Langpack_english.txt
@@ -3436,6 +3436,141 @@ Miranda Language Pack Version 1
 [Open log file]

 [Do nothing]

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

+#muuid {53e095a3-2695-490a-9dad-d20479093831}

+;langpack template for Clist_blind

+;file \plugins\Clist_blind\res\resource.rc

+[Are you sure you want to delete %s?]

+[This will erase all history and settings for this contact!]

+[Yes]

+[No]

+[Hide from list only, in order to keep their history and ignore/visibility settings]

+[Use Options->Ignore (expert mode) to unhide contacts.]

+[Hotkeys]

+[Show/Hide:]

+[HotKey1]

+[Read Message:]

+[Web Search:]

+[URL:]

+[Open in new browser window]

+[Show Options]

+[Hide offline users]

+[Hide empty groups]

+[Disable groups]

+[Ask before deleting contacts]

+[Sort contacts by name]

+[Sort contacts by status]

+[Sort contacts by protocol]

+[Single click interface]

+[Always show status in tooltip]

+[Disable icon blinking]

+[ms delay]

+[Show]

+[icon when statuses differ]

+[Cycle icons every]

+[seconds, when statuses differ]

+[Show multiple icons]

+[Only when statuses differ]

+[Contact List]

+[System tray icon]

+[System tray icon when using multiple protocols]

+[Contact List Sorting]

+[Window]

+[Always on top]

+[Tool style main window]

+[Minimize to tray]

+[Hide contact list after it has been idle for]

+[seconds]

+[Automatically resize window to height of list]

+[maximum]

+[% of screen]

+[Size upwards]

+[Title bar text:]

+[Translucency options (Windows 2000/XP only)]

+[Fade contact list in/out]

+[Transparent contact list]

+[Inactive opacity:]

+[Active opacity:]

+[000%]

+[Show menu bar]

+[Easy move]

+[Show title bar]

+[If window is partially covered, bring to front instead of hiding]

+[Show drop shadow (restart required)]

+[Pin to desktop]

+[Items]

+['Hide Offline' means to hide:]

+[Groups]

+[Show counts of number of contacts in a group]

+[Hide group counts when there are none online]

+[Sort groups alphabetically]

+[Quicksearch in open groups only]

+[Templates]

+[Contact:]

+[Group:]

+[Divider:]

+[Info:]

+[Status Bar]

+[Show status bar]

+[Show icons]

+[Show protocol names]

+[Show status text]

+[Right click opens status menu]

+[Right click opens Miranda IM menu]

+[Make sections equal width]

+[Show bevels on panels]

+[Show resize grip indicator]

+[E&xit]

+[&Offline\tCtrl+0]

+[On&line\tCtrl+1]

+[&Away\tCtrl+2]

+[&NA\tCtrl+3]

+[Occ&upied\tCtrl+4]

+[&DND\tCtrl+5]

+[&Free for chat\tCtrl+6]

+[&Invisible\tCtrl+7]

+[On the &Phone\tCtrl+8]

+[Out to &Lunch\tCtrl+9]

+[&Hide/Show]

+[&New Group]

+[&Hide Offline Users]

+[Hide &Offline Users out here]

+[Hide &Empty Groups]

+[Disable &Groups]

+[Hide Miranda]

+[&New Subgroup]

+[&Hide Offline Users in here]

+[&Rename Group]

+[&Delete Group]

+;file \plugins\Clist_blind\src\clcopts.cpp

+[Not focused]

+[Offline]

+[Online]

+[Away]

+[Occupied]

+[DND]

+[Free for chat]

+[Invisible]

+[Out to lunch]

+[On the phone]

+[%name% [%status% %protocol%] %status_message%]

+[Group: %name% %count% [%mode%]]

+[Divider: %s]

+[Info: %s]

+[List]

+;file \plugins\Clist_blind\src\clistopts.cpp

+[Global]

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

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

+[LISTBOX]

+[Unknown Protocol]

+[%name%]

+[%count%]

+[%mode%]

+[Expanded]

+[Colapsed]

+[%status%]

+[%protocol%]

+[%status_message%]

 #muuid {043909b6-aad8-4d82-8eb5-9f64cfe867cd}

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

 ;  File: Clist_modern.dll

@@ -4891,7 +5026,7 @@ Miranda Language Pack Version 1
 [%s\n]

 [%s - %s\\%s]

 [Miranda Console]

-[Network]

+[Services]

 [Console]

 [Text]

 [Background]

@@ -5324,8 +5459,6 @@ Miranda Language Pack Version 1
 ;file \plugins\DbEditorPP\src\main_window.cpp

 [Are you sure you want to delete contact "%s"?]

 [Confirm Contact Delete]

-[Database Editor++ (unicode mode)]

-[Database Editor++ (ansi mode)]

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

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

 [Loading contacts...]

@@ -5335,7 +5468,7 @@ Miranda Language Pack Version 1
 [HANDLE]

 [Add module to contact "%s"]

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

-[Services]

+[Database]

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

 [Name]

 [Data]

@@ -5539,7 +5672,6 @@ Miranda Language Pack Version 1
 [Database is marked as belonging to an unknown version of Miranda]

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

 [Database Features]

-[Services]

 [Database]

 [Change Password]

 [Change password]

@@ -5686,7 +5818,6 @@ Miranda Language Pack Version 1
 [Select Backup Folder]

 [Error Creating Backup Folder]

 [Database AutoBackups]

-[Services]

 ;#muuid not found, please specify manually!

 ;langpack template for EmLanProto

 ;file \protocols\EmLanProto\res\amdproto.rc

@@ -7090,14 +7221,14 @@ Miranda Language Pack Version 1
 [MirandaIM v0.5 #2 overlay]

 [*Miranda*0.4.*]

 [MirandaIM v0.4 #2 overlay]

-[*Secure*IM*]

-[SecureIM overlay]

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

 [x64 overlay]

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

 [x32 overlay]

 [*unicode*]

 [Unicode overlay]

+[*Secure*IM*]

+[SecureIM overlay]

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

 [Icons]

 [Fingerprint]

@@ -7490,8 +7621,11 @@ Miranda Language Pack Version 1
 [Gadu-Gadu servers are now down. Try again later.]

 [Unknown]

 [External direct connections hostname %s is invalid. Disabling external host forwarding.]

+[<none>]

 [Server hostname %s is invalid. Using default hostname provided by the network.]

 [Connection cannot be established because of error:\n\t%s]

+[, %s %s]

+[, %s %d]

 [Age:]

 [List import successful.]

 [List remove successful.]

@@ -7504,6 +7638,9 @@ Miranda Language Pack Version 1
 ;file \protocols\Gadu-Gadu\src\dialogs.cpp

 [Male]

 [Female]

+[GMT%+d:%02d]

+[GMT]

+[???]

 [<not specified>]

 [Network]

 [General]

@@ -7544,6 +7681,7 @@ Miranda Language Pack Version 1
 [%miranda_userdata%]

 [%s\\%s\\ImageCache]

 [Gadu-Gadu Number]

+[%d %d]

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

 [Open &conference...]

 [&Clear ignored conferences]

@@ -7588,6 +7726,7 @@ Miranda Language Pack Version 1
 [jpeg]

 [\\%s]

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

+[[img]%s[/img]]

 [.bmp]

 [.gif]

 [.jpg]

@@ -9047,9 +9186,6 @@ Miranda Language Pack Version 1
 [Shows ignore state of contact in contacts list.]

 ;file \plugins\IgnoreState\res\ignore.rc

 [Plugin settings]

-[Use]

-[slot to draw the icon]

-[Warning: classic contact list plugin doesn`t have ability to use extraicons]

 [Filtered events:]

 [Use Miranda ignore settings for All Contacts]

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

@@ -9065,7 +9201,6 @@ Miranda Language Pack Version 1
 [Partial Ignore]

 [Message Ignore]

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

-[Extraicons plugin is used, use Contact list > Extraicons for customize.]

 [Icons]

 #muuid {2d77a746-00a6-4343-bfc5-f808cdd772ea}

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

@@ -9915,7 +10050,8 @@ Miranda Language Pack Version 1
 [Next]

 [Back]

 [Complete]

-[Save password for this session]

+[Remember password for this session]

+[Save password permanently]

 [Address1:]

 [Address2:]

 [City:]

@@ -10093,6 +10229,17 @@ Miranda Language Pack Version 1
 [key]

 [registered]

 [password]

+;file \protocols\JabberG\src\jabber_archive.cpp

+[auto]

+[save]

+[true]

+[false]

+[list]

+[with]

+[start]

+[chat]

+[retrieve]

+[secs]

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

 [conference]

 [url]

@@ -10153,6 +10300,8 @@ Miranda Language Pack Version 1
 [Receives information about the music to which a user is listening]

 [Supports private XML Storage (for bookmakrs and other)]

 [Supports attention requests ('nudge]

+[Supports chat history retrieving]

+[Supports chat history management]

 [Can report information about user activity]

 [Receives information about user activity]

 [Supports Miranda NG notes extension]

@@ -10760,7 +10909,6 @@ Miranda Language Pack Version 1
 [bad-profile]

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

 [%s@%s/%s]

-[%04d-%02d-%02dT%02d:%02d:%02dZ]

 [history]

 [since]

 [Failed to retrieve room list from server.]

@@ -10776,7 +10924,6 @@ Miranda Language Pack Version 1
 [available]

 [away]

 [dnd]

-[chat]

 [has set the subject to:]

 [/me ]

 [jabber:x:delay]

@@ -10901,7 +11048,6 @@ Miranda Language Pack Version 1
 [mimetype]

 [vCard]

 [autojoin]

-[true]

 [Jabber Bookmarks Error]

 [time[@xmlns='%s']/tzo]

 [time[@xmlns='%s']/tz]

@@ -11217,6 +11363,7 @@ Miranda Language Pack Version 1
 [Enable user activity receiving]

 [Receive notes]

 [Automatically save received notes]

+[Enable server-side history]

 [Server options]

 [Disable SASL authentication (for old servers)]

 [Enable stream compression (if possible)]

@@ -11304,7 +11451,6 @@ Miranda Language Pack Version 1
 [Privacy list %s set as default]

 [Default privacy list successfully declined]

 [Error occurred while setting default list]

-[list]

 [Any]

 [Allow]

 [Simple mode]

@@ -11622,11 +11768,12 @@ Miranda Language Pack Version 1
 [priority]

 [photo]

 [show]

-[false]

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

 [Advanced Status]

 [Set mood...]

 [Set activity...]

+[%04d-%02d-%02dT%02d:%02d:%02dZ]

+[%04d-%02d-%02dT%02d:%02d:%02d.%dZ]

 [%s (%d)]

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

 [prodid]

@@ -12691,7 +12838,7 @@ Miranda Language Pack Version 1
 [MirOTRPopUpMenuProcessor]

 [OTR Status]

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

-[Plugins]

+[Services]

 [READ privkey]

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

 [OTR_GUI_POLICY]

@@ -13987,7 +14134,7 @@ Miranda Language Pack Version 1
 [Open:]

 [Close:]

 [Strip all tags in outgoing messages]

-[Turn on presence signing (Jabber)]

+[Turn on presence signing (Jabber) (required by xep 0-27)]

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

 [" --homedir "]

 [--display-charset utf-8 ]

@@ -14015,6 +14162,7 @@ Miranda Language Pack Version 1
 [Name]

 [Creation date]

 [Key length]

+[Accounts]

 [--batch --list-secret-keys]

 [Default]

 [key id]

@@ -14109,6 +14257,7 @@ Miranda Language Pack Version 1
 [-----PGP KEY RESPONSE-----]

 [-----END PGP PUBLIC KEY BLOCK-----]

 [-----BEGIN PGP PUBLIC KEY BLOCK-----]

+[.asc]

 [-----BEGIN PGP PRIVATE KEY BLOCK-----]

 [-----END PGP PRIVATE KEY BLOCK-----]

 [GPG_Key_Auto_Exchange:0]

@@ -14118,7 +14267,6 @@ Miranda Language Pack Version 1
 [--batch --yes -e -a -t -r ]

 [We trying to encrypt with untrusted key, do you want to trust this key permanently ?]

 [Something wrong, gpg does not understand us, aborting encryption.]

-[.asc]

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

 [Services]

 [Main]

@@ -14163,6 +14311,7 @@ Miranda Language Pack Version 1
 [ --trust-model always ]

 [ -o "]

 [ -e "]

+[encrypting file for transfer]

 [This message is encrypted.]

 [Version: ]

 [Comment: ]

@@ -14172,11 +14321,12 @@ Miranda Language Pack Version 1
 [status]

 [--local-user ]

 [ --default-key ]

-[ --batch --yes -a -s "]

+[ --batch --yes -a -b -s "]

+[-----BEGIN PGP SIGNATURE-----]

+[-----END PGP SIGNATURE-----]

 [jabber:x:signed]

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

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

-[ --verify -a "]

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

 [GPG_Key_Auto_Exchange:0\0\0]

@@ -14185,6 +14335,7 @@ Miranda Language Pack Version 1
 [Keys export result]

 [Choose file to import keys from]

 [Keys import result]

+[\r\r]

 #muuid {b25e8c7b-292b-495a-9fb8-a4c3d4eeb04b}

 ;langpack template for NoHistory

 ;file \plugins\NoHistory\res\NoHistory.rc

@@ -14579,7 +14730,7 @@ Miranda Language Pack Version 1
 [hours]

 [days]

 [Test]

-[Events]

+[Services]

 ;file \plugins\PackUpdater\Src\PackUpdater.cpp

 [%miranda_userdata%\"DEFAULT_UPDATES_FOLDER));\r\n	lstrcpyn(tszRoot, tszFolder, SIZEOF(tszRoot));\r\n	if (ServiceExists(MS_FOLDERS_REGISTER_PATH))\r\n	{\r\n		hPackUpdaterFolder = FoldersRegisterCustomPathT(MODULEA, "Pack Updater", MIRANDA_USERDATAT _T("\\]

 [Clear pack updates folder]

@@ -14821,100 +14972,6 @@ Miranda Language Pack Version 1
 [Not Responding]

 [Testing]

 [Disabled]

-#muuid {760ea901-c0c2-446c-8029-94c3bc47c45e}

-;langpack template for PingPlugin

-;file \plugins\Ping\res\ping.rc

-[Delay between pings (secs):]

-[Timeout]

-[Ping timeout (secs):]

-[Logging]

-[Log to File]

-[Log Filename:]

-[Network]

-[PopUps]

-[Reply]

-[Block Repetitions]

-[View Log]

-[Browse...]

-[Interface]

-[Do not change icon when testing]

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

-[Indent:]

-[Row height:]

-[Spin3]

-[Repeats for success/failure:]

-[Attach to contact list]

-[Use CSV format]

-[Add]

-[Remove]

-[Edit]

-[Up]

-[Down]

-[OK]

-[Cancel]

-[Address:]

-[Label:]

-[TCP Connect]

-[Port:]

-[Control Protocol:]

-[Set my status to:]

-[On success, if my status is:]

-[Execute the following command on double-click:]

-[Contact]

-[Protocols]

-[(Optional) Command Parameters:]

-[Graph]

-[Enable]

-[Disable all pings]

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

-[Disable]

-[PING]

-[Enable All Pings]

-[Disable All Pings]

-;file \plugins\Ping\src\options.cpp

-[All\0*.*\0Text\0*.TXT\0]

-[<none>]

-[<all>]

-[Settings]

-[Hosts]

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

-[Ping Plugin]

-[Failed to initialize. Plugin disabled.]

-[Local\\ThreadWaitEvent]

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

-[BUTTON]

-[Show grid lines]

-[Show stats]

-[%d ms]

-[AVG %.1lf ms]

-[MAX %hd ms]

-[MIN %hd ms]

-[GraphWindow]

-;file \plugins\Ping\src\pingthread.cpp

-[%s - setting status of protocol '%s' (%d)]

-[%s - reply, %d]

-[%s - timeout]

-[enabled]

-[double clicked]

-[user32.dll]

-[Ping]

-;file \plugins\Ping\src\rawping.cpp

-[Host %s requests that you reduce the amount of traffic you are sending.]

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

-[Unknown Address]

-[Unknown]

-[Responding]

-[Not Responding]

-[Testing]

-[Disabled]

 #muuid {968def4a-bc60-4266-ac08-754ce721db5f}

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

 ;  File: PluginUpdater.dll

@@ -15010,6 +15067,8 @@ Miranda Language Pack Version 1
 [dbtool.exe]

 [Plugins\\dbchecker.dll]

 [dbtool_sa.exe]

+[bclist.dll]

+[Plugins\\Clist_blind.dll]

 [clienticons_general.dll]

 [Icons\\fp_icons.dll]

 [clienticons_miranda.dll]

@@ -15347,7 +15406,6 @@ Miranda Language Pack Version 1
 [But keep subcontacts of protocols in above list if meta is hidden]

 [Show all contacts (Ctrl+A)]

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

-[Plugins]

 [Quick Contacts]

 ;file \plugins\QuickContacts\src\quickcontacts.cpp

 [Open dialog]

@@ -15411,7 +15469,7 @@ Miranda Language Pack Version 1
 [You win!]

 [New Button]

 [New Menu Entry]

-[Plugins]

+[Message Sessions]

 #muuid {a6a031b6-d32f-4842-98c6-ec716c576b77}

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

 ;  File: quickreplies.dll

@@ -15783,7 +15841,7 @@ Miranda Language Pack Version 1
 [Format of date and time\n(Look to readme for placeholders help)]

 [Hide offline contacts]

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

-[Contact List]

+[Contacts]

 ;file \plugins\RecentContacts\src\RecentContacts.cpp

 [Main icon]

 [Contact]

@@ -20088,7 +20146,6 @@ Miranda Language Pack Version 1
 [Translit Last / Selected]

 [Invert Case All / Selected]

 [Invert Case Last / Selected]

-[SwitchLayout and Send]

 #muuid {bc09a71b-b86e-4d33-b18d-82d30451dd3c}

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

 ;  File: Twitter.dll

@@ -21884,7 +21941,8 @@ Miranda Language Pack Version 1
 [Enable WUMF popups]

 [Disable WUMF popups]

 [Show connections list]

-[Plugins]

+[Wumf]

+[Services]

 [PopUps]

 [WUMF: Show connections]

 ;#muuid not found, please specify manually!

diff --git a/langpacks/en/Plugins/Console.txt b/langpacks/en/Plugins/Console.txt
index 343fa7d27f..bd2448c5a3 100644
--- a/langpacks/en/Plugins/Console.txt
+++ b/langpacks/en/Plugins/Console.txt
@@ -36,7 +36,7 @@
 [%s\n]

 [%s - %s\\%s]

 [Miranda Console]

-[Network]

+[Services]

 [Console]

 [Text]

 [Background]

diff --git a/langpacks/en/Plugins/DbEditorPP.txt b/langpacks/en/Plugins/DbEditorPP.txt
index 1bf226bb2d..16ac05b0fd 100644
--- a/langpacks/en/Plugins/DbEditorPP.txt
+++ b/langpacks/en/Plugins/DbEditorPP.txt
@@ -153,8 +153,6 @@
 ;file \plugins\DbEditorPP\src\main_window.cpp

 [Are you sure you want to delete contact "%s"?]

 [Confirm Contact Delete]

-[Database Editor++ (unicode mode)]

-[Database Editor++ (ansi mode)]

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

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

 [Loading contacts...]

@@ -164,7 +162,7 @@
 [HANDLE]

 [Add module to contact "%s"]

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

-[Services]

+[Database]

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

 [Name]

 [Data]

diff --git a/langpacks/en/Plugins/Db_autobackups.txt b/langpacks/en/Plugins/Db_autobackups.txt
index 57174064a2..aa66c9d810 100644
--- a/langpacks/en/Plugins/Db_autobackups.txt
+++ b/langpacks/en/Plugins/Db_autobackups.txt
@@ -68,4 +68,3 @@
 [Select Backup Folder]

 [Error Creating Backup Folder]

 [Database AutoBackups]

-[Services]

diff --git a/langpacks/en/Plugins/Dbx_mmap_SA.txt b/langpacks/en/Plugins/Dbx_mmap_SA.txt
index 5208762a08..2fb0e4a60d 100644
--- a/langpacks/en/Plugins/Dbx_mmap_SA.txt
+++ b/langpacks/en/Plugins/Dbx_mmap_SA.txt
@@ -47,7 +47,6 @@
 [Database is marked as belonging to an unknown version of Miranda]

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

 [Database Features]

-[Services]

 [Database]

 [Change Password]

 [Change password]

diff --git a/langpacks/en/Plugins/Fingerprint.txt b/langpacks/en/Plugins/Fingerprint.txt
index 04a965cce0..e3b56044e4 100644
--- a/langpacks/en/Plugins/Fingerprint.txt
+++ b/langpacks/en/Plugins/Fingerprint.txt
@@ -1196,14 +1196,14 @@
 [MirandaIM v0.5 #2 overlay]

 [*Miranda*0.4.*]

 [MirandaIM v0.4 #2 overlay]

-[*Secure*IM*]

-[SecureIM overlay]

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

 [x64 overlay]

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

 [x32 overlay]

 [*unicode*]

 [Unicode overlay]

+[*Secure*IM*]

+[SecureIM overlay]

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

 [Icons]

 [Fingerprint]

diff --git a/langpacks/en/Plugins/GG.txt b/langpacks/en/Plugins/GG.txt
index 6dd0e9c49b..d1b001c024 100644
--- a/langpacks/en/Plugins/GG.txt
+++ b/langpacks/en/Plugins/GG.txt
@@ -96,8 +96,11 @@
 [Gadu-Gadu servers are now down. Try again later.]

 [Unknown]

 [External direct connections hostname %s is invalid. Disabling external host forwarding.]

+[<none>]

 [Server hostname %s is invalid. Using default hostname provided by the network.]

 [Connection cannot be established because of error:\n\t%s]

+[, %s %s]

+[, %s %d]

 [Age:]

 [List import successful.]

 [List remove successful.]

@@ -110,6 +113,9 @@
 ;file \protocols\Gadu-Gadu\src\dialogs.cpp

 [Male]

 [Female]

+[GMT%+d:%02d]

+[GMT]

+[???]

 [<not specified>]

 [Network]

 [General]

@@ -150,6 +156,7 @@
 [%miranda_userdata%]

 [%s\\%s\\ImageCache]

 [Gadu-Gadu Number]

+[%d %d]

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

 [Open &conference...]

 [&Clear ignored conferences]

@@ -194,6 +201,7 @@
 [jpeg]

 [\\%s]

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

+[[img]%s[/img]]

 [.bmp]

 [.gif]

 [.jpg]

diff --git a/langpacks/en/Plugins/IgnoreState.txt b/langpacks/en/Plugins/IgnoreState.txt
index d3ef4b70c8..6c2a87f2c4 100644
--- a/langpacks/en/Plugins/IgnoreState.txt
+++ b/langpacks/en/Plugins/IgnoreState.txt
@@ -8,9 +8,6 @@
 [Shows ignore state of contact in contacts list.]

 ;file \plugins\IgnoreState\res\ignore.rc

 [Plugin settings]

-[Use]

-[slot to draw the icon]

-[Warning: classic contact list plugin doesn`t have ability to use extraicons]

 [Filtered events:]

 [Use Miranda ignore settings for All Contacts]

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

@@ -26,5 +23,4 @@
 [Partial Ignore]

 [Message Ignore]

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

-[Extraicons plugin is used, use Contact list > Extraicons for customize.]

 [Icons]

diff --git a/langpacks/en/Plugins/Jabber.txt b/langpacks/en/Plugins/Jabber.txt
index 10b8e4188e..85c99db353 100644
--- a/langpacks/en/Plugins/Jabber.txt
+++ b/langpacks/en/Plugins/Jabber.txt
@@ -68,7 +68,8 @@
 [Next]

 [Back]

 [Complete]

-[Save password for this session]

+[Remember password for this session]

+[Save password permanently]

 [Address1:]

 [Address2:]

 [City:]

@@ -246,6 +247,17 @@
 [key]

 [registered]

 [password]

+;file \protocols\JabberG\src\jabber_archive.cpp

+[auto]

+[save]

+[true]

+[false]

+[list]

+[with]

+[start]

+[chat]

+[retrieve]

+[secs]

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

 [conference]

 [url]

@@ -306,6 +318,8 @@
 [Receives information about the music to which a user is listening]

 [Supports private XML Storage (for bookmakrs and other)]

 [Supports attention requests ('nudge]

+[Supports chat history retrieving]

+[Supports chat history management]

 [Can report information about user activity]

 [Receives information about user activity]

 [Supports Miranda NG notes extension]

@@ -913,7 +927,6 @@
 [bad-profile]

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

 [%s@%s/%s]

-[%04d-%02d-%02dT%02d:%02d:%02dZ]

 [history]

 [since]

 [Failed to retrieve room list from server.]

@@ -929,7 +942,6 @@
 [available]

 [away]

 [dnd]

-[chat]

 [has set the subject to:]

 [/me ]

 [jabber:x:delay]

@@ -1054,7 +1066,6 @@
 [mimetype]

 [vCard]

 [autojoin]

-[true]

 [Jabber Bookmarks Error]

 [time[@xmlns='%s']/tzo]

 [time[@xmlns='%s']/tz]

@@ -1370,6 +1381,7 @@
 [Enable user activity receiving]

 [Receive notes]

 [Automatically save received notes]

+[Enable server-side history]

 [Server options]

 [Disable SASL authentication (for old servers)]

 [Enable stream compression (if possible)]

@@ -1457,7 +1469,6 @@
 [Privacy list %s set as default]

 [Default privacy list successfully declined]

 [Error occurred while setting default list]

-[list]

 [Any]

 [Allow]

 [Simple mode]

@@ -1775,11 +1786,12 @@
 [priority]

 [photo]

 [show]

-[false]

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

 [Advanced Status]

 [Set mood...]

 [Set activity...]

+[%04d-%02d-%02dT%02d:%02d:%02dZ]

+[%04d-%02d-%02dT%02d:%02d:%02d.%dZ]

 [%s (%d)]

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

 [prodid]

diff --git a/langpacks/en/Plugins/MirOTR.txt b/langpacks/en/Plugins/MirOTR.txt
index e507743707..bfacbd29ba 100644
--- a/langpacks/en/Plugins/MirOTR.txt
+++ b/langpacks/en/Plugins/MirOTR.txt
@@ -139,7 +139,7 @@
 [MirOTRPopUpMenuProcessor]

 [OTR Status]

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

-[Plugins]

+[Services]

 [READ privkey]

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

 [OTR_GUI_POLICY]

diff --git a/langpacks/en/Plugins/New_GPG.txt b/langpacks/en/Plugins/New_GPG.txt
index 33ea47b32e..e1bb707e38 100644
--- a/langpacks/en/Plugins/New_GPG.txt
+++ b/langpacks/en/Plugins/New_GPG.txt
@@ -55,7 +55,7 @@
 [Open:]

 [Close:]

 [Strip all tags in outgoing messages]

-[Turn on presence signing (Jabber)]

+[Turn on presence signing (Jabber) (required by xep 0-27)]

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

 [" --homedir "]

 [--display-charset utf-8 ]

@@ -83,6 +83,7 @@
 [Name]

 [Creation date]

 [Key length]

+[Accounts]

 [--batch --list-secret-keys]

 [Default]

 [key id]

@@ -177,6 +178,7 @@
 [-----PGP KEY RESPONSE-----]

 [-----END PGP PUBLIC KEY BLOCK-----]

 [-----BEGIN PGP PUBLIC KEY BLOCK-----]

+[.asc]

 [-----BEGIN PGP PRIVATE KEY BLOCK-----]

 [-----END PGP PRIVATE KEY BLOCK-----]

 [GPG_Key_Auto_Exchange:0]

@@ -186,7 +188,6 @@
 [--batch --yes -e -a -t -r ]

 [We trying to encrypt with untrusted key, do you want to trust this key permanently ?]

 [Something wrong, gpg does not understand us, aborting encryption.]

-[.asc]

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

 [Services]

 [Main]

@@ -231,6 +232,7 @@
 [ --trust-model always ]

 [ -o "]

 [ -e "]

+[encrypting file for transfer]

 [This message is encrypted.]

 [Version: ]

 [Comment: ]

@@ -240,11 +242,12 @@
 [status]

 [--local-user ]

 [ --default-key ]

-[ --batch --yes -a -s "]

+[ --batch --yes -a -b -s "]

+[-----BEGIN PGP SIGNATURE-----]

+[-----END PGP SIGNATURE-----]

 [jabber:x:signed]

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

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

-[ --verify -a "]

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

 [GPG_Key_Auto_Exchange:0\0\0]

@@ -253,3 +256,4 @@
 [Keys export result]

 [Choose file to import keys from]

 [Keys import result]

+[\r\r]

diff --git a/langpacks/en/Plugins/PackUpdater.txt b/langpacks/en/Plugins/PackUpdater.txt
index 649cbeef3e..a53c1daaba 100644
--- a/langpacks/en/Plugins/PackUpdater.txt
+++ b/langpacks/en/Plugins/PackUpdater.txt
@@ -76,7 +76,7 @@
 [hours]

 [days]

 [Test]

-[Events]

+[Services]

 ;file \plugins\PackUpdater\Src\PackUpdater.cpp

 [%miranda_userdata%\"DEFAULT_UPDATES_FOLDER));\r\n	lstrcpyn(tszRoot, tszFolder, SIZEOF(tszRoot));\r\n	if (ServiceExists(MS_FOLDERS_REGISTER_PATH))\r\n	{\r\n		hPackUpdaterFolder = FoldersRegisterCustomPathT(MODULEA, "Pack Updater", MIRANDA_USERDATAT _T("\\]

 [Clear pack updates folder]

diff --git a/langpacks/en/Plugins/PluginUpdater.txt b/langpacks/en/Plugins/PluginUpdater.txt
index 5023b97573..4e74f763bd 100644
--- a/langpacks/en/Plugins/PluginUpdater.txt
+++ b/langpacks/en/Plugins/PluginUpdater.txt
@@ -93,6 +93,8 @@
 [dbtool.exe]

 [Plugins\\dbchecker.dll]

 [dbtool_sa.exe]

+[bclist.dll]

+[Plugins\\Clist_blind.dll]

 [clienticons_general.dll]

 [Icons\\fp_icons.dll]

 [clienticons_miranda.dll]

diff --git a/langpacks/en/Plugins/QuickContacts.txt b/langpacks/en/Plugins/QuickContacts.txt
index fbdc58e488..4621d7acc0 100644
--- a/langpacks/en/Plugins/QuickContacts.txt
+++ b/langpacks/en/Plugins/QuickContacts.txt
@@ -15,7 +15,6 @@
 [But keep subcontacts of protocols in above list if meta is hidden]

 [Show all contacts (Ctrl+A)]

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

-[Plugins]

 [Quick Contacts]

 ;file \plugins\QuickContacts\src\quickcontacts.cpp

 [Open dialog]

diff --git a/langpacks/en/Plugins/QuickMessages.txt b/langpacks/en/Plugins/QuickMessages.txt
index 8b429710d9..ed070242bb 100644
--- a/langpacks/en/Plugins/QuickMessages.txt
+++ b/langpacks/en/Plugins/QuickMessages.txt
@@ -40,4 +40,4 @@
 [You win!]

 [New Button]

 [New Menu Entry]

-[Plugins]

+[Message Sessions]

diff --git a/langpacks/en/Plugins/RecentContacts.txt b/langpacks/en/Plugins/RecentContacts.txt
index 896c032f50..0535b8900f 100644
--- a/langpacks/en/Plugins/RecentContacts.txt
+++ b/langpacks/en/Plugins/RecentContacts.txt
@@ -6,7 +6,7 @@
 [Format of date and time\n(Look to readme for placeholders help)]

 [Hide offline contacts]

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

-[Contact List]

+[Contacts]

 ;file \plugins\RecentContacts\src\RecentContacts.cpp

 [Main icon]

 [Contact]

diff --git a/langpacks/en/Plugins/TranslitSwitcher.txt b/langpacks/en/Plugins/TranslitSwitcher.txt
index 80a7e22a88..549eb7528c 100644
--- a/langpacks/en/Plugins/TranslitSwitcher.txt
+++ b/langpacks/en/Plugins/TranslitSwitcher.txt
@@ -26,4 +26,3 @@
 [Translit Last / Selected]

 [Invert Case All / Selected]

 [Invert Case Last / Selected]

-[SwitchLayout and Send]

diff --git a/langpacks/en/Plugins/WhoUsesMyFiles.txt b/langpacks/en/Plugins/WhoUsesMyFiles.txt
index a7cb962f27..adb5fb4601 100644
--- a/langpacks/en/Plugins/WhoUsesMyFiles.txt
+++ b/langpacks/en/Plugins/WhoUsesMyFiles.txt
@@ -30,6 +30,7 @@
 [Enable WUMF popups]

 [Disable WUMF popups]

 [Show connections list]

-[Plugins]

+[Wumf]

+[Services]

 [PopUps]

 [WUMF: Show connections]