X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=po%2Fquassel_de.po;h=993a33040b2b7e4e923efd2948e2d71a8c4a90bb;hb=ef10367b5d412e7f7d4fdd7bb34a53ad3fa92282;hp=7b9f33a4abc36873d33e04167c891636bcbc9f20;hpb=2573fe442275287321d828d88a5fb8d743952388;p=quassel.git

diff --git a/po/quassel_de.po b/po/quassel_de.po
index 7b9f33a4..993a3304 100644
--- a/po/quassel_de.po
+++ b/po/quassel_de.po
@@ -129,7 +129,7 @@ msgstr ""
 "Fehler zu melden."
 
 #. ts-context AboutDlg
-#: ../src/qtui/aboutdlg.cpp:116
+#: ../src/qtui/aboutdlg.cpp:128
 msgid ""
 "Special thanks goes to:<br><dl><dt><img "
 "src=\":/pics/quassel-eye.png\">&nbsp;<b>John \"nox\" Hand</b></dt><dd>for "
@@ -225,6 +225,11 @@ msgstr "Erweiterung"
 msgid "Aliases"
 msgstr "Aliase"
 
+#. ts-context AliasesSettingsPage
+#: ../src/qtui/settingspages/aliasessettingspage.cpp:29
+msgid "IRC"
+msgstr "IRC"
+
 #. ts-context AliasesSettingsPage
 #: ../src/qtui/settingspages/aliasessettingspage.ui:13
 msgid "Form"
@@ -240,69 +245,109 @@ msgstr "Neu"
 msgid "Delete"
 msgstr "Löschen"
 
-#. ts-context AliasesSettingsPage
-#: ../src/qtui/settingspages/aliasessettingspage.cpp:29
-msgid "Misc"
-msgstr "Verschiedenes"
-
 #. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:14
 msgid "Form"
 msgstr "Formular"
 
 #. ts-context AppearanceSettingsPage
-#: ../src/qtui/settingspages/appearancesettingspage.ui:51
+#: ../src/qtui/settingspages/appearancesettingspage.ui:22
+msgid "Client style:"
+msgstr "Client-Stil:"
+
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:36
+msgid "Language:"
+msgstr "Sprache:"
+
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:52
 msgid "<Original>"
 msgstr ""
 
 #. ts-context AppearanceSettingsPage
-#: ../src/qtui/settingspages/appearancesettingspage.cpp:34
+#: ../src/qtui/settingspages/appearancesettingspage.ui:75
+msgid "Use custom stylesheet"
+msgstr "Eine benutzerdefinierte Layoutdatei verwenden"
+
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:150
+msgid "Show system tray icon"
+msgstr "Systemleistensymbol zeigen"
+
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:184
+msgid "Hide to tray on close button"
+msgstr "Zur Systemleiste minimieren bei \"Schließen\""
+
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:199
+msgid "Message Redirection"
+msgstr "Nachrichtenumlenkung"
+
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:205
+msgid "User Notices:"
+msgstr "Benutzernotizen:"
+
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:248
+msgid "Server Notices:"
+msgstr "Servernotizen:"
+
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:262
+msgid "Default Target"
+msgstr "Standardziel"
+
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:269
+msgid "Status Window"
+msgstr "Statusfenster"
+
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:276
+msgid "Current Chat"
+msgstr "Aktueller Chat"
+
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:283
+msgid "Errors:"
+msgstr "Fehler:"
+
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:35
 msgid "Interface"
 msgstr "Oberfläche"
 
 #. ts-context AppearanceSettingsPage
-#: ../src/qtui/settingspages/appearancesettingspage.cpp:53
-#: ../src/qtui/settingspages/appearancesettingspage.ui:46
+#: ../src/qtui/settingspages/appearancesettingspage.ui:47
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:71
 msgid "<System Default>"
 msgstr ""
 
 #. ts-context AppearanceSettingsPage
-#: ../src/qtui/settingspages/appearancesettingspage.cpp:151
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:214
 msgid "Please choose a stylesheet file"
 msgstr "Bitte wählen Sie eine Layoutdatei"
 
 #. ts-context AppearanceSettingsPage
-#: ../src/qtui/settingspages/appearancesettingspage.ui:20
-msgid "Client Style"
-msgstr "Client-Stil"
-
-#. ts-context AppearanceSettingsPage
-#: ../src/qtui/settingspages/appearancesettingspage.ui:26
+#: ../src/qtui/settingspages/appearancesettingspage.ui:29
 msgid "Set application style"
 msgstr "Anwendungsstil ändern"
 
 #. ts-context AppearanceSettingsPage
-#: ../src/qtui/settingspages/appearancesettingspage.ui:36
-msgid "Language"
-msgstr "Sprache"
-
-#. ts-context AppearanceSettingsPage
-#: ../src/qtui/settingspages/appearancesettingspage.ui:42
+#: ../src/qtui/settingspages/appearancesettingspage.ui:43
 msgid "Set the application language. Requires restart!"
 msgstr "Sprache für die Anwendung ändern. Erfordert Neustart!"
 
 #. ts-context AppearanceSettingsPage
-#: ../src/qtui/settingspages/appearancesettingspage.ui:62
-msgid "Use Custom Stylesheet"
-msgstr "Eine benutzerdefinierte Layoutdatei verwenden"
-
-#. ts-context AppearanceSettingsPage
-#: ../src/qtui/settingspages/appearancesettingspage.ui:82
+#: ../src/qtui/settingspages/appearancesettingspage.ui:109
 msgid "Path:"
 msgstr "Pfad:"
 
 #. ts-context AppearanceSettingsPage
-#: ../src/qtui/settingspages/appearancesettingspage.ui:108
+#: ../src/qtui/settingspages/appearancesettingspage.ui:141
 msgid "..."
 msgstr "..."
 
@@ -321,11 +366,6 @@ msgstr "Netzwerknamen zeigen"
 msgid "Show Buffer Name"
 msgstr "Fensternamen zeigen"
 
-#. ts-context BacklogSettingsPage
-#: ../src/qtui/settingspages/backlogsettingspage.cpp:27
-msgid "Backlog"
-msgstr "Verlauf"
-
 #. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:14
 msgid "Form"
@@ -394,11 +434,6 @@ msgstr "Anzahl der Nachrichten, die beim Zurückscrollen angefordert werden."
 msgid "Dynamic backlog amount:"
 msgstr "Dynamische Verlaufsgröße:"
 
-#. ts-context BacklogSettingsPage
-#: ../src/qtui/settingspages/backlogsettingspage.cpp:27
-msgid "Misc"
-msgstr "Verschiedenes"
-
 #. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:75
 msgid "Backlog request method:"
@@ -473,6 +508,16 @@ msgstr ""
 "Sie können außerdem weitere (ältere) Verlaufszeilen anfordern um den Kontext "
 "zu wahren."
 
+#. ts-context BacklogSettingsPage
+#: ../src/qtui/settingspages/backlogsettingspage.cpp:27
+msgid "Interface"
+msgstr "Oberfläche"
+
+#. ts-context BacklogSettingsPage
+#: ../src/qtui/settingspages/backlogsettingspage.cpp:27
+msgid "Backlog Fetching"
+msgstr "Verlaufsempfänger"
+
 #. ts-context BufferItem
 #: ../src/client/networkmodel.cpp:324
 msgid "<p> %1 - %2 </p>"
@@ -537,22 +582,22 @@ msgstr "&Löschen"
 msgid "Network:"
 msgstr "Netzwerk:"
 
-#. ts-context BufferViewSettingsPage
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:36
-msgid "Misc"
-msgstr "Verschiedenes"
-
 #. ts-context BufferViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.cpp:36
 msgid "Custom Chat Lists"
 msgstr "Spezielle Chat-Listen"
 
 #. ts-context BufferViewSettingsPage
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:117
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:100
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:117
 msgid "All"
 msgstr "Alle"
 
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:36
+msgid "Interface"
+msgstr "Oberfläche"
+
 #. ts-context BufferViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.cpp:342
 msgid "Delete Chat List?"
@@ -761,8 +806,8 @@ msgid "Opt Out"
 msgstr "Ausgewählte ignorieren"
 
 #. ts-context ChatMonitorSettingsPage
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:236
 #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:133
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:236
 msgid "Show:"
 msgstr "Anzeigen:"
 
