Update the .pot file to reflect latest sources.

diff --git a/po/quassel.pot b/po/quassel.pot
index 1583dda..942780a 100644 (file)
--- a/po/quassel.pot
+++ b/po/quassel.pot
@@ -8,64 +8,6 @@ msgid ""
 msgstr ""
 "X-Virgin-Header: remove this line if you change anything in the header.\n"
 
 msgstr ""
 "X-Virgin-Header: remove this line if you change anything in the header.\n"
 

-#. ts-context AboutDlg
-#: ../src/qtui/aboutdlg.cpp:32
-#, fuzzy
-msgid "<b>Version:</b> %1<br><b>Protocol version:</b> %2<br><b>Built:</b> %3"
-msgstr ""
-
-#. ts-context AboutDlg
-#: ../src/qtui/aboutdlg.cpp:46
-#, fuzzy
-msgid ""
-"<b>A modern, distributed IRC Client</b><br><br>&copy;2005-2009 by the "
-"Quassel Project<br><a "
-"href=\"http://quassel-irc.org\">http://quassel-irc.org</a><br><a "
-"href=\"irc://irc.freenode.net/quassel\">#quassel</a> on <a "
-"href=\"http://www.freenode.net\">Freenode</a><br><br>Quassel IRC is "
-"dual-licensed under <a "
-"href=\"http://www.gnu.org/licenses/gpl-2.0.txt\">GPLv2</a> and <a "
-"href=\"http://www.gnu.org/licenses/gpl-3.0.txt\">GPLv3</a>.<br>Most icons "
-"are &copy; by the <a href=\"http://www.oxygen-icons.org\">Oxygen Team</a> "
-"and used under the <a "
-"href=\"http://www.gnu.org/licenses/lgpl.html\">LGPL</a>.<br><br>Please use "
-"<a href=\"http://bugs.quassel-irc.org\">http://bugs.quassel-irc.org</a> to "
-"report bugs."
-msgstr ""
-
-#. ts-context AboutDlg
-#: ../src/qtui/aboutdlg.cpp:62
-#, fuzzy
-msgid "Quassel IRC is mainly developed by:"
-msgstr ""
-
-#. ts-context AboutDlg
-#: ../src/qtui/aboutdlg.cpp:77
-#, fuzzy
-msgid ""
-"We would like to thank the following contributors (in alphabetical order) "
-"and everybody we forgot to mention here:"
-msgstr ""
-
-#. ts-context AboutDlg
-#: ../src/qtui/aboutdlg.cpp:116
-#, fuzzy
-msgid ""
-"Special thanks goes to:<br><dl><dt><img "
-"src=\":/pics/quassel-eye.png\">&nbsp;<b>John \"nox\" Hand</b></dt><dd>for "
-"the original Quassel icon - The All-Seeing Eye</dt><dt><img "
-"src=\":/pics/oxygen.png\">&nbsp;<b><a "
-"href=\"http://www.oxygen-icons.org\">The Oxygen Team</a></b></dt><dd>for "
-"creating all the artwork you see throughout Quassel</dd><dt><img "
-"src=\":/pics/qt-logo-32.png\">&nbsp;<b><a "
-"href=\"http://www.trolltech.com\">Qt Software formerly known as "
-"Trolltech</a></b></dt><dd>for creating Qt and Qtopia, and for sponsoring "
-"development of QuasselTopia with Greenphones and more</dd><dt><a "
-"href=\"http://www.nokia.com\"><img "
-"src=\":/pics/nokia.png\"></a></b></dt><dd>for keeping Qt alive, and for "
-"sponsoring development of Quassel Mobile with N810s</dd>"
-msgstr ""
-

 #. ts-context AboutDlg
 #: ../src/qtui/ui/aboutdlg.ui:17
 #, fuzzy
 #. ts-context AboutDlg
 #: ../src/qtui/ui/aboutdlg.ui:17
 #, fuzzy


@@ -124,6 +66,64 @@ msgstr ""
 msgid "&Thanks To"
 msgstr ""
 
 msgid "&Thanks To"
 msgstr ""
 

+#. ts-context AboutDlg
+#: ../src/qtui/aboutdlg.cpp:32
+#, fuzzy
+msgid "<b>Version:</b> %1<br><b>Protocol version:</b> %2<br><b>Built:</b> %3"
+msgstr ""
+
+#. ts-context AboutDlg
+#: ../src/qtui/aboutdlg.cpp:46
+#, fuzzy
+msgid ""
+"<b>A modern, distributed IRC Client</b><br><br>&copy;2005-2009 by the "
+"Quassel Project<br><a "
+"href=\"http://quassel-irc.org\">http://quassel-irc.org</a><br><a "
+"href=\"irc://irc.freenode.net/quassel\">#quassel</a> on <a "
+"href=\"http://www.freenode.net\">Freenode</a><br><br>Quassel IRC is "
+"dual-licensed under <a "
+"href=\"http://www.gnu.org/licenses/gpl-2.0.txt\">GPLv2</a> and <a "
+"href=\"http://www.gnu.org/licenses/gpl-3.0.txt\">GPLv3</a>.<br>Most icons "
+"are &copy; by the <a href=\"http://www.oxygen-icons.org\">Oxygen Team</a> "
+"and used under the <a "
+"href=\"http://www.gnu.org/licenses/lgpl.html\">LGPL</a>.<br><br>Please use "
+"<a href=\"http://bugs.quassel-irc.org\">http://bugs.quassel-irc.org</a> to "
+"report bugs."
+msgstr ""
+
+#. ts-context AboutDlg
+#: ../src/qtui/aboutdlg.cpp:62
+#, fuzzy
+msgid "Quassel IRC is mainly developed by:"
+msgstr ""
+
+#. ts-context AboutDlg
+#: ../src/qtui/aboutdlg.cpp:77
+#, fuzzy
+msgid ""
+"We would like to thank the following contributors (in alphabetical order) "
+"and everybody we forgot to mention here:"
+msgstr ""
+
+#. ts-context AboutDlg
+#: ../src/qtui/aboutdlg.cpp:128
+#, fuzzy
+msgid ""
+"Special thanks goes to:<br><dl><dt><img "
+"src=\":/pics/quassel-eye.png\">&nbsp;<b>John \"nox\" Hand</b></dt><dd>for "
+"the original Quassel icon - The All-Seeing Eye</dt><dt><img "
+"src=\":/pics/oxygen.png\">&nbsp;<b><a "
+"href=\"http://www.oxygen-icons.org\">The Oxygen Team</a></b></dt><dd>for "
+"creating all the artwork you see throughout Quassel</dd><dt><img "
+"src=\":/pics/qt-logo-32.png\">&nbsp;<b><a "
+"href=\"http://www.trolltech.com\">Qt Software formerly known as "
+"Trolltech</a></b></dt><dd>for creating Qt and Qtopia, and for sponsoring "
+"development of QuasselTopia with Greenphones and more</dd><dt><a "
+"href=\"http://www.nokia.com\"><img "
+"src=\":/pics/nokia.png\"></a></b></dt><dd>for keeping Qt alive, and for "
+"sponsoring development of Quassel Mobile with N810s</dd>"
+msgstr ""
+

 #. ts-context AbstractSqlStorage
 #: ../src/core/abstractsqlstorage.cpp:112
 #, fuzzy
 #. ts-context AbstractSqlStorage
 #: ../src/core/abstractsqlstorage.cpp:112
 #, fuzzy


@@ -174,18 +174,6 @@ msgstr ""
 msgid "Expansion"
 msgstr ""
 
 msgid "Expansion"
 msgstr ""
 

-#. ts-context AliasesSettingsPage
-#: ../src/qtui/settingspages/aliasessettingspage.cpp:29
-#, fuzzy
-msgid "Misc"
-msgstr ""
-
-#. ts-context AliasesSettingsPage
-#: ../src/qtui/settingspages/aliasessettingspage.cpp:29
-#, fuzzy
-msgid "Aliases"
-msgstr ""
-

 #. ts-context AliasesSettingsPage
 #: ../src/qtui/settingspages/aliasessettingspage.ui:13
 #, fuzzy
 #. ts-context AliasesSettingsPage
 #: ../src/qtui/settingspages/aliasessettingspage.ui:13
 #, fuzzy


@@ -204,23 +192,16 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
 msgid "Delete"
 msgstr ""
 

-#. ts-context AppearanceSettingsPage
-#: ../src/qtui/settingspages/appearancesettingspage.cpp:34
-#, fuzzy
-msgid "Interface"
-msgstr ""
-
-#. ts-context AppearanceSettingsPage
-#: ../src/qtui/settingspages/appearancesettingspage.cpp:53
-#: ../src/qtui/settingspages/appearancesettingspage.ui:46
+#. ts-context AliasesSettingsPage
+#: ../src/qtui/settingspages/aliasessettingspage.cpp:29

 #, fuzzy
 #, fuzzy

-msgid "<System Default>"
+msgid "Misc"

 msgstr ""
 
 msgstr ""
 

-#. ts-context AppearanceSettingsPage
-#: ../src/qtui/settingspages/appearancesettingspage.cpp:151
+#. ts-context AliasesSettingsPage
+#: ../src/qtui/settingspages/aliasessettingspage.cpp:29

 #, fuzzy
 #, fuzzy

-msgid "Please choose a stylesheet file"
+msgid "Aliases"

 msgstr ""
 
 #. ts-context AppearanceSettingsPage
 msgstr ""
 
 #. ts-context AppearanceSettingsPage


@@ -253,6 +234,13 @@ msgstr ""
 msgid "Set the application language. Requires restart!"
 msgstr ""
 
 msgid "Set the application language. Requires restart!"
 msgstr ""
 

+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.ui:46
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:53
+#, fuzzy
+msgid "<System Default>"
+msgstr ""
+

 #. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:51
 #, fuzzy
 #. ts-context AppearanceSettingsPage
 #: ../src/qtui/settingspages/appearancesettingspage.ui:51
 #, fuzzy


@@ -277,6 +265,18 @@ msgstr ""
 msgid "..."
 msgstr ""
 
 msgid "..."
 msgstr ""
 

+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:34
+#, fuzzy
+msgid "Interface"
+msgstr ""
+
+#. ts-context AppearanceSettingsPage
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:151
+#, fuzzy
+msgid "Please choose a stylesheet file"
+msgstr ""
+

 #. ts-context AwayLogView
 #: ../src/qtui/awaylogview.cpp:33
 #, fuzzy
 #. ts-context AwayLogView
 #: ../src/qtui/awaylogview.cpp:33
 #, fuzzy


@@ -295,18 +295,6 @@ msgstr ""
 msgid "Show Buffer Name"
 msgstr ""
 
 msgid "Show Buffer Name"
 msgstr ""
 

-#. ts-context BacklogSettingsPage
-#: ../src/qtui/settingspages/backlogsettingspage.cpp:27
-#, fuzzy
-msgid "Misc"
-msgstr ""
-
-#. ts-context BacklogSettingsPage
-#: ../src/qtui/settingspages/backlogsettingspage.cpp:27
-#, fuzzy
-msgid "Backlog"
-msgstr ""
-

 #. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:14
 #, fuzzy
 #. ts-context BacklogSettingsPage
 #: ../src/qtui/settingspages/backlogsettingspage.ui:14
 #, fuzzy


@@ -446,6 +434,18 @@ msgstr ""
 msgid "Maximum amount of messages to be fetched over all buffers."
 msgstr ""
 
 msgid "Maximum amount of messages to be fetched over all buffers."
 msgstr ""
 

+#. ts-context BacklogSettingsPage
+#: ../src/qtui/settingspages/backlogsettingspage.cpp:27
+#, fuzzy
+msgid "Misc"
+msgstr ""
+
+#. ts-context BacklogSettingsPage
+#: ../src/qtui/settingspages/backlogsettingspage.cpp:27
+#, fuzzy
+msgid "Backlog"
+msgstr ""
+

 #. ts-context BufferItem
 #: ../src/client/networkmodel.cpp:324
 #, fuzzy
 #. ts-context BufferItem
 #: ../src/client/networkmodel.cpp:324
 #, fuzzy


@@ -490,37 +490,6 @@ msgstr ""
 msgid "Show / Hide Chats"
 msgstr ""
 
 msgid "Show / Hide Chats"
 msgstr ""
 

-#. ts-context BufferViewSettingsPage
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:36
-#, fuzzy
-msgid "Misc"
-msgstr ""
-
-#. ts-context BufferViewSettingsPage
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:36
-#, fuzzy
-msgid "Custom Chat Lists"
-msgstr ""
-
-#. ts-context BufferViewSettingsPage
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:117
-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:100
-#, fuzzy
-msgid "All"
-msgstr ""
-
-#. ts-context BufferViewSettingsPage
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:342
-#, fuzzy
-msgid "Delete Chat List?"
-msgstr ""
-
-#. ts-context BufferViewSettingsPage
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:343
-#, fuzzy
-msgid "Do you really want to delete the chat list \"%1\"?"
-msgstr ""
-

 #. ts-context BufferViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:14
 #, fuzzy
 #. ts-context BufferViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:14
 #, fuzzy


