7 files changed, 33 insertions, 28 deletions
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 6d69585948..dff9fd92b1 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -1344,14 +1344,14 @@
 [Benin]
 [Bermuda]
 [Bhutan]
-[Bolivia, Plurinational State of]
+[Bolivia]
 [Bonaire, Sint Eustatius and Saba]
 [Bosnia and Herzegovina]
 [Botswana]
 [Bouvet Island]
 [Brazil]
 [British Indian Ocean Territory]
-[Brunei Darussalam]
+[Brunei]
 [Bulgaria]
 [Burkina Faso]
 [Burundi]
@@ -1368,7 +1368,7 @@
 [Cocos (Keeling) Islands]
 [Colombia]
 [Comoros]
-[Congo]
+[Congo, Republic of the]
 [Congo, the Democratic Republic of the]
 [Cook Islands]
 [Costa Rica]
@@ -1396,7 +1396,7 @@
 [France]
 [French Guiana]
 [French Polynesia]
-[French Southern Territories]
+[French Southern and Antarctic Lands]
 [Gabon]
 [Gambia]
 [Georgia]
@@ -1415,7 +1415,7 @@
 [Guyana]
 [Haiti]
 [Heard Island and McDonald Islands]
-[Holy See (Vatican City State)]
+[Holy See (Vatican City)]
 [Honduras]
 [Hong Kong]
 [Hungary]
@@ -1435,11 +1435,11 @@
 [Kazakhstan]
 [Kenya]
 [Kiribati]