@@ -876,7 +921,7 @@ msgid "Configure..."
 msgstr "Konfigurieren..."
 
 #. ts-context ChatScene
-#: ../src/qtui/chatscene.cpp:604
+#: ../src/qtui/chatscene.cpp:589
 msgid "Copy Selection"
 msgstr "Auswahl kopieren"
 
@@ -1054,12 +1099,12 @@ msgid "Own messages:"
 msgstr "Eigene Nachrichten:"
 
 #. ts-context Client
-#: ../src/client/client.cpp:270
+#: ../src/client/client.cpp:265
 msgid "Identity already exists in client!"
 msgstr "Identität im Client schon vorhanden!"
 
 #. ts-context Client
-#: ../src/client/client.cpp:369
+#: ../src/client/client.cpp:365
 msgid "All Chats"
 msgstr "Alle Chats"
 
@@ -1068,80 +1113,6 @@ msgstr "Alle Chats"
 msgid "Processed %1 messages in %2 seconds."
 msgstr "%1 Nachrichten in %2 Sekunden verarbeitet."
 
-#. ts-context ClientSyncer
-#: ../src/client/clientsyncer.cpp:52
-msgid ""
-"The Quassel Core you try to connect to is too old! Please consider upgrading."
-msgstr ""
-"Der Quassel-Core, zu dem Sie verbinden möchten, ist veraltet! Bitte ziehen "
-"Sie eine Aktualisierung in Betracht."
-
-#. ts-context ClientSyncer
-#: ../src/client/clientsyncer.cpp:77
-msgid "<b>Invalid data received from core!</b><br>Disconnecting."
-msgstr "<b>Ungültige Daten vom Core erhalten!</b><br>Verbindungsabbruch."
-
-#. ts-context ClientSyncer
-#: ../src/client/clientsyncer.cpp:111
-msgid ""
-"<b>This client is built without SSL Support!</b><br />Disable the usage of "
-"SSL in the account settings."
-msgstr ""
-"<b>Dieser Client wurde ohne SSL-Unterstützung gebaut!</b><br />Schalten Sie "
-"die SSL-Benutzung in den Kontoeinstellungen ab."
-
-#. ts-context ClientSyncer
-#: ../src/client/clientsyncer.cpp:195
-msgid ""
-"<b>The Quassel Core you are trying to connect to is too old!</b><br>Need at "
-"least core/client protocol v%1 to connect."
-msgstr ""
-"<b>Der Quassel-Core, zu dem Sie verbinden möchten, ist "
-"veraltet!</b><br>Benötige mindestens Core/Client-Protokoll v%1 zum Verbinden."
-
-#. ts-context ClientSyncer
-#: ../src/client/clientsyncer.cpp:219
-msgid ""
-"<b>The Quassel Core you are trying to connect to does not support "
-"SSL!</b><br />If you want to connect anyways, disable the usage of SSL in "
-"the account settings."
-msgstr ""
-"<b>Der Quassel-Core, zu dem Sie verbinden möchten, unterstützt kein "
-"SSL!</b><br />Wenn Sie dennoch eine Verbindung herstellen wollen, schalten "
-"Sie die SSL-Benutzung in den Kontoeinstellungen ab."
-
-#. ts-context ClientSyncer
-#: ../src/client/clientsyncer.cpp:248
-msgid "Logging in..."
-msgstr "Anmelden..."
-
-#. ts-context ClientSyncer
-#: ../src/client/clientsyncer.cpp:102
-msgid "No Host to connect to specified."
-msgstr "Kein Host zum Verbinden festgelegt."
-
-#. ts-context ClientSyncer
-#: ../src/client/clientsyncer.cpp:360
-msgid "<b>Quassel Core Version %1</b><br>Built: %2<br>Up %3d%4h%5m (since %6)"
-msgstr ""
-"<b>Quassel-Core Version %1</b><br>Erstellungsdatum: %2<br>Betriebsdauer: "
-"%3T%4S%5M (seit %6)"
-
-#. ts-context ClientSyncer
-#: ../src/client/clientsyncer.cpp:404 ../src/client/clientsyncer.cpp:429
-msgid "Cert Digest changed! was: %1"
-msgstr "Zertifikat geändert! Vorher: %1"
-
-#. ts-context ConnectionSettingsPage
-#: ../src/qtui/settingspages/connectionsettingspage.cpp:27
-msgid "Misc"
-msgstr "Verschiedenes"
-
-#. ts-context ConnectionSettingsPage
-#: ../src/qtui/settingspages/connectionsettingspage.cpp:27
-msgid "Connection"
-msgstr "Verbindung"
-
 #. ts-context ConnectionSettingsPage
 #: ../src/qtui/settingspages/connectionsettingspage.ui:14
 msgid "Configure the IRC Connection"
@@ -1209,8 +1180,13 @@ msgstr " Nutzern"
 msgid "Minimum delay between requests:"
 msgstr "Kleinster Abstand zwischen zwei Abfragen:"
 
+#. ts-context ConnectionSettingsPage
+#: ../src/qtui/settingspages/connectionsettingspage.cpp:27
+msgid "IRC"
+msgstr "IRC"
+
 #. ts-context ContentsChatItem
-#: ../src/qtui/chatitem.cpp:592
+#: ../src/qtui/chatitem.cpp:594
 msgid "Copy Link Address"
 msgstr "Linkadresse kopieren"
 
@@ -1588,104 +1564,154 @@ msgstr "Konnte keine Netzwerkoberfläche öffnen!"
 msgid "Could not find a session for client:"
 msgstr "Konnte Sitzung für den Client nicht finden:"
 
+#. ts-context CoreAccount
+#: ../src/client/coreaccount.h:39
+msgid "Internal Core"
+msgstr "Interner Core"
+
 #. ts-context CoreAccountEditDlg
-#: ../src/qtui/coreconnectdlg.cpp:522
+#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:231
 msgid "Add Core Account"
 msgstr "Remote-Konto hinzufügen"
 
 #. ts-context CoreAccountEditDlg
-#: ../src/qtui/ui/coreaccounteditdlg.ui:13
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:14
+#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:229
 msgid "Edit Core Account"
 msgstr "Remote-Konto ändern"
 
 #. ts-context CoreAccountEditDlg
-#: ../src/qtui/ui/coreaccounteditdlg.ui:54
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:54
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:187
 msgid "Port:"
 msgstr "Port:"
 
 #. ts-context CoreAccountEditDlg
-#: ../src/qtui/ui/coreaccounteditdlg.ui:21
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:20
 msgid "Account Details"
 msgstr "Kontodetails"
 
 #. ts-context CoreAccountEditDlg
-#: ../src/qtui/ui/coreaccounteditdlg.ui:29
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:26
 msgid "Account Name:"
 msgstr "Kontoname:"
 
 #. ts-context CoreAccountEditDlg
-#: ../src/qtui/ui/coreaccounteditdlg.ui:81
-msgid "Use secure connection (SSL)"
-msgstr "Gesicherte Verbindung (SSL) benutzen"
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:93
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:226
+msgid "User:"
+msgstr "Benutzer:"
+
+#. ts-context CoreAccountEditDlg
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:103
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:236
+msgid "Password:"
+msgstr "Passwort:"
+
+#. ts-context CoreAccountEditDlg
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:117
+msgid "Remember"
+msgstr "Merken"
 
 #. ts-context CoreAccountEditDlg
-#: ../src/qtui/ui/coreaccounteditdlg.ui:97
-msgid "Use a proxy:"
-msgstr "Einen Proxy benutzen:"
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:127
+msgid "Use a Proxy"
+msgstr "Proxy benutzen"
 
 #. ts-context CoreAccountEditDlg
-#: ../src/qtui/ui/coreaccounteditdlg.ui:109
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:139
 msgid "Proxy Type:"
 msgstr "Proxy-Art:"
 
 #. ts-context CoreAccountEditDlg
-#: ../src/qtui/ui/coreaccounteditdlg.ui:117
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:147
 msgid "Socks 5"
 msgstr ""
 
 #. ts-context CoreAccountEditDlg
-#: ../src/qtui/ui/coreaccounteditdlg.ui:122
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:152
 msgid "HTTP"
 msgstr ""
 
 #. ts-context CoreAccountEditDlg