@@ -557,6 +526,13 @@ msgstr ""
 msgid "Network:"
 msgstr ""
 
 msgid "Network:"
 msgstr ""
 

+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:100
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:117
+#, fuzzy
+msgid "All"
+msgstr ""
+

 #. ts-context BufferViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:110
 #, fuzzy
 #. ts-context BufferViewSettingsPage
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:110
 #, fuzzy


@@ -637,6 +613,30 @@ msgstr ""
 msgid "Preview:"
 msgstr ""
 
 msgid "Preview:"
 msgstr ""
 

+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:36
+#, fuzzy
+msgid "Misc"
+msgstr ""
+
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:36
+#, fuzzy
+msgid "Custom Chat Lists"
+msgstr ""
+
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:342
+#, fuzzy
+msgid "Delete Chat List?"
+msgstr ""
+
+#. ts-context BufferViewSettingsPage
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:343
+#, fuzzy
+msgid "Do you really want to delete the chat list \"%1\"?"
+msgstr ""
+

 #. ts-context BufferViewWidget
 #: ../src/qtui/ui/bufferviewwidget.ui:26
 #, fuzzy
 #. ts-context BufferViewWidget
 #: ../src/qtui/ui/bufferviewwidget.ui:26
 #, fuzzy


@@ -744,51 +744,14 @@ msgid ""
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
 "type=\"text/css\">\n"
 "p, li { white-space: pre-wrap; }\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:9pt; "
-"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;\">SUPER EVIL CATASTROPHIC ERROR!!11</p>\n"
-"<p style=\"-qt-paragraph-type:empty; 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;\"></p></body></html>"
-msgstr ""
-
-#. ts-context ChatMonitorSettingsPage
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35
-#, fuzzy
-msgid "Interface"
-msgstr ""
-
-#. ts-context ChatMonitorSettingsPage
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35
-#, fuzzy
-msgid "Chat Monitor"
-msgstr ""
-
-#. ts-context ChatMonitorSettingsPage
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:58
-#, fuzzy
-msgid "Opt In"
-msgstr ""
-
-#. ts-context ChatMonitorSettingsPage
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:59
-#, fuzzy
-msgid "Opt Out"
-msgstr ""
-
-#. ts-context ChatMonitorSettingsPage
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:236
-#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:133
-#, fuzzy
-msgid "Show:"
-msgstr ""
-
-#. ts-context ChatMonitorSettingsPage
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:239
-#, fuzzy
-msgid "Ignore:"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; "
+"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;\">SUPER EVIL CATASTROPHIC ERROR!!11</p>\n"
+"<p style=\"-qt-paragraph-type:empty; 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;\"></p></body></html>"

 msgstr ""
 
 #. ts-context ChatMonitorSettingsPage
 msgstr ""
 
 #. ts-context ChatMonitorSettingsPage


@@ -846,6 +809,13 @@ msgstr ""
 msgid "Move selected buffers to the right"
 msgstr ""
 
 msgid "Move selected buffers to the right"
 msgstr ""
 

+#. ts-context ChatMonitorSettingsPage
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:133
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:236
+#, fuzzy
+msgid "Show:"
+msgstr ""
+

 #. ts-context ChatMonitorSettingsPage
 #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:147
 #, fuzzy
 #. ts-context ChatMonitorSettingsPage
 #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:147
 #, fuzzy


@@ -865,6 +835,36 @@ msgstr ""
 msgid "Show own messages"
 msgstr ""
 
 msgid "Show own messages"
 msgstr ""
 

+#. ts-context ChatMonitorSettingsPage
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35
+#, fuzzy
+msgid "Interface"
+msgstr ""
+
+#. ts-context ChatMonitorSettingsPage
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35
+#, fuzzy
+msgid "Chat Monitor"
+msgstr ""
+
+#. ts-context ChatMonitorSettingsPage
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:58
+#, fuzzy
+msgid "Opt In"
+msgstr ""
+
+#. ts-context ChatMonitorSettingsPage
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:59
+#, fuzzy
+msgid "Opt Out"
+msgstr ""
+
+#. ts-context ChatMonitorSettingsPage
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:239
+#, fuzzy
+msgid "Ignore:"
+msgstr ""
+

 #. ts-context ChatMonitorView
 #: ../src/qtui/chatmonitorview.cpp:52
 #, fuzzy
 #. ts-context ChatMonitorView
 #: ../src/qtui/chatmonitorview.cpp:52
 #, fuzzy


@@ -890,7 +890,7 @@ msgid "Configure..."
 msgstr ""
 
 #. ts-context ChatScene
 msgstr ""
 
 #. ts-context ChatScene

-#: ../src/qtui/chatscene.cpp:604
+#: ../src/qtui/chatscene.cpp:589

 #, fuzzy
 msgid "Copy Selection"
 msgstr ""
 #, fuzzy
 msgid "Copy Selection"
 msgstr ""


@@ -932,18 +932,6 @@ msgstr ""
 msgid "ignore joins, parts, etc."
 msgstr ""
 
 msgid "ignore joins, parts, etc."
 msgstr ""
 

-#. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.cpp:27
-#, fuzzy
-msgid "Interface"
-msgstr ""
-
-#. ts-context ChatViewSettingsPage
-#: ../src/qtui/settingspages/chatviewsettingspage.cpp:27
-#, fuzzy
-msgid "Chat View"
-msgstr ""
-

 #. ts-context ChatViewSettingsPage
 #: ../src/qtui/settingspages/chatviewsettingspage.ui:14
 #, fuzzy
 #. ts-context ChatViewSettingsPage
 #: ../src/qtui/settingspages/chatviewsettingspage.ui:14
 #, fuzzy


@@ -1097,14 +1085,26 @@ msgstr ""
 msgid "Own messages:"
 msgstr ""
 
 msgid "Own messages:"
 msgstr ""
 

+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:27
+#, fuzzy
+msgid "Interface"
+msgstr ""
+
+#. ts-context ChatViewSettingsPage
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:27
+#, fuzzy
+msgid "Chat View"
+msgstr ""
+

 #. ts-context Client
 #. ts-context Client

-#: ../src/client/client.cpp:270
+#: ../src/client/client.cpp:265

 #, fuzzy
 msgid "Identity already exists in client!"
 msgstr ""
 
 #. ts-context Client
 #, fuzzy
 msgid "Identity already exists in client!"
 msgstr ""
 
 #. ts-context Client

-#: ../src/client/client.cpp:369
+#: ../src/client/client.cpp:365

 #, fuzzy
 msgid "All Chats"
 msgstr ""
 #, fuzzy
 msgid "All Chats"
 msgstr ""


@@ -1115,80 +1115,6 @@ msgstr ""
 msgid "Processed %1 messages in %2 seconds."
 msgstr ""
 
 msgid "Processed %1 messages in %2 seconds."
 msgstr ""
 

-#. ts-context ClientSyncer
-#: ../src/client/clientsyncer.cpp:52
-#, fuzzy
-msgid ""
-"The Quassel Core you try to connect to is too old! Please consider upgrading."
-msgstr ""
-
-#. ts-context ClientSyncer
-#: ../src/client/clientsyncer.cpp:77
-#, fuzzy
-msgid "<b>Invalid data received from core!</b><br>Disconnecting."
-msgstr ""
-
-#. ts-context ClientSyncer
-#: ../src/client/clientsyncer.cpp:102
-#, fuzzy
-msgid "No Host to connect to specified."
-msgstr ""
-
-#. ts-context ClientSyncer
-#: ../src/client/clientsyncer.cpp:111
-#, fuzzy
-msgid ""
-"<b>This client is built without SSL Support!</b><br />Disable the usage of "
-"SSL in the account settings."
-msgstr ""
-
-#. ts-context ClientSyncer
-#: ../src/client/clientsyncer.cpp:195
-#, fuzzy
-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 ""
-
-#. ts-context ClientSyncer
-#: ../src/client/clientsyncer.cpp:219
-#, fuzzy
-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 ""
-
-#. ts-context ClientSyncer
-#: ../src/client/clientsyncer.cpp:248
-#, fuzzy
-msgid "Logging in..."
-msgstr ""
-
-#. ts-context ClientSyncer
-#: ../src/client/clientsyncer.cpp:360
-#, fuzzy
-msgid "<b>Quassel Core Version %1</b><br>Built: %2<br>Up %3d%4h%5m (since %6)"
-msgstr ""
-
-#. ts-context ClientSyncer
-#: ../src/client/clientsyncer.cpp:404 ../src/client/clientsyncer.cpp:429
-#, fuzzy
-msgid "Cert Digest changed! was: %1"
-msgstr ""
-
-#. ts-context ConnectionSettingsPage
-#: ../src/qtui/settingspages/connectionsettingspage.cpp:27
-#, fuzzy
-msgid "Misc"
-msgstr ""
-
-#. ts-context ConnectionSettingsPage
-#: ../src/qtui/settingspages/connectionsettingspage.cpp:27
-#, fuzzy
-msgid "Connection"
-msgstr ""
-

 #. ts-context ConnectionSettingsPage
 #: ../src/qtui/settingspages/connectionsettingspage.ui:14
 #, fuzzy
 #. ts-context ConnectionSettingsPage
 #: ../src/qtui/settingspages/connectionsettingspage.ui:14
 #, fuzzy


@@ -1265,8 +1191,20 @@ msgstr ""
 msgid "Minimum delay between requests:"
 msgstr ""
 
 msgid "Minimum delay between requests:"
 msgstr ""
 

+#. ts-context ConnectionSettingsPage
+#: ../src/qtui/settingspages/connectionsettingspage.cpp:27
+#, fuzzy
+msgid "Misc"
+msgstr ""
+
+#. ts-context ConnectionSettingsPage
+#: ../src/qtui/settingspages/connectionsettingspage.cpp:27
+#, fuzzy
+msgid "Connection"
+msgstr ""
+

 #. ts-context ContentsChatItem
 #. ts-context ContentsChatItem

-#: ../src/qtui/chatitem.cpp:592
+#: ../src/qtui/chatitem.cpp:594

 #, fuzzy
 msgid "Copy Link Address"
 msgstr ""
 #, fuzzy
 msgid "Copy Link Address"
 msgstr ""


@@ -1701,130 +1639,190 @@ msgstr ""
 msgid "Could not find a session for client:"
 msgstr ""
 
 msgid "Could not find a session for client:"
 msgstr ""
 

-#. ts-context CoreAccountEditDlg
-#: ../src/qtui/coreconnectdlg.cpp:522
+#. ts-context CoreAccount
+#: ../src/client/coreaccount.h:39

 #, fuzzy
 #, fuzzy

-msgid "Add Core Account"
+msgid "Internal Core"

 msgstr ""
 
 #. ts-context CoreAccountEditDlg
 msgstr ""
 
 #. ts-context CoreAccountEditDlg

-#: ../src/qtui/ui/coreaccounteditdlg.ui:13
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:14
+#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:229

 #, fuzzy
 msgid "Edit Core Account"
 msgstr ""
 
 #. ts-context CoreAccountEditDlg
 #, fuzzy
 msgid "Edit Core Account"
 msgstr ""
 
 #. ts-context CoreAccountEditDlg

-#: ../src/qtui/ui/coreaccounteditdlg.ui:21
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:20

 #, fuzzy
 msgid "Account Details"
 msgstr ""
 
 #. ts-context CoreAccountEditDlg
 #, fuzzy
 msgid "Account Details"
 msgstr ""
 
 #. ts-context CoreAccountEditDlg

-#: ../src/qtui/ui/coreaccounteditdlg.ui:29
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:26

 #, fuzzy
 msgid "Account Name:"
 msgstr ""
 
 #. ts-context CoreAccountEditDlg
 #, fuzzy
 msgid "Account Name:"
 msgstr ""
 
 #. ts-context CoreAccountEditDlg

-#: ../src/qtui/ui/coreaccounteditdlg.ui:36
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:33

 #, fuzzy
 msgid "Local Core"
 msgstr ""
 
 #. ts-context CoreAccountEditDlg
 #, fuzzy
 msgid "Local Core"
 msgstr ""
 
 #. ts-context CoreAccountEditDlg

-#: ../src/qtui/ui/coreaccounteditdlg.ui:47
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:40
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:173

 #, fuzzy
 msgid "Hostname:"
 msgstr ""
 
 #. ts-context CoreAccountEditDlg
 #, fuzzy
 msgid "Hostname:"
 msgstr ""
 
 #. ts-context CoreAccountEditDlg

