X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=po%2Fru.po;h=8dcb3a6675c5f40418bc45fed32cdaf0c2aa9896;hp=2918183bfc9421c1986ebefd74071e5609de1242;hb=3c984e549489eddc18dcbf1864e26ef32e3eb586;hpb=5b1428bf281a0142c9286380eec3d0655c39fc44 diff --git a/po/ru.po b/po/ru.po index 2918183b..8dcb3a66 100644 --- a/po/ru.po +++ b/po/ru.po @@ -7,16 +7,489 @@ msgid "" msgstr "" "Project-Id-Version: Quassel IRC\n" "Report-Msgid-Bugs-To: http://bugs.quassel-irc.org/\n" -"PO-Revision-Date: 2013-07-09 11:25+0000\n" +"PO-Revision-Date: 2015-03-25 12:13+0000\n" "Last-Translator: Daniel Albers \n" -"Language-Team: Russian (http://www.transifex.com/projects/p/quassel/language/ru/)\n" +"Language-Team: Russian (http://www.transifex.com/ald/quassel/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ru\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" "X-Qt-Contexts: true\n" +#: ../src/uisupport/aboutdata.cpp:136 +msgctxt "AboutData|" +msgid "Quassel IRC" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:141 +msgctxt "AboutData|" +msgid "A modern, distributed IRC client" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:174 +msgctxt "AboutData|" +msgid "Project Founder, Lead Developer" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:175 +msgctxt "AboutData|" +msgid "Project Motivator, Lead Developer" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:176 +msgctxt "AboutData|" +msgid "Former Lead Developer" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:177 +msgctxt "AboutData|" +msgid "Master of Translation, many fixes and enhancements" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:178 +msgctxt "AboutData|" +msgid "Many features, fixes and improvements" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:179 +msgctxt "AboutData|" +msgid "Many fixes and improvements, bug and patch triaging, community support" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:183 ../src/uisupport/aboutdata.cpp:192 +msgctxt "AboutData|" +msgid "Chatview improvements" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:184 +msgctxt "AboutData|" +msgid "Early beta tester and bughunter, Danish translation" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:185 ../src/uisupport/aboutdata.cpp:261 +#: ../src/uisupport/aboutdata.cpp:284 +msgctxt "AboutData|" +msgid "Spanish translation" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:186 +msgctxt "AboutData|" +msgid "Tray icon fix" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:187 +msgctxt "AboutData|" +msgid "Language improvements" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:188 +msgctxt "AboutData|" +msgid "Documentation improvements" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:189 ../src/uisupport/aboutdata.cpp:285 +msgctxt "AboutData|" +msgid "Romanian translation" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:190 ../src/uisupport/aboutdata.cpp:235 +#: ../src/uisupport/aboutdata.cpp:246 ../src/uisupport/aboutdata.cpp:247 +msgctxt "AboutData|" +msgid "Finnish translation" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:191 +msgctxt "AboutData|" +msgid "Message indicator support" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:193 +msgctxt "AboutData|" +msgid "Windows build system fixes" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:194 +msgctxt "AboutData|" +msgid "Crash fixes" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:195 ../src/uisupport/aboutdata.cpp:215 +#: ../src/uisupport/aboutdata.cpp:271 +msgctxt "AboutData|" +msgid "French translation" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:196 +msgctxt "AboutData|" +msgid "Usability review" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:197 +msgctxt "AboutData|" +msgid "SASL support" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:198 +msgctxt "AboutData|" +msgid "Various improvements" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:199 ../src/uisupport/aboutdata.cpp:200 +#: ../src/uisupport/aboutdata.cpp:204 +msgctxt "AboutData|" +msgid "Various fixes and improvements" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:201 +msgctxt "AboutData|" +msgid "Galician translation" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:202 +msgctxt "AboutData|" +msgid "Esperanto translation" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:203 +msgctxt "AboutData|" +msgid "Japanese translation" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:205 ../src/uisupport/aboutdata.cpp:263 +msgctxt "AboutData|" +msgid "Gentoo maintainer" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:206 +msgctxt "AboutData|" +msgid "Early beta tester and bughunter (on Vista™!)" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:207 +msgctxt "AboutData|" +msgid "Translation system fixes" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:208 +msgctxt "AboutData|" +msgid "OSX Notification Center support" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:209 ../src/uisupport/aboutdata.cpp:257 +msgctxt "AboutData|" +msgid "Fixes" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:210 ../src/uisupport/aboutdata.cpp:259 +msgctxt "AboutData|" +msgid "Mac fixes" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:211 +msgctxt "AboutData|" +msgid "D-Bus notifications" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:212 +msgctxt "AboutData|" +msgid "Polish translation" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:213 +msgctxt "AboutData|" +msgid "Build system improvements" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:214 +msgctxt "AboutData|" +msgid "Formatting support and other input line improvements, many other fixes" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:216 +msgctxt "AboutData|" +msgid "BluesTheme stylesheet" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:217 ../src/uisupport/aboutdata.cpp:251 +#: ../src/uisupport/aboutdata.cpp:279 +msgctxt "AboutData|" +msgid "Russian translation" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:218 ../src/uisupport/aboutdata.cpp:253 +msgctxt "AboutData|" +msgid "Italian translation" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:219 +msgctxt "AboutData|" +msgid "Certificate handling improvements" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:220 +msgctxt "AboutData|" +msgid "Sanitize topic handling" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:221 +msgctxt "AboutData|" +msgid "Norwegian translation" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:222 +msgctxt "AboutData|" +msgid "Hungarian translation" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:223 +msgctxt "AboutData|" +msgid "IRC parser improvements" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:224 ../src/uisupport/aboutdata.cpp:296 +#: ../src/uisupport/aboutdata.cpp:300 +msgctxt "AboutData|" +msgid "Turkish translation" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:225 +msgctxt "AboutData|" +msgid "Initial Qt5 support" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:226 +msgctxt "AboutData|" +msgid "{Ku|U}buntu packager, motivator, promoter" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:227 +msgctxt "AboutData|" +msgid "Various features" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:228 ../src/uisupport/aboutdata.cpp:229 +#: ../src/uisupport/aboutdata.cpp:234 ../src/uisupport/aboutdata.cpp:239 +msgctxt "AboutData|" +msgid "Various fixes" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:230 ../src/uisupport/aboutdata.cpp:231 +#: ../src/uisupport/aboutdata.cpp:270 ../src/uisupport/aboutdata.cpp:273 +#: ../src/uisupport/aboutdata.cpp:277 ../src/uisupport/aboutdata.cpp:281 +msgctxt "AboutData|" +msgid "Bugfixes" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:232 +msgctxt "AboutData|" +msgid "Postgres migration fixes" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:233 +msgctxt "AboutData|" +msgid "Context menu fixes" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:236 +msgctxt "AboutData|" +msgid "Many fixes and improvements, bug triaging" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:237 +msgctxt "AboutData|" +msgid "Original \"All-Seeing Eye\" logo" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:238 +msgctxt "AboutData|" +msgid "Project founder, various improvements" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:240 +msgctxt "AboutData|" +msgid "Serbian translation" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:241 +msgctxt "AboutData|" +msgid "Slovenian translation" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:242 +msgctxt "AboutData|" +msgid "" +"Tireless tester, {Ku|U}buntu tester and lobbyist, liters of delicious " +"Finnish alcohol" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:243 +msgctxt "AboutData|" +msgid "Qt5 porting help, Travis CI setup" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:244 ../src/uisupport/aboutdata.cpp:254 +#: ../src/uisupport/aboutdata.cpp:256 ../src/uisupport/aboutdata.cpp:293 +msgctxt "AboutData|" +msgid "German translation" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:245 +msgctxt "AboutData|" +msgid "Buffer merge improvements" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:248 +msgctxt "AboutData|" +msgid "OSX improvements" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:249 +msgctxt "AboutData|" +msgid "Lithuanian translation" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:250 +msgctxt "AboutData|" +msgid "Documentation fixes" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:252 +msgctxt "AboutData|" +msgid "Ideas, hacking, initial motivation" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:255 +msgctxt "AboutData|" +msgid "Core and other fixes, QuasselDroid" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:258 +msgctxt "AboutData|" +msgid "German translation, fixes" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:260 +msgctxt "AboutData|" +msgid "Many fixes and improvements; Ubuntu live packages" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:262 +msgctxt "AboutData|" +msgid "Tons of Oxygen icons including the Quassel logo" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:264 +msgctxt "AboutData|" +msgid "MinGW support, SNORE backend, Windows packaging" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:265 +msgctxt "AboutData|" +msgid "Initial design and main window layout" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:266 +msgctxt "AboutData|" +msgid "Early beta tester and bughunter" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:267 +msgctxt "AboutData|" +msgid "Danish translation" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:268 +msgctxt "AboutData|" +msgid "Linewrap for input line" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:269 +msgctxt "AboutData|" +msgid "/print command" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:272 +msgctxt "AboutData|" +msgid "Build system fixes" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:274 +msgctxt "AboutData|" +msgid "Emacs keybindings" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:275 +msgctxt "AboutData|" +msgid "Highlight configuration improvements" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:276 +msgctxt "AboutData|" +msgid "Kubuntu packager, (packaging/build system) bughunter" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:278 +msgctxt "AboutData|" +msgid "Audio backend improvements" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:280 +msgctxt "AboutData|" +msgid "Dutch translation" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:282 ../src/uisupport/aboutdata.cpp:283 +#: ../src/uisupport/aboutdata.cpp:288 ../src/uisupport/aboutdata.cpp:289 +msgctxt "AboutData|" +msgid "Greek translation" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:286 +msgctxt "AboutData|" +msgid "Korean translation" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:287 +msgctxt "AboutData|" +msgid "Norwegian translation, documentation" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:290 +msgctxt "AboutData|" +msgid "Former Windows builder" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:291 +msgctxt "AboutData|" +msgid "Fixes, Debian packaging" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:292 +msgctxt "AboutData|" +msgid "Fixes and feedback" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:294 ../src/uisupport/aboutdata.cpp:295 +msgctxt "AboutData|" +msgid "Czech translation" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:297 +msgctxt "AboutData|" +msgid "Network detection improvements" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:298 +msgctxt "AboutData|" +msgid "Ukrainian translation" +msgstr "" + +#: ../src/uisupport/aboutdata.cpp:299 +msgctxt "AboutData|" +msgid "Portuguese translation" +msgstr "" + #: ../src/qtui/ui/aboutdlg.ui:17 msgctxt "AboutDlg|" msgid "About Quassel" @@ -31,46 +504,38 @@ msgid "" "

Quassel IRC

" msgstr "

Quassel IRC

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

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

" -msgstr "

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 "&О программе" -#: ../src/qtui/ui/aboutdlg.ui:135 +#: ../src/qtui/ui/aboutdlg.ui:132 msgctxt "AboutDlg|" msgid "A&uthors" msgstr "&Авторы" -#: ../src/qtui/ui/aboutdlg.ui:155 +#: ../src/qtui/ui/aboutdlg.ui:152 msgctxt "AboutDlg|" msgid "&Contributors" msgstr "&Помощники" -#: ../src/qtui/ui/aboutdlg.ui:175 +#: ../src/qtui/ui/aboutdlg.ui:172 msgctxt "AboutDlg|" msgid "&Thanks To" msgstr "&Благодарности" -#: ../src/qtui/aboutdlg.cpp:33 +#: ../src/qtui/aboutdlg.cpp:38 #, qt-format msgctxt "AboutDlg|" msgid "Version: %1
Protocol version: %2
Built: %3" msgstr "Версия: %1
Версия протокола: %2
Дата сборки: %3" -#: ../src/qtui/aboutdlg.cpp:49 +#: ../src/qtui/aboutdlg.cpp:54 +#, 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" @@ -82,43 +547,50 @@ msgid "" "report bugs." msgstr "" -#: ../src/qtui/aboutdlg.cpp:67 +#: ../src/qtui/aboutdlg.cpp:72 msgctxt "AboutDlg|" msgid "Quassel IRC is mainly developed by:" msgstr "Quassel IRC разрабатывается в основном:" -#: ../src/qtui/aboutdlg.cpp:84 +#: ../src/qtui/aboutdlg.cpp:87 msgctxt "AboutDlg|" msgid "" "We would like to thank the following contributors (in alphabetical order) " "and everybody we forgot to mention here:" msgstr "Мы хотим выразить благодарность следующим людям, внесшим свой вклад (в алфавитном порядке), а также всем, кого мы забыли здесь упомянуть:" -#: ../src/qtui/aboutdlg.cpp:185 +#: ../src/qtui/aboutdlg.cpp:91 +msgctxt "AboutDlg|" +msgid "" +"...and anybody else finding and reporting bugs, giving feedback, helping " +"others and being part of the community!" +msgstr "" + +#: ../src/qtui/aboutdlg.cpp:100 msgctxt "AboutDlg|" msgid "" "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
" -msgstr "Особая благодарность:
 John \"nox\" Hand
за оригинальный значок Quassel - Всевидящее Око
 The Oxygen Team
за всю графическую работу для Quassel
 Qt Software, ранее известная как Trolltech
за создание Qt и Qtopia, и за поддержку развития QuasselTopia с помощью Greenphones и прочего
за поддержку жизни Qt, и за спонсорство разработки Quassel Mobile с помощью N810
" - -#: ../src/core/abstractsqlstorage.cpp:124 +"eye.png\"> 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 sponsoring development of " +"Quassel Mobile with N810s
" +msgstr "" + +#: ../src/core/abstractsqlstorage.cpp:127 #, qt-format msgctxt "AbstractSqlStorage|" msgid "" "Installed Schema (version %1) is not up to date. Upgrading to version %2..." msgstr "Используемая схема (версии %1) устарела. Обновляю до версии %2..." -#: ../src/core/abstractsqlstorage.cpp:126 +#: ../src/core/abstractsqlstorage.cpp:129 msgctxt "AbstractSqlStorage|" msgid "Upgrade failed..." msgstr "Обновление не удалось..." @@ -171,12 +643,12 @@ msgctxt "AliasesSettingsPage|" msgid "Delete" msgstr "Удалить" -#: ../src/qtui/settingspages/aliasessettingspage.cpp:29 +#: ../src/qtui/settingspages/aliasessettingspage.cpp:28 msgctxt "AliasesSettingsPage|" msgid "IRC" msgstr "IRC" -#: ../src/qtui/settingspages/aliasessettingspage.cpp:29 +#: ../src/qtui/settingspages/aliasessettingspage.cpp:28 msgctxt "AliasesSettingsPage|" msgid "Aliases" msgstr "Псевдонимы" @@ -432,18 +904,18 @@ msgctxt "BacklogSettingsPage|" msgid "Backlog Fetching" msgstr "Просмотр Журнала" -#: ../src/client/networkmodel.cpp:386 +#: ../src/client/networkmodel.cpp:401 #, qt-format msgctxt "BufferItem|" msgid "

%1 - %2

" msgstr "

%1 - %2