-#: ../src/qtui/ui/coreaccounteditdlg.ui:130
-msgid "Proxy Host:"
-msgstr "Proxy-Rechner:"
-
-#. ts-context CoreAccountEditDlg
-#: ../src/qtui/ui/coreaccounteditdlg.ui:137
-msgid "Proxy Port:"
-msgstr "Proxy-Port:"
-
-#. ts-context CoreAccountEditDlg
-#: ../src/qtui/ui/coreaccounteditdlg.ui:61
-#: ../src/qtui/ui/coreaccounteditdlg.ui:144
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:47
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:180
 msgid "localhost"
 msgstr "localhost"
 
 #. ts-context CoreAccountEditDlg
-#: ../src/qtui/ui/coreaccounteditdlg.ui:170
-msgid "Proxy Username:"
-msgstr "Proxy-Benutzername:"
-
-#. ts-context CoreAccountEditDlg
-#: ../src/qtui/ui/coreaccounteditdlg.ui:180
-msgid "Proxy Password:"
-msgstr "Proxy-Passwort:"
-
-#. ts-context CoreAccountEditDlg
-#: ../src/qtui/ui/coreaccounteditdlg.ui:36
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:33
 msgid "Local Core"
 msgstr "Lokaler Core"
 
 #. ts-context CoreAccountEditDlg
-#: ../src/qtui/ui/coreaccounteditdlg.ui:47
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:40
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:173
 msgid "Hostname:"
 msgstr "Rechnername:"
 
+#. ts-context CoreAccountModel
+#: ../src/client/coreaccountmodel.cpp:62
+msgid "Internal Core"
+msgstr "Interner Core"
+
+#. ts-context CoreAccountSettingsPage
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:20
+msgid "Connect to Quassel Core"
+msgstr "Mit Quassel-Core verbinden"
+
+#. ts-context CoreAccountSettingsPage
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:30
+msgid "Core Accounts"
+msgstr "Remote-Konto"
+
+#. ts-context CoreAccountSettingsPage
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:45
+msgid "Edit..."
+msgstr "Ändern..."
+
+#. ts-context CoreAccountSettingsPage
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:56
+msgid "Add..."
+msgstr "Hinzufügen..."
+
+#. ts-context CoreAccountSettingsPage
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:67
+msgid "Delete"
+msgstr "Löschen"
+
+#. ts-context CoreAccountSettingsPage
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:96
+msgid "Automatically connect on startup"
+msgstr "Beim Starten automatisch Verbinden"
+
+#. ts-context CoreAccountSettingsPage
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:136
+msgid "Connect to last account used"
+msgstr "Zum zuletzt benutzten Konto verbinden"
+
+#. ts-context CoreAccountSettingsPage
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:148
+msgid "Always connect to"
+msgstr "Immer verbinden mit"
+
+#. ts-context CoreAccountSettingsPage
+#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:29
+msgid "Remote Cores"
+msgstr "Remote Cores"
+
 #. ts-context CoreConfigWizard
-#: ../src/qtui/coreconfigwizard.cpp:60
+#: ../src/qtui/coreconfigwizard.cpp:69
 msgid "Core Configuration Wizard"
 msgstr "Core-Konfigurationshelfer"
 
 #. ts-context CoreConfigWizard
-#: ../src/qtui/coreconfigwizard.cpp:82
+#: ../src/qtui/coreconfigwizard.cpp:97
 msgid "Your core has been successfully configured. Logging you in..."
 msgstr "Ihr Core wurde erfolgreich konfiguriert. Melde an..."
 
 #. ts-context CoreConfigWizard
-#: ../src/qtui/coreconfigwizard.cpp:93
+#: ../src/qtui/coreconfigwizard.cpp:104
 msgid ""
 "Core configuration failed:<br><b>%1</b><br>Press <em>Next</em> to start over."
 msgstr ""
@@ -1693,7 +1719,7 @@ msgstr ""
 "<em>Weiter</em> wählen."
 
 #. ts-context CoreConfigWizard
-#: ../src/qtui/coreconfigwizard.cpp:108
+#: ../src/qtui/coreconfigwizard.cpp:119
 msgid ""
 "Your are now logged into your freshly configured Quassel Core!<br>Please "
 "remember to configure your identities and networks now."
@@ -1703,70 +1729,43 @@ msgstr ""
 "konfigurieren."
 
 #. ts-context CoreConfigWizardAdminUserPage
-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:13
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:14
 msgid "Form"
 msgstr "Formular"
 
 #. ts-context CoreConfigWizardAdminUserPage
-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:21
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:22
 msgid "Username:"
 msgstr "Benutzername:"
 
 #. ts-context CoreConfigWizardAdminUserPage
-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:31
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:32
 msgid "Password:"
 msgstr "Passwort:"
 
 #. ts-context CoreConfigWizardAdminUserPage
-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:45
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:46
 msgid "Repeat password:"
 msgstr "Passwort wiederholen:"
 
 #. ts-context CoreConfigWizardAdminUserPage
-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:59
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:60
 msgid "Remember password"
 msgstr "Passwort merken"
 
+# Das geht wohl noch schöner :)
 #. ts-context CoreConfigWizardAdminUserPage
-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:68
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:69
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:8pt; "
-"font-weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-"margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Lucida "
-"Grande'; font-size:13pt;\"><span style=\" font-size:10pt; "
-"font-weight:600;\">Note: </span><span style=\" font-size:10pt;\">Adding more "
-"users and changing your username/password is not possible via Quassel's "
-"interface yet.</span></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-"margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Lucida "
-"Grande'; font-size:10pt;\">If you need to do these things have a look at the "
-"manageusers.py script which is located in the /scripts "
-"directory.</p></body></html>"
+"<b>Note:</b> Adding more users and changing your username/password is not "
+"possible via Quassel's client interface yet.\n"
+"If you need to do these things, please run \"<tt><nobr>quasselcore "
+"--help</nobr></tt>\"."
 msgstr ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:8pt; "
-"font-weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-"margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Lucida "
-"Grande'; font-size:13pt;\"><span style=\" font-size:10pt; "
-"font-weight:600;\">Notiz: </span><span style=\" font-size:10pt;\">Das "
-"hinzufügen von Benutzern und das Ändern des Benutzernamens/Passworts ist "
-"nochnicht von der Quassel-Oberfläche möglich</span></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; "
-"margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Lucida "
-"Grande'; font-size:10pt;\">Diese Aufgaben übernimmt zurzeit das "
-"\"manageusers.py\" Script das sich im /scripts Verzeichnis "
-"befindet.</p></body></html>"
+"<b>Anmerkung:</b> Das Hinzufügen von Benutzern und das Ändern des "
+"Benutzernamens/Passwortes ist noch nicht in die Benutzeroberfläche "
+"integriert. Um dies zu tun \"<tt><nobr>quasselcore --help</nobr></tt>\" "
+"ausführen."
 
 #. ts-context CoreConfigWizardIntroPage
 #: ../src/qtui/ui/coreconfigwizardintropage.ui:13
@@ -1780,12 +1779,12 @@ msgstr ""
 "Dieser Helfer wird Sie durch die Einrichtung Ihres Quassel-Core führen."
 
 #. ts-context CoreConfigWizardPages::AdminUserPage
-#: ../src/qtui/coreconfigwizard.cpp:140
+#: ../src/qtui/coreconfigwizard.cpp:150
 msgid "Create Admin User"
 msgstr "Administrativbenutzer erstellen"
 
 #. ts-context CoreConfigWizardPages::AdminUserPage
-#: ../src/qtui/coreconfigwizard.cpp:141
+#: ../src/qtui/coreconfigwizard.cpp:151
 msgid ""
 "First, we will create a user on the core. This first user will have "
 "administrator privileges."
@@ -1794,17 +1793,17 @@ msgstr ""
 "wird administrative Privilegien besitzen."
 
 #. ts-context CoreConfigWizardPages::IntroPage
-#: ../src/qtui/coreconfigwizard.cpp:125
+#: ../src/qtui/coreconfigwizard.cpp:135
 msgid "Introduction"
 msgstr "Einleitung"
 
 #. ts-context CoreConfigWizardPages::StorageSelectionPage
-#: ../src/qtui/coreconfigwizard.cpp:172
+#: ../src/qtui/coreconfigwizard.cpp:182
 msgid "Select Storage Backend"
 msgstr "Speichermechanismus auswählen"
 
 #. ts-context CoreConfigWizardPages::StorageSelectionPage