-#: ../src/qtui/ui/coreaccounteditdlg.ui:54
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:47
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:180
+#, fuzzy
+msgid "localhost"
+msgstr ""
+
+#. ts-context CoreAccountEditDlg
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:54
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:187

 #, fuzzy
 msgid "Port:"
 msgstr ""
 
 #. ts-context CoreAccountEditDlg
 #, fuzzy
 msgid "Port:"
 msgstr ""
 
 #. ts-context CoreAccountEditDlg

-#: ../src/qtui/ui/coreaccounteditdlg.ui:61
-#: ../src/qtui/ui/coreaccounteditdlg.ui:144
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:93
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:226

 #, fuzzy
 #, fuzzy

-msgid "localhost"
+msgid "User:"
+msgstr ""
+
+#. ts-context CoreAccountEditDlg
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:103
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:236
+#, fuzzy
+msgid "Password:"

 msgstr ""
 
 #. ts-context CoreAccountEditDlg
 msgstr ""
 
 #. ts-context CoreAccountEditDlg

-#: ../src/qtui/ui/coreaccounteditdlg.ui:81
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:117

 #, fuzzy
 #, fuzzy

-msgid "Use secure connection (SSL)"
+msgid "Remember"

 msgstr ""
 
 #. ts-context CoreAccountEditDlg
 msgstr ""
 
 #. ts-context CoreAccountEditDlg

-#: ../src/qtui/ui/coreaccounteditdlg.ui:97
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:127

 #, fuzzy
 #, fuzzy

-msgid "Use a proxy:"
+msgid "Use a Proxy"

 msgstr ""
 
 #. ts-context CoreAccountEditDlg
 msgstr ""
 
 #. ts-context CoreAccountEditDlg

-#: ../src/qtui/ui/coreaccounteditdlg.ui:109
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:139

 #, fuzzy
 msgid "Proxy Type:"
 msgstr ""
 
 #. ts-context CoreAccountEditDlg
 #, fuzzy
 msgid "Proxy Type:"
 msgstr ""
 
 #. ts-context CoreAccountEditDlg

-#: ../src/qtui/ui/coreaccounteditdlg.ui:117
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:147

 #, fuzzy
 msgid "Socks 5"
 msgstr ""
 
 #. ts-context CoreAccountEditDlg
 #, fuzzy
 msgid "Socks 5"
 msgstr ""
 
 #. ts-context CoreAccountEditDlg

-#: ../src/qtui/ui/coreaccounteditdlg.ui:122
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:152

 #, fuzzy
 msgid "HTTP"
 msgstr ""
 
 #. ts-context CoreAccountEditDlg
 #, fuzzy
 msgid "HTTP"
 msgstr ""
 
 #. ts-context CoreAccountEditDlg

-#: ../src/qtui/ui/coreaccounteditdlg.ui:130
+#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:231

 #, fuzzy
 #, fuzzy

-msgid "Proxy Host:"
+msgid "Add Core Account"

 msgstr ""
 
 msgstr ""
 

-#. ts-context CoreAccountEditDlg
-#: ../src/qtui/ui/coreaccounteditdlg.ui:137
+#. ts-context CoreAccountModel
+#: ../src/client/coreaccountmodel.cpp:62

 #, fuzzy
 #, fuzzy

-msgid "Proxy Port:"
+msgid "Internal Core"

 msgstr ""
 
 msgstr ""
 

-#. ts-context CoreAccountEditDlg
-#: ../src/qtui/ui/coreaccounteditdlg.ui:170
+#. ts-context CoreAccountSettingsPage
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:20

 #, fuzzy
 #, fuzzy

-msgid "Proxy Username:"
+msgid "Connect to Quassel Core"

 msgstr ""
 
 msgstr ""
 

-#. ts-context CoreAccountEditDlg
-#: ../src/qtui/ui/coreaccounteditdlg.ui:180
+#. ts-context CoreAccountSettingsPage
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:30
+#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:29

 #, fuzzy
 #, fuzzy

-msgid "Proxy Password:"
+msgid "Core Accounts"
+msgstr ""
+
+#. ts-context CoreAccountSettingsPage
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:45
+#, fuzzy
+msgid "Edit..."
+msgstr ""
+
+#. ts-context CoreAccountSettingsPage
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:56
+#, fuzzy
+msgid "Add..."
+msgstr ""
+
+#. ts-context CoreAccountSettingsPage
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:67
+#, fuzzy
+msgid "Delete"
+msgstr ""
+
+#. ts-context CoreAccountSettingsPage
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:96
+#, fuzzy
+msgid "Automatically connect on startup"
+msgstr ""
+
+#. ts-context CoreAccountSettingsPage
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:136
+#, fuzzy
+msgid "Connect to last account used"
+msgstr ""
+
+#. ts-context CoreAccountSettingsPage
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:148
+#, fuzzy
+msgid "Always connect to"
+msgstr ""
+
+#. ts-context CoreAccountSettingsPage
+#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:29
+#, fuzzy
+msgid "Misc"

 msgstr ""
 
 #. ts-context CoreConfigWizard
 msgstr ""
 
 #. ts-context CoreConfigWizard

-#: ../src/qtui/coreconfigwizard.cpp:60
+#: ../src/qtui/coreconfigwizard.cpp:69

 #, fuzzy
 msgid "Core Configuration Wizard"
 msgstr ""
 
 #. ts-context CoreConfigWizard
 #, fuzzy
 msgid "Core Configuration Wizard"
 msgstr ""
 
 #. ts-context CoreConfigWizard

-#: ../src/qtui/coreconfigwizard.cpp:82
+#: ../src/qtui/coreconfigwizard.cpp:97

 #, fuzzy
 msgid "Your core has been successfully configured. Logging you in..."
 msgstr ""
 
 #. ts-context CoreConfigWizard
 #, fuzzy
 msgid "Your core has been successfully configured. Logging you in..."
 msgstr ""
 
 #. ts-context CoreConfigWizard

-#: ../src/qtui/coreconfigwizard.cpp:93
+#: ../src/qtui/coreconfigwizard.cpp:104

 #, fuzzy
 msgid ""
 "Core configuration failed:<br><b>%1</b><br>Press <em>Next</em> to start over."
 msgstr ""
 
 #. ts-context CoreConfigWizard
 #, fuzzy
 msgid ""
 "Core configuration failed:<br><b>%1</b><br>Press <em>Next</em> to start over."
 msgstr ""
 
 #. ts-context CoreConfigWizard

-#: ../src/qtui/coreconfigwizard.cpp:108
+#: ../src/qtui/coreconfigwizard.cpp:119

 #, fuzzy
 msgid ""
 "Your are now logged into your freshly configured Quassel Core!<br>Please "
 #, fuzzy
 msgid ""
 "Your are now logged into your freshly configured Quassel Core!<br>Please "


@@ -1832,57 +1830,43 @@ msgid ""
 msgstr ""
 
 #. ts-context CoreConfigWizardAdminUserPage
 msgstr ""
 
 #. ts-context CoreConfigWizardAdminUserPage

-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:13
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:14

 #, fuzzy
 msgid "Form"
 msgstr ""
 
 #. ts-context CoreConfigWizardAdminUserPage
 #, fuzzy
 msgid "Form"
 msgstr ""
 
 #. ts-context CoreConfigWizardAdminUserPage

-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:21
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:22

 #, fuzzy
 msgid "Username:"
 msgstr ""
 
 #. ts-context CoreConfigWizardAdminUserPage
 #, fuzzy
 msgid "Username:"
 msgstr ""
 
 #. ts-context CoreConfigWizardAdminUserPage

-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:31
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:32

 #, fuzzy
 msgid "Password:"
 msgstr ""
 
 #. ts-context CoreConfigWizardAdminUserPage
 #, fuzzy
 msgid "Password:"
 msgstr ""
 
 #. ts-context CoreConfigWizardAdminUserPage

-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:45
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:46

 #, fuzzy
 msgid "Repeat password:"
 msgstr ""
 
 #. ts-context CoreConfigWizardAdminUserPage
 #, fuzzy
 msgid "Repeat password:"
 msgstr ""
 
 #. ts-context CoreConfigWizardAdminUserPage

-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:59
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:60

 #, fuzzy
 msgid "Remember password"
 msgstr ""
 
 #. ts-context CoreConfigWizardAdminUserPage
 #, fuzzy
 msgid "Remember password"
 msgstr ""
 
 #. ts-context CoreConfigWizardAdminUserPage

-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:68
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:69

 #, fuzzy
 msgid ""
 #, fuzzy
 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 ""
 
 #. ts-context CoreConfigWizardIntroPage
 msgstr ""
 
 #. ts-context CoreConfigWizardIntroPage


@@ -1898,13 +1882,13 @@ msgid "This wizard will guide you through the setup of your Quassel Core."
 msgstr ""
 
 #. ts-context CoreConfigWizardPages::AdminUserPage
 msgstr ""
 
 #. ts-context CoreConfigWizardPages::AdminUserPage

-#: ../src/qtui/coreconfigwizard.cpp:140
+#: ../src/qtui/coreconfigwizard.cpp:150

 #, fuzzy
 msgid "Create Admin User"
 msgstr ""
 
 #. ts-context CoreConfigWizardPages::AdminUserPage
 #, fuzzy
 msgid "Create Admin User"
 msgstr ""
 
 #. ts-context CoreConfigWizardPages::AdminUserPage

-#: ../src/qtui/coreconfigwizard.cpp:141
+#: ../src/qtui/coreconfigwizard.cpp:151

 #, fuzzy
 msgid ""
 "First, we will create a user on the core. This first user will have "
 #, fuzzy
 msgid ""
 "First, we will create a user on the core. This first user will have "


@@ -1912,19 +1896,19 @@ msgid ""
 msgstr ""
 
 #. ts-context CoreConfigWizardPages::IntroPage
 msgstr ""
 
 #. ts-context CoreConfigWizardPages::IntroPage

-#: ../src/qtui/coreconfigwizard.cpp:125
+#: ../src/qtui/coreconfigwizard.cpp:135

 #, fuzzy
 msgid "Introduction"
 msgstr ""
 
 #. ts-context CoreConfigWizardPages::StorageSelectionPage
 #, fuzzy
 msgid "Introduction"
 msgstr ""
 
 #. ts-context CoreConfigWizardPages::StorageSelectionPage

-#: ../src/qtui/coreconfigwizard.cpp:172
+#: ../src/qtui/coreconfigwizard.cpp:182

 #, fuzzy
 msgid "Select Storage Backend"
 msgstr ""
 
 #. ts-context CoreConfigWizardPages::StorageSelectionPage
 #, fuzzy
 msgid "Select Storage Backend"
 msgstr ""
 
 #. ts-context CoreConfigWizardPages::StorageSelectionPage

-#: ../src/qtui/coreconfigwizard.cpp:173
+#: ../src/qtui/coreconfigwizard.cpp:183

 #, fuzzy
 msgid ""
 "Please select a database backend for the Quassel Core storage to store the "
 #, fuzzy
 msgid ""
 "Please select a database backend for the Quassel Core storage to store the "


@@ -1932,19 +1916,19 @@ msgid ""
 msgstr ""
 
 #. ts-context CoreConfigWizardPages::StorageSelectionPage
 msgstr ""
 
 #. ts-context CoreConfigWizardPages::StorageSelectionPage

-#: ../src/qtui/coreconfigwizard.cpp:267
+#: ../src/qtui/coreconfigwizard.cpp:277

 #, fuzzy
 msgid "Connection Properties"
 msgstr ""
 
 #. ts-context CoreConfigWizardPages::SyncPage
 #, fuzzy
 msgid "Connection Properties"
 msgstr ""
 
 #. ts-context CoreConfigWizardPages::SyncPage

-#: ../src/qtui/coreconfigwizard.cpp:307
+#: ../src/qtui/coreconfigwizard.cpp:317

 #, fuzzy
 msgid "Storing Your Settings"
 msgstr ""
 
 #. ts-context CoreConfigWizardPages::SyncPage
 #, fuzzy
 msgid "Storing Your Settings"
 msgstr ""
 
 #. ts-context CoreConfigWizardPages::SyncPage

-#: ../src/qtui/coreconfigwizard.cpp:308
+#: ../src/qtui/coreconfigwizard.cpp:318

 #, fuzzy
 msgid ""
 "Your settings are now stored in the core, and you will be logged in "
 #, fuzzy
 msgid ""
 "Your settings are now stored in the core, and you will be logged in "


@@ -2017,239 +2001,182 @@ msgstr ""
 msgid "Please wait while your settings are being transmitted to the core..."
 msgstr ""
 
 msgid "Please wait while your settings are being transmitted to the core..."
 msgstr ""
 

