X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=po%2Fquassel.pot;h=bef82056d5053bd133b9a2ee4baffcb11f3fa0d9;hb=8544d22f38e453776f01fabfa6083cec00cf6e50;hp=d6a152b7d5352c231fedeb76eabed26dcd2a39e7;hpb=f66845d70cedc06de25d531c5b7a06c2db8d9b91;p=quassel.git
diff --git a/po/quassel.pot b/po/quassel.pot
index d6a152b7..bef82056 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-2014 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:201
+#: ../src/qtui/aboutdlg.cpp:206
msgctxt "AboutDlg|"
msgid ""
"Special thanks goes to:
- "
@@ -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,27 +600,27 @@ 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 ""
@@ -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,17 @@ msgctxt "ChatMonitorView|"
msgid "Configure..."
msgstr ""
-#: ../src/qtui/chatscene.cpp:813
+#: ../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"
@@ -939,96 +958,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 ""
@@ -1053,24 +1114,61 @@ msgctxt "Client|"
msgid "Identity already exists in client!"
msgstr ""
-#: ../src/client/clientauthhandler.cpp:61
-#: ../src/client/clientauthhandler.cpp:256
+#: ../src/client/clientauthhandler.cpp:65
+#: ../src/client/clientauthhandler.cpp:463
msgctxt "ClientAuthHandler|"
msgid "Unencrypted connection canceled"
msgstr ""
-#: ../src/client/clientauthhandler.cpp:84
+#: ../src/client/clientauthhandler.cpp:87
+#: ../src/client/clientauthhandler.cpp:103
#, qt-format
msgctxt "ClientAuthHandler|"
msgid "Connecting to %1..."
msgstr ""
-#: ../src/client/clientauthhandler.cpp:154
+#: ../src/client/clientauthhandler.cpp:99
+#, qt-format
msgctxt "ClientAuthHandler|"
-msgid "Synchronizing to core..."
+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:167
+#: ../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 ""
@@ -1078,35 +1176,34 @@ msgid ""
"at least protocol v%1, but the core speaks v%2 only."
msgstr ""
-#: ../src/client/clientauthhandler.cpp:169
+#: ../src/client/clientauthhandler.cpp:248
msgctxt "ClientAuthHandler|"
msgid "Incompatible protocol version, connection to core refused"
msgstr ""
-#: ../src/client/clientauthhandler.cpp:176
+#: ../src/client/clientauthhandler.cpp:270
msgctxt "ClientAuthHandler|"
-msgid "The core refused connection from this client"
+msgid "Synchronizing to core..."
msgstr ""
-#: ../src/client/clientauthhandler.cpp:207
+#: ../src/client/clientauthhandler.cpp:285
msgctxt "ClientAuthHandler|"
-msgid "Unencrypted connection cancelled"
+msgid "The core refused connection from this client"
msgstr ""
-#: ../src/client/clientauthhandler.cpp:275
-#, qt-format
+#: ../src/client/clientauthhandler.cpp:349
msgctxt "ClientAuthHandler|"
-msgid "Connected to %1"
+msgid "Logging in..."
msgstr ""
-#: ../src/client/clientauthhandler.cpp:317
+#: ../src/client/clientauthhandler.cpp:354
msgctxt "ClientAuthHandler|"
-msgid "Logging in..."
+msgid "Login canceled"
msgstr ""
-#: ../src/client/clientauthhandler.cpp:322
+#: ../src/client/clientauthhandler.cpp:412
msgctxt "ClientAuthHandler|"
-msgid "Login canceled"
+msgid "Unencrypted connection cancelled"
msgstr ""
#: ../src/client/clientbacklogmanager.cpp:178
@@ -1424,12 +1521,12 @@ msgctxt "ContextMenuActionProvider|"
msgid "Existing Rules"
msgstr ""
-#: ../src/core/core.cpp:193
+#: ../src/core/core.cpp:191
msgctxt "Core|"
msgid "Could not initialize any storage backend! Exiting..."
msgstr ""
-#: ../src/core/core.cpp:194
+#: ../src/core/core.cpp:192
msgctxt "Core|"
msgid ""
"Currently, Quassel supports SQLite3 and PostgreSQL. You need to build your\n"
@@ -1438,93 +1535,93 @@ msgid ""
"to work."
msgstr ""
-#: ../src/core/core.cpp:253
+#: ../src/core/core.cpp:251
msgctxt "Core|"
msgid "Calling restoreState() even though active sessions exist!"
msgstr ""
-#: ../src/core/core.cpp:287
+#: ../src/core/core.cpp:285
msgctxt "Core|"
msgid "Core is already configured! Not configuring again..."
msgstr ""
-#: ../src/core/core.cpp:290
+#: ../src/core/core.cpp:288
msgctxt "Core|"
msgid "Admin user or password not set."
msgstr ""
-#: ../src/core/core.cpp:293
+#: ../src/core/core.cpp:291
msgctxt "Core|"
msgid "Could not setup storage!"
msgstr ""
-#: ../src/core/core.cpp:298
+#: ../src/core/core.cpp:296
msgctxt "Core|"
msgid "Creating admin user..."
msgstr ""
-#: ../src/core/core.cpp:451
+#: ../src/core/core.cpp:449
#, qt-format
msgctxt "Core|"
msgid "Invalid listen address %1"
msgstr ""
-#: ../src/core/core.cpp:460
+#: ../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:469
+#: ../src/core/core.cpp:467
#, qt-format
msgctxt "Core|"
msgid "Could not open IPv6 interface %1:%2: %3"
msgstr ""
-#: ../src/core/core.cpp:477
+#: ../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:488
+#: ../src/core/core.cpp:486
#, qt-format
msgctxt "Core|"
msgid "Could not open IPv4 interface %1:%2: %3"
msgstr ""
-#: ../src/core/core.cpp:496
+#: ../src/core/core.cpp:494
#, qt-format
msgctxt "Core|"
msgid "Invalid listen address %1, unknown network protocol"
msgstr ""
-#: ../src/core/core.cpp:505
+#: ../src/core/core.cpp:503
msgctxt "Core|"
msgid "Could not open any network interfaces to listen on!"
msgstr ""
-#: ../src/core/core.cpp:545
+#: ../src/core/core.cpp:543
msgctxt "Core|"
msgid "Client connected from"
msgstr ""
-#: ../src/core/core.cpp:548
+#: ../src/core/core.cpp:546
msgctxt "Core|"
msgid "Closing server for basic setup."
msgstr ""
-#: ../src/core/core.cpp:560
+#: ../src/core/core.cpp:558
msgctxt "Core|"
msgid "Non-authed client disconnected:"
msgstr ""
-#: ../src/core/core.cpp:592
+#: ../src/core/core.cpp:590
msgctxt "Core|"
msgid "Could not initialize session for client:"
msgstr ""
-#: ../src/core/core.cpp:619
+#: ../src/core/core.cpp:617
msgctxt "Core|"
msgid "Could not find a session for client:"
msgstr ""
@@ -1665,17 +1762,17 @@ msgctxt "CoreAccountSettingsPage|"
msgid "Remote Cores"
msgstr ""
-#: ../src/core/coreauthhandler.cpp:54 ../src/core/coreauthhandler.cpp:90
+#: ../src/core/coreauthhandler.cpp:126 ../src/core/coreauthhandler.cpp:138
msgctxt "CoreAuthHandler|"
msgid "Client"
msgstr ""
-#: ../src/core/coreauthhandler.cpp:54
+#: ../src/core/coreauthhandler.cpp:126
msgctxt "CoreAuthHandler|"
msgid "too old, rejecting."
msgstr ""
-#: ../src/core/coreauthhandler.cpp:55
+#: ../src/core/coreauthhandler.cpp:127
#, qt-format
msgctxt "CoreAuthHandler|"
msgid ""
@@ -1683,44 +1780,44 @@ msgid ""
"core protocol version %1 (got: %2).
Please consider upgrading your client."
msgstr ""
-#: ../src/core/coreauthhandler.cpp:69
+#: ../src/core/coreauthhandler.cpp:138
msgctxt "CoreAuthHandler|"
-msgid "Starting encryption for Client:"
+msgid "did not send a registration message before trying to login, rejecting."
msgstr ""
-#: ../src/core/coreauthhandler.cpp:90
-msgctxt "CoreAuthHandler|"
-msgid "did not send an init message before trying to login, rejecting."
-msgstr ""
-
-#: ../src/core/coreauthhandler.cpp:91
+#: ../src/core/coreauthhandler.cpp:139
msgctxt "CoreAuthHandler|"
msgid ""
-"Client not initialized!
You need to send an init message before "
-"trying to login."
+"Client not initialized!
You need to send a registration message "
+"before trying to login."
msgstr ""
-#: ../src/core/coreauthhandler.cpp:105
+#: ../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:146
+#: ../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:151
+#: ../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"
@@ -1931,57 +2028,33 @@ msgctxt "CoreConnection|"
msgid "Network is down"
msgstr ""
-#: ../src/client/coreconnection.cpp:227 ../src/client/coreconnection.cpp:328
+#: ../src/client/coreconnection.cpp:276
msgctxt "CoreConnection|"
msgid "Disconnected"
msgstr ""
-#: ../src/client/coreconnection.cpp:230
-#, qt-format
-msgctxt "CoreConnection|"
-msgid "Looking up %1..."
-msgstr ""
-
-#: ../src/client/coreconnection.cpp:233
-#, qt-format
-msgctxt "CoreConnection|"
-msgid "Connecting to %1..."
-msgstr ""
-
-#: ../src/client/coreconnection.cpp:236
-#, qt-format
-msgctxt "CoreConnection|"
-msgid "Connected to %1"
-msgstr ""
-
-#: ../src/client/coreconnection.cpp:239
-#, qt-format
-msgctxt "CoreConnection|"
-msgid "Disconnecting from %1..."
-msgstr ""
-
-#: ../src/client/coreconnection.cpp:363
+#: ../src/client/coreconnection.cpp:311
msgctxt "CoreConnection|"
msgid "Disconnected from core."
msgstr ""
-#: ../src/client/coreconnection.cpp:501
+#: ../src/client/coreconnection.cpp:451
msgctxt "CoreConnection|"
msgid "Receiving session state"
msgstr ""
-#: ../src/client/coreconnection.cpp:503
+#: ../src/client/coreconnection.cpp:453
#, qt-format
msgctxt "CoreConnection|"
msgid "Synchronizing to %1..."
msgstr ""
-#: ../src/client/coreconnection.cpp:539
+#: ../src/client/coreconnection.cpp:489
msgctxt "CoreConnection|"
msgid "Receiving network states"
msgstr ""
-#: ../src/client/coreconnection.cpp:590
+#: ../src/client/coreconnection.cpp:540
#, qt-format
msgctxt "CoreConnection|"
msgid "Synchronized to %1"
@@ -2161,35 +2234,35 @@ msgctxt "CoreInfoDlg|"
msgid " %1:%2:%3 (since %4)"
msgstr ""
-#: ../src/core/corenetwork.cpp:167
+#: ../src/core/corenetwork.cpp:166
msgctxt "CoreNetwork|"
msgid "Connection failed. Cycling to next Server"
msgstr ""
-#: ../src/core/corenetwork.cpp:175 ../src/core/corenetwork.cpp:176
+#: ../src/core/corenetwork.cpp:174 ../src/core/corenetwork.cpp:175
#, qt-format
msgctxt "CoreNetwork|"
msgid "Connecting to %1:%2..."
msgstr ""
-#: ../src/core/corenetwork.cpp:228
+#: ../src/core/corenetwork.cpp:229
#, qt-format
msgctxt "CoreNetwork|"
msgid "Disconnecting. (%1)"
msgstr ""
-#: ../src/core/corenetwork.cpp:228
+#: ../src/core/corenetwork.cpp:229
msgctxt "CoreNetwork|"
msgid "Core Shutdown"
msgstr ""
-#: ../src/core/corenetwork.cpp:423
+#: ../src/core/corenetwork.cpp:424
#, qt-format
msgctxt "CoreNetwork|"
msgid "Could not connect to %1 (%2)"
msgstr ""
-#: ../src/core/corenetwork.cpp:425
+#: ../src/core/corenetwork.cpp:426
#, qt-format
msgctxt "CoreNetwork|"
msgid "Connection failure: %1"
@@ -2296,38 +2369,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:606
-#: ../src/core/coreuserinputhandler.cpp:644
+#: ../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:662
+#: ../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:670
+#: ../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 "
@@ -2336,30 +2409,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:628
+#: ../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 "
@@ -2368,39 +2441,39 @@ msgid ""
"with QCA present."
msgstr ""
-#: ../src/core/coreuserinputhandler.cpp:556
+#: ../src/core/coreuserinputhandler.cpp:559
#, qt-format
msgctxt "CoreUserInputHandler|"
msgid "Starting query with %1"
msgstr ""
-#: ../src/core/coreuserinputhandler.cpp:616
+#: ../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:625
+#: ../src/core/coreuserinputhandler.cpp:628
#, qt-format
msgctxt "CoreUserInputHandler|"
msgid "The key for %1 has been set."
msgstr ""
-#: ../src/core/coreuserinputhandler.cpp:654
+#: ../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:666
+#: ../src/core/coreuserinputhandler.cpp:669
#, qt-format
msgctxt "CoreUserInputHandler|"
msgid "The key for %1 is %2:%3"
msgstr ""
-#: ../src/core/coreuserinputhandler.cpp:794
+#: ../src/core/coreuserinputhandler.cpp:797
#, qt-format
msgctxt "CoreUserInputHandler|"
msgid "[Error] Could not encrypt your message: %1"
@@ -2426,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"
@@ -2743,7 +2827,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"
@@ -3644,7 +3734,7 @@ msgctxt "InputWidget|"
msgid "Clear Color"
msgstr ""
-#: ../src/qtui/inputwidget.cpp:133
+#: ../src/qtui/inputwidget.cpp:136
msgctxt "InputWidget|"
msgid "Focus Input Line"
msgstr ""
@@ -3691,40 +3781,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 ""
@@ -4000,18 +4100,18 @@ msgctxt "KeySequenceWidget|"
msgid "Reassign"
msgstr ""
-#: ../src/common/protocols/legacy/legacypeer.cpp:175
+#: ../src/common/protocols/legacy/legacypeer.cpp:136
msgctxt "LegacyPeer|"
msgid "Invalid handshake message!"
msgstr ""
-#: ../src/common/protocols/legacy/legacypeer.cpp:246
+#: ../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:295
+#: ../src/common/protocols/legacy/legacypeer.cpp:256
#, qt-format
msgctxt "LegacyPeer|"
msgid "Quassel Core Version %1
Built: %2
Up %3d%4h%5m (since %6)"
@@ -4352,44 +4452,44 @@ msgctxt "MainWin|"
msgid "Main Toolbar"
msgstr ""
-#: ../src/qtui/mainwin.cpp:1058
+#: ../src/qtui/mainwin.cpp:1074
msgctxt "MainWin|"
msgid "Connected to core."
msgstr ""
-#: ../src/qtui/mainwin.cpp:1157
+#: ../src/qtui/mainwin.cpp:1173
msgctxt "MainWin|"
msgid "Not connected to core."
msgstr ""
-#: ../src/qtui/mainwin.cpp:1175 ../src/qtui/mainwin.cpp:1185
+#: ../src/qtui/mainwin.cpp:1191 ../src/qtui/mainwin.cpp:1201
msgctxt "MainWin|"
msgid "Unencrypted Connection"
msgstr ""
-#: ../src/qtui/mainwin.cpp:1175
+#: ../src/qtui/mainwin.cpp:1191
msgctxt "MainWin|"
msgid "Your client does not support SSL encryption"
msgstr ""
-#: ../src/qtui/mainwin.cpp:1177 ../src/qtui/mainwin.cpp:1187
+#: ../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:1185
+#: ../src/qtui/mainwin.cpp:1201
msgctxt "MainWin|"
msgid "Your core does not support SSL encryption"
msgstr ""
-#: ../src/qtui/mainwin.cpp:1203 ../src/qtui/mainwin.cpp:1224
+#: ../src/qtui/mainwin.cpp:1219 ../src/qtui/mainwin.cpp:1240
msgctxt "MainWin|"
msgid "Untrusted Security Certificate"
msgstr ""
-#: ../src/qtui/mainwin.cpp:1204
+#: ../src/qtui/mainwin.cpp:1220
#, qt-format
msgctxt "MainWin|"
msgid ""
@@ -4397,33 +4497,33 @@ msgid ""
"following reasons:"
msgstr ""
-#: ../src/qtui/mainwin.cpp:1207
+#: ../src/qtui/mainwin.cpp:1223
msgctxt "MainWin|"
msgid "Continue"
msgstr ""
-#: ../src/qtui/mainwin.cpp:1208
+#: ../src/qtui/mainwin.cpp:1224
msgctxt "MainWin|"
msgid "Show Certificate"
msgstr ""
-#: ../src/qtui/mainwin.cpp:1225
+#: ../src/qtui/mainwin.cpp:1241
msgctxt "MainWin|"
msgid ""
"Would you like to accept this certificate forever without being prompted?"
msgstr ""
-#: ../src/qtui/mainwin.cpp:1227
+#: ../src/qtui/mainwin.cpp:1243
msgctxt "MainWin|"
msgid "Current Session Only"
msgstr ""
-#: ../src/qtui/mainwin.cpp:1228
+#: ../src/qtui/mainwin.cpp:1244
msgctxt "MainWin|"
msgid "Forever"
msgstr ""
-#: ../src/qtui/mainwin.cpp:1239
+#: ../src/qtui/mainwin.cpp:1255
msgctxt "MainWin|"
msgid "Core Connection Error"
msgstr ""
@@ -5197,6 +5297,11 @@ 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"
@@ -5536,7 +5641,6 @@ msgid ""
msgstr ""
#: ../src/qtui/snorenotificationbackend.cpp:60
-#: ../src/qtui/snorenotificationbackend.cpp:104
msgctxt "SnoreNotificationBackend|"
msgid "Private Message"
msgstr ""