-#: ../src/qtui/coreconfigwizard.cpp:173
+#: ../src/qtui/coreconfigwizard.cpp:183
 msgid ""
 "Please select a database backend for the Quassel Core storage to store the "
 "backlog and other data in."
@@ -1813,17 +1812,17 @@ msgstr ""
 "der zum Speichern des Verlaufs und anderen Daten verwendet wird."
 
 #. ts-context CoreConfigWizardPages::StorageSelectionPage
-#: ../src/qtui/coreconfigwizard.cpp:267
+#: ../src/qtui/coreconfigwizard.cpp:277
 msgid "Connection Properties"
 msgstr "Verbindungseinstellungen"
 
 #. ts-context CoreConfigWizardPages::SyncPage
-#: ../src/qtui/coreconfigwizard.cpp:307
+#: ../src/qtui/coreconfigwizard.cpp:317
 msgid "Storing Your Settings"
 msgstr "Speichere Ihre Einstellungen"
 
 #. ts-context CoreConfigWizardPages::SyncPage
-#: ../src/qtui/coreconfigwizard.cpp:308
+#: ../src/qtui/coreconfigwizard.cpp:318
 msgid ""
 "Your settings are now stored in the core, and you will be logged in "
 "automatically."
@@ -1887,200 +1886,159 @@ msgid "Please wait while your settings are being transmitted to the core..."
 msgstr ""
 "Bitte warten Sie, bis Ihre Einstellungen zum Core übermittelt wurden..."
 
-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:20 ../src/qtui/ui/coreconnectdlg.ui:46
-msgid "Connect to Quassel Core"
-msgstr "Mit Quassel-Core verbinden"
+#. ts-context CoreConnectAuthDlg
+#: ../src/qtui/ui/coreconnectauthdlg.ui:14
+msgid "Authentication Required"
+msgstr "Authentifizierung benötigt"
 
-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:271
-msgid "User:"
-msgstr "Benutzer:"
+#. ts-context CoreConnectAuthDlg
+#: ../src/qtui/ui/coreconnectauthdlg.ui:20
+msgid "Please enter your account data:"
+msgstr "Bitte die Kontodaten eingeben:"
 
-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:285
+#. ts-context CoreConnectAuthDlg
+#: ../src/qtui/ui/coreconnectauthdlg.ui:35
 msgid "Password:"
 msgstr "Passwort:"
 
-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:299
-msgid "Remember"
-msgstr "Merken"
-
-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:121
-msgid "Always use this account"
-msgstr "Diesen Account immer benutzen"
-
-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:83
-msgid "Delete"
-msgstr "Löschen"
-
-#. ts-context CoreConnectDlg
-#: ../src/qtui/coreconnectdlg.cpp:190
-msgid "Remove Account Settings"
-msgstr "Kontoeinstellungen entfernen"
-
-#. ts-context CoreConnectDlg
-#: ../src/qtui/coreconnectdlg.cpp:191
-msgid ""
-"Do you really want to remove your local settings for this Quassel Core "
-"account?<br>Note: This will <em>not</em> remove or change any data on the "
-"Core itself!"
-msgstr ""
-"Möchten Sie wirklich Ihre lokalen Einstellungen für dieses Konto "
-"löschen?<br>Anmerkung: Dies wird die Daten im Core selbst <em>nicht</em> "
-"entfernen oder ändern!"
+#. ts-context CoreConnectAuthDlg
+#: ../src/qtui/ui/coreconnectauthdlg.ui:49
+msgid "Username:"
+msgstr "Benutzername:"
 
-#. ts-context CoreConnectDlg
-#: ../src/qtui/coreconnectdlg.cpp:242
-msgid "Connect to %1"
-msgstr "Mit %1 verbinden"
+#. ts-context CoreConnectAuthDlg
+#: ../src/qtui/ui/coreconnectauthdlg.ui:58
+msgid "Remember password"
+msgstr "Passwort merken"
 
-#. ts-context CoreConnectDlg
-#: ../src/qtui/coreconnectdlg.cpp:259
-msgid "<div style=color:red;>Connection to %1 failed!</div>"
-msgstr "<div style=color:red;>Verbindung zu %1 fehlgeschlagen!</div>"
+#. ts-context CoreConnectAuthDlg
+#: ../src/qtui/coreconnectdlg.cpp:75
+msgid "Please enter your credentials for %1:"
+msgstr "Bitte die Kontodaten für %1 eingeben:"
 
 #. ts-context CoreConnectDlg
-#: ../src/qtui/coreconnectdlg.cpp:309
-msgid "Not connected to %1."
-msgstr "Nicht mit %1 verbunden."
-
-#. ts-context CoreConnectDlg
-#: ../src/qtui/coreconnectdlg.cpp:310
+#: ../src/qtui/coreconnectdlg.cpp:40
+msgid "Connect to Core"
+msgstr "Zum Quassel-Core verbinden"
+
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:105
+msgid "Disconnected from core."
+msgstr "Vom Core getrennt"
+
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:123 ../src/client/coreconnection.cpp:232
+msgid "Disconnected"
+msgstr "Getrennt"
+
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:126
 msgid "Looking up %1..."
 msgstr "Suche %1..."
 
-#. ts-context CoreConnectDlg
-#: ../src/qtui/coreconnectdlg.cpp:311
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:129 ../src/client/coreconnection.cpp:331
 msgid "Connecting to %1..."
 msgstr "Verbinde mit %1..."
 
-#. ts-context CoreConnectDlg
-#: ../src/qtui/coreconnectdlg.cpp:312
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:132 ../src/client/coreconnection.cpp:452
 msgid "Connected to %1"
 msgstr "Verbunden mit %1"
 
-#. ts-context CoreConnectDlg
-#: ../src/qtui/coreconnectdlg.cpp:313
-msgid "Unknown connection state to %1"
-msgstr "Unbekannter Verbindungsstatus zu %1"
-
-#. ts-context CoreConnectDlg
-#: ../src/qtui/coreconnectdlg.cpp:365
-msgid "Logging in..."
-msgstr "Anmelden..."
-
-#. ts-context CoreConnectDlg
-#: ../src/qtui/coreconnectdlg.cpp:392 ../src/qtui/coreconnectdlg.cpp:450
-#: ../src/qtui/ui/coreconnectdlg.ui:263
-msgid "Login"
-msgstr "Anmeldung"
-
-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:61
-msgid "Edit..."
-msgstr "Ändern..."
-
-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:72
-msgid "Add..."
-msgstr "Hinzufügen..."
-
-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:150
-msgid "Initializing your connection"
-msgstr "Initialisiere Ihre Verbindung"
-
-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:168
-msgid "Connected to apollo.mindpool.net."
-msgstr "Verbunden zu apollo.mindpool.net."
-
-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:333
-msgid "View SSL Certificate"
-msgstr "SSL-Zertifikat anzeigen"
+# "Von %1 getrennt..." wäre sprachlich hübscher, aber so steht alles am ende
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:135
+msgid "Disconnecting from %1..."
+msgstr "Getrennt von %1..."
 
-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:370
-msgid "Add to known hosts"
-msgstr "zu den bekannten Hosts hinzufügen"
-
-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:425
-msgid "Configure your Quassel Core"
-msgstr "Ihren Quassel-Core konfigurieren"
-
-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:431
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:193
 msgid ""
-"The Quassel Core you are connected to is not configured yet. You may now "
-"launch a configuration wizard that helps you setting up your Core."
+"The Quassel Core you try to connect to is too old! Please consider upgrading."
 msgstr ""
-"Der Quassel-Core, mit dem Sie eine Verbindung herstellen möchten, ist noch "
-"unkonfiguriert. Sie können jetzt den Konfigurationshelfer starten, der Ihnen "
-"bei der Konfiguration Ihres Cores behilflich ist."
+"Der Quassel-Core, zu dem Sie verbinden möchten, ist veraltet! Bitte ziehen "
+"Sie eine Aktualisierung in Betracht."
 
-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:459
-msgid "Launch Wizard"
-msgstr "Helfer starten"
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:221
+msgid "Invalid data received from core"
+msgstr "Ungültige Daten vom Core erhalten"
 
-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:505
-msgid "Initializing your session..."
-msgstr "Initialisiere Ihre Sitzung..."
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:308 ../src/client/coreconnection.cpp:390
+#: ../src/client/coreconnection.cpp:435
+msgid "Unencrypted connection canceled"
+msgstr "Gesicherte Verbindung abgebrochen"
 
