From cb2880d9217139d86681c1d524e46ea318ef1726 Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Mon, 29 Dec 2014 16:09:27 +0100
Subject: [PATCH] [Dominik George] updated german translation

---
 po/de.po | 2422 +++++++++++++++++++++++++++---------------------------
 1 file changed, 1203 insertions(+), 1219 deletions(-)

diff --git a/po/de.po b/po/de.po
index 338713d041..688847a1df 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,13 +7,14 @@
 # Sebastian Schäfer <sarek@uliweb.de>, 2007.
 # Nico Gulden <cilugnedon@gmx.de>, 2007, 2008, 2009, 2010.
 # Niklas Hambüchen <nh2@deditus.de>, 2009.
+# Dominik George <nik@naturalnet.de>, 2014.
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.13\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-29 15:27+0200\n"
+"POT-Creation-Date: 2014-12-29 16:07+0100\n"
 "PO-Revision-Date: 2010-08-03 22:43+0200\n"
-"Last-Translator: Nico Gulden <cilugnedon@gmx.de>\n"
+"Last-Translator: Dominik George <nik@naturalnet.de>\n"
 "Language-Team: German <translators@gajim.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
@@ -32,12 +33,15 @@ msgid "_Personal Events"
 msgstr "_Persönliche Ereignisse"
 
 #: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "_Start Chat..."
 msgstr "_Chat starten …"
 
-#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/roster_window.ui.h:5
-msgid "Join _Group Chat..."
-msgstr "_Gruppenchat betreten …"
+#: ../data/gui/account_context_menu.ui.h:4
+#: ../data/gui/chat_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:5
+#: ../data/gui/systray_context_menu.ui.h:3
+msgid "Join _Group Chat"
+msgstr "_Chatraum betreten …"
 
 #: ../data/gui/account_context_menu.ui.h:5
 msgid "_Add Contact..."
@@ -56,8 +60,9 @@ msgid "_Open Gmail Inbox"
 msgstr "Google-Mail-Posteingang _öffnen"
 
 #: ../data/gui/account_context_menu.ui.h:9
-msgid "_Modify Account"
-msgstr "Konto _bearbeiten"
+#: ../data/gui/zeroconf_context_menu.ui.h:2
+msgid "_Modify Account..."
+msgstr "_Konto bearbeiten …"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:1
 msgid "Gajim: Account Creation Wizard"
@@ -178,13 +183,13 @@ msgstr "_Beenden"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:30
 #: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1
-#: ../src/config.py:1253 ../src/config.py:1267 ../src/config.py:1272
-#: ../src/config.py:1320 ../src/config.py:1423 ../src/config.py:1742
-#: ../src/config.py:1747 ../src/config.py:2339 ../src/config.py:2420
-#: ../src/config.py:2435 ../src/config.py:3716 ../src/config.py:3791
-#: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523
-#: ../src/dialogs.py:536 ../src/roster_window.py:3147
-#: ../src/roster_window.py:3153 ../src/roster_window.py:3158
+#: ../src/config.py:1258 ../src/config.py:1273 ../src/config.py:1278
+#: ../src/config.py:1326 ../src/config.py:1429 ../src/config.py:1748
+#: ../src/config.py:1753 ../src/config.py:2356 ../src/config.py:2438
+#: ../src/config.py:2453 ../src/config.py:3748 ../src/config.py:3823
+#: ../src/dialogs.py:316 ../src/dialogs.py:318 ../src/dialogs.py:524
+#: ../src/dialogs.py:537 ../src/roster_window.py:3185
+#: ../src/roster_window.py:3191 ../src/roster_window.py:3196
 msgid "None"
 msgstr "Kein Proxy"
 
@@ -193,26 +198,25 @@ msgid "Accounts"
 msgstr "Konten"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3524
-#: ../src/dialogs.py:3570
+#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3534
+#: ../src/dialogs.py:3580
 msgid "Add"
 msgstr "Hinzufügen"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3528
-#: ../src/dialogs.py:3625
+#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3538
+#: ../src/dialogs.py:3635
 msgid "Delete"
 msgstr "Löschen"
 
-#. Rename
-#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5792
+#: ../data/gui/accounts_window.ui.h:5
 msgid "Re_name"
 msgstr "_Umbenennen"
 
-#. XML Console enable checkbutton
-#: ../data/gui/accounts_window.ui.h:6 ../data/gui/xml_console_window.ui.h:3
-msgid "_Enable"
-msgstr "Aktivi_eren"
+#: ../data/gui/accounts_window.ui.h:6 ../src/config.py:4196
+#: ../src/plugins/gui.py:92
+msgid "Active"
+msgstr "Aktiv"
 
 #: ../data/gui/accounts_window.ui.h:7
 msgid "Anonymous authentication"
@@ -346,10 +350,14 @@ msgstr ""
 "entsprechend geändert."
 
 #: ../data/gui/accounts_window.ui.h:35
+msgid "Receive conversations from other resources (If server supports it)"
+msgstr ""
+
+#: ../data/gui/accounts_window.ui.h:36
 msgid "Use file transfer proxies"
 msgstr "Dateiübertragungs-Proxys verwenden"
 
-#: ../data/gui/accounts_window.ui.h:36
+#: ../data/gui/accounts_window.ui.h:37
 msgid ""
 "If checked, Gajim will also broadcast some more IPs except from just your "
 "IP, so file transfer has higher chances of working."
@@ -358,34 +366,35 @@ msgstr ""
 "Adresse, wodurch die Wahrscheinlichkeit einer erfolgreichen Dateiübertragung "
 "erhöht wird."
 
+#. nick choosen by contact
 #. FIXME: Ugly workaround.
 #. FIXME: Ugly workaround.
 #. Maybe we haven't been in any group (defaults to General)
 #. General group cannot be changed
-#: ../data/gui/accounts_window.ui.h:37 ../data/gui/preferences_window.ui.h:41
-#: ../src/common/contacts.py:135 ../src/dialogs.py:115 ../src/dialogs.py:127
-#: ../src/roster_window.py:3089 ../src/roster_window.py:4215
-#: ../src/roster_window.py:5842
+#: ../data/gui/accounts_window.ui.h:38 ../data/gui/preferences_window.ui.h:41
+#: ../src/common/contacts.py:102 ../src/common/contacts.py:135
+#: ../src/dialogs.py:116 ../src/dialogs.py:128 ../src/roster_window.py:3127
+#: ../src/roster_window.py:4257 ../src/roster_window.py:5902
 msgid "General"
 msgstr "Allgemein"
 
-#: ../data/gui/accounts_window.ui.h:38
+#: ../data/gui/accounts_window.ui.h:39
 msgid "_use HTTP__PROXY environment variable"
 msgstr "Umgebungsvariable HTTP__PROXY ben_utzen"
 
-#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:134
+#: ../data/gui/accounts_window.ui.h:40 ../data/gui/preferences_window.ui.h:134
 msgid "_Manage..."
 msgstr "_Verwalten …"
 
-#: ../data/gui/accounts_window.ui.h:40
+#: ../data/gui/accounts_window.ui.h:41
 msgid "<b>Proxy</b>"
 msgstr "<b>Proxy</b>"
 
-#: ../data/gui/accounts_window.ui.h:41
+#: ../data/gui/accounts_window.ui.h:42
 msgid "_Warn before using an insecure connection"
 msgstr "_Warnen, bevor eine unsichere Verbindung verwendet wird"
 
-#: ../data/gui/accounts_window.ui.h:42
+#: ../data/gui/accounts_window.ui.h:43
 msgid ""
 "Check this so Gajim will ask you before sending your password over an "
 "insecure connection."
@@ -393,11 +402,11 @@ msgstr ""
 "Falls aktiviert, fragt Gajim nach, bevor das Passwort über eine unsichere "
 "Verbindung gesendet wird."
 
-#: ../data/gui/accounts_window.ui.h:43
+#: ../data/gui/accounts_window.ui.h:44
 msgid "Send _keep-alive packets"
 msgstr "_Keepalive-Pakete senden"
 
-#: ../data/gui/accounts_window.ui.h:44
+#: ../data/gui/accounts_window.ui.h:45
 msgid ""
 "If checked, Gajim will send keep-alive packets to prevent connection timeout "
 "which results in disconnection"
@@ -405,79 +414,79 @@ msgstr ""
 "Falls aktiviert, sendet Gajim regelmäßig Keepalive-Pakete, um einen "
 "Verbindungsabbruch durch eine Zeitüberschreitung zu verhindern."
 
-#: ../data/gui/accounts_window.ui.h:45
+#: ../data/gui/accounts_window.ui.h:46
 msgid "Use cust_om hostname/port"
 msgstr "Benutzerdefinierten Rechnernamen und P_ort verwenden"
 
-#: ../data/gui/accounts_window.ui.h:46
+#: ../data/gui/accounts_window.ui.h:47
 msgid "_Hostname: "
 msgstr "Rec_hnername: "
 
-#: ../data/gui/accounts_window.ui.h:47
+#: ../data/gui/accounts_window.ui.h:48
 msgid "_Port: "
 msgstr "_Port: "
 
-#: ../data/gui/accounts_window.ui.h:48 ../data/gui/preferences_window.ui.h:138
+#: ../data/gui/accounts_window.ui.h:49 ../data/gui/preferences_window.ui.h:138
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Verschiedenes</b>"
 
-#: ../data/gui/accounts_window.ui.h:49
+#: ../data/gui/accounts_window.ui.h:50
 msgid "Connection"
 msgstr "Verbindung"
 
-#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1840
-#: ../src/config.py:2436
+#: ../data/gui/accounts_window.ui.h:51 ../src/config.py:1846
+#: ../src/config.py:2454
 msgid "No key selected"
 msgstr "Kein Schlüssel ausgewählt"
 
-#: ../data/gui/accounts_window.ui.h:51
+#: ../data/gui/accounts_window.ui.h:52
 msgid "Choose _Key..."
 msgstr "_Schlüssel wählen …"
 
-#: ../data/gui/accounts_window.ui.h:52
+#: ../data/gui/accounts_window.ui.h:53
 msgid "Use G_PG Agent"
 msgstr "G_PG Schlüsselverwaltung verwenden"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../data/gui/accounts_window.ui.h:53
+#: ../data/gui/accounts_window.ui.h:54
 msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
 msgstr ""
 "Falls aktiviert, bezieht Gajim das Passwort von einem GPG-Agenten wie "
 "seahorse."
 
-#: ../data/gui/accounts_window.ui.h:54
+#: ../data/gui/accounts_window.ui.h:55
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../data/gui/accounts_window.ui.h:55
+#: ../data/gui/accounts_window.ui.h:56
 msgid "_Edit Personal Information..."
 msgstr "Persönliche Informationen b_earbeiten …"
 
-#: ../data/gui/accounts_window.ui.h:56
+#: ../data/gui/accounts_window.ui.h:57
 msgid "Information about you, as stored in the server"
 msgstr "Informationen über Sie, die auf dem Server gespeichert sind"
 
-#: ../data/gui/accounts_window.ui.h:57
+#: ../data/gui/accounts_window.ui.h:58
 msgid "<b>Personal Information</b>"
 msgstr "<b>Persönliche Informationen</b>"
 
-#: ../data/gui/accounts_window.ui.h:58 ../data/gui/profile_window.ui.h:1
+#: ../data/gui/accounts_window.ui.h:59 ../data/gui/profile_window.ui.h:1
 msgid "Personal Information"
 msgstr "Persönliche Informationen"
 
-#: ../data/gui/accounts_window.ui.h:59
+#: ../data/gui/accounts_window.ui.h:60
 msgid "Co_nnect on Gajim startup"
 msgstr "Beim _Programmstart verbinden"
 
-#: ../data/gui/accounts_window.ui.h:60
+#: ../data/gui/accounts_window.ui.h:61
 msgid "Synchroni_ze account status with global status"
 msgstr "Konto-Status mit globalem Status synchroni_sieren"
 
-#: ../data/gui/accounts_window.ui.h:61
+#: ../data/gui/accounts_window.ui.h:62
 msgid "Use cust_om port:"
 msgstr "Benutzerdefinierten P_ort verwenden:"
 
-#: ../data/gui/accounts_window.ui.h:62
+#: ../data/gui/accounts_window.ui.h:63
 msgid ""
 "If the default port that is used for incoming messages is unfitting for your "
 "setup you can select another one here.\n"
@@ -488,28 +497,28 @@ msgstr ""
 "festlegen.\n"
 "Eventuell müssen Sie dazu Ihre Firewall-Einstellungen ändern."
 
-#: ../data/gui/accounts_window.ui.h:64
+#: ../data/gui/accounts_window.ui.h:65
 #: ../data/gui/zeroconf_information_window.ui.h:10
 msgid "First Name:"
 msgstr "Vorname:"
 
-#: ../data/gui/accounts_window.ui.h:65
+#: ../data/gui/accounts_window.ui.h:66
 #: ../data/gui/zeroconf_information_window.ui.h:9
 msgid "Last Name:"
 msgstr "Nachname:"
 
-#: ../data/gui/accounts_window.ui.h:66
+#: ../data/gui/accounts_window.ui.h:67
 #: ../data/gui/zeroconf_information_window.ui.h:8
 msgid "E-Mail:"
 msgstr "E-Mail:"
 
-#: ../data/gui/accounts_window.ui.h:67
-#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1867
-#: ../src/dialogs.py:841
+#: ../data/gui/accounts_window.ui.h:68
+#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1873
+#: ../src/dialogs.py:842
 msgid "Jabber ID:"
 msgstr "Jabber-ID:"
 
-#: ../data/gui/accounts_window.ui.h:68
+#: ../data/gui/accounts_window.ui.h:69
 msgid "Mer_ge accounts"
 msgstr "Konten _zusammenführen"
 
@@ -645,9 +654,8 @@ msgid "Show _XML Console"
 msgstr "_XML-Konsole anzeigen"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:2
-#, fuzzy
 msgid "Edit Archi_ving Preferences"
-msgstr "_Einstellungen"
+msgstr "Archi_veinstellungen bearbeiten"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Edit _Privacy Lists..."
@@ -691,43 +699,40 @@ msgid "Deletes Message of the Day"
 msgstr "Löscht die Nachricht des Tages (MOTD)."
 
 #: ../data/gui/archiving_preferences_window.ui.h:1
-#, fuzzy
 msgid "No"
-msgstr "Kein Proxy"
+msgstr "Nein"
 
 #: ../data/gui/archiving_preferences_window.ui.h:2
 msgid "Yes"
-msgstr ""
+msgstr "Ja"
 
 #: ../data/gui/archiving_preferences_window.ui.h:3
-#, fuzzy
 msgid "Prefer"
-msgstr "Einstellungen"
+msgstr "Vorziehen"
 
 #: ../data/gui/archiving_preferences_window.ui.h:4
 msgid "Concede"
-msgstr ""
+msgstr "Erlauben"
 
 #: ../data/gui/archiving_preferences_window.ui.h:5
 msgid "Forbid"
-msgstr ""
+msgstr "Verbieten"
 
 #: ../data/gui/archiving_preferences_window.ui.h:6
 msgid "<i>Method Manual</i>"
-msgstr ""
+msgstr "<i>Methode: Manuell</i>"
 
 #: ../data/gui/archiving_preferences_window.ui.h:7
 msgid "<i>Method Local</i>"
-msgstr ""
+msgstr "<i>Methode: Lokal</i>"
 
 #: ../data/gui/archiving_preferences_window.ui.h:8
 msgid "<i>Method Auto</i>"
-msgstr ""
+msgstr "<i>Methode: Automatisch</i>"
 
 #: ../data/gui/archiving_preferences_window.ui.h:9
-#, fuzzy
 msgid "Auto"
-msgstr "Automatisch verbinden"
+msgstr "Automatisch"
 
 #: ../data/gui/atom_entry_window.ui.h:1
 msgid "New entry received"
@@ -760,8 +765,8 @@ msgstr "blockierte Kontakte"
 # TODO: Review by german translators
 #: ../data/gui/blocked_contacts_window.ui.h:2
 #: ../data/gui/contact_context_menu.ui.h:20
-#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5811
-#: ../src/roster_window.py:5938 ../src/roster_window.py:6071
+#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/gui_menu_builder.py:674
+#: ../src/roster_window.py:5871 ../src/roster_window.py:6005
 msgid "_Unblock"
 msgstr "_Entblocken"
 
@@ -835,14 +840,9 @@ msgstr "E-Mail-Pr_ogramm öffnen"
 
 #: ../data/gui/chat_context_menu.ui.h:5
 #: ../data/gui/subscription_request_popup_menu.ui.h:1
-#: ../data/gui/systray_context_menu.ui.h:2
 msgid "_Start Chat"
 msgstr "Chat _starten"
 
-#: ../data/gui/chat_context_menu.ui.h:6
-msgid "Join _Group Chat"
-msgstr "_Chatraum betreten …"
-
 #: ../data/gui/chat_context_menu.ui.h:7
 #: ../data/gui/contact_context_menu.ui.h:24
 msgid "_Add to Roster..."
@@ -879,57 +879,56 @@ msgid "#"
 msgstr "Nr."
 
 #: ../data/gui/chat_control.ui.h:8 ../data/gui/groupchat_control.ui.h:8
-#: ../data/gui/single_message_window.ui.h:6
-msgid "Send message"
-msgstr "Nachricht senden"
-
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/gui/chat_control.ui.h:10 ../data/gui/groupchat_control.ui.h:10
 #: ../data/gui/xml_console_window.ui.h:15 ../src/filetransfers_window.py:322
 msgid "_Send"
 msgstr "_Senden"
 
-#: ../data/gui/chat_control.ui.h:11
+#: ../data/gui/chat_control.ui.h:9 ../data/gui/groupchat_control.ui.h:9
+#: ../data/gui/single_message_window.ui.h:6
+msgid "Send message"
+msgstr "Nachricht senden"
+
+#: ../data/gui/chat_control.ui.h:10
 msgid "1"
 msgstr "1"
 
-#: ../data/gui/chat_control.ui.h:12
+#: ../data/gui/chat_control.ui.h:11
 msgid "2"
 msgstr "2"
 
-#: ../data/gui/chat_control.ui.h:13
+#: ../data/gui/chat_control.ui.h:12
 msgid "3"
 msgstr "3"
 
-#: ../data/gui/chat_control.ui.h:14
+#: ../data/gui/chat_control.ui.h:13
 msgid "4"
 msgstr "4"
 
-#: ../data/gui/chat_control.ui.h:15
+#: ../data/gui/chat_control.ui.h:14
 msgid "5"
 msgstr "5"
 
-#: ../data/gui/chat_control.ui.h:16
+#: ../data/gui/chat_control.ui.h:15
 msgid "6"
 msgstr "6"
 
-#: ../data/gui/chat_control.ui.h:17
+#: ../data/gui/chat_control.ui.h:16
 msgid "7"
 msgstr "7"
 
-#: ../data/gui/chat_control.ui.h:18
+#: ../data/gui/chat_control.ui.h:17
 msgid "8"
 msgstr "8"
 
-#: ../data/gui/chat_control.ui.h:19
+#: ../data/gui/chat_control.ui.h:18
 msgid "9"
 msgstr "9"
 
-#: ../data/gui/chat_control.ui.h:20
+#: ../data/gui/chat_control.ui.h:19
 msgid "*"
 msgstr "*"
 
-#: ../data/gui/chat_control.ui.h:21 ../data/gui/single_message_window.ui.h:3
+#: ../data/gui/chat_control.ui.h:20 ../data/gui/single_message_window.ui.h:3
 msgid "0"
 msgstr "0"
 
@@ -961,7 +960,9 @@ msgstr "_Einladen zu"
 msgid "Start _Chat"
 msgstr "_Chat starten"
 
+#. Send single message
 #: ../data/gui/contact_context_menu.ui.h:2 ../data/gui/roster_window.ui.h:4
+#: ../data/gui/systray_context_menu.ui.h:4 ../src/gui_menu_builder.py:584
 msgid "Send Single _Message..."
 msgstr "Einzelne _Nachricht senden …"
 
@@ -969,11 +970,10 @@ msgstr "Einzelne _Nachricht senden …"
 msgid "Send _File..."
 msgstr "_Datei senden …"
 
-#. Invite to
 #. Invite to Groupchat
 #: ../data/gui/contact_context_menu.ui.h:4
-#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5747
-#: ../src/roster_window.py:5906
+#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5801
+#: ../src/roster_window.py:5972
 msgid "In_vite to"
 msgstr "_Einladen zu"
 
@@ -990,12 +990,14 @@ msgstr "Open_PGP-Verschlüsselung aktivieren"
 msgid "Toggle End to End Encryption"
 msgstr "ESession-Verschlüsselung aktivieren"
 
-#: ../data/gui/contact_context_menu.ui.h:8 ../src/roster_window.py:5757
-#: ../src/roster_window.py:5995
+#. Send Custom Status
+#: ../data/gui/contact_context_menu.ui.h:8 ../src/gui_menu_builder.py:598
+#: ../src/roster_window.py:5812
 msgid "Send Cus_tom Status"
 msgstr "Benu_tzerdefinierten Status senden"
 
-#: ../data/gui/contact_context_menu.ui.h:9
+#. Execute Command
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/gui_menu_builder.py:634
 msgid "E_xecute Command..."
 msgstr "B_efehl ausführen …"
 
@@ -1004,11 +1006,14 @@ msgstr "B_efehl ausführen …"
 msgid "M_anage Contact"
 msgstr "Kontakt _verwalten"
 
-#: ../data/gui/contact_context_menu.ui.h:11
+#. Rename
+#: ../data/gui/contact_context_menu.ui.h:11 ../src/gui_menu_builder.py:661
+#: ../src/roster_window.py:5852
 msgid "_Rename..."
 msgstr "_Umbenennen …"
 
-#: ../data/gui/contact_context_menu.ui.h:12
+#. Edit Groups
+#: ../data/gui/contact_context_menu.ui.h:12 ../src/roster_window.py:5994
 msgid "Edit _Groups..."
 msgstr "_Gruppen bearbeiten …"
 
@@ -1045,8 +1050,8 @@ msgid "_Forbid contact to see my status"
 msgstr "_Verbiete dem Kontakt, meinen Status zu sehen"
 
 #: ../data/gui/contact_context_menu.ui.h:21
-#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5819
-#: ../src/roster_window.py:5944 ../src/roster_window.py:6074
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/gui_menu_builder.py:677
+#: ../src/roster_window.py:5879 ../src/roster_window.py:6011
 msgid "_Block"
 msgstr "_Blockieren"
 
@@ -1058,14 +1063,17 @@ msgstr "Ignorieren a_ufheben"
 msgid "_Ignore"
 msgstr "_Ignorieren"
 
-#: ../data/gui/contact_context_menu.ui.h:25
+#. Remove
+#. Remove group
+#: ../data/gui/contact_context_menu.ui.h:25 ../src/gui_menu_builder.py:687
+#: ../src/roster_window.py:5889
 msgid "Remo_ve"
 msgstr "Ent_fernen"
 
 #: ../data/gui/contact_context_menu.ui.h:26
 #: ../data/gui/gc_control_popup_menu.ui.h:9
 #: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19
-#: ../src/roster_window.py:6145
+#: ../src/roster_window.py:6087
 msgid "_History"
 msgstr "_Verlauf"
 
@@ -1123,16 +1131,20 @@ msgstr ""
 "Zeige eine Popup-Benachrichtigung, wenn die Datei komplett übertragen wurde."
 
 #: ../data/gui/filetransfers.ui.h:7
+msgid "Clean _up"
+msgstr "Aufrä_umen"
+
+#: ../data/gui/filetransfers.ui.h:8
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr ""
 "Entfernt beendete, abgebrochene und fehlgeschlagene Dateiübertragungen aus "
 "der Liste."
 
-#: ../data/gui/filetransfers.ui.h:8
+#: ../data/gui/filetransfers.ui.h:9
 msgid "Remove file transfer from the list."
 msgstr "Entferne Dateiübertragung aus der Liste"
 
-#: ../data/gui/filetransfers.ui.h:9
+#: ../data/gui/filetransfers.ui.h:10
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -1140,10 +1152,6 @@ msgstr ""
 "Diese Aktion entfernt eine Dateiübertragung aus der Liste. Falls die "
 "Übertragung aktiv ist, wird sie erst gestoppt und anschließend entfernt."
 
-#: ../data/gui/filetransfers.ui.h:10
-msgid "Clean _up"
-msgstr "Aufrä_umen"
-
 #: ../data/gui/filetransfers.ui.h:11
 msgid "_Pause"
 msgstr "_Pause"
@@ -1171,7 +1179,7 @@ msgstr "Versteckt das Fenster."
 msgid "_Continue"
 msgstr "_Fortsetzen"
 
-#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3351
+#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3390
 #: ../src/filetransfers_window.py:213
 msgid "_Open Containing Folder"
 msgstr "Öffne _Ordner"
@@ -1212,11 +1220,11 @@ msgstr "Schri_ftart:"
 msgid "Font style:"
 msgstr "Schriftart:"
 
-#: ../data/gui/gajim_themes_window.ui.h:10 ../src/chat_control.py:1045
+#: ../data/gui/gajim_themes_window.ui.h:10 ../src/chat_control.py:1041
 msgid "Bold"
 msgstr "Fett"
 
-#: ../data/gui/gajim_themes_window.ui.h:11 ../src/chat_control.py:1046
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/chat_control.py:1042
 msgid "Italic"
 msgstr "Kursiv"
 
@@ -1281,11 +1289,10 @@ msgid "_Minimize on close"
 msgstr "Beim Schließen _minimieren"
 
 #: ../data/gui/gc_control_popup_menu.ui.h:7
-#, fuzzy
 msgid "_Request Voice"
-msgstr "_Stimme verleihen"
+msgstr "Stimme anfo_rdern"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1843
+#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1851
 msgid "_Bookmark"
 msgstr "Chatraum zu den Lesezeichen _hinzufügen"
 
@@ -1446,16 +1453,15 @@ msgstr "_Logge die Statusveränderungen von Kontakten"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:1
 msgid "expire"
-msgstr ""
+msgstr "ablaufen"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:2
 msgid "save"
-msgstr ""
+msgstr "speichern"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:3
-#, fuzzy
 msgid "otr"
-msgstr "Heiß"
+msgstr "OTR"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:4
 #: ../src/gajim-remote.py:230
@@ -1463,47 +1469,47 @@ msgid "jid"
 msgstr "Jabber-ID"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:5
-#, fuzzy
 msgid "body"
-msgstr "Jeder"
+msgstr "body"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:6
 msgid "false"
-msgstr ""
+msgstr "nein"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:7
+#: ../src/common/connection_handlers.py:1180
 msgid "message"
 msgstr "Nachricht"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:8
 msgid "stream"
-msgstr ""
+msgstr "Stream"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:9
 msgid "approve"
-msgstr ""
+msgstr "Bestätigen"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:10
 msgid "concede"
-msgstr ""
+msgstr "Erlauben"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:11
 msgid "forbid"
-msgstr ""
+msgstr "verbieten"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:12
 msgid "oppose"
-msgstr ""
+msgstr "entgegnen"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:13
 msgid "prefer"
-msgstr ""
+msgstr "vorziehen"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:14
 msgid "require"
-msgstr ""
+msgstr "einfordern"
 
-#: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2416
+#: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2420
 msgid "Join Group Chat"
 msgstr "Chatraum betreten"
 
@@ -1532,7 +1538,7 @@ msgstr "Betrete diesen Chatraum _automatisch, wenn ich mich verbinde"
 msgid "_Bookmark this room"
 msgstr "Diesen _Chatraum merken"
 
-#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1857
+#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1863
 msgid "Server:"
 msgstr "Server:"
 
@@ -1540,8 +1546,8 @@ msgstr "Server:"
 msgid "Bro_wse Rooms"
 msgstr "Räume _Durchsuchen"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3386
-#: ../src/disco.py:1396 ../src/disco.py:1847
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3425
+#: ../src/disco.py:1413 ../src/disco.py:1855
 msgid "_Join"
 msgstr "_Betreten"
 
