X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=po%2Fen_GB.po;h=89a1090b08c21ced36880ccc0f21e306a7ab3f48;hp=2d50c87ab71ea12afc8a9731f6d462fa314fa16e;hb=e0781eeb34db0aaa775bd3439c1c98103437f009;hpb=e5f8a5ece691c1bcdc1405d3d8f5028007a985af diff --git a/po/en_GB.po b/po/en_GB.po index 2d50c87a..89a1090b 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -6,14 +6,14 @@ msgid "" msgstr "" "Project-Id-Version: Quassel IRC\n" "Report-Msgid-Bugs-To: http://bugs.quassel-irc.org/\n" -"PO-Revision-Date: 2012-06-24 20:04+0000\n" +"PO-Revision-Date: 2013-04-16 00:15+0000\n" "Last-Translator: Daniel Albers \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: en_GB\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Qt-Contexts: true\n" #: ../src/qtui/ui/aboutdlg.ui:17 @@ -68,7 +68,7 @@ msgstr "Version: %1
Protocol version: %2
Built: %3" #: ../src/qtui/aboutdlg.cpp:49 msgctxt "AboutDlg|" msgid "" -"A modern, distributed IRC Client

©2005-2012 by the " +"A modern, distributed IRC Client

©2005-2013 by the " "Quassel Project
http://quassel-" "irc.org
#quassel on Freenode