-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:513
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:338
+msgid "Synchronizing to core..."
+msgstr "Mit Quassel-Core synchronisieren..."
+
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:359
 msgid ""
-"<b>Please be patient while your client synchronizes with the Quassel "
-"Core!</b>"
+"<b>The Quassel Core you are trying to connect to is too old!</b><br>Need at "
+"least core/client protocol v%1 to connect."
 msgstr ""
-"<b>Bitte haben Sie etwas Geduld, während sich Ihr Client mit dem "
-"Quassel-Core synchronisiert!</b>"
+"<b>Der Quassel-Core, zu dem Sie verbinden möchten, ist "
+"veraltet!</b><br>Benötige mindestens Core/Client-Protokoll v%1 zum Verbinden."
 
-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:528
-msgid "Session state:"
-msgstr "Sitzungsstatus:"
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:471
+msgid "Logging in..."
+msgstr "Anmelden..."
 
-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:545
-msgid "Network states:"
-msgstr "Netzwerkstatus:"
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:476
+msgid "Login canceled"
+msgstr "Anmelden abgebrochen"
+
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:499
+msgid "Receiving session state"
+msgstr "Empfange Sitzungsstatus"
+
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:501
+msgid "Synchronizing to %1..."
+msgstr "Synchronisiere mit %1..."
+
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:522
+msgid "Receiving network states"
+msgstr "Empfange Status der Netzwerke"
+
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:571
+msgid "Synchronized to %1"
+msgstr "Synchronisiert mit %1"
+
+#. ts-context CoreConnectionStatusWidget
+#: ../src/qtui/ui/coreconnectionstatuswidget.ui:14
+msgid "Form"
+msgstr "Formular"
 
-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:558
-msgid "0/0"
-msgstr "0/0"
+#. ts-context CoreConnectionStatusWidget
+#: ../src/qtui/ui/coreconnectionstatuswidget.ui:32
+msgid "Message"
+msgstr "Meldung"
 
-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:107
-msgid "Use internal core"
-msgstr "Internen Core benutzen"
+#. ts-context CoreConnectionStatusWidget
+#: ../src/qtui/coreconnectionstatuswidget.cpp:61
+msgid "(Lag: %1 ms)"
+msgstr "(Latenz: %1 msecs)"
 
-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:200
-msgid ""
-"THIS IS A PLACEHOLDER\n"
-"TO\n"
-"RESERVE\n"
-"SOME SPACE"
-msgstr ""
+#. ts-context CoreConnectionStatusWidget
+#: ../src/qtui/coreconnectionstatuswidget.cpp:74
+msgid "The connection to your core is encrypted with SSL."
+msgstr "Die Verbindung zum Quassel-Core ist mit SSL verschlüsselt"
 
-#. ts-context CoreConnectDlg
-#: ../src/qtui/coreconnectdlg.cpp:272
-msgid "<div>Errors occurred while connecting to \"%1\":</div>"
-msgstr "<div>Fehler beim Verbinden zu \"%1\":</div>"
-
-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:390
-msgid "Continue connection"
-msgstr "Verbinden fortsetzen"
+#. ts-context CoreConnectionStatusWidget
+#: ../src/qtui/coreconnectionstatuswidget.cpp:77
+msgid "The connection to your core is not encrypted."
+msgstr "Die Verbindung zum Quassel-Core ist nicht verschlüsselt"
 
 #. ts-context CoreInfoDlg
 #: ../src/qtui/ui/coreinfodlg.ui:13
@@ -2290,13 +2248,8 @@ msgstr "Temporär entfernte Chats:"
 
 #. ts-context DebugBufferViewOverlay
 #: ../src/qtui/debugbufferviewoverlay.cpp:57
-#, fuzzy
 msgid "Add Buffers Automatically:"
-msgstr ""
-
-#. ts-context DebugBufferViewOverlay
-#~ msgid "Add Bufers Automatically:"
-#~ msgstr "Chats automatisch hinzufügen:"
+msgstr "Chats automatisch hinzufügen:"
 
 #. ts-context DebugBufferViewOverlay
 #: ../src/qtui/debugbufferviewoverlay.cpp:58
@@ -2444,74 +2397,9 @@ msgstr "Script \"%1\" verursachte den Fehler %2."
 msgid "Choose..."
 msgstr "Wähle..."
 
-#. ts-context GeneralSettingsPage
-#: ../src/qtui/settingspages/generalsettingspage.ui:14
-msgid "Form"
-msgstr "Formular"
-
-#. ts-context GeneralSettingsPage
-#: ../src/qtui/settingspages/generalsettingspage.ui:45
-msgid "Show system tray icon"
-msgstr "Systemleistensymbol zeigen"
-
-#. ts-context GeneralSettingsPage
-#: ../src/qtui/settingspages/generalsettingspage.ui:20
-msgid "Show System Tray Icon"
-msgstr "Zeige Systemleistensymbol"
-
-#. ts-context GeneralSettingsPage
-#: ../src/qtui/settingspages/generalsettingspage.ui:29
-msgid "Hide to tray on close button"
-msgstr "Zur Systemleiste minimieren bei \"Schließen\""
-
-#. ts-context GeneralSettingsPage
-#: ../src/qtui/settingspages/generalsettingspage.ui:39
-msgid "Tray Icon"
-msgstr "Systemleistensymbol"
-
-#. ts-context GeneralSettingsPage
-#: ../src/qtui/settingspages/generalsettingspage.ui:58
-msgid "Message Redirection"
-msgstr "Nachrichtenumlenkung"
-
-#. ts-context GeneralSettingsPage
-#: ../src/qtui/settingspages/generalsettingspage.ui:64
-msgid "User Notices:"
-msgstr "Benutzernotizen:"
-
-#. ts-context GeneralSettingsPage
-#: ../src/qtui/settingspages/generalsettingspage.ui:107
-msgid "Server Notices:"
-msgstr "Servernotizen:"
-
-#. ts-context GeneralSettingsPage
-#: ../src/qtui/settingspages/generalsettingspage.ui:121
-msgid "Default Target"
-msgstr "Standardziel"
-
-#. ts-context GeneralSettingsPage
-#: ../src/qtui/settingspages/generalsettingspage.ui:128
-msgid "Status Window"
-msgstr "Status-Fenster"
-
-#. ts-context GeneralSettingsPage
-#: ../src/qtui/settingspages/generalsettingspage.ui:135
-msgid "Current Chat"
-msgstr "Aktueller Chat"
-
-#. ts-context GeneralSettingsPage
-#: ../src/qtui/settingspages/generalsettingspage.ui:142
-msgid "Errors:"
-msgstr "Fehler:"
-
-#. ts-context GeneralSettingsPage
-#: ../src/qtui/settingspages/generalsettingspage.cpp:28
-msgid "Misc"
-msgstr "Verschiedenes"
-
 #. ts-context HighlightSettingsPage
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:30
 #: ../src/qtui/settingspages/highlightsettingspage.ui:32
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:30
 msgid "Highlight"
 msgstr "Hervorhebungen"
 
@@ -2606,6 +2494,11 @@ msgstr "..."
 msgid "Identities"
 msgstr "Identitäten"
 
+#. ts-context IdentitiesSettingsPage
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:31
+msgid "IRC"
+msgstr "IRC"
+
 #. ts-context IdentitiesSettingsPage
 #: ../src/qtui/settingspages/identitiessettingspage.cpp:178
 msgid ""
@@ -2657,8 +2550,8 @@ msgid "Do you really want to delete identity \"%1\"?"
 msgstr "Wollen Sie Identität \"%1\" wirklich löschen?"
 
 #. ts-context IdentitiesSettingsPage
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:322
 #: ../src/qtui/settingspages/identitiessettingspage.ui:31
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:322
 msgid "Rename Identity"
 msgstr "Identität umbenennen"
 
@@ -2677,11 +2570,6 @@ msgstr "Identität hinzufügen"
 msgid "Remove Identity"
 msgstr "Identität entfernen"
 
-#. ts-context IdentitiesSettingsPage
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:31
-msgid "Misc"
-msgstr "Verschiedenes"
-
 #. ts-context Identity
 #: ../src/common/identity.cpp:150
 msgid "<empty>"
