X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=po%2Fen_GB.po;h=5a76486536cd657952f74c5970bf892d2c910fae;hp=f7295c63a1d5de99367d81046b33cb0d18b07e9b;hb=60bf8c5270a523172fd4e4dd4768058af612439f;hpb=03c4c31e9eeb5040697881be976024aad68c4588 diff --git a/po/en_GB.po b/po/en_GB.po index f7295c63..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-04-29 08:28+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:185 +#: ../src/qtui/aboutdlg.cpp:206 msgctxt "AboutDlg|" msgid "" "Special thanks goes to:
" msgstr "Special thanks goes to:
 John \"nox\" Hand
for the original Quassel icon - The All-Seeing Eye
 The Oxygen Team
for creating all the artwork you see throughout Quassel
 Qt Software formerly known as Trolltech
for creating Qt and Qtopia, and for sponsoring development of QuasselTopia with Greenphones and more
for keeping Qt alive, and for sponsoring development of Quassel Mobile with N810s
" -#: ../src/core/abstractsqlstorage.cpp:124 +#: ../src/core/abstractsqlstorage.cpp:127 #, qt-format msgctxt "AbstractSqlStorage|" msgid "" "Installed Schema (version %1) is not up to date. Upgrading to version %2..." msgstr "Installed Schema (version %1) is not up to date. Upgrading to version %2..." -#: ../src/core/abstractsqlstorage.cpp:126 +#: ../src/core/abstractsqlstorage.cpp:129 msgctxt "AbstractSqlStorage|" msgid "Upgrade failed..." msgstr "Upgrade failed..." @@ -431,7 +423,7 @@ msgctxt "BacklogSettingsPage|" msgid "Backlog Fetching" msgstr "Backlog Fetching" -#: ../src/client/networkmodel.cpp:386 +#: ../src/client/networkmodel.cpp:401 #, qt-format msgctxt "BufferItem|" msgid "