-#. ts-context CoreConnectDlg
-#: ../src/qtui/coreconnectdlg.cpp:190
-#, fuzzy
-msgid "Remove Account Settings"
-msgstr ""
-
-#. ts-context CoreConnectDlg
-#: ../src/qtui/coreconnectdlg.cpp:191
-#, fuzzy
-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 ""
-
-#. ts-context CoreConnectDlg
-#: ../src/qtui/coreconnectdlg.cpp:242
-#, fuzzy
-msgid "Connect to %1"
-msgstr ""
-
-#. ts-context CoreConnectDlg
-#: ../src/qtui/coreconnectdlg.cpp:259
-#, fuzzy
-msgid "<div style=color:red;>Connection to %1 failed!</div>"
-msgstr ""
-
-#. ts-context CoreConnectDlg
-#: ../src/qtui/coreconnectdlg.cpp:272
-#, fuzzy
-msgid "<div>Errors occurred while connecting to \"%1\":</div>"
-msgstr ""
-
-#. ts-context CoreConnectDlg
-#: ../src/qtui/coreconnectdlg.cpp:309
-#, fuzzy
-msgid "Not connected to %1."
-msgstr ""
-
-#. ts-context CoreConnectDlg
-#: ../src/qtui/coreconnectdlg.cpp:310
-#, fuzzy
-msgid "Looking up %1..."
-msgstr ""
-
-#. ts-context CoreConnectDlg
-#: ../src/qtui/coreconnectdlg.cpp:311
+#. ts-context CoreConnectAuthDlg
+#: ../src/qtui/ui/coreconnectauthdlg.ui:14

 #, fuzzy
 #, fuzzy

-msgid "Connecting to %1..."
+msgid "Authentication Required"

 msgstr ""
 
 msgstr ""
 

-#. ts-context CoreConnectDlg
-#: ../src/qtui/coreconnectdlg.cpp:312
+#. ts-context CoreConnectAuthDlg
+#: ../src/qtui/ui/coreconnectauthdlg.ui:20

 #, fuzzy
 #, fuzzy

-msgid "Connected to %1"
+msgid "Please enter your account data:"

 msgstr ""
 
 msgstr ""
 

-#. ts-context CoreConnectDlg
-#: ../src/qtui/coreconnectdlg.cpp:313
+#. ts-context CoreConnectAuthDlg
+#: ../src/qtui/ui/coreconnectauthdlg.ui:35

 #, fuzzy
 #, fuzzy

-msgid "Unknown connection state to %1"
+msgid "Password:"

 msgstr ""
 
 msgstr ""
 

-#. ts-context CoreConnectDlg
-#: ../src/qtui/coreconnectdlg.cpp:365
+#. ts-context CoreConnectAuthDlg
+#: ../src/qtui/ui/coreconnectauthdlg.ui:49

 #, fuzzy
 #, fuzzy

-msgid "Logging in..."
+msgid "Username:"

 msgstr ""
 
 msgstr ""
 

-#. ts-context CoreConnectDlg
-#: ../src/qtui/coreconnectdlg.cpp:392 ../src/qtui/coreconnectdlg.cpp:450
-#: ../src/qtui/ui/coreconnectdlg.ui:263
+#. ts-context CoreConnectAuthDlg
+#: ../src/qtui/ui/coreconnectauthdlg.ui:58

 #, fuzzy
 #, fuzzy

-msgid "Login"
+msgid "Remember password"

 msgstr ""
 
 msgstr ""
 

-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:20 ../src/qtui/ui/coreconnectdlg.ui:46
+#. ts-context CoreConnectAuthDlg
+#: ../src/qtui/coreconnectdlg.cpp:75

 #, fuzzy
 #, fuzzy

-msgid "Connect to Quassel Core"
+msgid "Please enter your credentials for %1:"

 msgstr ""
 
 #. ts-context CoreConnectDlg
 msgstr ""
 
 #. ts-context CoreConnectDlg

-#: ../src/qtui/ui/coreconnectdlg.ui:61
+#: ../src/qtui/coreconnectdlg.cpp:40

 #, fuzzy
 #, fuzzy

-msgid "Edit..."
+msgid "Connect to Core"

 msgstr ""
 
 msgstr ""
 

-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:72
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:105

 #, fuzzy
 #, fuzzy

-msgid "Add..."
+msgid "Disconnected from core."

 msgstr ""
 
 msgstr ""
 

-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:83
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:123 ../src/client/coreconnection.cpp:232

 #, fuzzy
 #, fuzzy

-msgid "Delete"
+msgid "Disconnected"

 msgstr ""
 
 msgstr ""
 

-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:107
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:126

 #, fuzzy
 #, fuzzy

-msgid "Use internal core"
+msgid "Looking up %1..."

 msgstr ""
 
 msgstr ""
 

-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:121
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:129 ../src/client/coreconnection.cpp:331

 #, fuzzy
 #, fuzzy

-msgid "Always use this account"
+msgid "Connecting to %1..."

 msgstr ""
 
 msgstr ""
 

-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:150
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:132 ../src/client/coreconnection.cpp:452

 #, fuzzy
 #, fuzzy

-msgid "Initializing your connection"
+msgid "Connected to %1"

 msgstr ""
 
 msgstr ""
 

-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:168
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:135

 #, fuzzy
 #, fuzzy

-msgid "Connected to apollo.mindpool.net."
+msgid "Disconnecting from %1..."

 msgstr ""
 
 msgstr ""
 

-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:200
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:193

 #, fuzzy
 msgid ""
 #, fuzzy
 msgid ""

-"THIS IS A PLACEHOLDER\n"
-"TO\n"
-"RESERVE\n"
-"SOME SPACE"
-msgstr ""
-
-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:271
-#, fuzzy
-msgid "User:"
+"The Quassel Core you try to connect to is too old! Please consider upgrading."

 msgstr ""
 
 msgstr ""
 

-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:285
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:221

 #, fuzzy
 #, fuzzy

-msgid "Password:"
+msgid "Invalid data received from core"

 msgstr ""
 
 msgstr ""
 

-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:299
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:308 ../src/client/coreconnection.cpp:390
+#: ../src/client/coreconnection.cpp:435

 #, fuzzy
 #, fuzzy

-msgid "Remember"
+msgid "Unencrypted connection canceled"

 msgstr ""
 
 msgstr ""
 

-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:333
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:338

 #, fuzzy
 #, fuzzy

-msgid "View SSL Certificate"
+msgid "Synchronizing to core..."

 msgstr ""
 
 msgstr ""
 

-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:370
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:359

 #, fuzzy
 #, fuzzy

-msgid "Add to known hosts"
+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 ""
 
 msgstr ""
 

-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:390
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:471

 #, fuzzy
 #, fuzzy

-msgid "Continue connection"
+msgid "Logging in..."

 msgstr ""
 
 msgstr ""
 

-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:425
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:476

 #, fuzzy
 #, fuzzy

-msgid "Configure your Quassel Core"
+msgid "Login canceled"

 msgstr ""
 
 msgstr ""
 

-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:431
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:499

 #, fuzzy
 #, fuzzy

-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."
+msgid "Receiving session state"

 msgstr ""
 
 msgstr ""
 

-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:459
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:501

 #, fuzzy
 #, fuzzy

-msgid "Launch Wizard"
+msgid "Synchronizing to %1..."

 msgstr ""
 
 msgstr ""
 

-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:505
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:522

 #, fuzzy
 #, fuzzy

-msgid "Initializing your session..."
+msgid "Receiving network states"

 msgstr ""
 
 msgstr ""
 

-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:513
+#. ts-context CoreConnection
+#: ../src/client/coreconnection.cpp:571

 #, fuzzy
 #, fuzzy

-msgid ""
-"<b>Please be patient while your client synchronizes with the Quassel "
-"Core!</b>"
+msgid "Synchronized to %1"

 msgstr ""
 
 msgstr ""
 

-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:528
+#. ts-context CoreConnectionStatusWidget
+#: ../src/qtui/ui/coreconnectionstatuswidget.ui:14

 #, fuzzy
 #, fuzzy

-msgid "Session state:"
+msgid "Form"

 msgstr ""
 
 msgstr ""
 

-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:545
+#. ts-context CoreConnectionStatusWidget
+#: ../src/qtui/ui/coreconnectionstatuswidget.ui:32

 #, fuzzy
 #, fuzzy

-msgid "Network states:"
+msgid "Message"

 msgstr ""
 
 msgstr ""
 

-#. ts-context CoreConnectDlg
-#: ../src/qtui/ui/coreconnectdlg.ui:558
+#. ts-context CoreConnectionStatusWidget
+#: ../src/qtui/coreconnectionstatuswidget.cpp:61

 #, fuzzy
 #, fuzzy

-msgid "0/0"
+msgid "(Lag: %1 ms)"

 msgstr ""
 
 msgstr ""
 

-#. ts-context CoreInfoDlg
-#: ../src/qtui/coreinfodlg.cpp:53
+#. ts-context CoreConnectionStatusWidget
+#: ../src/qtui/coreconnectionstatuswidget.cpp:74

 #, fuzzy
 #, fuzzy

-msgid "%n Day(s)"
-msgid_plural "%n Day(s)"
-msgstr[0] ""
+msgid "The connection to your core is encrypted with SSL."
+msgstr ""

 
 

-#. ts-context CoreInfoDlg
-#: ../src/qtui/coreinfodlg.cpp:54
+#. ts-context CoreConnectionStatusWidget
+#: ../src/qtui/coreconnectionstatuswidget.cpp:77

 #, fuzzy
 #, fuzzy

-msgid " %1:%2:%3 (since %4)"
+msgid "The connection to your core is not encrypted."

 msgstr ""
 
 #. ts-context CoreInfoDlg
 msgstr ""
 
 #. ts-context CoreInfoDlg


@@ -2312,6 +2239,19 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
 msgid "Close"
 msgstr ""
 

+#. ts-context CoreInfoDlg
+#: ../src/qtui/coreinfodlg.cpp:53
+#, fuzzy
+msgid "%n Day(s)"
+msgid_plural "%n Day(s)"
+msgstr[0] ""
+
+#. ts-context CoreInfoDlg
+#: ../src/qtui/coreinfodlg.cpp:54
+#, fuzzy
+msgid " %1:%2:%3 (since %4)"
+msgstr ""
+

 #. ts-context CoreNetwork
 #: ../src/core/corenetwork.cpp:153
 #, fuzzy
 #. ts-context CoreNetwork
 #: ../src/core/corenetwork.cpp:153
 #, fuzzy


@@ -2442,6 +2382,24 @@ msgstr ""
 msgid "Received unknown CTCP %1 by %2"
 msgstr ""
 
 msgid "Received unknown CTCP %1 by %2"
 msgstr ""
 

+#. ts-context DebugBufferViewOverlay
+#: ../src/qtui/ui/debugbufferviewoverlay.ui:13
+#, fuzzy
+msgid "Debug BufferView Overlay"
+msgstr ""
+
+#. ts-context DebugBufferViewOverlay
+#: ../src/qtui/ui/debugbufferviewoverlay.ui:26
+#, fuzzy
+msgid "Overlay View"
+msgstr ""
+
+#. ts-context DebugBufferViewOverlay
+#: ../src/qtui/ui/debugbufferviewoverlay.ui:39
+#, fuzzy
+msgid "Overlay Properties"
+msgstr ""
+

 #. ts-context DebugBufferViewOverlay
 #: ../src/qtui/debugbufferviewoverlay.cpp:50
 #, fuzzy
 #. ts-context DebugBufferViewOverlay
 #: ../src/qtui/debugbufferviewoverlay.cpp:50
 #, fuzzy


@@ -2508,24 +2466,6 @@ msgstr ""
 msgid "Is initialized:"
 msgstr ""
 
 msgid "Is initialized:"
 msgstr ""
 

-#. ts-context DebugBufferViewOverlay
-#: ../src/qtui/ui/debugbufferviewoverlay.ui:13
-#, fuzzy
-msgid "Debug BufferView Overlay"
-msgstr ""
-
-#. ts-context DebugBufferViewOverlay
-#: ../src/qtui/ui/debugbufferviewoverlay.ui:26
-#, fuzzy
-msgid "Overlay View"
-msgstr ""
-
-#. ts-context DebugBufferViewOverlay
-#: ../src/qtui/ui/debugbufferviewoverlay.ui:39
-#, fuzzy
-msgid "Overlay Properties"
-msgstr ""
-

 #. ts-context DebugConsole
 #: ../src/qtui/ui/debugconsole.ui:13
 #, fuzzy
 #. ts-context DebugConsole
 #: ../src/qtui/ui/debugconsole.ui:13
 #, fuzzy