@@ -1551,29 +1557,25 @@ msgstr "Chatraum-Lesezeichen"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:4
 msgid "Roo_m:"
-msgstr ""
+msgstr "Rau_m:"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:6
-#, fuzzy
 msgid "_Title:"
-msgstr "Titel:"
+msgstr "_Titel:"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:7
-#, fuzzy
 msgid "Pr_int status:"
-msgstr "Status anzeigen:"
+msgstr "Status anze_igen:"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:8
-#, fuzzy
 msgid "A_uto join"
-msgstr "Automatisch verbinden"
+msgstr "A_utomatisch verbinden"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:9
 msgid "If checked, Gajim will join this group chat on startup"
 msgstr "Falls aktiviert, tritt Gajim diesem Chatraum beim Programmstart bei."
 
 #: ../data/gui/manage_bookmarks_window.ui.h:10
-#, fuzzy
 msgid "Minimi_ze on Auto Join"
 msgstr "Minimieren bei automatischem Beitritt"
 
@@ -1656,57 +1658,52 @@ msgstr "Passphrase"
 
 #: ../data/gui/plugins_window.ui.h:1
 msgid "Plugins"
-msgstr ""
+msgstr "Plugins"
 
 #: ../data/gui/plugins_window.ui.h:2
+#, fuzzy
 msgid "Install from zip"
-msgstr ""
+msgstr "Installieren"
 
 #: ../data/gui/plugins_window.ui.h:3
 msgid "&lt;empty&gt;"
-msgstr ""
+msgstr "&lt;leer&gt;"
 
 #: ../data/gui/plugins_window.ui.h:4
-#, fuzzy
 msgid "Version:"
-msgstr "GTK+-Version:"
+msgstr "Version:"
 
 #: ../data/gui/plugins_window.ui.h:5
 msgid "<empty>"
-msgstr ""
+msgstr "<leer>"
 
 #: ../data/gui/plugins_window.ui.h:6
-#, fuzzy
 msgid "Authors:"
-msgstr "Au_torisieren"
+msgstr "Autoren:"
 
 #: ../data/gui/plugins_window.ui.h:7
-#, fuzzy
 msgid "Homepage:"
-msgstr "<b>Homepage:</b>"
+msgstr "Homepage:"
 
 #: ../data/gui/plugins_window.ui.h:8
 msgid "homepage url"
-msgstr ""
+msgstr "Homepage-URL"
 
 #: ../data/gui/plugins_window.ui.h:9
-#, fuzzy
 msgid "Description:"
 msgstr "Beschreibung: "
 
 #: ../data/gui/plugins_window.ui.h:10
 msgid "Uninstall"
-msgstr ""
+msgstr "Deinstallieren"
 
 #: ../data/gui/plugins_window.ui.h:11
-#, fuzzy
 msgid "Configure"
-msgstr "_Einstellen"
+msgstr "Konfigurieren"
 
 #: ../data/gui/plugins_window.ui.h:12
-#, fuzzy
 msgid "Installed"
-msgstr "Steht still"
+msgstr "Installiert"
 
 #: ../data/gui/plugins_window.ui.h:13
 msgid ""
@@ -1723,9 +1720,8 @@ msgid "Event desc"
 msgstr "Ereignisbeschreibung"
 
 #: ../data/gui/preferences_window.ui.h:1
-#, fuzzy
 msgid "Use default applications"
-msgstr "Immer KDE Standardanwendungen verwenden"
+msgstr "Standardanwendungen verwenden"
 
 #: ../data/gui/preferences_window.ui.h:2
 msgid "Custom"
@@ -1789,9 +1785,8 @@ msgid "Detached roster with chat grouped by type"
 msgstr "Abgelöste Kontaktliste mit Chat gruppiert nach Typ"
 
 #: ../data/gui/preferences_window.ui.h:17
-#, fuzzy
 msgid "Last state"
-msgstr "Letzter Status: %s"
+msgstr "Letzter Status"
 
 #: ../data/gui/preferences_window.ui.h:18
 msgid "Preferences"
@@ -1854,30 +1849,18 @@ msgid "_Window behavior:"
 msgstr "_Fensterverhalten:"
 
 #: ../data/gui/preferences_window.ui.h:30
-msgid ""
-"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
-"animated or static graphical emoticons"
-msgstr ""
-"Falls aktiviert, werden ASCII-Smilies wie \":)\" mit äquivalenten "
-"graphischen Emoticons ersetzt."
-
-#: ../data/gui/preferences_window.ui.h:31
-msgid "_Emoticons:"
-msgstr "_Emoticons:"
-
-#: ../data/gui/preferences_window.ui.h:32
 msgid "Ma_ke message windows compact"
 msgstr "Nachrichtenfenster _kompakt anzeigen"
 
-#: ../data/gui/preferences_window.ui.h:33
+#: ../data/gui/preferences_window.ui.h:31
 msgid "Hide all buttons in chat windows"
 msgstr "Versteckt alle Schaltflächen im Chatfenster"
 
-#: ../data/gui/preferences_window.ui.h:34
+#: ../data/gui/preferences_window.ui.h:32
 msgid "_Ignore rich content in incoming messages"
 msgstr "Formatierten Inhalt in ankommenden Nachrichten _ignorieren"
 
-#: ../data/gui/preferences_window.ui.h:35
+#: ../data/gui/preferences_window.ui.h:33
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -1886,11 +1869,11 @@ msgstr ""
 "Schriftarten usw.). Falls aktiviert, wird Gajim nur den reinen "
 "Nachrichtentext anzeigen."
 
-#: ../data/gui/preferences_window.ui.h:36
+#: ../data/gui/preferences_window.ui.h:34
 msgid "_Highlight misspelled words"
 msgstr "Falsch geschriebene Wörter _hervorheben"
 
-#: ../data/gui/preferences_window.ui.h:37
+#: ../data/gui/preferences_window.ui.h:35
 msgid ""
 "If checked, Gajim will highlight spelling errors in input fields of chat "
 "windows. If no language is explicitly set via right click on the input "
@@ -1901,16 +1884,27 @@ msgstr ""
 "Rechtsklick), wird die Standardsprache für diesen Kontakt oder Chatraum "
 "verwendet."
 
-#: ../data/gui/preferences_window.ui.h:38
-#, fuzzy
+#: ../data/gui/preferences_window.ui.h:36
 msgid "_Show roster on startup:"
-msgstr "_Kontaktliste anzeigen"
+msgstr "Kontaktli_ste beim Start anzeigen"
 
-#: ../data/gui/preferences_window.ui.h:39
+#: ../data/gui/preferences_window.ui.h:37
 #, fuzzy
 msgid "Show icon when your messages are received"
 msgstr "Ton, der bei einer neuen Chatraum-Nachricht abgespielt werden soll"
 
+#: ../data/gui/preferences_window.ui.h:38
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
+"Falls aktiviert, werden ASCII-Smilies wie \":)\" mit äquivalenten "
+"graphischen Emoticons ersetzt."
+
+#: ../data/gui/preferences_window.ui.h:39
+msgid "_Emoticons:"
+msgstr "_Emoticons:"
+
 #: ../data/gui/preferences_window.ui.h:40
 msgid "<b>Chat Appearance</b>"
 msgstr "<b>Chat-Aussehen</b>"
@@ -1972,7 +1966,7 @@ msgstr "<b>Google-Mail-Optionen</b>"
 
 #: ../data/gui/preferences_window.ui.h:52
 msgid "Show notification area icon:"
-msgstr ""
+msgstr "Benachrichtigungssymbol anzeigen:"
 
 #: ../data/gui/preferences_window.ui.h:53
 msgid "<b>Visual Notifications</b>"
@@ -2097,11 +2091,11 @@ msgstr "Erfrage Statusnachricht beim:"
 
 #: ../data/gui/preferences_window.ui.h:78
 msgid "Sign _in"
-msgstr "_anmelden"
+msgstr "_Anmelden"
 
 #: ../data/gui/preferences_window.ui.h:79
 msgid "Sign _out"
-msgstr "a_bmelden"
+msgstr "A_bmelden"
 
 #: ../data/gui/preferences_window.ui.h:80
 msgid ""
@@ -2378,7 +2372,7 @@ msgstr "Erweitert"
 msgid "Privacy Lists:"
 msgstr "Privatsphären-Listen:"
 
-#: ../data/gui/privacy_list_window.ui.h:1 ../src/dialogs.py:4121
+#: ../data/gui/privacy_list_window.ui.h:1 ../src/dialogs.py:4131
 msgid "Privacy List"
 msgstr "Privatsphären-Liste"
 
@@ -2627,10 +2621,8 @@ msgstr "Konto entfernen (in Gajim und auf dem _Server)"
 msgid "<b>What do you want to do?</b>"
 msgstr "<b>Was möchten Sie tun?</b>"
 
-#. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5829
-#: ../src/roster_window.py:5954 ../src/roster_window.py:6084
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:6021
 msgid "_Remove"
 msgstr "_Entfernen"
 
@@ -2667,7 +2659,7 @@ msgstr "_Aktionen"
 msgid "Add _Contact..."
 msgstr "_Kontakt hinzufügen …"
 
-#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1558
+#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1566
 msgid "_Edit"
 msgstr "Änd_ern"
 
@@ -2681,7 +2673,7 @@ msgstr "Profil und A_vatar"
 
 #: ../data/gui/roster_window.ui.h:12
 msgid "P_lugins"
-msgstr ""
+msgstr "P_lugins"
 
 #: ../data/gui/roster_window.ui.h:13
 msgid "_View"
@@ -2749,11 +2741,11 @@ msgid "_Add contact"
 msgstr "_Kontakt hinzufügen"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:6096
+#: ../data/gui/search_window.ui.h:4 ../src/gui_menu_builder.py:699
 msgid "_Information"
 msgstr "_Informationen"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1408
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1422
 msgid "_Search"
 msgstr "_Suche"
 
@@ -2841,14 +2833,6 @@ msgstr "Kontakte auswählen, die Sie synchronisieren möchten"
 msgid "Sta_tus"
 msgstr "Sta_tus"
 
-#: ../data/gui/systray_context_menu.ui.h:3
-msgid "_Group Chat"
-msgstr "_Gruppenchat"
-
-#: ../data/gui/systray_context_menu.ui.h:4
-msgid "Send Single _Message"
-msgstr "Einzelne Nachricht _senden"
-
 #: ../data/gui/systray_context_menu.ui.h:5
 msgid "Show All Pending _Events"
 msgstr "Zeige alle neuen _Ereignisse"
@@ -2887,14 +2871,12 @@ msgid "<b>Contact time:</b>"
 msgstr "<b>Uhrzeit beim Kontakt:</b>"
 
 #: ../data/gui/vcard_information_window.ui.h:8
-#, fuzzy
 msgid "<b>User avatar:</b>"
-msgstr "<b>Avatar:</b>"
+msgstr "<b>Benutzer-Avatar:</b>"
 
 #: ../data/gui/vcard_information_window.ui.h:9
-#, fuzzy
 msgid "<b>Configured avatar:</b>"
-msgstr "Gewählter Avatar:"
+msgstr "<b>Gewählter Avatar:</b>"
 
 #. Family Name
 #: ../data/gui/vcard_information_window.ui.h:11
@@ -2923,6 +2905,11 @@ msgstr "Kommentare"
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber-Datentransfer</b>"
 
+#. XML Console enable checkbutton
+#: ../data/gui/xml_console_window.ui.h:3
+msgid "_Enable"
+msgstr "Aktivi_eren"
+
 #: ../data/gui/xml_console_window.ui.h:4
 msgid "Hide IN stanzas"
 msgstr "IN Strophen verstecken"
@@ -2968,10 +2955,6 @@ msgstr "_Nachricht"
 msgid "<b>XML Input</b>"
 msgstr "<b>XML-Direkteingabe</b>"
 
-#: ../data/gui/zeroconf_context_menu.ui.h:2
-msgid "_Modify Account..."
-msgstr "_Konto bearbeiten …"
-
 #: ../data/gui/zeroconf_information_window.ui.h:2
 msgid "Local jid:"
 msgstr "Lokale Jabber-ID:"
@@ -3011,14 +2994,12 @@ msgstr ""
 "Sie sind dabei, einen Befehl auszuführen. Wollen Sie wirklich abbrechen?"
 
 #: ../src/adhoc_commands.py:372
-#, fuzzy
 msgid "Invalid Form"
-msgstr "Ungültiger Raum"
+msgstr "Ungültiges Formular"
 
 #: ../src/adhoc_commands.py:373
-#, fuzzy
 msgid "The form is not filled correctly."
-msgstr "Die Jabber-ID enthält ungültige Zeichen."
+msgstr "Das Formular wurde nicht korrekt ausgefüllt."
 
 #: ../src/adhoc_commands.py:392 ../src/adhoc_commands.py:416
 msgid "Service sent malformed data"
@@ -3039,48 +3020,48 @@ msgid "Service returned an error."
 msgstr "Der Dienst gab einen Fehler zurück."
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:92
+#: ../src/advanced_configuration_window.py:93
 msgid "Activated"
 msgstr "Aktiviert"
 
-#: ../src/advanced_configuration_window.py:92
+#: ../src/advanced_configuration_window.py:93
 msgid "Deactivated"
 msgstr "Deaktiviert"
 
-#: ../src/advanced_configuration_window.py:94
+#: ../src/advanced_configuration_window.py:95
 msgid "Boolean"
 msgstr "Boolean"
 
-#: ../src/advanced_configuration_window.py:95
+#: ../src/advanced_configuration_window.py:96
 msgid "Integer"
 msgstr "Ganzzahl"
 
-#: ../src/advanced_configuration_window.py:96
+#: ../src/advanced_configuration_window.py:97
 msgid "Text"
 msgstr "Text"
 
-#: ../src/advanced_configuration_window.py:97 ../src/chat_control.py:1065
+#: ../src/advanced_configuration_window.py:98 ../src/chat_control.py:1061
 msgid "Color"
 msgstr "Farbe"
 
-#: ../src/advanced_configuration_window.py:108
+#: ../src/advanced_configuration_window.py:109
 msgid "Preference Name"
 msgstr "Einstellungsname"
 
-#: ../src/advanced_configuration_window.py:114
+#: ../src/advanced_configuration_window.py:116
 msgid "Value"
 msgstr "Wert"
 
-#: ../src/advanced_configuration_window.py:124
+#: ../src/advanced_configuration_window.py:125
 msgid "Type"
 msgstr "Typ"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:179
+#: ../src/advanced_configuration_window.py:182
 msgid "(None)"
 msgstr "(Keine)"
 
-#: ../src/advanced_configuration_window.py:305
+#: ../src/advanced_configuration_window.py:308
 msgid "Hidden"
 msgstr "Versteckt"
 
@@ -3096,44 +3077,39 @@ msgid "Ping?"
 msgstr "Ping?"
 
 #: ../src/chat_control.py:214
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr "Pong! (%s s.)"
-
-#: ../src/chat_control.py:219
 msgid "Error."
 msgstr "Fehler:"
 
 #. we are not connected
-#: ../src/chat_control.py:800
+#: ../src/chat_control.py:795
 msgid "A connection is not available"
 msgstr "Keine Verbindung verfügbar"
 
-#: ../src/chat_control.py:801
+#: ../src/chat_control.py:796
 msgid "Your message can not be sent until you are connected."
 msgstr "Ihre Nachricht kann erst gesendet werden, wenn Sie verbunden sind."
 
-#: ../src/chat_control.py:1047
+#: ../src/chat_control.py:1043
 msgid "Underline"
 msgstr "Unterstrichen"
 
-#: ../src/chat_control.py:1048
+#: ../src/chat_control.py:1044
 msgid "Strike"
 msgstr "Durchgestrichen"
 
-#: ../src/chat_control.py:1071
+#: ../src/chat_control.py:1067
 msgid "Font"
 msgstr "Schriftart"
 
-#: ../src/chat_control.py:1080
+#: ../src/chat_control.py:1076
 msgid "Clear formating"
 msgstr "Formatierung löschen"
 
-#: ../src/chat_control.py:1157
+#: ../src/chat_control.py:1153
 msgid "Really send file?"
 msgstr "Datei wirklich senden?"
 
-#: ../src/chat_control.py:1158
+#: ../src/chat_control.py:1154
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
@@ -3141,7 +3117,7 @@ msgstr ""
 "kennen."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/chat_control.py:1665 ../src/chat_control.py:2249
+#: ../src/chat_control.py:1665 ../src/chat_control.py:2270
 #, fuzzy
 msgid "OpenPGP encryption enabled"
 msgstr "GPG-Verschlüsselung aktiviert"
@@ -3158,12 +3134,12 @@ msgstr "Der Kontakt unterstützt keine Dateiübertragung."
 #. Add to roster
 #: ../src/chat_control.py:1735 ../src/common/contacts.py:152
 #: ../src/common/contacts.py:273 ../src/common/helpers.py:67
-#: ../src/common/helpers.py:261 ../src/dialogs.py:1105 ../src/dialogs.py:2310
-#: ../src/dialogs.py:2339 ../src/dialogs.py:3551 ../src/gui_interface.py:485
-#: ../src/gui_menu_builder.py:266 ../src/gui_menu_builder.py:421
-#: ../src/roster_window.py:771 ../src/roster_window.py:1732
-#: ../src/roster_window.py:1734 ../src/roster_window.py:2082
-#: ../src/roster_window.py:3618 ../src/roster_window.py:3645
+#: ../src/common/helpers.py:261 ../src/dialogs.py:1106 ../src/dialogs.py:2314
+#: ../src/dialogs.py:2343 ../src/dialogs.py:3561 ../src/gui_interface.py:485
+#: ../src/gui_menu_builder.py:318 ../src/gui_menu_builder.py:489
+#: ../src/roster_window.py:771 ../src/roster_window.py:1735
+#: ../src/roster_window.py:1737 ../src/roster_window.py:2086
+#: ../src/roster_window.py:3660 ../src/roster_window.py:3687
 msgid "Not in Roster"
 msgstr "Nicht in der Kontaktliste"
 
@@ -3193,34 +3169,34 @@ msgstr ""
 msgid "Send files"
 msgstr "_Datei senden"
 
-#: ../src/chat_control.py:1785
+#: ../src/chat_control.py:1786
 msgid "This contact does not support file transfer."
 msgstr "Der Kontakt unterstützt keine Dateiübertragung."
 
-#: ../src/chat_control.py:1788
+#: ../src/chat_control.py:1789
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 "Sie müssen die JID des Kontakts kennen, um ihm oder ihr eine Datei zu senden."
 
-#: ../src/chat_control.py:1906
+#: ../src/chat_control.py:1907
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s Status: %(state)s, Grund: %(reason)s"
 
-#: ../src/chat_control.py:2098
+#: ../src/chat_control.py:2110
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s aus dem Chatraum %(room_name)s"
 
 # TODO: GPG/PGP unification in original strings needed
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:2229 ../src/dialogs.py:5194
+#: ../src/chat_control.py:2250 ../src/dialogs.py:5206
 #, fuzzy
 msgid "No OpenPGP key assigned"
 msgstr "Kein GPG-Schlüssel zugewiesen"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/chat_control.py:2230
+#: ../src/chat_control.py:2251
 #, fuzzy
 msgid ""
 "No OpenPGP key is assigned to this contact. So you cannot encrypt messages "
@@ -3230,51 +3206,51 @@ msgstr ""
 "GPG verschlüsselt werden."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/chat_control.py:2239
+#: ../src/chat_control.py:2260
 #, fuzzy
 msgid "OpenPGP encryption disabled"
 msgstr "GPG-Verschlüsselung deaktiviert"
 
-#: ../src/chat_control.py:2265
+#: ../src/chat_control.py:2286
 msgid "Session WILL be logged"
 msgstr "Sitzung WIRD aufgezeichnet"
 
-#: ../src/chat_control.py:2267
+#: ../src/chat_control.py:2288
 msgid "Session WILL NOT be logged"
 msgstr "Sitzung WIRD NICHT aufgezeichnet"
 
 #. encryption %s active
-#: ../src/chat_control.py:2284
+#: ../src/chat_control.py:2305
 msgid "is"
 msgstr "ist"
 
-#: ../src/chat_control.py:2284
+#: ../src/chat_control.py:2305
 msgid "is NOT"
 msgstr "ist NICHT"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2286
+#: ../src/chat_control.py:2307
 msgid "will"
 msgstr "wird"
 
-#: ../src/chat_control.py:2286
+#: ../src/chat_control.py:2307
 msgid "will NOT"
 msgstr "wird NICHT"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2290
+#: ../src/chat_control.py:2311
 msgid "and authenticated"
 msgstr "und authentifiziert"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2294
+#: ../src/chat_control.py:2315
 msgid "and NOT authenticated"
 msgstr "und NICHT authentifiziert"
 
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:2301
+#: ../src/chat_control.py:2322
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3283,32 +3259,31 @@ msgstr ""
 "%(type)s Verschlüsselung %(status)s aktiv %(authenticated)s.\n"
 "Ihre Chatsitzung %(logged)s mitgeschrieben."
 
-#: ../src/chat_control.py:2439
+#: ../src/chat_control.py:2460
 msgid "Session negotiation cancelled"
 msgstr "Sitzungsaushandlung abgebrochen"
 
-#: ../src/chat_control.py:2449
+#: ../src/chat_control.py:2470
 msgid "This session WILL be archived on server"
-msgstr ""
+msgstr "Diese Sitzung WIRD auf dem Server archiviert"
 
-#: ../src/chat_control.py:2451
-#, fuzzy
+#: ../src/chat_control.py:2472
 msgid "This session WILL NOT be archived on server"
-msgstr "Sitzung WIRD NICHT aufgezeichnet"
+msgstr "Diese Sitzung WIRD NICHT auf dem Server archiviert"
 
-#: ../src/chat_control.py:2460
+#: ../src/chat_control.py:2481
 msgid "This session is encrypted"
 msgstr "Diese Sitzung ist verschlüsselt"
 
-#: ../src/chat_control.py:2463
+#: ../src/chat_control.py:2484
 msgid " and WILL be logged"
-msgstr " und wird AUFGEZEICHNET"
+msgstr " und WIRD aufgezeichnet"
 
-#: ../src/chat_control.py:2465
+#: ../src/chat_control.py:2486
 msgid " and WILL NOT be logged"
 msgstr " und wird NICHT AUFGEZEICHNET"
 
-#: ../src/chat_control.py:2470
+#: ../src/chat_control.py:2491
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3316,25 +3291,25 @@ msgstr ""
 "Die Identität des Gesprächspartners wurde nicht überprüft. Mehr "
 "Informationen durch Klicken auf das Schild-Symbol."
 
-#: ../src/chat_control.py:2472
+#: ../src/chat_control.py:2493
 msgid "E2E encryption disabled"
 msgstr "E2E-Verschlüsselung deaktiviert"
 
-#: ../src/chat_control.py:2520 ../src/chat_control.py:2534
+#: ../src/chat_control.py:2541 ../src/chat_control.py:2555
 msgid "The following message was NOT encrypted"
 msgstr "Die folgende Nachricht wurde UNVERSCHLÜSSELT übertragen"
 
-#: ../src/chat_control.py:2526
+#: ../src/chat_control.py:2547
 msgid "The following message was encrypted"
 msgstr "Die folgende Nachricht wurde verschlüsselt übertragen"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2797
+#: ../src/chat_control.py:2822
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Sie haben eine neue Nachricht von \"%s\" erhalten"
 
-#: ../src/chat_control.py:2799
+#: ../src/chat_control.py:2824
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3342,14 +3317,19 @@ msgstr ""
 "Wenn Sie das Fenster schließen und der Verlauf abgeschaltet ist, geht die "
 "Nachricht verloren."
 
-#: ../src/chat_control.py:2967 ../src/common/connection_handlers_events.py:913
-#: ../src/common/connection_handlers.py:1145
-#: ../src/common/connection_handlers.py:1269 ../src/common/connection.py:523
-#: ../src/common/logger.py:1161 ../src/gajim.py:229 ../src/session.py:98
+#: ../src/chat_control.py:2855 ../src/groupchat_control.py:1385
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr "Pong! (%s s.)"
+
+#: ../src/chat_control.py:3005 ../src/common/connection_handlers_events.py:925
+#: ../src/common/connection_handlers.py:1089
+#: ../src/common/connection_handlers.py:1214 ../src/common/connection.py:543
+#: ../src/common/logger.py:1165 ../src/gajim.py:252 ../src/session.py:98
 msgid "Database Error"
 msgstr "Datenbankfehler"
 
-#: ../src/chat_control.py:2968
+#: ../src/chat_control.py:3006
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3358,7 +3338,7 @@ msgstr ""
 "Die Datenbankdatei (%s) konnte nicht gelesen werden. Versuchen Sie, diese zu "
 "reparieren oder zu löschen (dabei gehen alle Verläufe verloren)."
 
-#: ../src/chat_control.py:3205 ../src/gui_interface.py:1161
+#: ../src/chat_control.py:3244 ../src/gui_interface.py:1170
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -3367,55 +3347,55 @@ msgstr ""
 "Die Nachricht von %s konnte nicht entschlüsselt werden.\n"
 "Eventuell wurde sie verändert."
 
-#: ../src/chat_control.py:3262
+#: ../src/chat_control.py:3301
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s ist jetzt %(status)s"
 
-#: ../src/chat_control.py:3321
+#: ../src/chat_control.py:3360
 #, fuzzy
 msgid "File transfer"
 msgstr "Dateiübertragungen"
 
-#: ../src/chat_control.py:3324
+#: ../src/chat_control.py:3363
 #, fuzzy
 msgid "Size"
 msgstr "Größe: %s"
 
-#: ../src/chat_control.py:3326
+#: ../src/chat_control.py:3365
 #, fuzzy
 msgid "_Accept"
 msgstr "_Konten"
 
-#: ../src/chat_control.py:3347 ../src/filetransfers_window.py:211
+#: ../src/chat_control.py:3386 ../src/filetransfers_window.py:211
 msgid "File transfer completed"
 msgstr "Dateiübertragung abgeschlossen"
 
-#: ../src/chat_control.py:3383 ../src/dialogs.py:2927 ../src/dialogs.py:4614
+#: ../src/chat_control.py:3422 ../src/dialogs.py:2935 ../src/dialogs.py:4625
 #: ../src/gui_interface.py:646 ../src/notify.py:278
 msgid "Groupchat Invitation"
 msgstr "Gruppenchat-Einladung"
 
-#: ../src/chat_control.py:3405 ../src/gui_interface.py:1019
-#: ../src/roster_window.py:1991
+#: ../src/chat_control.py:3444 ../src/gui_interface.py:1019
+#: ../src/roster_window.py:1994
 msgid "Remote contact stopped transfer"
 msgstr "Entfernter Kontakt unterbrach die Dateiübertragung"
 
-#: ../src/chat_control.py:3407 ../src/gui_interface.py:1022
-#: ../src/roster_window.py:1993
+#: ../src/chat_control.py:3446 ../src/gui_interface.py:1022
+#: ../src/roster_window.py:1996
 msgid "Error opening file"
 msgstr "Fehler beim Öffnen der Datei:"
 
-#: ../src/chat_control.py:3409 ../src/filetransfers_window.py:247
+#: ../src/chat_control.py:3448 ../src/filetransfers_window.py:247
 msgid "File transfer stopped"
 msgstr "Dateiübertragung gestoppt"
 
-#: ../src/chat_control.py:3412 ../src/filetransfers_window.py:226
+#: ../src/chat_control.py:3451 ../src/filetransfers_window.py:226
 #: ../src/filetransfers_window.py:233
 msgid "File transfer cancelled"
 msgstr "Dateiübertragung abgebrochen"
 
-#: ../src/chat_control.py:3413 ../src/filetransfers_window.py:226
+#: ../src/chat_control.py:3452 ../src/filetransfers_window.py:226
 #: ../src/filetransfers_window.py:234
 msgid "Connection with peer cannot be established."
 msgstr "Verbindung zum Teilnehmer kann nicht hergestellt werden"
@@ -3485,7 +3465,7 @@ msgstr ""
 
 #: ../src/command_system/implementation/standard.py:151
 #: ../src/common/commands.py:110 ../src/common/helpers.py:249