" -#: ../src/uisupport/bufferview.cpp:272 +#: ../src/uisupport/bufferview.cpp:268 msgctxt "BufferView|" msgid "Merge buffers permanently?" msgstr "Произвести необратимое слияние буферов?" -#: ../src/uisupport/bufferview.cpp:273 +#: ../src/uisupport/bufferview.cpp:269 #, qt-format msgctxt "BufferView|" msgid "" @@ -461,12 +933,12 @@ msgctxt "BufferViewEditDlg|" msgid "Please enter a name for the chat list:" msgstr "Пожалуйста, введите имя чатлиста:" -#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:575 +#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:582 msgctxt "BufferViewEditDlg|" msgid "Add Chat List" msgstr "Добавить Чатлист" -#: ../src/uisupport/bufferviewfilter.cpp:54 +#: ../src/uisupport/bufferviewfilter.cpp:53 msgctxt "BufferViewFilter|" msgid "Show / Hide Chats" msgstr "Показать / Скрыть Чаты" @@ -502,7 +974,7 @@ msgid "Network:" msgstr "Сеть:" #: ../src/qtui/settingspages/bufferviewsettingspage.ui:100 -#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:123 +#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:128 msgctxt "BufferViewSettingsPage|" msgid "All" msgstr "Все" @@ -536,40 +1008,45 @@ msgstr "Скрыть неактивные чаты" #: ../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 "Добавлять новые чаты автоматически" -#: ../src/qtui/settingspages/bufferviewsettingspage.ui:149 +#: ../src/qtui/settingspages/bufferviewsettingspage.ui:156 msgctxt "BufferViewSettingsPage|" msgid "Sort alphabetically" msgstr "Сортировать по алфавиту" -#: ../src/qtui/settingspages/bufferviewsettingspage.ui:156 +#: ../src/qtui/settingspages/bufferviewsettingspage.ui:163 msgctxt "BufferViewSettingsPage|" msgid "Minimum Activity:" msgstr "Минимальная активность:" -#: ../src/qtui/settingspages/bufferviewsettingspage.ui:164 +#: ../src/qtui/settingspages/bufferviewsettingspage.ui:171 msgctxt "BufferViewSettingsPage|" msgid "No Activity" msgstr "Нет активности" -#: ../src/qtui/settingspages/bufferviewsettingspage.ui:169 +#: ../src/qtui/settingspages/bufferviewsettingspage.ui:176 msgctxt "BufferViewSettingsPage|" msgid "Other Activity" msgstr "Другая активность" -#: ../src/qtui/settingspages/bufferviewsettingspage.ui:174 +#: ../src/qtui/settingspages/bufferviewsettingspage.ui:181 msgctxt "BufferViewSettingsPage|" msgid "New Message" msgstr "Новое сообщение" -#: ../src/qtui/settingspages/bufferviewsettingspage.ui:179 +#: ../src/qtui/settingspages/bufferviewsettingspage.ui:186 msgctxt "BufferViewSettingsPage|" msgid "Highlight" msgstr "Подсветка" -#: ../src/qtui/settingspages/bufferviewsettingspage.ui:205 +#: ../src/qtui/settingspages/bufferviewsettingspage.ui:212 msgctxt "BufferViewSettingsPage|" msgid "Preview:" msgstr "Предварительный просмотр:" @@ -584,12 +1061,12 @@ msgctxt "BufferViewSettingsPage|" msgid "Custom Chat Lists" msgstr "Пользовательские Чатлисты" -#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:378 +#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:383 msgctxt "BufferViewSettingsPage|" msgid "Delete Chat List?" msgstr "Удалить Чатлист?" -#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:379 +#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:384 #, qt-format msgctxt "BufferViewSettingsPage|" msgid "Do you really want to delete the chat list \"%1\"?" @@ -600,61 +1077,61 @@ msgctxt "BufferViewWidget|" msgid "BufferView" msgstr "СписокБуферов" -#: ../src/qtui/bufferwidget.cpp:78 +#: ../src/qtui/bufferwidget.cpp:79 msgctxt "BufferWidget|" msgid "Zoom In" msgstr "Увеличить" -#: ../src/qtui/bufferwidget.cpp:84 +#: ../src/qtui/bufferwidget.cpp:85 msgctxt "BufferWidget|" msgid "Zoom Out" msgstr "Уменьшить" -#: ../src/qtui/bufferwidget.cpp:89 +#: ../src/qtui/bufferwidget.cpp:90 msgctxt "BufferWidget|" msgid "Actual Size" msgstr "Действительный размер" -#: ../src/qtui/bufferwidget.cpp:93 +#: ../src/qtui/bufferwidget.cpp:94 msgctxt "BufferWidget|" msgid "Set Marker Line" msgstr "Отметка:" -#: ../src/qtui/bufferwidget.cpp:97 +#: ../src/qtui/bufferwidget.cpp:98 msgctxt "BufferWidget|" msgid "Go to Marker Line" msgstr "Отметка:" -#: ../src/client/networkmodel.cpp:565 +#: ../src/client/networkmodel.cpp:583 ../src/client/networkmodel.cpp:585 #, qt-format msgctxt "ChannelBufferItem|" msgid "Channel %1" msgstr "Канал %1" -#: ../src/client/networkmodel.cpp:568 +#: ../src/client/networkmodel.cpp:589 #, qt-format msgctxt "ChannelBufferItem|" msgid "Users: %1" msgstr "Пользователи: %1" -#: ../src/client/networkmodel.cpp:572 +#: ../src/client/networkmodel.cpp:593 #, qt-format msgctxt "ChannelBufferItem|" msgid "Mode: %1" msgstr "Режим: %1" -#: ../src/client/networkmodel.cpp:583 +#: ../src/client/networkmodel.cpp:608 #, qt-format msgctxt "ChannelBufferItem|" msgid "Topic: %1" msgstr "Тема: %1" -#: ../src/client/networkmodel.cpp:588 +#: ../src/client/networkmodel.cpp:613 msgctxt "ChannelBufferItem|" msgid "Not active
Double-click to join" msgstr "Неактивно
Дважды щёлкните чтобы войти" -#: ../src/client/networkmodel.cpp:591 +#: ../src/client/networkmodel.cpp:616 #, qt-format msgctxt "ChannelBufferItem|" msgid "

%1

