synced langpack_german.txt with langpack_english.txt

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

80 files changed, 207 insertions, 543 deletions

diff --git a/langpacks/german/Untranslated/Plugins/AIM.txt b/langpacks/german/Untranslated/Plugins/AIM.txt
index 34c2b8e650..361e512ba8 100644
--- a/langpacks/german/Untranslated/Plugins/AIM.txt
+++ b/langpacks/german/Untranslated/Plugins/AIM.txt
@@ -50,7 +50,6 @@
 [Open mail account?]

 [[Auto-Response]:]

 [Contact tried to open an audio/video conference (currently not supported)]

-[Successfully modified group.]

 [Unknown error when attempting to modify a group. Error code %#x]

 [Error uploading avatar. (Too small)]

 [ICQ]

@@ -58,7 +57,5 @@
 [Hiptop]

 [AOL Bot]

 [AOL]

-[AIM Account Type]

-[AIM Extended Status]

 [Please, enter a password in the options dialog.]

 [Failed to open file: %s %s]

diff --git a/langpacks/german/Untranslated/Plugins/AddContactPlus.txt b/langpacks/german/Untranslated/Plugins/AddContactPlus.txt
index 08efa135cf..7ad701fb72 100644
--- a/langpacks/german/Untranslated/Plugins/AddContactPlus.txt
+++ b/langpacks/german/Untranslated/Plugins/AddContactPlus.txt
@@ -1,5 +1,4 @@
 [Provides the ability to quickly add new contacts.]

-[Contact ID:]

 [The contact cannot be added to your contact list. Please make sure the contact ID is entered correctly.]

 [The contact cannot be added to your contact list. If you are not logged into the selected account, please try to do so. Also, make sure the contact ID is entered correctly.]

 [Open add contact dialog]

diff --git a/langpacks/german/Untranslated/Plugins/AdvancedAutoAway.txt b/langpacks/german/Untranslated/Plugins/AdvancedAutoAway.txt
index a511f6d87f..9a999a892e 100644
--- a/langpacks/german/Untranslated/Plugins/AdvancedAutoAway.txt
+++ b/langpacks/german/Untranslated/Plugins/AdvancedAutoAway.txt
@@ -1,11 +1,8 @@
 [An Auto Away module with some more options than the original.]

-[Account Connection]

-[Accounts to check]

 [minutes of level 1 mode]

 [ms]

-[Specify settings for each account]

-[Use same settings for all accounts]

-[You enabled "Change my status mode to" in the "Idle" options dialog, AdvancedAutoAway's options are ignored.]

+[s]

+[x]

 [Trigger when connection loss is detected]

 [Trigger when reconnection attempt is made]

 [Trigger when successfull reconnected]

@@ -14,9 +11,6 @@
 [Trigger when a login error occurs]

 [HotKey1]

 [Hotkey]

-[Cancel all if a account connects from another location]

-[Set account offline before a connection attempt]

-[Max. account connecting time (secs)]

 [Entering first auto-away status]

 [Entering second auto-away status]

 [Leaving first auto-away status]

diff --git a/langpacks/german/Untranslated/Plugins/Alarms.txt b/langpacks/german/Untranslated/Plugins/Alarms.txt
index 3c3fe2d2e3..0bb3489b74 100644
--- a/langpacks/german/Untranslated/Plugins/Alarms.txt
+++ b/langpacks/german/Untranslated/Plugins/Alarms.txt
@@ -3,7 +3,6 @@
 [DateTimePicker1]

 [i'm hiding]

 [Snooze]

-[...]

 [Reminder Frame Context]

 [&Suspend]

 [&New Alarm...]

diff --git a/langpacks/german/Untranslated/Plugins/AssocMgr.txt b/langpacks/german/Untranslated/Plugins/AssocMgr.txt
index 0133fd0c32..c73ae4e116 100644
--- a/langpacks/german/Untranslated/Plugins/AssocMgr.txt
+++ b/langpacks/german/Untranslated/Plugins/AssocMgr.txt
@@ -11,6 +11,3 @@
 [Yahoo Link Protocol]

 [MSN Link Protocol]

 [Gadu-Gadu Link Protocol]

-[Testing Service]

-[Miranda Installer Package (demo purpose)]

-[&Install]

diff --git a/langpacks/german/Untranslated/Plugins/BasicHistory.txt b/langpacks/german/Untranslated/Plugins/BasicHistory.txt
index 2d8b806666..57a1611adc 100644
--- a/langpacks/german/Untranslated/Plugins/BasicHistory.txt
+++ b/langpacks/german/Untranslated/Plugins/BasicHistory.txt
@@ -1,5 +1,4 @@
 [History viewer for Miranda NG.]

-[...]

 [Task]

 [Filter]

 [Triger type]

diff --git a/langpacks/german/Untranslated/Plugins/Boltun.txt b/langpacks/german/Untranslated/Plugins/Boltun.txt
index bc384331d7..1444da34c6 100644
--- a/langpacks/german/Untranslated/Plugins/Boltun.txt
+++ b/langpacks/german/Untranslated/Plugins/Boltun.txt
@@ -11,7 +11,6 @@
 [Typing and thinking time can be much longer]

 [Typing time (for a message of 4 words):]

 [Thinking time:]

-[...]

 [Base of remarks]

 [Stay silent, if have no good aswers]

 [Start answers with a lowercase letter]

diff --git a/langpacks/german/Untranslated/Plugins/BossKey.txt b/langpacks/german/Untranslated/Plugins/BossKey.txt
index c554bb52a6..3ebab0dfb4 100644
--- a/langpacks/german/Untranslated/Plugins/BossKey.txt
+++ b/langpacks/german/Untranslated/Plugins/BossKey.txt
@@ -6,5 +6,4 @@
 [EN]

 [Miranda NG is locked.\nEnter password to unlock it.]

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

-[Hide Miranda NG]

 [BossKey\tget the BossKey name]

diff --git a/langpacks/german/Untranslated/Plugins/Clist_blind.txt b/langpacks/german/Untranslated/Plugins/Clist_blind.txt
index 2c22ac1993..7f988282c8 100644
--- a/langpacks/german/Untranslated/Plugins/Clist_blind.txt
+++ b/langpacks/german/Untranslated/Plugins/Clist_blind.txt
@@ -2,9 +2,7 @@
 [HotKey1]

 [Read Message:]

 [Web Search:]

-[000%]

 [Info:]

-[&¤]

 [&Status]

 [&Offline\tCtrl+0]

 [On&line\tCtrl+1]

diff --git a/langpacks/german/Untranslated/Plugins/Clist_modern.txt b/langpacks/german/Untranslated/Plugins/Clist_modern.txt
index 9f2f12f743..67fbc8f602 100644
--- a/langpacks/german/Untranslated/Plugins/Clist_modern.txt
+++ b/langpacks/german/Untranslated/Plugins/Clist_modern.txt
@@ -1,8 +1,5 @@
 [Displays contacts, event notifications, protocol status with advantage visual modifications. Supported MW modifications, enchanced metacontact cooperation.]

-[000%]

-[...]

 [Info]

-[Ok]

 [Hold [Shift] to inverse [Right Click] behaviour]

 [[Ctrl]+[Left Click] to filter only  protocol. Click on empty space to show all]

 [For other stuff MetaContacts plugin should be loaded.\n\nhttp://miranda-ng.org]

@@ -16,7 +13,6 @@
 [UNDER CONSTRUCTION!!!           IT DOES NOT WORK]

 [Row template]

 [Layered]

-[&¤]

 [&Status]

 [&Offline\tCtrl+0]

 [On&line\tCtrl+1]

diff --git a/langpacks/german/Untranslated/Plugins/Clist_mw.txt b/langpacks/german/Untranslated/Plugins/Clist_mw.txt
index 761ded49a5..f55bc9db43 100644
--- a/langpacks/german/Untranslated/Plugins/Clist_mw.txt
+++ b/langpacks/german/Untranslated/Plugins/Clist_mw.txt
@@ -1,8 +1,5 @@
 [Displays contacts, event notifications, protocol status with MW modifications.]

-[...]

 [InsertSeparator]

-[000%]

-[&¤]

 [&Status]

 [&Offline\tCtrl+0]

 [On&line\tCtrl+1]

diff --git a/langpacks/german/Untranslated/Plugins/Clist_nicer.txt b/langpacks/german/Untranslated/Plugins/Clist_nicer.txt
index dc0bdb78ec..85e9e57900 100644
--- a/langpacks/german/Untranslated/Plugins/Clist_nicer.txt
+++ b/langpacks/german/Untranslated/Plugins/Clist_nicer.txt
@@ -3,14 +3,10 @@
 [Continue]

 [Exit Miranda]

 [Although the exception was caught and you may continue working with Miranda, you should restart the program as soon as possible. The exception may have damaged internal data structures and can have a serious impact on stability.]

-[000%]

 [Radius]

 [ms]

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

-[...]

-[Ok]

 [Dialog]

-[&¤]

 [&Status]

 [&Offline\tCtrl+0]

 [On&line\tCtrl+1]

@@ -28,7 +24,6 @@
 [Copy from]

 [Raised]

 [Etched]

-[Skins]

 [The requested action requires a valid contact selection. Please select a contact from the contact list and repeat]

 [Parameter mismatch]

 [The service %s specified by the %s button definition was not found. You may need to install additional plugins]

diff --git a/langpacks/german/Untranslated/Plugins/Console.txt b/langpacks/german/Untranslated/Plugins/Console.txt
index 23c06b6ff7..5d7f075b88 100644
--- a/langpacks/german/Untranslated/Plugins/Console.txt
+++ b/langpacks/german/Untranslated/Plugins/Console.txt
@@ -25,4 +25,3 @@
 [*** Console cleared ***]

 [Miranda Console]

 [Save selection to file]

-[Save log to file]

diff --git a/langpacks/german/Untranslated/Plugins/Contacts.txt b/langpacks/german/Untranslated/Plugins/Contacts.txt
index 81a3f33171..ecc44dec7b 100644
--- a/langpacks/german/Untranslated/Plugins/Contacts.txt
+++ b/langpacks/german/Untranslated/Plugins/Contacts.txt
@@ -1,5 +1,4 @@
-[Send contacts]

-[&A]

+[&A]

 [&D]

 [&H]

 [Received contacts]

diff --git a/langpacks/german/Untranslated/Plugins/CryptoPP.txt b/langpacks/german/Untranslated/Plugins/CryptoPP.txt
index 84a685de98..e1a762300b 100644
--- a/langpacks/german/Untranslated/Plugins/CryptoPP.txt
+++ b/langpacks/german/Untranslated/Plugins/CryptoPP.txt
@@ -1,3 +1,3 @@
-[GnuPG Plugin - Passphrase]

-[Ok]

+[Crypto++ library for SecureIM plugin.]

+[GnuPG Plugin - Passphrase]

 [GnuPG Plugin - Select public key]

diff --git a/langpacks/german/Untranslated/Plugins/CyrTranslit.txt b/langpacks/german/Untranslated/Plugins/CyrTranslit.txt
index 5032e8af4a..b4fcf15fee 100644
--- a/langpacks/german/Untranslated/Plugins/CyrTranslit.txt
+++ b/langpacks/german/Untranslated/Plugins/CyrTranslit.txt
@@ -1 +1 @@
-[Replaces (for the selected contacts only) the Cyrillic letters in the ]

+[Replaces (for the selected contacts only) the Cyrillic letters in the outgoing messages with the phonetically equivalent Latin letter combinations.]

diff --git a/langpacks/german/Untranslated/Plugins/DbEditorPP.txt b/langpacks/german/Untranslated/Plugins/DbEditorPP.txt
index 1311e799e9..9f0a191d40 100644
--- a/langpacks/german/Untranslated/Plugins/DbEditorPP.txt
+++ b/langpacks/german/Untranslated/Plugins/DbEditorPP.txt
@@ -2,15 +2,6 @@
 [Text:]

 [In:]

 [DBEditor++]

-[&Open Options]

-[&Byte]

-[&Word]

-[&String]

-[&Unicode]

-[BL&OB]

-[Import from files]

-[Replaced with]

-[%s Setting "%s" in module "%s" in contact "%s"]

 [Finished. %d items were found, %d items were replaced.]

 [Module tree not found]

 [HANDLE]

diff --git a/langpacks/german/Untranslated/Plugins/Db_autobackups.txt b/langpacks/german/Untranslated/Plugins/Db_autobackups.txt
index e950456a82..4893b7bbd3 100644
--- a/langpacks/german/Untranslated/Plugins/Db_autobackups.txt
+++ b/langpacks/german/Untranslated/Plugins/Db_autobackups.txt
@@ -1,7 +1,4 @@
-[Go to the "Customize -> Folders" to change settings]

-[Miranda Databases]

+[Db autobackuper plugin.]

+[Go to the "Customize -> Folders" to change settings]

 [Database/Database Backups]

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

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

-[Select Backup Folder]

 [Error Creating Backup Folder]

diff --git a/langpacks/german/Untranslated/Plugins/Dbx_mmap.txt b/langpacks/german/Untranslated/Plugins/Dbx_mmap.txt
index 7a5a694070..842d7dad9f 100644
--- a/langpacks/german/Untranslated/Plugins/Dbx_mmap.txt
+++ b/langpacks/german/Untranslated/Plugins/Dbx_mmap.txt
@@ -1,4 +1,5 @@
-[Disk is full. Miranda will now shutdown.]

+[Provides Miranda database support: global settings, contacts, history, settings per contact.]

+[Disk is full. Miranda will now shutdown.]

 [Database failure. Miranda will now shutdown.]

 [Database Error]

 [Invalid offset found (database truncated?)]

diff --git a/langpacks/german/Untranslated/Plugins/FTPFile.txt b/langpacks/german/Untranslated/Plugins/FTPFile.txt
index a79dee7a37..47858e5403 100644
--- a/langpacks/german/Untranslated/Plugins/FTPFile.txt
+++ b/langpacks/german/Untranslated/Plugins/FTPFile.txt
@@ -19,6 +19,11 @@
 [Copy Link to Clipboard]

 [%d days]

 [Do you really want to cancel all running jobs?]

+[FTP Server 1]

+[FTP Server 2]

+[FTP Server 3]

+[FTP Server 4]

+[FTP Server 5]

 [FTP File]

 [Upload file(s)]

 [Zip and upload file(s)]

diff --git a/langpacks/german/Untranslated/Plugins/Facebook.txt b/langpacks/german/Untranslated/Plugins/Facebook.txt
index da693ad0fc..ec8131178e 100644
--- a/langpacks/german/Untranslated/Plugins/Facebook.txt
+++ b/langpacks/german/Untranslated/Plugins/Facebook.txt
@@ -1,5 +1,4 @@
 [Facebook protocol support for Miranda NG.]

-[420]

 [Login error: Some Facebook things are required.]

 [Timeout when sending message.]

 [Contact was removed from your server list.]

diff --git a/langpacks/german/Untranslated/Plugins/FavContacts.txt b/langpacks/german/Untranslated/Plugins/FavContacts.txt
index ec89e197b7..177453efd9 100644
--- a/langpacks/german/Untranslated/Plugins/FavContacts.txt
+++ b/langpacks/german/Untranslated/Plugins/FavContacts.txt
@@ -1,18 +1,6 @@
-[Draw avatar border]

-[px.]

-[Hide for transparent avatars]

-[Use system colors and fonts]

-[Hotkey shows menu centered on screen]

-[Menu item preview:]

-[Favourite Contacts]

-[Enable groups]

-[Multicolumn menu]

-[Configure fonts and colors...]

-[Align to the right]

-[Dim idle contact icons]

+[Favourite contacts menu.]

 [recent contacts]

 [<no group>]

 [Favourite Contact]

 [Regular Contact]

 [&Favourite Contacts...]

-[<No group>]

diff --git a/langpacks/german/Untranslated/Plugins/FileAsMessage.txt b/langpacks/german/Untranslated/Plugins/FileAsMessage.txt
index 199e39facf..a07f9f631b 100644
--- a/langpacks/german/Untranslated/Plugins/FileAsMessage.txt
+++ b/langpacks/german/Untranslated/Plugins/FileAsMessage.txt
@@ -1,5 +1,5 @@
-[fileAsMessage]

-[...]

+[File tranfer by using the messaging services - as plain text.]

+[fileAsMessage]

 [Chunk size]

 [ms]

 [Delays between sends]

@@ -32,4 +32,4 @@
 [Transfer is in progress. Do you really want to close?]

 [File As Message...]

 [File As Message]

-[\nIf you see this "garbage", probably you "                         "have no "fileAsMessage" plugin installed, see "						 PLUGIN_URL " for more information and download.]

+[\nIf you see this "garbage", probably you "                         "have no "fileAsMessage" plugin installed, see "						 "http://miranda-ng.org/ for more information and download.]

diff --git a/langpacks/german/Untranslated/Plugins/Fingerprint.txt b/langpacks/german/Untranslated/Plugins/Fingerprint.txt
index 2718a58fdf..2db93110b3 100644
--- a/langpacks/german/Untranslated/Plugins/Fingerprint.txt
+++ b/langpacks/german/Untranslated/Plugins/Fingerprint.txt
@@ -1,6 +1,101 @@
 [Fingerprint overlays icons]

-[Use alternative (old style) overlays]

 [Unicode overlay]

 [Secure overlays]

 [Multi-protocol clients]

+[Client icons]

+[Pack overlays]

+[Multi-proto clients]

+[Other protocols]

+[Overlays]

+[Platform]

+[MirandaNG stable]

+[MirandaIM (old versions)]

+[Miranda (unknown)]

+[spam client]

+[PHP Jabber Client]

+[MP3 Script for mIRC]

+[Mail.Ru Agent (official)]

+[Mail.Ru (unknown client)]

+[TM 2008 and >]

+[Gadu-Gadu client]

+[Tlen.pl client]

+[Python-based clients]

+[Jabber client]

+[XMPP client]

+[Client not found]

+[Undetected client]

+[AIM overlay]

+[ICQJ Plus Mod overlay]

+[ICQJ overlay]

+[IRC overlay]

+[JGmail overlay]

+[JGTalk overlay]

+[Jabber overlay]

+[MSN overlay]

+[QQ overlay]

+[Tlen.pl overlay]

+[Yahoo overlay]

+[Mail.Ru Agent overlay]

+[ICQ 2003 overlay]

+[ICQ Lite 4 overlay]

+[ICQ v5.x overlay]

+[ICQ v6.x overlay]

+[ICQ v7.x overlay]

+[ICQ v8.x overlay]

+[Yahoo v11.x overlay]

+[Yahoo v10.x overlay]

+[Yahoo v9.x overlay]

+[Gadu-Gadu v11 client]

+[Gadu-Gadu v10 client]

+[Gadu-Gadu v9 client]

+[Gadu-Gadu v8 client]

+[Tlen 7.x overlay]

+[Tlen 6.x overlay]

+[Tlen 5.x overlay]

+[TM/QQ 2012 overlay]

+[TM/QQ 2011 overlay]

+[TM/QQ 2010 overlay]

+[TM/QQ 2009 overlay]

+[TM/QQ 2008 overlay]

+[TM/QQ 2007 overlay]

+[TM/QQ 2006 overlay]

+[TM/QQ 2005 overlay]

+[QQ 2004 overlay]

+[TM 3.x / QQ 2003 overlay]

+[TM 2.x overlay]

+[TM 1.x overlay]

+[QQ 2000 overlay]

+[Windows overlay]

+[iOS overlay (iPhone/iPad)]

+[MacOS overlay]

+[Linux overlay]

+[Flash overlay]

+[Java overlay]

+[Symbian overlay]

+[Amiga overlay]

+[Android overlay]

+[debug overlay]

+[office overlay]

+[mobile overlay]

+[home overlay]

+[work overlay]

+[notebook overlay]

+[MirandaNG v0.6 #2 overlay]

+[MirandaNG v0.5 #2 overlay]

+[MirandaNG v0.4 #2 overlay]

+[MirandaNG v0.3 #2 overlay]

+[MirandaNG v0.2 #2 overlay]

+[MirandaNG v0.1 #2 overlay]

+[MirandaIM v0.10 #2 overlay]

+[MirandaIM v0.9 #2 overlay]

+[MirandaIM v0.8 #2 overlay]

+[MirandaIM v0.7 #2 overlay]

+[MirandaIM v0.6 #2 overlay]

+[MirandaIM v0.5 #2 overlay]

+[MirandaIM v0.4 #2 overlay]

+[x64 overlay]

+[x32 overlay]

+[NewGPG overlay]

+[MirOTR overlay]

+[SecureIM overlay]

 [Fingerprint]

diff --git a/langpacks/german/Untranslated/Plugins/FlashAvatars.txt b/langpacks/german/Untranslated/Plugins/FlashAvatars.txt
index ec7f0c3f75..f80122228c 100644
--- a/langpacks/german/Untranslated/Plugins/FlashAvatars.txt
+++ b/langpacks/german/Untranslated/Plugins/FlashAvatars.txt
@@ -1,4 +1,5 @@
-[You don't have installed ShockwaveFlash interface in your system.]

+[Loads and displays flash avatars.]

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

 [Bugged Flash detected!]

 [You have installed Flash 8.\r\nThis version of Flash contains a bug which can causes random crashes.\r\nIt is recommended to upgrade or downgrade your Flash library]

 [Flash Avatars]

diff --git a/langpacks/german/Untranslated/Plugins/FltContacts.txt b/langpacks/german/Untranslated/Plugins/FltContacts.txt
index a0f1a1d88b..af6a60f75f 100644
--- a/langpacks/german/Untranslated/Plugins/FltContacts.txt
+++ b/langpacks/german/Untranslated/Plugins/FltContacts.txt
@@ -1,5 +1,3 @@
 [Floating Contacts plugin for Miranda.]

-[ms]

-[100 %]

-[...]

-[Floating Contacts]

+[*requires Tipper plugin]

+[Idle contacts]

diff --git a/langpacks/german/Untranslated/Plugins/GG.txt b/langpacks/german/Untranslated/Plugins/GG.txt
index 9a41b4753e..e2c3d462f2 100644
--- a/langpacks/german/Untranslated/Plugins/GG.txt
+++ b/langpacks/german/Untranslated/Plugins/GG.txt
@@ -1,11 +1,4 @@
-[Change e-mail]

-[Ignore incoming conference messages]

-[Version:]

-[Enter token to continue]

-[Remove Gadu-Gadu account]

-[Change Gadu-Gadu password]

-[Change Gadu-Gadu e-mail]

-[Change Gadu-Gadu e-mail\nChanges current Gadu-Gadu user e-mail]

+[Enter token to continue]

 [Concurrent Sessions]

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

 [Can not create avatar file. ERROR: %d: %s\n%s]

@@ -35,15 +28,11 @@
 [%s connection]

 [Gadu-Gadu Number]

 ['Unknown']

-[Concurrent sessions]

-[&Image]

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

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

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

 [Can not open image file. ERROR: %d: %s\n%s]

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

 [List cannot be removeed because of error: %s (Error: %d)]

-[Text files]

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

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

 [List cannot be exported because of error:\n\t%s (Error: %d)]

@@ -55,7 +44,4 @@
 [Client Name]

 [Login Time]

 [sign out]

-[Copy Text]

 [Whois]

-[Your password has been changed.]

-[Your e-mail has been changed.]

diff --git a/langpacks/german/Untranslated/Plugins/HTTPServer.txt b/langpacks/german/Untranslated/Plugins/HTTPServer.txt
index ac6e8fe112..16106947e1 100644
--- a/langpacks/german/Untranslated/Plugins/HTTPServer.txt
+++ b/langpacks/german/Untranslated/Plugins/HTTPServer.txt
@@ -1,4 +1,5 @@
-[IPAddress1]

+[HTTP Web Server plugin for Miranda.]

+[IPAddress1]

 [IPAddress2]

 [Max downloads]

 [Miranda NG HTTP-Server]

diff --git a/langpacks/german/Untranslated/Plugins/HistoryPP.txt b/langpacks/german/Untranslated/Plugins/HistoryPP.txt
index 61b7a2f7f4..5ee6af2323 100644
--- a/langpacks/german/Untranslated/Plugins/HistoryPP.txt
+++ b/langpacks/german/Untranslated/Plugins/HistoryPP.txt
@@ -1,7 +1,4 @@
 [Pseudo-edit mode...]

-[Group log messages]

-[Need more options?]

-[Open Link]

 [WATrack: information request]

 [Artist: %s\\nTitle: %s\\nAlbum: %s]

 [WATrack: %s]

@@ -9,10 +6,8 @@
 [Text formatting options]

 [Limit Search Sange]

 [&Name:]

-[%s - History++]

 [Disable &Processing]

 [Enable &Processing]

-[Remove bookmark]

 [Authorization request granted by %s (%d): %s]

 [Authorization request denied by %s (%d): %s]

 [User %s (%d) removed himself from your contact list: %s]

@@ -21,18 +16,11 @@
 [All except status]

 [Grid options]

 [Additional processing support]

-[Change Appearance]

 [SMTP Simple]

 [Toggle &Processing]

 [History++]

-[Unicode text file]

-[RTF file]

-[XML file]

-[HTML file]

-[Hide Menu]

 [Searching unprotected contacts only]

 [Searching all contacts]

-[Wrong password]

 [History++ module could not be loaded, riched20.dll is missing. Press Yes to continue loading Miranda.]

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

 [Ignored status request by %s (%d):%s]

diff --git a/langpacks/german/Untranslated/Plugins/ICQ.txt b/langpacks/german/Untranslated/Plugins/ICQ.txt
index 2716de932f..4016a1721b 100644
--- a/langpacks/german/Untranslated/Plugins/ICQ.txt
+++ b/langpacks/german/Untranslated/Plugins/ICQ.txt
@@ -1,137 +1,17 @@
-[Enter an authorization request]

-[ICQ]

-[Legacy fix (for ICQ Groupware or IServerD only)]

-[You will need to reconnect to the ICQ network for the changes you have made on this page to take effect.]

-[UIN:]

+[UIN:]

 [Organisation:]

 [Incoming URL:]

 [The contact does not support receiving offline messages.]

 [Contact "%s" was authorized in the server list.]

 [Contact "%s" lost its authorization in the server list.]

 [** Unknown missed message event.]

-[Afghanistan]

-[Andorra]

-[Angola]

-[Anguilla]

-[Aruba]

-[Australia, Antarctic Territory]

-[Australia, Christmas Island]

-[Australia, Cocos (Keeling) Islands]

-[Australia, Norfolk Island]

-[Bahamas]

-[Bahrain]

-[Bangladesh]

-[Barbados]

-[Barbuda]

-[Belize]

-[Benin]

-[Bermuda]

-[Bhutan]

-[Botswana]

-[Brunei]

-[Burkina Faso]

-[Burundi]

-[Costa Rica]

-[Greek, Republic of South Cyprus]

-[Diego Garcia]

-[Dominica]

-[El Salvador]

-[Eritrea]

-[Europe]

-[Gambia]

-[Ghana]

-[Gibraltar]

-[Grenada]

-[Guadeloupe]

-[Guatemala]

-[Guinea]

-[Guinea-Bissau]

-[Guyana]

-[Haiti]

-[Honduras]

-[Hong Kong]

-[Israel]

-[Japan]

-[Kuwait]

-[Laos]

-[Lesotho]

-[Liberia]

-[Liechtenstein]

-[Macedonia, Republic of]

-[Malawi]

-[Malaysia]

-[Mali]

-[Malta]

-[Martinique]

-[Mauritius]

-[Monaco]

-[Montserrat]

-[Myanmar]

-[Namibia]

-[Nepal]

-[St. Maarten]

-[Curacao]

-[Netherlands (Bonaire Island)]

-[Netherlands (Saba Island)]

-[Netherlands (St. Eustatius Island)]

-[Nevis]

-[Nicaragua]

-[Niger]

-[Nigeria]

-[Niue]

-[Northern Mariana Islands, US Territory of]

-[Oman]

-[Pakistan]

-[Palau]

-[Panama]

-[Paraguay]

-[Peru]

-[Portugal]

-[Puerto Rico]

-[Samoa (USA)]

-[Samoa, Western]

-[San Marino]

-[Senegal]

-[Sierra Leone]

-[Somalia]

-[Spain, Canary Islands]

-[Sri Lanka]

-[Sudan]

-[Swaziland]

-[Taiwan]

-[Thailand]

-[Timor, East]

-[Togo]

-[Tokelau]

-[Tonga]

-[Turkey, Republic of Northern Cyprus]

-[Turkmenistan]

-[Tuvalu]

-[Uganda]

-[Ukraine]

-[Uruguay]

-[USA]

-[Vanuatu]

-[Venezuela]

-[Vietnam]

-[Virgin Islands (UK)]

-[Wales]

-[Serbia, Republic of]

-[Kosovo, Republic of]

-[Montenegro, Republic of]

-[Fitness]

-[Internet]

-[Religion]

 [Bhojpuri]

 [Chamorro]

 [Farsi]

 [Gujarati]

 [Hindi]

-[Khmer]

-[Mandarin]

 [Sindhi]

 [Tagalog]

-[Taiwanese]

 [Urdu]

 [Yoruba]

 [Associated degree]

@@ -165,25 +45,10 @@
 [Adding group "%s"...]

 [Updating group "%s"...]

 [Deleting group "%s"...]

-[Hot Dog]

-[Baby]

-[Cool]

-[Pilot]

-[Afro]

-[Pink Lady]

-[Ninja]

-[Cocktail]

-[Donut]

-[Oink Oink]

-[Sumo]

-[Pizza]

 [Basketball]

 [Sushi]

-[Greeting card:]

 [error]

-[%d Files]

 [The checksum of file "%s" does not match, the file is probably damaged.]

-[<invalid>]

 [GMT-11:30]

 [GMT-10:30]

 [GMT-10:00 Hawaii]

diff --git a/langpacks/german/Untranslated/Plugins/IEView.txt b/langpacks/german/Untranslated/Plugins/IEView.txt
index 7b216e607c..c016ae19c5 100644
--- a/langpacks/german/Untranslated/Plugins/IEView.txt
+++ b/langpacks/german/Untranslated/Plugins/IEView.txt
@@ -1,11 +1,2 @@
-[...]

-[ requested authorisation]

+[ requested authorisation]

 [ was added.]

-[IEView]

-[Skins]

-[320 x 205]

-[480 x 385]

-[560 x 349]

-[640 x 390]

-[All Images]

-[Style Sheet]

diff --git a/langpacks/german/Untranslated/Plugins/IRC.txt b/langpacks/german/Untranslated/Plugins/IRC.txt
index 5c567f6a16..e046c90e8d 100644
--- a/langpacks/german/Untranslated/Plugins/IRC.txt
+++ b/langpacks/german/Untranslated/Plugins/IRC.txt
@@ -1,6 +1,4 @@
 [Internet Relay Chat (IRC) protocol support for Miranda NG.]

-['Old style' mode changes]

-[->]

 [System]

 [SSL]

 [Ping]

@@ -16,8 +14,6 @@
 [The IRC protocol depends on another plugin called 'Chat'\n\nDo you want to download it from the Miranda NG web site now?]

 [WhoIs]

 [Logo (48x48)]

-[Cyrillic (Windows)]

-[Cyrillic (KOI8R)]

 [Add ignore]

 [Edit ignore]

 [Kick]

diff --git a/langpacks/german/Untranslated/Plugins/IgnoreState.txt b/langpacks/german/Untranslated/Plugins/IgnoreState.txt
index 07f81f7dd0..4334bfb50d 100644
--- a/langpacks/german/Untranslated/Plugins/IgnoreState.txt
+++ b/langpacks/german/Untranslated/Plugins/IgnoreState.txt
@@ -1,2 +1,2 @@
 [Shows ignore state of contact in contacts list.]

-[User Online]

+[Ignore State]

diff --git a/langpacks/german/Untranslated/Plugins/Import.txt b/langpacks/german/Untranslated/Plugins/Import.txt
index c368c57948..52ecc55793 100644
--- a/langpacks/german/Untranslated/Plugins/Import.txt
+++ b/langpacks/german/Untranslated/Plugins/Import.txt
@@ -1,5 +1,4 @@
-[URLs]

-[Ignored event from/to self]

+[Ignored event from/to self]

 [Added contact %u (found in history)]

 [Failed to add %S contact %s]

 [Added %S contact %s, '%s']

diff --git a/langpacks/german/Untranslated/Plugins/Jabber.txt b/langpacks/german/Untranslated/Plugins/Jabber.txt
index 39964b20cf..205e484bfc 100644
--- a/langpacks/german/Untranslated/Plugins/Jabber.txt
+++ b/langpacks/german/Untranslated/Plugins/Jabber.txt
@@ -1,9 +1,7 @@
 [Domain/Server:]

 [Jabber]

-[Search...]

 [Command]

 [Jabber Form]

-[Save password permanently]

 [Data form test]

 [Internet]

 [X400]

@@ -15,7 +13,6 @@
 [ISDN]

 [PCS]

 [JID List]

-[List4]

 [Apply Filter]

 [Reset Filter]

 [JID:]

@@ -83,6 +80,56 @@
 [Removing]

 [Http authentication request received]

 [Convert]

+[Akan]

+[Avaric]

+[Avestan]

+[Aymara]

+[Bambara]

+[Bihari]

+[Bislama]

+[Chamorro]

+[Cree]

+[Dzongkha]

+[Ewe]

+[Manx]

+[Guarani]

+[Gujarati]

+[Hausa]

+[Hindi]

+[Hiri Motu]

+[Igbo]

+[Ido]

+[Inuktitut]

+[Inupiaq]

+[Kannada]

+[Kanuri]

+[Kinyarwanda]

+[Komi]

+[Kongo]

+[Lingala]

+[Ganda]

+[Malayalam]

+[Maori]

+[Marathi]

+[Malagasy]

+[Bokmaal, Norwegian; Norwegian Bokmaal]

+[Occitan (post 1500); Provencal]

+[Oriya]

+[Oromo]

+[Pali]

+[Quechua]

+[Sango]

+[Shona]

+[Sindhi]

+[Telugu]

+[Tagalog]

+[Tsonga]

+[Twi]

+[Urdu]

+[Volapuk]

+[Wolof]

+[Yoruba]

+[Zulu]

 [JID]

 [Uploading...]

 [Google Talk!]

@@ -125,6 +172,4 @@
 [Unknown format]

 [Only JPG, GIF, and BMP image files smaller than 40 KB are supported.]

 [%s connection]

-[Mood: %s]

-[Activity: %s]

 [Listening To]

diff --git a/langpacks/german/Untranslated/Plugins/KeepStatus.txt b/langpacks/german/Untranslated/Plugins/KeepStatus.txt
index ef3ce9530f..2fcad7f5ce 100644
--- a/langpacks/german/Untranslated/Plugins/KeepStatus.txt
+++ b/langpacks/german/Untranslated/Plugins/KeepStatus.txt
@@ -1,10 +1,7 @@
-[Account Connection]

-[Accounts to check]

-[minutes of level 1 mode]

+[minutes of level 1 mode]

 [ms]

-[Specify settings for each account]

-[Use same settings for all accounts]

-[You enabled "Change my status mode to" in the "Idle" options dialog, AdvancedAutoAway's options are ignored.]

+[s]

+[x]

 [Trigger when connection loss is detected]

 [Trigger when reconnection attempt is made]

 [Trigger when successfull reconnected]

@@ -13,9 +10,6 @@
 [Trigger when a login error occurs]

 [HotKey1]

 [Hotkey]

-[Cancel all if a account connects from another location]

-[Set account offline before a connection attempt]

-[Max. account connecting time (secs)]

 [Entering first auto-away status]

 [Entering second auto-away status]

 [Leaving first auto-away status]

@@ -24,5 +18,4 @@
 [TriggerData]

 [Status: The status the account will change to\r\nAccount: The account changing state]

 [KeepStatus]

-[%s\t(will be set to %s)\r\n]

 [<n/a>]

diff --git a/langpacks/german/Untranslated/Plugins/KeyboardNotify.txt b/langpacks/german/Untranslated/Plugins/KeyboardNotify.txt
index 50e3c6c30f..97de47706b 100644
--- a/langpacks/german/Untranslated/Plugins/KeyboardNotify.txt
+++ b/langpacks/german/Untranslated/Plugins/KeyboardNotify.txt
@@ -1,9 +1,4 @@
-[Accounts to check]

-[...]

-[Num Lock]

-[Caps Lock]

-[Scroll Lock]

-[Num]

+[Num]

 [Caps]

 [Scroll]

 [Consider event opened after]

diff --git a/langpacks/german/Untranslated/Plugins/LangMan.txt b/langpacks/german/Untranslated/Plugins/LangMan.txt
index 1fce628584..9fca0cc06e 100644
--- a/langpacks/german/Untranslated/Plugins/LangMan.txt
+++ b/langpacks/german/Untranslated/Plugins/LangMan.txt
@@ -1,8 +1,2 @@
-[Language Pack Update Now Available]

-[A new version of a Language Pack is now available. Click the install button to download and install this new update.]

-[New:]

-[&Install Now]

-[Version:]

-[Check for new &versions of Language Packs periodically]

-[(incompatible)]

+[(incompatible)]

 [built-in]

diff --git a/langpacks/german/Untranslated/Plugins/LinkList.txt b/langpacks/german/Untranslated/Plugins/LinkList.txt
index d52c7efd88..a6b58c76fe 100644
--- a/langpacks/german/Untranslated/Plugins/LinkList.txt
+++ b/langpacks/german/Untranslated/Plugins/LinkList.txt
@@ -1,4 +1,5 @@
-[link]

+[Generates a list of extracted URIs from the history.]

+[link]

 [History Linklist]

 [Filter]

 [no filter]

diff --git a/langpacks/german/Untranslated/Plugins/ListeningTo.txt b/langpacks/german/Untranslated/Plugins/ListeningTo.txt
index c9f50d4186..263f00e023 100644
--- a/langpacks/german/Untranslated/Plugins/ListeningTo.txt
+++ b/langpacks/german/Untranslated/Plugins/ListeningTo.txt
@@ -1,21 +1,7 @@
 [Listening to information]

-[Radio]

-[Video]

 [XStatus]

-[Winamp (*)]

-[Windows Media Player]

-[iTunes]

-[mRadio]

-[Listening to (enabled)]

-[Listening to (disabled)]

-[Media type: Music, Video, etc]

 [Track number]

-[Song year]

 [Song genre]

 [Player name]

-[Disable ListeningTo (to all protocols)]

-[Enable ListeningTo (to all protocols)]

-[<Nothing is playing now>]

-[Format]

 [Miranda ListeningTo receiver]

 [Miranda ListeningTo WMP receiver]

diff --git a/langpacks/german/Untranslated/Plugins/MRA.txt b/langpacks/german/Untranslated/Plugins/MRA.txt
index 0b9b1c3674..0c3794353d 100644
--- a/langpacks/german/Untranslated/Plugins/MRA.txt
+++ b/langpacks/german/Untranslated/Plugins/MRA.txt
@@ -1,5 +1,4 @@
 [Create a new Mail.ru account]

-[(2042, 443, 110, 25)]

 [Automatically request authorization on logon]

 [Automatically add contacts to server list on logon]

 [Automatically grant authorization to users in contact list]

@@ -10,10 +9,8 @@
 [Zodiak:]

 [Remember]

 [Server:]

-[(80, 443, 2041)]

 [Leave empty if you dont want change password]

 [Writed:]

-[0/500]

 [Avatars: cant open file %s, error]

 [invite sender]

 [invite new members]

diff --git a/langpacks/german/Untranslated/Plugins/MSN.txt b/langpacks/german/Untranslated/Plugins/MSN.txt
index 427516fc50..fc815a3560 100644
--- a/langpacks/german/Untranslated/Plugins/MSN.txt
+++ b/langpacks/german/Untranslated/Plugins/MSN.txt
@@ -1,9 +1,6 @@
 [MSN]

 [Live ID:]

-[...]

-[ 1863]

 [Gateway:]

-[ 80]

 [Hotmail]

 [Mobile Device (used for SMS)]

 [Spouse/Partner]

@@ -19,11 +16,6 @@
 [User not online]

 [MSN Link Protocol]

 [Contact %s has been removed from the server.\nWould you like to keep it as "Local Only" contact to preserve history?]

-[Start Netmeeting]

-[MSN Options]

-[Contact tried to share media with us (currently not supported)]

-[Live Mail]

-[Live Alert]

 [Protocol is offline]

 [MSN requires message send timeout in your Message window plugin to be not less then 60 sec. Please correct the timeout value.]

 [Convert to Chat]

diff --git a/langpacks/german/Untranslated/Plugins/MenuEx.txt b/langpacks/german/Untranslated/Plugins/MenuEx.txt
index 9f42895e3f..f41ab09001 100644
--- a/langpacks/german/Untranslated/Plugins/MenuEx.txt
+++ b/langpacks/german/Untranslated/Plugins/MenuEx.txt
@@ -1,7 +1 @@
-[Enter an authorization request]

-[XStatus message]

-[Activity title]

-[Activity text]

-[Copy xStatus Message]

-[User Online]

-[Please authorize me to add you to my contact list.]

+[Please authorize me to add you to my contact list.]

diff --git a/langpacks/german/Untranslated/Plugins/Msg_Export.txt b/langpacks/german/Untranslated/Plugins/Msg_Export.txt
index 6e2c87eebb..e346f4ad01 100644
--- a/langpacks/german/Untranslated/Plugins/Msg_Export.txt
+++ b/langpacks/german/Untranslated/Plugins/Msg_Export.txt
@@ -1,5 +1,4 @@
-[Exports every message, URL or File you receive to a text file.]

-[History file for %s (%s format %s)]

+[History file for %s (%s format %s)]

 [&External]

 [Debug]

 [UserList]

@@ -12,7 +11,6 @@
 [Failed to open file\r\n%s\r\n\r\nContact handle is invalid]

 [Failed to open file\r\n%s\r\n\r\nMiranda database contains %d events]

 [With scroll to bottom %d\n]

-[Save as RTF]

 [Failed to create file]

 [Failed to save file]

 [History was saved successfully in file\r\n]

@@ -31,11 +29,9 @@
 [Executable files]

 [Failed to get the shells allocator!]

 [Failed to Allocate buffer space]

-[Additional]

 [No_Nick]

 [No_Group]

 [DB: Attempt to get wrong type of value, string]

-[File name for the user "%s" has changed!\n\nfrom:\t%s\nto:\t%s\n\nDo you wish to rename file?]

 [\nError: ]

 [\nMessage has not been saved!\n]

 [Do you wish to save debug information?]

diff --git a/langpacks/german/Untranslated/Plugins/MyDetails.txt b/langpacks/german/Untranslated/Plugins/MyDetails.txt
index 70317ab186..8e8af8910c 100644
--- a/langpacks/german/Untranslated/Plugins/MyDetails.txt
+++ b/langpacks/german/Untranslated/Plugins/MyDetails.txt
@@ -1,5 +1,2 @@
-[RTL]

-[&Offline]

-[On&line]

-[ListeningTo popup]

+[ListeningTo popup]

 [Listening To]

diff --git a/langpacks/german/Untranslated/Plugins/NewEventNotify.txt b/langpacks/german/Untranslated/Plugins/NewEventNotify.txt
index 2554c7cefb..2d3b6ddc09 100644
--- a/langpacks/german/Untranslated/Plugins/NewEventNotify.txt
+++ b/langpacks/german/Untranslated/Plugins/NewEventNotify.txt
@@ -1,9 +1,4 @@
-[Show Date]

-[Show Time]

-[Message Received]

-[ICQ Web pager]

-[Received %d contacts.]

-[ added you to the contact list]

+[ICQ Web pager]

 [ requested authorization]

 [Plugin Test]

 [Number of new message: ]

diff --git a/langpacks/german/Untranslated/Plugins/NewXstatusNotify.txt b/langpacks/german/Untranslated/Plugins/NewXstatusNotify.txt
index 232bdafba3..02f10a24d2 100644
--- a/langpacks/german/Untranslated/Plugins/NewXstatusNotify.txt
+++ b/langpacks/german/Untranslated/Plugins/NewXstatusNotify.txt
@@ -1,5 +1,4 @@
-[...]

-[IndSndList]

+[IndSndList]

 [Wave Files]

 [connecting]

 [aborting]

diff --git a/langpacks/german/Untranslated/Plugins/New_GPG.txt b/langpacks/german/Untranslated/Plugins/New_GPG.txt
index 16a34936f1..72c34aaf93 100644
--- a/langpacks/german/Untranslated/Plugins/New_GPG.txt
+++ b/langpacks/german/Untranslated/Plugins/New_GPG.txt
@@ -13,7 +13,6 @@
 [Recieved encrypted file form contact whith disabled encryption.]

 [Remember choice]

 [Choose which  keys to export]

-[Ok]

 [Export public keys (only set for contacts)]

 [Export all private keys]

 [Export public and private keys]

diff --git a/langpacks/german/Untranslated/Plugins/NewsAggregator.txt b/langpacks/german/Untranslated/Plugins/NewsAggregator.txt
index d161238aaa..b9af298643 100644
--- a/langpacks/german/Untranslated/Plugins/NewsAggregator.txt
+++ b/langpacks/german/Untranslated/Plugins/NewsAggregator.txt
@@ -1,22 +1,9 @@
 [RSS/Atom news aggregator.]

-[Retrieve news at startup]

-[0 - check manually]

 [News Aggregator]

-[Check feed]

-[Change feed]

-[Enter Feed name]

-[Enter Feed URL]

-[Enter checking interval]

-[Enter message format]

-[The title of the item.]

 [The item synopsis.]

-[The URL of the item.]

-[Email address of the author of the item.]

-[URL of a page for comments relating to the item.]

 [A string that uniquely identifies the item.]

 [Specify one or more categories that the item belongs to.]

 [Tags Mask Reset]

-[Change Feed]

 [Contact deleting]

 [Enable/disable auto update]

 [NewsAggregator HTTP connection]

diff --git a/langpacks/german/Untranslated/Plugins/NotesReminders.txt b/langpacks/german/Untranslated/Plugins/NotesReminders.txt
index 284a3c8a8d..6f5a1b0c66 100644
--- a/langpacks/german/Untranslated/Plugins/NotesReminders.txt
+++ b/langpacks/german/Untranslated/Plugins/NotesReminders.txt
@@ -1,24 +1,12 @@
 [Sticky Notes Options]

-[Notes Appearance]

-[Show Buttons]

-[Title Date]

-[Title Time]

-[Hide notes at startup]

-[(Requires Miranda restart)]

 [Reminder options]

 [Add Reminder closes dialog]

 [Use MCI to play alert sounds]

 [Note Transparency (Minimum Win 2k/XP)]

-[0%]

-[100%]

-[Open links with this program instead:]

-[...]

 [(Using MCI allows different sounds to be played simultaneously, may not be needed or desired when a custom sound plugin is installed.)]

 [DateTimePicker1]

 [Repeat Alert Sound]

-[Use Sound]

 [reftime]

-[After:]

 [On Time && Date:]

 [&Remind Again]

 [&Create Note]

@@ -29,35 +17,17 @@
 [&Delete Reminder]

 [D&elete All Reminders]

 [Context Menu Note Popup]

-[&Hide Note]

-[&Always On Top]

-[&Delete Note]

-[Paste Title]

-[Reset Title]

-[&View Notes]

-[&Bring All To Front]

 [Context Menu Note ListView]

-[Edi&t Note]

-[Always &On Top]

-[Delete &All Notes]

-[New Note]

 [Toggle Notes Visibility]

-[Bring All Notes to Front]

-[New Reminder]

 [Are you sure you want to delete all notes?]

 [Are you sure you want to delete all reminders?]

-[Delete All Notes]

-[Show/Hide Notes]

 [On Top Caption Icon]

 [View Reminders]

 [Not on Top Caption Icon]

 [Hide Note Icon]

 [Remove Note Icon]

-[Reminder Icon]

 [Bring All to Front]

 [Play Sound Icon]

-[View Notes]

-[Add New Note]

 [Reminder triggered]

 [Reminder triggered (Alternative 1)]

 [Reminder triggered (Alternative 2)]

diff --git a/langpacks/german/Untranslated/Plugins/NotifyAnything.txt b/langpacks/german/Untranslated/Plugins/NotifyAnything.txt
index 3029f1fcd5..008b237366 100644
--- a/langpacks/german/Untranslated/Plugins/NotifyAnything.txt
+++ b/langpacks/german/Untranslated/Plugins/NotifyAnything.txt
@@ -5,7 +5,6 @@
 [Message debugging]

 [(Default is 12001)]

 [Allow actions to execute programs]

-[...]

 [NotifyAnything]

 [No resource name given.]

 [Icon indices start at 1.]

diff --git a/langpacks/german/Untranslated/Plugins/Nudge.txt b/langpacks/german/Untranslated/Plugins/Nudge.txt
index 28befc274b..c06f7b134e 100644
--- a/langpacks/german/Untranslated/Plugins/Nudge.txt
+++ b/langpacks/german/Untranslated/Plugins/Nudge.txt
@@ -1,3 +1,2 @@
 [Nudge]

 [Default Nudge]

-[Nudge for %s]

diff --git a/langpacks/german/Untranslated/Plugins/Omegle.txt b/langpacks/german/Untranslated/Plugins/Omegle.txt
index 32242241cc..87741542ff 100644
--- a/langpacks/german/Untranslated/Plugins/Omegle.txt
+++ b/langpacks/german/Untranslated/Plugins/Omegle.txt
@@ -1,12 +1,4 @@
-[Server:]

-[Server]

-[Last question is empty.]

-[You can't send messages in question mode.]

-[You]

-[Connection error.]

-[Chosing server: ]

-[Connected to server %s.]

-[On whole Omegle are %s strangers online now.]

+[Connected to server %s.]

 [%s disconnected.]

 [Recaptcha is required.\nOpen http://omegle.com , solve Recaptcha and try again.]

 [Error: ]

@@ -14,7 +6,6 @@
 [Connecting canceled.]

 [Disconnecting...]

 [We are already waiting for new stranger...]

-[We are disconnecting now, wait...]

 [Unable to get Netlib connection for Omegle]

 [Stranger typing]

 [Stranger stopped typing]

diff --git a/langpacks/german/Untranslated/Plugins/PasteIt.txt b/langpacks/german/Untranslated/Plugins/PasteIt.txt
index 67276b209e..d804c351c6 100644
--- a/langpacks/german/Untranslated/Plugins/PasteIt.txt
+++ b/langpacks/german/Untranslated/Plugins/PasteIt.txt
@@ -1,4 +1,3 @@
-[User name]

-[Paste It]

+[Paste It]

 [Format]

 [Recode]

diff --git a/langpacks/german/Untranslated/Plugins/Ping.txt b/langpacks/german/Untranslated/Plugins/Ping.txt
index e562b1d8bf..18d7ba1dec 100644
--- a/langpacks/german/Untranslated/Plugins/Ping.txt
+++ b/langpacks/german/Untranslated/Plugins/Ping.txt
@@ -13,7 +13,6 @@
 [<all>]

 [Hosts]

 [Ping Plugin]

-[Failed to initialize. Plugin disabled.]

 [Show grid lines]

 [Show stats]

 [%d ms]

diff --git a/langpacks/german/Untranslated/Plugins/PluginUpdater.txt b/langpacks/german/Untranslated/Plugins/PluginUpdater.txt
index 3da9e14cca..321a896bb3 100644
--- a/langpacks/german/Untranslated/Plugins/PluginUpdater.txt
+++ b/langpacks/german/Untranslated/Plugins/PluginUpdater.txt
@@ -1,13 +1,4 @@
-[Plugin updater for Miranda NG.]

-[Details >>]

+[Details >>]

 [Hotkey]

-[Skipped.]

-[Will be deleted!]

-[Failed!]

-[Succeeded.]

-[Plugin Updater]

 [You have chosen not to install the plugin updates immediately.\nYou can install it manually from this location:\n\n%s]

 [An error occured while downloading the update.]

-['Yes' Button]

-['No' Button]

-[Plugin Updater HTTP connection]

diff --git a/langpacks/german/Untranslated/Plugins/PopUp.txt b/langpacks/german/Untranslated/Plugins/PopUp.txt
index 471aa99821..a871f37596 100644
--- a/langpacks/german/Untranslated/Plugins/PopUp.txt
+++ b/langpacks/german/Untranslated/Plugins/PopUp.txt
@@ -1,13 +1,10 @@
 [Go to Customize > Fonts && Colors for fonts and colors options]

-[32]

 [Multimonitor (98/ME/2000/XP)]

 [Enable Win 9x/Me transparency]

-[100%]

 [ms]

 [Skins]

 [Desktop]

 [Disable if message window is open]

-[...]

 [Debug]

 [Popup History is disabled]

 [Popup History message]

diff --git a/langpacks/german/Untranslated/Plugins/Scriver.txt b/langpacks/german/Untranslated/Plugins/Scriver.txt
index c309fb445c..1675b96136 100644
--- a/langpacks/german/Untranslated/Plugins/Scriver.txt
+++ b/langpacks/german/Untranslated/Plugins/Scriver.txt
@@ -1,18 +1,13 @@
 [Tabs]

 [Show close button on each tab ]

 [Layout]

-[100%]

 [&U]

 [&D]

 [&E]

 [&H]

 [&Q]

 [Remember my choice for this container]

-[Show these events only:]

-[...]

 [kB]

-[Word lookup]

-[Google]

 [Bing]

 [Wikipedia (en)]

 [Google Maps]

@@ -20,8 +15,6 @@
 [Yahoo]

 [Foodnetwork]

 [LogLink]

-[&Open link]

-[Status 2 (10x10]

 [Navigate: Tab %d]

 [Quote]

 [Smiley]

@@ -31,11 +24,6 @@
 [Infobar background]

 [Message background]

 [User list background]

-[The topic is '%s%s']

-[ (set by %s on %s)]

-[%s enables '%s' status for %s]

-[%s disables '%s' status for %s]

-[<invalid>]

 [protocol name of current contact (if defined). Account name is used when protocol supports multiaccounts]

 [UserID of current contact (if defined). It is like UIN Number for ICQ, JID for Jabber, etc.]

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

@@ -43,7 +31,6 @@
 [year without century, 01-  99]

 [Default events to show in new chat rooms if the 'event filter' is enabled]

 [Server: %s]

-[Font size]

 [Filter]

 [Manager]

 [Unique id]

diff --git a/langpacks/german/Untranslated/Plugins/SecureIM.txt b/langpacks/german/Untranslated/Plugins/SecureIM.txt
index 675d538bcd..fd83b44c6a 100644
--- a/langpacks/german/Untranslated/Plugins/SecureIM.txt
+++ b/langpacks/german/Untranslated/Plugins/SecureIM.txt
@@ -6,15 +6,12 @@
 [E&xport]

 [Set &keyrings...]

 [Load &Private key]

-[...]

 [Temp Dir:]

 [Debug]

 [Save Pass]

-[Ok]

 [PGP SecureIM]

 [GPG SecureIM]

 [RSA/AES SecureIM]

-[RSA SecureIM]

 [Encrypting File:]

 [Decrypting File:]

 [SecureIM: Error while decrypting the message.]

diff --git a/langpacks/german/Untranslated/Plugins/SendSS.txt b/langpacks/german/Untranslated/Plugins/SendSS.txt
index b306c09782..b3d6ac83bc 100644
--- a/langpacks/german/Untranslated/Plugins/SendSS.txt
+++ b/langpacks/german/Untranslated/Plugins/SendSS.txt
@@ -1,5 +1,4 @@
 [Dialog]

-[Send screenshot]

 [%s\nv%s]

 [GCHAT error]

 [Unable to initiate %s.]

diff --git a/langpacks/german/Untranslated/Plugins/SmileyAdd.txt b/langpacks/german/Untranslated/Plugins/SmileyAdd.txt
index 29d951742e..eea8d9d72d 100644
--- a/langpacks/german/Untranslated/Plugins/SmileyAdd.txt
+++ b/langpacks/german/Untranslated/Plugins/SmileyAdd.txt
@@ -1,6 +1,4 @@
-[...]

-[Version:]

-[Smileys]

+[Smileys]

 [Smiley #%u in file %s for Smiley Pack %s not found.]

 [Standard]

 [Regular Expression "%s" in smiley pack "%s" could produce "empty matches".]

diff --git a/langpacks/german/Untranslated/Plugins/SpellChecker.txt b/langpacks/german/Untranslated/Plugins/SpellChecker.txt
index dd08083281..f461cfee28 100644
--- a/langpacks/german/Untranslated/Plugins/SpellChecker.txt
+++ b/langpacks/german/Untranslated/Plugins/SpellChecker.txt
@@ -1,5 +1,4 @@
-[The correction can't be equal to the wrong word!]

-[tl_PH]

+[tl_PH]

 [Tagalog (Philippines)]

 [de_frami_neu]

 [German (Germany)]

diff --git a/langpacks/german/Untranslated/Plugins/SplashScreen.txt b/langpacks/german/Untranslated/Plugins/SplashScreen.txt
index c4965db304..a0b93f5058 100644
--- a/langpacks/german/Untranslated/Plugins/SplashScreen.txt
+++ b/langpacks/german/Untranslated/Plugins/SplashScreen.txt
@@ -1,5 +1,4 @@
-[...]

-[Your advaimg.dll is either obsolete or damaged. Get latest from Miranda alpha builds.]

+[Your advaimg.dll is either obsolete or damaged. Get latest from Miranda alpha builds.]

 [Call Splash Service]

 [Graphic files]

 [Skins]

diff --git a/langpacks/german/Untranslated/Plugins/StartupStatus.txt b/langpacks/german/Untranslated/Plugins/StartupStatus.txt
index 6b8ee53c8d..38b50a966c 100644
--- a/langpacks/german/Untranslated/Plugins/StartupStatus.txt
+++ b/langpacks/german/Untranslated/Plugins/StartupStatus.txt
@@ -1,10 +1,7 @@
-[Account Connection]

-[Accounts to check]

-[minutes of level 1 mode]

+[minutes of level 1 mode]

 [ms]

-[Specify settings for each account]

-[Use same settings for all accounts]

-[You enabled "Change my status mode to" in the "Idle" options dialog, AdvancedAutoAway's options are ignored.]

+[s]

+[x]

 [Trigger when connection loss is detected]

 [Trigger when reconnection attempt is made]

 [Trigger when successfull reconnected]

@@ -13,9 +10,6 @@
 [Trigger when a login error occurs]

 [HotKey1]

 [Hotkey]

-[Cancel all if a account connects from another location]

-[Set account offline before a connection attempt]

-[Max. account connecting time (secs)]

 [Entering first auto-away status]

 [Entering second auto-away status]

 [Leaving first auto-away status]

diff --git a/langpacks/german/Untranslated/Plugins/StopSpamMod.txt b/langpacks/german/Untranslated/Plugins/StopSpamMod.txt
index 6bd9f4507f..843f1b8f75 100644
--- a/langpacks/german/Untranslated/Plugins/StopSpamMod.txt
+++ b/langpacks/german/Untranslated/Plugins/StopSpamMod.txt
@@ -1,27 +1,4 @@
-[Answer:]

-[Vars]

-[>>>>]

-[>>]

-[<<]

-[<<<<]

-[Filtered accounts:]

-[Hide unanswered contacts and spammers from contact list]

-[Ignore spammers (do not write messages to history)]

-[Log spam to file]

-[Case insensitive answer checking]

-[Disable question in invisible mode]

-[Enable integration with DOS plugin]

-[Exclude contacts which we sending something from spam check]

-[Remove Excluded contacts after restart]

-[Add contacts to specified group:]

-[Ignore URL in messages and auth requests]

-[Add contact to server list]

-[After congratulation (ICQ only)]

-[Automatically grant authorization]

-[Request authorization from contacts which pass stopspam test]

-[Use regex for answers checking]

-[Use math expression in question]

-[Details..]

+[Vars]

 [Spammers made me to install small anti-spam system you are now speaking with.\r\nPlease reply "nospam" without quotes and spaces if you want to contact me.]

 [nospam]

 [If math expression is turned on you can use following expression in message text:\nXX+XX-X/X*X\neach X will be replaced by one ruandom number and answer will be expression result\nMessage must contain only one expression without spaces]

diff --git a/langpacks/german/Untranslated/Plugins/TabSRMM.txt b/langpacks/german/Untranslated/Plugins/TabSRMM.txt
index 68db7f4374..f5abff2959 100644
--- a/langpacks/german/Untranslated/Plugins/TabSRMM.txt
+++ b/langpacks/german/Untranslated/Plugins/TabSRMM.txt
@@ -1,29 +1,19 @@
 [Tray]

-[...]

-[Word lookup]

-[Google]

-[Wikipedia]

-[Link]

 [Undo  ]

-[Tabs]

 [TabSRMM exception]

 [Continue]

-[Exit Miranda]

 [Although the exception was caught and you may continue working with Miranda, you should restart the program as soon as possible. The exception may have damaged internal data structures and can have a serious impact on stability.]

 [Dialog]

-[   ]

 [...is typing]

 [...stopped typing]

 [PopUps timeout]

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

-[Ok]

 [Format]

 [&Quote]

 [LogLink]

 [Editor]

 [Tabmenu]

 [Picmenu]

-[Always keep the button bar at full width]

 [Logmenu]

 [Sendmenu]

 [Protomenu]

@@ -37,7 +27,6 @@
 [Panelpicmenu]

 [Splitter context]

 [Check1]

-[Notifications:]

 [One of your popup actions is set to DISMISS EVENT.\nNote that this options may have unwanted side effects as it REMOVES the event from the unread queue.\nThis may lead to events not showing up as "new". If you don't want this behaviour, please review the Event Notifications settings page.]

 [Unknown event]

 [Rich Edit file]

@@ -64,23 +53,14 @@
 [Message window warning]

 [This version of tabSRMM requires Windows 2000 or later.]

 [Previews not availble when using History++ plugin for message log display.]

-[%d Unread]

-[%d User(s)]

 [Carbon]

-[Enable "Paste and send" feature]

-[Support Math Module plugin]

 [Icon pack version check|The installed icon pack is outdated and might be incompatible with TabSRMM version 3.\n\n\\b1Missing or misplaced icons are possible issues with the currently installed icon pack.\\b0]

 [Aero peek warning|You have enabled Aero Peek features and loaded a custom container window skin\n\nThis can result in minor visual anomalies in the live preview feature.]

 [TabSRMM group chat module|TabSRMM could not enable its group chat module. The most likely cause is that you have installed and enabled \\b1chat.dll\\b0  or another plugin that provides groupchat services.\n\nShould I try to fix this now \\b1(a restart of Miranda is required to apply these changes)?\\b0]

 [Filetransfer problem|Sending the image by file transfer failed.\n\nPossible reasons: File transfers not supported, either you or the target contact is offline, or you are invisible and the target contact is not on your visibilty list.]

 [Settings problem|The option \\b1 History->Imitate IEView API\\b0  is enabled and the History++ plugin is active. This can cause problems when using IEView as message log viewer.\n\nShould I correct the option (a restart is required)?]

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

-[The topic is '%s%s']

-[ (set by %s on %s)]

-[%s enables '%s' status for %s]

-[%s disables '%s' status for %s]

 [Notice from %s: ]

-[<invalid>]

 [Group chat log background]

 [Input area background]

 [Outgoing background]

@@ -90,10 +70,5 @@
 [Outgoing background(old)]

 [UIN]

 [Fields background]

-[protocol name of current contact (if defined). Account name is used when protocol supports multiaccounts]

-[UserID of current contact (if defined). It is like UIN Number for ICQ, JID for Jabber, etc.]

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

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

 [Unique Id]

 [Unique id]

-[minute]

diff --git a/langpacks/german/Untranslated/Plugins/Tipper.txt b/langpacks/german/Untranslated/Plugins/Tipper.txt
index 1e9070edae..1640834f38 100644
--- a/langpacks/german/Untranslated/Plugins/Tipper.txt
+++ b/langpacks/german/Untranslated/Plugins/Tipper.txt
@@ -1,6 +1,4 @@
 [Layout]

-[Skins]

-[Aero Glass (Vista+)]

 [ms]

 [Invalid Substitution]

 [<No Label>]

@@ -42,9 +40,7 @@
 [Gujarati]

 [Hindi]

 [Khmer]

-[Mandarin]

 [Sindhi]

 [Tagalog]

-[Taiwanese]

 [Urdu]

 [Yoruba]

diff --git a/langpacks/german/Untranslated/Plugins/Tlen.txt b/langpacks/german/Untranslated/Plugins/Tlen.txt
index 99b70c5f89..ff76c141ad 100644
--- a/langpacks/german/Untranslated/Plugins/Tlen.txt
+++ b/langpacks/german/Untranslated/Plugins/Tlen.txt
@@ -33,7 +33,6 @@
 [Tlen Mail]

 [Send picture]

 [1 File]

-[%d Files]

 [Image sent file://%s]

 [Image received file://%s]

 [...Connecting...]

diff --git a/langpacks/german/Untranslated/Plugins/TooltipNotify.txt b/langpacks/german/Untranslated/Plugins/TooltipNotify.txt
index 3179faa6a2..7d5d1277fa 100644
--- a/langpacks/german/Untranslated/Plugins/TooltipNotify.txt
+++ b/langpacks/german/Untranslated/Plugins/TooltipNotify.txt
@@ -1,6 +1,4 @@
 [ms]

-[Behavior]

-[000%]

 [Tooltip Notify: Online]

 [Tooltip Notify: Offline]

 [Tooltip Notify: Other]

diff --git a/langpacks/german/Untranslated/Plugins/TopToolBar.txt b/langpacks/german/Untranslated/Plugins/TopToolBar.txt
index d1d9b3a79e..82fee10868 100644
--- a/langpacks/german/Untranslated/Plugins/TopToolBar.txt
+++ b/langpacks/german/Untranslated/Plugins/TopToolBar.txt
@@ -1,3 +1,2 @@
 [ToptoolBar adds buttons in top frame for fast access.]

-[...]

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

diff --git a/langpacks/german/Untranslated/Plugins/TrafficCounter.txt b/langpacks/german/Untranslated/Plugins/TrafficCounter.txt
index f0ac124d1c..f1e386d9d5 100644
--- a/langpacks/german/Untranslated/Plugins/TrafficCounter.txt
+++ b/langpacks/german/Untranslated/Plugins/TrafficCounter.txt
@@ -5,5 +5,3 @@
 [Traffic Counter]

 [Display/]

 [General/]

-["Toggle traffic counter" in main menu]

-[Year]

diff --git a/langpacks/german/Untranslated/Plugins/Twitter.txt b/langpacks/german/Untranslated/Plugins/Twitter.txt
index 3c223f0392..d4efdeb275 100644
--- a/langpacks/german/Untranslated/Plugins/Twitter.txt
+++ b/langpacks/german/Untranslated/Plugins/Twitter.txt
@@ -7,7 +7,6 @@
 [OAuth variables are out of sequence, they have been reset.  Please reconnect and reauthorise Miranda to Twitter.com (do the PIN stuff again)]

 [Failed to get Twitter Access Tokens, please go offline and try again.  If this keeps happening, check your internet connection.]

 [You're missing the Nick key in the database.  This isn't really a big deal, but you'll notice some minor quirks (self contact in list, no group chat outgoing message highlighting, etc).  To fix it either add it manually or reset your twitter account in the miranda account options]

-[Something went wrong with authorisation, OAuth keys have been reset.  Please try to reconnect.  If problems persist, please se your doctor]

 [Unable to get Netlib connection for Twitter]

 [Twitter]

 [Unable to get avatar Netlib connection for Twitter]

diff --git a/langpacks/german/Untranslated/Plugins/UInfoEx.txt b/langpacks/german/Untranslated/Plugins/UInfoEx.txt
index d5f707ae78..ba8eb63d7b 100644
--- a/langpacks/german/Untranslated/Plugins/UInfoEx.txt
+++ b/langpacks/german/Untranslated/Plugins/UInfoEx.txt
@@ -1,11 +1,7 @@
 [Gives extended ability to edit information about your contacts locally. ]

 [Edit Contact Information\nThis list gives you some overview about all your contact's anniversaries.]

-[Ok]

 [Partner:]

-[1.:]

-[2.:]

-[3.:]

-[00:00]

+[r]

 [Upcoming anniversaries\nThis list gives you some overview about all your contact's anniversaries.]

 [Show &during the next]

 [Setting/Event (20/100)]

@@ -14,7 +10,6 @@
 [Show Menu Item]

 [Replace the following default icons:]

 [Use &unknown flag if country can not be determined]

-[Syntax Error]

 [Proto]

 [Abord]

 [The Page to add has invalid size %d bytes!]

@@ -29,10 +24,8 @@
 [Gujarati]

 [Hindi]

 [Khmer]

-[Mandarin]

 [Sindhi]

 [Tagalog]

-[Taiwanese]

 [Urdu]

 [Yoruba]

 [Web Building]

diff --git a/langpacks/german/Untranslated/Plugins/Variables.txt b/langpacks/german/Untranslated/Plugins/Variables.txt
index 2c71202de1..7cc894504e 100644
--- a/langpacks/german/Untranslated/Plugins/Variables.txt
+++ b/langpacks/german/Untranslated/Plugins/Variables.txt
@@ -2,13 +2,3 @@
 [Tokens]

 [Alias]

 [user defined]

-[retrieves info from AMIP (x is var_<variable> with any AMIP variable)]

-[retrieves info from AMIP (x is AMIP format string)]

-[x + y + ...]

-[x - y - ...]

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

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

-[TRUE if service function exists]

-[XML]

-[apply stylesheet file x to document file y]

-[apply stylesheet x to document y]

diff --git a/langpacks/german/Untranslated/Plugins/Weather.txt b/langpacks/german/Untranslated/Plugins/Weather.txt
index 2a458b87bd..f6d0bd0db9 100644
--- a/langpacks/german/Untranslated/Plugins/Weather.txt
+++ b/langpacks/german/Untranslated/Plugins/Weather.txt
@@ -11,6 +11,7 @@
 [mm Hg (torr)]

 [Elevation]

 [ft]

+[m]

 [ID]

 [Updates]

 [Weather Protocol INI Setup]

diff --git a/langpacks/german/Untranslated/Plugins/WhenWasIt.txt b/langpacks/german/Untranslated/Plugins/WhenWasIt.txt
index 370b3e5378..ea81b86e25 100644
--- a/langpacks/german/Untranslated/Plugins/WhenWasIt.txt
+++ b/langpacks/german/Untranslated/Plugins/WhenWasIt.txt
@@ -1,12 +1,7 @@
-[Notify of birthdays:]

-[  ]

-[Dialog]

-[Set birthday:]

-[Manage anniversaries]

+[Manage anniversaries]

 [Please select the module where you want the date of birth to be saved.\r\n"UserInfo" is the default location.\r\nUse "Protocol module" to make the data visible in User Details.\n"mBirthday module" uses the same module as mBirthday plugin.]

 [N/A]

 [WhenWasIt]

-[WhenWasIt birthday reminder]

 [%s has birthday today (Should not happen, please report).]

 [Could not create worker thread. Error#%d - threadID %d]

 [Could not open file to import birthdays]

diff --git a/langpacks/german/Untranslated/Plugins/WhoUsesMyFiles.txt b/langpacks/german/Untranslated/Plugins/WhoUsesMyFiles.txt
index 395bd1fcfe..4e0573c095 100644
--- a/langpacks/german/Untranslated/Plugins/WhoUsesMyFiles.txt
+++ b/langpacks/german/Untranslated/Plugins/WhoUsesMyFiles.txt
@@ -2,7 +2,6 @@
 [PopUp Delay (seconds)]

 [File access filter && logging settings]

 [Please note that this settings has effect only with PopUps Interoperability plugin version 1.0.1.9 or higher]

-[...]

 [Log files and folders in UNC format]

 [Alert files && folders in UNC format]

 [Log computer name with username]

diff --git a/langpacks/german/Untranslated/Plugins/Xfire.txt b/langpacks/german/Untranslated/Plugins/Xfire.txt
index 28aef6d7cc..6ac1c301a9 100644
--- a/langpacks/german/Untranslated/Plugins/Xfire.txt
+++ b/langpacks/german/Untranslated/Plugins/Xfire.txt
@@ -3,26 +3,25 @@
 [icons.dll]

 [Unreal Tournament 2004]

 [IP:]

-[255.255.255.255]

-[27770]

 [Userdetails]

 [dufte]

 [Enter Password]

 [Custom ...]

 [Parameter:]

-[Add a new game]

 [Well, I would talk to you if Miranda ICQ supported chat]

 [The Icons.dll was updated.]

 [%s (Nickname: %s) has invited you to join the %s clan. Message: %s%sPlease go to the XFireclan-Site to accept the Invitation.]

 [Friends of Friends Playing]

 [XFire is not connected.]

-[xfirebstartgame]

+[ServerIP]

+[My Current ServerIP]

+[My Current Voice]

+[Voice ServerIP]

+[My Voice ServerIP]

 [It seems that is the first time you use this plugin. Do you want to automatically download the latest available xfire_games.ini und icons.dll?\r\nWithout the ini xfire cant detect any games on your computer.]

 [&XFire Online Profile]

 [XFire &Clan Site]

 [Protocols/XFire]

 [XFire does not support offline messaging!]

-[%s is playing %s.]

-[%s is playing %s on server %d.%d.%d.%d:%d.]

 [The changes you have made require you to reconnect to the XFire network before they take effect]

 [Messagebox]

diff --git a/langpacks/german/Untranslated/Plugins/YAMN.txt b/langpacks/german/Untranslated/Plugins/YAMN.txt
index c84e347dec..3df6d688d7 100644
--- a/langpacks/german/Untranslated/Plugins/YAMN.txt
+++ b/langpacks/german/Untranslated/Plugins/YAMN.txt
@@ -1,13 +1,5 @@
-[List4]

-[List5]

-[Version:]

-[WWW:]

-[...]

-[Server:]

-[SSL]

-[APOP]

+[WWW:]

 [N/A]

-[Enable YAMN Main Menu]

 [%s - connection error]

 [An error occured. Error code: %d]

 [ - connection error]

diff --git a/langpacks/german/Untranslated/Plugins/Yahoo.txt b/langpacks/german/Untranslated/Plugins/Yahoo.txt
index de67be10af..d96a676acc 100644
--- a/langpacks/german/Untranslated/Plugins/Yahoo.txt
+++ b/langpacks/german/Untranslated/Plugins/Yahoo.txt
@@ -5,7 +5,6 @@
 [Denial Message]

 [Invitation Message]

 [Host]

-[Avatar upload failed!?!]

 [[miranda] Got conference invite to room: %s with msg: %s]

 [%s denied invitation with message: %s]

 [Join My Conference...]

@@ -16,5 +15,4 @@
 [[miranda] Got webcam invite. (not currently supported)]

 [Unknown Error??.]

 [Yahoo System Message]

-[You have been logged out of the yahoo service.]

 [Custom error %s]