-#: ../src/tooltips.py:189
+#: ../src/tooltips.py:205
 msgid "Away"
 msgstr "Abwesend"
 
@@ -3494,9 +3474,8 @@ msgid "Set the current status to online"
 msgstr ""
 
 #: ../src/command_system/implementation/standard.py:165
-#, fuzzy
 msgid "Available"
-msgstr "_Angemeldet"
+msgstr "Verfügbar"
 
 #: ../src/command_system/implementation/standard.py:185
 #: ../src/command_system/implementation/standard.py:267
@@ -3511,11 +3490,13 @@ msgid "Toggle the OpenPGP encryption"
 msgstr "Open_PGP-Verschlüsselung aktivieren"
 
 #: ../src/command_system/implementation/standard.py:195
+#: ../src/command_system/implementation/standard.py:415
 #, fuzzy
 msgid "Send a ping to the contact"
 msgstr "Verwendung: /%s, sendet einen Ping zum Kontakt."
 
 #: ../src/command_system/implementation/standard.py:198
+#: ../src/command_system/implementation/standard.py:418
 #, fuzzy
 msgid "Command is not supported for zeroconf accounts"
 msgstr "Der Befehl für das Zeroconf-Konto wird nicht unterstützt."
@@ -3553,8 +3534,8 @@ msgid "Change your nickname in a group chat"
 msgstr "Spitzname ändern (Strg+N)"
 
 #. invalid char
-#: ../src/command_system/implementation/standard.py:279 ../src/config.py:3405
-#: ../src/dialogs.py:2154
+#: ../src/command_system/implementation/standard.py:279 ../src/config.py:3426
+#: ../src/dialogs.py:2158
 msgid "Invalid nickname"
 msgstr "Ungültiger Benutzername"
 
@@ -3668,36 +3649,36 @@ msgstr "Fehlendes Argument \"contact_Jabber-ID\""
 msgid "Excessive arguments"
 msgstr ""
 
-#: ../src/common/check_paths.py:39
+#: ../src/common/check_paths.py:38
 msgid "creating logs database"
 msgstr "Erstelle Log-Datenbank"
 
-#: ../src/common/check_paths.py:87
+#: ../src/common/check_paths.py:86
 msgid "creating cache database"
 msgstr "Erstelle Cache-Datenbank"
 
-#: ../src/common/check_paths.py:278 ../src/common/check_paths.py:285
-#: ../src/common/check_paths.py:292 ../src/common/check_paths.py:299
-#: ../src/common/check_paths.py:306 ../src/common/check_paths.py:313
-#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
+#: ../src/common/check_paths.py:277 ../src/common/check_paths.py:284
+#: ../src/common/check_paths.py:291 ../src/common/check_paths.py:298
+#: ../src/common/check_paths.py:305 ../src/common/check_paths.py:312
+#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:326
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s ist eine Datei, sollte aber ein Verzeichnis sein"
 
-#: ../src/common/check_paths.py:279 ../src/common/check_paths.py:286
-#: ../src/common/check_paths.py:293 ../src/common/check_paths.py:300
-#: ../src/common/check_paths.py:307 ../src/common/check_paths.py:314
-#: ../src/common/check_paths.py:321 ../src/common/check_paths.py:328
-#: ../src/common/check_paths.py:338 ../src/common/check_paths.py:346
+#: ../src/common/check_paths.py:278 ../src/common/check_paths.py:285
+#: ../src/common/check_paths.py:292 ../src/common/check_paths.py:299
+#: ../src/common/check_paths.py:306 ../src/common/check_paths.py:313
+#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
+#: ../src/common/check_paths.py:337 ../src/common/check_paths.py:345
 msgid "Gajim will now exit"
 msgstr "Gajim wird nun beendet"
 
-#: ../src/common/check_paths.py:337 ../src/common/check_paths.py:345
+#: ../src/common/check_paths.py:336 ../src/common/check_paths.py:344
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s ist ein Verzeichnis, sollte aber eine Datei sein"
 
-#: ../src/common/check_paths.py:366
+#: ../src/common/check_paths.py:359
 #, python-format
 msgid "creating %s directory"
 msgstr "Erstelle Verzeichnis %s"
@@ -3762,8 +3743,8 @@ msgstr "Wählen Sie die Chaträume, die Sie verlassen möchten"
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:216 ../src/common/contacts.py:131
 #: ../src/common/helpers.py:67 ../src/roster_window.py:824
-#: ../src/roster_window.py:1736 ../src/roster_window.py:1738
-#: ../src/roster_window.py:2621 ../src/roster_window.py:5714
+#: ../src/roster_window.py:1739 ../src/roster_window.py:1741
+#: ../src/roster_window.py:2625 ../src/roster_window.py:5767
 msgid "Groupchats"
 msgstr "Gruppenchat"
 
@@ -3830,7 +3811,6 @@ msgstr ""
 
 # FIXME: Check English
 #: ../src/common/config.py:89
-#, fuzzy
 msgid ""
 "When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
@@ -3840,6 +3820,8 @@ msgstr ""
 #: ../src/common/config.py:90
 msgid "Allow to hide the roster window even if the tray icon is not shown."
 msgstr ""
+"Erlauben, die Kontaktliste zu verstecken, auch wenn das "
+"Benachrichtigungssymbol nicht angezeigt wird."
 
 #: ../src/common/config.py:95
 msgid "Incoming nickname color."
@@ -3940,9 +3922,9 @@ msgstr ""
 "eingeklappt sind."
 
 #. sorted alphanum
-#: ../src/common/config.py:117 ../src/common/config.py:533
-#: ../src/common/optparser.py:295 ../src/common/optparser.py:491
-#: ../src/common/optparser.py:525 ../src/gui_interface.py:2795
+#: ../src/common/config.py:117 ../src/common/config.py:537
+#: ../src/common/optparser.py:297 ../src/common/optparser.py:493
+#: ../src/common/optparser.py:527 ../src/gui_interface.py:2828
 msgid "default"
 msgstr "Standard"
 
@@ -4010,10 +3992,14 @@ msgstr ""
 "Chatraum bereits vergeben ist."
 
 #: ../src/common/config.py:160
+#, fuzzy
 msgid ""
 "If True, Gajim will save roster position when hiding roster, and restore it "
 "when showing roster."
 msgstr ""
+"Wenn aktiviert, wird Gajim die Position der Kontaktliste beim Verstecken "
+"speichern und sie wiederherstellen, wenn die Kontaktliste wieder angezeigt "
+"wird."
 
 #: ../src/common/config.py:172
 msgid ""
@@ -4066,7 +4052,7 @@ msgid ""
 "limit"
 msgstr ""
 "Wie viele zurückliegende Chatzeilen sollen beim Betreten eines Gruppenchats "
-"abgefragt werden?"
+"abgefragt werden? -1 bedeutet kein Limit"
 
 #: ../src/common/config.py:183
 #, fuzzy
@@ -4074,8 +4060,8 @@ msgid ""
 "How many minutes back to request logs when entering a groupchat. -1 means no "
 "limit"
 msgstr ""
-"Wie viele Minuten zurück soll das Logfile beim Betreten eines Gruppenchats "
-"abgefragt werden?"
+"Wie viele Minuten zurück sollen Chatzeilen beim Betreten eines Gruppenchats "
+"abgefragt werden? -1 bedeutet kein Limit"
 
 #: ../src/common/config.py:184
 msgid ""
@@ -4090,6 +4076,8 @@ msgstr ""
 msgid ""
 "Should autorejoin be activated when we are being kicked from a conference?"
 msgstr ""
+"Soll das automatische Wiederbetreten aktiviert werden, wenn wir von einem "
+"Gruppenchat getrennt wurden?"
 
 #: ../src/common/config.py:186
 msgid ""
@@ -4198,9 +4186,8 @@ msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Der IEC-Standard legt fest: 1 KiB = 1024 Byte, 1 kB = 1000 Byte."
 
 #: ../src/common/config.py:210
-#, fuzzy
 msgid "Notify of events in the notification area."
-msgstr "Neue Ereignisse per Trayicon anzeigen"
+msgstr "Neue Ereignisse per Benachrichtigungssymbol anzeigen."
 
 #: ../src/common/config.py:211
 msgid ""
@@ -4245,14 +4232,13 @@ msgstr ""
 "hervorgehoben werden sollen."
 
 #: ../src/common/config.py:247
-#, fuzzy
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if notification icon is used."
 msgstr ""
 "Falls aktiviert, wird Gajim beendet, wenn der X-Button des Fenstermanagers "
-"geklickt wird. Diese Option funktioniert nur, wenn das Trayicon verwendet "
-"wird."
+"geklickt wird. Diese Option funktioniert nur, wenn das "
+"Benachrichtigungssymbol verwendet wird."
 
 #: ../src/common/config.py:248
 msgid ""
@@ -4316,7 +4302,7 @@ msgstr ""
 
 #: ../src/common/config.py:261
 msgid "Log XHTML messages instead of plain text messages."
-msgstr ""
+msgstr "XHTML-Nachrichten anstelle von Text speichern."
 
 #: ../src/common/config.py:262
 msgid "Background color of contacts when they just signed in."
@@ -4392,6 +4378,10 @@ msgid ""
 "'never' - Never show roster.\n"
 "'last_state' - Restore the last state roster."
 msgstr ""
+"Kontaktliste beim Starten anzeigen.\n"
+"'always' - Kontaktliste immer anzeigen.\n"
+"'never' - Kontaktliste nie anzeigen.\n"
+"'last_state' - Letzten Zustand wiederherstellen."
 
 #: ../src/common/config.py:275
 msgid "If False, you will no longer see the avatar in the chat window."
@@ -4539,13 +4529,12 @@ msgstr ""
 "Zeilen werden gelöscht."
 
 #: ../src/common/config.py:297
-#, fuzzy
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "notification icon."
 msgstr ""
 "Falls aktiviert, werden Benachrichtigungsfenster vom Benachrichtigungsdienst "
-"an das Systray-Icon angehängt."
+"an das Benachrichtigungssymbol angehängt."
 
 #: ../src/common/config.py:298
 msgid "Choose interval between 2 checks of idleness."
@@ -4704,7 +4693,14 @@ msgstr ""
 "Geordnete Liste der auszuprobierenden Verbindungstypen (getrennt durch "
 "Leerzeichen). Mögliche Werte sind TLS, SSL und PLAIN."
 
-#: ../src/common/config.py:352
+#: ../src/common/config.py:354
+msgid ""
+"List (space separated) of authentication mechanisms to try. Can contain "
+"ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
+"PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
+msgstr ""
+
+#: ../src/common/config.py:355
 #, fuzzy
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection. "
@@ -4713,46 +4709,45 @@ msgstr ""
 "Warnmeldung anzeigen, bevor das Passwort über eine unsichere Verbindung "
 "übertragen wird."
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:356
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 "Warnmeldung anzeigen, bevor das Passwort über eine mit der Standard-SSL-"
 "Bibliothek geschützte Verbindung übertragen wird."
 
-#: ../src/common/config.py:354
-#, fuzzy
+#: ../src/common/config.py:357
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
 "Warnmeldung anzeigen, bevor das PLAIN Passwort über eine unsichere "
 "Verbindung übertragen wird."
 
-#: ../src/common/config.py:356
+#: ../src/common/config.py:359
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 "Liste der SSL-Fehler, die zu ignorieren sind (getrennt durch Leerzeichen)."
 
-#: ../src/common/config.py:362
+#: ../src/common/config.py:365
 msgid ""
 "Space separated list of JIDs for which you do not want to store logs. You "
 "can also add account name to log nothing for this account."
 msgstr ""
 
-#: ../src/common/config.py:363
+#: ../src/common/config.py:366
 msgid ""
 "Space separated list of JIDs for which you accept to not log conversations "
 "if he does not want to."
 msgstr ""
 
-#: ../src/common/config.py:366
+#: ../src/common/config.py:369
 msgid "Whitespace sent after inactivity"
 msgstr "Whitespace nach Untätigkeit gesendet"
 
-#: ../src/common/config.py:367
+#: ../src/common/config.py:370
 msgid "XMPP ping sent after inactivity"
 msgstr "XMPP Ping nach Untätigkeit gesendet"
 
-#: ../src/common/config.py:371
+#: ../src/common/config.py:374
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
@@ -4762,11 +4757,11 @@ msgstr ""
 "wieder hergestellt wird."
 
 #. yes, no, ask
-#: ../src/common/config.py:375
+#: ../src/common/config.py:378
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2-Workaround"
 
-#: ../src/common/config.py:378
+#: ../src/common/config.py:381
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4775,34 +4770,30 @@ msgstr ""
 "file_transfer_proxies Option definierten Proxys für den Dateitransfer "
 "verwenden."
 
-#: ../src/common/config.py:379
+#: ../src/common/config.py:382
 msgid ""
 "If True, Gajim will test file transfer proxies on startup to be sure it "
 "works. Openfire's proxies are known to fail this test even if they work."
 msgstr ""
 
-#: ../src/common/config.py:393
+#: ../src/common/config.py:396
 msgid "Answer to receipt requests"
 msgstr "Antwort auf Empfangsbestätigungsanfragen"
 
-#: ../src/common/config.py:394
+#: ../src/common/config.py:397
 msgid "Sent receipt requests"
 msgstr "Empfangsbestätigungen anfordern"
 
-#: ../src/common/config.py:403
-#, fuzzy
+#: ../src/common/config.py:406
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
-msgstr ""
-"Falls aktiviert, erlaubt Gajim Ihrem Gegenüber, Ihr Betriebssystem "
-"festzustellen."
+msgstr "Erlaubt Gajim, Informationen über Ihr Betriebssystem zu übermitteln."
 
-#: ../src/common/config.py:404
-#, fuzzy
+#: ../src/common/config.py:407
 msgid "Allow Gajim to send your local time."
-msgstr "%s möchte Ihnen eine Datei senden."
+msgstr "Erlaubt Gajim, Ihre lokale Zeit zu übermitteln."
 
-#: ../src/common/config.py:405
+#: ../src/common/config.py:408
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4810,52 +4801,57 @@ msgstr ""
 "Soll beim Aushandeln einer verschlüsselten Sitzung angenommen werden, dass "
 "Sie Ihre Nachrichten aufzeichnen wollen?"
 
-#: ../src/common/config.py:408
+#: ../src/common/config.py:411
 msgid "Message that is sent to contacts you want to add"
 msgstr ""
 "Nachricht, die an Kontakte gesendet wird, die hinzugefügt werden sollen"
 
-#: ../src/common/config.py:409
+#: ../src/common/config.py:412
 msgid "Last time we syncronized with logs from server."
-msgstr ""
+msgstr "Letzte Synchronisation mit dem Archiv auf dem Server."
 
-#: ../src/common/config.py:410
+#: ../src/common/config.py:413
 msgid ""
 "If enabled and if server supports this feature, Gajim will receive messages "
 "sent and received by other resources."
 msgstr ""
 
-#: ../src/common/config.py:411
+#: ../src/common/config.py:414
 msgid ""
 "If enabled, Gajim will send your local IPs so your contact can connect to "
 "your machine to transfer files."
 msgstr ""
 
-#: ../src/common/config.py:412
+#: ../src/common/config.py:415
 #, fuzzy
 msgid "Latest token for Oauth2 authentication."
 msgstr "Anonyme Authentifizierung"
 
-#: ../src/common/config.py:413
+#: ../src/common/config.py:416
 #, fuzzy
 msgid "client_id for Oauth2 authentication."
 msgstr "Anon_yme Authentifizierung"
 
-#: ../src/common/config.py:414
+#: ../src/common/config.py:417
 msgid "redirect_url for Oauth2 authentication."
 msgstr ""
 
-#: ../src/common/config.py:415
+#: ../src/common/config.py:418
 msgid ""
 "Space separated list of JIDs for which we want to re-open a chat window on "
 "next startup."
 msgstr ""
 
-#: ../src/common/config.py:477
+#: ../src/common/config.py:419
+#, fuzzy
+msgid "Last MAM id we are syncronized with"
+msgstr "Letzte Synchronisation mit dem Archiv auf dem Server."
+
+#: ../src/common/config.py:481
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Ist OpenPGP für diesen Kontakt aktiviert?"
 
-#: ../src/common/config.py:478
+#: ../src/common/config.py:482
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4863,112 +4859,112 @@ msgstr ""
 "Soll automatisch eine ESession-Verschlüsselung mit diesem Kontakt gestartet "
 "werden?"
 
-#: ../src/common/config.py:479 ../src/common/config.py:482
+#: ../src/common/config.py:483 ../src/common/config.py:486
 msgid "Language for which we want to check misspelled words"
 msgstr "Sprache, die für die Rechtschreibprüfung verwerdet werden soll"
 
-#: ../src/common/config.py:483
+#: ../src/common/config.py:487
 #, fuzzy
 msgid ""
 "How many lines to request from server when entering a groupchat. -1 means no "
 "limit, -2 means global value"
 msgstr ""
 "Wie viele zurückliegende Chatzeilen sollen beim Betreten eines Gruppenchats "
-"abgefragt werden?"
+"abgefragt werden? -1 bedeutet kein Limit"
 
-#: ../src/common/config.py:484
+#: ../src/common/config.py:488
 #, fuzzy
 msgid ""
 "How many minutes back to request logs when entering a groupchat. -1 means no "
 "limit, -2 means global value"
 msgstr ""
-"Wie viele Minuten zurück soll das Logfile beim Betreten eines Gruppenchats "
-"abgefragt werden?"
+"Wie viele Minuten zurück sollen Chatzeilen beim Betreten eines Gruppenchats "
+"abgefragt werden? -1 bedeutet kein Limit"
 
-#: ../src/common/config.py:487
+#: ../src/common/config.py:491
 msgid ""
 "State whether plugins should be activated on startup (this is saved on Gajim "
 "exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
 "instead."
 msgstr ""
 
-#: ../src/common/config.py:492 ../src/common/pep.py:157
+#: ../src/common/config.py:496 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Schlafen"
 
-#: ../src/common/config.py:493
+#: ../src/common/config.py:497
 msgid "Back soon"
 msgstr "Bin gleich wieder da"
 
-#: ../src/common/config.py:493
+#: ../src/common/config.py:497
 msgid "Back in some minutes."
 msgstr "Bin in ein paar Minuten zurück."
 
-#: ../src/common/config.py:494 ../src/common/pep.py:127
+#: ../src/common/config.py:498 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Essen"
 
-#: ../src/common/config.py:494
+#: ../src/common/config.py:498
 msgid "I'm eating, so leave me a message."
 msgstr "Ich esse gerade, bitte hinterlasse eine Nachricht."
 
-#: ../src/common/config.py:495
+#: ../src/common/config.py:499
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:495
+#: ../src/common/config.py:499
 msgid "I'm watching a movie."
 msgstr "Ich sehe mir einen Film an."
 
-#: ../src/common/config.py:496 ../src/common/pep.py:186
+#: ../src/common/config.py:500 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Arbeiten"
 
-#: ../src/common/config.py:496
+#: ../src/common/config.py:500
 msgid "I'm working."
 msgstr "Ich arbeite."
 
-#: ../src/common/config.py:497
+#: ../src/common/config.py:501
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:497
+#: ../src/common/config.py:501
 msgid "I'm on the phone."
 msgstr "Ich telefoniere."
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:502
 msgid "Out"
 msgstr "Draußen"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:502
 msgid "I'm out enjoying life."
 msgstr "Ich bin draußen und genieße das Leben."
 
-#: ../src/common/config.py:509
+#: ../src/common/config.py:513
 msgid "I'm available."
 msgstr "Ich bin angemeldet."
 
-#: ../src/common/config.py:510
+#: ../src/common/config.py:514
 msgid "I'm free for chat."
 msgstr "Ich bin frei zum Chatten."
 
-#: ../src/common/config.py:511 ../src/config.py:1646
+#: ../src/common/config.py:515 ../src/config.py:1652
 msgid "Be right back."
 msgstr "Bin gleich zurück."
 
-#: ../src/common/config.py:512
+#: ../src/common/config.py:516
 msgid "I'm not available."
 msgstr "Ich bin nicht verfügbar."
 
-#: ../src/common/config.py:513
+#: ../src/common/config.py:517
 msgid "Do not disturb."
 msgstr "Bitte nicht stören."
 
-#: ../src/common/config.py:514 ../src/common/config.py:515
+#: ../src/common/config.py:518 ../src/common/config.py:519
 msgid "Bye!"
 msgstr "Auf Wiedersehen!"
 
-#: ../src/common/config.py:526
+#: ../src/common/config.py:530
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4976,32 +4972,32 @@ msgstr ""
 "Abzuspielender Ton, falls eine Chatraum-Nachricht eines der Wörter aus der "
 "muc_highlights_works-Liste oder Ihren Spitznamen enthält."
 
-#: ../src/common/config.py:527
+#: ../src/common/config.py:531
 msgid "Sound to play when any MUC message arrives."
 msgstr "Ton, der bei einer neuen Chatraum-Nachricht abgespielt werden soll"
 
-#: ../src/common/config.py:536 ../src/common/optparser.py:309
+#: ../src/common/config.py:540 ../src/common/optparser.py:311
 msgid "green"
 msgstr "grün"
 
-#: ../src/common/config.py:540 ../src/common/optparser.py:295
+#: ../src/common/config.py:544 ../src/common/optparser.py:297
 msgid "grocery"
 msgstr "Lebensmittel"
 
-#: ../src/common/config.py:544
+#: ../src/common/config.py:548
 msgid "human"
 msgstr "Menschlich"
 
-#: ../src/common/config.py:548
+#: ../src/common/config.py:552
 msgid "marine"
 msgstr "Marine"
 
-#: ../src/common/config.py:555
+#: ../src/common/config.py:559
 #, fuzzy
 msgid "Tor"
 msgstr "An"
 
-#: ../src/common/connection_handlers_events.py:370
+#: ../src/common/connection_handlers_events.py:382
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5011,23 +5007,23 @@ msgstr ""
 "hinzugefügt. Verwenden Sie ein Kontaktlisten-Managment-Tool wie <http://jru."
 "jabberstudio.org/>, um sie zu entfernen."
 
-#: ../src/common/connection_handlers_events.py:825
+#: ../src/common/connection_handlers_events.py:837
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Anfrage zur Beendigung des Abonnements von %s"
 
-#: ../src/common/connection_handlers_events.py:910
-#: ../src/common/connection_handlers.py:343
-#: ../src/common/connection_handlers.py:1143
-#: ../src/common/connection_handlers.py:1267 ../src/common/connection.py:520
-#: ../src/common/logger.py:1159 ../src/gajim.py:435 ../src/session.py:95
+#: ../src/common/connection_handlers_events.py:922
+#: ../src/common/connection_handlers.py:341
+#: ../src/common/connection_handlers.py:1087
+#: ../src/common/connection_handlers.py:1212 ../src/common/connection.py:540
+#: ../src/common/logger.py:1163 ../src/gajim.py:472 ../src/session.py:95
 msgid "Disk Write Error"
 msgstr "Fehler beim Schreiben auf Festplatte"
 
-#: ../src/common/connection_handlers_events.py:914
-#: ../src/common/connection_handlers.py:1146
-#: ../src/common/connection_handlers.py:1270 ../src/common/connection.py:524
-#: ../src/common/logger.py:1162 ../src/gajim.py:230 ../src/session.py:99
+#: ../src/common/connection_handlers_events.py:926
+#: ../src/common/connection_handlers.py:1090
+#: ../src/common/connection_handlers.py:1215 ../src/common/connection.py:544
+#: ../src/common/logger.py:1166 ../src/gajim.py:253 ../src/session.py:99
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
@@ -5039,156 +5035,156 @@ msgstr ""
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers_events.py:935
+#: ../src/common/connection_handlers_events.py:947
 msgid "Room has been destroyed"
 msgstr "Der Chatraum wurde gelöscht"
 
-#: ../src/common/connection_handlers_events.py:943
+#: ../src/common/connection_handlers_events.py:955
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Sie können stattdessen diesen Chatraum betreten: %s"
 
-#: ../src/common/connection_handlers_events.py:1027
-#: ../src/common/connection_handlers_events.py:1070
-#: ../src/common/connection.py:270 ../src/common/connection.py:280
-#: ../src/config.py:2157 ../src/config.py:2166 ../src/config.py:2236
-#: ../src/config.py:3680 ../src/dataforms_widget.py:633 ../src/dialogs.py:3244
+#: ../src/common/connection_handlers_events.py:1043
+#: ../src/common/connection_handlers_events.py:1086
+#: ../src/common/connection.py:276 ../src/common/connection.py:286
+#: ../src/config.py:2167 ../src/config.py:2176 ../src/config.py:2246
+#: ../src/config.py:3712 ../src/dataforms_widget.py:633 ../src/dialogs.py:3252
 msgid "Invalid Jabber ID"
 msgstr "Ungültige Jabber-ID"
 
-#: ../src/common/connection_handlers_events.py:1028
-#: ../src/common/connection_handlers_events.py:1071
+#: ../src/common/connection_handlers_events.py:1044
+#: ../src/common/connection_handlers_events.py:1087
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 "Es wurde eine Nachricht von einer ungültigen Jabber-ID empfangen. Die "
 "Nachricht wurde ignoriert."
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/common/connection_handlers_events.py:1102
+#: ../src/common/connection_handlers_events.py:1177
 #: ../src/gui_interface.py:433 ../src/gui_interface.py:447
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "Fehler beim Senden von %(message)s ( %(error)s )"
 
-#: ../src/common/connection_handlers_events.py:1307
+#: ../src/common/connection_handlers_events.py:1406
 msgid "URL:"
 msgstr ""
 
-#: ../src/common/connection_handlers_events.py:1608
+#: ../src/common/connection_handlers_events.py:1707
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Unbekannter SSL-Fehler: %d"
 
-#: ../src/common/connection_handlers_events.py:2211 ../src/dialogs.py:2917
+#: ../src/common/connection_handlers_events.py:2313 ../src/dialogs.py:2925
 #: ../src/notify.py:266
 msgid "New Single Message"
 msgstr "Neue einzelne Nachricht"
 
-#: ../src/common/connection_handlers_events.py:2213
+#: ../src/common/connection_handlers_events.py:2315
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Einzelne neue Nachricht von %(nickname)s"
 
-#: ../src/common/connection_handlers_events.py:2217 ../src/dialogs.py:2918
+#: ../src/common/connection_handlers_events.py:2319 ../src/dialogs.py:2926
 #: ../src/notify.py:267
 msgid "New Private Message"
 msgstr "Neue private Nachricht"
 
-#: ../src/common/connection_handlers_events.py:2219
+#: ../src/common/connection_handlers_events.py:2321
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Neue private Nachricht aus dem Chatraum %s"
 
-#: ../src/common/connection_handlers_events.py:2222
+#: ../src/common/connection_handlers_events.py:2324
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/common/connection_handlers_events.py:2225
+#: ../src/common/connection_handlers_events.py:2327
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Neue Nachricht von %(nickname)s"
 
-#: ../src/common/connection_handlers_events.py:2229 ../src/dialogs.py:2917
+#: ../src/common/connection_handlers_events.py:2331 ../src/dialogs.py:2925
 #: ../src/notify.py:266
 msgid "New Message"
 msgstr "Neue Nachricht"
 
-#: ../src/common/connection_handlers_events.py:2231
+#: ../src/common/connection_handlers_events.py:2333
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Neue Nachricht von %(nickname)s"
 
-#: ../src/common/connection_handlers_events.py:2375
+#: ../src/common/connection_handlers_events.py:2477
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s änderte seinen Status"
 
-#: ../src/common/connection_handlers_events.py:2377
-#: ../src/groupchat_control.py:207 ../src/groupchat_control.py:1855
+#: ../src/common/connection_handlers_events.py:2479
+#: ../src/groupchat_control.py:208 ../src/groupchat_control.py:1903
 #: ../src/history_window.py:455
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s ist jetzt %(status)s"
 