" @@ -741,7 +1218,7 @@ msgid "Move selected buffers to the right" msgstr "Переместить выбранные буферы вправо" #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:133 -#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:258 +#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:273 msgctxt "ChatMonitorSettingsPage|" msgid "Show:" msgstr "Показывать:" @@ -762,27 +1239,47 @@ msgctxt "ChatMonitorSettingsPage|" msgid "Show own messages" msgstr "Показывать свои сообщения" -#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35 +#: ../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:36 msgctxt "ChatMonitorSettingsPage|" msgid "Interface" msgstr "Интерфейс" -#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35 +#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:36 msgctxt "ChatMonitorSettingsPage|" msgid "Chat Monitor" msgstr "Монитор чата" -#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:59 +#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:60 msgctxt "ChatMonitorSettingsPage|" msgid "Opt In" msgstr "Белый список" -#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:60 +#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:61 msgctxt "ChatMonitorSettingsPage|" msgid "Opt Out" msgstr "Чёрный список" -#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:261 +#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:276 msgctxt "ChatMonitorSettingsPage|" msgid "Ignore:" msgstr "Игнорировать:" @@ -807,11 +1304,22 @@ msgctxt "ChatMonitorView|" msgid "Configure..." msgstr "Настроить..." -#: ../src/qtui/chatscene.cpp:803 +#: ../src/qtui/chatscene.cpp:826 msgctxt "ChatScene|" msgid "Copy Selection" msgstr "Скопировать выделение" +#: ../src/qtui/chatscene.cpp:833 +#, qt-format +msgctxt "ChatScene|" +msgid "Search '%1'" +msgstr "" + +#: ../src/qtui/chatscene.cpp:845 +msgctxt "ChatScene|" +msgid "Reset Column Widths" +msgstr "" + #: ../src/qtui/ui/chatviewsearchbar.ui:13 msgctxt "ChatViewSearchBar|" msgid "Form" @@ -912,96 +1420,128 @@ msgstr "" #: ../src/qtui/settingspages/chatviewsettingspage.ui:159 msgctxt "ChatViewSettingsPage|" +msgid "" +"Set the marker line to the bottom of the current chat window when Quassel " +"loses focus." +msgstr "" + +#: ../src/qtui/settingspages/chatviewsettingspage.ui:162 +msgctxt "ChatViewSettingsPage|" +msgid "Set marker line automatically when Quassel loses focus" +msgstr "" + +#: ../src/qtui/settingspages/chatviewsettingspage.ui: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 "Пользовательские цвета" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:177 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:220 msgctxt "ChatViewSettingsPage|" msgid "Action:" msgstr "Действие:" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:184 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:208 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:232 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:269 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:293 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:324 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:348 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:372 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:396 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:413 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:453 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:470 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:487 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:504 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:521 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:538 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:555 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:572 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:589 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:606 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:623 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:640 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:657 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:674 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:691 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:708 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:736 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:227 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:251 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:275 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:312 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:336 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:367 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:391 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:415 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:439 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:456 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:496 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:513 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:530 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:547 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:564 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:581 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:598 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:615 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:632 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:649 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:666 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:683 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:700 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:717 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:734 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:751 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:779 msgctxt "ChatViewSettingsPage|" msgid "..." msgstr "..." -#: ../src/qtui/settingspages/chatviewsettingspage.ui:201 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:244 msgctxt "ChatViewSettingsPage|" msgid "Timestamp:" msgstr "Время:" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:225 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:268 msgctxt "ChatViewSettingsPage|" msgid "Channel message:" msgstr "Сообщение канала:" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:262 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:305 msgctxt "ChatViewSettingsPage|" msgid "Highlight foreground:" msgstr "Подсветка:" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:286 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:329 msgctxt "ChatViewSettingsPage|" msgid "Command message:" msgstr "Сообщение команды:" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:310 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:353 msgctxt "ChatViewSettingsPage|" msgid "Highlight background:" msgstr "Подсвечивать ники" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:317 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:360 msgctxt "ChatViewSettingsPage|" msgid "Server message:" msgstr "Сообщение сервера:" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:341 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:384 msgctxt "ChatViewSettingsPage|" msgid "Marker line:" msgstr "Отметка:" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:365 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:408 msgctxt "ChatViewSettingsPage|" msgid "Error message:" msgstr "Сообщение об ошибке:" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:389 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:432 msgctxt "ChatViewSettingsPage|" msgid "Background:" msgstr "Фон" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:433 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:476 msgctxt "ChatViewSettingsPage|" msgid "Use Sender Coloring" msgstr "Использовать Цветовую Палитру Отправителя" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:729 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:772 msgctxt "ChatViewSettingsPage|" msgid "Own messages:" msgstr "Собственные сообщения:" @@ -1018,14 +1558,111 @@ msgstr "Вид Окна Чата" #: ../src/qtui/settingspages/chatviewsettingspage.cpp:41 msgctxt "ChatViewSettingsPage|" -msgid "You need at 0.6 quasselcore to use this feature" +msgid "You need at least version 0.6 of quasselcore to use this feature" msgstr "Для использования этой функции вам нужно иметь quasselcore версии 0.6" -#: ../src/client/client.cpp:318 +#: ../src/common/qt5cliparser.cpp:30 +msgctxt "CliParser|" +msgid "Quassel IRC is a modern, distributed IRC client." +msgstr "" + +#: ../src/client/client.cpp:324 msgctxt "Client|" msgid "Identity already exists in client!" msgstr "Личность уже есть в клиенте!" +#: ../src/client/clientauthhandler.cpp:65 +#: ../src/client/clientauthhandler.cpp:472 +msgctxt "ClientAuthHandler|" +msgid "Unencrypted connection canceled" +msgstr "Незашифрованное подключение отменено" + +#: ../src/client/clientauthhandler.cpp:87 +#: ../src/client/clientauthhandler.cpp:103 +#, qt-format +msgctxt "ClientAuthHandler|" +msgid "Connecting to %1..." +msgstr "Соединяюсь с %1..." + +#: ../src/client/clientauthhandler.cpp:99 +#, qt-format +msgctxt "ClientAuthHandler|" +msgid "Looking up %1..." +msgstr "Ищу хост %1..." + +#: ../src/client/clientauthhandler.cpp:106 +#: ../src/client/clientauthhandler.cpp:316 +#, qt-format +msgctxt "ClientAuthHandler|" +msgid "Connected to %1" +msgstr "Соединение с %1 установлено" + +#: ../src/client/clientauthhandler.cpp:110 +#, qt-format +msgctxt "ClientAuthHandler|" +msgid "Disconnecting from %1..." +msgstr "Идет отключение от %1..." + +#: ../src/client/clientauthhandler.cpp:114 +msgctxt "ClientAuthHandler|" +msgid "Disconnected" +msgstr "Отключено" + +#: ../src/client/clientauthhandler.cpp:149 +msgctxt "ClientAuthHandler|" +msgid "Reconnecting in compatibility mode..." +msgstr "" + +#: ../src/client/clientauthhandler.cpp:237 +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:240 +msgctxt "ClientAuthHandler|" +msgid "Core speaks none of the protocols we support" +msgstr "" + +#: ../src/client/clientauthhandler.cpp:255 +#, 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:257 +msgctxt "ClientAuthHandler|" +msgid "Incompatible protocol version, connection to core refused" +msgstr "" + +#: ../src/client/clientauthhandler.cpp:279 +msgctxt "ClientAuthHandler|" +msgid "Synchronizing to core..." +msgstr "Синхронизация с ядром..." + +#: ../src/client/clientauthhandler.cpp:294 +msgctxt "ClientAuthHandler|" +msgid "The core refused connection from this client" +msgstr "" + +#: ../src/client/clientauthhandler.cpp:358 +msgctxt "ClientAuthHandler|" +msgid "Logging in..." +msgstr "Авторизуюсь..." + +#: ../src/client/clientauthhandler.cpp:363 +msgctxt "ClientAuthHandler|" +msgid "Login canceled" +msgstr "Вход в систему отменен" + +#: ../src/client/clientauthhandler.cpp:421 +msgctxt "ClientAuthHandler|" +msgid "Unencrypted connection cancelled" +msgstr "" + #: ../src/client/clientbacklogmanager.cpp:178 #, qt-format msgctxt "ClientBacklogManager|" @@ -1121,7 +1758,7 @@ msgctxt "ConnectionSettingsPage|" msgid "IRC" msgstr "IRC" -#: ../src/qtui/chatitem.cpp:803 +#: ../src/qtui/chatitem.cpp:801 msgctxt "ContentsChatItem|" msgid "Copy Link Address" msgstr "Скопировать адрес ссылки" @@ -1158,195 +1795,200 @@ msgstr "Войти в Чат" #: ../src/uisupport/contextmenuactionprovider.cpp:47 msgctxt "ContextMenuActionProvider|" +msgid "Joins/Parts/Quits" +msgstr "" + +#: ../src/uisupport/contextmenuactionprovider.cpp:48 +msgctxt "ContextMenuActionProvider|" msgid "Joins" msgstr "Входы" -#: ../src/uisupport/contextmenuactionprovider.cpp:48 +#: ../src/uisupport/contextmenuactionprovider.cpp:49 msgctxt "ContextMenuActionProvider|" msgid "Parts" msgstr "Выходы из канала" -#: ../src/uisupport/contextmenuactionprovider.cpp:49 +#: ../src/uisupport/contextmenuactionprovider.cpp:50 msgctxt "ContextMenuActionProvider|" msgid "Quits" msgstr "Выходы из сети" -#: ../src/uisupport/contextmenuactionprovider.cpp:50 +#: ../src/uisupport/contextmenuactionprovider.cpp:51 msgctxt "ContextMenuActionProvider|" msgid "Nick Changes" msgstr "Смены ника" -#: ../src/uisupport/contextmenuactionprovider.cpp:51 +#: ../src/uisupport/contextmenuactionprovider.cpp:52 msgctxt "ContextMenuActionProvider|" msgid "Mode Changes" msgstr "Смены режимов" -#: ../src/uisupport/contextmenuactionprovider.cpp:52 +#: ../src/uisupport/contextmenuactionprovider.cpp:53 msgctxt "ContextMenuActionProvider|" msgid "Day Changes" msgstr "Смены дня" -#: ../src/uisupport/contextmenuactionprovider.cpp:53 +#: ../src/uisupport/contextmenuactionprovider.cpp:54 msgctxt "ContextMenuActionProvider|" msgid "Topic Changes" msgstr "Смены ника" -#: ../src/uisupport/contextmenuactionprovider.cpp:54 +#: ../src/uisupport/contextmenuactionprovider.cpp:55 msgctxt "ContextMenuActionProvider|" msgid "Set as Default..." msgstr "Задать буфер по умолчанию..." -#: ../src/uisupport/contextmenuactionprovider.cpp:55 +#: ../src/uisupport/contextmenuactionprovider.cpp:56 msgctxt "ContextMenuActionProvider|" msgid "Use Defaults..." msgstr "Использовать по умолчанию..." -#: ../src/uisupport/contextmenuactionprovider.cpp:57 +#: ../src/uisupport/contextmenuactionprovider.cpp:58 msgctxt "ContextMenuActionProvider|" msgid "Join Channel..." msgstr "Зайти на канал..." -#: ../src/uisupport/contextmenuactionprovider.cpp:59 +#: ../src/uisupport/contextmenuactionprovider.cpp:60 msgctxt "ContextMenuActionProvider|" msgid "Start Query" msgstr "Начать диалог" -#: ../src/uisupport/contextmenuactionprovider.cpp:60 +#: ../src/uisupport/contextmenuactionprovider.cpp:61 msgctxt "ContextMenuActionProvider|" msgid "Show Query" msgstr "Показать диалог" -#: ../src/uisupport/contextmenuactionprovider.cpp:61 +#: ../src/uisupport/contextmenuactionprovider.cpp:62 msgctxt "ContextMenuActionProvider|" msgid "Whois" msgstr "Whois" -#: ../src/uisupport/contextmenuactionprovider.cpp:63 +#: ../src/uisupport/contextmenuactionprovider.cpp:64 msgctxt "ContextMenuActionProvider|" msgid "Version" msgstr "Версия" -#: ../src/uisupport/contextmenuactionprovider.cpp:64 +#: ../src/uisupport/contextmenuactionprovider.cpp:65 msgctxt "ContextMenuActionProvider|" msgid "Time" msgstr "Время" -#: ../src/uisupport/contextmenuactionprovider.cpp:65 +#: ../src/uisupport/contextmenuactionprovider.cpp:66 msgctxt "ContextMenuActionProvider|" msgid "Ping" msgstr "Ping" -#: ../src/uisupport/contextmenuactionprovider.cpp:66 +#: ../src/uisupport/contextmenuactionprovider.cpp:67 msgctxt "ContextMenuActionProvider|" msgid "Client info" msgstr "Информация о IRC клиенте" -#: ../src/uisupport/contextmenuactionprovider.cpp:67 +#: ../src/uisupport/contextmenuactionprovider.cpp:68 msgctxt "ContextMenuActionProvider|" msgid "Custom..." msgstr "" -#: ../src/uisupport/contextmenuactionprovider.cpp:79 +#: ../src/uisupport/contextmenuactionprovider.cpp:80 msgctxt "ContextMenuActionProvider|" msgid "Give Operator Status" msgstr "Дать оператора" -#: ../src/uisupport/contextmenuactionprovider.cpp:80 +#: ../src/uisupport/contextmenuactionprovider.cpp:81 msgctxt "ContextMenuActionProvider|" msgid "Take Operator Status" msgstr "Снять оператора" -#: ../src/uisupport/contextmenuactionprovider.cpp:81 +#: ../src/uisupport/contextmenuactionprovider.cpp:82 msgctxt "ContextMenuActionProvider|" msgid "Give Half-Operator Status" msgstr "" -#: ../src/uisupport/contextmenuactionprovider.cpp:82 +#: ../src/uisupport/contextmenuactionprovider.cpp:83 msgctxt "ContextMenuActionProvider|" msgid "Take Half-Operator Status" msgstr "" -#: ../src/uisupport/contextmenuactionprovider.cpp:83 +#: ../src/uisupport/contextmenuactionprovider.cpp:84 msgctxt "ContextMenuActionProvider|" msgid "Give Voice" msgstr "Дать голос" -#: ../src/uisupport/contextmenuactionprovider.cpp:84 +#: ../src/uisupport/contextmenuactionprovider.cpp:85 msgctxt "ContextMenuActionProvider|" msgid "Take Voice" msgstr "Снять голос" -#: ../src/uisupport/contextmenuactionprovider.cpp:85 +#: ../src/uisupport/contextmenuactionprovider.cpp:86 msgctxt "ContextMenuActionProvider|" msgid "Kick From Channel" msgstr "Выгнать с канала" -#: ../src/uisupport/contextmenuactionprovider.cpp:86 +#: ../src/uisupport/contextmenuactionprovider.cpp:87 msgctxt "ContextMenuActionProvider|" msgid "Ban From Channel" msgstr "Забанить на канале" -#: ../src/uisupport/contextmenuactionprovider.cpp:87 +#: ../src/uisupport/contextmenuactionprovider.cpp:88 msgctxt "ContextMenuActionProvider|" msgid "Kick && Ban" msgstr "Выгнать и забанить" -#: ../src/uisupport/contextmenuactionprovider.cpp:89 +#: ../src/uisupport/contextmenuactionprovider.cpp:90 msgctxt "ContextMenuActionProvider|" msgid "Hide Chat(s) Temporarily" msgstr "Скрыть чат(ы), временно" -#: ../src/uisupport/contextmenuactionprovider.cpp:90 +#: ../src/uisupport/contextmenuactionprovider.cpp:91 msgctxt "ContextMenuActionProvider|" msgid "Hide Chat(s) Permanently" msgstr "Скрыть чат(ы), Постоянно" -#: ../src/uisupport/contextmenuactionprovider.cpp:91 +#: ../src/uisupport/contextmenuactionprovider.cpp:92 msgctxt "ContextMenuActionProvider|" msgid "Show Channel List" msgstr "Показать список каналов" -#: ../src/uisupport/contextmenuactionprovider.cpp:92 +#: ../src/uisupport/contextmenuactionprovider.cpp:93 msgctxt "ContextMenuActionProvider|" msgid "Show Ignore List" msgstr "Показать список игнорируемых" -#: ../src/uisupport/contextmenuactionprovider.cpp:105 +#: ../src/uisupport/contextmenuactionprovider.cpp:108 msgctxt "ContextMenuActionProvider|" msgid "Hide Events" msgstr "Спрятать события" -#: ../src/uisupport/contextmenuactionprovider.cpp:113 +#: ../src/uisupport/contextmenuactionprovider.cpp:116 msgctxt "ContextMenuActionProvider|" msgid "CTCP" msgstr "CTCP" -#: ../src/uisupport/contextmenuactionprovider.cpp:128 +#: ../src/uisupport/contextmenuactionprovider.cpp:131 msgctxt "ContextMenuActionProvider|" msgid "Actions" msgstr "Действия" -#: ../src/uisupport/contextmenuactionprovider.cpp:132 +#: ../src/uisupport/contextmenuactionprovider.cpp:135 msgctxt "ContextMenuActionProvider|" msgid "Ignore" msgstr "Игнорировать" -#: ../src/uisupport/contextmenuactionprovider.cpp:137 +#: ../src/uisupport/contextmenuactionprovider.cpp:140 msgctxt "ContextMenuActionProvider|" msgid "Add Ignore Rule" msgstr "Добавить правило игнорирования" -#: ../src/uisupport/contextmenuactionprovider.cpp:138 +#: ../src/uisupport/contextmenuactionprovider.cpp:141 msgctxt "ContextMenuActionProvider|" msgid "Existing Rules" msgstr "Имеющиеся правила" -#: ../src/core/core.cpp:190 +#: ../src/core/core.cpp:191 msgctxt "Core|" msgid "Could not initialize any storage backend! Exiting..." msgstr "Не могу инициализировать ни одно хранилище! Выхожу..." -#: ../src/core/core.cpp:191 +#: ../src/core/core.cpp:192 msgctxt "Core|" msgid "" "Currently, Quassel supports SQLite3 and PostgreSQL. You need to build your\n" @@ -1354,150 +1996,86 @@ msgid "" "to work." msgstr "Сейчас, Quassel поддерживает SQLite3 и PostgreSQL. вам нужно создать свою\nбиблиотеку Qt с разрешенными в ядре Quassel плагинами sqlite или postgres\nдля работы." -#: ../src/core/core.cpp:249 +#: ../src/core/core.cpp:252 msgctxt "Core|" msgid "Calling restoreState() even though active sessions exist!" msgstr "Вызываю restoreState(), несмотря на существующие активные сессии!" -#: ../src/core/core.cpp:295 +#: ../src/core/core.cpp:286 +msgctxt "Core|" +msgid "Core is already configured! Not configuring again..." +msgstr "" + +#: ../src/core/core.cpp:289 msgctxt "Core|" msgid "Admin user or password not set." msgstr "Нет пользователя-администратора или пароля." -#: ../src/core/core.cpp:298 +#: ../src/core/core.cpp:292 msgctxt "Core|" msgid "Could not setup storage!" msgstr "Не могу настроить хранилище!" -#: ../src/core/core.cpp:302 +#: ../src/core/core.cpp:297 msgctxt "Core|" msgid "Creating admin user..." msgstr "Создаю пользователя-администратора..." -#: ../src/core/core.cpp:434 +#: ../src/core/core.cpp:447 #, qt-format msgctxt "Core|" msgid "Invalid listen address %1" msgstr "Некорректный адрес для прослушивания %1" -#: ../src/core/core.cpp:443 +#: ../src/core/core.cpp:456 #, qt-format msgctxt "Core|" msgid "Listening for GUI clients on IPv6 %1 port %2 using protocol version %3" msgstr "Ожидаю графических клиентов по адресу IPv6 %1 порт %2, использую протокол версии %3" -#: ../src/core/core.cpp:452 +#: ../src/core/core.cpp:465 #, qt-format msgctxt "Core|" msgid "Could not open IPv6 interface %1:%2: %3" msgstr "Не могу открыть интерфейс IPv6 %1:%2: %3" -#: ../src/core/core.cpp:460 +#: ../src/core/core.cpp:473 #, qt-format msgctxt "Core|" msgid "Listening for GUI clients on IPv4 %1 port %2 using protocol version %3" msgstr "Ожидаю графических клиентов по адресу IPv4 %1 порт %2, использую протокол версии %3" -#: ../src/core/core.cpp:471 +#: ../src/core/core.cpp:484 #, qt-format msgctxt "Core|" msgid "Could not open IPv4 interface %1:%2: %3" msgstr "Не могу открыть интерфейс IPv4 %1:%2: %3" -#: ../src/core/core.cpp:479 +#: ../src/core/core.cpp:492 #, qt-format msgctxt "Core|" msgid "Invalid listen address %1, unknown network protocol" msgstr "Некорректный адрес для прослушивания %1, неизвестный сетевой протокол" -#: ../src/core/core.cpp:488 +#: ../src/core/core.cpp:501 msgctxt "Core|" msgid "Could not open any network interfaces to listen on!" msgstr "Не могу открыть ни один сетевой интерфейс для прослушивания!" -#: ../src/core/core.cpp:527 +#: ../src/core/core.cpp:541 msgctxt "Core|" msgid "Client connected from" msgstr "Клиент соединился с" -#: ../src/core/core.cpp:530 +#: ../src/core/core.cpp:544 msgctxt "Core|" msgid "Closing server for basic setup." msgstr "Закрываю сервер для базовой настройки." -#: ../src/core/core.cpp:547 -msgctxt "Core|" -msgid "Antique client trying to connect... refusing." -msgstr "Древний клиент попытался подключиться... отказываю." - -#: ../src/core/core.cpp:560 -#, qt-format -msgctxt "Core|" -msgid "" -"Your Quassel Client is too old!
This core needs at least " -"client/core protocol version %1.
Please consider upgrading your client." -msgstr "Ваш клиент Quassel слишком старый!
Этому ядру нужна версия клиент-серверного протокола по крайней мере %1.
Пожалуйста обновите клиент." - -#: ../src/core/core.cpp:564 ../src/core/core.cpp:656 ../src/core/core.cpp:682 -msgctxt "Core|" -msgid "Client" -msgstr "Клиент" - -#: ../src/core/core.cpp:564 -msgctxt "Core|" -msgid "too old, rejecting." -msgstr "слишком старый, отказываю." - -#: ../src/core/core.cpp:582 -#, qt-format -msgctxt "Core|" -msgid "Quassel Core Version %1
Built: %2
Up %3d%4h%5m (since %6)" -msgstr "Ядро Quassel версии %1
Собрано: %2
Аптайм %3д%4ч%5м (с %6)" - -#: ../src/core/core.cpp:636 -msgctxt "Core|" -msgid "Starting TLS for Client:" -msgstr "Запускаю TLS для клиента:" - -#: ../src/core/core.cpp:654 -msgctxt "Core|" -msgid "" -"Client not initialized!
You need to send an init message before " -"trying to login." -msgstr "Клиент не инициализирован!
Вам нужно отправить инициализационное сообщение перед попыткой входа." - -#: ../src/core/core.cpp:656 -msgctxt "Core|" -msgid "did not send an init message before trying to login, rejecting." -msgstr "не отправил инициализационное сообщение перед попыткой входа, отказываю." - -#: ../src/core/core.cpp:676 -msgctxt "Core|" -msgid "" -"Invalid username or password!
The username/password combination " -"you supplied could not be found in the database." -msgstr "Неверное имя пользователя или пароль!
Предоставленные вами имя пользователя и пароль не найдены в базе." - -#: ../src/core/core.cpp:682 -#, qt-format +#: ../src/core/core.cpp:556 msgctxt "Core|" -msgid "initialized and authenticated successfully as \"%1\" (UserId: %2)." -msgstr "инициализирован и аутентифицирован успешно как \"%1\" (UserId: %2)." - -#: ../src/core/core.cpp:695 -msgctxt "Core|" -msgid "Non-authed client disconnected." -msgstr "Неавторизованный клиент отсоединён." - -#: ../src/core/core.cpp:724 -msgctxt "Core|" -msgid "Could not initialize session for client:" -msgstr "Не могу инициализировать сессию для клиента:" - -#: ../src/core/core.cpp:750 -msgctxt "Core|" -msgid "Could not find a session for client:" -msgstr "Не удалось найти сессии для клиента:" +msgid "Non-authed client disconnected:" +msgstr "" #: ../src/client/coreaccount.h:40 msgctxt "CoreAccount|" @@ -1505,7 +2083,7 @@ msgid "Internal Core" msgstr "Встроенное ядро" #: ../src/qtui/settingspages/coreaccounteditdlg.ui:14 -#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:260 +#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:261 msgctxt "CoreAccountEditDlg|" msgid "Edit Core Account" msgstr "Редактировать аккаунт в ядре" @@ -1580,7 +2158,7 @@ msgctxt "CoreAccountEditDlg|" msgid "HTTP" msgstr "HTTP" -#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:262 +#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:263 msgctxt "CoreAccountEditDlg|" msgid "Add Core Account" msgstr "Добавить аккаунт в ядре" @@ -1630,22 +2208,85 @@ msgctxt "CoreAccountSettingsPage|" msgid "Always connect to" msgstr "Всегда подключаться к" -#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:29 +#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:30 msgctxt "CoreAccountSettingsPage|" msgid "Remote Cores" msgstr "Удаленные Quassel Core сервера" +#: ../src/core/coreauthhandler.cpp:132 ../src/core/coreauthhandler.cpp:144 +msgctxt "CoreAuthHandler|" +msgid "Client" +msgstr "Клиент" + +#: ../src/core/coreauthhandler.cpp:132 +msgctxt "CoreAuthHandler|" +msgid "too old, rejecting." +msgstr "слишком старый, отказываю." + +#: ../src/core/coreauthhandler.cpp:133 +#, qt-format +msgctxt "CoreAuthHandler|" +msgid "" +"Your Quassel Client is too old!
This core needs at least " +"client/core protocol version %1 (got: %2).
Please consider upgrading your" +" client." +msgstr "" + +#: ../src/core/coreauthhandler.cpp:144 +msgctxt "CoreAuthHandler|" +msgid "did not send a registration message before trying to login, rejecting." +msgstr "" + +#: ../src/core/coreauthhandler.cpp:145 +msgctxt "CoreAuthHandler|" +msgid "" +"Client not initialized!
You need to send a registration message " +"before trying to login." +msgstr "" + +#: ../src/core/coreauthhandler.cpp:162 +msgctxt "CoreAuthHandler|" +msgid "" +"SSL is required!
You need to use SSL in order to connect to this " +"core." +msgstr "" + +#: ../src/core/coreauthhandler.cpp:176 +#, qt-format +msgctxt "CoreAuthHandler|" +msgid "Quassel Core Version %1
Built: %2
Up %3d%4h%5m (since %6)" +msgstr "Ядро Quassel версии %1
Собрано: %2
Аптайм %3д%4ч%5м (с %6)" + +#: ../src/core/coreauthhandler.cpp:212 +msgctxt "CoreAuthHandler|" +msgid "" +"Invalid username or password!
The username/password combination " +"you supplied could not be found in the database." +msgstr "Неверное имя пользователя или пароль!
Предоставленные вами имя пользователя и пароль не найдены в базе." + +#: ../src/core/coreauthhandler.cpp:217 +#, qt-format +msgctxt "CoreAuthHandler|" +msgid "" +"Client %1 initialized and authenticated successfully as \"%2\" (UserId: %3)." +msgstr "" + +#: ../src/core/coreauthhandler.cpp:236 +msgctxt "CoreAuthHandler|" +msgid "Starting encryption for Client:" +msgstr "" + #: ../src/qtui/coreconfigwizard.cpp:69 msgctxt "CoreConfigWizard|" msgid "Core Configuration Wizard" msgstr "Мастер конфигурации ядра" -#: ../src/qtui/coreconfigwizard.cpp:103 +#: ../src/qtui/coreconfigwizard.cpp:98 msgctxt "CoreConfigWizard|" msgid "Your core has been successfully configured. Logging you in..." msgstr "Ваше ядро сконфигурировано успешно. Выполняю вход в..." -#: ../src/qtui/coreconfigwizard.cpp:112 +#: ../src/qtui/coreconfigwizard.cpp:107 #, qt-format msgctxt "CoreConfigWizard|" msgid "" @@ -1653,7 +2294,7 @@ msgid "" "over." msgstr "Ошибка конфигурации ядра:
%1
Нажмите Далее чтобы начать сначала." -#: ../src/qtui/coreconfigwizard.cpp:131 +#: ../src/qtui/coreconfigwizard.cpp:126 msgctxt "CoreConfigWizard|" msgid "" "Your are now logged into your freshly configured Quassel Core!
Please " @@ -1702,46 +2343,46 @@ msgctxt "CoreConfigWizardIntroPage|" msgid "This wizard will guide you through the setup of your Quassel Core." msgstr "Этот мастер поможет вам настроить ядро Quassel." -#: ../src/qtui/coreconfigwizard.cpp:167 +#: ../src/qtui/coreconfigwizard.cpp:162 msgctxt "CoreConfigWizardPages::AdminUserPage|" msgid "Create Admin User" msgstr "Создание пользователя-администратора" -#: ../src/qtui/coreconfigwizard.cpp:168 +#: ../src/qtui/coreconfigwizard.cpp:163 msgctxt "CoreConfigWizardPages::AdminUserPage|" msgid "" "First, we will create a user on the core. This first user will have " "administrator privileges." msgstr "Для начала мы создадим пользователя в ядре. У этого первого пользователя будут привилегии администратора." -#: ../src/qtui/coreconfigwizard.cpp:150 +#: ../src/qtui/coreconfigwizard.cpp:145 msgctxt "CoreConfigWizardPages::IntroPage|" msgid "Introduction" msgstr "Введение" -#: ../src/qtui/coreconfigwizard.cpp:203 +#: ../src/qtui/coreconfigwizard.cpp:198 msgctxt "CoreConfigWizardPages::StorageSelectionPage|" msgid "Select Storage Backend" msgstr "Выбор средства хранения" -#: ../src/qtui/coreconfigwizard.cpp:204 +#: ../src/qtui/coreconfigwizard.cpp:199 msgctxt "CoreConfigWizardPages::StorageSelectionPage|" msgid "" "Please select a database backend for the Quassel Core storage to store the " "backlog and other data in." msgstr "Пожалуйста выберите движок базы данных, с помощью которого ядро Quassel будет хранить журнал и прочие данные." -#: ../src/qtui/coreconfigwizard.cpp:305 +#: ../src/qtui/coreconfigwizard.cpp:300 msgctxt "CoreConfigWizardPages::StorageSelectionPage|" msgid "Connection Properties" msgstr "Свойства соединения" -#: ../src/qtui/coreconfigwizard.cpp:347 +#: ../src/qtui/coreconfigwizard.cpp:342 msgctxt "CoreConfigWizardPages::SyncPage|" msgid "Storing Your Settings" msgstr "Сохранение настроек" -#: ../src/qtui/coreconfigwizard.cpp:348 +#: ../src/qtui/coreconfigwizard.cpp:343 msgctxt "CoreConfigWizardPages::SyncPage|" msgid "" "Your settings are now stored in the core, and you will be logged in " @@ -1839,103 +2480,38 @@ msgctxt "CoreConnectDlg|" msgid "Connect to Core" msgstr "Подключение к ядру" -#: ../src/client/coreconnection.cpp:190 -msgctxt "CoreConnection|" -msgid "Network is down" -msgstr "Сеть недоступна" - -#: ../src/client/coreconnection.cpp:225 ../src/client/coreconnection.cpp:365 -msgctxt "CoreConnection|" -msgid "Disconnected" -msgstr "Отключено" - -#: ../src/client/coreconnection.cpp:228 -#, qt-format -msgctxt "CoreConnection|" -msgid "Looking up %1..." -msgstr "Ищу хост %1..." - -#: ../src/client/coreconnection.cpp:231 ../src/client/coreconnection.cpp:518 -#, qt-format -msgctxt "CoreConnection|" -msgid "Connecting to %1..." -msgstr "" - -#: ../src/client/coreconnection.cpp:234 ../src/client/coreconnection.cpp:658 -#, qt-format -msgctxt "CoreConnection|" -msgid "Connected to %1" -msgstr "" - -#: ../src/client/coreconnection.cpp:237 -#, qt-format -msgctxt "CoreConnection|" -msgid "Disconnecting from %1..." -msgstr "Идет отключение от %1..." - -#: ../src/client/coreconnection.cpp:303 -msgctxt "CoreConnection|" -msgid "" -"The Quassel Core you try to connect to is too old! Please consider " -"upgrading." -msgstr "Вы пытаетесь подключиться к слишком старому ядру Quassel! Пожалуйста обновите." - -#: ../src/client/coreconnection.cpp:340 -msgctxt "CoreConnection|" -msgid "Invalid data received from core" -msgstr "От ядра были получены недопустимые данные" - -#: ../src/client/coreconnection.cpp:403 -msgctxt "CoreConnection|" -msgid "Disconnected from core." -msgstr "&Отключиться от ядра" - -#: ../src/client/coreconnection.cpp:496 ../src/client/coreconnection.cpp:590 -#: ../src/client/coreconnection.cpp:639 -msgctxt "CoreConnection|" -msgid "Unencrypted connection canceled" -msgstr "Незашифрованное подключение отменено" - -#: ../src/client/coreconnection.cpp:533 -msgctxt "CoreConnection|" -msgid "Synchronizing to core..." -msgstr "Синхронизация с ядром..." - -#: ../src/client/coreconnection.cpp:556 -#, qt-format +#: ../src/client/coreconnection.cpp:182 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 "Вы пытаетесь подключиться к слишком старому ядру Quassel!
Для соединения необходима поддержка клиент-серверного протокола по крайней мере версии %1." +msgid "Network is down" +msgstr "Сеть недоступна" -#: ../src/client/coreconnection.cpp:682 +#: ../src/client/coreconnection.cpp:263 msgctxt "CoreConnection|" -msgid "Logging in..." -msgstr "Авторизуюсь..." +msgid "Disconnected" +msgstr "Отключено" -#: ../src/client/coreconnection.cpp:687 +#: ../src/client/coreconnection.cpp:298 msgctxt "CoreConnection|" -msgid "Login canceled" -msgstr "Вход в систему отменен" +msgid "Disconnected from core." +msgstr "&Отключиться от ядра" -#: ../src/client/coreconnection.cpp:716 +#: ../src/client/coreconnection.cpp:436 msgctxt "CoreConnection|" msgid "Receiving session state" msgstr "Получение состояния сетей" -#: ../src/client/coreconnection.cpp:718 +#: ../src/client/coreconnection.cpp:438 #, qt-format msgctxt "CoreConnection|" msgid "Synchronizing to %1..." msgstr "Синхронизация с %1..." -#: ../src/client/coreconnection.cpp:744 +#: ../src/client/coreconnection.cpp:474 msgctxt "CoreConnection|" msgid "Receiving network states" msgstr "Получение состояния сетей" -#: ../src/client/coreconnection.cpp:798 +#: ../src/client/coreconnection.cpp:525 #, qt-format msgctxt "CoreConnection|" msgid "Synchronized to %1" @@ -1953,19 +2529,16 @@ msgstr "Определение состояния сети" #: ../src/qtui/settingspages/coreconnectionsettingspage.ui:26 msgctxt "CoreConnectionSettingsPage|" -msgid "" -"Rely on KDE's hardware layer to detect if we're online. Recommended for most" -" KDE users" -msgstr "Полагаться на аппаратный уровень KDE, чтобы определить, онлайн ли мы. Рекомендуется для большинства пользователей KDE" +msgid "Rely on Qt's network configuration manager to detect if we're online" +msgstr "" #: ../src/qtui/settingspages/coreconnectionsettingspage.ui:29 msgctxt "CoreConnectionSettingsPage|" -msgid "Use KDE's network status detection (via Solid)" -msgstr "Используйте сетевое обнаружение состояния KDE (via Solid)" +msgid "Automatic" +msgstr "" #: ../src/qtui/settingspages/coreconnectionsettingspage.ui:41 #: ../src/qtui/settingspages/coreconnectionsettingspage.ui:57 -#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:154 msgctxt "CoreConnectionSettingsPage|" msgid "" "Actively ping the remote core and disconnect if we didn't get a reply after " @@ -2005,6 +2578,11 @@ msgctxt "CoreConnectionSettingsPage|" msgid "Retry every" msgstr "Повтор каждые" +#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:154 +msgctxt "CoreConnectionSettingsPage|" +msgid "Interval between consecutive connection attempts" +msgstr "" + #: ../src/qtui/settingspages/coreconnectionsettingspage.cpp:24 msgctxt "CoreConnectionSettingsPage|" msgid "Remote Cores" @@ -2025,28 +2603,28 @@ msgctxt "CoreConnectionStatusWidget|" msgid "Message" msgstr "Сообщение" -#: ../src/qtui/coreconnectionstatuswidget.cpp:66 +#: ../src/qtui/coreconnectionstatuswidget.cpp:67 msgctxt "CoreConnectionStatusWidget|seconds" msgid "s" msgstr " сек" -#: ../src/qtui/coreconnectionstatuswidget.cpp:66 +#: ../src/qtui/coreconnectionstatuswidget.cpp:67 msgctxt "CoreConnectionStatusWidget|milliseconds" msgid "ms" msgstr "мс" -#: ../src/qtui/coreconnectionstatuswidget.cpp:67 +#: ../src/qtui/coreconnectionstatuswidget.cpp:68 #, qt-format msgctxt "CoreConnectionStatusWidget|" msgid "(Lag: %1 %2)" msgstr "(Задержка: %1 %2)" -#: ../src/qtui/coreconnectionstatuswidget.cpp:83 +#: ../src/qtui/coreconnectionstatuswidget.cpp:84 msgctxt "CoreConnectionStatusWidget|" msgid "The connection to your core is encrypted with SSL." msgstr "Соединение с ядром использует SSL-шифрование." -#: ../src/qtui/coreconnectionstatuswidget.cpp:87 +#: ../src/qtui/coreconnectionstatuswidget.cpp:88 msgctxt "CoreConnectionStatusWidget|" msgid "The connection to your core is not encrypted." msgstr "Соединение с ядром не использует шифрование." @@ -2109,6 +2687,7 @@ msgid_plural "%n Day(s)" msgstr[0] "" msgstr[1] "" msgstr[2] "" +msgstr[3] "" #: ../src/qtui/coreinfodlg.cpp:58 #, qt-format @@ -2116,52 +2695,52 @@ msgctxt "CoreInfoDlg|" msgid " %1:%2:%3 (since %4)" msgstr " %1:%2:%3 (с %4)" -#: ../src/core/corenetwork.cpp:166 +#: ../src/core/corenetwork.cpp:168 msgctxt "CoreNetwork|" msgid "Connection failed. Cycling to next Server" msgstr "Сбой соединения. Пробую следующий сервер" -#: ../src/core/corenetwork.cpp:174 ../src/core/corenetwork.cpp:175 +#: ../src/core/corenetwork.cpp:176 ../src/core/corenetwork.cpp:177 #, qt-format msgctxt "CoreNetwork|" msgid "Connecting to %1:%2..." msgstr "" -#: ../src/core/corenetwork.cpp:227 +#: ../src/core/corenetwork.cpp:234 #, qt-format msgctxt "CoreNetwork|" msgid "Disconnecting. (%1)" msgstr "" -#: ../src/core/corenetwork.cpp:227 +#: ../src/core/corenetwork.cpp:234 msgctxt "CoreNetwork|" msgid "Core Shutdown" msgstr "Ядро завершает работу" -#: ../src/core/corenetwork.cpp:409 +#: ../src/core/corenetwork.cpp:442 #, qt-format msgctxt "CoreNetwork|" msgid "Could not connect to %1 (%2)" msgstr "Не могу подсоединиться к %1 (%2)" -#: ../src/core/corenetwork.cpp:411 +#: ../src/core/corenetwork.cpp:444 #, qt-format msgctxt "CoreNetwork|" msgid "Connection failure: %1" msgstr "Сбой соединения: %1" -#: ../src/core/coresession.cpp:230 +#: ../src/core/coresession.cpp:233 msgctxt "CoreSession|" msgid "Client" msgstr "Клиент" -#: ../src/core/coresession.cpp:230 +#: ../src/core/coresession.cpp:233 #, qt-format msgctxt "CoreSession|" msgid "disconnected (UserId: %1)." msgstr "отсоединён (UserId: %1)." -#: ../src/core/coresession.cpp:491 +#: ../src/core/coresession.cpp:481 #, qt-format msgctxt "CoreSession|" msgid "" @@ -2169,41 +2748,78 @@ msgid "" " create network %1!" msgstr "CoreSession::createNetwork(): Получен неверный networkId от ядра, пытаясь создать сеть %1!" -#: ../src/core/coresession.cpp:523 +#: ../src/core/coresession.cpp:513 msgctxt "CoreSession|" msgid "" "CoreSession::createNetwork(): Trying to create a network that already " "exists, updating instead!" msgstr "CoreSession::createNetwork(): Попытался создать уже существующую сеть, вместо этого обновляю!" -#: ../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 "Среди ников в списке не найдено свободного и корректного. Используйте /nick <другой ник> для продолжения" -#: ../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:1052 +msgctxt "CoreSessionEventProcessor|" +msgid "Reverse DCC SEND not supported" +msgstr "" + +#: ../src/core/coresessioneventprocessor.cpp:1070 +#, 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" @@ -2215,28 +2831,38 @@ msgctxt "CoreUserInputHandler|" msgid "sending CTCP-%1 request to %2" msgstr "" -#: ../src/core/coreuserinputhandler.cpp:199 +#: ../src/core/coreuserinputhandler.cpp:189 +#: ../src/core/coreuserinputhandler.cpp:360 +#: ../src/core/coreuserinputhandler.cpp:622 +#: ../src/core/coreuserinputhandler.cpp:660 +msgctxt "CoreUserInputHandler|" +msgid "" +"Error: QCA provider plugin not found. It is usually provided by the qca-ossl" +" plugin." +msgstr "" + +#: ../src/core/coreuserinputhandler.cpp:200 msgctxt "CoreUserInputHandler|" msgid "" "[usage] /delkey deletes the encryption key for nick or " "channel or just /delkey when in a channel or query." msgstr "" -#: ../src/core/coreuserinputhandler.cpp:206 -#: ../src/core/coreuserinputhandler.cpp:648 +#: ../src/core/coreuserinputhandler.cpp:207 +#: ../src/core/coreuserinputhandler.cpp:678 #, qt-format msgctxt "CoreUserInputHandler|" msgid "No key has been set for %1." msgstr "Тема для канала %1 не установлена." -#: ../src/core/coreuserinputhandler.cpp:211 +#: ../src/core/coreuserinputhandler.cpp:212 #, qt-format msgctxt "CoreUserInputHandler|" msgid "The key for %1 has been deleted." msgstr "" -#: ../src/core/coreuserinputhandler.cpp:215 -#: ../src/core/coreuserinputhandler.cpp:656 +#: ../src/core/coreuserinputhandler.cpp:216 +#: ../src/core/coreuserinputhandler.cpp:686 msgctxt "CoreUserInputHandler|" msgid "" "Error: Setting an encryption key requires Quassel to have been built with " @@ -2245,27 +2871,31 @@ msgid "" "with QCA2 present." msgstr "" -#: ../src/core/coreuserinputhandler.cpp:367 +#: ../src/core/coreuserinputhandler.cpp:370 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:379 +#: ../src/core/coreuserinputhandler.cpp:377 +msgctxt "CoreUserInputHandler|" +msgid "It is only possible to exchange keys in a query buffer." +msgstr "" + +#: ../src/core/coreuserinputhandler.cpp:387 #, qt-format msgctxt "CoreUserInputHandler|" msgid "Failed to initiate key exchange with %1." msgstr "" -#: ../src/core/coreuserinputhandler.cpp:384 +#: ../src/core/coreuserinputhandler.cpp:392 #, 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:396 +#: ../src/core/coreuserinputhandler.cpp:644 msgctxt "CoreUserInputHandler|" msgid "" "Error: Setting an encryption key requires Quassel to have been built with " @@ -2274,13 +2904,13 @@ msgid "" "with QCA present." msgstr "" -#: ../src/core/coreuserinputhandler.cpp:546 +#: ../src/core/coreuserinputhandler.cpp:569 #, qt-format msgctxt "CoreUserInputHandler|" msgid "Starting query with %1" msgstr "" -#: ../src/core/coreuserinputhandler.cpp:604 +#: ../src/core/coreuserinputhandler.cpp:632 msgctxt "CoreUserInputHandler|" msgid "" "[usage] /setkey sets the encryption key for nick or " @@ -2288,29 +2918,23 @@ msgid "" "it." msgstr "" -#: ../src/core/coreuserinputhandler.cpp:613 +#: ../src/core/coreuserinputhandler.cpp:641 #, qt-format msgctxt "CoreUserInputHandler|" msgid "The key for %1 has been set." msgstr "" -#: ../src/core/coreuserinputhandler.cpp:640 +#: ../src/core/coreuserinputhandler.cpp:670 msgctxt "CoreUserInputHandler|" msgid "" "[usage] /showkey shows the encryption key for nick or channel" " or just /showkey when in a channel or query." msgstr "" -#: ../src/core/coreuserinputhandler.cpp:652 -#, qt-format -msgctxt "CoreUserInputHandler|" -msgid "The key for %1 is %2" -msgstr "" - -#: ../src/core/coreuserinputhandler.cpp:780 +#: ../src/core/coreuserinputhandler.cpp:682 #, qt-format msgctxt "CoreUserInputHandler|" -msgid "[Error] Could not encrypt your message: %1" +msgid "The key for %1 is %2:%3" msgstr "" #: ../src/qtui/settingspages/createidentitydlg.ui:17 @@ -2333,6 +2957,17 @@ msgctxt "CreateIdentityDlg|" msgid "Duplicate:" msgstr "Дублировать:" +#: ../src/common/protocols/datastream/datastreampeer.cpp:114 +msgctxt "DataStreamPeer|" +msgid "Invalid handshake message!" +msgstr "" + +#: ../src/common/protocols/datastream/datastreampeer.cpp:161 +#, qt-format +msgctxt "DataStreamPeer|" +msgid "Unknown protocol message of type %1" +msgstr "" + #: ../src/qtui/ui/debugbufferviewoverlay.ui:13 msgctxt "DebugBufferViewOverlay|" msgid "Debug BufferView Overlay" @@ -2428,234 +3063,233 @@ 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 "" -#: ../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 меняет тему канала %2 на \"%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 "Получен нестандартный RPL_ISUPPORT: может случиться всё что угодно!" -#: ../src/core/eventstringifier.cpp:379 +#: ../src/core/eventstringifier.cpp:384 #, qt-format msgctxt "EventStringifier|" msgid "%1 is away: \"%2\"" msgstr "" -#: ../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 "" -#: ../src/core/eventstringifier.cpp:432 +#: ../src/core/eventstringifier.cpp:437 #, qt-format msgctxt "EventStringifier|" msgid "[Whois] %1 is online via %2 (%3)" msgstr "%1 подключен через %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 был %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] Конец списка /WHO для %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 в онлайне с %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 неактивен %2 (%3)" -#: ../src/core/eventstringifier.cpp:479 +#: ../src/core/eventstringifier.cpp:484 msgctxt "EventStringifier|" msgid "[Whois] End of /WHOIS list" msgstr "[Who] Конец списка /WHO для %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 является участником каналов: %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 является участником с голосом на каналах: %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 является оператором каналов: %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 "На канале %1 %2 пользователей. Тема: %3" -#: ../src/core/eventstringifier.cpp:535 +#: ../src/core/eventstringifier.cpp:540 msgctxt "EventStringifier|" msgid "End of channel list" msgstr "Конец списка каналов" -#: ../src/core/eventstringifier.cpp:553 +#: ../src/core/eventstringifier.cpp:558 #, qt-format msgctxt "EventStringifier|" msgid "Homepage for %1 is %2" msgstr "Домашняя страница для %1 %2" -#: ../src/core/eventstringifier.cpp:570 +#: ../src/core/eventstringifier.cpp:575 #, qt-format msgctxt "EventStringifier|" msgid "Channel %1 created on %2" msgstr "Создан канал %1 на сервере %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 отсутствует: \"%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 "Тема для канала %1 не установлена." -#: ../src/core/eventstringifier.cpp:604 +#: ../src/core/eventstringifier.cpp:609 #, qt-format msgctxt "EventStringifier|" msgid "Topic for %1 is \"%2\"" msgstr "" -#: ../src/core/eventstringifier.cpp:616 +#: ../src/core/eventstringifier.cpp:621 #, qt-format msgctxt "EventStringifier|" msgid "Topic set by %1 on %2" msgstr "Тема установлена %1 %2" -#: ../src/core/eventstringifier.cpp:629 +#: ../src/core/eventstringifier.cpp:634 #, qt-format msgctxt "EventStringifier|" msgid "%1 has been invited to %2" msgstr "" -#: ../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 "Ник %1 содержит недопустимые символы" -#: ../src/core/eventstringifier.cpp:664 +#: ../src/core/eventstringifier.cpp:669 #, qt-format msgctxt "EventStringifier|" msgid "Nick already in use: %1" msgstr "Ник уже используется: %1" -#: ../src/core/eventstringifier.cpp:674 +#: ../src/core/eventstringifier.cpp:679 #, qt-format msgctxt "EventStringifier|" msgid "Nick/channel is temporarily unavailable: %1" msgstr "Ник/канал временно недоступен: %1" -#: ../src/core/eventstringifier.cpp:697 +#: ../src/core/eventstringifier.cpp:702 #, qt-format msgctxt "EventStringifier|" msgid "sending CTCP-%1 request to %2" msgstr "" -#. 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:736 #, qt-format msgctxt "EventStringifier|" -msgid "Received CTCP-PING answer from %1 with %2 seconds round trip time" -msgstr "Получен ответ на CTCP от %1 с временем полного пути %2" +msgid "Received CTCP-PING answer from %1 with %2 milliseconds round trip time" +msgstr "" #: ../src/client/execwrapper.cpp:49 #, qt-format @@ -2774,7 +3408,7 @@ msgctxt "HighlightSettingsPage|" msgid "Interface" msgstr "Интерфейс" -#: ../src/qtui/settingspages/highlightsettingspage.cpp:184 +#: ../src/qtui/settingspages/highlightsettingspage.cpp:192 msgctxt "HighlightSettingsPage|" msgid "this shouldn't be empty" msgstr "это не должно быть пусто" @@ -2785,7 +3419,7 @@ msgid "highlight rule" msgstr "правило подсветки" #: ../src/qtui/settingspages/identitiessettingspage.ui:31 -#: ../src/qtui/settingspages/identitiessettingspage.cpp:369 +#: ../src/qtui/settingspages/identitiessettingspage.cpp:370 msgctxt "IdentitiesSettingsPage|" msgid "Rename Identity" msgstr "Переименовать личность" @@ -2821,55 +3455,55 @@ msgctxt "IdentitiesSettingsPage|" msgid "Identities" msgstr "Личности" -#: ../src/qtui/settingspages/identitiessettingspage.cpp:204 +#: ../src/qtui/settingspages/identitiessettingspage.cpp:205 msgctxt "IdentitiesSettingsPage|" msgid "" "The following problems need to be corrected before your changes can be " "applied:
    " msgstr "Прежде чем сохранить настройки, необходимо устранить следующие проблемы:
      " -#: ../src/qtui/settingspages/identitiessettingspage.cpp:205 +#: ../src/qtui/settingspages/identitiessettingspage.cpp:206 msgctxt "IdentitiesSettingsPage|" msgid "
    • All identities need an identity name set
      • " msgstr "
    • У всех личностей должно быть название
      • " -#: ../src/qtui/settingspages/identitiessettingspage.cpp:206 +#: ../src/qtui/settingspages/identitiessettingspage.cpp:207 msgctxt "IdentitiesSettingsPage|" msgid "
    • Every identity needs at least one nickname defined
      • " msgstr "
    • В каждой личности должен быть хотя бы один ник
      • " -#: ../src/qtui/settingspages/identitiessettingspage.cpp:207 +#: ../src/qtui/settingspages/identitiessettingspage.cpp:208 msgctxt "IdentitiesSettingsPage|" msgid "
    • You need to specify a real name for every identity
      • " msgstr "
    • Вам нужно указать настоящее имя для каждой личности
      • " -#: ../src/qtui/settingspages/identitiessettingspage.cpp:208 +#: ../src/qtui/settingspages/identitiessettingspage.cpp:209 msgctxt "IdentitiesSettingsPage|" msgid "
    • You need to specify an ident for every identity
      • " msgstr "
    • Вам нужно указать идент для каждой личности
      • " -#: ../src/qtui/settingspages/identitiessettingspage.cpp:209 +#: ../src/qtui/settingspages/identitiessettingspage.cpp:210 msgctxt "IdentitiesSettingsPage|" msgid "
    " msgstr "