@@ -2659,12 +2599,6 @@ msgstr ""
 msgid "Choose..."
 msgstr ""
 
 msgid "Choose..."
 msgstr ""
 

-#. ts-context GeneralSettingsPage
-#: ../src/qtui/settingspages/generalsettingspage.cpp:28
-#, fuzzy
-msgid "Misc"
-msgstr ""
-

 #. ts-context GeneralSettingsPage
 #: ../src/qtui/settingspages/generalsettingspage.ui:14
 #, fuzzy
 #. ts-context GeneralSettingsPage
 #: ../src/qtui/settingspages/generalsettingspage.ui:14
 #, fuzzy


@@ -2737,29 +2671,10 @@ msgstr ""
 msgid "Errors:"
 msgstr ""
 
 msgid "Errors:"
 msgstr ""
 

-#. ts-context HighlightSettingsPage
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:30
-#, fuzzy
-msgid "Interface"
-msgstr ""
-
-#. ts-context HighlightSettingsPage
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:30
-#: ../src/qtui/settingspages/highlightsettingspage.ui:32
-#, fuzzy
-msgid "Highlight"
-msgstr ""
-
-#. ts-context HighlightSettingsPage
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:159
-#, fuzzy
-msgid "this shouldn't be empty"
-msgstr ""
-
-#. ts-context HighlightSettingsPage
-#: ../src/qtui/settingspages/highlightsettingspage.h:45
+#. ts-context GeneralSettingsPage
+#: ../src/qtui/settingspages/generalsettingspage.cpp:28

 #, fuzzy
 #, fuzzy

-msgid "highlight rule"
+msgid "Misc"

 msgstr ""
 
 #. ts-context HighlightSettingsPage
 msgstr ""
 
 #. ts-context HighlightSettingsPage


@@ -2774,6 +2689,13 @@ msgstr ""
 msgid "Custom Highlights"
 msgstr ""
 
 msgid "Custom Highlights"
 msgstr ""
 

+#. ts-context HighlightSettingsPage
+#: ../src/qtui/settingspages/highlightsettingspage.ui:32
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:30
+#, fuzzy
+msgid "Highlight"
+msgstr ""
+

 #. ts-context HighlightSettingsPage
 #: ../src/qtui/settingspages/highlightsettingspage.ui:37
 #, fuzzy
 #. ts-context HighlightSettingsPage
 #: ../src/qtui/settingspages/highlightsettingspage.ui:37
 #, fuzzy


@@ -2834,6 +2756,56 @@ msgstr ""
 msgid "Case sensitive"
 msgstr ""
 
 msgid "Case sensitive"
 msgstr ""
 

+#. ts-context HighlightSettingsPage
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:30
+#, fuzzy
+msgid "Interface"
+msgstr ""
+
+#. ts-context HighlightSettingsPage
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:159
+#, fuzzy
+msgid "this shouldn't be empty"
+msgstr ""
+
+#. ts-context HighlightSettingsPage
+#: ../src/qtui/settingspages/highlightsettingspage.h:45
+#, fuzzy
+msgid "highlight rule"
+msgstr ""
+
+#. ts-context IdentitiesSettingsPage
+#: ../src/qtui/settingspages/identitiessettingspage.ui:31
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:322
+#, fuzzy
+msgid "Rename Identity"
+msgstr ""
+
+#. ts-context IdentitiesSettingsPage
+#: ../src/qtui/settingspages/identitiessettingspage.ui:34
+#: ../src/qtui/settingspages/identitiessettingspage.ui:77
+#, fuzzy
+msgid "..."
+msgstr ""
+
+#. ts-context IdentitiesSettingsPage
+#: ../src/qtui/settingspages/identitiessettingspage.ui:51
+#, fuzzy
+msgid "Add Identity"
+msgstr ""
+
+#. ts-context IdentitiesSettingsPage
+#: ../src/qtui/settingspages/identitiessettingspage.ui:54
+#, fuzzy
+msgid "Add..."
+msgstr ""
+
+#. ts-context IdentitiesSettingsPage
+#: ../src/qtui/settingspages/identitiessettingspage.ui:74
+#, fuzzy
+msgid "Remove Identity"
+msgstr ""
+

 #. ts-context IdentitiesSettingsPage
 #: ../src/qtui/settingspages/identitiessettingspage.cpp:31
 #, fuzzy
 #. ts-context IdentitiesSettingsPage
 #: ../src/qtui/settingspages/identitiessettingspage.cpp:31
 #, fuzzy


@@ -2902,44 +2874,12 @@ msgstr ""
 msgid "Do you really want to delete identity \"%1\"?"
 msgstr ""
 
 msgid "Do you really want to delete identity \"%1\"?"
 msgstr ""
 

-#. ts-context IdentitiesSettingsPage
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:322
-#: ../src/qtui/settingspages/identitiessettingspage.ui:31
-#, fuzzy
-msgid "Rename Identity"
-msgstr ""
-

 #. ts-context IdentitiesSettingsPage
 #: ../src/qtui/settingspages/identitiessettingspage.cpp:323
 #, fuzzy
 msgid "Please enter a new name for the identity \"%1\"!"
 msgstr ""
 
 #. ts-context IdentitiesSettingsPage
 #: ../src/qtui/settingspages/identitiessettingspage.cpp:323
 #, fuzzy
 msgid "Please enter a new name for the identity \"%1\"!"
 msgstr ""
 

-#. ts-context IdentitiesSettingsPage
-#: ../src/qtui/settingspages/identitiessettingspage.ui:34
-#: ../src/qtui/settingspages/identitiessettingspage.ui:77
-#, fuzzy
-msgid "..."
-msgstr ""
-
-#. ts-context IdentitiesSettingsPage
-#: ../src/qtui/settingspages/identitiessettingspage.ui:51
-#, fuzzy
-msgid "Add Identity"
-msgstr ""
-
-#. ts-context IdentitiesSettingsPage
-#: ../src/qtui/settingspages/identitiessettingspage.ui:54
-#, fuzzy
-msgid "Add..."
-msgstr ""
-
-#. ts-context IdentitiesSettingsPage
-#: ../src/qtui/settingspages/identitiessettingspage.ui:74
-#, fuzzy
-msgid "Remove Identity"
-msgstr ""
-

 #. ts-context Identity
 #: ../src/common/identity.cpp:122
 #, fuzzy
 #. ts-context Identity
 #: ../src/common/identity.cpp:122
 #, fuzzy


@@ -2961,89 +2901,25 @@ msgstr ""
 #. ts-context Identity
 #: ../src/common/identity.cpp:160
 #, fuzzy
 #. ts-context Identity
 #: ../src/common/identity.cpp:160
 #, fuzzy

-msgid "Not here. No, really. not here!"
-msgstr ""
-
-#. ts-context Identity
-#: ../src/common/identity.cpp:163
-#, fuzzy
-msgid "All Quassel clients vanished from the face of the earth..."
-msgstr ""
-
-#. ts-context Identity
-#: ../src/common/identity.cpp:166
-#, fuzzy
-msgid "Kindergarten is elsewhere!"
-msgstr ""
-
-#. ts-context Identity
-#: ../src/common/identity.cpp:167 ../src/common/identity.cpp:168
-#, fuzzy
-msgid "http://quassel-irc.org - Chat comfortably. Anywhere."
-msgstr ""
-
-#. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.cpp:219
-#: ../src/qtui/settingspages/identityeditwidget.ui:398
-#, fuzzy
-msgid "Advanced"
-msgstr ""
-
-#. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.cpp:290
-#, fuzzy
-msgid "Load a Key"
-msgstr ""
-
-#. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.cpp:317
-#: ../src/qtui/settingspages/identityeditwidget.cpp:328
-#: ../src/qtui/settingspages/identityeditwidget.ui:604
-#, fuzzy
-msgid "No Key loaded"
-msgstr ""
-
-#. 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
-#, fuzzy
-msgid "Load"
-msgstr ""
-
-#. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.cpp:322
-#, fuzzy
-msgid "RSA"
-msgstr ""
-
-#. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.cpp:325
-#, fuzzy
-msgid "DSA"
+msgid "Not here. No, really. not here!"

 msgstr ""
 
 msgstr ""
 

-#. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.cpp:330
-#: ../src/qtui/settingspages/identityeditwidget.cpp:369
+#. ts-context Identity
+#: ../src/common/identity.cpp:163

 #, fuzzy
 #, fuzzy

-msgid "Clear"
+msgid "All Quassel clients vanished from the face of the earth..."

 msgstr ""
 
 msgstr ""
 

-#. ts-context IdentityEditWidget
-#: ../src/qtui/settingspages/identityeditwidget.cpp:340
+#. ts-context Identity
+#: ../src/common/identity.cpp:166

 #, fuzzy
 #, fuzzy

-msgid "Load a Certificate"
+msgid "Kindergarten is elsewhere!"

 msgstr ""
 
 msgstr ""
 

-#. 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
+#. ts-context Identity
+#: ../src/common/identity.cpp:167 ../src/common/identity.cpp:168

 #, fuzzy
 #, fuzzy

-msgid "No Certificate loaded"
+msgid "http://quassel-irc.org - Chat comfortably. Anywhere."

 msgstr ""
 
 #. ts-context IdentityEditWidget
 msgstr ""
 
 #. ts-context IdentityEditWidget


@@ -3199,6 +3075,13 @@ msgstr ""
 msgid "minutes of being idle"
 msgstr ""
 
 msgid "minutes of being idle"
 msgstr ""
 

+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:398
+#: ../src/qtui/settingspages/identityeditwidget.cpp:219
+#, fuzzy
+msgid "Advanced"
+msgstr ""
+

 #. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:406
 #, fuzzy
 #. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:406
 #, fuzzy


@@ -3272,6 +3155,23 @@ msgstr ""
 msgid "Key Type:"
 msgstr ""
 
 msgid "Key Type:"
 msgstr ""
 

+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:604
+#: ../src/qtui/settingspages/identityeditwidget.cpp:317
+#: ../src/qtui/settingspages/identityeditwidget.cpp:328
+#, fuzzy
+msgid "No Key loaded"
+msgstr ""
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:624
+#: ../src/qtui/settingspages/identityeditwidget.ui:722
+#: ../src/qtui/settingspages/identityeditwidget.cpp:318
+#: ../src/qtui/settingspages/identityeditwidget.cpp:365
+#, fuzzy
+msgid "Load"
+msgstr ""
+

 #. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:636
 #, fuzzy
 #. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:636
 #, fuzzy


@@ -3284,12 +3184,52 @@ msgstr ""
 msgid "Organisation:"
 msgstr ""
 
 msgid "Organisation:"
 msgstr ""
 

+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.ui:662
+#: ../src/qtui/settingspages/identityeditwidget.ui:696
+#: ../src/qtui/settingspages/identityeditwidget.cpp:363
+#: ../src/qtui/settingspages/identityeditwidget.cpp:364
+#, fuzzy
+msgid "No Certificate loaded"
+msgstr ""
+

 #. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:689
 #, fuzzy
 msgid "CommonName:"
 msgstr ""
 
 #. ts-context IdentityEditWidget
 #: ../src/qtui/settingspages/identityeditwidget.ui:689
 #, fuzzy
 msgid "CommonName:"
 msgstr ""
 

+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.cpp:290
+#, fuzzy
+msgid "Load a Key"
+msgstr ""
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.cpp:322
+#, fuzzy
+msgid "RSA"
+msgstr ""
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.cpp:325
+#, fuzzy
+msgid "DSA"
+msgstr ""
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.cpp:330
+#: ../src/qtui/settingspages/identityeditwidget.cpp:369
+#, fuzzy
+msgid "Clear"
+msgstr ""
+
+#. ts-context IdentityEditWidget
+#: ../src/qtui/settingspages/identityeditwidget.cpp:340
+#, fuzzy
+msgid "Load a Certificate"
+msgstr ""
+

 #. ts-context IdentityPage
 #: ../src/qtui/ircconnectionwizard.cpp:107
 #, fuzzy
 #. ts-context IdentityPage
 #: ../src/qtui/ircconnectionwizard.cpp:107
 #, fuzzy


@@ -3536,54 +3476,54 @@ msgid "Ignore Rule"
 msgstr ""
 
 #. ts-context IgnoreListSettingsPage
 msgstr ""
 
 #. ts-context IgnoreListSettingsPage

-#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:34
+#: ../src/qtui/settingspages/ignorelistsettingspage.ui:14

 #, fuzzy
 #, fuzzy

-msgid "Misc"
+msgid "Form"

 msgstr ""
 
 #. ts-context IgnoreListSettingsPage
 msgstr ""
 
 #. ts-context IgnoreListSettingsPage

-#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:34
+#: ../src/qtui/settingspages/ignorelistsettingspage.ui:28

 #, fuzzy
 #, fuzzy