%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:565 +#: ../src/client/networkmodel.cpp:583 ../src/client/networkmodel.cpp:585 #, qt-format msgctxt "ChannelBufferItem|" msgid "Channel %1" msgstr "Channel %1" -#: ../src/client/networkmodel.cpp:568 +#: ../src/client/networkmodel.cpp:589 #, qt-format msgctxt "ChannelBufferItem|" msgid "Users: %1" msgstr "Users: %1" -#: ../src/client/networkmodel.cpp:572 +#: ../src/client/networkmodel.cpp:593 #, qt-format msgctxt "ChannelBufferItem|" msgid "Mode: %1" msgstr "Mode: %1" -#: ../src/client/networkmodel.cpp:583 +#: ../src/client/networkmodel.cpp:608 #, qt-format msgctxt "ChannelBufferItem|" msgid "Topic: %1" msgstr "Topic: %1" -#: ../src/client/networkmodel.cpp:588 +#: ../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:591 +#: ../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:803 +#: ../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,11 +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:65 +#: ../src/client/clientauthhandler.cpp:471 +msgctxt "ClientAuthHandler|" +msgid "Unencrypted connection canceled" +msgstr "Unencrypted connection cancelled" + +#: ../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:99 +#, qt-format +msgctxt "ClientAuthHandler|" +msgid "Looking up %1..." +msgstr "Looking up %1..." + +#: ../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 "" +"Incompatible Quassel Core!
None of the protocols this client " +"speaks are supported by the core you are trying to connect to." +msgstr "" + +#: ../src/client/clientauthhandler.cpp:239 +msgctxt "ClientAuthHandler|" +msgid "Core speaks none of the protocols we support" +msgstr "" + +#: ../src/client/clientauthhandler.cpp:254 +#, qt-format +msgctxt "ClientAuthHandler|" +msgid "" +"The Quassel Core you are trying to connect to is too old!
We need " +"at least protocol v%1, but the core speaks v%2 only." +msgstr "" + +#: ../src/client/clientauthhandler.cpp:256 +msgctxt "ClientAuthHandler|" +msgid "Incompatible protocol version, connection to core refused" +msgstr "" + +#: ../src/client/clientauthhandler.cpp:278 +msgctxt "ClientAuthHandler|" +msgid "Synchronizing to core..." +msgstr "Synchronising to core..." + +#: ../src/client/clientauthhandler.cpp:293 +msgctxt "ClientAuthHandler|" +msgid "The core refused connection from this client" +msgstr "" + +#: ../src/client/clientauthhandler.cpp:357 +msgctxt "ClientAuthHandler|" +msgid "Logging in..." +msgstr "Logging in..." + +#: ../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|" @@ -1120,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" @@ -1340,12 +1492,12 @@ msgctxt "ContextMenuActionProvider|" msgid "Existing Rules" msgstr "Existing Rules" -#: ../src/core/core.cpp:190 +#: ../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:191 +#: ../src/core/core.cpp:192 msgctxt "Core|" msgid "" "Currently, Quassel supports SQLite3 and PostgreSQL. You need to build your\n" @@ -1353,147 +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:249 +#: ../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:295 +#: ../src/core/core.cpp:285 +msgctxt "Core|" +msgid "Core is already configured! Not configuring again..." +msgstr "" + +#: ../src/core/core.cpp:288 msgctxt "Core|" msgid "Admin user or password not set." msgstr "Admin user or password not set." -#: ../src/core/core.cpp:298 +#: ../src/core/core.cpp:291 msgctxt "Core|" msgid "Could not setup storage!" msgstr "Could not set-up storage!" -#: ../src/core/core.cpp:302 +#: ../src/core/core.cpp:296 msgctxt "Core|" msgid "Creating admin user..." msgstr "Creating admin user..." -#: ../src/core/core.cpp:434 +#: ../src/core/core.cpp:449 #, qt-format msgctxt "Core|" msgid "Invalid listen address %1" msgstr "Invalid listen address %1" -#: ../src/core/core.cpp:443 +#: ../src/core/core.cpp:458 #, qt-format msgctxt "Core|" msgid "Listening for GUI clients on IPv6 %1 port %2 using protocol version %3" msgstr "Listening for GUI clients on IPv6 %1 port %2 using protocol version %3" -#: ../src/core/core.cpp:452 +#: ../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:460 +#: ../src/core/core.cpp:475 #, qt-format msgctxt "Core|" msgid "Listening for GUI clients on IPv4 %1 port %2 using protocol version %3" msgstr "Listening for GUI clients on IPv4 %1 port %2 using protocol version %3" -#: ../src/core/core.cpp:471 +#: ../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:479 +#: ../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:488 +#: ../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:527 +#: ../src/core/core.cpp:543 msgctxt "Core|" msgid "Client connected from" msgstr "Client connected from" -#: ../src/core/core.cpp:530 +#: ../src/core/core.cpp:546 msgctxt "Core|" msgid "Closing server for basic setup." msgstr "Closing server for basic set-up." -#: ../src/core/core.cpp:547 -msgctxt "Core|" -msgid "Antique client trying to connect... refusing." -msgstr "Antique client trying to connect... refusing." - -#: ../src/core/core.cpp:560 -#, qt-format -msgctxt "Core|" -msgid "" -"Your Quassel Client is too old!
This core needs at least " -"client/core protocol version %1.
Please consider upgrading your client." -msgstr "Your Quassel Client is too old!
This core needs at least client/core protocol version %1.
Please consider upgrading your client." - -#: ../src/core/core.cpp:564 ../src/core/core.cpp:656 ../src/core/core.cpp:682 -msgctxt "Core|" -msgid "Client" -msgstr "Client" - -#: ../src/core/core.cpp:564 -msgctxt "Core|" -msgid "too old, rejecting." -msgstr "too old, rejecting." - -#: ../src/core/core.cpp:582 -#, qt-format -msgctxt "Core|" -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/core/core.cpp:636 +#: ../src/core/core.cpp:558 msgctxt "Core|" -msgid "Starting TLS for Client:" -msgstr "Starting TLS for Client:" - -#: ../src/core/core.cpp:654 -msgctxt "Core|" -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." - -#: ../src/core/core.cpp:656 -msgctxt "Core|" -msgid "did not send an init message before trying to login, rejecting." -msgstr "did not send an init message before trying to login, rejecting." - -#: ../src/core/core.cpp:676 -msgctxt "Core|" -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/core.cpp:682 -#, qt-format -msgctxt "Core|" -msgid "initialized and authenticated successfully as \"%1\" (UserId: %2)." -msgstr "initialised and authenticated successfully as \"%1\" (UserId: %2)." - -#: ../src/core/core.cpp:695 -msgctxt "Core|" -msgid "Non-authed client disconnected." -msgstr "Non-authed client disconnected." +msgid "Non-authed client disconnected:" +msgstr "" -#: ../src/core/core.cpp:724 +#: ../src/core/core.cpp:590 msgctxt "Core|" msgid "Could not initialize session for client:" msgstr "Could not initialise session for client:" -#: ../src/core/core.cpp:750 +#: ../src/core/core.cpp:617 msgctxt "Core|" msgid "Could not find a session for client:" msgstr "Could not find a session for client:" @@ -1634,17 +1732,74 @@ msgctxt "CoreAccountSettingsPage|" msgid "Remote Cores" msgstr "Remote Cores" +#: ../src/core/coreauthhandler.cpp:132 ../src/core/coreauthhandler.cpp:144 +msgctxt "CoreAuthHandler|" +msgid "Client" +msgstr "Client" + +#: ../src/core/coreauthhandler.cpp:132 +msgctxt "CoreAuthHandler|" +msgid "too old, rejecting." +msgstr "too old, rejecting." + +#: ../src/core/coreauthhandler.cpp:133 +#, qt-format +msgctxt "CoreAuthHandler|" +msgid "" +"Your Quassel Client is too old!
This core needs at least " +"client/core protocol version %1 (got: %2).
Please consider upgrading your" +" client." +msgstr "" + +#: ../src/core/coreauthhandler.cpp:144 +msgctxt "CoreAuthHandler|" +msgid "did not send a registration message before trying to login, rejecting." +msgstr "" + +#: ../src/core/coreauthhandler.cpp:145 +msgctxt "CoreAuthHandler|" +msgid "" +"Client not initialized!
You need to send a registration message " +"before trying to login." +msgstr "" + +#: ../src/core/coreauthhandler.cpp:162 +msgctxt "CoreAuthHandler|" +msgid "" +"SSL is required!
You need to use SSL in order to connect to this " +"core." +msgstr "" + +#: ../src/core/coreauthhandler.cpp:202 +msgctxt "CoreAuthHandler|" +msgid "" +"Invalid username or password!
The username/password combination " +"you supplied could not be found in the database." +msgstr "Invalid username or password!
The username/password combination you supplied could not be found in the database." + +#: ../src/core/coreauthhandler.cpp:207 +#, qt-format +msgctxt "CoreAuthHandler|" +msgid "" +"Client %1 initialized and authenticated successfully as \"%2\" (UserId: %3)." +msgstr "" + +#: ../src/core/coreauthhandler.cpp:226 +msgctxt "CoreAuthHandler|" +msgid "Starting encryption for Client:" +msgstr "" + #: ../src/qtui/coreconfigwizard.cpp:69 msgctxt "CoreConfigWizard|" msgid "Core Configuration Wizard" msgstr "Core Configuration Wizard" -#: ../src/qtui/coreconfigwizard.cpp:103 +#: ../src/qtui/coreconfigwizard.cpp:98 msgctxt "CoreConfigWizard|" msgid "Your core has been successfully configured. Logging you in..." msgstr "Your core has been successfully configured. Logging you in..." -#: ../src/qtui/coreconfigwizard.cpp:112 +#: ../src/qtui/coreconfigwizard.cpp:107 #, qt-format msgctxt "CoreConfigWizard|" msgid "" @@ -1652,7 +1807,7 @@ msgid "" "over." msgstr "Core configuration failed:
%1
Press Next to start over." -#: ../src/qtui/coreconfigwizard.cpp:131 +#: ../src/qtui/coreconfigwizard.cpp:126 msgctxt "CoreConfigWizard|" msgid "" "Your are now logged into your freshly configured Quassel Core!
Please " @@ -1701,46 +1856,46 @@ msgctxt "CoreConfigWizardIntroPage|" msgid "This wizard will guide you through the setup of your Quassel Core." msgstr "This wizard will guide you through the set-up of your Quassel Core." -#: ../src/qtui/coreconfigwizard.cpp:167 +#: ../src/qtui/coreconfigwizard.cpp:162 msgctxt "CoreConfigWizardPages::AdminUserPage|" msgid "Create Admin User" msgstr "Create Admin User" -#: ../src/qtui/coreconfigwizard.cpp:168 +#: ../src/qtui/coreconfigwizard.cpp:163 msgctxt "CoreConfigWizardPages::AdminUserPage|" msgid "" "First, we will create a user on the core. This first user will have " "administrator privileges." msgstr "First, we will create a user on the core. This first user will have administrator privileges." -#: ../src/qtui/coreconfigwizard.cpp:150 +#: ../src/qtui/coreconfigwizard.cpp:145 msgctxt "CoreConfigWizardPages::IntroPage|" msgid "Introduction" msgstr "Introduction" -#: ../src/qtui/coreconfigwizard.cpp:203 +#: ../src/qtui/coreconfigwizard.cpp:198 msgctxt "CoreConfigWizardPages::StorageSelectionPage|" msgid "Select Storage Backend" msgstr "Select Storage Backend" -#: ../src/qtui/coreconfigwizard.cpp:204 +#: ../src/qtui/coreconfigwizard.cpp:199 msgctxt "CoreConfigWizardPages::StorageSelectionPage|" msgid "" "Please select a database backend for the Quassel Core storage to store the " "backlog and other data in." msgstr "Please select a database backend for the Quassel Core storage to store the backlog and other data in." -#: ../src/qtui/coreconfigwizard.cpp:305 +#: ../src/qtui/coreconfigwizard.cpp:300 msgctxt "CoreConfigWizardPages::StorageSelectionPage|" msgid "Connection Properties" msgstr "Connection Properties" -#: ../src/qtui/coreconfigwizard.cpp:347 +#: ../src/qtui/coreconfigwizard.cpp:342 msgctxt "CoreConfigWizardPages::SyncPage|" msgid "Storing Your Settings" msgstr "Storing Your Settings" -#: ../src/qtui/coreconfigwizard.cpp:348 +#: ../src/qtui/coreconfigwizard.cpp:343 msgctxt "CoreConfigWizardPages::SyncPage|" msgid "" "Your settings are now stored in the core, and you will be logged in " @@ -1838,103 +1993,38 @@ msgctxt "CoreConnectDlg|" msgid "Connect to Core" msgstr "Connect to Core" -#: ../src/client/coreconnection.cpp:190 +#: ../src/client/coreconnection.cpp:193 msgctxt "CoreConnection|" msgid "Network is down" msgstr "Network is down" -#: ../src/client/coreconnection.cpp:225 ../src/client/coreconnection.cpp:365 +#: ../src/client/coreconnection.cpp:276 msgctxt "CoreConnection|" msgid "Disconnected" msgstr "Disconnected" -#: ../src/client/coreconnection.cpp:228 -#, qt-format -msgctxt "CoreConnection|" -msgid "Looking up %1..." -msgstr "Looking up %1..." - -#: ../src/client/coreconnection.cpp:231 ../src/client/coreconnection.cpp:518 -#, qt-format -msgctxt "CoreConnection|" -msgid "Connecting to %1..." -msgstr "Connecting to %1..." - -#: ../src/client/coreconnection.cpp:234 ../src/client/coreconnection.cpp:658 -#, qt-format -msgctxt "CoreConnection|" -msgid "Connected to %1" -msgstr "Connected to %1" - -#: ../src/client/coreconnection.cpp:237 -#, qt-format -msgctxt "CoreConnection|" -msgid "Disconnecting from %1..." -msgstr "Disconnecting from %1..." - -#: ../src/client/coreconnection.cpp:303 -msgctxt "CoreConnection|" -msgid "" -"The Quassel Core you try to connect to is too old! Please consider " -"upgrading." -msgstr "The Quassel Core you try to connect to is too old! Please consider upgrading." - -#: ../src/client/coreconnection.cpp:340 -msgctxt "CoreConnection|" -msgid "Invalid data received from core" -msgstr "Invalid data received from core" - -#: ../src/client/coreconnection.cpp:403 +#: ../src/client/coreconnection.cpp:311 msgctxt "CoreConnection|" msgid "Disconnected from core." msgstr "Disconnected from core." -#: ../src/client/coreconnection.cpp:496 ../src/client/coreconnection.cpp:590 -#: ../src/client/coreconnection.cpp:639 -msgctxt "CoreConnection|" -msgid "Unencrypted connection canceled" -msgstr "Unencrypted connection cancelled" - -#: ../src/client/coreconnection.cpp:533 -msgctxt "CoreConnection|" -msgid "Synchronizing to core..." -msgstr "Synchronising to core..." - -#: ../src/client/coreconnection.cpp:556 -#, qt-format -msgctxt "CoreConnection|" -msgid "" -"The Quassel Core you are trying to connect to is too old!
Need at " -"least core/client protocol v%1 to connect." -msgstr "The Quassel Core you are trying to connect to is too old!
Need at least core/client protocol v%1 to connect." - -#: ../src/client/coreconnection.cpp:682 -msgctxt "CoreConnection|" -msgid "Logging in..." -msgstr "Logging in..." - -#: ../src/client/coreconnection.cpp:687 -msgctxt "CoreConnection|" -msgid "Login canceled" -msgstr "Login cancelled" - -#: ../src/client/coreconnection.cpp:716 +#: ../src/client/coreconnection.cpp:449 msgctxt "CoreConnection|" msgid "Receiving session state" msgstr "Receiving session state" -#: ../src/client/coreconnection.cpp:718 +#: ../src/client/coreconnection.cpp:451 #, qt-format msgctxt "CoreConnection|" msgid "Synchronizing to %1..." msgstr "Synchronising to %1..." -#: ../src/client/coreconnection.cpp:744 +#: ../src/client/coreconnection.cpp:487 msgctxt "CoreConnection|" msgid "Receiving network states" msgstr "Receiving network states" -#: ../src/client/coreconnection.cpp:798 +#: ../src/client/coreconnection.cpp:538 #, qt-format msgctxt "CoreConnection|" msgid "Synchronized to %1" @@ -2114,35 +2204,35 @@ msgctxt "CoreInfoDlg|" msgid " %1:%2:%3 (since %4)" msgstr " %1:%2:%3 (since %4)" -#: ../src/core/corenetwork.cpp:166 +#: ../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:174 ../src/core/corenetwork.cpp:175 +#: ../src/core/corenetwork.cpp:176 ../src/core/corenetwork.cpp:177 #, qt-format msgctxt "CoreNetwork|" msgid "Connecting to %1:%2..." msgstr "Connecting to %1:%2..." -#: ../src/core/corenetwork.cpp:227 +#: ../src/core/corenetwork.cpp:234 #, qt-format msgctxt "CoreNetwork|" msgid "Disconnecting. (%1)" msgstr "Disconnecting. (%1)" -#: ../src/core/corenetwork.cpp:227 +#: ../src/core/corenetwork.cpp:234 msgctxt "CoreNetwork|" msgid "Core Shutdown" msgstr "Core Shutdown" -#: ../src/core/corenetwork.cpp:409 +#: ../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:411 +#: ../src/core/corenetwork.cpp:434 #, qt-format msgctxt "CoreNetwork|" msgid "Connection failure: %1" @@ -2159,7 +2249,7 @@ msgctxt "CoreSession|" msgid "disconnected (UserId: %1)." msgstr "disconnected (UserId: %1)." -#: ../src/core/coresession.cpp:491 +#: ../src/core/coresession.cpp:477 #, qt-format msgctxt "CoreSession|" msgid "" @@ -2167,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:523 +#: ../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." +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" @@ -2213,28 +2340,38 @@ msgctxt "CoreUserInputHandler|" msgid "sending CTCP-%1 request to %2" msgstr "sending CTCP-%1 request to %2" -#: ../src/core/coreuserinputhandler.cpp:199 +#: ../src/core/coreuserinputhandler.cpp:193 +#: ../src/core/coreuserinputhandler.cpp:364 +#: ../src/core/coreuserinputhandler.cpp:609 +#: ../src/core/coreuserinputhandler.cpp:647 +msgctxt "CoreUserInputHandler|" +msgid "" +"Error: QCA provider plugin not found. It is usually provided by the qca-ossl" +" plugin." +msgstr "" + +#: ../src/core/coreuserinputhandler.cpp:204 msgctxt "CoreUserInputHandler|" msgid "" "[usage] /delkey deletes the encryption key for nick or " "channel or just /delkey when in a channel or query." msgstr "[usage] /delkey deletes the encryption key for nick or channel or just /delkey when in a channel or query." -#: ../src/core/coreuserinputhandler.cpp:206 -#: ../src/core/coreuserinputhandler.cpp:648 +#: ../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:211 +#: ../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:215 -#: ../src/core/coreuserinputhandler.cpp:656 +#: ../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 " @@ -2243,27 +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:367 +#: ../src/core/coreuserinputhandler.cpp:374 msgctxt "CoreUserInputHandler|" msgid "" -"[usage] /keyx [] Initiates a DH1080 key exchange with the " -"target." +"[usage] /keyx [] Initiates a DH1080 key exchange with the target." +msgstr "" + +#: ../src/core/coreuserinputhandler.cpp:381 +msgctxt "CoreUserInputHandler|" +msgid "It is only possible to exchange keys in a query buffer." msgstr "" -#: ../src/core/coreuserinputhandler.cpp:379 +#: ../src/core/coreuserinputhandler.cpp:391 #, qt-format msgctxt "CoreUserInputHandler|" msgid "Failed to initiate key exchange with %1." msgstr "" -#: ../src/core/coreuserinputhandler.cpp:384 +#: ../src/core/coreuserinputhandler.cpp:396 #, qt-format msgctxt "CoreUserInputHandler|" msgid "Initiated key exchange with %1." msgstr "" -#: ../src/core/coreuserinputhandler.cpp:388 -#: ../src/core/coreuserinputhandler.cpp:616 +#: ../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 " @@ -2272,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:546 +#: ../src/core/coreuserinputhandler.cpp:559 #, qt-format msgctxt "CoreUserInputHandler|" msgid "Starting query with %1" msgstr "" -#: ../src/core/coreuserinputhandler.cpp:604 +#: ../src/core/coreuserinputhandler.cpp:619 msgctxt "CoreUserInputHandler|" msgid "" "[usage] /setkey sets the encryption key for nick or " @@ -2286,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:613 +#: ../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:640 +#: ../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:652 +#: ../src/core/coreuserinputhandler.cpp:669 #, qt-format msgctxt "CoreUserInputHandler|" -msgid "The key for %1 is %2" -msgstr "Homepage for %1 is %2" +msgid "The key for %1 is %2:%3" +msgstr "" -#: ../src/core/coreuserinputhandler.cpp:780 +#: ../src/core/coreuserinputhandler.cpp:797 #, qt-format msgctxt "CoreUserInputHandler|" msgid "[Error] Could not encrypt your message: %1" @@ -2331,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" @@ -2426,230 +2578,235 @@ msgctxt "DockManagerNotificationBackend::ConfigWidget|" msgid "Mark dockmanager entry" msgstr "" -#: ../src/core/eventstringifier.cpp:219 ../src/core/eventstringifier.cpp:365 +#: ../src/core/eventstringifier.cpp:224 ../src/core/eventstringifier.cpp:370 msgctxt "EventStringifier|" msgid "[Whois] " msgstr "[Whois] %1" -#: ../src/core/eventstringifier.cpp:234 +#: ../src/core/eventstringifier.cpp:239 #, qt-format msgctxt "EventStringifier|" msgid "%1 invited you to channel %2" msgstr "%1 invited you to channel %2" -#: ../src/core/eventstringifier.cpp:336 +#: ../src/core/eventstringifier.cpp:341 #, qt-format msgctxt "EventStringifier|" msgid "%1 has changed topic for %2 to: \"%3\"" msgstr "%1 has changed topic for %2 to: \"%3\"" -#: ../src/core/eventstringifier.cpp:342 +#: ../src/core/eventstringifier.cpp:347 #, qt-format msgctxt "EventStringifier|" msgid "[Operwall] %1: %2" msgstr "" -#: ../src/core/eventstringifier.cpp:350 +#: ../src/core/eventstringifier.cpp:355 msgctxt "EventStringifier|" msgid "" "Received non-RFC-compliant RPL_ISUPPORT: this can lead to unexpected " "behavior!" msgstr "Received non RFC compliant RPL_ISUPPORT: this can lead to unexpected behaviour!" -#: ../src/core/eventstringifier.cpp:379 +#: ../src/core/eventstringifier.cpp:384 #, qt-format msgctxt "EventStringifier|" msgid "%1 is away: \"%2\"" msgstr "%1 is away: \"%2\"" -#: ../src/core/eventstringifier.cpp:386 +#: ../src/core/eventstringifier.cpp:391 msgctxt "EventStringifier|" msgid "You are no longer marked as being away" msgstr "" -#: ../src/core/eventstringifier.cpp:394 +#: ../src/core/eventstringifier.cpp:399 msgctxt "EventStringifier|" msgid "You have been marked as being away" msgstr "" -#: ../src/core/eventstringifier.cpp:416 +#: ../src/core/eventstringifier.cpp:421 #, qt-format msgctxt "EventStringifier|" msgid "[Whois] %1 is %2 (%3)" msgstr "[Whois] %1 is %2 (%3)" -#: ../src/core/eventstringifier.cpp:432 +#: ../src/core/eventstringifier.cpp:437 #, qt-format msgctxt "EventStringifier|" msgid "[Whois] %1 is online via %2 (%3)" msgstr "%1 is online via %2 (%3)" -#: ../src/core/eventstringifier.cpp:434 +#: ../src/core/eventstringifier.cpp:439 #, qt-format msgctxt "EventStringifier|" msgid "[Whowas] %1 was online via %2 (%3)" msgstr "[Whowas] %1 was %2 (%3)" -#: ../src/core/eventstringifier.cpp:444 +#: ../src/core/eventstringifier.cpp:449 #, qt-format msgctxt "EventStringifier|" msgid "[Whowas] %1 was %2@%3 (%4)" msgstr "" -#: ../src/core/eventstringifier.cpp:453 +#: ../src/core/eventstringifier.cpp:458 #, qt-format msgctxt "EventStringifier|" msgid "[Who] End of /WHO list for %1" msgstr "[Who] End of /WHO list for %1" -#: ../src/core/eventstringifier.cpp:465 +#: ../src/core/eventstringifier.cpp:470 #, qt-format msgctxt "EventStringifier|" msgid "[Whois] %1 is logged in since %2" msgstr "[Whois] %1 is logged in since %2" -#: ../src/core/eventstringifier.cpp:469 +#: ../src/core/eventstringifier.cpp:474 #, qt-format msgctxt "EventStringifier|" msgid "[Whois] %1 is idling for %2 (since %3)" msgstr "[Whois] %1 is idling for %2 (%3)" -#: ../src/core/eventstringifier.cpp:479 +#: ../src/core/eventstringifier.cpp:484 msgctxt "EventStringifier|" msgid "[Whois] End of /WHOIS list" msgstr "[Who] End of /WHO list for %1" -#: ../src/core/eventstringifier.cpp:502 +#: ../src/core/eventstringifier.cpp:507 #, qt-format msgctxt "EventStringifier|" msgid "[Whois] %1 is a user on channels: %2" msgstr "[Whois] %1 is a user on channels: %2" -#: ../src/core/eventstringifier.cpp:504 +#: ../src/core/eventstringifier.cpp:509 #, qt-format msgctxt "EventStringifier|" msgid "[Whois] %1 has voice on channels: %2" msgstr "[Whois] %1 has voice on channels: %2" -#: ../src/core/eventstringifier.cpp:506 +#: ../src/core/eventstringifier.cpp:511 #, qt-format msgctxt "EventStringifier|" msgid "[Whois] %1 is an operator on channels: %2" msgstr "[Whois] %1 is an operator on channels: %2" -#: ../src/core/eventstringifier.cpp:527 +#: ../src/core/eventstringifier.cpp:532 #, qt-format msgctxt "EventStringifier|" msgid "Channel %1 has %2 users. Topic is: \"%3\"" msgstr "Channel %1 has %2 users. Topic is: %3" -#: ../src/core/eventstringifier.cpp:535 +#: ../src/core/eventstringifier.cpp:540 msgctxt "EventStringifier|" msgid "End of channel list" msgstr "End of channel list" -#: ../src/core/eventstringifier.cpp:553 +#: ../src/core/eventstringifier.cpp:558 #, qt-format msgctxt "EventStringifier|" msgid "Homepage for %1 is %2" msgstr "Homepage for %1 is %2" -#: ../src/core/eventstringifier.cpp:570 +#: ../src/core/eventstringifier.cpp:575 #, qt-format msgctxt "EventStringifier|" msgid "Channel %1 created on %2" msgstr "Channel %1 created on %2" -#: ../src/core/eventstringifier.cpp:584 +#: ../src/core/eventstringifier.cpp:589 #, qt-format msgctxt "EventStringifier|" msgid "[Whois] %1 is authed as %2" msgstr "[Whois] %1 is away: \"%2\"" -#: ../src/core/eventstringifier.cpp:587 +#: ../src/core/eventstringifier.cpp:592 #, qt-format msgctxt "EventStringifier|" msgid "[Whowas] %1 was authed as %2" msgstr "" -#: ../src/core/eventstringifier.cpp:596 +#: ../src/core/eventstringifier.cpp:601 #, qt-format msgctxt "EventStringifier|" msgid "No topic is set for %1." msgstr "No topic is set for %1." -#: ../src/core/eventstringifier.cpp:604 +#: ../src/core/eventstringifier.cpp:609 #, qt-format msgctxt "EventStringifier|" msgid "Topic for %1 is \"%2\"" msgstr "Topic for %1 is \"%2\"" -#: ../src/core/eventstringifier.cpp:616 +#: ../src/core/eventstringifier.cpp:621 #, qt-format msgctxt "EventStringifier|" msgid "Topic set by %1 on %2" msgstr "Topic set by %1 on %2" -#: ../src/core/eventstringifier.cpp:629 +#: ../src/core/eventstringifier.cpp:634 #, qt-format msgctxt "EventStringifier|" msgid "%1 has been invited to %2" msgstr "%1 has been invited to %2" -#: ../src/core/eventstringifier.cpp:637 +#: ../src/core/eventstringifier.cpp:642 #, qt-format msgctxt "EventStringifier|" msgid "[Who] %1" msgstr "[Who] %1" -#: ../src/core/eventstringifier.cpp:644 +#: ../src/core/eventstringifier.cpp:649 msgctxt "EventStringifier|" msgid "End of /WHOWAS" msgstr "" -#: ../src/core/eventstringifier.cpp:654 +#: ../src/core/eventstringifier.cpp:659 #, qt-format msgctxt "EventStringifier|" msgid "Nick %1 contains illegal characters" msgstr "Nick %1 contains illegal characters" -#: ../src/core/eventstringifier.cpp:664 +#: ../src/core/eventstringifier.cpp:669 #, qt-format msgctxt "EventStringifier|" msgid "Nick already in use: %1" msgstr "Nick already in use: %1" -#: ../src/core/eventstringifier.cpp:674 +#: ../src/core/eventstringifier.cpp:679 #, qt-format msgctxt "EventStringifier|" msgid "Nick/channel is temporarily unavailable: %1" msgstr "Nick/channel is temporarily unavailable: %1" -#: ../src/core/eventstringifier.cpp:697 +#: ../src/core/eventstringifier.cpp:702 #, qt-format msgctxt "EventStringifier|" msgid "sending CTCP-%1 request to %2" msgstr "sending CTCP-%1 request to %2" -#. Optional "unknown" in "Received unknown CTCP-FOO request by bar" -#: ../src/core/eventstringifier.cpp:712 +#: ../src/core/eventstringifier.cpp:717 msgctxt "EventStringifier|" msgid "unknown" msgstr "" -#: ../src/core/eventstringifier.cpp:713 +#: ../src/core/eventstringifier.cpp:718 #, qt-format msgctxt "EventStringifier|" msgid "Received %1CTCP-%2 request by %3" msgstr "" -#: ../src/core/eventstringifier.cpp:716 +#: ../src/core/eventstringifier.cpp:721 #, qt-format msgctxt "EventStringifier|" msgid "Received CTCP-%1 answer from %2: %3" msgstr "" -#: ../src/core/eventstringifier.cpp:731 +#: ../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" @@ -2772,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" @@ -2783,7 +2940,7 @@ msgid "highlight rule" msgstr "highlight rule" #: ../src/qtui/settingspages/identitiessettingspage.ui:31 -#: ../src/qtui/settingspages/identitiessettingspage.cpp:369 +#: ../src/qtui/settingspages/identitiessettingspage.cpp:370 msgctxt "IdentitiesSettingsPage|" msgid "Rename Identity" msgstr "Rename Identity" @@ -2819,55 +2976,55 @@ msgctxt "IdentitiesSettingsPage|" msgid "Identities" msgstr "Identities" -#: ../src/qtui/settingspages/identitiessettingspage.cpp:204 +#: ../src/qtui/settingspages/identitiessettingspage.cpp:205 msgctxt "IdentitiesSettingsPage|" msgid "" "The following problems need to be corrected before your changes can be " "applied:
    " msgstr "The following problems need to be corrected before your changes can be applied:
      " -#: ../src/qtui/settingspages/identitiessettingspage.cpp:205 +#: ../src/qtui/settingspages/identitiessettingspage.cpp:206 msgctxt "IdentitiesSettingsPage|" msgid "
    • All identities need an identity name set
      • " msgstr "
    • All identities need an identity name set
      • " -#: ../src/qtui/settingspages/identitiessettingspage.cpp:206 +#: ../src/qtui/settingspages/identitiessettingspage.cpp:207 msgctxt "IdentitiesSettingsPage|" msgid "
    • Every identity needs at least one nickname defined
      • " msgstr "
    • Every identity needs at least one nickname defined
      • " -#: ../src/qtui/settingspages/identitiessettingspage.cpp:207 +#: ../src/qtui/settingspages/identitiessettingspage.cpp:208 msgctxt "IdentitiesSettingsPage|" msgid "
    • You need to specify a real name for every identity
      • " msgstr "
    • You need to specify a real name for every identity
      • " -#: ../src/qtui/settingspages/identitiessettingspage.cpp:208 +#: ../src/qtui/settingspages/identitiessettingspage.cpp:209 msgctxt "IdentitiesSettingsPage|" msgid "
    • You need to specify an ident for every identity
      • " msgstr "
    • You need to specify an ident for every identity
      • " -#: ../src/qtui/settingspages/identitiessettingspage.cpp:209 +#: ../src/qtui/settingspages/identitiessettingspage.cpp:210 msgctxt "IdentitiesSettingsPage|" msgid "
    " msgstr "