Quassel IRC is dual-" @@ -93,7 +93,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:167 +#: ../src/qtui/aboutdlg.cpp:185 msgctxt "AboutDlg|" msgid "" "Special thanks goes to:
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:566 ../src/core/core.cpp:657 ../src/core/core.cpp:683 +#: ../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:566 +#: ../src/core/core.cpp:564 msgctxt "Core|" msgid "too old, rejecting." msgstr "too old, rejecting." -#: ../src/core/core.cpp:583 +#: ../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:637 +#: ../src/core/core.cpp:636 msgctxt "Core|" msgid "Starting TLS for Client:" msgstr "Starting TLS for Client:" -#: ../src/core/core.cpp:655 +#: ../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:657 +#: ../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:677 +#: ../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:683 +#: ../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:696 +#: ../src/core/core.cpp:695 msgctxt "Core|" msgid "Non-authed client disconnected." msgstr "Non-authed client disconnected." -#: ../src/core/core.cpp:703 -msgctxt "Core|" -msgid "Non-authed client disconnected. (socket allready destroyed)" -msgstr "Non-authed client disconnected. (socket allready destroyed)" - -#: ../src/core/core.cpp:755 +#: ../src/core/core.cpp:724 msgctxt "Core|" msgid "Could not initialize session for client:" msgstr "Could not initialise session for client:" -#: ../src/core/core.cpp:781 +#: ../src/core/core.cpp:750 msgctxt "Core|" msgid "Could not find a session for client:" msgstr "Could not find a session for client:" @@ -1838,69 +1838,69 @@ msgctxt "CoreConnectDlg|" msgid "Connect to Core" msgstr "Connect to Core" -#: ../src/client/coreconnection.cpp:189 +#: ../src/client/coreconnection.cpp:190 msgctxt "CoreConnection|" msgid "Network is down" msgstr "Network is down" -#: ../src/client/coreconnection.cpp:229 ../src/client/coreconnection.cpp:369 +#: ../src/client/coreconnection.cpp:225 ../src/client/coreconnection.cpp:365 msgctxt "CoreConnection|" msgid "Disconnected" msgstr "Disconnected" -#: ../src/client/coreconnection.cpp:232 +#: ../src/client/coreconnection.cpp:228 #, qt-format msgctxt "CoreConnection|" msgid "Looking up %1..." msgstr "Looking up %1..." -#: ../src/client/coreconnection.cpp:235 ../src/client/coreconnection.cpp:507 +#: ../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:238 ../src/client/coreconnection.cpp:641 +#: ../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:241 +#: ../src/client/coreconnection.cpp:237 #, qt-format msgctxt "CoreConnection|" msgid "Disconnecting from %1..." msgstr "Disconnecting from %1..." -#: ../src/client/coreconnection.cpp:309 +#: ../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:344 +#: ../src/client/coreconnection.cpp:340 msgctxt "CoreConnection|" msgid "Invalid data received from core" msgstr "Invalid data received from core" -#: ../src/client/coreconnection.cpp:399 +#: ../src/client/coreconnection.cpp:403 msgctxt "CoreConnection|" msgid "Disconnected from core." msgstr "Disconnected from core." -#: ../src/client/coreconnection.cpp:484 ../src/client/coreconnection.cpp:573 -#: ../src/client/coreconnection.cpp:622 +#: ../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:516 +#: ../src/client/coreconnection.cpp:533 msgctxt "CoreConnection|" msgid "Synchronizing to core..." msgstr "Synchronising to core..." -#: ../src/client/coreconnection.cpp:539 +#: ../src/client/coreconnection.cpp:556 #, qt-format msgctxt "CoreConnection|" msgid "" @@ -1908,33 +1908,33 @@ msgid "" "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:665 +#: ../src/client/coreconnection.cpp:682 msgctxt "CoreConnection|" msgid "Logging in..." msgstr "Logging in..." -#: ../src/client/coreconnection.cpp:670 +#: ../src/client/coreconnection.cpp:687 msgctxt "CoreConnection|" msgid "Login canceled" msgstr "Login cancelled" -#: ../src/client/coreconnection.cpp:699 +#: ../src/client/coreconnection.cpp:716 msgctxt "CoreConnection|" msgid "Receiving session state" msgstr "Receiving session state" -#: ../src/client/coreconnection.cpp:701 +#: ../src/client/coreconnection.cpp:718 #, qt-format msgctxt "CoreConnection|" msgid "Synchronizing to %1..." msgstr "Synchronising to %1..." -#: ../src/client/coreconnection.cpp:731 +#: ../src/client/coreconnection.cpp:744 msgctxt "CoreConnection|" msgid "Receiving network states" msgstr "Receiving network states" -#: ../src/client/coreconnection.cpp:785 +#: ../src/client/coreconnection.cpp:798 #, qt-format msgctxt "CoreConnection|" msgid "Synchronized to %1" @@ -2136,30 +2136,30 @@ msgctxt "CoreNetwork|" msgid "Core Shutdown" msgstr "Core Shutdown" -#: ../src/core/corenetwork.cpp:396 +#: ../src/core/corenetwork.cpp:409 #, qt-format msgctxt "CoreNetwork|" msgid "Could not connect to %1 (%2)" msgstr "Could not connect to %1 (%2)" -#: ../src/core/corenetwork.cpp:398 +#: ../src/core/corenetwork.cpp:411 #, qt-format msgctxt "CoreNetwork|" msgid "Connection failure: %1" msgstr "Connection failure: %1" -#: ../src/core/coresession.cpp:236 +#: ../src/core/coresession.cpp:230 msgctxt "CoreSession|" msgid "Client" msgstr "Client" -#: ../src/core/coresession.cpp:236 +#: ../src/core/coresession.cpp:230 #, qt-format msgctxt "CoreSession|" msgid "disconnected (UserId: %1)." msgstr "disconnected (UserId: %1)." -#: ../src/core/coresession.cpp:497 +#: ../src/core/coresession.cpp:491 #, qt-format msgctxt "CoreSession|" msgid "" @@ -2167,20 +2167,41 @@ msgid "" " create network %1!" msgstr "CoreSession::createNetwork(): Got invalid networkId from Core when trying to create network %1!" -#: ../src/core/coresession.cpp:529 +#: ../src/core/coresession.cpp:523 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:71 +#: ../src/core/coresessioneventprocessor.cpp:75 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 +msgctxt "CoreSessionEventProcessor|" +msgid "Unable to perform key exchange." +msgstr "" + +#: ../src/core/coresessioneventprocessor.cpp:458 +msgctxt "CoreSessionEventProcessor|" +msgid "Unable to parse the DH1080_INIT. Key exchange failed." +msgstr "" + +#: ../src/core/coresessioneventprocessor.cpp:462 +#: ../src/core/coresessioneventprocessor.cpp:470 +msgctxt "CoreSessionEventProcessor|" +msgid "Your key is set and messages will be encrypted." +msgstr "" + +#: ../src/core/coresessioneventprocessor.cpp:472 +msgctxt "CoreSessionEventProcessor|" +msgid "Failed to parse DH1080_FINISH. Key exchange failed." +msgstr "" + #: ../src/core/coreuserinputhandler.cpp:88 msgctxt "CoreUserInputHandler|" msgid "away" @@ -2192,28 +2213,28 @@ msgctxt "CoreUserInputHandler|" msgid "sending CTCP-%1 request to %2" msgstr "sending CTCP-%1 request to %2" -#: ../src/core/coreuserinputhandler.cpp:198 +#: ../src/core/coreuserinputhandler.cpp:199 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:205 -#: ../src/core/coreuserinputhandler.cpp:606 +#: ../src/core/coreuserinputhandler.cpp:206 +#: ../src/core/coreuserinputhandler.cpp:648 #, qt-format msgctxt "CoreUserInputHandler|" msgid "No key has been set for %1." msgstr "No key has been set for %1." -#: ../src/core/coreuserinputhandler.cpp:218 +#: ../src/core/coreuserinputhandler.cpp:211 #, qt-format msgctxt "CoreUserInputHandler|" msgid "The key for %1 has been deleted." msgstr "The key for %1 has been deleted." -#: ../src/core/coreuserinputhandler.cpp:222 -#: ../src/core/coreuserinputhandler.cpp:614 +#: ../src/core/coreuserinputhandler.cpp:215 +#: ../src/core/coreuserinputhandler.cpp:656 msgctxt "CoreUserInputHandler|" msgid "" "Error: Setting an encryption key requires Quassel to have been built with " @@ -2222,13 +2243,42 @@ 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:499 +#: ../src/core/coreuserinputhandler.cpp:367 +msgctxt "CoreUserInputHandler|" +msgid "" +"[usage] /keyx [] Initiates a DH1080 key exchange with the " +"target." +msgstr "" + +#: ../src/core/coreuserinputhandler.cpp:379 +#, qt-format +msgctxt "CoreUserInputHandler|" +msgid "Failed to initiate key exchange with %1." +msgstr "" + +#: ../src/core/coreuserinputhandler.cpp:384 +#, qt-format +msgctxt "CoreUserInputHandler|" +msgid "Initiated key exchange with %1." +msgstr "" + +#: ../src/core/coreuserinputhandler.cpp:388 +#: ../src/core/coreuserinputhandler.cpp:616 +msgctxt "CoreUserInputHandler|" +msgid "" +"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." +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 #, qt-format msgctxt "CoreUserInputHandler|" msgid "Starting query with %1" msgstr "" -#: ../src/core/coreuserinputhandler.cpp:556 +#: ../src/core/coreuserinputhandler.cpp:604 msgctxt "CoreUserInputHandler|" msgid "" "[usage] /setkey sets the encryption key for nick or " @@ -2236,35 +2286,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:571 +#: ../src/core/coreuserinputhandler.cpp:613 #, qt-format msgctxt "CoreUserInputHandler|" msgid "The key for %1 has been set." msgstr "The key for %1 has been set." -#: ../src/core/coreuserinputhandler.cpp:574 -msgctxt "CoreUserInputHandler|" -msgid "" -"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." -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:598 +#: ../src/core/coreuserinputhandler.cpp:640 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:610 +#: ../src/core/coreuserinputhandler.cpp:652 #, qt-format msgctxt "CoreUserInputHandler|" msgid "The key for %1 is %2" msgstr "Homepage for %1 is %2" -#: ../src/core/coreuserinputhandler.cpp:738 +#: ../src/core/coreuserinputhandler.cpp:780 #, qt-format msgctxt "CoreUserInputHandler|" msgid "[Error] Could not encrypt your message: %1" @@ -2380,7 +2421,12 @@ msgctxt "DebugLogWidget|" msgid "Close" msgstr "Close" -#: ../src/core/eventstringifier.cpp:219 ../src/core/eventstringifier.cpp:360 +#: ../src/qtui/dockmanagernotificationbackend.cpp:184 +msgctxt "DockManagerNotificationBackend::ConfigWidget|" +msgid "Mark dockmanager entry" +msgstr "" + +#: ../src/core/eventstringifier.cpp:219 ../src/core/eventstringifier.cpp:365 msgctxt "EventStringifier|" msgid "[Whois] " msgstr "[Whois] %1" @@ -2397,207 +2443,213 @@ msgctxt "EventStringifier|" msgid "%1 has changed topic for %2 to: \"%3\"" msgstr "%1 has changed topic for %2 to: \"%3\"" -#: ../src/core/eventstringifier.cpp:345 +#: ../src/core/eventstringifier.cpp:342 +#, qt-format +msgctxt "EventStringifier|" +msgid "[Operwall] %1: %2" +msgstr "" + +#: ../src/core/eventstringifier.cpp:350 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:374 +#: ../src/core/eventstringifier.cpp:379 #, qt-format msgctxt "EventStringifier|" msgid "%1 is away: \"%2\"" msgstr "%1 is away: \"%2\"" -#: ../src/core/eventstringifier.cpp:381 +#: ../src/core/eventstringifier.cpp:386 msgctxt "EventStringifier|" msgid "You are no longer marked as being away" msgstr "" -#: ../src/core/eventstringifier.cpp:389 +#: ../src/core/eventstringifier.cpp:394 msgctxt "EventStringifier|" msgid "You have been marked as being away" msgstr "" -#: ../src/core/eventstringifier.cpp:411 +#: ../src/core/eventstringifier.cpp:416 #, qt-format msgctxt "EventStringifier|" msgid "[Whois] %1 is %2 (%3)" msgstr "[Whois] %1 is %2 (%3)" -#: ../src/core/eventstringifier.cpp:427 +#: ../src/core/eventstringifier.cpp:432 #, qt-format msgctxt "EventStringifier|" msgid "[Whois] %1 is online via %2 (%3)" msgstr "%1 is online via %2 (%3)" -#: ../src/core/eventstringifier.cpp:429 +#: ../src/core/eventstringifier.cpp:434 #, qt-format msgctxt "EventStringifier|" msgid "[Whowas] %1 was online via %2 (%3)" msgstr "[Whowas] %1 was %2 (%3)" -#: ../src/core/eventstringifier.cpp:439 +#: ../src/core/eventstringifier.cpp:444 #, qt-format msgctxt "EventStringifier|" msgid "[Whowas] %1 was %2@%3 (%4)" msgstr "" -#: ../src/core/eventstringifier.cpp:448 +#: ../src/core/eventstringifier.cpp:453 #, qt-format msgctxt "EventStringifier|" msgid "[Who] End of /WHO list for %1" msgstr "[Who] End of /WHO list for %1" -#: ../src/core/eventstringifier.cpp:460 +#: ../src/core/eventstringifier.cpp:465 #, qt-format msgctxt "EventStringifier|" msgid "[Whois] %1 is logged in since %2" msgstr "[Whois] %1 is logged in since %2" -#: ../src/core/eventstringifier.cpp:462 +#: ../src/core/eventstringifier.cpp:469 #, 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:471 +#: ../src/core/eventstringifier.cpp:479 msgctxt "EventStringifier|" msgid "[Whois] End of /WHOIS list" msgstr "[Who] End of /WHO list for %1" -#: ../src/core/eventstringifier.cpp:494 +#: ../src/core/eventstringifier.cpp:502 #, 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:496 +#: ../src/core/eventstringifier.cpp:504 #, qt-format msgctxt "EventStringifier|" msgid "[Whois] %1 has voice on channels: %2" msgstr "[Whois] %1 has voice on channels: %2" -#: ../src/core/eventstringifier.cpp:498 +#: ../src/core/eventstringifier.cpp:506 #, 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:519 +#: ../src/core/eventstringifier.cpp:527 #, 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:527 +#: ../src/core/eventstringifier.cpp:535 msgctxt "EventStringifier|" msgid "End of channel list" msgstr "End of channel list" -#: ../src/core/eventstringifier.cpp:545 +#: ../src/core/eventstringifier.cpp:553 #, qt-format msgctxt "EventStringifier|" msgid "Homepage for %1 is %2" msgstr "Homepage for %1 is %2" -#: ../src/core/eventstringifier.cpp:562 +#: ../src/core/eventstringifier.cpp:570 #, qt-format msgctxt "EventStringifier|" msgid "Channel %1 created on %2" msgstr "Channel %1 created on %2" -#: ../src/core/eventstringifier.cpp:574 +#: ../src/core/eventstringifier.cpp:584 #, qt-format msgctxt "EventStringifier|" msgid "[Whois] %1 is authed as %2" msgstr "[Whois] %1 is away: \"%2\"" -#: ../src/core/eventstringifier.cpp:577 +#: ../src/core/eventstringifier.cpp:587 #, qt-format msgctxt "EventStringifier|" msgid "[Whowas] %1 was authed as %2" msgstr "" -#: ../src/core/eventstringifier.cpp:586 +#: ../src/core/eventstringifier.cpp:596 #, qt-format msgctxt "EventStringifier|" msgid "No topic is set for %1." msgstr "No topic is set for %1." -#: ../src/core/eventstringifier.cpp:594 +#: ../src/core/eventstringifier.cpp:604 #, qt-format msgctxt "EventStringifier|" msgid "Topic for %1 is \"%2\"" msgstr "Topic for %1 is \"%2\"" -#: ../src/core/eventstringifier.cpp:605 +#: ../src/core/eventstringifier.cpp:616 #, qt-format msgctxt "EventStringifier|" msgid "Topic set by %1 on %2" msgstr "Topic set by %1 on %2" -#: ../src/core/eventstringifier.cpp:617 +#: ../src/core/eventstringifier.cpp:629 #, qt-format msgctxt "EventStringifier|" msgid "%1 has been invited to %2" msgstr "%1 has been invited to %2" -#: ../src/core/eventstringifier.cpp:625 +#: ../src/core/eventstringifier.cpp:637 #, qt-format msgctxt "EventStringifier|" msgid "[Who] %1" msgstr "[Who] %1" -#: ../src/core/eventstringifier.cpp:632 +#: ../src/core/eventstringifier.cpp:644 msgctxt "EventStringifier|" msgid "End of /WHOWAS" msgstr "" -#: ../src/core/eventstringifier.cpp:642 +#: ../src/core/eventstringifier.cpp:654 #, qt-format msgctxt "EventStringifier|" msgid "Nick %1 contains illegal characters" msgstr "Nick %1 contains illegal characters" -#: ../src/core/eventstringifier.cpp:652 +#: ../src/core/eventstringifier.cpp:664 #, qt-format msgctxt "EventStringifier|" msgid "Nick already in use: %1" msgstr "Nick already in use: %1" -#: ../src/core/eventstringifier.cpp:662 +#: ../src/core/eventstringifier.cpp:674 #, qt-format msgctxt "EventStringifier|" msgid "Nick/channel is temporarily unavailable: %1" msgstr "Nick/channel is temporarily unavailable: %1" -#: ../src/core/eventstringifier.cpp:685 +#: ../src/core/eventstringifier.cpp:697 #, 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:700 +#: ../src/core/eventstringifier.cpp:712 msgctxt "EventStringifier|" msgid "unknown" msgstr "" -#: ../src/core/eventstringifier.cpp:701 +#: ../src/core/eventstringifier.cpp:713 #, qt-format msgctxt "EventStringifier|" msgid "Received %1CTCP-%2 request by %3" msgstr "" -#: ../src/core/eventstringifier.cpp:704 +#: ../src/core/eventstringifier.cpp:716 #, qt-format msgctxt "EventStringifier|" msgid "Received CTCP-%1 answer from %2: %3" msgstr "" -#: ../src/core/eventstringifier.cpp:719 +#: ../src/core/eventstringifier.cpp:731 #, qt-format msgctxt "EventStringifier|" msgid "Received CTCP-PING answer from %1 with %2 seconds round trip time" @@ -2731,7 +2783,7 @@ msgid "highlight rule" msgstr "highlight rule" #: ../src/qtui/settingspages/identitiessettingspage.ui:31 -#: ../src/qtui/settingspages/identitiessettingspage.cpp:364 +#: ../src/qtui/settingspages/identitiessettingspage.cpp:369 msgctxt "IdentitiesSettingsPage|" msgid "Rename Identity" msgstr "Rename Identity" @@ -2767,55 +2819,55 @@ msgctxt "IdentitiesSettingsPage|" msgid "Identities" msgstr "Identities" -#: ../src/qtui/settingspages/identitiessettingspage.cpp:199 +#: ../src/qtui/settingspages/identitiessettingspage.cpp:204 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:200 +#: ../src/qtui/settingspages/identitiessettingspage.cpp:205 msgctxt "IdentitiesSettingsPage|" msgid "
    • All identities need an identity name set
    • " msgstr "
    • All identities need an identity name set
    • " -#: ../src/qtui/settingspages/identitiessettingspage.cpp:201 +#: ../src/qtui/settingspages/identitiessettingspage.cpp:206 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:202 +#: ../src/qtui/settingspages/identitiessettingspage.cpp:207 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:203 +#: ../src/qtui/settingspages/identitiessettingspage.cpp:208 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:204 +#: ../src/qtui/settingspages/identitiessettingspage.cpp:209 msgctxt "IdentitiesSettingsPage|" msgid "
    " msgstr "