-msgid "Ignore List"
+msgid "New"

 msgstr ""
 
 #. ts-context IgnoreListSettingsPage
 msgstr ""
 
 #. ts-context IgnoreListSettingsPage

-#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:128
+#: ../src/qtui/settingspages/ignorelistsettingspage.ui:42

 #, fuzzy
 #, fuzzy

-msgid "Rule already exists"
+msgid "Delete"

 msgstr ""
 
 #. ts-context IgnoreListSettingsPage
 msgstr ""
 
 #. ts-context IgnoreListSettingsPage

-#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:129
+#: ../src/qtui/settingspages/ignorelistsettingspage.ui:56

 #, fuzzy
 #, fuzzy

-msgid ""
-"There is already a rule\n"
-"\"%1\"\n"
-"Please choose another rule."
+msgid "&Edit"

 msgstr ""
 
 #. ts-context IgnoreListSettingsPage
 msgstr ""
 
 #. ts-context IgnoreListSettingsPage

-#: ../src/qtui/settingspages/ignorelistsettingspage.ui:14
+#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:34

 #, fuzzy
 #, fuzzy

-msgid "Form"
+msgid "Misc"

 msgstr ""
 
 #. ts-context IgnoreListSettingsPage
 msgstr ""
 
 #. ts-context IgnoreListSettingsPage

-#: ../src/qtui/settingspages/ignorelistsettingspage.ui:28
+#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:34

 #, fuzzy
 #, fuzzy

-msgid "New"
+msgid "Ignore List"

 msgstr ""
 
 #. ts-context IgnoreListSettingsPage
 msgstr ""
 
 #. ts-context IgnoreListSettingsPage

-#: ../src/qtui/settingspages/ignorelistsettingspage.ui:42
+#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:128

 #, fuzzy
 #, fuzzy

-msgid "Delete"
+msgid "Rule already exists"

 msgstr ""
 
 #. ts-context IgnoreListSettingsPage
 msgstr ""
 
 #. ts-context IgnoreListSettingsPage

-#: ../src/qtui/settingspages/ignorelistsettingspage.ui:56
+#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:129

 #, fuzzy
 #, fuzzy

-msgid "&Edit"
+msgid ""
+"There is already a rule\n"
+"\"%1\"\n"
+"Please choose another rule."

 msgstr ""
 
 #. ts-context IndicatorNotificationConfigWidget
 msgstr ""
 
 #. ts-context IndicatorNotificationConfigWidget


@@ -3598,34 +3538,22 @@ msgstr ""
 msgid "Show messages in indicator"
 msgstr ""
 
 msgid "Show messages in indicator"
 msgstr ""
 

-#. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:89
-#, fuzzy
-msgid "Focus Input Line"
-msgstr ""
-
-#. ts-context InputWidget
-#: ../src/qtui/inputwidget.cpp:90
-#, fuzzy
-msgid "Ctrl+L"
-msgstr ""
-

 #. ts-context InputWidget
 #: ../src/qtui/ui/inputwidget.ui:20
 #, fuzzy
 msgid "Form"
 msgstr ""
 
 #. ts-context InputWidget
 #: ../src/qtui/ui/inputwidget.ui:20
 #, fuzzy
 msgid "Form"
 msgstr ""
 

-#. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.cpp:23
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:89

 #, fuzzy
 #, fuzzy

-msgid "Interface"
+msgid "Focus Input Line"

 msgstr ""
 
 msgstr ""
 

-#. ts-context InputWidgetSettingsPage
-#: ../src/qtui/settingspages/inputwidgetsettingspage.cpp:23
+#. ts-context InputWidget
+#: ../src/qtui/inputwidget.cpp:90

 #, fuzzy
 #, fuzzy

-msgid "Input Widget"
+msgid "Ctrl+L"

 msgstr ""
 
 #. ts-context InputWidgetSettingsPage
 msgstr ""
 
 #. ts-context InputWidgetSettingsPage


@@ -3694,6 +3622,18 @@ msgstr ""
 msgid ": "
 msgstr ""
 
 msgid ": "
 msgstr ""
 

+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.cpp:23
+#, fuzzy
+msgid "Interface"
+msgstr ""
+
+#. ts-context InputWidgetSettingsPage
+#: ../src/qtui/settingspages/inputwidgetsettingspage.cpp:23
+#, fuzzy
+msgid "Input Widget"
+msgstr ""
+

 #. ts-context IrcConnectionWizard
 #: ../src/qtui/ircconnectionwizard.cpp:51
 #, fuzzy
 #. ts-context IrcConnectionWizard
 #: ../src/qtui/ircconnectionwizard.cpp:51
 #, fuzzy


@@ -3916,54 +3856,6 @@ msgstr ""
 msgid "server: %1"
 msgstr ""
 
 msgid "server: %1"
 msgstr ""
 

-#. ts-context ItemViewSettingsPage
-#: ../src/qtui/settingspages/itemviewsettingspage.cpp:28
-#, fuzzy
-msgid "Interface"
-msgstr ""
-
-#. ts-context ItemViewSettingsPage
-#: ../src/qtui/settingspages/itemviewsettingspage.cpp:28
-#, fuzzy
-msgid "Chat & Nick Lists"
-msgstr ""
-
-#. ts-context ItemViewSettingsPage
-#: ../src/qtui/settingspages/itemviewsettingspage.cpp:33
-#, fuzzy
-msgid "Network"
-msgstr ""
-
-#. ts-context ItemViewSettingsPage
-#: ../src/qtui/settingspages/itemviewsettingspage.cpp:36
-#, fuzzy
-msgid "Inactive"
-msgstr ""
-
-#. ts-context ItemViewSettingsPage
-#: ../src/qtui/settingspages/itemviewsettingspage.cpp:37
-#, fuzzy
-msgid "Normal"
-msgstr ""
-
-#. ts-context ItemViewSettingsPage
-#: ../src/qtui/settingspages/itemviewsettingspage.cpp:38
-#, fuzzy
-msgid "Unread messages"
-msgstr ""
-
-#. ts-context ItemViewSettingsPage
-#: ../src/qtui/settingspages/itemviewsettingspage.cpp:39
-#, fuzzy
-msgid "Highlight"
-msgstr ""
-
-#. ts-context ItemViewSettingsPage
-#: ../src/qtui/settingspages/itemviewsettingspage.cpp:40
-#, fuzzy
-msgid "Other activity"
-msgstr ""
-

 #. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:14
 #, fuzzy
 #. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:14
 #, fuzzy


@@ -4057,283 +3949,402 @@ msgstr ""
 #. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:286
 #, fuzzy
 #. ts-context ItemViewSettingsPage
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:286
 #, fuzzy

-msgid "Custom Nick List Colors"
+msgid "Custom Nick List Colors"
+msgstr ""
+
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:301
+#, fuzzy
+msgid "Online:"
+msgstr ""
+
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:338
+#, fuzzy
+msgid "Away:"
+msgstr ""
+
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:28
+#, fuzzy
+msgid "Interface"
+msgstr ""
+
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:28
+#, fuzzy
+msgid "Chat & Nick Lists"
+msgstr ""
+
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:33
+#, fuzzy
+msgid "Network"
+msgstr ""
+
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:36
+#, fuzzy
+msgid "Inactive"
+msgstr ""
+
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:37
+#, fuzzy
+msgid "Normal"
+msgstr ""
+
+#. ts-context ItemViewSettingsPage
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:38
+#, fuzzy
+msgid "Unread messages"

 msgstr ""
 
 #. ts-context ItemViewSettingsPage
 msgstr ""
 
 #. ts-context ItemViewSettingsPage

-#: ../src/qtui/settingspages/itemviewsettingspage.ui:301
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:39

 #, fuzzy
 #, fuzzy

-msgid "Online:"
+msgid "Highlight"

 msgstr ""
 
 #. ts-context ItemViewSettingsPage
 msgstr ""
 
 #. ts-context ItemViewSettingsPage

-#: ../src/qtui/settingspages/itemviewsettingspage.ui:338
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:40

 #, fuzzy
 #, fuzzy

-msgid "Away:"
+msgid "Other activity"

 msgstr ""
 
 #. ts-context MainWin
 msgstr ""
 
 #. ts-context MainWin

-#: ../src/qtui/mainwin.cpp:293
+#: ../src/qtui/mainwin.cpp:309

 #, fuzzy
 msgid "&Connect to Core..."
 msgstr ""
 
 #. ts-context MainWin
 #, fuzzy
 msgid "&Connect to Core..."
 msgstr ""
 
 #. ts-context MainWin

-#: ../src/qtui/mainwin.cpp:295
+#: ../src/qtui/mainwin.cpp:311

 #, fuzzy
 msgid "&Disconnect from Core"
 msgstr ""
 
 #. ts-context MainWin
 #, fuzzy
 msgid "&Disconnect from Core"
 msgstr ""
 
 #. ts-context MainWin

-#: ../src/qtui/mainwin.cpp:297
+#: ../src/qtui/mainwin.cpp:313

 #, fuzzy
 msgid "Core &Info..."
 msgstr ""
 
 #. ts-context MainWin
 #, fuzzy
 msgid "Core &Info..."
 msgstr ""
 
 #. ts-context MainWin

-#: ../src/qtui/mainwin.cpp:299
+#: ../src/qtui/mainwin.cpp:315

 #, fuzzy
 msgid "Configure &Networks..."
 msgstr ""
 
 #. ts-context MainWin
 #, fuzzy
 msgid "Configure &Networks..."
 msgstr ""
 
 #. ts-context MainWin

-#: ../src/qtui/mainwin.cpp:301
+#: ../src/qtui/mainwin.cpp:317

 #, fuzzy
 msgid "&Quit"
 msgstr ""
 
 #. ts-context MainWin
 #, fuzzy
 msgid "&Quit"
 msgstr ""
 
 #. ts-context MainWin

-#: ../src/qtui/mainwin.cpp:302
+#: ../src/qtui/mainwin.cpp:318

 #, fuzzy
 msgid "Ctrl+Q"
 msgstr ""
 
 #. ts-context MainWin
 #, fuzzy
 msgid "Ctrl+Q"
 msgstr ""
 
 #. ts-context MainWin

-#: ../src/qtui/mainwin.cpp:305
+#: ../src/qtui/mainwin.cpp:321

 #, fuzzy
 msgid "&Configure Chat Lists..."
 msgstr ""
 
 #. ts-context MainWin
 #, fuzzy
 msgid "&Configure Chat Lists..."
 msgstr ""
 
 #. ts-context MainWin

-#: ../src/qtui/mainwin.cpp:308
+#: ../src/qtui/mainwin.cpp:324

 #, fuzzy
 msgid "&Lock Layout"
 msgstr ""
 
 #. ts-context MainWin
 #, fuzzy
 msgid "&Lock Layout"
 msgstr ""
 
 #. ts-context MainWin

-#: ../src/qtui/mainwin.cpp:312
+#: ../src/qtui/mainwin.cpp:328

 #, fuzzy
 msgid "Show &Search Bar"
 msgstr ""
 
 #. ts-context MainWin
 #, fuzzy
 msgid "Show &Search Bar"
 msgstr ""
 
 #. ts-context MainWin

-#: ../src/qtui/mainwin.cpp:314
+#: ../src/qtui/mainwin.cpp:330

 #, fuzzy
 msgid "Show Away Log"
 msgstr ""
 
 #. ts-context MainWin
 #, fuzzy
 msgid "Show Away Log"
 msgstr ""
 
 #. ts-context MainWin

-#: ../src/qtui/mainwin.cpp:316
+#: ../src/qtui/mainwin.cpp:332

 #, fuzzy
 msgid "Show &Menubar"
 msgstr ""
 
 #. ts-context MainWin
 #, fuzzy
 msgid "Show &Menubar"
 msgstr ""
 
 #. ts-context MainWin

-#: ../src/qtui/mainwin.cpp:317
+#: ../src/qtui/mainwin.cpp:333

 #, fuzzy
 msgid "Ctrl+M"
 msgstr ""
 
 #. ts-context MainWin
 #, fuzzy
 msgid "Ctrl+M"
 msgstr ""
 
 #. ts-context MainWin

-#: ../src/qtui/mainwin.cpp:319
+#: ../src/qtui/mainwin.cpp:335

 #, fuzzy
 msgid "Show Status &Bar"
 msgstr ""
 
 #. ts-context MainWin
 #, fuzzy
 msgid "Show Status &Bar"
 msgstr ""
 
 #. ts-context MainWin

-#: ../src/qtui/mainwin.cpp:323
+#: ../src/qtui/mainwin.cpp:339

 #, fuzzy
 msgid "&Configure Quassel..."
 msgstr ""
 
 #. ts-context MainWin
 #, fuzzy
 msgid "&Configure Quassel..."
 msgstr ""
 
 #. ts-context MainWin