-#: ../src/common/connection_handlers_events.py:2381 ../src/dialogs.py:2929
+#: ../src/common/connection_handlers_events.py:2483 ../src/dialogs.py:2937
 #: ../src/notify.py:280
 msgid "Contact Changed Status"
 msgstr "Kontakt hat Status verändert"
 
-#: ../src/common/connection_handlers_events.py:2383
+#: ../src/common/connection_handlers_events.py:2485
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s angemeldet"
 
 #. default value
-#: ../src/common/connection_handlers_events.py:2387 ../src/dialogs.py:2913
+#: ../src/common/connection_handlers_events.py:2489 ../src/dialogs.py:2921
 #: ../src/notify.py:262
 msgid "Contact Signed In"
 msgstr "Kontakt hat sich angemeldet"
 
-#: ../src/common/connection_handlers_events.py:2389
+#: ../src/common/connection_handlers_events.py:2491
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s abgemeldet"
 
-#: ../src/common/connection_handlers_events.py:2393 ../src/dialogs.py:2915
+#: ../src/common/connection_handlers_events.py:2495 ../src/dialogs.py:2923
 #: ../src/notify.py:264
 msgid "Contact Signed Out"
 msgstr "Kontakt hat sich abgemeldet"
 
-#: ../src/common/connection_handlers.py:92
+#: ../src/common/connection_handlers.py:90
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Konnte Idle-Modul nicht laden"
 
-#: ../src/common/connection_handlers.py:127
+#: ../src/common/connection_handlers.py:125
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 "Die Registrierungsinformation für den Transport %s sind nicht rechtzeitig "
 "angekommen"
 
-#: ../src/common/connection_handlers.py:135
+#: ../src/common/connection_handlers.py:133
 msgid "Registration succeeded"
 msgstr "Registrierung war erfolgreich"
 
 # FIXME: Type in original string. Should be
 # Registration with agent %s succeeded
 # FIXME: Check English: should be consistently called "transport"
-#: ../src/common/connection_handlers.py:136
+#: ../src/common/connection_handlers.py:134
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Registrierung mit Agent %s war erfolgreich"
 
-#: ../src/common/connection_handlers.py:145
+#: ../src/common/connection_handlers.py:143
 msgid "Registration failed"
 msgstr "Registrierung ist fehlgeschlagen"
 
 # FIXME: Type in original string. Should be
 # Registration with agent ...
 # FIXME: Check English: should be consistently called "transport"
-#: ../src/common/connection_handlers.py:146
+#: ../src/common/connection_handlers.py:144
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
@@ -5196,164 +5192,164 @@ msgstr ""
 "Registrierung mit Agent %(agent)s ist mit Fehler %(error)s fehlgeschlagen: "
 "%(error_msg)s"
 
-#: ../src/common/connection_handlers.py:591 ../src/common/connection.py:1770
+#: ../src/common/connection_handlers.py:598 ../src/common/connection.py:1816
 msgid "Invisibility not supported"
 msgstr "Unsichtbarkeit wird nicht unterstützt"
 
-#: ../src/common/connection_handlers.py:592 ../src/common/connection.py:1771
+#: ../src/common/connection_handlers.py:599 ../src/common/connection.py:1817
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Das Konto %s unterstützt keine Unsichtbarkeit."
 
-#: ../src/common/connection_handlers.py:1956
+#: ../src/common/connection_handlers.py:1905
 msgid "I would like to add you to my roster."
 msgstr "Ich würde Sie gerne als Kontakt zu meiner Kontaktliste hinzufügen."
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:73
 msgid "Unable to get issuer certificate"
 msgstr "Das Zertifikat des Ausstellers ist nicht verfügbar."
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:74
 msgid "Unable to get certificate CRL"
 msgstr "Die Zertifikats-CRL ist nicht verfügbar."
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:75
 msgid "Unable to decrypt certificate's signature"
 msgstr "Die Zertifikatsunterschrift konnte nicht entschlüsselt werden."
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:76
 msgid "Unable to decrypt CRL's signature"
 msgstr "Die CRL-Unterschrift konnte nicht entschlüsselt werden."
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:77
 msgid "Unable to decode issuer public key"
 msgstr "Der öffentliche Schlüssel konnte nicht entschlüsselt werden."
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:78
 msgid "Certificate signature failure"
 msgstr "Fehler bei der Zertifikat-Unterschrift"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:79
 msgid "CRL signature failure"
 msgstr "Fehler bei der CRL-Unterschrift"
 
 # TODO: How should we handle full sentences that miss a . at their end in the original string?
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:80
 msgid "Certificate is not yet valid"
 msgstr "Das Zertifikat ist noch nicht gültig."
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:81
 msgid "Certificate has expired"
 msgstr "Das Zertifikat ist abgelaufen."
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:82
 msgid "CRL is not yet valid"
 msgstr "Die CRL ist nocht nicht gültig."
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:83
 msgid "CRL has expired"
 msgstr "Die CRL ist abgelaufen."
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:84
 msgid "Format error in certificate's notBefore field"
 msgstr "Formatfehler im \"notBefore\"-Feld des Zertifikats"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:85
 msgid "Format error in certificate's notAfter field"
 msgstr "Formatfehler im \"notAfter\"-Feld des Zertifikats"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:86
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Formatfehler im \"lastUpdate\"-Feld der CRL"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:87
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Formatfehler im \"nextUpdate\"-Feld der CRL"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:88
 msgid "Out of memory"
 msgstr "Zu wenig Speicher"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:89
 msgid "Self signed certificate"
 msgstr "Selbstsigniertes Zertifikat"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:90
 msgid "Self signed certificate in certificate chain"
 msgstr "Selbstsigniertes Zertifikat in der Zertifikatkette"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:91
 msgid "Unable to get local issuer certificate"
 msgstr "Das lokale Herausgeberzertifikat ist nicht verfügbar."
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:92
 msgid "Unable to verify the first certificate"
 msgstr "Das erste Zertifikat konnte nicht überprüft werden."
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:93
 msgid "Certificate chain too long"
 msgstr "Zertifikatkette zu lang"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:94
 msgid "Certificate revoked"
 msgstr "Zertifikat wurde widerrufen"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:95
 msgid "Invalid CA certificate"
 msgstr "Ungültiges CA-Zertifikat"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:96
 msgid "Path length constraint exceeded"
 msgstr "Pfadlängenbeschränkung überschritten"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:97
 msgid "Unsupported certificate purpose"
 msgstr "Nicht unterstützter Zertifikatsverwendungszweck"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:98
 msgid "Certificate not trusted"
 msgstr "Zertifikat nicht vertrauenswürdig"
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:99
 msgid "Certificate rejected"
 msgstr "Zertifikat abgelehnt"
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:100
 msgid "Subject issuer mismatch"
 msgstr "Betreffs-Aussteller unpassend"
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:101
 msgid "Authority and subject key identifier mismatch"
 msgstr "Zertifizierungsstelle und Betreffsschlüssel unpassend"
 
-#: ../src/common/connection.py:99
+#: ../src/common/connection.py:102
 msgid "Authority and issuer serial number mismatch"
 msgstr "Zertifizierungsstelle und Aussteller-Seriennummer unpassend"
 
-#: ../src/common/connection.py:100
+#: ../src/common/connection.py:103
 msgid "Key usage does not include certificate signing"
 msgstr ""
 "Die Verwendung des Schlüssels beinhaltet nicht das Unterschreiben des "
 "Zertifikats."
 
-#: ../src/common/connection.py:101
+#: ../src/common/connection.py:104
 msgid "Application verification failure"
 msgstr "Fehler beim Überprüfen der Anwendung"
 
-#: ../src/common/connection.py:271 ../src/common/connection.py:281
-#: ../src/dialogs.py:3245
+#: ../src/common/connection.py:277 ../src/common/connection.py:287
+#: ../src/dialogs.py:3253
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr ""
 "Die Nachricht kann nicht an %s gesendet werden. Die Jabber-ID ist ungültig."
 
-#: ../src/common/connection.py:304
+#: ../src/common/connection.py:310
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 "Weder ist die entfernte Präsenz signiert, noch wurde ein Schlüssel "
 "zugewiesen."
 
-#: ../src/common/connection.py:307
+#: ../src/common/connection.py:313
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr ""
@@ -5361,11 +5357,11 @@ msgstr ""
 "Schlüssel überein."
 
 #. we're not english: one in locale and one en
-#: ../src/common/connection.py:363
+#: ../src/common/connection.py:369
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Diese Nachricht ist *verschlüsselt* (Siehe: JEP:`27`)]"
 
-#: ../src/common/connection.py:507
+#: ../src/common/connection.py:527
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -5374,18 +5370,18 @@ msgstr ""
 "Thema: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:930
+#: ../src/common/connection.py:958
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Verbindung mit Konto \"%s\" abgebrochen"
 
-#: ../src/common/connection.py:931
+#: ../src/common/connection.py:959
 msgid "Reconnect manually."
 msgstr "Manuelle Neuverbindung."
 
 #. it's a new account
 #. wrong answer
-#: ../src/common/connection.py:942
+#: ../src/common/connection.py:970
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
@@ -5393,65 +5389,70 @@ msgstr ""
 "%(error)s"
 
 #. requested config has changed since first connection
-#: ../src/common/connection.py:984
+#: ../src/common/connection.py:1012
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Der Server %s hat ein anderes Registrierungsformular angeboten"
 
-#: ../src/common/connection.py:1001
+#: ../src/common/connection.py:1029
 msgid "Invalid answer"
 msgstr "Ungültige Antwort"
 
-#: ../src/common/connection.py:1002
+#: ../src/common/connection.py:1030
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Der Transport %(name)s beantwortete die Registrierungsanfrage nicht korrekt: "
 "%(error)s"
 
-#: ../src/common/connection.py:1297
+#: ../src/common/connection.py:1157
+#, fuzzy
+msgid "Wrong Custom Hostname"
+msgstr "Benutzerdefinierten Rechnernamen und Port verwenden"
+
+#: ../src/common/connection.py:1339
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr "Die Verbindung mit %s konnte nicht hergestellt werden."
 
-#: ../src/common/connection.py:1300
+#: ../src/common/connection.py:1342
 #, fuzzy, python-format
 msgid "Could not connect to \"%(host)s\""
 msgstr "Die Verbindung mit %s konnte nicht hergestellt werden."
 
-#: ../src/common/connection.py:1302 ../src/common/connection.py:1463
+#: ../src/common/connection.py:1344 ../src/common/connection.py:1510
 #: ../src/gui_interface.py:542
 msgid "Check your connection or try again later."
 msgstr ""
 "Überprüfen Sie die Verbindung oder versuchen Sie es später noch einmal."
 
-#: ../src/common/connection.py:1307
+#: ../src/common/connection.py:1349
 #, python-format
 msgid "Server replied: %s"
 msgstr "Server antwortete: %s"
 
-#: ../src/common/connection.py:1322
+#: ../src/common/connection.py:1364
 msgid "Connection to proxy failed"
 msgstr "Verbindung mit Proxy fehlgeschlagen"
 
-#: ../src/common/connection.py:1360 ../src/common/connection.py:1438
+#: ../src/common/connection.py:1402 ../src/common/connection.py:1485
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Die Verbindung zum Konto %s konnte nicht hergestellt werden."
 
-#: ../src/common/connection.py:1361 ../src/common/connection.py:1439
+#: ../src/common/connection.py:1403 ../src/common/connection.py:1486
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr ""
 "Die Verbindung zum Konto \"%s\" wurde unterbrochen. Sie wird "
 "wiederhergestellt."
 
-#: ../src/common/connection.py:1388
-#, python-format
-msgid "The authenticity of the %s certificate could be invalid."
+#: ../src/common/connection.py:1429
+#, fuzzy, python-format
+msgid "The authenticity of the %s certificate could be invalid"
 msgstr "Die Authentizität des %s Zertifikats könnte ungültig sein."
 
-#: ../src/common/connection.py:1391
+#: ../src/common/connection.py:1432
 #, python-format
 msgid ""
 "\n"
@@ -5460,7 +5461,7 @@ msgstr ""
 "\n"
 "SSL-Fehler: <b>%s</b>"
 
-#: ../src/common/connection.py:1393
+#: ../src/common/connection.py:1434
 #, python-format
 msgid ""
 "\n"
@@ -5469,33 +5470,33 @@ msgstr ""
 "\n"
 "Unbekannter SSL-Fehler: %d"
 
-#: ../src/common/connection.py:1420
+#: ../src/common/connection.py:1462
 #, fuzzy, python-format
 msgid ""
 "The authenticity of the %s certificate could be invalid.\n"
 "The certificate does not cover this domain."
 msgstr "Die Authentizität des %s Zertifikats könnte ungültig sein."
 
-#: ../src/common/connection.py:1462 ../src/common/connection.py:2203
+#: ../src/common/connection.py:1509 ../src/common/connection.py:2256
 #: ../src/common/zeroconf/connection_zeroconf.py:205
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Die Verbindung mit %s konnte nicht hergestellt werden."
 
-#: ../src/common/connection.py:1498
+#: ../src/common/connection.py:1545
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Authentifizierung mit \"%s\" fehlgeschlagen"
 
-#: ../src/common/connection.py:1499
+#: ../src/common/connection.py:1546
 msgid "Please check your login and password for correctness."
 msgstr "Bitte überprüfen Sie Benutzernamen und Passwort."
 
-#: ../src/common/connection.py:1574
+#: ../src/common/connection.py:1622
 msgid "Error while removing privacy list"
 msgstr "Fehler beim Entfernen der Privatsphären-Liste"
 
-#: ../src/common/connection.py:1575
+#: ../src/common/connection.py:1623
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -5505,24 +5506,24 @@ msgstr ""
 "in einer Ihrer Verbindungen aktiv. Deaktivieren Sie diese und versuchen Sie "
 "es erneut."
 
-#: ../src/common/connection.py:2067
+#: ../src/common/connection.py:2120
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Kontakt gesendet: \"%s\" (%s)"
 
-#: ../src/common/connection.py:2070
+#: ../src/common/connection.py:2123
 msgid "Sent contacts:"
 msgstr "Gesendete Kontakte:"
 
-#: ../src/common/connection.py:2220 ../src/common/connection.py:2242
+#: ../src/common/connection.py:2273 ../src/common/connection.py:2295
 msgid "Not fetched because of invisible status"
 msgstr "Nicht abgeholt, da der Status auf Unsichtbar gesetzt ist"
 
-#: ../src/common/connection.py:2826
+#: ../src/common/connection.py:2879
 msgid "Unregister failed"
 msgstr "De-Registrierung fehlgeschlagen"
 
-#: ../src/common/connection.py:2827
+#: ../src/common/connection.py:2880
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr "De-Registrierung mit Server %(server)s fehlgeschlagen: %(error)s"
@@ -5532,12 +5533,13 @@ msgstr "De-Registrierung mit Server %(server)s fehlgeschlagen: %(error)s"
 msgid "Observers"
 msgstr "Beobachter"
 
+#. Invite to
 #: ../src/common/contacts.py:133 ../src/common/contacts.py:361
-#: ../src/common/helpers.py:67 ../src/disco.py:121 ../src/disco.py:122
-#: ../src/disco.py:1554 ../src/roster_window.py:863
-#: ../src/roster_window.py:1614 ../src/roster_window.py:1728
-#: ../src/roster_window.py:1730 ../src/roster_window.py:1892
-#: ../src/roster_window.py:2589
+#: ../src/common/helpers.py:67 ../src/disco.py:123 ../src/disco.py:124
+#: ../src/disco.py:1562 ../src/roster_window.py:863
+#: ../src/roster_window.py:1617 ../src/roster_window.py:1731
+#: ../src/roster_window.py:1733 ../src/roster_window.py:1895
+#: ../src/roster_window.py:2593 ../src/roster_window.py:5800
 msgid "Transports"
 msgstr "Transporte"
 
@@ -5765,7 +5767,7 @@ msgstr "Wochenende!"
 
 #: ../src/common/helpers.py:158
 msgid "Username must be between 1 and 1023 chars"
-msgstr ""
+msgstr "Der Benutzername muss zwischen 1 und 1023 Zeichen lang sein"
 
 #: ../src/common/helpers.py:163
 msgid "Invalid character in username."
@@ -5773,7 +5775,7 @@ msgstr "Ungültiges Zeichen im Benutzernamen"
 
 #: ../src/common/helpers.py:169
 msgid "Server must be between 1 and 1023 chars"
-msgstr ""
+msgstr "Der Servername muss zwischen 1 und 1023 Zeichen lang sein"
 
 #: ../src/common/helpers.py:174
 msgid "Invalid character in hostname."
@@ -5785,7 +5787,7 @@ msgstr "Server-Adresse benötigt."
 
 #: ../src/common/helpers.py:180
 msgid "Resource must be between 1 and 1023 chars"
-msgstr ""
+msgstr "Der Resourcenname muss zwischen 1 und 1023 Zeichen lang sein"
 
 #: ../src/common/helpers.py:185
 msgid "Invalid character in resource."
@@ -5795,7 +5797,7 @@ msgstr "Ungültiges Zeichen in der Ressource."
 msgid "_Busy"
 msgstr "_Beschäftigt"
 
-#: ../src/common/helpers.py:227 ../src/tooltips.py:191
+#: ../src/common/helpers.py:227 ../src/tooltips.py:207
 msgid "Busy"
 msgstr "Beschäftigt"
 
@@ -5803,7 +5805,7 @@ msgstr "Beschäftigt"
 msgid "_Not Available"
 msgstr "_Nicht verfügbar"
 
-#: ../src/common/helpers.py:232 ../src/tooltips.py:193
+#: ../src/common/helpers.py:232 ../src/tooltips.py:209
 msgid "Not Available"
 msgstr "Nicht verfügbar"
 
@@ -5811,7 +5813,7 @@ msgstr "Nicht verfügbar"
 msgid "_Free for Chat"
 msgstr "_Frei zum Chatten"
 
-#: ../src/common/helpers.py:237 ../src/tooltips.py:187
+#: ../src/common/helpers.py:237 ../src/tooltips.py:203
 msgid "Free for Chat"
 msgstr "Frei zum Chatten"
 
@@ -5819,7 +5821,7 @@ msgstr "Frei zum Chatten"
 msgid "?user status:_Available"
 msgstr "?Benutzerstatus:Verfügb_ar"
 
-#: ../src/common/helpers.py:242 ../src/tooltips.py:185
+#: ../src/common/helpers.py:242 ../src/tooltips.py:201
 msgid "?user status:Available"
 msgstr "?Benutzerstatus:Verfügbar"
 
@@ -5835,7 +5837,7 @@ msgstr "Ab_wesend"
 msgid "_Offline"
 msgstr "A_bgemeldet"
 
-#: ../src/common/helpers.py:254 ../src/tooltips.py:195
+#: ../src/common/helpers.py:254 ../src/tooltips.py:211
 msgid "Offline"
 msgstr "Abgemeldet"
 
@@ -5907,19 +5909,19 @@ msgstr "Besucher"
 msgid "Visitor"
 msgstr "Besucher"
 
-#: ../src/common/helpers.py:316 ../src/tooltips.py:209
+#: ../src/common/helpers.py:316 ../src/tooltips.py:225
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Gruppenchat Kontaktverbindung:Keine"
 
-#: ../src/common/helpers.py:318 ../src/tooltips.py:215
+#: ../src/common/helpers.py:318 ../src/tooltips.py:231
 msgid "Owner"
 msgstr "Besitzer"
 
-#: ../src/common/helpers.py:320 ../src/tooltips.py:213
+#: ../src/common/helpers.py:320 ../src/tooltips.py:229
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:322 ../src/tooltips.py:211
+#: ../src/common/helpers.py:322 ../src/tooltips.py:227
 msgid "Member"
 msgstr "Mitglied"
 
@@ -6132,9 +6134,9 @@ msgstr "ALSA: %s"
 #. Pulseaudio sink
 #: ../src/common/multimedia_helpers.py:71
 #: ../src/common/multimedia_helpers.py:85
-#, fuzzy, python-format
+#, python-format
 msgid "Pulse: %s"
-msgstr "Datei: %s"
+msgstr "Pulse: %s"
 
 #. Fake sink
 #: ../src/common/multimedia_helpers.py:79
@@ -6183,11 +6185,11 @@ msgstr "X Window System (ohne Xv)"
 msgid "Error: cannot open %s for reading"
 msgstr "Fehler: Kann %s kann nicht zum Lesen öffnen"
 
-#: ../src/common/optparser.py:304 ../src/common/optparser.py:305
+#: ../src/common/optparser.py:306 ../src/common/optparser.py:307
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:384
+#: ../src/common/optparser.py:386
 msgid "migrating logs database to indices"
 msgstr "migriere Logdatenbank zu Indizes"
 
@@ -6905,8 +6907,9 @@ msgid "speed"
 msgstr ""
 
 #: ../src/common/pep.py:213
+#, fuzzy
 msgid "street"
-msgstr ""
+msgstr "Stream"
 
 #: ../src/common/pep.py:214
 msgid "text"
@@ -6978,28 +6981,28 @@ msgid "Unable to bind to port %d."
 msgstr "Die Verbindung mit Port %d ist fehlgeschlagen."
 
 #: ../src/common/zeroconf/connection_zeroconf.py:221
-#: ../src/common/zeroconf/connection_zeroconf.py:305
-#: ../src/common/zeroconf/connection_zeroconf.py:318
-#: ../src/common/zeroconf/connection_zeroconf.py:334
+#: ../src/common/zeroconf/connection_zeroconf.py:306
+#: ../src/common/zeroconf/connection_zeroconf.py:319
+#: ../src/common/zeroconf/connection_zeroconf.py:335
 msgid "Please check if avahi-daemon is running."
 msgstr "Bitte überprüfen Sie, ob avahi-daemon läuft."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:304
-#: ../src/common/zeroconf/connection_zeroconf.py:317
-#: ../src/common/zeroconf/connection_zeroconf.py:333
+#: ../src/common/zeroconf/connection_zeroconf.py:305
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Der Status des Kontos \"%s\" konnte nicht geändert werden."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:353
+#: ../src/common/zeroconf/connection_zeroconf.py:356
 msgid "Your message could not be sent."
 msgstr "Die Nachricht konnte nicht gesendet werden."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:367
+#: ../src/common/zeroconf/connection_zeroconf.py:368
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Der Kontakt ist offline. Ihre Nachricht konnte nicht gesendet werden."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:394
+#: ../src/common/zeroconf/connection_zeroconf.py:395
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -7020,11 +7023,11 @@ msgstr "Standard-Nachricht"
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: ../src/config.py:468 ../src/config.py:472 ../src/config.py:3185
+#: ../src/config.py:468 ../src/config.py:472 ../src/config.py:3203
 msgid "Default"
 msgstr "Standard"
 
-#: ../src/config.py:747 ../src/dialogs.py:1499
+#: ../src/config.py:747 ../src/dialogs.py:1500
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Kein Wörterburch für die Sprache %s verfügbar"
@@ -7038,73 +7041,73 @@ msgstr ""
 "Sie müssen das Wörterbuch %s installieren oder eine andere Sprache wählen, "
 "um die Rechtschreibprüfung nutzen zu können."
 
-#: ../src/config.py:1226
+#: ../src/config.py:1230
 msgid "status message title"
 msgstr "Statusbetreff"
 
-#: ../src/config.py:1226
+#: ../src/config.py:1231
 msgid "status message text"
 msgstr "Statusnachricht"
 
 #. Name column
-#: ../src/config.py:1553 ../src/dialogs.py:2673 ../src/dialogs.py:2740
-#: ../src/dialogs.py:3535 ../src/disco.py:889 ../src/disco.py:1787
-#: ../src/disco.py:2089 ../src/history_window.py:92
+#: ../src/config.py:1559 ../src/dialogs.py:2680 ../src/dialogs.py:2747
+#: ../src/dialogs.py:3545 ../src/disco.py:898 ../src/disco.py:1795
+#: ../src/disco.py:2099 ../src/history_window.py:92
 msgid "Name"
 msgstr "Name"
 
-#: ../src/config.py:1656
+#: ../src/config.py:1662
 msgid "Relogin now?"
 msgstr "Jetzt erneut anmelden?"
 
-#: ../src/config.py:1657
+#: ../src/config.py:1663
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Wenn die Änderungen sofort übernommen werden sollen, müssen Sie sich erneut "
 "anmelden."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/config.py:1814 ../src/config.py:1949
+#: ../src/config.py:1820 ../src/config.py:1955
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP kann auf diesem Computer nicht genutzt werden."
 
-#: ../src/config.py:1990 ../src/config.py:2039
+#: ../src/config.py:1998 ../src/config.py:2048
 msgid "Unread events"
 msgstr "Ungelesene Ereignisse"
 
-#: ../src/config.py:1991
+#: ../src/config.py:1999
 msgid "Read all pending events before removing this account."
 msgstr "Alle ungelesenen Ereignisse anzeigen, bevor das Konto entfernt wird."
 
-#: ../src/config.py:2021
+#: ../src/config.py:2029
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Sie haben mit dem Konto %s einen Chat geöffnet."
 
-#: ../src/config.py:2022
+#: ../src/config.py:2030
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Alle Chatfenster werden geschlossen. Fortfahren?"
 
-#: ../src/config.py:2034 ../src/config.py:2596 ../src/config.py:2634
+#: ../src/config.py:2043 ../src/config.py:2614 ../src/config.py:2652
 msgid "You are currently connected to the server"
 msgstr "Sie sind mit dem Server verbunden."
 
-#: ../src/config.py:2035
+#: ../src/config.py:2044
 msgid "To change the account name, you must be disconnected."
 msgstr ""
 "Die Verbindung muss beendet werden, damit der Kontoname geändert werden kann."
 
-#: ../src/config.py:2040
+#: ../src/config.py:2049
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Damit der Kontoname geändert werden kann, müssen Sie zuvor alle neuen "
 "Ereignisse lesen."
 
-#: ../src/config.py:2046
+#: ../src/config.py:2055
 msgid "Account Name Already Used"
 msgstr "Der Kontoname wird bereits verwendet."
 
-#: ../src/config.py:2047
+#: ../src/config.py:2056
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -7112,153 +7115,153 @@ msgstr ""
 "Dieser Name wird bereits für eines Ihrer Konten verwendet. Bitte wählen Sie "
 "einen anderen Namen."
 
-#: ../src/config.py:2051 ../src/config.py:2056
+#: ../src/config.py:2060 ../src/config.py:2065
 msgid "Invalid account name"
 msgstr "Ungültiger Kontoname"
 
-#: ../src/config.py:2052
+#: ../src/config.py:2061
 msgid "Account name cannot be empty."
 msgstr "Der Kontoname darf nicht leer sein."
 
-#: ../src/config.py:2057
+#: ../src/config.py:2066
 msgid "Account name cannot contain spaces."
 msgstr "Der Kontoname darf keine Leerzeichen enthalten."
 
-#: ../src/config.py:2138
+#: ../src/config.py:2147
 msgid "Rename Account"
 msgstr "Konto umbenennen"
 
-#: ../src/config.py:2139
+#: ../src/config.py:2148
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Geben Sie einen neuen Namen für das Konto %s ein"
 
-#: ../src/config.py:2168
+#: ../src/config.py:2178
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Die Jabber-ID muss in der Form \"benutzer@servername\" sein."
 
-#: ../src/config.py:2394 ../src/config.py:3726
+#: ../src/config.py:2412 ../src/config.py:3758
 msgid "Invalid entry"
 msgstr "Ungültiger Eintrag"
 
-#: ../src/config.py:2395 ../src/config.py:3727
+#: ../src/config.py:2413 ../src/config.py:3759
 msgid "Custom port must be a port number."
 msgstr "Der Proxy-Port muss eine gültige Portnummer sein."
 
-#: ../src/config.py:2417
+#: ../src/config.py:2435
 msgid "Failed to get secret keys"
 msgstr "Die geheimen Schlüssel konnten nicht empfangen werden."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/config.py:2418
+#: ../src/config.py:2436
 msgid "There is no OpenPGP secret key available."
 msgstr "Kein GPG-Schlüssel verfügbar."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/config.py:2456