" -#: ../src/qtui/settingspages/identitiessettingspage.cpp:210 +#: ../src/qtui/settingspages/identitiessettingspage.cpp:211 msgctxt "IdentitiesSettingsPage|" msgid "One or more identities are invalid" msgstr "One or more identities are invalid" -#: ../src/qtui/settingspages/identitiessettingspage.cpp:355 +#: ../src/qtui/settingspages/identitiessettingspage.cpp:356 msgctxt "IdentitiesSettingsPage|" msgid "Delete Identity?" msgstr "Delete Identity?" -#: ../src/qtui/settingspages/identitiessettingspage.cpp:356 +#: ../src/qtui/settingspages/identitiessettingspage.cpp:357 #, qt-format msgctxt "IdentitiesSettingsPage|" msgid "Do you really want to delete identity \"%1\"?" msgstr "Do you really want to delete identity \"%1\"?" -#: ../src/qtui/settingspages/identitiessettingspage.cpp:370 +#: ../src/qtui/settingspages/identitiessettingspage.cpp:371 #, qt-format msgctxt "IdentitiesSettingsPage|" msgid "Please enter a new name for the identity \"%1\"!" @@ -3037,7 +3194,7 @@ msgid "minutes of being idle" msgstr "minutes of being idle" #: ../src/qtui/settingspages/identityeditwidget.ui:399 -#: ../src/qtui/settingspages/identityeditwidget.cpp:237 +#: ../src/qtui/settingspages/identityeditwidget.cpp:244 msgctxt "IdentityEditWidget|" msgid "Advanced" msgstr "Advanced" @@ -3103,16 +3260,16 @@ msgid "Key Type:" msgstr "Key Type:" #: ../src/qtui/settingspages/identityeditwidget.ui:605 -#: ../src/qtui/settingspages/identityeditwidget.cpp:351 -#: ../src/qtui/settingspages/identityeditwidget.cpp:363 +#: ../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:352 -#: ../src/qtui/settingspages/identityeditwidget.cpp:406 +#: ../src/qtui/settingspages/identityeditwidget.cpp:365 +#: ../src/qtui/settingspages/identityeditwidget.cpp:423 msgctxt "IdentityEditWidget|" msgid "Load" msgstr "Load" @@ -3129,8 +3286,8 @@ msgstr "Organisation:" #: ../src/qtui/settingspages/identityeditwidget.ui:663 #: ../src/qtui/settingspages/identityeditwidget.ui:697 -#: ../src/qtui/settingspages/identityeditwidget.cpp:404 -#: ../src/qtui/settingspages/identityeditwidget.cpp:405 +#: ../src/qtui/settingspages/identityeditwidget.cpp:421 +#: ../src/qtui/settingspages/identityeditwidget.cpp:422 msgctxt "IdentityEditWidget|" msgid "No Certificate loaded" msgstr "No Certificate loaded" @@ -3140,28 +3297,40 @@ msgctxt "IdentityEditWidget|" msgid "CommonName:" msgstr "CommonName:" -#: ../src/qtui/settingspages/identityeditwidget.cpp:320 +#: ../src/qtui/settingspages/identityeditwidget.cpp:327 msgctxt "IdentityEditWidget|" msgid "Load a Key" msgstr "Load a Key" -#: ../src/qtui/settingspages/identityeditwidget.cpp:357 +#: ../src/qtui/settingspages/identityeditwidget.cpp:355 +msgctxt "IdentityEditWidget|" +msgid "Failed to read key" +msgstr "" + +#: ../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:370 msgctxt "IdentityEditWidget|" msgid "RSA" msgstr "RSA" -#: ../src/qtui/settingspages/identityeditwidget.cpp:360 +#: ../src/qtui/settingspages/identityeditwidget.cpp:373 msgctxt "IdentityEditWidget|" msgid "DSA" msgstr "DSA" -#: ../src/qtui/settingspages/identityeditwidget.cpp:365 -#: ../src/qtui/settingspages/identityeditwidget.cpp:411 +#: ../src/qtui/settingspages/identityeditwidget.cpp:378 +#: ../src/qtui/settingspages/identityeditwidget.cpp:433 msgctxt "IdentityEditWidget|" msgid "Clear" msgstr "Clear" -#: ../src/qtui/settingspages/identityeditwidget.cpp:377 +#: ../src/qtui/settingspages/identityeditwidget.cpp:390 msgctxt "IdentityEditWidget|" msgid "Load a Certificate" msgstr "Load a Certificate" @@ -3445,92 +3614,92 @@ msgctxt "InputWidget|" msgid "Form" msgstr "Form" -#: ../src/qtui/inputwidget.cpp:73 +#: ../src/qtui/inputwidget.cpp:74 msgctxt "InputWidget|" msgid "White" msgstr "White" -#: ../src/qtui/inputwidget.cpp:73 +#: ../src/qtui/inputwidget.cpp:74 msgctxt "InputWidget|" msgid "Black" msgstr "Black" -#: ../src/qtui/inputwidget.cpp:73 +#: ../src/qtui/inputwidget.cpp:74 msgctxt "InputWidget|" msgid "Dark blue" msgstr "Dark blue" -#: ../src/qtui/inputwidget.cpp:73 +#: ../src/qtui/inputwidget.cpp:74 msgctxt "InputWidget|" msgid "Dark green" msgstr "Dark green" -#: ../src/qtui/inputwidget.cpp:73 +#: ../src/qtui/inputwidget.cpp:74 msgctxt "InputWidget|" msgid "Red" msgstr "Red" -#: ../src/qtui/inputwidget.cpp:73 +#: ../src/qtui/inputwidget.cpp:74 msgctxt "InputWidget|" msgid "Dark red" msgstr "Dark red" -#: ../src/qtui/inputwidget.cpp:73 +#: ../src/qtui/inputwidget.cpp:74 msgctxt "InputWidget|" msgid "Dark magenta" msgstr "Dark magenta" -#: ../src/qtui/inputwidget.cpp:73 +#: ../src/qtui/inputwidget.cpp:74 msgctxt "InputWidget|" msgid "Orange" msgstr "Orange" -#: ../src/qtui/inputwidget.cpp:74 +#: ../src/qtui/inputwidget.cpp:75 msgctxt "InputWidget|" msgid "Yellow" msgstr "Yellow" -#: ../src/qtui/inputwidget.cpp:74 +#: ../src/qtui/inputwidget.cpp:75 msgctxt "InputWidget|" msgid "Green" msgstr "Green" -#: ../src/qtui/inputwidget.cpp:74 +#: ../src/qtui/inputwidget.cpp:75 msgctxt "InputWidget|" msgid "Dark cyan" msgstr "Dark cyan" -#: ../src/qtui/inputwidget.cpp:74 +#: ../src/qtui/inputwidget.cpp:75 msgctxt "InputWidget|" msgid "Cyan" msgstr "Cyan" -#: ../src/qtui/inputwidget.cpp:74 +#: ../src/qtui/inputwidget.cpp:75 msgctxt "InputWidget|" msgid "Blue" msgstr "Blue" -#: ../src/qtui/inputwidget.cpp:74 +#: ../src/qtui/inputwidget.cpp:75 msgctxt "InputWidget|" msgid "Magenta" msgstr "Magenta" -#: ../src/qtui/inputwidget.cpp:74 +#: ../src/qtui/inputwidget.cpp:75 msgctxt "InputWidget|" msgid "Dark gray" msgstr "Dark gray" -#: ../src/qtui/inputwidget.cpp:74 +#: ../src/qtui/inputwidget.cpp:75 msgctxt "InputWidget|" msgid "Light gray" msgstr "Light gray" -#: ../src/qtui/inputwidget.cpp:84 ../src/qtui/inputwidget.cpp:85 +#: ../src/qtui/inputwidget.cpp:85 ../src/qtui/inputwidget.cpp:86 msgctxt "InputWidget|" msgid "Clear Color" msgstr "Clear Colour" -#: ../src/qtui/inputwidget.cpp:132 +#: ../src/qtui/inputwidget.cpp:136 msgctxt "InputWidget|" msgid "Focus Input Line" msgstr "Focus Input Line" @@ -3577,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 "" @@ -3650,24 +3829,24 @@ msgctxt "IrcListModel|" msgid "Topic" msgstr "Topic" -#: ../src/client/networkmodel.cpp:911 +#: ../src/client/networkmodel.cpp:953 msgctxt "IrcUserItem|" msgid " is away" msgstr " is away" -#: ../src/client/networkmodel.cpp:926 +#: ../src/client/networkmodel.cpp:968 #, qt-format msgctxt "IrcUserItem|" msgid "idling since %1" msgstr "idling since %1" -#: ../src/client/networkmodel.cpp:929 +#: ../src/client/networkmodel.cpp:971 #, qt-format msgctxt "IrcUserItem|" msgid "login time: %1" msgstr "login time: %1" -#: ../src/client/networkmodel.cpp:932 +#: ../src/client/networkmodel.cpp:974 #, qt-format msgctxt "IrcUserItem|" msgid "server: %1" @@ -3799,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)" @@ -3886,379 +4065,396 @@ msgctxt "KeySequenceWidget|" msgid "Reassign" msgstr "Reassign" -#: ../src/qtui/mainwin.cpp:350 +#: ../src/common/protocols/legacy/legacypeer.cpp:136 +msgctxt "LegacyPeer|" +msgid "Invalid handshake message!" +msgstr "" + +#: ../src/common/protocols/legacy/legacypeer.cpp:207 +#, qt-format +msgctxt "LegacyPeer|" +msgid "Unknown protocol message of type %1" +msgstr "" + +#: ../src/common/protocols/legacy/legacypeer.cpp:256 +#, qt-format +msgctxt "LegacyPeer|" +msgid "Quassel Core Version %1
Built: %2
Up %3d%4h%5m (since %6)" +msgstr "Quassel Core Version %1
Built: %2
Up %3d%4h%5m (since %6)" + +#: ../src/qtui/mainwin.cpp:358 msgctxt "MainWin|" msgid "General" msgstr "General" -#: ../src/qtui/mainwin.cpp:352 +#: ../src/qtui/mainwin.cpp:360 msgctxt "MainWin|" msgid "&Connect to Core..." msgstr "&Connect to Core..." -#: ../src/qtui/mainwin.cpp:354 +#: ../src/qtui/mainwin.cpp:362 msgctxt "MainWin|" msgid "&Disconnect from Core" msgstr "&Disconnect from Core" -#: ../src/qtui/mainwin.cpp:356 +#: ../src/qtui/mainwin.cpp:364 msgctxt "MainWin|" msgid "Core &Info..." msgstr "Core &Info..." -#: ../src/qtui/mainwin.cpp:358 +#: ../src/qtui/mainwin.cpp:366 msgctxt "MainWin|" msgid "Configure &Networks..." msgstr "Configure &Networks..." -#: ../src/qtui/mainwin.cpp:361 +#: ../src/qtui/mainwin.cpp:369 msgctxt "MainWin|" msgid "&Quit" msgstr "&Quit" -#: ../src/qtui/mainwin.cpp:365 +#: ../src/qtui/mainwin.cpp:373 msgctxt "MainWin|" msgid "&Configure Chat Lists..." msgstr "&Configure Chat Lists..." -#: ../src/qtui/mainwin.cpp:368 +#: ../src/qtui/mainwin.cpp:376 msgctxt "MainWin|" msgid "&Lock Layout" msgstr "&Lock Layout" -#: ../src/qtui/mainwin.cpp:372 +#: ../src/qtui/mainwin.cpp:380 msgctxt "MainWin|" msgid "Show &Search Bar" msgstr "Show &Search Bar" -#: ../src/qtui/mainwin.cpp:374 +#: ../src/qtui/mainwin.cpp:382 msgctxt "MainWin|" msgid "Show Away Log" msgstr "Show Away Log" -#: ../src/qtui/mainwin.cpp:376 +#: ../src/qtui/mainwin.cpp:384 msgctxt "MainWin|" msgid "Show &Menubar" msgstr "Show &Menubar" -#: ../src/qtui/mainwin.cpp:379 +#: ../src/qtui/mainwin.cpp:387 msgctxt "MainWin|" msgid "Show Status &Bar" msgstr "Show Status &Bar" -#: ../src/qtui/mainwin.cpp:385 +#: ../src/qtui/mainwin.cpp:393 msgctxt "MainWin|" msgid "&Full Screen Mode" msgstr "&Fullscreen mode" -#: ../src/qtui/mainwin.cpp:392 +#: ../src/qtui/mainwin.cpp:400 msgctxt "MainWin|" msgid "Configure &Shortcuts..." msgstr "Configure &Shortcuts..." -#: ../src/qtui/mainwin.cpp:398 ../src/qtui/mainwin.cpp:402 +#: ../src/qtui/mainwin.cpp:406 ../src/qtui/mainwin.cpp:410 msgctxt "MainWin|" msgid "&Configure Quassel..." msgstr "&Configure Quassel..." -#: ../src/qtui/mainwin.cpp:408 +#: ../src/qtui/mainwin.cpp:416 msgctxt "MainWin|" msgid "&About Quassel" msgstr "&About Quassel" -#: ../src/qtui/mainwin.cpp:413 +#: ../src/qtui/mainwin.cpp:421 msgctxt "MainWin|" msgid "About &Qt" msgstr "About &Qt" -#: ../src/qtui/mainwin.cpp:417 +#: ../src/qtui/mainwin.cpp:425 msgctxt "MainWin|" msgid "Debug &NetworkModel" msgstr "Debug &NetworkModel" -#: ../src/qtui/mainwin.cpp:419 +#: ../src/qtui/mainwin.cpp:427 msgctxt "MainWin|" msgid "Debug &BufferViewOverlay" msgstr "Debug &BufferViewOverlay" -#: ../src/qtui/mainwin.cpp:421 +#: ../src/qtui/mainwin.cpp:429 msgctxt "MainWin|" msgid "Debug &MessageModel" msgstr "Debug &MessageModel" -#: ../src/qtui/mainwin.cpp:423 +#: ../src/qtui/mainwin.cpp:431 msgctxt "MainWin|" msgid "Debug &HotList" msgstr "Debug &HotList" -#: ../src/qtui/mainwin.cpp:425 +#: ../src/qtui/mainwin.cpp:433 msgctxt "MainWin|" msgid "Debug &Log" msgstr "Debug &Log" -#: ../src/qtui/mainwin.cpp:427 +#: ../src/qtui/mainwin.cpp:435 msgctxt "MainWin|" msgid "Reload Stylesheet" msgstr "Reload Stylesheet" -#: ../src/qtui/mainwin.cpp:430 +#: ../src/qtui/mainwin.cpp:438 msgctxt "MainWin|" msgid "Hide Current Buffer" msgstr "" -#: ../src/qtui/mainwin.cpp:434 +#: ../src/qtui/mainwin.cpp:442 msgctxt "MainWin|" msgid "Navigation" msgstr "Navigation" -#: ../src/qtui/mainwin.cpp:436 +#: ../src/qtui/mainwin.cpp:444 msgctxt "MainWin|" msgid "Jump to hot chat" msgstr "Jump to hot chat" -#: ../src/qtui/mainwin.cpp:448 +#: ../src/qtui/mainwin.cpp:456 msgctxt "MainWin|" msgid "Set Quick Access #0" msgstr "Set Quick Access #0" -#: ../src/qtui/mainwin.cpp:450 +#: ../src/qtui/mainwin.cpp:458 msgctxt "MainWin|" msgid "Set Quick Access #1" msgstr "Set Quick Access #1" -#: ../src/qtui/mainwin.cpp:452 +#: ../src/qtui/mainwin.cpp:460 msgctxt "MainWin|" msgid "Set Quick Access #2" msgstr "Set Quick Access #2" -#: ../src/qtui/mainwin.cpp:454 +#: ../src/qtui/mainwin.cpp:462 msgctxt "MainWin|" msgid "Set Quick Access #3" msgstr "Set Quick Access #3" -#: ../src/qtui/mainwin.cpp:456 +#: ../src/qtui/mainwin.cpp:464 msgctxt "MainWin|" msgid "Set Quick Access #4" msgstr "Set Quick Access #4" -#: ../src/qtui/mainwin.cpp:458 +#: ../src/qtui/mainwin.cpp:466 msgctxt "MainWin|" msgid "Set Quick Access #5" msgstr "Set Quick Access #5" -#: ../src/qtui/mainwin.cpp:460 +#: ../src/qtui/mainwin.cpp:468 msgctxt "MainWin|" msgid "Set Quick Access #6" msgstr "Set Quick Access #6" -#: ../src/qtui/mainwin.cpp:462 +#: ../src/qtui/mainwin.cpp:470 msgctxt "MainWin|" msgid "Set Quick Access #7" msgstr "Set Quick Access #7" -#: ../src/qtui/mainwin.cpp:464 +#: ../src/qtui/mainwin.cpp:472 msgctxt "MainWin|" msgid "Set Quick Access #8" msgstr "Set Quick Access #8" -#: ../src/qtui/mainwin.cpp:466 +#: ../src/qtui/mainwin.cpp:474 msgctxt "MainWin|" msgid "Set Quick Access #9" msgstr "Set Quick Access #9" -#: ../src/qtui/mainwin.cpp:469 +#: ../src/qtui/mainwin.cpp:477 msgctxt "MainWin|" msgid "Quick Access #0" msgstr "Quick Access #0" -#: ../src/qtui/mainwin.cpp:471 +#: ../src/qtui/mainwin.cpp:479 msgctxt "MainWin|" msgid "Quick Access #1" msgstr "Quick Access #1" -#: ../src/qtui/mainwin.cpp:473 +#: ../src/qtui/mainwin.cpp:481 msgctxt "MainWin|" msgid "Quick Access #2" msgstr "Quick Access #2" -#: ../src/qtui/mainwin.cpp:475 +#: ../src/qtui/mainwin.cpp:483 msgctxt "MainWin|" msgid "Quick Access #3" msgstr "Quick Access #3" -#: ../src/qtui/mainwin.cpp:477 +#: ../src/qtui/mainwin.cpp:485 msgctxt "MainWin|" msgid "Quick Access #4" msgstr "Quick Access #4" -#: ../src/qtui/mainwin.cpp:479 +#: ../src/qtui/mainwin.cpp:487 msgctxt "MainWin|" msgid "Quick Access #5" msgstr "Quick Access #5" -#: ../src/qtui/mainwin.cpp:481 +#: ../src/qtui/mainwin.cpp:489 msgctxt "MainWin|" msgid "Quick Access #6" msgstr "Quick Access #6" -#: ../src/qtui/mainwin.cpp:483 +#: ../src/qtui/mainwin.cpp:491 msgctxt "MainWin|" msgid "Quick Access #7" msgstr "Quick Access #7" -#: ../src/qtui/mainwin.cpp:485 +#: ../src/qtui/mainwin.cpp:493 msgctxt "MainWin|" msgid "Quick Access #8" msgstr "Quick Access #8" -#: ../src/qtui/mainwin.cpp:487 +#: ../src/qtui/mainwin.cpp:495 msgctxt "MainWin|" msgid "Quick Access #9" msgstr "Quick Access #9" -#: ../src/qtui/mainwin.cpp:491 +#: ../src/qtui/mainwin.cpp:499 msgctxt "MainWin|" msgid "Activate Next Chat List" msgstr "Activate Next Chat List" -#: ../src/qtui/mainwin.cpp:493 +#: ../src/qtui/mainwin.cpp:501 msgctxt "MainWin|" msgid "Activate Previous Chat List" msgstr "Activate Previous Chat List" -#: ../src/qtui/mainwin.cpp:495 +#: ../src/qtui/mainwin.cpp:503 msgctxt "MainWin|" msgid "Go to Next Chat" msgstr "Go to Next Chat" -#: ../src/qtui/mainwin.cpp:497 +#: ../src/qtui/mainwin.cpp:505 msgctxt "MainWin|" msgid "Go to Previous Chat" msgstr "Go to Previous Chat" -#: ../src/qtui/mainwin.cpp:506 +#: ../src/qtui/mainwin.cpp:514 msgctxt "MainWin|" msgid "&File" msgstr "&File" -#: ../src/qtui/mainwin.cpp:519 +#: ../src/qtui/mainwin.cpp:527 msgctxt "MainWin|" msgid "&Networks" msgstr "&Networks" -#: ../src/qtui/mainwin.cpp:525 +#: ../src/qtui/mainwin.cpp:533 msgctxt "MainWin|" msgid "&View" msgstr "&View" -#: ../src/qtui/mainwin.cpp:526 +#: ../src/qtui/mainwin.cpp:534 msgctxt "MainWin|" msgid "&Chat Lists" msgstr "&Chat Lists" -#: ../src/qtui/mainwin.cpp:528 +#: ../src/qtui/mainwin.cpp:536 msgctxt "MainWin|" msgid "&Toolbars" msgstr "&Toolbars" -#: ../src/qtui/mainwin.cpp:542 +#: ../src/qtui/mainwin.cpp:550 msgctxt "MainWin|" msgid "&Settings" msgstr "&Settings" -#: ../src/qtui/mainwin.cpp:551 +#: ../src/qtui/mainwin.cpp:559 msgctxt "MainWin|" msgid "&Help" msgstr "&Help" -#: ../src/qtui/mainwin.cpp:559 +#: ../src/qtui/mainwin.cpp:567 msgctxt "MainWin|" msgid "Debug" msgstr "Debug" -#: ../src/qtui/mainwin.cpp:835 +#: ../src/qtui/mainwin.cpp:843 msgctxt "MainWin|" msgid "Nicks" msgstr "Nicks" -#: ../src/qtui/mainwin.cpp:844 +#: ../src/qtui/mainwin.cpp:852 msgctxt "MainWin|" msgid "Show Nick List" msgstr "Show Nick List" -#: ../src/qtui/mainwin.cpp:857 +#: ../src/qtui/mainwin.cpp:865 msgctxt "MainWin|" msgid "Chat Monitor" msgstr "Chat Monitor" -#: ../src/qtui/mainwin.cpp:869 +#: ../src/qtui/mainwin.cpp:877 msgctxt "MainWin|" msgid "Show Chat Monitor" msgstr "Show Chat Monitor" -#: ../src/qtui/mainwin.cpp:875 +#: ../src/qtui/mainwin.cpp:883 msgctxt "MainWin|" msgid "Inputline" msgstr "Inputline" -#: ../src/qtui/mainwin.cpp:884 +#: ../src/qtui/mainwin.cpp:892 msgctxt "MainWin|" msgid "Show Input Line" msgstr "Show Input Line" -#: ../src/qtui/mainwin.cpp:899 +#: ../src/qtui/mainwin.cpp:907 msgctxt "MainWin|" msgid "Topic" msgstr "Topic" -#: ../src/qtui/mainwin.cpp:911 +#: ../src/qtui/mainwin.cpp:919 msgctxt "MainWin|" msgid "Show Topic Line" msgstr "Show Topic Line" -#: ../src/qtui/mainwin.cpp:1005 +#: ../src/qtui/mainwin.cpp:1013 msgctxt "MainWin|" msgid "Main Toolbar" msgstr "Main Toolbar" -#: ../src/qtui/mainwin.cpp:1048 +#: ../src/qtui/mainwin.cpp:1074 msgctxt "MainWin|" msgid "Connected to core." msgstr "Connected to core." -#: ../src/qtui/mainwin.cpp:1147 +#: ../src/qtui/mainwin.cpp:1173 msgctxt "MainWin|" msgid "Not connected to core." msgstr "Not connected to core." -#: ../src/qtui/mainwin.cpp:1165 ../src/qtui/mainwin.cpp:1175 +#: ../src/qtui/mainwin.cpp:1191 ../src/qtui/mainwin.cpp:1201 msgctxt "MainWin|" msgid "Unencrypted Connection" msgstr "Unencrypted Connection" -#: ../src/qtui/mainwin.cpp:1165 +#: ../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:1167 ../src/qtui/mainwin.cpp:1177 +#: ../src/qtui/mainwin.cpp:1193 ../src/qtui/mainwin.cpp:1203 msgctxt "MainWin|" msgid "" "Sensitive data, like passwords, will be transmitted unencrypted to your " "Quassel core." msgstr "Sensitive data, like passwords, will be transmitted unencrypted to your Quassel core." -#: ../src/qtui/mainwin.cpp:1175 +#: ../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:1193 ../src/qtui/mainwin.cpp:1214 +#: ../src/qtui/mainwin.cpp:1219 ../src/qtui/mainwin.cpp:1240 msgctxt "MainWin|" msgid "Untrusted Security Certificate" msgstr "Untrusted Security Certificate" -#: ../src/qtui/mainwin.cpp:1194 +#: ../src/qtui/mainwin.cpp:1220 #, qt-format msgctxt "MainWin|" msgid "" @@ -4266,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:1197 +#: ../src/qtui/mainwin.cpp:1223 msgctxt "MainWin|" msgid "Continue" msgstr "Continue" -#: ../src/qtui/mainwin.cpp:1198 +#: ../src/qtui/mainwin.cpp:1224 msgctxt "MainWin|" msgid "Show Certificate" msgstr "Show Certificate" -#: ../src/qtui/mainwin.cpp:1215 +#: ../src/qtui/mainwin.cpp:1241 msgctxt "MainWin|" msgid "" "Would you like to accept this certificate forever without being prompted?" msgstr "Would you like to accept this certificate forever without being prompted?" -#: ../src/qtui/mainwin.cpp:1217 +#: ../src/qtui/mainwin.cpp:1243 msgctxt "MainWin|" msgid "Current Session Only" msgstr "Current Session Only" -#: ../src/qtui/mainwin.cpp:1218 +#: ../src/qtui/mainwin.cpp:1244 msgctxt "MainWin|" msgid "Forever" msgstr "Forever" -#: ../src/qtui/mainwin.cpp:1229 +#: ../src/qtui/mainwin.cpp:1255 msgctxt "MainWin|" msgid "Core Connection Error" msgstr "Core Connection Error" @@ -4321,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" @@ -4386,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:960 +#: ../src/client/networkmodel.cpp:1002 msgctxt "NetworkModel|" msgid "Chat" msgstr "Chat" -#: ../src/client/networkmodel.cpp:960 +#: ../src/client/networkmodel.cpp:1002 msgctxt "NetworkModel|" msgid "Topic" msgstr "Topic" -#: ../src/client/networkmodel.cpp:960 +#: ../src/client/networkmodel.cpp:1002 msgctxt "NetworkModel|" msgid "Nick Count" msgstr "Nick Count" @@ -4771,7 +4967,7 @@ msgid "" "the special characters {, }, [, ], \\, |, `, ^, _ and -." msgstr "A valid nickname may contain letters from the English alphabet, digits, and the special characters {, }, [, ], \\, |, `, ^, _ and -." -#: ../src/qtui/settingspages/identitiessettingspage.cpp:479 +#: ../src/qtui/settingspages/identitiessettingspage.cpp:480 msgctxt "NickEditDlg|" msgid "Add Nickname" msgstr "Add Nickname" @@ -4786,7 +4982,7 @@ msgctxt "NotificationsSettingsPage|" msgid "Notifications" msgstr "Notifications" -#: ../src/qtui/phononnotificationbackend.cpp:186 +#: ../src/qtui/phononnotificationbackend.cpp:188 msgctxt "PhononNotificationBackend::ConfigWidget|" msgid "Select Audio File" msgstr "Select Audio File" @@ -4849,159 +5045,159 @@ msgid "" "wizard any time and use the settings dialog for more detailed changes." msgstr "This wizard will help you to set up your default identity and your IRC network connection.
This only covers basic settings. You can cancel this wizard any time and use the settings dialogue for more detailed changes." -#: ../src/uisupport/qssparser.cpp:129 ../src/uisupport/qssparser.cpp:179 -#: ../src/uisupport/qssparser.cpp:335 +#: ../src/uisupport/qssparser.cpp:128 ../src/uisupport/qssparser.cpp:178 +#: ../src/uisupport/qssparser.cpp:334 #, qt-format msgctxt "QssParser|" msgid "Invalid block declaration: %1" msgstr "Invalid block declaration: %1" -#: ../src/uisupport/qssparser.cpp:148 +#: ../src/uisupport/qssparser.cpp:147 #, qt-format msgctxt "QssParser|" msgid "Invalid palette role assignment: %1" msgstr "Invalid palette role assignment: %1" -#: ../src/uisupport/qssparser.cpp:167 +#: ../src/uisupport/qssparser.cpp:166 #, qt-format msgctxt "QssParser|" msgid "Unknown palette role name: %1" msgstr "Unknown palette role name: %1" -#: ../src/uisupport/qssparser.cpp:205 +#: ../src/uisupport/qssparser.cpp:204 #, qt-format msgctxt "QssParser|" msgid "Invalid subelement name in %1" msgstr "Invalid subelement name in %1" -#: ../src/uisupport/qssparser.cpp:249 +#: ../src/uisupport/qssparser.cpp:248 #, qt-format msgctxt "QssParser|" msgid "Invalid message type in %1" msgstr "Invalid message type in %1" -#: ../src/uisupport/qssparser.cpp:258 +#: ../src/uisupport/qssparser.cpp:257 #, qt-format msgctxt "QssParser|" msgid "Invalid condition %1" msgstr "Invalid condition %1" -#: ../src/uisupport/qssparser.cpp:270 +#: ../src/uisupport/qssparser.cpp:269 #, qt-format msgctxt "QssParser|" msgid "Invalid message label: %1" msgstr "Invalid message label: %1" -#: ../src/uisupport/qssparser.cpp:282 +#: ../src/uisupport/qssparser.cpp:281 #, qt-format msgctxt "QssParser|" msgid "Invalid senderhash specification: %1" msgstr "Invalid senderhash specification: %1" -#: ../src/uisupport/qssparser.cpp:286 +#: ../src/uisupport/qssparser.cpp:285 msgctxt "QssParser|" msgid "Senderhash can be at most \"0x0f\"!" msgstr "Senderhash can be at most \"0x0f\"!" -#: ../src/uisupport/qssparser.cpp:302 +#: ../src/uisupport/qssparser.cpp:301 #, qt-format msgctxt "QssParser|" msgid "Invalid format name: %1" msgstr "Invalid format name: %1" -#: ../src/uisupport/qssparser.cpp:310 +#: ../src/uisupport/qssparser.cpp:309 #, qt-format msgctxt "QssParser|" msgid "Illegal IRC color specification (must be between 00 and 0f): %1" msgstr "Illegal IRC colour specification (must be between 00 and 0f): %1" -#: ../src/uisupport/qssparser.cpp:319 +#: ../src/uisupport/qssparser.cpp:318 #, qt-format msgctxt "QssParser|" msgid "Unhandled condition: %1" msgstr "Unhandled condition: %1" -#: ../src/uisupport/qssparser.cpp:350 +#: ../src/uisupport/qssparser.cpp:349 #, qt-format msgctxt "QssParser|" msgid "Invalid proplist %1" msgstr "Invalid proplist %1" -#: ../src/uisupport/qssparser.cpp:369 +#: ../src/uisupport/qssparser.cpp:368 #, qt-format msgctxt "QssParser|" msgid "Invalid chatlist item type %1" msgstr "Invalid chatlist item type %1" -#: ../src/uisupport/qssparser.cpp:385 +#: ../src/uisupport/qssparser.cpp:384 #, qt-format msgctxt "QssParser|" msgid "Invalid chatlist state %1" msgstr "Invalid chatlist state %1" -#: ../src/uisupport/qssparser.cpp:415 +#: ../src/uisupport/qssparser.cpp:414 #, qt-format msgctxt "QssParser|" msgid "Invalid property declaration: %1" msgstr "Invalid property declaration: %1" -#: ../src/uisupport/qssparser.cpp:439 +#: ../src/uisupport/qssparser.cpp:438 #, qt-format msgctxt "QssParser|" msgid "Invalid font property: %1" msgstr "Invalid font property: %1" -#: ../src/uisupport/qssparser.cpp:445 +#: ../src/uisupport/qssparser.cpp:444 #, qt-format msgctxt "QssParser|" msgid "Unknown ChatLine property: %1" msgstr "Unknown ChatLine property: %1" -#: ../src/uisupport/qssparser.cpp:469 +#: ../src/uisupport/qssparser.cpp:468 #, qt-format msgctxt "QssParser|" msgid "Invalid palette color role specification: %1" msgstr "Invalid palette colour role specification: %1" -#: ../src/uisupport/qssparser.cpp:476 +#: ../src/uisupport/qssparser.cpp:475 #, qt-format msgctxt "QssParser|" msgid "Unknown palette color role: %1" msgstr "Unknown palette colour role: %1" -#: ../src/uisupport/qssparser.cpp:483 ../src/uisupport/qssparser.cpp:506 -#: ../src/uisupport/qssparser.cpp:528 +#: ../src/uisupport/qssparser.cpp:482 ../src/uisupport/qssparser.cpp:505 +#: ../src/uisupport/qssparser.cpp:527 #, qt-format msgctxt "QssParser|" msgid "Invalid gradient declaration: %1" msgstr "Invalid gradient declaration: %1" -#: ../src/uisupport/qssparser.cpp:492 ../src/uisupport/qssparser.cpp:514 -#: ../src/uisupport/qssparser.cpp:538 +#: ../src/uisupport/qssparser.cpp:491 ../src/uisupport/qssparser.cpp:513 +#: ../src/uisupport/qssparser.cpp:537 #, qt-format msgctxt "QssParser|" msgid "Invalid gradient stops list: %1" msgstr "Invalid gradient stops list: %1" -#: ../src/uisupport/qssparser.cpp:647 +#: ../src/uisupport/qssparser.cpp:646 #, qt-format msgctxt "QssParser|" msgid "Invalid font specification: %1" msgstr "Invalid font specification: %1" -#: ../src/uisupport/qssparser.cpp:688 +#: ../src/uisupport/qssparser.cpp:687 #, qt-format msgctxt "QssParser|" msgid "Invalid font style specification: %1" msgstr "Invalid font style specification: %1" -#: ../src/uisupport/qssparser.cpp:703 +#: ../src/uisupport/qssparser.cpp:702 #, qt-format msgctxt "QssParser|" msgid "Invalid font weight specification: %1" msgstr "Invalid font weight specification: %1" -#: ../src/uisupport/qssparser.cpp:715 +#: ../src/uisupport/qssparser.cpp:714 #, qt-format msgctxt "QssParser|" msgid "Invalid font size specification: %1" @@ -5032,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" @@ -5087,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:" @@ -5107,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:" @@ -5311,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" @@ -5394,6 +5579,41 @@ msgid "" "network" msgstr "A list of IRC channels you will join automatically after connecting to the network" +#: ../src/qtui/snorenotificationbackend.cpp:60 +msgctxt "SnoreNotificationBackend|" +msgid "Private Message" +msgstr "" + +#: ../src/qtui/ui/snorentificationconfigwidget.ui:20 +msgctxt "SnoreNotificationConfigWidget|" +msgid "Form" +msgstr "Form" + +#: ../src/qtui/ui/snorentificationconfigwidget.ui:29 +msgctxt "SnoreNotificationConfigWidget|" +msgid "Snore" +msgstr "" + +#: ../src/qtui/ui/snorentificationconfigwidget.ui:41 +msgctxt "SnoreNotificationConfigWidget|" +msgid "Backend:" +msgstr "" + +#: ../src/qtui/ui/snorentificationconfigwidget.ui:64 +msgctxt "SnoreNotificationConfigWidget|" +msgid "Timeout:" +msgstr "" + +#: ../src/qtui/ui/snorentificationconfigwidget.ui:80 +msgctxt "SnoreNotificationConfigWidget|" +msgid " s" +msgstr " s" + +#: ../src/qtui/ui/snorentificationconfigwidget.ui:96 +msgctxt "SnoreNotificationConfigWidget|" +msgid "0 means infinite" +msgstr "" + #: ../src/core/sqlitestorage.cpp:60 msgctxt "SqliteStorage|" msgid "" @@ -5510,7 +5730,7 @@ msgctxt "SslInfoDlg|" msgid "%1 to %2" msgstr "%1 to %2" -#: ../src/client/networkmodel.h:149 +#: ../src/client/networkmodel.h:151 msgctxt "StatusBufferItem|" msgid "Status Buffer" msgstr "Status Buffer" @@ -5713,13 +5933,13 @@ msgctxt "TopicWidget|" msgid "..." msgstr "..." -#: ../src/qtui/topicwidget.cpp:118 +#: ../src/qtui/topicwidget.cpp:121 ../src/qtui/topicwidget.cpp:127 #, qt-format msgctxt "TopicWidget|" msgid "Users: %1" msgstr "Users: %1" -#: ../src/qtui/topicwidget.cpp:119 +#: ../src/qtui/topicwidget.cpp:122 ../src/qtui/topicwidget.cpp:128 #, qt-format msgctxt "TopicWidget|" msgid "Lag: %1 msecs" @@ -5768,114 +5988,114 @@ msgstr "Topic Widget" #. Topic Message #. ---------- #. Invite Message -#: ../src/uisupport/uistyle.cpp:666 ../src/uisupport/uistyle.cpp:669 -#: ../src/uisupport/uistyle.cpp:710 ../src/uisupport/uistyle.cpp:713 -#: ../src/uisupport/uistyle.cpp:716 ../src/uisupport/uistyle.cpp:725 -#: ../src/uisupport/uistyle.cpp:759 +#: ../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:672 +#: ../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:676 +#: ../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:677 +#: ../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:681 +#: ../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:682 +#: ../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:686 +#: ../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:689 +#: ../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:694 +#: ../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:702 +#: ../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:720 +#: ../src/uisupport/uistyle.cpp:723 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "{Day changed to %1}" msgstr "{Day changed to %1}" -#: ../src/uisupport/uistyle.cpp:734 +#: ../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:738 ../src/uisupport/uistyle.cpp:754 +#: ../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:749 +#: ../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:761 ../src/uisupport/uistyle.cpp:809 +#: ../src/uisupport/uistyle.cpp:764 ../src/uisupport/uistyle.cpp:812 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "[%1]" msgstr "[%1]" -#: ../src/uisupport/uistyle.cpp:807 +#: ../src/uisupport/uistyle.cpp:810 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "<%1>" msgstr "<%1>" -#: ../src/client/networkmodel.cpp:783 +#: ../src/client/networkmodel.cpp:825 #, qt-format msgctxt "UserCategoryItem|" msgid "%n Owner(s)" @@ -5883,7 +6103,7 @@ msgid_plural "%n Owner(s)" msgstr[0] "%n Owner" msgstr[1] "%n Owners" -#: ../src/client/networkmodel.cpp:785 +#: ../src/client/networkmodel.cpp:827 #, qt-format msgctxt "UserCategoryItem|" msgid "%n Admin(s)" @@ -5891,7 +6111,7 @@ msgid_plural "%n Admin(s)" msgstr[0] "%n Admin" msgstr[1] "%n Admins" -#: ../src/client/networkmodel.cpp:787 +#: ../src/client/networkmodel.cpp:829 #, qt-format msgctxt "UserCategoryItem|" msgid "%n Operator(s)" @@ -5899,7 +6119,7 @@ msgid_plural "%n Operator(s)" msgstr[0] "%n Operator" msgstr[1] "%n Operators" -#: ../src/client/networkmodel.cpp:789 +#: ../src/client/networkmodel.cpp:831 #, qt-format msgctxt "UserCategoryItem|" msgid "%n Half-Op(s)" @@ -5907,7 +6127,7 @@ msgid_plural "%n Half-Op(s)" msgstr[0] "%n Half-Op" msgstr[1] "%n Half-Ops" -#: ../src/client/networkmodel.cpp:791 +#: ../src/client/networkmodel.cpp:833 #, qt-format msgctxt "UserCategoryItem|" msgid "%n Voiced" @@ -5915,7 +6135,7 @@ msgid_plural "%n Voiced" msgstr[0] "%n Voiced" msgstr[1] "%n Voiced" -#: ../src/client/networkmodel.cpp:793 +#: ../src/client/networkmodel.cpp:835 #, qt-format msgctxt "UserCategoryItem|" msgid "%n User(s)"