-#: ../src/qtui/mainwin.cpp:324
+#: ../src/qtui/mainwin.cpp:340

 #, fuzzy
 msgid "F7"
 msgstr ""
 
 #. ts-context MainWin
 #, fuzzy
 msgid "F7"
 msgstr ""
 
 #. ts-context MainWin

-#: ../src/qtui/mainwin.cpp:327
+#: ../src/qtui/mainwin.cpp:343

 #, fuzzy
 msgid "&About Quassel"
 msgstr ""
 
 #. ts-context MainWin
 #, fuzzy
 msgid "&About Quassel"
 msgstr ""
 
 #. ts-context MainWin

-#: ../src/qtui/mainwin.cpp:329
+#: ../src/qtui/mainwin.cpp:345

 #, fuzzy
 msgid "About &Qt"
 msgstr ""
 
 #. ts-context MainWin
 #, fuzzy
 msgid "About &Qt"
 msgstr ""
 
 #. ts-context MainWin

-#: ../src/qtui/mainwin.cpp:331
+#: ../src/qtui/mainwin.cpp:347

 #, fuzzy
 msgid "Debug &NetworkModel"
 msgstr ""
 
 #. ts-context MainWin
 #, fuzzy
 msgid "Debug &NetworkModel"
 msgstr ""
 
 #. ts-context MainWin

-#: ../src/qtui/mainwin.cpp:333
+#: ../src/qtui/mainwin.cpp:349

 #, fuzzy
 msgid "Debug &BufferViewOverlay"
 msgstr ""
 
 #. ts-context MainWin
 #, fuzzy
 msgid "Debug &BufferViewOverlay"
 msgstr ""
 
 #. ts-context MainWin

-#: ../src/qtui/mainwin.cpp:335
+#: ../src/qtui/mainwin.cpp:351

 #, fuzzy
 msgid "Debug &MessageModel"
 msgstr ""
 
 #. ts-context MainWin
 #, fuzzy
 msgid "Debug &MessageModel"
 msgstr ""
 
 #. ts-context MainWin

-#: ../src/qtui/mainwin.cpp:337
+#: ../src/qtui/mainwin.cpp:353

 #, fuzzy
 msgid "Debug &HotList"
 msgstr ""
 
 #. ts-context MainWin
 #, fuzzy
 msgid "Debug &HotList"
 msgstr ""
 
 #. ts-context MainWin

-#: ../src/qtui/mainwin.cpp:339
+#: ../src/qtui/mainwin.cpp:355

 #, fuzzy
 msgid "Debug &Log"
 msgstr ""
 
 #. ts-context MainWin
 #, fuzzy
 msgid "Debug &Log"
 msgstr ""
 
 #. ts-context MainWin

-#: ../src/qtui/mainwin.cpp:341
+#: ../src/qtui/mainwin.cpp:357

 #, fuzzy
 msgid "Reload Stylesheet"
 msgstr ""
 
 #. ts-context MainWin
 #, fuzzy
 msgid "Reload Stylesheet"
 msgstr ""
 
 #. ts-context MainWin

-#: ../src/qtui/mainwin.cpp:345
+#: ../src/qtui/mainwin.cpp:361

 #, fuzzy
 msgid "Jump to hot chat"
 msgstr ""
 
 #. ts-context MainWin
 #, fuzzy
 msgid "Jump to hot chat"
 msgstr ""
 
 #. ts-context MainWin

-#: ../src/qtui/mainwin.cpp:352
+#: ../src/qtui/mainwin.cpp:368

 #, fuzzy
 msgid "&File"
 msgstr ""
 
 #. ts-context MainWin
 #, fuzzy
 msgid "&File"
 msgstr ""
 
 #. ts-context MainWin

-#: ../src/qtui/mainwin.cpp:365
+#: ../src/qtui/mainwin.cpp:381

 #, fuzzy
 msgid "&Networks"
 msgstr ""
 
 #. ts-context MainWin
 #, fuzzy
 msgid "&Networks"
 msgstr ""
 
 #. ts-context MainWin

-#: ../src/qtui/mainwin.cpp:371
+#: ../src/qtui/mainwin.cpp:387

 #, fuzzy
 msgid "&View"
 msgstr ""
 
 #. ts-context MainWin
 #, fuzzy
 msgid "&View"
 msgstr ""
 
 #. ts-context MainWin

-#: ../src/qtui/mainwin.cpp:372
+#: ../src/qtui/mainwin.cpp:388

 #, fuzzy
 msgid "&Chat Lists"
 msgstr ""
 
 #. ts-context MainWin
 #, fuzzy
 msgid "&Chat Lists"
 msgstr ""
 
 #. ts-context MainWin

-#: ../src/qtui/mainwin.cpp:374
+#: ../src/qtui/mainwin.cpp:390

 #, fuzzy
 msgid "&Toolbars"
 msgstr ""
 
 #. ts-context MainWin
 #, fuzzy
 msgid "&Toolbars"
 msgstr ""
 
 #. ts-context MainWin

-#: ../src/qtui/mainwin.cpp:388
+#: ../src/qtui/mainwin.cpp:404

 #, fuzzy
 msgid "&Settings"
 msgstr ""
 
 #. ts-context MainWin
 #, fuzzy
 msgid "&Settings"
 msgstr ""
 
 #. ts-context MainWin

-#: ../src/qtui/mainwin.cpp:395
+#: ../src/qtui/mainwin.cpp:411

 #, fuzzy
 msgid "&Help"
 msgstr ""
 
 #. ts-context MainWin
 #, fuzzy
 msgid "&Help"
 msgstr ""
 
 #. ts-context MainWin

-#: ../src/qtui/mainwin.cpp:403
+#: ../src/qtui/mainwin.cpp:419

 #, fuzzy
 msgid "Debug"
 msgstr ""
 
 #. ts-context MainWin
 #, fuzzy
 msgid "Debug"
 msgstr ""
 
 #. ts-context MainWin

-#: ../src/qtui/mainwin.cpp:542
+#: ../src/qtui/mainwin.cpp:564

 #, fuzzy
 msgid "Nicks"
 msgstr ""
 
 #. ts-context MainWin
 #, fuzzy
 msgid "Nicks"
 msgstr ""
 
 #. ts-context MainWin

-#: ../src/qtui/mainwin.cpp:551
+#: ../src/qtui/mainwin.cpp:573

 #, fuzzy
 msgid "Show Nick List"
 msgstr ""
 
 #. ts-context MainWin
 #, fuzzy
 msgid "Show Nick List"
 msgstr ""
 
 #. ts-context MainWin

-#: ../src/qtui/mainwin.cpp:562
+#: ../src/qtui/mainwin.cpp:584

 #, fuzzy
 msgid "Chat Monitor"
 msgstr ""
 
 #. ts-context MainWin
 #, fuzzy
 msgid "Chat Monitor"
 msgstr ""
 
 #. ts-context MainWin

-#: ../src/qtui/mainwin.cpp:573
+#: ../src/qtui/mainwin.cpp:595

 #, fuzzy
 msgid "Show Chat Monitor"
 msgstr ""
 
 #. ts-context MainWin
 #, fuzzy
 msgid "Show Chat Monitor"
 msgstr ""
 
 #. ts-context MainWin

-#: ../src/qtui/mainwin.cpp:577
+#: ../src/qtui/mainwin.cpp:599

 #, fuzzy
 msgid "Inputline"
 msgstr ""
 
 #. ts-context MainWin
 #, fuzzy
 msgid "Inputline"
 msgstr ""
 
 #. ts-context MainWin

-#: ../src/qtui/mainwin.cpp:586
+#: ../src/qtui/mainwin.cpp:608

 #, fuzzy
 msgid "Show Input Line"
 msgstr ""
 
 #. ts-context MainWin
 #, fuzzy
 msgid "Show Input Line"
 msgstr ""
 
 #. ts-context MainWin

-#: ../src/qtui/mainwin.cpp:597
+#: ../src/qtui/mainwin.cpp:619

 #, fuzzy
 msgid "Topic"
 msgstr ""
 
 #. ts-context MainWin
 #, fuzzy
 msgid "Topic"
 msgstr ""
 
 #. ts-context MainWin

-#: ../src/qtui/mainwin.cpp:609
+#: ../src/qtui/mainwin.cpp:631

 #, fuzzy
 msgid "Show Topic Line"
 msgstr ""
 
 #. ts-context MainWin
 #, fuzzy
 msgid "Show Topic Line"
 msgstr ""
 
 #. ts-context MainWin

-#: ../src/qtui/mainwin.cpp:680
+#: ../src/qtui/mainwin.cpp:697

 #, fuzzy
 msgid "Main Toolbar"
 msgstr ""
 
 #. ts-context MainWin
 #, fuzzy
 msgid "Main Toolbar"
 msgstr ""
 
 #. ts-context MainWin

-#: ../src/qtui/mainwin.cpp:719
+#: ../src/qtui/mainwin.cpp:736

 #, fuzzy
 msgid "Connected to core."
 msgstr ""
 
 #. ts-context MainWin
 #, fuzzy
 msgid "Connected to core."
 msgstr ""
 
 #. ts-context MainWin

-#: ../src/qtui/mainwin.cpp:753
+#: ../src/qtui/mainwin.cpp:804

 #, fuzzy
 #, fuzzy

-msgid "Core Lag: %1"
+msgid "Not connected to core."

 msgstr ""
 
 #. ts-context MainWin
 msgstr ""
 
 #. ts-context MainWin

-#: ../src/qtui/mainwin.cpp:789
+#: ../src/qtui/mainwin.cpp:818 ../src/qtui/mainwin.cpp:826

 #, fuzzy
 #, fuzzy

-msgid "Not connected to core."
+msgid "Unencrypted Connection"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:818
+#, fuzzy
+msgid "<b>Your client does not support SSL encryption</b>"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:820 ../src/qtui/mainwin.cpp:828
+#, fuzzy
+msgid ""
+"Sensitive data, like passwords, will be transmitted unencrypted to your "
+"Quassel core."
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:826
+#, fuzzy
+msgid "<b>Your core does not support SSL encryption</b>"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:843 ../src/qtui/mainwin.cpp:863
+#, fuzzy
+msgid "Untrusted Security Certificate"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:844
+#, fuzzy
+msgid ""
+"<b>The SSL certificate provided by the core at %1 is untrusted for the "
+"following reasons:</b>"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:847
+#, fuzzy
+msgid "Continue"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:848
+#, fuzzy
+msgid "Show Certificate"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:864
+#, fuzzy
+msgid ""
+"Would you like to accept this certificate forever without being prompted?"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:866
+#, fuzzy
+msgid "Current Session Only"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:867
+#, fuzzy
+msgid "Forever"
+msgstr ""
+
+#. ts-context MainWin
+#: ../src/qtui/mainwin.cpp:876
+#, fuzzy
+msgid "Core Connection Error"

 msgstr ""
 
 #. ts-context MessageModel
 msgstr ""
 
 #. ts-context MessageModel


@@ -4527,58 +4538,6 @@ msgstr ""
 msgid "Setup Network Connection"
 msgstr ""
 
 msgid "Setup Network Connection"
 msgstr ""
 

-#. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.cpp:37
-#, fuzzy
-msgid "Misc"
-msgstr ""
-
-#. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.cpp:37
-#, fuzzy
-msgid "Networks"
-msgstr ""
-
-#. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.cpp:160
-#, fuzzy
-msgid ""
-"<b>The following problems need to be corrected before your changes can be "
-"applied:</b><ul>"
-msgstr ""
-
-#. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.cpp:161
-#, fuzzy
-msgid "<li>All networks need at least one server defined</li>"
-msgstr ""
-
-#. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.cpp:162
-#, fuzzy
-msgid "</ul>"
-msgstr ""
-
-#. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.cpp:163
-#, fuzzy
-msgid "Invalid Network Settings"
-msgstr ""
-
-#. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.cpp:527
-#, fuzzy
-msgid "Delete Network?"
-msgstr ""
-
-#. ts-context NetworksSettingsPage
-#: ../src/qtui/settingspages/networkssettingspage.cpp:528
-#, fuzzy
-msgid ""
-"Do you really want to delete the network \"%1\" and all related settings, "
-"including the backlog?"
-msgstr ""
-

 #. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:13
 #, fuzzy
 #. ts-context NetworksSettingsPage
 #: ../src/qtui/settingspages/networkssettingspage.ui:13
 #, fuzzy


@@ -4827,10 +4786,56 @@ msgstr ""
 msgid "Server encoding:"
 msgstr ""
 
 msgid "Server encoding:"
 msgstr ""
 

-#. ts-context NickEditDlg
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:420
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.cpp:37

 #, fuzzy
 #, fuzzy