-[Korea, Democratic People's Republic of]
-[Korea, Republic of]
+[North Korea]
+[South Korea]
 [Kuwait]
 [Kyrgyzstan]
-[Lao People's Democratic Republic]
+[Laos]
 [Latvia]
 [Lebanon]
 [Lesotho]
@@ -1463,7 +1463,7 @@
 [Mayotte]
 [Mexico]
 [Micronesia, Federated States of]
-[Moldova, Republic of]
+[Moldova]
 [Monaco]
 [Mongolia]
 [Montenegro]
@@ -1487,20 +1487,20 @@
 [Oman]
 [Pakistan]
 [Palau]
-[Palestinian Territory, Occupied]
+[Palestinian Territories]
 [Panama]
 [Papua New Guinea]
 [Paraguay]
 [Peru]
 [Philippines]
-[Pitcairn]
+[Pitcairn Islands]
 [Poland]
 [Portugal]
 [Puerto Rico]
 [Qatar]
 [Reunion]
 [Romania]
-[Russian Federation]
+[Russia]
 [Rwanda]
 [Saint Barthelemy]
 [Saint Helena, Ascension and Tristan da Cunha]
@@ -1534,10 +1534,10 @@
 [Swaziland]
 [Sweden]
 [Switzerland]
-[Syrian Arab Republic]
+[Syria]
 [Taiwan, Province of China]
 [Tajikistan]
-[Tanzania, United Republic of]
+[Tanzania]
 [Thailand]
 [Timor-Leste]
 [Togo]
@@ -1558,10 +1558,10 @@
 [Uruguay]
 [Uzbekistan]
 [Vanuatu]
-[Venezuela, Bolivarian Republic of]
-[Viet Nam]
-[Virgin Islands, British]
-[Virgin Islands, U.S.]
+[Venezuela]
+[Vietnam]
+[Virgin Islands (British)]
+[Virgin Islands (United States)]
 [Wallis and Futuna]
 [Western Sahara]
 [Yemen]
diff --git a/langpacks/english/Plugins/BASS_interface.txt b/langpacks/english/Plugins/BASS_interface.txt
index ebd95b7cce..6bc1f3ecee 100644
--- a/langpacks/english/Plugins/BASS_interface.txt
+++ b/langpacks/english/Plugins/BASS_interface.txt
@@ -35,7 +35,7 @@
 [Sounds]
 [Disable sounds]
 [Enable sounds]
-[Frame Background]
+[Frame background]
 [Bass library]
 [Sounds enabled]
 [Sounds disabled]
diff --git a/langpacks/english/Plugins/Db_autobackups.txt b/langpacks/english/Plugins/Db_autobackups.txt
index 1412553c96..42c4750780 100644
--- a/langpacks/english/Plugins/Db_autobackups.txt
+++ b/langpacks/english/Plugins/Db_autobackups.txt
@@ -10,12 +10,12 @@
 [Backup progress]
 [Cancel]
 [Automatic backups]
-[Number of backups to keep:]
 [Backup NOW]
 [Disabled]
 [When Miranda starts]
 [When Miranda exits]
 [Every:]
+[Number of backups to keep:]
 [Backup to folder:]
 [Browse...]
 [Go to the "Customize -> Folders" to change settings]
diff --git a/langpacks/english/Plugins/Dbx_mmap.txt b/langpacks/english/Plugins/Dbx_mmap.txt
index 2e1beb4378..6cc429cf35 100644
--- a/langpacks/english/Plugins/Dbx_mmap.txt
+++ b/langpacks/english/Plugins/Dbx_mmap.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: Dbx_mmap.dll
 ;  Plugin: Miranda NG mmap database driver
-;  Version: 0.11.0.1
+;  Version: 0.11.0.2
 ;  Authors: Miranda-NG project
 ;============================================================
 [Provides Miranda database support: global settings, contacts, history, settings per contact.]
@@ -18,6 +18,11 @@
 [Change]
 [Remove]
 [Old password]
+[Database encryption mode]
+[Standard]
+[Total]
+[Only critical data are encrypted (passwords, security tokens etc). All another settings and history remains unencrypted. Fast and effective, suitable for the most cases]
+[All string settings and all events in histories are encrypted. It also makes Miranda much slower and creates a risk of loosing everything you've stored in a profile in case of loosing password. Recommended only for paranoidal users]
 ;file \plugins\Db3x_mmap\src\database.cpp
 [Disk is full. Miranda will now shutdown.]
 [Database failure. Miranda will now shutdown.]
diff --git a/langpacks/english/Plugins/MsgPopup.txt b/langpacks/english/Plugins/MsgPopup.txt
index c96bfaf32b..4051df8b92 100644
--- a/langpacks/english/Plugins/MsgPopup.txt
+++ b/langpacks/english/Plugins/MsgPopup.txt
@@ -5,11 +5,11 @@
 ;  Version: 0.1.1.3
 ;  Authors: StDenis
 ;============================================================
-[Plugin replaces MessageBoxes (those having only OK button) with popups.]
+[Plugin replaces message boxes (those having only OK button) with popups.]
 ;file \plugins\MsgPopup\res\MsgPopup.rc
 [ASTERISK style]
-[Background]
-[Foreground]
+[Background color]
+[Text color]
 [ERROR style]
 [EXCLAMATION style]
 [QUESTION style]
@@ -19,7 +19,7 @@
 [Emit a sound]
 ;file \plugins\MsgPopup\src\main.cpp
 [VirtualProtect failed. Code %d\nTry to call the author]
-[MsgBox]
+[Error]
 [Hmm. Something goes wrong. I can't write into the memory.\nAnd as you can see, there are no any exception raised...\nTry to call the author]
 [MessagePopup]
 [Popups]
diff --git a/langpacks/english/Plugins/PManagerEx.txt b/langpacks/english/Plugins/PManagerEx.txt
index bc329a33b0..182a72489e 100644
--- a/langpacks/english/Plugins/PManagerEx.txt
+++ b/langpacks/english/Plugins/PManagerEx.txt
@@ -13,5 +13,5 @@
 [Change profile]
 [Check database]
 [Restart]
-[Profile manager]
 [Database]
+[Profile manager]
diff --git a/langpacks/english/Plugins/ZeroNotify.txt b/langpacks/english/Plugins/ZeroNotify.txt
index 04c9567c91..e10ac6872e 100644
--- a/langpacks/english/Plugins/ZeroNotify.txt
+++ b/langpacks/english/Plugins/ZeroNotify.txt
@@ -7,10 +7,10 @@
 ;============================================================
 [Adds options to automatically disable notifications when a protocol is in a certain status.]
 ;file \plugins\ZeroNotification\res\ZeroNotify.rc
-[Hide the "toggle sound" menu item (requires restart of Miranda)]
 [No sounds when:]
-[No SysTray blink when:]
 [No CLIST blink when:]
+[No SysTray blink when:]
+[Hide the "toggle sound" menu item (requires restart of Miranda)]
 ;file \plugins\ZeroNotification\src\common.h
 [Disable &Sounds]
 [Enable &Sounds]