+#: ../src/config.py:2474
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP-Schlüssel-Auswahl"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/config.py:2457
+#: ../src/config.py:2475
 msgid "Choose your OpenPGP key"
 msgstr "Wählen Sie Ihren OpenPGP-Schlüssel"
 
-#: ../src/config.py:2465
+#: ../src/config.py:2483
 msgid "No such account available"
 msgstr "Das angegebene Konto ist nicht verfügbar"
 
-#: ../src/config.py:2466
+#: ../src/config.py:2484
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Sie müssen ein Konto erstellen, bevor Sie die persönlichen Informationen "
 "ändern können."
 
-#: ../src/config.py:2473 ../src/dialogs.py:2369 ../src/dialogs.py:2662
-#: ../src/dialogs.py:2850 ../src/disco.py:516 ../src/profile_window.py:371
+#: ../src/config.py:2491 ../src/dialogs.py:2373 ../src/dialogs.py:2668
+#: ../src/dialogs.py:2857 ../src/disco.py:524 ../src/profile_window.py:371
 msgid "You are not connected to the server"
 msgstr "Sie sind nicht mit dem Server verbunden."
 
-#: ../src/config.py:2474
+#: ../src/config.py:2492
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 "Sie müssen angemeldet sein, um Ihre persönlichen Informationen ändern zu "
 "können."
 
-#: ../src/config.py:2479
+#: ../src/config.py:2497
 #, fuzzy
 msgid "Your server doesn't support vCard"
 msgstr "Ihr Server unterstützt keine vCard."
 
-#: ../src/config.py:2480
+#: ../src/config.py:2498
 msgid "Your server can't save your personal information."
 msgstr "Ihr Server kann keine persönlichen Informationen speichern."
 
-#: ../src/config.py:2597 ../src/config.py:2635
+#: ../src/config.py:2615 ../src/config.py:2653
 msgid "To disable the account, you must be disconnected."
 msgstr "Zum Deaktivieren des Kontos, müssen Sie offline sein."
 
-#: ../src/config.py:2604
+#: ../src/config.py:2622
 msgid "Account Local already exists."
 msgstr "Ein Konto mit dem Namen 'Local' ist bereits vorhanden."
 
-#: ../src/config.py:2605
+#: ../src/config.py:2623
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Bitte benennen Sie es um oder entfernen es, bevor Sie LAN-Kontakte "
 "aktivieren."
 
-#: ../src/config.py:2766
+#: ../src/config.py:2784
 #, python-format
 msgid "Edit %s"
 msgstr "%s bearbeiten"
 
-#: ../src/config.py:2768
+#: ../src/config.py:2786
 #, python-format
 msgid "Register to %s"
 msgstr "Auf %s registrieren"
 
 #. list at the beginning
-#: ../src/config.py:2804
+#: ../src/config.py:2822
 msgid "Ban List"
 msgstr "Sperrliste"
 
-#: ../src/config.py:2805
+#: ../src/config.py:2823
 msgid "Member List"
 msgstr "Mitgliederliste"
 
-#: ../src/config.py:2805
+#: ../src/config.py:2823
 msgid "Owner List"
 msgstr "Besitzerliste"
 
-#: ../src/config.py:2806
+#: ../src/config.py:2824
 msgid "Administrator List"
 msgstr "Administratorliste"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2870 ../src/disco.py:896 ../src/history_manager.py:217
+#: ../src/config.py:2888 ../src/disco.py:905 ../src/history_manager.py:217
 msgid "JID"
 msgstr "Jabber-ID"
 
-#: ../src/config.py:2880
+#: ../src/config.py:2898
 msgid "Reason"
 msgstr "Grund"
 
-#: ../src/config.py:2887
+#: ../src/config.py:2905
 msgid "Nick"
 msgstr "Spitzname"
 
-#: ../src/config.py:2893
+#: ../src/config.py:2911
 msgid "Role"
 msgstr "Rolle"
 
-#: ../src/config.py:2920
+#: ../src/config.py:2938
 msgid "Banning..."
 msgstr "Verbannen …"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2922
+#: ../src/config.py:2940
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -7266,11 +7269,11 @@ msgstr ""
 "<b>Wen möchten Sie verbannen?</b>\n"
 "\n"
 
-#: ../src/config.py:2924
+#: ../src/config.py:2942
 msgid "Adding Member..."
 msgstr "Mitglied hinzufügen …"
 
-#: ../src/config.py:2925
+#: ../src/config.py:2943
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -7278,11 +7281,11 @@ msgstr ""
 "<b>Wen möchten Sie zum Mitglied machen?</b>\n"
 "\n"
 
-#: ../src/config.py:2927
+#: ../src/config.py:2945
 msgid "Adding Owner..."
 msgstr "Besitzer hinzufügen …"
 
-#: ../src/config.py:2928
+#: ../src/config.py:2946
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -7290,11 +7293,11 @@ msgstr ""
 "<b>Wen möchten Sie zum Besitzer machen?</b>\n"
 "\n"
 
-#: ../src/config.py:2930
+#: ../src/config.py:2948
 msgid "Adding Administrator..."
 msgstr "Administrator hinzufügen …"
 
-#: ../src/config.py:2931
+#: ../src/config.py:2949
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -7302,7 +7305,7 @@ msgstr ""
 "<b>Wen möchten Sie zum Administrator machen?</b>\n"
 "\n"
 
-#: ../src/config.py:2932
+#: ../src/config.py:2950
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -7319,105 +7322,104 @@ msgstr ""
 "benutzer@domain, jede domain/Ressource oder jede Adresse, die eine Subdomain "
 "enthält)."
 
-#: ../src/config.py:3033
+#: ../src/config.py:3051
 #, python-format
 msgid "Removing %s account"
 msgstr "Entferne Konto %s"
 
-#: ../src/config.py:3048
+#: ../src/config.py:3066
 msgid "Account is disabled"
 msgstr "Konto ist deaktiviert"
 
-#: ../src/config.py:3049
+#: ../src/config.py:3067
 msgid "To unregister from a server, account must be enabled."
 msgstr "Um sich vom Server abzumelden, muss das Konto aktiviert sein."
 
-#: ../src/config.py:3062 ../src/gui_interface.py:286
+#: ../src/config.py:3080 ../src/gui_interface.py:286
 #: ../src/gui_interface.py:734
 msgid "Password Required"
 msgstr "Passwort benötigt"
 
-#: ../src/config.py:3063 ../src/gui_interface.py:714
+#: ../src/config.py:3081 ../src/gui_interface.py:714
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Bitte geben Sie Ihr Passwort für %s ein"
 
-#: ../src/config.py:3064 ../src/gui_interface.py:734
+#: ../src/config.py:3082 ../src/gui_interface.py:734
 msgid "Save password"
 msgstr "Passwort speichern"
 
-#: ../src/config.py:3074
+#: ../src/config.py:3092
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Das Konto \"%s\" ist mit dem Server verbunden"
 
-#: ../src/config.py:3075
+#: ../src/config.py:3093
 msgid "If you remove it, the connection will be lost."
 msgstr "Wenn Sie es entfernen, wird die Verbindung beendet."
 
-#: ../src/config.py:3089
+#: ../src/config.py:3107
 #, python-format
 msgid "Connection to server %s failed"
 msgstr "Verbindung zu Server %s fehlgeschlagen"
 
-#: ../src/config.py:3090
+#: ../src/config.py:3108
 msgid "What would you like to do?"
 msgstr "Was möchten Sie tun?"
 
-#: ../src/config.py:3091
+#: ../src/config.py:3109
 msgid "Remove only from Gajim"
 msgstr "Kont_o nur aus Gajim entfernen"
 
-#: ../src/config.py:3092
+#: ../src/config.py:3110
 msgid "Don't remove anything. I'll try again later"
 msgstr "Bitte nichts entfernen. Ich versuche es später noch einmal"
 
-#: ../src/config.py:3185
+#: ../src/config.py:3203
 msgid "?print_status:All"
 msgstr "?print_status:Alle"
 
-#: ../src/config.py:3186
+#: ../src/config.py:3204
 msgid "Enter and leave only"
 msgstr "Nur betreten und verlassen"
 
-#: ../src/config.py:3187
+#: ../src/config.py:3205
 msgid "?print_status:None"
 msgstr "?print_status:Nichts"
 
-#: ../src/config.py:3246
+#: ../src/config.py:3265
 msgid "New Group Chat"
 msgstr "Neuer Gruppenchat"
 
 # TODO: make decisision about how to handle original string referring to a bookmarked groupchat.
-#: ../src/config.py:3279
+#: ../src/config.py:3298
 msgid "This bookmark has invalid data"
 msgstr "Dieser gespeicherte Chatraum beinhaltet ungültige Daten"
 
-#: ../src/config.py:3280
+#: ../src/config.py:3299
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Bitte Server- und Chatraumfeld ausfüllen oder gespeicherten Chatraum löschen."
 
-#: ../src/config.py:3406 ../src/config.py:3417 ../src/config.py:3426
-#: ../src/config.py:3437 ../src/config.py:3445
+#: ../src/config.py:3427 ../src/config.py:3440 ../src/config.py:3452
+#: ../src/config.py:3478
 msgid "Character not allowed"
 msgstr "Zeichen nicht erlaubt"
 
-#: ../src/config.py:3417 ../src/config.py:3425 ../src/config.py:3437
-#: ../src/config.py:3702
+#: ../src/config.py:3440 ../src/config.py:3451 ../src/config.py:3734
 msgid "Invalid server"
 msgstr "Ungültiger Server"
 
-#: ../src/config.py:3444
+#: ../src/config.py:3477
 msgid "Invalid room"
 msgstr "Ungültiger Raum"
 
-#: ../src/config.py:3614
+#: ../src/config.py:3646
 msgid "Account has been added successfully"
 msgstr "Konto wurde erfolgreich hinzugefügt"
 
-#: ../src/config.py:3615 ../src/config.py:3621
+#: ../src/config.py:3647 ../src/config.py:3653
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menu item under the Edit menu from the main "
@@ -7427,35 +7429,35 @@ msgstr ""
 "Button drücken, oder später den Eintrag Konto im Ändern Menü in der "
 "Kontaktliste auswählen."
 
-#: ../src/config.py:3620
+#: ../src/config.py:3652
 msgid "Your new account has been created successfully"
 msgstr "Ihr neues Konto wurde erfolgreich erstellt"
 
-#: ../src/config.py:3659
+#: ../src/config.py:3691
 msgid "Invalid username"
 msgstr "Ungültiger Benutzername"
 
-#: ../src/config.py:3661
+#: ../src/config.py:3693
 msgid "You must provide a username to configure this account."
 msgstr ""
 "Sie müssen einen Benutzernamen angeben, um dieses Konto zu konfigurieren."
 
-#: ../src/config.py:3703
+#: ../src/config.py:3735
 msgid "Please provide a server on which you want to register."
 msgstr "Bitte geben Sie den Server an, bei dem Sie sich registrieren möchten."
 
-#: ../src/config.py:3759 ../src/gui_interface.py:1313
+#: ../src/config.py:3791 ../src/gui_interface.py:1322
 msgid "Certificate Already in File"
 msgstr "Zertifikat bereits in der Datei"
 
-#: ../src/config.py:3760 ../src/gui_interface.py:1314
+#: ../src/config.py:3792 ../src/gui_interface.py:1323
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 "Dieses Zertifikat wird nicht erneut hinzugefügt, da es sich bereit in der "
 "Datei %s befindet."
 
-#: ../src/config.py:3850
+#: ../src/config.py:3882
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -7470,7 +7472,7 @@ msgstr ""
 "SSL-Fehler: %(error)s\n"
 "Möchten Sie sich dennoch zum Server verbinden?"
 
-#: ../src/config.py:3856 ../src/gui_interface.py:1342
+#: ../src/config.py:3888 ../src/gui_interface.py:1351
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -7481,89 +7483,85 @@ msgstr ""
 "SHA1-Fingerprint dieses Zertifikates:\n"
 "%s"
 
-#: ../src/config.py:3888 ../src/config.py:3922
+#: ../src/config.py:3920 ../src/config.py:3954
 msgid "An error occurred during account creation"
 msgstr "Während der Konto-Erstellung ist ein Fehler aufgetreten"
 
-#: ../src/config.py:3987
+#: ../src/config.py:4019
 msgid "Account name is in use"
 msgstr "Der Kontoname ist bereits vergeben"
 
-#: ../src/config.py:3988
+#: ../src/config.py:4020
 msgid "You already have an account using this name."
 msgstr "Sie haben bereits ein Konto mit diesem Namen."
 
-#: ../src/config.py:4118
+#: ../src/config.py:4150
 msgid "PEP node was not removed"
 msgstr "PEP-Knoten wurde nicht entfernt"
 
-#: ../src/config.py:4119
+#: ../src/config.py:4151
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "Der PEP-Knoten %(node)s wurde nicht entfernt: %(message)s"
 
-#: ../src/config.py:4147
-#, fuzzy, python-format
+#: ../src/config.py:4179
+#, python-format
 msgid "Configure %s"
-msgstr "_Einstellen"
-
-#: ../src/config.py:4163 ../src/plugins/gui.py:92
-msgid "Active"
-msgstr "Aktiv"
+msgstr "%s konfigurieren"
 
-#: ../src/config.py:4171
+#: ../src/config.py:4204
 msgid "Event"
 msgstr "Ereignis"
 
-#: ../src/config.py:4205
+#: ../src/config.py:4238
 #, fuzzy
 msgid "Attention Message Received"
 msgstr "Erste empfangene Nachricht"
 
-#: ../src/config.py:4206
+#: ../src/config.py:4239
 msgid "First Message Received"
 msgstr "Erste empfangene Nachricht"
 
-#: ../src/config.py:4207
+#: ../src/config.py:4240
 msgid "Next Message Received Focused"
 msgstr "Nächste empfangene Nachricht ausgewählt"
 
-#: ../src/config.py:4209
+#: ../src/config.py:4242
 msgid "Next Message Received Unfocused"
 msgstr "Nächste empfangene Nachricht nicht ausgewählt"
 
-#: ../src/config.py:4210
+#: ../src/config.py:4243
 msgid "Contact Connected"
 msgstr "Kontakt verbunden"
 
-#: ../src/config.py:4211
+#: ../src/config.py:4244
 msgid "Contact Disconnected"
 msgstr "Kontakt nicht verbunden"
 
-#: ../src/config.py:4212
+#: ../src/config.py:4245
 msgid "Message Sent"
 msgstr "Nachricht gesendet"
 
-#: ../src/config.py:4213
+#: ../src/config.py:4246
 msgid "Group Chat Message Highlight"
 msgstr "Hervorhebung von Chatraum-Nachrichten"
 
-#: ../src/config.py:4214
+#: ../src/config.py:4247
 msgid "Group Chat Message Received"
 msgstr "Chatraum-Nachricht empfangen"
 
-#: ../src/config.py:4215
+#: ../src/config.py:4248
 msgid "GMail Email Received"
 msgstr "E-Mail über Google-Mail empfangen"
 
-#: ../src/conversation_textview.py:483 ../src/conversation_textview.py:501
+#: ../src/conversation_textview.py:471 ../src/conversation_textview.py:491
 #, python-format
 msgid ""
 "<b>Message was corrected. Last message was:</b>\n"
 "  %s"
 msgstr ""
 
-#: ../src/conversation_textview.py:654
+#: ../src/conversation_textview.py:628
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -7573,7 +7571,7 @@ msgstr ""
 "am anderen Ende eingetroffen ist. Falls es längere\n"
 "Zeit bleibt, ging die Nachricht höchstwahrscheinlich verloren."
 
-#: ../src/conversation_textview.py:673
+#: ../src/conversation_textview.py:648
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -7581,44 +7579,44 @@ msgstr ""
 "Der Text unterhalb dieser Linie zeigt, was seit Ihrem letzten Besuch in "
 "diesem Chatraum gesagt wurde."
 
-#: ../src/conversation_textview.py:793
+#: ../src/conversation_textview.py:769
 msgid "_Quote"
 msgstr "_Zitieren"
 
-#: ../src/conversation_textview.py:800
+#: ../src/conversation_textview.py:776
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Aktionen für \"%s\""
 
-#: ../src/conversation_textview.py:813
+#: ../src/conversation_textview.py:789
 msgid "Read _Wikipedia Article"
 msgstr "_Wikipedia-Artikel lesen"
 
-#: ../src/conversation_textview.py:818
+#: ../src/conversation_textview.py:794
 msgid "Look it up in _Dictionary"
 msgstr "Im Wörterbuch _suchen"
 
-#: ../src/conversation_textview.py:835
+#: ../src/conversation_textview.py:811
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Im Wörterbuch URL fehlt ein \"%s\" und ist nicht Wiktionary"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:848
+#: ../src/conversation_textview.py:824
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "In der URL für die Websuche fehlt ein \"%s\""
 
-#: ../src/conversation_textview.py:851
+#: ../src/conversation_textview.py:827
 msgid "Web _Search for it"
 msgstr "Im _Internet hiernach suchen"
 
-#: ../src/conversation_textview.py:857
+#: ../src/conversation_textview.py:833
 msgid "Open as _Link"
 msgstr "Als _Link öffnen"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1386
+#: ../src/conversation_textview.py:1381
 #, python-format
 msgid "Yesterday"
 msgid_plural "%(nb_days)i days ago"
@@ -7626,7 +7624,7 @@ msgstr[0] "Gestern"
 msgstr[1] "vor %(nb_days)i Tagen"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1436 ../src/history_window.py:488
+#: ../src/conversation_textview.py:1437 ../src/history_window.py:488
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Thema: %s\n"
@@ -7642,7 +7640,7 @@ msgstr "Medientyp wird nicht unterstützt"
 
 #: ../src/dataforms_widget.py:592
 msgid "This field is required"
-msgstr ""
+msgstr "Dieses Feld wird benötigt"
 
 #: ../src/dataforms_widget.py:637
 msgid "Jabber ID already in list"
@@ -7664,153 +7662,153 @@ msgstr "neu@jabber.id"
 msgid "new%d@jabber.id"
 msgstr "neu%d@jabber.id"
 
-#: ../src/dialogs.py:84
+#: ../src/dialogs.py:85
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Kontaktname: <i>%s</i>"
 
-#: ../src/dialogs.py:86
+#: ../src/dialogs.py:87
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber-ID: <i>%s</i>"
 
-#: ../src/dialogs.py:200
+#: ../src/dialogs.py:201
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../src/dialogs.py:207
+#: ../src/dialogs.py:208
 msgid "In the group"
 msgstr "In der Gruppe"
 
-#: ../src/dialogs.py:299
+#: ../src/dialogs.py:300
 msgid "KeyID"
 msgstr "Schlüssel-ID"
 
-#: ../src/dialogs.py:304
+#: ../src/dialogs.py:305
 msgid "Contact name"
 msgstr "Name des Kontakts"
 
-#: ../src/dialogs.py:479
+#: ../src/dialogs.py:480
 msgid "Set Mood"
 msgstr "Stimmung setzen"
 
-#: ../src/dialogs.py:599
+#: ../src/dialogs.py:600
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Statusnachricht"
 
-#: ../src/dialogs.py:613
+#: ../src/dialogs.py:614
 msgid "Status Message"
 msgstr "Statusnachricht"
 
-#: ../src/dialogs.py:804
+#: ../src/dialogs.py:805
 msgid "Overwrite Status Message?"
 msgstr "Statusnachricht überschreiben"
 
-#: ../src/dialogs.py:805
+#: ../src/dialogs.py:806
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
 "Dieser Name wird bereits verwendet. Möchten Sie die Statusnachricht "
 "überschreiben?"
 
-#: ../src/dialogs.py:813
+#: ../src/dialogs.py:814
 msgid "Save as Preset Status Message"
 msgstr "Als Vorlage für Statusnachrichten speichern"
 
-#: ../src/dialogs.py:814
+#: ../src/dialogs.py:815
 msgid "Please type a name for this status message"
 msgstr "Bitte geben Sie einen Namen für diese Statusnachricht ein:"
 
-#: ../src/dialogs.py:842
+#: ../src/dialogs.py:843
 msgid "AIM Address:"
 msgstr "AIM-Adresse"
 
-#: ../src/dialogs.py:843
+#: ../src/dialogs.py:844
 msgid "GG Number:"
 msgstr "GG-Nummer"
 
-#: ../src/dialogs.py:844
+#: ../src/dialogs.py:845
 msgid "ICQ Number:"
 msgstr "ICQ-Nummer"
 
-#: ../src/dialogs.py:845
+#: ../src/dialogs.py:846
 msgid "MSN Address:"
 msgstr "MSN-Adresse"
 
-#: ../src/dialogs.py:846
+#: ../src/dialogs.py:847
 msgid "Yahoo! Address:"
 msgstr "Yahoo-Adresse"
 
-#: ../src/dialogs.py:883
+#: ../src/dialogs.py:884
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Bitte füllen Sie die Daten für den Kontakt aus, den Sie dem Konto %s "
 "hinzufügen wollen"
 
-#: ../src/dialogs.py:886
+#: ../src/dialogs.py:887
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Bitte geben Sie die Daten des neuen Kontakts ein"
 
-#: ../src/dialogs.py:1080 ../src/dialogs.py:1086 ../src/dialogs.py:1091
-#: ../src/dialogs.py:3770
+#: ../src/dialogs.py:1081 ../src/dialogs.py:1087 ../src/dialogs.py:1092
+#: ../src/dialogs.py:3780
 msgid "Invalid User ID"
 msgstr "Ungültige Benutzer-ID"
 
-#: ../src/dialogs.py:1087
+#: ../src/dialogs.py:1088
 msgid "The user ID must not contain a resource."
 msgstr "Die Benutzer-ID darf keine Ressource enthalten."
 
-#: ../src/dialogs.py:1092
+#: ../src/dialogs.py:1093
 msgid "You cannot add yourself to your roster."
 msgstr "Sie können sich nicht selbst zu Ihrer Kontaktliste hinzuzufügen."
 
-#: ../src/dialogs.py:1106
+#: ../src/dialogs.py:1107
 msgid "Contact already in roster"
 msgstr "Kontakt bereits in der Kontaktliste"
 
-#: ../src/dialogs.py:1107
+#: ../src/dialogs.py:1108
 msgid "This contact is already listed in your roster."
 msgstr "Der angegebene Kontakt befindet sich bereits in Ihrer Kontaktliste."
 
-#: ../src/dialogs.py:1160 ../src/dialogs.py:1194
+#: ../src/dialogs.py:1161 ../src/dialogs.py:1195
 msgid "User ID:"
 msgstr "_Benutzer-ID:"
 
-#: ../src/dialogs.py:1279
+#: ../src/dialogs.py:1280
 #, fuzzy
 msgid "A GTK+ Jabber/XMPP client"
 msgstr "Ein Jabber-Client in GTK+"
 
-#: ../src/dialogs.py:1280
+#: ../src/dialogs.py:1281
 msgid "GTK+ Version:"
 msgstr "GTK+-Version:"
 
-#: ../src/dialogs.py:1281
+#: ../src/dialogs.py:1282
 msgid "PyGTK Version:"
 msgstr "PyGTK-Version"
 
-#: ../src/dialogs.py:1291
+#: ../src/dialogs.py:1292
 msgid "Current Developers:"
 msgstr "Derzeitige Entwickler:"
 
-#: ../src/dialogs.py:1293
+#: ../src/dialogs.py:1294
 msgid "Past Developers:"
 msgstr "Frühere Entwickler:"
 
-#: ../src/dialogs.py:1299
+#: ../src/dialogs.py:1300
 msgid "THANKS:"
 msgstr "DANKE:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1305
+#: ../src/dialogs.py:1306
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "Zuletzt möchten wird gerne allen Paket-Verwaltern danken."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1317
+#: ../src/dialogs.py:1318
 msgid "translator-credits"
 msgstr ""
 "Fridtjof Busse\n"
@@ -7820,7 +7818,7 @@ msgstr ""
 "Nico Gulden (cilugnedon AT gmx.de)\n"
 "Niklas Hambüchen (nh2 AT deditus.de)"
 
-#: ../src/dialogs.py:1500
+#: ../src/dialogs.py:1501
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7833,12 +7831,12 @@ msgstr ""
 "\n"
 "Falsch geschriebene Wörter können nicht hervorgehoben werden."
 
-#: ../src/dialogs.py:1845 ../src/gui_interface.py:1446
-#: ../src/gui_interface.py:1488
+#: ../src/dialogs.py:1846 ../src/dialogs.py:1862 ../src/gui_interface.py:1455
+#: ../src/gui_interface.py:1497
 msgid "Insecure connection"
 msgstr "Unsichere Verbindung"
 
-#: ../src/dialogs.py:1846
+#: ../src/dialogs.py:1847
 #, fuzzy, python-format
 msgid ""
 "You are about to connect to the account %(account)s (%(server)s) with an "
@@ -7850,138 +7848,138 @@ msgstr ""
 "bedeutet, dass alle Unterhaltungen unverschlüsselt übertragen werden. Sind "
 "Sie sicher, dass Sie das tun wollen?"
 
-#: ../src/dialogs.py:1852 ../src/gui_interface.py:1450
-#: ../src/gui_interface.py:1491
+#: ../src/dialogs.py:1853 ../src/gui_interface.py:1459
+#: ../src/gui_interface.py:1500
 msgid "Yes, I really want to connect insecurely"
 msgstr "Ja, ich möchte dies trotz Sicherheitsbedenken tun"
 
-#: ../src/dialogs.py:1853
+#: ../src/dialogs.py:1854
 msgid "Gajim will NOT connect unless you check this box"
 msgstr ""
 
-#: ../src/dialogs.py:1854 ../src/groupchat_control.py:2130
-#: ../src/gui_interface.py:706 ../src/gui_interface.py:1451
-#: ../src/gui_interface.py:1492 ../src/message_window.py:222
-#: ../src/roster_window.py:3048 ../src/roster_window.py:3728
-#: ../src/roster_window.py:4556
+#: ../src/dialogs.py:1855 ../src/groupchat_control.py:2178
+#: ../src/gui_interface.py:706 ../src/gui_interface.py:1460
+#: ../src/gui_interface.py:1501 ../src/message_window.py:227
+#: ../src/roster_window.py:3085 ../src/roster_window.py:3770
+#: ../src/roster_window.py:4603
 msgid "_Do not ask me again"
 msgstr "_Nicht noch einmal fragen"
 
-#: ../src/dialogs.py:1950
+#: ../src/dialogs.py:1954
 msgid "_Resume"
-msgstr ""
+msgstr "Fo_rtsetzen"
 
-#: ../src/dialogs.py:1958
+#: ../src/dialogs.py:1962
 msgid "Re_place"
-msgstr ""
+msgstr "Er_setzen"
 
-#: ../src/dialogs.py:2155 ../src/dialogs.py:2612
+#: ../src/dialogs.py:2159 ../src/dialogs.py:2618
 #, fuzzy
 msgid "The nickname contains invalid characters."
 msgstr "Die Jabber-ID enthält ungültige Zeichen."
 
-#: ../src/dialogs.py:2277
+#: ../src/dialogs.py:2281
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Abonnement-Anfrage für das Konto %(account)s von %(jid)s"
 
-#: ../src/dialogs.py:2280
+#: ../src/dialogs.py:2284
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abonnement-Anfrage von %s"
 
-#: ../src/dialogs.py:2364 ../src/gui_interface.py:2056
+#: ../src/dialogs.py:2368 ../src/gui_interface.py:2084
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Sie sind bereits im Chatraum %s"
 
-#: ../src/dialogs.py:2370
+#: ../src/dialogs.py:2374
 msgid "You can not join a group chat unless you are connected."
 msgstr "Sie können einen Chatraum erst betreten, wenn Sie verbunden sind."
 
-#: ../src/dialogs.py:2414
+#: ../src/dialogs.py:2418
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Chatraum betreten mit dem Konto %s"
 
-#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#: ../src/dialogs.py:2553 ../src/dialogs.py:2564
 #, fuzzy
 msgid "Wrong server"
 msgstr "Falscher URI"
 