-msgid "Add Nickname"
+msgid "Misc"
+msgstr ""
+
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.cpp:37
+#, fuzzy
+msgid "Networks"
+msgstr ""
+
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.cpp:160
+#, fuzzy
+msgid ""
+"<b>The following problems need to be corrected before your changes can be "
+"applied:</b><ul>"
+msgstr ""
+
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.cpp:161
+#, fuzzy
+msgid "<li>All networks need at least one server defined</li>"
+msgstr ""
+
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.cpp:162
+#, fuzzy
+msgid "</ul>"
+msgstr ""
+
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.cpp:163
+#, fuzzy
+msgid "Invalid Network Settings"
+msgstr ""
+
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.cpp:527
+#, fuzzy
+msgid "Delete Network?"
+msgstr ""
+
+#. ts-context NetworksSettingsPage
+#: ../src/qtui/settingspages/networkssettingspage.cpp:528
+#, fuzzy
+msgid ""
+"Do you really want to delete the network \"%1\" and all related settings, "
+"including the backlog?"

 msgstr ""
 
 #. ts-context NickEditDlg
 msgstr ""
 
 #. ts-context NickEditDlg


@@ -4853,6 +4858,12 @@ msgid ""
 "the special characters {, }, [, ], \\, |, `, ^, _ and -."
 msgstr ""
 
 "the special characters {, }, [, ], \\, |, `, ^, _ and -."
 msgstr ""
 

+#. ts-context NickEditDlg
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:420
+#, fuzzy
+msgid "Add Nickname"
+msgstr ""
+

 #. ts-context NotificationsSettingsPage
 #: ../src/qtui/settingspages/notificationssettingspage.cpp:28
 #, fuzzy
 #. ts-context NotificationsSettingsPage
 #: ../src/qtui/settingspages/notificationssettingspage.cpp:28
 #, fuzzy


@@ -4890,7 +4901,7 @@ msgid "Play File:"
 msgstr ""
 
 #. ts-context PostgreSqlStorage
 msgstr ""
 
 #. ts-context PostgreSqlStorage

-#: ../src/core/postgresqlstorage.cpp:61
+#: ../src/core/postgresqlstorage.cpp:62

 #, fuzzy
 msgid "PostgreSQL Turbo Bomber HD!"
 msgstr ""
 #, fuzzy
 msgid "PostgreSQL Turbo Bomber HD!"
 msgstr ""


@@ -5283,8 +5294,14 @@ msgid "Proxy Password:"
 msgstr ""
 
 #. ts-context SettingsDlg
 msgstr ""
 
 #. 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:13
+#, fuzzy
+msgid "Configure Quassel"
+msgstr ""
+
+#. ts-context SettingsDlg
+#: ../src/qtui/ui/settingsdlg.ui:34 ../src/qtui/ui/settingsdlg.ui:49
+#: ../src/qtui/settingsdlg.cpp:77

 #, fuzzy
 msgid "Settings"
 msgstr ""
 #, fuzzy
 msgid "Settings"
 msgstr ""


@@ -5333,12 +5350,18 @@ msgstr ""
 msgid "Do you like to restore the default values for this page?"
 msgstr ""
 
 msgid "Do you like to restore the default values for this page?"
 msgstr ""
 

-#. ts-context SettingsDlg
-#: ../src/qtui/ui/settingsdlg.ui:13
+#. ts-context SettingsPageDlg
+#: ../src/qtui/ui/settingspagedlg.ui:14

 #, fuzzy
 msgid "Configure Quassel"
 msgstr ""
 
 #, fuzzy
 msgid "Configure Quassel"
 msgstr ""
 

+#. ts-context SettingsPageDlg
+#: ../src/qtui/ui/settingspagedlg.ui:30
+#, fuzzy
+msgid "Settings"
+msgstr ""
+

 #. ts-context SettingsPageDlg
 #: ../src/qtui/settingspagedlg.cpp:36
 #, fuzzy
 #. ts-context SettingsPageDlg
 #: ../src/qtui/settingspagedlg.cpp:36
 #, fuzzy


@@ -5369,18 +5392,6 @@ msgstr ""
 msgid "Do you like to restore the default values for this page?"
 msgstr ""
 
 msgid "Do you like to restore the default values for this page?"
 msgstr ""
 

-#. ts-context SettingsPageDlg
-#: ../src/qtui/ui/settingspagedlg.ui:13
-#, fuzzy
-msgid "Configure Quassel"
-msgstr ""
-
-#. ts-context SettingsPageDlg
-#: ../src/qtui/ui/settingspagedlg.ui:29
-#, fuzzy
-msgid "Settings"
-msgstr ""
-

 #. ts-context SignalProxy
 #: ../src/common/signalproxy.cpp:865
 #, fuzzy
 #. ts-context SignalProxy
 #: ../src/common/signalproxy.cpp:865
 #, fuzzy


@@ -5406,7 +5417,7 @@ msgid "Peer sent corrupt data: unable to load QVariant!"
 msgstr ""
 
 #. ts-context SignalProxy
 msgstr ""
 
 #. ts-context SignalProxy

-#: ../src/common/signalproxy.cpp:1030
+#: ../src/common/signalproxy.cpp:1035

 #, fuzzy
 msgid "Disconnecting"
 msgstr ""
 #, fuzzy
 msgid "Disconnecting"
 msgstr ""


@@ -5515,88 +5526,130 @@ msgid ""
 "your core."
 msgstr ""
 
 "your core."
 msgstr ""
 

-#. ts-context SslCertDisplayDialog
-#: ../src/qtui/coreconnectdlg.cpp:568
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:14
+#, fuzzy
+msgid "Security Information"
+msgstr ""
+
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:22
+#, fuzzy
+msgid "<b>Hostname:</b>"
+msgstr ""
+
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:39
+#, fuzzy
+msgid "<b>IP address:</b>"
+msgstr ""
+
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:56
+#, fuzzy
+msgid "<b>Encryption:</b>"
+msgstr ""
+
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:73
+#, fuzzy
+msgid "<b>Protocol:</b>"
+msgstr ""
+
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:90
+#, fuzzy
+msgid "<b>Certificate chain:</b>"
+msgstr ""
+
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:120
+#, fuzzy
+msgid "Subject"
+msgstr ""
+
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:126 ../src/qtui/ui/sslinfodlg.ui:248

 #, fuzzy
 #, fuzzy

-msgid "SSL Certificate used by %1"
+msgid "<b>Common name:</b>"

 msgstr ""
 
 msgstr ""
 

-#. ts-context SslCertDisplayDialog
-#: ../src/qtui/coreconnectdlg.cpp:572
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:143 ../src/qtui/ui/sslinfodlg.ui:265

 #, fuzzy
 #, fuzzy

-msgid "Issuer Info"
+msgid "<b>Organization:</b>"

 msgstr ""
 
 msgstr ""
 

-#. ts-context SslCertDisplayDialog
-#: ../src/qtui/coreconnectdlg.cpp:574 ../src/qtui/coreconnectdlg.cpp:583
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:160 ../src/qtui/ui/sslinfodlg.ui:282

 #, fuzzy
 #, fuzzy

-msgid "Organization:"
+msgid "<b>Organizational unit:</b>"

 msgstr ""
 
 msgstr ""
 

-#. ts-context SslCertDisplayDialog
-#: ../src/qtui/coreconnectdlg.cpp:575 ../src/qtui/coreconnectdlg.cpp:584
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:177 ../src/qtui/ui/sslinfodlg.ui:299

 #, fuzzy
 #, fuzzy

-msgid "Locality Name:"
+msgid "<b>Country:</b>"

 msgstr ""
 
 msgstr ""
 

-#. ts-context SslCertDisplayDialog
-#: ../src/qtui/coreconnectdlg.cpp:576 ../src/qtui/coreconnectdlg.cpp:585
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:194 ../src/qtui/ui/sslinfodlg.ui:316

 #, fuzzy
 #, fuzzy

-msgid "Organizational Unit Name:"
+msgid "<b>State or province:</b>"

 msgstr ""
 
 msgstr ""
 

-#. ts-context SslCertDisplayDialog
-#: ../src/qtui/coreconnectdlg.cpp:577 ../src/qtui/coreconnectdlg.cpp:586
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:231 ../src/qtui/ui/sslinfodlg.ui:353

 #, fuzzy
 #, fuzzy

-msgid "Country Name:"
+msgid "<b>Locality:</b>"

 msgstr ""
 
 msgstr ""
 

-#. ts-context SslCertDisplayDialog
-#: ../src/qtui/coreconnectdlg.cpp:578 ../src/qtui/coreconnectdlg.cpp:587
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:242

 #, fuzzy
 #, fuzzy

-msgid "State or Province Name:"
+msgid "Issuer"

 msgstr ""
 
 msgstr ""
 

-#. ts-context SslCertDisplayDialog
-#: ../src/qtui/coreconnectdlg.cpp:581
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:367

 #, fuzzy
 #, fuzzy

-msgid "Subject Info"
+msgid "<b>Validity period:</b>"

 msgstr ""
 
 msgstr ""
 

-#. ts-context SslCertDisplayDialog
-#: ../src/qtui/coreconnectdlg.cpp:590
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:384

 #, fuzzy
 #, fuzzy

-msgid "Additional Info"
+msgid "<b>MD5 digest:</b>"

 msgstr ""
 
 msgstr ""
 

-#. ts-context SslCertDisplayDialog
-#: ../src/qtui/coreconnectdlg.cpp:592
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:401

 #, fuzzy
 #, fuzzy

-msgid "Valid From:"
+msgid "<b>SHA1 digest:</b>"

 msgstr ""
 
 msgstr ""
 

-#. ts-context SslCertDisplayDialog
-#: ../src/qtui/coreconnectdlg.cpp:593
+#. ts-context SslInfoDlg
+#: ../src/qtui/ui/sslinfodlg.ui:431

 #, fuzzy
 #, fuzzy

-msgid "Valid To:"
+msgid "<b>Trusted:</b>"

 msgstr ""
 
 msgstr ""
 

-#. ts-context SslCertDisplayDialog
-#: ../src/qtui/coreconnectdlg.cpp:596
+#. ts-context SslInfoDlg
+#: ../src/qtui/sslinfodlg.cpp:69

 #, fuzzy
 #, fuzzy

-msgid "Hostname %1:"
+msgid "Yes"

 msgstr ""
 
 msgstr ""
 

-#. ts-context SslCertDisplayDialog
-#: ../src/qtui/coreconnectdlg.cpp:600
+#. ts-context SslInfoDlg
+#: ../src/qtui/sslinfodlg.cpp:71

 #, fuzzy
 #, fuzzy

-msgid "E-Mail Address %1:"
+msgid "No, for the following reasons:<ul>"

 msgstr ""
 
 msgstr ""
 

-#. ts-context SslCertDisplayDialog
-#: ../src/qtui/coreconnectdlg.cpp:602
+#. ts-context SslInfoDlg
+#: ../src/qtui/sslinfodlg.cpp:78

 #, fuzzy
 #, fuzzy

-msgid "Digest:"
+msgid "%1 to %2"

 msgstr ""
 
 #. ts-context StatusBufferItem
 msgstr ""
 
 #. ts-context StatusBufferItem


@@ -5827,18 +5880,6 @@ msgstr ""
 msgid "..."
 msgstr ""
 
 msgid "..."
 msgstr ""
 

-#. ts-context TopicWidgetSettingsPage
-#: ../src/qtui/settingspages/topicwidgetsettingspage.cpp:23
-#, fuzzy
-msgid "Interface"
-msgstr ""
-
-#. ts-context TopicWidgetSettingsPage
-#: ../src/qtui/settingspages/topicwidgetsettingspage.cpp:23
-#, fuzzy
-msgid "Topic Widget"
-msgstr ""
-

 #. ts-context TopicWidgetSettingsPage
 #: ../src/qtui/settingspages/topicwidgetsettingspage.ui:14
 #, fuzzy
 #. ts-context TopicWidgetSettingsPage
 #: ../src/qtui/settingspages/topicwidgetsettingspage.ui:14
 #, fuzzy


@@ -5863,6 +5904,18 @@ msgstr ""
 msgid "On hover only"
 msgstr ""
 
 msgid "On hover only"
 msgstr ""
 

+#. ts-context TopicWidgetSettingsPage
+#: ../src/qtui/settingspages/topicwidgetsettingspage.cpp:23
+#, fuzzy
+msgid "Interface"
+msgstr ""
+
+#. ts-context TopicWidgetSettingsPage
+#: ../src/qtui/settingspages/topicwidgetsettingspage.cpp:23
+#, fuzzy
+msgid "Topic Widget"
+msgstr ""
+

 #. Plain Message
 #. ----------
 #. Notice Message
 #. Plain Message
 #. ----------
 #. Notice Message