X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=po%2Fquassel.pot;h=bef82056d5053bd133b9a2ee4baffcb11f3fa0d9;hb=44212b2131e958c40ca26b9f49289590d8f83145;hp=f7cc960edbf3e76a39f9548385797ef7ff683da3;hpb=0c3a3be22d7bbac5c9fcf1c807cb6b6873ae24af;p=quassel.git
diff --git a/po/quassel.pot b/po/quassel.pot
index f7cc960e..bef82056 100644
--- a/po/quassel.pot
+++ b/po/quassel.pot
@@ -30,73 +30,61 @@ msgid ""
"html>"
msgstr ""
-#: ../src/qtui/ui/aboutdlg.ui:75
-msgctxt "AboutDlg|"
-msgid ""
-"
\n"
-"Version 0.2.0-pre, Build "
-">= 474 (2008-02-08)
"
-msgstr ""
-
-#: ../src/qtui/ui/aboutdlg.ui:115
+#: ../src/qtui/ui/aboutdlg.ui:112
msgctxt "AboutDlg|"
msgid "&About"
msgstr ""
-#: ../src/qtui/ui/aboutdlg.ui:135
+#: ../src/qtui/ui/aboutdlg.ui:132
msgctxt "AboutDlg|"
msgid "A&uthors"
msgstr ""
-#: ../src/qtui/ui/aboutdlg.ui:155
+#: ../src/qtui/ui/aboutdlg.ui:152
msgctxt "AboutDlg|"
msgid "&Contributors"
msgstr ""
-#: ../src/qtui/ui/aboutdlg.ui:175
+#: ../src/qtui/ui/aboutdlg.ui:172
msgctxt "AboutDlg|"
msgid "&Thanks To"
msgstr ""
-#: ../src/qtui/aboutdlg.cpp:32
+#: ../src/qtui/aboutdlg.cpp:33
#, qt-format
msgctxt "AboutDlg|"
msgid "Version: %1
Protocol version: %2
Built: %3"
msgstr ""
-#: ../src/qtui/aboutdlg.cpp:46
+#: ../src/qtui/aboutdlg.cpp:49
+#, qt-format
msgctxt "AboutDlg|"
msgid ""
-"A modern, distributed IRC Client
©2005-2010 by the "
-"Quassel Project
http://quassel-irc."
-"org
#quassel on Freenode
Quassel IRC is dual-"
-"licensed under GPLv2 "
-"and GPLv3.
Most "
-"icons are © by the Oxygen Team"
-"a> and used under the LGPL.
Please use http://bugs.quassel-irc.org to report bugs."
-msgstr ""
-
-#: ../src/qtui/aboutdlg.cpp:62
+"A modern, distributed IRC Client
©%1 by the Quassel "
+"Project
http://quassel-irc.org"
+"a>
#quassel on Freenode
Quassel IRC is dual-licensed "
+"under GPLv2 and GPLv3.
Most icons "
+"are © by the Oxygen Team "
+"and used under the LGPL"
+"a>.
Please use http://bugs."
+"quassel-irc.org to report bugs."
+msgstr ""
+
+#: ../src/qtui/aboutdlg.cpp:67
msgctxt "AboutDlg|"
msgid "Quassel IRC is mainly developed by:"
msgstr ""
-#: ../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 ""
-#: ../src/qtui/aboutdlg.cpp:135
+#: ../src/qtui/aboutdlg.cpp:206
msgctxt "AboutDlg|"
msgid ""
"Special thanks goes to:
- "
@@ -112,26 +100,26 @@ msgid ""
"N810s"
msgstr ""
-#: ../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 ""
-#: ../src/core/abstractsqlstorage.cpp:117
+#: ../src/core/abstractsqlstorage.cpp:129
msgctxt "AbstractSqlStorage|"
msgid "Upgrade failed..."
msgstr ""
-#: ../src/qtui/settingspages/aliasesmodel.cpp:55
+#: ../src/qtui/settingspages/aliasesmodel.cpp:57
msgctxt "AliasesModel|"
msgid ""
"The shortcut for the alias
It can be used as a regular slash "
"command.
Example: \"foo\" can be used per /foo"
msgstr ""
-#: ../src/qtui/settingspages/aliasesmodel.cpp:59
+#: ../src/qtui/settingspages/aliasesmodel.cpp:61
msgctxt "AliasesModel|"
msgid ""
"The string the shortcut will be expanded to
special variables:"
@@ -147,12 +135,12 @@ msgid ""
"1 2 3\" when called like /test 1 2 3"
msgstr ""
-#: ../src/qtui/settingspages/aliasesmodel.cpp:170
+#: ../src/qtui/settingspages/aliasesmodel.cpp:185
msgctxt "AliasesModel|"
msgid "Alias"
msgstr ""
-#: ../src/qtui/settingspages/aliasesmodel.cpp:171
+#: ../src/qtui/settingspages/aliasesmodel.cpp:186
msgctxt "AliasesModel|"
msgid "Expansion"
msgstr ""
@@ -213,7 +201,7 @@ msgid ""
msgstr ""
#: ../src/qtui/settingspages/appearancesettingspage.ui:52
-#: ../src/qtui/settingspages/appearancesettingspage.cpp:74
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:76
msgctxt "AppearanceSettingsPage|"
msgid ""
msgstr ""
@@ -288,7 +276,7 @@ msgctxt "AppearanceSettingsPage|"
msgid "Interface"
msgstr ""
-#: ../src/qtui/settingspages/appearancesettingspage.cpp:225
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:242
msgctxt "AppearanceSettingsPage|"
msgid "Please choose a stylesheet file"
msgstr ""
@@ -298,12 +286,12 @@ msgctxt "AwayLogView|"
msgid "Away Log"
msgstr ""
-#: ../src/qtui/awaylogview.cpp:44
+#: ../src/qtui/awaylogview.cpp:46
msgctxt "AwayLogView|"
msgid "Show Network Name"
msgstr ""
-#: ../src/qtui/awaylogview.cpp:49
+#: ../src/qtui/awaylogview.cpp:51
msgctxt "AwayLogView|"
msgid "Show Buffer Name"
msgstr ""
@@ -439,18 +427,18 @@ msgctxt "BacklogSettingsPage|"
msgid "Backlog Fetching"
msgstr ""
-#: ../src/client/networkmodel.cpp:346
+#: ../src/client/networkmodel.cpp:386
#, qt-format
msgctxt "BufferItem|"
msgid " %1 - %2
"
msgstr ""
-#: ../src/uisupport/bufferview.cpp:248
+#: ../src/uisupport/bufferview.cpp:272
msgctxt "BufferView|"
msgid "Merge buffers permanently?"
msgstr ""
-#: ../src/uisupport/bufferview.cpp:249
+#: ../src/uisupport/bufferview.cpp:273
#, qt-format
msgctxt "BufferView|"
msgid ""
@@ -468,12 +456,12 @@ msgctxt "BufferViewEditDlg|"
msgid "Please enter a name for the chat list:"
msgstr ""
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:520
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:582
msgctxt "BufferViewEditDlg|"
msgid "Add Chat List"
msgstr ""
-#: ../src/uisupport/bufferviewfilter.cpp:52
+#: ../src/uisupport/bufferviewfilter.cpp:54
msgctxt "BufferViewFilter|"
msgid "Show / Hide Chats"
msgstr ""
@@ -509,7 +497,7 @@ msgid "Network:"
msgstr ""
#: ../src/qtui/settingspages/bufferviewsettingspage.ui:100
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:117
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:128
msgctxt "BufferViewSettingsPage|"
msgid "All"
msgstr ""
@@ -543,40 +531,45 @@ msgstr ""
#: ../src/qtui/settingspages/bufferviewsettingspage.ui:142
msgctxt "BufferViewSettingsPage|"
-msgid "Add new chats automatically"
+msgid "Hide inactive networks"
msgstr ""
#: ../src/qtui/settingspages/bufferviewsettingspage.ui:149
msgctxt "BufferViewSettingsPage|"
-msgid "Sort alphabetically"
+msgid "Add new chats automatically"
msgstr ""
#: ../src/qtui/settingspages/bufferviewsettingspage.ui:156
msgctxt "BufferViewSettingsPage|"
+msgid "Sort alphabetically"
+msgstr ""
+
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:163
+msgctxt "BufferViewSettingsPage|"
msgid "Minimum Activity:"
msgstr ""
-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:164
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:171
msgctxt "BufferViewSettingsPage|"
msgid "No Activity"
msgstr ""
-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:169
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:176
msgctxt "BufferViewSettingsPage|"
msgid "Other Activity"
msgstr ""
-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:174
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:181
msgctxt "BufferViewSettingsPage|"
msgid "New Message"
msgstr ""
-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:179
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:186
msgctxt "BufferViewSettingsPage|"
msgid "Highlight"
msgstr ""
-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:205
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:212
msgctxt "BufferViewSettingsPage|"
msgid "Preview:"
msgstr ""
@@ -591,12 +584,12 @@ msgctxt "BufferViewSettingsPage|"
msgid "Custom Chat Lists"
msgstr ""
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:342
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:383
msgctxt "BufferViewSettingsPage|"
msgid "Delete Chat List?"
msgstr ""
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:343
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:384
#, qt-format
msgctxt "BufferViewSettingsPage|"
msgid "Do you really want to delete the chat list \"%1\"?"
@@ -632,36 +625,36 @@ msgctxt "BufferWidget|"
msgid "Go to Marker Line"
msgstr ""
-#: ../src/client/networkmodel.cpp:503
+#: ../src/client/networkmodel.cpp:566
#, qt-format
msgctxt "ChannelBufferItem|"
msgid "Channel %1"
msgstr ""
-#: ../src/client/networkmodel.cpp:506
+#: ../src/client/networkmodel.cpp:569
#, qt-format
msgctxt "ChannelBufferItem|"
msgid "Users: %1"
msgstr ""
-#: ../src/client/networkmodel.cpp:510
+#: ../src/client/networkmodel.cpp:573
#, qt-format
msgctxt "ChannelBufferItem|"
msgid "Mode: %1"
msgstr ""
-#: ../src/client/networkmodel.cpp:521
+#: ../src/client/networkmodel.cpp:584
#, qt-format
msgctxt "ChannelBufferItem|"
msgid "Topic: %1"
msgstr ""
-#: ../src/client/networkmodel.cpp:525
+#: ../src/client/networkmodel.cpp:589
msgctxt "ChannelBufferItem|"
msgid "Not active
Double-click to join"
msgstr ""
-#: ../src/client/networkmodel.cpp:528
+#: ../src/client/networkmodel.cpp:592
#, qt-format
msgctxt "ChannelBufferItem|"
msgid " %1
"
@@ -681,7 +674,7 @@ msgstr ""
msgctxt "ChannelListDlg|"
msgid ""
"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 ""
#: ../src/qtui/ui/channellistdlg.ui:62
@@ -696,7 +689,7 @@ msgstr ""
#: ../src/qtui/ui/channellistdlg.ui:98
msgctxt "ChannelListDlg|"
-msgid "Errors Occured:"
+msgid "Errors Occurred:"
msgstr ""
#: ../src/qtui/ui/channellistdlg.ui:132
@@ -768,7 +761,7 @@ msgid "Move selected buffers to the right"
msgstr ""
#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:133
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:236
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:272
msgctxt "ChatMonitorSettingsPage|"
msgid "Show:"
msgstr ""
@@ -789,6 +782,26 @@ msgctxt "ChatMonitorSettingsPage|"
msgid "Show own messages"
msgstr ""
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:164
+msgctxt "ChatMonitorSettingsPage|"
+msgid "Display messages from backlog on reconnect"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:167
+msgctxt "ChatMonitorSettingsPage|"
+msgid "Show messages from backlog"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:192
+msgctxt "ChatMonitorSettingsPage|"
+msgid "Include read messages from backlog on reconnect"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:195
+msgctxt "ChatMonitorSettingsPage|"
+msgid "Include read messages"
+msgstr ""
+
#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35
msgctxt "ChatMonitorSettingsPage|"
msgid "Interface"
@@ -799,46 +812,52 @@ msgctxt "ChatMonitorSettingsPage|"
msgid "Chat Monitor"
msgstr ""
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:58
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:59
msgctxt "ChatMonitorSettingsPage|"
msgid "Opt In"
msgstr ""
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:59
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:60
msgctxt "ChatMonitorSettingsPage|"
msgid "Opt Out"
msgstr ""
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:239
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:275
msgctxt "ChatMonitorSettingsPage|"
msgid "Ignore:"
msgstr ""
-#: ../src/qtui/chatmonitorview.cpp:52
+#: ../src/qtui/chatmonitorview.cpp:54
msgctxt "ChatMonitorView|"
msgid "Show Own Messages"
msgstr ""
-#: ../src/qtui/chatmonitorview.cpp:59
+#: ../src/qtui/chatmonitorview.cpp:61
msgctxt "ChatMonitorView|"
msgid "Show Network Name"
msgstr ""
-#: ../src/qtui/chatmonitorview.cpp:64
+#: ../src/qtui/chatmonitorview.cpp:66
msgctxt "ChatMonitorView|"
msgid "Show Buffer Name"
msgstr ""
-#: ../src/qtui/chatmonitorview.cpp:71
+#: ../src/qtui/chatmonitorview.cpp:73
msgctxt "ChatMonitorView|"
msgid "Configure..."
msgstr ""
-#: ../src/qtui/chatscene.cpp:743
+#: ../src/qtui/chatscene.cpp:815
msgctxt "ChatScene|"
msgid "Copy Selection"
msgstr ""
+#: ../src/qtui/chatscene.cpp:822
+#, qt-format
+msgctxt "ChatScene|"
+msgid "Search '%1'"
+msgstr ""
+
#: ../src/qtui/ui/chatviewsearchbar.ui:13
msgctxt "ChatViewSearchBar|"
msgid "Form"
@@ -881,141 +900,196 @@ msgctxt "ChatViewSettingsPage|"
msgid "Timestamp format:"
msgstr ""
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:32
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:29
+msgctxt "ChatViewSettingsPage|"
+msgid ""
+"Usage examples:
\n"
+"\n"
+"dd.MM.yyyy | 21.05.2001 |
\n"
+"ddd MMMM d yy | Tue May 21 01 |
\n"
+"hh:mm:ss.zzz | 14:13:09.042 |
\n"
+"h:m:s ap | 2:13:9 pm |
\n"
+"
\n"
+""
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:42
msgctxt "ChatViewSettingsPage|"
msgid "[hh:mm:ss]"
msgstr ""
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:59
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:69
msgctxt "ChatViewSettingsPage|"
msgid "Custom chat window font:"
msgstr ""
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:92
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:102
msgctxt "ChatViewSettingsPage|"
msgid "Show colored text in the chat window"
msgstr ""
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:95
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:105
msgctxt "ChatViewSettingsPage|"
msgid "Allow colored text (mIRC color codes)"
msgstr ""
-#: ../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 ""
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:114
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:124
msgctxt "ChatViewSettingsPage|"
msgid "Show previews of webpages on URL hover"
msgstr ""
-#: ../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 ""
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:133
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:143
msgctxt "ChatViewSettingsPage|"
msgid "Set marker line automatically when switching chats"
msgstr ""
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:149
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:159
+msgctxt "ChatViewSettingsPage|"
+msgid ""
+"Set the marker line to the bottom of the current chat window when Quassel "
+"loses focus."
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:162
+msgctxt "ChatViewSettingsPage|"
+msgid "Set marker line automatically when Quassel loses focus"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:168
+msgctxt "ChatViewSettingsPage|"
+msgid "AutoMarkerLineOnLostFocus"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:180
+msgctxt "ChatViewSettingsPage|"
+msgid "Web Search Url:"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:187
+msgctxt "ChatViewSettingsPage|"
+msgid ""
+"The URL to open with the selected text as the "
+"parameter. Place %s where selected "
+"text should go.
Eg:
https://www.google.com/search?q=%s
https://duckduckgo.com/?q=%s
"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:190
+msgctxt "ChatViewSettingsPage|"
+msgid "WebSearchUrlFormat"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:193
+msgctxt "ChatViewSettingsPage|"
+msgid "https://www.google.com/search?q=%s"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:202
msgctxt "ChatViewSettingsPage|"
msgid "Custom Colors"
msgstr ""
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:167
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:220
msgctxt "ChatViewSettingsPage|"
msgid "Action:"
msgstr ""
-#: ../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:227
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:251
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:275
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:312
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:336
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:367
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:391
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:415
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:439
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:456
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:496
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:513
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:530
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:547
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:564
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:581
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:598
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:615
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:632
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:649
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:666
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:683
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:700
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:717
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:734
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:751
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:779
msgctxt "ChatViewSettingsPage|"
msgid "..."
msgstr ""
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:191
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:244
msgctxt "ChatViewSettingsPage|"
msgid "Timestamp:"
msgstr ""
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:215
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:268
msgctxt "ChatViewSettingsPage|"
msgid "Channel message:"
msgstr ""
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:252
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:305
msgctxt "ChatViewSettingsPage|"
msgid "Highlight foreground:"
msgstr ""
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:276
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:329
msgctxt "ChatViewSettingsPage|"
msgid "Command message:"
msgstr ""
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:300
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:353
msgctxt "ChatViewSettingsPage|"
msgid "Highlight background:"
msgstr ""
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:307
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:360
msgctxt "ChatViewSettingsPage|"
msgid "Server message:"
msgstr ""
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:331
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:384
msgctxt "ChatViewSettingsPage|"
msgid "Marker line:"
msgstr ""
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:355
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:408
msgctxt "ChatViewSettingsPage|"
msgid "Error message:"
msgstr ""
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:379
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:432
msgctxt "ChatViewSettingsPage|"
msgid "Background:"
msgstr ""
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:423
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:476
msgctxt "ChatViewSettingsPage|"
msgid "Use Sender Coloring"
msgstr ""
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:719
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:772
msgctxt "ChatViewSettingsPage|"
msgid "Own messages:"
msgstr ""
@@ -1032,31 +1106,123 @@ msgstr ""
#: ../src/qtui/settingspages/chatviewsettingspage.cpp:41
msgctxt "ChatViewSettingsPage|"
-msgid "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 ""
-#: ../src/client/client.cpp:270
+#: ../src/client/client.cpp:320
msgctxt "Client|"
msgid "Identity already exists in client!"
msgstr ""
-#: ../src/client/clientbacklogmanager.cpp:161
+#: ../src/client/clientauthhandler.cpp:65
+#: ../src/client/clientauthhandler.cpp:463
+msgctxt "ClientAuthHandler|"
+msgid "Unencrypted connection canceled"
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:87
+#: ../src/client/clientauthhandler.cpp:103
+#, qt-format
+msgctxt "ClientAuthHandler|"
+msgid "Connecting to %1..."
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:99
+#, qt-format
+msgctxt "ClientAuthHandler|"
+msgid "Looking up %1..."
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:106
+#: ../src/client/clientauthhandler.cpp:307
+#, qt-format
+msgctxt "ClientAuthHandler|"
+msgid "Connected to %1"
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:110
+#, qt-format
+msgctxt "ClientAuthHandler|"
+msgid "Disconnecting from %1..."
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:114
+msgctxt "ClientAuthHandler|"
+msgid "Disconnected"
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:147
+msgctxt "ClientAuthHandler|"
+msgid "Reconnecting in compatibility mode..."
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:228
+msgctxt "ClientAuthHandler|"
+msgid ""
+"Incompatible Quassel Core!
None of the protocols this client "
+"speaks are supported by the core you are trying to connect to."
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:231
+msgctxt "ClientAuthHandler|"
+msgid "Core speaks none of the protocols we support"
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:246
+#, qt-format
+msgctxt "ClientAuthHandler|"
+msgid ""
+"The Quassel Core you are trying to connect to is too old!
We need "
+"at least protocol v%1, but the core speaks v%2 only."
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:248
+msgctxt "ClientAuthHandler|"
+msgid "Incompatible protocol version, connection to core refused"
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:270
+msgctxt "ClientAuthHandler|"
+msgid "Synchronizing to core..."
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:285
+msgctxt "ClientAuthHandler|"
+msgid "The core refused connection from this client"
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:349
+msgctxt "ClientAuthHandler|"
+msgid "Logging in..."
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:354
+msgctxt "ClientAuthHandler|"
+msgid "Login canceled"
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:412
+msgctxt "ClientAuthHandler|"
+msgid "Unencrypted connection cancelled"
+msgstr ""
+
+#: ../src/client/clientbacklogmanager.cpp:178
#, qt-format
msgctxt "ClientBacklogManager|"
msgid "Processed %1 messages in %2 seconds."
msgstr ""
-#: ../src/client/clientbufferviewmanager.cpp:52
+#: ../src/client/clientbufferviewmanager.cpp:60
msgctxt "ClientBufferViewManager|"
msgid "All Chats"
msgstr ""
-#: ../src/client/clientuserinputhandler.cpp:88
+#: ../src/client/clientuserinputhandler.cpp:98
msgctxt "ClientUserInputHandler|"
msgid "/JOIN expects a channel"
msgstr ""
-#: ../src/client/clientuserinputhandler.cpp:98
+#: ../src/client/clientuserinputhandler.cpp:110
msgctxt "ClientUserInputHandler|"
msgid "/QUERY expects at least a nick"
msgstr ""
@@ -1125,227 +1291,242 @@ msgctxt "ConnectionSettingsPage|"
msgid "Minimum delay between requests:"
msgstr ""
+#: ../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 ""
-#: ../src/qtui/chatitem.cpp:683
+#: ../src/qtui/chatitem.cpp:803
msgctxt "ContentsChatItem|"
msgid "Copy Link Address"
msgstr ""
-#: ../src/uisupport/contextmenuactionprovider.cpp:38
+#: ../src/uisupport/contextmenuactionprovider.cpp:39
msgctxt "ContextMenuActionProvider|"
msgid "Connect"
msgstr ""
-#: ../src/uisupport/contextmenuactionprovider.cpp:39
+#: ../src/uisupport/contextmenuactionprovider.cpp:40
msgctxt "ContextMenuActionProvider|"
msgid "Disconnect"
msgstr ""
-#: ../src/uisupport/contextmenuactionprovider.cpp:41
+#: ../src/uisupport/contextmenuactionprovider.cpp:42
msgctxt "ContextMenuActionProvider|"
msgid "Join"
msgstr ""
-#: ../src/uisupport/contextmenuactionprovider.cpp:42
+#: ../src/uisupport/contextmenuactionprovider.cpp:43
msgctxt "ContextMenuActionProvider|"
msgid "Part"
msgstr ""
-#: ../src/uisupport/contextmenuactionprovider.cpp:43
+#: ../src/uisupport/contextmenuactionprovider.cpp:44
msgctxt "ContextMenuActionProvider|"
msgid "Delete Chat(s)..."
msgstr ""
-#: ../src/uisupport/contextmenuactionprovider.cpp:44
+#: ../src/uisupport/contextmenuactionprovider.cpp:45
msgctxt "ContextMenuActionProvider|"
msgid "Go to Chat"
msgstr ""
-#: ../src/uisupport/contextmenuactionprovider.cpp:46
+#: ../src/uisupport/contextmenuactionprovider.cpp:47
msgctxt "ContextMenuActionProvider|"
msgid "Joins"
msgstr ""
-#: ../src/uisupport/contextmenuactionprovider.cpp:47
+#: ../src/uisupport/contextmenuactionprovider.cpp:48
msgctxt "ContextMenuActionProvider|"
msgid "Parts"
msgstr ""
-#: ../src/uisupport/contextmenuactionprovider.cpp:48
+#: ../src/uisupport/contextmenuactionprovider.cpp:49
msgctxt "ContextMenuActionProvider|"
msgid "Quits"
msgstr ""
-#: ../src/uisupport/contextmenuactionprovider.cpp:49
+#: ../src/uisupport/contextmenuactionprovider.cpp:50
msgctxt "ContextMenuActionProvider|"
msgid "Nick Changes"
msgstr ""
-#: ../src/uisupport/contextmenuactionprovider.cpp:50
+#: ../src/uisupport/contextmenuactionprovider.cpp:51
msgctxt "ContextMenuActionProvider|"
msgid "Mode Changes"
msgstr ""
-#: ../src/uisupport/contextmenuactionprovider.cpp:51
+#: ../src/uisupport/contextmenuactionprovider.cpp:52
msgctxt "ContextMenuActionProvider|"
msgid "Day Changes"
msgstr ""
-#: ../src/uisupport/contextmenuactionprovider.cpp:52
+#: ../src/uisupport/contextmenuactionprovider.cpp:53
msgctxt "ContextMenuActionProvider|"
msgid "Topic Changes"
msgstr ""
-#: ../src/uisupport/contextmenuactionprovider.cpp:53
+#: ../src/uisupport/contextmenuactionprovider.cpp:54
msgctxt "ContextMenuActionProvider|"
msgid "Set as Default..."
msgstr ""
-#: ../src/uisupport/contextmenuactionprovider.cpp:54
+#: ../src/uisupport/contextmenuactionprovider.cpp:55
msgctxt "ContextMenuActionProvider|"
msgid "Use Defaults..."
msgstr ""
-#: ../src/uisupport/contextmenuactionprovider.cpp:56
+#: ../src/uisupport/contextmenuactionprovider.cpp:57
msgctxt "ContextMenuActionProvider|"
msgid "Join Channel..."
msgstr ""
-#: ../src/uisupport/contextmenuactionprovider.cpp:58
+#: ../src/uisupport/contextmenuactionprovider.cpp:59
msgctxt "ContextMenuActionProvider|"
msgid "Start Query"
msgstr ""
-#: ../src/uisupport/contextmenuactionprovider.cpp:59
+#: ../src/uisupport/contextmenuactionprovider.cpp:60
msgctxt "ContextMenuActionProvider|"
msgid "Show Query"
msgstr ""
-#: ../src/uisupport/contextmenuactionprovider.cpp:60
+#: ../src/uisupport/contextmenuactionprovider.cpp:61
msgctxt "ContextMenuActionProvider|"
msgid "Whois"
msgstr ""
-#: ../src/uisupport/contextmenuactionprovider.cpp:62
+#: ../src/uisupport/contextmenuactionprovider.cpp:63
msgctxt "ContextMenuActionProvider|"
msgid "Version"
msgstr ""
-#: ../src/uisupport/contextmenuactionprovider.cpp:63
+#: ../src/uisupport/contextmenuactionprovider.cpp:64
msgctxt "ContextMenuActionProvider|"
msgid "Time"
msgstr ""
-#: ../src/uisupport/contextmenuactionprovider.cpp:64
+#: ../src/uisupport/contextmenuactionprovider.cpp:65
msgctxt "ContextMenuActionProvider|"
msgid "Ping"
msgstr ""
-#: ../src/uisupport/contextmenuactionprovider.cpp:65
+#: ../src/uisupport/contextmenuactionprovider.cpp:66
msgctxt "ContextMenuActionProvider|"
msgid "Client info"
msgstr ""
-#: ../src/uisupport/contextmenuactionprovider.cpp:66
+#: ../src/uisupport/contextmenuactionprovider.cpp:67
msgctxt "ContextMenuActionProvider|"
msgid "Custom..."
msgstr ""
-#: ../src/uisupport/contextmenuactionprovider.cpp:78
+#: ../src/uisupport/contextmenuactionprovider.cpp:79
msgctxt "ContextMenuActionProvider|"
msgid "Give Operator Status"
msgstr ""
-#: ../src/uisupport/contextmenuactionprovider.cpp:79
+#: ../src/uisupport/contextmenuactionprovider.cpp:80
msgctxt "ContextMenuActionProvider|"
msgid "Take Operator Status"
msgstr ""
-#: ../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 ""
-#: ../src/uisupport/contextmenuactionprovider.cpp:81
+#: ../src/uisupport/contextmenuactionprovider.cpp:84
msgctxt "ContextMenuActionProvider|"
msgid "Take Voice"
msgstr ""
-#: ../src/uisupport/contextmenuactionprovider.cpp:82
+#: ../src/uisupport/contextmenuactionprovider.cpp:85
msgctxt "ContextMenuActionProvider|"
msgid "Kick From Channel"
msgstr ""
-#: ../src/uisupport/contextmenuactionprovider.cpp:83
+#: ../src/uisupport/contextmenuactionprovider.cpp:86
msgctxt "ContextMenuActionProvider|"
msgid "Ban From Channel"
msgstr ""
-#: ../src/uisupport/contextmenuactionprovider.cpp:84
+#: ../src/uisupport/contextmenuactionprovider.cpp:87
msgctxt "ContextMenuActionProvider|"
msgid "Kick && Ban"
msgstr ""
-#: ../src/uisupport/contextmenuactionprovider.cpp:86
+#: ../src/uisupport/contextmenuactionprovider.cpp:89
msgctxt "ContextMenuActionProvider|"
msgid "Hide Chat(s) Temporarily"
msgstr ""
-#: ../src/uisupport/contextmenuactionprovider.cpp:87
+#: ../src/uisupport/contextmenuactionprovider.cpp:90
msgctxt "ContextMenuActionProvider|"
msgid "Hide Chat(s) Permanently"
msgstr ""
-#: ../src/uisupport/contextmenuactionprovider.cpp:88
+#: ../src/uisupport/contextmenuactionprovider.cpp:91
msgctxt "ContextMenuActionProvider|"
msgid "Show Channel List"
msgstr ""
-#: ../src/uisupport/contextmenuactionprovider.cpp:89
+#: ../src/uisupport/contextmenuactionprovider.cpp:92
msgctxt "ContextMenuActionProvider|"
msgid "Show Ignore List"
msgstr ""
-#: ../src/uisupport/contextmenuactionprovider.cpp:102
+#: ../src/uisupport/contextmenuactionprovider.cpp:105
msgctxt "ContextMenuActionProvider|"
msgid "Hide Events"
msgstr ""
-#: ../src/uisupport/contextmenuactionprovider.cpp:110
+#: ../src/uisupport/contextmenuactionprovider.cpp:113
msgctxt "ContextMenuActionProvider|"
msgid "CTCP"
msgstr ""
-#: ../src/uisupport/contextmenuactionprovider.cpp:122
+#: ../src/uisupport/contextmenuactionprovider.cpp:128
msgctxt "ContextMenuActionProvider|"
msgid "Actions"
msgstr ""
-#: ../src/uisupport/contextmenuactionprovider.cpp:126
+#: ../src/uisupport/contextmenuactionprovider.cpp:132
msgctxt "ContextMenuActionProvider|"
msgid "Ignore"
msgstr ""
-#: ../src/uisupport/contextmenuactionprovider.cpp:131
+#: ../src/uisupport/contextmenuactionprovider.cpp:137
msgctxt "ContextMenuActionProvider|"
msgid "Add Ignore Rule"
msgstr ""
-#: ../src/uisupport/contextmenuactionprovider.cpp:132
+#: ../src/uisupport/contextmenuactionprovider.cpp:138
msgctxt "ContextMenuActionProvider|"
msgid "Existing Rules"
msgstr ""
-#: ../src/core/core.cpp:182
+#: ../src/core/core.cpp:191
msgctxt "Core|"
msgid "Could not initialize any storage backend! Exiting..."
msgstr ""
-#: ../src/core/core.cpp:183
+#: ../src/core/core.cpp:192
msgctxt "Core|"
msgid ""
"Currently, Quassel supports SQLite3 and PostgreSQL. You need to build your\n"
@@ -1354,163 +1535,104 @@ msgid ""
"to work."
msgstr ""
-#: ../src/core/core.cpp:232
+#: ../src/core/core.cpp:251
msgctxt "Core|"
msgid "Calling restoreState() even though active sessions exist!"
msgstr ""
-#: ../src/core/core.cpp:273
+#: ../src/core/core.cpp:285
+msgctxt "Core|"
+msgid "Core is already configured! Not configuring again..."
+msgstr ""
+
+#: ../src/core/core.cpp:288
msgctxt "Core|"
msgid "Admin user or password not set."
msgstr ""
-#: ../src/core/core.cpp:276
+#: ../src/core/core.cpp:291
msgctxt "Core|"
msgid "Could not setup storage!"
msgstr ""
-#: ../src/core/core.cpp:280
+#: ../src/core/core.cpp:296
msgctxt "Core|"
msgid "Creating admin user..."
msgstr ""
-#: ../src/core/core.cpp:393
+#: ../src/core/core.cpp:449
#, qt-format
msgctxt "Core|"
msgid "Invalid listen address %1"
msgstr ""
-#: ../src/core/core.cpp:401
+#: ../src/core/core.cpp:458
#, qt-format
msgctxt "Core|"
msgid "Listening for GUI clients on IPv6 %1 port %2 using protocol version %3"
msgstr ""
-#: ../src/core/core.cpp:409
+#: ../src/core/core.cpp:467
#, qt-format
msgctxt "Core|"
msgid "Could not open IPv6 interface %1:%2: %3"
msgstr ""
-#: ../src/core/core.cpp:417
+#: ../src/core/core.cpp:475
#, qt-format
msgctxt "Core|"
msgid "Listening for GUI clients on IPv4 %1 port %2 using protocol version %3"
msgstr ""
-#: ../src/core/core.cpp:427
+#: ../src/core/core.cpp:486
#, qt-format
msgctxt "Core|"
msgid "Could not open IPv4 interface %1:%2: %3"
msgstr ""
-#: ../src/core/core.cpp:435
+#: ../src/core/core.cpp:494
#, qt-format
msgctxt "Core|"
msgid "Invalid listen address %1, unknown network protocol"
msgstr ""
-#: ../src/core/core.cpp:444
+#: ../src/core/core.cpp:503
msgctxt "Core|"
msgid "Could not open any network interfaces to listen on!"
msgstr ""
-#: ../src/core/core.cpp:478
+#: ../src/core/core.cpp:543
msgctxt "Core|"
msgid "Client connected from"
msgstr ""
-#: ../src/core/core.cpp:481
+#: ../src/core/core.cpp:546
msgctxt "Core|"
msgid "Closing server for basic setup."
msgstr ""
-#: ../src/core/core.cpp:500
-msgctxt "Core|"
-msgid "Antique client trying to connect... refusing."
-msgstr ""
-
-#: ../src/core/core.cpp:512
-#, qt-format
-msgctxt "Core|"
-msgid ""
-"Your Quassel Client is too old!
This core needs at least client/"
-"core protocol version %1.
Please consider upgrading your client."
-msgstr ""
-
-#: ../src/core/core.cpp:516 ../src/core/core.cpp:606 ../src/core/core.cpp:630
-msgctxt "Core|"
-msgid "Client"
-msgstr ""
-
-#: ../src/core/core.cpp:516
+#: ../src/core/core.cpp:558
msgctxt "Core|"
-msgid "too old, rejecting."
-msgstr ""
-
-#: ../src/core/core.cpp:533
-#, qt-format
-msgctxt "Core|"
-msgid "Quassel Core Version %1
Built: %2
Up %3d%4h%5m (since %6)"
-msgstr ""
-
-#: ../src/core/core.cpp:586
-msgctxt "Core|"
-msgid "Starting TLS for Client:"
-msgstr ""
-
-#: ../src/core/core.cpp:604
-msgctxt "Core|"
-msgid ""
-"Client not initialized!
You need to send an init message before "
-"trying to login."
-msgstr ""
-
-#: ../src/core/core.cpp:606
-msgctxt "Core|"
-msgid "did not send an init message before trying to login, rejecting."
+msgid "Non-authed client disconnected:"
msgstr ""
-#: ../src/core/core.cpp:624
-msgctxt "Core|"
-msgid ""
-"Invalid username or password!
The username/password combination "
-"you supplied could not be found in the database."
-msgstr ""
-
-#: ../src/core/core.cpp:630
-#, qt-format
-msgctxt "Core|"
-msgid "initialized and authenticated successfully as \"%1\" (UserId: %2)."
-msgstr ""
-
-#: ../src/core/core.cpp:641
-msgctxt "Core|"
-msgid "Non-authed client disconnected."
-msgstr ""
-
-#: ../src/core/core.cpp:647
-msgctxt "Core|"
-msgid "Non-authed client disconnected. (socket allready destroyed)"
-msgstr ""
-
-#: ../src/core/core.cpp:695
+#: ../src/core/core.cpp:590
msgctxt "Core|"
msgid "Could not initialize session for client:"
msgstr ""
-#: ../src/core/core.cpp:717
+#: ../src/core/core.cpp:617
msgctxt "Core|"
msgid "Could not find a session for client:"
msgstr ""
-#: ../src/client/coreaccount.h:39
+#: ../src/client/coreaccount.h:40
msgctxt "CoreAccount|"
msgid "Internal Core"
msgstr ""
#: ../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 ""
@@ -1585,12 +1707,12 @@ msgctxt "CoreAccountEditDlg|"
msgid "HTTP"
msgstr ""
-#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:231
+#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:262
msgctxt "CoreAccountEditDlg|"
msgid "Add Core Account"
msgstr ""
-#: ../src/client/coreaccountmodel.cpp:64
+#: ../src/client/coreaccountmodel.cpp:68
msgctxt "CoreAccountModel|"
msgid "Internal Core"
msgstr ""
@@ -1640,24 +1762,80 @@ msgctxt "CoreAccountSettingsPage|"
msgid "Remote Cores"
msgstr ""
+#: ../src/core/coreauthhandler.cpp:126 ../src/core/coreauthhandler.cpp:138
+msgctxt "CoreAuthHandler|"
+msgid "Client"
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:126
+msgctxt "CoreAuthHandler|"
+msgid "too old, rejecting."
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:127
+#, qt-format
+msgctxt "CoreAuthHandler|"
+msgid ""
+"Your Quassel Client is too old!
This core needs at least client/"
+"core protocol version %1 (got: %2).
Please consider upgrading your client."
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:138
+msgctxt "CoreAuthHandler|"
+msgid "did not send a registration message before trying to login, rejecting."
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:139
+msgctxt "CoreAuthHandler|"
+msgid ""
+"Client not initialized!
You need to send a registration message "
+"before trying to login."
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:156
+msgctxt "CoreAuthHandler|"
+msgid ""
+"SSL is required!
You need to use SSL in order to connect to this "
+"core."
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:196
+msgctxt "CoreAuthHandler|"
+msgid ""
+"Invalid username or password!
The username/password combination "
+"you supplied could not be found in the database."
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:201
+#, qt-format
+msgctxt "CoreAuthHandler|"
+msgid ""
+"Client %1 initialized and authenticated successfully as \"%2\" (UserId: %3)."
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:220
+msgctxt "CoreAuthHandler|"
+msgid "Starting encryption for Client:"
+msgstr ""
+
#: ../src/qtui/coreconfigwizard.cpp:69
msgctxt "CoreConfigWizard|"
msgid "Core Configuration Wizard"
msgstr ""
-#: ../src/qtui/coreconfigwizard.cpp:97
+#: ../src/qtui/coreconfigwizard.cpp:98
msgctxt "CoreConfigWizard|"
msgid "Your core has been successfully configured. Logging you in..."
msgstr ""
-#: ../src/qtui/coreconfigwizard.cpp:104
+#: ../src/qtui/coreconfigwizard.cpp:107
#, qt-format
msgctxt "CoreConfigWizard|"
msgid ""
"Core configuration failed:
%1
Press Next to start over."
msgstr ""
-#: ../src/qtui/coreconfigwizard.cpp:119
+#: ../src/qtui/coreconfigwizard.cpp:126
msgctxt "CoreConfigWizard|"
msgid ""
"Your are now logged into your freshly configured Quassel Core!
Please "
@@ -1708,46 +1886,46 @@ msgctxt "CoreConfigWizardIntroPage|"
msgid "This wizard will guide you through the setup of your Quassel Core."
msgstr ""
-#: ../src/qtui/coreconfigwizard.cpp:150
+#: ../src/qtui/coreconfigwizard.cpp:162
msgctxt "CoreConfigWizardPages::AdminUserPage|"
msgid "Create Admin User"
msgstr ""
-#: ../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 ""
-#: ../src/qtui/coreconfigwizard.cpp:135
+#: ../src/qtui/coreconfigwizard.cpp:145
msgctxt "CoreConfigWizardPages::IntroPage|"
msgid "Introduction"
msgstr ""
-#: ../src/qtui/coreconfigwizard.cpp:182
+#: ../src/qtui/coreconfigwizard.cpp:198
msgctxt "CoreConfigWizardPages::StorageSelectionPage|"
msgid "Select Storage Backend"
msgstr ""
-#: ../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 ""
-#: ../src/qtui/coreconfigwizard.cpp:277
+#: ../src/qtui/coreconfigwizard.cpp:300
msgctxt "CoreConfigWizardPages::StorageSelectionPage|"
msgid "Connection Properties"
msgstr ""
-#: ../src/qtui/coreconfigwizard.cpp:317
+#: ../src/qtui/coreconfigwizard.cpp:342
msgctxt "CoreConfigWizardPages::SyncPage|"
msgid "Storing Your Settings"
msgstr ""
-#: ../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 "
@@ -1809,138 +1987,74 @@ msgctxt "CoreConfigWizardSyncPage|"
msgid "Please wait while your settings are being transmitted to the core..."
msgstr ""
-#: ../src/qtui/ui/coreconnectauthdlg.ui:14
-msgctxt "CoreConnectAuthDlg|"
-msgid "Authentication Required"
-msgstr ""
-
-#: ../src/qtui/ui/coreconnectauthdlg.ui:20
-msgctxt "CoreConnectAuthDlg|"
-msgid "Please enter your account data:"
-msgstr ""
-
-#: ../src/qtui/ui/coreconnectauthdlg.ui:35
-msgctxt "CoreConnectAuthDlg|"
-msgid "Password:"
-msgstr ""
-
-#: ../src/qtui/ui/coreconnectauthdlg.ui:49
-msgctxt "CoreConnectAuthDlg|"
-msgid "Username:"
-msgstr ""
-
-#: ../src/qtui/ui/coreconnectauthdlg.ui:58
-msgctxt "CoreConnectAuthDlg|"
-msgid "Remember password"
-msgstr ""
-
-#: ../src/qtui/coreconnectdlg.cpp:75
-#, qt-format
-msgctxt "CoreConnectAuthDlg|"
-msgid "Please enter your credentials for %1:"
-msgstr ""
-
-#: ../src/qtui/coreconnectdlg.cpp:40
-msgctxt "CoreConnectDlg|"
-msgid "Connect to Core"
-msgstr ""
-
-#: ../src/client/coreconnection.cpp:168
-msgctxt "CoreConnection|"
-msgid "Network is down"
-msgstr ""
-
-#: ../src/client/coreconnection.cpp:202 ../src/client/coreconnection.cpp:321
-msgctxt "CoreConnection|"
-msgid "Disconnected"
-msgstr ""
-
-#: ../src/client/coreconnection.cpp:205
-#, qt-format
-msgctxt "CoreConnection|"
-msgid "Looking up %1..."
-msgstr ""
-
-#: ../src/client/coreconnection.cpp:208 ../src/client/coreconnection.cpp:450
-#, qt-format
-msgctxt "CoreConnection|"
-msgid "Connecting to %1..."
-msgstr ""
-
-#: ../src/client/coreconnection.cpp:211 ../src/client/coreconnection.cpp:573
-#, qt-format
-msgctxt "CoreConnection|"
-msgid "Connected to %1"
+#: ../src/qtui/ui/coreconnectauthdlg.ui:14
+msgctxt "CoreConnectAuthDlg|"
+msgid "Authentication Required"
msgstr ""
-#: ../src/client/coreconnection.cpp:214
-#, qt-format
-msgctxt "CoreConnection|"
-msgid "Disconnecting from %1..."
+#: ../src/qtui/ui/coreconnectauthdlg.ui:20
+msgctxt "CoreConnectAuthDlg|"
+msgid "Please enter your account data:"
msgstr ""
-#: ../src/client/coreconnection.cpp:272
-msgctxt "CoreConnection|"
-msgid ""
-"The Quassel Core you try to connect to is too old! Please consider upgrading."
+#: ../src/qtui/ui/coreconnectauthdlg.ui:35
+msgctxt "CoreConnectAuthDlg|"
+msgid "Password:"
msgstr ""
-#: ../src/client/coreconnection.cpp:300
-msgctxt "CoreConnection|"
-msgid "Invalid data received from core"
+#: ../src/qtui/ui/coreconnectauthdlg.ui:49
+msgctxt "CoreConnectAuthDlg|"
+msgid "Username:"
msgstr ""
-#: ../src/client/coreconnection.cpp:349
-msgctxt "CoreConnection|"
-msgid "Disconnected from core."
+#: ../src/qtui/ui/coreconnectauthdlg.ui:58
+msgctxt "CoreConnectAuthDlg|"
+msgid "Remember password"
msgstr ""
-#: ../src/client/coreconnection.cpp:427 ../src/client/coreconnection.cpp:511
-#: ../src/client/coreconnection.cpp:556
-msgctxt "CoreConnection|"
-msgid "Unencrypted connection canceled"
+#: ../src/qtui/coreconnectdlg.cpp:81
+#, qt-format
+msgctxt "CoreConnectAuthDlg|"
+msgid "Please enter your credentials for %1:"
msgstr ""
-#: ../src/client/coreconnection.cpp:457
-msgctxt "CoreConnection|"
-msgid "Synchronizing to core..."
+#: ../src/qtui/coreconnectdlg.cpp:41
+msgctxt "CoreConnectDlg|"
+msgid "Connect to Core"
msgstr ""
-#: ../src/client/coreconnection.cpp:478
-#, qt-format
+#: ../src/client/coreconnection.cpp:193
msgctxt "CoreConnection|"
-msgid ""
-"The Quassel Core you are trying to connect to is too old!
Need at "
-"least core/client protocol v%1 to connect."
+msgid "Network is down"
msgstr ""
-#: ../src/client/coreconnection.cpp:592
+#: ../src/client/coreconnection.cpp:276
msgctxt "CoreConnection|"
-msgid "Logging in..."
+msgid "Disconnected"
msgstr ""
-#: ../src/client/coreconnection.cpp:597
+#: ../src/client/coreconnection.cpp:311
msgctxt "CoreConnection|"
-msgid "Login canceled"
+msgid "Disconnected from core."
msgstr ""
-#: ../src/client/coreconnection.cpp:622
+#: ../src/client/coreconnection.cpp:451
msgctxt "CoreConnection|"
msgid "Receiving session state"
msgstr ""
-#: ../src/client/coreconnection.cpp:624
+#: ../src/client/coreconnection.cpp:453
#, qt-format
msgctxt "CoreConnection|"
msgid "Synchronizing to %1..."
msgstr ""
-#: ../src/client/coreconnection.cpp:648
+#: ../src/client/coreconnection.cpp:489
msgctxt "CoreConnection|"
msgid "Receiving network states"
msgstr ""
-#: ../src/client/coreconnection.cpp:698
+#: ../src/client/coreconnection.cpp:540
#, qt-format
msgctxt "CoreConnection|"
msgid "Synchronized to %1"
@@ -2030,28 +2144,28 @@ msgctxt "CoreConnectionStatusWidget|"
msgid "Message"
msgstr ""
-#: ../src/qtui/coreconnectionstatuswidget.cpp:61
+#: ../src/qtui/coreconnectionstatuswidget.cpp:66
msgctxt "CoreConnectionStatusWidget|seconds"
msgid "s"
msgstr ""
-#: ../src/qtui/coreconnectionstatuswidget.cpp:61
+#: ../src/qtui/coreconnectionstatuswidget.cpp:66
msgctxt "CoreConnectionStatusWidget|milliseconds"
msgid "ms"
msgstr ""
-#: ../src/qtui/coreconnectionstatuswidget.cpp:62
+#: ../src/qtui/coreconnectionstatuswidget.cpp:67
#, qt-format
msgctxt "CoreConnectionStatusWidget|"
msgid "(Lag: %1 %2)"
msgstr ""
-#: ../src/qtui/coreconnectionstatuswidget.cpp:75
+#: ../src/qtui/coreconnectionstatuswidget.cpp:83
msgctxt "CoreConnectionStatusWidget|"
msgid "The connection to your core is encrypted with SSL."
msgstr ""
-#: ../src/qtui/coreconnectionstatuswidget.cpp:78
+#: ../src/qtui/coreconnectionstatuswidget.cpp:87
msgctxt "CoreConnectionStatusWidget|"
msgid "The connection to your core is not encrypted."
msgstr ""
@@ -2106,7 +2220,7 @@ msgctxt "CoreInfoDlg|"
msgid "Close"
msgstr ""
-#: ../src/qtui/coreinfodlg.cpp:53
+#: ../src/qtui/coreinfodlg.cpp:57
#, qt-format
msgctxt "CoreInfoDlg|"
msgid "%n Day(s)"
@@ -2114,58 +2228,58 @@ msgid_plural "%n Day(s)"
msgstr[0] ""
msgstr[1] ""
-#: ../src/qtui/coreinfodlg.cpp:54
+#: ../src/qtui/coreinfodlg.cpp:58
#, qt-format
msgctxt "CoreInfoDlg|"
msgid " %1:%2:%3 (since %4)"
msgstr ""
-#: ../src/core/corenetwork.cpp:148
+#: ../src/core/corenetwork.cpp:166
msgctxt "CoreNetwork|"
msgid "Connection failed. Cycling to next Server"
msgstr ""
-#: ../src/core/corenetwork.cpp:156 ../src/core/corenetwork.cpp:157
+#: ../src/core/corenetwork.cpp:174 ../src/core/corenetwork.cpp:175
#, qt-format
msgctxt "CoreNetwork|"
msgid "Connecting to %1:%2..."
msgstr ""
-#: ../src/core/corenetwork.cpp:205
+#: ../src/core/corenetwork.cpp:229
#, qt-format
msgctxt "CoreNetwork|"
msgid "Disconnecting. (%1)"
msgstr ""
-#: ../src/core/corenetwork.cpp:205
+#: ../src/core/corenetwork.cpp:229
msgctxt "CoreNetwork|"
msgid "Core Shutdown"
msgstr ""
-#: ../src/core/corenetwork.cpp:343
+#: ../src/core/corenetwork.cpp:424
#, qt-format
msgctxt "CoreNetwork|"
msgid "Could not connect to %1 (%2)"
msgstr ""
-#: ../src/core/corenetwork.cpp:345
+#: ../src/core/corenetwork.cpp:426
#, qt-format
msgctxt "CoreNetwork|"
msgid "Connection failure: %1"
msgstr ""
-#: ../src/core/coresession.cpp:214
+#: ../src/core/coresession.cpp:230
msgctxt "CoreSession|"
msgid "Client"
msgstr ""
-#: ../src/core/coresession.cpp:214
+#: ../src/core/coresession.cpp:230
#, qt-format
msgctxt "CoreSession|"
msgid "disconnected (UserId: %1)."
msgstr ""
-#: ../src/core/coresession.cpp:440
+#: ../src/core/coresession.cpp:477
#, qt-format
msgctxt "CoreSession|"
msgid ""
@@ -2173,52 +2287,120 @@ msgid ""
"create network %1!"
msgstr ""
-#: ../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 ""
-#: ../src/core/coresessioneventprocessor.cpp:65
+#: ../src/core/coresessioneventprocessor.cpp:78
msgctxt "CoreSessionEventProcessor|"
msgid ""
"No free and valid nicks in nicklist found. use: /nick to continue"
msgstr ""
-#: ../src/core/coreuserinputhandler.cpp:81
+#: ../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 ""
+
+#: ../src/core/coreuserinputhandler.cpp:88
msgctxt "CoreUserInputHandler|"
msgid "away"
msgstr ""
-#: ../src/core/coreuserinputhandler.cpp:150
+#: ../src/core/coreuserinputhandler.cpp:169
#, qt-format
msgctxt "CoreUserInputHandler|"
msgid "sending CTCP-%1 request to %2"
msgstr ""
-#: ../src/core/coreuserinputhandler.cpp:177
+#: ../src/core/coreuserinputhandler.cpp:193
+#: ../src/core/coreuserinputhandler.cpp:364
+#: ../src/core/coreuserinputhandler.cpp:609
+#: ../src/core/coreuserinputhandler.cpp:647
+msgctxt "CoreUserInputHandler|"
+msgid ""
+"Error: QCA provider plugin not found. It is usually provided by the qca-ossl "
+"plugin."
+msgstr ""
+
+#: ../src/core/coreuserinputhandler.cpp:204
msgctxt "CoreUserInputHandler|"
msgid ""
"[usage] /delkey deletes the encryption key for nick or "
"channel or just /delkey when in a channel or query."
msgstr ""
-#: ../src/core/coreuserinputhandler.cpp:184
-#: ../src/core/coreuserinputhandler.cpp:517
+#: ../src/core/coreuserinputhandler.cpp:211
+#: ../src/core/coreuserinputhandler.cpp:665
#, qt-format
msgctxt "CoreUserInputHandler|"
msgid "No key has been set for %1."
msgstr ""
-#: ../src/core/coreuserinputhandler.cpp:197
+#: ../src/core/coreuserinputhandler.cpp:216
#, qt-format
msgctxt "CoreUserInputHandler|"
msgid "The key for %1 has been deleted."
msgstr ""
-#: ../src/core/coreuserinputhandler.cpp:201
-#: ../src/core/coreuserinputhandler.cpp:525
+#: ../src/core/coreuserinputhandler.cpp:220
+#: ../src/core/coreuserinputhandler.cpp:673
msgctxt "CoreUserInputHandler|"
msgid ""
"Error: Setting an encryption key requires Quassel to have been built with "
@@ -2227,26 +2409,30 @@ msgid ""
"with QCA2 present."
msgstr ""
-#: ../src/core/coreuserinputhandler.cpp:422
-#, qt-format
+#: ../src/core/coreuserinputhandler.cpp:374
msgctxt "CoreUserInputHandler|"
-msgid "Starting query with %1"
+msgid "[usage] /keyx [] Initiates a DH1080 key exchange with the target."
msgstr ""
-#: ../src/core/coreuserinputhandler.cpp:469
+#: ../src/core/coreuserinputhandler.cpp:381
msgctxt "CoreUserInputHandler|"
-msgid ""
-"[usage] /setkey sets the encryption key for nick or "
-"channel. /setkey when in a channel or query buffer sets the key for it."
+msgid "It is only possible to exchange keys in a query buffer."
msgstr ""
-#: ../src/core/coreuserinputhandler.cpp:484
+#: ../src/core/coreuserinputhandler.cpp:391
#, qt-format
msgctxt "CoreUserInputHandler|"
-msgid "The key for %1 has been set."
+msgid "Failed to initiate key exchange with %1."
+msgstr ""
+
+#: ../src/core/coreuserinputhandler.cpp:396
+#, qt-format
+msgctxt "CoreUserInputHandler|"
+msgid "Initiated key exchange with %1."
msgstr ""
-#: ../src/core/coreuserinputhandler.cpp:487
+#: ../src/core/coreuserinputhandler.cpp:400
+#: ../src/core/coreuserinputhandler.cpp:631
msgctxt "CoreUserInputHandler|"
msgid ""
"Error: Setting an encryption key requires Quassel to have been built with "
@@ -2255,20 +2441,39 @@ msgid ""
"with QCA present."
msgstr ""
-#: ../src/core/coreuserinputhandler.cpp:509
+#: ../src/core/coreuserinputhandler.cpp:559
+#, qt-format
+msgctxt "CoreUserInputHandler|"
+msgid "Starting query with %1"
+msgstr ""
+
+#: ../src/core/coreuserinputhandler.cpp:619
+msgctxt "CoreUserInputHandler|"
+msgid ""
+"[usage] /setkey sets the encryption key for nick or "
+"channel. /setkey when in a channel or query buffer sets the key for it."
+msgstr ""
+
+#: ../src/core/coreuserinputhandler.cpp:628
+#, qt-format
+msgctxt "CoreUserInputHandler|"
+msgid "The key for %1 has been set."
+msgstr ""
+
+#: ../src/core/coreuserinputhandler.cpp:657
msgctxt "CoreUserInputHandler|"
msgid ""
"[usage] /showkey shows the encryption key for nick or channel "
"or just /showkey when in a channel or query."
msgstr ""
-#: ../src/core/coreuserinputhandler.cpp:521
+#: ../src/core/coreuserinputhandler.cpp:669
#, qt-format
msgctxt "CoreUserInputHandler|"
-msgid "The key for %1 is %2"
+msgid "The key for %1 is %2:%3"
msgstr ""
-#: ../src/core/coreuserinputhandler.cpp:633
+#: ../src/core/coreuserinputhandler.cpp:797
#, qt-format
msgctxt "CoreUserInputHandler|"
msgid "[Error] Could not encrypt your message: %1"
@@ -2294,6 +2499,17 @@ msgctxt "CreateIdentityDlg|"
msgid "Duplicate:"
msgstr ""
+#: ../src/common/protocols/datastream/datastreampeer.cpp:115
+msgctxt "DataStreamPeer|"
+msgid "Invalid handshake message!"
+msgstr ""
+
+#: ../src/common/protocols/datastream/datastreampeer.cpp:162
+#, qt-format
+msgctxt "DataStreamPeer|"
+msgid "Unknown protocol message of type %1"
+msgstr ""
+
#: ../src/qtui/ui/debugbufferviewoverlay.ui:13
msgctxt "DebugBufferViewOverlay|"
msgid "Debug BufferView Overlay"
@@ -2384,347 +2600,374 @@ msgctxt "DebugLogWidget|"
msgid "Close"
msgstr ""
-#: ../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 ""
-#: ../src/core/eventstringifier.cpp:145
+#: ../src/core/eventstringifier.cpp:239
#, qt-format
msgctxt "EventStringifier|"
msgid "%1 invited you to channel %2"
msgstr ""
-#: ../src/core/eventstringifier.cpp:230
+#: ../src/core/eventstringifier.cpp:341
#, qt-format
msgctxt "EventStringifier|"
msgid "%1 has changed topic for %2 to: \"%3\""
msgstr ""
-#: ../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 ""
-#: ../src/core/eventstringifier.cpp:263
+#: ../src/core/eventstringifier.cpp:384
#, qt-format
msgctxt "EventStringifier|"
msgid "%1 is away: \"%2\""
msgstr ""
-#: ../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 ""
-#: ../src/core/eventstringifier.cpp:308
+#: ../src/core/eventstringifier.cpp:437
#, qt-format
msgctxt "EventStringifier|"
msgid "[Whois] %1 is online via %2 (%3)"
msgstr ""
-#: ../src/core/eventstringifier.cpp:310
+#: ../src/core/eventstringifier.cpp:439
#, qt-format
msgctxt "EventStringifier|"
msgid "[Whowas] %1 was online via %2 (%3)"
msgstr ""
-#: ../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 ""
-#: ../src/core/eventstringifier.cpp:335
+#: ../src/core/eventstringifier.cpp:470
#, qt-format
msgctxt "EventStringifier|"
msgid "[Whois] %1 is logged in since %2"
msgstr ""
-#: ../src/core/eventstringifier.cpp:337
+#: ../src/core/eventstringifier.cpp:474
#, qt-format
msgctxt "EventStringifier|"
msgid "[Whois] %1 is idling for %2 (since %3)"
msgstr ""
-#: ../src/core/eventstringifier.cpp:344
+#: ../src/core/eventstringifier.cpp:484
msgctxt "EventStringifier|"
msgid "[Whois] End of /WHOIS list"
msgstr ""
-#: ../src/core/eventstringifier.cpp:365
+#: ../src/core/eventstringifier.cpp:507
#, qt-format
msgctxt "EventStringifier|"
msgid "[Whois] %1 is a user on channels: %2"
msgstr ""
-#: ../src/core/eventstringifier.cpp:367
+#: ../src/core/eventstringifier.cpp:509
#, qt-format
msgctxt "EventStringifier|"
msgid "[Whois] %1 has voice on channels: %2"
msgstr ""
-#: ../src/core/eventstringifier.cpp:369
+#: ../src/core/eventstringifier.cpp:511
#, qt-format
msgctxt "EventStringifier|"
msgid "[Whois] %1 is an operator on channels: %2"
msgstr ""
-#: ../src/core/eventstringifier.cpp:388
+#: ../src/core/eventstringifier.cpp:532
#, qt-format
msgctxt "EventStringifier|"
msgid "Channel %1 has %2 users. Topic is: \"%3\""
msgstr ""
-#: ../src/core/eventstringifier.cpp:394
+#: ../src/core/eventstringifier.cpp:540
msgctxt "EventStringifier|"
msgid "End of channel list"
msgstr ""
-#: ../src/core/eventstringifier.cpp:408
+#: ../src/core/eventstringifier.cpp:558
#, qt-format
msgctxt "EventStringifier|"
msgid "Homepage for %1 is %2"
msgstr ""
-#: ../src/core/eventstringifier.cpp:423
+#: ../src/core/eventstringifier.cpp:575
#, qt-format
msgctxt "EventStringifier|"
msgid "Channel %1 created on %2"
msgstr ""
-#: ../src/core/eventstringifier.cpp:431
+#: ../src/core/eventstringifier.cpp:589
#, qt-format
msgctxt "EventStringifier|"
msgid "[Whois] %1 is authed as %2"
msgstr ""
-#: ../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 ""
-#: ../src/core/eventstringifier.cpp:443
+#: ../src/core/eventstringifier.cpp:609
#, qt-format
msgctxt "EventStringifier|"
msgid "Topic for %1 is \"%2\""
msgstr ""
-#: ../src/core/eventstringifier.cpp:452
+#: ../src/core/eventstringifier.cpp:621
#, qt-format
msgctxt "EventStringifier|"
msgid "Topic set by %1 on %2"
msgstr ""
-#: ../src/core/eventstringifier.cpp:462
+#: ../src/core/eventstringifier.cpp:634
#, qt-format
msgctxt "EventStringifier|"
msgid "%1 has been invited to %2"
msgstr ""
-#: ../src/core/eventstringifier.cpp:468
+#: ../src/core/eventstringifier.cpp:642
#, qt-format
msgctxt "EventStringifier|"
msgid "[Who] %1"
msgstr ""
-#: ../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 ""
-#: ../src/core/eventstringifier.cpp:483
+#: ../src/core/eventstringifier.cpp:669
#, qt-format
msgctxt "EventStringifier|"
msgid "Nick already in use: %1"
msgstr ""
-#: ../src/core/eventstringifier.cpp:488
+#: ../src/core/eventstringifier.cpp:679
#, qt-format
msgctxt "EventStringifier|"
msgid "Nick/channel is temporarily unavailable: %1"
msgstr ""
-#: ../src/core/eventstringifier.cpp:509
+#: ../src/core/eventstringifier.cpp:702
#, qt-format
msgctxt "EventStringifier|"
msgid "sending CTCP-%1 request to %2"
msgstr ""
-#. 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:737
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "Received CTCP-PING answer from %1 with %2 milliseconds round trip time"
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:740
#, qt-format
msgctxt "EventStringifier|"
msgid "Received CTCP-PING answer from %1 with %2 seconds round trip time"
msgstr ""
-#: ../src/client/execwrapper.cpp:45
+#: ../src/client/execwrapper.cpp:49
#, qt-format
msgctxt "ExecWrapper|"
msgid "Invalid command string for /exec: %1"
msgstr ""
-#: ../src/client/execwrapper.cpp:53
+#: ../src/client/execwrapper.cpp:58
#, qt-format
msgctxt "ExecWrapper|"
msgid "Name \"%1\" is invalid: ../ or ..\\ are not allowed!"
msgstr ""
-#: ../src/client/execwrapper.cpp:64
+#: ../src/client/execwrapper.cpp:69
#, qt-format
msgctxt "ExecWrapper|"
msgid "Could not find script \"%1\""
msgstr ""
-#: ../src/client/execwrapper.cpp:82
+#: ../src/client/execwrapper.cpp:93
#, qt-format
msgctxt "ExecWrapper|"
msgid "Script \"%1\" crashed with exit code %2."
msgstr ""
-#: ../src/client/execwrapper.cpp:98
+#: ../src/client/execwrapper.cpp:111
#, qt-format
msgctxt "ExecWrapper|"
msgid "Script \"%1\" could not start."
msgstr ""
-#: ../src/client/execwrapper.cpp:100
+#: ../src/client/execwrapper.cpp:113
#, qt-format
msgctxt "ExecWrapper|"
msgid "Script \"%1\" caused error %2."
msgstr ""
-#: ../src/uisupport/fontselector.cpp:31
+#: ../src/uisupport/fontselector.cpp:32
msgctxt "FontSelector|"
msgid "Choose..."
msgstr ""
-#: ../src/qtui/settingspages/highlightsettingspage.ui:13
+#: ../src/qtui/settingspages/highlightsettingspage.ui:14
msgctxt "HighlightSettingsPage|"
msgid "Form"
msgstr ""
-#: ../src/qtui/settingspages/highlightsettingspage.ui:19
+#: ../src/qtui/settingspages/highlightsettingspage.ui:20
msgctxt "HighlightSettingsPage|"
msgid "Custom Highlights"
msgstr ""
-#: ../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 ""
-#: ../src/qtui/settingspages/highlightsettingspage.ui:37
+#: ../src/qtui/settingspages/highlightsettingspage.ui:38
msgctxt "HighlightSettingsPage|"
msgid "RegEx"
msgstr ""
-#: ../src/qtui/settingspages/highlightsettingspage.ui:42
+#: ../src/qtui/settingspages/highlightsettingspage.ui:43
msgctxt "HighlightSettingsPage|"
msgid "CS"
msgstr ""
-#: ../src/qtui/settingspages/highlightsettingspage.ui:47
+#: ../src/qtui/settingspages/highlightsettingspage.ui:48
msgctxt "HighlightSettingsPage|"
msgid "Enable"
msgstr ""
-#: ../src/qtui/settingspages/highlightsettingspage.ui:55
+#: ../src/qtui/settingspages/highlightsettingspage.ui:53
+msgctxt "HighlightSettingsPage|"
+msgid "Channel"
+msgstr ""
+
+#: ../src/qtui/settingspages/highlightsettingspage.ui:69
msgctxt "HighlightSettingsPage|"
msgid "Add"
msgstr ""
-#: ../src/qtui/settingspages/highlightsettingspage.ui:62
+#: ../src/qtui/settingspages/highlightsettingspage.ui:76
msgctxt "HighlightSettingsPage|"
msgid "Remove"
msgstr ""
-#: ../src/qtui/settingspages/highlightsettingspage.ui:85
+#: ../src/qtui/settingspages/highlightsettingspage.ui:101
msgctxt "HighlightSettingsPage|"
msgid "Highlight Nicks"
msgstr ""
-#: ../src/qtui/settingspages/highlightsettingspage.ui:91
+#: ../src/qtui/settingspages/highlightsettingspage.ui:107
msgctxt "HighlightSettingsPage|"
msgid "All nicks from identity"
msgstr ""
-#: ../src/qtui/settingspages/highlightsettingspage.ui:98
+#: ../src/qtui/settingspages/highlightsettingspage.ui:114
msgctxt "HighlightSettingsPage|"
msgid "Current nick"
msgstr ""
-#: ../src/qtui/settingspages/highlightsettingspage.ui:108
+#: ../src/qtui/settingspages/highlightsettingspage.ui:124
msgctxt "HighlightSettingsPage|"
msgid "None"
msgstr ""
-#: ../src/qtui/settingspages/highlightsettingspage.ui:115
+#: ../src/qtui/settingspages/highlightsettingspage.ui:131
msgctxt "HighlightSettingsPage|"
msgid "Case sensitive"
msgstr ""
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:30
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:29
msgctxt "HighlightSettingsPage|"
msgid "Interface"
msgstr ""
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:159
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:184
msgctxt "HighlightSettingsPage|"
msgid "this shouldn't be empty"
msgstr ""
-#: ../src/qtui/settingspages/highlightsettingspage.h:45
+#: ../src/qtui/settingspages/highlightsettingspage.h:46
msgctxt "HighlightSettingsPage|"
msgid "highlight rule"
msgstr ""
#: ../src/qtui/settingspages/identitiessettingspage.ui:31
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:322
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:370
msgctxt "IdentitiesSettingsPage|"
msgid "Rename Identity"
msgstr ""
@@ -2760,91 +3003,91 @@ msgctxt "IdentitiesSettingsPage|"
msgid "Identities"
msgstr ""
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:178
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:205
msgctxt "IdentitiesSettingsPage|"
msgid ""
"The following problems need to be corrected before your changes can be "
"applied:"
msgstr ""
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:179
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:206
msgctxt "IdentitiesSettingsPage|"
msgid "- All identities need an identity name set
"
msgstr ""
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:180
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:207
msgctxt "IdentitiesSettingsPage|"
msgid "- Every identity needs at least one nickname defined
"
msgstr ""
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:181
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:208
msgctxt "IdentitiesSettingsPage|"
msgid "- You need to specify a real name for every identity
"
msgstr ""
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:182
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:209
msgctxt "IdentitiesSettingsPage|"
msgid "- You need to specify an ident for every identity
"
msgstr ""
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:183
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:210
msgctxt "IdentitiesSettingsPage|"
msgid "
"
msgstr ""
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:184
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:211
msgctxt "IdentitiesSettingsPage|"
msgid "One or more identities are invalid"
msgstr ""
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:310
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:356
msgctxt "IdentitiesSettingsPage|"
msgid "Delete Identity?"
msgstr ""
-#: ../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 ""
-#: ../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 ""
-#: ../src/common/identity.cpp:134
+#: ../src/common/identity.cpp:147
msgctxt "Identity|"
msgid "Quassel IRC User"
msgstr ""
-#: ../src/common/identity.cpp:162
+#: ../src/common/identity.cpp:177
msgctxt "Identity|"
msgid ""
msgstr ""
-#: ../src/common/identity.cpp:168
+#: ../src/common/identity.cpp:183
msgctxt "Identity|"
msgid "Gone fishing."
msgstr ""
-#: ../src/common/identity.cpp:172
+#: ../src/common/identity.cpp:187
msgctxt "Identity|"
msgid "Not here. No, really. not here!"
msgstr ""
-#: ../src/common/identity.cpp:175
+#: ../src/common/identity.cpp:190
msgctxt "Identity|"
msgid "All Quassel clients vanished from the face of the earth..."
msgstr ""
-#: ../src/common/identity.cpp:178
+#: ../src/common/identity.cpp:193
msgctxt "Identity|"
msgid "Kindergarten is elsewhere!"
msgstr ""
-#: ../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 ""
@@ -2978,7 +3221,7 @@ msgid "minutes of being idle"
msgstr ""
#: ../src/qtui/settingspages/identityeditwidget.ui:399
-#: ../src/qtui/settingspages/identityeditwidget.cpp:219
+#: ../src/qtui/settingspages/identityeditwidget.cpp:238
msgctxt "IdentityEditWidget|"
msgid "Advanced"
msgstr ""
@@ -3046,16 +3289,16 @@ msgid "Key Type:"
msgstr ""
#: ../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 ""
#: ../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 ""
@@ -3072,8 +3315,8 @@ msgstr ""
#: ../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 ""
@@ -3083,38 +3326,50 @@ msgctxt "IdentityEditWidget|"
msgid "CommonName:"
msgstr ""
-#: ../src/qtui/settingspages/identityeditwidget.cpp:290
+#: ../src/qtui/settingspages/identityeditwidget.cpp:321
msgctxt "IdentityEditWidget|"
msgid "Load a Key"
msgstr ""
-#: ../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 ""
-#: ../src/qtui/settingspages/identityeditwidget.cpp:325
+#: ../src/qtui/settingspages/identityeditwidget.cpp:362
msgctxt "IdentityEditWidget|"
msgid "DSA"
msgstr ""
-#: ../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 ""
-#: ../src/qtui/settingspages/identityeditwidget.cpp:340
+#: ../src/qtui/settingspages/identityeditwidget.cpp:379
msgctxt "IdentityEditWidget|"
msgid "Load a Certificate"
msgstr ""
-#: ../src/qtui/ircconnectionwizard.cpp:107
+#: ../src/qtui/ircconnectionwizard.cpp:115
msgctxt "IdentityPage|"
msgid "Setup Identity"
msgstr ""
-#: ../src/qtui/ircconnectionwizard.cpp:112
+#: ../src/qtui/ircconnectionwizard.cpp:120
msgctxt "IdentityPage|"
msgid "Default Identity"
msgstr ""
@@ -3284,14 +3539,14 @@ msgctxt "IgnoreListEditDlg|"
msgid "Rule is enabled"
msgstr ""
-#: ../src/qtui/settingspages/ignorelistmodel.cpp:69
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:71
msgctxt "IgnoreListModel|"
msgid ""
"Enable / Disable:
Only enabled rules are filtered.
For "
"dynamic rules, disabling actually shows the filtered messages again"
msgstr ""
-#: ../src/qtui/settingspages/ignorelistmodel.cpp:73
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:75
msgctxt "IgnoreListModel|"
msgid ""
"Ignore rule:
Depending on the type of the rule, the text is "
@@ -3303,27 +3558,27 @@ msgid ""
"nickname \"stupid\" from any host
"
msgstr ""
-#: ../src/qtui/settingspages/ignorelistmodel.cpp:89
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:91
msgctxt "IgnoreListModel|"
msgid "By Sender"
msgstr ""
-#: ../src/qtui/settingspages/ignorelistmodel.cpp:91
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:93
msgctxt "IgnoreListModel|"
msgid "By Message"
msgstr ""
-#: ../src/qtui/settingspages/ignorelistmodel.cpp:193
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:208
msgctxt "IgnoreListModel|"
msgid "Enabled"
msgstr ""
-#: ../src/qtui/settingspages/ignorelistmodel.cpp:194
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:209
msgctxt "IgnoreListModel|"
msgid "Type"
msgstr ""
-#: ../src/qtui/settingspages/ignorelistmodel.cpp:195
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:210
msgctxt "IgnoreListModel|"
msgid "Ignore Rule"
msgstr ""
@@ -3358,12 +3613,12 @@ msgctxt "IgnoreListSettingsPage|"
msgid "Ignore List"
msgstr ""
-#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:128
+#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:144
msgctxt "IgnoreListSettingsPage|"
msgid "Rule already exists"
msgstr ""
-#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:129
+#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:145
#, qt-format
msgctxt "IgnoreListSettingsPage|"
msgid ""
@@ -3394,92 +3649,92 @@ msgctxt "InputWidget|"
msgid "Form"
msgstr ""
-#: ../src/qtui/inputwidget.cpp:73
+#: ../src/qtui/inputwidget.cpp:74
msgctxt "InputWidget|"
msgid "White"
msgstr ""
-#: ../src/qtui/inputwidget.cpp:73
+#: ../src/qtui/inputwidget.cpp:74
msgctxt "InputWidget|"
msgid "Black"
msgstr ""
-#: ../src/qtui/inputwidget.cpp:73
+#: ../src/qtui/inputwidget.cpp:74
msgctxt "InputWidget|"
msgid "Dark blue"
msgstr ""
-#: ../src/qtui/inputwidget.cpp:73
+#: ../src/qtui/inputwidget.cpp:74
msgctxt "InputWidget|"
msgid "Dark green"
msgstr ""
-#: ../src/qtui/inputwidget.cpp:73
+#: ../src/qtui/inputwidget.cpp:74
msgctxt "InputWidget|"
msgid "Red"
msgstr ""
-#: ../src/qtui/inputwidget.cpp:73
+#: ../src/qtui/inputwidget.cpp:74
msgctxt "InputWidget|"
msgid "Dark red"
msgstr ""
-#: ../src/qtui/inputwidget.cpp:73
+#: ../src/qtui/inputwidget.cpp:74
msgctxt "InputWidget|"
msgid "Dark magenta"
msgstr ""
-#: ../src/qtui/inputwidget.cpp:73
+#: ../src/qtui/inputwidget.cpp:74
msgctxt "InputWidget|"
msgid "Orange"
msgstr ""
-#: ../src/qtui/inputwidget.cpp:74
+#: ../src/qtui/inputwidget.cpp:75
msgctxt "InputWidget|"
msgid "Yellow"
msgstr ""
-#: ../src/qtui/inputwidget.cpp:74
+#: ../src/qtui/inputwidget.cpp:75
msgctxt "InputWidget|"
msgid "Green"
msgstr ""
-#: ../src/qtui/inputwidget.cpp:74
+#: ../src/qtui/inputwidget.cpp:75
msgctxt "InputWidget|"
msgid "Dark cyan"
msgstr ""
-#: ../src/qtui/inputwidget.cpp:74
+#: ../src/qtui/inputwidget.cpp:75
msgctxt "InputWidget|"
msgid "Cyan"
msgstr ""
-#: ../src/qtui/inputwidget.cpp:74
+#: ../src/qtui/inputwidget.cpp:75
msgctxt "InputWidget|"
msgid "Blue"
msgstr ""
-#: ../src/qtui/inputwidget.cpp:74
+#: ../src/qtui/inputwidget.cpp:75
msgctxt "InputWidget|"
msgid "Magenta"
msgstr ""
-#: ../src/qtui/inputwidget.cpp:74
+#: ../src/qtui/inputwidget.cpp:75
msgctxt "InputWidget|"
msgid "Dark gray"
msgstr ""
-#: ../src/qtui/inputwidget.cpp:74
+#: ../src/qtui/inputwidget.cpp:75
msgctxt "InputWidget|"
msgid "Light gray"
msgstr ""
-#: ../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 ""
-#: ../src/qtui/inputwidget.cpp:132
+#: ../src/qtui/inputwidget.cpp:136
msgctxt "InputWidget|"
msgid "Focus Input Line"
msgstr ""
@@ -3526,92 +3781,107 @@ msgstr ""
#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:127
msgctxt "InputWidgetSettingsPage|"
+msgid "Enables line wrapping for input."
+msgstr ""
+
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:130
+msgctxt "InputWidgetSettingsPage|"
+msgid "Line wrapping"
+msgstr ""
+
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:143
+msgctxt "InputWidgetSettingsPage|"
msgid "Multi-Line Editing"
msgstr ""
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:144
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:160
msgctxt "InputWidgetSettingsPage|"
msgid "Show at most"
msgstr ""
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:170
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:186
msgctxt "InputWidgetSettingsPage|"
msgid "lines"
msgstr ""
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:192
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:208
msgctxt "InputWidgetSettingsPage|"
msgid "Enable scrollbars"
msgstr ""
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:211
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:227
msgctxt "InputWidgetSettingsPage|"
msgid "Tab Completion"
msgstr ""
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:219
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:235
msgctxt "InputWidgetSettingsPage|"
msgid "Completion suffix:"
msgstr ""
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:235
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:251
msgctxt "InputWidgetSettingsPage|"
msgid ": "
msgstr ""
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:262
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:278
msgctxt "InputWidgetSettingsPage|"
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 ""
-#: ../src/qtui/settingspages/inputwidgetsettingspage.cpp:23
+#: ../src/qtui/settingspages/inputwidgetsettingspage.cpp:24
msgctxt "InputWidgetSettingsPage|"
msgid "Input Widget"
msgstr ""
-#: ../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 ""
-#: ../src/client/irclistmodel.cpp:59
+#: ../src/client/irclistmodel.cpp:65
msgctxt "IrcListModel|"
msgid "Channel"
msgstr ""
-#: ../src/client/irclistmodel.cpp:60
+#: ../src/client/irclistmodel.cpp:66
msgctxt "IrcListModel|"
msgid "Users"
msgstr ""
-#: ../src/client/irclistmodel.cpp:61
+#: ../src/client/irclistmodel.cpp:67
msgctxt "IrcListModel|"
msgid "Topic"
msgstr ""
-#: ../src/client/networkmodel.cpp:806
+#: ../src/client/networkmodel.cpp:914
msgctxt "IrcUserItem|"
msgid " is away"
msgstr ""
-#: ../src/client/networkmodel.cpp:821
+#: ../src/client/networkmodel.cpp:929
#, qt-format
msgctxt "IrcUserItem|"
msgid "idling since %1"
msgstr ""
-#: ../src/client/networkmodel.cpp:824
+#: ../src/client/networkmodel.cpp:932
#, qt-format
msgctxt "IrcUserItem|"
msgid "login time: %1"
msgstr ""
-#: ../src/client/networkmodel.cpp:827
+#: ../src/client/networkmodel.cpp:935
#, qt-format
msgctxt "IrcUserItem|"
msgid "server: %1"
@@ -3703,109 +3973,109 @@ msgctxt "ItemViewSettingsPage|"
msgid "Away:"
msgstr ""
-#: ../src/qtui/settingspages/itemviewsettingspage.cpp:28
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:29
msgctxt "ItemViewSettingsPage|"
msgid "Interface"
msgstr ""
-#: ../src/qtui/settingspages/itemviewsettingspage.cpp:28
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:29
msgctxt "ItemViewSettingsPage|"
msgid "Chat & Nick Lists"
msgstr ""
-#: ../src/qtui/settingspages/itemviewsettingspage.cpp:33
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:34
msgctxt "ItemViewSettingsPage|"
msgid "Network"
msgstr ""
-#: ../src/qtui/settingspages/itemviewsettingspage.cpp:36
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:37
msgctxt "ItemViewSettingsPage|"
msgid "Inactive"
msgstr ""
-#: ../src/qtui/settingspages/itemviewsettingspage.cpp:37
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:38
msgctxt "ItemViewSettingsPage|"
msgid "Normal"
msgstr ""
-#: ../src/qtui/settingspages/itemviewsettingspage.cpp:38
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:39
msgctxt "ItemViewSettingsPage|"
msgid "Unread messages"
msgstr ""
-#: ../src/qtui/settingspages/itemviewsettingspage.cpp:39
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:40
msgctxt "ItemViewSettingsPage|"
msgid "Highlight"
msgstr ""
-#: ../src/qtui/settingspages/itemviewsettingspage.cpp:40
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:41
msgctxt "ItemViewSettingsPage|"
msgid "Other activity"
msgstr ""
-#: ../src/qtui/knotificationbackend.cpp:115
+#: ../src/qtui/knotificationbackend.cpp:130
#, qt-format
msgctxt "KNotificationBackend|"
-msgid "%n pending highlights"
-msgid_plural "%n pending highlights"
+msgid "%n pending highlight(s)"
+msgid_plural "%n pending highlight(s)"
msgstr[0] ""
msgstr[1] ""
-#: ../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 ""
-#: ../src/qtui/settingspages/keysequencewidget.cpp:78
+#: ../src/qtui/settingspages/keysequencewidget.cpp:81
msgctxt "KeySequenceButton|"
msgid "Unsupported Key"
msgstr ""
-#: ../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 ""
-#: ../src/qtui/settingspages/keysequencewidget.cpp:259
+#: ../src/qtui/settingspages/keysequencewidget.cpp:274
msgctxt "KeySequenceWidget|Meta key"
msgid "Meta"
msgstr ""
-#: ../src/qtui/settingspages/keysequencewidget.cpp:260
+#: ../src/qtui/settingspages/keysequencewidget.cpp:275
msgctxt "KeySequenceWidget|Ctrl key"
msgid "Ctrl"
msgstr ""
-#: ../src/qtui/settingspages/keysequencewidget.cpp:261
+#: ../src/qtui/settingspages/keysequencewidget.cpp:276
msgctxt "KeySequenceWidget|Alt key"
msgid "Alt"
msgstr ""
-#: ../src/qtui/settingspages/keysequencewidget.cpp:262
+#: ../src/qtui/settingspages/keysequencewidget.cpp:277
msgctxt "KeySequenceWidget|Shift key"
msgid "Shift"
msgstr ""
-#: ../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 ""
-#: ../src/qtui/settingspages/keysequencewidget.cpp:272
+#: ../src/qtui/settingspages/keysequencewidget.cpp:288
msgctxt "KeySequenceWidget|No shortcut defined"
msgid "None"
msgstr ""
-#: ../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 ""
-#: ../src/qtui/settingspages/keysequencewidget.cpp:356
+#: ../src/qtui/settingspages/keysequencewidget.cpp:384
#, qt-format
msgctxt "KeySequenceWidget|"
msgid ""
@@ -3813,391 +4083,413 @@ msgid ""
"Please choose another one."
msgstr ""
-#: ../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 ""
-#: ../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 ""
-#: ../src/qtui/settingspages/keysequencewidget.cpp:367
+#: ../src/qtui/settingspages/keysequencewidget.cpp:395
msgctxt "KeySequenceWidget|"
msgid "Reassign"
msgstr ""
-#: ../src/qtui/mainwin.cpp:313
+#: ../src/common/protocols/legacy/legacypeer.cpp:136
+msgctxt "LegacyPeer|"
+msgid "Invalid handshake message!"
+msgstr ""
+
+#: ../src/common/protocols/legacy/legacypeer.cpp:207
+#, qt-format
+msgctxt "LegacyPeer|"
+msgid "Unknown protocol message of type %1"
+msgstr ""
+
+#: ../src/common/protocols/legacy/legacypeer.cpp:256
+#, qt-format
+msgctxt "LegacyPeer|"
+msgid "Quassel Core Version %1
Built: %2
Up %3d%4h%5m (since %6)"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:358
msgctxt "MainWin|"
msgid "General"
msgstr ""
-#: ../src/qtui/mainwin.cpp:315
+#: ../src/qtui/mainwin.cpp:360
msgctxt "MainWin|"
msgid "&Connect to Core..."
msgstr ""
-#: ../src/qtui/mainwin.cpp:317
+#: ../src/qtui/mainwin.cpp:362
msgctxt "MainWin|"
msgid "&Disconnect from Core"
msgstr ""
-#: ../src/qtui/mainwin.cpp:319
+#: ../src/qtui/mainwin.cpp:364
msgctxt "MainWin|"
msgid "Core &Info..."
msgstr ""
-#: ../src/qtui/mainwin.cpp:321
+#: ../src/qtui/mainwin.cpp:366
msgctxt "MainWin|"
msgid "Configure &Networks..."
msgstr ""
-#: ../src/qtui/mainwin.cpp:324
+#: ../src/qtui/mainwin.cpp:369
msgctxt "MainWin|"
msgid "&Quit"
msgstr ""
-#: ../src/qtui/mainwin.cpp:328
+#: ../src/qtui/mainwin.cpp:373
msgctxt "MainWin|"
msgid "&Configure Chat Lists..."
msgstr ""
-#: ../src/qtui/mainwin.cpp:331
+#: ../src/qtui/mainwin.cpp:376
msgctxt "MainWin|"
msgid "&Lock Layout"
msgstr ""
-#: ../src/qtui/mainwin.cpp:335
+#: ../src/qtui/mainwin.cpp:380
msgctxt "MainWin|"
msgid "Show &Search Bar"
msgstr ""
-#: ../src/qtui/mainwin.cpp:337
+#: ../src/qtui/mainwin.cpp:382
msgctxt "MainWin|"
msgid "Show Away Log"
msgstr ""
-#: ../src/qtui/mainwin.cpp:339
+#: ../src/qtui/mainwin.cpp:384
msgctxt "MainWin|"
msgid "Show &Menubar"
msgstr ""
-#: ../src/qtui/mainwin.cpp:342
+#: ../src/qtui/mainwin.cpp:387
msgctxt "MainWin|"
msgid "Show Status &Bar"
msgstr ""
-#: ../src/qtui/mainwin.cpp:348
+#: ../src/qtui/mainwin.cpp:393
msgctxt "MainWin|"
msgid "&Full Screen Mode"
msgstr ""
-#: ../src/qtui/mainwin.cpp:355
+#: ../src/qtui/mainwin.cpp:400
msgctxt "MainWin|"
msgid "Configure &Shortcuts..."
msgstr ""
-#: ../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 ""
-#: ../src/qtui/mainwin.cpp:371
+#: ../src/qtui/mainwin.cpp:416
msgctxt "MainWin|"
msgid "&About Quassel"
msgstr ""
-#: ../src/qtui/mainwin.cpp:376
+#: ../src/qtui/mainwin.cpp:421
msgctxt "MainWin|"
msgid "About &Qt"
msgstr ""
-#: ../src/qtui/mainwin.cpp:380
+#: ../src/qtui/mainwin.cpp:425
msgctxt "MainWin|"
msgid "Debug &NetworkModel"
msgstr ""
-#: ../src/qtui/mainwin.cpp:382
+#: ../src/qtui/mainwin.cpp:427
msgctxt "MainWin|"
msgid "Debug &BufferViewOverlay"
msgstr ""
-#: ../src/qtui/mainwin.cpp:384
+#: ../src/qtui/mainwin.cpp:429
msgctxt "MainWin|"
msgid "Debug &MessageModel"
msgstr ""
-#: ../src/qtui/mainwin.cpp:386
+#: ../src/qtui/mainwin.cpp:431
msgctxt "MainWin|"
msgid "Debug &HotList"
msgstr ""
-#: ../src/qtui/mainwin.cpp:388
+#: ../src/qtui/mainwin.cpp:433
msgctxt "MainWin|"
msgid "Debug &Log"
msgstr ""
-#: ../src/qtui/mainwin.cpp:390
+#: ../src/qtui/mainwin.cpp:435
msgctxt "MainWin|"
msgid "Reload Stylesheet"
msgstr ""
-#: ../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 ""
-#: ../src/qtui/mainwin.cpp:396
+#: ../src/qtui/mainwin.cpp:444
msgctxt "MainWin|"
msgid "Jump to hot chat"
msgstr ""
-#: ../src/qtui/mainwin.cpp:408
+#: ../src/qtui/mainwin.cpp:456
msgctxt "MainWin|"
msgid "Set Quick Access #0"
msgstr ""
-#: ../src/qtui/mainwin.cpp:410
+#: ../src/qtui/mainwin.cpp:458
msgctxt "MainWin|"
msgid "Set Quick Access #1"
msgstr ""
-#: ../src/qtui/mainwin.cpp:412
+#: ../src/qtui/mainwin.cpp:460
msgctxt "MainWin|"
msgid "Set Quick Access #2"
msgstr ""
-#: ../src/qtui/mainwin.cpp:414
+#: ../src/qtui/mainwin.cpp:462
msgctxt "MainWin|"
msgid "Set Quick Access #3"
msgstr ""
-#: ../src/qtui/mainwin.cpp:416
+#: ../src/qtui/mainwin.cpp:464
msgctxt "MainWin|"
msgid "Set Quick Access #4"
msgstr ""
-#: ../src/qtui/mainwin.cpp:418
+#: ../src/qtui/mainwin.cpp:466
msgctxt "MainWin|"
msgid "Set Quick Access #5"
msgstr ""
-#: ../src/qtui/mainwin.cpp:420
+#: ../src/qtui/mainwin.cpp:468
msgctxt "MainWin|"
msgid "Set Quick Access #6"
msgstr ""
-#: ../src/qtui/mainwin.cpp:422
+#: ../src/qtui/mainwin.cpp:470
msgctxt "MainWin|"
msgid "Set Quick Access #7"
msgstr ""
-#: ../src/qtui/mainwin.cpp:424
+#: ../src/qtui/mainwin.cpp:472
msgctxt "MainWin|"
msgid "Set Quick Access #8"
msgstr ""
-#: ../src/qtui/mainwin.cpp:426
+#: ../src/qtui/mainwin.cpp:474
msgctxt "MainWin|"
msgid "Set Quick Access #9"
msgstr ""
-#: ../src/qtui/mainwin.cpp:429
+#: ../src/qtui/mainwin.cpp:477
msgctxt "MainWin|"
msgid "Quick Access #0"
msgstr ""
-#: ../src/qtui/mainwin.cpp:431
+#: ../src/qtui/mainwin.cpp:479
msgctxt "MainWin|"
msgid "Quick Access #1"
msgstr ""
-#: ../src/qtui/mainwin.cpp:433
+#: ../src/qtui/mainwin.cpp:481
msgctxt "MainWin|"
msgid "Quick Access #2"
msgstr ""
-#: ../src/qtui/mainwin.cpp:435
+#: ../src/qtui/mainwin.cpp:483
msgctxt "MainWin|"
msgid "Quick Access #3"
msgstr ""
-#: ../src/qtui/mainwin.cpp:437
+#: ../src/qtui/mainwin.cpp:485
msgctxt "MainWin|"
msgid "Quick Access #4"
msgstr ""
-#: ../src/qtui/mainwin.cpp:439
+#: ../src/qtui/mainwin.cpp:487
msgctxt "MainWin|"
msgid "Quick Access #5"
msgstr ""
-#: ../src/qtui/mainwin.cpp:441
+#: ../src/qtui/mainwin.cpp:489
msgctxt "MainWin|"
msgid "Quick Access #6"
msgstr ""
-#: ../src/qtui/mainwin.cpp:443
+#: ../src/qtui/mainwin.cpp:491
msgctxt "MainWin|"
msgid "Quick Access #7"
msgstr ""
-#: ../src/qtui/mainwin.cpp:445
+#: ../src/qtui/mainwin.cpp:493
msgctxt "MainWin|"
msgid "Quick Access #8"
msgstr ""
-#: ../src/qtui/mainwin.cpp:447
+#: ../src/qtui/mainwin.cpp:495
msgctxt "MainWin|"
msgid "Quick Access #9"
msgstr ""
-#: ../src/qtui/mainwin.cpp:451
+#: ../src/qtui/mainwin.cpp:499
msgctxt "MainWin|"
msgid "Activate Next Chat List"
msgstr ""
-#: ../src/qtui/mainwin.cpp:453
+#: ../src/qtui/mainwin.cpp:501
msgctxt "MainWin|"
msgid "Activate Previous Chat List"
msgstr ""
-#: ../src/qtui/mainwin.cpp:455
+#: ../src/qtui/mainwin.cpp:503
msgctxt "MainWin|"
msgid "Go to Next Chat"
msgstr ""
-#: ../src/qtui/mainwin.cpp:457
+#: ../src/qtui/mainwin.cpp:505
msgctxt "MainWin|"
msgid "Go to Previous Chat"
msgstr ""
-#: ../src/qtui/mainwin.cpp:464
+#: ../src/qtui/mainwin.cpp:514
msgctxt "MainWin|"
msgid "&File"
msgstr ""
-#: ../src/qtui/mainwin.cpp:477
+#: ../src/qtui/mainwin.cpp:527
msgctxt "MainWin|"
msgid "&Networks"
msgstr ""
-#: ../src/qtui/mainwin.cpp:483
+#: ../src/qtui/mainwin.cpp:533
msgctxt "MainWin|"
msgid "&View"
msgstr ""
-#: ../src/qtui/mainwin.cpp:484
+#: ../src/qtui/mainwin.cpp:534
msgctxt "MainWin|"
msgid "&Chat Lists"
msgstr ""
-#: ../src/qtui/mainwin.cpp:486
+#: ../src/qtui/mainwin.cpp:536
msgctxt "MainWin|"
msgid "&Toolbars"
msgstr ""
-#: ../src/qtui/mainwin.cpp:500
+#: ../src/qtui/mainwin.cpp:550
msgctxt "MainWin|"
msgid "&Settings"
msgstr ""
-#: ../src/qtui/mainwin.cpp:509
+#: ../src/qtui/mainwin.cpp:559
msgctxt "MainWin|"
msgid "&Help"
msgstr ""
-#: ../src/qtui/mainwin.cpp:517
+#: ../src/qtui/mainwin.cpp:567
msgctxt "MainWin|"
msgid "Debug"
msgstr ""
-#: ../src/qtui/mainwin.cpp:746
+#: ../src/qtui/mainwin.cpp:843
msgctxt "MainWin|"
msgid "Nicks"
msgstr ""
-#: ../src/qtui/mainwin.cpp:755
+#: ../src/qtui/mainwin.cpp:852
msgctxt "MainWin|"
msgid "Show Nick List"
msgstr ""
-#: ../src/qtui/mainwin.cpp:766
+#: ../src/qtui/mainwin.cpp:865
msgctxt "MainWin|"
msgid "Chat Monitor"
msgstr ""
-#: ../src/qtui/mainwin.cpp:778
+#: ../src/qtui/mainwin.cpp:877
msgctxt "MainWin|"
msgid "Show Chat Monitor"
msgstr ""
-#: ../src/qtui/mainwin.cpp:782
+#: ../src/qtui/mainwin.cpp:883
msgctxt "MainWin|"
msgid "Inputline"
msgstr ""
-#: ../src/qtui/mainwin.cpp:791
+#: ../src/qtui/mainwin.cpp:892
msgctxt "MainWin|"
msgid "Show Input Line"
msgstr ""
-#: ../src/qtui/mainwin.cpp:804
+#: ../src/qtui/mainwin.cpp:907
msgctxt "MainWin|"
msgid "Topic"
msgstr ""
-#: ../src/qtui/mainwin.cpp:816
+#: ../src/qtui/mainwin.cpp:919
msgctxt "MainWin|"
msgid "Show Topic Line"
msgstr ""
-#: ../src/qtui/mainwin.cpp:894
+#: ../src/qtui/mainwin.cpp:1013
msgctxt "MainWin|"
msgid "Main Toolbar"
msgstr ""
-#: ../src/qtui/mainwin.cpp:933
+#: ../src/qtui/mainwin.cpp:1074
msgctxt "MainWin|"
msgid "Connected to core."
msgstr ""
-#: ../src/qtui/mainwin.cpp:1024
+#: ../src/qtui/mainwin.cpp:1173
msgctxt "MainWin|"
msgid "Not connected to core."
msgstr ""
-#: ../src/qtui/mainwin.cpp:1038 ../src/qtui/mainwin.cpp:1046
+#: ../src/qtui/mainwin.cpp:1191 ../src/qtui/mainwin.cpp:1201
msgctxt "MainWin|"
msgid "Unencrypted Connection"
msgstr ""
-#: ../src/qtui/mainwin.cpp:1038
+#: ../src/qtui/mainwin.cpp:1191
msgctxt "MainWin|"
msgid "Your client does not support SSL encryption"
msgstr ""
-#: ../src/qtui/mainwin.cpp:1040 ../src/qtui/mainwin.cpp:1048
+#: ../src/qtui/mainwin.cpp:1193 ../src/qtui/mainwin.cpp:1203
msgctxt "MainWin|"
msgid ""
"Sensitive data, like passwords, will be transmitted unencrypted to your "
"Quassel core."
msgstr ""
-#: ../src/qtui/mainwin.cpp:1046
+#: ../src/qtui/mainwin.cpp:1201
msgctxt "MainWin|"
msgid "Your core does not support SSL encryption"
msgstr ""
-#: ../src/qtui/mainwin.cpp:1063 ../src/qtui/mainwin.cpp:1083
+#: ../src/qtui/mainwin.cpp:1219 ../src/qtui/mainwin.cpp:1240
msgctxt "MainWin|"
msgid "Untrusted Security Certificate"
msgstr ""
-#: ../src/qtui/mainwin.cpp:1064
+#: ../src/qtui/mainwin.cpp:1220
#, qt-format
msgctxt "MainWin|"
msgid ""
@@ -4205,38 +4497,38 @@ msgid ""
"following reasons:"
msgstr ""
-#: ../src/qtui/mainwin.cpp:1067
+#: ../src/qtui/mainwin.cpp:1223
msgctxt "MainWin|"
msgid "Continue"
msgstr ""
-#: ../src/qtui/mainwin.cpp:1068
+#: ../src/qtui/mainwin.cpp:1224
msgctxt "MainWin|"
msgid "Show Certificate"
msgstr ""
-#: ../src/qtui/mainwin.cpp:1084
+#: ../src/qtui/mainwin.cpp:1241
msgctxt "MainWin|"
msgid ""
"Would you like to accept this certificate forever without being prompted?"
msgstr ""
-#: ../src/qtui/mainwin.cpp:1086
+#: ../src/qtui/mainwin.cpp:1243
msgctxt "MainWin|"
msgid "Current Session Only"
msgstr ""
-#: ../src/qtui/mainwin.cpp:1087
+#: ../src/qtui/mainwin.cpp:1244
msgctxt "MainWin|"
msgid "Forever"
msgstr ""
-#: ../src/qtui/mainwin.cpp:1096
+#: ../src/qtui/mainwin.cpp:1255
msgctxt "MainWin|"
msgid "Core Connection Error"
msgstr ""
-#: ../src/client/messagemodel.cpp:375
+#: ../src/client/messagemodel.cpp:404
#, qt-format
msgctxt "MessageModel|"
msgid "Requesting %1 messages from backlog for buffer %2:%3"
@@ -4252,15 +4544,15 @@ msgctxt "MsgProcessorStatusWidget|"
msgid "Receiving Backlog"
msgstr ""
-#: ../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?"
+msgid "Do you really want to paste %n line(s)?"
+msgid_plural "Do you really want to paste %n line(s)?"
msgstr[0] ""
msgstr[1] ""
-#: ../src/uisupport/multilineedit.cpp:670
+#: ../src/uisupport/multilineedit.cpp:727
msgctxt "MultiLineEdit|"
msgid "Paste Protection"
msgstr ""
@@ -4320,96 +4612,96 @@ msgctxt "NetworkEditDlg|"
msgid "Please enter a network name:"
msgstr ""
-#: ../src/qtui/settingspages/networkssettingspage.cpp:705
+#: ../src/qtui/settingspages/networkssettingspage.cpp:840
msgctxt "NetworkEditDlg|"
msgid "Add Network"
msgstr ""
-#: ../src/client/networkmodel.cpp:196
+#: ../src/client/networkmodel.cpp:213
#, qt-format
msgctxt "NetworkItem|"
msgid "Server: %1"
msgstr ""
-#: ../src/client/networkmodel.cpp:197
+#: ../src/client/networkmodel.cpp:214
#, qt-format
msgctxt "NetworkItem|"
msgid "Users: %1"
msgstr ""
-#: ../src/client/networkmodel.cpp:200
+#: ../src/client/networkmodel.cpp:217
#, qt-format
msgctxt "NetworkItem|"
msgid "Lag: %1 msecs"
msgstr ""
-#: ../src/client/networkmodel.cpp:852
+#: ../src/client/networkmodel.cpp:963
msgctxt "NetworkModel|"
msgid "Chat"
msgstr ""
-#: ../src/client/networkmodel.cpp:852
+#: ../src/client/networkmodel.cpp:963
msgctxt "NetworkModel|"
msgid "Topic"
msgstr ""
-#: ../src/client/networkmodel.cpp:852
+#: ../src/client/networkmodel.cpp:963
msgctxt "NetworkModel|"
msgid "Nick Count"
msgstr ""
-#: ../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] ""
msgstr[1] ""
-#: ../src/uisupport/networkmodelcontroller.cpp:167
+#: ../src/uisupport/networkmodelcontroller.cpp:190
#, qt-format
msgctxt "NetworkModelController|"
msgid "...and %1 more
"
msgstr ""
-#: ../src/uisupport/networkmodelcontroller.cpp:168
+#: ../src/uisupport/networkmodelcontroller.cpp:191
msgctxt "NetworkModelController|"
msgid ""
"Note: This will delete all related data, including all backlog data, "
"from the core's database and cannot be undone."
msgstr ""
-#: ../src/uisupport/networkmodelcontroller.cpp:170
+#: ../src/uisupport/networkmodelcontroller.cpp:193
msgctxt "NetworkModelController|"
msgid ""
"
Active channel buffers cannot be deleted, please part the channel first."
msgstr ""
-#: ../src/uisupport/networkmodelcontroller.cpp:172
+#: ../src/uisupport/networkmodelcontroller.cpp:195
msgctxt "NetworkModelController|"
msgid "Remove buffers permanently?"
msgstr ""
-#: ../src/uisupport/networkmodelcontroller.cpp:484
+#: ../src/uisupport/networkmodelcontroller.cpp:530
msgctxt "NetworkModelController::JoinDlg|"
msgid "Join Channel"
msgstr ""
-#: ../src/uisupport/networkmodelcontroller.cpp:487
+#: ../src/uisupport/networkmodelcontroller.cpp:533
msgctxt "NetworkModelController::JoinDlg|"
msgid "Network:"
msgstr ""
-#: ../src/uisupport/networkmodelcontroller.cpp:489
+#: ../src/uisupport/networkmodelcontroller.cpp:535
msgctxt "NetworkModelController::JoinDlg|"
msgid "Channel:"
msgstr ""
-#: ../src/uisupport/networkmodelcontroller.cpp:491
+#: ../src/uisupport/networkmodelcontroller.cpp:537
msgctxt "NetworkModelController::JoinDlg|"
msgid "Password:"
msgstr ""
-#: ../src/qtui/ircconnectionwizard.cpp:148
+#: ../src/qtui/ircconnectionwizard.cpp:158
msgctxt "NetworkPage|"
msgid "Setup Network Connection"
msgstr ""
@@ -4580,62 +4872,70 @@ msgctxt "NetworksSettingsPage|"
msgid "Account:"
msgstr ""
-#: ../src/qtui/settingspages/networkssettingspage.ui:649
+#: ../src/qtui/settingspages/networkssettingspage.ui:635
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"Note: because "
+"the identity has an ssl certificate set, SASL EXTERNAL will be used.
"
+"body>"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:659
msgctxt "NetworksSettingsPage|"
msgid "Encodings"
msgstr ""
-#: ../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 ""
-#: ../src/qtui/settingspages/networkssettingspage.ui:661
+#: ../src/qtui/settingspages/networkssettingspage.ui:671
msgctxt "NetworksSettingsPage|"
msgid "Control encodings for in- and outgoing messages"
msgstr ""
-#: ../src/qtui/settingspages/networkssettingspage.ui:664
+#: ../src/qtui/settingspages/networkssettingspage.ui:674
msgctxt "NetworksSettingsPage|"
msgid "Use Custom Encodings"
msgstr ""
-#: ../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 ""
-#: ../src/qtui/settingspages/networkssettingspage.ui:679
+#: ../src/qtui/settingspages/networkssettingspage.ui:689
msgctxt "NetworksSettingsPage|"
msgid "Send messages in:"
msgstr ""
-#: ../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 ""
-#: ../src/qtui/settingspages/networkssettingspage.ui:710
+#: ../src/qtui/settingspages/networkssettingspage.ui:720
msgctxt "NetworksSettingsPage|"
msgid "Receive fallback:"
msgstr ""
-#: ../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 ""
-#: ../src/qtui/settingspages/networkssettingspage.ui:741
+#: ../src/qtui/settingspages/networkssettingspage.ui:751
msgctxt "NetworksSettingsPage|"
msgid "Server encoding:"
msgstr ""
@@ -4650,34 +4950,34 @@ msgctxt "NetworksSettingsPage|"
msgid "Networks"
msgstr ""
-#: ../src/qtui/settingspages/networkssettingspage.cpp:167
+#: ../src/qtui/settingspages/networkssettingspage.cpp:184
msgctxt "NetworksSettingsPage|"
msgid ""
"The following problems need to be corrected before your changes can be "
"applied:"
msgstr ""
-#: ../src/qtui/settingspages/networkssettingspage.cpp:168
+#: ../src/qtui/settingspages/networkssettingspage.cpp:185
msgctxt "NetworksSettingsPage|"
msgid "- All networks need at least one server defined
"
msgstr ""
-#: ../src/qtui/settingspages/networkssettingspage.cpp:169
+#: ../src/qtui/settingspages/networkssettingspage.cpp:186
msgctxt "NetworksSettingsPage|"
msgid "
"
msgstr ""
-#: ../src/qtui/settingspages/networkssettingspage.cpp:170
+#: ../src/qtui/settingspages/networkssettingspage.cpp:187
msgctxt "NetworksSettingsPage|"
msgid "Invalid Network Settings"
msgstr ""
-#: ../src/qtui/settingspages/networkssettingspage.cpp:542
+#: ../src/qtui/settingspages/networkssettingspage.cpp:650
msgctxt "NetworksSettingsPage|"
msgid "Delete Network?"
msgstr ""
-#: ../src/qtui/settingspages/networkssettingspage.cpp:543
+#: ../src/qtui/settingspages/networkssettingspage.cpp:651
#, qt-format
msgctxt "NetworksSettingsPage|"
msgid ""
@@ -4702,7 +5002,7 @@ msgid ""
"the special characters {, }, [, ], \\, |, `, ^, _ and -."
msgstr ""
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:420
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:480
msgctxt "NickEditDlg|"
msgid "Add Nickname"
msgstr ""
@@ -4717,7 +5017,7 @@ msgctxt "NotificationsSettingsPage|"
msgid "Notifications"
msgstr ""
-#: ../src/qtui/phononnotificationbackend.cpp:143
+#: ../src/qtui/phononnotificationbackend.cpp:188
msgctxt "PhononNotificationBackend::ConfigWidget|"
msgid "Select Audio File"
msgstr ""
@@ -4743,24 +5043,24 @@ msgctxt "PhononNotificationConfigWidget|"
msgid "Select the sound file to play"
msgstr ""
-#: ../src/core/postgresqlstorage.cpp:62
+#: ../src/core/postgresqlstorage.cpp:72
msgctxt "PostgreSqlStorage|"
msgid "PostgreSQL Turbo Bomber HD!"
msgstr ""
-#: ../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 ""
-#: ../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 ""
-#: ../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"
@@ -4779,213 +5079,229 @@ msgid ""
"wizard any time and use the settings dialog for more detailed changes."
msgstr ""
-#: ../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 ""
-#: ../src/uisupport/qssparser.cpp:140
+#: ../src/uisupport/qssparser.cpp:147
#, qt-format
msgctxt "QssParser|"
msgid "Invalid palette role assignment: %1"
msgstr ""
-#: ../src/uisupport/qssparser.cpp:156
+#: ../src/uisupport/qssparser.cpp:166
#, qt-format
msgctxt "QssParser|"
msgid "Unknown palette role name: %1"
msgstr ""
-#: ../src/uisupport/qssparser.cpp:192
+#: ../src/uisupport/qssparser.cpp:204
#, qt-format
msgctxt "QssParser|"
msgid "Invalid subelement name in %1"
msgstr ""
-#: ../src/uisupport/qssparser.cpp:236
+#: ../src/uisupport/qssparser.cpp:248
#, qt-format
msgctxt "QssParser|"
msgid "Invalid message type in %1"
msgstr ""
-#: ../src/uisupport/qssparser.cpp:245
+#: ../src/uisupport/qssparser.cpp:257
#, qt-format
msgctxt "QssParser|"
msgid "Invalid condition %1"
msgstr ""
-#: ../src/uisupport/qssparser.cpp:257
+#: ../src/uisupport/qssparser.cpp:269
#, qt-format
msgctxt "QssParser|"
msgid "Invalid message label: %1"
msgstr ""
-#: ../src/uisupport/qssparser.cpp:268
+#: ../src/uisupport/qssparser.cpp:281
#, qt-format
msgctxt "QssParser|"
msgid "Invalid senderhash specification: %1"
msgstr ""
-#: ../src/uisupport/qssparser.cpp:272
+#: ../src/uisupport/qssparser.cpp:285
msgctxt "QssParser|"
msgid "Senderhash can be at most \"0x0f\"!"
msgstr ""
-#: ../src/uisupport/qssparser.cpp:287
+#: ../src/uisupport/qssparser.cpp:301
#, qt-format
msgctxt "QssParser|"
msgid "Invalid format name: %1"
msgstr ""
-#: ../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 ""
-#: ../src/uisupport/qssparser.cpp:302
+#: ../src/uisupport/qssparser.cpp:318
#, qt-format
msgctxt "QssParser|"
msgid "Unhandled condition: %1"
msgstr ""
-#: ../src/uisupport/qssparser.cpp:331
+#: ../src/uisupport/qssparser.cpp:349
#, qt-format
msgctxt "QssParser|"
msgid "Invalid proplist %1"
msgstr ""
-#: ../src/uisupport/qssparser.cpp:350
+#: ../src/uisupport/qssparser.cpp:368
#, qt-format
msgctxt "QssParser|"
msgid "Invalid chatlist item type %1"
msgstr ""
-#: ../src/uisupport/qssparser.cpp:366
+#: ../src/uisupport/qssparser.cpp:384
#, qt-format
msgctxt "QssParser|"
msgid "Invalid chatlist state %1"
msgstr ""
-#: ../src/uisupport/qssparser.cpp:392
+#: ../src/uisupport/qssparser.cpp:414
#, qt-format
msgctxt "QssParser|"
msgid "Invalid property declaration: %1"
msgstr ""
-#: ../src/uisupport/qssparser.cpp:416
+#: ../src/uisupport/qssparser.cpp:438
#, qt-format
msgctxt "QssParser|"
msgid "Invalid font property: %1"
msgstr ""
-#: ../src/uisupport/qssparser.cpp:422
+#: ../src/uisupport/qssparser.cpp:444
#, qt-format
msgctxt "QssParser|"
msgid "Unknown ChatLine property: %1"
msgstr ""
-#: ../src/uisupport/qssparser.cpp:444
+#: ../src/uisupport/qssparser.cpp:468
#, qt-format
msgctxt "QssParser|"
msgid "Invalid palette color role specification: %1"
msgstr ""
-#: ../src/uisupport/qssparser.cpp:451
+#: ../src/uisupport/qssparser.cpp:475
#, qt-format
msgctxt "QssParser|"
msgid "Unknown palette color role: %1"
msgstr ""
-#: ../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 ""
-#: ../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 ""
-#: ../src/uisupport/qssparser.cpp:610
+#: ../src/uisupport/qssparser.cpp:646
#, qt-format
msgctxt "QssParser|"
msgid "Invalid font specification: %1"
msgstr ""
-#: ../src/uisupport/qssparser.cpp:649
+#: ../src/uisupport/qssparser.cpp:687
#, qt-format
msgctxt "QssParser|"
msgid "Invalid font style specification: %1"
msgstr ""
-#: ../src/uisupport/qssparser.cpp:662
+#: ../src/uisupport/qssparser.cpp:702
#, qt-format
msgctxt "QssParser|"
msgid "Invalid font weight specification: %1"
msgstr ""
-#: ../src/uisupport/qssparser.cpp:672
+#: ../src/uisupport/qssparser.cpp:714
#, qt-format
msgctxt "QssParser|"
msgid "Invalid font size specification: %1"
msgstr ""
-#: ../src/common/util.cpp:145
+#: ../src/common/util.cpp:169
msgctxt "Quassel::secondsToString()|"
msgid "year"
msgstr ""
-#: ../src/common/util.cpp:146
+#: ../src/common/util.cpp:170
msgctxt "Quassel::secondsToString()|"
msgid "day"
msgstr ""
-#: ../src/common/util.cpp:147
+#: ../src/common/util.cpp:171
msgctxt "Quassel::secondsToString()|"
msgid "h"
msgstr ""
-#: ../src/common/util.cpp:148
+#: ../src/common/util.cpp:172
msgctxt "Quassel::secondsToString()|"
msgid "min"
msgstr ""
-#: ../src/common/util.cpp:149
+#: ../src/common/util.cpp:173
msgctxt "Quassel::secondsToString()|"
msgid "sec"
msgstr ""
-#: ../src/client/networkmodel.cpp:429
+#: ../src/client/networkmodel.cpp:482
#, qt-format
msgctxt "QueryBufferItem|"
msgid "Query with %1"
msgstr ""
-#: ../src/client/networkmodel.cpp:447
+#: ../src/client/networkmodel.cpp:500
#, qt-format
msgctxt "QueryBufferItem|"
msgid "idling since %1"
msgstr ""
-#: ../src/client/networkmodel.cpp:450
+#: ../src/client/networkmodel.cpp:503
#, qt-format
msgctxt "QueryBufferItem|"
msgid "login time: %1"
msgstr ""
-#: ../src/client/networkmodel.cpp:453
+#: ../src/client/networkmodel.cpp:506
#, qt-format
msgctxt "QueryBufferItem|"
msgid "server: %1"
msgstr ""
+#: ../src/qtui/ui/receivefiledlg.ui:14
+msgctxt "ReceiveFileDlg|"
+msgid "Incoming File Transfer"
+msgstr ""
+
+#: ../src/qtui/receivefiledlg.cpp:35
+#, qt-format
+msgctxt "ReceiveFileDlg|"
+msgid "%1 wants to send you a file:
%2 (%3 bytes)"
+msgstr ""
+
+#: ../src/common/remotepeer.cpp:69
+msgctxt "RemotePeer|"
+msgid "Disconnecting..."
+msgstr ""
+
#: ../src/qtui/settingspages/saveidentitiesdlg.ui:13
msgctxt "SaveIdentitiesDlg|"
msgid "Sync With Core"
@@ -5110,45 +5426,45 @@ msgid "Configure Quassel"
msgstr ""
#: ../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 ""
-#: ../src/qtui/settingsdlg.cpp:109
+#: ../src/qtui/settingsdlg.cpp:121
msgctxt "SettingsDlg|"
msgid "Save changes"
msgstr ""
-#: ../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 ""
-#: ../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 ""
-#: ../src/qtui/settingsdlg.cpp:193
+#: ../src/qtui/settingsdlg.cpp:220
msgctxt "SettingsDlg|"
msgid "Reload Settings"
msgstr ""
-#: ../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 ""
-#: ../src/qtui/settingsdlg.cpp:202
+#: ../src/qtui/settingsdlg.cpp:231
msgctxt "SettingsDlg|"
msgid "Restore Defaults"
msgstr ""
-#: ../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 ""
@@ -5163,38 +5479,38 @@ msgctxt "SettingsPageDlg|"
msgid "Settings"
msgstr ""
-#: ../src/qtui/settingspagedlg.cpp:36
+#: ../src/qtui/settingspagedlg.cpp:39
#, qt-format
msgctxt "SettingsPageDlg|"
msgid "Configure %1"
msgstr ""
-#: ../src/qtui/settingspagedlg.cpp:104
+#: ../src/qtui/settingspagedlg.cpp:120
msgctxt "SettingsPageDlg|"
msgid "Reload Settings"
msgstr ""
-#: ../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 ""
-#: ../src/qtui/settingspagedlg.cpp:113
+#: ../src/qtui/settingspagedlg.cpp:131
msgctxt "SettingsPageDlg|"
msgid "Restore Defaults"
msgstr ""
-#: ../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 ""
-#: ../src/qtui/settingspages/shortcutsmodel.cpp:110
+#: ../src/qtui/settingspages/shortcutsmodel.cpp:121
msgctxt "ShortcutsModel|"
msgid "Action"
msgstr ""
-#: ../src/qtui/settingspages/shortcutsmodel.cpp:112
+#: ../src/qtui/settingspages/shortcutsmodel.cpp:123
msgctxt "ShortcutsModel|"
msgid "Shortcut"
msgstr ""
@@ -5220,8 +5536,8 @@ msgid "Default:"
msgstr ""
#: ../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 ""
@@ -5231,37 +5547,17 @@ msgctxt "ShortcutsSettingsPage|"
msgid "Custom:"
msgstr ""
-#: ../src/qtui/settingspages/shortcutssettingspage.cpp:60
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:65
msgctxt "ShortcutsSettingsPage|"
msgid "Interface"
msgstr ""
-#: ../src/qtui/settingspages/shortcutssettingspage.cpp:60
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:65
msgctxt "ShortcutsSettingsPage|"
msgid "Shortcuts"
msgstr ""
-#: ../src/common/signalproxy.cpp:880
-msgctxt "SignalProxy|"
-msgid "Peer tried to send package larger than max package size!"
-msgstr ""
-
-#: ../src/common/signalproxy.cpp:885
-msgctxt "SignalProxy|"
-msgid "Peer tried to send 0 byte package!"
-msgstr ""
-
-#: ../src/common/signalproxy.cpp:902
-msgctxt "SignalProxy|"
-msgid "Peer sent corrupted compressed data!"
-msgstr ""
-
-#: ../src/common/signalproxy.cpp:917
-msgctxt "SignalProxy|"
-msgid "Peer sent corrupt data: unable to load QVariant!"
-msgstr ""
-
-#: ../src/common/signalproxy.cpp:1050
+#: ../src/common/signalproxy.cpp:758
msgctxt "SignalProxy|"
msgid "Disconnecting"
msgstr ""
@@ -5344,7 +5640,42 @@ msgid ""
"network"
msgstr ""
-#: ../src/core/sqlitestorage.cpp:52
+#: ../src/qtui/snorenotificationbackend.cpp:60
+msgctxt "SnoreNotificationBackend|"
+msgid "Private Message"
+msgstr ""
+
+#: ../src/qtui/ui/snorentificationconfigwidget.ui:20
+msgctxt "SnoreNotificationConfigWidget|"
+msgid "Form"
+msgstr ""
+
+#: ../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 ""
+
+#: ../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 "
@@ -5444,46 +5775,46 @@ msgctxt "SslInfoDlg|"
msgid "Trusted:"
msgstr ""
-#: ../src/qtui/sslinfodlg.cpp:69
+#: ../src/qtui/sslinfodlg.cpp:71
msgctxt "SslInfoDlg|"
msgid "Yes"
msgstr ""
-#: ../src/qtui/sslinfodlg.cpp:71
+#: ../src/qtui/sslinfodlg.cpp:73
msgctxt "SslInfoDlg|"
msgid "No, for the following reasons:"
msgstr ""
-#: ../src/qtui/sslinfodlg.cpp:78
+#: ../src/qtui/sslinfodlg.cpp:80
#, qt-format
msgctxt "SslInfoDlg|"
msgid "%1 to %2"
msgstr ""
-#: ../src/client/networkmodel.h:144
+#: ../src/client/networkmodel.h:150
msgctxt "StatusBufferItem|"
msgid "Status Buffer"
msgstr ""
-#: ../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 ""
-#: ../src/qtui/systemtray.cpp:94
+#: ../src/qtui/systemtray.cpp:103
msgctxt "SystemTray|"
msgid "&Restore"
msgstr ""
-#: ../src/qtui/systraynotificationbackend.cpp:125
+#: ../src/qtui/systraynotificationbackend.cpp:142
#, qt-format
msgctxt "SystrayNotificationBackend|"
-msgid "%n pending highlights"
-msgid_plural "%n pending highlights"
+msgid "%n pending highlight(s)"
+msgid_plural "%n pending highlight(s)"
msgstr[0] ""
msgstr[1] ""
-#: ../src/qtui/systraynotificationbackend.cpp:135
+#: ../src/qtui/systraynotificationbackend.cpp:156
msgctxt "SystrayNotificationBackend::ConfigWidget|"
msgid "Show a message in a popup"
msgstr ""
@@ -5493,22 +5824,22 @@ msgctxt "TabCompleter|"
msgid "Tab completion"
msgstr ""
-#: ../src/qtui/taskbarnotificationbackend.cpp:68
+#: ../src/qtui/taskbarnotificationbackend.cpp:83
msgctxt "TaskbarNotificationBackend::ConfigWidget|"
msgid "Activate dock entry, timeout:"
msgstr ""
-#: ../src/qtui/taskbarnotificationbackend.cpp:70
+#: ../src/qtui/taskbarnotificationbackend.cpp:85
msgctxt "TaskbarNotificationBackend::ConfigWidget|"
msgid "Mark taskbar entry, timeout:"
msgstr ""
-#: ../src/qtui/taskbarnotificationbackend.cpp:78
+#: ../src/qtui/taskbarnotificationbackend.cpp:93
msgctxt "TaskbarNotificationBackend::ConfigWidget|"
msgid "Unlimited"
msgstr ""
-#: ../src/qtui/taskbarnotificationbackend.cpp:79
+#: ../src/qtui/taskbarnotificationbackend.cpp:94
msgctxt "TaskbarNotificationBackend::ConfigWidget|"
msgid " seconds"
msgstr ""
@@ -5663,13 +5994,13 @@ msgctxt "TopicWidget|"
msgid "..."
msgstr ""
-#: ../src/qtui/topicwidget.cpp:106
+#: ../src/qtui/topicwidget.cpp:120
#, qt-format
msgctxt "TopicWidget|"
msgid "Users: %1"
msgstr ""
-#: ../src/qtui/topicwidget.cpp:107
+#: ../src/qtui/topicwidget.cpp:121
#, qt-format
msgctxt "TopicWidget|"
msgid "Lag: %1 msecs"
@@ -5695,12 +6026,12 @@ msgctxt "TopicWidgetSettingsPage|"
msgid "On hover only"
msgstr ""
-#: ../src/qtui/settingspages/topicwidgetsettingspage.cpp:23
+#: ../src/qtui/settingspages/topicwidgetsettingspage.cpp:24
msgctxt "TopicWidgetSettingsPage|"
msgid "Interface"
msgstr ""
-#: ../src/qtui/settingspages/topicwidgetsettingspage.cpp:23
+#: ../src/qtui/settingspages/topicwidgetsettingspage.cpp:24
msgctxt "TopicWidgetSettingsPage|"
msgid "Topic Widget"
msgstr ""
@@ -5718,114 +6049,114 @@ msgstr ""
#. 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: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 ""
#. Action Message
-#: ../src/uisupport/uistyle.cpp:583
+#: ../src/uisupport/uistyle.cpp:671
#, qt-format
msgctxt "UiStyle::StyledMessage|"
msgid "%DN%1%DN %2"
msgstr ""
#. 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 ""
-#: ../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 ""
#. Mode Message
-#: ../src/uisupport/uistyle.cpp:592
+#: ../src/uisupport/uistyle.cpp:680
#, qt-format
msgctxt "UiStyle::StyledMessage|"
msgid "User mode: %DM%1%DM"
msgstr ""
-#: ../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 ""
#. 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 ""
#. 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 ""
#. 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 ""
#. 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 ""
#. Day Change Message
-#: ../src/uisupport/uistyle.cpp:629
+#: ../src/uisupport/uistyle.cpp:719
#, qt-format
msgctxt "UiStyle::StyledMessage|"
msgid "{Day changed to %1}"
msgstr ""
-#: ../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 ""
-#: ../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 ""
-#: ../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 ""
-#: ../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 ""
-#: ../src/uisupport/uistyle.cpp:703
+#: ../src/uisupport/uistyle.cpp:806
#, qt-format
msgctxt "UiStyle::StyledMessage|"
msgid "<%1>"
msgstr ""
-#: ../src/client/networkmodel.cpp:697
+#: ../src/client/networkmodel.cpp:786
#, qt-format
msgctxt "UserCategoryItem|"
msgid "%n Owner(s)"
@@ -5833,7 +6164,7 @@ msgid_plural "%n Owner(s)"
msgstr[0] ""
msgstr[1] ""
-#: ../src/client/networkmodel.cpp:698
+#: ../src/client/networkmodel.cpp:788
#, qt-format
msgctxt "UserCategoryItem|"
msgid "%n Admin(s)"
@@ -5841,7 +6172,7 @@ msgid_plural "%n Admin(s)"
msgstr[0] ""
msgstr[1] ""
-#: ../src/client/networkmodel.cpp:699
+#: ../src/client/networkmodel.cpp:790
#, qt-format
msgctxt "UserCategoryItem|"
msgid "%n Operator(s)"
@@ -5849,7 +6180,7 @@ msgid_plural "%n Operator(s)"
msgstr[0] ""
msgstr[1] ""
-#: ../src/client/networkmodel.cpp:700
+#: ../src/client/networkmodel.cpp:792
#, qt-format
msgctxt "UserCategoryItem|"
msgid "%n Half-Op(s)"
@@ -5857,7 +6188,7 @@ msgid_plural "%n Half-Op(s)"
msgstr[0] ""
msgstr[1] ""
-#: ../src/client/networkmodel.cpp:701
+#: ../src/client/networkmodel.cpp:794
#, qt-format
msgctxt "UserCategoryItem|"
msgid "%n Voiced"
@@ -5865,7 +6196,7 @@ msgid_plural "%n Voiced"
msgstr[0] ""
msgstr[1] ""
-#: ../src/client/networkmodel.cpp:702
+#: ../src/client/networkmodel.cpp:796
#, qt-format
msgctxt "UserCategoryItem|"
msgid "%n User(s)"