-#: ../src/dialogs.py:2548 ../src/dialogs.py:2558
+#: ../src/dialogs.py:2553 ../src/dialogs.py:2564
 #, fuzzy, python-format
 msgid "%s is not a groupchat server"
 msgstr "Dies ist kein Chatraum"
 
-#: ../src/dialogs.py:2598
+#: ../src/dialogs.py:2604
 msgid "Invalid Account"
 msgstr "Ungültiges Konto"
 
-#: ../src/dialogs.py:2599
+#: ../src/dialogs.py:2605
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr ""
 "Sie müssen ein Konto auswählen, mit dem Sie den Gruppenchat betreten möchten."
 
-#: ../src/dialogs.py:2611
+#: ../src/dialogs.py:2617
 msgid "Invalid Nickname"
 msgstr "Ungültiger Benutzername"
 
-#: ../src/dialogs.py:2616 ../src/dialogs.py:2622
-#: ../src/groupchat_control.py:2198
+#: ../src/dialogs.py:2622 ../src/dialogs.py:2628
+#: ../src/groupchat_control.py:2246
 msgid "Invalid group chat Jabber ID"
 msgstr "Ungültige Jabber-ID für den Chatraum"
 
-#: ../src/dialogs.py:2617
+#: ../src/dialogs.py:2623
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "Bitte gib die Gruppenchat Jabber ID als raum@server ein."
 
-#: ../src/dialogs.py:2623
+#: ../src/dialogs.py:2629
 #, fuzzy
 msgid "The group chat Jabber ID contains invalid characters."
 msgstr "Die Jabber-ID des Chatraums enthält ungültige Zeichen."
 
-#: ../src/dialogs.py:2628 ../src/gui_interface.py:2038
+#: ../src/dialogs.py:2634 ../src/gui_interface.py:2066
 msgid "This is not a group chat"
 msgstr "Dies ist kein Chatraum"
 
-#: ../src/dialogs.py:2629 ../src/gui_interface.py:2039
+#: ../src/dialogs.py:2635 ../src/gui_interface.py:2067
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s ist nicht der Name eines Chatraums."
 
-#: ../src/dialogs.py:2663
+#: ../src/dialogs.py:2669
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Sie müssen verbunden sein, um Ihre Kontakte synchronisieren zu können."
 
-#: ../src/dialogs.py:2676
+#: ../src/dialogs.py:2683
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2712
+#: ../src/dialogs.py:2719
 msgid "This account is not connected to the server"
 msgstr "Das Konto \"%s\" ist nicht mit dem Server verbunden"
 
-#: ../src/dialogs.py:2713
+#: ../src/dialogs.py:2720
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 "Sie können ein Konto nicht synchronisieren, solange es nicht verbunden ist."
 
-#: ../src/dialogs.py:2738
+#: ../src/dialogs.py:2745
 msgid "Synchronise"
 msgstr "Synchronisieren"
 
-#: ../src/dialogs.py:2799
+#: ../src/dialogs.py:2806
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Starte Chat mit Konto %s"
 
-#: ../src/dialogs.py:2801
+#: ../src/dialogs.py:2808
 msgid "Start Chat"
 msgstr "Chat starten"
 
-#: ../src/dialogs.py:2802
+#: ../src/dialogs.py:2809
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -7990,135 +7988,135 @@ msgstr ""
 "an den Sie eine Chat-Nachricht schicken wollen:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2829 ../src/dialogs.py:3213 ../src/dialogs.py:3448
+#: ../src/dialogs.py:2836 ../src/dialogs.py:3221 ../src/dialogs.py:3458
 msgid "Connection not available"
 msgstr "Verbindung nicht verfügbar"
 
-#: ../src/dialogs.py:2830 ../src/dialogs.py:3214 ../src/dialogs.py:3449
+#: ../src/dialogs.py:2837 ../src/dialogs.py:3222 ../src/dialogs.py:3459
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vergewissern Sie sich, dass Sie mit \"%s\" verbunden sind."
 
-#: ../src/dialogs.py:2839 ../src/dialogs.py:2842
+#: ../src/dialogs.py:2846 ../src/dialogs.py:2849
 msgid "Invalid JID"
 msgstr "Ungültige Jabber-ID"
 
-#: ../src/dialogs.py:2842
+#: ../src/dialogs.py:2849
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Kann \"%s\" nicht parsen."
 
-#: ../src/dialogs.py:2851
+#: ../src/dialogs.py:2858
 msgid "Without a connection, you can not change your password."
 msgstr "Sie müssen verbunden sein, um Ihr Passwort ändern zu können."
 
-#: ../src/dialogs.py:2870
+#: ../src/dialogs.py:2878
 msgid "Invalid password"
 msgstr "Ungültiges Passwort"
 
-#: ../src/dialogs.py:2870
+#: ../src/dialogs.py:2878
 msgid "You must enter a password."
 msgstr "Sie müssen ein Passwort eingeben."
 
-#: ../src/dialogs.py:2874
+#: ../src/dialogs.py:2882
 msgid "Passwords do not match"
 msgstr "Die Passwörter stimmen nicht überein"
 
-#: ../src/dialogs.py:2875
+#: ../src/dialogs.py:2883
 msgid "The passwords typed in both fields must be identical."
 msgstr "Die Passwörter in beiden Feldern müssen identisch sein."
 
-#: ../src/dialogs.py:2918 ../src/gui_interface.py:883 ../src/notify.py:276
+#: ../src/dialogs.py:2926 ../src/gui_interface.py:883 ../src/notify.py:276
 msgid "New E-mail"
 msgstr "Neue E-Mail"
 
-#: ../src/dialogs.py:2920 ../src/gui_interface.py:943 ../src/notify.py:269
+#: ../src/dialogs.py:2928 ../src/gui_interface.py:943 ../src/notify.py:269
 msgid "File Transfer Request"
 msgstr "Anfrage zur Dateiübertragung"
 
-#: ../src/dialogs.py:2922 ../src/gui_interface.py:845
+#: ../src/dialogs.py:2930 ../src/gui_interface.py:845
 #: ../src/gui_interface.py:909 ../src/notify.py:271
 msgid "File Transfer Error"
 msgstr "Dateiübertragungsfehler"
 
-#: ../src/dialogs.py:2924 ../src/gui_interface.py:1032
-#: ../src/gui_interface.py:1058 ../src/gui_interface.py:1079
+#: ../src/dialogs.py:2932 ../src/gui_interface.py:1035
+#: ../src/gui_interface.py:1061 ../src/gui_interface.py:1082
 #: ../src/notify.py:273
 msgid "File Transfer Completed"
 msgstr "Dateiübertragung beendet"
 
-#: ../src/dialogs.py:2925 ../src/gui_interface.py:1035
-#: ../src/gui_interface.py:1062 ../src/gui_interface.py:1083
+#: ../src/dialogs.py:2933 ../src/gui_interface.py:1038
+#: ../src/gui_interface.py:1065 ../src/gui_interface.py:1086
 #: ../src/notify.py:274
 msgid "File Transfer Stopped"
 msgstr "Dateiübertragung gestoppt"
 
-#: ../src/dialogs.py:3132
+#: ../src/dialogs.py:3140
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Einzelne Nachricht über das Konto %s"
 
-#: ../src/dialogs.py:3134
+#: ../src/dialogs.py:3142
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Einzelne Nachricht über das Konto %s"
 
-#: ../src/dialogs.py:3136
+#: ../src/dialogs.py:3144
 msgid "Single Message"
 msgstr "Einzelne Nachricht"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:3139
+#: ../src/dialogs.py:3147
 #, python-format
 msgid "Send %s"
 msgstr "Sende %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:3162
+#: ../src/dialogs.py:3170
 #, python-format
 msgid "Received %s"
 msgstr "%s empfangen"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:3185
+#: ../src/dialogs.py:3193
 #, python-format
 msgid "Form %s"
 msgstr "Von %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:3268
+#: ../src/dialogs.py:3276
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:3269
+#: ../src/dialogs.py:3277
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s schrieb:\n"
 
-#: ../src/dialogs.py:3329
+#: ../src/dialogs.py:3337
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML-Konsole für %s"
 
-#: ../src/dialogs.py:3331
+#: ../src/dialogs.py:3339
 msgid "XML Console"
 msgstr "XML-Konsole"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3478
+#: ../src/dialogs.py:3488
 msgid "add"
 msgstr "hinzufügen"
 
-#: ../src/dialogs.py:3478
+#: ../src/dialogs.py:3488
 msgid "modify"
 msgstr "Verändern"
 
-#: ../src/dialogs.py:3479
+#: ../src/dialogs.py:3489
 msgid "remove"
 msgstr "Entfernen"
 
-#: ../src/dialogs.py:3508
+#: ../src/dialogs.py:3518
 #, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -8128,188 +8126,184 @@ msgstr ""
 "%(action)s</b>."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3526 ../src/dialogs.py:3601
+#: ../src/dialogs.py:3536 ../src/dialogs.py:3611
 msgid "Modify"
 msgstr "Verändern"
 
 #. holds jid
-#: ../src/dialogs.py:3532 ../src/history_manager.py:166
+#: ../src/dialogs.py:3542 ../src/history_manager.py:166
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: ../src/dialogs.py:3538
+#: ../src/dialogs.py:3548
 msgid "Groups"
 msgstr "Gruppen"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3646
+#: ../src/dialogs.py:3656
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr ""
 "%s hat mir vorgeschlagen Sie als Kontakt zu meiner Kontaktliste hinzuzufügen."
 
-#: ../src/dialogs.py:3660
+#: ../src/dialogs.py:3670
 #, fuzzy, python-format
 msgid "Added %d contact"
 msgid_plural "Added %d contacts"
 msgstr[0] "%d Kontakt hinzugefügt"
 msgstr[1] "%d Kontakt hinzugefügt"
 
-#: ../src/dialogs.py:3698
+#: ../src/dialogs.py:3708
 #, fuzzy, python-format
 msgid "Removed %d contact"
 msgid_plural "Removed %d contacts"
 msgstr[0] "%d Kontakt entfernt"
 msgstr[1] "%d Kontakt entfernt"
 
-#: ../src/dialogs.py:3739 ../src/dialogs.py:3916
+#: ../src/dialogs.py:3749 ../src/dialogs.py:3926
 #, python-format
 msgid "Archiving Preferences for %s"
-msgstr ""
+msgstr "Archiveinstellungen für %s"
 
-#: ../src/dialogs.py:3779
-#, fuzzy
+#: ../src/dialogs.py:3789
 msgid "Invalid expire value"
-msgstr "Ungültiger Servername"
+msgstr "Ungültiger Ablaufwert"
 
-#: ../src/dialogs.py:3780
+#: ../src/dialogs.py:3790
 msgid "Expire must be a valid positive integer."
-msgstr ""
+msgstr "Die Ablaufzeit muss eine gütige, positive ganze Zahl sein."
 
-#: ../src/dialogs.py:3827
+#: ../src/dialogs.py:3837
 msgid "There is an error with the form"
-msgstr ""
+msgstr "Es gibt einen Fehler mit dem Formular"
 
-#: ../src/dialogs.py:4047
-#, fuzzy
+#: ../src/dialogs.py:4057
 msgid "There is an error"
-msgstr "Der Dienst gab einen Fehler zurück."
+msgstr "Es gibt einen Fehler"
 
-#: ../src/dialogs.py:4115
+#: ../src/dialogs.py:4125
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privatsphären-Liste <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:4119
+#: ../src/dialogs.py:4129
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privatsphären-Liste für %s"
 
-#: ../src/dialogs.py:4186
+#: ../src/dialogs.py:4196
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Sortierung: %(order)s, Aktion: %(action)s, Typ: %(type)s, Wert: %(value)s"
 
-#: ../src/dialogs.py:4191
+#: ../src/dialogs.py:4201
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Sortierung: %(order)s, Aktion: %(action)s"
 
-#: ../src/dialogs.py:4242
+#: ../src/dialogs.py:4252
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Eine Regel bearbeiten</b>"
 
-#: ../src/dialogs.py:4353
+#: ../src/dialogs.py:4363
 msgid "<b>Add a rule</b>"
 msgstr "<b>Eine Regel hinzufügen</b>"
 
-#: ../src/dialogs.py:4452
+#: ../src/dialogs.py:4462
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privatsphären-Liste für %s"
 
-#: ../src/dialogs.py:4454
+#: ../src/dialogs.py:4464
 msgid "Privacy Lists"
 msgstr "Privatsphären-Listen"
 
-#: ../src/dialogs.py:4543
+#: ../src/dialogs.py:4553
 msgid "Invalid List Name"
 msgstr "Ungültiger Listenname"
 
-#: ../src/dialogs.py:4544
+#: ../src/dialogs.py:4554
 msgid "You must enter a name to create a privacy list."
 msgstr ""
 "Sie müssen einen Namen eingeben, um eine Privatsphären-Liste erstellen zu "
 "können."
 
-#: ../src/dialogs.py:4580
+#: ../src/dialogs.py:4590
 msgid "You are invited to a groupchat"
 msgstr "Sie wurden in einen Chatraum eingeladen"
 
-#: ../src/dialogs.py:4583
+#: ../src/dialogs.py:4593
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact hat Sie in den Chatraum %(room_Jabber-ID)s eingeladen"
 
-#: ../src/dialogs.py:4585
+#: ../src/dialogs.py:4595
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact hat Sie in den Chatraum %(room_jid)s eingeladen"
 
-#: ../src/dialogs.py:4593
+#: ../src/dialogs.py:4604
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:4595
+#: ../src/dialogs.py:4606
 msgid "Do you want to accept the invitation?"
 msgstr "Möchten Sie die Einladung annehmen?"
 
-#: ../src/dialogs.py:4612
+#: ../src/dialogs.py:4623
 msgid "Reason (if you decline):"
 msgstr ""
 
-#: ../src/dialogs.py:4664
+#: ../src/dialogs.py:4675
 msgid "Choose Client Cert #PCKS12"
 msgstr "Clientzertifikat #PCKS12 auswählen"
 
-#: ../src/dialogs.py:4674 ../src/dialogs.py:4716 ../src/dialogs.py:4772
-#: ../src/dialogs.py:4860
+#: ../src/dialogs.py:4686 ../src/dialogs.py:4728 ../src/dialogs.py:4784
+#: ../src/dialogs.py:4872
 msgid "All files"
 msgstr "Alle Dateien"
 
-#: ../src/dialogs.py:4679
+#: ../src/dialogs.py:4691
 msgid "PKCS12 Files"
 msgstr "PKCS12 Dateien"
 
-#: ../src/dialogs.py:4706
+#: ../src/dialogs.py:4718
 msgid "Choose Sound"
 msgstr "Sound wählen"
 
-#: ../src/dialogs.py:4721
+#: ../src/dialogs.py:4733
 msgid "Wav Sounds"
 msgstr "Wav-Dateien"
 
-#: ../src/dialogs.py:4759
+#: ../src/dialogs.py:4771
 msgid "Choose Image"
 msgstr "Bild auswählen"
 
-#: ../src/dialogs.py:4777
+#: ../src/dialogs.py:4789
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/dialogs.py:4847
-#, fuzzy
+#: ../src/dialogs.py:4859
 msgid "Choose Archive"
-msgstr "Bild auswählen"
+msgstr "Archiv auswählen"
 
-#: ../src/dialogs.py:4865
-#, fuzzy
+#: ../src/dialogs.py:4877
 msgid "Zip files"
-msgstr "Alle Dateien"
+msgstr "Dateien packen"
 
-#: ../src/dialogs.py:4891
+#: ../src/dialogs.py:4903
 #, python-format
 msgid "When %s becomes:"
 msgstr "Wenn %s wird:"
 
-#: ../src/dialogs.py:4893
+#: ../src/dialogs.py:4905
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Füge speziellen Hinweis für %s hinzu"
 
-#: ../src/dialogs.py:5113
+#: ../src/dialogs.py:5125
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -8321,19 +8315,19 @@ msgstr ""
 "Der kurze Authentifizierungs-Schlüssel für diese Unterhaltung ist: <b>"
 "%(sas)s</b>"
 
-#: ../src/dialogs.py:5116
+#: ../src/dialogs.py:5128
 msgid "You have already verified this contact's identity."
 msgstr "Sie haben die Identität dieses Kontaktes bereits überprüft."
 
-#: ../src/dialogs.py:5122 ../src/dialogs.py:5207
+#: ../src/dialogs.py:5134 ../src/dialogs.py:5219
 msgid "Contact's identity verified"
 msgstr "Kontaktidentität wurde überprüft"
 
-#: ../src/dialogs.py:5128
+#: ../src/dialogs.py:5140
 msgid "Verify again..."
 msgstr "Erneut überprüfen …"
 
-#: ../src/dialogs.py:5133
+#: ../src/dialogs.py:5145
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
@@ -8343,19 +8337,19 @@ msgstr ""
 "Nachrichten lesen oder Ihnen Nachrichten senden kann, müssen Sie seine "
 "Identität überprüfen, indem Sie die Schaltfläche weiter unten betätigen."
 
-#: ../src/dialogs.py:5136 ../src/dialogs.py:5188 ../src/dialogs.py:5201
+#: ../src/dialogs.py:5148 ../src/dialogs.py:5200 ../src/dialogs.py:5213
 msgid "Contact's identity NOT verified"
 msgstr "Kontaktidentität nicht überprüft"
 
-#: ../src/dialogs.py:5141
+#: ../src/dialogs.py:5153
 msgid "Verify..."
 msgstr "Überprüfen …"
 
-#: ../src/dialogs.py:5152
+#: ../src/dialogs.py:5164
 msgid "Have you verified the contact's identity?"
 msgstr "Haben Sie die Identität des Kontaktes überprüft?"
 
-#: ../src/dialogs.py:5153
+#: ../src/dialogs.py:5165
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -8371,13 +8365,13 @@ msgstr ""
 "Der kurze Authentifizierungs-Schlüssel dieser Unterhaltung ist: <b>%(sas)s</"
 "b>"
 
-#: ../src/dialogs.py:5154
+#: ../src/dialogs.py:5166
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 "Haben Sie mit dem Kontakt gesprochen, um den kurzen Authentifizierungs-"
 "Schluessel zu überprüfen?"
 
-#: ../src/dialogs.py:5189
+#: ../src/dialogs.py:5201
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
@@ -8385,7 +8379,7 @@ msgstr ""
 "Schlüssel überein."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/dialogs.py:5195
+#: ../src/dialogs.py:5207
 #, fuzzy
 msgid ""
 "No OpenPGP key is assigned to this contact. So you cannot encrypt messages."
@@ -8394,7 +8388,7 @@ msgstr ""
 "verschlüsselt werden."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/dialogs.py:5202
+#: ../src/dialogs.py:5214
 #, fuzzy
 msgid ""
 "OpenPGP key is assigned to this contact, but <b>you do not trust his key</"
@@ -8407,7 +8401,7 @@ msgstr ""
 "einzustufen."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/dialogs.py:5208
+#: ../src/dialogs.py:5220
 #, fuzzy
 msgid ""
 "OpenPGP Key is assigned to this contact, and you trust his key, so messages "
@@ -8416,19 +8410,19 @@ msgstr ""
 "Ein vertrauenswürdiger GPG-Schlüssel ist dem Kontakt zugewiesen. Die "
 "Nachrichten werden verschlüsselt."
 
-#: ../src/dialogs.py:5273
+#: ../src/dialogs.py:5286
 msgid "an audio and video"
 msgstr "eine Audio und Video"
 
-#: ../src/dialogs.py:5275
+#: ../src/dialogs.py:5288
 msgid "an audio"
 msgstr "eine Audio"
 
-#: ../src/dialogs.py:5277
+#: ../src/dialogs.py:5290
 msgid "a video"
 msgstr "eine Video"
 
-#: ../src/dialogs.py:5281
+#: ../src/dialogs.py:5294
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
@@ -8437,12 +8431,12 @@ msgstr ""
 "%(contact)s möchte eine %(type)s-Sitzung mit dir starten. Möchten Sie den "
 "Anruf annehmen?"
 
-#: ../src/dialogs.py:5372 ../src/dialogs.py:5376
-#, fuzzy, python-format
+#: ../src/dialogs.py:5397 ../src/dialogs.py:5428
+#, python-format
 msgid "Certificate for account %s"
-msgstr "für das Konto %s"
+msgstr "Zertifikat für das Konto %s"
 
-#: ../src/dialogs.py:5376
+#: ../src/dialogs.py:5397
 #, python-format
 msgid ""
 "<b>Issued to:</b>\n"
@@ -8464,42 +8458,42 @@ msgid ""
 "SHA1 Fingerprint: %(sha1)s"
 msgstr ""
 
-#: ../src/dialogs.py:5411 ../src/dialogs.py:5428
-msgid "View cert..."
-msgstr ""
+#: ../src/dialogs.py:5439 ../src/gui_interface.py:1364
+#, fuzzy, python-format
+msgid "SSL Certificate Verification for %s"
+msgstr "SSL/TLS-Zertifikatprüfung"
 
-#: ../src/dialogs.py:5436
-#, fuzzy
-msgid "Certificate"
-msgstr "Clientzertifikat"
+#: ../src/dialogs.py:5440 ../src/dialogs.py:5457
+msgid "View cert..."
+msgstr "Zertifikat anzeigen..."
 
-#: ../src/disco.py:120
+#: ../src/disco.py:122
 msgid "Others"
 msgstr "Andere"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:124
+#: ../src/disco.py:126
 msgid "Conference"
 msgstr "Konferenz"
 
-#: ../src/disco.py:517
+#: ../src/disco.py:525
 msgid "Without a connection, you can not browse available services"
 msgstr "Sie müssen angemeldet sein, um die Dienste durchsuchen zu können"
 
-#: ../src/disco.py:603
+#: ../src/disco.py:611
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Dienste des Kontos %s durchsuchen"
 
-#: ../src/disco.py:605
+#: ../src/disco.py:613
 msgid "Service Discovery"
 msgstr "Dienste durchsuchen"
 
-#: ../src/disco.py:761
+#: ../src/disco.py:769
 msgid "The service could not be found"
 msgstr "Der Dienst konnte nicht gefunden werden"
 
-#: ../src/disco.py:762
+#: ../src/disco.py:770
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -8508,101 +8502,100 @@ msgstr ""
 "Dienst antwortet nicht. Überprüfen Sie die Adresse und versuchen Sie es "
 "erneut."
 
-#: ../src/disco.py:768 ../src/disco.py:1109
+#: ../src/disco.py:776 ../src/disco.py:1124
 msgid "The service is not browsable"
 msgstr "Der Dienst ist nicht durchsuchbar"
 
-#: ../src/disco.py:769
+#: ../src/disco.py:777
 msgid "This type of service does not contain any items to browse."
 msgstr ""
 "Dieser Art von Dienst enthält keine Objekte, die durchsucht werden können."
 
-#: ../src/disco.py:810 ../src/disco.py:820
+#: ../src/disco.py:818 ../src/disco.py:828
 msgid "Invalid Server Name"
 msgstr "Ungültiger Servername"
 
-#: ../src/disco.py:873
+#: ../src/disco.py:882
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Durchsuche %(address)s über das Konto %(account)s"
 
-#: ../src/disco.py:917
+#: ../src/disco.py:929
 msgid "_Browse"
 msgstr "_Durchsuche"
 
-#: ../src/disco.py:1110
+#: ../src/disco.py:1125
 msgid "This service does not contain any items to browse."
 msgstr "Dieser Dienst enthält keine keine durchsuchbaren Objekte."
 
-#: ../src/disco.py:1378
+#: ../src/disco.py:1398
 msgid "_Execute Command"
 msgstr "_Befehl ausführen"
 
-#: ../src/disco.py:1388 ../src/disco.py:1560
+#: ../src/disco.py:1402 ../src/disco.py:1568
 msgid "Re_gister"
 msgstr "Re_gistrieren"
 
-#: ../src/disco.py:1601
+#: ../src/disco.py:1609
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Durchsuche %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1797
+#: ../src/disco.py:1805
 msgid "Users"
 msgstr "Benutzer"
 
 #. Description column
-#: ../src/disco.py:1805
+#: ../src/disco.py:1813
 msgid "Description"
 msgstr "Beschreibung"
 
 #. Id column
-#: ../src/disco.py:1813
+#: ../src/disco.py:1821
 msgid "Id"
 msgstr "ID"
 
-#: ../src/disco.py:1877 ../src/gui_interface.py:2574
+#: ../src/disco.py:1885 ../src/gui_interface.py:2602
 msgid "Bookmark already set"
 msgstr "Chatraum ist bereits gespeichert"
 
-#: ../src/disco.py:1878 ../src/gui_interface.py:2575
+#: ../src/disco.py:1886 ../src/gui_interface.py:2603
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Der Chatraum \"%s\" wurde bereits gespeichert."
 
-#: ../src/disco.py:1887 ../src/gui_interface.py:2589
+#: ../src/disco.py:1896 ../src/gui_interface.py:2617
 msgid "Bookmark has been added successfully"
 msgstr "Chatraum wurde erfolgreich gespeichert"
 
-#: ../src/disco.py:1888 ../src/gui_interface.py:2590
+#: ../src/disco.py:1897 ../src/gui_interface.py:2618
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Sie können die gespeicherten Chaträume über das Aktionen-Menü in der "
 "Kontaktliste bearbeiten"
 
-#: ../src/disco.py:2098
+#: ../src/disco.py:2108
 msgid "Subscribed"
 msgstr "Abonniert"
 
-#: ../src/disco.py:2106
+#: ../src/disco.py:2116
 msgid "Node"
 msgstr "Node"
 
-#: ../src/disco.py:2173
+#: ../src/disco.py:2183
 msgid "New post"
 msgstr "Neue Nachricht"
 
-#: ../src/disco.py:2179
+#: ../src/disco.py:2189
 msgid "_Subscribe"
 msgstr "_Abonnieren"
 
-#: ../src/disco.py:2185
+#: ../src/disco.py:2195
 msgid "_Unsubscribe"
 msgstr "_Abbestellen"
 
 #: ../src/features_window.py:50
-#, fuzzy
 msgid "SSL certificate validation"
 msgstr "SSL/TLS-Zertifikatprüfung"
 
@@ -8671,10 +8664,11 @@ msgstr "Ermöglicht die Verschlüsselung von Nachrichten per OpenPGP."
 #: ../src/features_window.py:64
 msgid "Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/)."
 msgstr ""
+"Benötigt gpg und python-gnupg (http://code.google.com/p/python-gnupg/)."
 
 #: ../src/features_window.py:65
 msgid "Requires gpg.exe in PATH."
-msgstr ""
+msgstr "Benötigt gpg.exe im PATH"
 
 #: ../src/features_window.py:66
 msgid "Network-manager"
@@ -8817,7 +8811,7 @@ msgstr "Audio und Video Chat sind möglich."
 #: ../src/features_window.py:104
 #, fuzzy
 msgid "Requires python-farstream and gstreamer-plugins-bad."
-msgstr "Erfordert python-farsight."
+msgstr "Erfordert python-farsight und gstreamer-plugins-bad."
 
 #: ../src/features_window.py:106
 msgid "UPnP-IGD"
@@ -8888,7 +8882,7 @@ msgid "Sender: %s"
 msgstr "Gespeichert in: %s"
 
 #: ../src/filetransfers_window.py:198 ../src/filetransfers_window.py:734
-#: ../src/tooltips.py:758
+#: ../src/tooltips.py:774
 msgid "Recipient: "
 msgstr "Empfänger: "
 
@@ -8919,7 +8913,7 @@ msgstr ""
 msgid "Choose File to Send..."
 msgstr "Datei auswählen …"
 
-#: ../src/filetransfers_window.py:329 ../src/tooltips.py:793
+#: ../src/filetransfers_window.py:329 ../src/tooltips.py:809
 msgid "Description: "
 msgstr "Beschreibung: "
 
@@ -9028,11 +9022,11 @@ msgstr "Datei: "
 msgid "It is not possible to send empty files"
 msgstr "Es nicht möglich, leere Dateien zu versenden"
 
-#: ../src/filetransfers_window.py:730 ../src/tooltips.py:748
+#: ../src/filetransfers_window.py:730 ../src/tooltips.py:764
 msgid "Name: "
 msgstr "Name: "
 