" -#: ../src/qtui/settingspages/identitiessettingspage.cpp:205 +#: ../src/qtui/settingspages/identitiessettingspage.cpp:210 msgctxt "IdentitiesSettingsPage|" msgid "One or more identities are invalid" msgstr "One or more identities are invalid" -#: ../src/qtui/settingspages/identitiessettingspage.cpp:350 +#: ../src/qtui/settingspages/identitiessettingspage.cpp:355 msgctxt "IdentitiesSettingsPage|" msgid "Delete Identity?" msgstr "Delete Identity?" -#: ../src/qtui/settingspages/identitiessettingspage.cpp:351 +#: ../src/qtui/settingspages/identitiessettingspage.cpp:356 #, 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:365 +#: ../src/qtui/settingspages/identitiessettingspage.cpp:370 #, qt-format msgctxt "IdentitiesSettingsPage|" msgid "Please enter a new name for the identity \"%1\"!" @@ -2985,7 +3037,7 @@ msgid "minutes of being idle" msgstr "minutes of being idle" #: ../src/qtui/settingspages/identityeditwidget.ui:399 -#: ../src/qtui/settingspages/identityeditwidget.cpp:236 +#: ../src/qtui/settingspages/identityeditwidget.cpp:237 msgctxt "IdentityEditWidget|" msgid "Advanced" msgstr "Advanced" @@ -3051,16 +3103,16 @@ msgid "Key Type:" msgstr "Key Type:" #: ../src/qtui/settingspages/identityeditwidget.ui:605 -#: ../src/qtui/settingspages/identityeditwidget.cpp:350 -#: ../src/qtui/settingspages/identityeditwidget.cpp:362 +#: ../src/qtui/settingspages/identityeditwidget.cpp:351 +#: ../src/qtui/settingspages/identityeditwidget.cpp:363 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:351 -#: ../src/qtui/settingspages/identityeditwidget.cpp:405 +#: ../src/qtui/settingspages/identityeditwidget.cpp:352 +#: ../src/qtui/settingspages/identityeditwidget.cpp:406 msgctxt "IdentityEditWidget|" msgid "Load" msgstr "Load" @@ -3077,8 +3129,8 @@ msgstr "Organisation:" #: ../src/qtui/settingspages/identityeditwidget.ui:663 #: ../src/qtui/settingspages/identityeditwidget.ui:697 -#: ../src/qtui/settingspages/identityeditwidget.cpp:403 #: ../src/qtui/settingspages/identityeditwidget.cpp:404 +#: ../src/qtui/settingspages/identityeditwidget.cpp:405 msgctxt "IdentityEditWidget|" msgid "No Certificate loaded" msgstr "No Certificate loaded" @@ -3088,28 +3140,28 @@ msgctxt "IdentityEditWidget|" msgid "CommonName:" msgstr "CommonName:" -#: ../src/qtui/settingspages/identityeditwidget.cpp:319 +#: ../src/qtui/settingspages/identityeditwidget.cpp:320 msgctxt "IdentityEditWidget|" msgid "Load a Key" msgstr "Load a Key" -#: ../src/qtui/settingspages/identityeditwidget.cpp:356 +#: ../src/qtui/settingspages/identityeditwidget.cpp:357 msgctxt "IdentityEditWidget|" msgid "RSA" msgstr "RSA" -#: ../src/qtui/settingspages/identityeditwidget.cpp:359 +#: ../src/qtui/settingspages/identityeditwidget.cpp:360 msgctxt "IdentityEditWidget|" msgid "DSA" msgstr "DSA" -#: ../src/qtui/settingspages/identityeditwidget.cpp:364 -#: ../src/qtui/settingspages/identityeditwidget.cpp:410 +#: ../src/qtui/settingspages/identityeditwidget.cpp:365 +#: ../src/qtui/settingspages/identityeditwidget.cpp:411 msgctxt "IdentityEditWidget|" msgid "Clear" msgstr "Clear" -#: ../src/qtui/settingspages/identityeditwidget.cpp:376 +#: ../src/qtui/settingspages/identityeditwidget.cpp:377 msgctxt "IdentityEditWidget|" msgid "Load a Certificate" msgstr "Load a Certificate" @@ -3573,6 +3625,11 @@ msgctxt "InputWidgetSettingsPage|" msgid "Input Widget" msgstr "Input Widget" +#: ../src/common/internalpeer.cpp:58 +msgctxt "InternalPeer|" +msgid "internal connection" +msgstr "" + #: ../src/qtui/ircconnectionwizard.cpp:49 msgctxt "IrcConnectionWizard|" msgid "Save && Connect" @@ -3829,379 +3886,379 @@ msgctxt "KeySequenceWidget|" msgid "Reassign" msgstr "Reassign" -#: ../src/qtui/mainwin.cpp:332 +#: ../src/qtui/mainwin.cpp:350 msgctxt "MainWin|" msgid "General" msgstr "General" -#: ../src/qtui/mainwin.cpp:334 +#: ../src/qtui/mainwin.cpp:352 msgctxt "MainWin|" msgid "&Connect to Core..." msgstr "&Connect to Core..." -#: ../src/qtui/mainwin.cpp:336 +#: ../src/qtui/mainwin.cpp:354 msgctxt "MainWin|" msgid "&Disconnect from Core" msgstr "&Disconnect from Core" -#: ../src/qtui/mainwin.cpp:338 +#: ../src/qtui/mainwin.cpp:356 msgctxt "MainWin|" msgid "Core &Info..." msgstr "Core &Info..." -#: ../src/qtui/mainwin.cpp:340 +#: ../src/qtui/mainwin.cpp:358 msgctxt "MainWin|" msgid "Configure &Networks..." msgstr "Configure &Networks..." -#: ../src/qtui/mainwin.cpp:343 +#: ../src/qtui/mainwin.cpp:361 msgctxt "MainWin|" msgid "&Quit" msgstr "&Quit" -#: ../src/qtui/mainwin.cpp:347 +#: ../src/qtui/mainwin.cpp:365 msgctxt "MainWin|" msgid "&Configure Chat Lists..." msgstr "&Configure Chat Lists..." -#: ../src/qtui/mainwin.cpp:350 +#: ../src/qtui/mainwin.cpp:368 msgctxt "MainWin|" msgid "&Lock Layout" msgstr "&Lock Layout" -#: ../src/qtui/mainwin.cpp:354 +#: ../src/qtui/mainwin.cpp:372 msgctxt "MainWin|" msgid "Show &Search Bar" msgstr "Show &Search Bar" -#: ../src/qtui/mainwin.cpp:356 +#: ../src/qtui/mainwin.cpp:374 msgctxt "MainWin|" msgid "Show Away Log" msgstr "Show Away Log" -#: ../src/qtui/mainwin.cpp:358 +#: ../src/qtui/mainwin.cpp:376 msgctxt "MainWin|" msgid "Show &Menubar" msgstr "Show &Menubar" -#: ../src/qtui/mainwin.cpp:361 +#: ../src/qtui/mainwin.cpp:379 msgctxt "MainWin|" msgid "Show Status &Bar" msgstr "Show Status &Bar" -#: ../src/qtui/mainwin.cpp:367 +#: ../src/qtui/mainwin.cpp:385 msgctxt "MainWin|" msgid "&Full Screen Mode" msgstr "&Fullscreen mode" -#: ../src/qtui/mainwin.cpp:374 +#: ../src/qtui/mainwin.cpp:392 msgctxt "MainWin|" msgid "Configure &Shortcuts..." msgstr "Configure &Shortcuts..." -#: ../src/qtui/mainwin.cpp:380 ../src/qtui/mainwin.cpp:384 +#: ../src/qtui/mainwin.cpp:398 ../src/qtui/mainwin.cpp:402 msgctxt "MainWin|" msgid "&Configure Quassel..." msgstr "&Configure Quassel..." -#: ../src/qtui/mainwin.cpp:390 +#: ../src/qtui/mainwin.cpp:408 msgctxt "MainWin|" msgid "&About Quassel" msgstr "&About Quassel" -#: ../src/qtui/mainwin.cpp:395 +#: ../src/qtui/mainwin.cpp:413 msgctxt "MainWin|" msgid "About &Qt" msgstr "About &Qt" -#: ../src/qtui/mainwin.cpp:399 +#: ../src/qtui/mainwin.cpp:417 msgctxt "MainWin|" msgid "Debug &NetworkModel" msgstr "Debug &NetworkModel" -#: ../src/qtui/mainwin.cpp:401 +#: ../src/qtui/mainwin.cpp:419 msgctxt "MainWin|" msgid "Debug &BufferViewOverlay" msgstr "Debug &BufferViewOverlay" -#: ../src/qtui/mainwin.cpp:403 +#: ../src/qtui/mainwin.cpp:421 msgctxt "MainWin|" msgid "Debug &MessageModel" msgstr "Debug &MessageModel" -#: ../src/qtui/mainwin.cpp:405 +#: ../src/qtui/mainwin.cpp:423 msgctxt "MainWin|" msgid "Debug &HotList" msgstr "Debug &HotList" -#: ../src/qtui/mainwin.cpp:407 +#: ../src/qtui/mainwin.cpp:425 msgctxt "MainWin|" msgid "Debug &Log" msgstr "Debug &Log" -#: ../src/qtui/mainwin.cpp:409 +#: ../src/qtui/mainwin.cpp:427 msgctxt "MainWin|" msgid "Reload Stylesheet" msgstr "Reload Stylesheet" -#: ../src/qtui/mainwin.cpp:412 +#: ../src/qtui/mainwin.cpp:430 msgctxt "MainWin|" msgid "Hide Current Buffer" msgstr "" -#: ../src/qtui/mainwin.cpp:416 +#: ../src/qtui/mainwin.cpp:434 msgctxt "MainWin|" msgid "Navigation" msgstr "Navigation" -#: ../src/qtui/mainwin.cpp:418 +#: ../src/qtui/mainwin.cpp:436 msgctxt "MainWin|" msgid "Jump to hot chat" msgstr "Jump to hot chat" -#: ../src/qtui/mainwin.cpp:430 +#: ../src/qtui/mainwin.cpp:448 msgctxt "MainWin|" msgid "Set Quick Access #0" msgstr "Set Quick Access #0" -#: ../src/qtui/mainwin.cpp:432 +#: ../src/qtui/mainwin.cpp:450 msgctxt "MainWin|" msgid "Set Quick Access #1" msgstr "Set Quick Access #1" -#: ../src/qtui/mainwin.cpp:434 +#: ../src/qtui/mainwin.cpp:452 msgctxt "MainWin|" msgid "Set Quick Access #2" msgstr "Set Quick Access #2" -#: ../src/qtui/mainwin.cpp:436 +#: ../src/qtui/mainwin.cpp:454 msgctxt "MainWin|" msgid "Set Quick Access #3" msgstr "Set Quick Access #3" -#: ../src/qtui/mainwin.cpp:438 +#: ../src/qtui/mainwin.cpp:456 msgctxt "MainWin|" msgid "Set Quick Access #4" msgstr "Set Quick Access #4" -#: ../src/qtui/mainwin.cpp:440 +#: ../src/qtui/mainwin.cpp:458 msgctxt "MainWin|" msgid "Set Quick Access #5" msgstr "Set Quick Access #5" -#: ../src/qtui/mainwin.cpp:442 +#: ../src/qtui/mainwin.cpp:460 msgctxt "MainWin|" msgid "Set Quick Access #6" msgstr "Set Quick Access #6" -#: ../src/qtui/mainwin.cpp:444 +#: ../src/qtui/mainwin.cpp:462 msgctxt "MainWin|" msgid "Set Quick Access #7" msgstr "Set Quick Access #7" -#: ../src/qtui/mainwin.cpp:446 +#: ../src/qtui/mainwin.cpp:464 msgctxt "MainWin|" msgid "Set Quick Access #8" msgstr "Set Quick Access #8" -#: ../src/qtui/mainwin.cpp:448 +#: ../src/qtui/mainwin.cpp:466 msgctxt "MainWin|" msgid "Set Quick Access #9" msgstr "Set Quick Access #9" -#: ../src/qtui/mainwin.cpp:451 +#: ../src/qtui/mainwin.cpp:469 msgctxt "MainWin|" msgid "Quick Access #0" msgstr "Quick Access #0" -#: ../src/qtui/mainwin.cpp:453 +#: ../src/qtui/mainwin.cpp:471 msgctxt "MainWin|" msgid "Quick Access #1" msgstr "Quick Access #1" -#: ../src/qtui/mainwin.cpp:455 +#: ../src/qtui/mainwin.cpp:473 msgctxt "MainWin|" msgid "Quick Access #2" msgstr "Quick Access #2" -#: ../src/qtui/mainwin.cpp:457 +#: ../src/qtui/mainwin.cpp:475 msgctxt "MainWin|" msgid "Quick Access #3" msgstr "Quick Access #3" -#: ../src/qtui/mainwin.cpp:459 +#: ../src/qtui/mainwin.cpp:477 msgctxt "MainWin|" msgid "Quick Access #4" msgstr "Quick Access #4" -#: ../src/qtui/mainwin.cpp:461 +#: ../src/qtui/mainwin.cpp:479 msgctxt "MainWin|" msgid "Quick Access #5" msgstr "Quick Access #5" -#: ../src/qtui/mainwin.cpp:463 +#: ../src/qtui/mainwin.cpp:481 msgctxt "MainWin|" msgid "Quick Access #6" msgstr "Quick Access #6" -#: ../src/qtui/mainwin.cpp:465 +#: ../src/qtui/mainwin.cpp:483 msgctxt "MainWin|" msgid "Quick Access #7" msgstr "Quick Access #7" -#: ../src/qtui/mainwin.cpp:467 +#: ../src/qtui/mainwin.cpp:485 msgctxt "MainWin|" msgid "Quick Access #8" msgstr "Quick Access #8" -#: ../src/qtui/mainwin.cpp:469 +#: ../src/qtui/mainwin.cpp:487 msgctxt "MainWin|" msgid "Quick Access #9" msgstr "Quick Access #9" -#: ../src/qtui/mainwin.cpp:473 +#: ../src/qtui/mainwin.cpp:491 msgctxt "MainWin|" msgid "Activate Next Chat List" msgstr "Activate Next Chat List" -#: ../src/qtui/mainwin.cpp:475 +#: ../src/qtui/mainwin.cpp:493 msgctxt "MainWin|" msgid "Activate Previous Chat List" msgstr "Activate Previous Chat List" -#: ../src/qtui/mainwin.cpp:477 +#: ../src/qtui/mainwin.cpp:495 msgctxt "MainWin|" msgid "Go to Next Chat" msgstr "Go to Next Chat" -#: ../src/qtui/mainwin.cpp:479 +#: ../src/qtui/mainwin.cpp:497 msgctxt "MainWin|" msgid "Go to Previous Chat" msgstr "Go to Previous Chat" -#: ../src/qtui/mainwin.cpp:488 +#: ../src/qtui/mainwin.cpp:506 msgctxt "MainWin|" msgid "&File" msgstr "&File" -#: ../src/qtui/mainwin.cpp:501 +#: ../src/qtui/mainwin.cpp:519 msgctxt "MainWin|" msgid "&Networks" msgstr "&Networks" -#: ../src/qtui/mainwin.cpp:507 +#: ../src/qtui/mainwin.cpp:525 msgctxt "MainWin|" msgid "&View" msgstr "&View" -#: ../src/qtui/mainwin.cpp:508 +#: ../src/qtui/mainwin.cpp:526 msgctxt "MainWin|" msgid "&Chat Lists" msgstr "&Chat Lists" -#: ../src/qtui/mainwin.cpp:510 +#: ../src/qtui/mainwin.cpp:528 msgctxt "MainWin|" msgid "&Toolbars" msgstr "&Toolbars" -#: ../src/qtui/mainwin.cpp:524 +#: ../src/qtui/mainwin.cpp:542 msgctxt "MainWin|" msgid "&Settings" msgstr "&Settings" -#: ../src/qtui/mainwin.cpp:533 +#: ../src/qtui/mainwin.cpp:551 msgctxt "MainWin|" msgid "&Help" msgstr "&Help" -#: ../src/qtui/mainwin.cpp:541 +#: ../src/qtui/mainwin.cpp:559 msgctxt "MainWin|" msgid "Debug" msgstr "Debug" -#: ../src/qtui/mainwin.cpp:817 +#: ../src/qtui/mainwin.cpp:835 msgctxt "MainWin|" msgid "Nicks" msgstr "Nicks" -#: ../src/qtui/mainwin.cpp:826 +#: ../src/qtui/mainwin.cpp:844 msgctxt "MainWin|" msgid "Show Nick List" msgstr "Show Nick List" -#: ../src/qtui/mainwin.cpp:839 +#: ../src/qtui/mainwin.cpp:857 msgctxt "MainWin|" msgid "Chat Monitor" msgstr "Chat Monitor" -#: ../src/qtui/mainwin.cpp:851 +#: ../src/qtui/mainwin.cpp:869 msgctxt "MainWin|" msgid "Show Chat Monitor" msgstr "Show Chat Monitor" -#: ../src/qtui/mainwin.cpp:857 +#: ../src/qtui/mainwin.cpp:875 msgctxt "MainWin|" msgid "Inputline" msgstr "Inputline" -#: ../src/qtui/mainwin.cpp:866 +#: ../src/qtui/mainwin.cpp:884 msgctxt "MainWin|" msgid "Show Input Line" msgstr "Show Input Line" -#: ../src/qtui/mainwin.cpp:881 +#: ../src/qtui/mainwin.cpp:899 msgctxt "MainWin|" msgid "Topic" msgstr "Topic" -#: ../src/qtui/mainwin.cpp:893 +#: ../src/qtui/mainwin.cpp:911 msgctxt "MainWin|" msgid "Show Topic Line" msgstr "Show Topic Line" -#: ../src/qtui/mainwin.cpp:987 +#: ../src/qtui/mainwin.cpp:1005 msgctxt "MainWin|" msgid "Main Toolbar" msgstr "Main Toolbar" -#: ../src/qtui/mainwin.cpp:1030 +#: ../src/qtui/mainwin.cpp:1048 msgctxt "MainWin|" msgid "Connected to core." msgstr "Connected to core." -#: ../src/qtui/mainwin.cpp:1129 +#: ../src/qtui/mainwin.cpp:1147 msgctxt "MainWin|" msgid "Not connected to core." msgstr "Not connected to core." -#: ../src/qtui/mainwin.cpp:1147 ../src/qtui/mainwin.cpp:1157 +#: ../src/qtui/mainwin.cpp:1165 ../src/qtui/mainwin.cpp:1175 msgctxt "MainWin|" msgid "Unencrypted Connection" msgstr "Unencrypted Connection" -#: ../src/qtui/mainwin.cpp:1147 +#: ../src/qtui/mainwin.cpp:1165 msgctxt "MainWin|" msgid "Your client does not support SSL encryption" msgstr "Your client does not support SSL encryption" -#: ../src/qtui/mainwin.cpp:1149 ../src/qtui/mainwin.cpp:1159 +#: ../src/qtui/mainwin.cpp:1167 ../src/qtui/mainwin.cpp:1177 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:1157 +#: ../src/qtui/mainwin.cpp:1175 msgctxt "MainWin|" msgid "Your core does not support SSL encryption" msgstr "Your core does not support SSL encryption" -#: ../src/qtui/mainwin.cpp:1175 ../src/qtui/mainwin.cpp:1196 +#: ../src/qtui/mainwin.cpp:1193 ../src/qtui/mainwin.cpp:1214 msgctxt "MainWin|" msgid "Untrusted Security Certificate" msgstr "Untrusted Security Certificate" -#: ../src/qtui/mainwin.cpp:1176 +#: ../src/qtui/mainwin.cpp:1194 #, qt-format msgctxt "MainWin|" msgid "" @@ -4209,33 +4266,33 @@ msgid "" "following reasons:" msgstr "The SSL certificate provided by the core at %1 is untrusted for the following reasons:" -#: ../src/qtui/mainwin.cpp:1179 +#: ../src/qtui/mainwin.cpp:1197 msgctxt "MainWin|" msgid "Continue" msgstr "Continue" -#: ../src/qtui/mainwin.cpp:1180 +#: ../src/qtui/mainwin.cpp:1198 msgctxt "MainWin|" msgid "Show Certificate" msgstr "Show Certificate" -#: ../src/qtui/mainwin.cpp:1197 +#: ../src/qtui/mainwin.cpp:1215 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:1199 +#: ../src/qtui/mainwin.cpp:1217 msgctxt "MainWin|" msgid "Current Session Only" msgstr "Current Session Only" -#: ../src/qtui/mainwin.cpp:1200 +#: ../src/qtui/mainwin.cpp:1218 msgctxt "MainWin|" msgid "Forever" msgstr "Forever" -#: ../src/qtui/mainwin.cpp:1211 +#: ../src/qtui/mainwin.cpp:1229 msgctxt "MainWin|" msgid "Core Connection Error" msgstr "Core Connection Error" @@ -4324,7 +4381,7 @@ msgctxt "NetworkEditDlg|" msgid "Please enter a network name:" msgstr "Please enter a network name:" -#: ../src/qtui/settingspages/networkssettingspage.cpp:792 +#: ../src/qtui/settingspages/networkssettingspage.cpp:840 msgctxt "NetworkEditDlg|" msgid "Add Network" msgstr "Add Network" @@ -4583,63 +4640,71 @@ msgctxt "NetworksSettingsPage|" msgid "Account:" msgstr "Account:" -#: ../src/qtui/settingspages/networkssettingspage.ui:649 +#: ../src/qtui/settingspages/networkssettingspage.ui:635 +msgctxt "NetworksSettingsPage|" +msgid "" +"