" -#: ../src/qtui/settingspages/identitiessettingspage.cpp:210 +#: ../src/qtui/settingspages/identitiessettingspage.cpp:211 msgctxt "IdentitiesSettingsPage|" msgid "One or more identities are invalid" msgstr "Одна или несколько личностей некорректны" -#: ../src/qtui/settingspages/identitiessettingspage.cpp:355 +#: ../src/qtui/settingspages/identitiessettingspage.cpp:356 msgctxt "IdentitiesSettingsPage|" msgid "Delete Identity?" msgstr "Удалить личность?" -#: ../src/qtui/settingspages/identitiessettingspage.cpp:356 +#: ../src/qtui/settingspages/identitiessettingspage.cpp:357 #, qt-format msgctxt "IdentitiesSettingsPage|" msgid "Do you really want to delete identity \"%1\"?" msgstr "Вы действительно хотите удалить личность \"%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\"!" @@ -3039,7 +3673,7 @@ msgid "minutes of being idle" msgstr "минут неактивности" #: ../src/qtui/settingspages/identityeditwidget.ui:399 -#: ../src/qtui/settingspages/identityeditwidget.cpp:237 +#: ../src/qtui/settingspages/identityeditwidget.cpp:244 msgctxt "IdentityEditWidget|" msgid "Advanced" msgstr "Дополнительно" @@ -3105,16 +3739,16 @@ msgid "Key Type:" msgstr "Тип ключа:" #: ../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 "Ключ не загружен" #: ../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 "Загрузить" @@ -3131,8 +3765,8 @@ msgstr "Организация:" #: ../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 "Сертификат не загружен" @@ -3142,38 +3776,50 @@ msgctxt "IdentityEditWidget|" msgid "CommonName:" msgstr "ОбщееИмя:" -#: ../src/qtui/settingspages/identityeditwidget.cpp:320 +#: ../src/qtui/settingspages/identityeditwidget.cpp:327 msgctxt "IdentityEditWidget|" msgid "Load a Key" msgstr "Загрузить ключ" -#: ../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 "Очистить" -#: ../src/qtui/settingspages/identityeditwidget.cpp:377 +#: ../src/qtui/settingspages/identityeditwidget.cpp:390 msgctxt "IdentityEditWidget|" msgid "Load a Certificate" msgstr "Загрузить сертификат" -#: ../src/qtui/ircconnectionwizard.cpp:115 +#: ../src/qtui/ircconnectionwizard.cpp:116 msgctxt "IdentityPage|" msgid "Setup Identity" msgstr "Настроить личность" -#: ../src/qtui/ircconnectionwizard.cpp:120 +#: ../src/qtui/ircconnectionwizard.cpp:121 msgctxt "IdentityPage|" msgid "Default Identity" msgstr "Личность по умолчанию" @@ -3447,92 +4093,92 @@ msgctxt "InputWidget|" msgid "Form" msgstr "Форма" -#: ../src/qtui/inputwidget.cpp:73 +#: ../src/qtui/inputwidget.cpp:75 msgctxt "InputWidget|" msgid "White" msgstr "Белый" -#: ../src/qtui/inputwidget.cpp:73 +#: ../src/qtui/inputwidget.cpp:75 msgctxt "InputWidget|" msgid "Black" msgstr "Черный" -#: ../src/qtui/inputwidget.cpp:73 +#: ../src/qtui/inputwidget.cpp:75 msgctxt "InputWidget|" msgid "Dark blue" msgstr "Темно-синий" -#: ../src/qtui/inputwidget.cpp:73 +#: ../src/qtui/inputwidget.cpp:75 msgctxt "InputWidget|" msgid "Dark green" msgstr "Темно-зеленый" -#: ../src/qtui/inputwidget.cpp:73 +#: ../src/qtui/inputwidget.cpp:75 msgctxt "InputWidget|" msgid "Red" msgstr "Красный" -#: ../src/qtui/inputwidget.cpp:73 +#: ../src/qtui/inputwidget.cpp:75 msgctxt "InputWidget|" msgid "Dark red" msgstr "Темно-красный" -#: ../src/qtui/inputwidget.cpp:73 +#: ../src/qtui/inputwidget.cpp:75 msgctxt "InputWidget|" msgid "Dark magenta" msgstr "Фиолетовый" -#: ../src/qtui/inputwidget.cpp:73 +#: ../src/qtui/inputwidget.cpp:75 msgctxt "InputWidget|" msgid "Orange" msgstr "Оранжевый" -#: ../src/qtui/inputwidget.cpp:74 +#: ../src/qtui/inputwidget.cpp:76 msgctxt "InputWidget|" msgid "Yellow" msgstr "Жёлтый" -#: ../src/qtui/inputwidget.cpp:74 +#: ../src/qtui/inputwidget.cpp:76 msgctxt "InputWidget|" msgid "Green" msgstr "Зелёный" -#: ../src/qtui/inputwidget.cpp:74 +#: ../src/qtui/inputwidget.cpp:76 msgctxt "InputWidget|" msgid "Dark cyan" msgstr "Сине-зеленый" -#: ../src/qtui/inputwidget.cpp:74 +#: ../src/qtui/inputwidget.cpp:76 msgctxt "InputWidget|" msgid "Cyan" msgstr "" -#: ../src/qtui/inputwidget.cpp:74 +#: ../src/qtui/inputwidget.cpp:76 msgctxt "InputWidget|" msgid "Blue" msgstr "" -#: ../src/qtui/inputwidget.cpp:74 +#: ../src/qtui/inputwidget.cpp:76 msgctxt "InputWidget|" msgid "Magenta" msgstr "Фиолетовый" -#: ../src/qtui/inputwidget.cpp:74 +#: ../src/qtui/inputwidget.cpp:76 msgctxt "InputWidget|" msgid "Dark gray" msgstr "Темно-зеленый" -#: ../src/qtui/inputwidget.cpp:74 +#: ../src/qtui/inputwidget.cpp:76 msgctxt "InputWidget|" msgid "Light gray" msgstr "Светло-серый" -#: ../src/qtui/inputwidget.cpp:84 ../src/qtui/inputwidget.cpp:85 +#: ../src/qtui/inputwidget.cpp:86 ../src/qtui/inputwidget.cpp:87 msgctxt "InputWidget|" msgid "Clear Color" msgstr "Очистить цвет" -#: ../src/qtui/inputwidget.cpp:132 +#: ../src/qtui/inputwidget.cpp:137 msgctxt "InputWidget|" msgid "Focus Input Line" msgstr "Активировать строку ввода" @@ -3579,40 +4225,50 @@ msgstr "" #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:127 msgctxt "InputWidgetSettingsPage|" +msgid "Enables line wrapping for input." +msgstr "" + +#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:130 +msgctxt "InputWidgetSettingsPage|" +msgid "Line wrapping" +msgstr "" + +#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:143 +msgctxt "InputWidgetSettingsPage|" msgid "Multi-Line Editing" msgstr "" -#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:144 +#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:160 msgctxt "InputWidgetSettingsPage|" msgid "Show at most" msgstr "Показывать не более" -#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:170 +#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:186 msgctxt "InputWidgetSettingsPage|" msgid "lines" msgstr "строк" -#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:192 +#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:208 msgctxt "InputWidgetSettingsPage|" msgid "Enable scrollbars" msgstr "Включить прокрутку" -#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:211 +#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:227 msgctxt "InputWidgetSettingsPage|" msgid "Tab Completion" msgstr "Скопировать выделение" -#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:219 +#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:235 msgctxt "InputWidgetSettingsPage|" msgid "Completion suffix:" msgstr "Суффикс автодополнения:" -#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:235 +#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:251 msgctxt "InputWidgetSettingsPage|" msgid ": " msgstr "" -#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:262 +#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:278 msgctxt "InputWidgetSettingsPage|" msgid "Add space after nick when completing mid-sentence" msgstr "" @@ -3632,7 +4288,7 @@ msgctxt "InternalPeer|" msgid "internal connection" msgstr "" -#: ../src/qtui/ircconnectionwizard.cpp:49 +#: ../src/qtui/ircconnectionwizard.cpp:50 msgctxt "IrcConnectionWizard|" msgid "Save && Connect" msgstr "Сохранить и соединиться" @@ -3652,24 +4308,24 @@ msgctxt "IrcListModel|" msgid "Topic" msgstr "Тема" -#: ../src/client/networkmodel.cpp:911 +#: ../src/client/networkmodel.cpp:953 msgctxt "IrcUserItem|" msgid " is away" msgstr "%1 отсутствует: \"%2\"" -#: ../src/client/networkmodel.cpp:926 +#: ../src/client/networkmodel.cpp:968 #, qt-format msgctxt "IrcUserItem|" msgid "idling since %1" msgstr "неактивен с %1" -#: ../src/client/networkmodel.cpp:929 +#: ../src/client/networkmodel.cpp:971 #, qt-format msgctxt "IrcUserItem|" msgid "login time: %1" msgstr "время входа: %1" -#: ../src/client/networkmodel.cpp:932 +#: ../src/client/networkmodel.cpp:974 #, qt-format msgctxt "IrcUserItem|" msgid "server: %1" @@ -3801,7 +4457,7 @@ msgctxt "ItemViewSettingsPage|" msgid "Other activity" msgstr "Другая активность" -#: ../src/qtui/knotificationbackend.cpp:130 +#: ../src/qtui/knotificationbackend.cpp:139 #, qt-format msgctxt "KNotificationBackend|" msgid "%n pending highlight(s)" @@ -3809,6 +4465,7 @@ msgid_plural "%n pending highlight(s)" msgstr[0] "" msgstr[1] "" msgstr[2] "" +msgstr[3] "" #: ../src/qtui/settingspages/keysequencewidget.cpp:80 msgctxt "KeySequenceButton|" @@ -3889,379 +4546,412 @@ msgctxt "KeySequenceWidget|" msgid "Reassign" msgstr "" -#: ../src/qtui/mainwin.cpp:350 +#: ../src/common/protocols/legacy/legacypeer.cpp:136 +msgctxt "LegacyPeer|" +msgid "Invalid handshake message!" +msgstr "" + +#: ../src/common/protocols/legacy/legacypeer.cpp:207 +#, qt-format +msgctxt "LegacyPeer|" +msgid "Unknown protocol message of type %1" +msgstr "" + +#: ../src/qtui/mainwin.cpp:358 msgctxt "MainWin|" msgid "General" msgstr "Общие" -#: ../src/qtui/mainwin.cpp:352 +#: ../src/qtui/mainwin.cpp:360 msgctxt "MainWin|" msgid "&Connect to Core..." msgstr "&Подключиться к ядру..." -#: ../src/qtui/mainwin.cpp:354 +#: ../src/qtui/mainwin.cpp:362 msgctxt "MainWin|" msgid "&Disconnect from Core" msgstr "&Отключиться от ядра" -#: ../src/qtui/mainwin.cpp:356 +#: ../src/qtui/mainwin.cpp:364 +msgctxt "MainWin|" +msgid "Change &Password..." +msgstr "" + +#: ../src/qtui/mainwin.cpp:366 msgctxt "MainWin|" msgid "Core &Info..." msgstr "&Инфромация ядра..." -#: ../src/qtui/mainwin.cpp:358 +#: ../src/qtui/mainwin.cpp:368 msgctxt "MainWin|" msgid "Configure &Networks..." msgstr "Настроить &сети..." -#: ../src/qtui/mainwin.cpp:361 +#: ../src/qtui/mainwin.cpp:371 msgctxt "MainWin|" msgid "&Quit" msgstr "В&ыход" -#: ../src/qtui/mainwin.cpp:365 +#: ../src/qtui/mainwin.cpp:375 msgctxt "MainWin|" msgid "&Configure Chat Lists..." msgstr "&Настройка Списка Чата" -#: ../src/qtui/mainwin.cpp:368 +#: ../src/qtui/mainwin.cpp:378 msgctxt "MainWin|" msgid "&Lock Layout" msgstr "&Блокировать расположение" -#: ../src/qtui/mainwin.cpp:372 +#: ../src/qtui/mainwin.cpp:382 msgctxt "MainWin|" msgid "Show &Search Bar" msgstr "Показать строку &поиска" -#: ../src/qtui/mainwin.cpp:374 +#: ../src/qtui/mainwin.cpp:384 msgctxt "MainWin|" msgid "Show Away Log" msgstr "Показать журнал отсутствия" -#: ../src/qtui/mainwin.cpp:376 +#: ../src/qtui/mainwin.cpp:386 msgctxt "MainWin|" msgid "Show &Menubar" msgstr "Показать строку &поиска" -#: ../src/qtui/mainwin.cpp:379 +#: ../src/qtui/mainwin.cpp:389 msgctxt "MainWin|" msgid "Show Status &Bar" msgstr "Показать строку &статуса" -#: ../src/qtui/mainwin.cpp:385 +#: ../src/qtui/mainwin.cpp:395 msgctxt "MainWin|" msgid "&Full Screen Mode" msgstr "" -#: ../src/qtui/mainwin.cpp:392 +#: ../src/qtui/mainwin.cpp:402 msgctxt "MainWin|" msgid "Configure &Shortcuts..." msgstr "Настроить &сети..." -#: ../src/qtui/mainwin.cpp:398 ../src/qtui/mainwin.cpp:402 +#: ../src/qtui/mainwin.cpp:408 ../src/qtui/mainwin.cpp:412 msgctxt "MainWin|" msgid "&Configure Quassel..." msgstr "&Настройки Quassel..." -#: ../src/qtui/mainwin.cpp:408 +#: ../src/qtui/mainwin.cpp:418 msgctxt "MainWin|" msgid "&About Quassel" msgstr "&О Quassel" -#: ../src/qtui/mainwin.cpp:413 +#: ../src/qtui/mainwin.cpp:423 msgctxt "MainWin|" msgid "About &Qt" msgstr "О &Qt" -#: ../src/qtui/mainwin.cpp:417 +#: ../src/qtui/mainwin.cpp:427 msgctxt "MainWin|" msgid "Debug &NetworkModel" msgstr "Отладить &NetworkModel" -#: ../src/qtui/mainwin.cpp:419 +#: ../src/qtui/mainwin.cpp:429 msgctxt "MainWin|" msgid "Debug &BufferViewOverlay" msgstr "" -#: ../src/qtui/mainwin.cpp:421 +#: ../src/qtui/mainwin.cpp:431 msgctxt "MainWin|" msgid "Debug &MessageModel" msgstr "Отладить &MessageModel" -#: ../src/qtui/mainwin.cpp:423 +#: ../src/qtui/mainwin.cpp:433 msgctxt "MainWin|" msgid "Debug &HotList" msgstr "&Журнал отладки" -#: ../src/qtui/mainwin.cpp:425 +#: ../src/qtui/mainwin.cpp:435 msgctxt "MainWin|" msgid "Debug &Log" msgstr "&Журнал отладки" -#: ../src/qtui/mainwin.cpp:427 +#: ../src/qtui/mainwin.cpp:437 msgctxt "MainWin|" msgid "Reload Stylesheet" msgstr "Использовать свою таблицу стилей" -#: ../src/qtui/mainwin.cpp:430 +#: ../src/qtui/mainwin.cpp:440 msgctxt "MainWin|" msgid "Hide Current Buffer" msgstr "" -#: ../src/qtui/mainwin.cpp:434 +#: ../src/qtui/mainwin.cpp:444 msgctxt "MainWin|" msgid "Navigation" msgstr "Организация:" -#: ../src/qtui/mainwin.cpp:436 +#: ../src/qtui/mainwin.cpp:446 msgctxt "MainWin|" msgid "Jump to hot chat" msgstr "" -#: ../src/qtui/mainwin.cpp:448 +#: ../src/qtui/mainwin.cpp:458 msgctxt "MainWin|" msgid "Set Quick Access #0" msgstr "" -#: ../src/qtui/mainwin.cpp:450 +#: ../src/qtui/mainwin.cpp:460 msgctxt "MainWin|" msgid "Set Quick Access #1" msgstr "" -#: ../src/qtui/mainwin.cpp:452 +#: ../src/qtui/mainwin.cpp:462 msgctxt "MainWin|" msgid "Set Quick Access #2" msgstr "" -#: ../src/qtui/mainwin.cpp:454 +#: ../src/qtui/mainwin.cpp:464 msgctxt "MainWin|" msgid "Set Quick Access #3" msgstr "" -#: ../src/qtui/mainwin.cpp:456 +#: ../src/qtui/mainwin.cpp:466 msgctxt "MainWin|" msgid "Set Quick Access #4" msgstr "" -#: ../src/qtui/mainwin.cpp:458 +#: ../src/qtui/mainwin.cpp:468 msgctxt "MainWin|" msgid "Set Quick Access #5" msgstr "" -#: ../src/qtui/mainwin.cpp:460 +#: ../src/qtui/mainwin.cpp:470 msgctxt "MainWin|" msgid "Set Quick Access #6" msgstr "" -#: ../src/qtui/mainwin.cpp:462 +#: ../src/qtui/mainwin.cpp:472 msgctxt "MainWin|" msgid "Set Quick Access #7" msgstr "" -#: ../src/qtui/mainwin.cpp:464 +#: ../src/qtui/mainwin.cpp:474 msgctxt "MainWin|" msgid "Set Quick Access #8" msgstr "" -#: ../src/qtui/mainwin.cpp:466 +#: ../src/qtui/mainwin.cpp:476 msgctxt "MainWin|" msgid "Set Quick Access #9" msgstr "" -#: ../src/qtui/mainwin.cpp:469 +#: ../src/qtui/mainwin.cpp:479 msgctxt "MainWin|" msgid "Quick Access #0" msgstr "" -#: ../src/qtui/mainwin.cpp:471 +#: ../src/qtui/mainwin.cpp:481 msgctxt "MainWin|" msgid "Quick Access #1" msgstr "" -#: ../src/qtui/mainwin.cpp:473 +#: ../src/qtui/mainwin.cpp:483 msgctxt "MainWin|" msgid "Quick Access #2" msgstr "" -#: ../src/qtui/mainwin.cpp:475 +#: ../src/qtui/mainwin.cpp:485 msgctxt "MainWin|" msgid "Quick Access #3" msgstr "" -#: ../src/qtui/mainwin.cpp:477 +#: ../src/qtui/mainwin.cpp:487 msgctxt "MainWin|" msgid "Quick Access #4" msgstr "" -#: ../src/qtui/mainwin.cpp:479 +#: ../src/qtui/mainwin.cpp:489 msgctxt "MainWin|" msgid "Quick Access #5" msgstr "" -#: ../src/qtui/mainwin.cpp:481 +#: ../src/qtui/mainwin.cpp:491 msgctxt "MainWin|" msgid "Quick Access #6" msgstr "" -#: ../src/qtui/mainwin.cpp:483 +#: ../src/qtui/mainwin.cpp:493 msgctxt "MainWin|" msgid "Quick Access #7" msgstr "" -#: ../src/qtui/mainwin.cpp:485 +#: ../src/qtui/mainwin.cpp:495 msgctxt "MainWin|" msgid "Quick Access #8" msgstr "" -#: ../src/qtui/mainwin.cpp:487 +#: ../src/qtui/mainwin.cpp:497 msgctxt "MainWin|" msgid "Quick Access #9" msgstr "" -#: ../src/qtui/mainwin.cpp:491 +#: ../src/qtui/mainwin.cpp:501 msgctxt "MainWin|" msgid "Activate Next Chat List" msgstr "Удалить Чатлист?" -#: ../src/qtui/mainwin.cpp:493 +#: ../src/qtui/mainwin.cpp:503 msgctxt "MainWin|" msgid "Activate Previous Chat List" msgstr "" -#: ../src/qtui/mainwin.cpp:495 +#: ../src/qtui/mainwin.cpp:505 msgctxt "MainWin|" msgid "Go to Next Chat" msgstr "Войти в Чат" -#: ../src/qtui/mainwin.cpp:497 +#: ../src/qtui/mainwin.cpp:507 msgctxt "MainWin|" msgid "Go to Previous Chat" msgstr "Войти в Чат" -#: ../src/qtui/mainwin.cpp:506 +#: ../src/qtui/mainwin.cpp:516 msgctxt "MainWin|" msgid "&File" msgstr "&Файл" -#: ../src/qtui/mainwin.cpp:519 +#: ../src/qtui/mainwin.cpp:529 msgctxt "MainWin|" msgid "&Networks" msgstr "&Сети" -#: ../src/qtui/mainwin.cpp:525 +#: ../src/qtui/mainwin.cpp:535 msgctxt "MainWin|" msgid "&View" msgstr "&Вид" -#: ../src/qtui/mainwin.cpp:526 +#: ../src/qtui/mainwin.cpp:536 msgctxt "MainWin|" msgid "&Chat Lists" msgstr "&Список Чатов" -#: ../src/qtui/mainwin.cpp:528 +#: ../src/qtui/mainwin.cpp:538 msgctxt "MainWin|" msgid "&Toolbars" msgstr "Па&нели" -#: ../src/qtui/mainwin.cpp:542 +#: ../src/qtui/mainwin.cpp:552 msgctxt "MainWin|" msgid "&Settings" msgstr "&Настройки" -#: ../src/qtui/mainwin.cpp:551 +#: ../src/qtui/mainwin.cpp:562 msgctxt "MainWin|" msgid "&Help" msgstr "&Помощь" -#: ../src/qtui/mainwin.cpp:559 +#: ../src/qtui/mainwin.cpp:571 msgctxt "MainWin|" msgid "Debug" msgstr "Отладка" -#: ../src/qtui/mainwin.cpp:835 +#: ../src/qtui/mainwin.cpp:747 +msgctxt "MainWin|" +msgid "Feature Not Supported" +msgstr "" + +#: ../src/qtui/mainwin.cpp:748 +msgctxt "MainWin|" +msgid "Your Quassel Core does not support this feature" +msgstr "" + +#: ../src/qtui/mainwin.cpp:750 +msgctxt "MainWin|" +msgid "" +"You need a Quassel Core v0.12.0 or newer in order to be able to remotely " +"change your password." +msgstr "" + +#: ../src/qtui/mainwin.cpp:863 msgctxt "MainWin|" msgid "Nicks" msgstr "Ники" -#: ../src/qtui/mainwin.cpp:844 +#: ../src/qtui/mainwin.cpp:872 msgctxt "MainWin|" msgid "Show Nick List" msgstr "Показать список ников" -#: ../src/qtui/mainwin.cpp:857 +#: ../src/qtui/mainwin.cpp:885 msgctxt "MainWin|" msgid "Chat Monitor" msgstr "Монитор чата" -#: ../src/qtui/mainwin.cpp:869 +#: ../src/qtui/mainwin.cpp:897 msgctxt "MainWin|" msgid "Show Chat Monitor" msgstr "Показать монитор чата" -#: ../src/qtui/mainwin.cpp:875 +#: ../src/qtui/mainwin.cpp:903 msgctxt "MainWin|" msgid "Inputline" msgstr "Строкаввода" -#: ../src/qtui/mainwin.cpp:884 +#: ../src/qtui/mainwin.cpp:912 msgctxt "MainWin|" msgid "Show Input Line" msgstr "Показать строку ввода" -#: ../src/qtui/mainwin.cpp:899 +#: ../src/qtui/mainwin.cpp:927 msgctxt "MainWin|" msgid "Topic" msgstr "Тема" -#: ../src/qtui/mainwin.cpp:911 +#: ../src/qtui/mainwin.cpp:939 msgctxt "MainWin|" msgid "Show Topic Line" msgstr "Показать строку темы" -#: ../src/qtui/mainwin.cpp:1005 +#: ../src/qtui/mainwin.cpp:1033 msgctxt "MainWin|" msgid "Main Toolbar" msgstr "Па&нели" -#: ../src/qtui/mainwin.cpp:1048 +#: ../src/qtui/mainwin.cpp:1097 msgctxt "MainWin|" msgid "Connected to core." msgstr "Соединение с ядром установлено." -#: ../src/qtui/mainwin.cpp:1147 +#: ../src/qtui/mainwin.cpp:1197 msgctxt "MainWin|" msgid "Not connected to core." msgstr "Нет соединения с ядром." -#: ../src/qtui/mainwin.cpp:1165 ../src/qtui/mainwin.cpp:1175 +#: ../src/qtui/mainwin.cpp:1215 ../src/qtui/mainwin.cpp:1225 msgctxt "MainWin|" msgid "Unencrypted Connection" msgstr "Незашифрованное Подключение" -#: ../src/qtui/mainwin.cpp:1165 +#: ../src/qtui/mainwin.cpp:1215 msgctxt "MainWin|" msgid "Your client does not support SSL encryption" msgstr " Ваш клиент не поддерживает SSL шифрование" -#: ../src/qtui/mainwin.cpp:1167 ../src/qtui/mainwin.cpp:1177 +#: ../src/qtui/mainwin.cpp:1217 ../src/qtui/mainwin.cpp:1227 msgctxt "MainWin|" msgid "" "Sensitive data, like passwords, will be transmitted unencrypted to your " "Quassel core." msgstr "" -#: ../src/qtui/mainwin.cpp:1175 +#: ../src/qtui/mainwin.cpp:1225 msgctxt "MainWin|" msgid "Your core does not support SSL encryption" msgstr " Ваше ядро не поддерживает SSL шифрование" -#: ../src/qtui/mainwin.cpp:1193 ../src/qtui/mainwin.cpp:1214 +#: ../src/qtui/mainwin.cpp:1243 ../src/qtui/mainwin.cpp:1264 msgctxt "MainWin|" msgid "Untrusted Security Certificate" msgstr "Недоверяемый Сертификат Безопасности" -#: ../src/qtui/mainwin.cpp:1194 +#: ../src/qtui/mainwin.cpp:1244 #, qt-format msgctxt "MainWin|" msgid "" @@ -4269,33 +4959,33 @@ msgid "" "following reasons:" msgstr "" -#: ../src/qtui/mainwin.cpp:1197 +#: ../src/qtui/mainwin.cpp:1247 msgctxt "MainWin|" msgid "Continue" msgstr "Продолжить" -#: ../src/qtui/mainwin.cpp:1198 +#: ../src/qtui/mainwin.cpp:1248 msgctxt "MainWin|" msgid "Show Certificate" msgstr "Показать Сертификаты" -#: ../src/qtui/mainwin.cpp:1215 +#: ../src/qtui/mainwin.cpp:1265 msgctxt "MainWin|" msgid "" "Would you like to accept this certificate forever without being prompted?" msgstr "" -#: ../src/qtui/mainwin.cpp:1217 +#: ../src/qtui/mainwin.cpp:1267 msgctxt "MainWin|" msgid "Current Session Only" msgstr "Только Текущий Сеанс" -#: ../src/qtui/mainwin.cpp:1218 +#: ../src/qtui/mainwin.cpp:1268 msgctxt "MainWin|" msgid "Forever" msgstr "" -#: ../src/qtui/mainwin.cpp:1229 +#: ../src/qtui/mainwin.cpp:1279 msgctxt "MainWin|" msgid "Core Connection Error" msgstr "Основная Ошибка Подключения" @@ -4316,7 +5006,7 @@ msgctxt "MsgProcessorStatusWidget|" msgid "Receiving Backlog" msgstr "Получаю журнал" -#: ../src/uisupport/multilineedit.cpp:718 +#: ../src/uisupport/multilineedit.cpp:701 #, qt-format msgctxt "MultiLineEdit|" msgid "Do you really want to paste %n line(s)?" @@ -4324,8 +5014,9 @@ msgid_plural "Do you really want to paste %n line(s)?" msgstr[0] "" msgstr[1] "" msgstr[2] "" +msgstr[3] "" -#: ../src/uisupport/multilineedit.cpp:727 +#: ../src/uisupport/multilineedit.cpp:714 msgctxt "MultiLineEdit|" msgid "Paste Protection" msgstr "Защита при вставке" @@ -4385,40 +5076,40 @@ msgctxt "NetworkEditDlg|" msgid "Please enter a network name:" msgstr "Пожалуйста введите название сети:" -#: ../src/qtui/settingspages/networkssettingspage.cpp:840 +#: ../src/qtui/settingspages/networkssettingspage.cpp:841 msgctxt "NetworkEditDlg|" msgid "Add Network" msgstr "Добавить сеть" -#: ../src/client/networkmodel.cpp:213 +#: ../src/client/networkmodel.cpp:216 ../src/client/networkmodel.cpp:219 #, qt-format msgctxt "NetworkItem|" msgid "Server: %1" msgstr "" -#: ../src/client/networkmodel.cpp:214 +#: ../src/client/networkmodel.cpp:221 #, qt-format msgctxt "NetworkItem|" msgid "Users: %1" msgstr "" -#: ../src/client/networkmodel.cpp:217 +#: ../src/client/networkmodel.cpp:224 #, qt-format msgctxt "NetworkItem|" msgid "Lag: %1 msecs" msgstr "Лаг: %1 мс" -#: ../src/client/networkmodel.cpp:960 +#: ../src/client/networkmodel.cpp:1002 msgctxt "NetworkModel|" msgid "Chat" msgstr "Вид Окна Чата" -#: ../src/client/networkmodel.cpp:960 +#: ../src/client/networkmodel.cpp:1002 msgctxt "NetworkModel|" msgid "Topic" msgstr "Тема" -#: ../src/client/networkmodel.cpp:960 +#: ../src/client/networkmodel.cpp:1002 msgctxt "NetworkModel|" msgid "Nick Count" msgstr "Ников" @@ -4430,6 +5121,7 @@ msgid_plural "Do you want to delete the following buffer(s) permanently?" msgstr[0] "" msgstr[1] "" msgstr[2] "" +msgstr[3] "" #: ../src/uisupport/networkmodelcontroller.cpp:190 #, qt-format @@ -4455,27 +5147,27 @@ msgctxt "NetworkModelController|" msgid "Remove buffers permanently?" msgstr "Удалить буфера навсегда?" -#: ../src/uisupport/networkmodelcontroller.cpp:530 +#: ../src/uisupport/networkmodelcontroller.cpp:544 msgctxt "NetworkModelController::JoinDlg|" msgid "Join Channel" msgstr "Зайти на канал" -#: ../src/uisupport/networkmodelcontroller.cpp:533 +#: ../src/uisupport/networkmodelcontroller.cpp:547 msgctxt "NetworkModelController::JoinDlg|" msgid "Network:" msgstr "Сеть:" -#: ../src/uisupport/networkmodelcontroller.cpp:535 +#: ../src/uisupport/networkmodelcontroller.cpp:549 msgctxt "NetworkModelController::JoinDlg|" msgid "Channel:" msgstr "Канал:" -#: ../src/uisupport/networkmodelcontroller.cpp:537 +#: ../src/uisupport/networkmodelcontroller.cpp:551 msgctxt "NetworkModelController::JoinDlg|" msgid "Password:" msgstr "Пароль:" -#: ../src/qtui/ircconnectionwizard.cpp:158 +#: ../src/qtui/ircconnectionwizard.cpp:159 msgctxt "NetworkPage|" msgid "Setup Network Connection" msgstr "Настройка сетевого соединения" @@ -4714,44 +5406,44 @@ msgctxt "NetworksSettingsPage|" msgid "Server encoding:" msgstr "Кодировка сервера:" -#: ../src/qtui/settingspages/networkssettingspage.cpp:37 +#: ../src/qtui/settingspages/networkssettingspage.cpp:38 msgctxt "NetworksSettingsPage|" msgid "IRC" msgstr "IRC" -#: ../src/qtui/settingspages/networkssettingspage.cpp:37 +#: ../src/qtui/settingspages/networkssettingspage.cpp:38 msgctxt "NetworksSettingsPage|" msgid "Networks" msgstr "Сети" -#: ../src/qtui/settingspages/networkssettingspage.cpp:184 +#: ../src/qtui/settingspages/networkssettingspage.cpp:185 msgctxt "NetworksSettingsPage|" msgid "" "The following problems need to be corrected before your changes can be " "applied:
    " msgstr "Прежде чем сохранить настройки, необходимо устранить следующие проблемы:
      " -#: ../src/qtui/settingspages/networkssettingspage.cpp:185 +#: ../src/qtui/settingspages/networkssettingspage.cpp:186 msgctxt "NetworksSettingsPage|" msgid "
    • All networks need at least one server defined
      • " msgstr "
    • У каждой сети должен быть хотя бы один сервер
      • " -#: ../src/qtui/settingspages/networkssettingspage.cpp:186 +#: ../src/qtui/settingspages/networkssettingspage.cpp:187 msgctxt "NetworksSettingsPage|" msgid "
    " msgstr "
