9 files changed, 46 insertions, 31 deletions
diff --git a/langpacks/german/=CORE=.txt b/langpacks/german/=CORE=.txt
index 9e37968ddc..59aaf4aa89 100644
--- a/langpacks/german/=CORE=.txt
+++ b/langpacks/german/=CORE=.txt
@@ -2600,7 +2600,7 @@ Benin
 Bermuda
 [Bhutan]
 Bhutan
-[Bolivia, Plurinational State of]
+[Bolivia]
 Bolivien, pluralistischer Staat
 [Bonaire, Sint Eustatius and Saba]
 Bonaire, Sint Eustatius und Saba
@@ -2614,7 +2614,7 @@ Bouvet Insel
 Brasilien
 [British Indian Ocean Territory]
 Britisches Territorium Indischer Ozean
-[Brunei Darussalam]
+[Brunei]
 Brunei Darussalam
 [Bulgaria]
 Bulgarien
@@ -2648,7 +2648,7 @@ Kokos (Keeling) Inseln
 Kolumbien
 [Comoros]
 Comoren
-[Congo]
+[Congo, Republic of the]
 Kongo
 [Congo, Democratic Republic of the]
 Kongo, demokratische Republik
@@ -2704,7 +2704,7 @@ Frankreich
 Französisch-Guayana
 [French Polynesia]
 Französisch-Polynesien
-[French Southern Territories]
+[French Southern and Antarctic Lands]
 Französische Südliche Territorien
 [Gabon]
 Gabun
@@ -2742,7 +2742,7 @@ Guyana
 Haiti
 [Heard Island and McDonald Islands]
 Heard Insel und McDonald Inseln
-[Holy See (Vatican City State)]
+[Holy See (Vatican City)]
 Heiliger Stuhl (Vatikanstadt)
 [Honduras]
 Honduras
@@ -2782,15 +2782,15 @@ Kasachstan
 Kenia
 [Kiribati]
 Kiribati
-[Korea, Democratic People's Republic of]
+[North Korea]
 Korea, Demokratische Volksrepublik
-[Korea, Republic of]
+[South Korea]
 Korea, Republik
 [Kuwait]
 Kuwait
 [Kyrgyzstan]
 Kirgisien
-[Lao People's Democratic Republic]
+[Laos]
 Lao, Demokratische Volksrepublik
 [Latvia]
 Lettland
@@ -2886,7 +2886,7 @@ Oman
 Pakistan
 [Palau]
 Palau
-[Palestinian Territory, Occupied]
+[Palestinian Territories]
 Palästinensisches Territorium, besetzt
 [Panama]
 Panama
@@ -2898,7 +2898,7 @@ Paraguay
 Peru
 [Philippines]
 Philippinen
-[Pitcairn]
+[Pitcairn Islands]
 Pitcairn
 [Poland]
 Polen
@@ -2912,7 +2912,7 @@ Katar
 Reunion
 [Romania]
 Rumänien
-[Russian Federation]
+[Russia]
 Russische Föderation
 [Rwanda]
 Ruanda
@@ -2986,7 +2986,7 @@ Syrien
 Taiwan, Provinz von China
 [Tajikistan]
 Tadschikistan
-[Tanzania, United Republic of]
+[Tanzania]
 Tansania, vereinigte Republik
 [Thailand]
 Thailand
@@ -3028,13 +3028,13 @@ Uruguay
 Usbekistan
 [Vanuatu]
 Vanuatu
-[Venezuela, Bolivarian Republic of]
+[Venezuela]
 Venezuela, bolivarische Republik
-[Viet Nam]
+[Vietnam]
 Vietnam
-[Virgin Islands, British]
+[Virgin Islands (British)]
 Jungferninseln, Britisch
-[Virgin Islands, U.S.]
+[Virgin Islands (United States)]
 Jungferninseln, U.S.
 [Wallis and Futuna]
 Wallis und Futuna
diff --git a/langpacks/german/Plugins/BASS_interface.txt b/langpacks/german/Plugins/BASS_interface.txt
index de092d33c3..89a323fb99 100644
--- a/langpacks/german/Plugins/BASS_interface.txt
+++ b/langpacks/german/Plugins/BASS_interface.txt
@@ -62,7 +62,7 @@ Klänge
 Klänge deaktivieren
 [Enable sounds]
 Klänge aktivieren
-[Frame Background]
+[Frame background]
 Frame-Hintergrund
 [Bass library]
 Bass-Bibliothek
diff --git a/langpacks/german/Plugins/Db_autobackups.txt b/langpacks/german/Plugins/Db_autobackups.txt
index 70147d0816..e90ea33ce3 100644
--- a/langpacks/german/Plugins/Db_autobackups.txt
+++ b/langpacks/german/Plugins/Db_autobackups.txt
@@ -14,8 +14,6 @@ Fortschritt der Sicherung
 Abbrechen
 [Automatic backups]
 Automatische Sicherung
-[Number of backups to keep:]
-Anzahl der gespeicherten Sicherungen:
 [Backup NOW]
 Jetzt sichern
 [Disabled]
@@ -26,6 +24,8 @@ Während des Startvorgangs
 Während des Beendens
 [Every:]
 Alle:
+[Number of backups to keep:]
+Anzahl der gespeicherten Sicherungen:
 [Backup to folder:]
 Ordner für Sicherungen:
 [Browse...]
diff --git a/langpacks/german/Plugins/Dbx_mmap.txt b/langpacks/german/Plugins/Dbx_mmap.txt
index b092e3a8da..32e1135bf2 100644
--- a/langpacks/german/Plugins/Dbx_mmap.txt
+++ b/langpacks/german/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.]
@@ -30,6 +30,16 @@ Unterstützung für Miranda-Datenbank: Globale Einstellungen, Kontakte, Verlauf,
 
 [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.]
 Festplatte ist voll. Miranda wird nun beendet.
diff --git a/langpacks/german/Plugins/MsgPopup.txt b/langpacks/german/Plugins/MsgPopup.txt
index 0c77e7c0cb..e5956aa877 100644
--- a/langpacks/german/Plugins/MsgPopup.txt
+++ b/langpacks/german/Plugins/MsgPopup.txt
@@ -5,14 +5,14 @@
 ;  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.]
 Ersetzt Meldungsfenlder (die mit nur OK Buttons) durch Popups.
 ;file \plugins\MsgPopup\res\MsgPopup.rc
 [ASTERISK style]
 Information-Stil