@@ -2718,8 +2606,8 @@ msgid "All Quassel clients vanished from the face of the earth..."
 msgstr "Alle Quassel-Clients sind vom Erdboden verschwunden..."
 
 #. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.cpp:219
 #: ../src/qtui/settingspages/identityeditwidget.ui:398
+#: ../src/qtui/settingspages/identityeditwidget.cpp:219
 msgid "Advanced"
 msgstr "Erweitert"
 
@@ -2729,17 +2617,17 @@ msgid "Load a Key"
 msgstr "Schlüssel laden"
 
 #. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:604
 #: ../src/qtui/settingspages/identityeditwidget.cpp:317
 #: ../src/qtui/settingspages/identityeditwidget.cpp:328
-#: ../src/qtui/settingspages/identityeditwidget.ui:604
 msgid "No Key loaded"
 msgstr "Kein Schlüssel geladen"
 
 #. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.cpp:318
-#: ../src/qtui/settingspages/identityeditwidget.cpp:365
 #: ../src/qtui/settingspages/identityeditwidget.ui:624
 #: ../src/qtui/settingspages/identityeditwidget.ui:722
+#: ../src/qtui/settingspages/identityeditwidget.cpp:318
+#: ../src/qtui/settingspages/identityeditwidget.cpp:365
 msgid "Load"
 msgstr "Laden"
 
@@ -2765,10 +2653,10 @@ msgid "Load a Certificate"
 msgstr "Ein Zertifikat laden"
 
 #. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.cpp:363
-#: ../src/qtui/settingspages/identityeditwidget.cpp:364
 #: ../src/qtui/settingspages/identityeditwidget.ui:662
 #: ../src/qtui/settingspages/identityeditwidget.ui:696
+#: ../src/qtui/settingspages/identityeditwidget.cpp:363
+#: ../src/qtui/settingspages/identityeditwidget.cpp:364
 msgid "No Certificate loaded"
 msgstr "Kein Zertifikat geladen"
 
@@ -3012,7 +2900,6 @@ msgstr "permanent"
 
 #. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:58
-#, fuzzy
 msgid ""
 "<p><b>Rule Type:</b></p>\n"
 "<p><u>Sender:</u></p>\n"
@@ -3021,6 +2908,12 @@ msgid ""
 "<p><u>Message:</u></p>\n"
 "<p>The rule is matched against the actual message content</p>"
 msgstr ""
+"<p><b>Regeltyp:</b></p>\n"
+"<p><u>Nach Absender:</u></p>\n"
+"<p>Die Regel filtert abhängig vom Absenderstring.\n"
+"<i>nick!ident@host.name<i></p>\n"
+"<p><u>Nach Meldungsinhalt:</u></p>\n"
+"<p>Die Regel filtert abhängig vom Meldungsinhalt.</p>"
 
 #. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:66
@@ -3062,22 +2955,6 @@ msgstr ""
 "<p>Meldungen werden irreversibel herausgefiltert bevor sie in der Datenbank "
 "gespeichert werden.</p>"
 
-#. ts-context IgnoreListEditDlg
-#~ msgid ""
-#~ "<p><b>Rule Type:</b></p>\n"
-#~ "<p><u>By Sender:</u></p>\n"
-#~ "<p>The rule is matched against the sender string\n"
-#~ "<i>nick!ident@host.name<i></p>\n"
-#~ "<p><u>By Message:</u></p>\n"
-#~ "<p>The rule is matched against the actual message content</p>"
-#~ msgstr ""
-#~ "<p><b>Regeltyp:</b></p>\n"
-#~ "<p><u>Nach Absender:</u></p>\n"
-#~ "<p>Die Regel filtert abhängig vom Absenderstring.\n"
-#~ "<i>nick!ident@host.name<i></p>\n"
-#~ "<p><u>Nach Meldungsinhalt:</u></p>\n"
-#~ "<p>Die Regel filtert abhängig vom Meldungsinhalt.</p>"
-
 #. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:91
 msgid ""
@@ -3117,24 +2994,6 @@ msgstr ""
 msgid "Ignore Rule"
 msgstr "Ignorier-Regel"
 
-#. ts-context IgnoreListEditDlg
-#~ msgid ""
-#~ "<p><b>Use RegularExpressions:</b></p>\n"
-#~ "<p>If enabled, rules follow regular expression syntax.</p>\n"
-#~ "<p>Otherwise rules allow wildcard matching with the following special "
-#~ "characters:</p>\n"
-#~ "<p> *: representing \"any amount of any character\"\n"
-#~ "<br />\n"
-#~ "?: representing \"exactly one character\"</p>"
-#~ msgstr ""
-#~ "<p><b>Reguläre Ausdrucke (RegEx):</b></p>\n"
-#~ "<p>Falls aktiviert, wird nach dem Syntax regulärer Ausdrücke "
-#~ "gefiltert.</p>\n"
-#~ "<p>Ansonsten erlauben Regeln folgende Platzhalter:</p>\n"
-#~ "<p> *: entspricht einer beliebigen Anzahl an Zeichen.\n"
-#~ "<br />\n"
-#~ " ?: entspricht einem oder keinem Zeichen.</p>"
-
 #. ts-context IgnoreListEditDlg
 #: ../src/qtui/settingspages/ignorelisteditdlg.ui:116
 msgid ""
@@ -3297,13 +3156,13 @@ msgstr "Ignorier-Regel"
 
 #. ts-context IgnoreListSettingsPage
 #: ../src/qtui/settingspages/ignorelistsettingspage.cpp:34
-msgid "Misc"
-msgstr "Verschiedenes"
+msgid "Ignore List"
+msgstr "Ignorieren-Liste"
 
 #. ts-context IgnoreListSettingsPage
 #: ../src/qtui/settingspages/ignorelistsettingspage.cpp:34
-msgid "Ignore List"
-msgstr "Ignorieren-Liste"
+msgid "IRC"
+msgstr "IRC"
 
 #. ts-context IgnoreListSettingsPage
 #: ../src/qtui/settingspages/ignorelistsettingspage.cpp:128
@@ -3753,225 +3612,290 @@ msgid "Away:"
 msgstr "Abwesend:"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:789
+#: ../src/qtui/mainwin.cpp:803
 msgid "Not connected to core."
 msgstr "Nicht mit Core verbunden."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:403
+#: ../src/qtui/mainwin.cpp:418
 msgid "Debug"
 msgstr "Debug"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:324
+#: ../src/qtui/mainwin.cpp:339
 msgid "F7"
 msgstr "F7"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:719
+#: ../src/qtui/mainwin.cpp:735
 msgid "Connected to core."
 msgstr "Mit Quassel-Core verbunden."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:542
+#: ../src/qtui/mainwin.cpp:563
 msgid "Nicks"
 msgstr "Spitznamen"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:562
+#: ../src/qtui/mainwin.cpp:583
 msgid "Chat Monitor"
 msgstr "Chatmonitor"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:577
+#: ../src/qtui/mainwin.cpp:598
 msgid "Inputline"
 msgstr "Eingabezeile"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:597
+#: ../src/qtui/mainwin.cpp:618
 msgid "Topic"
 msgstr "Thema"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:352
+#: ../src/qtui/mainwin.cpp:367
 msgid "&File"
 msgstr "&Datei"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:365
+#: ../src/qtui/mainwin.cpp:380
 msgid "&Networks"
 msgstr "&Netzwerke"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:388
+#: ../src/qtui/mainwin.cpp:403
 msgid "&Settings"
 msgstr "Ein&stellungen"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:395
+#: ../src/qtui/mainwin.cpp:410
 msgid "&Help"
 msgstr "&Hilfe"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:293
+#: ../src/qtui/mainwin.cpp:308
 msgid "&Connect to Core..."
 msgstr "Zum Core &verbinden..."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:295
+#: ../src/qtui/mainwin.cpp:310
 msgid "&Disconnect from Core"
 msgstr "Vom Core &trennen"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:297
+#: ../src/qtui/mainwin.cpp:312
 msgid "Core &Info..."
 msgstr "Core-&Info..."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:301
+#: ../src/qtui/mainwin.cpp:316
 msgid "&Quit"
 msgstr "&Beenden"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:302
+#: ../src/qtui/mainwin.cpp:317
 msgid "Ctrl+Q"
 msgstr "Strg+Q"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:312