" -#: ../src/qtui/settingspages/networkssettingspage.cpp:187 +#: ../src/qtui/settingspages/networkssettingspage.cpp:188 msgctxt "NetworksSettingsPage|" msgid "Invalid Network Settings" msgstr "Некорректные настройки сети" -#: ../src/qtui/settingspages/networkssettingspage.cpp:650 +#: ../src/qtui/settingspages/networkssettingspage.cpp:651 msgctxt "NetworksSettingsPage|" msgid "Delete Network?" msgstr "Удалить сеть?" -#: ../src/qtui/settingspages/networkssettingspage.cpp:651 +#: ../src/qtui/settingspages/networkssettingspage.cpp:652 #, qt-format msgctxt "NetworksSettingsPage|" msgid "" @@ -4776,7 +5468,7 @@ msgid "" "the special characters {, }, [, ], \\, |, `, ^, _ and -." msgstr "Корректный ник может содержать только буквы латинского алфавита, цифры и спецсимволы {, }, [, ], \\, |, `, ^, _ и -." -#: ../src/qtui/settingspages/identitiessettingspage.cpp:479 +#: ../src/qtui/settingspages/identitiessettingspage.cpp:480 msgctxt "NickEditDlg|" msgid "Add Nickname" msgstr "Добавить ник" @@ -4791,7 +5483,52 @@ msgctxt "NotificationsSettingsPage|" msgid "Notifications" msgstr "Уведомления" -#: ../src/qtui/phononnotificationbackend.cpp:186 +#: ../src/qtui/ui/passwordchangedlg.ui:14 +msgctxt "PasswordChangeDlg|" +msgid "Change Password" +msgstr "" + +#: ../src/qtui/ui/passwordchangedlg.ui:37 +msgctxt "PasswordChangeDlg|" +msgid "Old password:" +msgstr "" + +#: ../src/qtui/ui/passwordchangedlg.ui:51 +msgctxt "PasswordChangeDlg|" +msgid "New Password:" +msgstr "" + +#: ../src/qtui/ui/passwordchangedlg.ui:65 +msgctxt "PasswordChangeDlg|" +msgid "Confirm password:" +msgstr "" + +#: ../src/qtui/passwordchangedlg.cpp:33 +#, qt-format +msgctxt "PasswordChangeDlg|" +msgid "" +"This changes the password for your username %1 on the Quassel Core " +"running at %2." +msgstr "" + +#: ../src/qtui/passwordchangedlg.cpp:66 +msgctxt "PasswordChangeDlg|" +msgid "Password Not Changed" +msgstr "" + +#: ../src/qtui/passwordchangedlg.cpp:67 +msgctxt "PasswordChangeDlg|" +msgid "Password change failed" +msgstr "" + +#: ../src/qtui/passwordchangedlg.cpp:69 +msgctxt "PasswordChangeDlg|" +msgid "" +"The core reported an error when trying to change your password. Make sure " +"you entered your old password correctly!" +msgstr "" + +#: ../src/qtui/phononnotificationbackend.cpp:188 msgctxt "PhononNotificationBackend::ConfigWidget|" msgid "Select Audio File" msgstr "Выбрать звуковой файл" @@ -4841,12 +5578,12 @@ msgctxt "QObject|" msgid "Requesting a total of up to %1 unread backlog messages for %2 buffers" msgstr "Запрашиваю суммарно до %1 непрочитанных сообщений из журнала для %2 буферов" -#: ../src/qtui/ircconnectionwizard.cpp:56 +#: ../src/qtui/ircconnectionwizard.cpp:57 msgctxt "QObject|" msgid "Welcome to Quassel IRC" msgstr "Добро пожаловать в Quassel IRC" -#: ../src/qtui/ircconnectionwizard.cpp:58 +#: ../src/qtui/ircconnectionwizard.cpp:59 msgctxt "QObject|" msgid "" "This wizard will help you to set up your default identity and your IRC " @@ -4854,159 +5591,159 @@ msgid "" "wizard any time and use the settings dialog for more detailed changes." msgstr "Этот мастер поможет настроить личность по умолчанию и сетевое соединение с IRC.
Он устанавливает только базовые настройки. В любой момент можно отказаться от мастера и использовать окно настройки для более подробной конфигурации." -#: ../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 "Недопустимое условие %1" -#: ../src/uisupport/qssparser.cpp:148 +#: ../src/uisupport/qssparser.cpp:147 #, qt-format msgctxt "QssParser|" msgid "Invalid palette role assignment: %1" msgstr "Некорректный адрес для прослушивания %1" -#: ../src/uisupport/qssparser.cpp:167 +#: ../src/uisupport/qssparser.cpp:166 #, qt-format msgctxt "QssParser|" msgid "Unknown palette role name: %1" msgstr "" -#: ../src/uisupport/qssparser.cpp:205 +#: ../src/uisupport/qssparser.cpp:204 #, qt-format msgctxt "QssParser|" msgid "Invalid subelement name in %1" msgstr "Недопустимый тип сообщения в %1" -#: ../src/uisupport/qssparser.cpp:249 +#: ../src/uisupport/qssparser.cpp:248 #, qt-format msgctxt "QssParser|" msgid "Invalid message type in %1" msgstr "" -#: ../src/uisupport/qssparser.cpp:258 +#: ../src/uisupport/qssparser.cpp:257 #, qt-format msgctxt "QssParser|" msgid "Invalid condition %1" msgstr "Недопустимое условие %1" -#: ../src/uisupport/qssparser.cpp:270 +#: ../src/uisupport/qssparser.cpp:269 #, qt-format msgctxt "QssParser|" msgid "Invalid message label: %1" msgstr "Недопустимая метка сообщения: %1" -#: ../src/uisupport/qssparser.cpp:282 +#: ../src/uisupport/qssparser.cpp:281 #, qt-format msgctxt "QssParser|" msgid "Invalid senderhash specification: %1" msgstr "" -#: ../src/uisupport/qssparser.cpp:286 +#: ../src/uisupport/qssparser.cpp:285 msgctxt "QssParser|" msgid "Senderhash can be at most \"0x0f\"!" msgstr "" -#: ../src/uisupport/qssparser.cpp:302 +#: ../src/uisupport/qssparser.cpp:301 #, qt-format msgctxt "QssParser|" msgid "Invalid format name: %1" msgstr "Недопустимая метка сообщения: %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 "" -#: ../src/uisupport/qssparser.cpp:319 +#: ../src/uisupport/qssparser.cpp:318 #, qt-format msgctxt "QssParser|" msgid "Unhandled condition: %1" msgstr "Недопустимое условие %1" -#: ../src/uisupport/qssparser.cpp:350 +#: ../src/uisupport/qssparser.cpp:349 #, qt-format msgctxt "QssParser|" msgid "Invalid proplist %1" msgstr "Недопустимое условие %1" -#: ../src/uisupport/qssparser.cpp:369 +#: ../src/uisupport/qssparser.cpp:368 #, qt-format msgctxt "QssParser|" msgid "Invalid chatlist item type %1" msgstr "Некорректный адрес для прослушивания %1" -#: ../src/uisupport/qssparser.cpp:385 +#: ../src/uisupport/qssparser.cpp:384 #, qt-format msgctxt "QssParser|" msgid "Invalid chatlist state %1" msgstr "Некорректный адрес для прослушивания %1" -#: ../src/uisupport/qssparser.cpp:415 +#: ../src/uisupport/qssparser.cpp:414 #, qt-format msgctxt "QssParser|" msgid "Invalid property declaration: %1" msgstr "Недопустимое условие %1" -#: ../src/uisupport/qssparser.cpp:439 +#: ../src/uisupport/qssparser.cpp:438 #, qt-format msgctxt "QssParser|" msgid "Invalid font property: %1" msgstr "Недопустимое условие %1" -#: ../src/uisupport/qssparser.cpp:445 +#: ../src/uisupport/qssparser.cpp:444 #, qt-format msgctxt "QssParser|" msgid "Unknown ChatLine property: %1" msgstr "" -#: ../src/uisupport/qssparser.cpp:469 +#: ../src/uisupport/qssparser.cpp:468 #, qt-format msgctxt "QssParser|" msgid "Invalid palette color role specification: %1" msgstr "" -#: ../src/uisupport/qssparser.cpp:476 +#: ../src/uisupport/qssparser.cpp:475 #, qt-format msgctxt "QssParser|" msgid "Unknown palette color role: %1" msgstr "" -#: ../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 "Недопустимое условие %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 "Недопустимый тип сообщения в %1" -#: ../src/uisupport/qssparser.cpp:647 +#: ../src/uisupport/qssparser.cpp:646 #, qt-format msgctxt "QssParser|" msgid "Invalid font specification: %1" msgstr "Недопустимое условие %1" -#: ../src/uisupport/qssparser.cpp:688 +#: ../src/uisupport/qssparser.cpp:687 #, qt-format msgctxt "QssParser|" msgid "Invalid font style specification: %1" msgstr "Недопустимое условие %1" -#: ../src/uisupport/qssparser.cpp:703 +#: ../src/uisupport/qssparser.cpp:702 #, qt-format msgctxt "QssParser|" msgid "Invalid font weight specification: %1" msgstr "Недопустимое условие %1" -#: ../src/uisupport/qssparser.cpp:715 +#: ../src/uisupport/qssparser.cpp:714 #, qt-format msgctxt "QssParser|" msgid "Invalid font size specification: %1" @@ -5037,30 +5774,46 @@ msgctxt "Quassel::secondsToString()|" msgid "sec" msgstr "сек" -#: ../src/client/networkmodel.cpp:482 +#: ../src/client/networkmodel.cpp:497 #, qt-format msgctxt "QueryBufferItem|" msgid "Query with %1" msgstr "Приват с %1" -#: ../src/client/networkmodel.cpp:500 +#: ../src/client/networkmodel.cpp:515 #, qt-format msgctxt "QueryBufferItem|" msgid "idling since %1" msgstr "неактивен с %1" -#: ../src/client/networkmodel.cpp:503 +#: ../src/client/networkmodel.cpp:518 #, qt-format msgctxt "QueryBufferItem|" msgid "login time: %1" msgstr "время входа: %1" -#: ../src/client/networkmodel.cpp:506 +#: ../src/client/networkmodel.cpp:521 #, qt-format msgctxt "QueryBufferItem|" msgid "server: %1" msgstr "сервер: %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" @@ -5119,20 +5872,18 @@ msgstr "Версия SSL:" #: ../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 "Не меняйте, если не собираетесь подключаться к серверу, не поддерживающему SSLv3!" +msgid "Use only TLSv1 unless you know what you are doing!" +msgstr "" #: ../src/qtui/settingspages/servereditdlg.ui:151 msgctxt "ServerEditDlg|" -msgid "SSLv3 (default)" -msgstr "SSLv3 (по умолчанию)" +msgid "SSLv3 (insecure)" +msgstr "" #: ../src/qtui/settingspages/servereditdlg.ui:156 msgctxt "ServerEditDlg|" -msgid "SSLv2" -msgstr "SSLv2" +msgid "SSLv2 (insecure)" +msgstr "" #: ../src/qtui/settingspages/servereditdlg.ui:161 msgctxt "ServerEditDlg|" @@ -5238,28 +5989,28 @@ msgctxt "SettingsPageDlg|" msgid "Settings" msgstr "Настройки" -#: ../src/qtui/settingspagedlg.cpp:39 +#: ../src/qtui/settingspagedlg.cpp:38 #, qt-format msgctxt "SettingsPageDlg|" msgid "Configure %1" msgstr "Настроить %1" -#: ../src/qtui/settingspagedlg.cpp:120 +#: ../src/qtui/settingspagedlg.cpp:119 msgctxt "SettingsPageDlg|" msgid "Reload Settings" msgstr "Вернуть настройки" -#: ../src/qtui/settingspagedlg.cpp:120 +#: ../src/qtui/settingspagedlg.cpp:119 msgctxt "SettingsPageDlg|" msgid "Do you like to reload the settings, undoing your changes on this page?" msgstr "Вернуть старый настройки, отменив все изменения на этой вкладке?" -#: ../src/qtui/settingspagedlg.cpp:131 +#: ../src/qtui/settingspagedlg.cpp:130 msgctxt "SettingsPageDlg|" msgid "Restore Defaults" msgstr "Вернуть умолчания" -#: ../src/qtui/settingspagedlg.cpp:131 +#: ../src/qtui/settingspagedlg.cpp:130 msgctxt "SettingsPageDlg|" msgid "Do you like to restore the default values for this page?" msgstr "Вернуть параметры по-умолчанию для этой вкладки?" @@ -5316,7 +6067,7 @@ msgctxt "ShortcutsSettingsPage|" msgid "Shortcuts" msgstr "" -#: ../src/common/signalproxy.cpp:736 +#: ../src/common/signalproxy.cpp:775 msgctxt "SignalProxy|" msgid "Disconnecting" msgstr "Отсоединяюсь" @@ -5399,6 +6150,41 @@ msgid "" "network" msgstr "Список каналов IRC, на которые клиент будет автоматически заходить при подключении к сети" +#: ../src/qtui/snorenotificationbackend.cpp:59 +msgctxt "SnoreNotificationBackend|" +msgid "Private Message" +msgstr "" + +#: ../src/qtui/ui/snorentificationconfigwidget.ui:20 +msgctxt "SnoreNotificationConfigWidget|" +msgid "Form" +msgstr "Форма" + +#: ../src/qtui/ui/snorentificationconfigwidget.ui:29 +msgctxt "SnoreNotificationConfigWidget|" +msgid "Snore" +msgstr "" + +#: ../src/qtui/ui/snorentificationconfigwidget.ui:41 +msgctxt "SnoreNotificationConfigWidget|" +msgid "Backend:" +msgstr "" + +#: ../src/qtui/ui/snorentificationconfigwidget.ui:64 +msgctxt "SnoreNotificationConfigWidget|" +msgid "Timeout:" +msgstr "" + +#: ../src/qtui/ui/snorentificationconfigwidget.ui:80 +msgctxt "SnoreNotificationConfigWidget|" +msgid " s" +msgstr " сек" + +#: ../src/qtui/ui/snorentificationconfigwidget.ui:96 +msgctxt "SnoreNotificationConfigWidget|" +msgid "0 means infinite" +msgstr "" + #: ../src/core/sqlitestorage.cpp:60 msgctxt "SqliteStorage|" msgid "" @@ -5515,22 +6301,22 @@ msgctxt "SslInfoDlg|" msgid "%1 to %2" msgstr "" -#: ../src/client/networkmodel.h:149 +#: ../src/client/networkmodel.h:151 msgctxt "StatusBufferItem|" msgid "Status Buffer" msgstr "Буфер состояния" -#: ../src/qtui/systemtray.cpp:68 ../src/qtui/systemtray.cpp:101 +#: ../src/qtui/systemtray.cpp:67 ../src/qtui/systemtray.cpp:100 msgctxt "SystemTray|" msgid "&Minimize" msgstr "" -#: ../src/qtui/systemtray.cpp:103 +#: ../src/qtui/systemtray.cpp:102 msgctxt "SystemTray|" msgid "&Restore" msgstr "" -#: ../src/qtui/systraynotificationbackend.cpp:142 +#: ../src/qtui/systraynotificationbackend.cpp:141 #, qt-format msgctxt "SystrayNotificationBackend|" msgid "%n pending highlight(s)" @@ -5538,8 +6324,9 @@ msgid_plural "%n pending highlight(s)" msgstr[0] "" msgstr[1] "" msgstr[2] "" +msgstr[3] "" -#: ../src/qtui/systraynotificationbackend.cpp:156 +#: ../src/qtui/systraynotificationbackend.cpp:155 msgctxt "SystrayNotificationBackend::ConfigWidget|" msgid "Show a message in a popup" msgstr "Показывать свои сообщения" @@ -5569,142 +6356,142 @@ msgctxt "TaskbarNotificationBackend::ConfigWidget|" msgid " seconds" msgstr " сек." -#: ../src/uisupport/toolbaractionprovider.cpp:31 +#: ../src/uisupport/toolbaractionprovider.cpp:30 msgctxt "ToolBarActionProvider|" msgid "Connect" msgstr "Соединиться" -#: ../src/uisupport/toolbaractionprovider.cpp:31 +#: ../src/uisupport/toolbaractionprovider.cpp:30 msgctxt "ToolBarActionProvider|" msgid "Connect to IRC" msgstr "Соединиться с IRC" -#: ../src/uisupport/toolbaractionprovider.cpp:32 +#: ../src/uisupport/toolbaractionprovider.cpp:31 msgctxt "ToolBarActionProvider|" msgid "Disconnect" msgstr "Отсоединиться" -#: ../src/uisupport/toolbaractionprovider.cpp:32 +#: ../src/uisupport/toolbaractionprovider.cpp:31 msgctxt "ToolBarActionProvider|" msgid "Disconnect from IRC" msgstr "Отсоединиться от IRC" -#: ../src/uisupport/toolbaractionprovider.cpp:34 +#: ../src/uisupport/toolbaractionprovider.cpp:33 msgctxt "ToolBarActionProvider|" msgid "Part" msgstr "Выйти" -#: ../src/uisupport/toolbaractionprovider.cpp:34 +#: ../src/uisupport/toolbaractionprovider.cpp:33 msgctxt "ToolBarActionProvider|" msgid "Leave currently selected channel" msgstr "Покинуть выделенный канал" -#: ../src/uisupport/toolbaractionprovider.cpp:35 +#: ../src/uisupport/toolbaractionprovider.cpp:34 msgctxt "ToolBarActionProvider|" msgid "Join" msgstr "Зайти" -#: ../src/uisupport/toolbaractionprovider.cpp:35 +#: ../src/uisupport/toolbaractionprovider.cpp:34 msgctxt "ToolBarActionProvider|" msgid "Join a channel" msgstr "Зайти на канал" -#: ../src/uisupport/toolbaractionprovider.cpp:37 +#: ../src/uisupport/toolbaractionprovider.cpp:36 msgctxt "ToolBarActionProvider|" msgid "Query" msgstr "Приват" -#: ../src/uisupport/toolbaractionprovider.cpp:37 +#: ../src/uisupport/toolbaractionprovider.cpp:36 msgctxt "ToolBarActionProvider|" msgid "Start a private conversation" msgstr "Начать личную беседу" -#: ../src/uisupport/toolbaractionprovider.cpp:38 +#: ../src/uisupport/toolbaractionprovider.cpp:37 msgctxt "ToolBarActionProvider|" msgid "Whois" msgstr "Whois" -#: ../src/uisupport/toolbaractionprovider.cpp:38 +#: ../src/uisupport/toolbaractionprovider.cpp:37 msgctxt "ToolBarActionProvider|" msgid "Request user information" msgstr "Запросить информацию о пользователе" -#: ../src/uisupport/toolbaractionprovider.cpp:40 +#: ../src/uisupport/toolbaractionprovider.cpp:39 msgctxt "ToolBarActionProvider|" msgid "Op" msgstr "Оп" -#: ../src/uisupport/toolbaractionprovider.cpp:40 +#: ../src/uisupport/toolbaractionprovider.cpp:39 msgctxt "ToolBarActionProvider|" msgid "Give operator privileges to user" msgstr "Дать пользователю статус оператора" -#: ../src/uisupport/toolbaractionprovider.cpp:41 +#: ../src/uisupport/toolbaractionprovider.cpp:40 msgctxt "ToolBarActionProvider|" msgid "Deop" msgstr "Снять оп" -#: ../src/uisupport/toolbaractionprovider.cpp:41 +#: ../src/uisupport/toolbaractionprovider.cpp:40 msgctxt "ToolBarActionProvider|" msgid "Take operator privileges from user" msgstr "Снять статус оператора с пользователя" -#: ../src/uisupport/toolbaractionprovider.cpp:42 +#: ../src/uisupport/toolbaractionprovider.cpp:41 msgctxt "ToolBarActionProvider|" msgid "Voice" msgstr "Голос" -#: ../src/uisupport/toolbaractionprovider.cpp:42 +#: ../src/uisupport/toolbaractionprovider.cpp:41 msgctxt "ToolBarActionProvider|" msgid "Give voice to user" msgstr "Дать пользователю статус \"с голосом\"" -#: ../src/uisupport/toolbaractionprovider.cpp:43 +#: ../src/uisupport/toolbaractionprovider.cpp:42 msgctxt "ToolBarActionProvider|" msgid "Devoice" msgstr "Снять голос" -#: ../src/uisupport/toolbaractionprovider.cpp:43 +#: ../src/uisupport/toolbaractionprovider.cpp:42 msgctxt "ToolBarActionProvider|" msgid "Take voice from user" msgstr "Снять статус \"с голосом\" с пользователя" -#: ../src/uisupport/toolbaractionprovider.cpp:44 +#: ../src/uisupport/toolbaractionprovider.cpp:43 msgctxt "ToolBarActionProvider|" msgid "Kick" msgstr "Выгнать" -#: ../src/uisupport/toolbaractionprovider.cpp:44 +#: ../src/uisupport/toolbaractionprovider.cpp:43 msgctxt "ToolBarActionProvider|" msgid "Remove user from channel" msgstr "Удалить пользователя с канала" -#: ../src/uisupport/toolbaractionprovider.cpp:45 +#: ../src/uisupport/toolbaractionprovider.cpp:44 msgctxt "ToolBarActionProvider|" msgid "Ban" msgstr "Забанить" -#: ../src/uisupport/toolbaractionprovider.cpp:45 +#: ../src/uisupport/toolbaractionprovider.cpp:44 msgctxt "ToolBarActionProvider|" msgid "Ban user from channel" msgstr "Запретить пользователю вход на канал" -#: ../src/uisupport/toolbaractionprovider.cpp:46 +#: ../src/uisupport/toolbaractionprovider.cpp:45 msgctxt "ToolBarActionProvider|" msgid "Kick/Ban" msgstr "Выгнать" -#: ../src/uisupport/toolbaractionprovider.cpp:46 +#: ../src/uisupport/toolbaractionprovider.cpp:45 msgctxt "ToolBarActionProvider|" msgid "Remove and ban user from channel" msgstr "Удалить пользователя с канала и запретить ему вход" -#: ../src/uisupport/toolbaractionprovider.cpp:51 +#: ../src/uisupport/toolbaractionprovider.cpp:50 msgctxt "ToolBarActionProvider|" msgid "Connect to all" msgstr "Подключиться ко всем" -#: ../src/uisupport/toolbaractionprovider.cpp:58 +#: ../src/uisupport/toolbaractionprovider.cpp:57 msgctxt "ToolBarActionProvider|" msgid "Disconnect from all" msgstr "Отключиться от всех" @@ -5719,13 +6506,13 @@ msgctxt "TopicWidget|" msgid "..." msgstr "" -#: ../src/qtui/topicwidget.cpp:118 +#: ../src/qtui/topicwidget.cpp:122 ../src/qtui/topicwidget.cpp:128 #, qt-format msgctxt "TopicWidget|" msgid "Users: %1" msgstr "" -#: ../src/qtui/topicwidget.cpp:119 +#: ../src/qtui/topicwidget.cpp:123 ../src/qtui/topicwidget.cpp:129 #, qt-format msgctxt "TopicWidget|" msgid "Lag: %1 msecs" @@ -5761,127 +6548,86 @@ msgctxt "TopicWidgetSettingsPage|" msgid "Topic Widget" msgstr "" -#. Plain Message -#. ---------- -#. Notice Message -#. ---------- -#. Server Message -#. ---------- -#. Info Message -#. ---------- -#. Error Message -#. ---------- -#. 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 -#, qt-format -msgctxt "UiStyle::StyledMessage|" -msgid "%1" -msgstr "" - -#. Action Message -#: ../src/uisupport/uistyle.cpp:672 -#, qt-format -msgctxt "UiStyle::StyledMessage|" -msgid "%DN%1%DN %2" -msgstr "" - #. Nick Message -#: ../src/uisupport/uistyle.cpp:676 +#: ../src/uisupport/uistyle.cpp:690 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "You are now known as %DN%1%DN" msgstr "" -#: ../src/uisupport/uistyle.cpp:677 +#: ../src/uisupport/uistyle.cpp:691 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "%DN%1%DN is now known as %DN%2%DN" msgstr "" #. Mode Message -#: ../src/uisupport/uistyle.cpp:681 +#: ../src/uisupport/uistyle.cpp:695 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "User mode: %DM%1%DM" msgstr "" -#: ../src/uisupport/uistyle.cpp:682 +#: ../src/uisupport/uistyle.cpp:696 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "Mode %DM%1%DM by %DN%2%DN" msgstr "" #. Join Message -#: ../src/uisupport/uistyle.cpp:686 +#: ../src/uisupport/uistyle.cpp:700 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC" msgstr "" #. Part Message -#: ../src/uisupport/uistyle.cpp:689 +#: ../src/uisupport/uistyle.cpp:703 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC" msgstr "" #. Quit Message -#: ../src/uisupport/uistyle.cpp:694 +#: ../src/uisupport/uistyle.cpp:708 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "%DN%1%DN %DH(%2@%3)%DH has quit" msgstr "" #. Kick Message -#: ../src/uisupport/uistyle.cpp:702 +#: ../src/uisupport/uistyle.cpp:716 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "%DN%1%DN has kicked %DN%2%DN from %DC%3%DC" msgstr "%DN%1%DN выкинул %DN%2%DN из %DC%3%DC" #. Day Change Message -#: ../src/uisupport/uistyle.cpp:720 +#: ../src/uisupport/uistyle.cpp:731 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "{Day changed to %1}" msgstr "{Новые сутки. Сегодня: %1}" -#: ../src/uisupport/uistyle.cpp:734 +#: ../src/uisupport/uistyle.cpp:744 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "Netsplit between %DH%1%DH and %DH%2%DH ended. Users joined: " msgstr "Нетсплит между %DH%1%DH и %DH%2%DH закончен. Пользователей присоединилось: " -#: ../src/uisupport/uistyle.cpp:738 ../src/uisupport/uistyle.cpp:754 +#: ../src/uisupport/uistyle.cpp:748 ../src/uisupport/uistyle.cpp:764 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "%DN%1%DN (%2 more)" msgstr "" -#: ../src/uisupport/uistyle.cpp:749 +#: ../src/uisupport/uistyle.cpp:759 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "Netsplit between %DH%1%DH and %DH%2%DH. Users quit: " msgstr "Нетсплит между %DH%1%DH и %DH%2%DH. Пользователей вышло: " -#: ../src/uisupport/uistyle.cpp:761 ../src/uisupport/uistyle.cpp:809 -#, qt-format -msgctxt "UiStyle::StyledMessage|" -msgid "[%1]" -msgstr "" - -#: ../src/uisupport/uistyle.cpp:807 -#, qt-format -msgctxt "UiStyle::StyledMessage|" -msgid "<%1>" -msgstr "" - -#: ../src/client/networkmodel.cpp:783 +#: ../src/client/networkmodel.cpp:825 #, qt-format msgctxt "UserCategoryItem|" msgid "%n Owner(s)" @@ -5889,8 +6635,9 @@ msgid_plural "%n Owner(s)" msgstr[0] "" msgstr[1] "" msgstr[2] "" +msgstr[3] "" -#: ../src/client/networkmodel.cpp:785 +#: ../src/client/networkmodel.cpp:827 #, qt-format msgctxt "UserCategoryItem|" msgid "%n Admin(s)" @@ -5898,8 +6645,9 @@ msgid_plural "%n Admin(s)" msgstr[0] "" msgstr[1] "" msgstr[2] "" +msgstr[3] "" -#: ../src/client/networkmodel.cpp:787 +#: ../src/client/networkmodel.cpp:829 #, qt-format msgctxt "UserCategoryItem|" msgid "%n Operator(s)" @@ -5907,8 +6655,9 @@ msgid_plural "%n Operator(s)" msgstr[0] "" msgstr[1] "" msgstr[2] "" +msgstr[3] "" -#: ../src/client/networkmodel.cpp:789 +#: ../src/client/networkmodel.cpp:831 #, qt-format msgctxt "UserCategoryItem|" msgid "%n Half-Op(s)" @@ -5916,8 +6665,9 @@ msgid_plural "%n Half-Op(s)" msgstr[0] "" msgstr[1] "" msgstr[2] "" +msgstr[3] "" -#: ../src/client/networkmodel.cpp:791 +#: ../src/client/networkmodel.cpp:833 #, qt-format msgctxt "UserCategoryItem|" msgid "%n Voiced" @@ -5925,8 +6675,9 @@ msgid_plural "%n Voiced" msgstr[0] "" msgstr[1] "" msgstr[2] "" +msgstr[3] "" -#: ../src/client/networkmodel.cpp:793 +#: ../src/client/networkmodel.cpp:835 #, qt-format msgctxt "UserCategoryItem|" msgid "%n User(s)" @@ -5934,3 +6685,4 @@ msgid_plural "%n User(s)" msgstr[0] "" msgstr[1] "" msgstr[2] "" +msgstr[3] ""