-#: ../src/filetransfers_window.py:732 ../src/tooltips.py:752
+#: ../src/filetransfers_window.py:732 ../src/tooltips.py:768
 msgid "Sender: "
 msgstr "Absender: "
 
@@ -9040,78 +9034,78 @@ msgstr "Absender: "
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/gajim.py:135 ../src/history_manager.py:73
+#: ../src/gajim.py:157 ../src/history_manager.py:73
 #, fuzzy
 msgid "Usage:"
 msgstr "Nachricht"
 
-#: ../src/gajim.py:137 ../src/history_manager.py:75
+#: ../src/gajim.py:159 ../src/history_manager.py:75
 #, fuzzy
 msgid "Options:"
 msgstr "_Emoticons:"
 
-#: ../src/gajim.py:139 ../src/history_manager.py:77
+#: ../src/gajim.py:161 ../src/history_manager.py:77
 msgid "Show this help message and exit"
 msgstr ""
 
-#: ../src/gajim.py:141
+#: ../src/gajim.py:163
 #, fuzzy
 msgid "Show only critical errors"
 msgstr "Nur in der Kontaktliste zeigen"
 
-#: ../src/gajim.py:143
+#: ../src/gajim.py:165
 msgid "Print xml stanzas and other debug information"
 msgstr ""
 
-#: ../src/gajim.py:145
+#: ../src/gajim.py:167
 #, fuzzy
 msgid "Use defined profile in configuration directory"
 msgstr "Erweiterter Konfigurationseditor"
 
-#: ../src/gajim.py:147
+#: ../src/gajim.py:169
 #, fuzzy
 msgid "Set configuration directory"
 msgstr "%s Konfigurationsfehler"
 
-#: ../src/gajim.py:149
+#: ../src/gajim.py:171
 #, fuzzy
 msgid "Configure logging system"
-msgstr "_Einstellen"
+msgstr "%s konfigurieren"
 
-#: ../src/gajim.py:211
+#: ../src/gajim.py:234
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim benötigt einen laufenden X-Server. Abbruch …"
 
-#: ../src/gajim.py:213
+#: ../src/gajim.py:236
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr "Import von PyGTIK fehlgeschlagen: %s"
 
-#: ../src/gajim.py:256
+#: ../src/gajim.py:279
 #, fuzzy
 msgid "Gajim needs PyGTK 2.22 or above"
 msgstr "Gajim benötigt PyGTK 2.16 oder höher"
 
-#: ../src/gajim.py:257
+#: ../src/gajim.py:280
 #, fuzzy
 msgid "Gajim needs PyGTK 2.22 or above to run. Quiting..."
 msgstr "Gajim benötigt PyGTK 2.16 oder höher. Abbruch …"
 
-#: ../src/gajim.py:259
+#: ../src/gajim.py:282
 #, fuzzy
 msgid "Gajim needs GTK 2.22 or above"
 msgstr "Gajim benötigt GTK 2.16 oder höher"
 
-#: ../src/gajim.py:260
+#: ../src/gajim.py:283
 #, fuzzy
 msgid "Gajim needs GTK 2.22 or above to run. Quiting..."
 msgstr "Gajim benötigt GTK 2.16 oder höher. Abbruch …"
 
-#: ../src/gajim.py:269
+#: ../src/gajim.py:292
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim benötigt pywin32 zum Laufen"
 
-#: ../src/gajim.py:270
+#: ../src/gajim.py:293
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -9120,11 +9114,11 @@ msgstr ""
 "Bitte stellen Sie sicher das Pywin32 auf Ihrem Computer installiert ist. Sie "
 "können es unter folgender URL herunterladen: %s"
 
-#: ../src/gajim.py:410
+#: ../src/gajim.py:447
 msgid "Gajim is already running"
 msgstr "Gajim läuft bereits"
 
-#: ../src/gajim.py:411
+#: ../src/gajim.py:448
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -9191,7 +9185,6 @@ msgid "?CLI:status"
 msgstr "Status"
 
 #: ../src/gajim-remote.py:110
-#, fuzzy
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
 "account's previous status"
@@ -9597,247 +9590,247 @@ msgstr "Kein URI angegeben"
 msgid "Wrong uri"
 msgstr "Falscher URI"
 
-#: ../src/gajim_themes_window.py:59
+#: ../src/gajim_themes_window.py:60
 msgid "Theme"
 msgstr "Design"
 
-#: ../src/gajim_themes_window.py:97
+#: ../src/gajim_themes_window.py:98
 msgid "You cannot make changes to the default theme"
 msgstr "Sie können das derzeitige Design nicht ändern"
 
-#: ../src/gajim_themes_window.py:98
+#: ../src/gajim_themes_window.py:99
 msgid "Please create a clean new theme with your desired name."
 msgstr "Bitte erstellen Sie ein neues leeres Design mit dem gewünschten Namen."
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:169
+#: ../src/gajim_themes_window.py:170
 msgid "theme name"
 msgstr "Name des Themas"
 
-#: ../src/gajim_themes_window.py:186
+#: ../src/gajim_themes_window.py:187
 msgid "You cannot delete your current theme"
 msgstr "Sie können Ihr derzeitiges Design nicht löschen"
 
-#: ../src/gajim_themes_window.py:187
+#: ../src/gajim_themes_window.py:188
 #, fuzzy
 msgid "Please first choose another theme as your current theme."
 msgstr ""
 "Bitte wählen Sie zuerst einen anderen Namen für Ihr derzeitiges Design."
 
-#: ../src/groupchat_control.py:181 ../src/groupchat_control.py:1645
+#: ../src/groupchat_control.py:182 ../src/groupchat_control.py:1693
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s heißt jetzt %(new_nick)s"
 
-#: ../src/groupchat_control.py:236
+#: ../src/groupchat_control.py:237
 msgid "Sending private message failed"
 msgstr "Senden privater Nachricht fehlgeschlagen"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:238
+#: ../src/groupchat_control.py:239
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Entweder sind Sie nicht mehr im Chatraum \"%(room)s\" oder \"%(nick)s\" hat "
 "den Chatraum verlassen."
 
-#: ../src/groupchat_control.py:584
+#: ../src/groupchat_control.py:585
 msgid "Insert Nickname"
 msgstr "Spitzname einfügen"
 
-#: ../src/groupchat_control.py:767
+#: ../src/groupchat_control.py:768
 msgid "Conversation with "
 msgstr "Unterhaltung mit "
 
-#: ../src/groupchat_control.py:769
+#: ../src/groupchat_control.py:770
 msgid "Continued conversation"
 msgstr "Unterhaltung fortsetzen"
 
-#: ../src/groupchat_control.py:1268
-#, fuzzy, python-format
+#: ../src/groupchat_control.py:1307
+#, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
-msgstr "%(jid)s hat das Thema in %(subject)s geändert"
+msgstr "%(nick)s hat das Thema in %(subject)s geändert"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1286 ../src/groupchat_control.py:1587
+#: ../src/groupchat_control.py:1325 ../src/groupchat_control.py:1635
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Jeder Teilnehmer darf Ihre vollständige Jabber-ID sehen"
 
-#: ../src/groupchat_control.py:1289
+#: ../src/groupchat_control.py:1328
 #, fuzzy
 msgid "Room now shows unavailable members"
 msgstr "Der Chatraum zeigt nun abwesende Teilnehmer an"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1330
 #, fuzzy
 msgid "Room now does not show unavailable members"
 msgstr "Der Chatraum zeigt nun abwesende Teilnehmer nicht mehr an"
 
-#: ../src/groupchat_control.py:1293
+#: ../src/groupchat_control.py:1332
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 "Eine nicht Privatsphären-bezogene Chatraum-Konfigurations-Änderung ist "
 "aufgetreten"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1297
+#: ../src/groupchat_control.py:1336
 msgid "Room logging is now enabled"
 msgstr "Die Chatraum-Aufzeichnung ist jetzt aktiviert"
 
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1338
 msgid "Room logging is now disabled"
 msgstr "Die Chatraum-Aufzeichnung ist jetzt deaktiviert"
 
-#: ../src/groupchat_control.py:1301
+#: ../src/groupchat_control.py:1340
 msgid "Room is now non-anonymous"
 msgstr "Der Chatraum ist jetzt nicht mehr anonym"
 
-#: ../src/groupchat_control.py:1304
+#: ../src/groupchat_control.py:1343
 msgid "Room is now semi-anonymous"
 msgstr "Der Chatraum ist jetzt semi-anonym"
 
-#: ../src/groupchat_control.py:1307
+#: ../src/groupchat_control.py:1346
 msgid "Room is now fully-anonymous"
 msgstr "Der Chatraum ist jetzt komplett anonym"
 
-#: ../src/groupchat_control.py:1580 ../src/groupchat_control.py:2241
-#: ../src/gui_interface.py:605 ../src/roster_window.py:3323
+#: ../src/groupchat_control.py:1628 ../src/groupchat_control.py:2289
+#: ../src/gui_interface.py:605 ../src/roster_window.py:3361
 #, fuzzy, python-format
 msgid "%(jid)s has been invited in this room"
 msgstr "%(nick)s wurde aus dem Chatraum geworfen. Grund: %(reason)s"
 
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1592
+#: ../src/groupchat_control.py:1640
 msgid "Room logging is enabled"
 msgstr "Chatraum-Aufzeichnung ist aktiviert"
 
-#: ../src/groupchat_control.py:1594
+#: ../src/groupchat_control.py:1642
 msgid "A new room has been created"
 msgstr "Ein neuer Chatraum wurde erstellt"
 
-#: ../src/groupchat_control.py:1597
+#: ../src/groupchat_control.py:1645
 msgid "The server has assigned or modified your roomnick"
 msgstr "Der Server hat Ihren Chatraum-Nick zugewiesen oder verändert"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1603
+#: ../src/groupchat_control.py:1651
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s wurde aus dem Chatraum geworfen. Grund: %(reason)s"
 
-#: ../src/groupchat_control.py:1606
+#: ../src/groupchat_control.py:1654
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr ""
 "%(nick)s wurde von %(who)s aus dem Chatraum geworfen. Grund: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1615
+#: ../src/groupchat_control.py:1663
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s wurde gebannt. Grund: %(reason)s"
 
-#: ../src/groupchat_control.py:1618
+#: ../src/groupchat_control.py:1666
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s wurde von %(who)s gebannt. Grund: %(reason)s"
 
-#: ../src/groupchat_control.py:1629 ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1677 ../src/groupchat_control.py:1793
 #, python-format
 msgid "You are now known as %s"
 msgstr "Sie heißen nun %s"
 
-#: ../src/groupchat_control.py:1699 ../src/groupchat_control.py:1704
-#: ../src/groupchat_control.py:1710
+#: ../src/groupchat_control.py:1747 ../src/groupchat_control.py:1752
+#: ../src/groupchat_control.py:1758
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s wurde aus dem Chatraum geworfen. Grund: %(reason)s"
 
-#: ../src/groupchat_control.py:1701
+#: ../src/groupchat_control.py:1749
 msgid "affiliation changed"
 msgstr "Zugehörigkeit geändert:"
 
-#: ../src/groupchat_control.py:1706
+#: ../src/groupchat_control.py:1754
 msgid "room configuration changed to members-only"
 msgstr ""
 "Chatraum-Konfiguration wurde auf \"ausschließlich Mitgleider\" geändert"
 
-#: ../src/groupchat_control.py:1712
+#: ../src/groupchat_control.py:1760
 msgid "system shutdown"
 msgstr "Computer wird heruntergefahren"
 
-#: ../src/groupchat_control.py:1795
+#: ../src/groupchat_control.py:1843
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** Mitgliedschaft von %(nick)s wurde von %(actor)s auf %(affiliation)s "
 "gesetzt"
 
-#: ../src/groupchat_control.py:1799
+#: ../src/groupchat_control.py:1847
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Mitgliedschaft von %(nick)s wurde an %(affiliation)s gesendet"
 
-#: ../src/groupchat_control.py:1814
+#: ../src/groupchat_control.py:1862
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** Die Rolle von %(nick)s wurde durch %(actor)s in %(role)s geändert"
 
-#: ../src/groupchat_control.py:1818
+#: ../src/groupchat_control.py:1866
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Die Rolle von %(nick)s wurde in %(role)s geändert"
 
-#: ../src/groupchat_control.py:1848
+#: ../src/groupchat_control.py:1896
 #, python-format
 msgid "%s has left"
 msgstr "%s ist gegangen"
 
-#: ../src/groupchat_control.py:1853
+#: ../src/groupchat_control.py:1901
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s hat den Chatraum betreten"
 
-#: ../src/groupchat_control.py:2124
+#: ../src/groupchat_control.py:2172
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Möchten Sie den Chatraum \"%s\" wirklich verlassen?"
 
-#: ../src/groupchat_control.py:2126
+#: ../src/groupchat_control.py:2174
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr ""
 "Wenn Sie dieses Fenster schließen, wird die Verbindung zu diesem Chatraum "
 "geschlossen."
 
-#: ../src/groupchat_control.py:2165
+#: ../src/groupchat_control.py:2213
 msgid "Changing Subject"
 msgstr "Thema ändern"
 
-#: ../src/groupchat_control.py:2166
+#: ../src/groupchat_control.py:2214
 msgid "Please specify the new subject:"
 msgstr "Bitte wählen Sie ein neues Thema"
 
-#: ../src/groupchat_control.py:2173
+#: ../src/groupchat_control.py:2221
 msgid "Changing Nickname"
 msgstr "Spitzname ändern"
 
-#: ../src/groupchat_control.py:2174
+#: ../src/groupchat_control.py:2222
 msgid "Please specify the new nickname you want to use:"
 msgstr "Bitte geben Sie an, welchen Spitznamen Sie verwenden möchten:"
 
-#: ../src/groupchat_control.py:2199
+#: ../src/groupchat_control.py:2247
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Die Jabber-ID des Chatraums enthält ungültige Zeichen."
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:2205
+#: ../src/groupchat_control.py:2253
 #, python-format
 msgid "Destroying %s"
 msgstr "Lösche %s"
 
-#: ../src/groupchat_control.py:2206
+#: ../src/groupchat_control.py:2254
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -9845,22 +9838,22 @@ msgstr ""
 "Der Chatraum wird endgültig gelöscht.\n"
 "Sie können hier einen Grund angeben:"
 
-#: ../src/groupchat_control.py:2208
+#: ../src/groupchat_control.py:2256
 msgid "You may also enter an alternate venue:"
 msgstr "Sie können auch einen alternativen Chatraum eintragen:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2408
+#: ../src/groupchat_control.py:2456
 #, python-format
 msgid "Kicking %s"
 msgstr "%s rauswerfen"
 
-#: ../src/groupchat_control.py:2409 ../src/groupchat_control.py:2743
+#: ../src/groupchat_control.py:2457 ../src/groupchat_control.py:2794
 msgid "You may specify a reason below:"
 msgstr "Sie können eine Begründung angeben:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2742
+#: ../src/groupchat_control.py:2793
 #, python-format
 msgid "Banning %s"
 msgstr "%s verbannen"
@@ -10162,62 +10155,66 @@ msgstr ""
 msgid "%s wants to send you a file."
 msgstr "%s möchte Ihnen eine Datei senden."
 
-#: ../src/gui_interface.py:1038
+#: ../src/gui_interface.py:1027 ../src/gui_interface.py:1383
+msgid "SSL certificate error"
+msgstr "SSL-Zertifikat-Fehler"
+
+#: ../src/gui_interface.py:1041
 #, fuzzy
 msgid "File Transfer Failed"
 msgstr "Dateiübertragung abgeschlossen"
 
-#: ../src/gui_interface.py:1059
+#: ../src/gui_interface.py:1062
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Die Ãœbermittlung der Datei %(filename)s von %(name)s war erfolgreich."
 
-#: ../src/gui_interface.py:1063
+#: ../src/gui_interface.py:1066
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr ""
 "Die Dateiübertragung der Datei %(filename)s von %(name)s wurde gestoppt."
 
 #. ft hash error
-#: ../src/gui_interface.py:1067
+#: ../src/gui_interface.py:1070
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s from %(name)s failed."
 msgstr ""
 "Die Dateiübertragung der Datei %(filename)s von %(name)s wurde gestoppt."
 
-#: ../src/gui_interface.py:1080
+#: ../src/gui_interface.py:1083
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Sie haben die Datei %(filename)s erfolgreich an %(name)s gesendet."
 
-#: ../src/gui_interface.py:1084
+#: ../src/gui_interface.py:1087
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Die Dateiübertragung von %(filename)s an %(name)s wurde gestoppt."
 
 #. ft hash error
-#: ../src/gui_interface.py:1088
+#: ../src/gui_interface.py:1091
 #, fuzzy, python-format
 msgid "File transfer of %(filename)s to %(name)s failed."
 msgstr "Die Dateiübertragung von %(filename)s an %(name)s wurde gestoppt."
 
-#: ../src/gui_interface.py:1163
+#: ../src/gui_interface.py:1172
 msgid "Unable to decrypt message"
 msgstr "Die Nachricht konnte nicht entschlüsselt werden"
 
-#: ../src/gui_interface.py:1175
+#: ../src/gui_interface.py:1184
 msgid "Username Conflict"
 msgstr "Benutzernamenkonflikt"
 
-#: ../src/gui_interface.py:1176
+#: ../src/gui_interface.py:1185
 msgid "Please type a new username for your local account"
 msgstr "Bitte geben Sie einen neuen Benutzernamen für Ihr lokales Konto ein"
 
-#: ../src/gui_interface.py:1191
+#: ../src/gui_interface.py:1200
 msgid "Resource Conflict"
 msgstr "Ressourcenkonflikt"
 
-#: ../src/gui_interface.py:1192
+#: ../src/gui_interface.py:1201
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -10226,20 +10223,20 @@ msgstr ""
 "geben Sie eine neue Ressource ein"
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1247
+#: ../src/gui_interface.py:1256
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s möchte einen Sprachchat beginnen."
 
-#: ../src/gui_interface.py:1250
+#: ../src/gui_interface.py:1259
 msgid "Voice Chat Request"
 msgstr "Anfrage für Sprachchat"
 
-#: ../src/gui_interface.py:1337
+#: ../src/gui_interface.py:1346
 msgid "Error verifying SSL certificate"
 msgstr "Fehler bei der Überprüfung des SSL-Zertifikats"
 
-#: ../src/gui_interface.py:1338
+#: ../src/gui_interface.py:1347
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -10250,22 +10247,13 @@ msgstr ""
 "Servers auf: %(error)s\n"
 "Möchten Sie sich dennoch zum Server verbinden?"
 
-#: ../src/gui_interface.py:1347
+#: ../src/gui_interface.py:1356
 msgid "Ignore this error for this certificate."
 msgstr "Ignoriere den Fehler für dieses Zertifikat."
 
-#: ../src/gui_interface.py:1355
-#, fuzzy, python-format
-msgid "SSL Certificate Verification for %s"
-msgstr "SSL/TLS-Zertifikatprüfung"
-
-#: ../src/gui_interface.py:1374
-msgid "SSL certificate error"
-msgstr "SSL-Zertifikat-Fehler"
-
 # FIXME: Check English. Should be:
 # your connection has been hacked.
-#: ../src/gui_interface.py:1375
+#: ../src/gui_interface.py:1384
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -10283,7 +10271,7 @@ msgstr ""
 "Möchten Sie sich dennoch verbinden und den Fingerabdruck des Zertifikats "
 "aktualisieren?"
 
-#: ../src/gui_interface.py:1447
+#: ../src/gui_interface.py:1456
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
@@ -10292,7 +10280,7 @@ msgstr ""
 "Sie sicher, dass Sie dies tun möchten? (Es ist ratsam, PyOpenSSL zu "
 "installieren, um dieses Problem zu beheben.)"
 
-#: ../src/gui_interface.py:1489
+#: ../src/gui_interface.py:1498
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
 "Are you sure you want to do that?"
@@ -10301,11 +10289,12 @@ msgstr ""
 "zu übertragen. Sind Sie sicher, dass Sie dies tun möchten?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:1995 ../src/gui_interface.py:2018
+#: ../src/gui_interface.py:2013 ../src/gui_interface.py:2020
+#: ../src/gui_interface.py:2044
 msgid "Emoticons disabled"
 msgstr "Emoticons deaktiviert"
 
-#: ../src/gui_interface.py:1996
+#: ../src/gui_interface.py:2014
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -10313,7 +10302,7 @@ msgstr ""
 "Das konfigurierte Emoticon-Set wurde nicht gefunden. Emoticons sind "
 "deaktiviert."
 
-#: ../src/gui_interface.py:2019
+#: ../src/gui_interface.py:2021 ../src/gui_interface.py:2045
 msgid ""
 "Your configured emoticons theme cannot been loaded. You maybe need to update "
 "the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
@@ -10323,22 +10312,22 @@ msgstr ""
 "eventuell das Format der Datei emoticons.py aktualisieren. Besuchen Sie "
 "http://trac.gajim.org/wiki/Emoticons (Englisch) für mehr Informationen."
 
-#: ../src/gui_interface.py:2063 ../src/roster_window.py:3895
+#: ../src/gui_interface.py:2091 ../src/roster_window.py:3937
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Sie können einen Chatraum nicht betreten, wenn Sie unsichtbar sind."
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gui_interface.py:2450
+#: ../src/gui_interface.py:2478
 msgid "Could not save your settings and preferences"
 msgstr "Konnte Einstellungen nicht speichern"
 
-#: ../src/gui_interface.py:3043
+#: ../src/gui_interface.py:3080
 msgid "Passphrase Required"
 msgstr "Passphrase benötigt"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/gui_interface.py:3044
+#: ../src/gui_interface.py:3081
 #, fuzzy, python-format
 msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr ""
@@ -10346,14 +10335,14 @@ msgstr ""
 "%(account)s)."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/gui_interface.py:3058
+#: ../src/gui_interface.py:3095
 #, fuzzy
 msgid "OpenPGP key expired"
 msgstr "GPG-Schlüssel abgelaufen"
 
 # TODO: GPG/PGP unification in original strings needed
 # FIXME: should be "has expired"
-#: ../src/gui_interface.py:3059
+#: ../src/gui_interface.py:3096
 #, fuzzy, python-format
 msgid ""
 "Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
@@ -10362,26 +10351,36 @@ msgstr ""
 "mit %s verbunden."
 
 #. ask again
-#: ../src/gui_interface.py:3068
+#: ../src/gui_interface.py:3105
 msgid "Wrong Passphrase"
 msgstr "Falsche Passphrase"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/gui_interface.py:3069
+#: ../src/gui_interface.py:3106
 #, fuzzy
 msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr ""
 "Bitte geben Sie Ihre GPG-Passphrase erneut ein oder klicken Sie auf "
 "Abbrechen."
 
-#: ../src/gui_menu_builder.py:94
+#: ../src/gui_menu_builder.py:99
 msgid "_New Group Chat"
 msgstr "Neuer Gruppenchat"
 
-#: ../src/gui_menu_builder.py:436
+#: ../src/gui_menu_builder.py:504
 msgid "I would like to add you to my roster"
 msgstr "Ich würde Sie gerne zu meiner Kontaktliste hinzufügen"
 
+#. Manage Transport submenu
+#: ../src/gui_menu_builder.py:644
+msgid "_Manage Transport"
+msgstr "_Transport verwalten"
+
+#. Modify Transport
+#: ../src/gui_menu_builder.py:652
+msgid "_Modify Transport"
+msgstr "_Ändern"
+
 #: ../src/history_manager.py:78
 #, fuzzy
 msgid "Set logs directory"
@@ -10436,13 +10435,12 @@ msgstr ""
 "Falls Sie JA klicken, warten Sie danach bitte einen Augenblick …"
 
 #: ../src/history_manager.py:269
-#, fuzzy
 msgid "Database Cleanup"
-msgstr "Datenbankfehler"
+msgstr "Datenbank aufräumen"
 
 #: ../src/history_manager.py:487
 msgid "Exporting History Logs..."
-msgstr "Exportiere Verlauf …"
+msgstr "Exportiere Verlauf..."
 
 #: ../src/history_manager.py:564
 #, python-format
@@ -10450,23 +10448,21 @@ msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s sagte um %(time)s: %(message)s\n"
 
 #: ../src/history_manager.py:602
-#, fuzzy, python-format
+#, python-format
 msgid "Do you really want to delete the logs of %(jid)s?"
-msgstr "Möchten Sie die ausgewählte Nachricht wirklich löschen?"
+msgstr "Möchten Sie den Verlauf von %(jid)s wirklich löschen?"
 
 #: ../src/history_manager.py:606
-#, fuzzy
 msgid "Do you really want to delete logs of the selected contacts?"
-msgstr "Möchten Sie wirklich alle Logs des ausgewählten Kontakts löschen?"
+msgstr "Möchten Sie wirklich den Verlauf des ausgewählten Kontakts löschen?"
 
 #: ../src/history_manager.py:608 ../src/history_manager.py:647
 msgid "This is an irreversible operation."
 msgstr "Dies ist ein unwiderruflicher Vorgang."
 
 #: ../src/history_manager.py:610 ../src/history_manager.py:649
-#, fuzzy
 msgid "Deletion Confirmation"
-msgstr "Bestätigung abbrechen"
+msgstr "Löschbestätigung"
 
 #: ../src/history_manager.py:644
 msgid "Do you really want to delete the selected message?"
@@ -10508,35 +10504,34 @@ msgid "Status is now: %(status)s"
 msgstr "Der Status ist jetzt: %(status)s"
 
 #: ../src/htmltextview.py:523
-#, fuzzy
 msgid "Loading"
-msgstr "Programmieren"
+msgstr "Lade"
 
 #: ../src/logind_listener.py:53 ../src/upower_listener.py:31
 msgid "Machine going to sleep"
 msgstr ""
 
-#: ../src/message_window.py:220
+#: ../src/message_window.py:225
 msgid "You are going to close several tabs"
 msgstr "Sie sind dabei verschiedene Tabs zu schließen"
 
-#: ../src/message_window.py:221
+#: ../src/message_window.py:226
 msgid "Do you really want to close them all?"
 msgstr "Möchten Sie wirklich alle schließen?"
 
-#: ../src/message_window.py:518
+#: ../src/message_window.py:524
 msgid "Chats"
 msgstr "Chats"
 
-#: ../src/message_window.py:520
+#: ../src/message_window.py:526
 msgid "Group Chats"
 msgstr "Chatraum"
 
-#: ../src/message_window.py:522
+#: ../src/message_window.py:528
 msgid "Private Chats"
 msgstr "Private Chats"
 
-#: ../src/message_window.py:528
+#: ../src/message_window.py:534
 msgid "Messages"
 msgstr "Nachrichten"
 
@@ -10554,7 +10549,7 @@ msgstr "Ignorieren"
 
 #: ../src/plugins/gui.py:82
 msgid "Plugin"
-msgstr ""
+msgstr "Plugin"
 
 #: ../src/plugins/gui.py:151
 #, fuzzy, python-format
@@ -10562,63 +10557,58 @@ msgid "Warning: %s"
 msgstr "%s verbannen"
 
 #: ../src/plugins/gui.py:209
-#, fuzzy
 msgid "Plugin failed"
-msgstr "Registrierung ist fehlgeschlagen"
+msgstr "Plugin fehlgeschlagen"
 
 #: ../src/plugins/gui.py:254
 msgid "Unable to properly remove the plugin"
-msgstr ""
+msgstr "Kann das Plugin nicht korrekt entfernen"
 
 #. members not safe
-#: ../src/plugins/gui.py:262 ../src/plugins/pluginmanager.py:526
-#: ../src/plugins/pluginmanager.py:534
-#, fuzzy
+#: ../src/plugins/gui.py:262 ../src/plugins/pluginmanager.py:539
+#: ../src/plugins/pluginmanager.py:547
 msgid "Archive is malformed"
-msgstr "Der Dienst sendete unzureichende Daten."
+msgstr "Das Archiv ist defekt"
 
 #: ../src/plugins/gui.py:286 ../src/plugins/gui.py:294
