X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=po%2Fquassel.pot;h=a286518a57f27fe386f21a8b81f7dce8f679bf29;hb=refs%2Ftags%2F0.12-rc1;hp=71414a538d0f3d11f63e0893486201517ffc4320;hpb=5b1428bf281a0142c9286380eec3d0655c39fc44;p=quassel.git
diff --git a/po/quassel.pot b/po/quassel.pot
index 71414a53..a286518a 100644
--- a/po/quassel.pot
+++ b/po/quassel.pot
@@ -30,35 +30,22 @@ 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 ""
@@ -70,18 +57,19 @@ msgid "Version: %1
Protocol version: %2
Built: %3"
msgstr ""
#: ../src/qtui/aboutdlg.cpp:49
+#, qt-format
msgctxt "AboutDlg|"
msgid ""
-"A modern, distributed IRC Client
©2005-2013 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."
+"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
@@ -96,7 +84,7 @@ msgid ""
"and everybody we forgot to mention here:"
msgstr ""
-#: ../src/qtui/aboutdlg.cpp:194
+#: ../src/qtui/aboutdlg.cpp:206
msgctxt "AboutDlg|"
msgid ""
"Special thanks goes to:
- "
@@ -439,7 +427,7 @@ msgctxt "BacklogSettingsPage|"
msgid "Backlog Fetching"
msgstr ""
-#: ../src/client/networkmodel.cpp:386
+#: ../src/client/networkmodel.cpp:394
#, qt-format
msgctxt "BufferItem|"
msgid "
%1 - %2
"
@@ -468,7 +456,7 @@ msgctxt "BufferViewEditDlg|"
msgid "Please enter a name for the chat list:"
msgstr ""
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:575
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:582
msgctxt "BufferViewEditDlg|"
msgid "Add Chat List"
msgstr ""
@@ -509,7 +497,7 @@ msgid "Network:"
msgstr ""
#: ../src/qtui/settingspages/bufferviewsettingspage.ui:100
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:123
+#: ../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:378
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:383
msgctxt "BufferViewSettingsPage|"
msgid "Delete Chat List?"
msgstr ""
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:379
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:384
#, qt-format
msgctxt "BufferViewSettingsPage|"
msgid "Do you really want to delete the chat list \"%1\"?"
@@ -607,61 +600,61 @@ msgctxt "BufferViewWidget|"
msgid "BufferView"
msgstr ""
-#: ../src/qtui/bufferwidget.cpp:78
+#: ../src/qtui/bufferwidget.cpp:79
msgctxt "BufferWidget|"
msgid "Zoom In"
msgstr ""
-#: ../src/qtui/bufferwidget.cpp:84
+#: ../src/qtui/bufferwidget.cpp:85
msgctxt "BufferWidget|"
msgid "Zoom Out"
msgstr ""
-#: ../src/qtui/bufferwidget.cpp:89
+#: ../src/qtui/bufferwidget.cpp:90
msgctxt "BufferWidget|"
msgid "Actual Size"
msgstr ""
-#: ../src/qtui/bufferwidget.cpp:93
+#: ../src/qtui/bufferwidget.cpp:94
msgctxt "BufferWidget|"
msgid "Set Marker Line"
msgstr ""
-#: ../src/qtui/bufferwidget.cpp:97
+#: ../src/qtui/bufferwidget.cpp:98
msgctxt "BufferWidget|"
msgid "Go to Marker Line"
msgstr ""
-#: ../src/client/networkmodel.cpp:566
+#: ../src/client/networkmodel.cpp:575
#, qt-format
msgctxt "ChannelBufferItem|"
msgid "Channel %1"
msgstr ""
-#: ../src/client/networkmodel.cpp:569
+#: ../src/client/networkmodel.cpp:578
#, qt-format
msgctxt "ChannelBufferItem|"
msgid "Users: %1"
msgstr ""
-#: ../src/client/networkmodel.cpp:573
+#: ../src/client/networkmodel.cpp:582
#, qt-format
msgctxt "ChannelBufferItem|"
msgid "Mode: %1"
msgstr ""
-#: ../src/client/networkmodel.cpp:584
+#: ../src/client/networkmodel.cpp:593
#, qt-format
msgctxt "ChannelBufferItem|"
msgid "Topic: %1"
msgstr ""
-#: ../src/client/networkmodel.cpp:589
+#: ../src/client/networkmodel.cpp:598
msgctxt "ChannelBufferItem|"
msgid "Not active
Double-click to join"
msgstr ""
-#: ../src/client/networkmodel.cpp:592
+#: ../src/client/networkmodel.cpp:601
#, qt-format
msgctxt "ChannelBufferItem|"
msgid " %1
"
@@ -768,7 +761,7 @@ msgid "Move selected buffers to the right"
msgstr ""
#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:133
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:258
+#: ../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"
@@ -809,7 +822,7 @@ msgctxt "ChatMonitorSettingsPage|"
msgid "Opt Out"
msgstr ""
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:261
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:275
msgctxt "ChatMonitorSettingsPage|"
msgid "Ignore:"
msgstr ""
@@ -834,11 +847,22 @@ msgctxt "ChatMonitorView|"
msgid "Configure..."
msgstr ""
-#: ../src/qtui/chatscene.cpp:803
+#: ../src/qtui/chatscene.cpp:826
msgctxt "ChatScene|"
msgid "Copy Selection"
msgstr ""
+#: ../src/qtui/chatscene.cpp:833
+#, qt-format
+msgctxt "ChatScene|"
+msgid "Search '%1'"
+msgstr ""
+
+#: ../src/qtui/chatscene.cpp:844
+msgctxt "ChatScene|"
+msgid "Reset Column Widths"
+msgstr ""
+
#: ../src/qtui/ui/chatviewsearchbar.ui:13
msgctxt "ChatViewSearchBar|"
msgid "Form"
@@ -939,96 +963,138 @@ msgstr ""
#: ../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:177
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:220
msgctxt "ChatViewSettingsPage|"
msgid "Action:"
msgstr ""
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:184
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:208
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:232
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:269
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:293
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:324
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:348
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:372
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:396
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:413
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:453
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:470
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:487
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:504
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:521
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:538
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:555
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:572
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:589
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:606
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:623
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:640
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:657
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:674
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:691
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:708
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:736
+#: ../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:201
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:244
msgctxt "ChatViewSettingsPage|"
msgid "Timestamp:"
msgstr ""
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:225
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:268
msgctxt "ChatViewSettingsPage|"
msgid "Channel message:"
msgstr ""
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:262
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:305
msgctxt "ChatViewSettingsPage|"
msgid "Highlight foreground:"
msgstr ""
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:286
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:329
msgctxt "ChatViewSettingsPage|"
msgid "Command message:"
msgstr ""
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:310
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:353
msgctxt "ChatViewSettingsPage|"
msgid "Highlight background:"
msgstr ""
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:317
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:360
msgctxt "ChatViewSettingsPage|"
msgid "Server message:"
msgstr ""
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:341
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:384
msgctxt "ChatViewSettingsPage|"
msgid "Marker line:"
msgstr ""
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:365
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:408
msgctxt "ChatViewSettingsPage|"
msgid "Error message:"
msgstr ""
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:389
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:432
msgctxt "ChatViewSettingsPage|"
msgid "Background:"
msgstr ""
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:433
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:476
msgctxt "ChatViewSettingsPage|"
msgid "Use Sender Coloring"
msgstr ""
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:729
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:772
msgctxt "ChatViewSettingsPage|"
msgid "Own messages:"
msgstr ""
@@ -1045,14 +1111,106 @@ 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:318
+#: ../src/client/client.cpp:320
msgctxt "Client|"
msgid "Identity already exists in client!"
msgstr ""
+#: ../src/client/clientauthhandler.cpp:65
+#: ../src/client/clientauthhandler.cpp:471
+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:315
+#, 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:149
+msgctxt "ClientAuthHandler|"
+msgid "Reconnecting in compatibility mode..."
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:236
+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:239
+msgctxt "ClientAuthHandler|"
+msgid "Core speaks none of the protocols we support"
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:254
+#, 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:256
+msgctxt "ClientAuthHandler|"
+msgid "Incompatible protocol version, connection to core refused"
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:278
+msgctxt "ClientAuthHandler|"
+msgid "Synchronizing to core..."
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:293
+msgctxt "ClientAuthHandler|"
+msgid "The core refused connection from this client"
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:357
+msgctxt "ClientAuthHandler|"
+msgid "Logging in..."
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:362
+msgctxt "ClientAuthHandler|"
+msgid "Login canceled"
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:420
+msgctxt "ClientAuthHandler|"
+msgid "Unencrypted connection cancelled"
+msgstr ""
+
#: ../src/client/clientbacklogmanager.cpp:178
#, qt-format
msgctxt "ClientBacklogManager|"
@@ -1368,12 +1526,12 @@ msgctxt "ContextMenuActionProvider|"
msgid "Existing Rules"
msgstr ""
-#: ../src/core/core.cpp:190
+#: ../src/core/core.cpp:191
msgctxt "Core|"
msgid "Could not initialize any storage backend! Exiting..."
msgstr ""
-#: ../src/core/core.cpp:191
+#: ../src/core/core.cpp:192
msgctxt "Core|"
msgid ""
"Currently, Quassel supports SQLite3 and PostgreSQL. You need to build your\n"
@@ -1382,147 +1540,93 @@ msgid ""
"to work."
msgstr ""
-#: ../src/core/core.cpp:249
+#: ../src/core/core.cpp:251
msgctxt "Core|"
msgid "Calling restoreState() even though active sessions exist!"
msgstr ""
-#: ../src/core/core.cpp:295
+#: ../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:298
+#: ../src/core/core.cpp:291
msgctxt "Core|"
msgid "Could not setup storage!"
msgstr ""
-#: ../src/core/core.cpp:302
+#: ../src/core/core.cpp:296
msgctxt "Core|"
msgid "Creating admin user..."
msgstr ""
-#: ../src/core/core.cpp:434
+#: ../src/core/core.cpp:449
#, qt-format
msgctxt "Core|"
msgid "Invalid listen address %1"
msgstr ""
-#: ../src/core/core.cpp:443
+#: ../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:452
+#: ../src/core/core.cpp:467
#, qt-format
msgctxt "Core|"
msgid "Could not open IPv6 interface %1:%2: %3"
msgstr ""
-#: ../src/core/core.cpp:460
+#: ../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:471
+#: ../src/core/core.cpp:486
#, qt-format
msgctxt "Core|"
msgid "Could not open IPv4 interface %1:%2: %3"
msgstr ""
-#: ../src/core/core.cpp:479
+#: ../src/core/core.cpp:494
#, qt-format
msgctxt "Core|"
msgid "Invalid listen address %1, unknown network protocol"
msgstr ""
-#: ../src/core/core.cpp:488
+#: ../src/core/core.cpp:503
msgctxt "Core|"
msgid "Could not open any network interfaces to listen on!"
msgstr ""
-#: ../src/core/core.cpp:527
+#: ../src/core/core.cpp:543
msgctxt "Core|"
msgid "Client connected from"
msgstr ""
-#: ../src/core/core.cpp:530
+#: ../src/core/core.cpp:546
msgctxt "Core|"
msgid "Closing server for basic setup."
msgstr ""
-#: ../src/core/core.cpp:547
-msgctxt "Core|"
-msgid "Antique client trying to connect... refusing."
-msgstr ""
-
-#: ../src/core/core.cpp:560
-#, 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:564 ../src/core/core.cpp:656 ../src/core/core.cpp:682
-msgctxt "Core|"
-msgid "Client"
-msgstr ""
-
-#: ../src/core/core.cpp:564
-msgctxt "Core|"
-msgid "too old, rejecting."
-msgstr ""
-
-#: ../src/core/core.cpp:582
-#, qt-format
-msgctxt "Core|"
-msgid "Quassel Core Version %1
Built: %2
Up %3d%4h%5m (since %6)"
-msgstr ""
-
-#: ../src/core/core.cpp:636
-msgctxt "Core|"
-msgid "Starting TLS for Client:"
-msgstr ""
-
-#: ../src/core/core.cpp:654
-msgctxt "Core|"
-msgid ""
-"Client not initialized!
You need to send an init message before "
-"trying to login."
-msgstr ""
-
-#: ../src/core/core.cpp:656
-msgctxt "Core|"
-msgid "did not send an init message before trying to login, rejecting."
-msgstr ""
-
-#: ../src/core/core.cpp:676
-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:682
-#, qt-format
-msgctxt "Core|"
-msgid "initialized and authenticated successfully as \"%1\" (UserId: %2)."
-msgstr ""
-
-#: ../src/core/core.cpp:695
+#: ../src/core/core.cpp:558
msgctxt "Core|"
-msgid "Non-authed client disconnected."
+msgid "Non-authed client disconnected:"
msgstr ""
-#: ../src/core/core.cpp:724
+#: ../src/core/core.cpp:590
msgctxt "Core|"
msgid "Could not initialize session for client:"
msgstr ""
-#: ../src/core/core.cpp:750
+#: ../src/core/core.cpp:617
msgctxt "Core|"
msgid "Could not find a session for client:"
msgstr ""
@@ -1663,24 +1767,80 @@ msgctxt "CoreAccountSettingsPage|"
msgid "Remote Cores"
msgstr ""
+#: ../src/core/coreauthhandler.cpp:132 ../src/core/coreauthhandler.cpp:144
+msgctxt "CoreAuthHandler|"
+msgid "Client"
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:132
+msgctxt "CoreAuthHandler|"
+msgid "too old, rejecting."
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:133
+#, 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:144
+msgctxt "CoreAuthHandler|"
+msgid "did not send a registration message before trying to login, rejecting."
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:145
+msgctxt "CoreAuthHandler|"
+msgid ""
+"Client not initialized!
You need to send a registration message "
+"before trying to login."
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:162
+msgctxt "CoreAuthHandler|"
+msgid ""
+"SSL is required!
You need to use SSL in order to connect to this "
+"core."
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:202
+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:207
+#, qt-format
+msgctxt "CoreAuthHandler|"
+msgid ""
+"Client %1 initialized and authenticated successfully as \"%2\" (UserId: %3)."
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:226
+msgctxt "CoreAuthHandler|"
+msgid "Starting encryption for Client:"
+msgstr ""
+
#: ../src/qtui/coreconfigwizard.cpp:69
msgctxt "CoreConfigWizard|"
msgid "Core Configuration Wizard"
msgstr ""
-#: ../src/qtui/coreconfigwizard.cpp:103
+#: ../src/qtui/coreconfigwizard.cpp:98
msgctxt "CoreConfigWizard|"
msgid "Your core has been successfully configured. Logging you in..."
msgstr ""
-#: ../src/qtui/coreconfigwizard.cpp:112
+#: ../src/qtui/coreconfigwizard.cpp:107
#, qt-format
msgctxt "CoreConfigWizard|"
msgid ""
"Core configuration failed:
%1
Press Next to start over."
msgstr ""
-#: ../src/qtui/coreconfigwizard.cpp:131
+#: ../src/qtui/coreconfigwizard.cpp:126
msgctxt "CoreConfigWizard|"
msgid ""
"Your are now logged into your freshly configured Quassel Core!
Please "
@@ -1731,46 +1891,46 @@ msgctxt "CoreConfigWizardIntroPage|"
msgid "This wizard will guide you through the setup of your Quassel Core."
msgstr ""
-#: ../src/qtui/coreconfigwizard.cpp:167
+#: ../src/qtui/coreconfigwizard.cpp:162
msgctxt "CoreConfigWizardPages::AdminUserPage|"
msgid "Create Admin User"
msgstr ""
-#: ../src/qtui/coreconfigwizard.cpp:168
+#: ../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:150
+#: ../src/qtui/coreconfigwizard.cpp:145
msgctxt "CoreConfigWizardPages::IntroPage|"
msgid "Introduction"
msgstr ""
-#: ../src/qtui/coreconfigwizard.cpp:203
+#: ../src/qtui/coreconfigwizard.cpp:198
msgctxt "CoreConfigWizardPages::StorageSelectionPage|"
msgid "Select Storage Backend"
msgstr ""
-#: ../src/qtui/coreconfigwizard.cpp:204
+#: ../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:305
+#: ../src/qtui/coreconfigwizard.cpp:300
msgctxt "CoreConfigWizardPages::StorageSelectionPage|"
msgid "Connection Properties"
msgstr ""
-#: ../src/qtui/coreconfigwizard.cpp:347
+#: ../src/qtui/coreconfigwizard.cpp:342
msgctxt "CoreConfigWizardPages::SyncPage|"
msgid "Storing Your Settings"
msgstr ""
-#: ../src/qtui/coreconfigwizard.cpp:348
+#: ../src/qtui/coreconfigwizard.cpp:343
msgctxt "CoreConfigWizardPages::SyncPage|"
msgid ""
"Your settings are now stored in the core, and you will be logged in "
@@ -1868,102 +2028,38 @@ msgctxt "CoreConnectDlg|"
msgid "Connect to Core"
msgstr ""
-#: ../src/client/coreconnection.cpp:190
+#: ../src/client/coreconnection.cpp:193
msgctxt "CoreConnection|"
msgid "Network is down"
msgstr ""
-#: ../src/client/coreconnection.cpp:225 ../src/client/coreconnection.cpp:367
+#: ../src/client/coreconnection.cpp:276
msgctxt "CoreConnection|"
msgid "Disconnected"
msgstr ""
-#: ../src/client/coreconnection.cpp:228
-#, qt-format
-msgctxt "CoreConnection|"
-msgid "Looking up %1..."
-msgstr ""
-
-#: ../src/client/coreconnection.cpp:231 ../src/client/coreconnection.cpp:520
-#, qt-format
-msgctxt "CoreConnection|"
-msgid "Connecting to %1..."
-msgstr ""
-
-#: ../src/client/coreconnection.cpp:234 ../src/client/coreconnection.cpp:660
-#, qt-format
-msgctxt "CoreConnection|"
-msgid "Connected to %1"
-msgstr ""
-
-#: ../src/client/coreconnection.cpp:237
-#, qt-format
-msgctxt "CoreConnection|"
-msgid "Disconnecting from %1..."
-msgstr ""
-
-#: ../src/client/coreconnection.cpp:303
-msgctxt "CoreConnection|"
-msgid ""
-"The Quassel Core you try to connect to is too old! Please consider upgrading."
-msgstr ""
-
-#: ../src/client/coreconnection.cpp:340
-msgctxt "CoreConnection|"
-msgid "Invalid data received from core"
-msgstr ""
-
-#: ../src/client/coreconnection.cpp:405
+#: ../src/client/coreconnection.cpp:311
msgctxt "CoreConnection|"
msgid "Disconnected from core."
msgstr ""
-#: ../src/client/coreconnection.cpp:498 ../src/client/coreconnection.cpp:592
-#: ../src/client/coreconnection.cpp:641
-msgctxt "CoreConnection|"
-msgid "Unencrypted connection canceled"
-msgstr ""
-
-#: ../src/client/coreconnection.cpp:535
-msgctxt "CoreConnection|"
-msgid "Synchronizing to core..."
-msgstr ""
-
-#: ../src/client/coreconnection.cpp:558
-#, qt-format
-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."
-msgstr ""
-
-#: ../src/client/coreconnection.cpp:684
-msgctxt "CoreConnection|"
-msgid "Logging in..."
-msgstr ""
-
-#: ../src/client/coreconnection.cpp:689
-msgctxt "CoreConnection|"
-msgid "Login canceled"
-msgstr ""
-
-#: ../src/client/coreconnection.cpp:718
+#: ../src/client/coreconnection.cpp:449
msgctxt "CoreConnection|"
msgid "Receiving session state"
msgstr ""
-#: ../src/client/coreconnection.cpp:720
+#: ../src/client/coreconnection.cpp:451
#, qt-format
msgctxt "CoreConnection|"
msgid "Synchronizing to %1..."
msgstr ""
-#: ../src/client/coreconnection.cpp:746
+#: ../src/client/coreconnection.cpp:487
msgctxt "CoreConnection|"
msgid "Receiving network states"
msgstr ""
-#: ../src/client/coreconnection.cpp:800
+#: ../src/client/coreconnection.cpp:538
#, qt-format
msgctxt "CoreConnection|"
msgid "Synchronized to %1"
@@ -2143,35 +2239,35 @@ msgctxt "CoreInfoDlg|"
msgid " %1:%2:%3 (since %4)"
msgstr ""
-#: ../src/core/corenetwork.cpp:166
+#: ../src/core/corenetwork.cpp:168
msgctxt "CoreNetwork|"
msgid "Connection failed. Cycling to next Server"
msgstr ""
-#: ../src/core/corenetwork.cpp:174 ../src/core/corenetwork.cpp:175
+#: ../src/core/corenetwork.cpp:176 ../src/core/corenetwork.cpp:177
#, qt-format
msgctxt "CoreNetwork|"
msgid "Connecting to %1:%2..."
msgstr ""
-#: ../src/core/corenetwork.cpp:227
+#: ../src/core/corenetwork.cpp:234
#, qt-format
msgctxt "CoreNetwork|"
msgid "Disconnecting. (%1)"
msgstr ""
-#: ../src/core/corenetwork.cpp:227
+#: ../src/core/corenetwork.cpp:234
msgctxt "CoreNetwork|"
msgid "Core Shutdown"
msgstr ""
-#: ../src/core/corenetwork.cpp:422
+#: ../src/core/corenetwork.cpp:432
#, qt-format
msgctxt "CoreNetwork|"
msgid "Could not connect to %1 (%2)"
msgstr ""
-#: ../src/core/corenetwork.cpp:424
+#: ../src/core/corenetwork.cpp:434
#, qt-format
msgctxt "CoreNetwork|"
msgid "Connection failure: %1"
@@ -2188,7 +2284,7 @@ msgctxt "CoreSession|"
msgid "disconnected (UserId: %1)."
msgstr ""
-#: ../src/core/coresession.cpp:491
+#: ../src/core/coresession.cpp:477
#, qt-format
msgctxt "CoreSession|"
msgid ""
@@ -2196,40 +2292,77 @@ msgid ""
"create network %1!"
msgstr ""
-#: ../src/core/coresession.cpp:523
+#: ../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:75
+#: ../src/core/coresessioneventprocessor.cpp:78
msgctxt "CoreSessionEventProcessor|"
msgid ""
"No free and valid nicks in nicklist found. use: /nick to continue"
msgstr ""
-#: ../src/core/coresessioneventprocessor.cpp:447
+#: ../src/core/coresessioneventprocessor.cpp:450
msgctxt "CoreSessionEventProcessor|"
msgid "Unable to perform key exchange, missing qca-ossl plugin."
msgstr ""
-#: ../src/core/coresessioneventprocessor.cpp:458
+#: ../src/core/coresessioneventprocessor.cpp:461
msgctxt "CoreSessionEventProcessor|"
msgid "Unable to parse the DH1080_INIT. Key exchange failed."
msgstr ""
-#: ../src/core/coresessioneventprocessor.cpp:462
-#: ../src/core/coresessioneventprocessor.cpp:470
+#: ../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:472
+#: ../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"
@@ -2241,38 +2374,38 @@ msgctxt "CoreUserInputHandler|"
msgid "sending CTCP-%1 request to %2"
msgstr ""
-#: ../src/core/coreuserinputhandler.cpp:190
-#: ../src/core/coreuserinputhandler.cpp:361
-#: ../src/core/coreuserinputhandler.cpp:605
-#: ../src/core/coreuserinputhandler.cpp:643
+#: ../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:201
+#: ../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:208
-#: ../src/core/coreuserinputhandler.cpp:661
+#: ../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:213
+#: ../src/core/coreuserinputhandler.cpp:216
#, qt-format
msgctxt "CoreUserInputHandler|"
msgid "The key for %1 has been deleted."
msgstr ""
-#: ../src/core/coreuserinputhandler.cpp:217
-#: ../src/core/coreuserinputhandler.cpp:669
+#: ../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 "
@@ -2281,30 +2414,30 @@ msgid ""
"with QCA2 present."
msgstr ""
-#: ../src/core/coreuserinputhandler.cpp:371
+#: ../src/core/coreuserinputhandler.cpp:374
msgctxt "CoreUserInputHandler|"
msgid "[usage] /keyx [] Initiates a DH1080 key exchange with the target."
msgstr ""
-#: ../src/core/coreuserinputhandler.cpp:378
+#: ../src/core/coreuserinputhandler.cpp:381
msgctxt "CoreUserInputHandler|"
msgid "It is only possible to exchange keys in a query buffer."
msgstr ""
-#: ../src/core/coreuserinputhandler.cpp:388
+#: ../src/core/coreuserinputhandler.cpp:391
#, qt-format
msgctxt "CoreUserInputHandler|"
msgid "Failed to initiate key exchange with %1."
msgstr ""
-#: ../src/core/coreuserinputhandler.cpp:393
+#: ../src/core/coreuserinputhandler.cpp:396
#, qt-format
msgctxt "CoreUserInputHandler|"
msgid "Initiated key exchange with %1."
msgstr ""
-#: ../src/core/coreuserinputhandler.cpp:397
-#: ../src/core/coreuserinputhandler.cpp:627
+#: ../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 "
@@ -2313,39 +2446,39 @@ msgid ""
"with QCA present."
msgstr ""
-#: ../src/core/coreuserinputhandler.cpp:555
+#: ../src/core/coreuserinputhandler.cpp:559
#, qt-format
msgctxt "CoreUserInputHandler|"
msgid "Starting query with %1"
msgstr ""
-#: ../src/core/coreuserinputhandler.cpp:615
+#: ../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:624
+#: ../src/core/coreuserinputhandler.cpp:628
#, qt-format
msgctxt "CoreUserInputHandler|"
msgid "The key for %1 has been set."
msgstr ""
-#: ../src/core/coreuserinputhandler.cpp:653
+#: ../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:665
+#: ../src/core/coreuserinputhandler.cpp:669
#, qt-format
msgctxt "CoreUserInputHandler|"
msgid "The key for %1 is %2:%3"
msgstr ""
-#: ../src/core/coreuserinputhandler.cpp:793
+#: ../src/core/coreuserinputhandler.cpp:797
#, qt-format
msgctxt "CoreUserInputHandler|"
msgid "[Error] Could not encrypt your message: %1"
@@ -2371,6 +2504,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"
@@ -2671,7 +2815,6 @@ msgctxt "EventStringifier|"
msgid "sending CTCP-%1 request to %2"
msgstr ""
-#. Optional "unknown" in "Received unknown CTCP-FOO request by bar"
#: ../src/core/eventstringifier.cpp:717
msgctxt "EventStringifier|"
msgid "unknown"
@@ -2689,7 +2832,13 @@ msgctxt "EventStringifier|"
msgid "Received CTCP-%1 answer from %2: %3"
msgstr ""
-#: ../src/core/eventstringifier.cpp:736
+#: ../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"
@@ -2823,7 +2972,7 @@ msgid "highlight rule"
msgstr ""
#: ../src/qtui/settingspages/identitiessettingspage.ui:31
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:369
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:370
msgctxt "IdentitiesSettingsPage|"
msgid "Rename Identity"
msgstr ""
@@ -2859,55 +3008,55 @@ msgctxt "IdentitiesSettingsPage|"
msgid "Identities"
msgstr ""
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:204
+#: ../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:205
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:206
msgctxt "IdentitiesSettingsPage|"
msgid "- All identities need an identity name set
"
msgstr ""
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:206
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:207
msgctxt "IdentitiesSettingsPage|"
msgid "- Every identity needs at least one nickname defined
"
msgstr ""
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:207
+#: ../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:208
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:209
msgctxt "IdentitiesSettingsPage|"
msgid "- You need to specify an ident for every identity
"
msgstr ""
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:209
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:210
msgctxt "IdentitiesSettingsPage|"
msgid "
"
msgstr ""
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:210
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:211
msgctxt "IdentitiesSettingsPage|"
msgid "One or more identities are invalid"
msgstr ""
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:355
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:356
msgctxt "IdentitiesSettingsPage|"
msgid "Delete Identity?"
msgstr ""
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:356
+#: ../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:370
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:371
#, qt-format
msgctxt "IdentitiesSettingsPage|"
msgid "Please enter a new name for the identity \"%1\"!"
@@ -3505,11 +3654,6 @@ msgctxt "InputWidget|"
msgid "Form"
msgstr ""
-#: ../src/qtui/ui/inputwidget.ui:298
-msgctxt "InputWidget|"
-msgid ""
-msgstr ""
-
#: ../src/qtui/inputwidget.cpp:74
msgctxt "InputWidget|"
msgid "White"
@@ -3595,7 +3739,7 @@ msgctxt "InputWidget|"
msgid "Clear Color"
msgstr ""
-#: ../src/qtui/inputwidget.cpp:133
+#: ../src/qtui/inputwidget.cpp:136
msgctxt "InputWidget|"
msgid "Focus Input Line"
msgstr ""
@@ -3642,40 +3786,50 @@ 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 ""
@@ -3715,24 +3869,24 @@ msgctxt "IrcListModel|"
msgid "Topic"
msgstr ""
-#: ../src/client/networkmodel.cpp:914
+#: ../src/client/networkmodel.cpp:938
msgctxt "IrcUserItem|"
msgid " is away"
msgstr ""
-#: ../src/client/networkmodel.cpp:929
+#: ../src/client/networkmodel.cpp:953
#, qt-format
msgctxt "IrcUserItem|"
msgid "idling since %1"
msgstr ""
-#: ../src/client/networkmodel.cpp:932
+#: ../src/client/networkmodel.cpp:956
#, qt-format
msgctxt "IrcUserItem|"
msgid "login time: %1"
msgstr ""
-#: ../src/client/networkmodel.cpp:935
+#: ../src/client/networkmodel.cpp:959
#, qt-format
msgctxt "IrcUserItem|"
msgid "server: %1"
@@ -3951,379 +4105,396 @@ msgctxt "KeySequenceWidget|"
msgid "Reassign"
msgstr ""
-#: ../src/qtui/mainwin.cpp:350
+#: ../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:352
+#: ../src/qtui/mainwin.cpp:360
msgctxt "MainWin|"
msgid "&Connect to Core..."
msgstr ""
-#: ../src/qtui/mainwin.cpp:354
+#: ../src/qtui/mainwin.cpp:362
msgctxt "MainWin|"
msgid "&Disconnect from Core"
msgstr ""
-#: ../src/qtui/mainwin.cpp:356
+#: ../src/qtui/mainwin.cpp:364
msgctxt "MainWin|"
msgid "Core &Info..."
msgstr ""
-#: ../src/qtui/mainwin.cpp:358
+#: ../src/qtui/mainwin.cpp:366
msgctxt "MainWin|"
msgid "Configure &Networks..."
msgstr ""
-#: ../src/qtui/mainwin.cpp:361
+#: ../src/qtui/mainwin.cpp:369
msgctxt "MainWin|"
msgid "&Quit"
msgstr ""
-#: ../src/qtui/mainwin.cpp:365
+#: ../src/qtui/mainwin.cpp:373
msgctxt "MainWin|"
msgid "&Configure Chat Lists..."
msgstr ""
-#: ../src/qtui/mainwin.cpp:368
+#: ../src/qtui/mainwin.cpp:376
msgctxt "MainWin|"
msgid "&Lock Layout"
msgstr ""
-#: ../src/qtui/mainwin.cpp:372
+#: ../src/qtui/mainwin.cpp:380
msgctxt "MainWin|"
msgid "Show &Search Bar"
msgstr ""
-#: ../src/qtui/mainwin.cpp:374
+#: ../src/qtui/mainwin.cpp:382
msgctxt "MainWin|"
msgid "Show Away Log"
msgstr ""
-#: ../src/qtui/mainwin.cpp:376
+#: ../src/qtui/mainwin.cpp:384
msgctxt "MainWin|"
msgid "Show &Menubar"
msgstr ""
-#: ../src/qtui/mainwin.cpp:379
+#: ../src/qtui/mainwin.cpp:387
msgctxt "MainWin|"
msgid "Show Status &Bar"
msgstr ""
-#: ../src/qtui/mainwin.cpp:385
+#: ../src/qtui/mainwin.cpp:393
msgctxt "MainWin|"
msgid "&Full Screen Mode"
msgstr ""
-#: ../src/qtui/mainwin.cpp:392
+#: ../src/qtui/mainwin.cpp:400
msgctxt "MainWin|"
msgid "Configure &Shortcuts..."
msgstr ""
-#: ../src/qtui/mainwin.cpp:398 ../src/qtui/mainwin.cpp:402
+#: ../src/qtui/mainwin.cpp:406 ../src/qtui/mainwin.cpp:410
msgctxt "MainWin|"
msgid "&Configure Quassel..."
msgstr ""
-#: ../src/qtui/mainwin.cpp:408
+#: ../src/qtui/mainwin.cpp:416
msgctxt "MainWin|"
msgid "&About Quassel"
msgstr ""
-#: ../src/qtui/mainwin.cpp:413
+#: ../src/qtui/mainwin.cpp:421
msgctxt "MainWin|"
msgid "About &Qt"
msgstr ""
-#: ../src/qtui/mainwin.cpp:417
+#: ../src/qtui/mainwin.cpp:425
msgctxt "MainWin|"
msgid "Debug &NetworkModel"
msgstr ""
-#: ../src/qtui/mainwin.cpp:419
+#: ../src/qtui/mainwin.cpp:427
msgctxt "MainWin|"
msgid "Debug &BufferViewOverlay"
msgstr ""
-#: ../src/qtui/mainwin.cpp:421
+#: ../src/qtui/mainwin.cpp:429
msgctxt "MainWin|"
msgid "Debug &MessageModel"
msgstr ""
-#: ../src/qtui/mainwin.cpp:423
+#: ../src/qtui/mainwin.cpp:431
msgctxt "MainWin|"
msgid "Debug &HotList"
msgstr ""
-#: ../src/qtui/mainwin.cpp:425
+#: ../src/qtui/mainwin.cpp:433
msgctxt "MainWin|"
msgid "Debug &Log"
msgstr ""
-#: ../src/qtui/mainwin.cpp:427
+#: ../src/qtui/mainwin.cpp:435
msgctxt "MainWin|"
msgid "Reload Stylesheet"
msgstr ""
-#: ../src/qtui/mainwin.cpp:430
+#: ../src/qtui/mainwin.cpp:438
msgctxt "MainWin|"
msgid "Hide Current Buffer"
msgstr ""
-#: ../src/qtui/mainwin.cpp:434
+#: ../src/qtui/mainwin.cpp:442
msgctxt "MainWin|"
msgid "Navigation"
msgstr ""
-#: ../src/qtui/mainwin.cpp:436
+#: ../src/qtui/mainwin.cpp:444
msgctxt "MainWin|"
msgid "Jump to hot chat"
msgstr ""
-#: ../src/qtui/mainwin.cpp:448
+#: ../src/qtui/mainwin.cpp:456
msgctxt "MainWin|"
msgid "Set Quick Access #0"
msgstr ""
-#: ../src/qtui/mainwin.cpp:450
+#: ../src/qtui/mainwin.cpp:458
msgctxt "MainWin|"
msgid "Set Quick Access #1"
msgstr ""
-#: ../src/qtui/mainwin.cpp:452
+#: ../src/qtui/mainwin.cpp:460
msgctxt "MainWin|"
msgid "Set Quick Access #2"
msgstr ""
-#: ../src/qtui/mainwin.cpp:454
+#: ../src/qtui/mainwin.cpp:462
msgctxt "MainWin|"
msgid "Set Quick Access #3"
msgstr ""
-#: ../src/qtui/mainwin.cpp:456
+#: ../src/qtui/mainwin.cpp:464
msgctxt "MainWin|"
msgid "Set Quick Access #4"
msgstr ""
-#: ../src/qtui/mainwin.cpp:458
+#: ../src/qtui/mainwin.cpp:466
msgctxt "MainWin|"
msgid "Set Quick Access #5"
msgstr ""
-#: ../src/qtui/mainwin.cpp:460
+#: ../src/qtui/mainwin.cpp:468
msgctxt "MainWin|"
msgid "Set Quick Access #6"
msgstr ""
-#: ../src/qtui/mainwin.cpp:462
+#: ../src/qtui/mainwin.cpp:470
msgctxt "MainWin|"
msgid "Set Quick Access #7"
msgstr ""
-#: ../src/qtui/mainwin.cpp:464
+#: ../src/qtui/mainwin.cpp:472
msgctxt "MainWin|"
msgid "Set Quick Access #8"
msgstr ""
-#: ../src/qtui/mainwin.cpp:466
+#: ../src/qtui/mainwin.cpp:474
msgctxt "MainWin|"
msgid "Set Quick Access #9"
msgstr ""
-#: ../src/qtui/mainwin.cpp:469
+#: ../src/qtui/mainwin.cpp:477
msgctxt "MainWin|"
msgid "Quick Access #0"
msgstr ""
-#: ../src/qtui/mainwin.cpp:471
+#: ../src/qtui/mainwin.cpp:479
msgctxt "MainWin|"
msgid "Quick Access #1"
msgstr ""
-#: ../src/qtui/mainwin.cpp:473
+#: ../src/qtui/mainwin.cpp:481
msgctxt "MainWin|"
msgid "Quick Access #2"
msgstr ""
-#: ../src/qtui/mainwin.cpp:475
+#: ../src/qtui/mainwin.cpp:483
msgctxt "MainWin|"
msgid "Quick Access #3"
msgstr ""
-#: ../src/qtui/mainwin.cpp:477
+#: ../src/qtui/mainwin.cpp:485
msgctxt "MainWin|"
msgid "Quick Access #4"
msgstr ""
-#: ../src/qtui/mainwin.cpp:479
+#: ../src/qtui/mainwin.cpp:487
msgctxt "MainWin|"
msgid "Quick Access #5"
msgstr ""
-#: ../src/qtui/mainwin.cpp:481
+#: ../src/qtui/mainwin.cpp:489
msgctxt "MainWin|"
msgid "Quick Access #6"
msgstr ""
-#: ../src/qtui/mainwin.cpp:483
+#: ../src/qtui/mainwin.cpp:491
msgctxt "MainWin|"
msgid "Quick Access #7"
msgstr ""
-#: ../src/qtui/mainwin.cpp:485
+#: ../src/qtui/mainwin.cpp:493
msgctxt "MainWin|"
msgid "Quick Access #8"
msgstr ""
-#: ../src/qtui/mainwin.cpp:487
+#: ../src/qtui/mainwin.cpp:495
msgctxt "MainWin|"
msgid "Quick Access #9"
msgstr ""
-#: ../src/qtui/mainwin.cpp:491
+#: ../src/qtui/mainwin.cpp:499
msgctxt "MainWin|"
msgid "Activate Next Chat List"
msgstr ""
-#: ../src/qtui/mainwin.cpp:493
+#: ../src/qtui/mainwin.cpp:501
msgctxt "MainWin|"
msgid "Activate Previous Chat List"
msgstr ""
-#: ../src/qtui/mainwin.cpp:495
+#: ../src/qtui/mainwin.cpp:503
msgctxt "MainWin|"
msgid "Go to Next Chat"
msgstr ""
-#: ../src/qtui/mainwin.cpp:497
+#: ../src/qtui/mainwin.cpp:505
msgctxt "MainWin|"
msgid "Go to Previous Chat"
msgstr ""
-#: ../src/qtui/mainwin.cpp:506
+#: ../src/qtui/mainwin.cpp:514
msgctxt "MainWin|"
msgid "&File"
msgstr ""
-#: ../src/qtui/mainwin.cpp:519
+#: ../src/qtui/mainwin.cpp:527
msgctxt "MainWin|"
msgid "&Networks"
msgstr ""
-#: ../src/qtui/mainwin.cpp:525
+#: ../src/qtui/mainwin.cpp:533
msgctxt "MainWin|"
msgid "&View"
msgstr ""
-#: ../src/qtui/mainwin.cpp:526
+#: ../src/qtui/mainwin.cpp:534
msgctxt "MainWin|"
msgid "&Chat Lists"
msgstr ""
-#: ../src/qtui/mainwin.cpp:528
+#: ../src/qtui/mainwin.cpp:536
msgctxt "MainWin|"
msgid "&Toolbars"
msgstr ""
-#: ../src/qtui/mainwin.cpp:542
+#: ../src/qtui/mainwin.cpp:550
msgctxt "MainWin|"
msgid "&Settings"
msgstr ""
-#: ../src/qtui/mainwin.cpp:551
+#: ../src/qtui/mainwin.cpp:559
msgctxt "MainWin|"
msgid "&Help"
msgstr ""
-#: ../src/qtui/mainwin.cpp:559
+#: ../src/qtui/mainwin.cpp:567
msgctxt "MainWin|"
msgid "Debug"
msgstr ""
-#: ../src/qtui/mainwin.cpp:835
+#: ../src/qtui/mainwin.cpp:843
msgctxt "MainWin|"
msgid "Nicks"
msgstr ""
-#: ../src/qtui/mainwin.cpp:844
+#: ../src/qtui/mainwin.cpp:852
msgctxt "MainWin|"
msgid "Show Nick List"
msgstr ""
-#: ../src/qtui/mainwin.cpp:857
+#: ../src/qtui/mainwin.cpp:865
msgctxt "MainWin|"
msgid "Chat Monitor"
msgstr ""
-#: ../src/qtui/mainwin.cpp:869
+#: ../src/qtui/mainwin.cpp:877
msgctxt "MainWin|"
msgid "Show Chat Monitor"
msgstr ""
-#: ../src/qtui/mainwin.cpp:875
+#: ../src/qtui/mainwin.cpp:883
msgctxt "MainWin|"
msgid "Inputline"
msgstr ""
-#: ../src/qtui/mainwin.cpp:884
+#: ../src/qtui/mainwin.cpp:892
msgctxt "MainWin|"
msgid "Show Input Line"
msgstr ""
-#: ../src/qtui/mainwin.cpp:899
+#: ../src/qtui/mainwin.cpp:907
msgctxt "MainWin|"
msgid "Topic"
msgstr ""
-#: ../src/qtui/mainwin.cpp:911
+#: ../src/qtui/mainwin.cpp:919
msgctxt "MainWin|"
msgid "Show Topic Line"
msgstr ""
-#: ../src/qtui/mainwin.cpp:1005
+#: ../src/qtui/mainwin.cpp:1013
msgctxt "MainWin|"
msgid "Main Toolbar"
msgstr ""
-#: ../src/qtui/mainwin.cpp:1048
+#: ../src/qtui/mainwin.cpp:1074
msgctxt "MainWin|"
msgid "Connected to core."
msgstr ""
-#: ../src/qtui/mainwin.cpp:1147
+#: ../src/qtui/mainwin.cpp:1173
msgctxt "MainWin|"
msgid "Not connected to core."
msgstr ""
-#: ../src/qtui/mainwin.cpp:1165 ../src/qtui/mainwin.cpp:1175
+#: ../src/qtui/mainwin.cpp:1191 ../src/qtui/mainwin.cpp:1201
msgctxt "MainWin|"
msgid "Unencrypted Connection"
msgstr ""
-#: ../src/qtui/mainwin.cpp:1165
+#: ../src/qtui/mainwin.cpp:1191
msgctxt "MainWin|"
msgid "Your client does not support SSL encryption"
msgstr ""
-#: ../src/qtui/mainwin.cpp:1167 ../src/qtui/mainwin.cpp:1177
+#: ../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:1175
+#: ../src/qtui/mainwin.cpp:1201
msgctxt "MainWin|"
msgid "Your core does not support SSL encryption"
msgstr ""
-#: ../src/qtui/mainwin.cpp:1193 ../src/qtui/mainwin.cpp:1214
+#: ../src/qtui/mainwin.cpp:1219 ../src/qtui/mainwin.cpp:1240
msgctxt "MainWin|"
msgid "Untrusted Security Certificate"
msgstr ""
-#: ../src/qtui/mainwin.cpp:1194
+#: ../src/qtui/mainwin.cpp:1220
#, qt-format
msgctxt "MainWin|"
msgid ""
@@ -4331,33 +4502,33 @@ msgid ""
"following reasons:"
msgstr ""
-#: ../src/qtui/mainwin.cpp:1197
+#: ../src/qtui/mainwin.cpp:1223
msgctxt "MainWin|"
msgid "Continue"
msgstr ""
-#: ../src/qtui/mainwin.cpp:1198
+#: ../src/qtui/mainwin.cpp:1224
msgctxt "MainWin|"
msgid "Show Certificate"
msgstr ""
-#: ../src/qtui/mainwin.cpp:1215
+#: ../src/qtui/mainwin.cpp:1241
msgctxt "MainWin|"
msgid ""
"Would you like to accept this certificate forever without being prompted?"
msgstr ""
-#: ../src/qtui/mainwin.cpp:1217
+#: ../src/qtui/mainwin.cpp:1243
msgctxt "MainWin|"
msgid "Current Session Only"
msgstr ""
-#: ../src/qtui/mainwin.cpp:1218
+#: ../src/qtui/mainwin.cpp:1244
msgctxt "MainWin|"
msgid "Forever"
msgstr ""
-#: ../src/qtui/mainwin.cpp:1229
+#: ../src/qtui/mainwin.cpp:1255
msgctxt "MainWin|"
msgid "Core Connection Error"
msgstr ""
@@ -4469,17 +4640,17 @@ msgctxt "NetworkItem|"
msgid "Lag: %1 msecs"
msgstr ""
-#: ../src/client/networkmodel.cpp:963
+#: ../src/client/networkmodel.cpp:987
msgctxt "NetworkModel|"
msgid "Chat"
msgstr ""
-#: ../src/client/networkmodel.cpp:963
+#: ../src/client/networkmodel.cpp:987
msgctxt "NetworkModel|"
msgid "Topic"
msgstr ""
-#: ../src/client/networkmodel.cpp:963
+#: ../src/client/networkmodel.cpp:987
msgctxt "NetworkModel|"
msgid "Nick Count"
msgstr ""
@@ -4836,7 +5007,7 @@ msgid ""
"the special characters {, }, [, ], \\, |, `, ^, _ and -."
msgstr ""
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:479
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:480
msgctxt "NickEditDlg|"
msgid "Add Nickname"
msgstr ""
@@ -4851,7 +5022,7 @@ msgctxt "NotificationsSettingsPage|"
msgid "Notifications"
msgstr ""
-#: ../src/qtui/phononnotificationbackend.cpp:186
+#: ../src/qtui/phononnotificationbackend.cpp:188
msgctxt "PhononNotificationBackend::ConfigWidget|"
msgid "Select Audio File"
msgstr ""
@@ -5096,30 +5267,46 @@ msgctxt "Quassel::secondsToString()|"
msgid "sec"
msgstr ""
-#: ../src/client/networkmodel.cpp:482
+#: ../src/client/networkmodel.cpp:490
#, qt-format
msgctxt "QueryBufferItem|"
msgid "Query with %1"
msgstr ""
-#: ../src/client/networkmodel.cpp:500
+#: ../src/client/networkmodel.cpp:508
#, qt-format
msgctxt "QueryBufferItem|"
msgid "idling since %1"
msgstr ""
-#: ../src/client/networkmodel.cpp:503
+#: ../src/client/networkmodel.cpp:511
#, qt-format
msgctxt "QueryBufferItem|"
msgid "login time: %1"
msgstr ""
-#: ../src/client/networkmodel.cpp:506
+#: ../src/client/networkmodel.cpp:514
#, 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"
@@ -5151,7 +5338,7 @@ msgid "Server address:"
msgstr ""
#: ../src/qtui/settingspages/servereditdlg.ui:45
-#: ../src/qtui/settingspages/servereditdlg.ui:227
+#: ../src/qtui/settingspages/servereditdlg.ui:181
msgctxt "ServerEditDlg|"
msgid "Port:"
msgstr ""
@@ -5171,69 +5358,42 @@ msgctxt "ServerEditDlg|"
msgid "Advanced"
msgstr ""
-#: ../src/qtui/settingspages/servereditdlg.ui:140
-msgctxt "ServerEditDlg|"
-msgid "SSL Version:"
-msgstr ""
-
-#: ../src/qtui/settingspages/servereditdlg.ui:147
-msgctxt "ServerEditDlg|"
-msgid ""
-"Do not change unless you're going to connect to a server not supporting "
-"SSLv3!"
-msgstr ""
-
-#: ../src/qtui/settingspages/servereditdlg.ui:151
-msgctxt "ServerEditDlg|"
-msgid "SSLv3 (default)"
-msgstr ""
-
-#: ../src/qtui/settingspages/servereditdlg.ui:156
-msgctxt "ServerEditDlg|"
-msgid "SSLv2"
-msgstr ""
-
-#: ../src/qtui/settingspages/servereditdlg.ui:161
-msgctxt "ServerEditDlg|"
-msgid "TLSv1"
-msgstr ""
-
-#: ../src/qtui/settingspages/servereditdlg.ui:171
+#: ../src/qtui/settingspages/servereditdlg.ui:125
msgctxt "ServerEditDlg|"
msgid "Use a Proxy"
msgstr ""
-#: ../src/qtui/settingspages/servereditdlg.ui:188
+#: ../src/qtui/settingspages/servereditdlg.ui:142
msgctxt "ServerEditDlg|"
msgid "Proxy Type:"
msgstr ""
-#: ../src/qtui/settingspages/servereditdlg.ui:196
+#: ../src/qtui/settingspages/servereditdlg.ui:150
msgctxt "ServerEditDlg|"
msgid "Socks 5"
msgstr ""
-#: ../src/qtui/settingspages/servereditdlg.ui:201
+#: ../src/qtui/settingspages/servereditdlg.ui:155
msgctxt "ServerEditDlg|"
msgid "HTTP"
msgstr ""
-#: ../src/qtui/settingspages/servereditdlg.ui:213
+#: ../src/qtui/settingspages/servereditdlg.ui:167
msgctxt "ServerEditDlg|"
msgid "Proxy Host:"
msgstr ""
-#: ../src/qtui/settingspages/servereditdlg.ui:220
+#: ../src/qtui/settingspages/servereditdlg.ui:174
msgctxt "ServerEditDlg|"
msgid "localhost"
msgstr ""
-#: ../src/qtui/settingspages/servereditdlg.ui:251
+#: ../src/qtui/settingspages/servereditdlg.ui:205
msgctxt "ServerEditDlg|"
msgid "Proxy Username:"
msgstr ""
-#: ../src/qtui/settingspages/servereditdlg.ui:261
+#: ../src/qtui/settingspages/servereditdlg.ui:215
msgctxt "ServerEditDlg|"
msgid "Proxy Password:"
msgstr ""
@@ -5375,7 +5535,7 @@ msgctxt "ShortcutsSettingsPage|"
msgid "Shortcuts"
msgstr ""
-#: ../src/common/signalproxy.cpp:736
+#: ../src/common/signalproxy.cpp:758
msgctxt "SignalProxy|"
msgid "Disconnecting"
msgstr ""
@@ -5458,6 +5618,41 @@ msgid ""
"network"
msgstr ""
+#: ../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 ""
@@ -5574,7 +5769,7 @@ msgctxt "SslInfoDlg|"
msgid "%1 to %2"
msgstr ""
-#: ../src/client/networkmodel.h:150
+#: ../src/client/networkmodel.h:151
msgctxt "StatusBufferItem|"
msgid "Status Buffer"
msgstr ""
@@ -5832,114 +6027,114 @@ msgstr ""
#. Topic Message
#. ----------
#. Invite Message
-#: ../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
+#: ../src/uisupport/uistyle.cpp:669 ../src/uisupport/uistyle.cpp:672
+#: ../src/uisupport/uistyle.cpp:713 ../src/uisupport/uistyle.cpp:716
+#: ../src/uisupport/uistyle.cpp:719 ../src/uisupport/uistyle.cpp:728
+#: ../src/uisupport/uistyle.cpp:762
#, qt-format
msgctxt "UiStyle::StyledMessage|"
msgid "%1"
msgstr ""
#. Action Message
-#: ../src/uisupport/uistyle.cpp:671
+#: ../src/uisupport/uistyle.cpp:675
#, qt-format
msgctxt "UiStyle::StyledMessage|"
msgid "%DN%1%DN %2"
msgstr ""
#. Nick Message
-#: ../src/uisupport/uistyle.cpp:675
+#: ../src/uisupport/uistyle.cpp:679
#, qt-format
msgctxt "UiStyle::StyledMessage|"
msgid "You are now known as %DN%1%DN"
msgstr ""
-#: ../src/uisupport/uistyle.cpp:676
+#: ../src/uisupport/uistyle.cpp:680
#, qt-format
msgctxt "UiStyle::StyledMessage|"
msgid "%DN%1%DN is now known as %DN%2%DN"
msgstr ""
#. Mode Message
-#: ../src/uisupport/uistyle.cpp:680
+#: ../src/uisupport/uistyle.cpp:684
#, qt-format
msgctxt "UiStyle::StyledMessage|"
msgid "User mode: %DM%1%DM"
msgstr ""
-#: ../src/uisupport/uistyle.cpp:681
+#: ../src/uisupport/uistyle.cpp:685
#, qt-format
msgctxt "UiStyle::StyledMessage|"
msgid "Mode %DM%1%DM by %DN%2%DN"
msgstr ""
#. Join Message
-#: ../src/uisupport/uistyle.cpp:685
+#: ../src/uisupport/uistyle.cpp:689
#, 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:688
+#: ../src/uisupport/uistyle.cpp:692
#, 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:693
+#: ../src/uisupport/uistyle.cpp:697
#, qt-format
msgctxt "UiStyle::StyledMessage|"
msgid "%DN%1%DN %DH(%2@%3)%DH has quit"
msgstr ""
#. Kick Message
-#: ../src/uisupport/uistyle.cpp:701
+#: ../src/uisupport/uistyle.cpp:705
#, 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:719
+#: ../src/uisupport/uistyle.cpp:723
#, qt-format
msgctxt "UiStyle::StyledMessage|"
msgid "{Day changed to %1}"
msgstr ""
-#: ../src/uisupport/uistyle.cpp:733
+#: ../src/uisupport/uistyle.cpp:737
#, qt-format
msgctxt "UiStyle::StyledMessage|"
msgid "Netsplit between %DH%1%DH and %DH%2%DH ended. Users joined: "
msgstr ""
-#: ../src/uisupport/uistyle.cpp:737 ../src/uisupport/uistyle.cpp:753
+#: ../src/uisupport/uistyle.cpp:741 ../src/uisupport/uistyle.cpp:757
#, qt-format
msgctxt "UiStyle::StyledMessage|"
msgid "%DN%1%DN (%2 more)"
msgstr ""
-#: ../src/uisupport/uistyle.cpp:748
+#: ../src/uisupport/uistyle.cpp:752
#, qt-format
msgctxt "UiStyle::StyledMessage|"
msgid "Netsplit between %DH%1%DH and %DH%2%DH. Users quit: "
msgstr ""
-#: ../src/uisupport/uistyle.cpp:760 ../src/uisupport/uistyle.cpp:808
+#: ../src/uisupport/uistyle.cpp:764 ../src/uisupport/uistyle.cpp:812
#, qt-format
msgctxt "UiStyle::StyledMessage|"
msgid "[%1]"
msgstr ""
-#: ../src/uisupport/uistyle.cpp:806
+#: ../src/uisupport/uistyle.cpp:810
#, qt-format
msgctxt "UiStyle::StyledMessage|"
msgid "<%1>"
msgstr ""
-#: ../src/client/networkmodel.cpp:786
+#: ../src/client/networkmodel.cpp:810
#, qt-format
msgctxt "UserCategoryItem|"
msgid "%n Owner(s)"
@@ -5947,7 +6142,7 @@ msgid_plural "%n Owner(s)"
msgstr[0] ""
msgstr[1] ""
-#: ../src/client/networkmodel.cpp:788
+#: ../src/client/networkmodel.cpp:812
#, qt-format
msgctxt "UserCategoryItem|"
msgid "%n Admin(s)"
@@ -5955,7 +6150,7 @@ msgid_plural "%n Admin(s)"
msgstr[0] ""
msgstr[1] ""
-#: ../src/client/networkmodel.cpp:790
+#: ../src/client/networkmodel.cpp:814
#, qt-format
msgctxt "UserCategoryItem|"
msgid "%n Operator(s)"
@@ -5963,7 +6158,7 @@ msgid_plural "%n Operator(s)"
msgstr[0] ""
msgstr[1] ""
-#: ../src/client/networkmodel.cpp:792
+#: ../src/client/networkmodel.cpp:816
#, qt-format
msgctxt "UserCategoryItem|"
msgid "%n Half-Op(s)"
@@ -5971,7 +6166,7 @@ msgid_plural "%n Half-Op(s)"
msgstr[0] ""
msgstr[1] ""
-#: ../src/client/networkmodel.cpp:794
+#: ../src/client/networkmodel.cpp:818
#, qt-format
msgctxt "UserCategoryItem|"
msgid "%n Voiced"
@@ -5979,7 +6174,7 @@ msgid_plural "%n Voiced"
msgstr[0] ""
msgstr[1] ""
-#: ../src/client/networkmodel.cpp:796
+#: ../src/client/networkmodel.cpp:820
#, qt-format
msgctxt "UserCategoryItem|"
msgid "%n User(s)"