#
# Translators:
-# Daniel Albers <daniel@lbers.com>, 2011.
-# Johannes Huber <johu@gmx.de>, 2010.
+# Daniel Albers <daniel@lbers.com>, 2011
+# Johannes Huber <johu@gmx.de>, 2010
msgid ""
msgstr ""
"Project-Id-Version: Quassel IRC\n"
"Report-Msgid-Bugs-To: http://bugs.quassel-irc.org/\n"
-"PO-Revision-Date: 2012-01-23 18:06+0000\n"
-"Last-Translator: Daniel Albers <daniel@lbers.com>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2014-02-22 09:00+0000\n"
+"Last-Translator: Daniel Albers <daniel@lbe.rs>\n"
+"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/quassel/language/en_GB/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: en_GB\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Qt-Contexts: true\n"
#: ../src/qtui/ui/aboutdlg.ui:17
"p, li { white-space: pre-wrap; }\n"
"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:15pt; font-weight:600; 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;\">Quassel IRC</p></body></html>"
-msgstr ""
-"<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:15pt; font-weight:600; 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;\">Quassel IRC</p></body></html>"
+msgstr "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'DejaVu Sans'; font-size:15pt; font-weight:600; 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;\">Quassel IRC</p></body></html>"
#: ../src/qtui/ui/aboutdlg.ui:75
msgctxt "AboutDlg|"
"p, li { white-space: pre-wrap; }\n"
"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; font-weight:600; 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;\">Version 0.2.0-pre, Build >= 474 (2008-02-08)</p></body></html>"
-msgstr ""
-"<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:10pt; font-weight:600; 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;\">Version 0.2.0-pre, Build >= 474 (2008-02-08)</p></body></html>"
+msgstr "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; font-weight:600; 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;\">Version 0.2.0-pre, Build >= 474 (2008-02-08)</p></body></html>"
#: ../src/qtui/ui/aboutdlg.ui:115
msgctxt "AboutDlg|"
msgid "&Thanks To"
msgstr "&Thanks To"
-#: ../src/qtui/aboutdlg.cpp:32
+#: ../src/qtui/aboutdlg.cpp:33
#, qt-format
msgctxt "AboutDlg|"
msgid "<b>Version:</b> %1<br><b>Protocol version:</b> %2<br><b>Built:</b> %3"
msgstr "<b>Version:</b> %1<br><b>Protocol version:</b> %2<br><b>Built:</b> %3"
-#: ../src/qtui/aboutdlg.cpp:46
+#: ../src/qtui/aboutdlg.cpp:49
msgctxt "AboutDlg|"
msgid ""
-"<b>A modern, distributed IRC Client</b><br><br>©2005-2010 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 © 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 ""
-"<b>A modern, distributed IRC Client</b><br><br>©2005-20010 by the "
+"<b>A modern, distributed IRC Client</b><br><br>©%1 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-"
"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 "<b>A modern, distributed IRC Client</b><br><br>©%1 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 © 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."
-#: ../src/qtui/aboutdlg.cpp:62
+#: ../src/qtui/aboutdlg.cpp:67
msgctxt "AboutDlg|"
msgid "Quassel IRC is mainly developed by:"
msgstr "Quassel IRC is mainly developed by:"
-#: ../src/qtui/aboutdlg.cpp:77
+#: ../src/qtui/aboutdlg.cpp:84
msgctxt "AboutDlg|"
msgid ""
"We would like to thank the following contributors (in alphabetical order) "
"and everybody we forgot to mention here:"
-msgstr ""
-"We would like to thank the following contributors (in alphabetical order) "
-"and everybody we forgot to mention here:"
+msgstr "We would like to thank the following contributors (in alphabetical order) and everybody we forgot to mention here:"
-#: ../src/qtui/aboutdlg.cpp:135
+#: ../src/qtui/aboutdlg.cpp:201
msgctxt "AboutDlg|"
msgid ""
"Special thanks goes to:<br><dl><dt><img src=\":/pics/quassel-"
"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 ""
-"Special thanks goes to:<br><dl><dt><img src=\":/pics/quassel-"
-"eye.png\"> <b>John \"nox\" Hand</b></dt><dd>for the original Quassel "
-"icon - The All-Seeing Eye</dt><dt><img src=\":/pics/oxygen.png\"> <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\"> <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 "Special thanks goes to:<br><dl><dt><img src=\":/pics/quassel-eye.png\"> <b>John \"nox\" Hand</b></dt><dd>for the original Quassel icon - The All-Seeing Eye</dt><dt><img src=\":/pics/oxygen.png\"> <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\"> <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>"
-#: ../src/core/abstractsqlstorage.cpp:115
+#: ../src/core/abstractsqlstorage.cpp:127
#, qt-format
msgctxt "AbstractSqlStorage|"
msgid ""
"Installed Schema (version %1) is not up to date. Upgrading to version %2..."
-msgstr ""
-"Installed Schema (version %1) is not up to date. Upgrading to version %2..."
+msgstr "Installed Schema (version %1) is not up to date. Upgrading to version %2..."
-#: ../src/core/abstractsqlstorage.cpp:117
+#: ../src/core/abstractsqlstorage.cpp:129
msgctxt "AbstractSqlStorage|"
msgid "Upgrade failed..."
msgstr "Upgrade failed..."
-#: ../src/qtui/settingspages/aliasesmodel.cpp:55
+#: ../src/qtui/settingspages/aliasesmodel.cpp:57
msgctxt "AliasesModel|"
msgid ""
"<b>The shortcut for the alias</b><br />It can be used as a regular slash "
"command.<br /><br /><b>Example:</b> \"foo\" can be used per /foo"
-msgstr ""
-"<b>The shortcut for the alias</b><br />It can be used as a regular slash "
-"command.<br /><br /><b>Example:</b> \"foo\" can be used per /foo"
+msgstr "<b>The shortcut for the alias</b><br />It can be used as a regular slash command.<br /><br /><b>Example:</b> \"foo\" can be used per /foo"
-#: ../src/qtui/settingspages/aliasesmodel.cpp:59
+#: ../src/qtui/settingspages/aliasesmodel.cpp:61
msgctxt "AliasesModel|"
msgid ""
"<b>The string the shortcut will be expanded to</b><br /><b>special "
"semicolons<br /><br /><b>Example:</b> \"Test $1; Test $2; Test All $0\" will"
" be expanded to three separate messages \"Test 1\", \"Test 2\" and \"Test "
"All 1 2 3\" when called like /test 1 2 3"
-msgstr ""
-"<b>The string the shortcut will be expanded to</b><br /><b>special "
-"variables:</b><br /> - <b>$i</b> represents the i'th parameter.<br /> - "
-"<b>$i..j</b> represents the i'th to j'th parameter separated by spaces.<br "
-"/> - <b>$i..</b> represents all parameters from i on separated by spaces.<br"
-" /> - <b>$i:hostname</b> represents the hostname of the user identified by "
-"the i'th parameter or a * if unknown.<br /> - <b>$0</b> the whole string.<br"
-" /> - <b>$nick</b> your current nickname<br /> - <b>$channel</b> the name of"
-" the selected channel<br /><br />Multiple commands can be separated with "
-"semicolons<br /><br /><b>Example:</b> \"Test $1; Test $2; Test All $0\" will"
-" be expanded to three separate messages \"Test 1\", \"Test 2\" and \"Test "
-"All 1 2 3\" when called like /test 1 2 3"
+msgstr "<b>The string the shortcut will be expanded to</b><br /><b>special variables:</b><br /> - <b>$i</b> represents the i'th parameter.<br /> - <b>$i..j</b> represents the i'th to j'th parameter separated by spaces.<br /> - <b>$i..</b> represents all parameters from i on separated by spaces.<br /> - <b>$i:hostname</b> represents the hostname of the user identified by the i'th parameter or a * if unknown.<br /> - <b>$0</b> the whole string.<br /> - <b>$nick</b> your current nickname<br /> - <b>$channel</b> the name of the selected channel<br /><br />Multiple commands can be separated with semicolons<br /><br /><b>Example:</b> \"Test $1; Test $2; Test All $0\" will be expanded to three separate messages \"Test 1\", \"Test 2\" and \"Test All 1 2 3\" when called like /test 1 2 3"
-#: ../src/qtui/settingspages/aliasesmodel.cpp:170
+#: ../src/qtui/settingspages/aliasesmodel.cpp:185
msgctxt "AliasesModel|"
msgid "Alias"
msgstr "Alias"
-#: ../src/qtui/settingspages/aliasesmodel.cpp:171
+#: ../src/qtui/settingspages/aliasesmodel.cpp:186
msgctxt "AliasesModel|"
msgid "Expansion"
msgstr "Expansion"
msgstr "<Untranslated>"
#: ../src/qtui/settingspages/appearancesettingspage.ui:52
-#: ../src/qtui/settingspages/appearancesettingspage.cpp:74
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:76
msgctxt "AppearanceSettingsPage|"
msgid "<System Default>"
msgstr "<System Default>"
msgid "Interface"
msgstr "Interface"
-#: ../src/qtui/settingspages/appearancesettingspage.cpp:225
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:242
msgctxt "AppearanceSettingsPage|"
msgid "Please choose a stylesheet file"
msgstr "Please choose a stylesheet file"
msgid "Away Log"
msgstr "Away Log"
-#: ../src/qtui/awaylogview.cpp:44
+#: ../src/qtui/awaylogview.cpp:46
msgctxt "AwayLogView|"
msgid "Show Network Name"
msgstr "Show Network Name"
-#: ../src/qtui/awaylogview.cpp:49
+#: ../src/qtui/awaylogview.cpp:51
msgctxt "AwayLogView|"
msgid "Show Buffer Name"
msgstr "Show Buffer Name"
msgid ""
"Number of messages to be requested from the core when using scrolling up in "
"the buffer view."
-msgstr ""
-"Number of messages to be requested from the core when using scrolling up in "
-"the buffer view."
+msgstr "Number of messages to be requested from the core when using scrolling up in the buffer view."
#: ../src/qtui/settingspages/backlogsettingspage.ui:25
msgctxt "BacklogSettingsPage|"
msgid ""
"The simplest requester. It fetches a fixed amount of lines for each chat "
"window from the backlog."
-msgstr ""
-"The simplest requester. It fetches a fixed amount of lines for each chat "
-"window from the backlog."
+msgstr "The simplest requester. It fetches a fixed amount of lines for each chat window from the backlog."
#: ../src/qtui/settingspages/backlogsettingspage.ui:138
msgctxt "BacklogSettingsPage|"
msgid ""
"amount of messages per buffer that are requested after the core connection "
"has been established."
-msgstr ""
-"amount of messages per buffer that are requested after the core connection "
-"has been established."
+msgstr "amount of messages per buffer that are requested after the core connection has been established."
#: ../src/qtui/settingspages/backlogsettingspage.ui:141
msgctxt "BacklogSettingsPage|"
"This requester fetches unread messages for each chat window individually. The amount of lines can be limited per chat.\n"
"\n"
"You can also choose to fetch additional older chatlines to provide a better context."
-msgstr ""
-"This requester fetches unread messages for each chat window individually. The amount of lines can be limited per chat.\n"
-"\n"
-"You can also choose to fetch additional older chatlines to provide a better context."
+msgstr "This requester fetches unread messages for each chat window individually. The amount of lines can be limited per chat.\n\nYou can also choose to fetch additional older chatlines to provide a better context."
#: ../src/qtui/settingspages/backlogsettingspage.ui:222
#: ../src/qtui/settingspages/backlogsettingspage.ui:232
msgid ""
"Amount of messages to be fetched in addition to the unread messages. The "
"Limit does not apply here."
-msgstr ""
-"Amount of messages to be fetched in addition to the unread messages. The "
-"Limit does not apply here."
+msgstr "Amount of messages to be fetched in addition to the unread messages. The Limit does not apply here."
#: ../src/qtui/settingspages/backlogsettingspage.ui:263
#: ../src/qtui/settingspages/backlogsettingspage.ui:385
"It is useful to limit the total amount of the backlog and is probably the fastest.\n"
"\n"
"You can also chose to fetch additional older chatlines to provide a better context."
-msgstr ""
-"This requester fetches all messages newer than the oldest unread message for all chats.\n"
-"\n"
-"Note: This requester is not recommended if you use hidden chat windows or have inactive chats (i.e.: no stale queries or channels).\n"
-"It is useful to limit the total amount of the backlog and is probably the fastest.\n"
-"\n"
-"You can also chose to fetch additional older chatlines to provide a better context."
+msgstr "This requester fetches all messages newer than the oldest unread message for all chats.\n\nNote: This requester is not recommended if you use hidden chat windows or have inactive chats (i.e.: no stale queries or channels).\nIt is useful to limit the total amount of the backlog and is probably the fastest.\n\nYou can also chose to fetch additional older chatlines to provide a better context."
#: ../src/qtui/settingspages/backlogsettingspage.ui:344
msgctxt "BacklogSettingsPage|"
msgid "Backlog Fetching"
msgstr "Backlog Fetching"
-#: ../src/client/networkmodel.cpp:346
+#: ../src/client/networkmodel.cpp:386
#, qt-format
msgctxt "BufferItem|"
msgid "<p> %1 - %2 </p>"
msgstr "<p> %1 - %2 </p>"
-#: ../src/uisupport/bufferview.cpp:248
+#: ../src/uisupport/bufferview.cpp:272
msgctxt "BufferView|"
msgid "Merge buffers permanently?"
msgstr "Merge buffers permanently?"
-#: ../src/uisupport/bufferview.cpp:249
+#: ../src/uisupport/bufferview.cpp:273
#, qt-format
msgctxt "BufferView|"
msgid ""
"Do you want to merge the buffer \"%1\" permanently into buffer \"%2\"?\n"
" This cannot be reversed!"
-msgstr ""
-"Do you want to merge the buffer \"%1\" permanently into buffer \"%2\"?\n"
-" This cannot be reversed!"
+msgstr "Do you want to merge the buffer \"%1\" permanently into buffer \"%2\"?\n This cannot be reversed!"
#: ../src/qtui/settingspages/buffervieweditdlg.ui:14
msgctxt "BufferViewEditDlg|"
msgid "Please enter a name for the chat list:"
msgstr "Please enter a name for the chat list:"
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:520
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:575
msgctxt "BufferViewEditDlg|"
msgid "Add Chat List"
msgstr "Add Chat List"
-#: ../src/uisupport/bufferviewfilter.cpp:52
+#: ../src/uisupport/bufferviewfilter.cpp:54
msgctxt "BufferViewFilter|"
msgid "Show / Hide Chats"
msgstr "Show / Hide Chats"
msgstr "Network:"
#: ../src/qtui/settingspages/bufferviewsettingspage.ui:100
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:117
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:123
msgctxt "BufferViewSettingsPage|"
msgid "All"
msgstr "All"
msgid ""
"This option is not available when all Networks are visible.\n"
"In this mode no separate status buffer is displayed."
-msgstr ""
-"This option is not available when all Networks are visible.\n"
-"In this mode no separate status buffer is displayed."
+msgstr "This option is not available when all Networks are visible.\nIn this mode no separate status buffer is displayed."
#: ../src/qtui/settingspages/bufferviewsettingspage.ui:114
msgctxt "BufferViewSettingsPage|"
msgid "Custom Chat Lists"
msgstr "Custom Chat Lists"
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:342
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:378
msgctxt "BufferViewSettingsPage|"
msgid "Delete Chat List?"
msgstr "Delete Chat List?"
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:343
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:379
#, qt-format
msgctxt "BufferViewSettingsPage|"
msgid "Do you really want to delete the chat list \"%1\"?"
msgid "BufferView"
msgstr "BufferView"
-#: ../src/qtui/bufferwidget.cpp:79
+#: ../src/qtui/bufferwidget.cpp:78
msgctxt "BufferWidget|"
msgid "Zoom In"
msgstr "Zoom In"
-#: ../src/qtui/bufferwidget.cpp:85
+#: ../src/qtui/bufferwidget.cpp:84
msgctxt "BufferWidget|"
msgid "Zoom Out"
msgstr "Zoom Out"
-#: ../src/qtui/bufferwidget.cpp:90
+#: ../src/qtui/bufferwidget.cpp:89
msgctxt "BufferWidget|"
msgid "Actual Size"
msgstr "Actual Size"
-#: ../src/qtui/bufferwidget.cpp:94
+#: ../src/qtui/bufferwidget.cpp:93
msgctxt "BufferWidget|"
msgid "Set Marker Line"
msgstr "Set Marker Line"
-#: ../src/qtui/bufferwidget.cpp:98
+#: ../src/qtui/bufferwidget.cpp:97
msgctxt "BufferWidget|"
msgid "Go to Marker Line"
msgstr "Go to Marker Line"
-#: ../src/client/networkmodel.cpp:503
+#: ../src/client/networkmodel.cpp:566
#, qt-format
msgctxt "ChannelBufferItem|"
msgid "<b>Channel %1</b>"
msgstr "<b>Channel %1</b>"
-#: ../src/client/networkmodel.cpp:506
+#: ../src/client/networkmodel.cpp:569
#, qt-format
msgctxt "ChannelBufferItem|"
msgid "<b>Users:</b> %1"
msgstr "<b>Users:</b> %1"
-#: ../src/client/networkmodel.cpp:510
+#: ../src/client/networkmodel.cpp:573
#, qt-format
msgctxt "ChannelBufferItem|"
msgid "<b>Mode:</b> %1"
msgstr "<b>Mode:</b> %1"
-#: ../src/client/networkmodel.cpp:521
+#: ../src/client/networkmodel.cpp:584
#, qt-format
msgctxt "ChannelBufferItem|"
msgid "<b>Topic:</b> %1"
msgstr "<b>Topic:</b> %1"
-#: ../src/client/networkmodel.cpp:525
+#: ../src/client/networkmodel.cpp:589
msgctxt "ChannelBufferItem|"
msgid "Not active <br /> Double-click to join"
msgstr "Not active <br /> Double-click to join"
-#: ../src/client/networkmodel.cpp:528
+#: ../src/client/networkmodel.cpp:592
#, qt-format
msgctxt "ChannelBufferItem|"
msgid "<p> %1 </p>"
msgctxt "ChannelListDlg|"
msgid ""
"Toggle between simple and advanced mode.\n"
-"Advanced mode allows to pass search strings to the IRC Server."
-msgstr ""
-"Toggle between simple and advanced mode.\n"
-"Advanced mode allows to pass search strings to the IRC Server."
+"Advanced mode allows one to pass search strings to the IRC Server."
+msgstr "Toggle between simple and advanced mode.\nAdvanced mode allows one to pass search strings to the IRC Server."
#: ../src/qtui/ui/channellistdlg.ui:62
msgctxt "ChannelListDlg|"
#: ../src/qtui/ui/channellistdlg.ui:98
msgctxt "ChannelListDlg|"
-msgid "Errors Occured:"
-msgstr "Errors Occured:"
+msgid "Errors Occurred:"
+msgstr "Errors Occurred:"
#: ../src/qtui/ui/channellistdlg.ui:132
msgctxt "ChannelListDlg|"
"</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;\"><span style=\" font-family:'Lucida Grande'; font-size:13pt;\">SUPER EVIL CATASTROPHIC ERROR!!11</span></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 ""
-"<!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;\"><span style=\" font-family:'Lucida Grande'; font-size:13pt;\">SUPER EVIL CATASTROPHIC ERROR!!11</span></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 "<!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\">\np, 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;\"><span style=\" font-family:'Lucida Grande'; font-size:13pt;\">SUPER EVIL CATASTROPHIC ERROR!!11</span></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>"
#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:14
msgctxt "ChatMonitorSettingsPage|"
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-weight:600;\">Operation modes:</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-weight:600;\"><span style=\" font-weight:400; text-decoration: underline;\">Opt-In:</span> <span style=\" font-weight:400;\">Only buffers on the right side are shown in chatmonitor</span></p>\n"
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" text-decoration: underline;\">Opt-Out:</span> Buffers on the right side will be ignored in chatmonitor</p></body></html>"
-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: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;\"><span style=\" font-weight:600;\">Operation modes:</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-weight:600;\"><span style=\" font-weight:400; text-decoration: underline;\">Opt-In:</span> <span style=\" font-weight:400;\">Only buffers on the right side are shown in chatmonitor</span></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" text-decoration: underline;\">Opt-Out:</span> Buffers on the right side will be ignored in chatmonitor</p></body></html>"
+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\">\np, 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;\"><span style=\" font-weight:600;\">Operation modes:</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-weight:600;\"><span style=\" font-weight:400; text-decoration: underline;\">Opt-In:</span> <span style=\" font-weight:400;\">Only buffers on the right side are shown in chatmonitor</span></p>\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" text-decoration: underline;\">Opt-Out:</span> Buffers on the right side will be ignored in chatmonitor</p></body></html>"
#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:61
msgctxt "ChatMonitorSettingsPage|"
msgstr "Move selected buffers to the right"
#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:133
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:236
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:258
msgctxt "ChatMonitorSettingsPage|"
msgid "Show:"
msgstr "Show:"
msgctxt "ChatMonitorSettingsPage|"
msgid ""
"Show highlights in chatmonitor even if the originating buffer is ignored"
-msgstr ""
-"Show highlights in chatmonitor even if the originating buffer is ignored"
+msgstr "Show highlights in chatmonitor even if the originating buffer is ignored"
#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:150
msgctxt "ChatMonitorSettingsPage|"
msgid "Chat Monitor"
msgstr "Chat Monitor"
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:58
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:59
msgctxt "ChatMonitorSettingsPage|"
msgid "Opt In"
msgstr "Opt In"
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:59
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:60
msgctxt "ChatMonitorSettingsPage|"
msgid "Opt Out"
msgstr "Opt Out"
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:239
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:261
msgctxt "ChatMonitorSettingsPage|"
msgid "Ignore:"
msgstr "Ignore:"
-#: ../src/qtui/chatmonitorview.cpp:52
+#: ../src/qtui/chatmonitorview.cpp:54
msgctxt "ChatMonitorView|"
msgid "Show Own Messages"
msgstr "Show Own Messages"
-#: ../src/qtui/chatmonitorview.cpp:59
+#: ../src/qtui/chatmonitorview.cpp:61
msgctxt "ChatMonitorView|"
msgid "Show Network Name"
msgstr "Show Network Name"
-#: ../src/qtui/chatmonitorview.cpp:64
+#: ../src/qtui/chatmonitorview.cpp:66
msgctxt "ChatMonitorView|"
msgid "Show Buffer Name"
msgstr "Show Buffer Name"
-#: ../src/qtui/chatmonitorview.cpp:71
+#: ../src/qtui/chatmonitorview.cpp:73
msgctxt "ChatMonitorView|"
msgid "Configure..."
msgstr "Configure..."
-#: ../src/qtui/chatscene.cpp:743
+#: ../src/qtui/chatscene.cpp:813
msgctxt "ChatScene|"
msgid "Copy Selection"
msgstr "Copy Selection"
msgid "Timestamp format:"
msgstr "Timestamp format:"
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:32
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:29
+msgctxt "ChatViewSettingsPage|"
+msgid ""
+"<html><head/><body><p>Usage examples:</p>\n"
+"<table cellpadding=\"2\">\n"
+"<tr><td>dd.MM.yyyy</td><td>21.05.2001</td></tr>\n"
+"<tr><td>ddd MMMM d yy</td><td>Tue May 21 01</td></tr>\n"
+"<tr><td>hh:mm:ss.zzz</td><td>14:13:09.042</td></tr>\n"
+"<tr><td>h:m:s ap</td><td>2:13:9 pm</td></tr>\n"
+"</table>\n"
+"</body></html>"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:42
msgctxt "ChatViewSettingsPage|"
msgid "[hh:mm:ss]"
msgstr "[hh:mm:ss]"
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:59
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:69
msgctxt "ChatViewSettingsPage|"
msgid "Custom chat window font:"
msgstr "Custom chat window font:"
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:92
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:102
msgctxt "ChatViewSettingsPage|"
msgid "Show colored text in the chat window"
msgstr "Show coloured text in the chat window"
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:95
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:105
msgctxt "ChatViewSettingsPage|"
msgid "Allow colored text (mIRC color codes)"
msgstr "Allow coloured text (mIRC colour codes)"
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:111
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:121
msgctxt "ChatViewSettingsPage|"
msgid ""
"Show a website preview window when hovering the mouse over a web address"
-msgstr ""
-"Show a website preview window when hovering the mouse over a web address"
+msgstr "Show a website preview window when hovering the mouse over a web address"
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:114
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:124
msgctxt "ChatViewSettingsPage|"
msgid "Show previews of webpages on URL hover"
msgstr "Show previews of webpages on URL hover"
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:130
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:140
msgctxt "ChatViewSettingsPage|"
msgid ""
"Set the marker line to the bottom of the current chat window when selecting "
"another channel"
-msgstr ""
-"Set the marker line to the bottom of the current chat window when selecting "
-"another channel"
+msgstr "Set the marker line to the bottom of the current chat window when selecting another channel"
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:133
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:143
msgctxt "ChatViewSettingsPage|"
msgid "Set marker line automatically when switching chats"
msgstr "Set marker line automatically when switching chats"
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:149
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:159
msgctxt "ChatViewSettingsPage|"
msgid "Custom Colors"
msgstr "Custom Colours"
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:167
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:177
msgctxt "ChatViewSettingsPage|"
msgid "Action:"
msgstr "Action:"
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:174
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:198
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:222
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:259
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:283
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:314
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:338
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:362
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:386
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:403
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:443
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:460
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:477
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:494
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:511
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:528
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:545
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:562
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:579
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:596
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:613
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:630
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:647
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:664
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:681
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:698
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:726
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:184
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:208
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:232
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:269
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:293
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:324
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:348
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:372
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:396
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:413
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:453
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:470
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:487
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:504
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:521
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:538
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:555
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:572
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:589
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:606
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:623
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:640
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:657
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:674
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:691
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:708
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:736
msgctxt "ChatViewSettingsPage|"
msgid "..."
msgstr "..."
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:191
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:201
msgctxt "ChatViewSettingsPage|"
msgid "Timestamp:"
msgstr "Timestamp:"
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:215
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:225
msgctxt "ChatViewSettingsPage|"
msgid "Channel message:"
msgstr "Channel message:"
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:252
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:262
msgctxt "ChatViewSettingsPage|"
msgid "Highlight foreground:"
msgstr "Highlight foreground:"
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:276
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:286
msgctxt "ChatViewSettingsPage|"
msgid "Command message:"
msgstr "Command message:"
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:300
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:310
msgctxt "ChatViewSettingsPage|"
msgid "Highlight background:"
msgstr "Highlight background:"
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:307
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:317
msgctxt "ChatViewSettingsPage|"
msgid "Server message:"
msgstr "Server message:"
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:331
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:341
msgctxt "ChatViewSettingsPage|"
msgid "Marker line:"
msgstr "Marker line:"
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:355
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:365
msgctxt "ChatViewSettingsPage|"
msgid "Error message:"
msgstr "Error message:"
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:379
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:389
msgctxt "ChatViewSettingsPage|"
msgid "Background:"
msgstr "Background:"
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:423
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:433
msgctxt "ChatViewSettingsPage|"
msgid "Use Sender Coloring"
msgstr "Use Sender Colouring"
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:719
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:729
msgctxt "ChatViewSettingsPage|"
msgid "Own messages:"
msgstr "Own messages:"
#: ../src/qtui/settingspages/chatviewsettingspage.cpp:41
msgctxt "ChatViewSettingsPage|"
-msgid "You need at 0.6 quasselcore to use this feature"
-msgstr "You need at 0.6 quasselcore to use this feature"
+msgid "You need at least version 0.6 of quasselcore to use this feature"
+msgstr "You need at least version 0.6 of quasselcore to use this feature"
-#: ../src/client/client.cpp:270
+#: ../src/client/client.cpp:320
msgctxt "Client|"
msgid "Identity already exists in client!"
msgstr "Identity already exists in client!"
-#: ../src/client/clientbacklogmanager.cpp:161
+#: ../src/client/clientauthhandler.cpp:61
+#: ../src/client/clientauthhandler.cpp:256
+msgctxt "ClientAuthHandler|"
+msgid "Unencrypted connection canceled"
+msgstr "Unencrypted connection cancelled"
+
+#: ../src/client/clientauthhandler.cpp:84
+#, qt-format
+msgctxt "ClientAuthHandler|"
+msgid "Connecting to %1..."
+msgstr "Connecting to %1..."
+
+#: ../src/client/clientauthhandler.cpp:154
+msgctxt "ClientAuthHandler|"
+msgid "Synchronizing to core..."
+msgstr "Synchronising to core..."
+
+#: ../src/client/clientauthhandler.cpp:167
+#, qt-format
+msgctxt "ClientAuthHandler|"
+msgid ""
+"<b>The Quassel Core you are trying to connect to is too old!</b><br>We need "
+"at least protocol v%1, but the core speaks v%2 only."
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:169
+msgctxt "ClientAuthHandler|"
+msgid "Incompatible protocol version, connection to core refused"
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:176
+msgctxt "ClientAuthHandler|"
+msgid "The core refused connection from this client"
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:207
+msgctxt "ClientAuthHandler|"
+msgid "Unencrypted connection cancelled"
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:275
+#, qt-format
+msgctxt "ClientAuthHandler|"
+msgid "Connected to %1"
+msgstr "Connected to %1"
+
+#: ../src/client/clientauthhandler.cpp:317
+msgctxt "ClientAuthHandler|"
+msgid "Logging in..."
+msgstr "Logging in..."
+
+#: ../src/client/clientauthhandler.cpp:322
+msgctxt "ClientAuthHandler|"
+msgid "Login canceled"
+msgstr "Login cancelled"
+
+#: ../src/client/clientbacklogmanager.cpp:178
#, qt-format
msgctxt "ClientBacklogManager|"
msgid "Processed %1 messages in %2 seconds."
msgstr "Processed %1 messages in %2 seconds."
-#: ../src/client/clientbufferviewmanager.cpp:52
+#: ../src/client/clientbufferviewmanager.cpp:60
msgctxt "ClientBufferViewManager|"
msgid "All Chats"
msgstr "All Chats"
-#: ../src/client/clientuserinputhandler.cpp:88
+#: ../src/client/clientuserinputhandler.cpp:98
msgctxt "ClientUserInputHandler|"
msgid "/JOIN expects a channel"
msgstr "/JOIN expects a channel"
-#: ../src/client/clientuserinputhandler.cpp:98
+#: ../src/client/clientuserinputhandler.cpp:110
msgctxt "ClientUserInputHandler|"
msgid "/QUERY expects at least a nick"
msgstr "/QUERY expects at least a nick"
msgid ""
"This enables periodic polling of user information using /WHO. This is mostly"
" interesting for tracking users' away status."
-msgstr ""
-"This enables periodic polling of user information using /WHO. This is mostly"
-" interesting for tracking users' away status."
+msgstr "This enables periodic polling of user information using /WHO. This is mostly interesting for tracking users' away status."
#: ../src/qtui/settingspages/connectionsettingspage.ui:131
msgctxt "ConnectionSettingsPage|"
msgid "Minimum delay between requests:"
msgstr "Minimum delay between requests:"
+#: ../src/qtui/settingspages/connectionsettingspage.ui:250
+msgctxt "ConnectionSettingsPage|"
+msgid "Enable standard-compliant CTCP behavior"
+msgstr ""
+
#: ../src/qtui/settingspages/connectionsettingspage.cpp:27
msgctxt "ConnectionSettingsPage|"
msgid "IRC"
msgstr "IRC"
-#: ../src/qtui/chatitem.cpp:683
+#: ../src/qtui/chatitem.cpp:803
msgctxt "ContentsChatItem|"
msgid "Copy Link Address"
msgstr "Copy Link Address"
-#: ../src/uisupport/contextmenuactionprovider.cpp:38
+#: ../src/uisupport/contextmenuactionprovider.cpp:39
msgctxt "ContextMenuActionProvider|"
msgid "Connect"
msgstr "Connect"
-#: ../src/uisupport/contextmenuactionprovider.cpp:39
+#: ../src/uisupport/contextmenuactionprovider.cpp:40
msgctxt "ContextMenuActionProvider|"
msgid "Disconnect"
msgstr "Disconnect"
-#: ../src/uisupport/contextmenuactionprovider.cpp:41
+#: ../src/uisupport/contextmenuactionprovider.cpp:42
msgctxt "ContextMenuActionProvider|"
msgid "Join"
msgstr "Join"
-#: ../src/uisupport/contextmenuactionprovider.cpp:42
+#: ../src/uisupport/contextmenuactionprovider.cpp:43
msgctxt "ContextMenuActionProvider|"
msgid "Part"
msgstr "Part"
-#: ../src/uisupport/contextmenuactionprovider.cpp:43
+#: ../src/uisupport/contextmenuactionprovider.cpp:44
msgctxt "ContextMenuActionProvider|"
msgid "Delete Chat(s)..."
msgstr "Delete Chat(s)..."
-#: ../src/uisupport/contextmenuactionprovider.cpp:44
+#: ../src/uisupport/contextmenuactionprovider.cpp:45
msgctxt "ContextMenuActionProvider|"
msgid "Go to Chat"
msgstr "Go to Chat"
-#: ../src/uisupport/contextmenuactionprovider.cpp:46
+#: ../src/uisupport/contextmenuactionprovider.cpp:47
msgctxt "ContextMenuActionProvider|"
msgid "Joins"
msgstr "Joins"
-#: ../src/uisupport/contextmenuactionprovider.cpp:47
+#: ../src/uisupport/contextmenuactionprovider.cpp:48
msgctxt "ContextMenuActionProvider|"
msgid "Parts"
msgstr "Parts"
-#: ../src/uisupport/contextmenuactionprovider.cpp:48
+#: ../src/uisupport/contextmenuactionprovider.cpp:49
msgctxt "ContextMenuActionProvider|"
msgid "Quits"
msgstr "Quits"
-#: ../src/uisupport/contextmenuactionprovider.cpp:49
+#: ../src/uisupport/contextmenuactionprovider.cpp:50
msgctxt "ContextMenuActionProvider|"
msgid "Nick Changes"
msgstr "Nick Changes"
-#: ../src/uisupport/contextmenuactionprovider.cpp:50
+#: ../src/uisupport/contextmenuactionprovider.cpp:51
msgctxt "ContextMenuActionProvider|"
msgid "Mode Changes"
msgstr "Mode Changes"
-#: ../src/uisupport/contextmenuactionprovider.cpp:51
+#: ../src/uisupport/contextmenuactionprovider.cpp:52
msgctxt "ContextMenuActionProvider|"
msgid "Day Changes"
msgstr "Day Changes"
-#: ../src/uisupport/contextmenuactionprovider.cpp:52
+#: ../src/uisupport/contextmenuactionprovider.cpp:53
msgctxt "ContextMenuActionProvider|"
msgid "Topic Changes"
msgstr "Topic Changes"
-#: ../src/uisupport/contextmenuactionprovider.cpp:53
+#: ../src/uisupport/contextmenuactionprovider.cpp:54
msgctxt "ContextMenuActionProvider|"
msgid "Set as Default..."
msgstr "Set as Default..."
-#: ../src/uisupport/contextmenuactionprovider.cpp:54
+#: ../src/uisupport/contextmenuactionprovider.cpp:55
msgctxt "ContextMenuActionProvider|"
msgid "Use Defaults..."
msgstr "Use Defaults..."
-#: ../src/uisupport/contextmenuactionprovider.cpp:56
+#: ../src/uisupport/contextmenuactionprovider.cpp:57
msgctxt "ContextMenuActionProvider|"
msgid "Join Channel..."
msgstr "Join Channel..."
-#: ../src/uisupport/contextmenuactionprovider.cpp:58
+#: ../src/uisupport/contextmenuactionprovider.cpp:59
msgctxt "ContextMenuActionProvider|"
msgid "Start Query"
msgstr "Start Query"
-#: ../src/uisupport/contextmenuactionprovider.cpp:59
+#: ../src/uisupport/contextmenuactionprovider.cpp:60
msgctxt "ContextMenuActionProvider|"
msgid "Show Query"
msgstr "Show Query"
-#: ../src/uisupport/contextmenuactionprovider.cpp:60
+#: ../src/uisupport/contextmenuactionprovider.cpp:61
msgctxt "ContextMenuActionProvider|"
msgid "Whois"
msgstr "Whois"
-#: ../src/uisupport/contextmenuactionprovider.cpp:62
+#: ../src/uisupport/contextmenuactionprovider.cpp:63
msgctxt "ContextMenuActionProvider|"
msgid "Version"
msgstr "Version"
-#: ../src/uisupport/contextmenuactionprovider.cpp:63
+#: ../src/uisupport/contextmenuactionprovider.cpp:64
msgctxt "ContextMenuActionProvider|"
msgid "Time"
msgstr "Time"
-#: ../src/uisupport/contextmenuactionprovider.cpp:64
+#: ../src/uisupport/contextmenuactionprovider.cpp:65
msgctxt "ContextMenuActionProvider|"
msgid "Ping"
msgstr "Ping"
-#: ../src/uisupport/contextmenuactionprovider.cpp:65
+#: ../src/uisupport/contextmenuactionprovider.cpp:66
msgctxt "ContextMenuActionProvider|"
msgid "Client info"
msgstr "Client"
-#: ../src/uisupport/contextmenuactionprovider.cpp:66
+#: ../src/uisupport/contextmenuactionprovider.cpp:67
msgctxt "ContextMenuActionProvider|"
msgid "Custom..."
msgstr "Custom..."
-#: ../src/uisupport/contextmenuactionprovider.cpp:78
+#: ../src/uisupport/contextmenuactionprovider.cpp:79
msgctxt "ContextMenuActionProvider|"
msgid "Give Operator Status"
msgstr "Give Operator Status"
-#: ../src/uisupport/contextmenuactionprovider.cpp:79
+#: ../src/uisupport/contextmenuactionprovider.cpp:80
msgctxt "ContextMenuActionProvider|"
msgid "Take Operator Status"
msgstr "Take Operator Status"
-#: ../src/uisupport/contextmenuactionprovider.cpp:80
+#: ../src/uisupport/contextmenuactionprovider.cpp:81
+msgctxt "ContextMenuActionProvider|"
+msgid "Give Half-Operator Status"
+msgstr ""
+
+#: ../src/uisupport/contextmenuactionprovider.cpp:82
+msgctxt "ContextMenuActionProvider|"
+msgid "Take Half-Operator Status"
+msgstr ""
+
+#: ../src/uisupport/contextmenuactionprovider.cpp:83
msgctxt "ContextMenuActionProvider|"
msgid "Give Voice"
msgstr "Give Voice"
-#: ../src/uisupport/contextmenuactionprovider.cpp:81
+#: ../src/uisupport/contextmenuactionprovider.cpp:84
msgctxt "ContextMenuActionProvider|"
msgid "Take Voice"
msgstr "Take Voice"
-#: ../src/uisupport/contextmenuactionprovider.cpp:82
+#: ../src/uisupport/contextmenuactionprovider.cpp:85
msgctxt "ContextMenuActionProvider|"
msgid "Kick From Channel"
msgstr "Kick From Channel"
-#: ../src/uisupport/contextmenuactionprovider.cpp:83
+#: ../src/uisupport/contextmenuactionprovider.cpp:86
msgctxt "ContextMenuActionProvider|"
msgid "Ban From Channel"
msgstr "Ban From Channel"
-#: ../src/uisupport/contextmenuactionprovider.cpp:84
+#: ../src/uisupport/contextmenuactionprovider.cpp:87
msgctxt "ContextMenuActionProvider|"
msgid "Kick && Ban"
msgstr "Kick && Ban"
-#: ../src/uisupport/contextmenuactionprovider.cpp:86
+#: ../src/uisupport/contextmenuactionprovider.cpp:89
msgctxt "ContextMenuActionProvider|"
msgid "Hide Chat(s) Temporarily"
msgstr "Hide Chat(s) Temporarily"
-#: ../src/uisupport/contextmenuactionprovider.cpp:87
+#: ../src/uisupport/contextmenuactionprovider.cpp:90
msgctxt "ContextMenuActionProvider|"
msgid "Hide Chat(s) Permanently"
msgstr "Hide Chat(s) Permanently"
-#: ../src/uisupport/contextmenuactionprovider.cpp:88
+#: ../src/uisupport/contextmenuactionprovider.cpp:91
msgctxt "ContextMenuActionProvider|"
msgid "Show Channel List"
msgstr "Show Channel List"
-#: ../src/uisupport/contextmenuactionprovider.cpp:89
+#: ../src/uisupport/contextmenuactionprovider.cpp:92
msgctxt "ContextMenuActionProvider|"
msgid "Show Ignore List"
msgstr "Show Ignore List"
-#: ../src/uisupport/contextmenuactionprovider.cpp:102
+#: ../src/uisupport/contextmenuactionprovider.cpp:105
msgctxt "ContextMenuActionProvider|"
msgid "Hide Events"
msgstr "Hide Events"
-#: ../src/uisupport/contextmenuactionprovider.cpp:110
+#: ../src/uisupport/contextmenuactionprovider.cpp:113
msgctxt "ContextMenuActionProvider|"
msgid "CTCP"
msgstr "CTCP"
-#: ../src/uisupport/contextmenuactionprovider.cpp:122
+#: ../src/uisupport/contextmenuactionprovider.cpp:128
msgctxt "ContextMenuActionProvider|"
msgid "Actions"
msgstr "Actions"
-#: ../src/uisupport/contextmenuactionprovider.cpp:126
+#: ../src/uisupport/contextmenuactionprovider.cpp:132
msgctxt "ContextMenuActionProvider|"
msgid "Ignore"
msgstr "Ignore"
-#: ../src/uisupport/contextmenuactionprovider.cpp:131
+#: ../src/uisupport/contextmenuactionprovider.cpp:137
msgctxt "ContextMenuActionProvider|"
msgid "Add Ignore Rule"
msgstr "Add Ignore Rule"
-#: ../src/uisupport/contextmenuactionprovider.cpp:132
+#: ../src/uisupport/contextmenuactionprovider.cpp:138
msgctxt "ContextMenuActionProvider|"
msgid "Existing Rules"
msgstr "Existing Rules"
-#: ../src/core/core.cpp:182
+#: ../src/core/core.cpp:193
msgctxt "Core|"
msgid "Could not initialize any storage backend! Exiting..."
msgstr "Could not initialise any storage backend! Exiting..."
-#: ../src/core/core.cpp:183
+#: ../src/core/core.cpp:194
msgctxt "Core|"
msgid ""
"Currently, Quassel supports SQLite3 and PostgreSQL. You need to build your\n"
"Qt library with the sqlite or postgres plugin enabled in order for quasselcore\n"
"to work."
-msgstr ""
-"Currently, Quassel supports SQLite3 and PostgreSQL. You need to build your\n"
-"Qt library with the sqlite or postgres plug-in enabled in order for quasselcore\n"
-"to work."
+msgstr "Currently, Quassel supports SQLite3 and PostgreSQL. You need to build your\nQt library with the sqlite or postgres plug-in enabled in order for quasselcore\nto work."
-#: ../src/core/core.cpp:232
+#: ../src/core/core.cpp:253
msgctxt "Core|"
msgid "Calling restoreState() even though active sessions exist!"
msgstr "Calling restoreState() even though active sessions exist!"
-#: ../src/core/core.cpp:273
+#: ../src/core/core.cpp:287
+msgctxt "Core|"
+msgid "Core is already configured! Not configuring again..."
+msgstr ""
+
+#: ../src/core/core.cpp:290
msgctxt "Core|"
msgid "Admin user or password not set."
msgstr "Admin user or password not set."
-#: ../src/core/core.cpp:276
+#: ../src/core/core.cpp:293
msgctxt "Core|"
msgid "Could not setup storage!"
msgstr "Could not set-up storage!"
-#: ../src/core/core.cpp:280
+#: ../src/core/core.cpp:298
msgctxt "Core|"
msgid "Creating admin user..."
msgstr "Creating admin user..."
-#: ../src/core/core.cpp:393
+#: ../src/core/core.cpp:451
#, qt-format
msgctxt "Core|"
msgid "Invalid listen address %1"
msgstr "Invalid listen address %1"
-#: ../src/core/core.cpp:401
+#: ../src/core/core.cpp:460
#, qt-format
msgctxt "Core|"
msgid "Listening for GUI clients on IPv6 %1 port %2 using protocol version %3"
-msgstr ""
-"Listening for GUI clients on IPv6 %1 port %2 using protocol version %3"
+msgstr "Listening for GUI clients on IPv6 %1 port %2 using protocol version %3"
-#: ../src/core/core.cpp:409
+#: ../src/core/core.cpp:469
#, qt-format
msgctxt "Core|"
msgid "Could not open IPv6 interface %1:%2: %3"
msgstr "Could not open IPv6 interface %1:%2: %3"
-#: ../src/core/core.cpp:417
+#: ../src/core/core.cpp:477
#, qt-format
msgctxt "Core|"
msgid "Listening for GUI clients on IPv4 %1 port %2 using protocol version %3"
-msgstr ""
-"Listening for GUI clients on IPv4 %1 port %2 using protocol version %3"
+msgstr "Listening for GUI clients on IPv4 %1 port %2 using protocol version %3"
-#: ../src/core/core.cpp:427
+#: ../src/core/core.cpp:488
#, qt-format
msgctxt "Core|"
msgid "Could not open IPv4 interface %1:%2: %3"
msgstr "Could not open IPv4 interface %1:%2: %3"
-#: ../src/core/core.cpp:435
+#: ../src/core/core.cpp:496
#, qt-format
msgctxt "Core|"
msgid "Invalid listen address %1, unknown network protocol"
msgstr "Invalid listen address %1, unknown network protocol"
-#: ../src/core/core.cpp:444
+#: ../src/core/core.cpp:505
msgctxt "Core|"
msgid "Could not open any network interfaces to listen on!"
msgstr "Could not open any network interfaces to listen on!"
-#: ../src/core/core.cpp:478
+#: ../src/core/core.cpp:545
msgctxt "Core|"
msgid "Client connected from"
msgstr "Client connected from"
-#: ../src/core/core.cpp:481
+#: ../src/core/core.cpp:548
msgctxt "Core|"
msgid "Closing server for basic setup."
msgstr "Closing server for basic set-up."
-#: ../src/core/core.cpp:500
-msgctxt "Core|"
-msgid "Antique client trying to connect... refusing."
-msgstr "Antique client trying to connect... refusing."
-
-#: ../src/core/core.cpp:512
-#, qt-format
-msgctxt "Core|"
-msgid ""
-"<b>Your Quassel Client is too old!</b><br>This core needs at least "
-"client/core protocol version %1.<br>Please consider upgrading your client."
-msgstr ""
-"<b>Your Quassel Client is too old!</b><br>This core needs at least "
-"client/core protocol version %1.<br>Please consider upgrading your client."
-
-#: ../src/core/core.cpp:516 ../src/core/core.cpp:606 ../src/core/core.cpp:630
-msgctxt "Core|"
-msgid "Client"
-msgstr "Client"
-
-#: ../src/core/core.cpp:516
-msgctxt "Core|"
-msgid "too old, rejecting."
-msgstr "too old, rejecting."
-
-#: ../src/core/core.cpp:533
-#, qt-format
-msgctxt "Core|"
-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>Built: %2<br>Up %3d%4h%5m (since %6)"
-
-#: ../src/core/core.cpp:586
-msgctxt "Core|"
-msgid "Starting TLS for Client:"
-msgstr "Starting TLS for Client:"
-
-#: ../src/core/core.cpp:604
-msgctxt "Core|"
-msgid ""
-"<b>Client not initialized!</b><br>You need to send an init message before "
-"trying to login."
-msgstr ""
-"<b>Client not initialised!</b><br>You need to send an init message before "
-"trying to log-in."
-
-#: ../src/core/core.cpp:606
-msgctxt "Core|"
-msgid "did not send an init message before trying to login, rejecting."
-msgstr "did not send an init message before trying to login, rejecting."
-
-#: ../src/core/core.cpp:624
+#: ../src/core/core.cpp:560
msgctxt "Core|"
-msgid ""
-"<b>Invalid username or password!</b><br>The username/password combination "
-"you supplied could not be found in the database."
+msgid "Non-authed client disconnected:"
msgstr ""
-"<b>Invalid username or password!</b><br>The username/password combination "
-"you supplied could not be found in the database."
-
-#: ../src/core/core.cpp:630
-#, qt-format
-msgctxt "Core|"
-msgid "initialized and authenticated successfully as \"%1\" (UserId: %2)."
-msgstr "initialised and authenticated successfully as \"%1\" (UserId: %2)."
-
-#: ../src/core/core.cpp:641
-msgctxt "Core|"
-msgid "Non-authed client disconnected."
-msgstr "Non-authed client disconnected."
-
-#: ../src/core/core.cpp:647
-msgctxt "Core|"
-msgid "Non-authed client disconnected. (socket allready destroyed)"
-msgstr "Non-authed client disconnected. (socket allready destroyed)"
-#: ../src/core/core.cpp:695
+#: ../src/core/core.cpp:592
msgctxt "Core|"
msgid "Could not initialize session for client:"
msgstr "Could not initialise session for client:"
-#: ../src/core/core.cpp:717
+#: ../src/core/core.cpp:619
msgctxt "Core|"
msgid "Could not find a session for client:"
msgstr "Could not find a session for client:"
-#: ../src/client/coreaccount.h:39
+#: ../src/client/coreaccount.h:40
msgctxt "CoreAccount|"
msgid "Internal Core"
msgstr "Internal Core"
#: ../src/qtui/settingspages/coreaccounteditdlg.ui:14
-#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:229
+#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:260
msgctxt "CoreAccountEditDlg|"
msgid "Edit Core Account"
msgstr "Edit Core Account"
msgid "HTTP"
msgstr "HTTP"
-#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:231
+#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:262
msgctxt "CoreAccountEditDlg|"
msgid "Add Core Account"
msgstr "Add Core Account"
-#: ../src/client/coreaccountmodel.cpp:64
+#: ../src/client/coreaccountmodel.cpp:68
msgctxt "CoreAccountModel|"
msgid "Internal Core"
msgstr "Internal Core"
msgid "Remote Cores"
msgstr "Remote Cores"
+#: ../src/core/coreauthhandler.cpp:54 ../src/core/coreauthhandler.cpp:90
+msgctxt "CoreAuthHandler|"
+msgid "Client"
+msgstr "Client"
+
+#: ../src/core/coreauthhandler.cpp:54
+msgctxt "CoreAuthHandler|"
+msgid "too old, rejecting."
+msgstr "too old, rejecting."
+
+#: ../src/core/coreauthhandler.cpp:55
+#, qt-format
+msgctxt "CoreAuthHandler|"
+msgid ""
+"<b>Your Quassel Client is too old!</b><br>This core needs at least "
+"client/core protocol version %1 (got: %2).<br>Please consider upgrading your"
+" client."
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:69
+msgctxt "CoreAuthHandler|"
+msgid "Starting encryption for Client:"
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:90
+msgctxt "CoreAuthHandler|"
+msgid "did not send an init message before trying to login, rejecting."
+msgstr "did not send an init message before trying to login, rejecting."
+
+#: ../src/core/coreauthhandler.cpp:91
+msgctxt "CoreAuthHandler|"
+msgid ""
+"<b>Client not initialized!</b><br>You need to send an init message before "
+"trying to login."
+msgstr "<b>Client not initialised!</b><br>You need to send an init message before trying to log-in."
+
+#: ../src/core/coreauthhandler.cpp:105
+msgctxt "CoreAuthHandler|"
+msgid ""
+"<b>SSL is required!</b><br>You need to use SSL in order to connect to this "
+"core."
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:146
+msgctxt "CoreAuthHandler|"
+msgid ""
+"<b>Invalid username or password!</b><br>The username/password combination "
+"you supplied could not be found in the database."
+msgstr "<b>Invalid username or password!</b><br>The username/password combination you supplied could not be found in the database."
+
+#: ../src/core/coreauthhandler.cpp:151
+#, qt-format
+msgctxt "CoreAuthHandler|"
+msgid ""
+"Client %1 initialized and authenticated successfully as \"%2\" (UserId: %3)."
+msgstr ""
+
#: ../src/qtui/coreconfigwizard.cpp:69
msgctxt "CoreConfigWizard|"
msgid "Core Configuration Wizard"
msgstr "Core Configuration Wizard"
-#: ../src/qtui/coreconfigwizard.cpp:97
+#: ../src/qtui/coreconfigwizard.cpp:98
msgctxt "CoreConfigWizard|"
msgid "Your core has been successfully configured. Logging you in..."
msgstr "Your core has been successfully configured. Logging you in..."
-#: ../src/qtui/coreconfigwizard.cpp:104
+#: ../src/qtui/coreconfigwizard.cpp:107
#, qt-format
msgctxt "CoreConfigWizard|"
msgid ""
"Core configuration failed:<br><b>%1</b><br>Press <em>Next</em> to start "
"over."
-msgstr ""
-"Core configuration failed:<br><b>%1</b><br>Press <em>Next</em> to start "
-"over."
+msgstr "Core configuration failed:<br><b>%1</b><br>Press <em>Next</em> to start over."
-#: ../src/qtui/coreconfigwizard.cpp:119
+#: ../src/qtui/coreconfigwizard.cpp:126
msgctxt "CoreConfigWizard|"
msgid ""
"Your are now logged into your freshly configured Quassel Core!<br>Please "
"remember to configure your identities and networks now."
-msgstr ""
-"Your are now logged into your freshly configured Quassel Core!<br>Please "
-"remember to configure your identities and networks now."
+msgstr "Your are now logged into your freshly configured Quassel Core!<br>Please remember to configure your identities and networks now."
#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:14
msgctxt "CoreConfigWizardAdminUserPage|"
msgid ""
"<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 ""
-"<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 "<b>Note:</b> Adding more users and changing your username/password is not possible via Quassel's client interface yet.\nIf you need to do these things, please run \"<tt><nobr>quasselcore --help</nobr></tt>\"."
#: ../src/qtui/ui/coreconfigwizardintropage.ui:13
msgctxt "CoreConfigWizardIntroPage|"
msgid "This wizard will guide you through the setup of your Quassel Core."
msgstr "This wizard will guide you through the set-up of your Quassel Core."
-#: ../src/qtui/coreconfigwizard.cpp:150
+#: ../src/qtui/coreconfigwizard.cpp:162
msgctxt "CoreConfigWizardPages::AdminUserPage|"
msgid "Create Admin User"
msgstr "Create Admin User"
-#: ../src/qtui/coreconfigwizard.cpp:151
+#: ../src/qtui/coreconfigwizard.cpp:163
msgctxt "CoreConfigWizardPages::AdminUserPage|"
msgid ""
"First, we will create a user on the core. This first user will have "
"administrator privileges."
-msgstr ""
-"First, we will create a user on the core. This first user will have "
-"administrator privileges."
+msgstr "First, we will create a user on the core. This first user will have administrator privileges."
-#: ../src/qtui/coreconfigwizard.cpp:135
+#: ../src/qtui/coreconfigwizard.cpp:145
msgctxt "CoreConfigWizardPages::IntroPage|"
msgid "Introduction"
msgstr "Introduction"
-#: ../src/qtui/coreconfigwizard.cpp:182
+#: ../src/qtui/coreconfigwizard.cpp:198
msgctxt "CoreConfigWizardPages::StorageSelectionPage|"
msgid "Select Storage Backend"
msgstr "Select Storage Backend"
-#: ../src/qtui/coreconfigwizard.cpp:183
+#: ../src/qtui/coreconfigwizard.cpp:199
msgctxt "CoreConfigWizardPages::StorageSelectionPage|"
msgid ""
"Please select a database backend for the Quassel Core storage to store the "
"backlog and other data in."
-msgstr ""
-"Please select a database backend for the Quassel Core storage to store the "
-"backlog and other data in."
+msgstr "Please select a database backend for the Quassel Core storage to store the backlog and other data in."
-#: ../src/qtui/coreconfigwizard.cpp:277
+#: ../src/qtui/coreconfigwizard.cpp:300
msgctxt "CoreConfigWizardPages::StorageSelectionPage|"
msgid "Connection Properties"
msgstr "Connection Properties"
-#: ../src/qtui/coreconfigwizard.cpp:317
+#: ../src/qtui/coreconfigwizard.cpp:342
msgctxt "CoreConfigWizardPages::SyncPage|"
msgid "Storing Your Settings"
msgstr "Storing Your Settings"
-#: ../src/qtui/coreconfigwizard.cpp:318
+#: ../src/qtui/coreconfigwizard.cpp:343
msgctxt "CoreConfigWizardPages::SyncPage|"
msgid ""
"Your settings are now stored in the core, and you will be logged in "
"automatically."
-msgstr ""
-"Your settings are now stored in the core, and you will be logged in "
-"automatically."
+msgstr "Your settings are now stored in the core, and you will be logged in automatically."
#: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:13
msgctxt "CoreConfigWizardStorageSelectionPage|"
msgid "Remember password"
msgstr "Remember password"
-#: ../src/qtui/coreconnectdlg.cpp:75
+#: ../src/qtui/coreconnectdlg.cpp:81
#, qt-format
msgctxt "CoreConnectAuthDlg|"
msgid "Please enter your credentials for %1:"
msgstr "Please enter your credentials for %1:"
-#: ../src/qtui/coreconnectdlg.cpp:40
+#: ../src/qtui/coreconnectdlg.cpp:41
msgctxt "CoreConnectDlg|"
msgid "Connect to Core"
msgstr "Connect to Core"
-#: ../src/client/coreconnection.cpp:168
+#: ../src/client/coreconnection.cpp:193
msgctxt "CoreConnection|"
msgid "Network is down"
msgstr "Network is down"
-#: ../src/client/coreconnection.cpp:202 ../src/client/coreconnection.cpp:321
+#: ../src/client/coreconnection.cpp:227 ../src/client/coreconnection.cpp:328
msgctxt "CoreConnection|"
msgid "Disconnected"
msgstr "Disconnected"
-#: ../src/client/coreconnection.cpp:205
+#: ../src/client/coreconnection.cpp:230
#, qt-format
msgctxt "CoreConnection|"
msgid "Looking up %1..."
msgstr "Looking up %1..."
-#: ../src/client/coreconnection.cpp:208 ../src/client/coreconnection.cpp:450
+#: ../src/client/coreconnection.cpp:233
#, qt-format
msgctxt "CoreConnection|"
msgid "Connecting to %1..."
msgstr "Connecting to %1..."
-#: ../src/client/coreconnection.cpp:211 ../src/client/coreconnection.cpp:573
+#: ../src/client/coreconnection.cpp:236
#, qt-format
msgctxt "CoreConnection|"
msgid "Connected to %1"
msgstr "Connected to %1"
-#: ../src/client/coreconnection.cpp:214
+#: ../src/client/coreconnection.cpp:239
#, qt-format
msgctxt "CoreConnection|"
msgid "Disconnecting from %1..."
msgstr "Disconnecting from %1..."
-#: ../src/client/coreconnection.cpp:272
-msgctxt "CoreConnection|"
-msgid ""
-"The Quassel Core you try to connect to is too old! Please consider "
-"upgrading."
-msgstr ""
-"The Quassel Core you try to connect to is too old! Please consider "
-"upgrading."
-
-#: ../src/client/coreconnection.cpp:300
-msgctxt "CoreConnection|"
-msgid "Invalid data received from core"
-msgstr "Invalid data received from core"
-
-#: ../src/client/coreconnection.cpp:349
+#: ../src/client/coreconnection.cpp:363
msgctxt "CoreConnection|"
msgid "Disconnected from core."
msgstr "Disconnected from core."
-#: ../src/client/coreconnection.cpp:427 ../src/client/coreconnection.cpp:511
-#: ../src/client/coreconnection.cpp:556
-msgctxt "CoreConnection|"
-msgid "Unencrypted connection canceled"
-msgstr "Unencrypted connection cancelled"
-
-#: ../src/client/coreconnection.cpp:457
-msgctxt "CoreConnection|"
-msgid "Synchronizing to core..."
-msgstr "Synchronising to core..."
-
-#: ../src/client/coreconnection.cpp:478
-#, qt-format
-msgctxt "CoreConnection|"
-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>The Quassel Core you are trying to connect to is too old!</b><br>Need at "
-"least core/client protocol v%1 to connect."
-
-#: ../src/client/coreconnection.cpp:592
-msgctxt "CoreConnection|"
-msgid "Logging in..."
-msgstr "Logging in..."
-
-#: ../src/client/coreconnection.cpp:597
-msgctxt "CoreConnection|"
-msgid "Login canceled"
-msgstr "Login cancelled"
-
-#: ../src/client/coreconnection.cpp:622
+#: ../src/client/coreconnection.cpp:501
msgctxt "CoreConnection|"
msgid "Receiving session state"
msgstr "Receiving session state"
-#: ../src/client/coreconnection.cpp:624
+#: ../src/client/coreconnection.cpp:503
#, qt-format
msgctxt "CoreConnection|"
msgid "Synchronizing to %1..."
msgstr "Synchronising to %1..."
-#: ../src/client/coreconnection.cpp:648
+#: ../src/client/coreconnection.cpp:539
msgctxt "CoreConnection|"
msgid "Receiving network states"
msgstr "Receiving network states"
-#: ../src/client/coreconnection.cpp:698
+#: ../src/client/coreconnection.cpp:590
#, qt-format
msgctxt "CoreConnection|"
msgid "Synchronized to %1"
msgid ""
"Rely on KDE's hardware layer to detect if we're online. Recommended for most"
" KDE users"
-msgstr ""
-"Rely on KDE's hardware layer to detect if we're online. Recommended for most"
-" KDE users"
+msgstr "Rely on KDE's hardware layer to detect if we're online. Recommended for most KDE users"
#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:29
msgctxt "CoreConnectionSettingsPage|"
msgid ""
"Actively ping the remote core and disconnect if we didn't get a reply after "
"a certain time"
-msgstr ""
-"Actively ping the remote core and disconnect if we didn't get a reply after "
-"a certain time"
+msgstr "Actively ping the remote core and disconnect if we didn't get a reply after a certain time"
#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:44
msgctxt "CoreConnectionSettingsPage|"
msgid ""
"Only disconnect if the network socket gets closed by the operating system. "
"This may take a long time after actually losing connectivity"
-msgstr ""
-"Only disconnect if the network socket gets closed by the operating system. "
-"This may take a long time after actually losing connectivity"
+msgstr "Only disconnect if the network socket gets closed by the operating system. This may take a long time after actually losing connectivity"
#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:103
msgctxt "CoreConnectionSettingsPage|"
msgid "Message"
msgstr "Message"
-#: ../src/qtui/coreconnectionstatuswidget.cpp:61
+#: ../src/qtui/coreconnectionstatuswidget.cpp:66
msgctxt "CoreConnectionStatusWidget|seconds"
msgid "s"
msgstr "s"
-#: ../src/qtui/coreconnectionstatuswidget.cpp:61
+#: ../src/qtui/coreconnectionstatuswidget.cpp:66
msgctxt "CoreConnectionStatusWidget|milliseconds"
msgid "ms"
msgstr "ms"
-#: ../src/qtui/coreconnectionstatuswidget.cpp:62
+#: ../src/qtui/coreconnectionstatuswidget.cpp:67
#, qt-format
msgctxt "CoreConnectionStatusWidget|"
msgid "(Lag: %1 %2)"
msgstr "(Lag: %1 %2)"
-#: ../src/qtui/coreconnectionstatuswidget.cpp:75
+#: ../src/qtui/coreconnectionstatuswidget.cpp:83
msgctxt "CoreConnectionStatusWidget|"
msgid "The connection to your core is encrypted with SSL."
msgstr "The connection to your core is encrypted with SSL."
-#: ../src/qtui/coreconnectionstatuswidget.cpp:78
+#: ../src/qtui/coreconnectionstatuswidget.cpp:87
msgctxt "CoreConnectionStatusWidget|"
msgid "The connection to your core is not encrypted."
msgstr "The connection to your core is not encrypted."
msgid "Close"
msgstr "Close"
-#: ../src/qtui/coreinfodlg.cpp:53
+#: ../src/qtui/coreinfodlg.cpp:57
#, qt-format
msgctxt "CoreInfoDlg|"
msgid "%n Day(s)"
msgid_plural "%n Day(s)"
-msgstr[0] "%n Day(s)"
-msgstr[1] "%n Day(s)"
+msgstr[0] "%n Day"
+msgstr[1] "%n Days"
-#: ../src/qtui/coreinfodlg.cpp:54
+#: ../src/qtui/coreinfodlg.cpp:58
#, qt-format
msgctxt "CoreInfoDlg|"
msgid " %1:%2:%3 (since %4)"
msgstr " %1:%2:%3 (since %4)"
-#: ../src/core/corenetwork.cpp:148
+#: ../src/core/corenetwork.cpp:167
msgctxt "CoreNetwork|"
msgid "Connection failed. Cycling to next Server"
msgstr "Connection failed. Cycling to next Server"
-#: ../src/core/corenetwork.cpp:156 ../src/core/corenetwork.cpp:157
+#: ../src/core/corenetwork.cpp:175 ../src/core/corenetwork.cpp:176
#, qt-format
msgctxt "CoreNetwork|"
msgid "Connecting to %1:%2..."
msgstr "Connecting to %1:%2..."
-#: ../src/core/corenetwork.cpp:205
+#: ../src/core/corenetwork.cpp:228
#, qt-format
msgctxt "CoreNetwork|"
msgid "Disconnecting. (%1)"
msgstr "Disconnecting. (%1)"
-#: ../src/core/corenetwork.cpp:205
+#: ../src/core/corenetwork.cpp:228
msgctxt "CoreNetwork|"
msgid "Core Shutdown"
msgstr "Core Shutdown"
-#: ../src/core/corenetwork.cpp:343
+#: ../src/core/corenetwork.cpp:423
#, qt-format
msgctxt "CoreNetwork|"
msgid "Could not connect to %1 (%2)"
msgstr "Could not connect to %1 (%2)"
-#: ../src/core/corenetwork.cpp:345
+#: ../src/core/corenetwork.cpp:425
#, qt-format
msgctxt "CoreNetwork|"
msgid "Connection failure: %1"
msgstr "Connection failure: %1"
-#: ../src/core/coresession.cpp:214
+#: ../src/core/coresession.cpp:230
msgctxt "CoreSession|"
msgid "Client"
msgstr "Client"
-#: ../src/core/coresession.cpp:214
+#: ../src/core/coresession.cpp:230
#, qt-format
msgctxt "CoreSession|"
msgid "disconnected (UserId: %1)."
msgstr "disconnected (UserId: %1)."
-#: ../src/core/coresession.cpp:440
+#: ../src/core/coresession.cpp:477
#, qt-format
msgctxt "CoreSession|"
msgid ""
"CoreSession::createNetwork(): Got invalid networkId from Core when trying to"
" create network %1!"
-msgstr ""
-"CoreSession::createNetwork(): Got invalid networkId from Core when trying to"
-" create network %1!"
+msgstr "CoreSession::createNetwork(): Got invalid networkId from Core when trying to create network %1!"
-#: ../src/core/coresession.cpp:472
+#: ../src/core/coresession.cpp:509
msgctxt "CoreSession|"
msgid ""
"CoreSession::createNetwork(): Trying to create a network that already "
"exists, updating instead!"
-msgstr ""
-"CoreSession::createNetwork(): Trying to create a network that already "
-"exists, updating instead!"
+msgstr "CoreSession::createNetwork(): Trying to create a network that already exists, updating instead!"
-#: ../src/core/coresessioneventprocessor.cpp:65
+#: ../src/core/coresessioneventprocessor.cpp:78
msgctxt "CoreSessionEventProcessor|"
msgid ""
"No free and valid nicks in nicklist found. use: /nick <othernick> to "
"continue"
+msgstr "No free and valid nicks in nicklist found. use: /nick <othernick> to continue"
+
+#: ../src/core/coresessioneventprocessor.cpp:450
+msgctxt "CoreSessionEventProcessor|"
+msgid "Unable to perform key exchange, missing qca-ossl plugin."
+msgstr ""
+
+#: ../src/core/coresessioneventprocessor.cpp:461
+msgctxt "CoreSessionEventProcessor|"
+msgid "Unable to parse the DH1080_INIT. Key exchange failed."
+msgstr ""
+
+#: ../src/core/coresessioneventprocessor.cpp:465
+#: ../src/core/coresessioneventprocessor.cpp:473
+msgctxt "CoreSessionEventProcessor|"
+msgid "Your key is set and messages will be encrypted."
+msgstr ""
+
+#: ../src/core/coresessioneventprocessor.cpp:475
+msgctxt "CoreSessionEventProcessor|"
+msgid "Failed to parse DH1080_FINISH. Key exchange failed."
+msgstr ""
+
+#: ../src/core/coresessioneventprocessor.cpp:1056
+msgctxt "CoreSessionEventProcessor|"
+msgid "Reverse DCC SEND not supported"
+msgstr ""
+
+#: ../src/core/coresessioneventprocessor.cpp:1074
+#, qt-format
+msgctxt "CoreSessionEventProcessor|"
+msgid "DCC %1 not supported"
+msgstr ""
+
+#: ../src/core/coretransfer.cpp:58
+msgctxt "CoreTransfer|"
+msgid "Socket closed while still transferring!"
+msgstr ""
+
+#: ../src/core/coretransfer.cpp:70
+#, qt-format
+msgctxt "CoreTransfer|"
+msgid "DCC connection error: %1"
+msgstr ""
+
+#: ../src/core/coretransfer.cpp:114
+msgctxt "CoreTransfer|"
+msgid "Reverse DCC not supported yet!"
+msgstr ""
+
+#: ../src/core/coretransfer.cpp:160
+msgctxt "CoreTransfer|"
+msgid "DCC Receive: Got more data than expected!"
+msgstr ""
+
+#: ../src/core/coretransfer.cpp:176
+msgctxt "CoreTransfer|"
+msgid "DCC Receive: Quassel Client disconnected during transfer!"
msgstr ""
-"No free and valid nicks in nicklist found. use: /nick <othernick> to "
-"continue"
-#: ../src/core/coreuserinputhandler.cpp:81
+#: ../src/core/coreuserinputhandler.cpp:88
msgctxt "CoreUserInputHandler|"
msgid "away"
msgstr "away"
-#: ../src/core/coreuserinputhandler.cpp:150
+#: ../src/core/coreuserinputhandler.cpp:169
#, qt-format
msgctxt "CoreUserInputHandler|"
msgid "sending CTCP-%1 request to %2"
msgstr "sending CTCP-%1 request to %2"
-#: ../src/core/coreuserinputhandler.cpp:177
+#: ../src/core/coreuserinputhandler.cpp:190
+#: ../src/core/coreuserinputhandler.cpp:361
+#: ../src/core/coreuserinputhandler.cpp:606
+#: ../src/core/coreuserinputhandler.cpp:644
msgctxt "CoreUserInputHandler|"
msgid ""
-"[usage] /delkey <nick|channel> deletes the encryption key for nick or "
-"channel or just /delkey when in a channel or query."
+"Error: QCA provider plugin not found. It is usually provided by the qca-ossl"
+" plugin."
msgstr ""
+
+#: ../src/core/coreuserinputhandler.cpp:201
+msgctxt "CoreUserInputHandler|"
+msgid ""
"[usage] /delkey <nick|channel> deletes the encryption key for nick or "
"channel or just /delkey when in a channel or query."
+msgstr "[usage] /delkey <nick|channel> deletes the encryption key for nick or channel or just /delkey when in a channel or query."
-#: ../src/core/coreuserinputhandler.cpp:184
-#: ../src/core/coreuserinputhandler.cpp:517
+#: ../src/core/coreuserinputhandler.cpp:208
+#: ../src/core/coreuserinputhandler.cpp:662
#, qt-format
msgctxt "CoreUserInputHandler|"
msgid "No key has been set for %1."
msgstr "No key has been set for %1."
-#: ../src/core/coreuserinputhandler.cpp:197
+#: ../src/core/coreuserinputhandler.cpp:213
#, qt-format
msgctxt "CoreUserInputHandler|"
msgid "The key for %1 has been deleted."
msgstr "The key for %1 has been deleted."
-#: ../src/core/coreuserinputhandler.cpp:201
-#: ../src/core/coreuserinputhandler.cpp:525
+#: ../src/core/coreuserinputhandler.cpp:217
+#: ../src/core/coreuserinputhandler.cpp:670
msgctxt "CoreUserInputHandler|"
msgid ""
"Error: Setting an encryption key requires Quassel to have been built with "
"support for the Qt Cryptographic Architecture (QCA2) library. Contact your "
"distributor about a Quassel package with QCA2 support, or rebuild Quassel "
"with QCA2 present."
+msgstr "Error: Setting an encryption key requires Quassel to have been built with support for the Qt Cryptographic Architecture (QCA2) library. Contact your distributor about a Quassel package with QCA2 support, or rebuild Quassel with QCA2 present."
+
+#: ../src/core/coreuserinputhandler.cpp:371
+msgctxt "CoreUserInputHandler|"
+msgid ""
+"[usage] /keyx [<nick>] Initiates a DH1080 key exchange with the target."
msgstr ""
-"Error: Setting an encryption key requires Quassel to have been built with "
-"support for the Qt Cryptographic Architecture (QCA2) library. Contact your "
-"distributor about a Quassel package with QCA2 support, or rebuild Quassel "
-"with QCA2 present."
-#: ../src/core/coreuserinputhandler.cpp:422
-#, qt-format
+#: ../src/core/coreuserinputhandler.cpp:378
msgctxt "CoreUserInputHandler|"
-msgid "Starting query with %1"
+msgid "It is only possible to exchange keys in a query buffer."
msgstr ""
-#: ../src/core/coreuserinputhandler.cpp:469
+#: ../src/core/coreuserinputhandler.cpp:388
+#, qt-format
msgctxt "CoreUserInputHandler|"
-msgid ""
-"[usage] /setkey <nick|channel> <key> sets the encryption key for nick or "
-"channel. /setkey <key> when in a channel or query buffer sets the key for "
-"it."
+msgid "Failed to initiate key exchange with %1."
msgstr ""
-"[usage] /setkey <nick|channel> <key> sets the encryption key for nick or "
-"channel. /setkey <key> when in a channel or query buffer sets the key for "
-"it."
-#: ../src/core/coreuserinputhandler.cpp:484
+#: ../src/core/coreuserinputhandler.cpp:393
#, qt-format
msgctxt "CoreUserInputHandler|"
-msgid "The key for %1 has been set."
-msgstr "The key for %1 has been set."
+msgid "Initiated key exchange with %1."
+msgstr ""
-#: ../src/core/coreuserinputhandler.cpp:487
+#: ../src/core/coreuserinputhandler.cpp:397
+#: ../src/core/coreuserinputhandler.cpp:628
msgctxt "CoreUserInputHandler|"
msgid ""
"Error: Setting an encryption key requires Quassel to have been built with "
"support for the Qt Cryptographic Architecture (QCA) library. Contact your "
"distributor about a Quassel package with QCA support, or rebuild Quassel "
"with QCA present."
+msgstr "Error: Setting an encryption key requires Quassel to have been built with support for the Qt Cryptographic Architecture (QCA) library. Contact your distributor about a Quassel package with QCA support, or rebuild Quassel with QCA present."
+
+#: ../src/core/coreuserinputhandler.cpp:556
+#, qt-format
+msgctxt "CoreUserInputHandler|"
+msgid "Starting query with %1"
msgstr ""
-"Error: Setting an encryption key requires Quassel to have been built with "
-"support for the Qt Cryptographic Architecture (QCA) library. Contact your "
-"distributor about a Quassel package with QCA support, or rebuild Quassel "
-"with QCA present."
-#: ../src/core/coreuserinputhandler.cpp:509
+#: ../src/core/coreuserinputhandler.cpp:616
+msgctxt "CoreUserInputHandler|"
+msgid ""
+"[usage] /setkey <nick|channel> <key> sets the encryption key for nick or "
+"channel. /setkey <key> when in a channel or query buffer sets the key for "
+"it."
+msgstr "[usage] /setkey <nick|channel> <key> sets the encryption key for nick or channel. /setkey <key> when in a channel or query buffer sets the key for it."
+
+#: ../src/core/coreuserinputhandler.cpp:625
+#, qt-format
+msgctxt "CoreUserInputHandler|"
+msgid "The key for %1 has been set."
+msgstr "The key for %1 has been set."
+
+#: ../src/core/coreuserinputhandler.cpp:654
msgctxt "CoreUserInputHandler|"
msgid ""
"[usage] /showkey <nick|channel> shows the encryption key for nick or channel"
" or just /showkey when in a channel or query."
-msgstr ""
-"[usage] /delkey <nick|channel> deletes the encryption key for nick or "
-"channel or just /delkey when in a channel or query."
+msgstr "[usage] /delkey <nick|channel> deletes the encryption key for nick or channel or just /delkey when in a channel or query."
-#: ../src/core/coreuserinputhandler.cpp:521
+#: ../src/core/coreuserinputhandler.cpp:666
#, qt-format
msgctxt "CoreUserInputHandler|"
-msgid "The key for %1 is %2"
-msgstr "Homepage for %1 is %2"
+msgid "The key for %1 is %2:%3"
+msgstr ""
-#: ../src/core/coreuserinputhandler.cpp:633
+#: ../src/core/coreuserinputhandler.cpp:794
#, qt-format
msgctxt "CoreUserInputHandler|"
msgid "[Error] Could not encrypt your message: %1"
msgid "Close"
msgstr "Close"
-#: ../src/core/eventstringifier.cpp:133 ../src/core/eventstringifier.cpp:250
+#: ../src/qtui/dockmanagernotificationbackend.cpp:184
+msgctxt "DockManagerNotificationBackend::ConfigWidget|"
+msgid "Mark dockmanager entry"
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:224 ../src/core/eventstringifier.cpp:370
msgctxt "EventStringifier|"
msgid "[Whois] "
msgstr "[Whois] %1"
-#: ../src/core/eventstringifier.cpp:145
+#: ../src/core/eventstringifier.cpp:239
#, qt-format
msgctxt "EventStringifier|"
msgid "%1 invited you to channel %2"
msgstr "%1 invited you to channel %2"
-#: ../src/core/eventstringifier.cpp:230
+#: ../src/core/eventstringifier.cpp:341
#, qt-format
msgctxt "EventStringifier|"
msgid "%1 has changed topic for %2 to: \"%3\""
msgstr "%1 has changed topic for %2 to: \"%3\""
-#: ../src/core/eventstringifier.cpp:237
+#: ../src/core/eventstringifier.cpp:347
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "[Operwall] %1: %2"
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:355
msgctxt "EventStringifier|"
msgid ""
"Received non-RFC-compliant RPL_ISUPPORT: this can lead to unexpected "
"behavior!"
-msgstr ""
-"Received non RFC compliant RPL_ISUPPORT: this can lead to unexpected "
-"behaviour!"
+msgstr "Received non RFC compliant RPL_ISUPPORT: this can lead to unexpected behaviour!"
-#: ../src/core/eventstringifier.cpp:263
+#: ../src/core/eventstringifier.cpp:384
#, qt-format
msgctxt "EventStringifier|"
msgid "%1 is away: \"%2\""
msgstr "%1 is away: \"%2\""
-#: ../src/core/eventstringifier.cpp:268
+#: ../src/core/eventstringifier.cpp:391
msgctxt "EventStringifier|"
msgid "You are no longer marked as being away"
msgstr ""
-#: ../src/core/eventstringifier.cpp:274
+#: ../src/core/eventstringifier.cpp:399
msgctxt "EventStringifier|"
msgid "You have been marked as being away"
msgstr ""
-#: ../src/core/eventstringifier.cpp:294
+#: ../src/core/eventstringifier.cpp:421
#, qt-format
msgctxt "EventStringifier|"
msgid "[Whois] %1 is %2 (%3)"
msgstr "[Whois] %1 is %2 (%3)"
-#: ../src/core/eventstringifier.cpp:308
+#: ../src/core/eventstringifier.cpp:437
#, qt-format
msgctxt "EventStringifier|"
msgid "[Whois] %1 is online via %2 (%3)"
msgstr "%1 is online via %2 (%3)"
-#: ../src/core/eventstringifier.cpp:310
+#: ../src/core/eventstringifier.cpp:439
#, qt-format
msgctxt "EventStringifier|"
msgid "[Whowas] %1 was online via %2 (%3)"
msgstr "[Whowas] %1 was %2 (%3)"
-#: ../src/core/eventstringifier.cpp:318
+#: ../src/core/eventstringifier.cpp:449
#, qt-format
msgctxt "EventStringifier|"
msgid "[Whowas] %1 was %2@%3 (%4)"
msgstr ""
-#: ../src/core/eventstringifier.cpp:325
+#: ../src/core/eventstringifier.cpp:458
#, qt-format
msgctxt "EventStringifier|"
msgid "[Who] End of /WHO list for %1"
msgstr "[Who] End of /WHO list for %1"
-#: ../src/core/eventstringifier.cpp:335
+#: ../src/core/eventstringifier.cpp:470
#, qt-format
msgctxt "EventStringifier|"
msgid "[Whois] %1 is logged in since %2"
msgstr "[Whois] %1 is logged in since %2"
-#: ../src/core/eventstringifier.cpp:337
+#: ../src/core/eventstringifier.cpp:474
#, qt-format
msgctxt "EventStringifier|"
msgid "[Whois] %1 is idling for %2 (since %3)"
msgstr "[Whois] %1 is idling for %2 (%3)"
-#: ../src/core/eventstringifier.cpp:344
+#: ../src/core/eventstringifier.cpp:484
msgctxt "EventStringifier|"
msgid "[Whois] End of /WHOIS list"
msgstr "[Who] End of /WHO list for %1"
-#: ../src/core/eventstringifier.cpp:365
+#: ../src/core/eventstringifier.cpp:507
#, qt-format
msgctxt "EventStringifier|"
msgid "[Whois] %1 is a user on channels: %2"
msgstr "[Whois] %1 is a user on channels: %2"
-#: ../src/core/eventstringifier.cpp:367
+#: ../src/core/eventstringifier.cpp:509
#, qt-format
msgctxt "EventStringifier|"
msgid "[Whois] %1 has voice on channels: %2"
msgstr "[Whois] %1 has voice on channels: %2"
-#: ../src/core/eventstringifier.cpp:369
+#: ../src/core/eventstringifier.cpp:511
#, qt-format
msgctxt "EventStringifier|"
msgid "[Whois] %1 is an operator on channels: %2"
msgstr "[Whois] %1 is an operator on channels: %2"
-#: ../src/core/eventstringifier.cpp:388
+#: ../src/core/eventstringifier.cpp:532
#, qt-format
msgctxt "EventStringifier|"
msgid "Channel %1 has %2 users. Topic is: \"%3\""
msgstr "Channel %1 has %2 users. Topic is: %3"
-#: ../src/core/eventstringifier.cpp:394
+#: ../src/core/eventstringifier.cpp:540
msgctxt "EventStringifier|"
msgid "End of channel list"
msgstr "End of channel list"
-#: ../src/core/eventstringifier.cpp:408
+#: ../src/core/eventstringifier.cpp:558
#, qt-format
msgctxt "EventStringifier|"
msgid "Homepage for %1 is %2"
msgstr "Homepage for %1 is %2"
-#: ../src/core/eventstringifier.cpp:423
+#: ../src/core/eventstringifier.cpp:575
#, qt-format
msgctxt "EventStringifier|"
msgid "Channel %1 created on %2"
msgstr "Channel %1 created on %2"
-#: ../src/core/eventstringifier.cpp:431
+#: ../src/core/eventstringifier.cpp:589
#, qt-format
msgctxt "EventStringifier|"
msgid "[Whois] %1 is authed as %2"
msgstr "[Whois] %1 is away: \"%2\""
-#: ../src/core/eventstringifier.cpp:437
+#: ../src/core/eventstringifier.cpp:592
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "[Whowas] %1 was authed as %2"
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:601
#, qt-format
msgctxt "EventStringifier|"
msgid "No topic is set for %1."
msgstr "No topic is set for %1."
-#: ../src/core/eventstringifier.cpp:443
+#: ../src/core/eventstringifier.cpp:609
#, qt-format
msgctxt "EventStringifier|"
msgid "Topic for %1 is \"%2\""
msgstr "Topic for %1 is \"%2\""
-#: ../src/core/eventstringifier.cpp:452
+#: ../src/core/eventstringifier.cpp:621
#, qt-format
msgctxt "EventStringifier|"
msgid "Topic set by %1 on %2"
msgstr "Topic set by %1 on %2"
-#: ../src/core/eventstringifier.cpp:462
+#: ../src/core/eventstringifier.cpp:634
#, qt-format
msgctxt "EventStringifier|"
msgid "%1 has been invited to %2"
msgstr "%1 has been invited to %2"
-#: ../src/core/eventstringifier.cpp:468
+#: ../src/core/eventstringifier.cpp:642
#, qt-format
msgctxt "EventStringifier|"
msgid "[Who] %1"
msgstr "[Who] %1"
-#: ../src/core/eventstringifier.cpp:473
+#: ../src/core/eventstringifier.cpp:649
msgctxt "EventStringifier|"
msgid "End of /WHOWAS"
msgstr ""
-#: ../src/core/eventstringifier.cpp:478
+#: ../src/core/eventstringifier.cpp:659
#, qt-format
msgctxt "EventStringifier|"
msgid "Nick %1 contains illegal characters"
msgstr "Nick %1 contains illegal characters"
-#: ../src/core/eventstringifier.cpp:483
+#: ../src/core/eventstringifier.cpp:669
#, qt-format
msgctxt "EventStringifier|"
msgid "Nick already in use: %1"
msgstr "Nick already in use: %1"
-#: ../src/core/eventstringifier.cpp:488
+#: ../src/core/eventstringifier.cpp:679
#, qt-format
msgctxt "EventStringifier|"
msgid "Nick/channel is temporarily unavailable: %1"
msgstr "Nick/channel is temporarily unavailable: %1"
-#: ../src/core/eventstringifier.cpp:509
+#: ../src/core/eventstringifier.cpp:702
#, qt-format
msgctxt "EventStringifier|"
msgid "sending CTCP-%1 request to %2"
msgstr "sending CTCP-%1 request to %2"
-#. Optional "unknown" in "Received unknown CTCP-FOO request by bar"
-#: ../src/core/eventstringifier.cpp:522
+#: ../src/core/eventstringifier.cpp:717
msgctxt "EventStringifier|"
msgid "unknown"
msgstr ""
-#: ../src/core/eventstringifier.cpp:523
+#: ../src/core/eventstringifier.cpp:718
#, qt-format
msgctxt "EventStringifier|"
msgid "Received %1CTCP-%2 request by %3"
msgstr ""
-#: ../src/core/eventstringifier.cpp:526
+#: ../src/core/eventstringifier.cpp:721
#, qt-format
msgctxt "EventStringifier|"
msgid "Received CTCP-%1 answer from %2: %3"
msgstr ""
-#: ../src/core/eventstringifier.cpp:537
+#: ../src/core/eventstringifier.cpp:736
#, qt-format
msgctxt "EventStringifier|"
msgid "Received CTCP-PING answer from %1 with %2 seconds round trip time"
msgstr "Received CTCP PING answer from %1 with %2 seconds round trip time"
-#: ../src/client/execwrapper.cpp:45
+#: ../src/client/execwrapper.cpp:49
#, qt-format
msgctxt "ExecWrapper|"
msgid "Invalid command string for /exec: %1"
msgstr "Invalid command string for /exec: %1"
-#: ../src/client/execwrapper.cpp:53
+#: ../src/client/execwrapper.cpp:58
#, qt-format
msgctxt "ExecWrapper|"
msgid "Name \"%1\" is invalid: ../ or ..\\ are not allowed!"
msgstr "Name \"%1\" is invalid: ../ or ..\\ are not allowed!"
-#: ../src/client/execwrapper.cpp:64
+#: ../src/client/execwrapper.cpp:69
#, qt-format
msgctxt "ExecWrapper|"
msgid "Could not find script \"%1\""
msgstr "Could not find script \"%1\""
-#: ../src/client/execwrapper.cpp:82
+#: ../src/client/execwrapper.cpp:93
#, qt-format
msgctxt "ExecWrapper|"
msgid "Script \"%1\" crashed with exit code %2."
msgstr "Script \"%1\" crashed with exit code %2."
-#: ../src/client/execwrapper.cpp:98
+#: ../src/client/execwrapper.cpp:111
#, qt-format
msgctxt "ExecWrapper|"
msgid "Script \"%1\" could not start."
msgstr "Script \"%1\" could not start."
-#: ../src/client/execwrapper.cpp:100
+#: ../src/client/execwrapper.cpp:113
#, qt-format
msgctxt "ExecWrapper|"
msgid "Script \"%1\" caused error %2."
msgstr "Script \"%1\" caused error %2."
-#: ../src/uisupport/fontselector.cpp:31
+#: ../src/uisupport/fontselector.cpp:32
msgctxt "FontSelector|"
msgid "Choose..."
msgstr "Choose..."
-#: ../src/qtui/settingspages/highlightsettingspage.ui:13
+#: ../src/qtui/settingspages/highlightsettingspage.ui:14
msgctxt "HighlightSettingsPage|"
msgid "Form"
msgstr "Form"
-#: ../src/qtui/settingspages/highlightsettingspage.ui:19
+#: ../src/qtui/settingspages/highlightsettingspage.ui:20
msgctxt "HighlightSettingsPage|"
msgid "Custom Highlights"
msgstr "Custom Highlights"
-#: ../src/qtui/settingspages/highlightsettingspage.ui:32
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:30
+#: ../src/qtui/settingspages/highlightsettingspage.ui:33
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:29
msgctxt "HighlightSettingsPage|"
msgid "Highlight"
msgstr "Highlight"
-#: ../src/qtui/settingspages/highlightsettingspage.ui:37
+#: ../src/qtui/settingspages/highlightsettingspage.ui:38
msgctxt "HighlightSettingsPage|"
msgid "RegEx"
msgstr "RegEx"
-#: ../src/qtui/settingspages/highlightsettingspage.ui:42
+#: ../src/qtui/settingspages/highlightsettingspage.ui:43
msgctxt "HighlightSettingsPage|"
msgid "CS"
msgstr "CS"
-#: ../src/qtui/settingspages/highlightsettingspage.ui:47
+#: ../src/qtui/settingspages/highlightsettingspage.ui:48
msgctxt "HighlightSettingsPage|"
msgid "Enable"
msgstr "Enable"
-#: ../src/qtui/settingspages/highlightsettingspage.ui:55
+#: ../src/qtui/settingspages/highlightsettingspage.ui:53
+msgctxt "HighlightSettingsPage|"
+msgid "Channel"
+msgstr "Channel"
+
+#: ../src/qtui/settingspages/highlightsettingspage.ui:69
msgctxt "HighlightSettingsPage|"
msgid "Add"
msgstr "Add"
-#: ../src/qtui/settingspages/highlightsettingspage.ui:62
+#: ../src/qtui/settingspages/highlightsettingspage.ui:76
msgctxt "HighlightSettingsPage|"
msgid "Remove"
msgstr "Remove"
-#: ../src/qtui/settingspages/highlightsettingspage.ui:85
+#: ../src/qtui/settingspages/highlightsettingspage.ui:101
msgctxt "HighlightSettingsPage|"
msgid "Highlight Nicks"
msgstr "Highlight Nicks"
-#: ../src/qtui/settingspages/highlightsettingspage.ui:91
+#: ../src/qtui/settingspages/highlightsettingspage.ui:107
msgctxt "HighlightSettingsPage|"
msgid "All nicks from identity"
msgstr "All nicks from identity"
-#: ../src/qtui/settingspages/highlightsettingspage.ui:98
+#: ../src/qtui/settingspages/highlightsettingspage.ui:114
msgctxt "HighlightSettingsPage|"
msgid "Current nick"
msgstr "Current nick"
-#: ../src/qtui/settingspages/highlightsettingspage.ui:108
+#: ../src/qtui/settingspages/highlightsettingspage.ui:124
msgctxt "HighlightSettingsPage|"
msgid "None"
msgstr "None"
-#: ../src/qtui/settingspages/highlightsettingspage.ui:115
+#: ../src/qtui/settingspages/highlightsettingspage.ui:131
msgctxt "HighlightSettingsPage|"
msgid "Case sensitive"
msgstr "Case sensitive"
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:30
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:29
msgctxt "HighlightSettingsPage|"
msgid "Interface"
msgstr "Interface"
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:159
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:184
msgctxt "HighlightSettingsPage|"
msgid "this shouldn't be empty"
msgstr "this shouldn't be empty"
-#: ../src/qtui/settingspages/highlightsettingspage.h:45
+#: ../src/qtui/settingspages/highlightsettingspage.h:46
msgctxt "HighlightSettingsPage|"
msgid "highlight rule"
msgstr "highlight rule"
#: ../src/qtui/settingspages/identitiessettingspage.ui:31
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:322
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:370
msgctxt "IdentitiesSettingsPage|"
msgid "Rename Identity"
msgstr "Rename Identity"
msgid "Identities"
msgstr "Identities"
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:178
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:205
msgctxt "IdentitiesSettingsPage|"
msgid ""
"<b>The following problems need to be corrected before your changes can be "
"applied:</b><ul>"
-msgstr ""
-"<b>The following problems need to be corrected before your changes can be "
-"applied:</b><ul>"
+msgstr "<b>The following problems need to be corrected before your changes can be applied:</b><ul>"
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:179
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:206
msgctxt "IdentitiesSettingsPage|"
msgid "<li>All identities need an identity name set</li>"
msgstr "<li>All identities need an identity name set</li>"
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:180
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:207
msgctxt "IdentitiesSettingsPage|"
msgid "<li>Every identity needs at least one nickname defined</li>"
msgstr "<li>Every identity needs at least one nickname defined</li>"
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:181
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:208
msgctxt "IdentitiesSettingsPage|"
msgid "<li>You need to specify a real name for every identity</li>"
msgstr "<li>You need to specify a real name for every identity</li>"
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:182
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:209
msgctxt "IdentitiesSettingsPage|"
msgid "<li>You need to specify an ident for every identity</li>"
msgstr "<li>You need to specify an ident for every identity</li>"
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:183
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:210
msgctxt "IdentitiesSettingsPage|"
msgid "</ul>"
msgstr "</ul>"
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:184
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:211
msgctxt "IdentitiesSettingsPage|"
msgid "One or more identities are invalid"
msgstr "One or more identities are invalid"
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:310
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:356
msgctxt "IdentitiesSettingsPage|"
msgid "Delete Identity?"
msgstr "Delete Identity?"
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:311
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:357
#, qt-format
msgctxt "IdentitiesSettingsPage|"
msgid "Do you really want to delete identity \"%1\"?"
msgstr "Do you really want to delete identity \"%1\"?"
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:323
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:371
#, qt-format
msgctxt "IdentitiesSettingsPage|"
msgid "Please enter a new name for the identity \"%1\"!"
msgstr "Please enter a new name for the identity \"%1\"!"
-#: ../src/common/identity.cpp:134
+#: ../src/common/identity.cpp:147
msgctxt "Identity|"
msgid "Quassel IRC User"
msgstr "Quassel IRC User"
-#: ../src/common/identity.cpp:162
+#: ../src/common/identity.cpp:177
msgctxt "Identity|"
msgid "<empty>"
msgstr "<empty>"
-#: ../src/common/identity.cpp:168
+#: ../src/common/identity.cpp:183
msgctxt "Identity|"
msgid "Gone fishing."
msgstr "Gone fishing."
-#: ../src/common/identity.cpp:172
+#: ../src/common/identity.cpp:187
msgctxt "Identity|"
msgid "Not here. No, really. not here!"
msgstr "Not here. No, really. not here!"
-#: ../src/common/identity.cpp:175
+#: ../src/common/identity.cpp:190
msgctxt "Identity|"
msgid "All Quassel clients vanished from the face of the earth..."
msgstr "All Quassel clients vanished from the face of the earth..."
-#: ../src/common/identity.cpp:178
+#: ../src/common/identity.cpp:193
msgctxt "Identity|"
msgid "Kindergarten is elsewhere!"
msgstr "Kindergarten is elsewhere!"
-#: ../src/common/identity.cpp:179 ../src/common/identity.cpp:180
+#: ../src/common/identity.cpp:194 ../src/common/identity.cpp:195
msgctxt "Identity|"
msgid "http://quassel-irc.org - Chat comfortably. Anywhere."
msgstr "http://quassel-irc.org - Chat comfortably. Anywhere."
msgstr "minutes of being idle"
#: ../src/qtui/settingspages/identityeditwidget.ui:399
-#: ../src/qtui/settingspages/identityeditwidget.cpp:219
+#: ../src/qtui/settingspages/identityeditwidget.cpp:238
msgctxt "IdentityEditWidget|"
msgid "Advanced"
msgstr "Advanced"
msgid ""
"The \"ident\" is part of your hostmask and, together with your host, "
"uniquely identifies you within the IRC network."
-msgstr ""
-"The \"ident\" is part of your hostmask and, together with your host, "
-"uniquely identifies you within the IRC network."
+msgstr "The \"ident\" is part of your hostmask and, together with your host, uniquely identifies you within the IRC network."
#: ../src/qtui/settingspages/identityeditwidget.ui:423
msgctxt "IdentityEditWidget|"
msgctxt "IdentityEditWidget|"
msgid ""
"You need an SSL Capable Client to edit your Cores SSL Key and Certificate"
-msgstr ""
-"You need an SSL Capable Client to edit your Cores SSL Key and Certificate"
+msgstr "You need an SSL Capable Client to edit your Cores SSL Key and Certificate"
#: ../src/qtui/settingspages/identityeditwidget.ui:517
msgctxt "IdentityEditWidget|"
msgid ""
"Warning: you are not connected with a secured connection to the Quassel Core!\n"
"Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificate!"
-msgstr ""
-"Warning: you are not connected with a secured connection to the Quassel Core!\n"
-"Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificate!"
+msgstr "Warning: you are not connected with a secured connection to the Quassel Core!\nProceeding will cause an unencrypted transfer of your SSL Key and SSL Certificate!"
#: ../src/qtui/settingspages/identityeditwidget.ui:546
msgctxt "IdentityEditWidget|"
msgstr "Key Type:"
#: ../src/qtui/settingspages/identityeditwidget.ui:605
-#: ../src/qtui/settingspages/identityeditwidget.cpp:317
-#: ../src/qtui/settingspages/identityeditwidget.cpp:328
+#: ../src/qtui/settingspages/identityeditwidget.cpp:353
+#: ../src/qtui/settingspages/identityeditwidget.cpp:365
msgctxt "IdentityEditWidget|"
msgid "No Key loaded"
msgstr "No Key loaded"
#: ../src/qtui/settingspages/identityeditwidget.ui:625
#: ../src/qtui/settingspages/identityeditwidget.ui:723
-#: ../src/qtui/settingspages/identityeditwidget.cpp:318
-#: ../src/qtui/settingspages/identityeditwidget.cpp:365
+#: ../src/qtui/settingspages/identityeditwidget.cpp:354
+#: ../src/qtui/settingspages/identityeditwidget.cpp:408
msgctxt "IdentityEditWidget|"
msgid "Load"
msgstr "Load"
#: ../src/qtui/settingspages/identityeditwidget.ui:663
#: ../src/qtui/settingspages/identityeditwidget.ui:697
-#: ../src/qtui/settingspages/identityeditwidget.cpp:363
-#: ../src/qtui/settingspages/identityeditwidget.cpp:364
+#: ../src/qtui/settingspages/identityeditwidget.cpp:406
+#: ../src/qtui/settingspages/identityeditwidget.cpp:407
msgctxt "IdentityEditWidget|"
msgid "No Certificate loaded"
msgstr "No Certificate loaded"
msgid "CommonName:"
msgstr "CommonName:"
-#: ../src/qtui/settingspages/identityeditwidget.cpp:290
+#: ../src/qtui/settingspages/identityeditwidget.cpp:321
msgctxt "IdentityEditWidget|"
msgid "Load a Key"
msgstr "Load a Key"
-#: ../src/qtui/settingspages/identityeditwidget.cpp:322
+#: ../src/qtui/settingspages/identityeditwidget.cpp:344
+msgctxt "IdentityEditWidget|"
+msgid "Failed to read key"
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:344
+msgctxt "IdentityEditWidget|"
+msgid ""
+"Failed to read the key file. It is either incompatible or invalid. Note that"
+" the key file must not have a passphrase."
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:359
msgctxt "IdentityEditWidget|"
msgid "RSA"
msgstr "RSA"
-#: ../src/qtui/settingspages/identityeditwidget.cpp:325
+#: ../src/qtui/settingspages/identityeditwidget.cpp:362
msgctxt "IdentityEditWidget|"
msgid "DSA"
msgstr "DSA"
-#: ../src/qtui/settingspages/identityeditwidget.cpp:330
-#: ../src/qtui/settingspages/identityeditwidget.cpp:369
+#: ../src/qtui/settingspages/identityeditwidget.cpp:367
+#: ../src/qtui/settingspages/identityeditwidget.cpp:413
msgctxt "IdentityEditWidget|"
msgid "Clear"
msgstr "Clear"
-#: ../src/qtui/settingspages/identityeditwidget.cpp:340
+#: ../src/qtui/settingspages/identityeditwidget.cpp:379
msgctxt "IdentityEditWidget|"
msgid "Load a Certificate"
msgstr "Load a Certificate"
-#: ../src/qtui/ircconnectionwizard.cpp:107
+#: ../src/qtui/ircconnectionwizard.cpp:115
msgctxt "IdentityPage|"
msgid "Setup Identity"
msgstr "Set-up Identity"
-#: ../src/qtui/ircconnectionwizard.cpp:112
+#: ../src/qtui/ircconnectionwizard.cpp:120
msgctxt "IdentityPage|"
msgid "Default Identity"
msgstr "Default Identity"
"Whenever you disable/delete the ignore rule, the messages are shown again.</p>\n"
"<p><u>Permanent:</u></p>\n"
"<p>Messages are filtered before they get stored in the database.</p>"
-msgstr ""
-"<p><b>Strictness:</b></p>\n"
-"<p><u>Dynamic:</u></p>\n"
-"<p>Messages are filtered \"on the fly\".\n"
-"Whenever you disable/delete the ignore rule, the messages are shown again.</p>\n"
-"<p><u>Permanent:</u></p>\n"
-"<p>Messages are filtered before they get stored in the database.</p>"
+msgstr "<p><b>Strictness:</b></p>\n<p><u>Dynamic:</u></p>\n<p>Messages are filtered \"on the fly\".\nWhenever you disable/delete the ignore rule, the messages are shown again.</p>\n<p><u>Permanent:</u></p>\n<p>Messages are filtered before they get stored in the database.</p>"
#: ../src/qtui/settingspages/ignorelisteditdlg.ui:35
msgctxt "IgnoreListEditDlg|"
"<i>nick!ident@host.name<i></p>\n"
"<p><u>Message:</u></p>\n"
"<p>The rule is matched against the actual message content</p>"
-msgstr ""
-"<p><b>Rule Type:</b></p>\n"
-"<p><u>Sender:</u></p>\n"
-"<p>The rule is matched against the sender string\n"
-"<i>nick!ident@host.name<i></p>\n"
-"<p><u>Message:</u></p>\n"
-"<p>The rule is matched against the actual message content</p>"
+msgstr "<p><b>Rule Type:</b></p>\n<p><u>Sender:</u></p>\n<p>The rule is matched against the sender string\n<i>nick!ident@host.name<i></p>\n<p><u>Message:</u></p>\n<p>The rule is matched against the actual message content</p>"
#: ../src/qtui/settingspages/ignorelisteditdlg.ui:66
msgctxt "IgnoreListEditDlg|"
msgctxt "IgnoreListEditDlg|"
msgid "CTCP"
msgstr "CTCP"
-
-#: ../src/qtui/settingspages/ignorelisteditdlg.ui:98
-msgctxt "IgnoreListEditDlg|"
-msgid ""
-"<p><b>Ignore rule:</b></p>\n"
-"<p>Depending on the type of the rule, the text is matched against either:</p>\n"
-"<p><u>- the message content:</u></p>\n"
-"<p><i>Example:</i>\n"
-"<br />\n"
-"<i>*foobar*</i> matches any text containing the word <i>foobar</i></p>\n"
-"<p><u>- the sender string</u> <i>(nick!ident@host.name)</i></p>\n"
-"<p><i>Examples:</i>\n"
-"<br />\n"
-"- <i>*@foobar.com</i> matches any sender from host <i>foobar.com</i>\n"
-"<br />\n"
-"- <i>stupid!.+</i> (RegEx) matches any sender with nickname <i>stupid</i> from any host</p>"
-msgstr ""
+
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:98
+msgctxt "IgnoreListEditDlg|"
+msgid ""
"<p><b>Ignore rule:</b></p>\n"
"<p>Depending on the type of the rule, the text is matched against either:</p>\n"
"<p><u>- the message content:</u></p>\n"
"- <i>*@foobar.com</i> matches any sender from host <i>foobar.com</i>\n"
"<br />\n"
"- <i>stupid!.+</i> (RegEx) matches any sender with nickname <i>stupid</i> from any host</p>"
+msgstr "<p><b>Ignore rule:</b></p>\n<p>Depending on the type of the rule, the text is matched against either:</p>\n<p><u>- the message content:</u></p>\n<p><i>Example:</i>\n<br />\n<i>*foobar*</i> matches any text containing the word <i>foobar</i></p>\n<p><u>- the sender string</u> <i>(nick!ident@host.name)</i></p>\n<p><i>Examples:</i>\n<br />\n- <i>*@foobar.com</i> matches any sender from host <i>foobar.com</i>\n<br />\n- <i>stupid!.+</i> (RegEx) matches any sender with nickname <i>stupid</i> from any host</p>"
#: ../src/qtui/settingspages/ignorelisteditdlg.ui:112
msgctxt "IgnoreListEditDlg|"
"<p> *: representing \"any amount of any character\"\n"
"<br />\n"
"?: representing \"exactly one character\"</p>"
-msgstr ""
-"<p><b>Use regular expressions:</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>Use regular expressions:</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>"
#: ../src/qtui/settingspages/ignorelisteditdlg.ui:131
msgctxt "IgnoreListEditDlg|"
"<p>The list below is interpreted as a list of networks for which the rule should match</p>\n"
"<p><u>Channel:</u></p>\n"
"<p>The list below is interpreted as a list of channels for which the rule should match</p>"
-msgstr ""
-"<p><b>Scope:</b></p>\n"
-"<p><u>Global:</u></p>\n"
-"<p>The rule is active for any channel on any network</p>\n"
-"<p><u>Network:</u></p>\n"
-"<p>The list below is interpreted as a list of networks for which the rule should match</p>\n"
-"<p><u>Channel:</u></p>\n"
-"<p>The list below is interpreted as a list of channels for which the rule should match</p>"
+msgstr "<p><b>Scope:</b></p>\n<p><u>Global:</u></p>\n<p>The rule is active for any channel on any network</p>\n<p><u>Network:</u></p>\n<p>The list below is interpreted as a list of networks for which the rule should match</p>\n<p><u>Channel:</u></p>\n<p>The list below is interpreted as a list of channels for which the rule should match</p>"
#: ../src/qtui/settingspages/ignorelisteditdlg.ui:152
msgctxt "IgnoreListEditDlg|"
"<i>#quassel*; #foobar</i>\n"
"<br />\n"
"would match on #foobar and on any channel starting with <i>#quassel</i></p>"
-msgstr ""
-"<p><b>Scope rule:</b></p>\n"
-"<p>A scope rule is a semicolon separated list of either <i>network</i> or <i>channel</i> names.</p>\n"
-"<p><i>Example:</i>\n"
-"<br />\n"
-"<i>#quassel*; #foobar</i>\n"
-"<br />\n"
-"would match on #foobar and on any channel starting with <i>#quassel</i></p>"
+msgstr "<p><b>Scope rule:</b></p>\n<p>A scope rule is a semicolon separated list of either <i>network</i> or <i>channel</i> names.</p>\n<p><i>Example:</i>\n<br />\n<i>#quassel*; #foobar</i>\n<br />\nwould match on #foobar and on any channel starting with <i>#quassel</i></p>"
#: ../src/qtui/settingspages/ignorelisteditdlg.ui:214
msgctxt "IgnoreListEditDlg|"
"<p>Only enabled rules are filtered.\n"
"<br />\n"
"For dynamic rules, disabling actually shows the filtered messages again.</p>"
-msgstr ""
-"<p><b>Enable / Disable:</b></p>\n"
-"<p>Only enabled rules are filtered.\n"
-"<br />\n"
-"For dynamic rules, disabling actually shows the filtered messages again.</p>"
+msgstr "<p><b>Enable / Disable:</b></p>\n<p>Only enabled rules are filtered.\n<br />\nFor dynamic rules, disabling actually shows the filtered messages again.</p>"
#: ../src/qtui/settingspages/ignorelisteditdlg.ui:220
msgctxt "IgnoreListEditDlg|"
msgid "Rule is enabled"
msgstr "Rule is enabled"
-#: ../src/qtui/settingspages/ignorelistmodel.cpp:69
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:71
msgctxt "IgnoreListModel|"
msgid ""
"<b>Enable / Disable:</b><br />Only enabled rules are filtered.<br />For "
"dynamic rules, disabling actually shows the filtered messages again"
-msgstr ""
-"<b>Enable / Disable:</b><br />Only enabled rules are filtered.<br />For "
-"dynamic rules, disabling actually shows the filtered messages again"
+msgstr "<b>Enable / Disable:</b><br />Only enabled rules are filtered.<br />For dynamic rules, disabling actually shows the filtered messages again"
-#: ../src/qtui/settingspages/ignorelistmodel.cpp:73
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:75
msgctxt "IgnoreListModel|"
msgid ""
"<b>Ignore rule:</b><br />Depending on the type of the rule, the text is "
"\"*@foobar.com\" matches any sender from host foobar.com<br /> "
"\"stupid!.+\" (RegEx) matches any sender with nickname \"stupid\" from any "
"host<br />"
-msgstr ""
-"<b>Ignore rule:</b><br />Depending on the type of the rule, the text is "
-"matched against either:<br /><br />- <u>the message content:</u><br "
-"/><i>Example:<i><br /> \"*foobar*\" matches any text containing the word "
-"\"foobar\"<br /><br />- <u>the sender string "
-"<i>nick!ident@host.name<i></u><br /><i>Example:</i><br /> "
-"\"*@foobar.com\" matches any sender from host foobar.com<br /> "
-"\"stupid!.+\" (RegEx) matches any sender with nickname \"stupid\" from any "
-"host<br />"
+msgstr "<b>Ignore rule:</b><br />Depending on the type of the rule, the text is matched against either:<br /><br />- <u>the message content:</u><br /><i>Example:<i><br /> \"*foobar*\" matches any text containing the word \"foobar\"<br /><br />- <u>the sender string <i>nick!ident@host.name<i></u><br /><i>Example:</i><br /> \"*@foobar.com\" matches any sender from host foobar.com<br /> \"stupid!.+\" (RegEx) matches any sender with nickname \"stupid\" from any host<br />"
-#: ../src/qtui/settingspages/ignorelistmodel.cpp:89
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:91
msgctxt "IgnoreListModel|"
msgid "By Sender"
msgstr "By Sender"
-#: ../src/qtui/settingspages/ignorelistmodel.cpp:91
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:93
msgctxt "IgnoreListModel|"
msgid "By Message"
msgstr "By Message"
-#: ../src/qtui/settingspages/ignorelistmodel.cpp:193
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:208
msgctxt "IgnoreListModel|"
msgid "Enabled"
msgstr "Enabled"
-#: ../src/qtui/settingspages/ignorelistmodel.cpp:194
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:209
msgctxt "IgnoreListModel|"
msgid "Type"
msgstr "Type"
-#: ../src/qtui/settingspages/ignorelistmodel.cpp:195
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:210
msgctxt "IgnoreListModel|"
msgid "Ignore Rule"
msgstr "Ignore Rule"
msgid "Ignore List"
msgstr "Ignore List"
-#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:128
+#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:144
msgctxt "IgnoreListSettingsPage|"
msgid "Rule already exists"
msgstr "Rule already exists"
-#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:129
+#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:145
#, qt-format
msgctxt "IgnoreListSettingsPage|"
msgid ""
"There is already a rule\n"
"\"%1\"\n"
"Please choose another rule."
-msgstr ""
-"There is already a rule\n"
-"\"%1\"\n"
-"Please choose another rule."
+msgstr "There is already a rule\n\"%1\"\nPlease choose another rule."
#: ../src/qtui/ui/indicatornotificationconfigwidget.ui:14
msgctxt "IndicatorNotificationConfigWidget|"
msgid ""
"This enables support for the Ayatana Project's application indicator "
"(libindicate)."
-msgstr ""
-"This enables support for the Ayatana Project's application indicator "
-"(libindicate)."
+msgstr "This enables support for the Ayatana Project's application indicator (libindicate)."
#: ../src/qtui/ui/indicatornotificationconfigwidget.ui:23
msgctxt "IndicatorNotificationConfigWidget|"
msgid "Form"
msgstr "Form"
-#: ../src/qtui/inputwidget.cpp:73
+#: ../src/qtui/inputwidget.cpp:74
msgctxt "InputWidget|"
msgid "White"
msgstr "White"
-#: ../src/qtui/inputwidget.cpp:73
+#: ../src/qtui/inputwidget.cpp:74
msgctxt "InputWidget|"
msgid "Black"
msgstr "Black"
-#: ../src/qtui/inputwidget.cpp:73
+#: ../src/qtui/inputwidget.cpp:74
msgctxt "InputWidget|"
msgid "Dark blue"
msgstr "Dark blue"
-#: ../src/qtui/inputwidget.cpp:73
+#: ../src/qtui/inputwidget.cpp:74
msgctxt "InputWidget|"
msgid "Dark green"
msgstr "Dark green"
-#: ../src/qtui/inputwidget.cpp:73
+#: ../src/qtui/inputwidget.cpp:74
msgctxt "InputWidget|"
msgid "Red"
msgstr "Red"
-#: ../src/qtui/inputwidget.cpp:73
+#: ../src/qtui/inputwidget.cpp:74
msgctxt "InputWidget|"
msgid "Dark red"
msgstr "Dark red"
-#: ../src/qtui/inputwidget.cpp:73
+#: ../src/qtui/inputwidget.cpp:74
msgctxt "InputWidget|"
msgid "Dark magenta"
msgstr "Dark magenta"
-#: ../src/qtui/inputwidget.cpp:73
+#: ../src/qtui/inputwidget.cpp:74
msgctxt "InputWidget|"
msgid "Orange"
msgstr "Orange"
-#: ../src/qtui/inputwidget.cpp:74
+#: ../src/qtui/inputwidget.cpp:75
msgctxt "InputWidget|"
msgid "Yellow"
msgstr "Yellow"
-#: ../src/qtui/inputwidget.cpp:74
+#: ../src/qtui/inputwidget.cpp:75
msgctxt "InputWidget|"
msgid "Green"
msgstr "Green"
-#: ../src/qtui/inputwidget.cpp:74
+#: ../src/qtui/inputwidget.cpp:75
msgctxt "InputWidget|"
msgid "Dark cyan"
msgstr "Dark cyan"
-#: ../src/qtui/inputwidget.cpp:74
+#: ../src/qtui/inputwidget.cpp:75
msgctxt "InputWidget|"
msgid "Cyan"
msgstr "Cyan"
-#: ../src/qtui/inputwidget.cpp:74
+#: ../src/qtui/inputwidget.cpp:75
msgctxt "InputWidget|"
msgid "Blue"
msgstr "Blue"
-#: ../src/qtui/inputwidget.cpp:74
+#: ../src/qtui/inputwidget.cpp:75
msgctxt "InputWidget|"
msgid "Magenta"
msgstr "Magenta"
-#: ../src/qtui/inputwidget.cpp:74
+#: ../src/qtui/inputwidget.cpp:75
msgctxt "InputWidget|"
msgid "Dark gray"
msgstr "Dark gray"
-#: ../src/qtui/inputwidget.cpp:74
+#: ../src/qtui/inputwidget.cpp:75
msgctxt "InputWidget|"
msgid "Light gray"
msgstr "Light gray"
-#: ../src/qtui/inputwidget.cpp:84 ../src/qtui/inputwidget.cpp:85
+#: ../src/qtui/inputwidget.cpp:85 ../src/qtui/inputwidget.cpp:86
msgctxt "InputWidget|"
msgid "Clear Color"
msgstr "Clear Colour"
-#: ../src/qtui/inputwidget.cpp:132
+#: ../src/qtui/inputwidget.cpp:133
msgctxt "InputWidget|"
msgid "Focus Input Line"
msgstr "Focus Input Line"
msgid "Add space after nick when completing mid-sentence"
msgstr ""
-#: ../src/qtui/settingspages/inputwidgetsettingspage.cpp:23
+#: ../src/qtui/settingspages/inputwidgetsettingspage.cpp:24
msgctxt "InputWidgetSettingsPage|"
msgid "Interface"
msgstr "Interface"
-#: ../src/qtui/settingspages/inputwidgetsettingspage.cpp:23
+#: ../src/qtui/settingspages/inputwidgetsettingspage.cpp:24
msgctxt "InputWidgetSettingsPage|"
msgid "Input Widget"
msgstr "Input Widget"
-#: ../src/qtui/ircconnectionwizard.cpp:51
+#: ../src/common/internalpeer.cpp:58
+msgctxt "InternalPeer|"
+msgid "internal connection"
+msgstr ""
+
+#: ../src/qtui/ircconnectionwizard.cpp:49
msgctxt "IrcConnectionWizard|"
msgid "Save && Connect"
msgstr "Save && Connect"
-#: ../src/client/irclistmodel.cpp:59
+#: ../src/client/irclistmodel.cpp:65
msgctxt "IrcListModel|"
msgid "Channel"
msgstr "Channel"
-#: ../src/client/irclistmodel.cpp:60
+#: ../src/client/irclistmodel.cpp:66
msgctxt "IrcListModel|"
msgid "Users"
msgstr "Users"
-#: ../src/client/irclistmodel.cpp:61
+#: ../src/client/irclistmodel.cpp:67
msgctxt "IrcListModel|"
msgid "Topic"
msgstr "Topic"
-#: ../src/client/networkmodel.cpp:806
+#: ../src/client/networkmodel.cpp:914
msgctxt "IrcUserItem|"
msgid " is away"
msgstr " is away"
-#: ../src/client/networkmodel.cpp:821
+#: ../src/client/networkmodel.cpp:929
#, qt-format
msgctxt "IrcUserItem|"
msgid "idling since %1"
msgstr "idling since %1"
-#: ../src/client/networkmodel.cpp:824
+#: ../src/client/networkmodel.cpp:932
#, qt-format
msgctxt "IrcUserItem|"
msgid "login time: %1"
msgstr "login time: %1"
-#: ../src/client/networkmodel.cpp:827
+#: ../src/client/networkmodel.cpp:935
#, qt-format
msgctxt "IrcUserItem|"
msgid "server: %1"
msgid "Other activity:"
msgstr "Other activity:"
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:272
-msgctxt "ItemViewSettingsPage|"
-msgid "1"
-msgstr "1"
-
#: ../src/qtui/settingspages/itemviewsettingspage.ui:286
msgctxt "ItemViewSettingsPage|"
msgid "Custom Nick List Colors"
msgid "Away:"
msgstr "Away:"
-#: ../src/qtui/settingspages/itemviewsettingspage.cpp:28
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:29
msgctxt "ItemViewSettingsPage|"
msgid "Interface"
msgstr "Interface"
-#: ../src/qtui/settingspages/itemviewsettingspage.cpp:28
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:29
msgctxt "ItemViewSettingsPage|"
msgid "Chat & Nick Lists"
msgstr "Chat & Nick Lists"
-#: ../src/qtui/settingspages/itemviewsettingspage.cpp:33
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:34
msgctxt "ItemViewSettingsPage|"
msgid "Network"
msgstr "Network"
-#: ../src/qtui/settingspages/itemviewsettingspage.cpp:36
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:37
msgctxt "ItemViewSettingsPage|"
msgid "Inactive"
msgstr "Inactive"
-#: ../src/qtui/settingspages/itemviewsettingspage.cpp:37
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:38
msgctxt "ItemViewSettingsPage|"
msgid "Normal"
msgstr "Normal"
-#: ../src/qtui/settingspages/itemviewsettingspage.cpp:38
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:39
msgctxt "ItemViewSettingsPage|"
msgid "Unread messages"
msgstr "Unread messages"
-#: ../src/qtui/settingspages/itemviewsettingspage.cpp:39
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:40
msgctxt "ItemViewSettingsPage|"
msgid "Highlight"
msgstr "Highlight"
-#: ../src/qtui/settingspages/itemviewsettingspage.cpp:40
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:41
msgctxt "ItemViewSettingsPage|"
msgid "Other activity"
msgstr "Other activity"
-#: ../src/qtui/knotificationbackend.cpp:115
+#: ../src/qtui/knotificationbackend.cpp:130
#, qt-format
msgctxt "KNotificationBackend|"
-msgid "%n pending highlights"
-msgid_plural "%n pending highlights"
-msgstr[0] "%n pending highlights"
+msgid "%n pending highlight(s)"
+msgid_plural "%n pending highlight(s)"
+msgstr[0] "%n pending highlight"
msgstr[1] "%n pending highlights"
-#: ../src/qtui/settingspages/keysequencewidget.cpp:77
+#: ../src/qtui/settingspages/keysequencewidget.cpp:80
msgctxt "KeySequenceButton|"
msgid "The key you just pressed is not supported by Qt."
msgstr "The key you just pressed is not supported by Qt."
-#: ../src/qtui/settingspages/keysequencewidget.cpp:78
+#: ../src/qtui/settingspages/keysequencewidget.cpp:81
msgctxt "KeySequenceButton|"
msgid "Unsupported Key"
msgstr "Unsupported Key"
-#: ../src/qtui/settingspages/keysequencewidget.cpp:169
+#: ../src/qtui/settingspages/keysequencewidget.cpp:176
msgctxt "KeySequenceWidget|"
msgid ""
"Click on the button, then enter the shortcut like you would in the program.\n"
"Example for Ctrl+a: hold the Ctrl key and press a."
-msgstr ""
-"Click on the button, then enter the shortcut like you would in the program.\n"
-"Example for Ctrl+a: hold the Ctrl key and press a."
+msgstr "Click on the button, then enter the shortcut like you would in the program.\nExample for Ctrl+a: hold the Ctrl key and press a."
-#: ../src/qtui/settingspages/keysequencewidget.cpp:259
+#: ../src/qtui/settingspages/keysequencewidget.cpp:274
msgctxt "KeySequenceWidget|Meta key"
msgid "Meta"
msgstr "Meta"
-#: ../src/qtui/settingspages/keysequencewidget.cpp:260
+#: ../src/qtui/settingspages/keysequencewidget.cpp:275
msgctxt "KeySequenceWidget|Ctrl key"
msgid "Ctrl"
msgstr "Ctrl"
-#: ../src/qtui/settingspages/keysequencewidget.cpp:261
+#: ../src/qtui/settingspages/keysequencewidget.cpp:276
msgctxt "KeySequenceWidget|Alt key"
msgid "Alt"
msgstr "Alt"
-#: ../src/qtui/settingspages/keysequencewidget.cpp:262
+#: ../src/qtui/settingspages/keysequencewidget.cpp:277
msgctxt "KeySequenceWidget|Shift key"
msgid "Shift"
msgstr "Shift"
-#: ../src/qtui/settingspages/keysequencewidget.cpp:265
+#: ../src/qtui/settingspages/keysequencewidget.cpp:281
msgctxt ""
"KeySequenceWidget|What the user inputs now will be taken as the new shortcut"
msgid "Input"
msgstr "Input"
-#: ../src/qtui/settingspages/keysequencewidget.cpp:272
+#: ../src/qtui/settingspages/keysequencewidget.cpp:288
msgctxt "KeySequenceWidget|No shortcut defined"
msgid "None"
msgstr "None"
-#: ../src/qtui/settingspages/keysequencewidget.cpp:355
-#: ../src/qtui/settingspages/keysequencewidget.cpp:361
+#: ../src/qtui/settingspages/keysequencewidget.cpp:383
+#: ../src/qtui/settingspages/keysequencewidget.cpp:389
msgctxt "KeySequenceWidget|"
msgid "Shortcut Conflict"
msgstr "Shortcut Conflict"
-#: ../src/qtui/settingspages/keysequencewidget.cpp:356
+#: ../src/qtui/settingspages/keysequencewidget.cpp:384
#, qt-format
msgctxt "KeySequenceWidget|"
msgid ""
"The \"%1\" shortcut is already in use, and cannot be configured.\n"
"Please choose another one."
-msgstr ""
-"The \"%1\" shortcut is already in use, and cannot be configured.\n"
-"Please choose another one."
+msgstr "The \"%1\" shortcut is already in use, and cannot be configured.\nPlease choose another one."
-#: ../src/qtui/settingspages/keysequencewidget.cpp:362
+#: ../src/qtui/settingspages/keysequencewidget.cpp:390
#, qt-format
msgctxt "KeySequenceWidget|"
msgid ""
"The \"%1\" shortcut is ambiguous with the shortcut for the following action:"
-msgstr ""
-"The \"%1\" shortcut is ambiguous with the shortcut for the following action:"
+msgstr "The \"%1\" shortcut is ambiguous with the shortcut for the following action:"
-#: ../src/qtui/settingspages/keysequencewidget.cpp:364
+#: ../src/qtui/settingspages/keysequencewidget.cpp:392
msgctxt "KeySequenceWidget|"
msgid "Do you want to reassign this shortcut to the selected action?"
msgstr "Do you want to reassign this shortcut to the selected action?"
-#: ../src/qtui/settingspages/keysequencewidget.cpp:367
+#: ../src/qtui/settingspages/keysequencewidget.cpp:395
msgctxt "KeySequenceWidget|"
msgid "Reassign"
msgstr "Reassign"
-#: ../src/qtui/mainwin.cpp:313
+#: ../src/common/protocols/legacy/legacypeer.cpp:175
+msgctxt "LegacyPeer|"
+msgid "Invalid handshake message!"
+msgstr ""
+
+#: ../src/common/protocols/legacy/legacypeer.cpp:246
+#, qt-format
+msgctxt "LegacyPeer|"
+msgid "Unknown protocol message of type %1"
+msgstr ""
+
+#: ../src/common/protocols/legacy/legacypeer.cpp:295
+#, qt-format
+msgctxt "LegacyPeer|"
+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>Built: %2<br>Up %3d%4h%5m (since %6)"
+
+#: ../src/qtui/mainwin.cpp:358
msgctxt "MainWin|"
msgid "General"
msgstr "General"
-#: ../src/qtui/mainwin.cpp:315
+#: ../src/qtui/mainwin.cpp:360
msgctxt "MainWin|"
msgid "&Connect to Core..."
msgstr "&Connect to Core..."
-#: ../src/qtui/mainwin.cpp:317
+#: ../src/qtui/mainwin.cpp:362
msgctxt "MainWin|"
msgid "&Disconnect from Core"
msgstr "&Disconnect from Core"
-#: ../src/qtui/mainwin.cpp:319
+#: ../src/qtui/mainwin.cpp:364
msgctxt "MainWin|"
msgid "Core &Info..."
msgstr "Core &Info..."
-#: ../src/qtui/mainwin.cpp:321
+#: ../src/qtui/mainwin.cpp:366
msgctxt "MainWin|"
msgid "Configure &Networks..."
msgstr "Configure &Networks..."
-#: ../src/qtui/mainwin.cpp:324
+#: ../src/qtui/mainwin.cpp:369
msgctxt "MainWin|"
msgid "&Quit"
msgstr "&Quit"
-#: ../src/qtui/mainwin.cpp:328
+#: ../src/qtui/mainwin.cpp:373
msgctxt "MainWin|"
msgid "&Configure Chat Lists..."
msgstr "&Configure Chat Lists..."
-#: ../src/qtui/mainwin.cpp:331
+#: ../src/qtui/mainwin.cpp:376
msgctxt "MainWin|"
msgid "&Lock Layout"
msgstr "&Lock Layout"
-#: ../src/qtui/mainwin.cpp:335
+#: ../src/qtui/mainwin.cpp:380
msgctxt "MainWin|"
msgid "Show &Search Bar"
msgstr "Show &Search Bar"
-#: ../src/qtui/mainwin.cpp:337
+#: ../src/qtui/mainwin.cpp:382
msgctxt "MainWin|"
msgid "Show Away Log"
msgstr "Show Away Log"
-#: ../src/qtui/mainwin.cpp:339
+#: ../src/qtui/mainwin.cpp:384
msgctxt "MainWin|"
msgid "Show &Menubar"
msgstr "Show &Menubar"
-#: ../src/qtui/mainwin.cpp:342
+#: ../src/qtui/mainwin.cpp:387
msgctxt "MainWin|"
msgid "Show Status &Bar"
msgstr "Show Status &Bar"
-#: ../src/qtui/mainwin.cpp:348
+#: ../src/qtui/mainwin.cpp:393
msgctxt "MainWin|"
msgid "&Full Screen Mode"
msgstr "&Fullscreen mode"
-#: ../src/qtui/mainwin.cpp:355
+#: ../src/qtui/mainwin.cpp:400
msgctxt "MainWin|"
msgid "Configure &Shortcuts..."
msgstr "Configure &Shortcuts..."
-#: ../src/qtui/mainwin.cpp:361 ../src/qtui/mainwin.cpp:365
+#: ../src/qtui/mainwin.cpp:406 ../src/qtui/mainwin.cpp:410
msgctxt "MainWin|"
msgid "&Configure Quassel..."
msgstr "&Configure Quassel..."
-#: ../src/qtui/mainwin.cpp:371
+#: ../src/qtui/mainwin.cpp:416
msgctxt "MainWin|"
msgid "&About Quassel"
msgstr "&About Quassel"
-#: ../src/qtui/mainwin.cpp:376
+#: ../src/qtui/mainwin.cpp:421
msgctxt "MainWin|"
msgid "About &Qt"
msgstr "About &Qt"
-#: ../src/qtui/mainwin.cpp:380
+#: ../src/qtui/mainwin.cpp:425
msgctxt "MainWin|"
msgid "Debug &NetworkModel"
msgstr "Debug &NetworkModel"
-#: ../src/qtui/mainwin.cpp:382
+#: ../src/qtui/mainwin.cpp:427
msgctxt "MainWin|"
msgid "Debug &BufferViewOverlay"
msgstr "Debug &BufferViewOverlay"
-#: ../src/qtui/mainwin.cpp:384
+#: ../src/qtui/mainwin.cpp:429
msgctxt "MainWin|"
msgid "Debug &MessageModel"
msgstr "Debug &MessageModel"
-#: ../src/qtui/mainwin.cpp:386
+#: ../src/qtui/mainwin.cpp:431
msgctxt "MainWin|"
msgid "Debug &HotList"
msgstr "Debug &HotList"
-#: ../src/qtui/mainwin.cpp:388
+#: ../src/qtui/mainwin.cpp:433
msgctxt "MainWin|"
msgid "Debug &Log"
msgstr "Debug &Log"
-#: ../src/qtui/mainwin.cpp:390
+#: ../src/qtui/mainwin.cpp:435
msgctxt "MainWin|"
msgid "Reload Stylesheet"
msgstr "Reload Stylesheet"
-#: ../src/qtui/mainwin.cpp:394
+#: ../src/qtui/mainwin.cpp:438
+msgctxt "MainWin|"
+msgid "Hide Current Buffer"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:442
msgctxt "MainWin|"
msgid "Navigation"
msgstr "Navigation"
-#: ../src/qtui/mainwin.cpp:396
+#: ../src/qtui/mainwin.cpp:444
msgctxt "MainWin|"
msgid "Jump to hot chat"
msgstr "Jump to hot chat"
-#: ../src/qtui/mainwin.cpp:408
+#: ../src/qtui/mainwin.cpp:456
msgctxt "MainWin|"
msgid "Set Quick Access #0"
msgstr "Set Quick Access #0"
-#: ../src/qtui/mainwin.cpp:410
+#: ../src/qtui/mainwin.cpp:458
msgctxt "MainWin|"
msgid "Set Quick Access #1"
msgstr "Set Quick Access #1"
-#: ../src/qtui/mainwin.cpp:412
+#: ../src/qtui/mainwin.cpp:460
msgctxt "MainWin|"
msgid "Set Quick Access #2"
msgstr "Set Quick Access #2"
-#: ../src/qtui/mainwin.cpp:414
+#: ../src/qtui/mainwin.cpp:462
msgctxt "MainWin|"
msgid "Set Quick Access #3"
msgstr "Set Quick Access #3"
-#: ../src/qtui/mainwin.cpp:416
+#: ../src/qtui/mainwin.cpp:464
msgctxt "MainWin|"
msgid "Set Quick Access #4"
msgstr "Set Quick Access #4"
-#: ../src/qtui/mainwin.cpp:418
+#: ../src/qtui/mainwin.cpp:466
msgctxt "MainWin|"
msgid "Set Quick Access #5"
msgstr "Set Quick Access #5"
-#: ../src/qtui/mainwin.cpp:420
+#: ../src/qtui/mainwin.cpp:468
msgctxt "MainWin|"
msgid "Set Quick Access #6"
msgstr "Set Quick Access #6"
-#: ../src/qtui/mainwin.cpp:422
+#: ../src/qtui/mainwin.cpp:470
msgctxt "MainWin|"
msgid "Set Quick Access #7"
msgstr "Set Quick Access #7"
-#: ../src/qtui/mainwin.cpp:424
+#: ../src/qtui/mainwin.cpp:472
msgctxt "MainWin|"
msgid "Set Quick Access #8"
msgstr "Set Quick Access #8"
-#: ../src/qtui/mainwin.cpp:426
+#: ../src/qtui/mainwin.cpp:474
msgctxt "MainWin|"
msgid "Set Quick Access #9"
msgstr "Set Quick Access #9"
-#: ../src/qtui/mainwin.cpp:429
+#: ../src/qtui/mainwin.cpp:477
msgctxt "MainWin|"
msgid "Quick Access #0"
msgstr "Quick Access #0"
-#: ../src/qtui/mainwin.cpp:431
+#: ../src/qtui/mainwin.cpp:479
msgctxt "MainWin|"
msgid "Quick Access #1"
msgstr "Quick Access #1"
-#: ../src/qtui/mainwin.cpp:433
+#: ../src/qtui/mainwin.cpp:481
msgctxt "MainWin|"
msgid "Quick Access #2"
msgstr "Quick Access #2"
-#: ../src/qtui/mainwin.cpp:435
+#: ../src/qtui/mainwin.cpp:483
msgctxt "MainWin|"
msgid "Quick Access #3"
msgstr "Quick Access #3"
-#: ../src/qtui/mainwin.cpp:437
+#: ../src/qtui/mainwin.cpp:485
msgctxt "MainWin|"
msgid "Quick Access #4"
msgstr "Quick Access #4"
-#: ../src/qtui/mainwin.cpp:439
+#: ../src/qtui/mainwin.cpp:487
msgctxt "MainWin|"
msgid "Quick Access #5"
msgstr "Quick Access #5"
-#: ../src/qtui/mainwin.cpp:441
+#: ../src/qtui/mainwin.cpp:489
msgctxt "MainWin|"
msgid "Quick Access #6"
msgstr "Quick Access #6"
-#: ../src/qtui/mainwin.cpp:443
+#: ../src/qtui/mainwin.cpp:491
msgctxt "MainWin|"
msgid "Quick Access #7"
msgstr "Quick Access #7"
-#: ../src/qtui/mainwin.cpp:445
+#: ../src/qtui/mainwin.cpp:493
msgctxt "MainWin|"
msgid "Quick Access #8"
msgstr "Quick Access #8"
-#: ../src/qtui/mainwin.cpp:447
+#: ../src/qtui/mainwin.cpp:495
msgctxt "MainWin|"
msgid "Quick Access #9"
msgstr "Quick Access #9"
-#: ../src/qtui/mainwin.cpp:451
+#: ../src/qtui/mainwin.cpp:499
msgctxt "MainWin|"
msgid "Activate Next Chat List"
msgstr "Activate Next Chat List"
-#: ../src/qtui/mainwin.cpp:453
+#: ../src/qtui/mainwin.cpp:501
msgctxt "MainWin|"
msgid "Activate Previous Chat List"
msgstr "Activate Previous Chat List"
-#: ../src/qtui/mainwin.cpp:455
+#: ../src/qtui/mainwin.cpp:503
msgctxt "MainWin|"
msgid "Go to Next Chat"
msgstr "Go to Next Chat"
-#: ../src/qtui/mainwin.cpp:457
+#: ../src/qtui/mainwin.cpp:505
msgctxt "MainWin|"
msgid "Go to Previous Chat"
msgstr "Go to Previous Chat"
-#: ../src/qtui/mainwin.cpp:464
+#: ../src/qtui/mainwin.cpp:514
msgctxt "MainWin|"
msgid "&File"
msgstr "&File"
-#: ../src/qtui/mainwin.cpp:477
+#: ../src/qtui/mainwin.cpp:527
msgctxt "MainWin|"
msgid "&Networks"
msgstr "&Networks"
-#: ../src/qtui/mainwin.cpp:483
+#: ../src/qtui/mainwin.cpp:533
msgctxt "MainWin|"
msgid "&View"
msgstr "&View"
-#: ../src/qtui/mainwin.cpp:484
+#: ../src/qtui/mainwin.cpp:534
msgctxt "MainWin|"
msgid "&Chat Lists"
msgstr "&Chat Lists"
-#: ../src/qtui/mainwin.cpp:486
+#: ../src/qtui/mainwin.cpp:536
msgctxt "MainWin|"
msgid "&Toolbars"
msgstr "&Toolbars"
-#: ../src/qtui/mainwin.cpp:500
+#: ../src/qtui/mainwin.cpp:550
msgctxt "MainWin|"
msgid "&Settings"
msgstr "&Settings"
-#: ../src/qtui/mainwin.cpp:509
+#: ../src/qtui/mainwin.cpp:559
msgctxt "MainWin|"
msgid "&Help"
msgstr "&Help"
-#: ../src/qtui/mainwin.cpp:517
+#: ../src/qtui/mainwin.cpp:567
msgctxt "MainWin|"
msgid "Debug"
msgstr "Debug"
-#: ../src/qtui/mainwin.cpp:746
+#: ../src/qtui/mainwin.cpp:843
msgctxt "MainWin|"
msgid "Nicks"
msgstr "Nicks"
-#: ../src/qtui/mainwin.cpp:755
+#: ../src/qtui/mainwin.cpp:852
msgctxt "MainWin|"
msgid "Show Nick List"
msgstr "Show Nick List"
-#: ../src/qtui/mainwin.cpp:766
+#: ../src/qtui/mainwin.cpp:865
msgctxt "MainWin|"
msgid "Chat Monitor"
msgstr "Chat Monitor"
-#: ../src/qtui/mainwin.cpp:778
+#: ../src/qtui/mainwin.cpp:877
msgctxt "MainWin|"
msgid "Show Chat Monitor"
msgstr "Show Chat Monitor"
-#: ../src/qtui/mainwin.cpp:782
+#: ../src/qtui/mainwin.cpp:883
msgctxt "MainWin|"
msgid "Inputline"
msgstr "Inputline"
-#: ../src/qtui/mainwin.cpp:791
+#: ../src/qtui/mainwin.cpp:892
msgctxt "MainWin|"
msgid "Show Input Line"
msgstr "Show Input Line"
-#: ../src/qtui/mainwin.cpp:804
+#: ../src/qtui/mainwin.cpp:907
msgctxt "MainWin|"
msgid "Topic"
msgstr "Topic"
-#: ../src/qtui/mainwin.cpp:816
+#: ../src/qtui/mainwin.cpp:919
msgctxt "MainWin|"
msgid "Show Topic Line"
msgstr "Show Topic Line"
-#: ../src/qtui/mainwin.cpp:894
+#: ../src/qtui/mainwin.cpp:1013
msgctxt "MainWin|"
msgid "Main Toolbar"
msgstr "Main Toolbar"
-#: ../src/qtui/mainwin.cpp:933
+#: ../src/qtui/mainwin.cpp:1058
msgctxt "MainWin|"
msgid "Connected to core."
msgstr "Connected to core."
-#: ../src/qtui/mainwin.cpp:1024
+#: ../src/qtui/mainwin.cpp:1157
msgctxt "MainWin|"
msgid "Not connected to core."
msgstr "Not connected to core."
-#: ../src/qtui/mainwin.cpp:1038 ../src/qtui/mainwin.cpp:1046
+#: ../src/qtui/mainwin.cpp:1175 ../src/qtui/mainwin.cpp:1185
msgctxt "MainWin|"
msgid "Unencrypted Connection"
msgstr "Unencrypted Connection"
-#: ../src/qtui/mainwin.cpp:1038
+#: ../src/qtui/mainwin.cpp:1175
msgctxt "MainWin|"
msgid "<b>Your client does not support SSL encryption</b>"
msgstr "<b>Your client does not support SSL encryption</b>"
-#: ../src/qtui/mainwin.cpp:1040 ../src/qtui/mainwin.cpp:1048
+#: ../src/qtui/mainwin.cpp:1177 ../src/qtui/mainwin.cpp:1187
msgctxt "MainWin|"
msgid ""
"Sensitive data, like passwords, will be transmitted unencrypted to your "
"Quassel core."
-msgstr ""
-"Sensitive data, like passwords, will be transmitted unencrypted to your "
-"Quassel core."
+msgstr "Sensitive data, like passwords, will be transmitted unencrypted to your Quassel core."
-#: ../src/qtui/mainwin.cpp:1046
+#: ../src/qtui/mainwin.cpp:1185
msgctxt "MainWin|"
msgid "<b>Your core does not support SSL encryption</b>"
msgstr "<b>Your core does not support SSL encryption</b>"
-#: ../src/qtui/mainwin.cpp:1063 ../src/qtui/mainwin.cpp:1083
+#: ../src/qtui/mainwin.cpp:1203 ../src/qtui/mainwin.cpp:1224
msgctxt "MainWin|"
msgid "Untrusted Security Certificate"
msgstr "Untrusted Security Certificate"
-#: ../src/qtui/mainwin.cpp:1064
+#: ../src/qtui/mainwin.cpp:1204
#, qt-format
msgctxt "MainWin|"
msgid ""
"<b>The SSL certificate provided by the core at %1 is untrusted for the "
"following reasons:</b>"
-msgstr ""
-"<b>The SSL certificate provided by the core at %1 is untrusted for the "
-"following reasons:</b>"
+msgstr "<b>The SSL certificate provided by the core at %1 is untrusted for the following reasons:</b>"
-#: ../src/qtui/mainwin.cpp:1067
+#: ../src/qtui/mainwin.cpp:1207
msgctxt "MainWin|"
msgid "Continue"
msgstr "Continue"
-#: ../src/qtui/mainwin.cpp:1068
+#: ../src/qtui/mainwin.cpp:1208
msgctxt "MainWin|"
msgid "Show Certificate"
msgstr "Show Certificate"
-#: ../src/qtui/mainwin.cpp:1084
+#: ../src/qtui/mainwin.cpp:1225
msgctxt "MainWin|"
msgid ""
"Would you like to accept this certificate forever without being prompted?"
-msgstr ""
-"Would you like to accept this certificate forever without being prompted?"
+msgstr "Would you like to accept this certificate forever without being prompted?"
-#: ../src/qtui/mainwin.cpp:1086
+#: ../src/qtui/mainwin.cpp:1227
msgctxt "MainWin|"
msgid "Current Session Only"
msgstr "Current Session Only"
-#: ../src/qtui/mainwin.cpp:1087
+#: ../src/qtui/mainwin.cpp:1228
msgctxt "MainWin|"
msgid "Forever"
msgstr "Forever"
-#: ../src/qtui/mainwin.cpp:1096
+#: ../src/qtui/mainwin.cpp:1239
msgctxt "MainWin|"
msgid "Core Connection Error"
msgstr "Core Connection Error"
-#: ../src/client/messagemodel.cpp:375
+#: ../src/client/messagemodel.cpp:404
#, qt-format
msgctxt "MessageModel|"
msgid "Requesting %1 messages from backlog for buffer %2:%3"
msgid "Receiving Backlog"
msgstr "Receiving Backlog"
-#: ../src/uisupport/multilineedit.cpp:661
+#: ../src/uisupport/multilineedit.cpp:718
#, qt-format
msgctxt "MultiLineEdit|"
-msgid "Do you really want to paste %n lines?"
-msgid_plural "Do you really want to paste %n lines?"
-msgstr[0] "Do you really want to paste %n lines?"
+msgid "Do you really want to paste %n line(s)?"
+msgid_plural "Do you really want to paste %n line(s)?"
+msgstr[0] "Do you really want to paste %n line?"
msgstr[1] "Do you really want to paste %n lines?"
-#: ../src/uisupport/multilineedit.cpp:670
+#: ../src/uisupport/multilineedit.cpp:727
msgctxt "MultiLineEdit|"
msgid "Paste Protection"
msgstr "Paste Protection"
msgid "Please enter a network name:"
msgstr "Please enter a network name:"
-#: ../src/qtui/settingspages/networkssettingspage.cpp:705
+#: ../src/qtui/settingspages/networkssettingspage.cpp:840
msgctxt "NetworkEditDlg|"
msgid "Add Network"
msgstr "Add Network"
-#: ../src/client/networkmodel.cpp:196
+#: ../src/client/networkmodel.cpp:213
#, qt-format
msgctxt "NetworkItem|"
msgid "Server: %1"
msgstr "Server: %1"
-#: ../src/client/networkmodel.cpp:197
+#: ../src/client/networkmodel.cpp:214
#, qt-format
msgctxt "NetworkItem|"
msgid "Users: %1"
msgstr "Users: %1"
-#: ../src/client/networkmodel.cpp:200
+#: ../src/client/networkmodel.cpp:217
#, qt-format
msgctxt "NetworkItem|"
msgid "Lag: %1 msecs"
msgstr "Lag: %1 msecs"
-#: ../src/client/networkmodel.cpp:852
+#: ../src/client/networkmodel.cpp:963
msgctxt "NetworkModel|"
msgid "Chat"
msgstr "Chat"
-#: ../src/client/networkmodel.cpp:852
+#: ../src/client/networkmodel.cpp:963
msgctxt "NetworkModel|"
msgid "Topic"
msgstr "Topic"
-#: ../src/client/networkmodel.cpp:852
+#: ../src/client/networkmodel.cpp:963
msgctxt "NetworkModel|"
msgid "Nick Count"
msgstr "Nick Count"
-#: ../src/uisupport/networkmodelcontroller.cpp:154
+#: ../src/uisupport/networkmodelcontroller.cpp:177
msgctxt "NetworkModelController|"
msgid "Do you want to delete the following buffer(s) permanently?"
msgid_plural "Do you want to delete the following buffer(s) permanently?"
-msgstr[0] "Do you want to delete the following buffer(s) permanently?"
-msgstr[1] "Do you want to delete the following buffer(s) permanently?"
+msgstr[0] "Do you want to delete the following buffer permanently?"
+msgstr[1] "Do you want to delete the following buffers permanently?"
-#: ../src/uisupport/networkmodelcontroller.cpp:167
+#: ../src/uisupport/networkmodelcontroller.cpp:190
#, qt-format
msgctxt "NetworkModelController|"
msgid "...and <b>%1</b> more<br><br>"
msgstr "...and <b>%1</b> more<br><br>"
-#: ../src/uisupport/networkmodelcontroller.cpp:168
+#: ../src/uisupport/networkmodelcontroller.cpp:191
msgctxt "NetworkModelController|"
msgid ""
"<b>Note:</b> This will delete all related data, including all backlog data, "
"from the core's database and cannot be undone."
-msgstr ""
-"<b>Note:</b> This will delete all related data, including all backlog data, "
-"from the core's database and cannot be undone."
+msgstr "<b>Note:</b> This will delete all related data, including all backlog data, from the core's database and cannot be undone."
-#: ../src/uisupport/networkmodelcontroller.cpp:170
+#: ../src/uisupport/networkmodelcontroller.cpp:193
msgctxt "NetworkModelController|"
msgid ""
"<br>Active channel buffers cannot be deleted, please part the channel first."
-msgstr ""
-"<br>Active channel buffers cannot be deleted, please part the channel first."
+msgstr "<br>Active channel buffers cannot be deleted, please part the channel first."
-#: ../src/uisupport/networkmodelcontroller.cpp:172
+#: ../src/uisupport/networkmodelcontroller.cpp:195
msgctxt "NetworkModelController|"
msgid "Remove buffers permanently?"
msgstr "Remove buffers permanently?"
-#: ../src/uisupport/networkmodelcontroller.cpp:484
+#: ../src/uisupport/networkmodelcontroller.cpp:530
msgctxt "NetworkModelController::JoinDlg|"
msgid "Join Channel"
msgstr "Join Channel"
-#: ../src/uisupport/networkmodelcontroller.cpp:487
+#: ../src/uisupport/networkmodelcontroller.cpp:533
msgctxt "NetworkModelController::JoinDlg|"
msgid "Network:"
msgstr "Network:"
-#: ../src/uisupport/networkmodelcontroller.cpp:489
+#: ../src/uisupport/networkmodelcontroller.cpp:535
msgctxt "NetworkModelController::JoinDlg|"
msgid "Channel:"
msgstr "Channel:"
-#: ../src/uisupport/networkmodelcontroller.cpp:491
+#: ../src/uisupport/networkmodelcontroller.cpp:537
msgctxt "NetworkModelController::JoinDlg|"
msgid "Password:"
msgstr "Password:"
-#: ../src/qtui/ircconnectionwizard.cpp:148
+#: ../src/qtui/ircconnectionwizard.cpp:158
msgctxt "NetworkPage|"
msgid "Setup Network Connection"
msgstr "Set-up Network Connection"
msgid ""
"Configure automatic identification or misc. commands to be executed after "
"connecting to a server"
-msgstr ""
-"Configure automatic identification or misc. commands to be executed after "
-"connecting to a server"
+msgstr "Configure automatic identification or misc. commands to be executed after connecting to a server"
#: ../src/qtui/settingspages/networkssettingspage.ui:346
msgctxt "NetworksSettingsPage|"
msgid ""
"Specify a list of IRC commands to be executed upon connect.\n"
"Note that Quassel IRC automatically rejoins channels, so /join will rarely be needed here!"
-msgstr ""
-"Specify a list of IRC commands to be executed upon connect.\n"
-"Note that Quassel IRC automatically rejoins channels, so /join will rarely be needed here!"
+msgstr "Specify a list of IRC commands to be executed upon connect.\nNote that Quassel IRC automatically rejoins channels, so /join will rarely be needed here!"
#: ../src/qtui/settingspages/networkssettingspage.ui:374
msgctxt "NetworksSettingsPage|"
msgid "Account:"
msgstr "Account:"
-#: ../src/qtui/settingspages/networkssettingspage.ui:649
+#: ../src/qtui/settingspages/networkssettingspage.ui:635
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"<html><head/><body><p><span style=\" font-weight:600;\">Note:</span> because"
+" the identity has an ssl certificate set, SASL EXTERNAL will be "
+"used.</p></body></html>"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:659
msgctxt "NetworksSettingsPage|"
msgid "Encodings"
msgstr "Encodings"
-#: ../src/qtui/settingspages/networkssettingspage.ui:652
+#: ../src/qtui/settingspages/networkssettingspage.ui:662
msgctxt "NetworksSettingsPage|"
msgid ""
"Configure advanced settings such as message encodings and automatic "
"reconnect"
-msgstr ""
-"Configure advanced settings such as message encodings and automatic "
-"reconnect"
+msgstr "Configure advanced settings such as message encodings and automatic reconnect"
-#: ../src/qtui/settingspages/networkssettingspage.ui:661
+#: ../src/qtui/settingspages/networkssettingspage.ui:671
msgctxt "NetworksSettingsPage|"
msgid "Control encodings for in- and outgoing messages"
msgstr "Control encodings for in- and outgoing messages"
-#: ../src/qtui/settingspages/networkssettingspage.ui:664
+#: ../src/qtui/settingspages/networkssettingspage.ui:674
msgctxt "NetworksSettingsPage|"
msgid "Use Custom Encodings"
msgstr "Use Custom Encodings"
-#: ../src/qtui/settingspages/networkssettingspage.ui:675
-#: ../src/qtui/settingspages/networkssettingspage.ui:695
+#: ../src/qtui/settingspages/networkssettingspage.ui:685
+#: ../src/qtui/settingspages/networkssettingspage.ui:705
msgctxt "NetworksSettingsPage|"
msgid ""
"Specify which encoding your messages will be sent in.\n"
"UTF-8 should be a sane choice for most networks."
-msgstr ""
-"Specify which encoding your messages will be sent in.\n"
-"UTF-8 should be a sane choice for most networks."
+msgstr "Specify which encoding your messages will be sent in.\nUTF-8 should be a sane choice for most networks."
-#: ../src/qtui/settingspages/networkssettingspage.ui:679
+#: ../src/qtui/settingspages/networkssettingspage.ui:689
msgctxt "NetworksSettingsPage|"
msgid "Send messages in:"
msgstr "Send messages in:"
-#: ../src/qtui/settingspages/networkssettingspage.ui:706
-#: ../src/qtui/settingspages/networkssettingspage.ui:726
+#: ../src/qtui/settingspages/networkssettingspage.ui:716
+#: ../src/qtui/settingspages/networkssettingspage.ui:736
msgctxt "NetworksSettingsPage|"
msgid ""
"Incoming messages encoded in Utf8 will always be treated as such.\n"
"This setting defines the encoding for messages that are not Utf8."
-msgstr ""
-"Incoming messages encoded in Utf8 will always be treated as such.\n"
-"This setting defines the encoding for messages that are not Utf8."
+msgstr "Incoming messages encoded in Utf8 will always be treated as such.\nThis setting defines the encoding for messages that are not Utf8."
-#: ../src/qtui/settingspages/networkssettingspage.ui:710
+#: ../src/qtui/settingspages/networkssettingspage.ui:720
msgctxt "NetworksSettingsPage|"
msgid "Receive fallback:"
msgstr "Receive fallback:"
-#: ../src/qtui/settingspages/networkssettingspage.ui:737
-#: ../src/qtui/settingspages/networkssettingspage.ui:751
+#: ../src/qtui/settingspages/networkssettingspage.ui:747
+#: ../src/qtui/settingspages/networkssettingspage.ui:761
msgctxt "NetworksSettingsPage|"
msgid ""
"This specifies how control messages, nicks and servernames are encoded.\n"
"Unless you *really* know what you do, leave this as ISO-8859-1!"
-msgstr ""
-"This specifies how control messages, nicks and servernames are encoded.\n"
-"Unless you *really* know what you do, leave this as ISO-8859-1!"
+msgstr "This specifies how control messages, nicks and servernames are encoded.\nUnless you *really* know what you do, leave this as ISO-8859-1!"
-#: ../src/qtui/settingspages/networkssettingspage.ui:741
+#: ../src/qtui/settingspages/networkssettingspage.ui:751
msgctxt "NetworksSettingsPage|"
msgid "Server encoding:"
msgstr "Server encoding:"
msgid "Networks"
msgstr "Networks"
-#: ../src/qtui/settingspages/networkssettingspage.cpp:167
+#: ../src/qtui/settingspages/networkssettingspage.cpp:184
msgctxt "NetworksSettingsPage|"
msgid ""
"<b>The following problems need to be corrected before your changes can be "
"applied:</b><ul>"
-msgstr ""
-"<b>The following problems need to be corrected before your changes can be "
-"applied:</b><ul>"
+msgstr "<b>The following problems need to be corrected before your changes can be applied:</b><ul>"
-#: ../src/qtui/settingspages/networkssettingspage.cpp:168
+#: ../src/qtui/settingspages/networkssettingspage.cpp:185
msgctxt "NetworksSettingsPage|"
msgid "<li>All networks need at least one server defined</li>"
msgstr "<li>All networks need at least one server defined</li>"
-#: ../src/qtui/settingspages/networkssettingspage.cpp:169
+#: ../src/qtui/settingspages/networkssettingspage.cpp:186
msgctxt "NetworksSettingsPage|"
msgid "</ul>"
msgstr "</ul>"
-#: ../src/qtui/settingspages/networkssettingspage.cpp:170
+#: ../src/qtui/settingspages/networkssettingspage.cpp:187
msgctxt "NetworksSettingsPage|"
msgid "Invalid Network Settings"
msgstr "Invalid Network Settings"
-#: ../src/qtui/settingspages/networkssettingspage.cpp:542
+#: ../src/qtui/settingspages/networkssettingspage.cpp:650
msgctxt "NetworksSettingsPage|"
msgid "Delete Network?"
msgstr "Delete Network?"
-#: ../src/qtui/settingspages/networkssettingspage.cpp:543
+#: ../src/qtui/settingspages/networkssettingspage.cpp:651
#, qt-format
msgctxt "NetworksSettingsPage|"
msgid ""
"Do you really want to delete the network \"%1\" and all related settings, "
"including the backlog?"
-msgstr ""
-"Do you really want to delete the network \"%1\" and all related settings, "
-"including the backlog?"
+msgstr "Do you really want to delete the network \"%1\" and all related settings, including the backlog?"
#: ../src/qtui/settingspages/nickeditdlg.ui:13
msgctxt "NickEditDlg|"
msgid ""
"A valid nickname may contain letters from the English alphabet, digits, and "
"the special characters {, }, [, ], \\, |, `, ^, _ and -."
-msgstr ""
-"A valid nickname may contain letters from the English alphabet, digits, and "
-"the special characters {, }, [, ], \\, |, `, ^, _ and -."
+msgstr "A valid nickname may contain letters from the English alphabet, digits, and the special characters {, }, [, ], \\, |, `, ^, _ and -."
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:420
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:480
msgctxt "NickEditDlg|"
msgid "Add Nickname"
msgstr "Add Nickname"
msgid "Notifications"
msgstr "Notifications"
-#: ../src/qtui/phononnotificationbackend.cpp:143
+#: ../src/qtui/phononnotificationbackend.cpp:188
msgctxt "PhononNotificationBackend::ConfigWidget|"
msgid "Select Audio File"
msgstr "Select Audio File"
msgid "Select the sound file to play"
msgstr "Select the sound file to play"
-#: ../src/core/postgresqlstorage.cpp:62
+#: ../src/core/postgresqlstorage.cpp:72
msgctxt "PostgreSqlStorage|"
msgid "PostgreSQL Turbo Bomber HD!"
msgstr "PostgreSQL Turbo Bomber HD!"
-#: ../src/client/backlogrequester.cpp:82
+#: ../src/client/backlogrequester.cpp:95
#, qt-format
msgctxt "QObject|"
msgid "Requesting a total of up to %1 backlog messages for %2 buffers"
msgstr "Requesting a total of up to %1 backlog messages for %2 buffers"
-#: ../src/client/backlogrequester.cpp:106
+#: ../src/client/backlogrequester.cpp:122
#, qt-format
msgctxt "QObject|"
msgid ""
"Requesting up to %1 of all unread backlog messages (plus additional %2)"
-msgstr ""
-"Requesting up to %1 of all unread backlog messages (plus additional %2)"
+msgstr "Requesting up to %1 of all unread backlog messages (plus additional %2)"
-#: ../src/client/backlogrequester.cpp:123
+#: ../src/client/backlogrequester.cpp:142
#, qt-format
msgctxt "QObject|"
msgid "Requesting a total of up to %1 unread backlog messages for %2 buffers"
"This wizard will help you to set up your default identity and your IRC "
"network connection.<br>This only covers basic settings. You can cancel this "
"wizard any time and use the settings dialog for more detailed changes."
-msgstr ""
-"This wizard will help you to set up your default identity and your IRC "
-"network connection.<br>This only covers basic settings. You can cancel this "
-"wizard any time and use the settings dialogue for more detailed changes."
+msgstr "This wizard will help you to set up your default identity and your IRC network connection.<br>This only covers basic settings. You can cancel this wizard any time and use the settings dialogue for more detailed changes."
-#: ../src/uisupport/qssparser.cpp:121 ../src/uisupport/qssparser.cpp:166
-#: ../src/uisupport/qssparser.cpp:316
+#: ../src/uisupport/qssparser.cpp:128 ../src/uisupport/qssparser.cpp:178
+#: ../src/uisupport/qssparser.cpp:334
#, qt-format
msgctxt "QssParser|"
msgid "Invalid block declaration: %1"
msgstr "Invalid block declaration: %1"
-#: ../src/uisupport/qssparser.cpp:140
+#: ../src/uisupport/qssparser.cpp:147
#, qt-format
msgctxt "QssParser|"
msgid "Invalid palette role assignment: %1"
msgstr "Invalid palette role assignment: %1"
-#: ../src/uisupport/qssparser.cpp:156
+#: ../src/uisupport/qssparser.cpp:166
#, qt-format
msgctxt "QssParser|"
msgid "Unknown palette role name: %1"
msgstr "Unknown palette role name: %1"
-#: ../src/uisupport/qssparser.cpp:192
+#: ../src/uisupport/qssparser.cpp:204
#, qt-format
msgctxt "QssParser|"
msgid "Invalid subelement name in %1"
msgstr "Invalid subelement name in %1"
-#: ../src/uisupport/qssparser.cpp:236
+#: ../src/uisupport/qssparser.cpp:248
#, qt-format
msgctxt "QssParser|"
msgid "Invalid message type in %1"
msgstr "Invalid message type in %1"
-#: ../src/uisupport/qssparser.cpp:245
+#: ../src/uisupport/qssparser.cpp:257
#, qt-format
msgctxt "QssParser|"
msgid "Invalid condition %1"
msgstr "Invalid condition %1"
-#: ../src/uisupport/qssparser.cpp:257
+#: ../src/uisupport/qssparser.cpp:269
#, qt-format
msgctxt "QssParser|"
msgid "Invalid message label: %1"
msgstr "Invalid message label: %1"
-#: ../src/uisupport/qssparser.cpp:268
+#: ../src/uisupport/qssparser.cpp:281
#, qt-format
msgctxt "QssParser|"
msgid "Invalid senderhash specification: %1"
msgstr "Invalid senderhash specification: %1"
-#: ../src/uisupport/qssparser.cpp:272
+#: ../src/uisupport/qssparser.cpp:285
msgctxt "QssParser|"
msgid "Senderhash can be at most \"0x0f\"!"
msgstr "Senderhash can be at most \"0x0f\"!"
-#: ../src/uisupport/qssparser.cpp:287
+#: ../src/uisupport/qssparser.cpp:301
#, qt-format
msgctxt "QssParser|"
msgid "Invalid format name: %1"
msgstr "Invalid format name: %1"
-#: ../src/uisupport/qssparser.cpp:294
+#: ../src/uisupport/qssparser.cpp:309
#, qt-format
msgctxt "QssParser|"
msgid "Illegal IRC color specification (must be between 00 and 0f): %1"
msgstr "Illegal IRC colour specification (must be between 00 and 0f): %1"
-#: ../src/uisupport/qssparser.cpp:302
+#: ../src/uisupport/qssparser.cpp:318
#, qt-format
msgctxt "QssParser|"
msgid "Unhandled condition: %1"
msgstr "Unhandled condition: %1"
-#: ../src/uisupport/qssparser.cpp:331
+#: ../src/uisupport/qssparser.cpp:349
#, qt-format
msgctxt "QssParser|"
msgid "Invalid proplist %1"
msgstr "Invalid proplist %1"
-#: ../src/uisupport/qssparser.cpp:350
+#: ../src/uisupport/qssparser.cpp:368
#, qt-format
msgctxt "QssParser|"
msgid "Invalid chatlist item type %1"
msgstr "Invalid chatlist item type %1"
-#: ../src/uisupport/qssparser.cpp:366
+#: ../src/uisupport/qssparser.cpp:384
#, qt-format
msgctxt "QssParser|"
msgid "Invalid chatlist state %1"
msgstr "Invalid chatlist state %1"
-#: ../src/uisupport/qssparser.cpp:392
+#: ../src/uisupport/qssparser.cpp:414
#, qt-format
msgctxt "QssParser|"
msgid "Invalid property declaration: %1"
msgstr "Invalid property declaration: %1"
-#: ../src/uisupport/qssparser.cpp:416
+#: ../src/uisupport/qssparser.cpp:438
#, qt-format
msgctxt "QssParser|"
msgid "Invalid font property: %1"
msgstr "Invalid font property: %1"
-#: ../src/uisupport/qssparser.cpp:422
+#: ../src/uisupport/qssparser.cpp:444
#, qt-format
msgctxt "QssParser|"
msgid "Unknown ChatLine property: %1"
msgstr "Unknown ChatLine property: %1"
-#: ../src/uisupport/qssparser.cpp:444
+#: ../src/uisupport/qssparser.cpp:468
#, qt-format
msgctxt "QssParser|"
msgid "Invalid palette color role specification: %1"
msgstr "Invalid palette colour role specification: %1"
-#: ../src/uisupport/qssparser.cpp:451
+#: ../src/uisupport/qssparser.cpp:475
#, qt-format
msgctxt "QssParser|"
msgid "Unknown palette color role: %1"
msgstr "Unknown palette colour role: %1"
-#: ../src/uisupport/qssparser.cpp:458 ../src/uisupport/qssparser.cpp:481
-#: ../src/uisupport/qssparser.cpp:503
+#: ../src/uisupport/qssparser.cpp:482 ../src/uisupport/qssparser.cpp:505
+#: ../src/uisupport/qssparser.cpp:527
#, qt-format
msgctxt "QssParser|"
msgid "Invalid gradient declaration: %1"
msgstr "Invalid gradient declaration: %1"
-#: ../src/uisupport/qssparser.cpp:467 ../src/uisupport/qssparser.cpp:489
-#: ../src/uisupport/qssparser.cpp:513
+#: ../src/uisupport/qssparser.cpp:491 ../src/uisupport/qssparser.cpp:513
+#: ../src/uisupport/qssparser.cpp:537
#, qt-format
msgctxt "QssParser|"
msgid "Invalid gradient stops list: %1"
msgstr "Invalid gradient stops list: %1"
-#: ../src/uisupport/qssparser.cpp:610
+#: ../src/uisupport/qssparser.cpp:646
#, qt-format
msgctxt "QssParser|"
msgid "Invalid font specification: %1"
msgstr "Invalid font specification: %1"
-#: ../src/uisupport/qssparser.cpp:649
+#: ../src/uisupport/qssparser.cpp:687
#, qt-format
msgctxt "QssParser|"
msgid "Invalid font style specification: %1"
msgstr "Invalid font style specification: %1"
-#: ../src/uisupport/qssparser.cpp:662
+#: ../src/uisupport/qssparser.cpp:702
#, qt-format
msgctxt "QssParser|"
msgid "Invalid font weight specification: %1"
msgstr "Invalid font weight specification: %1"
-#: ../src/uisupport/qssparser.cpp:672
+#: ../src/uisupport/qssparser.cpp:714
#, qt-format
msgctxt "QssParser|"
msgid "Invalid font size specification: %1"
msgstr "Invalid font size specification: %1"
-#: ../src/common/util.cpp:145
+#: ../src/common/util.cpp:169
msgctxt "Quassel::secondsToString()|"
msgid "year"
msgstr "year"
-#: ../src/common/util.cpp:146
+#: ../src/common/util.cpp:170
msgctxt "Quassel::secondsToString()|"
msgid "day"
msgstr "day"
-#: ../src/common/util.cpp:147
+#: ../src/common/util.cpp:171
msgctxt "Quassel::secondsToString()|"
msgid "h"
msgstr "h"
-#: ../src/common/util.cpp:148
+#: ../src/common/util.cpp:172
msgctxt "Quassel::secondsToString()|"
msgid "min"
msgstr "min"
-#: ../src/common/util.cpp:149
+#: ../src/common/util.cpp:173
msgctxt "Quassel::secondsToString()|"
msgid "sec"
msgstr "sec"
-#: ../src/client/networkmodel.cpp:429
+#: ../src/client/networkmodel.cpp:482
#, qt-format
msgctxt "QueryBufferItem|"
msgid "<b>Query with %1</b>"
msgstr "<b>Query with %1</b>"
-#: ../src/client/networkmodel.cpp:447
+#: ../src/client/networkmodel.cpp:500
#, qt-format
msgctxt "QueryBufferItem|"
msgid "idling since %1"
msgstr "idling since %1"
-#: ../src/client/networkmodel.cpp:450
+#: ../src/client/networkmodel.cpp:503
#, qt-format
msgctxt "QueryBufferItem|"
msgid "login time: %1"
msgstr "login time: %1"
-#: ../src/client/networkmodel.cpp:453
+#: ../src/client/networkmodel.cpp:506
#, qt-format
msgctxt "QueryBufferItem|"
msgid "server: %1"
msgstr "server: %1"
+#: ../src/qtui/ui/receivefiledlg.ui:14
+msgctxt "ReceiveFileDlg|"
+msgid "Incoming File Transfer"
+msgstr ""
+
+#: ../src/qtui/receivefiledlg.cpp:35
+#, qt-format
+msgctxt "ReceiveFileDlg|"
+msgid "<b>%1</b> wants to send you a file:<br>%2 (%3 bytes)"
+msgstr ""
+
#: ../src/qtui/settingspages/saveidentitiesdlg.ui:13
msgctxt "SaveIdentitiesDlg|"
msgid "Sync With Core"
msgid ""
"Do not change unless you're going to connect to a server not supporting "
"SSLv3!"
-msgstr ""
-"Do not change unless you're going to connect to a server not supporting "
-"SSLv3!"
+msgstr "Do not change unless you're going to connect to a server not supporting SSLv3!"
#: ../src/qtui/settingspages/servereditdlg.ui:151
msgctxt "ServerEditDlg|"
msgstr "Configure Quassel"
#: ../src/qtui/ui/settingsdlg.ui:35 ../src/qtui/ui/settingsdlg.ui:50
-#: ../src/qtui/settingsdlg.cpp:99
+#: ../src/qtui/settingsdlg.cpp:111
msgctxt "SettingsDlg|"
msgid "Settings"
msgstr "Settings"
-#: ../src/qtui/settingsdlg.cpp:109
+#: ../src/qtui/settingsdlg.cpp:121
msgctxt "SettingsDlg|"
msgid "Save changes"
msgstr "Save changes"
-#: ../src/qtui/settingsdlg.cpp:110
+#: ../src/qtui/settingsdlg.cpp:122
msgctxt "SettingsDlg|"
msgid ""
"There are unsaved changes on the current configuration page. Would you like "
"to apply your changes now?"
-msgstr ""
-"There are unsaved changes on the current configuration page. Would you like "
-"to apply your changes now?"
+msgstr "There are unsaved changes on the current configuration page. Would you like to apply your changes now?"
-#: ../src/qtui/settingsdlg.cpp:122 ../src/qtui/settingsdlg.cpp:126
+#: ../src/qtui/settingsdlg.cpp:136 ../src/qtui/settingsdlg.cpp:140
#, qt-format
msgctxt "SettingsDlg|"
msgid "Configure %1"
msgstr "Configure %1"
-#: ../src/qtui/settingsdlg.cpp:193
+#: ../src/qtui/settingsdlg.cpp:220
msgctxt "SettingsDlg|"
msgid "Reload Settings"
msgstr "Reload Settings"
-#: ../src/qtui/settingsdlg.cpp:193
+#: ../src/qtui/settingsdlg.cpp:220
msgctxt "SettingsDlg|"
msgid "Do you like to reload the settings, undoing your changes on this page?"
-msgstr ""
-"Do you like to reload the settings, undoing your changes on this page?"
+msgstr "Do you like to reload the settings, undoing your changes on this page?"
-#: ../src/qtui/settingsdlg.cpp:202
+#: ../src/qtui/settingsdlg.cpp:231
msgctxt "SettingsDlg|"
msgid "Restore Defaults"
msgstr "Restore Defaults"
-#: ../src/qtui/settingsdlg.cpp:202
+#: ../src/qtui/settingsdlg.cpp:231
msgctxt "SettingsDlg|"
msgid "Do you like to restore the default values for this page?"
msgstr "Do you like to restore the default values for this page?"
msgid "Settings"
msgstr "Settings"
-#: ../src/qtui/settingspagedlg.cpp:36
+#: ../src/qtui/settingspagedlg.cpp:39
#, qt-format
msgctxt "SettingsPageDlg|"
msgid "Configure %1"
msgstr "Configure %1"
-#: ../src/qtui/settingspagedlg.cpp:104
+#: ../src/qtui/settingspagedlg.cpp:120
msgctxt "SettingsPageDlg|"
msgid "Reload Settings"
msgstr "Reload Settings"
-#: ../src/qtui/settingspagedlg.cpp:104
+#: ../src/qtui/settingspagedlg.cpp:120
msgctxt "SettingsPageDlg|"
msgid "Do you like to reload the settings, undoing your changes on this page?"
-msgstr ""
-"Do you like to reload the settings, undoing your changes on this page?"
+msgstr "Do you like to reload the settings, undoing your changes on this page?"
-#: ../src/qtui/settingspagedlg.cpp:113
+#: ../src/qtui/settingspagedlg.cpp:131
msgctxt "SettingsPageDlg|"
msgid "Restore Defaults"
msgstr "Restore Defaults"
-#: ../src/qtui/settingspagedlg.cpp:113
+#: ../src/qtui/settingspagedlg.cpp:131
msgctxt "SettingsPageDlg|"
msgid "Do you like to restore the default values for this page?"
msgstr "Do you like to restore the default values for this page?"
-#: ../src/qtui/settingspages/shortcutsmodel.cpp:110
+#: ../src/qtui/settingspages/shortcutsmodel.cpp:121
msgctxt "ShortcutsModel|"
msgid "Action"
msgstr "Action:"
-#: ../src/qtui/settingspages/shortcutsmodel.cpp:112
+#: ../src/qtui/settingspages/shortcutsmodel.cpp:123
msgctxt "ShortcutsModel|"
msgid "Shortcut"
msgstr "Shortcut"
msgstr "Default:"
#: ../src/qtui/settingspages/shortcutssettingspage.ui:75
-#: ../src/qtui/settingspages/shortcutssettingspage.cpp:92
-#: ../src/qtui/settingspages/shortcutssettingspage.cpp:102
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:99
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:111
msgctxt "ShortcutsSettingsPage|"
msgid "None"
msgstr "None"
msgid "Custom:"
msgstr "Custom:"
-#: ../src/qtui/settingspages/shortcutssettingspage.cpp:60
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:65
msgctxt "ShortcutsSettingsPage|"
msgid "Interface"
msgstr "Interface"
-#: ../src/qtui/settingspages/shortcutssettingspage.cpp:60
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:65
msgctxt "ShortcutsSettingsPage|"
msgid "Shortcuts"
msgstr "Shortcuts"
-#: ../src/common/signalproxy.cpp:880
-msgctxt "SignalProxy|"
-msgid "Peer tried to send package larger than max package size!"
-msgstr "Peer tried to send package larger than max package size!"
-
-#: ../src/common/signalproxy.cpp:885
-msgctxt "SignalProxy|"
-msgid "Peer tried to send 0 byte package!"
-msgstr "Peer tried to send 0 byte package!"
-
-#: ../src/common/signalproxy.cpp:902
-msgctxt "SignalProxy|"
-msgid "Peer sent corrupted compressed data!"
-msgstr "Peer sent corrupted compressed data!"
-
-#: ../src/common/signalproxy.cpp:917
-msgctxt "SignalProxy|"
-msgid "Peer sent corrupt data: unable to load QVariant!"
-msgstr "Peer sent corrupt data: unable to load QVariant!"
-
-#: ../src/common/signalproxy.cpp:1050
+#: ../src/common/signalproxy.cpp:758
msgctxt "SignalProxy|"
msgid "Disconnecting"
msgstr "Disconnecting"
msgid ""
"A list of IRC channels you will join automatically after connecting to the "
"network"
+msgstr "A list of IRC channels you will join automatically after connecting to the network"
+
+#: ../src/qtui/snorenotificationbackend.cpp:60
+#: ../src/qtui/snorenotificationbackend.cpp:104
+msgctxt "SnoreNotificationBackend|"
+msgid "Private Message"
msgstr ""
-"A list of IRC channels you will join automatically after connecting to the "
-"network"
-#: ../src/core/sqlitestorage.cpp:52
+#: ../src/qtui/ui/snorentificationconfigwidget.ui:20
+msgctxt "SnoreNotificationConfigWidget|"
+msgid "Form"
+msgstr "Form"
+
+#: ../src/qtui/ui/snorentificationconfigwidget.ui:29
+msgctxt "SnoreNotificationConfigWidget|"
+msgid "Snore"
+msgstr ""
+
+#: ../src/qtui/ui/snorentificationconfigwidget.ui:41
+msgctxt "SnoreNotificationConfigWidget|"
+msgid "Backend:"
+msgstr ""
+
+#: ../src/qtui/ui/snorentificationconfigwidget.ui:64
+msgctxt "SnoreNotificationConfigWidget|"
+msgid "Timeout:"
+msgstr ""
+
+#: ../src/qtui/ui/snorentificationconfigwidget.ui:80
+msgctxt "SnoreNotificationConfigWidget|"
+msgid " s"
+msgstr " s"
+
+#: ../src/qtui/ui/snorentificationconfigwidget.ui:96
+msgctxt "SnoreNotificationConfigWidget|"
+msgid "0 means infinite"
+msgstr ""
+
+#: ../src/core/sqlitestorage.cpp:60
msgctxt "SqliteStorage|"
msgid ""
"SQLite is a file-based database engine that does not require any setup. It "
"via network. Use SQLite if your Quassel Core should store its data on the "
"same machine it is running on, and if you only expect a few users to use "
"your core."
-msgstr ""
-"SQLite is a file-based database engine that does not require any set-up. It "
-"is suitable for small and medium-sized databases that do not require access "
-"via network. Use SQLite if your Quassel Core should store its data on the "
-"same machine it is running on, and if you only expect a few users to use "
-"your core."
+msgstr "SQLite is a file-based database engine that does not require any set-up. It is suitable for small and medium-sized databases that do not require access via network. Use SQLite if your Quassel Core should store its data on the same machine it is running on, and if you only expect a few users to use your core."
#: ../src/qtui/ui/sslinfodlg.ui:14
msgctxt "SslInfoDlg|"
msgid "<b>Trusted:</b>"
msgstr "<b>Trusted:</b>"
-#: ../src/qtui/sslinfodlg.cpp:69
+#: ../src/qtui/sslinfodlg.cpp:71
msgctxt "SslInfoDlg|"
msgid "Yes"
msgstr "Yes"
-#: ../src/qtui/sslinfodlg.cpp:71
+#: ../src/qtui/sslinfodlg.cpp:73
msgctxt "SslInfoDlg|"
msgid "No, for the following reasons:<ul>"
msgstr "No, for the following reasons:<ul>"
-#: ../src/qtui/sslinfodlg.cpp:78
+#: ../src/qtui/sslinfodlg.cpp:80
#, qt-format
msgctxt "SslInfoDlg|"
msgid "%1 to %2"
msgstr "%1 to %2"
-#: ../src/client/networkmodel.h:144
+#: ../src/client/networkmodel.h:150
msgctxt "StatusBufferItem|"
msgid "Status Buffer"
msgstr "Status Buffer"
-#: ../src/qtui/systemtray.cpp:61 ../src/qtui/systemtray.cpp:92
+#: ../src/qtui/systemtray.cpp:68 ../src/qtui/systemtray.cpp:101
msgctxt "SystemTray|"
msgid "&Minimize"
msgstr "&Minimize"
-#: ../src/qtui/systemtray.cpp:94
+#: ../src/qtui/systemtray.cpp:103
msgctxt "SystemTray|"
msgid "&Restore"
msgstr "&Restore"
-#: ../src/qtui/systraynotificationbackend.cpp:125
+#: ../src/qtui/systraynotificationbackend.cpp:142
#, qt-format
msgctxt "SystrayNotificationBackend|"
-msgid "%n pending highlights"
-msgid_plural "%n pending highlights"
-msgstr[0] "%n pending highlights"
+msgid "%n pending highlight(s)"
+msgid_plural "%n pending highlight(s)"
+msgstr[0] "%n pending highlight"
msgstr[1] "%n pending highlights"
-#: ../src/qtui/systraynotificationbackend.cpp:135
+#: ../src/qtui/systraynotificationbackend.cpp:156
msgctxt "SystrayNotificationBackend::ConfigWidget|"
msgid "Show a message in a popup"
msgstr "Show messages in indicator"
msgid "Tab completion"
msgstr "Tab Completion"
-#: ../src/qtui/taskbarnotificationbackend.cpp:68
+#: ../src/qtui/taskbarnotificationbackend.cpp:83
msgctxt "TaskbarNotificationBackend::ConfigWidget|"
msgid "Activate dock entry, timeout:"
msgstr "Activate dock entry, timeout:"
-#: ../src/qtui/taskbarnotificationbackend.cpp:70
+#: ../src/qtui/taskbarnotificationbackend.cpp:85
msgctxt "TaskbarNotificationBackend::ConfigWidget|"
msgid "Mark taskbar entry, timeout:"
msgstr "Mark taskbar entry, timeout:"
-#: ../src/qtui/taskbarnotificationbackend.cpp:78
+#: ../src/qtui/taskbarnotificationbackend.cpp:93
msgctxt "TaskbarNotificationBackend::ConfigWidget|"
msgid "Unlimited"
msgstr "Unlimited"
-#: ../src/qtui/taskbarnotificationbackend.cpp:79
+#: ../src/qtui/taskbarnotificationbackend.cpp:94
msgctxt "TaskbarNotificationBackend::ConfigWidget|"
msgid " seconds"
msgstr " seconds"
msgid "..."
msgstr "..."
-#: ../src/qtui/topicwidget.cpp:106
+#: ../src/qtui/topicwidget.cpp:120
#, qt-format
msgctxt "TopicWidget|"
msgid "Users: %1"
msgstr "Users: %1"
-#: ../src/qtui/topicwidget.cpp:107
+#: ../src/qtui/topicwidget.cpp:121
#, qt-format
msgctxt "TopicWidget|"
msgid "Lag: %1 msecs"
msgid "On hover only"
msgstr "On hover only"
-#: ../src/qtui/settingspages/topicwidgetsettingspage.cpp:23
+#: ../src/qtui/settingspages/topicwidgetsettingspage.cpp:24
msgctxt "TopicWidgetSettingsPage|"
msgid "Interface"
msgstr "Interface"
-#: ../src/qtui/settingspages/topicwidgetsettingspage.cpp:23
+#: ../src/qtui/settingspages/topicwidgetsettingspage.cpp:24
msgctxt "TopicWidgetSettingsPage|"
msgid "Topic Widget"
msgstr "Topic Widget"
#. Topic Message
#. ----------
#. Invite Message
-#: ../src/uisupport/uistyle.cpp:577 ../src/uisupport/uistyle.cpp:580
-#: ../src/uisupport/uistyle.cpp:620 ../src/uisupport/uistyle.cpp:623
-#: ../src/uisupport/uistyle.cpp:626 ../src/uisupport/uistyle.cpp:633
-#: ../src/uisupport/uistyle.cpp:665 ../src/uisupport/uistyle.cpp:739
+#: ../src/uisupport/uistyle.cpp:665 ../src/uisupport/uistyle.cpp:668
+#: ../src/uisupport/uistyle.cpp:709 ../src/uisupport/uistyle.cpp:712
+#: ../src/uisupport/uistyle.cpp:715 ../src/uisupport/uistyle.cpp:724
+#: ../src/uisupport/uistyle.cpp:758
#, qt-format
msgctxt "UiStyle::StyledMessage|"
msgid "%1"
msgstr "%1"
#. Action Message
-#: ../src/uisupport/uistyle.cpp:583
+#: ../src/uisupport/uistyle.cpp:671
#, qt-format
msgctxt "UiStyle::StyledMessage|"
msgid "%DN%1%DN %2"
msgstr "%DN%1%DN %2"
#. Nick Message
-#: ../src/uisupport/uistyle.cpp:587
+#: ../src/uisupport/uistyle.cpp:675
#, qt-format
msgctxt "UiStyle::StyledMessage|"
msgid "You are now known as %DN%1%DN"
msgstr "You are now known as %DN%1%DN"
-#: ../src/uisupport/uistyle.cpp:588
+#: ../src/uisupport/uistyle.cpp:676
#, qt-format
msgctxt "UiStyle::StyledMessage|"
msgid "%DN%1%DN is now known as %DN%2%DN"
msgstr "%DN%1%DN is now known as %DN%2%DN"
#. Mode Message
-#: ../src/uisupport/uistyle.cpp:592
+#: ../src/uisupport/uistyle.cpp:680
#, qt-format
msgctxt "UiStyle::StyledMessage|"
msgid "User mode: %DM%1%DM"
msgstr "User mode: %DM%1%DM"
-#: ../src/uisupport/uistyle.cpp:593
+#: ../src/uisupport/uistyle.cpp:681
#, qt-format
msgctxt "UiStyle::StyledMessage|"
msgid "Mode %DM%1%DM by %DN%2%DN"
msgstr "Mode %DM%1%DM by %DN%2%DN"
#. Join Message
-#: ../src/uisupport/uistyle.cpp:597
+#: ../src/uisupport/uistyle.cpp:685
#, qt-format
msgctxt "UiStyle::StyledMessage|"
msgid "%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC"
msgstr "%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC"
#. Part Message
-#: ../src/uisupport/uistyle.cpp:600
+#: ../src/uisupport/uistyle.cpp:688
#, qt-format
msgctxt "UiStyle::StyledMessage|"
msgid "%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC"
msgstr "%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC"
#. Quit Message
-#: ../src/uisupport/uistyle.cpp:605
+#: ../src/uisupport/uistyle.cpp:693
#, qt-format
msgctxt "UiStyle::StyledMessage|"
msgid "%DN%1%DN %DH(%2@%3)%DH has quit"
msgstr "%DN%1%DN %DH(%2@%3)%DH has quit"
#. Kick Message
-#: ../src/uisupport/uistyle.cpp:612
+#: ../src/uisupport/uistyle.cpp:701
#, qt-format
msgctxt "UiStyle::StyledMessage|"
msgid "%DN%1%DN has kicked %DN%2%DN from %DC%3%DC"
msgstr "%DN%1%DN has kicked %DN%2%DN from %DC%3%DC"
#. Day Change Message
-#: ../src/uisupport/uistyle.cpp:629
+#: ../src/uisupport/uistyle.cpp:719
#, qt-format
msgctxt "UiStyle::StyledMessage|"
msgid "{Day changed to %1}"
msgstr "{Day changed to %1}"
-#: ../src/uisupport/uistyle.cpp:641
+#: ../src/uisupport/uistyle.cpp:733
#, qt-format
msgctxt "UiStyle::StyledMessage|"
msgid "Netsplit between %DH%1%DH and %DH%2%DH ended. Users joined: "
msgstr "Netsplit between %DH%1%DH and %DH%2%DH ended. Users joined: "
-#: ../src/uisupport/uistyle.cpp:645 ../src/uisupport/uistyle.cpp:660
+#: ../src/uisupport/uistyle.cpp:737 ../src/uisupport/uistyle.cpp:753
#, qt-format
msgctxt "UiStyle::StyledMessage|"
msgid "%DN%1%DN (%2 more)"
msgstr "%DN%1%DN (%2 more)"
-#: ../src/uisupport/uistyle.cpp:655
+#: ../src/uisupport/uistyle.cpp:748
#, qt-format
msgctxt "UiStyle::StyledMessage|"
msgid "Netsplit between %DH%1%DH and %DH%2%DH. Users quit: "
msgstr "Netsplit between %DH%1%DH and %DH%2%DH. Users quit: "
-#: ../src/uisupport/uistyle.cpp:667 ../src/uisupport/uistyle.cpp:705
+#: ../src/uisupport/uistyle.cpp:760 ../src/uisupport/uistyle.cpp:808
#, qt-format
msgctxt "UiStyle::StyledMessage|"
msgid "[%1]"
msgstr "[%1]"
-#: ../src/uisupport/uistyle.cpp:703
+#: ../src/uisupport/uistyle.cpp:806
#, qt-format
msgctxt "UiStyle::StyledMessage|"
msgid "<%1>"
msgstr "<%1>"
-#: ../src/uisupport/uistyle.cpp:707
-msgctxt "UiStyle::StyledMessage|"
-msgid "-*-"
-msgstr "-*-"
-
-#: ../src/uisupport/uistyle.cpp:709
-msgctxt "UiStyle::StyledMessage|"
-msgid "<->"
-msgstr "<->"
-
-#: ../src/uisupport/uistyle.cpp:711
-msgctxt "UiStyle::StyledMessage|"
-msgid "***"
-msgstr "***"
-
-#: ../src/uisupport/uistyle.cpp:713
-msgctxt "UiStyle::StyledMessage|"
-msgid "-->"
-msgstr "-->"
-
-#: ../src/uisupport/uistyle.cpp:715 ../src/uisupport/uistyle.cpp:717
-msgctxt "UiStyle::StyledMessage|"
-msgid "<--"
-msgstr "<--"
-
-#: ../src/uisupport/uistyle.cpp:719
-msgctxt "UiStyle::StyledMessage|"
-msgid "<-*"
-msgstr "<-*"
-
-#: ../src/uisupport/uistyle.cpp:721
-msgctxt "UiStyle::StyledMessage|"
-msgid "<-x"
-msgstr "<-x"
-
-#: ../src/uisupport/uistyle.cpp:723 ../src/uisupport/uistyle.cpp:725
-#: ../src/uisupport/uistyle.cpp:727 ../src/uisupport/uistyle.cpp:731
-msgctxt "UiStyle::StyledMessage|"
-msgid "*"
-msgstr "*"
-
-#: ../src/uisupport/uistyle.cpp:729
-msgctxt "UiStyle::StyledMessage|"
-msgid "-"
-msgstr "-"
-
-#: ../src/uisupport/uistyle.cpp:733
-msgctxt "UiStyle::StyledMessage|"
-msgid "=>"
-msgstr "=>"
-
-#: ../src/uisupport/uistyle.cpp:735
-msgctxt "UiStyle::StyledMessage|"
-msgid "<="
-msgstr "<="
-
-#: ../src/uisupport/uistyle.cpp:737
-msgctxt "UiStyle::StyledMessage|"
-msgid "->"
-msgstr "->"
-
-#: ../src/client/networkmodel.cpp:697
+#: ../src/client/networkmodel.cpp:786
#, qt-format
msgctxt "UserCategoryItem|"
msgid "%n Owner(s)"
msgid_plural "%n Owner(s)"
-msgstr[0] "%n Owner(s)"
-msgstr[1] "%n Owner(s)"
+msgstr[0] "%n Owner"
+msgstr[1] "%n Owners"
-#: ../src/client/networkmodel.cpp:698
+#: ../src/client/networkmodel.cpp:788
#, qt-format
msgctxt "UserCategoryItem|"
msgid "%n Admin(s)"
msgid_plural "%n Admin(s)"
-msgstr[0] "%n Admin(s)"
-msgstr[1] "%n Admin(s)"
+msgstr[0] "%n Admin"
+msgstr[1] "%n Admins"
-#: ../src/client/networkmodel.cpp:699
+#: ../src/client/networkmodel.cpp:790
#, qt-format
msgctxt "UserCategoryItem|"
msgid "%n Operator(s)"
msgid_plural "%n Operator(s)"
-msgstr[0] "%n Operator(s)"
-msgstr[1] "%n Operator(s)"
+msgstr[0] "%n Operator"
+msgstr[1] "%n Operators"
-#: ../src/client/networkmodel.cpp:700
+#: ../src/client/networkmodel.cpp:792
#, qt-format
msgctxt "UserCategoryItem|"
msgid "%n Half-Op(s)"
msgid_plural "%n Half-Op(s)"
-msgstr[0] "%n Half-Op(s)"
-msgstr[1] "%n Half-Op(s)"
+msgstr[0] "%n Half-Op"
+msgstr[1] "%n Half-Ops"
-#: ../src/client/networkmodel.cpp:701
+#: ../src/client/networkmodel.cpp:794
#, qt-format
msgctxt "UserCategoryItem|"
msgid "%n Voiced"
msgstr[0] "%n Voiced"
msgstr[1] "%n Voiced"
-#: ../src/client/networkmodel.cpp:702
+#: ../src/client/networkmodel.cpp:796
#, qt-format
msgctxt "UserCategoryItem|"
msgid "%n User(s)"
msgid_plural "%n User(s)"
-msgstr[0] "%n User(s)"
-msgstr[1] "%n User(s)"
-
-
+msgstr[0] "%n User"
+msgstr[1] "%n Users"
projects / quassel.git / blobdiff