-#: ../src/plugins/pluginmanager.py:542
-#, fuzzy
+#: ../src/plugins/pluginmanager.py:555
 msgid "Plugin already exists"
-msgstr "Diese Datei existiert bereits"
+msgstr "Plugin existiert bereits"
 
 #: ../src/plugins/gui.py:286
 msgid "Overwrite?"
-msgstr ""
+msgstr "Ãœberschreiben?"
 
 #: ../src/plugins/gui.py:316
-#, fuzzy
 msgid "Configuration"
-msgstr "Chatraum-Einstellungen"
+msgstr "Konfiguration"
 
 #. it is not zip file
 #. CRC error
-#: ../src/plugins/pluginmanager.py:512 ../src/plugins/pluginmanager.py:518
+#: ../src/plugins/pluginmanager.py:525 ../src/plugins/pluginmanager.py:531
 msgid "Archive corrupted"
-msgstr ""
+msgstr "Archiv defekt"
 
-#: ../src/plugins/pluginmanager.py:514
-#, fuzzy
+#: ../src/plugins/pluginmanager.py:527
 msgid "Archive empty"
-msgstr "Datei ist leer"
+msgstr "Archiv ist leer"
 
 #: ../src/profile_window.py:60
 msgid "Retrieving profile..."
-msgstr "Empfange Profil …"
+msgstr "Empfange Profil..."
 
-#: ../src/profile_window.py:129 ../src/roster_window.py:3192
+#: ../src/profile_window.py:129 ../src/roster_window.py:3230
 msgid "File is empty"
 msgstr "Datei ist leer"
 
-#: ../src/profile_window.py:132 ../src/roster_window.py:3195
+#: ../src/profile_window.py:132 ../src/roster_window.py:3233
 msgid "File does not exist"
 msgstr "Datei existiert nicht"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:146 ../src/profile_window.py:163
-#: ../src/roster_window.py:3197 ../src/roster_window.py:3208
+#: ../src/roster_window.py:3235 ../src/roster_window.py:3246
 msgid "Could not load image"
 msgstr "Konnte Bild nicht laden"
 
@@ -10665,51 +10655,51 @@ msgstr ""
 msgid "Merged accounts"
 msgstr "Alle Konten"
 
-#: ../src/roster_window.py:2059
+#: ../src/roster_window.py:2063
 msgid "Authorization has been sent"
 msgstr "Autorisierung wurde erneut gesendet"
 
-#: ../src/roster_window.py:2060
+#: ../src/roster_window.py:2064
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "\"%s\" kennt jetzt Ihren Status."
 
-#: ../src/roster_window.py:2083
+#: ../src/roster_window.py:2087
 msgid "Subscription request has been sent"
 msgstr "Abonnement-Anforderung wurde gesendet"
 
-#: ../src/roster_window.py:2084
+#: ../src/roster_window.py:2088
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Wenn \"%s\" diese Anfrage akzeptiert, können Sie seinen/ihren Status sehen."
 
-#: ../src/roster_window.py:2098
+#: ../src/roster_window.py:2102
 msgid "Authorization has been removed"
 msgstr "Autorisierung wurde entfernt"
 
-#: ../src/roster_window.py:2099
+#: ../src/roster_window.py:2103
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "\"%s\" wird Sie nun immer als offline sehen."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/roster_window.py:2126
+#: ../src/roster_window.py:2130
 #, fuzzy
 msgid "OpenPGP is not usable"
 msgstr "GPG ist nicht benutzbar"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/roster_window.py:2127
+#: ../src/roster_window.py:2131
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Sie werden ohne OpenPGP-Verschlüsselung mit %s verbunden."
 
-#: ../src/roster_window.py:2334 ../src/roster_window.py:3825
+#: ../src/roster_window.py:2338 ../src/roster_window.py:3867
 msgid "You are participating in one or more group chats"
 msgstr "Sie nehmen an einem oder mehreren Gruppenchats teil"
 
-#: ../src/roster_window.py:2335 ../src/roster_window.py:3826
+#: ../src/roster_window.py:2339 ../src/roster_window.py:3868
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -10717,40 +10707,39 @@ msgstr ""
 "Wenn Sie Ihren Status auf unsichtbar setzen, werden Sie von diesen "
 "Chaträumen getrennt. Sind Sie sicher, dass Sie unsichtbar werden möchten?"
 
-#: ../src/roster_window.py:2361
+#: ../src/roster_window.py:2365
 msgid "desync'ed"
 msgstr "Nicht synchronisiert"
 
-#: ../src/roster_window.py:2427
+#: ../src/roster_window.py:2431
 msgid "Really quit Gajim?"
 msgstr "Gajim wirklich beenden?"
 
-#: ../src/roster_window.py:2428
+#: ../src/roster_window.py:2432
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Möchten Sie Gajim wirklich verlassen?"
 
-#: ../src/roster_window.py:2429
+#: ../src/roster_window.py:2433
 msgid "Always close Gajim"
 msgstr "Gajim immer schließen"
 
-#: ../src/roster_window.py:2519
+#: ../src/roster_window.py:2523
 msgid "You have running file transfers"
 msgstr "Sie haben laufende Dateiübertragungen"
 
-#: ../src/roster_window.py:2520
-#, fuzzy
+#: ../src/roster_window.py:2524
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr ""
 "Wenn Sie jetzt beenden, werden die laufenden Dateiübertragungen abgebrochen. "
-"Möchten Sie noch beenden?"
+"Möchten Sie dennoch beenden?"
 
-#: ../src/roster_window.py:2551 ../src/roster_window.py:2988
+#: ../src/roster_window.py:2555 ../src/roster_window.py:3016
 msgid "You have unread messages"
 msgstr "Sie haben ungelesene Nachrichten"
 
-#: ../src/roster_window.py:2552
+#: ../src/roster_window.py:2556
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -10758,16 +10747,16 @@ msgstr ""
 "Nachrichten sind nur für das spätere Lesen verfügbar, wenn der Verlauf "
 "aktiviert wurde und der Kontakt sich in der Kontaktliste befindet."
 
-#: ../src/roster_window.py:2989
+#: ../src/roster_window.py:3017
 msgid "You must read them before removing this transport."
 msgstr "Sie müssen sie lesen, bevor das Konto entfernt wird."
 
-#: ../src/roster_window.py:2992
+#: ../src/roster_window.py:3020
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Der Transport \"%s\" wird entfernt"
 
-#: ../src/roster_window.py:2993
+#: ../src/roster_window.py:3021
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -10775,11 +10764,11 @@ msgstr ""
 "Sie können nun keine Nachrichten mehr mit Kontakten über diesen Transport "
 "austauschen."
 
-#: ../src/roster_window.py:2996
+#: ../src/roster_window.py:3024
 msgid "Transports will be removed"
 msgstr "Transporte werden entfernt"
 
-#: ../src/roster_window.py:3001
+#: ../src/roster_window.py:3029
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -10788,12 +10777,12 @@ msgstr ""
 "Sie können nun keine Nachrichten mehr mit Kontakten über diese Transporte "
 "austauschen: %s"
 
-#: ../src/roster_window.py:3043
+#: ../src/roster_window.py:3080
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr ""
 "Sie sind dabei, einen Kontakt zu blockieren. Wollen Sie wirklich fortfahren?"
 
-#: ../src/roster_window.py:3045
+#: ../src/roster_window.py:3082
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
@@ -10802,57 +10791,57 @@ msgstr ""
 "Nachrichten empfangen, die er Ihnen sendet."
 
 #. it's jid
-#: ../src/roster_window.py:3084
+#: ../src/roster_window.py:3122
 msgid "Rename Contact"
 msgstr "Kontakt umbenennen"
 
-#: ../src/roster_window.py:3085
+#: ../src/roster_window.py:3123
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Geben Sie einen Spitznamen für den Kontakt %s ein"
 
-#: ../src/roster_window.py:3092
+#: ../src/roster_window.py:3130
 msgid "Rename Group"
 msgstr "Gruppe umbenennen"
 
-#: ../src/roster_window.py:3093
+#: ../src/roster_window.py:3131
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Geben Sie einen neuen Namen für die Gruppe %s ein"
 
-#: ../src/roster_window.py:3138
+#: ../src/roster_window.py:3176
 msgid "Remove Group"
 msgstr "Gruppe entfernen"
 
-#: ../src/roster_window.py:3139
+#: ../src/roster_window.py:3177
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Möchten Sie wirklich die Gruppe %s von Ihrer Kontaktliste entfernen?"
 
-#: ../src/roster_window.py:3140
+#: ../src/roster_window.py:3178
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Auch alle Kontakte dieser Gruppe von Ihrer Kontaktliste entfernen"
 
-#: ../src/roster_window.py:3179
+#: ../src/roster_window.py:3217
 msgid "Assign OpenPGP Key"
 msgstr "OpenPGP-Schlüssel zuweisen"
 
-#: ../src/roster_window.py:3180
+#: ../src/roster_window.py:3218
 msgid "Select a key to apply to the contact"
 msgstr "Weisen Sie dem Kontakt einen Schüssel zu"
 
-#: ../src/roster_window.py:3635
+#: ../src/roster_window.py:3677
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" wird von Ihrer Kontaktliste entfernt"
 
-#: ../src/roster_window.py:3637
+#: ../src/roster_window.py:3679
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 "Sie sind dabei, \"%(name)s\" (%(jid)s) aus der Kontaktliste zu entfernen.\n"
 
-#: ../src/roster_window.py:3642
+#: ../src/roster_window.py:3684
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -10862,11 +10851,11 @@ msgstr ""
 "offline sehen wird."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3648
+#: ../src/roster_window.py:3690
 msgid "Do you want to continue?"
 msgstr "Möchten Sie fortsetzen?"
 
-#: ../src/roster_window.py:3652
+#: ../src/roster_window.py:3694
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -10875,17 +10864,17 @@ msgstr ""
 "Berechtigung, Ihren Status zu sehen, wodurch der Kontakt Sie nur noch als "
 "offline sehen wird."
 
-#: ../src/roster_window.py:3655
+#: ../src/roster_window.py:3697
 msgid "I want this contact to know my status after removal"
 msgstr ""
 "Ich möchte, dass dieser Kontakt meinen Status auch nach dem Entfernen sieht"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3659
+#: ../src/roster_window.py:3701
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakte werden von Ihrer Kontaktliste entfernt"
 
-#: ../src/roster_window.py:3664
+#: ../src/roster_window.py:3706
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -10895,7 +10884,7 @@ msgstr ""
 "entziehen Sie ihnen auch die Berechtigung, Ihren Status zu sehen, wodurch "
 "die Kontakte Sie nur noch als offline sehen werden."
 
-#: ../src/roster_window.py:3722
+#: ../src/roster_window.py:3764
 #, fuzzy
 msgid ""
 "You are about to send a custom status. Are you sure you want to continue?"
@@ -10903,7 +10892,7 @@ msgstr ""
 "Sie sind dabei, einen angepassten Status zu senden. Wollen Sie wirklich "
 "fortfahren?"
 
-#: ../src/roster_window.py:3724
+#: ../src/roster_window.py:3766
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -10912,22 +10901,22 @@ msgstr ""
 "Dieser Kontakt wird Sie vorläufig als %(status)s sehen, aber nur bis Sie "
 "Ihren Status ändern. Dann wird er Ihren globalen Status sehen."
 
-#: ../src/roster_window.py:3743
+#: ../src/roster_window.py:3785
 msgid "No account available"
 msgstr "Kein Konto vorhanden"
 
-#: ../src/roster_window.py:3744
+#: ../src/roster_window.py:3786
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Sie müssen ein Konto erstellen, bevor Sie sich zum Jabber-Netzwerk verbinden "
 "können."
 
-#: ../src/roster_window.py:4456
+#: ../src/roster_window.py:4499
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 "Das Speichern von Metakontakten wird von Ihrem Server nicht unterstützt"
 
-#: ../src/roster_window.py:4458
+#: ../src/roster_window.py:4501
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So this "
@@ -10937,14 +10926,14 @@ msgstr ""
 "Daher werden diese Informationen bei der nächsten Neuverbindung nicht "
 "gespeichert."
 
-#: ../src/roster_window.py:4550
+#: ../src/roster_window.py:4597
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "Sie sind dabei, einen Metakontakt zu erstellen. Wollen Sie wirklich "
 "fortfahren?"
 
-#: ../src/roster_window.py:4552
+#: ../src/roster_window.py:4599
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several Jabber accounts or transport "
@@ -10954,28 +10943,28 @@ msgstr ""
 "gruppieren. Sie werden normalerweise verwendet, wenn eine Person mehrere "
 "Jabber- oder Transport-Konten hat."
 
-#: ../src/roster_window.py:4673
+#: ../src/roster_window.py:4720
 msgid "Invalid file URI:"
 msgstr "Ungültiger Datei-URI:"
 
-#: ../src/roster_window.py:4685
+#: ../src/roster_window.py:4732
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Wollen Sie die Datei an %s senden?"
 msgstr[1] "Wollen Sie die Dateien an %s senden?"
 
-#: ../src/roster_window.py:4820
+#: ../src/roster_window.py:4867
 #, python-format
 msgid "Send %s to %s"
 msgstr "Sende %s an %s"
 
-#: ../src/roster_window.py:4831
-#, fuzzy, python-format
+#: ../src/roster_window.py:4878
+#, python-format
 msgid "Make %s first contact"
-msgstr "%s und %s zu Metakontakt zusammenführen"
+msgstr "%s zum ersten Kontakt machen"
 
-#: ../src/roster_window.py:4834
+#: ../src/roster_window.py:4881
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "%s und %s zu Metakontakt zusammenführen"
@@ -10985,150 +10974,120 @@ msgstr "%s und %s zu Metakontakt zusammenführen"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:5294 ../src/roster_window.py:5348
-#: ../src/roster_window.py:5357 ../src/statusicon.py:277
+#: ../src/roster_window.py:5343 ../src/roster_window.py:5397
+#: ../src/roster_window.py:5406 ../src/statusicon.py:277
 #: ../src/statusicon.py:324 ../src/statusicon.py:330
 #, python-format
 msgid "using account %s"
 msgstr "über das Konto %s"
 
 #. add
-#: ../src/roster_window.py:5364
+#: ../src/roster_window.py:5413
 #, python-format
 msgid "to %s account"
 msgstr "an das Konto %s"
 
 #. disco
-#: ../src/roster_window.py:5369
+#: ../src/roster_window.py:5418
 #, python-format
 msgid "using %s account"
 msgstr "über das Konto %s"
 
-#: ../src/roster_window.py:5408 ../src/statusicon.py:340
+#: ../src/roster_window.py:5457 ../src/statusicon.py:340
 msgid "_Manage Bookmarks..."
 msgstr "_Gespeicherte Chaträume …"
 
 #. profile, avatar
-#: ../src/roster_window.py:5428
+#: ../src/roster_window.py:5477
 #, python-format
 msgid "of account %s"
 msgstr "des Kontos %s"
 
-#: ../src/roster_window.py:5469
+#: ../src/roster_window.py:5518
 #, python-format
 msgid "for account %s"
 msgstr "für das Konto %s"
 
-#: ../src/roster_window.py:5529 ../src/roster_window.py:5637
+#: ../src/roster_window.py:5578 ../src/roster_window.py:5686
 msgid "_Change Status Message"
 msgstr "Ändere _Statusnachricht"
 
-#: ../src/roster_window.py:5562
+#: ../src/roster_window.py:5611
 msgid "Publish Tune"
 msgstr "Musiktitel veröffentlichen"
 
-#: ../src/roster_window.py:5564
+#: ../src/roster_window.py:5613
 msgid "Publish Location"
 msgstr "Position veröffentlichen"
 
-#: ../src/roster_window.py:5567
+#: ../src/roster_window.py:5616
 msgid "Configure Services..."
 msgstr "Dienste konfigurieren …"
 
-#: ../src/roster_window.py:5715
+#: ../src/roster_window.py:5768
 msgid "_Maximize All"
 msgstr "Alle _maximieren"
 
-#: ../src/roster_window.py:5725 ../src/roster_window.py:5898
+#: ../src/roster_window.py:5778 ../src/roster_window.py:5964
 msgid "Send Group M_essage"
 msgstr "Nachricht an die Gruppe _senden"
 
-#: ../src/roster_window.py:5733
+#: ../src/roster_window.py:5786
 msgid "To all users"
 msgstr "An alle Benutzer"
 
-#: ../src/roster_window.py:5737
+#: ../src/roster_window.py:5790
 msgid "To all online users"
 msgstr "An alle angemeldeten Benutzer"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5918
+#: ../src/roster_window.py:5985
 msgid "_Manage Contacts"
 msgstr "Kontakte verwalten"
 
-#. Edit Groups
-#: ../src/roster_window.py:5927
-msgid "Edit _Groups"
-msgstr "_Gruppen bearbeiten"
-
-#. Send single message
-#: ../src/roster_window.py:5982
-msgid "Send Single Message"
-msgstr "Sende _einzelne Nachricht"
-
-#. Execute Command
-#: ../src/roster_window.py:6029
-msgid "Execute Command..."
-msgstr "Befehl ausführen …"
-
-#. Manage Transport submenu
-#: ../src/roster_window.py:6039
-msgid "_Manage Transport"
-msgstr "_Transport verwalten"
-
-#. Modify Transport
-#: ../src/roster_window.py:6048
-msgid "_Modify Transport"
-msgstr "_Ändern"
-
-#. Rename
-#: ../src/roster_window.py:6058
-msgid "_Rename"
-msgstr "_Umbenennen"
-
-#: ../src/roster_window.py:6118
+#: ../src/roster_window.py:6060
 msgid "_Maximize"
 msgstr "_Maximieren"
 
-#: ../src/roster_window.py:6127
+#: ../src/roster_window.py:6069
 msgid "_Reconnect"
 msgstr "Wieder ve_rbinden"
 
-#: ../src/roster_window.py:6134
+#: ../src/roster_window.py:6076
 msgid "_Disconnect"
 msgstr "_Verbindung trennen"
 
 #. History manager
-#: ../src/roster_window.py:6228
+#: ../src/roster_window.py:6170
 msgid "History Manager"
 msgstr "_Verlaufsmanager"
 
-#: ../src/roster_window.py:6243
+#: ../src/roster_window.py:6185
 msgid "_Join New Group Chat"
 msgstr "_Chatraum betreten …"
 
-#: ../src/roster_window.py:6471
+#: ../src/roster_window.py:6423
 msgid "Change Status Message..."
 msgstr "Ändere Statusnachricht …"
 
-#: ../src/search_window.py:105
+#: ../src/search_window.py:107
 msgid "Waiting for results"
 msgstr "Warte auf Ergebnisse"
 
-#: ../src/search_window.py:143 ../src/search_window.py:220
+#: ../src/search_window.py:145 ../src/search_window.py:223
 msgid "Error in received dataform"
 msgstr "Fehler im empfangenen Datenformular"
 
 #. No result
-#: ../src/search_window.py:177 ../src/search_window.py:212
+#: ../src/search_window.py:180 ../src/search_window.py:215
 msgid "No result"
 msgstr "Kein Ergebnis"
 
-#: ../src/session.py:409 ../src/session.py:469
+#: ../src/session.py:411 ../src/session.py:471
 msgid "Confirm these session options"
 msgstr "Bestätigen Sie diese Sitzungsoptionen"
 
-#: ../src/session.py:411
+#: ../src/session.py:413
 #, fuzzy, python-format
 msgid ""
 "The remote client wants to negotiate a session with these features:\n"
@@ -11143,7 +11102,7 @@ msgstr ""
 "\n"
 "Sind diese Optionen akzeptabel?"
 
-#: ../src/session.py:471
+#: ../src/session.py:473
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -11158,7 +11117,7 @@ msgstr ""
 "\n"
 "Mit der Sitzung fortfahren?"
 
-#: ../src/session.py:474
+#: ../src/session.py:476
 #, fuzzy
 msgid "Always accept for this contact"
 msgstr "Ist OpenPGP für diesen Kontakt aktiviert?"
@@ -11175,134 +11134,134 @@ msgstr "_Kontaktliste verstecken"
 msgid "Hide this menu"
 msgstr "Dieses Menü ausblenden"
 
-#: ../src/tooltips.py:393 ../src/tooltips.py:614
+#: ../src/tooltips.py:409 ../src/tooltips.py:630
 msgid "Jabber ID: "
 msgstr "Jabber-ID: "
 
-#: ../src/tooltips.py:397 ../src/tooltips.py:619
+#: ../src/tooltips.py:413 ../src/tooltips.py:635
 msgid "Resource: "
 msgstr "Ressource: "
 
-#: ../src/tooltips.py:403
+#: ../src/tooltips.py:419
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s dieses Chatraums"
 
-#: ../src/tooltips.py:511
+#: ../src/tooltips.py:527
 msgid " [blocked]"
 msgstr " [blockiert]"
 
-#: ../src/tooltips.py:515
+#: ../src/tooltips.py:531
 msgid " [minimized]"
 msgstr " [minimiert]"
 
-#: ../src/tooltips.py:530 ../src/tooltips.py:791
+#: ../src/tooltips.py:546 ../src/tooltips.py:807
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:575
+#: ../src/tooltips.py:591
 #, python-format
 msgid "Last status: %s"
 msgstr "Letzter Status: %s"
 
-#: ../src/tooltips.py:577
+#: ../src/tooltips.py:593
 #, python-format
 msgid " since %s"
 msgstr " seit %s"
 
-#: ../src/tooltips.py:595
+#: ../src/tooltips.py:611
 msgid "Connected"
 msgstr "Verbunden"
 
-#: ../src/tooltips.py:597
+#: ../src/tooltips.py:613
 msgid "Disconnected"
 msgstr "Nicht verbunden"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:626
+#: ../src/tooltips.py:642
 msgid "Subscription: "
 msgstr "Abonnement: "
 
-#: ../src/tooltips.py:636
+#: ../src/tooltips.py:652
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:659
+#: ../src/tooltips.py:675
 #, python-format
 msgid "Idle since %s"
 msgstr "Untätig seit %s"
 
-#: ../src/tooltips.py:660
+#: ../src/tooltips.py:676
 #, python-format
 msgid "Idle for %s"
 msgstr "Untätig seit %s"
 
-#: ../src/tooltips.py:714
+#: ../src/tooltips.py:730
 #, fuzzy
 msgid "Mood: "
 msgstr "Stimmung:"
 
-#: ../src/tooltips.py:718
+#: ../src/tooltips.py:734
 #, fuzzy
 msgid "Activity: "
 msgstr "Aktivität:"
 
-#: ../src/tooltips.py:722
+#: ../src/tooltips.py:738
 #, fuzzy
 msgid "Tune: "
 msgstr "Musiktitel: %s"
 
-#: ../src/tooltips.py:726
+#: ../src/tooltips.py:742
 #, fuzzy
 msgid "Location: "
 msgstr "Position: %s"
 
-#: ../src/tooltips.py:751
+#: ../src/tooltips.py:767
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:757
+#: ../src/tooltips.py:773
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:764
+#: ../src/tooltips.py:780
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../src/tooltips.py:770
+#: ../src/tooltips.py:786
 msgid "Transferred: "
 msgstr "Ãœbertragen: "
 
-#: ../src/tooltips.py:773 ../src/tooltips.py:790
+#: ../src/tooltips.py:789 ../src/tooltips.py:806
 msgid "Not started"
 msgstr "Nicht gestartet"
 
-#: ../src/tooltips.py:775
+#: ../src/tooltips.py:791
 msgid "Stopped"
 msgstr "Angehalten"
 
-#: ../src/tooltips.py:777 ../src/tooltips.py:780
+#: ../src/tooltips.py:793 ../src/tooltips.py:796
 msgid "Completed"
 msgstr "Abgeschlossen"
 
-#: ../src/tooltips.py:783
+#: ../src/tooltips.py:799
 msgid "?transfer status:Paused"
 msgstr "?Transferstatus:Pausiert"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:786
+#: ../src/tooltips.py:802
 msgid "Stalled"
 msgstr "Steht still"
 
-#: ../src/tooltips.py:788
+#: ../src/tooltips.py:804
 msgid "Transferring"
 msgstr "Ãœbertrage"
 
-#: ../src/tooltips.py:825
+#: ../src/tooltips.py:841
 msgid "This service has not yet responded with detailed information"
 msgstr "Dieser Dienst hat nicht mit detaillierten Informationen geantwortet"
 
-#: ../src/tooltips.py:828
+#: ../src/tooltips.py:844
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -11377,6 +11336,12 @@ msgstr "Es gibt keine offenen Abonnementanfragen."
 msgid " resource with priority "
 msgstr " Resource mit Priorität "
 
+#~ msgid "Join _Group Chat..."
+#~ msgstr "_Gruppenchat betreten …"
+
+#~ msgid "_Modify Account"
+#~ msgstr "Konto _bearbeiten"
+
 #~ msgid "Choose Client Cert"
 #~ msgstr "Clientzertifikat auswählen …"
 
@@ -11392,9 +11357,11 @@ msgstr " Resource mit Priorität "
 #~ msgid "_Allow him/her to see my status"
 #~ msgstr "Erlaube dem Kont_akt, meinen Status zu sehen"
 
-#, fuzzy
 #~ msgid "Descrition:"
-#~ msgstr "Beschreibung: "
+#~ msgstr "Beschreibung:"
+
+#~ msgid "button"
+#~ msgstr "Button"
 
 #~ msgid "Display _activity of contacts in roster"
 #~ msgstr "_Aktivitäten von Kontakten in der Kontaktliste anzeigen"
@@ -11425,6 +11392,12 @@ msgstr " Resource mit Priorität "
 #~ "Falls aktiviert, wird der gerade abgespielte Musiktitel der Kontakte in "
 #~ "der Kontaktliste angezeigt."
 
+#~ msgid "Send Single _Message"
+#~ msgstr "Einzelne Nachricht _senden"
+
+#~ msgid "_Group Chat"
+#~ msgstr "_Gruppenchat"
+
 #~ msgid "Gajim Instant Messenger"
 #~ msgstr "Gajim Instant Messenger"
 
@@ -11564,27 +11537,38 @@ msgstr " Resource mit Priorität "
 #~ "Ermöglicht die Verwendung von LaTeX-Ausdrücken. Text zwischen $$ $$ wird "
 #~ "als LaTeX interpretiert."
 
-#, fuzzy
 #~ msgid ""
 #~ "Requires texlive-latex-base and (dvipng or ImageMagick). You have to set "
 #~ "'use_latex' to True in the Advanced Configuration Editor."
 #~ msgstr ""
-#~ "Erfordert texlive-latex-base und dvipng (befindlich in MikTeX). Im "
+#~ "Erfordert texlive-latex-base und (dvipng oder ImageMagick). Im "
 #~ "erweiterten Konfigurationseditor muss 'use_latex' auf 'true' gesetzt "
 #~ "werden."
 
-#, fuzzy
 #~ msgid ""
 #~ "Requires texlive-latex-base and (dvipng or ImageMagick) (All is in "
 #~ "MikTeX). You have to set 'use_latex' to True in the Advanced "
 #~ "Configuration Editor."
 #~ msgstr ""
-#~ "Erfordert texlive-latex-base und dvipng (befindlich in MikTeX). Sie "
-#~ "müssen 'use_latex' im Erweiterten Konfigurationseditor auf 'true' setzen."
+#~ "Erfordert texlive-latex-base und (dvipng oder ImageMagick) (befindlich in "
+#~ "MikTeX).Sie müssen 'use_latex' im Erweiterten Konfigurationseditor auf "
+#~ "'true' setzen."
 
 #~ msgid "Contacts"
 #~ msgstr "Kontakte"
 
+#~ msgid "Edit _Groups"
+#~ msgstr "_Gruppen bearbeiten"
+
+#~ msgid "Send Single Message"
+#~ msgstr "Sende _einzelne Nachricht"
+
+#~ msgid "Execute Command..."
+#~ msgstr "Befehl ausführen …"
+
+#~ msgid "_Rename"
+#~ msgstr "_Umbenennen"
+
 #~ msgid "Disk WriteError"
 #~ msgstr "Fehler beim Schreiben auf Festplatte"
 
-- 
GitLab