-[Background]
+[Background color]
 Hintergrund
-[Foreground]
+[Foreground color]
 Vordergrund
 [ERROR style]
 Fehler-Stil
@@ -31,7 +31,7 @@ Sound abspielen
 ;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]
 
diff --git a/langpacks/german/Plugins/PManagerEx.txt b/langpacks/german/Plugins/PManagerEx.txt
index 18aa0699ce..3b0d045972 100644
--- a/langpacks/german/Plugins/PManagerEx.txt
+++ b/langpacks/german/Plugins/PManagerEx.txt
@@ -20,7 +20,7 @@ Profil ändern
 Datenbank überprüfen
 [Restart]
 Neustart
-[Profile manager]
-Profilmanager
 [Database]
 Datenbank
+[Profile manager]
+Profilmanager
diff --git a/langpacks/german/Plugins/ZeroNotify.txt b/langpacks/german/Plugins/ZeroNotify.txt
index 439ca8d4e8..fda5794029 100644
--- a/langpacks/german/Plugins/ZeroNotify.txt
+++ b/langpacks/german/Plugins/ZeroNotify.txt
@@ -8,14 +8,14 @@
 [Adds options to automatically disable notifications when a protocol is in a certain status.]
 Ermöglicht die Deaktivierung von Benachrichtigungen, wenn ein Protokoll in einem bestimmten Status ist.
 ;file \plugins\ZeroNotification\res\ZeroNotify.rc
-[Hide the "toggle sound" menu item (requires restart of Miranda)]
-Menüpunkt verstecken (erfordert Neustart von Miranda)
 [No sounds when:]
 Keine Klänge, wenn:
-[No SysTray blink when:]
-Kein Blinken (Tray), wenn:
 [No CLIST blink when:]
 Kein Blinken (Liste), wenn:
+[No SysTray blink when:]
+Kein Blinken (Tray), wenn:
+[Hide the "toggle sound" menu item (requires restart of Miranda)]
+Menüpunkt verstecken (erfordert Neustart von Miranda)
 ;file \plugins\ZeroNotification\src\common.h
 [Disable &Sounds]
 Klänge deaktivieren
diff --git a/langpacks/german/Untranslated/Dbx_mmap.txt b/langpacks/german/Untranslated/Dbx_mmap.txt
index 005b4868d4..0673b65a1a 100644
--- a/langpacks/german/Untranslated/Dbx_mmap.txt
+++ b/langpacks/german/Untranslated/Dbx_mmap.txt
@@ -9,6 +9,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]
 [Change/remove password]
 [Set password]
 [Logo]
diff --git a/langpacks/german/Untranslated/MsgPopup.txt b/langpacks/german/Untranslated/MsgPopup.txt
index 7ae2830b44..9bde4ca32b 100644
--- a/langpacks/german/Untranslated/MsgPopup.txt
+++ b/langpacks/german/Untranslated/MsgPopup.txt
@@ -1,4 +1,4 @@
 [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]