+#: ../src/qtui/mainwin.cpp:327
 msgid "Show &Search Bar"
 msgstr "&Suchleiste anzeigen"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:319
+#: ../src/qtui/mainwin.cpp:334
 msgid "Show Status &Bar"
 msgstr "St&atusleiste anzeigen"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:323
+#: ../src/qtui/mainwin.cpp:338
 msgid "&Configure Quassel..."
 msgstr "Quassel &konfigurieren..."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:331
+#: ../src/qtui/mainwin.cpp:346
 msgid "Debug &NetworkModel"
 msgstr "Debug &NetworkModel"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:371
+#: ../src/qtui/mainwin.cpp:386
 msgid "&View"
 msgstr "&Ansicht"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:551
+#: ../src/qtui/mainwin.cpp:572
 msgid "Show Nick List"
 msgstr "Spitznamenliste anzeigen"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:573
+#: ../src/qtui/mainwin.cpp:594
 msgid "Show Chat Monitor"
 msgstr "Chatmonitor anzeigen"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:586
+#: ../src/qtui/mainwin.cpp:607
 msgid "Show Input Line"
 msgstr "Eingabezeile anzeigen"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:609
+#: ../src/qtui/mainwin.cpp:630
 msgid "Show Topic Line"
 msgstr "Thema anzeigen"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:339
+#: ../src/qtui/mainwin.cpp:817 ../src/qtui/mainwin.cpp:825
+msgid "Unencrypted Connection"
+msgstr "Unverschlüsselte Verbindung"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:817
+msgid "<b>Your client does not support SSL encryption</b>"
+msgstr "<b>Ihr Client unterstüzt keine SSL-Verschlüsselung</b>"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:819 ../src/qtui/mainwin.cpp:827
+msgid ""
+"Sensitive data, like passwords, will be transmitted unencrypted to your "
+"Quassel core."
+msgstr ""
+"Persönliche Daten, wie Passwörter, werden unverschlüsselt zum Quassel-Core "
+"gesendet."
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:825
+msgid "<b>Your core does not support SSL encryption</b>"
+msgstr "<b>Ihr Quassel-Core unterstüzt keine SSL-Verschlüsselung</b>"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:842 ../src/qtui/mainwin.cpp:862
+msgid "Untrusted Security Certificate"
+msgstr "Nicht vertrauenswürdiges SSL-Zertifikat"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:843
+msgid ""
+"<b>The SSL certificate provided by the core at %1 is untrusted for the "
+"following reasons:</b>"
+msgstr ""
+"<b>Das SSL-Zertifikat des Quassel-Core auf %1 ist nicht vertrauenswürdig, "
+"weil:</b>"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:846
+msgid "Continue"
+msgstr "Fortfahren"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:847
+msgid "Show Certificate"
+msgstr "SSL-Zertifikat anzeigen"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:863
+msgid ""
+"Would you like to accept this certificate forever without being prompted?"
+msgstr ""
+"Möchten sie das Zertifikat dauerhaft, ohne künftige Nachfragen akzeptieren?"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:865
+msgid "Current Session Only"
+msgstr "Nur aktuelle Sitzung"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:866
+msgid "Forever"
+msgstr "Dauerhaft"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:875
+msgid "Core Connection Error"
+msgstr "Core Verbindungs Fehler"
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:354
 msgid "Debug &Log"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:335
+#: ../src/qtui/mainwin.cpp:350
 msgid "Debug &MessageModel"
 msgstr ""
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:305
+#: ../src/qtui/mainwin.cpp:320
 msgid "&Configure Chat Lists..."
 msgstr "Chat-Listen &konfigurieren..."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:327
+#: ../src/qtui/mainwin.cpp:342
 msgid "&About Quassel"
 msgstr "&Über Quassel"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:329
+#: ../src/qtui/mainwin.cpp:344
 msgid "About &Qt"
 msgstr "Ü&ber Qt"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:299
+#: ../src/qtui/mainwin.cpp:314
 msgid "Configure &Networks..."
 msgstr "&Netzwerke konfigurieren..."
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:308
+#: ../src/qtui/mainwin.cpp:323
 msgid "&Lock Layout"
 msgstr "Ansicht &fixieren"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:314
+#: ../src/qtui/mainwin.cpp:329
 msgid "Show Away Log"
 msgstr "Abwesenheitslog anzeigen"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:316
+#: ../src/qtui/mainwin.cpp:331
 msgid "Show &Menubar"
 msgstr "&Menüleiste anzeigen"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:317
+#: ../src/qtui/mainwin.cpp:332
 msgid "Ctrl+M"
 msgstr "Strg+M"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:333
+#: ../src/qtui/mainwin.cpp:348
 msgid "Debug &BufferViewOverlay"
 msgstr "Fehler beseitigen (&BufferViewOverlay)"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:337
+#: ../src/qtui/mainwin.cpp:352
 msgid "Debug &HotList"
 msgstr "Fehler beseitigen (&HotList)"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:341
+#: ../src/qtui/mainwin.cpp:356
 msgid "Reload Stylesheet"
 msgstr "Layoutdatei neu laden"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:345
+#: ../src/qtui/mainwin.cpp:360
 msgid "Jump to hot chat"
 msgstr "Zum neusten Chat springen"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:372
+#: ../src/qtui/mainwin.cpp:387
 msgid "&Chat Lists"
 msgstr "&Chat-Listen"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:374
+#: ../src/qtui/mainwin.cpp:389
 msgid "&Toolbars"
 msgstr "&Werkzeugleiste"
 
 #. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:680
+#: ../src/qtui/mainwin.cpp:696
 msgid "Main Toolbar"
 msgstr "Hauptwerkzeugleiste"
 
-#. ts-context MainWin
-#: ../src/qtui/mainwin.cpp:753
-msgid "Core Lag: %1"
-msgstr "Latenz: %1"
-
 #. ts-context MessageModel
 #: ../src/client/messagemodel.cpp:373
 msgid "Requesting %1 messages from backlog for buffer %2:%3"
@@ -4143,6 +4067,11 @@ msgstr "Netzwerkverbindung konfigurieren"
 msgid "Networks"
 msgstr "Netzwerke"
 
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.cpp:37
+msgid "IRC"
+msgstr "IRC"
+
 #. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.cpp:160
 msgid ""
@@ -4393,11 +4322,6 @@ msgstr "Allen Kanälen beim Wiederverbinden erneut betreten"
 msgid " s"
 msgstr " s"
 
-#. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.cpp:37
-msgid "Misc"
-msgstr "Verschiedenes"
-
 #. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:336
 msgid "Commands"
@@ -4468,7 +4392,7 @@ msgid "Play File:"
 msgstr "Spiele Datei:"
 
 #. ts-context PostgreSqlStorage
-#: ../src/core/postgresqlstorage.cpp:61
+#: ../src/core/postgresqlstorage.cpp:62
 msgid "PostgreSQL Turbo Bomber HD!"
 msgstr "PostgreSQL Turbo Bomber HD!"
 
@@ -4803,18 +4727,18 @@ msgid "Proxy Password:"
 msgstr "Proxy-Passwort:"
 
 #. ts-context SettingsDlg
-#: ../src/qtui/settingsdlg.cpp:77 ../src/qtui/ui/settingsdlg.ui:34
-#: ../src/qtui/ui/settingsdlg.ui:49
+#: ../src/qtui/ui/settingsdlg.ui:34 ../src/qtui/ui/settingsdlg.ui:49
+#: ../src/qtui/settingsdlg.cpp:99
 msgid "Settings"
 msgstr "Einstellungen"
 
 #. ts-context SettingsDlg
-#: ../src/qtui/settingsdlg.cpp:87
+#: ../src/qtui/settingsdlg.cpp:109
 msgid "Save changes"
 msgstr "Einstellungen speichern"
 
 #. ts-context SettingsDlg
-#: ../src/qtui/settingsdlg.cpp:88
+#: ../src/qtui/settingsdlg.cpp:110
 msgid ""
 "There are unsaved changes on the current configuration page. Would you like "
 "to apply your changes now?"
@@ -4823,24 +4747,24 @@ msgstr ""
 "Möchten Sie diese Änderungen jetzt anwenden?"
 
 #. ts-context SettingsDlg
-#: ../src/qtui/settingsdlg.cpp:171
+#: ../src/qtui/settingsdlg.cpp:193
 msgid "Reload Settings"
 msgstr "Einstellungen neu laden"
 
 #. ts-context SettingsDlg
