17 files changed, 48 insertions, 31 deletions
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]