Note: because" +" the identity has an ssl certificate set, SASL EXTERNAL will be " +"used.

" +msgstr "" + +#: ../src/qtui/settingspages/networkssettingspage.ui:659 msgctxt "NetworksSettingsPage|" msgid "Encodings" msgstr "Encodings" -#: ../src/qtui/settingspages/networkssettingspage.ui:652 +#: ../src/qtui/settingspages/networkssettingspage.ui:662 msgctxt "NetworksSettingsPage|" msgid "" "Configure advanced settings such as message encodings and automatic " "reconnect" msgstr "Configure advanced settings such as message encodings and automatic reconnect" -#: ../src/qtui/settingspages/networkssettingspage.ui:661 +#: ../src/qtui/settingspages/networkssettingspage.ui:671 msgctxt "NetworksSettingsPage|" msgid "Control encodings for in- and outgoing messages" msgstr "Control encodings for in- and outgoing messages" -#: ../src/qtui/settingspages/networkssettingspage.ui:664 +#: ../src/qtui/settingspages/networkssettingspage.ui:674 msgctxt "NetworksSettingsPage|" msgid "Use Custom Encodings" msgstr "Use Custom Encodings" -#: ../src/qtui/settingspages/networkssettingspage.ui:675 -#: ../src/qtui/settingspages/networkssettingspage.ui:695 +#: ../src/qtui/settingspages/networkssettingspage.ui:685 +#: ../src/qtui/settingspages/networkssettingspage.ui:705 msgctxt "NetworksSettingsPage|" msgid "" "Specify which encoding your messages will be sent in.\n" "UTF-8 should be a sane choice for most networks." msgstr "Specify which encoding your messages will be sent in.\nUTF-8 should be a sane choice for most networks." -#: ../src/qtui/settingspages/networkssettingspage.ui:679 +#: ../src/qtui/settingspages/networkssettingspage.ui:689 msgctxt "NetworksSettingsPage|" msgid "Send messages in:" msgstr "Send messages in:" -#: ../src/qtui/settingspages/networkssettingspage.ui:706 -#: ../src/qtui/settingspages/networkssettingspage.ui:726 +#: ../src/qtui/settingspages/networkssettingspage.ui:716 +#: ../src/qtui/settingspages/networkssettingspage.ui:736 msgctxt "NetworksSettingsPage|" msgid "" "Incoming messages encoded in Utf8 will always be treated as such.\n" "This setting defines the encoding for messages that are not Utf8." msgstr "Incoming messages encoded in Utf8 will always be treated as such.\nThis setting defines the encoding for messages that are not Utf8." -#: ../src/qtui/settingspages/networkssettingspage.ui:710 +#: ../src/qtui/settingspages/networkssettingspage.ui:720 msgctxt "NetworksSettingsPage|" msgid "Receive fallback:" msgstr "Receive fallback:" -#: ../src/qtui/settingspages/networkssettingspage.ui:737 -#: ../src/qtui/settingspages/networkssettingspage.ui:751 +#: ../src/qtui/settingspages/networkssettingspage.ui:747 +#: ../src/qtui/settingspages/networkssettingspage.ui:761 msgctxt "NetworksSettingsPage|" msgid "" "This specifies how control messages, nicks and servernames are encoded.\n" "Unless you *really* know what you do, leave this as ISO-8859-1!" msgstr "This specifies how control messages, nicks and servernames are encoded.\nUnless you *really* know what you do, leave this as ISO-8859-1!" -#: ../src/qtui/settingspages/networkssettingspage.ui:741 +#: ../src/qtui/settingspages/networkssettingspage.ui:751 msgctxt "NetworksSettingsPage|" msgid "Server encoding:" msgstr "Server encoding:" @@ -4654,34 +4719,34 @@ msgctxt "NetworksSettingsPage|" msgid "Networks" msgstr "Networks" -#: ../src/qtui/settingspages/networkssettingspage.cpp:176 +#: ../src/qtui/settingspages/networkssettingspage.cpp:184 msgctxt "NetworksSettingsPage|" 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/networkssettingspage.cpp:177 +#: ../src/qtui/settingspages/networkssettingspage.cpp:185 msgctxt "NetworksSettingsPage|" msgid "
    • All networks need at least one server defined
    • " msgstr "
    • All networks need at least one server defined
    • " -#: ../src/qtui/settingspages/networkssettingspage.cpp:178 +#: ../src/qtui/settingspages/networkssettingspage.cpp:186 msgctxt "NetworksSettingsPage|" msgid "
    " msgstr "