-#: ../src/qtui/settingsdlg.cpp:171
+#: ../src/qtui/settingsdlg.cpp:193
 msgid "Do you like to reload the settings, undoing your changes on this page?"
 msgstr ""
 "Möchten Sie die Einstellungen neu laden und die Änderungen auf dieser Seite "
 "zurücknehmen?"
 
 #. ts-context SettingsDlg
-#: ../src/qtui/settingsdlg.cpp:180
+#: ../src/qtui/settingsdlg.cpp:202
 msgid "Restore Defaults"
 msgstr "Standards wiederherstellen"
 
 #. ts-context SettingsDlg
-#: ../src/qtui/settingsdlg.cpp:180
+#: ../src/qtui/settingsdlg.cpp:202
 msgid "Do you like to restore the default values for this page?"
 msgstr "Möchten Sie die Standardwerte für diese Seite wiederherstellen?"
 
@@ -4850,7 +4774,7 @@ msgid "Configure Quassel"
 msgstr "Quassel konfigurieren"
 
 #. ts-context SettingsDlg
-#: ../src/qtui/settingsdlg.cpp:100 ../src/qtui/settingsdlg.cpp:104
+#: ../src/qtui/settingsdlg.cpp:122 ../src/qtui/settingsdlg.cpp:126
 msgid "Configure %1"
 msgstr "Konfiguriere %1"
 
@@ -4877,12 +4801,12 @@ msgid "Do you like to restore the default values for this page?"
 msgstr "Möchten Sie die Standardwerte für diese Seite wiederherstellen?"
 
 #. ts-context SettingsPageDlg
-#: ../src/qtui/ui/settingspagedlg.ui:13
+#: ../src/qtui/ui/settingspagedlg.ui:14
 msgid "Configure Quassel"
 msgstr "Quassel konfigurieren"
 
 #. ts-context SettingsPageDlg
-#: ../src/qtui/ui/settingspagedlg.ui:29
+#: ../src/qtui/ui/settingspagedlg.ui:30
 msgid "Settings"
 msgstr "Einstellungen"
 
@@ -4892,7 +4816,7 @@ msgid "Configure %1"
 msgstr "Konfiguriere %1"
 
 #. ts-context SignalProxy
-#: ../src/common/signalproxy.cpp:1030
+#: ../src/common/signalproxy.cpp:1035
 msgid "Disconnecting"
 msgstr "Trenne"
 
@@ -5011,75 +4935,110 @@ msgstr ""
 "Quassel-Core seine Daten auf dem selben Rechner, auf dem er auch läuft, "
 "speichern soll und Sie nur mit ein paar Benutzern auf Ihrem Core rechnen."
 
-#. ts-context SslCertDisplayDialog
-#: ../src/qtui/coreconnectdlg.cpp:568
-msgid "SSL Certificate used by %1"
-msgstr ""
-
-#. ts-context SslCertDisplayDialog
-#: ../src/qtui/coreconnectdlg.cpp:572
-msgid "Issuer Info"
-msgstr ""
-
-#. ts-context SslCertDisplayDialog
-#: ../src/qtui/coreconnectdlg.cpp:574 ../src/qtui/coreconnectdlg.cpp:583
-msgid "Organization:"
-msgstr ""
-
-#. ts-context SslCertDisplayDialog
-#: ../src/qtui/coreconnectdlg.cpp:575 ../src/qtui/coreconnectdlg.cpp:584
-msgid "Locality Name:"
-msgstr ""
-
-#. ts-context SslCertDisplayDialog
-#: ../src/qtui/coreconnectdlg.cpp:576 ../src/qtui/coreconnectdlg.cpp:585
-msgid "Organizational Unit Name:"
-msgstr ""
-
-#. ts-context SslCertDisplayDialog
-#: ../src/qtui/coreconnectdlg.cpp:577 ../src/qtui/coreconnectdlg.cpp:586
-msgid "Country Name:"
-msgstr ""
-
-#. ts-context SslCertDisplayDialog
-#: ../src/qtui/coreconnectdlg.cpp:578 ../src/qtui/coreconnectdlg.cpp:587
-msgid "State or Province Name:"
-msgstr ""
-
-#. ts-context SslCertDisplayDialog
-#: ../src/qtui/coreconnectdlg.cpp:581
-msgid "Subject Info"
-msgstr ""
-
-#. ts-context SslCertDisplayDialog
-#: ../src/qtui/coreconnectdlg.cpp:590
-msgid "Additional Info"
-msgstr ""
-
-#. ts-context SslCertDisplayDialog
-#: ../src/qtui/coreconnectdlg.cpp:592
-msgid "Valid From:"
-msgstr ""
-
-#. ts-context SslCertDisplayDialog
-#: ../src/qtui/coreconnectdlg.cpp:593
-msgid "Valid To:"
-msgstr ""
-
-#. ts-context SslCertDisplayDialog
-#: ../src/qtui/coreconnectdlg.cpp:596
-msgid "Hostname %1:"
-msgstr ""
-
-#. ts-context SslCertDisplayDialog
-#: ../src/qtui/coreconnectdlg.cpp:600
-msgid "E-Mail Address %1:"
-msgstr ""
-
-#. ts-context SslCertDisplayDialog
-#: ../src/qtui/coreconnectdlg.cpp:602
-msgid "Digest:"
-msgstr ""
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:14
+msgid "Security Information"
+msgstr "Sicherheitsinformationen"
+
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:22
+msgid "<b>Hostname:</b>"
+msgstr "<b>Rechnername:</b>"
+
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:39
+msgid "<b>IP address:</b>"
+msgstr "<b>IP Addresse:</b>"
+
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:56
+msgid "<b>Encryption:</b>"
+msgstr "<b>Verschlüsselung:</b>"
+
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:73
+msgid "<b>Protocol:</b>"
+msgstr "<b>Protokoll:</b>"
+
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:90
+msgid "<b>Certificate chain:</b>"
+msgstr "<b>Zertifikatskette:</b>"
+
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:120
+msgid "Subject"
+msgstr "Betrifft"
+
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:126 ../src/qtui/ui/sslinfodlg.ui:248
+msgid "<b>Common name:</b>"
+msgstr "<b>Allgemeiner Name:</b>"
+
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:143 ../src/qtui/ui/sslinfodlg.ui:265
+msgid "<b>Organization:</b>"
+msgstr "<b>Organisation:</b>"
+
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:160 ../src/qtui/ui/sslinfodlg.ui:282
+msgid "<b>Organizational unit:</b>"
+msgstr "<b>Organisationseinheit:</b>"
+
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:177 ../src/qtui/ui/sslinfodlg.ui:299
+msgid "<b>Country:</b>"
+msgstr "<b>Land:</b>"
+
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:194 ../src/qtui/ui/sslinfodlg.ui:316
+msgid "<b>State or province:</b>"
+msgstr "<b>Bundesland/-staat:</b>"
+
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:231 ../src/qtui/ui/sslinfodlg.ui:353
+msgid "<b>Locality:</b>"
+msgstr "<b>Lokalität:</b>"
+
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:242
+msgid "Issuer"
+msgstr "Ausgestellt durch"
+
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:367
+msgid "<b>Validity period:</b>"
+msgstr "<b>Gültigkeitszeitraum:</b>"
+
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:384
+msgid "<b>MD5 digest:</b>"
+msgstr "<b>MD5 Digest:</b>"
+
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:401
+msgid "<b>SHA1 digest:</b>"
+msgstr "<b>SHA1 Digest:</b>"
+
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:431
+msgid "<b>Trusted:</b>"
+msgstr "<b>Vertrauenswürdig</b>"
+
+#. ts-context SslInfoDlg
+#: ../src/qtui/sslinfodlg.cpp:69
+msgid "Yes"
+msgstr "Ja"
+
+#. ts-context SslInfoDlg
+#: ../src/qtui/sslinfodlg.cpp:71
+msgid "No, for the following reasons:<ul>"
+msgstr "Nein, wegen den folgenden Gründen:<ul>"
+
+#. ts-context SslInfoDlg
+#: ../src/qtui/sslinfodlg.cpp:78
+msgid "%1 to %2"
+msgstr "%1 bis %2"
 
 #. ts-context StatusBufferItem
 #: ../src/client/networkmodel.h:142