X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=po%2Fen_GB.po;h=5a76486536cd657952f74c5970bf892d2c910fae;hp=d7fb0cc12d05e620643fdf903a6e8febcf48be88;hb=60bf8c5270a523172fd4e4dd4768058af612439f;hpb=d2b53bfcb015ccabcfa18e7c46ebd3af8c158886 diff --git a/po/en_GB.po b/po/en_GB.po index d7fb0cc1..5a764865 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Quassel IRC\n" "Report-Msgid-Bugs-To: http://bugs.quassel-irc.org/\n" -"PO-Revision-Date: 2013-11-25 00:20+0000\n" +"PO-Revision-Date: 2015-02-11 21:03+0000\n" "Last-Translator: Daniel Albers \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/quassel/language/en_GB/)\n" "MIME-Version: 1.0\n" @@ -30,31 +30,22 @@ msgid "" "

Quassel IRC

" msgstr "\n

Quassel IRC

" -#: ../src/qtui/ui/aboutdlg.ui:75 -msgctxt "AboutDlg|" -msgid "" -"\n" -"

Version 0.2.0-pre, Build >= 474 (2008-02-08)

" -msgstr "\n

Version 0.2.0-pre, Build >= 474 (2008-02-08)

" - -#: ../src/qtui/ui/aboutdlg.ui:115 +#: ../src/qtui/ui/aboutdlg.ui:112 msgctxt "AboutDlg|" msgid "&About" msgstr "&About" -#: ../src/qtui/ui/aboutdlg.ui:135 +#: ../src/qtui/ui/aboutdlg.ui:132 msgctxt "AboutDlg|" msgid "A&uthors" msgstr "A&uthors" -#: ../src/qtui/ui/aboutdlg.ui:155 +#: ../src/qtui/ui/aboutdlg.ui:152 msgctxt "AboutDlg|" msgid "&Contributors" msgstr "&Contributors" -#: ../src/qtui/ui/aboutdlg.ui:175 +#: ../src/qtui/ui/aboutdlg.ui:172 msgctxt "AboutDlg|" msgid "&Thanks To" msgstr "&Thanks To" @@ -66,10 +57,11 @@ msgid "Version: %1
Protocol version: %2
Built: %3" msgstr "Version: %1
Protocol version: %2
Built: %3" #: ../src/qtui/aboutdlg.cpp:49 +#, qt-format msgctxt "AboutDlg|" msgid "" -"A modern, distributed IRC Client

©2005-2013 by the " -"Quassel Project
http://quassel-" +"A modern, distributed IRC Client

©%1 by the Quassel " +"Project
http://quassel-" "irc.org
#quassel on Freenode

Quassel IRC is dual-" "licensed under GPLv2" @@ -79,7 +71,7 @@ msgid "" "href=\"http://www.gnu.org/licenses/lgpl.html\">LGPL.

Please use " "http://bugs.quassel-irc.org to " "report bugs." -msgstr "A modern, distributed IRC Client

©2005-20010 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 and used under the LGPL.

Please use http://bugs.quassel-irc.org to report bugs." +msgstr "" #: ../src/qtui/aboutdlg.cpp:67 msgctxt "AboutDlg|" @@ -93,7 +85,7 @@ msgid "" "and everybody we forgot to mention here:" msgstr "We would like to thank the following contributors (in alphabetical order) and everybody we forgot to mention here:" -#: ../src/qtui/aboutdlg.cpp:201 +#: ../src/qtui/aboutdlg.cpp:206 msgctxt "AboutDlg|" msgid "" "Special thanks goes to:

%1 - %2
" @@ -460,7 +452,7 @@ msgctxt "BufferViewEditDlg|" msgid "Please enter a name for the chat list:" msgstr "Please enter a name for the chat list:" -#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:575 +#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:582 msgctxt "BufferViewEditDlg|" msgid "Add Chat List" msgstr "Add Chat List" @@ -501,7 +493,7 @@ msgid "Network:" msgstr "Network:" #: ../src/qtui/settingspages/bufferviewsettingspage.ui:100 -#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:123 +#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:128 msgctxt "BufferViewSettingsPage|" msgid "All" msgstr "All" @@ -535,40 +527,45 @@ msgstr "Hide inactive chats" #: ../src/qtui/settingspages/bufferviewsettingspage.ui:142 msgctxt "BufferViewSettingsPage|" +msgid "Hide inactive networks" +msgstr "" + +#: ../src/qtui/settingspages/bufferviewsettingspage.ui:149 +msgctxt "BufferViewSettingsPage|" msgid "Add new chats automatically" msgstr "Add new chats automatically" -#: ../src/qtui/settingspages/bufferviewsettingspage.ui:149 +#: ../src/qtui/settingspages/bufferviewsettingspage.ui:156 msgctxt "BufferViewSettingsPage|" msgid "Sort alphabetically" msgstr "Sort alphabetically" -#: ../src/qtui/settingspages/bufferviewsettingspage.ui:156 +#: ../src/qtui/settingspages/bufferviewsettingspage.ui:163 msgctxt "BufferViewSettingsPage|" msgid "Minimum Activity:" msgstr "Minimum Activity:" -#: ../src/qtui/settingspages/bufferviewsettingspage.ui:164 +#: ../src/qtui/settingspages/bufferviewsettingspage.ui:171 msgctxt "BufferViewSettingsPage|" msgid "No Activity" msgstr "No Activity" -#: ../src/qtui/settingspages/bufferviewsettingspage.ui:169 +#: ../src/qtui/settingspages/bufferviewsettingspage.ui:176 msgctxt "BufferViewSettingsPage|" msgid "Other Activity" msgstr "Other Activity" -#: ../src/qtui/settingspages/bufferviewsettingspage.ui:174 +#: ../src/qtui/settingspages/bufferviewsettingspage.ui:181 msgctxt "BufferViewSettingsPage|" msgid "New Message" msgstr "New Message" -#: ../src/qtui/settingspages/bufferviewsettingspage.ui:179 +#: ../src/qtui/settingspages/bufferviewsettingspage.ui:186 msgctxt "BufferViewSettingsPage|" msgid "Highlight" msgstr "Highlight" -#: ../src/qtui/settingspages/bufferviewsettingspage.ui:205 +#: ../src/qtui/settingspages/bufferviewsettingspage.ui:212 msgctxt "BufferViewSettingsPage|" msgid "Preview:" msgstr "Preview:" @@ -583,12 +580,12 @@ msgctxt "BufferViewSettingsPage|" msgid "Custom Chat Lists" msgstr "Custom Chat Lists" -#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:378 +#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:383 msgctxt "BufferViewSettingsPage|" msgid "Delete Chat List?" msgstr "Delete Chat List?" -#: ../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\"?" @@ -599,61 +596,61 @@ msgctxt "BufferViewWidget|" msgid "BufferView" msgstr "BufferView" -#: ../src/qtui/bufferwidget.cpp:78 +#: ../src/qtui/bufferwidget.cpp:79 msgctxt "BufferWidget|" msgid "Zoom In" msgstr "Zoom In" -#: ../src/qtui/bufferwidget.cpp:84 +#: ../src/qtui/bufferwidget.cpp:85 msgctxt "BufferWidget|" msgid "Zoom Out" msgstr "Zoom Out" -#: ../src/qtui/bufferwidget.cpp:89 +#: ../src/qtui/bufferwidget.cpp:90 msgctxt "BufferWidget|" msgid "Actual Size" msgstr "Actual Size" -#: ../src/qtui/bufferwidget.cpp:93 +#: ../src/qtui/bufferwidget.cpp:94 msgctxt "BufferWidget|" msgid "Set Marker Line" msgstr "Set Marker Line" -#: ../src/qtui/bufferwidget.cpp:97 +#: ../src/qtui/bufferwidget.cpp:98 msgctxt "BufferWidget|" msgid "Go to Marker Line" msgstr "Go to Marker Line" -#: ../src/client/networkmodel.cpp:566 +#: ../src/client/networkmodel.cpp:583 ../src/client/networkmodel.cpp:585 #, qt-format msgctxt "ChannelBufferItem|" msgid "Channel %1" msgstr "Channel %1" -#: ../src/client/networkmodel.cpp:569 +#: ../src/client/networkmodel.cpp:589 #, qt-format msgctxt "ChannelBufferItem|" msgid "Users: %1" msgstr "Users: %1" -#: ../src/client/networkmodel.cpp:573 +#: ../src/client/networkmodel.cpp:593 #, qt-format msgctxt "ChannelBufferItem|" msgid "Mode: %1" msgstr "Mode: %1" -#: ../src/client/networkmodel.cpp:584 +#: ../src/client/networkmodel.cpp:608 #, qt-format msgctxt "ChannelBufferItem|" msgid "Topic: %1" msgstr "Topic: %1" -#: ../src/client/networkmodel.cpp:589 +#: ../src/client/networkmodel.cpp:613 msgctxt "ChannelBufferItem|" msgid "Not active
Double-click to join" msgstr "Not active
Double-click to join" -#: ../src/client/networkmodel.cpp:592 +#: ../src/client/networkmodel.cpp:616 #, qt-format msgctxt "ChannelBufferItem|" msgid "
%1
" @@ -740,7 +737,7 @@ msgid "Move selected buffers to the right" msgstr "Move selected buffers to the right" #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:133 -#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:258 +#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:272 msgctxt "ChatMonitorSettingsPage|" msgid "Show:" msgstr "Show:" @@ -761,6 +758,26 @@ msgctxt "ChatMonitorSettingsPage|" msgid "Show own messages" msgstr "Show own messages" +#: ../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" @@ -781,7 +798,7 @@ msgctxt "ChatMonitorSettingsPage|" msgid "Opt Out" msgstr "Opt Out" -#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:261 +#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:275 msgctxt "ChatMonitorSettingsPage|" msgid "Ignore:" msgstr "Ignore:" @@ -806,11 +823,22 @@ msgctxt "ChatMonitorView|" msgid "Configure..." msgstr "Configure..." -#: ../src/qtui/chatscene.cpp:813 +#: ../src/qtui/chatscene.cpp:826 msgctxt "ChatScene|" msgid "Copy Selection" msgstr "Copy Selection" +#: ../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" @@ -911,96 +939,128 @@ msgstr "Set marker line automatically when switching chats" #: ../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: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:193 +msgctxt "ChatViewSettingsPage|" +msgid "https://www.google.com/search?q=%s" +msgstr "" + +#: ../src/qtui/settingspages/chatviewsettingspage.ui:202 +msgctxt "ChatViewSettingsPage|" msgid "Custom Colors" msgstr "Custom Colours" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:177 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:220 msgctxt "ChatViewSettingsPage|" msgid "Action:" msgstr "Action:" -#: ../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 "Timestamp:" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:225 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:268 msgctxt "ChatViewSettingsPage|" msgid "Channel message:" msgstr "Channel message:" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:262 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:305 msgctxt "ChatViewSettingsPage|" msgid "Highlight foreground:" msgstr "Highlight foreground:" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:286 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:329 msgctxt "ChatViewSettingsPage|" msgid "Command message:" msgstr "Command message:" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:310 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:353 msgctxt "ChatViewSettingsPage|" msgid "Highlight background:" msgstr "Highlight background:" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:317 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:360 msgctxt "ChatViewSettingsPage|" msgid "Server message:" msgstr "Server message:" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:341 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:384 msgctxt "ChatViewSettingsPage|" msgid "Marker line:" msgstr "Marker line:" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:365 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:408 msgctxt "ChatViewSettingsPage|" msgid "Error message:" msgstr "Error message:" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:389 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:432 msgctxt "ChatViewSettingsPage|" msgid "Background:" msgstr "Background:" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:433 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:476 msgctxt "ChatViewSettingsPage|" msgid "Use Sender Coloring" msgstr "Use Sender Colouring" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:729 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:772 msgctxt "ChatViewSettingsPage|" msgid "Own messages:" msgstr "Own messages:" @@ -1020,67 +1080,103 @@ msgctxt "ChatViewSettingsPage|" msgid "You need at least version 0.6 of quasselcore to use this feature" msgstr "You need at least version 0.6 of quasselcore to use this feature" -#: ../src/client/client.cpp:318 +#: ../src/client/client.cpp:320 msgctxt "Client|" msgid "Identity already exists in client!" msgstr "Identity already exists in client!" -#: ../src/client/clientauthhandler.cpp:61 -#: ../src/client/clientauthhandler.cpp:256 +#: ../src/client/clientauthhandler.cpp:65 +#: ../src/client/clientauthhandler.cpp:471 msgctxt "ClientAuthHandler|" msgid "Unencrypted connection canceled" msgstr "Unencrypted connection cancelled" -#: ../src/client/clientauthhandler.cpp:84 +#: ../src/client/clientauthhandler.cpp:87 +#: ../src/client/clientauthhandler.cpp:103 #, qt-format msgctxt "ClientAuthHandler|" msgid "Connecting to %1..." msgstr "Connecting to %1..." -#: ../src/client/clientauthhandler.cpp:154 +#: ../src/client/clientauthhandler.cpp:99 +#, qt-format msgctxt "ClientAuthHandler|" -msgid "Synchronizing to core..." -msgstr "Synchronising to core..." +msgid "Looking up %1..." +msgstr "Looking up %1..." -#: ../src/client/clientauthhandler.cpp:167 +#: ../src/client/clientauthhandler.cpp:106 +#: ../src/client/clientauthhandler.cpp:315 #, qt-format msgctxt "ClientAuthHandler|" +msgid "Connected to %1" +msgstr "Connected to %1" + +#: ../src/client/clientauthhandler.cpp:110 +#, qt-format +msgctxt "ClientAuthHandler|" +msgid "Disconnecting from %1..." +msgstr "Disconnecting from %1..." + +#: ../src/client/clientauthhandler.cpp:114 +msgctxt "ClientAuthHandler|" +msgid "Disconnected" +msgstr "Disconnected" + +#: ../src/client/clientauthhandler.cpp:149 +msgctxt "ClientAuthHandler|" +msgid "Reconnecting in compatibility mode..." +msgstr "" + +#: ../src/client/clientauthhandler.cpp:236 +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." +"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:169 +#: ../src/client/clientauthhandler.cpp:239 msgctxt "ClientAuthHandler|" -msgid "Incompatible protocol version, connection to core refused" +msgid "Core speaks none of the protocols we support" msgstr "" -#: ../src/client/clientauthhandler.cpp:176 +#: ../src/client/clientauthhandler.cpp:254 +#, qt-format msgctxt "ClientAuthHandler|" -msgid "The core refused connection from this client" +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:207 +#: ../src/client/clientauthhandler.cpp:256 msgctxt "ClientAuthHandler|" -msgid "Unencrypted connection cancelled" +msgid "Incompatible protocol version, connection to core refused" msgstr "" -#: ../src/client/clientauthhandler.cpp:275 -#, qt-format +#: ../src/client/clientauthhandler.cpp:278 msgctxt "ClientAuthHandler|" -msgid "Connected to %1" -msgstr "Connected to %1" +msgid "Synchronizing to core..." +msgstr "Synchronising to core..." + +#: ../src/client/clientauthhandler.cpp:293 +msgctxt "ClientAuthHandler|" +msgid "The core refused connection from this client" +msgstr "" -#: ../src/client/clientauthhandler.cpp:317 +#: ../src/client/clientauthhandler.cpp:357 msgctxt "ClientAuthHandler|" msgid "Logging in..." msgstr "Logging in..." -#: ../src/client/clientauthhandler.cpp:322 +#: ../src/client/clientauthhandler.cpp:362 msgctxt "ClientAuthHandler|" msgid "Login canceled" msgstr "Login cancelled" +#: ../src/client/clientauthhandler.cpp:420 +msgctxt "ClientAuthHandler|" +msgid "Unencrypted connection cancelled" +msgstr "" + #: ../src/client/clientbacklogmanager.cpp:178 #, qt-format msgctxt "ClientBacklogManager|" @@ -1176,7 +1272,7 @@ msgctxt "ConnectionSettingsPage|" msgid "IRC" msgstr "IRC" -#: ../src/qtui/chatitem.cpp:803 +#: ../src/qtui/chatitem.cpp:800 msgctxt "ContentsChatItem|" msgid "Copy Link Address" msgstr "Copy Link Address" @@ -1396,12 +1492,12 @@ msgctxt "ContextMenuActionProvider|" msgid "Existing Rules" msgstr "Existing Rules" -#: ../src/core/core.cpp:193 +#: ../src/core/core.cpp:191 msgctxt "Core|" msgid "Could not initialize any storage backend! Exiting..." msgstr "Could not initialise any storage backend! Exiting..." -#: ../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" @@ -1409,93 +1505,93 @@ msgid "" "to work." msgstr "Currently, Quassel supports SQLite3 and PostgreSQL. You need to build your\nQt library with the sqlite or postgres plug-in enabled in order for quasselcore\nto work." -#: ../src/core/core.cpp:253 +#: ../src/core/core.cpp:251 msgctxt "Core|" msgid "Calling restoreState() even though active sessions exist!" msgstr "Calling restoreState() even though active sessions exist!" -#: ../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 "Admin user or password not set." -#: ../src/core/core.cpp:293 +#: ../src/core/core.cpp:291 msgctxt "Core|" msgid "Could not setup storage!" msgstr "Could not set-up storage!" -#: ../src/core/core.cpp:298 +#: ../src/core/core.cpp:296 msgctxt "Core|" msgid "Creating admin user..." msgstr "Creating admin user..." -#: ../src/core/core.cpp:451 +#: ../src/core/core.cpp:449 #, qt-format msgctxt "Core|" msgid "Invalid listen address %1" msgstr "Invalid listen address %1" -#: ../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 "Listening for GUI clients on IPv6 %1 port %2 using protocol version %3" -#: ../src/core/core.cpp:469 +#: ../src/core/core.cpp:467 #, qt-format msgctxt "Core|" msgid "Could not open IPv6 interface %1:%2: %3" msgstr "Could not open IPv6 interface %1:%2: %3" -#: ../src/core/core.cpp: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 "Listening for GUI clients on IPv4 %1 port %2 using protocol version %3" -#: ../src/core/core.cpp:488 +#: ../src/core/core.cpp:486 #, qt-format msgctxt "Core|" msgid "Could not open IPv4 interface %1:%2: %3" msgstr "Could not open IPv4 interface %1:%2: %3" -#: ../src/core/core.cpp:496 +#: ../src/core/core.cpp:494 #, qt-format msgctxt "Core|" msgid "Invalid listen address %1, unknown network protocol" msgstr "Invalid listen address %1, unknown network protocol" -#: ../src/core/core.cpp:505 +#: ../src/core/core.cpp:503 msgctxt "Core|" msgid "Could not open any network interfaces to listen on!" msgstr "Could not open any network interfaces to listen on!" -#: ../src/core/core.cpp:545 +#: ../src/core/core.cpp:543 msgctxt "Core|" msgid "Client connected from" msgstr "Client connected from" -#: ../src/core/core.cpp:548 +#: ../src/core/core.cpp:546 msgctxt "Core|" msgid "Closing server for basic setup." msgstr "Closing server for basic set-up." -#: ../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 "Could not initialise session for client:" -#: ../src/core/core.cpp:619 +#: ../src/core/core.cpp:617 msgctxt "Core|" msgid "Could not find a session for client:" msgstr "Could not find a session for client:" @@ -1636,17 +1732,17 @@ msgctxt "CoreAccountSettingsPage|" msgid "Remote Cores" msgstr "Remote Cores" -#: ../src/core/coreauthhandler.cpp:54 ../src/core/coreauthhandler.cpp:90 +#: ../src/core/coreauthhandler.cpp:132 ../src/core/coreauthhandler.cpp:144 msgctxt "CoreAuthHandler|" msgid "Client" msgstr "Client" -#: ../src/core/coreauthhandler.cpp:54 +#: ../src/core/coreauthhandler.cpp:132 msgctxt "CoreAuthHandler|" msgid "too old, rejecting." msgstr "too old, rejecting." -#: ../src/core/coreauthhandler.cpp:55 +#: ../src/core/coreauthhandler.cpp:133 #, qt-format msgctxt "CoreAuthHandler|" msgid "" @@ -1655,44 +1751,44 @@ msgid "" " client." msgstr "" -#: ../src/core/coreauthhandler.cpp:69 +#: ../src/core/coreauthhandler.cpp:144 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 "did not send an init message before trying to login, rejecting." - -#: ../src/core/coreauthhandler.cpp:91 +#: ../src/core/coreauthhandler.cpp:145 msgctxt "CoreAuthHandler|" msgid "" -"Client not initialized!
You need to send an init message before " -"trying to login." -msgstr "Client not initialised!
You need to send an init message before trying to log-in." +"Client not initialized!
You need to send a registration message " +"before trying to login." +msgstr "" -#: ../src/core/coreauthhandler.cpp:105 +#: ../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:146 +#: ../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 "Invalid username or password!
The username/password combination you supplied could not be found in the database." -#: ../src/core/coreauthhandler.cpp:151 +#: ../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" @@ -1902,57 +1998,33 @@ msgctxt "CoreConnection|" msgid "Network is down" msgstr "Network is down" -#: ../src/client/coreconnection.cpp:227 ../src/client/coreconnection.cpp:328 +#: ../src/client/coreconnection.cpp:276 msgctxt "CoreConnection|" msgid "Disconnected" msgstr "Disconnected" -#: ../src/client/coreconnection.cpp:230 -#, qt-format -msgctxt "CoreConnection|" -msgid "Looking up %1..." -msgstr "Looking up %1..." - -#: ../src/client/coreconnection.cpp:233 -#, qt-format -msgctxt "CoreConnection|" -msgid "Connecting to %1..." -msgstr "Connecting to %1..." - -#: ../src/client/coreconnection.cpp:236 -#, qt-format -msgctxt "CoreConnection|" -msgid "Connected to %1" -msgstr "Connected to %1" - -#: ../src/client/coreconnection.cpp:239 -#, qt-format -msgctxt "CoreConnection|" -msgid "Disconnecting from %1..." -msgstr "Disconnecting from %1..." - -#: ../src/client/coreconnection.cpp:363 +#: ../src/client/coreconnection.cpp:311 msgctxt "CoreConnection|" msgid "Disconnected from core." msgstr "Disconnected from core." -#: ../src/client/coreconnection.cpp:501 +#: ../src/client/coreconnection.cpp:449 msgctxt "CoreConnection|" msgid "Receiving session state" msgstr "Receiving session state" -#: ../src/client/coreconnection.cpp:503 +#: ../src/client/coreconnection.cpp:451 #, qt-format msgctxt "CoreConnection|" msgid "Synchronizing to %1..." msgstr "Synchronising to %1..." -#: ../src/client/coreconnection.cpp:539 +#: ../src/client/coreconnection.cpp:487 msgctxt "CoreConnection|" msgid "Receiving network states" msgstr "Receiving network states" -#: ../src/client/coreconnection.cpp:590 +#: ../src/client/coreconnection.cpp:538 #, qt-format msgctxt "CoreConnection|" msgid "Synchronized to %1" @@ -2132,52 +2204,52 @@ msgctxt "CoreInfoDlg|" msgid " %1:%2:%3 (since %4)" msgstr " %1:%2:%3 (since %4)" -#: ../src/core/corenetwork.cpp:167 +#: ../src/core/corenetwork.cpp:168 msgctxt "CoreNetwork|" msgid "Connection failed. Cycling to next Server" msgstr "Connection failed. Cycling to next Server" -#: ../src/core/corenetwork.cpp:175 ../src/core/corenetwork.cpp:176 +#: ../src/core/corenetwork.cpp:176 ../src/core/corenetwork.cpp:177 #, qt-format msgctxt "CoreNetwork|" msgid "Connecting to %1:%2..." msgstr "Connecting to %1:%2..." -#: ../src/core/corenetwork.cpp:228 +#: ../src/core/corenetwork.cpp:234 #, qt-format msgctxt "CoreNetwork|" msgid "Disconnecting. (%1)" msgstr "Disconnecting. (%1)" -#: ../src/core/corenetwork.cpp:228 +#: ../src/core/corenetwork.cpp:234 msgctxt "CoreNetwork|" msgid "Core Shutdown" msgstr "Core Shutdown" -#: ../src/core/corenetwork.cpp:423 +#: ../src/core/corenetwork.cpp:432 #, qt-format msgctxt "CoreNetwork|" msgid "Could not connect to %1 (%2)" msgstr "Could not connect to %1 (%2)" -#: ../src/core/corenetwork.cpp:425 +#: ../src/core/corenetwork.cpp:434 #, qt-format msgctxt "CoreNetwork|" msgid "Connection failure: %1" msgstr "Connection failure: %1" -#: ../src/core/coresession.cpp:227 +#: ../src/core/coresession.cpp:230 msgctxt "CoreSession|" msgid "Client" msgstr "Client" -#: ../src/core/coresession.cpp:227 +#: ../src/core/coresession.cpp:230 #, qt-format msgctxt "CoreSession|" msgid "disconnected (UserId: %1)." msgstr "disconnected (UserId: %1)." -#: ../src/core/coresession.cpp:474 +#: ../src/core/coresession.cpp:477 #, qt-format msgctxt "CoreSession|" msgid "" @@ -2185,41 +2257,78 @@ msgid "" " create network %1!" msgstr "CoreSession::createNetwork(): Got invalid networkId from Core when trying to create network %1!" -#: ../src/core/coresession.cpp:506 +#: ../src/core/coresession.cpp:509 msgctxt "CoreSession|" msgid "" "CoreSession::createNetwork(): Trying to create a network that already " "exists, updating instead!" msgstr "CoreSession::createNetwork(): Trying to create a network that already exists, updating instead!" -#: ../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 "No free and valid nicks in nicklist found. use: /nick to continue" -#: ../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" @@ -2231,38 +2340,38 @@ msgctxt "CoreUserInputHandler|" msgid "sending CTCP-%1 request to %2" msgstr "sending CTCP-%1 request to %2" -#: ../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 "[usage] /delkey deletes the encryption key for nick or channel or just /delkey when in a channel or query." -#: ../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 "No key has been set for %1." -#: ../src/core/coreuserinputhandler.cpp:213 +#: ../src/core/coreuserinputhandler.cpp:216 #, qt-format msgctxt "CoreUserInputHandler|" msgid "The key for %1 has been deleted." msgstr "The key for %1 has been deleted." -#: ../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 " @@ -2271,31 +2380,31 @@ msgid "" "with QCA2 present." msgstr "Error: Setting an encryption key requires Quassel to have been built with support for the Qt Cryptographic Architecture (QCA2) library. Contact your distributor about a Quassel package with QCA2 support, or rebuild Quassel with QCA2 present." -#: ../src/core/coreuserinputhandler.cpp:371 +#: ../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 " @@ -2304,13 +2413,13 @@ msgid "" "with QCA present." msgstr "Error: Setting an encryption key requires Quassel to have been built with support for the Qt Cryptographic Architecture (QCA) library. Contact your distributor about a Quassel package with QCA support, or rebuild Quassel with QCA present." -#: ../src/core/coreuserinputhandler.cpp:556 +#: ../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 " @@ -2318,26 +2427,26 @@ msgid "" "it." msgstr "[usage] /setkey sets the encryption key for nick or channel. /setkey when in a channel or query buffer sets the key for it." -#: ../src/core/coreuserinputhandler.cpp:625 +#: ../src/core/coreuserinputhandler.cpp:628 #, qt-format msgctxt "CoreUserInputHandler|" msgid "The key for %1 has been set." msgstr "The key for %1 has been set." -#: ../src/core/coreuserinputhandler.cpp:654 +#: ../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 "[usage] /delkey deletes the encryption key for nick or channel or just /delkey when in a channel or query." -#: ../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" @@ -2363,6 +2472,17 @@ msgctxt "CreateIdentityDlg|" msgid "Duplicate:" msgstr "Duplicate:" +#: ../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" @@ -2663,7 +2783,6 @@ msgctxt "EventStringifier|" msgid "sending CTCP-%1 request to %2" msgstr "sending CTCP-%1 request to %2" -#. Optional "unknown" in "Received unknown CTCP-FOO request by bar" #: ../src/core/eventstringifier.cpp:717 msgctxt "EventStringifier|" msgid "unknown" @@ -2681,7 +2800,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" @@ -2804,7 +2929,7 @@ msgctxt "HighlightSettingsPage|" msgid "Interface" msgstr "Interface" -#: ../src/qtui/settingspages/highlightsettingspage.cpp:184 +#: ../src/qtui/settingspages/highlightsettingspage.cpp:192 msgctxt "HighlightSettingsPage|" msgid "this shouldn't be empty" msgstr "this shouldn't be empty" @@ -3069,7 +3194,7 @@ msgid "minutes of being idle" msgstr "minutes of being idle" #: ../src/qtui/settingspages/identityeditwidget.ui:399 -#: ../src/qtui/settingspages/identityeditwidget.cpp:238 +#: ../src/qtui/settingspages/identityeditwidget.cpp:244 msgctxt "IdentityEditWidget|" msgid "Advanced" msgstr "Advanced" @@ -3135,16 +3260,16 @@ msgid "Key Type:" msgstr "Key Type:" #: ../src/qtui/settingspages/identityeditwidget.ui:605 -#: ../src/qtui/settingspages/identityeditwidget.cpp:353 -#: ../src/qtui/settingspages/identityeditwidget.cpp:365 +#: ../src/qtui/settingspages/identityeditwidget.cpp:364 +#: ../src/qtui/settingspages/identityeditwidget.cpp:376 msgctxt "IdentityEditWidget|" msgid "No Key loaded" msgstr "No Key loaded" #: ../src/qtui/settingspages/identityeditwidget.ui:625 #: ../src/qtui/settingspages/identityeditwidget.ui:723 -#: ../src/qtui/settingspages/identityeditwidget.cpp:354 -#: ../src/qtui/settingspages/identityeditwidget.cpp:408 +#: ../src/qtui/settingspages/identityeditwidget.cpp:365 +#: ../src/qtui/settingspages/identityeditwidget.cpp:423 msgctxt "IdentityEditWidget|" msgid "Load" msgstr "Load" @@ -3161,8 +3286,8 @@ msgstr "Organisation:" #: ../src/qtui/settingspages/identityeditwidget.ui:663 #: ../src/qtui/settingspages/identityeditwidget.ui:697 -#: ../src/qtui/settingspages/identityeditwidget.cpp:406 -#: ../src/qtui/settingspages/identityeditwidget.cpp:407 +#: ../src/qtui/settingspages/identityeditwidget.cpp:421 +#: ../src/qtui/settingspages/identityeditwidget.cpp:422 msgctxt "IdentityEditWidget|" msgid "No Certificate loaded" msgstr "No Certificate loaded" @@ -3172,40 +3297,40 @@ msgctxt "IdentityEditWidget|" msgid "CommonName:" msgstr "CommonName:" -#: ../src/qtui/settingspages/identityeditwidget.cpp:321 +#: ../src/qtui/settingspages/identityeditwidget.cpp:327 msgctxt "IdentityEditWidget|" msgid "Load a Key" msgstr "Load a Key" -#: ../src/qtui/settingspages/identityeditwidget.cpp:344 +#: ../src/qtui/settingspages/identityeditwidget.cpp:355 msgctxt "IdentityEditWidget|" msgid "Failed to read key" msgstr "" -#: ../src/qtui/settingspages/identityeditwidget.cpp:344 +#: ../src/qtui/settingspages/identityeditwidget.cpp:355 msgctxt "IdentityEditWidget|" msgid "" "Failed to read the key file. It is either incompatible or invalid. Note that" " the key file must not have a passphrase." msgstr "" -#: ../src/qtui/settingspages/identityeditwidget.cpp:359 +#: ../src/qtui/settingspages/identityeditwidget.cpp:370 msgctxt "IdentityEditWidget|" msgid "RSA" msgstr "RSA" -#: ../src/qtui/settingspages/identityeditwidget.cpp:362 +#: ../src/qtui/settingspages/identityeditwidget.cpp:373 msgctxt "IdentityEditWidget|" msgid "DSA" msgstr "DSA" -#: ../src/qtui/settingspages/identityeditwidget.cpp:367 -#: ../src/qtui/settingspages/identityeditwidget.cpp:413 +#: ../src/qtui/settingspages/identityeditwidget.cpp:378 +#: ../src/qtui/settingspages/identityeditwidget.cpp:433 msgctxt "IdentityEditWidget|" msgid "Clear" msgstr "Clear" -#: ../src/qtui/settingspages/identityeditwidget.cpp:379 +#: ../src/qtui/settingspages/identityeditwidget.cpp:390 msgctxt "IdentityEditWidget|" msgid "Load a Certificate" msgstr "Load a Certificate" @@ -3574,7 +3699,7 @@ msgctxt "InputWidget|" msgid "Clear Color" msgstr "Clear Colour" -#: ../src/qtui/inputwidget.cpp:133 +#: ../src/qtui/inputwidget.cpp:136 msgctxt "InputWidget|" msgid "Focus Input Line" msgstr "Focus Input Line" @@ -3621,40 +3746,50 @@ msgstr "Emacs key bindings" #: ../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 "Multi-Line Editing" -#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:144 +#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:160 msgctxt "InputWidgetSettingsPage|" msgid "Show at most" msgstr "Show at most" -#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:170 +#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:186 msgctxt "InputWidgetSettingsPage|" msgid "lines" msgstr "lines" -#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:192 +#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:208 msgctxt "InputWidgetSettingsPage|" msgid "Enable scrollbars" msgstr "Enable scrollbars" -#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:211 +#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:227 msgctxt "InputWidgetSettingsPage|" msgid "Tab Completion" msgstr "Tab Completion" -#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:219 +#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:235 msgctxt "InputWidgetSettingsPage|" msgid "Completion suffix:" msgstr "Completion suffix:" -#: ../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 "" @@ -3694,24 +3829,24 @@ msgctxt "IrcListModel|" msgid "Topic" msgstr "Topic" -#: ../src/client/networkmodel.cpp:914 +#: ../src/client/networkmodel.cpp:953 msgctxt "IrcUserItem|" msgid " is away" msgstr " is away" -#: ../src/client/networkmodel.cpp:929 +#: ../src/client/networkmodel.cpp:968 #, qt-format msgctxt "IrcUserItem|" msgid "idling since %1" msgstr "idling since %1" -#: ../src/client/networkmodel.cpp:932 +#: ../src/client/networkmodel.cpp:971 #, qt-format msgctxt "IrcUserItem|" msgid "login time: %1" msgstr "login time: %1" -#: ../src/client/networkmodel.cpp:935 +#: ../src/client/networkmodel.cpp:974 #, qt-format msgctxt "IrcUserItem|" msgid "server: %1" @@ -3843,7 +3978,7 @@ msgctxt "ItemViewSettingsPage|" msgid "Other activity" msgstr "Other activity" -#: ../src/qtui/knotificationbackend.cpp:130 +#: ../src/qtui/knotificationbackend.cpp:134 #, qt-format msgctxt "KNotificationBackend|" msgid "%n pending highlight(s)" @@ -3930,396 +4065,396 @@ msgctxt "KeySequenceWidget|" msgid "Reassign" msgstr "Reassign" -#: ../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)" msgstr "Quassel Core Version %1
Built: %2
Up %3d%4h%5m (since %6)" -#: ../src/qtui/mainwin.cpp:355 +#: ../src/qtui/mainwin.cpp:358 msgctxt "MainWin|" msgid "General" msgstr "General" -#: ../src/qtui/mainwin.cpp:357 +#: ../src/qtui/mainwin.cpp:360 msgctxt "MainWin|" msgid "&Connect to Core..." msgstr "&Connect to Core..." -#: ../src/qtui/mainwin.cpp:359 +#: ../src/qtui/mainwin.cpp:362 msgctxt "MainWin|" msgid "&Disconnect from Core" msgstr "&Disconnect from Core" -#: ../src/qtui/mainwin.cpp:361 +#: ../src/qtui/mainwin.cpp:364 msgctxt "MainWin|" msgid "Core &Info..." msgstr "Core &Info..." -#: ../src/qtui/mainwin.cpp:363 +#: ../src/qtui/mainwin.cpp:366 msgctxt "MainWin|" msgid "Configure &Networks..." msgstr "Configure &Networks..." -#: ../src/qtui/mainwin.cpp:366 +#: ../src/qtui/mainwin.cpp:369 msgctxt "MainWin|" msgid "&Quit" msgstr "&Quit" -#: ../src/qtui/mainwin.cpp:370 +#: ../src/qtui/mainwin.cpp:373 msgctxt "MainWin|" msgid "&Configure Chat Lists..." msgstr "&Configure Chat Lists..." -#: ../src/qtui/mainwin.cpp:373 +#: ../src/qtui/mainwin.cpp:376 msgctxt "MainWin|" msgid "&Lock Layout" msgstr "&Lock Layout" -#: ../src/qtui/mainwin.cpp:377 +#: ../src/qtui/mainwin.cpp:380 msgctxt "MainWin|" msgid "Show &Search Bar" msgstr "Show &Search Bar" -#: ../src/qtui/mainwin.cpp:379 +#: ../src/qtui/mainwin.cpp:382 msgctxt "MainWin|" msgid "Show Away Log" msgstr "Show Away Log" -#: ../src/qtui/mainwin.cpp:381 +#: ../src/qtui/mainwin.cpp:384 msgctxt "MainWin|" msgid "Show &Menubar" msgstr "Show &Menubar" -#: ../src/qtui/mainwin.cpp:384 +#: ../src/qtui/mainwin.cpp:387 msgctxt "MainWin|" msgid "Show Status &Bar" msgstr "Show Status &Bar" -#: ../src/qtui/mainwin.cpp:390 +#: ../src/qtui/mainwin.cpp:393 msgctxt "MainWin|" msgid "&Full Screen Mode" msgstr "&Fullscreen mode" -#: ../src/qtui/mainwin.cpp:397 +#: ../src/qtui/mainwin.cpp:400 msgctxt "MainWin|" msgid "Configure &Shortcuts..." msgstr "Configure &Shortcuts..." -#: ../src/qtui/mainwin.cpp:403 ../src/qtui/mainwin.cpp:407 +#: ../src/qtui/mainwin.cpp:406 ../src/qtui/mainwin.cpp:410 msgctxt "MainWin|" msgid "&Configure Quassel..." msgstr "&Configure Quassel..." -#: ../src/qtui/mainwin.cpp:413 +#: ../src/qtui/mainwin.cpp:416 msgctxt "MainWin|" msgid "&About Quassel" msgstr "&About Quassel" -#: ../src/qtui/mainwin.cpp:418 +#: ../src/qtui/mainwin.cpp:421 msgctxt "MainWin|" msgid "About &Qt" msgstr "About &Qt" -#: ../src/qtui/mainwin.cpp:422 +#: ../src/qtui/mainwin.cpp:425 msgctxt "MainWin|" msgid "Debug &NetworkModel" msgstr "Debug &NetworkModel" -#: ../src/qtui/mainwin.cpp:424 +#: ../src/qtui/mainwin.cpp:427 msgctxt "MainWin|" msgid "Debug &BufferViewOverlay" msgstr "Debug &BufferViewOverlay" -#: ../src/qtui/mainwin.cpp:426 +#: ../src/qtui/mainwin.cpp:429 msgctxt "MainWin|" msgid "Debug &MessageModel" msgstr "Debug &MessageModel" -#: ../src/qtui/mainwin.cpp:428 +#: ../src/qtui/mainwin.cpp:431 msgctxt "MainWin|" msgid "Debug &HotList" msgstr "Debug &HotList" -#: ../src/qtui/mainwin.cpp:430 +#: ../src/qtui/mainwin.cpp:433 msgctxt "MainWin|" msgid "Debug &Log" msgstr "Debug &Log" -#: ../src/qtui/mainwin.cpp:432 +#: ../src/qtui/mainwin.cpp:435 msgctxt "MainWin|" msgid "Reload Stylesheet" msgstr "Reload Stylesheet" -#: ../src/qtui/mainwin.cpp:435 +#: ../src/qtui/mainwin.cpp:438 msgctxt "MainWin|" msgid "Hide Current Buffer" msgstr "" -#: ../src/qtui/mainwin.cpp:439 +#: ../src/qtui/mainwin.cpp:442 msgctxt "MainWin|" msgid "Navigation" msgstr "Navigation" -#: ../src/qtui/mainwin.cpp:441 +#: ../src/qtui/mainwin.cpp:444 msgctxt "MainWin|" msgid "Jump to hot chat" msgstr "Jump to hot chat" -#: ../src/qtui/mainwin.cpp:453 +#: ../src/qtui/mainwin.cpp:456 msgctxt "MainWin|" msgid "Set Quick Access #0" msgstr "Set Quick Access #0" -#: ../src/qtui/mainwin.cpp:455 +#: ../src/qtui/mainwin.cpp:458 msgctxt "MainWin|" msgid "Set Quick Access #1" msgstr "Set Quick Access #1" -#: ../src/qtui/mainwin.cpp:457 +#: ../src/qtui/mainwin.cpp:460 msgctxt "MainWin|" msgid "Set Quick Access #2" msgstr "Set Quick Access #2" -#: ../src/qtui/mainwin.cpp:459 +#: ../src/qtui/mainwin.cpp:462 msgctxt "MainWin|" msgid "Set Quick Access #3" msgstr "Set Quick Access #3" -#: ../src/qtui/mainwin.cpp:461 +#: ../src/qtui/mainwin.cpp:464 msgctxt "MainWin|" msgid "Set Quick Access #4" msgstr "Set Quick Access #4" -#: ../src/qtui/mainwin.cpp:463 +#: ../src/qtui/mainwin.cpp:466 msgctxt "MainWin|" msgid "Set Quick Access #5" msgstr "Set Quick Access #5" -#: ../src/qtui/mainwin.cpp:465 +#: ../src/qtui/mainwin.cpp:468 msgctxt "MainWin|" msgid "Set Quick Access #6" msgstr "Set Quick Access #6" -#: ../src/qtui/mainwin.cpp:467 +#: ../src/qtui/mainwin.cpp:470 msgctxt "MainWin|" msgid "Set Quick Access #7" msgstr "Set Quick Access #7" -#: ../src/qtui/mainwin.cpp:469 +#: ../src/qtui/mainwin.cpp:472 msgctxt "MainWin|" msgid "Set Quick Access #8" msgstr "Set Quick Access #8" -#: ../src/qtui/mainwin.cpp:471 +#: ../src/qtui/mainwin.cpp:474 msgctxt "MainWin|" msgid "Set Quick Access #9" msgstr "Set Quick Access #9" -#: ../src/qtui/mainwin.cpp:474 +#: ../src/qtui/mainwin.cpp:477 msgctxt "MainWin|" msgid "Quick Access #0" msgstr "Quick Access #0" -#: ../src/qtui/mainwin.cpp:476 +#: ../src/qtui/mainwin.cpp:479 msgctxt "MainWin|" msgid "Quick Access #1" msgstr "Quick Access #1" -#: ../src/qtui/mainwin.cpp:478 +#: ../src/qtui/mainwin.cpp:481 msgctxt "MainWin|" msgid "Quick Access #2" msgstr "Quick Access #2" -#: ../src/qtui/mainwin.cpp:480 +#: ../src/qtui/mainwin.cpp:483 msgctxt "MainWin|" msgid "Quick Access #3" msgstr "Quick Access #3" -#: ../src/qtui/mainwin.cpp:482 +#: ../src/qtui/mainwin.cpp:485 msgctxt "MainWin|" msgid "Quick Access #4" msgstr "Quick Access #4" -#: ../src/qtui/mainwin.cpp:484 +#: ../src/qtui/mainwin.cpp:487 msgctxt "MainWin|" msgid "Quick Access #5" msgstr "Quick Access #5" -#: ../src/qtui/mainwin.cpp:486 +#: ../src/qtui/mainwin.cpp:489 msgctxt "MainWin|" msgid "Quick Access #6" msgstr "Quick Access #6" -#: ../src/qtui/mainwin.cpp:488 +#: ../src/qtui/mainwin.cpp:491 msgctxt "MainWin|" msgid "Quick Access #7" msgstr "Quick Access #7" -#: ../src/qtui/mainwin.cpp:490 +#: ../src/qtui/mainwin.cpp:493 msgctxt "MainWin|" msgid "Quick Access #8" msgstr "Quick Access #8" -#: ../src/qtui/mainwin.cpp:492 +#: ../src/qtui/mainwin.cpp:495 msgctxt "MainWin|" msgid "Quick Access #9" msgstr "Quick Access #9" -#: ../src/qtui/mainwin.cpp:496 +#: ../src/qtui/mainwin.cpp:499 msgctxt "MainWin|" msgid "Activate Next Chat List" msgstr "Activate Next Chat List" -#: ../src/qtui/mainwin.cpp:498 +#: ../src/qtui/mainwin.cpp:501 msgctxt "MainWin|" msgid "Activate Previous Chat List" msgstr "Activate Previous Chat List" -#: ../src/qtui/mainwin.cpp:500 +#: ../src/qtui/mainwin.cpp:503 msgctxt "MainWin|" msgid "Go to Next Chat" msgstr "Go to Next Chat" -#: ../src/qtui/mainwin.cpp:502 +#: ../src/qtui/mainwin.cpp:505 msgctxt "MainWin|" msgid "Go to Previous Chat" msgstr "Go to Previous Chat" -#: ../src/qtui/mainwin.cpp:511 +#: ../src/qtui/mainwin.cpp:514 msgctxt "MainWin|" msgid "&File" msgstr "&File" -#: ../src/qtui/mainwin.cpp:524 +#: ../src/qtui/mainwin.cpp:527 msgctxt "MainWin|" msgid "&Networks" msgstr "&Networks" -#: ../src/qtui/mainwin.cpp:530 +#: ../src/qtui/mainwin.cpp:533 msgctxt "MainWin|" msgid "&View" msgstr "&View" -#: ../src/qtui/mainwin.cpp:531 +#: ../src/qtui/mainwin.cpp:534 msgctxt "MainWin|" msgid "&Chat Lists" msgstr "&Chat Lists" -#: ../src/qtui/mainwin.cpp:533 +#: ../src/qtui/mainwin.cpp:536 msgctxt "MainWin|" msgid "&Toolbars" msgstr "&Toolbars" -#: ../src/qtui/mainwin.cpp:547 +#: ../src/qtui/mainwin.cpp:550 msgctxt "MainWin|" msgid "&Settings" msgstr "&Settings" -#: ../src/qtui/mainwin.cpp:556 +#: ../src/qtui/mainwin.cpp:559 msgctxt "MainWin|" msgid "&Help" msgstr "&Help" -#: ../src/qtui/mainwin.cpp:564 +#: ../src/qtui/mainwin.cpp:567 msgctxt "MainWin|" msgid "Debug" msgstr "Debug" -#: ../src/qtui/mainwin.cpp:840 +#: ../src/qtui/mainwin.cpp:843 msgctxt "MainWin|" msgid "Nicks" msgstr "Nicks" -#: ../src/qtui/mainwin.cpp:849 +#: ../src/qtui/mainwin.cpp:852 msgctxt "MainWin|" msgid "Show Nick List" msgstr "Show Nick List" -#: ../src/qtui/mainwin.cpp:862 +#: ../src/qtui/mainwin.cpp:865 msgctxt "MainWin|" msgid "Chat Monitor" msgstr "Chat Monitor" -#: ../src/qtui/mainwin.cpp:874 +#: ../src/qtui/mainwin.cpp:877 msgctxt "MainWin|" msgid "Show Chat Monitor" msgstr "Show Chat Monitor" -#: ../src/qtui/mainwin.cpp:880 +#: ../src/qtui/mainwin.cpp:883 msgctxt "MainWin|" msgid "Inputline" msgstr "Inputline" -#: ../src/qtui/mainwin.cpp:889 +#: ../src/qtui/mainwin.cpp:892 msgctxt "MainWin|" msgid "Show Input Line" msgstr "Show Input Line" -#: ../src/qtui/mainwin.cpp:904 +#: ../src/qtui/mainwin.cpp:907 msgctxt "MainWin|" msgid "Topic" msgstr "Topic" -#: ../src/qtui/mainwin.cpp:916 +#: ../src/qtui/mainwin.cpp:919 msgctxt "MainWin|" msgid "Show Topic Line" msgstr "Show Topic Line" -#: ../src/qtui/mainwin.cpp:1010 +#: ../src/qtui/mainwin.cpp:1013 msgctxt "MainWin|" msgid "Main Toolbar" msgstr "Main Toolbar" -#: ../src/qtui/mainwin.cpp:1053 +#: ../src/qtui/mainwin.cpp:1074 msgctxt "MainWin|" msgid "Connected to core." msgstr "Connected to core." -#: ../src/qtui/mainwin.cpp:1152 +#: ../src/qtui/mainwin.cpp:1173 msgctxt "MainWin|" msgid "Not connected to core." msgstr "Not connected to core." -#: ../src/qtui/mainwin.cpp:1170 ../src/qtui/mainwin.cpp:1180 +#: ../src/qtui/mainwin.cpp:1191 ../src/qtui/mainwin.cpp:1201 msgctxt "MainWin|" msgid "Unencrypted Connection" msgstr "Unencrypted Connection" -#: ../src/qtui/mainwin.cpp:1170 +#: ../src/qtui/mainwin.cpp:1191 msgctxt "MainWin|" msgid "Your client does not support SSL encryption" msgstr "Your client does not support SSL encryption" -#: ../src/qtui/mainwin.cpp:1172 ../src/qtui/mainwin.cpp:1182 +#: ../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 "Sensitive data, like passwords, will be transmitted unencrypted to your Quassel core." -#: ../src/qtui/mainwin.cpp:1180 +#: ../src/qtui/mainwin.cpp:1201 msgctxt "MainWin|" msgid "Your core does not support SSL encryption" msgstr "Your core does not support SSL encryption" -#: ../src/qtui/mainwin.cpp:1198 ../src/qtui/mainwin.cpp:1219 +#: ../src/qtui/mainwin.cpp:1219 ../src/qtui/mainwin.cpp:1240 msgctxt "MainWin|" msgid "Untrusted Security Certificate" msgstr "Untrusted Security Certificate" -#: ../src/qtui/mainwin.cpp:1199 +#: ../src/qtui/mainwin.cpp:1220 #, qt-format msgctxt "MainWin|" msgid "" @@ -4327,33 +4462,33 @@ msgid "" "following reasons:" msgstr "The SSL certificate provided by the core at %1 is untrusted for the following reasons:" -#: ../src/qtui/mainwin.cpp:1202 +#: ../src/qtui/mainwin.cpp:1223 msgctxt "MainWin|" msgid "Continue" msgstr "Continue" -#: ../src/qtui/mainwin.cpp:1203 +#: ../src/qtui/mainwin.cpp:1224 msgctxt "MainWin|" msgid "Show Certificate" msgstr "Show Certificate" -#: ../src/qtui/mainwin.cpp:1220 +#: ../src/qtui/mainwin.cpp:1241 msgctxt "MainWin|" msgid "" "Would you like to accept this certificate forever without being prompted?" msgstr "Would you like to accept this certificate forever without being prompted?" -#: ../src/qtui/mainwin.cpp:1222 +#: ../src/qtui/mainwin.cpp:1243 msgctxt "MainWin|" msgid "Current Session Only" msgstr "Current Session Only" -#: ../src/qtui/mainwin.cpp:1223 +#: ../src/qtui/mainwin.cpp:1244 msgctxt "MainWin|" msgid "Forever" msgstr "Forever" -#: ../src/qtui/mainwin.cpp:1234 +#: ../src/qtui/mainwin.cpp:1255 msgctxt "MainWin|" msgid "Core Connection Error" msgstr "Core Connection Error" @@ -4382,7 +4517,7 @@ msgid_plural "Do you really want to paste %n line(s)?" msgstr[0] "Do you really want to paste %n line?" msgstr[1] "Do you really want to paste %n lines?" -#: ../src/uisupport/multilineedit.cpp:727 +#: ../src/uisupport/multilineedit.cpp:731 msgctxt "MultiLineEdit|" msgid "Paste Protection" msgstr "Paste Protection" @@ -4447,35 +4582,35 @@ msgctxt "NetworkEditDlg|" msgid "Add Network" msgstr "Add Network" -#: ../src/client/networkmodel.cpp:213 +#: ../src/client/networkmodel.cpp:216 ../src/client/networkmodel.cpp:219 #, qt-format msgctxt "NetworkItem|" msgid "Server: %1" msgstr "Server: %1" -#: ../src/client/networkmodel.cpp:214 +#: ../src/client/networkmodel.cpp:221 #, qt-format msgctxt "NetworkItem|" msgid "Users: %1" msgstr "Users: %1" -#: ../src/client/networkmodel.cpp:217 +#: ../src/client/networkmodel.cpp:224 #, qt-format msgctxt "NetworkItem|" msgid "Lag: %1 msecs" msgstr "Lag: %1 msecs" -#: ../src/client/networkmodel.cpp:963 +#: ../src/client/networkmodel.cpp:1002 msgctxt "NetworkModel|" msgid "Chat" msgstr "Chat" -#: ../src/client/networkmodel.cpp:963 +#: ../src/client/networkmodel.cpp:1002 msgctxt "NetworkModel|" msgid "Topic" msgstr "Topic" -#: ../src/client/networkmodel.cpp:963 +#: ../src/client/networkmodel.cpp:1002 msgctxt "NetworkModel|" msgid "Nick Count" msgstr "Nick Count" @@ -5093,30 +5228,46 @@ msgctxt "Quassel::secondsToString()|" msgid "sec" msgstr "sec" -#: ../src/client/networkmodel.cpp:482 +#: ../src/client/networkmodel.cpp:497 #, qt-format msgctxt "QueryBufferItem|" msgid "Query with %1" msgstr "Query with %1" -#: ../src/client/networkmodel.cpp:500 +#: ../src/client/networkmodel.cpp:515 #, qt-format msgctxt "QueryBufferItem|" msgid "idling since %1" msgstr "idling since %1" -#: ../src/client/networkmodel.cpp:503 +#: ../src/client/networkmodel.cpp:518 #, qt-format msgctxt "QueryBufferItem|" msgid "login time: %1" msgstr "login time: %1" -#: ../src/client/networkmodel.cpp:506 +#: ../src/client/networkmodel.cpp:521 #, qt-format msgctxt "QueryBufferItem|" msgid "server: %1" msgstr "server: %1" +#: ../src/qtui/ui/receivefiledlg.ui:14 +msgctxt "ReceiveFileDlg|" +msgid "Incoming File Transfer" +msgstr "" + +#: ../src/qtui/receivefiledlg.cpp:35 +#, qt-format +msgctxt "ReceiveFileDlg|" +msgid "%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" @@ -5148,7 +5299,7 @@ msgid "Server address:" msgstr "Server address:" #: ../src/qtui/settingspages/servereditdlg.ui:45 -#: ../src/qtui/settingspages/servereditdlg.ui:227 +#: ../src/qtui/settingspages/servereditdlg.ui:181 msgctxt "ServerEditDlg|" msgid "Port:" msgstr "Port:" @@ -5168,69 +5319,42 @@ msgctxt "ServerEditDlg|" msgid "Advanced" msgstr "Advanced" -#: ../src/qtui/settingspages/servereditdlg.ui:140 -msgctxt "ServerEditDlg|" -msgid "SSL Version:" -msgstr "SSL Version:" - -#: ../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 "Do not change unless you're going to connect to a server not supporting SSLv3!" - -#: ../src/qtui/settingspages/servereditdlg.ui:151 -msgctxt "ServerEditDlg|" -msgid "SSLv3 (default)" -msgstr "SSLv3 (default)" - -#: ../src/qtui/settingspages/servereditdlg.ui:156 -msgctxt "ServerEditDlg|" -msgid "SSLv2" -msgstr "SSLv2" - -#: ../src/qtui/settingspages/servereditdlg.ui:161 -msgctxt "ServerEditDlg|" -msgid "TLSv1" -msgstr "TLSv1" - -#: ../src/qtui/settingspages/servereditdlg.ui:171 +#: ../src/qtui/settingspages/servereditdlg.ui:125 msgctxt "ServerEditDlg|" msgid "Use a Proxy" msgstr "Use a Proxy" -#: ../src/qtui/settingspages/servereditdlg.ui:188 +#: ../src/qtui/settingspages/servereditdlg.ui:142 msgctxt "ServerEditDlg|" msgid "Proxy Type:" msgstr "Proxy Type:" -#: ../src/qtui/settingspages/servereditdlg.ui:196 +#: ../src/qtui/settingspages/servereditdlg.ui:150 msgctxt "ServerEditDlg|" msgid "Socks 5" msgstr "Socks 5" -#: ../src/qtui/settingspages/servereditdlg.ui:201 +#: ../src/qtui/settingspages/servereditdlg.ui:155 msgctxt "ServerEditDlg|" msgid "HTTP" msgstr "HTTP" -#: ../src/qtui/settingspages/servereditdlg.ui:213 +#: ../src/qtui/settingspages/servereditdlg.ui:167 msgctxt "ServerEditDlg|" msgid "Proxy Host:" msgstr "Proxy Host:" -#: ../src/qtui/settingspages/servereditdlg.ui:220 +#: ../src/qtui/settingspages/servereditdlg.ui:174 msgctxt "ServerEditDlg|" msgid "localhost" msgstr "localhost" -#: ../src/qtui/settingspages/servereditdlg.ui:251 +#: ../src/qtui/settingspages/servereditdlg.ui:205 msgctxt "ServerEditDlg|" msgid "Proxy Username:" msgstr "Proxy Username:" -#: ../src/qtui/settingspages/servereditdlg.ui:261 +#: ../src/qtui/settingspages/servereditdlg.ui:215 msgctxt "ServerEditDlg|" msgid "Proxy Password:" msgstr "Proxy Password:" @@ -5372,7 +5496,7 @@ msgctxt "ShortcutsSettingsPage|" msgid "Shortcuts" msgstr "Shortcuts" -#: ../src/common/signalproxy.cpp:736 +#: ../src/common/signalproxy.cpp:770 msgctxt "SignalProxy|" msgid "Disconnecting" msgstr "Disconnecting" @@ -5455,8 +5579,7 @@ msgid "" "network" msgstr "A list of IRC channels you will join automatically after connecting to the network" -#: ../src/qtui/snorenotificationbackend.cpp:61 -#: ../src/qtui/snorenotificationbackend.cpp:100 +#: ../src/qtui/snorenotificationbackend.cpp:60 msgctxt "SnoreNotificationBackend|" msgid "Private Message" msgstr "" @@ -5607,7 +5730,7 @@ msgctxt "SslInfoDlg|" msgid "%1 to %2" msgstr "%1 to %2" -#: ../src/client/networkmodel.h:150 +#: ../src/client/networkmodel.h:151 msgctxt "StatusBufferItem|" msgid "Status Buffer" msgstr "Status Buffer" @@ -5810,13 +5933,13 @@ msgctxt "TopicWidget|" msgid "..." msgstr "..." -#: ../src/qtui/topicwidget.cpp:120 +#: ../src/qtui/topicwidget.cpp:121 ../src/qtui/topicwidget.cpp:127 #, qt-format msgctxt "TopicWidget|" msgid "Users: %1" msgstr "Users: %1" -#: ../src/qtui/topicwidget.cpp:121 +#: ../src/qtui/topicwidget.cpp:122 ../src/qtui/topicwidget.cpp:128 #, qt-format msgctxt "TopicWidget|" msgid "Lag: %1 msecs" @@ -5865,114 +5988,114 @@ msgstr "Topic Widget" #. 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 "%1" #. Action Message -#: ../src/uisupport/uistyle.cpp:671 +#: ../src/uisupport/uistyle.cpp:675 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "%DN%1%DN %2" msgstr "%DN%1%DN %2" #. 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 "You are now known as %DN%1%DN" -#: ../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 "%DN%1%DN is now known as %DN%2%DN" #. Mode Message -#: ../src/uisupport/uistyle.cpp:680 +#: ../src/uisupport/uistyle.cpp:684 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "User mode: %DM%1%DM" msgstr "User mode: %DM%1%DM" -#: ../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 "Mode %DM%1%DM by %DN%2%DN" #. 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 "%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC" #. 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 "%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC" #. 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 "%DN%1%DN %DH(%2@%3)%DH has quit" #. 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 "%DN%1%DN has kicked %DN%2%DN from %DC%3%DC" #. Day Change Message -#: ../src/uisupport/uistyle.cpp:719 +#: ../src/uisupport/uistyle.cpp:723 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "{Day changed to %1}" msgstr "{Day changed to %1}" -#: ../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 "Netsplit between %DH%1%DH and %DH%2%DH ended. Users joined: " -#: ../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 "%DN%1%DN (%2 more)" -#: ../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 "Netsplit between %DH%1%DH and %DH%2%DH. Users quit: " -#: ../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 "[%1]" -#: ../src/uisupport/uistyle.cpp:806 +#: ../src/uisupport/uistyle.cpp:810 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "<%1>" msgstr "<%1>" -#: ../src/client/networkmodel.cpp:786 +#: ../src/client/networkmodel.cpp:825 #, qt-format msgctxt "UserCategoryItem|" msgid "%n Owner(s)" @@ -5980,7 +6103,7 @@ msgid_plural "%n Owner(s)" msgstr[0] "%n Owner" msgstr[1] "%n Owners" -#: ../src/client/networkmodel.cpp:788 +#: ../src/client/networkmodel.cpp:827 #, qt-format msgctxt "UserCategoryItem|" msgid "%n Admin(s)" @@ -5988,7 +6111,7 @@ msgid_plural "%n Admin(s)" msgstr[0] "%n Admin" msgstr[1] "%n Admins" -#: ../src/client/networkmodel.cpp:790 +#: ../src/client/networkmodel.cpp:829 #, qt-format msgctxt "UserCategoryItem|" msgid "%n Operator(s)" @@ -5996,7 +6119,7 @@ msgid_plural "%n Operator(s)" msgstr[0] "%n Operator" msgstr[1] "%n Operators" -#: ../src/client/networkmodel.cpp:792 +#: ../src/client/networkmodel.cpp:831 #, qt-format msgctxt "UserCategoryItem|" msgid "%n Half-Op(s)" @@ -6004,7 +6127,7 @@ msgid_plural "%n Half-Op(s)" msgstr[0] "%n Half-Op" msgstr[1] "%n Half-Ops" -#: ../src/client/networkmodel.cpp:794 +#: ../src/client/networkmodel.cpp:833 #, qt-format msgctxt "UserCategoryItem|" msgid "%n Voiced" @@ -6012,7 +6135,7 @@ msgid_plural "%n Voiced" msgstr[0] "%n Voiced" msgstr[1] "%n Voiced" -#: ../src/client/networkmodel.cpp:796 +#: ../src/client/networkmodel.cpp:835 #, qt-format msgctxt "UserCategoryItem|" msgid "%n User(s)"