" -#: ../src/qtui/settingspages/networkssettingspage.cpp:179 +#: ../src/qtui/settingspages/networkssettingspage.cpp:187 msgctxt "NetworksSettingsPage|" msgid "Invalid Network Settings" msgstr "Invalid Network Settings" -#: ../src/qtui/settingspages/networkssettingspage.cpp:602 +#: ../src/qtui/settingspages/networkssettingspage.cpp:650 msgctxt "NetworksSettingsPage|" msgid "Delete Network?" msgstr "Delete Network?" -#: ../src/qtui/settingspages/networkssettingspage.cpp:603 +#: ../src/qtui/settingspages/networkssettingspage.cpp:651 #, qt-format msgctxt "NetworksSettingsPage|" msgid "" @@ -4706,7 +4771,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:474 +#: ../src/qtui/settingspages/identitiessettingspage.cpp:479 msgctxt "NickEditDlg|" msgid "Add Nickname" msgstr "Add Nickname" @@ -4721,7 +4786,7 @@ msgctxt "NotificationsSettingsPage|" msgid "Notifications" msgstr "Notifications" -#: ../src/qtui/phononnotificationbackend.cpp:172 +#: ../src/qtui/phononnotificationbackend.cpp:186 msgctxt "PhononNotificationBackend::ConfigWidget|" msgid "Select Audio File" msgstr "Select Audio File" @@ -4942,27 +5007,27 @@ msgctxt "QssParser|" msgid "Invalid font size specification: %1" msgstr "Invalid font size specification: %1" -#: ../src/common/util.cpp:162 +#: ../src/common/util.cpp:169 msgctxt "Quassel::secondsToString()|" msgid "year" msgstr "year" -#: ../src/common/util.cpp:163 +#: ../src/common/util.cpp:170 msgctxt "Quassel::secondsToString()|" msgid "day" msgstr "day" -#: ../src/common/util.cpp:164 +#: ../src/common/util.cpp:171 msgctxt "Quassel::secondsToString()|" msgid "h" msgstr "h" -#: ../src/common/util.cpp:165 +#: ../src/common/util.cpp:172 msgctxt "Quassel::secondsToString()|" msgid "min" msgstr "min" -#: ../src/common/util.cpp:166 +#: ../src/common/util.cpp:173 msgctxt "Quassel::secondsToString()|" msgid "sec" msgstr "sec" @@ -5246,27 +5311,7 @@ msgctxt "ShortcutsSettingsPage|" msgid "Shortcuts" msgstr "Shortcuts" -#: ../src/common/signalproxy.cpp:981 -msgctxt "SignalProxy|" -msgid "Peer tried to send package larger than max package size!" -msgstr "Peer tried to send package larger than max package size!" - -#: ../src/common/signalproxy.cpp:986 -msgctxt "SignalProxy|" -msgid "Peer tried to send 0 byte package!" -msgstr "Peer tried to send 0 byte package!" - -#: ../src/common/signalproxy.cpp:1003 -msgctxt "SignalProxy|" -msgid "Peer sent corrupted compressed data!" -msgstr "Peer sent corrupted compressed data!" - -#: ../src/common/signalproxy.cpp:1019 -msgctxt "SignalProxy|" -msgid "Peer sent corrupt data: unable to load QVariant!" -msgstr "Peer sent corrupt data: unable to load QVariant!" - -#: ../src/common/signalproxy.cpp:1168 +#: ../src/common/signalproxy.cpp:736 msgctxt "SignalProxy|" msgid "Disconnecting" msgstr "Disconnecting" @@ -5723,108 +5768,108 @@ msgstr "Topic Widget" #. Topic Message #. ---------- #. Invite Message -#: ../src/uisupport/uistyle.cpp:638 ../src/uisupport/uistyle.cpp:641 -#: ../src/uisupport/uistyle.cpp:682 ../src/uisupport/uistyle.cpp:685 -#: ../src/uisupport/uistyle.cpp:688 ../src/uisupport/uistyle.cpp:695 -#: ../src/uisupport/uistyle.cpp:729 +#: ../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 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "%1" msgstr "%1" #. Action Message -#: ../src/uisupport/uistyle.cpp:644 +#: ../src/uisupport/uistyle.cpp:672 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "%DN%1%DN %2" msgstr "%DN%1%DN %2" #. Nick Message -#: ../src/uisupport/uistyle.cpp:648 +#: ../src/uisupport/uistyle.cpp:676 #, 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:649 +#: ../src/uisupport/uistyle.cpp:677 #, 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:653 +#: ../src/uisupport/uistyle.cpp:681 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "User mode: %DM%1%DM" msgstr "User mode: %DM%1%DM" -#: ../src/uisupport/uistyle.cpp:654 +#: ../src/uisupport/uistyle.cpp:682 #, 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:658 +#: ../src/uisupport/uistyle.cpp:686 #, 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:661 +#: ../src/uisupport/uistyle.cpp:689 #, 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:666 +#: ../src/uisupport/uistyle.cpp:694 #, 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:674 +#: ../src/uisupport/uistyle.cpp:702 #, 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:691 +#: ../src/uisupport/uistyle.cpp:720 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "{Day changed to %1}" msgstr "{Day changed to %1}" -#: ../src/uisupport/uistyle.cpp:704 +#: ../src/uisupport/uistyle.cpp:734 #, 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:708 ../src/uisupport/uistyle.cpp:724 +#: ../src/uisupport/uistyle.cpp:738 ../src/uisupport/uistyle.cpp:754 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "%DN%1%DN (%2 more)" msgstr "%DN%1%DN (%2 more)" -#: ../src/uisupport/uistyle.cpp:719 +#: ../src/uisupport/uistyle.cpp:749 #, 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:731 ../src/uisupport/uistyle.cpp:779 +#: ../src/uisupport/uistyle.cpp:761 ../src/uisupport/uistyle.cpp:809 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "[%1]" msgstr "[%1]" -#: ../src/uisupport/uistyle.cpp:777 +#: ../src/uisupport/uistyle.cpp:807 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "<%1>"