summaryrefslogtreecommitdiff
path: root/po/ru.po
diff options
context:
space:
mode:
authorDmitry Beloglazov <dm1024@gmail.com>2007-06-14 16:07:21 +0000
committerDmitry Beloglazov <dm1024@gmail.com>2007-06-14 16:07:21 +0000
commitca97b3930a6a00cbe8dcf3fb4314a57712ce5590 (patch)
treeb6a489d7cbdd57d8403129284cc20fcc68ff49a3 /po/ru.po
parentd383676a016d552f1c586d920ace02414ea075c2 (diff)
downloadpidgin-ca97b3930a6a00cbe8dcf3fb4314a57712ce5590.tar.gz
fixes #1639
committer: Luke Schierer <lschiere@pidgin.im>
Diffstat (limited to 'po/ru.po')
-rw-r--r--po/ru.po5714
1 files changed, 3225 insertions, 2489 deletions
diff --git a/po/ru.po b/po/ru.po
index fe90909a10..d32ea4dd70 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ru\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-07 11:26+0400\n"
-"PO-Revision-Date: 2007-05-11 15:00+0400\n"
+"POT-Creation-Date: 2007-06-11 12:34+0400\n"
+"PO-Revision-Date: 2007-06-12 12:00+0400\n"
"Last-Translator: Dmitry Beloglazov <dmaa@users.sf.net>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -45,7 +45,13 @@ msgstr ""
" -n, --nologin не входить автоматически\n"
" -v, --version показать текущую версию и выйти\n"
-#: ../finch/finch.c:304 ../pidgin/gtkmain.c:690
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../finch/finch.c:274 ../finch/finch.c:303
+msgid "Finch"
+msgstr "Finch"
+
+#: ../finch/finch.c:301 ../pidgin/gtkmain.c:688
#, c-format
msgid ""
"%s encountered errors migrating your settings from %s to %s. Please "
@@ -53,19 +59,16 @@ msgid ""
"http://developer.pidgin.im"
msgstr ""
-#: ../finch/finch.c:306
-msgid "Finch"
-msgstr "Finch"
-
-#: ../finch/gntaccount.c:119 ../finch/gntblist.c:286 ../finch/gntblist.c:411
-#: ../finch/gntblist.c:424 ../finch/gntplugin.c:163 ../finch/gntplugin.c:207
+#: ../finch/gntaccount.c:119 ../finch/gntblist.c:290 ../finch/gntblist.c:415
+#: ../finch/gntblist.c:428 ../finch/gntplugin.c:181 ../finch/gntplugin.c:225
#: ../finch/gntstatus.c:294 ../finch/gntstatus.c:302
-#: ../libpurple/protocols/jabber/buddy.c:1401
-#: ../libpurple/protocols/jabber/chat.c:679
-#: ../libpurple/protocols/jabber/chat.c:690
-#: ../libpurple/protocols/jabber/jabber.c:1225
+#: ../libpurple/protocols/jabber/buddy.c:1426
+#: ../libpurple/protocols/jabber/chat.c:677
+#: ../libpurple/protocols/jabber/chat.c:688
+#: ../libpurple/protocols/jabber/jabber.c:1235
#: ../libpurple/protocols/qq/group_join.c:326
-#: ../libpurple/protocols/silc/ops.c:1451
+#: ../libpurple/protocols/silc/ops.c:57 ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc10/ops.c:1451
msgid "Error"
msgstr "Ошибка"
@@ -75,18 +78,18 @@ msgstr "Учётная запись не была добавлена"
#: ../finch/gntaccount.c:120
msgid "Screenname of an account must be non-empty."
-msgstr ""
+msgstr "Идентификатор учётной записи должен быть непустым."
-#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:575
+#: ../finch/gntaccount.c:423
msgid "New mail notifications"
msgstr "Уведомления о новой почте"
-#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:504
+#: ../finch/gntaccount.c:433
msgid "Remember password"
msgstr "Запомнить пароль"
-#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1441
-#: ../pidgin/gtkblist.c:3947
+#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1478
+#: ../pidgin/gtkblist.c:3976
msgid "Modify Account"
msgstr "Изменить учётную запись"
@@ -94,32 +97,30 @@ msgstr "Изменить учётную запись"
msgid "New Account"
msgstr "Новая учётная запись"
-#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:415 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:500 ../pidgin/gtkft.c:695
msgid "Protocol:"
msgstr "Протокол:"
-#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:420
-#: ../pidgin/gtkblist.c:5356
+#: ../finch/gntaccount.c:508
#: ../pidgin/plugins/gevolution/new_person_dialog.c:295
msgid "Screen name:"
msgstr "Идентификатор пользователя:"
-#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:495
+#: ../finch/gntaccount.c:521
msgid "Password:"
msgstr "Пароль:"
-#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5377
-#: ../pidgin/gtkblist.c:5740
+#: ../finch/gntaccount.c:531
msgid "Alias:"
msgstr "Псевдоним:"
#. Cancel button
#. Cancel
#: ../finch/gntaccount.c:554 ../finch/gntaccount.c:617
-#: ../finch/gntaccount.c:838 ../finch/gntblist.c:330 ../finch/gntblist.c:399
-#: ../finch/gntblist.c:434 ../finch/gntblist.c:762 ../finch/gntblist.c:952
-#: ../finch/gntblist.c:1048 ../finch/gntblist.c:2142 ../finch/gntplugin.c:336
-#: ../finch/gntpounce.c:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:245
+#: ../finch/gntaccount.c:853 ../finch/gntblist.c:334 ../finch/gntblist.c:403
+#: ../finch/gntblist.c:438 ../finch/gntblist.c:770 ../finch/gntblist.c:967
+#: ../finch/gntblist.c:1063 ../finch/gntblist.c:2160 ../finch/gntplugin.c:360
+#: ../finch/gntpounce.c:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:246
#: ../finch/gntstatus.c:142 ../finch/gntstatus.c:475 ../finch/gntstatus.c:600
#: ../libpurple/account.c:984 ../libpurple/account.c:1234
#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1168
@@ -127,16 +128,17 @@ msgstr "Псевдоним:"
#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:798
#: ../libpurple/protocols/gg/gg.c:879
#: ../libpurple/protocols/jabber/buddy.c:584
-#: ../libpurple/protocols/jabber/buddy.c:1763
-#: ../libpurple/protocols/jabber/buddy.c:1799
-#: ../libpurple/protocols/jabber/chat.c:788
-#: ../libpurple/protocols/jabber/jabber.c:874
-#: ../libpurple/protocols/jabber/jabber.c:1380
+#: ../libpurple/protocols/jabber/buddy.c:1788
+#: ../libpurple/protocols/jabber/buddy.c:1824
+#: ../libpurple/protocols/jabber/chat.c:786
+#: ../libpurple/protocols/jabber/jabber.c:882
+#: ../libpurple/protocols/jabber/jabber.c:1390
+#: ../libpurple/protocols/jabber/si.c:868
#: ../libpurple/protocols/jabber/xdata.c:337
-#: ../libpurple/protocols/msn/msn.c:250 ../libpurple/protocols/msn/msn.c:267
-#: ../libpurple/protocols/msn/msn.c:284 ../libpurple/protocols/msn/msn.c:301
-#: ../libpurple/protocols/msn/msn.c:322
-#: ../libpurple/protocols/oscar/oscar.c:6009
+#: ../libpurple/protocols/msn/msn.c:259 ../libpurple/protocols/msn/msn.c:276
+#: ../libpurple/protocols/msn/msn.c:293 ../libpurple/protocols/msn/msn.c:310
+#: ../libpurple/protocols/msn/msn.c:331
+#: ../libpurple/protocols/oscar/oscar.c:6047
#: ../libpurple/protocols/oscar/peer.c:1023
#: ../libpurple/protocols/qq/buddy_info.c:484
#: ../libpurple/protocols/qq/buddy_opt.c:214
@@ -152,27 +154,35 @@ msgstr "Псевдоним:"
#: ../libpurple/protocols/sametime/sametime.c:3388
#: ../libpurple/protocols/sametime/sametime.c:3474
#: ../libpurple/protocols/sametime/sametime.c:3645
-#: ../libpurple/protocols/sametime/sametime.c:5391
-#: ../libpurple/protocols/sametime/sametime.c:5481
-#: ../libpurple/protocols/sametime/sametime.c:5606
-#: ../libpurple/protocols/silc/buddy.c:468
-#: ../libpurple/protocols/silc/buddy.c:1084
-#: ../libpurple/protocols/silc/buddy.c:1189
-#: ../libpurple/protocols/silc/chat.c:600
-#: ../libpurple/protocols/silc/chat.c:730
-#: ../libpurple/protocols/silc/ops.c:1913
-#: ../libpurple/protocols/silc/silc.c:744
-#: ../libpurple/protocols/silc/silc.c:950
-#: ../libpurple/protocols/yahoo/yahoo.c:991
-#: ../libpurple/protocols/yahoo/yahoo.c:3235
-#: ../libpurple/protocols/yahoo/yahoo.c:3246 ../pidgin/gtkaccount.c:1879
-#: ../pidgin/gtkaccount.c:2470 ../pidgin/gtkblist.c:5796
-#: ../pidgin/gtkdialogs.c:722 ../pidgin/gtkdialogs.c:860
-#: ../pidgin/gtkdialogs.c:952 ../pidgin/gtkdialogs.c:972
-#: ../pidgin/gtkdialogs.c:996 ../pidgin/gtkdialogs.c:1018
-#: ../pidgin/gtkdialogs.c:1066 ../pidgin/gtkdialogs.c:1107
-#: ../pidgin/gtkdialogs.c:1163 ../pidgin/gtkdialogs.c:1202
-#: ../pidgin/gtkdialogs.c:1229 ../pidgin/gtkimhtmltoolbar.c:419
+#: ../libpurple/protocols/sametime/sametime.c:5397
+#: ../libpurple/protocols/sametime/sametime.c:5487
+#: ../libpurple/protocols/sametime/sametime.c:5612
+#: ../libpurple/protocols/silc/buddy.c:455
+#: ../libpurple/protocols/silc/buddy.c:1076
+#: ../libpurple/protocols/silc/buddy.c:1191
+#: ../libpurple/protocols/silc/chat.c:616
+#: ../libpurple/protocols/silc/chat.c:746
+#: ../libpurple/protocols/silc/ops.c:1816
+#: ../libpurple/protocols/silc/silc.c:823
+#: ../libpurple/protocols/silc/silc.c:1031
+#: ../libpurple/protocols/silc10/buddy.c:468
+#: ../libpurple/protocols/silc10/buddy.c:1084
+#: ../libpurple/protocols/silc10/buddy.c:1189
+#: ../libpurple/protocols/silc10/chat.c:600
+#: ../libpurple/protocols/silc10/chat.c:730
+#: ../libpurple/protocols/silc10/ops.c:1904
+#: ../libpurple/protocols/silc10/silc.c:736
+#: ../libpurple/protocols/silc10/silc.c:942
+#: ../libpurple/protocols/yahoo/yahoo.c:989
+#: ../libpurple/protocols/yahoo/yahoo.c:3248
+#: ../libpurple/protocols/yahoo/yahoo.c:3259 ../pidgin/gtkaccount.c:1916
+#: ../pidgin/gtkaccount.c:2514 ../pidgin/gtkblist.c:5856
+#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:871
+#: ../pidgin/gtkdialogs.c:963 ../pidgin/gtkdialogs.c:983
+#: ../pidgin/gtkdialogs.c:1007 ../pidgin/gtkdialogs.c:1029
+#: ../pidgin/gtkdialogs.c:1077 ../pidgin/gtkdialogs.c:1118
+#: ../pidgin/gtkdialogs.c:1174 ../pidgin/gtkdialogs.c:1213
+#: ../pidgin/gtkdialogs.c:1240 ../pidgin/gtkimhtmltoolbar.c:423
#: ../pidgin/gtklog.c:302 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1102
#: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:582
#: ../pidgin/gtkprivacy.c:607 ../pidgin/gtkprivacy.c:621
@@ -182,15 +192,15 @@ msgstr "Отменить"
#. Save button
#. Save
-#: ../finch/gntaccount.c:558 ../finch/gntplugin.c:336 ../finch/gntpounce.c:462
-#: ../finch/gntprefs.c:245 ../finch/gntstatus.c:478 ../finch/gntstatus.c:588
+#: ../finch/gntaccount.c:558 ../finch/gntplugin.c:360 ../finch/gntpounce.c:462
+#: ../finch/gntprefs.c:246 ../finch/gntstatus.c:478 ../finch/gntstatus.c:588
#: ../libpurple/account.c:1268 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:583 ../pidgin/gtkdebug.c:764
+#: ../libpurple/protocols/jabber/buddy.c:583 ../pidgin/gtkdebug.c:748
#: ../pidgin/gtkrequest.c:276
msgid "Save"
msgstr "Сохранить"
-#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1871
+#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1908
#: ../pidgin/gtksavedstatuses.c:328
#, c-format
msgid "Are you sure you want to delete %s?"
@@ -203,14 +213,14 @@ msgstr "Удалить учётную запись"
#. Delete button
#: ../finch/gntaccount.c:616 ../finch/gntaccount.c:683
#: ../finch/gntpounce.c:653 ../finch/gntpounce.c:714 ../finch/gntstatus.c:141
-#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1878 ../pidgin/gtklog.c:301
+#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1915 ../pidgin/gtklog.c:301
#: ../pidgin/gtkpounce.c:1101 ../pidgin/gtkrequest.c:273
#: ../pidgin/gtksavedstatuses.c:336
msgid "Delete"
msgstr "Удалить"
-#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2047 ../finch/gntui.c:76
-#: ../pidgin/gtkaccount.c:2296 ../pidgin/gtkdocklet.c:541
+#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2065 ../finch/gntui.c:76
+#: ../pidgin/gtkaccount.c:2340 ../pidgin/gtkdocklet.c:522
msgid "Accounts"
msgstr "Учётные записи"
@@ -219,15 +229,16 @@ msgid "You can enable/disable accounts from the following list."
msgstr "Вы можете включать/выключать учётные записи из следующего списка."
#. Add button
-#: ../finch/gntaccount.c:675 ../finch/gntaccount.c:837 ../finch/gntblist.c:329
-#: ../finch/gntblist.c:399 ../finch/gntblist.c:434 ../finch/gntnotify.c:309
+#: ../finch/gntaccount.c:675 ../finch/gntaccount.c:852 ../finch/gntblist.c:333
+#: ../finch/gntblist.c:403 ../finch/gntblist.c:438 ../finch/gntnotify.c:369
#: ../finch/gntpounce.c:699 ../finch/gntstatus.c:194
#: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:116
#: ../libpurple/protocols/qq/sys_msg.c:175
#: ../libpurple/protocols/qq/sys_msg.c:270
-#: ../libpurple/protocols/sametime/sametime.c:5480
-#: ../libpurple/protocols/silc/chat.c:599 ../pidgin/gtkaccount.c:2469
-#: ../pidgin/gtkblist.c:5795 ../pidgin/gtkconv.c:1633
+#: ../libpurple/protocols/sametime/sametime.c:5486
+#: ../libpurple/protocols/silc/chat.c:615
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2513
+#: ../pidgin/gtkblist.c:5855 ../pidgin/gtkconv.c:1686
#: ../pidgin/gtkrequest.c:274
msgid "Add"
msgstr "Добавить"
@@ -237,101 +248,110 @@ msgstr "Добавить"
msgid "Modify"
msgstr "Изменить"
-#: ../finch/gntaccount.c:760 ../pidgin/gtkaccount.c:2416
+#: ../finch/gntaccount.c:775 ../pidgin/gtkaccount.c:2460
#, c-format
msgid "%s%s%s%s has made %s his or her buddy%s%s"
msgstr "%s%s%s%s добавил %s в свой список собеседников%s%s"
-#: ../finch/gntaccount.c:833 ../pidgin/gtkaccount.c:2468
+#: ../finch/gntaccount.c:848 ../pidgin/gtkaccount.c:2512
msgid "Add buddy to your list?"
msgstr "Добавить собеседника в список?"
-#: ../finch/gntaccount.c:887 ../pidgin/gtkaccount.c:2520
+#: ../finch/gntaccount.c:902 ../pidgin/gtkaccount.c:2564
#, c-format
msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
msgstr "%s%s%s%s хочет добавить %s в свой список собеседников%s%s"
-#: ../finch/gntaccount.c:907 ../finch/gntaccount.c:914
-#: ../pidgin/gtkaccount.c:2543 ../pidgin/gtkaccount.c:2549
+#: ../finch/gntaccount.c:922 ../finch/gntaccount.c:929
+#: ../pidgin/gtkaccount.c:2587 ../pidgin/gtkaccount.c:2593
msgid "Authorize buddy?"
msgstr "Авторизовать собеседника?"
-#: ../finch/gntaccount.c:911 ../finch/gntaccount.c:918
-#: ../pidgin/gtkaccount.c:2544 ../pidgin/gtkaccount.c:2550
+#: ../finch/gntaccount.c:926 ../finch/gntaccount.c:933
+#: ../pidgin/gtkaccount.c:2588 ../pidgin/gtkaccount.c:2594
msgid "Authorize"
msgstr "Авторизовать"
-#: ../finch/gntaccount.c:912 ../finch/gntaccount.c:919
-#: ../pidgin/gtkaccount.c:2545 ../pidgin/gtkaccount.c:2551
+#: ../finch/gntaccount.c:927 ../finch/gntaccount.c:934
+#: ../pidgin/gtkaccount.c:2589 ../pidgin/gtkaccount.c:2595
msgid "Deny"
msgstr "Отказать"
-#: ../finch/gntblist.c:278
+#: ../finch/gntblist.c:279
msgid "You must provide a screename for the buddy."
-msgstr ""
+msgstr "Вы должны задать идентификатор пользователя для собеседника."
-#: ../finch/gntblist.c:280
+#: ../finch/gntblist.c:281
msgid "You must provide a group."
-msgstr ""
+msgstr "Вы должны задать группу."
-#: ../finch/gntblist.c:282
+#: ../finch/gntblist.c:283
msgid "You must select an account."
msgstr "Вы должны выбрать учётную запись."
-#: ../finch/gntblist.c:286
+#: ../finch/gntblist.c:285
+msgid "The selected account is not online."
+msgstr ""
+
+#: ../finch/gntblist.c:290
msgid "Error adding buddy"
msgstr "Ошибка добавления собеседника"
-#: ../finch/gntblist.c:311 ../libpurple/protocols/oscar/oscar.c:2843
-#: ../pidgin/gtkaccount.c:1954 ../pidgin/gtksavedstatuses.c:924
+#: ../finch/gntblist.c:315 ../libpurple/protocols/oscar/oscar.c:2845
+#: ../pidgin/gtkaccount.c:1991 ../pidgin/gtksavedstatuses.c:924
msgid "Screen Name"
msgstr "Идентификатор пользователя"
-#: ../finch/gntblist.c:314 ../finch/gntblist.c:391 ../finch/gntblist.c:949
-#: ../finch/gntblist.c:1196 ../libpurple/protocols/msn/msn.c:1360
-#: ../libpurple/protocols/silc/chat.c:590
+#: ../finch/gntblist.c:318 ../finch/gntblist.c:395 ../finch/gntblist.c:1211
+#: ../libpurple/protocols/msn/msn.c:1364
+#: ../libpurple/protocols/silc/chat.c:606
+#: ../libpurple/protocols/silc10/chat.c:590
#: ../libpurple/protocols/yahoo/yahoo_profile.c:680
#: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1206 ../pidgin/gtkdialogs.c:971
-#: ../pidgin/gtkdialogs.c:995 ../pidgin/gtkdialogs.c:1017
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:982
+#: ../pidgin/gtkdialogs.c:1006 ../pidgin/gtkdialogs.c:1028
#: ../pidgin/gtkrequest.c:277
msgid "Alias"
msgstr "Псевдоним"
-#: ../finch/gntblist.c:317 ../finch/gntblist.c:394
+#: ../finch/gntblist.c:321 ../finch/gntblist.c:398
msgid "Group"
msgstr "Группа"
-#: ../finch/gntblist.c:321 ../finch/gntblist.c:382 ../finch/gntblist.c:1246
-#: ../finch/gntnotify.c:155 ../finch/gntstatus.c:566
+#: ../finch/gntblist.c:325 ../finch/gntblist.c:386 ../finch/gntblist.c:1261
+#: ../finch/gntnotify.c:171 ../finch/gntstatus.c:566
#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:2948 ../pidgin/gtknotify.c:476
-#: ../pidgin/gtkpounce.c:1269 ../pidgin/plugins/gevolution/gevolution.c:444
+#: ../pidgin/gtkblist.c:2965 ../pidgin/gtknotify.c:476
+#: ../pidgin/gtkpounce.c:1269 ../pidgin/plugins/gevolution/gevolution.c:443
msgid "Account"
msgstr "Учётная запись"
-#: ../finch/gntblist.c:327 ../finch/gntblist.c:811
-#: ../libpurple/protocols/silc/buddy.c:737
-#: ../libpurple/protocols/silc/buddy.c:1033
-#: ../libpurple/protocols/silc/buddy.c:1080
-#: ../libpurple/protocols/silc/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3148 ../pidgin/gtkblist.c:5310
+#: ../finch/gntblist.c:331 ../finch/gntblist.c:819
+#: ../libpurple/protocols/silc/buddy.c:725
+#: ../libpurple/protocols/silc/buddy.c:1027
+#: ../libpurple/protocols/silc/buddy.c:1072
+#: ../libpurple/protocols/silc/buddy.c:1182
+#: ../libpurple/protocols/silc10/buddy.c:737
+#: ../libpurple/protocols/silc10/buddy.c:1033
+#: ../libpurple/protocols/silc10/buddy.c:1080
+#: ../libpurple/protocols/silc10/buddy.c:1180
+#: ../libpurple/protocols/yahoo/yahoo.c:3161 ../pidgin/gtkblist.c:5361
#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:447
msgid "Add Buddy"
msgstr "Добавить собеседника"
-#: ../finch/gntblist.c:327
+#: ../finch/gntblist.c:331
msgid "Please enter buddy information."
msgstr "Введите информацию о собеседнике."
-#: ../finch/gntblist.c:354 ../libpurple/blist.c:1192
+#: ../finch/gntblist.c:358 ../libpurple/blist.c:1192
msgid "Chats"
msgstr "Чаты"
#. Extract their Name and put it in
-#: ../finch/gntblist.c:388 ../libpurple/protocols/jabber/jabber.c:805
-#: ../libpurple/protocols/msn/msn.c:1533 ../libpurple/protocols/msn/msn.c:1598
-#: ../libpurple/protocols/msn/msn.c:1625
+#: ../finch/gntblist.c:392 ../libpurple/protocols/jabber/jabber.c:813
+#: ../libpurple/protocols/msn/msn.c:1553 ../libpurple/protocols/msn/msn.c:1618
+#: ../libpurple/protocols/msn/msn.c:1645
#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
#: ../pidgin/gtkroomlist.c:621
#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
@@ -339,162 +359,184 @@ msgstr "Чаты"
msgid "Name"
msgstr "Имя"
-#: ../finch/gntblist.c:397 ../finch/gntblist.c:813 ../pidgin/gtkblist.c:5686
+#: ../finch/gntblist.c:401 ../finch/gntblist.c:821 ../pidgin/gtkblist.c:5741
msgid "Add Chat"
msgstr "Добавить чат"
-#: ../finch/gntblist.c:398
+#: ../finch/gntblist.c:402
msgid "You can edit more information from the context menu later."
-msgstr ""
+msgstr "Вы можете изменить больше информации позже из контекстного меню."
-#: ../finch/gntblist.c:411 ../finch/gntblist.c:424
+#: ../finch/gntblist.c:415 ../finch/gntblist.c:428
msgid "Error adding group"
msgstr "Ошибка добавления группы"
-#: ../finch/gntblist.c:412
+#: ../finch/gntblist.c:416
msgid "You must give a name for the group to add."
msgstr "Вы должны дать имя добавляемой группе."
-#: ../finch/gntblist.c:425
+#: ../finch/gntblist.c:429
msgid "A group with the name already exists."
msgstr "Группа с таким именем уже существует."
-#: ../finch/gntblist.c:432 ../finch/gntblist.c:815
-#: ../libpurple/protocols/sametime/sametime.c:5390
-#: ../libpurple/protocols/sametime/sametime.c:5478 ../pidgin/gtkblist.c:5792
+#: ../finch/gntblist.c:436 ../finch/gntblist.c:823
+#: ../libpurple/protocols/sametime/sametime.c:5396
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5852
msgid "Add Group"
msgstr "Добавить группу"
-#: ../finch/gntblist.c:432
+#: ../finch/gntblist.c:436
msgid "Enter the name of the group"
msgstr "Введите имя группы"
-#: ../finch/gntblist.c:761
+#: ../finch/gntblist.c:769
msgid "Edit Chat"
msgstr "Изменить чат"
-#: ../finch/gntblist.c:761
+#: ../finch/gntblist.c:769
msgid "Please Update the necessary fields."
msgstr "Обновите нужные поля."
-#: ../finch/gntblist.c:762 ../finch/gntstatus.c:199
+#: ../finch/gntblist.c:770 ../finch/gntstatus.c:199
msgid "Edit"
msgstr "Изменить"
-#: ../finch/gntblist.c:778
+#: ../finch/gntblist.c:786
msgid "Auto-join"
msgstr "Присоединяться автоматически"
-#: ../finch/gntblist.c:787
+#: ../finch/gntblist.c:795
msgid "Edit Settings"
msgstr "Изменить настройки"
-#: ../finch/gntblist.c:851 ../libpurple/protocols/silc/chat.c:883
+#: ../finch/gntblist.c:833 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:276
+#: ../pidgin/gtkconv.c:681 ../pidgin/gtkdialogs.c:830
+msgid "Information"
+msgstr "Информация"
+
+#: ../finch/gntblist.c:833 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:276
+#: ../pidgin/gtkconv.c:681 ../pidgin/gtkdialogs.c:830
+msgid "Retrieving..."
+msgstr "Загрузка..."
+
+#: ../finch/gntblist.c:866 ../finch/gntconv.c:418
+#: ../libpurple/protocols/silc/chat.c:899
+#: ../libpurple/protocols/silc10/chat.c:883
msgid "Get Info"
msgstr "Получить информацию"
-#: ../finch/gntblist.c:855
+#: ../finch/gntblist.c:870
msgid "Add Buddy Pounce"
msgstr "Добавить правило"
#. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:862 ../libpurple/protocols/oscar/oscar.c:636
-#: ../libpurple/protocols/qq/qq.c:585 ../pidgin/gtkconv.c:1581
+#: ../finch/gntblist.c:877 ../finch/gntconv.c:430
+#: ../libpurple/protocols/jabber/si.c:868
+#: ../libpurple/protocols/oscar/oscar.c:636 ../libpurple/protocols/qq/qq.c:585
+#: ../pidgin/gtkconv.c:1634
msgid "Send File"
msgstr "Отправить файл"
-#: ../finch/gntblist.c:866
+#: ../finch/gntblist.c:881
msgid "View Log"
msgstr "Просмотреть журнал"
-#: ../finch/gntblist.c:947
+#: ../finch/gntblist.c:962
#, c-format
msgid "Please enter the new name for %s"
msgstr "Введите новое имя для %s"
-#: ../finch/gntblist.c:949 ../finch/gntblist.c:1196
+#: ../finch/gntblist.c:964 ../finch/gntblist.c:1211
msgid "Rename"
msgstr "Переименовать"
-#: ../finch/gntblist.c:950
+#: ../finch/gntblist.c:964
+msgid "Set Alias"
+msgstr "Задать псевдоним"
+
+#: ../finch/gntblist.c:965
msgid "Enter empty string to reset the name."
msgstr "Введите пустую строку для сброса имени."
-#: ../finch/gntblist.c:1026
+#: ../finch/gntblist.c:1041
msgid "Removing this contact will also remove all the buddies in the contact"
msgstr ""
"Удаление этого контакта приведёт к удалению всех входящих в него собеседников"
-#: ../finch/gntblist.c:1034
+#: ../finch/gntblist.c:1049
msgid "Removing this group will also remove all the buddies in the group"
msgstr ""
"Удаление этой группы приведёт к удалению всех входящих в неё собеседников"
-#: ../finch/gntblist.c:1039
+#: ../finch/gntblist.c:1054
#, c-format
msgid "Are you sure you want to remove %s?"
msgstr "Вы действительно хотите удалить %s?"
#. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1042
+#: ../finch/gntblist.c:1057
msgid "Confirm Remove"
msgstr "Подтвердить удаление"
-#: ../finch/gntblist.c:1047 ../finch/gntblist.c:1198 ../finch/gntft.c:223
-#: ../pidgin/gtkblist.c:1118 ../pidgin/gtkconv.c:1630
-#: ../pidgin/gtkrequest.c:275 ../pidgin/gtkstatusbox.c:261
+#: ../finch/gntblist.c:1062 ../finch/gntblist.c:1213 ../finch/gntft.c:223
+#: ../pidgin/gtkconv.c:1683 ../pidgin/gtkrequest.c:275
+#: ../pidgin/gtkstatusbox.c:261
msgid "Remove"
msgstr "Удалить"
#. Buddy List
-#: ../finch/gntblist.c:1172 ../finch/gntblist.c:2219 ../finch/gntprefs.c:239
-#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4189
+#: ../finch/gntblist.c:1187 ../finch/gntblist.c:2237 ../finch/gntprefs.c:240
+#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4220
#: ../pidgin/plugins/win32/winprefs/winprefs.c:330
msgid "Buddy List"
msgstr "Список собеседников"
-#: ../finch/gntblist.c:1203
+#: ../finch/gntblist.c:1218
msgid "Place tagged"
msgstr "Место помечено"
-#: ../finch/gntblist.c:1208
+#: ../finch/gntblist.c:1223
msgid "Toggle Tag"
msgstr "Обратить пометку"
#. General
-#: ../finch/gntblist.c:1241 ../libpurple/protocols/gg/gg.c:632
+#: ../finch/gntblist.c:1256 ../libpurple/protocols/gg/gg.c:632
#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1120
#: ../libpurple/protocols/gg/gg.c:2204
#: ../libpurple/protocols/jabber/buddy.c:274
#: ../libpurple/protocols/jabber/buddy.c:818
-#: ../libpurple/protocols/jabber/buddy.c:1564
-#: ../libpurple/protocols/jabber/buddy.c:1746
-#: ../libpurple/protocols/jabber/jabber.c:815
-#: ../libpurple/protocols/msn/msn.c:1368 ../libpurple/protocols/msn/msn.c:1536
+#: ../libpurple/protocols/jabber/buddy.c:1589
+#: ../libpurple/protocols/jabber/buddy.c:1771
+#: ../libpurple/protocols/jabber/jabber.c:823
+#: ../libpurple/protocols/msn/msn.c:1372 ../libpurple/protocols/msn/msn.c:1556
#: ../libpurple/protocols/qq/buddy_info.c:43
#: ../libpurple/protocols/silc/buddy.c:1535
-#: ../libpurple/protocols/silc/ops.c:1036
-#: ../libpurple/protocols/silc/ops.c:1179
-#: ../libpurple/protocols/silc/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2972
+#: ../libpurple/protocols/silc/ops.c:1002
+#: ../libpurple/protocols/silc/ops.c:1186
+#: ../libpurple/protocols/silc/ops.c:1322
+#: ../libpurple/protocols/silc10/buddy.c:1535
+#: ../libpurple/protocols/silc10/ops.c:1036
+#: ../libpurple/protocols/silc10/ops.c:1179
+#: ../libpurple/protocols/silc10/ops.c:1328
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2989
msgid "Nickname"
msgstr "Псевдоним"
#. Idle stuff
-#: ../finch/gntblist.c:1261 ../finch/gntprefs.c:242
-#: ../libpurple/protocols/bonjour/bonjour.c:322
+#: ../finch/gntblist.c:1276 ../finch/gntprefs.c:243
+#: ../libpurple/protocols/bonjour/bonjour.c:314
#: ../libpurple/protocols/jabber/buddy.c:643
#: ../libpurple/protocols/jabber/buddy.c:683
-#: ../libpurple/protocols/msn/msn.c:533 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/msn/msn.c:516 ../libpurple/protocols/msn/state.c:32
#: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2867
-#: ../libpurple/protocols/yahoo/yahoo.c:2902
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:2992
-#: ../pidgin/gtkblist.c:3381 ../pidgin/gtkprefs.c:1809
+#: ../libpurple/protocols/oscar/oscar.c:2869
+#: ../libpurple/protocols/yahoo/yahoo.c:2915
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:3009
+#: ../pidgin/gtkblist.c:3402 ../pidgin/gtkprefs.c:1848
msgid "Idle"
msgstr "Бездействие"
-#: ../finch/gntblist.c:1350
+#: ../finch/gntblist.c:1365
#, c-format
msgid ""
"Online: %d\n"
@@ -503,12 +545,12 @@ msgstr ""
"В сети: %d\n"
"Всего: %d"
-#: ../finch/gntblist.c:1359
+#: ../finch/gntblist.c:1374
#, c-format
msgid "Account: %s (%s)"
msgstr "Учётная запись: %s (%s)"
-#: ../finch/gntblist.c:1371
+#: ../finch/gntblist.c:1386
#, c-format
msgid ""
"\n"
@@ -517,162 +559,159 @@ msgstr ""
"\n"
"Последнее появление: %s назад"
-#: ../finch/gntblist.c:1636 ../pidgin/gtkdocklet.c:489
+#: ../finch/gntblist.c:1651 ../pidgin/gtkdocklet.c:470
#: ../pidgin/gtkstatusbox.c:1064
msgid "New..."
msgstr "Новый..."
-#: ../finch/gntblist.c:1643 ../pidgin/gtkdocklet.c:490
+#: ../finch/gntblist.c:1658 ../pidgin/gtkdocklet.c:471
#: ../pidgin/gtkstatusbox.c:1065
msgid "Saved..."
msgstr "Сохранённый..."
-#: ../finch/gntblist.c:2015 ../finch/gntplugin.c:224 ../finch/gntui.c:81
-#: ../pidgin/gtkdocklet.c:542 ../pidgin/gtkplugin.c:530
+#: ../finch/gntblist.c:2033 ../finch/gntplugin.c:244 ../finch/gntui.c:81
+#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
msgid "Plugins"
msgstr "Модули"
-#: ../finch/gntblist.c:2123 ../pidgin/gtkdialogs.c:703
-#: ../pidgin/gtkdialogs.c:841 ../pidgin/gtkdialogs.c:922
+#: ../finch/gntblist.c:2141 ../pidgin/gtkdialogs.c:705
+#: ../pidgin/gtkdialogs.c:852 ../pidgin/gtkdialogs.c:933
msgid "_Name"
msgstr "_Имя"
-#: ../finch/gntblist.c:2128 ../pidgin/gtkdialogs.c:708
-#: ../pidgin/gtkdialogs.c:846 ../pidgin/gtkdialogs.c:927
+#: ../finch/gntblist.c:2146 ../pidgin/gtkdialogs.c:710
+#: ../pidgin/gtkdialogs.c:857 ../pidgin/gtkdialogs.c:938
msgid "_Account"
msgstr "_Учётная запись"
-#: ../finch/gntblist.c:2136 ../pidgin/gtkdialogs.c:716
+#: ../finch/gntblist.c:2154 ../pidgin/gtkdialogs.c:718
msgid "New Instant Message"
msgstr "Новое мгновенное сообщение"
-#: ../finch/gntblist.c:2138 ../pidgin/gtkdialogs.c:718
+#: ../finch/gntblist.c:2156 ../pidgin/gtkdialogs.c:720
msgid ""
"Please enter the screen name or alias of the person you would like to IM."
msgstr ""
"Введите идентификатор пользователя или псевдоним персоны, которой вы хотели "
"бы отправить сообщение."
-#: ../finch/gntblist.c:2141 ../finch/gntconn.c:48 ../finch/gntnotify.c:79
-#: ../libpurple/account.c:983 ../libpurple/account.c:1233
-#: ../libpurple/protocols/gg/gg.c:501 ../libpurple/protocols/gg/gg.c:660
-#: ../libpurple/protocols/gg/gg.c:797
-#: ../libpurple/protocols/jabber/jabber.c:1379
+#: ../finch/gntblist.c:2159 ../finch/gntnotify.c:77 ../libpurple/account.c:983
+#: ../libpurple/account.c:1233 ../libpurple/protocols/gg/gg.c:501
+#: ../libpurple/protocols/gg/gg.c:660 ../libpurple/protocols/gg/gg.c:797
+#: ../libpurple/protocols/jabber/jabber.c:1389
#: ../libpurple/protocols/jabber/xdata.c:336
-#: ../libpurple/protocols/msn/msn.c:249 ../libpurple/protocols/msn/msn.c:266
-#: ../libpurple/protocols/msn/msn.c:283 ../libpurple/protocols/msn/msn.c:300
-#: ../libpurple/protocols/oscar/oscar.c:6008
-#: ../libpurple/protocols/silc/buddy.c:467
-#: ../libpurple/protocols/silc/buddy.c:1188
-#: ../libpurple/protocols/silc/chat.c:425
-#: ../libpurple/protocols/silc/chat.c:464
-#: ../libpurple/protocols/silc/chat.c:729
-#: ../libpurple/protocols/silc/ops.c:1297
-#: ../libpurple/protocols/silc/ops.c:1912
-#: ../libpurple/protocols/silc/silc.c:743
-#: ../libpurple/protocols/yahoo/yahoo.c:990
-#: ../libpurple/protocols/yahoo/yahoo.c:3234
-#: ../libpurple/protocols/yahoo/yahoo.c:3245 ../pidgin/gtkblist.c:3946
-#: ../pidgin/gtkdialogs.c:721 ../pidgin/gtkdialogs.c:859
-#: ../pidgin/gtkdialogs.c:951 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/msn/msn.c:258 ../libpurple/protocols/msn/msn.c:275
+#: ../libpurple/protocols/msn/msn.c:292 ../libpurple/protocols/msn/msn.c:309
+#: ../libpurple/protocols/oscar/oscar.c:6046
+#: ../libpurple/protocols/silc/buddy.c:454
+#: ../libpurple/protocols/silc/buddy.c:1190
+#: ../libpurple/protocols/silc/chat.c:447
+#: ../libpurple/protocols/silc/chat.c:482
+#: ../libpurple/protocols/silc/chat.c:745
+#: ../libpurple/protocols/silc/ops.c:1291
+#: ../libpurple/protocols/silc/ops.c:1815
+#: ../libpurple/protocols/silc/silc.c:822
+#: ../libpurple/protocols/silc10/buddy.c:467
+#: ../libpurple/protocols/silc10/buddy.c:1188
+#: ../libpurple/protocols/silc10/chat.c:425
+#: ../libpurple/protocols/silc10/chat.c:464
+#: ../libpurple/protocols/silc10/chat.c:729
+#: ../libpurple/protocols/silc10/ops.c:1297
+#: ../libpurple/protocols/silc10/ops.c:1903
+#: ../libpurple/protocols/silc10/silc.c:735
+#: ../libpurple/protocols/yahoo/yahoo.c:988
+#: ../libpurple/protocols/yahoo/yahoo.c:3247
+#: ../libpurple/protocols/yahoo/yahoo.c:3258 ../pidgin/gtkblist.c:3975
+#: ../pidgin/gtkdialogs.c:723 ../pidgin/gtkdialogs.c:870
+#: ../pidgin/gtkdialogs.c:962 ../pidgin/gtkrequest.c:269
msgid "OK"
msgstr "OK"
#. Create the "Options" frame.
-#: ../finch/gntblist.c:2161 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
+#: ../finch/gntblist.c:2179 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
msgid "Options"
msgstr "Параметры"
-#: ../finch/gntblist.c:2167
+#: ../finch/gntblist.c:2185
msgid "Send IM..."
msgstr "Отправить мгновенное сообщение..."
-#: ../finch/gntblist.c:2171
-msgid "Toggle offline buddies"
-msgstr "Обратить показывание собеседников не в сети"
+#: ../finch/gntblist.c:2189
+msgid "Show offline buddies"
+msgstr "Показывать собеседников не в сети"
-#: ../finch/gntblist.c:2177
+#: ../finch/gntblist.c:2195
msgid "Sort by status"
msgstr "Сортировать по статусу"
-#: ../finch/gntblist.c:2181
+#: ../finch/gntblist.c:2199
msgid "Sort alphabetically"
msgstr "Сортировать по алфавиту"
-#: ../finch/gntblist.c:2185
+#: ../finch/gntblist.c:2203
msgid "Sort by log size"
msgstr "Сортировать по размеру журнала"
-#: ../finch/gntconn.c:38
+#: ../finch/gntconn.c:109
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../finch/gntconn.c:41
+#: ../finch/gntconn.c:112
#, c-format
msgid "%s disconnected."
msgstr "Соединение с %s разорвано."
-#: ../finch/gntconn.c:42
+#: ../finch/gntconn.c:113
#, c-format
msgid ""
-"%s was disconnected due to the following error:\n"
-"%s"
+"%s\n"
+"\n"
+"Finch will not attempt to reconnect the account until you correct the error "
+"and re-enable the account."
msgstr ""
-"Соединение с %s было разорвано из-за следующей ошибки:\n"
-"%s"
-
-#: ../finch/gntconn.c:45 ../libpurple/account.c:1012
-#: ../libpurple/connection.c:107 ../pidgin/gtkblist.c:3943
-msgid "Connection Error"
-msgstr "Ошибка соединения"
-
-#: ../finch/gntconn.c:49 ../libpurple/protocols/sametime/sametime.c:3644
-#: ../pidgin/gtkblist.c:3948
-msgid "Connect"
-msgstr "Установить соединение"
-#: ../finch/gntconv.c:103
+#: ../finch/gntconv.c:116
msgid "No such command."
msgstr "Нет такой команды."
-#: ../finch/gntconv.c:107 ../pidgin/gtkconv.c:507
+#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:512
msgid "Syntax Error: You typed the wrong number of arguments to that command."
msgstr ""
"Синтаксическая ошибка: Вы ввели неверное количество аргументов для этой "
"команды."
-#: ../finch/gntconv.c:112 ../pidgin/gtkconv.c:512
+#: ../finch/gntconv.c:125 ../pidgin/gtkconv.c:517
msgid "Your command failed for an unknown reason."
msgstr "Ваша команда не была выполнена по неизвестной причине."
-#: ../finch/gntconv.c:117 ../pidgin/gtkconv.c:518
+#: ../finch/gntconv.c:130 ../pidgin/gtkconv.c:523
msgid "That command only works in chats, not IMs."
msgstr "Эта команда работает только в чатах, не в мгновенных сообщениях."
-#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:521
+#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:526
msgid "That command only works in IMs, not chats."
msgstr "Эта команда работает только в мгновенных сообщениях, не в чатах."
-#: ../finch/gntconv.c:124 ../pidgin/gtkconv.c:525
+#: ../finch/gntconv.c:137 ../pidgin/gtkconv.c:530
msgid "That command doesn't work on this protocol."
msgstr "Эта команда не работает с этим протоколом."
-#: ../finch/gntconv.c:131
+#: ../finch/gntconv.c:144
msgid "Commands are not supported yet. Message was NOT sent."
msgstr "Команды пока не поддерживаются. Сообщение НЕ было отправлено."
-#: ../finch/gntconv.c:217
+#: ../finch/gntconv.c:230
#, c-format
msgid "%s (%s -- %s)"
msgstr "%s (%s -- %s)"
-#: ../finch/gntconv.c:240
+#: ../finch/gntconv.c:253
#, c-format
msgid "%s [%s]"
msgstr "%s [%s]"
-#: ../finch/gntconv.c:245 ../finch/gntconv.c:423
+#: ../finch/gntconv.c:258 ../finch/gntconv.c:619
#, c-format
msgid ""
"\n"
@@ -681,24 +720,48 @@ msgstr ""
"\n"
"%s набирает сообщение..."
-#: ../finch/gntconv.c:390
+#: ../finch/gntconv.c:277
+msgid "You have left this chat."
+msgstr "Вы покинули этот чат."
+
+#: ../finch/gntconv.c:353
+msgid "Send To"
+msgstr "Адресат"
+
+#: ../finch/gntconv.c:397
+msgid "Conversation"
+msgstr "Беседа"
+
+#: ../finch/gntconv.c:403
+msgid "Clear Scrollback"
+msgstr "Очистить"
+
+#: ../finch/gntconv.c:407 ../finch/gntprefs.c:178
+msgid "Show Timestamps"
+msgstr "Показывать время сообщений"
+
+#: ../finch/gntconv.c:423
+msgid "Add Buddy Pounce..."
+msgstr "Добавить правило..."
+
+#: ../finch/gntconv.c:586
msgid "<AUTO-REPLY> "
msgstr "<AUTO-REPLY> "
#. Print the list of users in the room
-#: ../finch/gntconv.c:492
+#: ../finch/gntconv.c:702
msgid "List of users:\n"
msgstr "Список пользователей:\n"
-#: ../finch/gntconv.c:616 ../pidgin/gtkconv.c:388
+#: ../finch/gntconv.c:847 ../pidgin/gtkconv.c:393
msgid "Supported debug options are: version"
msgstr "Поддерживаемые параметры отладки: version"
-#: ../finch/gntconv.c:651 ../pidgin/gtkconv.c:424
+#: ../finch/gntconv.c:882 ../pidgin/gtkconv.c:429
msgid "No such command (in this context)."
msgstr "Нет такой команды (в этом контексте)."
-#: ../finch/gntconv.c:654 ../pidgin/gtkconv.c:427
+#: ../finch/gntconv.c:885 ../pidgin/gtkconv.c:432
msgid ""
"Use \"/help &lt;command&gt;\" for help on a specific command.\n"
"The following commands are available in this context:\n"
@@ -706,18 +769,20 @@ msgstr ""
"Используйте \"/help &lt;команда&gt;\" для помощи по конкретной команде.\n"
"Следующие команды доступны в этом контексте:\n"
-#: ../finch/gntconv.c:693 ../pidgin/gtkconv.c:7023
+#: ../finch/gntconv.c:943 ../pidgin/gtkconv.c:7171
msgid ""
"say &lt;message&gt;: Send a message normally as if you weren't using a "
"command."
msgstr ""
+"say &lt;сообщение&gt;: Отправить обычное сообщение, как если бы вы не "
+"использовали команду."
-#: ../finch/gntconv.c:696 ../pidgin/gtkconv.c:7026
+#: ../finch/gntconv.c:946 ../pidgin/gtkconv.c:7174
msgid "me &lt;action&gt;: Send an IRC style action to a buddy or chat."
msgstr ""
"me &lt;действие&gt;: Отправить действие в стиле IRC собеседнику или в чат."
-#: ../finch/gntconv.c:699 ../pidgin/gtkconv.c:7029
+#: ../finch/gntconv.c:949 ../pidgin/gtkconv.c:7177
msgid ""
"debug &lt;option&gt;: Send various debug information to the current "
"conversation."
@@ -725,39 +790,43 @@ msgstr ""
"debug &lt;параметр&gt;: Отправить различную отладочную информацию в текущую "
"беседу."
-#: ../finch/gntconv.c:702 ../pidgin/gtkconv.c:7032
+#: ../finch/gntconv.c:952 ../pidgin/gtkconv.c:7180
msgid "clear: Clears the conversation scrollback."
msgstr "clear: Очистить окно беседы."
-#: ../finch/gntconv.c:705 ../pidgin/gtkconv.c:7035
+#: ../finch/gntconv.c:955 ../pidgin/gtkconv.c:7183
msgid "help &lt;command&gt;: Help on a specific command."
msgstr "help &lt;команда&gt;: Получить помощь по конкретной команде."
-#: ../finch/gntconv.c:710
+#: ../finch/gntconv.c:958
+msgid "users: Show the list of users in the chat."
+msgstr "users: Вывести список пользователей в чате."
+
+#: ../finch/gntconv.c:963
msgid "plugins: Show the plugins window."
msgstr "plugins: Вывести окно модулей."
-#: ../finch/gntconv.c:713
+#: ../finch/gntconv.c:966
msgid "buddylist: Show the buddylist."
msgstr "buddylist: Вывести список собеседников."
-#: ../finch/gntconv.c:716
+#: ../finch/gntconv.c:969
msgid "accounts: Show the accounts window."
msgstr "accounts: Вывести окно учётных записей."
-#: ../finch/gntconv.c:719
+#: ../finch/gntconv.c:972
msgid "debugwin: Show the debug window."
msgstr "debugwin: Вывести окно отладки."
-#: ../finch/gntconv.c:722
+#: ../finch/gntconv.c:975
msgid "prefs: Show the preference window."
msgstr "prefs: Вывести окно настроек."
-#: ../finch/gntconv.c:725
+#: ../finch/gntconv.c:978
msgid "statuses: Show the savedstatuses window."
msgstr "statuses: Вывести окно сохранённых статусов."
-#: ../finch/gntdebug.c:211 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:710
+#: ../finch/gntdebug.c:230 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:694
msgid "Debug Window"
msgstr "Окно отладки"
@@ -765,18 +834,18 @@ msgstr "Окно отладки"
#. * it's necessary to make the width of the debug window resizable ... like I said,
#. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
#.
-#: ../finch/gntdebug.c:232 ../pidgin/gtkdebug.c:769
+#: ../finch/gntdebug.c:251 ../pidgin/gtkdebug.c:753
msgid "Clear"
msgstr "Очистить"
-#: ../finch/gntdebug.c:237 ../pidgin/gtkdebug.c:778
+#: ../finch/gntdebug.c:257
+msgid "Filter: "
+msgstr "Фильтр: "
+
+#: ../finch/gntdebug.c:261 ../pidgin/gtkdebug.c:762
msgid "Pause"
msgstr "Пауза"
-#: ../finch/gntdebug.c:242 ../pidgin/gtkdebug.c:785 ../pidgin/gtkdebug.c:786
-msgid "Timestamps"
-msgstr "Время"
-
#: ../finch/gntft.c:117 ../pidgin/gtkft.c:228
#, c-format
msgid "File Transfers - %d%% of %d files"
@@ -809,24 +878,24 @@ msgstr "Осталось"
#. XXX: Use of ggp_str_to_uin() is an ugly hack!
#: ../finch/gntft.c:197 ../finch/gntstatus.c:537 ../finch/gntstatus.c:566
-#: ../libpurple/protocols/bonjour/bonjour.c:326
+#: ../libpurple/protocols/bonjour/bonjour.c:318
#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1573
#: ../libpurple/protocols/gg/gg.c:1581
#: ../libpurple/protocols/jabber/buddy.c:634
#: ../libpurple/protocols/jabber/buddy.c:638
#: ../libpurple/protocols/jabber/buddy.c:673
-#: ../libpurple/protocols/jabber/jabber.c:1210
-#: ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/jabber/jabber.c:1220
+#: ../libpurple/protocols/msn/msn.c:515
#: ../libpurple/protocols/novell/novell.c:2835
#: ../libpurple/protocols/oscar/oscar.c:803
#: ../libpurple/protocols/oscar/oscar.c:808
#: ../libpurple/protocols/oscar/oscar.c:810
-#: ../libpurple/protocols/oscar/oscar.c:2656
-#: ../libpurple/protocols/oscar/oscar.c:3767
+#: ../libpurple/protocols/oscar/oscar.c:2658
+#: ../libpurple/protocols/oscar/oscar.c:3769
#: ../libpurple/protocols/sametime/sametime.c:3263
#: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3053 ../pidgin/gtkblist.c:3036
-#: ../pidgin/gtkblist.c:3049 ../pidgin/gtkblist.c:3051
+#: ../libpurple/protocols/yahoo/yahoo.c:3066 ../pidgin/gtkblist.c:3053
+#: ../pidgin/gtkblist.c:3066 ../pidgin/gtkblist.c:3068
#: ../pidgin/gtksavedstatuses.c:943 ../pidgin/gtksavedstatuses.c:1090
msgid "Status"
msgstr "Статус"
@@ -844,10 +913,11 @@ msgid "Stop"
msgstr "Остановить"
#. Close button
-#: ../finch/gntft.c:233 ../finch/gntnotify.c:163 ../finch/gntplugin.c:187
-#: ../finch/gntplugin.c:267 ../finch/gntpounce.c:722 ../finch/gntstatus.c:209
-#: ../libpurple/protocols/msn/msn.c:366 ../libpurple/protocols/silc/util.c:377
-#: ../pidgin/gtkaccount.c:2443 ../pidgin/gtkrequest.c:272
+#: ../finch/gntft.c:233 ../finch/gntnotify.c:179 ../finch/gntplugin.c:205
+#: ../finch/gntplugin.c:291 ../finch/gntpounce.c:722 ../finch/gntstatus.c:209
+#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:382
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2487
+#: ../pidgin/gtkrequest.c:272
msgid "Close"
msgstr "Закрыть"
@@ -873,27 +943,27 @@ msgstr "%.2f KB/s"
msgid "Finished"
msgstr "Завершено"
-#: ../finch/gntft.c:428 ../libpurple/protocols/msn/session.c:346
+#: ../finch/gntft.c:428 ../libpurple/protocols/msn/session.c:347
msgid "Transferring"
msgstr "Передача"
-#: ../finch/gntnotify.c:146
+#: ../finch/gntnotify.c:162
msgid "Emails"
msgstr "Адреса e-mail"
-#: ../finch/gntnotify.c:152 ../finch/gntnotify.c:206
+#: ../finch/gntnotify.c:168 ../finch/gntnotify.c:222
msgid "You have mail!"
msgstr "Вам пришла почта!"
-#: ../finch/gntnotify.c:155 ../libpurple/protocols/jabber/jabber.c:1170
+#: ../finch/gntnotify.c:171 ../libpurple/protocols/jabber/jabber.c:1180
msgid "From"
msgstr "От"
-#: ../finch/gntnotify.c:155 ../pidgin/gtknotify.c:490
+#: ../finch/gntnotify.c:171 ../pidgin/gtknotify.c:490
msgid "Subject"
msgstr "Тема"
-#: ../finch/gntnotify.c:182
+#: ../finch/gntnotify.c:198
#, c-format
msgid "%s (%s) has %d new message."
msgid_plural "%s (%s) has %d new messages."
@@ -901,45 +971,57 @@ msgstr[0] "%s (%s) имеет %d новое сообщение."
msgstr[1] "%s (%s) имеет %d новых сообщения."
msgstr[2] "%s (%s) имеет %d новых сообщений."
-#: ../finch/gntnotify.c:206 ../pidgin/gtknotify.c:329
+#: ../finch/gntnotify.c:222 ../pidgin/gtknotify.c:329
msgid "New Mail"
msgstr "Новая почта"
-#: ../finch/gntnotify.c:230 ../pidgin/gtknotify.c:866
+#: ../finch/gntnotify.c:287 ../pidgin/gtknotify.c:906
#, c-format
msgid "Info for %s"
msgstr "Информация для %s"
-#: ../finch/gntnotify.c:232 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:868
+#: ../finch/gntnotify.c:288 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:907
msgid "Buddy Information"
msgstr "Информация о собеседнике"
-#: ../finch/gntnotify.c:306
+#: ../finch/gntnotify.c:366
msgid "Continue"
msgstr "Продолжить"
-#: ../finch/gntnotify.c:312 ../pidgin/gtkconv.c:1609 ../pidgin/gtkdebug.c:864
+#: ../finch/gntnotify.c:372 ../pidgin/gtkconv.c:1662 ../pidgin/gtkdebug.c:834
msgid "Info"
msgstr "Информация"
-#: ../finch/gntnotify.c:315 ../pidgin/gtkconv.c:1570
+#: ../finch/gntnotify.c:375 ../pidgin/gtkconv.c:1623
msgid "IM"
msgstr "Мгновенное сообщение"
-#: ../finch/gntnotify.c:318
+#: ../finch/gntnotify.c:378
msgid "Join"
msgstr "Присоединиться"
-#: ../finch/gntnotify.c:321 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:381 ../libpurple/protocols/sametime/sametime.c:3473
msgid "Invite"
msgstr "Пригласить"
-#: ../finch/gntnotify.c:324
+#: ../finch/gntnotify.c:384
msgid "(none)"
msgstr "(нет)"
-#: ../finch/gntplugin.c:111
+#: ../finch/gntplugin.c:73 ../finch/gntplugin.c:82
+msgid "ERROR"
+msgstr ""
+
+#: ../finch/gntplugin.c:73
+msgid "loading plugin failed"
+msgstr ""
+
+#: ../finch/gntplugin.c:82
+msgid "unloading plugin failed"
+msgstr ""
+
+#: ../finch/gntplugin.c:124
#, c-format
msgid ""
"Name: %s\n"
@@ -956,24 +1038,24 @@ msgstr ""
"Веб-сайт: %s\n"
"Имя файла: %s\n"
-#: ../finch/gntplugin.c:164
+#: ../finch/gntplugin.c:182
msgid "Plugin need to be loaded before you can configure it."
-msgstr ""
+msgstr "Модуль необходимо загрузить перед его настройкой."
-#: ../finch/gntplugin.c:208
+#: ../finch/gntplugin.c:226
msgid "No configuration options for this plugin."
-msgstr ""
+msgstr "Этот модуль не имеет настраиваемых параметров."
-#: ../finch/gntplugin.c:229
+#: ../finch/gntplugin.c:249
msgid "You can (un)load plugins from the following list."
msgstr "Вы можете загружать/выгружать модули из следующего списка."
-#: ../finch/gntplugin.c:272
+#: ../finch/gntplugin.c:296
msgid "Configure Plugin"
msgstr "Настроить модуль"
-#: ../finch/gntplugin.c:328 ../finch/gntplugin.c:335 ../finch/gntprefs.c:244
-#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:543 ../pidgin/gtkprefs.c:1953
+#: ../finch/gntplugin.c:352 ../finch/gntplugin.c:359 ../finch/gntprefs.c:245
+#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:1992
msgid "Preferences"
msgstr "Настройки"
@@ -994,9 +1076,7 @@ msgid "Pounce Who"
msgstr "За кем следить"
#. Account:
-#. Set up stuff for the account box
-#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446 ../pidgin/gtkblist.c:5404
-#: ../pidgin/gtkblist.c:5720
+#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446
msgid "Account:"
msgstr "Учётная запись:"
@@ -1145,69 +1225,69 @@ msgstr "%s отправил вам сообщение (%s)"
msgid "Unknown pounce event. Please report this!"
msgstr "Неизвестное событие слежения. Сообщите об этом!"
-#: ../finch/gntprefs.c:80 ../pidgin/gtkprefs.c:1814
+#: ../finch/gntprefs.c:79
+msgid "Based on keyboard use"
+msgstr "Основываясь на использовании клавиатуры"
+
+#: ../finch/gntprefs.c:81 ../pidgin/gtkprefs.c:1853
msgid "From last sent message"
msgstr "С момента последней отправки сообщения"
-#: ../finch/gntprefs.c:82 ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829
-#: ../pidgin/gtkprefs.c:1813 ../pidgin/gtkprefs.c:1827
+#: ../finch/gntprefs.c:83 ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829
+#: ../pidgin/gtkprefs.c:1852 ../pidgin/gtkprefs.c:1866
#: ../pidgin/plugins/win32/winprefs/winprefs.c:337
msgid "Never"
msgstr "Никогда"
-#: ../finch/gntprefs.c:170
+#: ../finch/gntprefs.c:171
msgid "Show Idle Time"
msgstr "Показывать время бездействия"
-#: ../finch/gntprefs.c:171
+#: ../finch/gntprefs.c:172
msgid "Show Offline Buddies"
msgstr "Показывать собеседников не в сети"
-#: ../finch/gntprefs.c:177
-msgid "Show Timestamps"
-msgstr "Показывать время сообщений"
-
-#: ../finch/gntprefs.c:178
+#: ../finch/gntprefs.c:179
msgid "Notify buddies when you are typing"
msgstr "Уведомлять собеседников о наборе сообщения"
-#: ../finch/gntprefs.c:184
+#: ../finch/gntprefs.c:185
msgid "Log format"
msgstr "Формат журнала"
-#: ../finch/gntprefs.c:185
+#: ../finch/gntprefs.c:186
msgid "Log IMs"
msgstr "Записывать мгновенные сообщения"
-#: ../finch/gntprefs.c:186
+#: ../finch/gntprefs.c:187
msgid "Log chats"
msgstr "Записывать чаты"
-#: ../finch/gntprefs.c:187
+#: ../finch/gntprefs.c:188
msgid "Log status change events"
msgstr "Записывать изменения статуса"
#. Conversations
-#: ../finch/gntprefs.c:240 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1917
+#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:915 ../pidgin/gtkprefs.c:1956
#: ../pidgin/plugins/win32/winprefs/winprefs.c:344
msgid "Conversations"
msgstr "Беседы"
-#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1928
+#: ../finch/gntprefs.c:242 ../pidgin/gtkprefs.c:1392 ../pidgin/gtkprefs.c:1967
msgid "Logging"
msgstr "Журналы"
-#: ../finch/gntrequest.c:530
+#: ../finch/gntrequest.c:532
msgid "Not implemented yet."
msgstr "Ещё не реализовано."
-#: ../finch/gntrequest.c:595 ../pidgin/gtkrequest.c:1529
-#: ../pidgin/gtkrequest.c:1575
+#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1530
+#: ../pidgin/gtkrequest.c:1576
msgid "Save File..."
msgstr "Сохранить файл..."
-#: ../finch/gntrequest.c:595 ../pidgin/gtkrequest.c:1530
-#: ../pidgin/gtkrequest.c:1576
+#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1531
+#: ../pidgin/gtkrequest.c:1577
msgid "Open File..."
msgstr "Открыть файл..."
@@ -1237,38 +1317,39 @@ msgid "Type"
msgstr "Тип"
#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:554 ../finch/gntstatus.c:566
-#: ../libpurple/protocols/bonjour/bonjour.c:258
-#: ../libpurple/protocols/bonjour/bonjour.c:265
-#: ../libpurple/protocols/bonjour/bonjour.c:328
+#: ../libpurple/protocols/bonjour/bonjour.c:247
+#: ../libpurple/protocols/bonjour/bonjour.c:254
+#: ../libpurple/protocols/bonjour/bonjour.c:320
#: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1576
#: ../libpurple/protocols/gg/gg.c:1594 ../libpurple/protocols/gg/gg.c:1604
#: ../libpurple/protocols/gg/gg.c:1610 ../libpurple/protocols/gg/gg.c:1619
#: ../libpurple/protocols/gg/gg.c:1624 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1242
#: ../libpurple/protocols/jabber/jabber.c:1252
#: ../libpurple/protocols/jabber/jabber.c:1262
#: ../libpurple/protocols/jabber/jabber.c:1272
#: ../libpurple/protocols/jabber/jabber.c:1282
-#: ../libpurple/protocols/jabber/jabber.c:1294
+#: ../libpurple/protocols/jabber/jabber.c:1292
+#: ../libpurple/protocols/jabber/jabber.c:1304
#: ../libpurple/protocols/novell/novell.c:2838
#: ../libpurple/protocols/novell/novell.c:2941
#: ../libpurple/protocols/novell/novell.c:2947
#: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5469
-#: ../libpurple/protocols/oscar/oscar.c:5687
-#: ../libpurple/protocols/oscar/oscar.c:5701
-#: ../libpurple/protocols/oscar/oscar.c:5717
-#: ../libpurple/protocols/oscar/oscar.c:5724
-#: ../libpurple/protocols/oscar/oscar.c:5731
+#: ../libpurple/protocols/oscar/oscar.c:5507
+#: ../libpurple/protocols/oscar/oscar.c:5725
+#: ../libpurple/protocols/oscar/oscar.c:5739
+#: ../libpurple/protocols/oscar/oscar.c:5755
+#: ../libpurple/protocols/oscar/oscar.c:5762
+#: ../libpurple/protocols/oscar/oscar.c:5769
#: ../libpurple/protocols/sametime/sametime.c:3286
#: ../libpurple/protocols/sametime/sametime.c:3292
#: ../libpurple/protocols/sametime/sametime.c:3298
#: ../libpurple/protocols/sametime/sametime.c:3377
#: ../libpurple/protocols/silc/buddy.c:1551
+#: ../libpurple/protocols/silc10/buddy.c:1551
#: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3481
-#: ../libpurple/protocols/yahoo/yahoo.c:3487
-#: ../libpurple/protocols/zephyr/zephyr.c:2336
+#: ../libpurple/protocols/yahoo/yahoo.c:3494
+#: ../libpurple/protocols/yahoo/yahoo.c:3500
+#: ../libpurple/protocols/zephyr/zephyr.c:2337
#: ../pidgin/gtksavedstatuses.c:490 ../pidgin/gtksavedstatuses.c:954
msgid "Message"
msgstr "Сообщение"
@@ -1284,7 +1365,7 @@ msgstr "Неверное название"
#: ../finch/gntstatus.c:295
msgid "Please enter a non-empty title for the status."
-msgstr ""
+msgstr "Введите непустое название для статуса."
#: ../finch/gntstatus.c:302
msgid "Duplicate title"
@@ -1325,7 +1406,7 @@ msgstr "Статусы"
#: ../finch/plugins/gntclipboard.c:149
msgid "GntClipboard"
-msgstr ""
+msgstr "Gnt-буфер обмена"
#: ../finch/plugins/gntclipboard.c:151
msgid "Clipboard plugin"
@@ -1337,66 +1418,66 @@ msgid ""
"X, if possible."
msgstr ""
-#: ../finch/plugins/gntgf.c:223
+#: ../finch/plugins/gntgf.c:231
#, c-format
msgid "%s just signed on"
msgstr "%s в сети"
-#: ../finch/plugins/gntgf.c:230
+#: ../finch/plugins/gntgf.c:238
#, c-format
msgid "%s just signed off"
msgstr "%s не в сети"
-#: ../finch/plugins/gntgf.c:238
+#: ../finch/plugins/gntgf.c:246
#, c-format
msgid "%s sent you a message"
msgstr "%s отправил вам сообщение"
-#: ../finch/plugins/gntgf.c:257
+#: ../finch/plugins/gntgf.c:265
#, c-format
msgid "%s said your nick in %s"
msgstr "%s произнёс ваше имя в %s"
-#: ../finch/plugins/gntgf.c:259
+#: ../finch/plugins/gntgf.c:267
#, c-format
msgid "%s sent a message in %s"
msgstr "%s отправил сообщение в %s"
-#: ../finch/plugins/gntgf.c:297
+#: ../finch/plugins/gntgf.c:305
msgid "Buddy signs on/off"
msgstr "Собеседник входит/выходит"
-#: ../finch/plugins/gntgf.c:298
+#: ../finch/plugins/gntgf.c:306
msgid "You receive an IM"
msgstr "Вы принимаете мгновенное сообщение"
-#: ../finch/plugins/gntgf.c:299
+#: ../finch/plugins/gntgf.c:307
msgid "Someone speaks in a chat"
msgstr "Кто-то говорит в чате"
-#: ../finch/plugins/gntgf.c:300
+#: ../finch/plugins/gntgf.c:308
msgid "Someone says your name in a chat"
msgstr "Кто-то произносит ваше имя в чате"
-#: ../finch/plugins/gntgf.c:328
+#: ../finch/plugins/gntgf.c:336
msgid "Notify with a toaster when"
-msgstr ""
+msgstr "Когда уведомлять"
-#: ../finch/plugins/gntgf.c:343
+#: ../finch/plugins/gntgf.c:351
msgid "Beep too!"
-msgstr ""
+msgstr "И пищать!"
-#: ../finch/plugins/gntgf.c:349
+#: ../finch/plugins/gntgf.c:357
msgid "Set URGENT for the terminal window."
-msgstr ""
+msgstr "Установить подсказку СРОЧНО для окна терминала."
-#: ../finch/plugins/gntgf.c:369
+#: ../finch/plugins/gntgf.c:377
msgid "GntGf"
-msgstr ""
+msgstr "Gnt-уведомления"
-#: ../finch/plugins/gntgf.c:371 ../finch/plugins/gntgf.c:372
+#: ../finch/plugins/gntgf.c:379 ../finch/plugins/gntgf.c:380
msgid "Toaster plugin"
-msgstr ""
+msgstr "Модуль уведомлений"
#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:120
#, c-format
@@ -1405,7 +1486,7 @@ msgstr "<b>Беседа с %s на %s:</b><br>"
#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:147
msgid "History Plugin Requires Logging"
-msgstr ""
+msgstr "Модуль истории требует ведения журнала"
#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:148
msgid ""
@@ -1414,6 +1495,10 @@ msgid ""
"Enabling logs for instant messages and/or chats will activate history for "
"the same conversation type(s)."
msgstr ""
+"Ведение журнала может быть включено из Инструменты -> Настройки -> Журналы.\n"
+"\n"
+"Включение журналов для мгновенных сообщений и/или чатов активирует историю "
+"для соответствующих типов бесед."
#: ../finch/plugins/gnthistory.c:179
msgid "GntHistory"
@@ -1428,6 +1513,7 @@ msgid ""
"When a new conversation is opened this plugin will insert the last "
"conversation into the current conversation."
msgstr ""
+"При открытии новой беседы этот модуль вставит прошлую беседу в текущую."
#: ../finch/plugins/lastlog.c:69
msgid "Lastlog"
@@ -1472,8 +1558,13 @@ msgstr "Сохранить пароль"
msgid "Missing protocol plugin for %s"
msgstr "Отсутствует модуль протокола для %s"
+#: ../libpurple/account.c:1012 ../libpurple/connection.c:107
+#: ../pidgin/gtkblist.c:3972
+msgid "Connection Error"
+msgstr "Ошибка соединения"
+
#: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
-#: ../libpurple/protocols/jabber/jabber.c:1332
+#: ../libpurple/protocols/jabber/jabber.c:1342
msgid "New passwords do not match."
msgstr "Новые пароли не совпадают."
@@ -1513,8 +1604,8 @@ msgstr "Установить пользовательскую информаци
#: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
#: ../libpurple/protocols/jabber/buddy.c:638
-#: ../libpurple/protocols/jabber/buddy.c:1399
-#: ../libpurple/protocols/jabber/buddy.c:1416
+#: ../libpurple/protocols/jabber/buddy.c:1424
+#: ../libpurple/protocols/jabber/buddy.c:1441
#: ../libpurple/protocols/novell/novell.c:2831
#: ../libpurple/protocols/qq/qq.c:230 ../pidgin/gtkft.c:159
msgid "Unknown"
@@ -1522,7 +1613,7 @@ msgstr "Неизвестно"
#: ../libpurple/blist.c:523 ../libpurple/blist.c:1291
#: ../libpurple/blist.c:1520 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5200 ../pidgin/plugins/gevolution/gevolution.c:97
+#: ../pidgin/gtkblist.c:5251 ../pidgin/plugins/gevolution/gevolution.c:96
#: ../pidgin/plugins/gevolution/gevo-util.c:64
msgid "Buddies"
msgstr "Собеседники"
@@ -1546,9 +1637,9 @@ msgid "+++ %s signed off"
msgstr "+++ %s вышел"
#: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:1687
+#: ../libpurple/protocols/jabber/buddy.c:1712
#: ../libpurple/protocols/msn/servconn.c:139
-#: ../libpurple/protocols/msn/session.c:321
+#: ../libpurple/protocols/msn/session.c:322
msgid "Unknown error"
msgstr "Неизвестная ошибка"
@@ -1565,7 +1656,8 @@ msgstr "Не удаётся отправить сообщение для %s."
msgid "The message is too large."
msgstr "Сообщение слишком велико."
-#: ../libpurple/conversation.c:178
+#: ../libpurple/conversation.c:178 ../libpurple/protocols/bonjour/jabber.c:283
+#: ../libpurple/protocols/bonjour/jabber.c:325
msgid "Unable to send message."
msgstr "Не удаётся отправить сообщение."
@@ -1577,32 +1669,32 @@ msgstr "Отправить сообщение"
msgid "_Send Message"
msgstr "_Отправить сообщение"
-#: ../libpurple/conversation.c:1570
+#: ../libpurple/conversation.c:1572
#, c-format
msgid "%s entered the room."
msgstr "%s вошёл в комнату."
-#: ../libpurple/conversation.c:1573
+#: ../libpurple/conversation.c:1575
#, c-format
msgid "%s [<I>%s</I>] entered the room."
msgstr "%s [<I>%s</I>] вошёл в комнату."
-#: ../libpurple/conversation.c:1678
+#: ../libpurple/conversation.c:1682
#, c-format
msgid "You are now known as %s"
msgstr "Вы теперь известны как %s"
-#: ../libpurple/conversation.c:1698
+#: ../libpurple/conversation.c:1702
#, c-format
msgid "%s is now known as %s"
msgstr "%s теперь известен как %s"
-#: ../libpurple/conversation.c:1771
+#: ../libpurple/conversation.c:1775
#, c-format
msgid "%s left the room."
msgstr "%s вышел из комнаты."
-#: ../libpurple/conversation.c:1774
+#: ../libpurple/conversation.c:1778
#, c-format
msgid "%s left the room (%s)."
msgstr "%s вышел из комнаты (%s)."
@@ -1675,7 +1767,7 @@ msgstr "Ошибка создания нити: %s"
msgid "Unknown reason"
msgstr "Причина неизвестна"
-#: ../libpurple/ft.c:204 ../libpurple/protocols/msn/msn.c:429
+#: ../libpurple/ft.c:204
#, c-format
msgid ""
"Error reading %s: \n"
@@ -1704,7 +1796,7 @@ msgstr ""
#: ../libpurple/ft.c:248
msgid "Directory is not writable."
-msgstr ""
+msgstr "Каталог недоступен для записи."
#: ../libpurple/ft.c:263
msgid "Cannot send a file of 0 bytes."
@@ -1774,31 +1866,31 @@ msgstr "Передача файла %s завершена"
msgid "File transfer complete"
msgstr "Передача файлов завершена"
-#: ../libpurple/ft.c:1090
+#: ../libpurple/ft.c:1091
#, c-format
msgid "You canceled the transfer of %s"
msgstr "Вы отменили передачу %s"
-#: ../libpurple/ft.c:1095
+#: ../libpurple/ft.c:1096
msgid "File transfer cancelled"
msgstr "Передача файлов отменена"
-#: ../libpurple/ft.c:1153
+#: ../libpurple/ft.c:1154
#, c-format
msgid "%s canceled the transfer of %s"
msgstr "%s отменил передачу %s"
-#: ../libpurple/ft.c:1158
+#: ../libpurple/ft.c:1159
#, c-format
msgid "%s canceled the file transfer"
msgstr "%s отменил передачу файлов"
-#: ../libpurple/ft.c:1215
+#: ../libpurple/ft.c:1216
#, c-format
msgid "File transfer to %s failed."
msgstr "Не удалось произвести передачу файлов для %s."
-#: ../libpurple/ft.c:1217
+#: ../libpurple/ft.c:1218
#, c-format
msgid "File transfer from %s failed."
msgstr "Не удалось произвести передачу файлов от %s."
@@ -2036,7 +2128,7 @@ msgstr "Несоответствие версии ABI %d.%d.x (необходи
#: ../libpurple/plugin.c:482
msgid "Plugin does not implement all required functions"
-msgstr ""
+msgstr "Модуль не реализует всех требуемых функций"
#: ../libpurple/plugin.c:547
#, c-format
@@ -2104,12 +2196,12 @@ msgstr "_Сохранить"
#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
#: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
#: ../libpurple/protocols/oscar/oscar.c:1440
-#: ../libpurple/protocols/oscar/oscar.c:2231
-#: ../libpurple/protocols/oscar/oscar.c:2278
-#: ../libpurple/protocols/oscar/oscar.c:5801
-#: ../libpurple/protocols/oscar/oscar.c:5856
-#: ../libpurple/protocols/oscar/oscar.c:6082
-#: ../libpurple/protocols/oscar/oscar.c:6152 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:2233
+#: ../libpurple/protocols/oscar/oscar.c:2280
+#: ../libpurple/protocols/oscar/oscar.c:5839
+#: ../libpurple/protocols/oscar/oscar.c:5894
+#: ../libpurple/protocols/oscar/oscar.c:6120
+#: ../libpurple/protocols/oscar/oscar.c:6190 ../libpurple/request.h:1387
#: ../libpurple/request.h:1397
msgid "_Cancel"
msgstr "О_тменить"
@@ -2152,18 +2244,18 @@ msgstr ""
"файлов\n"
"(только при отсутствии беседы с отправителем)"
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1609
-#: ../libpurple/protocols/msn/msn.c:1639
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1629
+#: ../libpurple/protocols/msn/msn.c:1659
msgid "Notes"
msgstr "Заметки"
#: ../libpurple/plugins/buddynote.c:47
msgid "Enter your notes below..."
-msgstr ""
+msgstr "Ниже введите ваши заметки..."
#: ../libpurple/plugins/buddynote.c:62
msgid "Edit Notes..."
-msgstr ""
+msgstr "Изменить заметки..."
#. *< major version
#. *< minor version
@@ -2175,18 +2267,20 @@ msgstr ""
#. *< id
#: ../libpurple/plugins/buddynote.c:87
msgid "Buddy Notes"
-msgstr ""
+msgstr "Заметки о собеседниках"
#. *< name
#. *< version
#: ../libpurple/plugins/buddynote.c:89
msgid "Store notes on particular buddies."
-msgstr ""
+msgstr "Сохраняет заметки об отдельных собеседниках."
#. *< summary
#: ../libpurple/plugins/buddynote.c:90
msgid "Adds the option to store notes for buddies on your buddy list."
msgstr ""
+"Добавляет возможность сохранения заметок для собеседников в списке "
+"собеседников."
#. *< type
#. *< ui_requirement
@@ -2379,99 +2473,99 @@ msgstr ""
msgid "(UTC)"
msgstr "(UTC)"
-#: ../libpurple/plugins/log_reader.c:1552
+#: ../libpurple/plugins/log_reader.c:1573
msgid "User is offline."
msgstr "Пользователь не в сети."
-#: ../libpurple/plugins/log_reader.c:1558
+#: ../libpurple/plugins/log_reader.c:1579
msgid "Auto-response sent:"
msgstr "Автоматический отклик отправлен:"
-#: ../libpurple/plugins/log_reader.c:1568
-#: ../libpurple/plugins/log_reader.c:1571
+#: ../libpurple/plugins/log_reader.c:1589
+#: ../libpurple/plugins/log_reader.c:1592
#: ../libpurple/plugins/statenotify.c:80
#, c-format
msgid "%s has signed off."
msgstr "%s не в сети."
-#: ../libpurple/plugins/log_reader.c:1585
+#: ../libpurple/plugins/log_reader.c:1606
msgid "One or more messages may have been undeliverable."
msgstr "Одно или несколько сообщений могли быть недоставленными."
-#: ../libpurple/plugins/log_reader.c:1595
+#: ../libpurple/plugins/log_reader.c:1616
msgid "You were disconnected from the server."
msgstr "Вы были отсоединены от сервера."
-#: ../libpurple/plugins/log_reader.c:1603
+#: ../libpurple/plugins/log_reader.c:1624
msgid ""
"You are currently disconnected. Messages will not be received unless you are "
"logged in."
msgstr ""
-#: ../libpurple/plugins/log_reader.c:1618
+#: ../libpurple/plugins/log_reader.c:1639
msgid "Message could not be sent because the maximum length was exceeded."
msgstr ""
"Сообщение не может быть отправлено, так как был превышен максимальный размер."
-#: ../libpurple/plugins/log_reader.c:1623
+#: ../libpurple/plugins/log_reader.c:1644
msgid "Message could not be sent."
msgstr "Сообщение не может быть отправлено."
#. The names of IM clients are marked for translation at the request of
#. translators who wanted to transliterate them. Many translators
#. choose to leave them alone. Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:1976
-#: ../libpurple/plugins/log_reader.c:2085
+#: ../libpurple/plugins/log_reader.c:1989
+#: ../libpurple/plugins/log_reader.c:2098
msgid "Adium"
msgstr "Adium"
#. The names of IM clients are marked for translation at the request of
#. translators who wanted to transliterate them. Many translators
#. choose to leave them alone. Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:1989
-#: ../libpurple/plugins/log_reader.c:2090
+#: ../libpurple/plugins/log_reader.c:2002
+#: ../libpurple/plugins/log_reader.c:2103
msgid "Fire"
msgstr "Fire"
#. The names of IM clients are marked for translation at the request of
#. translators who wanted to transliterate them. Many translators
#. choose to leave them alone. Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2001
-#: ../libpurple/plugins/log_reader.c:2094
+#: ../libpurple/plugins/log_reader.c:2014
+#: ../libpurple/plugins/log_reader.c:2107
msgid "Messenger Plus!"
msgstr "Messenger Plus!"
#. The names of IM clients are marked for translation at the request of
#. translators who wanted to transliterate them. Many translators
#. choose to leave them alone. Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2014
-#: ../libpurple/plugins/log_reader.c:2099
+#: ../libpurple/plugins/log_reader.c:2027
+#: ../libpurple/plugins/log_reader.c:2112
msgid "MSN Messenger"
msgstr "MSN Messenger"
#. The names of IM clients are marked for translation at the request of
#. translators who wanted to transliterate them. Many translators
#. choose to leave them alone. Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2026
-#: ../libpurple/plugins/log_reader.c:2103
+#: ../libpurple/plugins/log_reader.c:2039
+#: ../libpurple/plugins/log_reader.c:2116
msgid "Trillian"
msgstr "Trillian"
#. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2067
+#: ../libpurple/plugins/log_reader.c:2080
msgid "General Log Reading Configuration"
msgstr "Основные настройки системы чтения журналов"
-#: ../libpurple/plugins/log_reader.c:2071
+#: ../libpurple/plugins/log_reader.c:2084
msgid "Fast size calculations"
msgstr "Быстрое вычисление размера"
-#: ../libpurple/plugins/log_reader.c:2075
+#: ../libpurple/plugins/log_reader.c:2088
msgid "Use name heuristics"
msgstr ""
#. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2081
+#: ../libpurple/plugins/log_reader.c:2094
msgid "Log Directory"
msgstr "Каталог журнала"
@@ -2481,21 +2575,21 @@ msgstr "Каталог журнала"
#. *< dependencies
#. *< priority
#. *< id
-#: ../libpurple/plugins/log_reader.c:2132
+#: ../libpurple/plugins/log_reader.c:2145
msgid "Log Reader"
msgstr "Система чтения журналов"
#. *< name
#. *< version
#. * summary
-#: ../libpurple/plugins/log_reader.c:2136
+#: ../libpurple/plugins/log_reader.c:2149
msgid "Includes other IM clients' logs in the log viewer."
msgstr ""
"Включает журналы других клиентов обмена сообщениями в систему просмотра "
"журналов."
#. * description
-#: ../libpurple/plugins/log_reader.c:2140
+#: ../libpurple/plugins/log_reader.c:2153
msgid ""
"When viewing logs, this plugin will include logs from other IM clients. "
"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -2572,21 +2666,25 @@ msgstr ""
#: ../libpurple/plugins/offlinemsg.c:161
#: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:539 ../libpurple/protocols/msn/msn.c:549
+#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
#: ../libpurple/protocols/novell/novell.c:1917
-#: ../libpurple/protocols/silc/buddy.c:314
-#: ../libpurple/protocols/silc/pk.c:119 ../libpurple/protocols/silc/wb.c:304
-#: ../pidgin/gtkrequest.c:267
+#: ../libpurple/protocols/silc/buddy.c:317
+#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
+#: ../libpurple/protocols/silc10/buddy.c:314
+#: ../libpurple/protocols/silc10/pk.c:119
+#: ../libpurple/protocols/silc10/wb.c:304 ../pidgin/gtkrequest.c:267
msgid "Yes"
msgstr "Да"
#: ../libpurple/plugins/offlinemsg.c:162
#: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:539 ../libpurple/protocols/msn/msn.c:549
+#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
#: ../libpurple/protocols/novell/novell.c:1918
-#: ../libpurple/protocols/silc/buddy.c:315
-#: ../libpurple/protocols/silc/pk.c:120 ../libpurple/protocols/silc/wb.c:305
-#: ../pidgin/gtkrequest.c:268
+#: ../libpurple/protocols/silc/buddy.c:318
+#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
+#: ../libpurple/protocols/silc10/buddy.c:315
+#: ../libpurple/protocols/silc10/pk.c:120
+#: ../libpurple/protocols/silc10/wb.c:305 ../pidgin/gtkrequest.c:268
msgid "No"
msgstr "Нет"
@@ -2626,7 +2724,7 @@ msgstr ""
#: ../libpurple/plugins/psychic.c:22
msgid ""
"Causes conversation windows to appear as other users begin to message you. "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
msgstr ""
#: ../libpurple/plugins/psychic.c:72
@@ -2710,7 +2808,7 @@ msgstr "Предоставляет обёртку вокруг библиоте
#. *< dependencies
#. *< priority
#. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:263
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:275
msgid "GNUTLS"
msgstr "GNUTLS"
@@ -2718,8 +2816,8 @@ msgstr "GNUTLS"
#. *< version
#. * summary
#. * description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:266
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:268
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:278
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:280
msgid "Provides SSL support through GNUTLS."
msgstr "Предоставляет поддержку SSL посредством GNUTLS."
@@ -2729,7 +2827,7 @@ msgstr "Предоставляет поддержку SSL посредством
#. *< dependencies
#. *< priority
#. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:415
+#: ../libpurple/plugins/ssl/ssl-nss.c:423
msgid "NSS"
msgstr "NSS"
@@ -2737,8 +2835,8 @@ msgstr "NSS"
#. *< version
#. * summary
#. * description
-#: ../libpurple/plugins/ssl/ssl-nss.c:418
-#: ../libpurple/plugins/ssl/ssl-nss.c:420
+#: ../libpurple/plugins/ssl/ssl-nss.c:426
+#: ../libpurple/plugins/ssl/ssl-nss.c:428
msgid "Provides SSL support through Mozilla NSS."
msgstr "Предоставляет поддержку SSL посредством Mozilla NSS."
@@ -2814,18 +2912,18 @@ msgstr "Загрузчик модулей Tcl"
msgid "Provides support for loading Tcl plugins"
msgstr "Предоставляет поддержку модулей на языке Tcl"
-#: ../libpurple/plugins/tcl/tcl.c:495
+#: ../libpurple/plugins/tcl/tcl.c:507
msgid ""
"Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
"install ActiveTCL from http://www.activestate.com\n"
msgstr ""
#. Send a message about the connection error
-#: ../libpurple/protocols/bonjour/bonjour.c:113
+#: ../libpurple/protocols/bonjour/bonjour.c:112
msgid "Unable to listen for incoming IM connections\n"
msgstr "Не удаётся прослушивать входящие соединения\n"
-#: ../libpurple/protocols/bonjour/bonjour.c:148
+#: ../libpurple/protocols/bonjour/bonjour.c:137
msgid ""
"Unable to establish connection with the local mDNS server. Is it running?"
msgstr ""
@@ -2834,18 +2932,19 @@ msgstr ""
#. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
#. Away stuff
-#: ../libpurple/protocols/bonjour/bonjour.c:302
-#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:516
-#: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/jabber/buddy.c:1409
+#: ../libpurple/protocols/bonjour/bonjour.c:294
+#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:530
+#: ../libpurple/protocols/irc/msgs.c:310
+#: ../libpurple/protocols/jabber/buddy.c:1434
#: ../libpurple/protocols/novell/novell.c:2819
#: ../libpurple/protocols/oscar/oscar.c:715
-#: ../libpurple/protocols/oscar/oscar.c:4496
-#: ../libpurple/protocols/oscar/oscar.c:5547
+#: ../libpurple/protocols/oscar/oscar.c:4520
+#: ../libpurple/protocols/oscar/oscar.c:5585
#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3384
-#: ../libpurple/protocols/yahoo/yahoo.c:3457 ../libpurple/status.c:159
-#: ../pidgin/gtkdocklet.c:461 ../pidgin/gtkprefs.c:1823
+#: ../libpurple/protocols/silc10/buddy.c:1476
+#: ../libpurple/protocols/yahoo/yahoo.c:3397
+#: ../libpurple/protocols/yahoo/yahoo.c:3470 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1862
#: ../pidgin/gtkstatusbox.c:1052
msgid "Away"
msgstr "Отошёл"
@@ -2860,86 +2959,91 @@ msgstr "Отошёл"
#. *< version
#. * summary
#. * description
-#: ../libpurple/protocols/bonjour/bonjour.c:431
-#: ../libpurple/protocols/bonjour/bonjour.c:433
+#: ../libpurple/protocols/bonjour/bonjour.c:425
+#: ../libpurple/protocols/bonjour/bonjour.c:427
msgid "Bonjour Protocol Plugin"
msgstr "Модуль протокола Bonjour"
-#: ../libpurple/protocols/bonjour/bonjour.c:476
-#: ../libpurple/protocols/bonjour/bonjour.c:483
-#: ../libpurple/protocols/bonjour/bonjour.c:541
+#: ../libpurple/protocols/bonjour/bonjour.c:470
+#: ../libpurple/protocols/bonjour/bonjour.c:477
+#: ../libpurple/protocols/bonjour/bonjour.c:535
msgid "Purple Person"
msgstr ""
#. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:589
-#: ../libpurple/protocols/silc/silc.c:926
+#: ../libpurple/protocols/bonjour/bonjour.c:583
+#: ../libpurple/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc10/silc.c:918
msgid "Hostname"
msgstr "Имя узла"
#. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:593
+#: ../libpurple/protocols/bonjour/bonjour.c:587
#: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:820
+#: ../libpurple/protocols/jabber/jabber.c:828
msgid "First name"
msgstr "Имя"
-#: ../libpurple/protocols/bonjour/bonjour.c:596
+#: ../libpurple/protocols/bonjour/bonjour.c:590
#: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:825
+#: ../libpurple/protocols/jabber/jabber.c:833
msgid "Last name"
msgstr "Фамилия"
-#: ../libpurple/protocols/bonjour/bonjour.c:599
+#: ../libpurple/protocols/bonjour/bonjour.c:593
#: ../libpurple/protocols/gg/gg.c:472
-#: ../libpurple/protocols/jabber/jabber.c:810
-#: ../libpurple/protocols/silc/silc.c:689
-#: ../libpurple/protocols/silc/silc.c:930
+#: ../libpurple/protocols/jabber/jabber.c:818
+#: ../libpurple/protocols/silc/silc.c:770
+#: ../libpurple/protocols/silc/silc.c:1011
+#: ../libpurple/protocols/silc10/silc.c:681
+#: ../libpurple/protocols/silc10/silc.c:922
msgid "E-mail"
msgstr "E-mail"
-#: ../libpurple/protocols/bonjour/bonjour.c:602
+#: ../libpurple/protocols/bonjour/bonjour.c:596
msgid "AIM Account"
msgstr "Учётная запись AIM"
-#: ../libpurple/protocols/bonjour/bonjour.c:605
-msgid "Jabber Account"
-msgstr "Учётная запись Jabber"
+#: ../libpurple/protocols/bonjour/bonjour.c:599
+msgid "XMPP Account"
+msgstr "Учётная запись XMPP"
-#: ../libpurple/protocols/bonjour/bonjour.h:35
+#: ../libpurple/protocols/bonjour/bonjour.h:33
msgid "Bonjour"
-msgstr ""
+msgstr "Bonjour"
-#: ../libpurple/protocols/bonjour/jabber.c:374
+#: ../libpurple/protocols/bonjour/jabber.c:394
#, c-format
msgid "%s has closed the conversation."
msgstr "%s закрыл беседу."
-#: ../libpurple/protocols/bonjour/jabber.c:461
+#: ../libpurple/protocols/bonjour/jabber.c:440
+#: ../libpurple/protocols/bonjour/jabber.c:653
+#: ../libpurple/protocols/bonjour/jabber.c:678
+msgid "Unable to send the message, the conversation couldn't be started."
+msgstr "Не удаётся отправить сообщение, не удалось начать беседу."
+
+#: ../libpurple/protocols/bonjour/jabber.c:574
msgid "Cannot open socket"
msgstr "Не удаётся открыть сокет"
-#: ../libpurple/protocols/bonjour/jabber.c:469
+#: ../libpurple/protocols/bonjour/jabber.c:582
msgid "Error setting socket options"
msgstr "Ошибка установки параметров сокета"
-#: ../libpurple/protocols/bonjour/jabber.c:493
+#: ../libpurple/protocols/bonjour/jabber.c:606
msgid "Could not bind socket to port"
msgstr "Не удалось связать сокет с портом"
-#: ../libpurple/protocols/bonjour/jabber.c:501
+#: ../libpurple/protocols/bonjour/jabber.c:614
msgid "Could not listen on socket"
msgstr "Не удалось осуществить прослушивание сокета"
-#: ../libpurple/protocols/bonjour/jabber.c:599
-msgid "Unable to send the message, the conversation couldn't be started."
-msgstr "Не удаётся отправить сообщение, не удалось начать беседу."
-
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1800
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1812
msgid "Invalid proxy settings"
msgstr "Неверные настройки прокси"
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1800
+#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1812
msgid ""
"Either the host name or port number specified for your given proxy type is "
"invalid."
@@ -3008,8 +3112,8 @@ msgid "Registration completed successfully!"
msgstr "Регистрация завершена успешно!"
#: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
-#: ../libpurple/protocols/jabber/jabber.c:799
-#: ../libpurple/protocols/jabber/jabber.c:1367
+#: ../libpurple/protocols/jabber/jabber.c:807
+#: ../libpurple/protocols/jabber/jabber.c:1377
msgid "Password"
msgstr "Пароль"
@@ -3035,9 +3139,9 @@ msgstr "Заполните следующие поля"
#: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
#: ../libpurple/protocols/gg/gg.c:1123
-#: ../libpurple/protocols/jabber/jabber.c:835
-#: ../libpurple/protocols/oscar/oscar.c:3776
-#: ../libpurple/protocols/oscar/oscar.c:3789
+#: ../libpurple/protocols/jabber/jabber.c:843
+#: ../libpurple/protocols/oscar/oscar.c:3778
+#: ../libpurple/protocols/oscar/oscar.c:3791
#: ../libpurple/protocols/qq/buddy_info.c:49
msgid "City"
msgstr "Город"
@@ -3046,8 +3150,8 @@ msgstr "Город"
msgid "Year of birth"
msgstr "Год рождения"
-#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1538
-#: ../libpurple/protocols/oscar/oscar.c:3719
+#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1558
+#: ../libpurple/protocols/oscar/oscar.c:3721
#: ../libpurple/protocols/qq/buddy_info.c:46
#: ../libpurple/protocols/qq/qq.c:224 ../libpurple/protocols/qq/qq.c:227
#: ../libpurple/protocols/qq/qq.c:230 ../libpurple/protocols/qq/qq.c:234
@@ -3060,14 +3164,14 @@ msgid "Male or female"
msgstr "Мужчина или женщина"
#: ../libpurple/protocols/gg/gg.c:647
-#: ../libpurple/protocols/oscar/oscar.c:3719
+#: ../libpurple/protocols/oscar/oscar.c:3721
#: ../libpurple/protocols/qq/buddy_info.c:83
#: ../libpurple/protocols/qq/qq.c:224
msgid "Male"
msgstr "Мужчина"
#: ../libpurple/protocols/gg/gg.c:648
-#: ../libpurple/protocols/oscar/oscar.c:3719
+#: ../libpurple/protocols/oscar/oscar.c:3721
#: ../libpurple/protocols/qq/buddy_info.c:84
#: ../libpurple/protocols/qq/qq.c:227
msgid "Female"
@@ -3127,38 +3231,39 @@ msgid "Add to chat..."
msgstr "Добавить к чату..."
#: ../libpurple/protocols/gg/gg.c:1003
-#: ../libpurple/protocols/jabber/buddy.c:1403
+#: ../libpurple/protocols/jabber/buddy.c:1428
#: ../libpurple/protocols/novell/novell.c:2828
#: ../libpurple/protocols/oscar/oscar.c:810
-#: ../libpurple/protocols/oscar/oscar.c:5519
+#: ../libpurple/protocols/oscar/oscar.c:5557
#: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/yahoo/yahoo.c:2904 ../libpurple/status.c:155
-#: ../pidgin/gtkblist.c:3036 ../pidgin/gtkblist.c:3360
-#: ../pidgin/gtkdocklet.c:469 ../pidgin/gtkstatusbox.c:1054
+#: ../libpurple/protocols/yahoo/yahoo.c:2917 ../libpurple/status.c:153
+#: ../pidgin/gtkblist.c:3053 ../pidgin/gtkblist.c:3381
+#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1054
msgid "Offline"
msgstr "Не в сети"
#: ../libpurple/protocols/gg/gg.c:1006
-#: ../libpurple/protocols/jabber/buddy.c:1405
+#: ../libpurple/protocols/jabber/buddy.c:1430
#: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
#: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
#: ../libpurple/protocols/novell/novell.c:2816
-#: ../libpurple/protocols/yahoo/yahoo.c:2906 ../libpurple/status.c:156
-#: ../pidgin/gtkdocklet.c:457 ../pidgin/gtkstatusbox.c:1051
+#: ../libpurple/protocols/yahoo/yahoo.c:2919 ../libpurple/status.c:154
+#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1051
msgid "Available"
msgstr "Доступен"
#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1114
-#: ../libpurple/protocols/oscar/oscar.c:2655
-#: ../libpurple/protocols/oscar/oscar.c:3686
+#: ../libpurple/protocols/oscar/oscar.c:2657
+#: ../libpurple/protocols/oscar/oscar.c:3688
msgid "UIN"
msgstr "UIN"
#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1117
-#: ../libpurple/protocols/jabber/buddy.c:1560
-#: ../libpurple/protocols/jabber/buddy.c:1736
-#: ../libpurple/protocols/oscar/oscar.c:3697
-#: ../libpurple/protocols/silc/ops.c:1024
+#: ../libpurple/protocols/jabber/buddy.c:1585
+#: ../libpurple/protocols/jabber/buddy.c:1761
+#: ../libpurple/protocols/oscar/oscar.c:3699
+#: ../libpurple/protocols/silc/ops.c:990
+#: ../libpurple/protocols/silc10/ops.c:1024
msgid "First Name"
msgstr "Имя"
@@ -3167,7 +3272,7 @@ msgid "Birth Year"
msgstr "Год рождения"
#: ../libpurple/protocols/gg/gg.c:1108 ../libpurple/protocols/gg/gg.c:1177
-#: ../libpurple/protocols/oscar/oscar.c:3898
+#: ../libpurple/protocols/oscar/oscar.c:3900
msgid "Unable to display the search results."
msgstr "Не удаётся отобразить результаты поиска."
@@ -3211,7 +3316,7 @@ msgstr "Список собеседников был сохранён на се
msgid "Connection failed."
msgstr "Не удалось установить соединение."
-#: ../libpurple/protocols/gg/gg.c:1618 ../libpurple/protocols/msn/msn.c:548
+#: ../libpurple/protocols/gg/gg.c:1618 ../libpurple/protocols/msn/msn.c:531
msgid "Blocked"
msgstr "Заблокирован"
@@ -3296,21 +3401,24 @@ msgid "Gadu-Gadu User"
msgstr "Пользователь Gadu-Gadu"
#: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1577
+#: ../libpurple/protocols/silc/silc.c:1637
+#: ../libpurple/protocols/silc10/silc.c:1566
#, c-format
msgid "Unknown command: %s"
msgstr "Неизвестная команда: %s"
#: ../libpurple/protocols/irc/cmds.c:503
-#: ../libpurple/protocols/jabber/chat.c:593
-#: ../libpurple/protocols/silc/silc.c:1285
+#: ../libpurple/protocols/jabber/chat.c:591
+#: ../libpurple/protocols/silc/silc.c:1345
+#: ../libpurple/protocols/silc10/silc.c:1274
#, c-format
msgid "current topic is: %s"
msgstr "текущая тема: %s"
#: ../libpurple/protocols/irc/cmds.c:507
-#: ../libpurple/protocols/jabber/chat.c:597
-#: ../libpurple/protocols/silc/silc.c:1289
+#: ../libpurple/protocols/jabber/chat.c:595
+#: ../libpurple/protocols/silc/silc.c:1349
+#: ../libpurple/protocols/silc10/silc.c:1278
msgid "No topic is set"
msgstr "Тема не установлена"
@@ -3345,7 +3453,7 @@ msgid "MOTD for %s"
msgstr "MOTD для %s"
#: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:600 ../libpurple/protocols/irc/irc.c:625
+#: ../libpurple/protocols/irc/irc.c:614 ../libpurple/protocols/irc/irc.c:639
msgid "Server has disconnected"
msgstr "Сервер разорвал соединение"
@@ -3354,11 +3462,12 @@ msgid "View MOTD"
msgstr "Просмотреть MOTD"
#: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
+#: ../libpurple/protocols/silc10/chat.c:33
msgid "_Channel:"
msgstr "_Канал:"
#: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:523
msgid "_Password:"
msgstr "_Пароль:"
@@ -3368,60 +3477,62 @@ msgstr "Псевдонимы IRC не могут содержать пробел
#. connect to the server
#: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1040
-#: ../libpurple/protocols/msn/session.c:344
+#: ../libpurple/protocols/jabber/jabber.c:1048
+#: ../libpurple/protocols/msn/session.c:345
#: ../libpurple/protocols/novell/novell.c:2182
#: ../libpurple/protocols/oscar/oscar.c:1270
#: ../libpurple/protocols/qq/qq.c:136
#: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1673
-#: ../libpurple/protocols/yahoo/yahoo.c:2749
-#: ../libpurple/protocols/zephyr/zephyr.c:1620 ../pidgin/gtkstatusbox.c:659
+#: ../libpurple/protocols/simple/simple.c:1671
+#: ../libpurple/protocols/yahoo/yahoo.c:2762
+#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:659
msgid "Connecting"
msgstr "Соединение"
#: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:595
-#: ../libpurple/protocols/jabber/jabber.c:942
+#: ../libpurple/protocols/jabber/jabber.c:603
+#: ../libpurple/protocols/jabber/jabber.c:950
msgid "SSL support unavailable"
msgstr "Поддержка SSL недоступна"
#: ../libpurple/protocols/irc/irc.c:338
#: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1588
+#: ../libpurple/protocols/simple/simple.c:1586
msgid "Couldn't create socket"
msgstr "Не удалось создать сокет"
-#: ../libpurple/protocols/irc/irc.c:402
-#: ../libpurple/protocols/jabber/jabber.c:466
+#: ../libpurple/protocols/irc/irc.c:416
#: ../libpurple/protocols/oscar/oscar.c:1266
msgid "Couldn't connect to host"
msgstr "Не удалось соединиться с узлом"
-#: ../libpurple/protocols/irc/irc.c:424
-#: ../libpurple/protocols/jabber/jabber.c:495
+#: ../libpurple/protocols/irc/irc.c:438
+#: ../libpurple/protocols/jabber/jabber.c:499
msgid "Connection Failed"
msgstr "Не удалось установить соединение"
-#: ../libpurple/protocols/irc/irc.c:427
-#: ../libpurple/protocols/jabber/jabber.c:498
+#: ../libpurple/protocols/irc/irc.c:441
+#: ../libpurple/protocols/jabber/jabber.c:502
msgid "SSL Handshake Failed"
msgstr "Не удалось выполнить согласование SSL"
-#: ../libpurple/protocols/irc/irc.c:597 ../libpurple/protocols/irc/irc.c:622
+#: ../libpurple/protocols/irc/irc.c:611 ../libpurple/protocols/irc/irc.c:636
msgid "Read error"
msgstr "Ошибка чтения"
-#: ../libpurple/protocols/irc/irc.c:761
-#: ../libpurple/protocols/silc/chat.c:1426
+#: ../libpurple/protocols/irc/irc.c:775
+#: ../libpurple/protocols/silc/chat.c:1412
+#: ../libpurple/protocols/silc10/chat.c:1426
#: ../libpurple/protocols/yahoo/yahoochat.c:1438
msgid "Users"
msgstr "Пользователи"
-#: ../libpurple/protocols/irc/irc.c:764
+#: ../libpurple/protocols/irc/irc.c:778
#: ../libpurple/protocols/sametime/sametime.c:3374
-#: ../libpurple/protocols/silc/chat.c:1429
-#: ../libpurple/protocols/silc/ops.c:1382
+#: ../libpurple/protocols/silc/chat.c:1415
+#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc10/chat.c:1429
+#: ../libpurple/protocols/silc10/ops.c:1382
#: ../libpurple/protocols/yahoo/yahoochat.c:1447
msgid "Topic"
msgstr "Тема"
@@ -3434,56 +3545,65 @@ msgstr "Тема"
#. *< id
#. *< name
#. *< version
-#: ../libpurple/protocols/irc/irc.c:901
+#: ../libpurple/protocols/irc/irc.c:915
msgid "IRC Protocol Plugin"
msgstr "Модуль протокола IRC"
#. * summary
-#: ../libpurple/protocols/irc/irc.c:902
+#: ../libpurple/protocols/irc/irc.c:916
msgid "The IRC Protocol Plugin that Sucks Less"
msgstr "Наименее плохой модуль протокола IRC"
#. host to connect to
-#: ../libpurple/protocols/irc/irc.c:927 ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/libxmpp.c:194
-#: ../libpurple/protocols/msn/msn.c:2131
-#: ../libpurple/protocols/oscar/oscar.c:6583
+#: ../libpurple/protocols/irc/irc.c:941 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2154
+#: ../libpurple/protocols/oscar/oscar.c:6624
#: ../libpurple/protocols/qq/qq.c:756
-#: ../libpurple/protocols/sametime/sametime.c:5712
-#: ../libpurple/protocols/silc/ops.c:1244
-#: ../libpurple/protocols/silc/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1852
+#: ../libpurple/protocols/sametime/sametime.c:5727
+#: ../libpurple/protocols/silc/ops.c:1249
+#: ../libpurple/protocols/silc/ops.c:1341
+#: ../libpurple/protocols/silc10/ops.c:1244
+#: ../libpurple/protocols/silc10/ops.c:1347
+#: ../libpurple/protocols/simple/simple.c:1850
#: ../libpurple/protocols/toc/toc.c:2327
msgid "Server"
msgstr "Сервер"
#. port to connect to
-#: ../libpurple/protocols/irc/irc.c:930 ../libpurple/protocols/msn/msn.c:2136
-#: ../libpurple/protocols/oscar/oscar.c:6586
+#: ../libpurple/protocols/irc/irc.c:944 ../libpurple/protocols/msn/msn.c:2159
+#: ../libpurple/protocols/oscar/oscar.c:6627
#: ../libpurple/protocols/qq/qq.c:759
-#: ../libpurple/protocols/sametime/sametime.c:5717
-#: ../libpurple/protocols/silc/silc.c:1870
+#: ../libpurple/protocols/sametime/sametime.c:5732
+#: ../libpurple/protocols/silc/silc.c:1917
+#: ../libpurple/protocols/silc10/silc.c:1859
#: ../libpurple/protocols/toc/toc.c:2331
msgid "Port"
msgstr "Порт"
-#: ../libpurple/protocols/irc/irc.c:933
+#: ../libpurple/protocols/irc/irc.c:947
msgid "Encodings"
msgstr "Кодировки"
-#: ../libpurple/protocols/irc/irc.c:936 ../libpurple/protocols/irc/msgs.c:309
-#: ../libpurple/protocols/jabber/jabber.c:795
+#: ../libpurple/protocols/irc/irc.c:950 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:803
#: ../libpurple/protocols/silc/buddy.c:1539
-#: ../libpurple/protocols/silc/ops.c:1191
-#: ../libpurple/protocols/silc/ops.c:1194
-#: ../libpurple/protocols/silc/ops.c:1340
-#: ../libpurple/protocols/silc/ops.c:1343
-#: ../libpurple/protocols/silc/silc.c:924
+#: ../libpurple/protocols/silc/ops.c:1197
+#: ../libpurple/protocols/silc/ops.c:1200
+#: ../libpurple/protocols/silc/ops.c:1334
+#: ../libpurple/protocols/silc/ops.c:1337
+#: ../libpurple/protocols/silc/silc.c:1005
+#: ../libpurple/protocols/silc10/buddy.c:1539
+#: ../libpurple/protocols/silc10/ops.c:1191
+#: ../libpurple/protocols/silc10/ops.c:1194
+#: ../libpurple/protocols/silc10/ops.c:1340
+#: ../libpurple/protocols/silc10/ops.c:1343
+#: ../libpurple/protocols/silc10/silc.c:916
msgid "Username"
msgstr "Имя пользователя"
-#: ../libpurple/protocols/irc/irc.c:939 ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/silc/silc.c:928
+#: ../libpurple/protocols/irc/irc.c:953 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/silc/silc.c:1009
+#: ../libpurple/protocols/silc10/silc.c:920
msgid "Real name"
msgstr "Настоящее имя"
@@ -3491,155 +3611,158 @@ msgstr "Настоящее имя"
#. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
#. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
#.
-#: ../libpurple/protocols/irc/irc.c:947
+#: ../libpurple/protocols/irc/irc.c:961
msgid "Use SSL"
msgstr "Использовать SSL"
-#: ../libpurple/protocols/irc/msgs.c:180
+#: ../libpurple/protocols/irc/msgs.c:187
msgid "Bad mode"
msgstr "Неверный режим"
-#: ../libpurple/protocols/irc/msgs.c:191
+#: ../libpurple/protocols/irc/msgs.c:198
#, c-format
msgid "You are banned from %s."
msgstr "Вас выгнали из %s."
-#: ../libpurple/protocols/irc/msgs.c:192
+#: ../libpurple/protocols/irc/msgs.c:199
msgid "Banned"
msgstr "Изгнан"
-#: ../libpurple/protocols/irc/msgs.c:209
+#: ../libpurple/protocols/irc/msgs.c:216
#, c-format
msgid "Cannot ban %s: banlist is full"
msgstr ""
-#: ../libpurple/protocols/irc/msgs.c:294
+#: ../libpurple/protocols/irc/msgs.c:301
msgid " <i>(ircop)</i>"
msgstr " <i>(оператор IRC)</i>"
-#: ../libpurple/protocols/irc/msgs.c:295
+#: ../libpurple/protocols/irc/msgs.c:302
msgid " <i>(identified)</i>"
msgstr " <i>(идентифицирован)</i>"
-#: ../libpurple/protocols/irc/msgs.c:296
-#: ../libpurple/protocols/oscar/oscar.c:3687
-#: ../libpurple/protocols/silc/ops.c:1414
+#: ../libpurple/protocols/irc/msgs.c:303
+#: ../libpurple/protocols/oscar/oscar.c:3689
+#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc10/ops.c:1414
msgid "Nick"
msgstr "Псевдоним"
-#: ../libpurple/protocols/irc/msgs.c:322
-#: ../libpurple/protocols/silc/ops.c:1272
+#: ../libpurple/protocols/irc/msgs.c:329
+#: ../libpurple/protocols/silc/ops.c:1268
+#: ../libpurple/protocols/silc10/ops.c:1272
msgid "Currently on"
msgstr "Сейчас на"
-#: ../libpurple/protocols/irc/msgs.c:327
+#: ../libpurple/protocols/irc/msgs.c:334
msgid "Idle for"
msgstr "Бездействует"
-#: ../libpurple/protocols/irc/msgs.c:330
+#: ../libpurple/protocols/irc/msgs.c:337
msgid "Online since"
msgstr "В сети с"
-#: ../libpurple/protocols/irc/msgs.c:334
+#: ../libpurple/protocols/irc/msgs.c:341
msgid "<b>Defining adjective:</b>"
msgstr ""
-#: ../libpurple/protocols/irc/msgs.c:334
+#: ../libpurple/protocols/irc/msgs.c:341
msgid "Glorious"
msgstr ""
-#: ../libpurple/protocols/irc/msgs.c:410
+#: ../libpurple/protocols/irc/msgs.c:420
#, c-format
msgid "%s has changed the topic to: %s"
msgstr "%s сменил тему на: %s"
-#: ../libpurple/protocols/irc/msgs.c:412
+#: ../libpurple/protocols/irc/msgs.c:422
#, c-format
msgid "%s has cleared the topic."
msgstr "%s очистил тему."
-#: ../libpurple/protocols/irc/msgs.c:420
+#: ../libpurple/protocols/irc/msgs.c:430
#, c-format
msgid "The topic for %s is: %s"
msgstr "Тема для %s: %s"
-#: ../libpurple/protocols/irc/msgs.c:438
+#: ../libpurple/protocols/irc/msgs.c:448
#, c-format
msgid "Unknown message '%s'"
msgstr "Неизвестное сообщение '%s'"
-#: ../libpurple/protocols/irc/msgs.c:439
+#: ../libpurple/protocols/irc/msgs.c:449
msgid "Unknown message"
msgstr "Неизвестное сообщение"
-#: ../libpurple/protocols/irc/msgs.c:439
+#: ../libpurple/protocols/irc/msgs.c:449
msgid "The IRC server received a message it did not understand."
msgstr "Сервер IRC не понял полученное сообщение."
-#: ../libpurple/protocols/irc/msgs.c:460
+#: ../libpurple/protocols/irc/msgs.c:470
#, c-format
msgid "Users on %s: %s"
msgstr "Пользователи на %s: %s"
-#: ../libpurple/protocols/irc/msgs.c:557
+#: ../libpurple/protocols/irc/msgs.c:575
msgid "Time Response"
msgstr "Отклик времени"
-#: ../libpurple/protocols/irc/msgs.c:558
+#: ../libpurple/protocols/irc/msgs.c:576
msgid "The IRC server's local time is:"
msgstr "Локальное время сервера IRC:"
-#: ../libpurple/protocols/irc/msgs.c:569
+#: ../libpurple/protocols/irc/msgs.c:587
msgid "No such channel"
msgstr "Нет такого канала"
#. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:580
+#: ../libpurple/protocols/irc/msgs.c:598
msgid "no such channel"
msgstr "нет такого канала"
-#: ../libpurple/protocols/irc/msgs.c:583
+#: ../libpurple/protocols/irc/msgs.c:601
msgid "User is not logged in"
msgstr "Пользователь не в сети"
-#: ../libpurple/protocols/irc/msgs.c:588
+#: ../libpurple/protocols/irc/msgs.c:606
msgid "No such nick or channel"
msgstr "Нет такого псевдонима или канала"
-#: ../libpurple/protocols/irc/msgs.c:608
+#: ../libpurple/protocols/irc/msgs.c:626
msgid "Could not send"
msgstr "Не удалось отправить"
-#: ../libpurple/protocols/irc/msgs.c:664
+#: ../libpurple/protocols/irc/msgs.c:682
#, c-format
msgid "Joining %s requires an invitation."
msgstr "Присоединение к %s требует приглашения."
-#: ../libpurple/protocols/irc/msgs.c:665
+#: ../libpurple/protocols/irc/msgs.c:683
msgid "Invitation only"
msgstr "Только по приглашению"
-#: ../libpurple/protocols/irc/msgs.c:777
+#: ../libpurple/protocols/irc/msgs.c:795
#, c-format
msgid "You have been kicked by %s: (%s)"
msgstr "Вы были удалены оператором %s: (%s)"
#. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:782 ../libpurple/protocols/silc/ops.c:720
+#: ../libpurple/protocols/irc/msgs.c:800 ../libpurple/protocols/silc/ops.c:699
+#: ../libpurple/protocols/silc10/ops.c:720
#, c-format
msgid "Kicked by %s (%s)"
msgstr "Удалён оператором %s (%s)"
-#: ../libpurple/protocols/irc/msgs.c:805
+#: ../libpurple/protocols/irc/msgs.c:823
#, c-format
msgid "mode (%s %s) by %s"
msgstr "режим (%s %s) установлен %s"
-#: ../libpurple/protocols/irc/msgs.c:890 ../libpurple/protocols/irc/msgs.c:891
+#: ../libpurple/protocols/irc/msgs.c:908 ../libpurple/protocols/irc/msgs.c:909
msgid "Invalid nickname"
msgstr "Неверный псевдоним"
-#: ../libpurple/protocols/irc/msgs.c:892
+#: ../libpurple/protocols/irc/msgs.c:910
msgid ""
"Your selected nickname was rejected by the server. It probably contains "
"invalid characters."
@@ -3647,7 +3770,7 @@ msgstr ""
"Выбранный вами псевдоним был отвергнут сервером. Вероятно, он содержит "
"недопустимые символы."
-#: ../libpurple/protocols/irc/msgs.c:897
+#: ../libpurple/protocols/irc/msgs.c:915
msgid ""
"Your selected account name was rejected by the server. It probably contains "
"invalid characters."
@@ -3655,52 +3778,53 @@ msgstr ""
"Выбранное вами имя учётной записи было отвергнуто сервером. Вероятно, оно "
"содержит недопустимые символы."
-#: ../libpurple/protocols/irc/msgs.c:936
+#: ../libpurple/protocols/irc/msgs.c:954
msgid "Cannot change nick"
msgstr "Не удаётся изменить псевдоним"
-#: ../libpurple/protocols/irc/msgs.c:936
+#: ../libpurple/protocols/irc/msgs.c:954
msgid "Could not change nick"
msgstr "Не удалось изменить псевдоним"
-#: ../libpurple/protocols/irc/msgs.c:957
+#: ../libpurple/protocols/irc/msgs.c:975
#, c-format
msgid "You have parted the channel%s%s"
msgstr "Вы покинули канал%s%s"
-#: ../libpurple/protocols/irc/msgs.c:999
+#: ../libpurple/protocols/irc/msgs.c:1017
msgid "Error: invalid PONG from server"
msgstr "Ошибка: неверный PONG с сервера"
-#: ../libpurple/protocols/irc/msgs.c:1001
+#: ../libpurple/protocols/irc/msgs.c:1019
#, c-format
msgid "PING reply -- Lag: %lu seconds"
msgstr "Ответ PING -- задержка: %lu секунд"
-#: ../libpurple/protocols/irc/msgs.c:1082
+#: ../libpurple/protocols/irc/msgs.c:1110
#, c-format
-msgid "Cannot join %s:"
-msgstr "Не удаётся присоединиться к %s:"
+msgid "Cannot join %s: Registration is required."
+msgstr "Не удаётся присоединиться к %s: Требуется регистрация."
-#: ../libpurple/protocols/irc/msgs.c:1083
-#: ../libpurple/protocols/silc/ops.c:1128
+#: ../libpurple/protocols/irc/msgs.c:1111
+#: ../libpurple/protocols/silc/ops.c:1093
+#: ../libpurple/protocols/silc10/ops.c:1128
msgid "Cannot join channel"
msgstr "Не удаётся присоединиться к каналу"
-#: ../libpurple/protocols/irc/msgs.c:1117
+#: ../libpurple/protocols/irc/msgs.c:1145
msgid "Nick or channel is temporarily unavailable."
msgstr "Псевдоним или канал временно недоступен."
-#: ../libpurple/protocols/irc/msgs.c:1129
+#: ../libpurple/protocols/irc/msgs.c:1157
#, c-format
msgid "Wallops from %s"
msgstr ""
-#: ../libpurple/protocols/irc/parse.c:121
+#: ../libpurple/protocols/irc/parse.c:122
msgid "action &lt;action to perform&gt;: Perform an action."
msgstr "action &lt;действие для выполнения&gt;: Выполнить действие."
-#: ../libpurple/protocols/irc/parse.c:122
+#: ../libpurple/protocols/irc/parse.c:123
msgid ""
"away [message]: Set an away message, or use no message to return from being "
"away."
@@ -3708,11 +3832,11 @@ msgstr ""
"away [сообщение]: Установить сообщение об отсутствии. Если сообщение не "
"задано, удалить сообщение об отсутствии."
-#: ../libpurple/protocols/irc/parse.c:123
+#: ../libpurple/protocols/irc/parse.c:124
msgid "chanserv: Send a command to chanserv"
msgstr "chanserv: Послать команду для chanserv"
-#: ../libpurple/protocols/irc/parse.c:124
+#: ../libpurple/protocols/irc/parse.c:125
msgid ""
"deop &lt;nick1&gt; [nick2] ...: Remove channel operator status from "
"someone. You must be a channel operator to do this."
@@ -3720,7 +3844,7 @@ msgstr ""
"deop &lt;псевдоним1&gt; [псевдоним2] ...: Забрать у пользователя статус "
"оператора канала. Вы должны быть оператором канала для этого."
-#: ../libpurple/protocols/irc/parse.c:125
+#: ../libpurple/protocols/irc/parse.c:126
msgid ""
"devoice &lt;nick1&gt; [nick2] ...: Remove channel voice status from "
"someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -3730,7 +3854,7 @@ msgstr ""
"голоса на канале, лишая его возможности говорить, если канал модерируемый "
"(+m). Вы должны быть оператором канала для этого."
-#: ../libpurple/protocols/irc/parse.c:126
+#: ../libpurple/protocols/irc/parse.c:127
msgid ""
"invite &lt;nick&gt; [room]: Invite someone to join you in the specified "
"channel, or the current channel."
@@ -3738,19 +3862,19 @@ msgstr ""
"invite &lt;псевдоним&gt; [комната]: Пригласить пользователя присоединиться "
"к вам на указанном или текущем канале."
-#: ../libpurple/protocols/irc/parse.c:127
+#: ../libpurple/protocols/irc/parse.c:128
msgid ""
"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]: Enter one or more "
"channels, optionally providing a channel key for each if needed."
msgstr ""
-#: ../libpurple/protocols/irc/parse.c:128
+#: ../libpurple/protocols/irc/parse.c:129
msgid ""
"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]: Enter one or more "
"channels, optionally providing a channel key for each if needed."
msgstr ""
-#: ../libpurple/protocols/irc/parse.c:129
+#: ../libpurple/protocols/irc/parse.c:130
msgid ""
"kick &lt;nick&gt; [message]: Remove someone from a channel. You must be a "
"channel operator to do this."
@@ -3758,7 +3882,7 @@ msgstr ""
"kick &lt;псевдоним&gt; [сообщение]: Удалить пользователя с канала. Вы "
"должны быть оператором канала для этого."
-#: ../libpurple/protocols/irc/parse.c:130
+#: ../libpurple/protocols/irc/parse.c:131
msgid ""
"list: Display a list of chat rooms on the network. <i>Warning, some servers "
"may disconnect you upon doing this.</i>"
@@ -3766,15 +3890,15 @@ msgstr ""
"list: Вывести список каналов в сети. <i>Имейте в виду, что некоторые "
"серверы за это могут разорвать соединение с вами.</i>"
-#: ../libpurple/protocols/irc/parse.c:131
+#: ../libpurple/protocols/irc/parse.c:132
msgid "me &lt;action to perform&gt;: Perform an action."
msgstr "me &lt;действие для выполнения&gt;: Выполнить действие."
-#: ../libpurple/protocols/irc/parse.c:132
+#: ../libpurple/protocols/irc/parse.c:133
msgid "memoserv: Send a command to memoserv"
msgstr "memoserv: Послать команду для memoserv"
-#: ../libpurple/protocols/irc/parse.c:133
+#: ../libpurple/protocols/irc/parse.c:134
msgid ""
"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;: Set or unset a channel "
"or user mode."
@@ -3782,28 +3906,28 @@ msgstr ""
"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;псевдоним|канал&gt;: Установить или "
"снять режим пользователя или канала."
-#: ../libpurple/protocols/irc/parse.c:134
+#: ../libpurple/protocols/irc/parse.c:135
msgid ""
"msg &lt;nick&gt; &lt;message&gt;: Send a private message to a user (as "
"opposed to a channel)."
msgstr ""
-#: ../libpurple/protocols/irc/parse.c:135
+#: ../libpurple/protocols/irc/parse.c:136
msgid "names [channel]: List the users currently in a channel."
msgstr ""
"names [канал]: Вывести список пользователей, присутствующих сейчас на "
"канале."
-#: ../libpurple/protocols/irc/parse.c:136
-#: ../libpurple/protocols/jabber/jabber.c:1809
+#: ../libpurple/protocols/irc/parse.c:137
+#: ../libpurple/protocols/jabber/jabber.c:1819
msgid "nick &lt;new nickname&gt;: Change your nickname."
msgstr "nick &lt;новый псевдоним&gt;: Изменить свой псевдоним."
-#: ../libpurple/protocols/irc/parse.c:137
+#: ../libpurple/protocols/irc/parse.c:138
msgid "nickserv: Send a command to nickserv"
msgstr "nickserv: Послать команду для nickserv"
-#: ../libpurple/protocols/irc/parse.c:138
+#: ../libpurple/protocols/irc/parse.c:139
msgid ""
"op &lt;nick1&gt; [nick2] ...: Grant channel operator status to someone. You "
"must be a channel operator to do this."
@@ -3811,17 +3935,17 @@ msgstr ""
"op &lt;псевдоним1&gt; [псевдоним2] ...: Дать пользователю статус оператора "
"канала. Вы должны быть оператором канала для этого."
-#: ../libpurple/protocols/irc/parse.c:139
+#: ../libpurple/protocols/irc/parse.c:140
msgid ""
"operwall &lt;message&gt;: If you don't know what this is, you probably "
"can't use it."
msgstr ""
-#: ../libpurple/protocols/irc/parse.c:140
+#: ../libpurple/protocols/irc/parse.c:141
msgid "operserv: Send a command to operserv"
msgstr "operserv: Послать команду для operserv"
-#: ../libpurple/protocols/irc/parse.c:141
+#: ../libpurple/protocols/irc/parse.c:142
msgid ""
"part [room] [message]: Leave the current channel, or a specified channel, "
"with an optional message."
@@ -3829,7 +3953,7 @@ msgstr ""
"part [комната] [сообщение]: Покинуть указанный или текущий канал. Сообщение "
"необязательно."
-#: ../libpurple/protocols/irc/parse.c:142
+#: ../libpurple/protocols/irc/parse.c:143
msgid ""
"ping [nick]: Asks how much lag a user (or the server if no user specified) "
"has."
@@ -3837,22 +3961,22 @@ msgstr ""
"ping [псевдоним]: Запросить величину задержки связи с пользователем (или с "
"сервером, если пользователь не указан)."
-#: ../libpurple/protocols/irc/parse.c:143
+#: ../libpurple/protocols/irc/parse.c:144
msgid ""
"query &lt;nick&gt; &lt;message&gt;: Send a private message to a user (as "
"opposed to a channel)."
msgstr ""
-#: ../libpurple/protocols/irc/parse.c:144
+#: ../libpurple/protocols/irc/parse.c:145
msgid "quit [message]: Disconnect from the server, with an optional message."
msgstr ""
"quit [сообщение]: Разорвать соединение с сервером. Сообщение необязательно."
-#: ../libpurple/protocols/irc/parse.c:145
+#: ../libpurple/protocols/irc/parse.c:146
msgid "quote [...]: Send a raw command to the server."
msgstr "quote [...]: Послать команду без обработки непосредственно серверу."
-#: ../libpurple/protocols/irc/parse.c:146
+#: ../libpurple/protocols/irc/parse.c:147
msgid ""
"remove &lt;nick&gt; [message]: Remove someone from a room. You must be a "
"channel operator to do this."
@@ -3860,24 +3984,24 @@ msgstr ""
"remove &lt;псевдоним&gt; [сообщение]: Удалить пользователя из комнаты. Вы "
"должны быть оператором канала для этого."
-#: ../libpurple/protocols/irc/parse.c:147
+#: ../libpurple/protocols/irc/parse.c:148
msgid "time: Displays the current local time at the IRC server."
msgstr "time: Выводит текущее локальное время на сервере IRC."
-#: ../libpurple/protocols/irc/parse.c:148
+#: ../libpurple/protocols/irc/parse.c:149
msgid "topic [new topic]: View or change the channel topic."
msgstr "topic [новая тема]: Просмотреть или изменить тему канала."
-#: ../libpurple/protocols/irc/parse.c:149
+#: ../libpurple/protocols/irc/parse.c:150
msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;: Set or unset a user mode."
msgstr ""
"umode &lt;+|-&gt;&lt;A-Za-z&gt;: Установить или снять режим пользователя."
-#: ../libpurple/protocols/irc/parse.c:150
+#: ../libpurple/protocols/irc/parse.c:151
msgid "version [nick]: send CTCP VERSION request to a user"
msgstr ""
-#: ../libpurple/protocols/irc/parse.c:151
+#: ../libpurple/protocols/irc/parse.c:152
msgid ""
"voice &lt;nick1&gt; [nick2] ...: Grant channel voice status to someone. You "
"must be a channel operator to do this."
@@ -3885,37 +4009,37 @@ msgstr ""
"voice &lt;псевдоним1&gt; [псевдоним2] ...: Дать пользователю статус голоса "
"на канале. Вы должны быть оператором канала для этого."
-#: ../libpurple/protocols/irc/parse.c:152
+#: ../libpurple/protocols/irc/parse.c:153
msgid ""
"wallops &lt;message&gt;: If you don't know what this is, you probably can't "
"use it."
msgstr ""
-#: ../libpurple/protocols/irc/parse.c:153
+#: ../libpurple/protocols/irc/parse.c:154
msgid "whois [server] &lt;nick&gt;: Get information on a user."
msgstr "whois [сервер] &lt;псевдоним&gt;: Получить информацию о пользователе."
-#: ../libpurple/protocols/irc/parse.c:154
+#: ../libpurple/protocols/irc/parse.c:155
msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
msgstr ""
"whowas &lt;псевдоним&gt;: Получить информацию о пользователе, вышедшем из "
"сети."
-#: ../libpurple/protocols/irc/parse.c:448
+#: ../libpurple/protocols/irc/parse.c:465
#, c-format
msgid "Reply time from %s: %lu seconds"
msgstr "Время ответа от %s: %lu секунд"
-#: ../libpurple/protocols/irc/parse.c:449
+#: ../libpurple/protocols/irc/parse.c:466
msgid "PONG"
msgstr "PONG"
-#: ../libpurple/protocols/irc/parse.c:449
+#: ../libpurple/protocols/irc/parse.c:466
msgid "CTCP PING reply"
msgstr "Ответ CTCP PING"
-#: ../libpurple/protocols/irc/parse.c:560
-#: ../libpurple/protocols/irc/parse.c:564 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/irc/parse.c:577
+#: ../libpurple/protocols/irc/parse.c:581 ../libpurple/protocols/toc/toc.c:191
#: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
#: ../libpurple/protocols/toc/toc.c:786
msgid "Disconnected."
@@ -3931,59 +4055,70 @@ msgstr ""
"Сервер требует аутентификацию простым текстом через нешифрованный поток"
#: ../libpurple/protocols/jabber/auth.c:294
-#: ../libpurple/protocols/jabber/auth.c:295
-#: ../libpurple/protocols/jabber/auth.c:480
-#: ../libpurple/protocols/jabber/auth.c:481
-#: ../libpurple/protocols/jabber/auth.c:564
-#: ../libpurple/protocols/jabber/auth.c:565
-msgid "Plaintext Authentication"
-msgstr "Аутентификация простым текстом"
-
-#: ../libpurple/protocols/jabber/auth.c:296
-#: ../libpurple/protocols/jabber/auth.c:482
-#: ../libpurple/protocols/jabber/auth.c:566
+#: ../libpurple/protocols/jabber/auth.c:483
+#, c-format
msgid ""
-"This server requires plaintext authentication over an unencrypted "
-"connection. Allow this and continue authentication?"
+"%s requires plaintext authentication over an unencrypted connection. Allow "
+"this and continue authentication?"
msgstr ""
-"Этот сервер требует аутентификацию простым текстом через нешифрованное "
-"соединение. Позволить это и продолжить аутентификацию?"
+"%s требует аутентификацию простым текстом через нешифрованное соединение. "
+"Позволить это и продолжить аутентификацию?"
-#: ../libpurple/protocols/jabber/auth.c:306
-#: ../libpurple/protocols/jabber/auth.c:492
-#: ../libpurple/protocols/jabber/auth.c:576
+#: ../libpurple/protocols/jabber/auth.c:296
+#: ../libpurple/protocols/jabber/auth.c:297
+#: ../libpurple/protocols/jabber/auth.c:485
+#: ../libpurple/protocols/jabber/auth.c:486
+#: ../libpurple/protocols/jabber/auth.c:570
+#: ../libpurple/protocols/jabber/auth.c:571
+msgid "Plaintext Authentication"
+msgstr "Аутентификация простым текстом"
+
+#: ../libpurple/protocols/jabber/auth.c:309
+#: ../libpurple/protocols/jabber/auth.c:498
+#: ../libpurple/protocols/jabber/auth.c:582
msgid "Server does not use any supported authentication method"
msgstr "Сервер не использует ни одного поддерживаемого метода аутентификации"
#. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:434
-#: ../libpurple/protocols/jabber/auth.c:527
-#: ../libpurple/protocols/jabber/auth.c:708
-#: ../libpurple/protocols/jabber/auth.c:842
-#: ../libpurple/protocols/jabber/auth.c:867
-#: ../libpurple/protocols/jabber/auth.c:886
+#: ../libpurple/protocols/jabber/auth.c:437
+#: ../libpurple/protocols/jabber/auth.c:533
+#: ../libpurple/protocols/jabber/auth.c:748
+#: ../libpurple/protocols/jabber/auth.c:889
+#: ../libpurple/protocols/jabber/auth.c:914
+#: ../libpurple/protocols/jabber/auth.c:933
#: ../libpurple/protocols/jabber/jabber.c:115
msgid "Invalid response from server."
msgstr "Неверный отклик от сервера."
-#: ../libpurple/protocols/jabber/auth.c:729
+#: ../libpurple/protocols/jabber/auth.c:572
+msgid ""
+"This server requires plaintext authentication over an unencrypted "
+"connection. Allow this and continue authentication?"
+msgstr ""
+"Этот сервер требует аутентификацию простым текстом через нешифрованное "
+"соединение. Позволить это и продолжить аутентификацию?"
+
+#: ../libpurple/protocols/jabber/auth.c:769
+#: ../libpurple/protocols/jabber/auth.c:792
msgid "Invalid challenge from server"
msgstr "Неверный запрос с сервера"
-#: ../libpurple/protocols/jabber/auth.c:817
+#: ../libpurple/protocols/jabber/auth.c:864
msgid "SASL error"
msgstr "Ошибка SASL"
#: ../libpurple/protocols/jabber/buddy.c:271
#: ../libpurple/protocols/jabber/buddy.c:787
#: ../libpurple/protocols/sametime/sametime.c:4128
-#: ../libpurple/protocols/silc/ops.c:1020
+#: ../libpurple/protocols/silc/ops.c:986
+#: ../libpurple/protocols/silc10/ops.c:1020
msgid "Full Name"
msgstr "Полное имя"
#: ../libpurple/protocols/jabber/buddy.c:272
#: ../libpurple/protocols/jabber/buddy.c:800
-#: ../libpurple/protocols/silc/ops.c:1032
+#: ../libpurple/protocols/silc/ops.c:998
+#: ../libpurple/protocols/silc10/ops.c:1032
msgid "Family Name"
msgstr "Фамилия"
@@ -3993,7 +4128,7 @@ msgid "Given Name"
msgstr "Имя"
#: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:855
+#: ../libpurple/protocols/jabber/jabber.c:863
msgid "URL"
msgstr "URL"
@@ -4024,7 +4159,8 @@ msgstr "Почтовый код"
#: ../libpurple/protocols/jabber/buddy.c:281
#: ../libpurple/protocols/jabber/buddy.c:873
-#: ../libpurple/protocols/silc/silc.c:934
+#: ../libpurple/protocols/silc/silc.c:1015
+#: ../libpurple/protocols/silc10/silc.c:926
msgid "Country"
msgstr "Страна"
@@ -4037,9 +4173,11 @@ msgstr "Телефон"
#: ../libpurple/protocols/jabber/buddy.c:283
#: ../libpurple/protocols/jabber/buddy.c:902
#: ../libpurple/protocols/jabber/buddy.c:910
-#: ../libpurple/protocols/jabber/buddy.c:1566
-#: ../libpurple/protocols/silc/ops.c:1075
-#: ../libpurple/protocols/silc/util.c:551
+#: ../libpurple/protocols/jabber/buddy.c:1591
+#: ../libpurple/protocols/silc/ops.c:1041
+#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc10/ops.c:1075
+#: ../libpurple/protocols/silc10/util.c:551
#: ../libpurple/protocols/yahoo/yahoo_profile.c:1037
msgid "E-Mail"
msgstr "E-mail"
@@ -4061,22 +4199,22 @@ msgstr "Должность"
#: ../libpurple/protocols/jabber/buddy.c:288
#: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/msn/msn.c:1607
-#: ../libpurple/protocols/oscar/oscar.c:3736
+#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/oscar/oscar.c:3738
msgid "Birthday"
msgstr "Дата рождения"
#: ../libpurple/protocols/jabber/buddy.c:289
#: ../libpurple/protocols/jabber/buddy.c:941
-#: ../libpurple/protocols/jabber/chat.c:777 ../pidgin/gtkblist.c:3047
+#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3064
#: ../pidgin/gtkprefs.c:680
msgid "Description"
msgstr "Описание"
#: ../libpurple/protocols/jabber/buddy.c:578
#: ../libpurple/protocols/jabber/buddy.c:579
-msgid "Edit Jabber vCard"
-msgstr "Изменить Jabber vCard"
+msgid "Edit XMPP vCard"
+msgstr "Изменить XMPP vCard"
#: ../libpurple/protocols/jabber/buddy.c:580
msgid ""
@@ -4096,30 +4234,33 @@ msgid "Operating System"
msgstr "Операционная система"
#: ../libpurple/protocols/jabber/buddy.c:665
-#: ../libpurple/protocols/jabber/libxmpp.c:197
+#: ../libpurple/protocols/jabber/libxmpp.c:198
+#: ../libpurple/protocols/jabber/si.c:853
msgid "Resource"
msgstr "Ресурс"
#: ../libpurple/protocols/jabber/buddy.c:667
-#: ../libpurple/protocols/jabber/jabber.c:1241
#: ../libpurple/protocols/jabber/jabber.c:1251
#: ../libpurple/protocols/jabber/jabber.c:1261
#: ../libpurple/protocols/jabber/jabber.c:1271
#: ../libpurple/protocols/jabber/jabber.c:1281
+#: ../libpurple/protocols/jabber/jabber.c:1291
msgid "Priority"
msgstr "Приоритет"
#: ../libpurple/protocols/jabber/buddy.c:808
-#: ../libpurple/protocols/silc/ops.c:1028
+#: ../libpurple/protocols/silc/ops.c:994
+#: ../libpurple/protocols/silc10/ops.c:1028
msgid "Middle Name"
msgstr "Отчество"
#: ../libpurple/protocols/jabber/buddy.c:841
-#: ../libpurple/protocols/jabber/jabber.c:830
-#: ../libpurple/protocols/oscar/oscar.c:3775
-#: ../libpurple/protocols/oscar/oscar.c:3788
+#: ../libpurple/protocols/jabber/jabber.c:838
+#: ../libpurple/protocols/oscar/oscar.c:3777
+#: ../libpurple/protocols/oscar/oscar.c:3790
#: ../libpurple/protocols/qq/buddy_info.c:56
-#: ../libpurple/protocols/silc/ops.c:1064
+#: ../libpurple/protocols/silc/ops.c:1030
+#: ../libpurple/protocols/silc10/ops.c:1064
msgid "Address"
msgstr "Адрес"
@@ -4135,130 +4276,130 @@ msgstr "Фотография"
msgid "Logo"
msgstr "Логотип"
-#: ../libpurple/protocols/jabber/buddy.c:1346
+#: ../libpurple/protocols/jabber/buddy.c:1371
msgid "Un-hide From"
msgstr "Показаться для"
-#: ../libpurple/protocols/jabber/buddy.c:1350
+#: ../libpurple/protocols/jabber/buddy.c:1375
msgid "Temporarily Hide From"
msgstr "Временно скрыться от"
#. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1358
+#: ../libpurple/protocols/jabber/buddy.c:1383
msgid "Cancel Presence Notification"
msgstr "Отменить уведомление о присутствии"
-#: ../libpurple/protocols/jabber/buddy.c:1365
+#: ../libpurple/protocols/jabber/buddy.c:1390
msgid "(Re-)Request authorization"
msgstr "(Повторно) Запросить авторизацию"
#. if(NOT ME)
#. shouldn't this just happen automatically when the buddy is
#. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1374
+#: ../libpurple/protocols/jabber/buddy.c:1399
msgid "Unsubscribe"
msgstr "Отписаться"
-#: ../libpurple/protocols/jabber/buddy.c:1407
-#: ../libpurple/protocols/jabber/jabber.c:1250
+#: ../libpurple/protocols/jabber/buddy.c:1432
+#: ../libpurple/protocols/jabber/jabber.c:1260
msgid "Chatty"
msgstr "Готов пообщаться"
-#: ../libpurple/protocols/jabber/buddy.c:1411 ../libpurple/status.c:160
+#: ../libpurple/protocols/jabber/buddy.c:1436 ../libpurple/status.c:158
msgid "Extended Away"
msgstr "Расширенный \"Отошёл\""
-#: ../libpurple/protocols/jabber/buddy.c:1413
-#: ../libpurple/protocols/jabber/jabber.c:1280
+#: ../libpurple/protocols/jabber/buddy.c:1438
+#: ../libpurple/protocols/jabber/jabber.c:1290
#: ../libpurple/protocols/oscar/oscar.c:709
-#: ../libpurple/protocols/oscar/oscar.c:5723
+#: ../libpurple/protocols/oscar/oscar.c:5761
#: ../libpurple/protocols/sametime/sametime.c:3297
msgid "Do Not Disturb"
msgstr "Не беспокоить"
-#: ../libpurple/protocols/jabber/buddy.c:1558
+#: ../libpurple/protocols/jabber/buddy.c:1583
msgid "JID"
msgstr "JID"
-#: ../libpurple/protocols/jabber/buddy.c:1562
-#: ../libpurple/protocols/jabber/buddy.c:1741
-#: ../libpurple/protocols/oscar/oscar.c:3698
+#: ../libpurple/protocols/jabber/buddy.c:1587
+#: ../libpurple/protocols/jabber/buddy.c:1766
+#: ../libpurple/protocols/oscar/oscar.c:3700
msgid "Last Name"
msgstr "Фамилия"
-#: ../libpurple/protocols/jabber/buddy.c:1594
+#: ../libpurple/protocols/jabber/buddy.c:1619
msgid "The following are the results of your search"
msgstr "Следующее является результатами вашего поиска"
#. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:1669
+#: ../libpurple/protocols/jabber/buddy.c:1694
msgid ""
"Find a contact by entering the search criteria in the given fields. Note: "
"Each field supports wild card searches (%)"
msgstr ""
-#: ../libpurple/protocols/jabber/buddy.c:1689
+#: ../libpurple/protocols/jabber/buddy.c:1714
msgid "Directory Query Failed"
msgstr "Не удалось опросить каталог"
-#: ../libpurple/protocols/jabber/buddy.c:1690
+#: ../libpurple/protocols/jabber/buddy.c:1715
msgid "Could not query the directory server."
msgstr "Не удалось опросить сервер каталога."
#. Try to translate the message (see static message
#. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:1724
+#: ../libpurple/protocols/jabber/buddy.c:1749
#, c-format
msgid "Server Instructions: %s"
msgstr "Инструкции сервера: %s"
-#: ../libpurple/protocols/jabber/buddy.c:1731
-msgid "Fill in one or more fields to search for any matching Jabber users."
+#: ../libpurple/protocols/jabber/buddy.c:1756
+msgid "Fill in one or more fields to search for any matching XMPP users."
msgstr ""
-#: ../libpurple/protocols/jabber/buddy.c:1751
+#: ../libpurple/protocols/jabber/buddy.c:1776
#: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3701
-#: ../libpurple/protocols/oscar/oscar.c:3710
+#: ../libpurple/protocols/oscar/oscar.c:3703
+#: ../libpurple/protocols/oscar/oscar.c:3712
msgid "E-Mail Address"
msgstr "Адрес e-mail"
-#: ../libpurple/protocols/jabber/buddy.c:1760
-#: ../libpurple/protocols/jabber/buddy.c:1761
-msgid "Search for Jabber users"
-msgstr "Искать пользователей Jabber"
+#: ../libpurple/protocols/jabber/buddy.c:1785
+#: ../libpurple/protocols/jabber/buddy.c:1786
+msgid "Search for XMPP users"
+msgstr "Искать пользователей XMPP"
#. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:1762
+#: ../libpurple/protocols/jabber/buddy.c:1787
#: ../libpurple/protocols/qq/group.c:123
#: ../libpurple/protocols/qq/group_im.c:145
#: ../libpurple/protocols/qq/sys_msg.c:176
#: ../libpurple/protocols/qq/sys_msg.c:253
#: ../libpurple/protocols/qq/sys_msg.c:271
-#: ../libpurple/protocols/sametime/sametime.c:5605
+#: ../libpurple/protocols/sametime/sametime.c:5611
#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:473
#: ../pidgin/plugins/gevolution/assoc-buddy.c:358
msgid "Search"
msgstr "Искать"
-#: ../libpurple/protocols/jabber/buddy.c:1777
+#: ../libpurple/protocols/jabber/buddy.c:1802
msgid "Invalid Directory"
msgstr "Неверный каталог"
-#: ../libpurple/protocols/jabber/buddy.c:1794
+#: ../libpurple/protocols/jabber/buddy.c:1819
msgid "Enter a User Directory"
msgstr "Введите каталог пользователей"
-#: ../libpurple/protocols/jabber/buddy.c:1795
+#: ../libpurple/protocols/jabber/buddy.c:1820
msgid "Select a user directory to search"
msgstr "Выберите каталог пользователей для поиска"
-#: ../libpurple/protocols/jabber/buddy.c:1798
+#: ../libpurple/protocols/jabber/buddy.c:1823
msgid "Search Directory"
msgstr "Поиск в каталоге"
#: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5229
+#: ../libpurple/protocols/oscar/oscar.c:5247
#: ../libpurple/protocols/yahoo/yahoochat.c:999
msgid "_Room:"
msgstr "_Комната:"
@@ -4271,80 +4412,81 @@ msgstr "_Сервер:"
msgid "_Handle:"
msgstr "_Имя:"
-#: ../libpurple/protocols/jabber/chat.c:225
+#: ../libpurple/protocols/jabber/chat.c:223
#, c-format
msgid "%s is not a valid room name"
msgstr "%s не является допустимым именем комнаты"
-#: ../libpurple/protocols/jabber/chat.c:226
+#: ../libpurple/protocols/jabber/chat.c:224
msgid "Invalid Room Name"
msgstr "Неверное имя комнаты"
-#: ../libpurple/protocols/jabber/chat.c:231
+#: ../libpurple/protocols/jabber/chat.c:229
#, c-format
msgid "%s is not a valid server name"
msgstr "%s не является допустимым именем сервера"
-#: ../libpurple/protocols/jabber/chat.c:232
-#: ../libpurple/protocols/jabber/chat.c:233
+#: ../libpurple/protocols/jabber/chat.c:230
+#: ../libpurple/protocols/jabber/chat.c:231
msgid "Invalid Server Name"
msgstr "Неверное имя сервера"
-#: ../libpurple/protocols/jabber/chat.c:237
+#: ../libpurple/protocols/jabber/chat.c:235
#, c-format
msgid "%s is not a valid room handle"
msgstr "%s не является допустимым именем комнаты"
-#: ../libpurple/protocols/jabber/chat.c:238
-#: ../libpurple/protocols/jabber/chat.c:239
+#: ../libpurple/protocols/jabber/chat.c:236
+#: ../libpurple/protocols/jabber/chat.c:237
msgid "Invalid Room Handle"
msgstr "Неверное имя комнаты"
-#: ../libpurple/protocols/jabber/chat.c:398
+#: ../libpurple/protocols/jabber/chat.c:396
msgid "Configuration error"
msgstr "Ошибка настройки"
-#: ../libpurple/protocols/jabber/chat.c:407
-#: ../libpurple/protocols/jabber/chat.c:550
+#: ../libpurple/protocols/jabber/chat.c:405
+#: ../libpurple/protocols/jabber/chat.c:548
msgid "Unable to configure"
msgstr "Не удаётся настроить"
-#: ../libpurple/protocols/jabber/chat.c:422
+#: ../libpurple/protocols/jabber/chat.c:420
msgid "Room Configuration Error"
msgstr "Ошибка настройки комнаты"
-#: ../libpurple/protocols/jabber/chat.c:423
+#: ../libpurple/protocols/jabber/chat.c:421
msgid "This room is not capable of being configured"
msgstr "Эта комната не имеет возможности настройки"
-#: ../libpurple/protocols/jabber/chat.c:472
-#: ../libpurple/protocols/jabber/chat.c:541
+#: ../libpurple/protocols/jabber/chat.c:470
+#: ../libpurple/protocols/jabber/chat.c:539
msgid "Registration error"
msgstr "Ошибка регистрации"
-#: ../libpurple/protocols/jabber/chat.c:629
+#: ../libpurple/protocols/jabber/chat.c:627
msgid "Nick changing not supported in non-MUC chatrooms"
msgstr "Изменение псевдонима не поддерживается в чатах не-MUC"
-#: ../libpurple/protocols/jabber/chat.c:680
-#: ../libpurple/protocols/jabber/chat.c:691
-#: ../libpurple/protocols/silc/ops.c:1451
+#: ../libpurple/protocols/jabber/chat.c:678
+#: ../libpurple/protocols/jabber/chat.c:689
+#: ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc10/ops.c:1451
msgid "Error retrieving room list"
msgstr "Ошибка загрузки списка комнат"
-#: ../libpurple/protocols/jabber/chat.c:739
+#: ../libpurple/protocols/jabber/chat.c:737
msgid "Invalid Server"
msgstr "Неверный сервер"
-#: ../libpurple/protocols/jabber/chat.c:783
+#: ../libpurple/protocols/jabber/chat.c:781
msgid "Enter a Conference Server"
msgstr "Войти на сервер конференций"
-#: ../libpurple/protocols/jabber/chat.c:784
+#: ../libpurple/protocols/jabber/chat.c:782
msgid "Select a conference server to query"
msgstr "Выберите сервер конференций для опроса"
-#: ../libpurple/protocols/jabber/chat.c:787
+#: ../libpurple/protocols/jabber/chat.c:785
msgid "Find Rooms"
msgstr "Искать комнаты"
@@ -4363,446 +4505,468 @@ msgstr "Ошибка записи"
msgid "Read Error"
msgstr "Ошибка чтения"
-#: ../libpurple/protocols/jabber/jabber.c:519
+#: ../libpurple/protocols/jabber/jabber.c:467
+#: ../libpurple/protocols/oscar/flap_connection.c:386
+#: ../libpurple/protocols/yahoo/yahoo.c:2381
+#: ../libpurple/protocols/yahoo/yahoo.c:2413
+#, c-format
+msgid ""
+"Could not establish a connection with the server:\n"
+"%s"
+msgstr ""
+"Не удалось установить соединение с сервером:\n"
+"%s"
+
+#: ../libpurple/protocols/jabber/jabber.c:523
msgid "Unable to create socket"
msgstr "Не удаётся создать сокет"
-#: ../libpurple/protocols/jabber/jabber.c:565
-#: ../libpurple/protocols/jabber/jabber.c:910
-msgid "Invalid Jabber ID"
-msgstr "Неверный Jabber ID"
+#: ../libpurple/protocols/jabber/jabber.c:568
+#: ../libpurple/protocols/jabber/jabber.c:918
+msgid "Invalid XMPP ID"
+msgstr "Неверный XMPP ID"
+
+#: ../libpurple/protocols/jabber/jabber.c:573
+msgid "Invalid XMPP ID. Domain must be set."
+msgstr "Неверный XMPP ID. Должен быть задан домен."
-#: ../libpurple/protocols/jabber/jabber.c:636
+#: ../libpurple/protocols/jabber/jabber.c:644
#, c-format
msgid "Registration of %s@%s successful"
msgstr "Регистрация %s@%s завершена успешно"
-#: ../libpurple/protocols/jabber/jabber.c:638
-#: ../libpurple/protocols/jabber/jabber.c:639
+#: ../libpurple/protocols/jabber/jabber.c:646
+#: ../libpurple/protocols/jabber/jabber.c:647
msgid "Registration Successful"
msgstr "Регистрация завершена успешно"
-#: ../libpurple/protocols/jabber/jabber.c:645
-#: ../libpurple/protocols/jabber/jabber.c:1520
+#: ../libpurple/protocols/jabber/jabber.c:653
+#: ../libpurple/protocols/jabber/jabber.c:1530
msgid "Unknown Error"
msgstr "Неизвестная ошибка"
-#: ../libpurple/protocols/jabber/jabber.c:647
-#: ../libpurple/protocols/jabber/jabber.c:648
+#: ../libpurple/protocols/jabber/jabber.c:655
+#: ../libpurple/protocols/jabber/jabber.c:656
msgid "Registration Failed"
msgstr "Регистрация завершилась неудачно"
-#: ../libpurple/protocols/jabber/jabber.c:763
-#: ../libpurple/protocols/jabber/jabber.c:764
+#: ../libpurple/protocols/jabber/jabber.c:771
+#: ../libpurple/protocols/jabber/jabber.c:772
msgid "Already Registered"
msgstr "Уже зарегистрировано"
-#: ../libpurple/protocols/jabber/jabber.c:840
-#: ../libpurple/protocols/oscar/oscar.c:3777
-#: ../libpurple/protocols/oscar/oscar.c:3790
+#: ../libpurple/protocols/jabber/jabber.c:848
+#: ../libpurple/protocols/oscar/oscar.c:3779
+#: ../libpurple/protocols/oscar/oscar.c:3792
msgid "State"
msgstr "Область"
-#: ../libpurple/protocols/jabber/jabber.c:845
+#: ../libpurple/protocols/jabber/jabber.c:853
msgid "Postal code"
msgstr "Почтовый код"
-#: ../libpurple/protocols/jabber/jabber.c:850
-#: ../libpurple/protocols/silc/ops.c:1069
-#: ../libpurple/protocols/silc/silc.c:691
-#: ../libpurple/protocols/silc/util.c:553
+#: ../libpurple/protocols/jabber/jabber.c:858
+#: ../libpurple/protocols/silc/ops.c:1035
+#: ../libpurple/protocols/silc/silc.c:772
+#: ../libpurple/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc10/ops.c:1069
+#: ../libpurple/protocols/silc10/silc.c:683
+#: ../libpurple/protocols/silc10/util.c:553
msgid "Phone"
msgstr "Телефон"
-#: ../libpurple/protocols/jabber/jabber.c:860
+#: ../libpurple/protocols/jabber/jabber.c:868
msgid "Date"
msgstr "Дата"
-#: ../libpurple/protocols/jabber/jabber.c:868
+#: ../libpurple/protocols/jabber/jabber.c:876
msgid "Please fill out the information below to register your new account."
msgstr "Заполните нижеследующие поля для регистрации новой учётной записи."
-#: ../libpurple/protocols/jabber/jabber.c:871
-#: ../libpurple/protocols/jabber/jabber.c:872
-msgid "Register New Jabber Account"
-msgstr "Зарегистрировать новую учётную запись Jabber"
+#: ../libpurple/protocols/jabber/jabber.c:879
+#: ../libpurple/protocols/jabber/jabber.c:880
+msgid "Register New XMPP Account"
+msgstr "Зарегистрировать новую учётную запись XMPP"
#. Register button
-#: ../libpurple/protocols/jabber/jabber.c:873 ../pidgin/gtkaccount.c:1489
+#: ../libpurple/protocols/jabber/jabber.c:881 ../pidgin/gtkaccount.c:1526
msgid "Register"
msgstr "Зарегистрировать"
-#: ../libpurple/protocols/jabber/jabber.c:1044
+#: ../libpurple/protocols/jabber/jabber.c:1052
msgid "Initializing Stream"
msgstr "Инициализация потока"
-#: ../libpurple/protocols/jabber/jabber.c:1049
-#: ../libpurple/protocols/msn/session.c:350
+#: ../libpurple/protocols/jabber/jabber.c:1057
+#: ../libpurple/protocols/msn/session.c:351
msgid "Authenticating"
msgstr "Аутентификация"
-#: ../libpurple/protocols/jabber/jabber.c:1058
+#: ../libpurple/protocols/jabber/jabber.c:1066
msgid "Re-initializing Stream"
msgstr "Повторная инициализация потока"
-#: ../libpurple/protocols/jabber/jabber.c:1124
-#: ../libpurple/protocols/jabber/jabber.c:1498
-#: ../libpurple/protocols/jabber/jabber.c:1539
-#: ../libpurple/protocols/jabber/jabber.c:1575
+#: ../libpurple/protocols/jabber/jabber.c:1134
+#: ../libpurple/protocols/jabber/jabber.c:1508
+#: ../libpurple/protocols/jabber/jabber.c:1549
+#: ../libpurple/protocols/jabber/jabber.c:1585
#: ../libpurple/protocols/oscar/oscar.c:808
-#: ../libpurple/protocols/oscar/oscar.c:5517
+#: ../libpurple/protocols/oscar/oscar.c:5555
msgid "Not Authorized"
msgstr "Не авторизован"
-#: ../libpurple/protocols/jabber/jabber.c:1166
+#: ../libpurple/protocols/jabber/jabber.c:1176
msgid "Both"
msgstr "Обе"
-#: ../libpurple/protocols/jabber/jabber.c:1168
+#: ../libpurple/protocols/jabber/jabber.c:1178
msgid "From (To pending)"
msgstr ""
-#: ../libpurple/protocols/jabber/jabber.c:1173
+#: ../libpurple/protocols/jabber/jabber.c:1183
msgid "To"
msgstr "Для"
-#: ../libpurple/protocols/jabber/jabber.c:1175
+#: ../libpurple/protocols/jabber/jabber.c:1185
msgid "None (To pending)"
msgstr ""
-#: ../libpurple/protocols/jabber/jabber.c:1177
+#: ../libpurple/protocols/jabber/jabber.c:1187
#: ../pidgin/plugins/gevolution/eds-utils.c:73
#: ../pidgin/plugins/gevolution/eds-utils.c:86
msgid "None"
msgstr "Нет"
-#: ../libpurple/protocols/jabber/jabber.c:1180
+#: ../libpurple/protocols/jabber/jabber.c:1190
msgid "Subscription"
msgstr "Подписка"
-#: ../libpurple/protocols/jabber/jabber.c:1310
+#: ../libpurple/protocols/jabber/jabber.c:1320
msgid "Password Changed"
msgstr "Пароль изменён"
-#: ../libpurple/protocols/jabber/jabber.c:1311
+#: ../libpurple/protocols/jabber/jabber.c:1321
msgid "Your password has been changed."
msgstr "Пароль был изменён."
-#: ../libpurple/protocols/jabber/jabber.c:1315
-#: ../libpurple/protocols/jabber/jabber.c:1316
+#: ../libpurple/protocols/jabber/jabber.c:1325
+#: ../libpurple/protocols/jabber/jabber.c:1326
msgid "Error changing password"
msgstr "Ошибка изменения пароля"
-#: ../libpurple/protocols/jabber/jabber.c:1372
+#: ../libpurple/protocols/jabber/jabber.c:1382
msgid "Password (again)"
msgstr "Пароль (ещё раз)"
-#: ../libpurple/protocols/jabber/jabber.c:1377
-#: ../libpurple/protocols/jabber/jabber.c:1378
-msgid "Change Jabber Password"
-msgstr "Изменить пароль Jabber"
+#: ../libpurple/protocols/jabber/jabber.c:1387
+#: ../libpurple/protocols/jabber/jabber.c:1388
+msgid "Change XMPP Password"
+msgstr "Изменить пароль XMPP"
-#: ../libpurple/protocols/jabber/jabber.c:1378
+#: ../libpurple/protocols/jabber/jabber.c:1388
msgid "Please enter your new password"
msgstr "Введите новый пароль"
-#: ../libpurple/protocols/jabber/jabber.c:1390
-#: ../libpurple/protocols/oscar/oscar.c:6303
-#: ../libpurple/protocols/silc/silc.c:1015
+#: ../libpurple/protocols/jabber/jabber.c:1400
+#: ../libpurple/protocols/oscar/oscar.c:6341
+#: ../libpurple/protocols/silc/silc.c:1093
+#: ../libpurple/protocols/silc10/silc.c:1004
msgid "Set User Info..."
msgstr "Установить пользовательскую информацию..."
#. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1395
-#: ../libpurple/protocols/oscar/oscar.c:6314
-#: ../libpurple/protocols/silc/silc.c:1011
+#: ../libpurple/protocols/jabber/jabber.c:1405
+#: ../libpurple/protocols/oscar/oscar.c:6352
+#: ../libpurple/protocols/silc/silc.c:1089
+#: ../libpurple/protocols/silc10/silc.c:1000
msgid "Change Password..."
msgstr "Изменить пароль..."
#. }
-#: ../libpurple/protocols/jabber/jabber.c:1400
+#: ../libpurple/protocols/jabber/jabber.c:1410
msgid "Search for Users..."
msgstr "Искать пользователей..."
-#: ../libpurple/protocols/jabber/jabber.c:1478
+#: ../libpurple/protocols/jabber/jabber.c:1488
msgid "Bad Request"
msgstr "Неверный запрос"
-#: ../libpurple/protocols/jabber/jabber.c:1480
+#: ../libpurple/protocols/jabber/jabber.c:1490
msgid "Conflict"
msgstr "Конфликт"
-#: ../libpurple/protocols/jabber/jabber.c:1482
+#: ../libpurple/protocols/jabber/jabber.c:1492
msgid "Feature Not Implemented"
msgstr "Функция не реализована"
-#: ../libpurple/protocols/jabber/jabber.c:1484
+#: ../libpurple/protocols/jabber/jabber.c:1494
msgid "Forbidden"
msgstr "Запрещено"
-#: ../libpurple/protocols/jabber/jabber.c:1486
+#: ../libpurple/protocols/jabber/jabber.c:1496
msgid "Gone"
msgstr "Ушёл"
-#: ../libpurple/protocols/jabber/jabber.c:1488
-#: ../libpurple/protocols/jabber/jabber.c:1565
+#: ../libpurple/protocols/jabber/jabber.c:1498
+#: ../libpurple/protocols/jabber/jabber.c:1575
msgid "Internal Server Error"
msgstr "Внутренняя ошибка сервера"
-#: ../libpurple/protocols/jabber/jabber.c:1490
+#: ../libpurple/protocols/jabber/jabber.c:1500
msgid "Item Not Found"
msgstr "Элемент не найден"
-#: ../libpurple/protocols/jabber/jabber.c:1492
-msgid "Malformed Jabber ID"
-msgstr "Неверный Jabber ID"
+#: ../libpurple/protocols/jabber/jabber.c:1502
+msgid "Malformed XMPP ID"
+msgstr "Неверно сформированный XMPP ID"
-#: ../libpurple/protocols/jabber/jabber.c:1494
+#: ../libpurple/protocols/jabber/jabber.c:1504
msgid "Not Acceptable"
msgstr "Недопустимо"
-#: ../libpurple/protocols/jabber/jabber.c:1496
+#: ../libpurple/protocols/jabber/jabber.c:1506
msgid "Not Allowed"
msgstr "Не разрешено"
-#: ../libpurple/protocols/jabber/jabber.c:1500
+#: ../libpurple/protocols/jabber/jabber.c:1510
msgid "Payment Required"
msgstr "Требуется плата"
-#: ../libpurple/protocols/jabber/jabber.c:1502
+#: ../libpurple/protocols/jabber/jabber.c:1512
msgid "Recipient Unavailable"
msgstr "Получатель недоступен"
-#: ../libpurple/protocols/jabber/jabber.c:1506
+#: ../libpurple/protocols/jabber/jabber.c:1516
msgid "Registration Required"
msgstr "Требуется регистрация"
-#: ../libpurple/protocols/jabber/jabber.c:1508
+#: ../libpurple/protocols/jabber/jabber.c:1518
msgid "Remote Server Not Found"
msgstr "Удалённый сервер не найден"
-#: ../libpurple/protocols/jabber/jabber.c:1510
+#: ../libpurple/protocols/jabber/jabber.c:1520
msgid "Remote Server Timeout"
msgstr "Истекло время ожидания удалённого сервера"
-#: ../libpurple/protocols/jabber/jabber.c:1512
+#: ../libpurple/protocols/jabber/jabber.c:1522
msgid "Server Overloaded"
msgstr "Сервер перегружен"
-#: ../libpurple/protocols/jabber/jabber.c:1514
+#: ../libpurple/protocols/jabber/jabber.c:1524
msgid "Service Unavailable"
msgstr "Служба недоступна"
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1526
msgid "Subscription Required"
msgstr "Требуется подписка"
-#: ../libpurple/protocols/jabber/jabber.c:1518
+#: ../libpurple/protocols/jabber/jabber.c:1528
msgid "Unexpected Request"
msgstr "Непредвиденный запрос"
-#: ../libpurple/protocols/jabber/jabber.c:1525
+#: ../libpurple/protocols/jabber/jabber.c:1535
msgid "Authorization Aborted"
msgstr "Авторизация прервана"
-#: ../libpurple/protocols/jabber/jabber.c:1527
+#: ../libpurple/protocols/jabber/jabber.c:1537
msgid "Incorrect encoding in authorization"
msgstr "Неправильная кодировка в авторизации"
-#: ../libpurple/protocols/jabber/jabber.c:1530
+#: ../libpurple/protocols/jabber/jabber.c:1540
msgid "Invalid authzid"
msgstr "Неверный идентификатор авторизации"
-#: ../libpurple/protocols/jabber/jabber.c:1533
+#: ../libpurple/protocols/jabber/jabber.c:1543
msgid "Invalid Authorization Mechanism"
msgstr "Неверный механизм авторизации"
-#: ../libpurple/protocols/jabber/jabber.c:1536
+#: ../libpurple/protocols/jabber/jabber.c:1546
msgid "Authorization mechanism too weak"
msgstr "Механизм авторизации слишком слаб"
-#: ../libpurple/protocols/jabber/jabber.c:1541
+#: ../libpurple/protocols/jabber/jabber.c:1551
msgid "Temporary Authentication Failure"
msgstr "Временная ошибка аутентификации"
-#: ../libpurple/protocols/jabber/jabber.c:1544
+#: ../libpurple/protocols/jabber/jabber.c:1554
msgid "Authentication Failure"
msgstr "Ошибка аутентификации"
-#: ../libpurple/protocols/jabber/jabber.c:1550
+#: ../libpurple/protocols/jabber/jabber.c:1560
msgid "Bad Format"
msgstr "Неверный формат"
-#: ../libpurple/protocols/jabber/jabber.c:1552
+#: ../libpurple/protocols/jabber/jabber.c:1562
msgid "Bad Namespace Prefix"
msgstr "Неверный префикс пространства имён"
-#: ../libpurple/protocols/jabber/jabber.c:1555
+#: ../libpurple/protocols/jabber/jabber.c:1565
msgid "Resource Conflict"
msgstr "Конфликт ресурсов"
-#: ../libpurple/protocols/jabber/jabber.c:1557
-#: ../libpurple/protocols/silc/ops.c:1729
+#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/silc/silc.c:244
+#: ../libpurple/protocols/silc10/ops.c:1720
msgid "Connection Timeout"
msgstr "Истекло время ожидания соединения"
-#: ../libpurple/protocols/jabber/jabber.c:1559
+#: ../libpurple/protocols/jabber/jabber.c:1569
msgid "Host Gone"
msgstr "Узел ушёл"
-#: ../libpurple/protocols/jabber/jabber.c:1561
+#: ../libpurple/protocols/jabber/jabber.c:1571
msgid "Host Unknown"
msgstr "Узел неизвестен"
-#: ../libpurple/protocols/jabber/jabber.c:1563
+#: ../libpurple/protocols/jabber/jabber.c:1573
msgid "Improper Addressing"
msgstr "Неправильная адресация"
-#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/jabber/jabber.c:1577
msgid "Invalid ID"
msgstr "Неверный ID"
-#: ../libpurple/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/jabber/jabber.c:1579
msgid "Invalid Namespace"
msgstr "Неверное пространство имён"
-#: ../libpurple/protocols/jabber/jabber.c:1571
+#: ../libpurple/protocols/jabber/jabber.c:1581
msgid "Invalid XML"
msgstr "Неверный XML"
-#: ../libpurple/protocols/jabber/jabber.c:1573
+#: ../libpurple/protocols/jabber/jabber.c:1583
msgid "Non-matching Hosts"
msgstr "Несочетаемые узлы"
-#: ../libpurple/protocols/jabber/jabber.c:1577
+#: ../libpurple/protocols/jabber/jabber.c:1587
msgid "Policy Violation"
msgstr "Нарушение правил"
-#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/jabber/jabber.c:1589
msgid "Remote Connection Failed"
msgstr "Не удалось установить удалённое соединение"
-#: ../libpurple/protocols/jabber/jabber.c:1581
+#: ../libpurple/protocols/jabber/jabber.c:1591
msgid "Resource Constraint"
msgstr "Недостаток ресурсов"
-#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1593
msgid "Restricted XML"
msgstr "Ограниченный XML"
-#: ../libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/jabber/jabber.c:1595
msgid "See Other Host"
msgstr "Обратитесь к другому узлу"
-#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1597
msgid "System Shutdown"
msgstr "Выключение системы"
-#: ../libpurple/protocols/jabber/jabber.c:1589
+#: ../libpurple/protocols/jabber/jabber.c:1599
msgid "Undefined Condition"
msgstr "Неопределённое состояние"
-#: ../libpurple/protocols/jabber/jabber.c:1591
+#: ../libpurple/protocols/jabber/jabber.c:1601
msgid "Unsupported Encoding"
msgstr "Неподдерживаемая кодировка"
-#: ../libpurple/protocols/jabber/jabber.c:1593
+#: ../libpurple/protocols/jabber/jabber.c:1603
msgid "Unsupported Stanza Type"
msgstr "Неподдерживаемый тип строфы"
-#: ../libpurple/protocols/jabber/jabber.c:1595
+#: ../libpurple/protocols/jabber/jabber.c:1605
msgid "Unsupported Version"
msgstr "Неподдерживаемая версия"
-#: ../libpurple/protocols/jabber/jabber.c:1597
+#: ../libpurple/protocols/jabber/jabber.c:1607
msgid "XML Not Well Formed"
msgstr "XML не сформирован должным образом"
-#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1609
msgid "Stream Error"
msgstr "Ошибка потока"
-#: ../libpurple/protocols/jabber/jabber.c:1666
+#: ../libpurple/protocols/jabber/jabber.c:1676
#, c-format
msgid "Unable to ban user %s"
msgstr "Не удаётся выгнать пользователя %s"
-#: ../libpurple/protocols/jabber/jabber.c:1686
+#: ../libpurple/protocols/jabber/jabber.c:1696
#, c-format
msgid "Unknown affiliation: \"%s\""
msgstr ""
-#: ../libpurple/protocols/jabber/jabber.c:1691
+#: ../libpurple/protocols/jabber/jabber.c:1701
#, c-format
msgid "Unable to affiliate user %s as \"%s\""
msgstr ""
-#: ../libpurple/protocols/jabber/jabber.c:1710
+#: ../libpurple/protocols/jabber/jabber.c:1720
#, c-format
msgid "Unknown role: \"%s\""
msgstr ""
-#: ../libpurple/protocols/jabber/jabber.c:1717
+#: ../libpurple/protocols/jabber/jabber.c:1727
#, c-format
msgid "Unable to set role \"%s\" for user: %s"
msgstr ""
-#: ../libpurple/protocols/jabber/jabber.c:1770
+#: ../libpurple/protocols/jabber/jabber.c:1780
#, c-format
msgid "Unable to kick user %s"
msgstr "Не удаётся удалить пользователя %s"
-#: ../libpurple/protocols/jabber/jabber.c:1801
+#: ../libpurple/protocols/jabber/jabber.c:1811
msgid "config: Configure a chat room."
msgstr "config: Настроить комнату."
-#: ../libpurple/protocols/jabber/jabber.c:1805
+#: ../libpurple/protocols/jabber/jabber.c:1815
msgid "configure: Configure a chat room."
msgstr "configure: Настроить комнату."
-#: ../libpurple/protocols/jabber/jabber.c:1814
+#: ../libpurple/protocols/jabber/jabber.c:1824
msgid "part [room]: Leave the room."
msgstr "part [комната]: Покинуть комнату."
-#: ../libpurple/protocols/jabber/jabber.c:1819
+#: ../libpurple/protocols/jabber/jabber.c:1829
msgid "register: Register with a chat room."
msgstr "register: Зарегистрировать комнату."
-#: ../libpurple/protocols/jabber/jabber.c:1825
+#: ../libpurple/protocols/jabber/jabber.c:1835
msgid "topic [new topic]: View or change the topic."
msgstr "topic [новая тема]: Просмотреть или изменить тему."
-#: ../libpurple/protocols/jabber/jabber.c:1831
+#: ../libpurple/protocols/jabber/jabber.c:1841
msgid "ban &lt;user&gt; [room]: Ban a user from the room."
msgstr "ban &lt;пользователь&gt; [комната]: Выгнать пользователя из комнаты."
-#: ../libpurple/protocols/jabber/jabber.c:1837
+#: ../libpurple/protocols/jabber/jabber.c:1847
msgid ""
"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
"affiliation with the room."
msgstr ""
-#: ../libpurple/protocols/jabber/jabber.c:1843
+#: ../libpurple/protocols/jabber/jabber.c:1853
msgid ""
"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
"role in the room."
msgstr ""
-#: ../libpurple/protocols/jabber/jabber.c:1849
+#: ../libpurple/protocols/jabber/jabber.c:1859
msgid "invite &lt;user&gt; [message]: Invite a user to the room."
msgstr ""
"invite &lt;пользователь&gt; [сообщение]: Пригласить пользователя в комнату."
-#: ../libpurple/protocols/jabber/jabber.c:1855
+#: ../libpurple/protocols/jabber/jabber.c:1865
msgid "join: &lt;room&gt; [server]: Join a chat on this server."
msgstr ""
"join: &lt;комната&gt; [сервер]: Присоединиться к чату на этом сервере."
-#: ../libpurple/protocols/jabber/jabber.c:1861
+#: ../libpurple/protocols/jabber/jabber.c:1871
msgid "kick &lt;user&gt; [room]: Kick a user from the room."
msgstr "kick &lt;пользователь&gt; [комната]: Удалить пользователя из комнаты."
-#: ../libpurple/protocols/jabber/jabber.c:1866
+#: ../libpurple/protocols/jabber/jabber.c:1876
msgid ""
"msg &lt;user&gt; &lt;message&gt;: Send a private message to another user."
msgstr ""
@@ -4821,53 +4985,64 @@ msgstr ""
#. * description
#: ../libpurple/protocols/jabber/libxmpp.c:166
#: ../libpurple/protocols/jabber/libxmpp.c:168
-msgid "Jabber Protocol Plugin"
-msgstr "Модуль протокола Jabber"
+msgid "XMPP Protocol Plugin"
+msgstr "Модуль протокола XMPP"
+
+#. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
+#: ../libpurple/protocols/jabber/libxmpp.c:195 ../pidgin/gtkaccount.c:505
+msgid "Domain"
+msgstr "Домен"
-#: ../libpurple/protocols/jabber/libxmpp.c:200
+#: ../libpurple/protocols/jabber/libxmpp.c:201
msgid "Force old (port 5223) SSL"
msgstr "Принудительно использовать старый (порт 5223) SSL"
-#: ../libpurple/protocols/jabber/libxmpp.c:205
+#: ../libpurple/protocols/jabber/libxmpp.c:206
msgid "Allow plaintext auth over unencrypted streams"
msgstr "Разрешить идентификацию простым текстом через нешифрованные потоки"
-#: ../libpurple/protocols/jabber/libxmpp.c:210
-#: ../libpurple/protocols/simple/simple.c:1858
+#: ../libpurple/protocols/jabber/libxmpp.c:211
+#: ../libpurple/protocols/simple/simple.c:1856
msgid "Connect port"
msgstr "Соединяться на порт"
#. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:214
-#: ../libpurple/protocols/silc/silc.c:1866
+#: ../libpurple/protocols/jabber/libxmpp.c:215
+#: ../libpurple/protocols/silc/silc.c:1913
+#: ../libpurple/protocols/silc10/silc.c:1855 ../pidgin/gtkaccount.c:835
msgid "Connect server"
msgstr "Соединяться с сервером"
-#: ../libpurple/protocols/jabber/message.c:155
+#: ../libpurple/protocols/jabber/message.c:102
+#, c-format
+msgid "%s has left the conversation."
+msgstr "%s покинул беседу."
+
+#: ../libpurple/protocols/jabber/message.c:153
#, c-format
msgid "Message from %s"
msgstr "Сообщение от %s"
-#: ../libpurple/protocols/jabber/message.c:219
+#: ../libpurple/protocols/jabber/message.c:217
#, c-format
msgid "%s has set the topic to: %s"
msgstr "%s установил тему: %s"
-#: ../libpurple/protocols/jabber/message.c:221
+#: ../libpurple/protocols/jabber/message.c:219
#, c-format
msgid "The topic is: %s"
msgstr "Тема: %s"
-#: ../libpurple/protocols/jabber/message.c:269
+#: ../libpurple/protocols/jabber/message.c:267
#, c-format
msgid "Message delivery to %s failed: %s"
msgstr "Не удалось доставить сообщение для %s: %s"
-#: ../libpurple/protocols/jabber/message.c:272
-msgid "Jabber Message Error"
-msgstr "Ошибка сообщения Jabber"
+#: ../libpurple/protocols/jabber/message.c:270
+msgid "XMPP Message Error"
+msgstr "Ошибка сообщения XMPP"
-#: ../libpurple/protocols/jabber/message.c:352
+#: ../libpurple/protocols/jabber/message.c:359
#, c-format
msgid " (Code %s)"
msgstr " (Код %s)"
@@ -4876,16 +5051,16 @@ msgstr " (Код %s)"
msgid "XML Parse error"
msgstr "Ошибка разбора XML"
-#: ../libpurple/protocols/jabber/presence.c:278
+#: ../libpurple/protocols/jabber/presence.c:279
msgid "Unknown Error in presence"
msgstr ""
-#: ../libpurple/protocols/jabber/presence.c:352
#: ../libpurple/protocols/jabber/presence.c:353
+#: ../libpurple/protocols/jabber/presence.c:354
msgid "Create New Room"
msgstr "Создать новую комнату"
-#: ../libpurple/protocols/jabber/presence.c:354
+#: ../libpurple/protocols/jabber/presence.c:355
msgid ""
"You are creating a new room. Would you like to configure it, or accept the "
"default settings?"
@@ -4893,39 +5068,65 @@ msgstr ""
"Вы создаёте новую комнату. Хотите настроить её или принять установки по "
"умолчанию?"
-#: ../libpurple/protocols/jabber/presence.c:360
+#: ../libpurple/protocols/jabber/presence.c:361
msgid "_Configure Room"
msgstr "_Настроить комнату"
-#: ../libpurple/protocols/jabber/presence.c:361
+#: ../libpurple/protocols/jabber/presence.c:362
msgid "_Accept Defaults"
msgstr "_Принять установки по умолчанию"
-#: ../libpurple/protocols/jabber/presence.c:398
+#: ../libpurple/protocols/jabber/presence.c:399
#, c-format
msgid "Error in chat %s"
msgstr "Ошибка в чате %s"
-#: ../libpurple/protocols/jabber/presence.c:401
+#: ../libpurple/protocols/jabber/presence.c:402
#, c-format
msgid "Error joining chat %s"
msgstr "Ошибка присоединения к чату %s"
-#: ../libpurple/protocols/jabber/si.c:765
+#: ../libpurple/protocols/jabber/si.c:769
#, c-format
msgid "Unable to send file to %s, user does not support file transfers"
msgstr ""
"Не удаётся отправить файл для %s, пользователь не поддерживает приём файлов"
-#: ../libpurple/protocols/jabber/si.c:766
-#: ../libpurple/protocols/jabber/si.c:767
+#: ../libpurple/protocols/jabber/si.c:770
+#: ../libpurple/protocols/jabber/si.c:771
+#: ../libpurple/protocols/jabber/si.c:839
msgid "File Send Failed"
msgstr "Не удалось отправить файл"
+#: ../libpurple/protocols/jabber/si.c:832
+#, c-format
+msgid "Unable to send file to %s, invalid JID"
+msgstr "Не удаётся отправить файл для %s, неверный JID"
+
+#: ../libpurple/protocols/jabber/si.c:834
+#, c-format
+msgid "Unable to send file to %s, user is not online"
+msgstr "Не удаётся отправить файл для %s, пользователь не в сети"
+
+#: ../libpurple/protocols/jabber/si.c:836
+#, c-format
+msgid "Unable to send file to %s, not subscribed to user presence"
+msgstr ""
+"Не удаётся отправить файл для %s, нет подписки на присутствие пользователя"
+
+#: ../libpurple/protocols/jabber/si.c:851
+#, c-format
+msgid "Please select which resource of %s you would like to send a file to"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/si.c:867
+msgid "Select a Resource"
+msgstr "Выбрать ресурс"
+
#: ../libpurple/protocols/msn/dialog.c:110
#, c-format
msgid "Buddy list synchronization issue in %s (%s)"
-msgstr ""
+msgstr "Проблема с синхронизацией списка собеседников в %s (%s)"
#: ../libpurple/protocols/msn/dialog.c:116
#, c-format
@@ -5139,8 +5340,9 @@ msgstr "Сервер слишком занят"
#: ../libpurple/protocols/msn/error.c:222
#: ../libpurple/protocols/oscar/oscar.c:1363
-#: ../libpurple/protocols/silc/ops.c:1718 ../libpurple/protocols/toc/toc.c:728
-#: ../libpurple/proxy.c:1351
+#: ../libpurple/protocols/silc/silc.c:233
+#: ../libpurple/protocols/silc10/ops.c:1709
+#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1363
msgid "Authentication failed"
msgstr "Аутентификация завершилась неудачно"
@@ -5174,367 +5376,371 @@ msgstr "Неизвестный код ошибки %d"
msgid "MSN Error: %s\n"
msgstr "Ошибка MSN: %s\n"
-#: ../libpurple/protocols/msn/msn.c:112
+#: ../libpurple/protocols/msn/msn.c:121
msgid "You have just sent a Nudge!"
msgstr ""
-#: ../libpurple/protocols/msn/msn.c:137
+#: ../libpurple/protocols/msn/msn.c:146
msgid "Your new MSN friendly name is too long."
msgstr "Ваше новое дружеское имя MSN слишком велико."
-#: ../libpurple/protocols/msn/msn.c:245
+#: ../libpurple/protocols/msn/msn.c:254
msgid "Set your friendly name."
msgstr "Введите ваше дружеское имя."
-#: ../libpurple/protocols/msn/msn.c:246
+#: ../libpurple/protocols/msn/msn.c:255
msgid "This is the name that other MSN buddies will see you as."
msgstr "Это имя, под которым вас будут видеть другие пользователи MSN."
-#: ../libpurple/protocols/msn/msn.c:264
+#: ../libpurple/protocols/msn/msn.c:273
msgid "Set your home phone number."
msgstr "Введите номер вашего домашнего телефона."
-#: ../libpurple/protocols/msn/msn.c:281
+#: ../libpurple/protocols/msn/msn.c:290
msgid "Set your work phone number."
msgstr "Введите номер вашего рабочего телефона."
-#: ../libpurple/protocols/msn/msn.c:298
+#: ../libpurple/protocols/msn/msn.c:307
msgid "Set your mobile phone number."
msgstr "Введите номер вашего мобильного телефона."
-#: ../libpurple/protocols/msn/msn.c:313
+#: ../libpurple/protocols/msn/msn.c:322
msgid "Allow MSN Mobile pages?"
msgstr ""
-#: ../libpurple/protocols/msn/msn.c:314
+#: ../libpurple/protocols/msn/msn.c:323
msgid ""
"Do you want to allow or disallow people on your buddy list to send you MSN "
"Mobile pages to your cell phone or other mobile device?"
msgstr ""
-#: ../libpurple/protocols/msn/msn.c:320
+#: ../libpurple/protocols/msn/msn.c:329
msgid "Allow"
msgstr "Разрешить"
-#: ../libpurple/protocols/msn/msn.c:321
+#: ../libpurple/protocols/msn/msn.c:330
msgid "Disallow"
msgstr "Запретить"
-#: ../libpurple/protocols/msn/msn.c:337
+#: ../libpurple/protocols/msn/msn.c:346
msgid "This Hotmail account may not be active."
msgstr ""
-#: ../libpurple/protocols/msn/msn.c:363
+#: ../libpurple/protocols/msn/msn.c:372
msgid "Send a mobile message."
msgstr "Отправить мобильное сообщение."
-#: ../libpurple/protocols/msn/msn.c:365
+#: ../libpurple/protocols/msn/msn.c:374
msgid "Page"
msgstr "Страница"
-#: ../libpurple/protocols/msn/msn.c:538
+#: ../libpurple/protocols/msn/msn.c:521
msgid "Has you"
msgstr ""
-#: ../libpurple/protocols/msn/msn.c:568 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2882
-#: ../libpurple/protocols/yahoo/yahoo.c:3491
+#: ../libpurple/protocols/msn/msn.c:551 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:2895
+#: ../libpurple/protocols/yahoo/yahoo.c:3504
msgid "Be Right Back"
msgstr "Скоро вернусь"
-#: ../libpurple/protocols/msn/msn.c:572 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/msn/msn.c:555 ../libpurple/protocols/msn/state.c:31
#: ../libpurple/protocols/novell/novell.c:2822
#: ../libpurple/protocols/novell/novell.c:2952
#: ../libpurple/protocols/silc/buddy.c:1480
-#: ../libpurple/protocols/silc/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2884
-#: ../libpurple/protocols/yahoo/yahoo.c:3494
+#: ../libpurple/protocols/silc/silc.c:56
+#: ../libpurple/protocols/silc10/buddy.c:1480
+#: ../libpurple/protocols/silc10/silc.c:47
+#: ../libpurple/protocols/yahoo/yahoo.c:2897
+#: ../libpurple/protocols/yahoo/yahoo.c:3507
msgid "Busy"
msgstr "Занят"
-#: ../libpurple/protocols/msn/msn.c:576
-#: ../libpurple/protocols/yahoo/yahoo.c:2892
-#: ../libpurple/protocols/yahoo/yahoo.c:3506
+#: ../libpurple/protocols/msn/msn.c:559
+#: ../libpurple/protocols/yahoo/yahoo.c:2905
+#: ../libpurple/protocols/yahoo/yahoo.c:3519
msgid "On the Phone"
msgstr "Разговариваю по телефону"
-#: ../libpurple/protocols/msn/msn.c:580
-#: ../libpurple/protocols/yahoo/yahoo.c:2896
-#: ../libpurple/protocols/yahoo/yahoo.c:3512
+#: ../libpurple/protocols/msn/msn.c:563
+#: ../libpurple/protocols/yahoo/yahoo.c:2909
+#: ../libpurple/protocols/yahoo/yahoo.c:3525
msgid "Out to Lunch"
msgstr "Пошёл перекусить"
-#: ../libpurple/protocols/msn/msn.c:608
+#: ../libpurple/protocols/msn/msn.c:591
msgid "Set Friendly Name..."
msgstr "Ввести дружеское имя..."
-#: ../libpurple/protocols/msn/msn.c:613
+#: ../libpurple/protocols/msn/msn.c:596
msgid "Set Home Phone Number..."
msgstr "Ввести номер домашнего телефона..."
-#: ../libpurple/protocols/msn/msn.c:617
+#: ../libpurple/protocols/msn/msn.c:600
msgid "Set Work Phone Number..."
msgstr "Ввести номер рабочего телефона..."
-#: ../libpurple/protocols/msn/msn.c:621
+#: ../libpurple/protocols/msn/msn.c:604
msgid "Set Mobile Phone Number..."
msgstr "Ввести номер мобильного телефона..."
-#: ../libpurple/protocols/msn/msn.c:627
+#: ../libpurple/protocols/msn/msn.c:610
msgid "Enable/Disable Mobile Devices..."
msgstr "Разрешить/запретить мобильные устройства..."
-#: ../libpurple/protocols/msn/msn.c:632
+#: ../libpurple/protocols/msn/msn.c:615
msgid "Allow/Disallow Mobile Pages..."
msgstr "Разрешить/запретить мобильные страницы..."
-#: ../libpurple/protocols/msn/msn.c:642
+#: ../libpurple/protocols/msn/msn.c:626
msgid "Open Hotmail Inbox"
msgstr ""
-#: ../libpurple/protocols/msn/msn.c:666
+#: ../libpurple/protocols/msn/msn.c:650
msgid "Send to Mobile"
msgstr ""
-#: ../libpurple/protocols/msn/msn.c:676
+#: ../libpurple/protocols/msn/msn.c:660
#: ../libpurple/protocols/novell/novell.c:3408
msgid "Initiate _Chat"
msgstr "Создать _чат"
-#: ../libpurple/protocols/msn/msn.c:714
+#: ../libpurple/protocols/msn/msn.c:698
msgid "SSL support is needed for MSN. Please install a supported SSL library."
msgstr ""
"Поддержка SSL необходима для MSN. Установите поддерживаемую библиотеку SSL."
-#: ../libpurple/protocols/msn/msn.c:739
+#: ../libpurple/protocols/msn/msn.c:723
msgid "Failed to connect to server."
msgstr "Не удалось соединиться с сервером."
-#: ../libpurple/protocols/msn/msn.c:1459 ../libpurple/protocols/msn/msn.c:1804
+#: ../libpurple/protocols/msn/msn.c:1479 ../libpurple/protocols/msn/msn.c:1827
#: ../libpurple/protocols/yahoo/yahoo_profile.c:784
msgid "Error retrieving profile"
msgstr "Ошибка загрузки профиля"
-#: ../libpurple/protocols/msn/msn.c:1530 ../pidgin/plugins/convcolors.c:309
+#: ../libpurple/protocols/msn/msn.c:1550 ../pidgin/plugins/convcolors.c:309
#: ../pidgin/plugins/pidginrc.c:448
msgid "General"
msgstr "Основные"
-#: ../libpurple/protocols/msn/msn.c:1537
-#: ../libpurple/protocols/oscar/oscar.c:3742
+#: ../libpurple/protocols/msn/msn.c:1557
+#: ../libpurple/protocols/oscar/oscar.c:3744
#: ../libpurple/protocols/qq/buddy_info.c:45
#: ../libpurple/protocols/qq/qq.c:219
#: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
msgid "Age"
msgstr "Возраст"
-#: ../libpurple/protocols/msn/msn.c:1539
+#: ../libpurple/protocols/msn/msn.c:1559
#: ../libpurple/protocols/qq/buddy_info.c:51
#: ../libpurple/protocols/yahoo/yahoo_profile.c:1072
msgid "Occupation"
msgstr "Занятость"
-#: ../libpurple/protocols/msn/msn.c:1540
+#: ../libpurple/protocols/msn/msn.c:1560
#: ../libpurple/protocols/novell/novell.c:1478
#: ../libpurple/protocols/yahoo/yahoo_profile.c:1052
#: ../libpurple/protocols/zephyr/zephyr.c:798
-#: ../libpurple/protocols/zephyr/zephyr.c:1214
+#: ../libpurple/protocols/zephyr/zephyr.c:1215
msgid "Location"
msgstr "Местоположение"
-#: ../libpurple/protocols/msn/msn.c:1545 ../libpurple/protocols/msn/msn.c:1737
-#: ../libpurple/protocols/msn/msn.c:1743 ../libpurple/protocols/msn/msn.c:1750
+#: ../libpurple/protocols/msn/msn.c:1565 ../libpurple/protocols/msn/msn.c:1757
+#: ../libpurple/protocols/msn/msn.c:1763 ../libpurple/protocols/msn/msn.c:1770
msgid "Hobbies and Interests"
msgstr "Хобби и интересы"
-#: ../libpurple/protocols/msn/msn.c:1551 ../libpurple/protocols/msn/msn.c:1671
-#: ../libpurple/protocols/msn/msn.c:1677 ../libpurple/protocols/msn/msn.c:1684
-#: ../libpurple/protocols/msn/msn.c:1692 ../libpurple/protocols/msn/msn.c:1699
+#: ../libpurple/protocols/msn/msn.c:1571 ../libpurple/protocols/msn/msn.c:1691
+#: ../libpurple/protocols/msn/msn.c:1697 ../libpurple/protocols/msn/msn.c:1704
+#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1719
msgid "A Little About Me"
msgstr "Немного о себе"
-#: ../libpurple/protocols/msn/msn.c:1568
+#: ../libpurple/protocols/msn/msn.c:1588
msgid "Social"
msgstr ""
-#: ../libpurple/protocols/msn/msn.c:1570
+#: ../libpurple/protocols/msn/msn.c:1590
#: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
msgid "Marital Status"
msgstr "Брачный статус"
-#: ../libpurple/protocols/msn/msn.c:1571
+#: ../libpurple/protocols/msn/msn.c:1591
msgid "Interests"
msgstr "Интересы"
-#: ../libpurple/protocols/msn/msn.c:1572
+#: ../libpurple/protocols/msn/msn.c:1592
msgid "Pets"
msgstr "Домашние животные"
-#: ../libpurple/protocols/msn/msn.c:1573
+#: ../libpurple/protocols/msn/msn.c:1593
msgid "Hometown"
msgstr "Родной город"
-#: ../libpurple/protocols/msn/msn.c:1574
+#: ../libpurple/protocols/msn/msn.c:1594
msgid "Places Lived"
msgstr "Места проживания"
-#: ../libpurple/protocols/msn/msn.c:1575
+#: ../libpurple/protocols/msn/msn.c:1595
msgid "Fashion"
msgstr "Мода"
-#: ../libpurple/protocols/msn/msn.c:1576
+#: ../libpurple/protocols/msn/msn.c:1596
msgid "Humor"
msgstr "Юмор"
-#: ../libpurple/protocols/msn/msn.c:1577
+#: ../libpurple/protocols/msn/msn.c:1597
msgid "Music"
msgstr "Музыка"
-#: ../libpurple/protocols/msn/msn.c:1578 ../libpurple/protocols/msn/msn.c:1759
-#: ../libpurple/protocols/msn/msn.c:1765
+#: ../libpurple/protocols/msn/msn.c:1598 ../libpurple/protocols/msn/msn.c:1779
+#: ../libpurple/protocols/msn/msn.c:1785
#: ../libpurple/protocols/yahoo/yahoo_profile.c:1114
msgid "Favorite Quote"
msgstr "Любимая цитата"
-#: ../libpurple/protocols/msn/msn.c:1595
+#: ../libpurple/protocols/msn/msn.c:1615
msgid "Contact Info"
msgstr "Контактная информация"
-#: ../libpurple/protocols/msn/msn.c:1596
+#: ../libpurple/protocols/msn/msn.c:1616
msgid "Personal"
msgstr "Персональное"
-#: ../libpurple/protocols/msn/msn.c:1599
+#: ../libpurple/protocols/msn/msn.c:1619
msgid "Significant Other"
msgstr ""
-#: ../libpurple/protocols/msn/msn.c:1600
+#: ../libpurple/protocols/msn/msn.c:1620
msgid "Home Phone"
msgstr "Домашний телефон"
-#: ../libpurple/protocols/msn/msn.c:1601
+#: ../libpurple/protocols/msn/msn.c:1621
msgid "Home Phone 2"
msgstr "Домашний телефон 2"
-#: ../libpurple/protocols/msn/msn.c:1602
-#: ../libpurple/protocols/oscar/oscar.c:3780
+#: ../libpurple/protocols/msn/msn.c:1622
+#: ../libpurple/protocols/oscar/oscar.c:3782
msgid "Home Address"
msgstr "Домашний адрес"
-#: ../libpurple/protocols/msn/msn.c:1603
+#: ../libpurple/protocols/msn/msn.c:1623
msgid "Personal Mobile"
msgstr "Персональный мобильный телефон"
-#: ../libpurple/protocols/msn/msn.c:1604
+#: ../libpurple/protocols/msn/msn.c:1624
msgid "Home Fax"
msgstr "Домашний факс"
-#: ../libpurple/protocols/msn/msn.c:1605
+#: ../libpurple/protocols/msn/msn.c:1625
msgid "Personal E-Mail"
msgstr "Персональный e-mail"
-#: ../libpurple/protocols/msn/msn.c:1606
+#: ../libpurple/protocols/msn/msn.c:1626
msgid "Personal IM"
msgstr ""
-#: ../libpurple/protocols/msn/msn.c:1608
+#: ../libpurple/protocols/msn/msn.c:1628
msgid "Anniversary"
msgstr ""
#. Business
-#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1644
msgid "Work"
msgstr "Работа"
-#: ../libpurple/protocols/msn/msn.c:1626
-#: ../libpurple/protocols/silc/ops.c:1044
+#: ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/silc/ops.c:1010
+#: ../libpurple/protocols/silc10/ops.c:1044
msgid "Job Title"
msgstr "Название работы"
-#: ../libpurple/protocols/msn/msn.c:1627
-#: ../libpurple/protocols/oscar/oscar.c:3801
+#: ../libpurple/protocols/msn/msn.c:1647
+#: ../libpurple/protocols/oscar/oscar.c:3803
msgid "Company"
msgstr "Компания"
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1648
#: ../libpurple/protocols/novell/novell.c:1480
msgid "Department"
msgstr "Отдел"
-#: ../libpurple/protocols/msn/msn.c:1629
+#: ../libpurple/protocols/msn/msn.c:1649
msgid "Profession"
msgstr "Профессия"
-#: ../libpurple/protocols/msn/msn.c:1630
+#: ../libpurple/protocols/msn/msn.c:1650
msgid "Work Phone"
msgstr "Рабочий телефон"
-#: ../libpurple/protocols/msn/msn.c:1631
+#: ../libpurple/protocols/msn/msn.c:1651
msgid "Work Phone 2"
msgstr "Рабочий телефон 2"
-#: ../libpurple/protocols/msn/msn.c:1632
-#: ../libpurple/protocols/oscar/oscar.c:3793
+#: ../libpurple/protocols/msn/msn.c:1652
+#: ../libpurple/protocols/oscar/oscar.c:3795
msgid "Work Address"
msgstr "Рабочий адрес"
-#: ../libpurple/protocols/msn/msn.c:1633
+#: ../libpurple/protocols/msn/msn.c:1653
msgid "Work Mobile"
msgstr "Рабочий мобильный телефон"
-#: ../libpurple/protocols/msn/msn.c:1634
+#: ../libpurple/protocols/msn/msn.c:1654
msgid "Work Pager"
msgstr "Рабочий пейджер"
-#: ../libpurple/protocols/msn/msn.c:1635
+#: ../libpurple/protocols/msn/msn.c:1655
msgid "Work Fax"
msgstr "Рабочий факс"
-#: ../libpurple/protocols/msn/msn.c:1636
+#: ../libpurple/protocols/msn/msn.c:1656
msgid "Work E-Mail"
msgstr "Рабочий e-mail"
-#: ../libpurple/protocols/msn/msn.c:1637
+#: ../libpurple/protocols/msn/msn.c:1657
msgid "Work IM"
msgstr ""
-#: ../libpurple/protocols/msn/msn.c:1638
+#: ../libpurple/protocols/msn/msn.c:1658
msgid "Start Date"
msgstr ""
-#: ../libpurple/protocols/msn/msn.c:1708 ../libpurple/protocols/msn/msn.c:1714
-#: ../libpurple/protocols/msn/msn.c:1721 ../libpurple/protocols/msn/msn.c:1728
+#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1734
+#: ../libpurple/protocols/msn/msn.c:1741 ../libpurple/protocols/msn/msn.c:1748
msgid "Favorite Things"
msgstr "Любимые вещи"
-#: ../libpurple/protocols/msn/msn.c:1773
+#: ../libpurple/protocols/msn/msn.c:1793
msgid "Last Updated"
msgstr "Последнее обновление"
-#: ../libpurple/protocols/msn/msn.c:1784
+#: ../libpurple/protocols/msn/msn.c:1804
#: ../libpurple/protocols/qq/buddy_info.c:60
-#: ../libpurple/protocols/silc/ops.c:1060
+#: ../libpurple/protocols/silc/ops.c:1026
+#: ../libpurple/protocols/silc10/ops.c:1060
msgid "Homepage"
msgstr "Домашняя страница"
-#: ../libpurple/protocols/msn/msn.c:1805
+#: ../libpurple/protocols/msn/msn.c:1828
msgid "The user has not created a public profile."
msgstr ""
-#: ../libpurple/protocols/msn/msn.c:1806
+#: ../libpurple/protocols/msn/msn.c:1829
msgid ""
"MSN reported not being able to find the user's profile. This either means "
"that the user does not exist, or that the user exists but has not created a "
"public profile."
msgstr ""
-#: ../libpurple/protocols/msn/msn.c:1810
+#: ../libpurple/protocols/msn/msn.c:1833
msgid ""
"Could not find any information in the user's profile. The user most likely "
"does not exist."
msgstr ""
-#: ../libpurple/protocols/msn/msn.c:1818
+#: ../libpurple/protocols/msn/msn.c:1841
#: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
msgid "Profile URL"
msgstr "URL профиля"
@@ -5549,19 +5755,19 @@ msgstr "URL профиля"
#. *< version
#. * summary
#. * description
-#: ../libpurple/protocols/msn/msn.c:2104 ../libpurple/protocols/msn/msn.c:2106
+#: ../libpurple/protocols/msn/msn.c:2127 ../libpurple/protocols/msn/msn.c:2129
msgid "MSN Protocol Plugin"
msgstr "Модуль протокола MSN"
-#: ../libpurple/protocols/msn/msn.c:2140
+#: ../libpurple/protocols/msn/msn.c:2163
msgid "Use HTTP Method"
msgstr "Использовать метод HTTP"
-#: ../libpurple/protocols/msn/msn.c:2145
+#: ../libpurple/protocols/msn/msn.c:2168
msgid "Show custom smileys"
msgstr ""
-#: ../libpurple/protocols/msn/msn.c:2153
+#: ../libpurple/protocols/msn/msn.c:2176
msgid "nudge: nudge a user to get their attention"
msgstr ""
@@ -5592,7 +5798,7 @@ msgstr "%s не является допустимой группой."
#: ../libpurple/protocols/msn/notification.c:184
#: ../libpurple/protocols/msn/notification.c:532
-#: ../libpurple/protocols/msn/session.c:329
+#: ../libpurple/protocols/msn/session.c:330
msgid "Unknown error."
msgstr "Неизвестная ошибка."
@@ -5630,15 +5836,15 @@ msgstr "%s не является допустимой паспортной уч
msgid "Service Temporarily Unavailable."
msgstr "Служба временно недоступна."
-#: ../libpurple/protocols/msn/notification.c:823
+#: ../libpurple/protocols/msn/notification.c:851
msgid "Unable to rename group"
msgstr "Не удаётся переименовать группу"
-#: ../libpurple/protocols/msn/notification.c:878
+#: ../libpurple/protocols/msn/notification.c:906
msgid "Unable to delete group"
msgstr "Не удаётся удалить группу"
-#: ../libpurple/protocols/msn/notification.c:1303
+#: ../libpurple/protocols/msn/notification.c:1325
#, c-format
msgid ""
"The MSN server will shut down for maintenance in %d minute. You will "
@@ -5684,7 +5890,7 @@ msgid "Error parsing HTTP."
msgstr "Ошибка разбора HTTP."
#: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/oscar.c:3454
+#: ../libpurple/protocols/oscar/oscar.c:3456
#: ../libpurple/protocols/yahoo/yahoo.c:202
msgid "You have signed on from another location."
msgstr "Вы подключены из другого места."
@@ -5697,35 +5903,35 @@ msgstr "Серверы MSN временно недоступны. Повтори
msgid "The MSN servers are going down temporarily."
msgstr "Серверы MSN временно выключаются."
-#: ../libpurple/protocols/msn/session.c:319
+#: ../libpurple/protocols/msn/session.c:320
#, c-format
msgid "Unable to authenticate: %s"
msgstr "Не удаётся аутентифицировать: %s"
-#: ../libpurple/protocols/msn/session.c:324
+#: ../libpurple/protocols/msn/session.c:325
msgid ""
"Your MSN buddy list is temporarily unavailable. Please wait and try again."
msgstr ""
"Ваш список собеседников MSN временно недоступен. Повторите попытку позже."
-#: ../libpurple/protocols/msn/session.c:345
-#: ../libpurple/protocols/msn/session.c:347
+#: ../libpurple/protocols/msn/session.c:346
+#: ../libpurple/protocols/msn/session.c:348
msgid "Handshaking"
msgstr "Согласование"
-#: ../libpurple/protocols/msn/session.c:348
+#: ../libpurple/protocols/msn/session.c:349
msgid "Starting authentication"
msgstr "Запуск аутентификации"
-#: ../libpurple/protocols/msn/session.c:349
+#: ../libpurple/protocols/msn/session.c:350
msgid "Getting cookie"
msgstr "Получение данных"
-#: ../libpurple/protocols/msn/session.c:351
+#: ../libpurple/protocols/msn/session.c:352
msgid "Sending cookie"
msgstr "Отправка данных"
-#: ../libpurple/protocols/msn/session.c:352
+#: ../libpurple/protocols/msn/session.c:353
msgid "Retrieving buddy list"
msgstr "Загрузка списка собеседников"
@@ -5767,17 +5973,23 @@ msgstr ""
#: ../libpurple/protocols/msn/switchboard.c:424
msgid ""
+"Message could not be sent because we wer unable to establish a session with "
+"the server. This is likely a server problem, try again in a few minutes:"
+msgstr ""
+
+#: ../libpurple/protocols/msn/switchboard.c:431
+msgid ""
"Message could not be sent because an error with the switchboard occurred:"
msgstr ""
"Сообщение не может быть отправлено, так как произошла ошибка коммутационной "
"панели:"
-#: ../libpurple/protocols/msn/switchboard.c:432
+#: ../libpurple/protocols/msn/switchboard.c:439
msgid "Message may have not been sent because an unknown error occurred:"
msgstr ""
"Сообщение могло быть не отправлено, так как произошла неизвестная ошибка:"
-#: ../libpurple/protocols/msn/switchboard.c:956
+#: ../libpurple/protocols/msn/switchboard.c:963
#, c-format
msgid "%s just sent you a Nudge!"
msgstr ""
@@ -5801,87 +6013,87 @@ msgstr "Не удаётся добавить \"%s\"."
msgid "The screen name specified is invalid."
msgstr "Указанный идентификатор пользователя недопустим."
-#: ../libpurple/protocols/novell/nmuser.c:1878
+#: ../libpurple/protocols/novell/nmuser.c:1864
msgid "Required parameters not passed in"
msgstr "Требуемые параметры не переданы"
-#: ../libpurple/protocols/novell/nmuser.c:1881
+#: ../libpurple/protocols/novell/nmuser.c:1867
msgid "Unable to write to network"
msgstr "Не удаётся писать в сеть"
-#: ../libpurple/protocols/novell/nmuser.c:1884
+#: ../libpurple/protocols/novell/nmuser.c:1870
msgid "Unable to read from network"
msgstr "Не удаётся читать из сети"
-#: ../libpurple/protocols/novell/nmuser.c:1887
+#: ../libpurple/protocols/novell/nmuser.c:1873
msgid "Error communicating with server"
msgstr "Ошибка связи с сервером"
-#: ../libpurple/protocols/novell/nmuser.c:1891
+#: ../libpurple/protocols/novell/nmuser.c:1877
msgid "Conference not found"
msgstr "Конференция не найдена"
-#: ../libpurple/protocols/novell/nmuser.c:1894
+#: ../libpurple/protocols/novell/nmuser.c:1880
msgid "Conference does not exist"
msgstr "Конференция не существует"
-#: ../libpurple/protocols/novell/nmuser.c:1898
+#: ../libpurple/protocols/novell/nmuser.c:1884
msgid "A folder with that name already exists"
msgstr "Папка с таким именем уже существует"
-#: ../libpurple/protocols/novell/nmuser.c:1901
+#: ../libpurple/protocols/novell/nmuser.c:1887
msgid "Not supported"
msgstr "Не поддерживается"
-#: ../libpurple/protocols/novell/nmuser.c:1905
+#: ../libpurple/protocols/novell/nmuser.c:1891
msgid "Password has expired"
msgstr "Срок действия пароля истёк"
-#: ../libpurple/protocols/novell/nmuser.c:1908
+#: ../libpurple/protocols/novell/nmuser.c:1894
msgid "Incorrect password"
msgstr "Неправильный пароль"
-#: ../libpurple/protocols/novell/nmuser.c:1911
+#: ../libpurple/protocols/novell/nmuser.c:1897
msgid "User not found"
msgstr "Пользователь не найден"
-#: ../libpurple/protocols/novell/nmuser.c:1914
+#: ../libpurple/protocols/novell/nmuser.c:1900
msgid "Account has been disabled"
msgstr "Учётная запись была отключена"
-#: ../libpurple/protocols/novell/nmuser.c:1917
+#: ../libpurple/protocols/novell/nmuser.c:1903
msgid "The server could not access the directory"
msgstr "Сервер не смог получить доступ к каталогу"
-#: ../libpurple/protocols/novell/nmuser.c:1920
+#: ../libpurple/protocols/novell/nmuser.c:1906
msgid "Your system administrator has disabled this operation"
msgstr "Ваш системный администратор отключил эту операцию"
-#: ../libpurple/protocols/novell/nmuser.c:1923
+#: ../libpurple/protocols/novell/nmuser.c:1909
msgid "The server is unavailable; try again later"
msgstr "Сервер недоступен; повторите попытку позже"
-#: ../libpurple/protocols/novell/nmuser.c:1926
+#: ../libpurple/protocols/novell/nmuser.c:1912
msgid "Cannot add a contact to the same folder twice"
msgstr "Нельзя добавить контакт в ту же папку дважды"
-#: ../libpurple/protocols/novell/nmuser.c:1929
+#: ../libpurple/protocols/novell/nmuser.c:1915
msgid "Cannot add yourself"
msgstr "Нельзя добавить себя самого"
-#: ../libpurple/protocols/novell/nmuser.c:1932
+#: ../libpurple/protocols/novell/nmuser.c:1918
msgid "Master archive is misconfigured"
msgstr "Главный архив не настроен"
-#: ../libpurple/protocols/novell/nmuser.c:1936
+#: ../libpurple/protocols/novell/nmuser.c:1922
msgid "Incorrect screen name or password"
msgstr "Неправильный идентификатор пользователя или пароль"
-#: ../libpurple/protocols/novell/nmuser.c:1939
+#: ../libpurple/protocols/novell/nmuser.c:1925
msgid "Could not recognize the host of the screen name you entered"
msgstr "Не удалось узнать узел введённого идентификатора пользователя"
-#: ../libpurple/protocols/novell/nmuser.c:1942
+#: ../libpurple/protocols/novell/nmuser.c:1928
msgid ""
"Your account has been disabled because too many incorrect passwords were "
"entered"
@@ -5889,31 +6101,31 @@ msgstr ""
"Ваша учётная запись была отключена, так как было введено слишком много "
"неправильных паролей"
-#: ../libpurple/protocols/novell/nmuser.c:1945
+#: ../libpurple/protocols/novell/nmuser.c:1931
msgid "You cannot add the same person twice to a conversation"
msgstr "Вы не можете добавить одну и ту же персону в беседу дважды"
-#: ../libpurple/protocols/novell/nmuser.c:1949
+#: ../libpurple/protocols/novell/nmuser.c:1935
msgid "You have reached your limit for the number of contacts allowed"
msgstr "Вы достигли предела допустимого количества контактов"
-#: ../libpurple/protocols/novell/nmuser.c:1952
+#: ../libpurple/protocols/novell/nmuser.c:1938
msgid "You have entered an incorrect screen name"
msgstr "Вы ввели неправильный идентификатор пользователя"
-#: ../libpurple/protocols/novell/nmuser.c:1955
+#: ../libpurple/protocols/novell/nmuser.c:1941
msgid "An error occurred while updating the directory"
msgstr "Произошла ошибка при обновлении каталога"
-#: ../libpurple/protocols/novell/nmuser.c:1958
+#: ../libpurple/protocols/novell/nmuser.c:1944
msgid "Incompatible protocol version"
msgstr "Несовместимая версия протокола"
-#: ../libpurple/protocols/novell/nmuser.c:1961
+#: ../libpurple/protocols/novell/nmuser.c:1947
msgid "The user has blocked you"
msgstr "Пользователь заблокировал вас"
-#: ../libpurple/protocols/novell/nmuser.c:1964
+#: ../libpurple/protocols/novell/nmuser.c:1950
msgid ""
"This evaluation version does not allow more than ten users to log in at one "
"time"
@@ -5921,11 +6133,11 @@ msgstr ""
"Эта ознакомительная версия не позволяет входить одновременно более, чем "
"десяти пользователям"
-#: ../libpurple/protocols/novell/nmuser.c:1967
+#: ../libpurple/protocols/novell/nmuser.c:1953
msgid "The user is either offline or you are blocked"
msgstr "Пользователь не в сети или заблокировал вас"
-#: ../libpurple/protocols/novell/nmuser.c:1970
+#: ../libpurple/protocols/novell/nmuser.c:1956
#, c-format
msgid "Unknown error: 0x%X"
msgstr "Неизвестная ошибка: 0x%X"
@@ -6162,19 +6374,19 @@ msgid "Server port"
msgstr "Порт сервера"
#: ../libpurple/protocols/oscar/flap_connection.c:379
-#: ../libpurple/protocols/yahoo/yahoo.c:2294
-#: ../libpurple/protocols/yahoo/yahoo.c:2453
+#: ../libpurple/protocols/yahoo/yahoo.c:2292
+#: ../libpurple/protocols/yahoo/yahoo.c:2459
#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
-#: ../libpurple/proxy.c:1085 ../libpurple/proxy.c:1196
-#: ../libpurple/proxy.c:1296 ../libpurple/proxy.c:1424
+#: ../libpurple/proxy.c:1099 ../libpurple/proxy.c:1208
+#: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
msgid "Server closed the connection."
msgstr "Сервер разорвал соединение."
#: ../libpurple/protocols/oscar/flap_connection.c:381
-#: ../libpurple/protocols/yahoo/yahoo.c:2288
-#: ../libpurple/protocols/yahoo/yahoo.c:2447 ../libpurple/proxy.c:592
-#: ../libpurple/proxy.c:1097 ../libpurple/proxy.c:1208
-#: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
+#: ../libpurple/protocols/yahoo/yahoo.c:2286
+#: ../libpurple/protocols/yahoo/yahoo.c:2453 ../libpurple/proxy.c:592
+#: ../libpurple/proxy.c:1111 ../libpurple/proxy.c:1220
+#: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1448
#, c-format
msgid ""
"Lost connection with server:\n"
@@ -6184,21 +6396,12 @@ msgstr ""
"%s"
#: ../libpurple/protocols/oscar/flap_connection.c:384
-#: ../libpurple/proxy.c:1114 ../libpurple/proxy.c:1221
-#: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1392
-#: ../libpurple/proxy.c:1449
+#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1233
+#: ../libpurple/proxy.c:1332 ../libpurple/proxy.c:1404
+#: ../libpurple/proxy.c:1461
msgid "Received invalid data on connection with server."
msgstr "При соединении с сервером получены недопустимые данные."
-#: ../libpurple/protocols/oscar/flap_connection.c:386
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
-"Не удалось установить соединение с сервером:\n"
-"%s"
-
#. *< type
#. *< ui_requirement
#. *< flags
@@ -6230,8 +6433,8 @@ msgid "ICQ Protocol Plugin"
msgstr "Модуль протокола ICQ"
#: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4098
-#: ../libpurple/protocols/zephyr/zephyr.c:2996
+#: ../libpurple/protocols/yahoo/yahoo.c:4111
+#: ../libpurple/protocols/zephyr/zephyr.c:2997
msgid "Encoding"
msgstr "Кодировка"
@@ -6279,7 +6482,7 @@ msgstr "Оценить узел"
#: ../libpurple/protocols/oscar/oscar.c:118
msgid "Rate to client"
-msgstr "Оценить клиента"
+msgstr "Оценить клиент"
#: ../libpurple/protocols/oscar/oscar.c:120
msgid "Service unavailable"
@@ -6379,8 +6582,8 @@ msgstr ""
"кодировки, либо клиент %s содержит ошибки.)"
#. Label
-#: ../libpurple/protocols/oscar/oscar.c:621 ../pidgin/gtkutils.c:2346
-#: ../pidgin/gtkutils.c:2368
+#: ../libpurple/protocols/oscar/oscar.c:621 ../pidgin/gtkutils.c:2309
+#: ../pidgin/gtkutils.c:2339
#: ../pidgin/plugins/gevolution/new_person_dialog.c:338
msgid "Buddy Icon"
msgstr "Значок собеседника"
@@ -6394,13 +6597,15 @@ msgid "AIM Direct IM"
msgstr "Прямое соединение AIM"
#: ../libpurple/protocols/oscar/oscar.c:630
-#: ../libpurple/protocols/silc/silc.c:687
-#: ../libpurple/protocols/silc/util.c:549
+#: ../libpurple/protocols/silc/silc.c:768
+#: ../libpurple/protocols/silc/util.c:553
+#: ../libpurple/protocols/silc10/silc.c:679
+#: ../libpurple/protocols/silc10/util.c:549
msgid "Chat"
msgstr "Чат"
#: ../libpurple/protocols/oscar/oscar.c:633
-#: ../libpurple/protocols/oscar/oscar.c:5925
+#: ../libpurple/protocols/oscar/oscar.c:5963
msgid "Get File"
msgstr "Получить файл"
@@ -6473,17 +6678,17 @@ msgid "Camera"
msgstr "Камера"
#: ../libpurple/protocols/oscar/oscar.c:707
-#: ../libpurple/protocols/oscar/oscar.c:5695
+#: ../libpurple/protocols/oscar/oscar.c:5733
msgid "Free For Chat"
msgstr "Готов пообщаться"
#: ../libpurple/protocols/oscar/oscar.c:711
-#: ../libpurple/protocols/oscar/oscar.c:5730
+#: ../libpurple/protocols/oscar/oscar.c:5768
msgid "Not Available"
msgstr "Недоступен"
#: ../libpurple/protocols/oscar/oscar.c:713
-#: ../libpurple/protocols/oscar/oscar.c:5716
+#: ../libpurple/protocols/oscar/oscar.c:5754
msgid "Occupied"
msgstr "Занят"
@@ -6492,8 +6697,8 @@ msgid "Web Aware"
msgstr "Статус на веб-страницах"
#: ../libpurple/protocols/oscar/oscar.c:719 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/yahoo/yahoo.c:2900 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:465 ../pidgin/gtkstatusbox.c:1053
+#: ../libpurple/protocols/yahoo/yahoo.c:2913 ../libpurple/status.c:156
+#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1053
msgid "Invisible"
msgstr "Невидимый"
@@ -6502,13 +6707,13 @@ msgid "Online"
msgstr "В сети"
#: ../libpurple/protocols/oscar/oscar.c:820
-#: ../libpurple/protocols/oscar/oscar.c:3694
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1015
+#: ../libpurple/protocols/oscar/oscar.c:3696
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1052
msgid "IP Address"
msgstr "IP-адрес"
#: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:2846
+#: ../libpurple/protocols/oscar/oscar.c:2848
msgid "Warning Level"
msgstr "Уровень предупреждения"
@@ -6556,14 +6761,14 @@ msgid ""
msgstr ""
#: ../libpurple/protocols/oscar/oscar.c:1328
-#: ../libpurple/protocols/yahoo/yahoo.c:1936
+#: ../libpurple/protocols/yahoo/yahoo.c:1934
msgid "Invalid screen name."
msgstr "Неверный идентификатор пользователя."
#: ../libpurple/protocols/oscar/oscar.c:1335
#: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1039
-#: ../libpurple/protocols/yahoo/yahoo.c:1954
+#: ../libpurple/protocols/simple/simple.c:1037
+#: ../libpurple/protocols/yahoo/yahoo.c:1952
msgid "Incorrect password."
msgstr "Неправильный пароль."
@@ -6614,10 +6819,10 @@ msgstr ""
#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
#.
#: ../libpurple/protocols/oscar/oscar.c:1439
-#: ../libpurple/protocols/oscar/oscar.c:2230
-#: ../libpurple/protocols/oscar/oscar.c:2277
-#: ../libpurple/protocols/oscar/oscar.c:5800
-#: ../libpurple/protocols/oscar/oscar.c:6081 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:2232
+#: ../libpurple/protocols/oscar/oscar.c:2279
+#: ../libpurple/protocols/oscar/oscar.c:5838
+#: ../libpurple/protocols/oscar/oscar.c:6119 ../libpurple/request.h:1387
msgid "_OK"
msgstr "_OK"
@@ -6636,49 +6841,49 @@ msgstr ""
msgid "Unable to get a valid AIM login hash."
msgstr "Не удаётся получить допустимый хэш входа AIM."
-#: ../libpurple/protocols/oscar/oscar.c:1610
+#: ../libpurple/protocols/oscar/oscar.c:1609
#, c-format
msgid "You may be disconnected shortly. Check %s for updates."
msgstr ""
"Соединение с вами вскоре может быть разорвано. Смотрите обновления на %s."
-#: ../libpurple/protocols/oscar/oscar.c:1613
+#: ../libpurple/protocols/oscar/oscar.c:1612
msgid "Unable to get a valid login hash."
msgstr "Не удаётся получить допустимый хэш входа."
-#: ../libpurple/protocols/oscar/oscar.c:1639
+#: ../libpurple/protocols/oscar/oscar.c:1641
msgid "Password sent"
msgstr "Пароль отправлен"
-#: ../libpurple/protocols/oscar/oscar.c:1695
+#: ../libpurple/protocols/oscar/oscar.c:1697
msgid "Unable to initialize connection"
msgstr "Не удаётся инициализировать соединение"
-#: ../libpurple/protocols/oscar/oscar.c:2200
+#: ../libpurple/protocols/oscar/oscar.c:2202
msgid "Please authorize me so I can add you to my buddy list."
msgstr ""
-#: ../libpurple/protocols/oscar/oscar.c:2228
+#: ../libpurple/protocols/oscar/oscar.c:2230
msgid "Authorization Request Message:"
msgstr "Сообщение запроса авторизации:"
-#: ../libpurple/protocols/oscar/oscar.c:2229
+#: ../libpurple/protocols/oscar/oscar.c:2231
msgid "Please authorize me!"
msgstr ""
-#: ../libpurple/protocols/oscar/oscar.c:2269
-#: ../libpurple/protocols/oscar/oscar.c:2276
-#: ../libpurple/protocols/oscar/oscar.c:2403
-#: ../libpurple/protocols/oscar/oscar.c:5198
-#: ../libpurple/protocols/yahoo/yahoo.c:989
+#: ../libpurple/protocols/oscar/oscar.c:2271
+#: ../libpurple/protocols/oscar/oscar.c:2278
+#: ../libpurple/protocols/oscar/oscar.c:2405
+#: ../libpurple/protocols/oscar/oscar.c:5216
+#: ../libpurple/protocols/yahoo/yahoo.c:987
msgid "No reason given."
msgstr "Причина не указана."
-#: ../libpurple/protocols/oscar/oscar.c:2275
+#: ../libpurple/protocols/oscar/oscar.c:2277
msgid "Authorization Denied Message:"
msgstr "Сообщение отказа в авторизации:"
-#: ../libpurple/protocols/oscar/oscar.c:2403
+#: ../libpurple/protocols/oscar/oscar.c:2405
#, c-format
msgid ""
"The user %u has denied your request to add them to your buddy list for the "
@@ -6689,18 +6894,18 @@ msgstr ""
"следующей причине:\n"
"%s"
-#: ../libpurple/protocols/oscar/oscar.c:2404
+#: ../libpurple/protocols/oscar/oscar.c:2406
msgid "ICQ authorization denied."
msgstr "В авторизации ICQ отказано."
#. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2411
+#: ../libpurple/protocols/oscar/oscar.c:2413
#, c-format
msgid "The user %u has granted your request to add them to your buddy list."
msgstr ""
"Пользователь %u дал своё согласие добавить его в ваш список собеседников."
-#: ../libpurple/protocols/oscar/oscar.c:2419
+#: ../libpurple/protocols/oscar/oscar.c:2421
#, c-format
msgid ""
"You have received a special message\n"
@@ -6713,7 +6918,7 @@ msgstr ""
"От: %s [%s]\n"
"%s"
-#: ../libpurple/protocols/oscar/oscar.c:2427
+#: ../libpurple/protocols/oscar/oscar.c:2429
#, c-format
msgid ""
"You have received an ICQ page\n"
@@ -6726,7 +6931,7 @@ msgstr ""
"От: %s [%s]\n"
"%s"
-#: ../libpurple/protocols/oscar/oscar.c:2435
+#: ../libpurple/protocols/oscar/oscar.c:2437
#, c-format
msgid ""
"You have received an ICQ e-mail from %s [%s]\n"
@@ -6739,24 +6944,24 @@ msgstr ""
"Сообщение:\n"
"%s"
-#: ../libpurple/protocols/oscar/oscar.c:2456
+#: ../libpurple/protocols/oscar/oscar.c:2458
#, c-format
msgid "ICQ user %u has sent you a buddy: %s (%s)"
msgstr "Пользователь ICQ %u отправил вам собеседника: %s (%s)"
-#: ../libpurple/protocols/oscar/oscar.c:2462
+#: ../libpurple/protocols/oscar/oscar.c:2464
msgid "Do you want to add this buddy to your buddy list?"
msgstr "Хотите добавить этого собеседника в список собеседников?"
-#: ../libpurple/protocols/oscar/oscar.c:2467 ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2469 ../pidgin/gtkroomlist.c:308
msgid "_Add"
msgstr "_Добавить"
-#: ../libpurple/protocols/oscar/oscar.c:2468
+#: ../libpurple/protocols/oscar/oscar.c:2470
msgid "_Decline"
msgstr "_Отклонить"
-#: ../libpurple/protocols/oscar/oscar.c:2552
+#: ../libpurple/protocols/oscar/oscar.c:2554
#, c-format
msgid "You missed %hu message from %s because it was invalid."
msgid_plural "You missed %hu messages from %s because they were invalid."
@@ -6764,7 +6969,7 @@ msgstr[0] "Вы не получили %hu сообщение от %s, так к
msgstr[1] "Вы не получили %hu сообщения от %s, так как они были некорректны."
msgstr[2] "Вы не получили %hu сообщений от %s, так как они были некорректны."
-#: ../libpurple/protocols/oscar/oscar.c:2561
+#: ../libpurple/protocols/oscar/oscar.c:2563
#, c-format
msgid "You missed %hu message from %s because it was too large."
msgid_plural "You missed %hu messages from %s because they were too large."
@@ -6775,7 +6980,7 @@ msgstr[1] ""
msgstr[2] ""
"Вы не получили %hu сообщений от %s, так как они были слишком велики."
-#: ../libpurple/protocols/oscar/oscar.c:2570
+#: ../libpurple/protocols/oscar/oscar.c:2572
#, c-format
msgid ""
"You missed %hu message from %s because the rate limit has been exceeded."
@@ -6788,7 +6993,7 @@ msgstr[1] ""
msgstr[2] ""
"Вы не получили %hu сообщений от %s, так как был превышен предел оценки."
-#: ../libpurple/protocols/oscar/oscar.c:2579
+#: ../libpurple/protocols/oscar/oscar.c:2581
#, c-format
msgid "You missed %hu message from %s because he/she was too evil."
msgid_plural "You missed %hu messages from %s because he/she was too evil."
@@ -6799,7 +7004,7 @@ msgstr[1] ""
msgstr[2] ""
"Вы не получили %hu сообщений от %s, потому что он слишком надоедлив."
-#: ../libpurple/protocols/oscar/oscar.c:2588
+#: ../libpurple/protocols/oscar/oscar.c:2590
#, c-format
msgid "You missed %hu message from %s because you are too evil."
msgid_plural "You missed %hu messages from %s because you are too evil."
@@ -6810,7 +7015,7 @@ msgstr[1] ""
msgstr[2] ""
"Вы не получили %hu сообщений от %s, потому что вы слишком надоедливы."
-#: ../libpurple/protocols/oscar/oscar.c:2597
+#: ../libpurple/protocols/oscar/oscar.c:2599
#, c-format
msgid "You missed %hu message from %s for an unknown reason."
msgid_plural "You missed %hu messages from %s for an unknown reason."
@@ -6819,61 +7024,61 @@ msgstr[1] "Вы не получили %hu сообщения от %s по неи
msgstr[2] "Вы не получили %hu сообщений от %s по неизвестной причине."
#. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2752
+#: ../libpurple/protocols/oscar/oscar.c:2754
#, c-format
msgid "Unable to send message: %s"
msgstr "Не удаётся отправить сообщение: %s"
-#: ../libpurple/protocols/oscar/oscar.c:2752
-#: ../libpurple/protocols/oscar/oscar.c:2757
-#: ../libpurple/protocols/oscar/oscar.c:2819
-#: ../libpurple/protocols/oscar/oscar.c:2823
+#: ../libpurple/protocols/oscar/oscar.c:2754
+#: ../libpurple/protocols/oscar/oscar.c:2759
+#: ../libpurple/protocols/oscar/oscar.c:2821
+#: ../libpurple/protocols/oscar/oscar.c:2825
msgid "Unknown reason."
msgstr "Причина неизвестна."
-#: ../libpurple/protocols/oscar/oscar.c:2755
+#: ../libpurple/protocols/oscar/oscar.c:2757
#: ../libpurple/protocols/sametime/sametime.c:2409
#, c-format
msgid "Unable to send message to %s:"
msgstr "Не удаётся отправить сообщение для %s:"
-#: ../libpurple/protocols/oscar/oscar.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:2821
#, c-format
msgid "User information not available: %s"
msgstr "Пользовательская информация недоступна: %s"
-#: ../libpurple/protocols/oscar/oscar.c:2822
+#: ../libpurple/protocols/oscar/oscar.c:2824
#, c-format
msgid "User information for %s unavailable:"
msgstr "Пользовательская информация для %s недоступна:"
-#: ../libpurple/protocols/oscar/oscar.c:2851
+#: ../libpurple/protocols/oscar/oscar.c:2853
msgid "Online Since"
msgstr "В сети с"
-#: ../libpurple/protocols/oscar/oscar.c:2856
+#: ../libpurple/protocols/oscar/oscar.c:2858
#: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
msgid "Member Since"
msgstr "Член с"
-#: ../libpurple/protocols/oscar/oscar.c:2861
+#: ../libpurple/protocols/oscar/oscar.c:2863
msgid "Capabilities"
msgstr "Возможности"
-#: ../libpurple/protocols/oscar/oscar.c:2891
+#: ../libpurple/protocols/oscar/oscar.c:2893
msgid "Available Message"
msgstr "Статусное сообщение"
-#: ../libpurple/protocols/oscar/oscar.c:2917
+#: ../libpurple/protocols/oscar/oscar.c:2919
msgid "Profile"
msgstr "Профиль"
-#: ../libpurple/protocols/oscar/oscar.c:2994
+#: ../libpurple/protocols/oscar/oscar.c:2996
msgid "Your AIM connection may be lost."
msgstr "Ваше соединение AIM может быть потеряно."
#. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3181
+#: ../libpurple/protocols/oscar/oscar.c:3183
msgid ""
"[Unable to display a message from this user because it contained invalid "
"characters.]"
@@ -6881,7 +7086,7 @@ msgstr ""
"[Не удаётся отобразить сообщение от этого пользователя, так как оно содержит "
"недопустимые символы.]"
-#: ../libpurple/protocols/oscar/oscar.c:3384
+#: ../libpurple/protocols/oscar/oscar.c:3386
msgid ""
"The last action you attempted could not be performed because you are over "
"the rate limit. Please wait 10 seconds and try again."
@@ -6889,56 +7094,57 @@ msgstr ""
"Последнее предпринятое вами действие не может быть выполнено, так как вы "
"превысили предел. Подождите 10 секунд и попытайтесь снова."
-#: ../libpurple/protocols/oscar/oscar.c:3456
+#: ../libpurple/protocols/oscar/oscar.c:3458
msgid "You have been signed off for an unknown reason."
msgstr "Вы были отключены по неизвестной причине."
-#: ../libpurple/protocols/oscar/oscar.c:3469
+#: ../libpurple/protocols/oscar/oscar.c:3471
#: ../libpurple/protocols/toc/toc.c:977
#, c-format
msgid "You have been disconnected from chat room %s."
msgstr "Вы были отсоединены от чата %s."
-#: ../libpurple/protocols/oscar/oscar.c:3716
-#: ../libpurple/protocols/silc/util.c:581
+#: ../libpurple/protocols/oscar/oscar.c:3718
+#: ../libpurple/protocols/silc/util.c:585
+#: ../libpurple/protocols/silc10/util.c:581
msgid "Mobile Phone"
msgstr "Мобильный телефон"
-#: ../libpurple/protocols/oscar/oscar.c:3746
+#: ../libpurple/protocols/oscar/oscar.c:3748
msgid "Personal Web Page"
msgstr "Персональная Web-страница"
-#: ../libpurple/protocols/oscar/oscar.c:3770
+#: ../libpurple/protocols/oscar/oscar.c:3772
#: ../libpurple/protocols/qq/buddy_info.c:40
msgid "Additional Information"
msgstr "Дополнительная информация"
-#: ../libpurple/protocols/oscar/oscar.c:3778
-#: ../libpurple/protocols/oscar/oscar.c:3791
+#: ../libpurple/protocols/oscar/oscar.c:3780
+#: ../libpurple/protocols/oscar/oscar.c:3793
msgid "Zip Code"
msgstr "Индекс"
-#: ../libpurple/protocols/oscar/oscar.c:3802
+#: ../libpurple/protocols/oscar/oscar.c:3804
msgid "Division"
msgstr "Отдел"
-#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/oscar/oscar.c:3805
msgid "Position"
msgstr "Должность"
-#: ../libpurple/protocols/oscar/oscar.c:3805
+#: ../libpurple/protocols/oscar/oscar.c:3807
msgid "Web Page"
msgstr "Web-страница"
-#: ../libpurple/protocols/oscar/oscar.c:3808
+#: ../libpurple/protocols/oscar/oscar.c:3810
msgid "Work Information"
msgstr "Информация о работе"
-#: ../libpurple/protocols/oscar/oscar.c:3864
+#: ../libpurple/protocols/oscar/oscar.c:3866
msgid "Pop-Up Message"
msgstr "Всплывающее сообщение"
-#: ../libpurple/protocols/oscar/oscar.c:3904
+#: ../libpurple/protocols/oscar/oscar.c:3906
#, c-format
msgid "The following screen name is associated with %s"
msgid_plural "The following screen names are associated with %s"
@@ -6946,29 +7152,29 @@ msgstr[0] "Следующий идентификатор пользовател
msgstr[1] "Следующие идентификаторы пользователей соотнесены с %s"
msgstr[2] "Следующие идентификаторы пользователей соотнесены с %s"
-#: ../libpurple/protocols/oscar/oscar.c:3909
+#: ../libpurple/protocols/oscar/oscar.c:3911
msgid "Screen name"
msgstr "Идентификатор пользователя"
-#: ../libpurple/protocols/oscar/oscar.c:3935
+#: ../libpurple/protocols/oscar/oscar.c:3937
#, c-format
msgid "No results found for e-mail address %s"
msgstr "Ничего не найдено для адреса e-mail %s"
-#: ../libpurple/protocols/oscar/oscar.c:3956
+#: ../libpurple/protocols/oscar/oscar.c:3958
#, c-format
msgid "You should receive an e-mail asking to confirm %s."
msgstr "Вы должны получить e-mail с просьбой подтвердить %s."
-#: ../libpurple/protocols/oscar/oscar.c:3958
+#: ../libpurple/protocols/oscar/oscar.c:3960
msgid "Account Confirmation Requested"
msgstr "Запрошено подтверждение учётной записи"
-#: ../libpurple/protocols/oscar/oscar.c:3989
+#: ../libpurple/protocols/oscar/oscar.c:3991
msgid "Error Changing Account Info"
msgstr "Ошибка изменения информации об учётной записи"
-#: ../libpurple/protocols/oscar/oscar.c:3992
+#: ../libpurple/protocols/oscar/oscar.c:3994
#, c-format
msgid ""
"Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -6977,14 +7183,14 @@ msgstr ""
"Ошибка 0x%04x: Не удаётся отформатировать идентификатор пользователя, так "
"как запрошенный идентификатор пользователя отличается от оригинального."
-#: ../libpurple/protocols/oscar/oscar.c:3995
+#: ../libpurple/protocols/oscar/oscar.c:3997
#, c-format
msgid "Error 0x%04x: Unable to format screen name because it is invalid."
msgstr ""
"Ошибка 0x%04x: Не удаётся отформатировать идентификатор пользователя, так "
"как он недопустим."
-#: ../libpurple/protocols/oscar/oscar.c:3998
+#: ../libpurple/protocols/oscar/oscar.c:4000
#, c-format
msgid ""
"Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -6993,7 +7199,7 @@ msgstr ""
"Ошибка 0x%04x: Не удаётся отформатировать идентификатор пользователя, так "
"как запрошенный идентификатор пользователя слишком велик."
-#: ../libpurple/protocols/oscar/oscar.c:4001
+#: ../libpurple/protocols/oscar/oscar.c:4003
#, c-format
msgid ""
"Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -7002,7 +7208,7 @@ msgstr ""
"Ошибка 0x%04x: Не удаётся изменить адрес e-mail, так как для этого "
"идентификатора пользователя уже есть ожидающий запрос."
-#: ../libpurple/protocols/oscar/oscar.c:4004
+#: ../libpurple/protocols/oscar/oscar.c:4006
#, c-format
msgid ""
"Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -7011,7 +7217,7 @@ msgstr ""
"Ошибка 0x%04x: Не удаётся изменить адрес e-mail, так как с заданным адресом "
"соотнесено слишком много идентификаторов пользователей."
-#: ../libpurple/protocols/oscar/oscar.c:4007
+#: ../libpurple/protocols/oscar/oscar.c:4009
#, c-format
msgid ""
"Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -7020,32 +7226,32 @@ msgstr ""
"Ошибка 0x%04x: Не удаётся изменить адрес e-mail, так как заданный адрес "
"неверен."
-#: ../libpurple/protocols/oscar/oscar.c:4010
+#: ../libpurple/protocols/oscar/oscar.c:4012
#, c-format
msgid "Error 0x%04x: Unknown error."
msgstr "Ошибка 0x%04x: Неизвестная ошибка."
-#: ../libpurple/protocols/oscar/oscar.c:4020
+#: ../libpurple/protocols/oscar/oscar.c:4022
#, c-format
msgid "The e-mail address for %s is %s"
msgstr "Адрес e-mail для %s: %s"
-#: ../libpurple/protocols/oscar/oscar.c:4022
+#: ../libpurple/protocols/oscar/oscar.c:4024
msgid "Account Info"
msgstr "Информация об учётной записи"
-#: ../libpurple/protocols/oscar/oscar.c:4193
+#: ../libpurple/protocols/oscar/oscar.c:4196
msgid ""
"Your IM Image was not sent. You must be Direct Connected to send IM Images."
msgstr ""
"Ваше изображение не было отправлено. Вы должны иметь прямое соединение для "
"отправки изображений."
-#: ../libpurple/protocols/oscar/oscar.c:4438
+#: ../libpurple/protocols/oscar/oscar.c:4462
msgid "Unable to set AIM profile."
msgstr "Не удаётся установить профиль AIM."
-#: ../libpurple/protocols/oscar/oscar.c:4439
+#: ../libpurple/protocols/oscar/oscar.c:4463
msgid ""
"You have probably requested to set your profile before the login procedure "
"completed. Your profile remains unset; try setting it again when you are "
@@ -7055,7 +7261,7 @@ msgstr ""
"входа. Ваш профиль остаётся неустановленным; попытайтесь установить его ещё "
"раз, когда будете полностью подключены."
-#: ../libpurple/protocols/oscar/oscar.c:4453
+#: ../libpurple/protocols/oscar/oscar.c:4477
#, c-format
msgid ""
"The maximum profile length of %d byte has been exceeded. It has been "
@@ -7070,11 +7276,11 @@ msgstr[1] ""
msgstr[2] ""
"Максимальный размер профиля в %d байт был превышен. Профиль был урезан."
-#: ../libpurple/protocols/oscar/oscar.c:4458
+#: ../libpurple/protocols/oscar/oscar.c:4482
msgid "Profile too long."
msgstr "Профиль слишком велик."
-#: ../libpurple/protocols/oscar/oscar.c:4503
+#: ../libpurple/protocols/oscar/oscar.c:4527
#, c-format
msgid ""
"The maximum away message length of %d byte has been exceeded. It has been "
@@ -7092,11 +7298,11 @@ msgstr[2] ""
"Максимальный размер сообщения об отсутствии в %d байт был превышен. "
"Сообщение об отсутствии было урезано."
-#: ../libpurple/protocols/oscar/oscar.c:4508
+#: ../libpurple/protocols/oscar/oscar.c:4532
msgid "Away message too long."
msgstr "Сообщение об отсутствии слишком велико."
-#: ../libpurple/protocols/oscar/oscar.c:4577
+#: ../libpurple/protocols/oscar/oscar.c:4601
#, c-format
msgid ""
"Could not add the buddy %s because the screen name is invalid. Screen names "
@@ -7104,17 +7310,17 @@ msgid ""
"spaces, or contain only numbers."
msgstr ""
-#: ../libpurple/protocols/oscar/oscar.c:4579
-#: ../libpurple/protocols/oscar/oscar.c:5002
-#: ../libpurple/protocols/oscar/oscar.c:5016
+#: ../libpurple/protocols/oscar/oscar.c:4603
+#: ../libpurple/protocols/oscar/oscar.c:5026
+#: ../libpurple/protocols/oscar/oscar.c:5040
msgid "Unable To Add"
msgstr "Не удаётся добавить"
-#: ../libpurple/protocols/oscar/oscar.c:4683
+#: ../libpurple/protocols/oscar/oscar.c:4707
msgid "Unable To Retrieve Buddy List"
msgstr "Не удаётся загрузить список собеседников"
-#: ../libpurple/protocols/oscar/oscar.c:4684
+#: ../libpurple/protocols/oscar/oscar.c:4708
msgid ""
"The AIM servers were temporarily unable to send your buddy list. Your buddy "
"list is not lost, and will probably become available in a few hours."
@@ -7123,16 +7329,16 @@ msgstr ""
"собеседников не потерян и, вероятно, станет доступен в течение нескольких "
"часов."
-#: ../libpurple/protocols/oscar/oscar.c:4888
-#: ../libpurple/protocols/oscar/oscar.c:4889
-#: ../libpurple/protocols/oscar/oscar.c:4894
-#: ../libpurple/protocols/oscar/oscar.c:5070
-#: ../libpurple/protocols/oscar/oscar.c:5071
-#: ../libpurple/protocols/oscar/oscar.c:5076
+#: ../libpurple/protocols/oscar/oscar.c:4912
+#: ../libpurple/protocols/oscar/oscar.c:4913
+#: ../libpurple/protocols/oscar/oscar.c:4918
+#: ../libpurple/protocols/oscar/oscar.c:5094
+#: ../libpurple/protocols/oscar/oscar.c:5095
+#: ../libpurple/protocols/oscar/oscar.c:5100
msgid "Orphans"
msgstr "Сироты"
-#: ../libpurple/protocols/oscar/oscar.c:5000
+#: ../libpurple/protocols/oscar/oscar.c:5024
#, c-format
msgid ""
"Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7141,12 +7347,12 @@ msgstr ""
"Не удалось добавить собеседника %s, так как в списке собеседников слишком "
"много собеседников. Удалите один и попытайтесь снова."
-#: ../libpurple/protocols/oscar/oscar.c:5000
-#: ../libpurple/protocols/oscar/oscar.c:5014
+#: ../libpurple/protocols/oscar/oscar.c:5024
+#: ../libpurple/protocols/oscar/oscar.c:5038
msgid "(no name)"
msgstr "(нет имени)"
-#: ../libpurple/protocols/oscar/oscar.c:5014
+#: ../libpurple/protocols/oscar/oscar.c:5038
#, c-format
msgid ""
"Could not add the buddy %s for an unknown reason. The most common reason "
@@ -7157,7 +7363,7 @@ msgstr ""
"причиной этого является то, что вы имеете максимальное количество допустимых "
"собеседников в списке собеседников."
-#: ../libpurple/protocols/oscar/oscar.c:5108
+#: ../libpurple/protocols/oscar/oscar.c:5131
#, c-format
msgid ""
"The user %s has given you permission to add you to their buddy list. Do you "
@@ -7166,22 +7372,22 @@ msgstr ""
"Пользователь %s разрешил добавить его в ваш список собеседников. Хотите "
"добавить его?"
-#: ../libpurple/protocols/oscar/oscar.c:5114
+#: ../libpurple/protocols/oscar/oscar.c:5139
msgid "Authorization Given"
msgstr "Авторизация дана"
#. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5194
+#: ../libpurple/protocols/oscar/oscar.c:5212
#, c-format
msgid "The user %s has granted your request to add them to your buddy list."
msgstr "Пользователь %s разрешил добавить его в ваш список собеседников."
-#: ../libpurple/protocols/oscar/oscar.c:5195
+#: ../libpurple/protocols/oscar/oscar.c:5213
msgid "Authorization Granted"
msgstr "Авторизация дана"
#. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5198
+#: ../libpurple/protocols/oscar/oscar.c:5216
#, c-format
msgid ""
"The user %s has denied your request to add them to your buddy list for the "
@@ -7192,53 +7398,53 @@ msgstr ""
"следующей причине:\n"
"%s"
-#: ../libpurple/protocols/oscar/oscar.c:5199
+#: ../libpurple/protocols/oscar/oscar.c:5217
msgid "Authorization Denied"
msgstr "В авторизации отказано"
-#: ../libpurple/protocols/oscar/oscar.c:5235
+#: ../libpurple/protocols/oscar/oscar.c:5253
#: ../libpurple/protocols/toc/toc.c:1371
msgid "_Exchange:"
msgstr "_Обмен:"
-#: ../libpurple/protocols/oscar/oscar.c:5275
+#: ../libpurple/protocols/oscar/oscar.c:5293
msgid "Invalid chat name specified."
msgstr "Указано неверное имя чата."
-#: ../libpurple/protocols/oscar/oscar.c:5345
+#: ../libpurple/protocols/oscar/oscar.c:5362
msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
msgstr ""
"Изображение не было отправлено. Вы не можете отправлять изображения в чатах "
"AIM."
-#: ../libpurple/protocols/oscar/oscar.c:5484
-#: ../libpurple/protocols/oscar/oscar.c:5489
+#: ../libpurple/protocols/oscar/oscar.c:5522
+#: ../libpurple/protocols/oscar/oscar.c:5527
msgid "Away Message"
msgstr "Сообщение об отсутствии"
-#: ../libpurple/protocols/oscar/oscar.c:5489
+#: ../libpurple/protocols/oscar/oscar.c:5527
msgid "<i>(retrieving)</i>"
msgstr "<i>(загрузка)</i>"
-#: ../libpurple/protocols/oscar/oscar.c:5689
+#: ../libpurple/protocols/oscar/oscar.c:5727
msgid "iTunes Music Store Link"
msgstr ""
-#: ../libpurple/protocols/oscar/oscar.c:5797
+#: ../libpurple/protocols/oscar/oscar.c:5835
#, c-format
msgid "Buddy Comment for %s"
msgstr "Комментарий собеседника для %s"
-#: ../libpurple/protocols/oscar/oscar.c:5798
+#: ../libpurple/protocols/oscar/oscar.c:5836
msgid "Buddy Comment:"
msgstr "Комментарий собеседника:"
-#: ../libpurple/protocols/oscar/oscar.c:5845
+#: ../libpurple/protocols/oscar/oscar.c:5883
#, c-format
msgid "You have selected to open a Direct IM connection with %s."
msgstr "Вы выбрали открытие прямого соединения с %s."
-#: ../libpurple/protocols/oscar/oscar.c:5849
+#: ../libpurple/protocols/oscar/oscar.c:5887
msgid ""
"Because this reveals your IP address, it may be considered a security risk. "
"Do you wish to continue?"
@@ -7246,65 +7452,65 @@ msgstr ""
"Так как это раскроет ваш IP-адрес, это можно считать угрозой безопасности. "
"Хотите продолжить?"
-#: ../libpurple/protocols/oscar/oscar.c:5855
+#: ../libpurple/protocols/oscar/oscar.c:5893
msgid "C_onnect"
msgstr "_Установить соединение"
-#: ../libpurple/protocols/oscar/oscar.c:5890
+#: ../libpurple/protocols/oscar/oscar.c:5928
msgid "Get AIM Info"
msgstr "Получить информацию AIM"
-#: ../libpurple/protocols/oscar/oscar.c:5896
+#: ../libpurple/protocols/oscar/oscar.c:5934
msgid "Edit Buddy Comment"
msgstr "Изменить комментарий собеседника"
-#: ../libpurple/protocols/oscar/oscar.c:5904
+#: ../libpurple/protocols/oscar/oscar.c:5942
msgid "Get Status Msg"
msgstr "Получить сообщение о статусе"
-#: ../libpurple/protocols/oscar/oscar.c:5917
+#: ../libpurple/protocols/oscar/oscar.c:5955
msgid "Direct IM"
msgstr "Прямое соединение"
-#: ../libpurple/protocols/oscar/oscar.c:5939
+#: ../libpurple/protocols/oscar/oscar.c:5977
msgid "Re-request Authorization"
msgstr "Повторный запрос авторизации"
-#: ../libpurple/protocols/oscar/oscar.c:5998
+#: ../libpurple/protocols/oscar/oscar.c:6036
msgid "Require authorization"
msgstr "Требовать авторизацию"
-#: ../libpurple/protocols/oscar/oscar.c:6001
+#: ../libpurple/protocols/oscar/oscar.c:6039
msgid "Web aware (enabling this will cause you to receive SPAM!)"
msgstr "Статус на веб-страницах (вызывает появление СПАМА!)"
-#: ../libpurple/protocols/oscar/oscar.c:6006
+#: ../libpurple/protocols/oscar/oscar.c:6044
msgid "ICQ Privacy Options"
msgstr "Параметры конфиденциальности ICQ"
-#: ../libpurple/protocols/oscar/oscar.c:6025
+#: ../libpurple/protocols/oscar/oscar.c:6063
msgid "The new formatting is invalid."
msgstr "Новое форматирование недопустимо."
-#: ../libpurple/protocols/oscar/oscar.c:6026
+#: ../libpurple/protocols/oscar/oscar.c:6064
msgid "Screen name formatting can change only capitalization and whitespace."
msgstr ""
"Форматирование идентификатора пользователя может влиять только на регистр "
"букв и пробелы."
-#: ../libpurple/protocols/oscar/oscar.c:6079
+#: ../libpurple/protocols/oscar/oscar.c:6117
msgid "Change Address To:"
msgstr "Изменить адрес на:"
-#: ../libpurple/protocols/oscar/oscar.c:6125
+#: ../libpurple/protocols/oscar/oscar.c:6163
msgid "<i>you are not waiting for authorization</i>"
msgstr "<i>вы не ожидаете авторизацию</i>"
-#: ../libpurple/protocols/oscar/oscar.c:6128
+#: ../libpurple/protocols/oscar/oscar.c:6166
msgid "You are awaiting authorization from the following buddies"
msgstr "Вы ожидаете авторизацию от следующих собеседников"
-#: ../libpurple/protocols/oscar/oscar.c:6129
+#: ../libpurple/protocols/oscar/oscar.c:6167
msgid ""
"You can re-request authorization from these buddies by right-clicking on "
"them and selecting \"Re-request Authorization.\""
@@ -7312,73 +7518,73 @@ msgstr ""
"Вы можете запросить авторизацию от этих собеседников повторно, щёлкнув на "
"них правой кнопкой мыши и выбрав \"Повторный запрос авторизации\"."
-#: ../libpurple/protocols/oscar/oscar.c:6146
+#: ../libpurple/protocols/oscar/oscar.c:6184
msgid "Find Buddy by E-Mail"
msgstr "Найти собеседника по e-mail"
-#: ../libpurple/protocols/oscar/oscar.c:6147
+#: ../libpurple/protocols/oscar/oscar.c:6185
msgid "Search for a buddy by e-mail address"
msgstr "Искать собеседника по адресу e-mail"
-#: ../libpurple/protocols/oscar/oscar.c:6148
+#: ../libpurple/protocols/oscar/oscar.c:6186
msgid "Type the e-mail address of the buddy you are searching for."
msgstr "Введите адрес e-mail собеседника, которого вы ищете."
-#: ../libpurple/protocols/oscar/oscar.c:6151
+#: ../libpurple/protocols/oscar/oscar.c:6189
msgid "_Search"
msgstr "_Искать"
-#: ../libpurple/protocols/oscar/oscar.c:6309
+#: ../libpurple/protocols/oscar/oscar.c:6347
msgid "Set User Info (URL)..."
msgstr "Установить пользовательскую информацию (URL)..."
-#: ../libpurple/protocols/oscar/oscar.c:6320
+#: ../libpurple/protocols/oscar/oscar.c:6358
msgid "Change Password (URL)"
msgstr "Изменить пароль (URL)"
-#: ../libpurple/protocols/oscar/oscar.c:6324
+#: ../libpurple/protocols/oscar/oscar.c:6362
msgid "Configure IM Forwarding (URL)"
msgstr "Настроить перенаправление сообщений (URL)"
#. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6334
+#: ../libpurple/protocols/oscar/oscar.c:6372
msgid "Set Privacy Options..."
msgstr "Установить параметры конфиденциальности..."
#. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6341
+#: ../libpurple/protocols/oscar/oscar.c:6379
msgid "Confirm Account"
msgstr "Подтвердить учётную запись"
-#: ../libpurple/protocols/oscar/oscar.c:6345
+#: ../libpurple/protocols/oscar/oscar.c:6383
msgid "Display Currently Registered E-Mail Address"
msgstr "Показать текущий зарегистрированный адрес e-mail"
-#: ../libpurple/protocols/oscar/oscar.c:6349
+#: ../libpurple/protocols/oscar/oscar.c:6387
msgid "Change Currently Registered E-Mail Address..."
msgstr "Изменить текущий зарегистрированный адрес e-mail..."
-#: ../libpurple/protocols/oscar/oscar.c:6356
+#: ../libpurple/protocols/oscar/oscar.c:6394
msgid "Show Buddies Awaiting Authorization"
msgstr "Показать собеседников без авторизации"
-#: ../libpurple/protocols/oscar/oscar.c:6362
+#: ../libpurple/protocols/oscar/oscar.c:6400
msgid "Search for Buddy by E-Mail Address..."
msgstr "Искать собеседника по адресу e-mail..."
-#: ../libpurple/protocols/oscar/oscar.c:6367
+#: ../libpurple/protocols/oscar/oscar.c:6405
msgid "Search for Buddy by Information"
msgstr "Искать собеседника по информации"
-#: ../libpurple/protocols/oscar/oscar.c:6435
+#: ../libpurple/protocols/oscar/oscar.c:6473
msgid "Use recent buddies group"
msgstr ""
-#: ../libpurple/protocols/oscar/oscar.c:6438
+#: ../libpurple/protocols/oscar/oscar.c:6476
msgid "Show how long you have been idle"
msgstr "Показывать, как долго вы бездействовали"
-#: ../libpurple/protocols/oscar/oscar.c:6590
+#: ../libpurple/protocols/oscar/oscar.c:6631
msgid ""
"Always use ICQ proxy server for file transfers\n"
"(slower, but does not reveal your IP address)"
@@ -7874,13 +8080,7 @@ msgid "Unable to login, check debug log"
msgstr ""
#. we didn't successfully connect. tdt->toc_fd is valid here
-#. TODO: Include error_message in the message below
#: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo.c:2382
-#: ../libpurple/protocols/yahoo/yahoo.c:2410
-#: ../libpurple/protocols/yahoo/yahoo.c:2517
-#: ../libpurple/protocols/yahoo/yahoo.c:2538
-#: ../libpurple/protocols/yahoo/yahoo.c:2622
#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:108
#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:188
#: ../libpurple/protocols/yahoo/ycht.c:549
@@ -8283,7 +8483,7 @@ msgstr "Пригласить в конференцию..."
msgid "Send TEST Announcement"
msgstr ""
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4145
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4250
msgid "Topic:"
msgstr "Тема:"
@@ -8306,6 +8506,10 @@ msgstr ""
msgid "No Sametime Community Server Specified"
msgstr ""
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:3977
+msgid "Connect"
+msgstr "Установить соединение"
+
#: ../libpurple/protocols/sametime/sametime.c:4135
#, c-format
msgid "Unknown (0x%04x)<br>"
@@ -8316,12 +8520,12 @@ msgid "Last Known Client"
msgstr "Последний известный клиент"
#: ../libpurple/protocols/sametime/sametime.c:4301
-#: ../libpurple/protocols/sametime/sametime.c:5500
+#: ../libpurple/protocols/sametime/sametime.c:5506
msgid "User Name"
msgstr "Имя пользователя"
#: ../libpurple/protocols/sametime/sametime.c:4304
-#: ../libpurple/protocols/sametime/sametime.c:5503
+#: ../libpurple/protocols/sametime/sametime.c:5509
msgid "Sametime ID"
msgstr "Sametime ID"
@@ -8391,39 +8595,39 @@ msgstr "Объединить и сохранить список на серве
msgid "Synchronize List with Server"
msgstr "Синхронизировать со списком с сервера"
-#: ../libpurple/protocols/sametime/sametime.c:5209
+#: ../libpurple/protocols/sametime/sametime.c:5215
#, c-format
msgid "Import Sametime List for Account %s"
msgstr "Импортировать список Sametime для учётной записи %s"
-#: ../libpurple/protocols/sametime/sametime.c:5249
+#: ../libpurple/protocols/sametime/sametime.c:5255
#, c-format
msgid "Export Sametime List for Account %s"
msgstr "Экспортировать список Sametime для учётной записи %s"
-#: ../libpurple/protocols/sametime/sametime.c:5303
+#: ../libpurple/protocols/sametime/sametime.c:5309
msgid "Unable to add group: group exists"
msgstr "Не удаётся добавить группу: группа существует"
-#: ../libpurple/protocols/sametime/sametime.c:5304
+#: ../libpurple/protocols/sametime/sametime.c:5310
#, c-format
msgid "A group named '%s' already exists in your buddy list."
msgstr "Группа с именем '%s' уже присутствует в списке собеседников."
-#: ../libpurple/protocols/sametime/sametime.c:5307
-#: ../libpurple/protocols/sametime/sametime.c:5437
+#: ../libpurple/protocols/sametime/sametime.c:5313
+#: ../libpurple/protocols/sametime/sametime.c:5443
msgid "Unable to add group"
msgstr "Не удаётся добавить группу"
-#: ../libpurple/protocols/sametime/sametime.c:5366
+#: ../libpurple/protocols/sametime/sametime.c:5372
msgid "Possible Matches"
msgstr "Вероятные совпадения"
-#: ../libpurple/protocols/sametime/sametime.c:5382
+#: ../libpurple/protocols/sametime/sametime.c:5388
msgid "Notes Address Book group results"
msgstr ""
-#: ../libpurple/protocols/sametime/sametime.c:5383
+#: ../libpurple/protocols/sametime/sametime.c:5389
#, c-format
msgid ""
"The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -8431,37 +8635,37 @@ msgid ""
"to your buddy list."
msgstr ""
-#: ../libpurple/protocols/sametime/sametime.c:5388
+#: ../libpurple/protocols/sametime/sametime.c:5394
msgid "Select Notes Address Book"
msgstr ""
-#: ../libpurple/protocols/sametime/sametime.c:5431
+#: ../libpurple/protocols/sametime/sametime.c:5437
msgid "Unable to add group: group not found"
msgstr "Не удаётся добавить группу: группа не найдена"
-#: ../libpurple/protocols/sametime/sametime.c:5433
+#: ../libpurple/protocols/sametime/sametime.c:5439
#, c-format
msgid ""
"The identifier '%s' did not match any Notes Address Book groups in your "
"Sametime community."
msgstr ""
-#: ../libpurple/protocols/sametime/sametime.c:5474
+#: ../libpurple/protocols/sametime/sametime.c:5480
msgid "Notes Address Book Group"
msgstr ""
-#: ../libpurple/protocols/sametime/sametime.c:5475
+#: ../libpurple/protocols/sametime/sametime.c:5481
msgid ""
"Enter the name of a Notes Address Book group in the field below to add the "
"group and its members to your buddy list."
msgstr ""
-#: ../libpurple/protocols/sametime/sametime.c:5524
+#: ../libpurple/protocols/sametime/sametime.c:5530
#, c-format
msgid "Search results for '%s'"
msgstr "Результаты поиска для '%s'"
-#: ../libpurple/protocols/sametime/sametime.c:5525
+#: ../libpurple/protocols/sametime/sametime.c:5531
#, c-format
msgid ""
"The identifier '%s' may possibly refer to any of the following users. You "
@@ -8472,117 +8676,142 @@ msgstr ""
"можете добавить этих пользователей в список собеседников или отправить им "
"сообщения с помощью кнопок действия ниже."
-#: ../libpurple/protocols/sametime/sametime.c:5532 ../pidgin/gtknotify.c:709
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:716
msgid "Search Results"
msgstr "Результаты поиска"
-#: ../libpurple/protocols/sametime/sametime.c:5557
+#: ../libpurple/protocols/sametime/sametime.c:5563
msgid "No matches"
msgstr "Нет совпадений"
-#: ../libpurple/protocols/sametime/sametime.c:5558
+#: ../libpurple/protocols/sametime/sametime.c:5564
#, c-format
msgid "The identifier '%s' did not match any users in your Sametime community."
msgstr ""
-#: ../libpurple/protocols/sametime/sametime.c:5562
+#: ../libpurple/protocols/sametime/sametime.c:5568
msgid "No Matches"
msgstr "Нет совпадений"
-#: ../libpurple/protocols/sametime/sametime.c:5599
+#: ../libpurple/protocols/sametime/sametime.c:5605
msgid "Search for a user"
msgstr "Искать пользователя"
-#: ../libpurple/protocols/sametime/sametime.c:5600
+#: ../libpurple/protocols/sametime/sametime.c:5606
msgid ""
"Enter a name or partial ID in the field below to search for matching users "
"in your Sametime community."
msgstr ""
-#: ../libpurple/protocols/sametime/sametime.c:5603
+#: ../libpurple/protocols/sametime/sametime.c:5609
msgid "User Search"
msgstr "Поиск пользователей"
-#: ../libpurple/protocols/sametime/sametime.c:5616
+#: ../libpurple/protocols/sametime/sametime.c:5622
msgid "Import Sametime List..."
msgstr ""
-#: ../libpurple/protocols/sametime/sametime.c:5620
+#: ../libpurple/protocols/sametime/sametime.c:5626
msgid "Export Sametime List..."
msgstr ""
-#: ../libpurple/protocols/sametime/sametime.c:5624
+#: ../libpurple/protocols/sametime/sametime.c:5630
msgid "Add Notes Address Book Group..."
msgstr ""
-#: ../libpurple/protocols/sametime/sametime.c:5628
+#: ../libpurple/protocols/sametime/sametime.c:5634
msgid "User Search..."
msgstr "Поиск пользователей..."
-#: ../libpurple/protocols/sametime/sametime.c:5725
+#: ../libpurple/protocols/sametime/sametime.c:5740
msgid "Force login (ignore server redirects)"
msgstr ""
#. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5735
+#: ../libpurple/protocols/sametime/sametime.c:5750
msgid "Hide client identity"
msgstr ""
#: ../libpurple/protocols/silc/buddy.c:52
-#: ../libpurple/protocols/silc/buddy.c:421
-#: ../libpurple/protocols/silc/buddy.c:546
-#: ../libpurple/protocols/silc/buddy.c:712
-#: ../libpurple/protocols/silc/ft.c:338
+#: ../libpurple/protocols/silc/buddy.c:410
+#: ../libpurple/protocols/silc/buddy.c:538
+#: ../libpurple/protocols/silc/buddy.c:700
+#: ../libpurple/protocols/silc/ft.c:423
+#: ../libpurple/protocols/silc10/buddy.c:52
+#: ../libpurple/protocols/silc10/buddy.c:421
+#: ../libpurple/protocols/silc10/buddy.c:546
+#: ../libpurple/protocols/silc10/buddy.c:712
+#: ../libpurple/protocols/silc10/ft.c:338
#, c-format
msgid "User %s is not present in the network"
msgstr "Пользователь %s не присутствует в сети"
#: ../libpurple/protocols/silc/buddy.c:53
+#: ../libpurple/protocols/silc/buddy.c:110
#: ../libpurple/protocols/silc/buddy.c:115
-#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc/buddy.c:119
#: ../libpurple/protocols/silc/buddy.c:124
#: ../libpurple/protocols/silc/buddy.c:129
#: ../libpurple/protocols/silc/buddy.c:134
-#: ../libpurple/protocols/silc/buddy.c:139
-#: ../libpurple/protocols/silc/buddy.c:257
+#: ../libpurple/protocols/silc/buddy.c:254
+#: ../libpurple/protocols/silc10/buddy.c:53
+#: ../libpurple/protocols/silc10/buddy.c:115
+#: ../libpurple/protocols/silc10/buddy.c:120
+#: ../libpurple/protocols/silc10/buddy.c:124
+#: ../libpurple/protocols/silc10/buddy.c:129
+#: ../libpurple/protocols/silc10/buddy.c:134
+#: ../libpurple/protocols/silc10/buddy.c:139
+#: ../libpurple/protocols/silc10/buddy.c:257
msgid "Key Agreement"
msgstr "Согласование ключей"
#: ../libpurple/protocols/silc/buddy.c:54
+#: ../libpurple/protocols/silc10/buddy.c:54
msgid "Cannot perform the key agreement"
msgstr "Не удаётся выполнить согласование ключей"
-#: ../libpurple/protocols/silc/buddy.c:116
+#: ../libpurple/protocols/silc/buddy.c:111
+#: ../libpurple/protocols/silc10/buddy.c:116
msgid "Error occurred during key agreement"
msgstr "Произошла ошибка во время согласования ключей"
-#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc/buddy.c:115
+#: ../libpurple/protocols/silc10/buddy.c:120
msgid "Key Agreement failed"
msgstr "Не удалось выполнить согласование ключей"
-#: ../libpurple/protocols/silc/buddy.c:125
+#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc10/buddy.c:125
msgid "Timeout during key agreement"
msgstr "Истекло время ожидания во время согласования ключей"
-#: ../libpurple/protocols/silc/buddy.c:130
+#: ../libpurple/protocols/silc/buddy.c:125
+#: ../libpurple/protocols/silc10/buddy.c:130
msgid "Key agreement was aborted"
msgstr "Согласование ключей было прервано"
-#: ../libpurple/protocols/silc/buddy.c:135
+#: ../libpurple/protocols/silc/buddy.c:130
+#: ../libpurple/protocols/silc10/buddy.c:135
msgid "Key agreement is already started"
msgstr "Согласование ключей уже начато"
-#: ../libpurple/protocols/silc/buddy.c:140
+#: ../libpurple/protocols/silc/buddy.c:135
+#: ../libpurple/protocols/silc10/buddy.c:140
msgid "Key agreement cannot be started with yourself"
msgstr "Согласование ключей не может быть начато с самим собой"
-#: ../libpurple/protocols/silc/buddy.c:258
-#: ../libpurple/protocols/silc/buddy.c:389
-#: ../libpurple/protocols/silc/buddy.c:514
+#: ../libpurple/protocols/silc/buddy.c:255
+#: ../libpurple/protocols/silc/buddy.c:383
+#: ../libpurple/protocols/silc/buddy.c:497
+#: ../libpurple/protocols/silc/buddy.c:508
+#: ../libpurple/protocols/silc10/buddy.c:258
+#: ../libpurple/protocols/silc10/buddy.c:389
+#: ../libpurple/protocols/silc10/buddy.c:514
msgid "The remote user is not present in the network any more"
msgstr "Удалённый пользователь больше не присутствует в сети"
-#: ../libpurple/protocols/silc/buddy.c:295
+#: ../libpurple/protocols/silc/buddy.c:298
+#: ../libpurple/protocols/silc10/buddy.c:295
#, c-format
msgid ""
"Key agreement request received from %s. Would you like to perform the key "
@@ -8591,7 +8820,8 @@ msgstr ""
"Получен запрос согласования ключей от %s. Хотите выполнить согласование "
"ключей?"
-#: ../libpurple/protocols/silc/buddy.c:299
+#: ../libpurple/protocols/silc/buddy.c:302
+#: ../libpurple/protocols/silc10/buddy.c:299
#, c-format
msgid ""
"The remote user is waiting key agreement on:\n"
@@ -8602,69 +8832,99 @@ msgstr ""
"Удалённый узел: %s\n"
"Удалённый порт: %d"
-#: ../libpurple/protocols/silc/buddy.c:312
+#: ../libpurple/protocols/silc/buddy.c:315
+#: ../libpurple/protocols/silc10/buddy.c:312
msgid "Key Agreement Request"
msgstr "Запрос согласования ключей"
-#: ../libpurple/protocols/silc/buddy.c:388
-#: ../libpurple/protocols/silc/buddy.c:423
-#: ../libpurple/protocols/silc/buddy.c:465
+#: ../libpurple/protocols/silc/buddy.c:382
+#: ../libpurple/protocols/silc/buddy.c:412
+#: ../libpurple/protocols/silc/buddy.c:452
+#: ../libpurple/protocols/silc10/buddy.c:388
+#: ../libpurple/protocols/silc10/buddy.c:423
+#: ../libpurple/protocols/silc10/buddy.c:465
msgid "IM With Password"
msgstr ""
-#: ../libpurple/protocols/silc/buddy.c:424
+#: ../libpurple/protocols/silc/buddy.c:413
+#: ../libpurple/protocols/silc10/buddy.c:424
msgid "Cannot set IM key"
msgstr ""
-#: ../libpurple/protocols/silc/buddy.c:466
+#: ../libpurple/protocols/silc/buddy.c:453
+#: ../libpurple/protocols/silc10/buddy.c:466
msgid "Set IM Password"
msgstr ""
-#: ../libpurple/protocols/silc/buddy.c:513
-#: ../libpurple/protocols/silc/buddy.c:548
-#: ../libpurple/protocols/silc/ops.c:1494
-#: ../libpurple/protocols/silc/ops.c:1505
+#: ../libpurple/protocols/silc/buddy.c:496
+#: ../libpurple/protocols/silc/buddy.c:507
+#: ../libpurple/protocols/silc/buddy.c:540
+#: ../libpurple/protocols/silc/ops.c:1499
+#: ../libpurple/protocols/silc/ops.c:1510
+#: ../libpurple/protocols/silc10/buddy.c:513
+#: ../libpurple/protocols/silc10/buddy.c:548
+#: ../libpurple/protocols/silc10/ops.c:1494
+#: ../libpurple/protocols/silc10/ops.c:1505
msgid "Get Public Key"
msgstr "Получить публичный ключ"
-#: ../libpurple/protocols/silc/buddy.c:549
-#: ../libpurple/protocols/silc/ops.c:1495
-#: ../libpurple/protocols/silc/ops.c:1506
+#: ../libpurple/protocols/silc/buddy.c:541
+#: ../libpurple/protocols/silc/ops.c:1500
+#: ../libpurple/protocols/silc/ops.c:1511
+#: ../libpurple/protocols/silc10/buddy.c:549
+#: ../libpurple/protocols/silc10/ops.c:1495
+#: ../libpurple/protocols/silc10/ops.c:1506
msgid "Cannot fetch the public key"
msgstr "Не удаётся загрузить публичный ключ"
-#: ../libpurple/protocols/silc/buddy.c:635
-#: ../libpurple/protocols/silc/buddy.c:1654
+#: ../libpurple/protocols/silc/buddy.c:622
+#: ../libpurple/protocols/silc/buddy.c:1655
+#: ../libpurple/protocols/silc10/buddy.c:635
+#: ../libpurple/protocols/silc10/buddy.c:1654
msgid "Show Public Key"
msgstr "Показать публичный ключ"
-#: ../libpurple/protocols/silc/buddy.c:636
-#: ../libpurple/protocols/silc/buddy.c:1033
+#: ../libpurple/protocols/silc/buddy.c:623
+#: ../libpurple/protocols/silc/buddy.c:1027
#: ../libpurple/protocols/silc/chat.c:237
+#: ../libpurple/protocols/silc10/buddy.c:636
+#: ../libpurple/protocols/silc10/buddy.c:1033
+#: ../libpurple/protocols/silc10/chat.c:237
msgid "Could not load public key"
msgstr "Не удалось загрузить публичный ключ"
-#: ../libpurple/protocols/silc/buddy.c:713
-#: ../libpurple/protocols/silc/ops.c:1087
-#: ../libpurple/protocols/silc/ops.c:1159
-#: ../libpurple/protocols/silc/ops.c:1294
-#: ../libpurple/protocols/silc/ops.c:1295
-#: ../libpurple/protocols/silc/ops.c:1313
+#: ../libpurple/protocols/silc/buddy.c:701
+#: ../libpurple/protocols/silc/ops.c:1053
+#: ../libpurple/protocols/silc/ops.c:1168
+#: ../libpurple/protocols/silc/ops.c:1288
+#: ../libpurple/protocols/silc/ops.c:1289
+#: ../libpurple/protocols/silc/ops.c:1307
+#: ../libpurple/protocols/silc10/buddy.c:713
+#: ../libpurple/protocols/silc10/ops.c:1087
+#: ../libpurple/protocols/silc10/ops.c:1159
+#: ../libpurple/protocols/silc10/ops.c:1294
+#: ../libpurple/protocols/silc10/ops.c:1295
+#: ../libpurple/protocols/silc10/ops.c:1313
msgid "User Information"
msgstr "Пользовательская информация"
-#: ../libpurple/protocols/silc/buddy.c:714
-#: ../libpurple/protocols/silc/ops.c:1160
-#: ../libpurple/protocols/silc/ops.c:1314
+#: ../libpurple/protocols/silc/buddy.c:702
+#: ../libpurple/protocols/silc/ops.c:1169
+#: ../libpurple/protocols/silc/ops.c:1308
+#: ../libpurple/protocols/silc10/buddy.c:714
+#: ../libpurple/protocols/silc10/ops.c:1160
+#: ../libpurple/protocols/silc10/ops.c:1314
msgid "Cannot get user information"
msgstr "Не удаётся получить пользовательскую информацию"
-#: ../libpurple/protocols/silc/buddy.c:735
+#: ../libpurple/protocols/silc/buddy.c:723
+#: ../libpurple/protocols/silc10/buddy.c:735
#, c-format
msgid "The %s buddy is not trusted"
msgstr "Собеседник %s не проверен"
-#: ../libpurple/protocols/silc/buddy.c:738
+#: ../libpurple/protocols/silc/buddy.c:726
+#: ../libpurple/protocols/silc10/buddy.c:738
msgid ""
"You cannot receive buddy notifications until you import his/her public key. "
"You can use the Get Public Key command to get the public key."
@@ -8674,16 +8934,19 @@ msgstr ""
"для получения публичного ключа."
#. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1067
+#: ../libpurple/protocols/silc/buddy.c:1059
+#: ../libpurple/protocols/silc10/buddy.c:1067
msgid "Open..."
msgstr "Открыть..."
-#: ../libpurple/protocols/silc/buddy.c:1078
+#: ../libpurple/protocols/silc/buddy.c:1070
+#: ../libpurple/protocols/silc10/buddy.c:1078
#, c-format
msgid "The %s buddy is not present in the network"
msgstr "Собеседник %s не присутствует в сети"
-#: ../libpurple/protocols/silc/buddy.c:1081
+#: ../libpurple/protocols/silc/buddy.c:1073
+#: ../libpurple/protocols/silc10/buddy.c:1081
msgid ""
"To add the buddy you must import his/her public key. Press Import to import "
"a public key."
@@ -8691,15 +8954,18 @@ msgstr ""
"Чтобы добавить собеседника, вы должны импортировать его публичный ключ. "
"Нажмите \"Импортировать...\" для импортирования публичного ключа."
-#: ../libpurple/protocols/silc/buddy.c:1085
+#: ../libpurple/protocols/silc/buddy.c:1077
+#: ../libpurple/protocols/silc10/buddy.c:1085
msgid "_Import..."
msgstr "_Импортировать..."
-#: ../libpurple/protocols/silc/buddy.c:1181
+#: ../libpurple/protocols/silc/buddy.c:1183
+#: ../libpurple/protocols/silc10/buddy.c:1181
msgid "Select correct user"
msgstr "Выберите корректного пользователя"
-#: ../libpurple/protocols/silc/buddy.c:1183
+#: ../libpurple/protocols/silc/buddy.c:1185
+#: ../libpurple/protocols/silc10/buddy.c:1183
msgid ""
"More than one user was found with the same public key. Select the correct "
"user from the list to add to the buddy list."
@@ -8707,7 +8973,8 @@ msgstr ""
"Было найдено несколько пользователей с одинаковыми публичными ключами. "
"Выберите из списка одного из них для добавления в список собеседников."
-#: ../libpurple/protocols/silc/buddy.c:1185
+#: ../libpurple/protocols/silc/buddy.c:1187
+#: ../libpurple/protocols/silc10/buddy.c:1185
msgid ""
"More than one user was found with the same name. Select the correct user "
"from the list to add to the buddy list."
@@ -8716,237 +8983,318 @@ msgstr ""
"списка одного из них для добавления в список собеседников."
#: ../libpurple/protocols/silc/buddy.c:1474
+#: ../libpurple/protocols/silc10/buddy.c:1474
msgid "Detached"
msgstr "Независимый"
#: ../libpurple/protocols/silc/buddy.c:1478
-#: ../libpurple/protocols/silc/silc.c:49
+#: ../libpurple/protocols/silc/silc.c:58
+#: ../libpurple/protocols/silc10/buddy.c:1478
+#: ../libpurple/protocols/silc10/silc.c:49
msgid "Indisposed"
msgstr "Недомогающий"
#: ../libpurple/protocols/silc/buddy.c:1482
-#: ../libpurple/protocols/silc/silc.c:51
+#: ../libpurple/protocols/silc/silc.c:60
+#: ../libpurple/protocols/silc10/buddy.c:1482
+#: ../libpurple/protocols/silc10/silc.c:51
msgid "Wake Me Up"
msgstr "Разбудите меня"
#: ../libpurple/protocols/silc/buddy.c:1484
-#: ../libpurple/protocols/silc/silc.c:43
+#: ../libpurple/protocols/silc/silc.c:52
+#: ../libpurple/protocols/silc10/buddy.c:1484
+#: ../libpurple/protocols/silc10/silc.c:43
msgid "Hyper Active"
msgstr "Гиперактивный"
#: ../libpurple/protocols/silc/buddy.c:1486
+#: ../libpurple/protocols/silc10/buddy.c:1486
msgid "Robot"
msgstr "Робот"
#: ../libpurple/protocols/silc/buddy.c:1493
-#: ../libpurple/protocols/silc/silc.c:662
-#: ../libpurple/protocols/silc/util.c:512
+#: ../libpurple/protocols/silc/silc.c:743
+#: ../libpurple/protocols/silc/util.c:516
+#: ../libpurple/protocols/silc10/buddy.c:1493
+#: ../libpurple/protocols/silc10/silc.c:654
+#: ../libpurple/protocols/silc10/util.c:512
msgid "Happy"
msgstr "Счастливый"
#: ../libpurple/protocols/silc/buddy.c:1495
-#: ../libpurple/protocols/silc/silc.c:664
-#: ../libpurple/protocols/silc/util.c:514
+#: ../libpurple/protocols/silc/silc.c:745
+#: ../libpurple/protocols/silc/util.c:518
+#: ../libpurple/protocols/silc10/buddy.c:1495
+#: ../libpurple/protocols/silc10/silc.c:656
+#: ../libpurple/protocols/silc10/util.c:514
msgid "Sad"
msgstr "Печальный"
#: ../libpurple/protocols/silc/buddy.c:1497
-#: ../libpurple/protocols/silc/silc.c:666
-#: ../libpurple/protocols/silc/util.c:516
+#: ../libpurple/protocols/silc/silc.c:747
+#: ../libpurple/protocols/silc/util.c:520
+#: ../libpurple/protocols/silc10/buddy.c:1497
+#: ../libpurple/protocols/silc10/silc.c:658
+#: ../libpurple/protocols/silc10/util.c:516
msgid "Angry"
msgstr "Рассерженный"
#: ../libpurple/protocols/silc/buddy.c:1499
-#: ../libpurple/protocols/silc/silc.c:668
-#: ../libpurple/protocols/silc/util.c:518
+#: ../libpurple/protocols/silc/silc.c:749
+#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc10/buddy.c:1499
+#: ../libpurple/protocols/silc10/silc.c:660
+#: ../libpurple/protocols/silc10/util.c:518
msgid "Jealous"
msgstr "Ревнующий"
#: ../libpurple/protocols/silc/buddy.c:1501
-#: ../libpurple/protocols/silc/silc.c:670
-#: ../libpurple/protocols/silc/util.c:520
+#: ../libpurple/protocols/silc/silc.c:751
+#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc10/buddy.c:1501
+#: ../libpurple/protocols/silc10/silc.c:662
+#: ../libpurple/protocols/silc10/util.c:520
msgid "Ashamed"
msgstr "Стыдящийся"
#: ../libpurple/protocols/silc/buddy.c:1503
-#: ../libpurple/protocols/silc/silc.c:672
-#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc/silc.c:753
+#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc10/buddy.c:1503
+#: ../libpurple/protocols/silc10/silc.c:664
+#: ../libpurple/protocols/silc10/util.c:522
msgid "Invincible"
msgstr "Непобедимый"
#: ../libpurple/protocols/silc/buddy.c:1505
-#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc10/buddy.c:1505
+#: ../libpurple/protocols/silc10/util.c:524
msgid "In Love"
msgstr "Влюблённый"
#: ../libpurple/protocols/silc/buddy.c:1507
-#: ../libpurple/protocols/silc/silc.c:676
-#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc/silc.c:757
+#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc10/buddy.c:1507
+#: ../libpurple/protocols/silc10/silc.c:668
+#: ../libpurple/protocols/silc10/util.c:526
msgid "Sleepy"
msgstr "Сонный"
#: ../libpurple/protocols/silc/buddy.c:1509
-#: ../libpurple/protocols/silc/silc.c:678
-#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc/silc.c:759
+#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc10/buddy.c:1509
+#: ../libpurple/protocols/silc10/silc.c:670
+#: ../libpurple/protocols/silc10/util.c:528
msgid "Bored"
msgstr "Скучающий"
#: ../libpurple/protocols/silc/buddy.c:1511
-#: ../libpurple/protocols/silc/silc.c:680
-#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc/silc.c:761
+#: ../libpurple/protocols/silc/util.c:534
+#: ../libpurple/protocols/silc10/buddy.c:1511
+#: ../libpurple/protocols/silc10/silc.c:672
+#: ../libpurple/protocols/silc10/util.c:530
msgid "Excited"
msgstr "Возбуждённый"
#: ../libpurple/protocols/silc/buddy.c:1513
-#: ../libpurple/protocols/silc/silc.c:682
-#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc/silc.c:763
+#: ../libpurple/protocols/silc/util.c:536
+#: ../libpurple/protocols/silc10/buddy.c:1513
+#: ../libpurple/protocols/silc10/silc.c:674
+#: ../libpurple/protocols/silc10/util.c:532
msgid "Anxious"
msgstr "Озабоченный"
#: ../libpurple/protocols/silc/buddy.c:1545
-#: ../libpurple/protocols/silc/ops.c:1202
+#: ../libpurple/protocols/silc/ops.c:1207
+#: ../libpurple/protocols/silc10/buddy.c:1545
+#: ../libpurple/protocols/silc10/ops.c:1202
msgid "User Modes"
msgstr "Режимы пользователя"
#: ../libpurple/protocols/silc/buddy.c:1557
-#: ../libpurple/protocols/silc/ops.c:1207
+#: ../libpurple/protocols/silc/ops.c:1212
+#: ../libpurple/protocols/silc10/buddy.c:1557
+#: ../libpurple/protocols/silc10/ops.c:1207
msgid "Mood"
msgstr "Настроение"
#: ../libpurple/protocols/silc/buddy.c:1562
-#: ../libpurple/protocols/silc/ops.c:1219
+#: ../libpurple/protocols/silc/ops.c:1224
+#: ../libpurple/protocols/silc10/buddy.c:1562
+#: ../libpurple/protocols/silc10/ops.c:1219
msgid "Preferred Contact"
msgstr "Предпочитаемый контакт"
#: ../libpurple/protocols/silc/buddy.c:1567
-#: ../libpurple/protocols/silc/ops.c:1224
+#: ../libpurple/protocols/silc/ops.c:1229
+#: ../libpurple/protocols/silc10/buddy.c:1567
+#: ../libpurple/protocols/silc10/ops.c:1224
msgid "Preferred Language"
msgstr "Предпочитаемый язык"
#: ../libpurple/protocols/silc/buddy.c:1572
-#: ../libpurple/protocols/silc/ops.c:1229
+#: ../libpurple/protocols/silc/ops.c:1234
+#: ../libpurple/protocols/silc10/buddy.c:1572
+#: ../libpurple/protocols/silc10/ops.c:1229
msgid "Device"
msgstr "Устройство"
#: ../libpurple/protocols/silc/buddy.c:1577
-#: ../libpurple/protocols/silc/ops.c:1234
-#: ../libpurple/protocols/silc/silc.c:730
-#: ../libpurple/protocols/silc/silc.c:732
+#: ../libpurple/protocols/silc/ops.c:1239
+#: ../libpurple/protocols/silc10/buddy.c:1577
+#: ../libpurple/protocols/silc10/ops.c:1234
+#: ../libpurple/protocols/silc10/silc.c:722
+#: ../libpurple/protocols/silc10/silc.c:724
msgid "Timezone"
msgstr "Часовой пояс"
#: ../libpurple/protocols/silc/buddy.c:1582
-#: ../libpurple/protocols/silc/ops.c:1239
+#: ../libpurple/protocols/silc/ops.c:1244
+#: ../libpurple/protocols/silc10/buddy.c:1582
+#: ../libpurple/protocols/silc10/ops.c:1239
msgid "Geolocation"
msgstr "Географическое положение"
-#: ../libpurple/protocols/silc/buddy.c:1636
+#: ../libpurple/protocols/silc/buddy.c:1638
+#: ../libpurple/protocols/silc10/buddy.c:1636
msgid "Reset IM Key"
msgstr ""
-#: ../libpurple/protocols/silc/buddy.c:1642
+#: ../libpurple/protocols/silc/buddy.c:1643
+#: ../libpurple/protocols/silc10/buddy.c:1642
msgid "IM with Key Exchange"
msgstr ""
-#: ../libpurple/protocols/silc/buddy.c:1647
+#: ../libpurple/protocols/silc/buddy.c:1648
+#: ../libpurple/protocols/silc10/buddy.c:1647
msgid "IM with Password"
msgstr ""
-#: ../libpurple/protocols/silc/buddy.c:1660
+#: ../libpurple/protocols/silc/buddy.c:1661
+#: ../libpurple/protocols/silc10/buddy.c:1660
msgid "Get Public Key..."
msgstr "Получить публичный ключ..."
-#: ../libpurple/protocols/silc/buddy.c:1667
-#: ../libpurple/protocols/silc/ops.c:1624
+#: ../libpurple/protocols/silc/buddy.c:1668
+#: ../libpurple/protocols/silc/ops.c:1608
+#: ../libpurple/protocols/silc10/buddy.c:1667
+#: ../libpurple/protocols/silc10/ops.c:1624
msgid "Kill User"
msgstr "Убить пользователя"
-#: ../libpurple/protocols/silc/buddy.c:1677
-#: ../libpurple/protocols/silc/chat.c:977
+#: ../libpurple/protocols/silc/buddy.c:1678
+#: ../libpurple/protocols/silc/chat.c:993
+#: ../libpurple/protocols/silc10/buddy.c:1677
+#: ../libpurple/protocols/silc10/chat.c:977
msgid "Draw On Whiteboard"
msgstr ""
#: ../libpurple/protocols/silc/chat.c:39
+#: ../libpurple/protocols/silc10/chat.c:39
msgid "_Passphrase:"
msgstr "_Парольная фраза:"
#: ../libpurple/protocols/silc/chat.c:80
+#: ../libpurple/protocols/silc10/chat.c:80
#, c-format
msgid "Channel %s does not exist in the network"
msgstr "Канал %s отсутствует в сети"
#: ../libpurple/protocols/silc/chat.c:81
-#: ../libpurple/protocols/silc/chat.c:174
+#: ../libpurple/protocols/silc/chat.c:175
+#: ../libpurple/protocols/silc10/chat.c:81
+#: ../libpurple/protocols/silc10/chat.c:174
msgid "Channel Information"
msgstr "Информация о канале"
#: ../libpurple/protocols/silc/chat.c:82
+#: ../libpurple/protocols/silc10/chat.c:82
msgid "Cannot get channel information"
msgstr "Не удаётся получить информацию о канале"
#: ../libpurple/protocols/silc/chat.c:119
+#: ../libpurple/protocols/silc10/chat.c:119
#, c-format
msgid "<b>Channel Name:</b> %s"
msgstr "<b>Имя канала:</b> %s"
#: ../libpurple/protocols/silc/chat.c:122
+#: ../libpurple/protocols/silc10/chat.c:122
#, c-format
msgid "<br><b>User Count:</b> %d"
msgstr "<br><b>Количество пользователей:</b> %d"
#: ../libpurple/protocols/silc/chat.c:129
+#: ../libpurple/protocols/silc10/chat.c:129
#, c-format
msgid "<br><b>Channel Founder:</b> %s"
msgstr "<br><b>Основатель канала::</b> %s"
#: ../libpurple/protocols/silc/chat.c:138
+#: ../libpurple/protocols/silc10/chat.c:138
#, c-format
msgid "<br><b>Channel Cipher:</b> %s"
msgstr "<br><b>Шифр канала:</b> %s"
#. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
-#: ../libpurple/protocols/silc/chat.c:142
+#: ../libpurple/protocols/silc/chat.c:143
+#: ../libpurple/protocols/silc10/chat.c:142
#, c-format
msgid "<br><b>Channel HMAC:</b> %s"
msgstr "<br><b>HMAC канала:</b> %s"
-#: ../libpurple/protocols/silc/chat.c:147
+#: ../libpurple/protocols/silc/chat.c:148
+#: ../libpurple/protocols/silc10/chat.c:147
#, c-format
msgid "<br><b>Channel Topic:</b><br>%s"
msgstr "<br><b>Тема канала:</b><br>%s"
-#: ../libpurple/protocols/silc/chat.c:152
+#: ../libpurple/protocols/silc/chat.c:153
+#: ../libpurple/protocols/silc10/chat.c:152
msgid "<br><b>Channel Modes:</b> "
msgstr "<br><b>Режимы канала:</b> "
-#: ../libpurple/protocols/silc/chat.c:165
+#: ../libpurple/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc10/chat.c:165
#, c-format
msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
msgstr ""
-#: ../libpurple/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc/chat.c:167
+#: ../libpurple/protocols/silc10/chat.c:166
#, c-format
msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
msgstr ""
#: ../libpurple/protocols/silc/chat.c:236
+#: ../libpurple/protocols/silc10/chat.c:236
msgid "Add Channel Public Key"
msgstr "Добавить публичный ключ канала"
#. Add new public key
-#: ../libpurple/protocols/silc/chat.c:291
+#: ../libpurple/protocols/silc/chat.c:304
+#: ../libpurple/protocols/silc10/chat.c:291
msgid "Open Public Key..."
msgstr "Открыть публичный ключ..."
-#: ../libpurple/protocols/silc/chat.c:401
+#: ../libpurple/protocols/silc/chat.c:423
+#: ../libpurple/protocols/silc10/chat.c:401
msgid "Channel Passphrase"
msgstr "Парольная фраза канала"
-#: ../libpurple/protocols/silc/chat.c:408
+#: ../libpurple/protocols/silc/chat.c:430
+#: ../libpurple/protocols/silc10/chat.c:408
msgid "Channel Public Keys List"
msgstr "Список публичных ключей канала"
-#: ../libpurple/protocols/silc/chat.c:413
+#: ../libpurple/protocols/silc/chat.c:435
+#: ../libpurple/protocols/silc10/chat.c:413
msgid ""
"Channel authentication is used to secure the channel from unauthorized "
"access. The authentication may be based on passphrase and digital "
@@ -8955,333 +9303,446 @@ msgid ""
"able to join."
msgstr ""
-#: ../libpurple/protocols/silc/chat.c:422
-#: ../libpurple/protocols/silc/chat.c:423
-#: ../libpurple/protocols/silc/chat.c:461
-#: ../libpurple/protocols/silc/chat.c:462
-#: ../libpurple/protocols/silc/chat.c:911
+#: ../libpurple/protocols/silc/chat.c:444
+#: ../libpurple/protocols/silc/chat.c:445
+#: ../libpurple/protocols/silc/chat.c:479
+#: ../libpurple/protocols/silc/chat.c:480
+#: ../libpurple/protocols/silc/chat.c:927
+#: ../libpurple/protocols/silc10/chat.c:422
+#: ../libpurple/protocols/silc10/chat.c:423
+#: ../libpurple/protocols/silc10/chat.c:461
+#: ../libpurple/protocols/silc10/chat.c:462
+#: ../libpurple/protocols/silc10/chat.c:911
msgid "Channel Authentication"
msgstr "Аутентификация канала"
-#: ../libpurple/protocols/silc/chat.c:424
-#: ../libpurple/protocols/silc/chat.c:463
+#: ../libpurple/protocols/silc/chat.c:446
+#: ../libpurple/protocols/silc/chat.c:481
+#: ../libpurple/protocols/silc10/chat.c:424
+#: ../libpurple/protocols/silc10/chat.c:463
msgid "Add / Remove"
msgstr "Добавить / Удалить"
-#: ../libpurple/protocols/silc/chat.c:581
+#: ../libpurple/protocols/silc/chat.c:597
+#: ../libpurple/protocols/silc10/chat.c:581
msgid "Group Name"
msgstr "Имя группы"
-#: ../libpurple/protocols/silc/chat.c:585
-#: ../libpurple/protocols/silc/ops.c:1910
-#: ../libpurple/protocols/silc/silc.c:939
+#: ../libpurple/protocols/silc/chat.c:601
+#: ../libpurple/protocols/silc/ops.c:1813
+#: ../libpurple/protocols/silc/silc.c:1020
+#: ../libpurple/protocols/silc10/chat.c:585
+#: ../libpurple/protocols/silc10/ops.c:1901
+#: ../libpurple/protocols/silc10/silc.c:931
msgid "Passphrase"
msgstr "Парольная фраза"
-#: ../libpurple/protocols/silc/chat.c:596
+#: ../libpurple/protocols/silc/chat.c:612
+#: ../libpurple/protocols/silc10/chat.c:596
#, c-format
msgid "Please enter the %s channel private group name and passphrase."
msgstr "Введите имя личной группы и парольную фразу канала %s."
-#: ../libpurple/protocols/silc/chat.c:598
+#: ../libpurple/protocols/silc/chat.c:614
+#: ../libpurple/protocols/silc10/chat.c:598
msgid "Add Channel Private Group"
msgstr "Добавить личную группу канала"
-#: ../libpurple/protocols/silc/chat.c:726
+#: ../libpurple/protocols/silc/chat.c:742
+#: ../libpurple/protocols/silc10/chat.c:726
msgid "User Limit"
msgstr "Предел количества пользователей"
-#: ../libpurple/protocols/silc/chat.c:727
+#: ../libpurple/protocols/silc/chat.c:743
+#: ../libpurple/protocols/silc10/chat.c:727
msgid "Set user limit on channel. Set to zero to reset user limit."
msgstr ""
"Установить предел количества пользователей на канале. Установите в ноль для "
"сброса предела количества пользователей."
-#: ../libpurple/protocols/silc/chat.c:891
+#: ../libpurple/protocols/silc/chat.c:907
+#: ../libpurple/protocols/silc10/chat.c:891
msgid "Invite List"
msgstr "Список приглашённых"
-#: ../libpurple/protocols/silc/chat.c:896
+#: ../libpurple/protocols/silc/chat.c:912
+#: ../libpurple/protocols/silc10/chat.c:896
msgid "Ban List"
msgstr "Список изгнанных"
-#: ../libpurple/protocols/silc/chat.c:904
+#: ../libpurple/protocols/silc/chat.c:920
+#: ../libpurple/protocols/silc10/chat.c:904
msgid "Add Private Group"
msgstr "Добавить личную группу"
-#: ../libpurple/protocols/silc/chat.c:917
+#: ../libpurple/protocols/silc/chat.c:933
+#: ../libpurple/protocols/silc10/chat.c:917
msgid "Reset Permanent"
msgstr "Сбросить перманентно"
-#: ../libpurple/protocols/silc/chat.c:922
+#: ../libpurple/protocols/silc/chat.c:938
+#: ../libpurple/protocols/silc10/chat.c:922
msgid "Set Permanent"
msgstr "Установить перманентно"
-#: ../libpurple/protocols/silc/chat.c:930
+#: ../libpurple/protocols/silc/chat.c:946
+#: ../libpurple/protocols/silc10/chat.c:930
msgid "Set User Limit"
msgstr "Установить предел количества пользователей"
-#: ../libpurple/protocols/silc/chat.c:936
+#: ../libpurple/protocols/silc/chat.c:952
+#: ../libpurple/protocols/silc10/chat.c:936
msgid "Reset Topic Restriction"
msgstr "Сбросить ограничение темы"
-#: ../libpurple/protocols/silc/chat.c:941
+#: ../libpurple/protocols/silc/chat.c:957
+#: ../libpurple/protocols/silc10/chat.c:941
msgid "Set Topic Restriction"
msgstr "Установить ограничение темы"
-#: ../libpurple/protocols/silc/chat.c:948
+#: ../libpurple/protocols/silc/chat.c:964
+#: ../libpurple/protocols/silc10/chat.c:948
msgid "Reset Private Channel"
msgstr "Сбросить личный канал"
-#: ../libpurple/protocols/silc/chat.c:953
+#: ../libpurple/protocols/silc/chat.c:969
+#: ../libpurple/protocols/silc10/chat.c:953
msgid "Set Private Channel"
msgstr "Установить личный канал"
-#: ../libpurple/protocols/silc/chat.c:960
+#: ../libpurple/protocols/silc/chat.c:976
+#: ../libpurple/protocols/silc10/chat.c:960
msgid "Reset Secret Channel"
msgstr "Сбросить секретный канал"
-#: ../libpurple/protocols/silc/chat.c:965
+#: ../libpurple/protocols/silc/chat.c:981
+#: ../libpurple/protocols/silc10/chat.c:965
msgid "Set Secret Channel"
msgstr "Установить секретный канал"
-#: ../libpurple/protocols/silc/chat.c:1039
-#, c-format
-msgid "You are channel founder on <I>%s</I>"
-msgstr "Вы являетесь основателем канала на <I>%s</I>"
-
-#: ../libpurple/protocols/silc/chat.c:1043
-#, c-format
-msgid "Channel founder on <I>%s</I> is <I>%s</I>"
-msgstr "Основателем канала на <I>%s</I> является <I>%s</I>"
-
-#: ../libpurple/protocols/silc/chat.c:1102
+#: ../libpurple/protocols/silc/chat.c:1045
+#: ../libpurple/protocols/silc10/chat.c:1102
#, c-format
msgid ""
"You have to join the %s channel before you are able to join the private group"
msgstr "Вы сможете войти в личную группу после того, как войдёте на канал %s."
-#: ../libpurple/protocols/silc/chat.c:1104
+#: ../libpurple/protocols/silc/chat.c:1047
+#: ../libpurple/protocols/silc10/chat.c:1104
msgid "Join Private Group"
msgstr "Присоединиться к личной группе"
-#: ../libpurple/protocols/silc/chat.c:1105
+#: ../libpurple/protocols/silc/chat.c:1048
+#: ../libpurple/protocols/silc10/chat.c:1105
msgid "Cannot join private group"
msgstr "Не удаётся присоединиться к личной группе"
-#: ../libpurple/protocols/silc/chat.c:1299
-#: ../libpurple/protocols/silc/silc.c:1148
+#: ../libpurple/protocols/silc/chat.c:1260
+#: ../libpurple/protocols/silc/silc.c:1217
+#: ../libpurple/protocols/silc10/chat.c:1299
+#: ../libpurple/protocols/silc10/silc.c:1137
msgid "Call Command"
msgstr "Вызвать команду"
-#: ../libpurple/protocols/silc/chat.c:1299
-#: ../libpurple/protocols/silc/silc.c:1148
+#: ../libpurple/protocols/silc/chat.c:1260
+#: ../libpurple/protocols/silc/silc.c:1218
+#: ../libpurple/protocols/silc10/chat.c:1299
+#: ../libpurple/protocols/silc10/silc.c:1137
msgid "Cannot call command"
msgstr "Не удаётся вызвать команду"
-#: ../libpurple/protocols/silc/chat.c:1300
-#: ../libpurple/protocols/silc/silc.c:1149
+#: ../libpurple/protocols/silc/chat.c:1261
+#: ../libpurple/protocols/silc/silc.c:1219
+#: ../libpurple/protocols/silc10/chat.c:1300
+#: ../libpurple/protocols/silc10/silc.c:1138
msgid "Unknown command"
msgstr "Неизвестная команда"
-#: ../libpurple/protocols/silc/ft.c:89 ../libpurple/protocols/silc/ft.c:92
-#: ../libpurple/protocols/silc/ft.c:96 ../libpurple/protocols/silc/ft.c:100
-#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:205
-#: ../libpurple/protocols/silc/ft.c:210 ../libpurple/protocols/silc/ft.c:215
-#: ../libpurple/protocols/silc/ft.c:221 ../libpurple/protocols/silc/ft.c:340
+#: ../libpurple/protocols/silc/ft.c:85 ../libpurple/protocols/silc/ft.c:101
+#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:108
+#: ../libpurple/protocols/silc/ft.c:112 ../libpurple/protocols/silc/ft.c:116
+#: ../libpurple/protocols/silc/ft.c:120 ../libpurple/protocols/silc/ft.c:272
+#: ../libpurple/protocols/silc/ft.c:277 ../libpurple/protocols/silc/ft.c:282
+#: ../libpurple/protocols/silc/ft.c:288 ../libpurple/protocols/silc/ft.c:425
+#: ../libpurple/protocols/silc10/ft.c:89 ../libpurple/protocols/silc10/ft.c:92
+#: ../libpurple/protocols/silc10/ft.c:96
+#: ../libpurple/protocols/silc10/ft.c:100
+#: ../libpurple/protocols/silc10/ft.c:104
+#: ../libpurple/protocols/silc10/ft.c:205
+#: ../libpurple/protocols/silc10/ft.c:210
+#: ../libpurple/protocols/silc10/ft.c:215
+#: ../libpurple/protocols/silc10/ft.c:221
+#: ../libpurple/protocols/silc10/ft.c:340
msgid "Secure File Transfer"
msgstr "Безопасная передача файлов"
-#: ../libpurple/protocols/silc/ft.c:90 ../libpurple/protocols/silc/ft.c:93
-#: ../libpurple/protocols/silc/ft.c:97 ../libpurple/protocols/silc/ft.c:101
-#: ../libpurple/protocols/silc/ft.c:105
+#: ../libpurple/protocols/silc/ft.c:86 ../libpurple/protocols/silc/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:105 ../libpurple/protocols/silc/ft.c:109
+#: ../libpurple/protocols/silc/ft.c:113 ../libpurple/protocols/silc/ft.c:117
+#: ../libpurple/protocols/silc/ft.c:121 ../libpurple/protocols/silc10/ft.c:90
+#: ../libpurple/protocols/silc10/ft.c:93 ../libpurple/protocols/silc10/ft.c:97
+#: ../libpurple/protocols/silc10/ft.c:101
+#: ../libpurple/protocols/silc10/ft.c:105
msgid "Error during file transfer"
msgstr "Ошибка во время передачи файлов"
-#: ../libpurple/protocols/silc/ft.c:94
+#: ../libpurple/protocols/silc/ft.c:87
+msgid "Remote disconnected"
+msgstr "Соединение разорвано"
+
+#: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc10/ft.c:94
msgid "Permission denied"
msgstr "Доступ запрещён"
-#: ../libpurple/protocols/silc/ft.c:98
+#: ../libpurple/protocols/silc/ft.c:110 ../libpurple/protocols/silc10/ft.c:98
msgid "Key agreement failed"
msgstr "Не удалось выполнить согласование ключей"
-#: ../libpurple/protocols/silc/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:114
+msgid "Connection timedout"
+msgstr "Истекло время ожидания соединения"
+
+#: ../libpurple/protocols/silc/ft.c:118
+msgid "Creating connection failed"
+msgstr "Не удалось создать соединение"
+
+#: ../libpurple/protocols/silc/ft.c:122 ../libpurple/protocols/silc10/ft.c:102
msgid "File transfer session does not exist"
msgstr "Сессия передачи файлов не существует"
-#: ../libpurple/protocols/silc/ft.c:206
+#: ../libpurple/protocols/silc/ft.c:273 ../libpurple/protocols/silc10/ft.c:206
msgid "No file transfer session active"
msgstr "Нет активных сессий передачи файлов"
-#: ../libpurple/protocols/silc/ft.c:211
+#: ../libpurple/protocols/silc/ft.c:278 ../libpurple/protocols/silc10/ft.c:211
msgid "File transfer already started"
msgstr "Передача файлов уже начата"
-#: ../libpurple/protocols/silc/ft.c:216
+#: ../libpurple/protocols/silc/ft.c:283 ../libpurple/protocols/silc10/ft.c:216
msgid "Could not perform key agreement for file transfer"
msgstr "Не удалось выполнить согласование ключей для передачи файлов"
-#: ../libpurple/protocols/silc/ft.c:222
+#: ../libpurple/protocols/silc/ft.c:289 ../libpurple/protocols/silc10/ft.c:222
msgid "Could not start the file transfer"
msgstr "Не удалось начать передачу файлов"
-#: ../libpurple/protocols/silc/ft.c:341
+#: ../libpurple/protocols/silc/ft.c:426 ../libpurple/protocols/silc10/ft.c:341
msgid "Cannot send file"
msgstr "Не удаётся отправить файл"
-#: ../libpurple/protocols/silc/ops.c:554 ../libpurple/protocols/silc/ops.c:563
-#: ../libpurple/protocols/silc/ops.c:572
+#: ../libpurple/protocols/silc/ops.c:57
+msgid "Error occurred"
+msgstr "Произошла ошибка"
+
+#: ../libpurple/protocols/silc/ops.c:533 ../libpurple/protocols/silc/ops.c:542
+#: ../libpurple/protocols/silc/ops.c:551
+#: ../libpurple/protocols/silc10/ops.c:554
+#: ../libpurple/protocols/silc10/ops.c:563
+#: ../libpurple/protocols/silc10/ops.c:572
#, c-format
msgid "%s has changed the topic of <I>%s</I> to: %s"
msgstr "%s изменил тему <I>%s</I> на: %s"
-#: ../libpurple/protocols/silc/ops.c:638
+#: ../libpurple/protocols/silc/ops.c:617
+#: ../libpurple/protocols/silc10/ops.c:638
#, c-format
msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
msgstr "<I>%s</I> установил режим канала <I>%s</I> в: %s"
-#: ../libpurple/protocols/silc/ops.c:642
+#: ../libpurple/protocols/silc/ops.c:621
+#: ../libpurple/protocols/silc10/ops.c:642
#, c-format
msgid "<I>%s</I> removed all channel <I>%s</I> modes"
msgstr "<I>%s</I> снял все режимы канала <I>%s</I>"
-#: ../libpurple/protocols/silc/ops.c:675
+#: ../libpurple/protocols/silc/ops.c:654
+#: ../libpurple/protocols/silc10/ops.c:675
#, c-format
msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
msgstr "<I>%s</I> установил режимы <I>%s</I> в: %s"
-#: ../libpurple/protocols/silc/ops.c:683
+#: ../libpurple/protocols/silc/ops.c:662
+#: ../libpurple/protocols/silc10/ops.c:683
#, c-format
msgid "<I>%s</I> removed all <I>%s's</I> modes"
msgstr "<I>%s</I> снял все режимы <I>%s</I>"
-#: ../libpurple/protocols/silc/ops.c:712
+#: ../libpurple/protocols/silc/ops.c:691
+#: ../libpurple/protocols/silc10/ops.c:712
#, c-format
msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
msgstr "Вы были удалены из <I>%s</I> оператором <I>%s</I> (%s)"
-#: ../libpurple/protocols/silc/ops.c:742 ../libpurple/protocols/silc/ops.c:747
-#: ../libpurple/protocols/silc/ops.c:752
+#: ../libpurple/protocols/silc/ops.c:718 ../libpurple/protocols/silc/ops.c:723
+#: ../libpurple/protocols/silc/ops.c:728
+#: ../libpurple/protocols/silc10/ops.c:742
+#: ../libpurple/protocols/silc10/ops.c:747
+#: ../libpurple/protocols/silc10/ops.c:752
#, c-format
msgid "You have been killed by %s (%s)"
msgstr "Вы были убиты оператором %s (%s)"
-#: ../libpurple/protocols/silc/ops.c:773 ../libpurple/protocols/silc/ops.c:778
-#: ../libpurple/protocols/silc/ops.c:783
+#: ../libpurple/protocols/silc/ops.c:749 ../libpurple/protocols/silc/ops.c:754
+#: ../libpurple/protocols/silc/ops.c:759
+#: ../libpurple/protocols/silc10/ops.c:773
+#: ../libpurple/protocols/silc10/ops.c:778
+#: ../libpurple/protocols/silc10/ops.c:783
#, c-format
msgid "Killed by %s (%s)"
msgstr "Убит оператором %s (%s)"
-#: ../libpurple/protocols/silc/ops.c:829
+#: ../libpurple/protocols/silc/ops.c:796
+#: ../libpurple/protocols/silc10/ops.c:829
msgid "Server signoff"
msgstr "Отключиться от сервера"
-#: ../libpurple/protocols/silc/ops.c:1017
+#: ../libpurple/protocols/silc/ops.c:983
+#: ../libpurple/protocols/silc10/ops.c:1017
msgid "Personal Information"
msgstr "Персональная информация"
-#: ../libpurple/protocols/silc/ops.c:1040
+#: ../libpurple/protocols/silc/ops.c:1006
+#: ../libpurple/protocols/silc10/ops.c:1040
msgid "Birth Day"
msgstr "День рождения"
-#: ../libpurple/protocols/silc/ops.c:1048
+#: ../libpurple/protocols/silc/ops.c:1014
+#: ../libpurple/protocols/silc10/ops.c:1048
msgid "Job Role"
msgstr "Должность"
-#: ../libpurple/protocols/silc/ops.c:1052
-#: ../libpurple/protocols/silc/silc.c:932
+#: ../libpurple/protocols/silc/ops.c:1018
+#: ../libpurple/protocols/silc/silc.c:1013
+#: ../libpurple/protocols/silc10/ops.c:1052
+#: ../libpurple/protocols/silc10/silc.c:924
msgid "Organization"
msgstr "Организация"
-#: ../libpurple/protocols/silc/ops.c:1056
+#: ../libpurple/protocols/silc/ops.c:1022
+#: ../libpurple/protocols/silc10/ops.c:1056
msgid "Unit"
msgstr "Отдел"
-#: ../libpurple/protocols/silc/ops.c:1080
+#: ../libpurple/protocols/silc/ops.c:1046
+#: ../libpurple/protocols/silc10/ops.c:1080
msgid "Note"
msgstr "Заметки"
-#: ../libpurple/protocols/silc/ops.c:1128
+#: ../libpurple/protocols/silc/ops.c:1093
+#: ../libpurple/protocols/silc10/ops.c:1128
msgid "Join Chat"
msgstr "Присоединиться к чату"
-#: ../libpurple/protocols/silc/ops.c:1183
-#: ../libpurple/protocols/silc/ops.c:1332
+#: ../libpurple/protocols/silc/ops.c:1127
+#: ../libpurple/protocols/silc10/chat.c:1039
+#, c-format
+msgid "You are channel founder on <I>%s</I>"
+msgstr "Вы являетесь основателем канала на <I>%s</I>"
+
+#: ../libpurple/protocols/silc/ops.c:1131
+#: ../libpurple/protocols/silc10/chat.c:1043
+#, c-format
+msgid "Channel founder on <I>%s</I> is <I>%s</I>"
+msgstr "Основателем канала на <I>%s</I> является <I>%s</I>"
+
+#: ../libpurple/protocols/silc/ops.c:1190
+#: ../libpurple/protocols/silc/ops.c:1326
+#: ../libpurple/protocols/silc10/ops.c:1183
+#: ../libpurple/protocols/silc10/ops.c:1332
#: ../libpurple/protocols/yahoo/yahoo_profile.c:1047
msgid "Real Name"
msgstr "Настоящее имя"
-#: ../libpurple/protocols/silc/ops.c:1213
+#: ../libpurple/protocols/silc/ops.c:1218
+#: ../libpurple/protocols/silc10/ops.c:1213
msgid "Status Text"
msgstr "Текст статуса"
-#: ../libpurple/protocols/silc/ops.c:1285
-#: ../libpurple/protocols/silc/ops.c:1357
+#: ../libpurple/protocols/silc/ops.c:1279
+#: ../libpurple/protocols/silc/ops.c:1351
+#: ../libpurple/protocols/silc10/ops.c:1285
+#: ../libpurple/protocols/silc10/ops.c:1357
msgid "Public Key Fingerprint"
msgstr ""
-#: ../libpurple/protocols/silc/ops.c:1286
-#: ../libpurple/protocols/silc/ops.c:1358
+#: ../libpurple/protocols/silc/ops.c:1280
+#: ../libpurple/protocols/silc/ops.c:1352
+#: ../libpurple/protocols/silc10/ops.c:1286
+#: ../libpurple/protocols/silc10/ops.c:1358
msgid "Public Key Babbleprint"
msgstr ""
-#: ../libpurple/protocols/silc/ops.c:1298
+#: ../libpurple/protocols/silc/ops.c:1292
+#: ../libpurple/protocols/silc10/ops.c:1298
msgid "_More..."
msgstr "_Ещё..."
-#: ../libpurple/protocols/silc/ops.c:1371
-#: ../libpurple/protocols/silc/silc.c:999
+#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc/silc.c:1077
+#: ../libpurple/protocols/silc10/ops.c:1371
+#: ../libpurple/protocols/silc10/silc.c:988
msgid "Detach From Server"
msgstr "Разорвать соединение с сервером"
-#: ../libpurple/protocols/silc/ops.c:1371
+#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc10/ops.c:1371
msgid "Cannot detach"
msgstr "Не удаётся разорвать соединение"
-#: ../libpurple/protocols/silc/ops.c:1382
+#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc10/ops.c:1382
msgid "Cannot set topic"
msgstr "Не удаётся установить тему"
-#: ../libpurple/protocols/silc/ops.c:1414
+#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc10/ops.c:1414
msgid "Failed to change nickname"
msgstr "Не удалось изменить псевдоним"
-#: ../libpurple/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc10/ops.c:1462
msgid "Roomlist"
msgstr "Список комнат"
-#: ../libpurple/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc10/ops.c:1462
msgid "Cannot get room list"
msgstr "Не удаётся получить список комнат"
-#: ../libpurple/protocols/silc/ops.c:1507
+#: ../libpurple/protocols/silc/ops.c:1468
+msgid "Network is empty"
+msgstr "Сеть пуста"
+
+#: ../libpurple/protocols/silc/ops.c:1512
+#: ../libpurple/protocols/silc10/ops.c:1507
msgid "No public key was received"
msgstr "Не было получено публичных ключей"
-#: ../libpurple/protocols/silc/ops.c:1519
-#: ../libpurple/protocols/silc/ops.c:1532
+#: ../libpurple/protocols/silc/ops.c:1524
+#: ../libpurple/protocols/silc/ops.c:1537
+#: ../libpurple/protocols/silc10/ops.c:1519
+#: ../libpurple/protocols/silc10/ops.c:1532
msgid "Server Information"
msgstr "Информация о сервере"
-#: ../libpurple/protocols/silc/ops.c:1520
+#: ../libpurple/protocols/silc/ops.c:1525
+#: ../libpurple/protocols/silc10/ops.c:1520
msgid "Cannot get server information"
msgstr "Не удаётся получить информацию о сервере"
-#: ../libpurple/protocols/silc/ops.c:1549
-#: ../libpurple/protocols/silc/ops.c:1558
+#: ../libpurple/protocols/silc/ops.c:1548
+#: ../libpurple/protocols/silc10/ops.c:1549
+#: ../libpurple/protocols/silc10/ops.c:1558
msgid "Server Statistics"
msgstr "Статистика сервера"
-#: ../libpurple/protocols/silc/ops.c:1550
+#: ../libpurple/protocols/silc/ops.c:1549
+#: ../libpurple/protocols/silc10/ops.c:1550
msgid "Cannot get server statistics"
msgstr "Не удаётся получить статистику сервера"
-#: ../libpurple/protocols/silc/ops.c:1559
-msgid "No server statistics available"
-msgstr "Нет доступной статистики сервера"
-
-#: ../libpurple/protocols/silc/ops.c:1581
+#: ../libpurple/protocols/silc/ops.c:1556
+#: ../libpurple/protocols/silc10/ops.c:1581
#, c-format
msgid ""
"Local server start time: %s\n"
@@ -9301,105 +9762,66 @@ msgid ""
"Total router operators: %d\n"
msgstr ""
-#: ../libpurple/protocols/silc/ops.c:1604
+#: ../libpurple/protocols/silc/ops.c:1588
+#: ../libpurple/protocols/silc10/ops.c:1604
msgid "Network Statistics"
msgstr "Статистика сети"
-#: ../libpurple/protocols/silc/ops.c:1612
-#: ../libpurple/protocols/silc/ops.c:1617
+#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc10/ops.c:1612
+#: ../libpurple/protocols/silc10/ops.c:1617
msgid "Ping"
msgstr ""
-#: ../libpurple/protocols/silc/ops.c:1612
+#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc10/ops.c:1612
msgid "Ping failed"
msgstr ""
-#: ../libpurple/protocols/silc/ops.c:1617
+#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc10/ops.c:1617
msgid "Ping reply received from server"
msgstr ""
-#: ../libpurple/protocols/silc/ops.c:1625
+#: ../libpurple/protocols/silc/ops.c:1609
+#: ../libpurple/protocols/silc10/ops.c:1625
msgid "Could not kill user"
msgstr "Не удалось убить пользователя"
-#: ../libpurple/protocols/silc/ops.c:1709
-msgid "Error during connecting to SILC Server"
-msgstr "Ошибка во время соединения с сервером SILC"
-
-#: ../libpurple/protocols/silc/ops.c:1714
-msgid "Key Exchange failed"
-msgstr "Не удалось выполнить обмен ключами"
-
-#: ../libpurple/protocols/silc/ops.c:1723
-msgid ""
-"Resuming detached session failed. Press Reconnect to create new connection."
-msgstr ""
-"Не удалось возобновить прерванную сессию. Нажмите \"Пересоединение\" для "
-"создания нового соединения."
+#: ../libpurple/protocols/silc/ops.c:1648
+msgid "WATCH"
+msgstr "НАБЛЮДАТЬ"
-#: ../libpurple/protocols/silc/ops.c:1758
-msgid "Disconnected by server"
-msgstr "Соединение разорвано сервером"
+#: ../libpurple/protocols/silc/ops.c:1648
+msgid "Cannot watch user"
+msgstr "Не удаётся наблюдать за пользователем"
-#: ../libpurple/protocols/silc/ops.c:1820
-#: ../libpurple/protocols/silc/ops.c:1867
-#: ../libpurple/protocols/silc/silc.c:182
+#: ../libpurple/protocols/silc/ops.c:1724
+#: ../libpurple/protocols/silc/ops.c:1775
+#: ../libpurple/protocols/silc/silc.c:277
+#: ../libpurple/protocols/silc10/ops.c:1811
+#: ../libpurple/protocols/silc10/ops.c:1858
+#: ../libpurple/protocols/silc10/silc.c:190
msgid "Resuming session"
msgstr "Возобновление сессии"
-#: ../libpurple/protocols/silc/ops.c:1822
+#: ../libpurple/protocols/silc/ops.c:1726
+#: ../libpurple/protocols/silc10/ops.c:1813
msgid "Authenticating connection"
msgstr "Аутентификация соединения"
-#: ../libpurple/protocols/silc/ops.c:1869
+#: ../libpurple/protocols/silc/ops.c:1777
+#: ../libpurple/protocols/silc10/ops.c:1860
msgid "Verifying server public key"
msgstr "Проверка публичного ключа сервера"
-#: ../libpurple/protocols/silc/ops.c:1911
+#: ../libpurple/protocols/silc/ops.c:1814
+#: ../libpurple/protocols/silc10/ops.c:1902
msgid "Passphrase required"
msgstr "Требуется парольная фраза"
-#: ../libpurple/protocols/silc/ops.c:1940
-msgid "Failure: Version mismatch, upgrade your client"
-msgstr "Ошибка: Несоответствие версии, обновите своего клиента"
-
-#: ../libpurple/protocols/silc/ops.c:1943
-msgid "Failure: Remote does not trust/support your public key"
-msgstr "Ошибка: Удалённая система не признаёт/поддерживает ваш публичный ключ"
-
-#: ../libpurple/protocols/silc/ops.c:1946
-msgid "Failure: Remote does not support proposed KE group"
-msgstr "Ошибка: Удалённая система не поддерживает предложенную группу KE"
-
-#: ../libpurple/protocols/silc/ops.c:1949
-msgid "Failure: Remote does not support proposed cipher"
-msgstr "Ошибка: Удалённая система не поддерживает предложенный шифр"
-
-#: ../libpurple/protocols/silc/ops.c:1952
-msgid "Failure: Remote does not support proposed PKCS"
-msgstr "Ошибка: Удалённая система не поддерживает предложенный PKCS"
-
-#: ../libpurple/protocols/silc/ops.c:1955
-msgid "Failure: Remote does not support proposed hash function"
-msgstr "Ошибка: Удалённая система не поддерживает предложенную хэш-функцию"
-
-#: ../libpurple/protocols/silc/ops.c:1958
-msgid "Failure: Remote does not support proposed HMAC"
-msgstr "Ошибка: Удалённая система не поддерживает предложенный HMAC"
-
-#: ../libpurple/protocols/silc/ops.c:1960
-msgid "Failure: Incorrect signature"
-msgstr "Ошибка: Неправильная подпись"
-
-#: ../libpurple/protocols/silc/ops.c:1962
-msgid "Failure: Invalid cookie"
-msgstr "Ошибка: Неверные данные"
-
-#: ../libpurple/protocols/silc/ops.c:1973
-msgid "Failure: Authentication failed"
-msgstr "Ошибка: Аутентификация завершилась неудачно"
-
-#: ../libpurple/protocols/silc/pk.c:104
+#: ../libpurple/protocols/silc/pk.c:98 ../libpurple/protocols/silc10/pk.c:104
#, c-format
msgid ""
"Received %s's public key. Your local copy does not match this key. Would you "
@@ -9408,12 +9830,12 @@ msgstr ""
"Получен публичный ключ %s. Локальная копия не совпадает с этим ключом. Всё "
"ещё хотите принять этот публичный ключ?"
-#: ../libpurple/protocols/silc/pk.c:109
+#: ../libpurple/protocols/silc/pk.c:103 ../libpurple/protocols/silc10/pk.c:109
#, c-format
msgid "Received %s's public key. Would you like to accept this public key?"
msgstr "Получен публичный ключ %s. Хотите принять этот публичный ключ?"
-#: ../libpurple/protocols/silc/pk.c:113
+#: ../libpurple/protocols/silc/pk.c:107 ../libpurple/protocols/silc10/pk.c:113
#, c-format
msgid ""
"Fingerprint and babbleprint for the %s key are:\n"
@@ -9422,73 +9844,100 @@ msgid ""
"%s\n"
msgstr ""
-#: ../libpurple/protocols/silc/pk.c:116 ../libpurple/protocols/silc/pk.c:142
+#: ../libpurple/protocols/silc/pk.c:110 ../libpurple/protocols/silc/pk.c:139
+#: ../libpurple/protocols/silc10/pk.c:116
+#: ../libpurple/protocols/silc10/pk.c:142
msgid "Verify Public Key"
msgstr "Проверить публичный ключ"
-#: ../libpurple/protocols/silc/pk.c:121
+#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc10/pk.c:121
msgid "_View..."
msgstr "_Просмотреть..."
-#: ../libpurple/protocols/silc/pk.c:143
+#: ../libpurple/protocols/silc/pk.c:140 ../libpurple/protocols/silc10/pk.c:143
msgid "Unsupported public key type"
msgstr "Неподдерживаемый тип публичного ключа"
-#: ../libpurple/protocols/silc/silc.c:153
-msgid "Connection failed"
-msgstr "Не удалось установить соединение"
-
-#: ../libpurple/protocols/silc/silc.c:174
-msgid "Cannot initialize SILC Client connection"
-msgstr "Не удаётся инициализировать соединение клиента SILC"
+#: ../libpurple/protocols/silc/silc.c:217
+#: ../libpurple/protocols/silc10/ops.c:1749
+msgid "Disconnected by server"
+msgstr "Соединение разорвано сервером"
-#: ../libpurple/protocols/silc/silc.c:185
-msgid "Performing key exchange"
-msgstr "Выполнение обмена ключами"
+#: ../libpurple/protocols/silc/silc.c:224
+#: ../libpurple/protocols/silc10/ops.c:1700
+msgid "Error during connecting to SILC Server"
+msgstr "Ошибка во время соединения с сервером SILC"
-#: ../libpurple/protocols/silc/silc.c:271
-msgid "Out of memory"
-msgstr "Недостаточно памяти"
+#: ../libpurple/protocols/silc/silc.c:229
+#: ../libpurple/protocols/silc10/ops.c:1705
+msgid "Key Exchange failed"
+msgstr "Не удалось выполнить обмен ключами"
-#: ../libpurple/protocols/silc/silc.c:294
-msgid "John Noname"
+#: ../libpurple/protocols/silc/silc.c:238
+#: ../libpurple/protocols/silc10/ops.c:1714
+msgid ""
+"Resuming detached session failed. Press Reconnect to create new connection."
msgstr ""
+"Не удалось возобновить прерванную сессию. Нажмите \"Пересоединение\" для "
+"создания нового соединения."
-#: ../libpurple/protocols/silc/silc.c:317
-msgid "Cannot initialize SILC protocol"
-msgstr "Не удаётся инициализировать протокол SILC"
+#: ../libpurple/protocols/silc/silc.c:265
+#: ../libpurple/protocols/silc/silc.c:311
+#: ../libpurple/protocols/silc10/silc.c:161
+msgid "Connection failed"
+msgstr "Не удалось установить соединение"
-#: ../libpurple/protocols/silc/silc.c:324
-msgid "Cannot find/access ~/.silc directory"
-msgstr "Не удаётся найти или получить доступ к каталогу ~/.silc"
+#: ../libpurple/protocols/silc/silc.c:280
+#: ../libpurple/protocols/silc10/silc.c:193
+msgid "Performing key exchange"
+msgstr "Выполнение обмена ключами"
#. Progress
-#: ../libpurple/protocols/silc/silc.c:329
+#: ../libpurple/protocols/silc/silc.c:343
+#: ../libpurple/protocols/silc10/silc.c:325
msgid "Connecting to SILC Server"
msgstr "Соединение с сервером SILC"
-#: ../libpurple/protocols/silc/silc.c:338
-#, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr "Не удалось загрузить пару ключей SILC: %s"
+#: ../libpurple/protocols/silc/silc.c:352
+msgid "Could not load SILC key pair"
+msgstr "Не удалось загрузить пару ключей SILC"
-#: ../libpurple/protocols/silc/silc.c:359
+#: ../libpurple/protocols/silc/silc.c:366
+#: ../libpurple/protocols/silc10/silc.c:355
msgid "Unable to create connection"
msgstr "Не удаётся создать соединение"
-#: ../libpurple/protocols/silc/silc.c:658
+#: ../libpurple/protocols/silc/silc.c:395
+#: ../libpurple/protocols/silc10/silc.c:267
+msgid "Out of memory"
+msgstr "Недостаточно памяти"
+
+#: ../libpurple/protocols/silc/silc.c:438
+#: ../libpurple/protocols/silc10/silc.c:313
+msgid "Cannot initialize SILC protocol"
+msgstr "Не удаётся инициализировать протокол SILC"
+
+#: ../libpurple/protocols/silc/silc.c:445
+msgid "Error loading SILC key pair"
+msgstr "Ошибка загрузки пары ключей SILC"
+
+#: ../libpurple/protocols/silc/silc.c:739
+#: ../libpurple/protocols/silc10/silc.c:650
msgid "Your Current Mood"
msgstr "Ваше текущее настроение"
-#: ../libpurple/protocols/silc/silc.c:660 ../pidgin/gtkprefs.c:1529
+#: ../libpurple/protocols/silc/silc.c:741
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1566
msgid "Normal"
msgstr "Нормально"
-#: ../libpurple/protocols/silc/silc.c:674
+#: ../libpurple/protocols/silc/silc.c:755
+#: ../libpurple/protocols/silc10/silc.c:666
msgid "In love"
msgstr "Влюблённый"
-#: ../libpurple/protocols/silc/silc.c:685
+#: ../libpurple/protocols/silc/silc.c:766
+#: ../libpurple/protocols/silc10/silc.c:677
msgid ""
"\n"
"Your Preferred Contact Methods"
@@ -9496,46 +9945,63 @@ msgstr ""
"\n"
"Предпочитаемые вами способы контакта"
-#: ../libpurple/protocols/silc/silc.c:693
-#: ../libpurple/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc/silc.c:774
+#: ../libpurple/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc10/silc.c:685
+#: ../libpurple/protocols/silc10/util.c:557
msgid "SMS"
msgstr "SMS"
-#: ../libpurple/protocols/silc/silc.c:695
-#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc/silc.c:776
+#: ../libpurple/protocols/silc/util.c:563
+#: ../libpurple/protocols/silc10/silc.c:687
+#: ../libpurple/protocols/silc10/util.c:559
msgid "MMS"
msgstr "MMS"
-#: ../libpurple/protocols/silc/silc.c:697
+#: ../libpurple/protocols/silc/silc.c:778
+#: ../libpurple/protocols/silc10/silc.c:689
msgid "Video conferencing"
msgstr "Видеоконференция"
-#: ../libpurple/protocols/silc/silc.c:702
+#: ../libpurple/protocols/silc/silc.c:783
+#: ../libpurple/protocols/silc10/silc.c:694
msgid "Your Current Status"
msgstr "Ваш текущий статус"
-#: ../libpurple/protocols/silc/silc.c:709
+#: ../libpurple/protocols/silc/silc.c:790
+#: ../libpurple/protocols/silc10/silc.c:701
msgid "Online Services"
msgstr "Сетевые службы"
-#: ../libpurple/protocols/silc/silc.c:712
+#: ../libpurple/protocols/silc/silc.c:793
+#: ../libpurple/protocols/silc10/silc.c:704
msgid "Let others see what services you are using"
msgstr "Позволить другим видеть, какие службы вы используете"
-#: ../libpurple/protocols/silc/silc.c:718
+#: ../libpurple/protocols/silc/silc.c:799
+#: ../libpurple/protocols/silc10/silc.c:710
msgid "Let others see what computer you are using"
msgstr "Позволить другим видеть, какой компьютер вы используете"
-#: ../libpurple/protocols/silc/silc.c:725
+#: ../libpurple/protocols/silc/silc.c:806
+#: ../libpurple/protocols/silc10/silc.c:717
msgid "Your VCard File"
msgstr "Ваш файл VCard"
-#: ../libpurple/protocols/silc/silc.c:737
-#: ../libpurple/protocols/silc/silc.c:738
+#: ../libpurple/protocols/silc/silc.c:812
+msgid "Timezone (UTC)"
+msgstr "Часовой пояс (UTC)"
+
+#: ../libpurple/protocols/silc/silc.c:816
+#: ../libpurple/protocols/silc/silc.c:817
+#: ../libpurple/protocols/silc10/silc.c:729
+#: ../libpurple/protocols/silc10/silc.c:730
msgid "User Online Status Attributes"
msgstr "Атрибуты сетевого статуса пользователя"
-#: ../libpurple/protocols/silc/silc.c:739
+#: ../libpurple/protocols/silc/silc.c:818
+#: ../libpurple/protocols/silc10/silc.c:731
msgid ""
"You can let other users see your online status information and your personal "
"information. Please fill the information you would like other users to see "
@@ -9545,181 +10011,226 @@ msgstr ""
"статусе и вашу персональную информацию. Введите информацию о себе, которую "
"вы хотели бы сделать доступной для просмотра другими пользователями."
-#: ../libpurple/protocols/silc/silc.c:780
-#: ../libpurple/protocols/silc/silc.c:786
-#: ../libpurple/protocols/silc/silc.c:1426
+#: ../libpurple/protocols/silc/silc.c:859
+#: ../libpurple/protocols/silc/silc.c:865
+#: ../libpurple/protocols/silc/silc.c:1486
+#: ../libpurple/protocols/silc10/silc.c:772
+#: ../libpurple/protocols/silc10/silc.c:778
+#: ../libpurple/protocols/silc10/silc.c:1415
msgid "Message of the Day"
msgstr "Сообщение дня"
-#: ../libpurple/protocols/silc/silc.c:780
+#: ../libpurple/protocols/silc/silc.c:859
+#: ../libpurple/protocols/silc10/silc.c:772
msgid "No Message of the Day available"
msgstr "Нет доступного сообщения дня"
-#: ../libpurple/protocols/silc/silc.c:781
-#: ../libpurple/protocols/silc/silc.c:1421
+#: ../libpurple/protocols/silc/silc.c:860
+#: ../libpurple/protocols/silc/silc.c:1481
+#: ../libpurple/protocols/silc10/silc.c:773
+#: ../libpurple/protocols/silc10/silc.c:1410
msgid "There is no Message of the Day associated with this connection"
msgstr "Нет сообщения дня, соотнесённого с этим соединением"
-#: ../libpurple/protocols/silc/silc.c:832
-#: ../libpurple/protocols/silc/silc.c:876
-#: ../libpurple/protocols/silc/silc.c:947
-#: ../libpurple/protocols/silc/silc.c:948
+#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc/silc.c:957
+#: ../libpurple/protocols/silc/silc.c:1028
+#: ../libpurple/protocols/silc/silc.c:1029
+#: ../libpurple/protocols/silc10/silc.c:824
+#: ../libpurple/protocols/silc10/silc.c:868
+#: ../libpurple/protocols/silc10/silc.c:939
+#: ../libpurple/protocols/silc10/silc.c:940
msgid "Create New SILC Key Pair"
msgstr "Создать новую пару ключей SILC"
-#: ../libpurple/protocols/silc/silc.c:832
+#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc10/silc.c:824
msgid "Passphrases do not match"
msgstr "Парольные фразы не совпадают"
-#: ../libpurple/protocols/silc/silc.c:876
+#: ../libpurple/protocols/silc/silc.c:957
+#: ../libpurple/protocols/silc10/silc.c:868
msgid "Key Pair Generation failed"
msgstr "Не удалось выполнить генерацию пары ключей"
-#: ../libpurple/protocols/silc/silc.c:915
+#: ../libpurple/protocols/silc/silc.c:996
+#: ../libpurple/protocols/silc10/silc.c:907
msgid "Key length"
msgstr "Длина ключа"
-#: ../libpurple/protocols/silc/silc.c:917
+#: ../libpurple/protocols/silc/silc.c:998
+#: ../libpurple/protocols/silc10/silc.c:909
msgid "Public key file"
msgstr "Файл публичного ключа"
-#: ../libpurple/protocols/silc/silc.c:919
+#: ../libpurple/protocols/silc/silc.c:1000
+#: ../libpurple/protocols/silc10/silc.c:911
msgid "Private key file"
msgstr "Файл личного ключа"
-#: ../libpurple/protocols/silc/silc.c:942
+#: ../libpurple/protocols/silc/silc.c:1023
+#: ../libpurple/protocols/silc10/silc.c:934
msgid "Passphrase (retype)"
msgstr "Парольная фраза (наберите ещё раз)"
-#: ../libpurple/protocols/silc/silc.c:949
+#: ../libpurple/protocols/silc/silc.c:1030
+#: ../libpurple/protocols/silc10/silc.c:941
msgid "Generate Key Pair"
msgstr "Сгенерировать пару ключей"
-#: ../libpurple/protocols/silc/silc.c:994
+#: ../libpurple/protocols/silc/silc.c:1073
+#: ../libpurple/protocols/silc10/silc.c:984
msgid "Online Status"
msgstr "Сетевой статус"
-#: ../libpurple/protocols/silc/silc.c:1003
+#: ../libpurple/protocols/silc/silc.c:1081
+#: ../libpurple/protocols/silc10/silc.c:992
msgid "View Message of the Day"
msgstr "Просмотреть сообщение дня"
-#: ../libpurple/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc/silc.c:1085
+#: ../libpurple/protocols/silc10/silc.c:996
msgid "Create SILC Key Pair..."
msgstr "Создать пару ключей SILC..."
-#: ../libpurple/protocols/silc/silc.c:1106
+#: ../libpurple/protocols/silc/silc.c:1177
+#: ../libpurple/protocols/silc10/silc.c:1095
#, c-format
msgid "User <I>%s</I> is not present in the network"
msgstr "Пользователь <I>%s</I> не присутствует в сети"
-#: ../libpurple/protocols/silc/silc.c:1297
+#: ../libpurple/protocols/silc/silc.c:1357
+#: ../libpurple/protocols/silc10/silc.c:1286
msgid "Topic too long"
msgstr "Тема слишком велика"
-#: ../libpurple/protocols/silc/silc.c:1378
+#: ../libpurple/protocols/silc/silc.c:1438
+#: ../libpurple/protocols/silc10/silc.c:1367
msgid "You must specify a nick"
msgstr "Вы должны указать псевдоним"
-#: ../libpurple/protocols/silc/silc.c:1480
+#: ../libpurple/protocols/silc/silc.c:1540
+#: ../libpurple/protocols/silc10/silc.c:1469
#, c-format
msgid "channel %s not found"
msgstr "канал %s не найден"
-#: ../libpurple/protocols/silc/silc.c:1485
+#: ../libpurple/protocols/silc/silc.c:1545
+#: ../libpurple/protocols/silc10/silc.c:1474
#, c-format
msgid "channel modes for %s: %s"
msgstr "режимы канала для %s: %s"
-#: ../libpurple/protocols/silc/silc.c:1487
+#: ../libpurple/protocols/silc/silc.c:1547
+#: ../libpurple/protocols/silc10/silc.c:1476
#, c-format
msgid "no channel modes are set on %s"
msgstr "нет установленных режимов канала на %s"
-#: ../libpurple/protocols/silc/silc.c:1500
+#: ../libpurple/protocols/silc/silc.c:1560
+#: ../libpurple/protocols/silc10/silc.c:1489
#, c-format
msgid "Failed to set cmodes for %s"
msgstr "Не удалось установить режимы канала для %s"
-#: ../libpurple/protocols/silc/silc.c:1530
+#: ../libpurple/protocols/silc/silc.c:1590
+#: ../libpurple/protocols/silc10/silc.c:1519
#, c-format
msgid "Unknown command: %s, (may be a client bug)"
msgstr "Неизвестная команда: %s, (возможно, ошибка в клиенте)"
-#: ../libpurple/protocols/silc/silc.c:1593
+#: ../libpurple/protocols/silc/silc.c:1653
+#: ../libpurple/protocols/silc10/silc.c:1582
msgid "part [channel]: Leave the chat"
msgstr "part [канал]: Покинуть чат"
-#: ../libpurple/protocols/silc/silc.c:1597
+#: ../libpurple/protocols/silc/silc.c:1657
+#: ../libpurple/protocols/silc10/silc.c:1586
msgid "leave [channel]: Leave the chat"
msgstr "leave [канал]: Покинуть чат"
-#: ../libpurple/protocols/silc/silc.c:1601
+#: ../libpurple/protocols/silc/silc.c:1661
+#: ../libpurple/protocols/silc10/silc.c:1590
msgid "topic [&lt;new topic&gt;]: View or change the topic"
msgstr "topic [&lt;новая тема&gt;]: Просмотреть или изменить тему"
-#: ../libpurple/protocols/silc/silc.c:1606
+#: ../libpurple/protocols/silc/silc.c:1666
+#: ../libpurple/protocols/silc10/silc.c:1595
msgid "join &lt;channel&gt; [&lt;password&gt;]: Join a chat on this network"
msgstr ""
"join &lt;канал&gt; [&lt;пароль&gt;]: Присоединиться к чату в этой сети"
-#: ../libpurple/protocols/silc/silc.c:1610
+#: ../libpurple/protocols/silc/silc.c:1670
+#: ../libpurple/protocols/silc10/silc.c:1599
msgid "list: List channels on this network"
msgstr "list: Вывести список каналов в этой сети"
-#: ../libpurple/protocols/silc/silc.c:1614
+#: ../libpurple/protocols/silc/silc.c:1674
+#: ../libpurple/protocols/silc10/silc.c:1603
msgid "whois &lt;nick&gt;: View nick's information"
msgstr "whois &lt;псевдоним&gt;: Просмотреть информацию о пользователе"
-#: ../libpurple/protocols/silc/silc.c:1618
-#: ../libpurple/protocols/zephyr/zephyr.c:2684
+#: ../libpurple/protocols/silc/silc.c:1678
+#: ../libpurple/protocols/silc10/silc.c:1607
+#: ../libpurple/protocols/zephyr/zephyr.c:2685
msgid "msg &lt;nick&gt; &lt;message&gt;: Send a private message to a user"
msgstr ""
"msg &lt;псевдоним&gt; &lt;сообщение&gt;: Отправить пользователю личное "
"сообщение"
-#: ../libpurple/protocols/silc/silc.c:1622
+#: ../libpurple/protocols/silc/silc.c:1682
+#: ../libpurple/protocols/silc10/silc.c:1611
msgid "query &lt;nick&gt; [&lt;message&gt;]: Send a private message to a user"
msgstr ""
"query &lt;псевдоним&gt; [&lt;сообщение&gt;]: Отправить пользователю личное "
"сообщение"
-#: ../libpurple/protocols/silc/silc.c:1626
+#: ../libpurple/protocols/silc/silc.c:1686
+#: ../libpurple/protocols/silc10/silc.c:1615
msgid "motd: View the server's Message Of The Day"
msgstr "motd: Просмотреть сообщение дня сервера"
-#: ../libpurple/protocols/silc/silc.c:1630
+#: ../libpurple/protocols/silc/silc.c:1690
+#: ../libpurple/protocols/silc10/silc.c:1619
msgid "detach: Detach this session"
msgstr "detach: Прервать эту сессию"
-#: ../libpurple/protocols/silc/silc.c:1634
+#: ../libpurple/protocols/silc/silc.c:1694
+#: ../libpurple/protocols/silc10/silc.c:1623
msgid "quit [message]: Disconnect from the server, with an optional message"
msgstr ""
"quit [сообщение]: Разорвать соединение с сервером, сообщение необязательно"
-#: ../libpurple/protocols/silc/silc.c:1638
+#: ../libpurple/protocols/silc/silc.c:1698
+#: ../libpurple/protocols/silc10/silc.c:1627
msgid "call &lt;command&gt;: Call any silc client command"
msgstr "call &lt;команда&gt;: Вызвать любую команду клиента silc"
-#: ../libpurple/protocols/silc/silc.c:1644
+#: ../libpurple/protocols/silc/silc.c:1704
+#: ../libpurple/protocols/silc10/silc.c:1633
msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]: Kill nick"
msgstr ""
"kill &lt;псевдоним&gt; [-публичный ключ|&lt;причина&gt;]: Убить пользователя"
-#: ../libpurple/protocols/silc/silc.c:1648
+#: ../libpurple/protocols/silc/silc.c:1708
+#: ../libpurple/protocols/silc10/silc.c:1637
msgid "nick &lt;newnick&gt;: Change your nickname"
msgstr "nick &lt;новый псевдоним&gt;: Изменить свой псевдоним"
-#: ../libpurple/protocols/silc/silc.c:1652
+#: ../libpurple/protocols/silc/silc.c:1712
+#: ../libpurple/protocols/silc10/silc.c:1641
msgid "whowas &lt;nick&gt;: View nick's information"
msgstr "whowas &lt;псевдоним&gt;: Просмотреть информацию о пользователе"
-#: ../libpurple/protocols/silc/silc.c:1656
+#: ../libpurple/protocols/silc/silc.c:1716
+#: ../libpurple/protocols/silc10/silc.c:1645
msgid ""
"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]: Change or display "
"channel modes"
msgstr ""
-#: ../libpurple/protocols/silc/silc.c:1660
+#: ../libpurple/protocols/silc/silc.c:1720
+#: ../libpurple/protocols/silc10/silc.c:1649
msgid ""
"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;: Change nick's modes "
"on channel"
@@ -9727,57 +10238,68 @@ msgstr ""
"cumode &lt;канал&gt; +|-&lt;режимы&gt; &lt;псевдоним&gt;: Изменить режимы "
"пользователя на канале"
-#: ../libpurple/protocols/silc/silc.c:1664
+#: ../libpurple/protocols/silc/silc.c:1724
+#: ../libpurple/protocols/silc10/silc.c:1653
msgid "umode &lt;usermodes&gt;: Set your modes in the network"
msgstr "umode &lt;режимы пользователя&gt;: Установить свои режимы в сети"
-#: ../libpurple/protocols/silc/silc.c:1668
+#: ../libpurple/protocols/silc/silc.c:1728
+#: ../libpurple/protocols/silc10/silc.c:1657
msgid "oper &lt;nick&gt; [-pubkey]: Get server operator privileges"
msgstr ""
"oper &lt;псевдоним&gt; [-публичный ключ]: Получить привилегии оператора "
"сервера"
-#: ../libpurple/protocols/silc/silc.c:1672
+#: ../libpurple/protocols/silc/silc.c:1732
+#: ../libpurple/protocols/silc10/silc.c:1661
msgid ""
"invite &lt;channel&gt; [-|+]&lt;nick&gt;: invite nick or add/remove from "
"channel invite list"
msgstr ""
-#: ../libpurple/protocols/silc/silc.c:1676
+#: ../libpurple/protocols/silc/silc.c:1736
+#: ../libpurple/protocols/silc10/silc.c:1665
msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]: Kick client from channel"
msgstr ""
"kick &lt;канал&gt; &lt;псевдоним&gt; [комментарий]: Удалить пользователя с "
"канала"
-#: ../libpurple/protocols/silc/silc.c:1680
+#: ../libpurple/protocols/silc/silc.c:1740
+#: ../libpurple/protocols/silc10/silc.c:1669
msgid "info [server]: View server administrative details"
msgstr "info [сервер]: Просмотреть административные подробности о сервере"
-#: ../libpurple/protocols/silc/silc.c:1684
+#: ../libpurple/protocols/silc/silc.c:1744
+#: ../libpurple/protocols/silc10/silc.c:1673
msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]: Ban client from channel"
msgstr ""
"ban [&lt;канал&gt; +|-&lt;псевдоним&gt;]: Выгнать пользователя с канала"
-#: ../libpurple/protocols/silc/silc.c:1688
+#: ../libpurple/protocols/silc/silc.c:1748
+#: ../libpurple/protocols/silc10/silc.c:1677
msgid "getkey &lt;nick|server&gt;: Retrieve client's or server's public key"
msgstr ""
"getkey &lt;псевдоним|сервер&gt;: Загрузить публичный ключ пользователя или "
"сервера"
-#: ../libpurple/protocols/silc/silc.c:1692
+#: ../libpurple/protocols/silc/silc.c:1752
+#: ../libpurple/protocols/silc10/silc.c:1681
msgid "stats: View server and network statistics"
msgstr "stats: Просмотреть статистику сервера и сети"
-#: ../libpurple/protocols/silc/silc.c:1696
+#: ../libpurple/protocols/silc/silc.c:1756
+#: ../libpurple/protocols/silc10/silc.c:1685
msgid "ping: Send PING to the connected server"
msgstr "ping: Послать PING серверу"
-#: ../libpurple/protocols/silc/silc.c:1701
+#: ../libpurple/protocols/silc/silc.c:1761
+#: ../libpurple/protocols/silc10/silc.c:1690
msgid "users &lt;channel&gt;: List users in channel"
msgstr ""
"users &lt;канал&gt;: Вывести список пользователей, присутствующих на канале"
-#: ../libpurple/protocols/silc/silc.c:1705
+#: ../libpurple/protocols/silc/silc.c:1765
+#: ../libpurple/protocols/silc10/silc.c:1694
msgid ""
"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;: List "
"specific users in channel(s)"
@@ -9792,116 +10314,141 @@ msgstr ""
#. *< name
#. *< version
#. * summary
-#: ../libpurple/protocols/silc/silc.c:1828
+#: ../libpurple/protocols/silc/silc.c:1875
+#: ../libpurple/protocols/silc10/silc.c:1817
msgid "SILC Protocol Plugin"
msgstr "Модуль протокола SILC"
#. * description
-#: ../libpurple/protocols/silc/silc.c:1830
+#: ../libpurple/protocols/silc/silc.c:1877
+#: ../libpurple/protocols/silc10/silc.c:1819
msgid "Secure Internet Live Conferencing (SILC) Protocol"
msgstr "Протокол Secure Internet Live Conferencing (SILC)"
-#: ../libpurple/protocols/silc/silc.c:1862 ../pidgin/gtkprefs.c:1920
+#: ../libpurple/protocols/silc/silc.c:1909
+#: ../libpurple/protocols/silc10/silc.c:1851 ../pidgin/gtkprefs.c:1959
msgid "Network"
msgstr "Сеть"
-#: ../libpurple/protocols/silc/silc.c:1873
+#: ../libpurple/protocols/silc/silc.c:1920
+#: ../libpurple/protocols/silc10/silc.c:1862
msgid "Public Key file"
msgstr "Файл публичного ключа"
-#: ../libpurple/protocols/silc/silc.c:1877
+#: ../libpurple/protocols/silc/silc.c:1924
+#: ../libpurple/protocols/silc10/silc.c:1866
msgid "Private Key file"
msgstr "Файл личного ключа"
-#: ../libpurple/protocols/silc/silc.c:1887
+#: ../libpurple/protocols/silc/silc.c:1934
+#: ../libpurple/protocols/silc10/silc.c:1876
msgid "Cipher"
msgstr "Шифр"
-#: ../libpurple/protocols/silc/silc.c:1897
+#: ../libpurple/protocols/silc/silc.c:1944
+#: ../libpurple/protocols/silc10/silc.c:1886
msgid "HMAC"
msgstr "HMAC"
-#: ../libpurple/protocols/silc/silc.c:1900
+#: ../libpurple/protocols/silc/silc.c:1947
+msgid "Use Perfect Forward Secrecy"
+msgstr ""
+
+#: ../libpurple/protocols/silc/silc.c:1951
+#: ../libpurple/protocols/silc10/silc.c:1889
msgid "Public key authentication"
msgstr "Аутентификация публичного ключа"
-#: ../libpurple/protocols/silc/silc.c:1903
-msgid "Reject watching by other users"
-msgstr "Запретить просмотр другими пользователями"
-
-#: ../libpurple/protocols/silc/silc.c:1906
-msgid "Block invites"
-msgstr "Блокировать приглашения"
-
-#: ../libpurple/protocols/silc/silc.c:1909
+#: ../libpurple/protocols/silc/silc.c:1954
+#: ../libpurple/protocols/silc10/silc.c:1892
msgid "Block IMs without Key Exchange"
msgstr "Блокировать сообщения без обмена ключами"
-#: ../libpurple/protocols/silc/silc.c:1912
-msgid "Reject online status attribute requests"
-msgstr "Отвергать запросы атрибута сетевого статуса"
-
-#: ../libpurple/protocols/silc/silc.c:1915
+#: ../libpurple/protocols/silc/silc.c:1957
+#: ../libpurple/protocols/silc10/silc.c:1895
msgid "Block messages to whiteboard"
msgstr ""
-#: ../libpurple/protocols/silc/silc.c:1918
+#: ../libpurple/protocols/silc/silc.c:1960
+#: ../libpurple/protocols/silc10/silc.c:1898
msgid "Automatically open whiteboard"
msgstr ""
-#: ../libpurple/protocols/silc/silc.c:1921
+#: ../libpurple/protocols/silc/silc.c:1963
+#: ../libpurple/protocols/silc10/silc.c:1901
msgid "Digitally sign and verify all messages"
msgstr "Делать цифровую подпись и проверку всех сообщений"
#: ../libpurple/protocols/silc/util.c:207
-#: ../libpurple/protocols/silc/util.c:247
+#: ../libpurple/protocols/silc/util.c:249
+#: ../libpurple/protocols/silc10/util.c:207
+#: ../libpurple/protocols/silc10/util.c:247
msgid "Creating SILC key pair..."
msgstr "Создание пары ключей SILC..."
+#: ../libpurple/protocols/silc/util.c:215
+#: ../libpurple/protocols/silc/util.c:257
+msgid "Cannot create SILC key pair\n"
+msgstr "Не удаётся создать пару ключей SILC\n"
+
#. Hint for translators: Please check the tabulator width here and in
#. the next strings (short strings: 2 tabs, longer strings 1 tab,
#. sum: 3 tabs or 24 characters)
-#: ../libpurple/protocols/silc/util.c:355
+#: ../libpurple/protocols/silc/util.c:358
+#: ../libpurple/protocols/silc10/util.c:355
#, c-format
msgid "Real Name: \t%s\n"
msgstr "Настоящее имя: \t%s\n"
-#: ../libpurple/protocols/silc/util.c:357
+#: ../libpurple/protocols/silc/util.c:360
+#: ../libpurple/protocols/silc10/util.c:357
#, c-format
msgid "User Name: \t%s\n"
msgstr "Имя пользователя: \t%s\n"
-#: ../libpurple/protocols/silc/util.c:359
+#: ../libpurple/protocols/silc/util.c:362
+#: ../libpurple/protocols/silc10/util.c:359
#, c-format
msgid "E-Mail: \t\t%s\n"
msgstr "E-mail: \t\t%s\n"
-#: ../libpurple/protocols/silc/util.c:361
+#: ../libpurple/protocols/silc/util.c:364
+#: ../libpurple/protocols/silc10/util.c:361
#, c-format
msgid "Host Name: \t%s\n"
msgstr "Имя узла: \t%s\n"
-#: ../libpurple/protocols/silc/util.c:363
+#: ../libpurple/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc10/util.c:363
#, c-format
msgid "Organization: \t%s\n"
msgstr "Организация: \t%s\n"
-#: ../libpurple/protocols/silc/util.c:365
+#: ../libpurple/protocols/silc/util.c:368
+#: ../libpurple/protocols/silc10/util.c:365
#, c-format
msgid "Country: \t%s\n"
msgstr "Страна: \t%s\n"
-#: ../libpurple/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc10/util.c:366
#, c-format
msgid "Algorithm: \t%s\n"
msgstr "Алгоритм: \t%s\n"
-#: ../libpurple/protocols/silc/util.c:367
+#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc10/util.c:367
#, c-format
msgid "Key Length: \t%d bits\n"
msgstr "Длина ключа: \t%d бит\n"
-#: ../libpurple/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc/util.c:372
+#, c-format
+msgid "Version: \t%s\n"
+msgstr "Версия: \t%s\n"
+
+#: ../libpurple/protocols/silc/util.c:374
+#: ../libpurple/protocols/silc10/util.c:369
#, c-format
msgid ""
"Public Key Fingerprint:\n"
@@ -9909,80 +10456,149 @@ msgid ""
"\n"
msgstr ""
-#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc10/util.c:370
#, c-format
msgid ""
"Public Key Babbleprint:\n"
"%s"
msgstr ""
-#: ../libpurple/protocols/silc/util.c:374
-#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc/util.c:379
+#: ../libpurple/protocols/silc/util.c:380
+#: ../libpurple/protocols/silc10/util.c:374
+#: ../libpurple/protocols/silc10/util.c:375
msgid "Public Key Information"
msgstr "Информация о публичном ключе"
-#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc10/util.c:555
msgid "Paging"
msgstr ""
-#: ../libpurple/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc/util.c:565
+#: ../libpurple/protocols/silc10/util.c:561
msgid "Video Conferencing"
msgstr "Видеоконференция"
-#: ../libpurple/protocols/silc/util.c:579
+#: ../libpurple/protocols/silc/util.c:583
+#: ../libpurple/protocols/silc10/util.c:579
msgid "Computer"
msgstr "Компьютер"
-#: ../libpurple/protocols/silc/util.c:583
+#: ../libpurple/protocols/silc/util.c:587
+#: ../libpurple/protocols/silc10/util.c:583
msgid "PDA"
msgstr "PDA"
-#: ../libpurple/protocols/silc/util.c:585
+#: ../libpurple/protocols/silc/util.c:589
+#: ../libpurple/protocols/silc10/util.c:585
msgid "Terminal"
msgstr "Терминал"
-#: ../libpurple/protocols/silc/wb.c:284
+#: ../libpurple/protocols/silc/wb.c:284 ../libpurple/protocols/silc10/wb.c:284
#, c-format
msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
msgstr ""
-#: ../libpurple/protocols/silc/wb.c:288
+#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:288
#, c-format
msgid ""
"%s sent message to whiteboard on %s channel. Would you like to open the "
"whiteboard?"
msgstr ""
-#: ../libpurple/protocols/silc/wb.c:302
+#: ../libpurple/protocols/silc/wb.c:302 ../libpurple/protocols/silc10/wb.c:302
msgid "Whiteboard"
msgstr ""
+#: ../libpurple/protocols/silc10/ops.c:1559
+msgid "No server statistics available"
+msgstr "Нет доступной статистики сервера"
+
+#: ../libpurple/protocols/silc10/ops.c:1931
+msgid "Failure: Version mismatch, upgrade your client"
+msgstr "Ошибка: Несоответствие версии, обновите свой клиент"
+
+#: ../libpurple/protocols/silc10/ops.c:1934
+msgid "Failure: Remote does not trust/support your public key"
+msgstr "Ошибка: Удалённая система не признаёт/поддерживает ваш публичный ключ"
+
+#: ../libpurple/protocols/silc10/ops.c:1937
+msgid "Failure: Remote does not support proposed KE group"
+msgstr "Ошибка: Удалённая система не поддерживает предложенную группу KE"
+
+#: ../libpurple/protocols/silc10/ops.c:1940
+msgid "Failure: Remote does not support proposed cipher"
+msgstr "Ошибка: Удалённая система не поддерживает предложенный шифр"
+
+#: ../libpurple/protocols/silc10/ops.c:1943
+msgid "Failure: Remote does not support proposed PKCS"
+msgstr "Ошибка: Удалённая система не поддерживает предложенный PKCS"
+
+#: ../libpurple/protocols/silc10/ops.c:1946
+msgid "Failure: Remote does not support proposed hash function"
+msgstr "Ошибка: Удалённая система не поддерживает предложенную хэш-функцию"
+
+#: ../libpurple/protocols/silc10/ops.c:1949
+msgid "Failure: Remote does not support proposed HMAC"
+msgstr "Ошибка: Удалённая система не поддерживает предложенный HMAC"
+
+#: ../libpurple/protocols/silc10/ops.c:1951
+msgid "Failure: Incorrect signature"
+msgstr "Ошибка: Неправильная подпись"
+
+#: ../libpurple/protocols/silc10/ops.c:1953
+msgid "Failure: Invalid cookie"
+msgstr "Ошибка: Неверные данные"
+
+#: ../libpurple/protocols/silc10/ops.c:1964
+msgid "Failure: Authentication failed"
+msgstr "Ошибка: Аутентификация завершилась неудачно"
+
+#: ../libpurple/protocols/silc10/silc.c:182
+msgid "Cannot initialize SILC Client connection"
+msgstr "Не удаётся инициализировать соединение клиента SILC"
+
+#: ../libpurple/protocols/silc10/silc.c:290
+msgid "John Noname"
+msgstr ""
+
+#: ../libpurple/protocols/silc10/silc.c:320
+msgid "Cannot find/access ~/.silc directory"
+msgstr "Не удаётся найти или получить доступ к каталогу ~/.silc"
+
+#: ../libpurple/protocols/silc10/silc.c:334
+#, c-format
+msgid "Could not load SILC key pair: %s"
+msgstr "Не удалось загрузить пару ключей SILC: %s"
+
#. TODO: do we really want to disconnect on a failure to write?
#: ../libpurple/protocols/simple/simple.c:416
msgid "Could not write"
msgstr "Не удалось записать"
#: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1486
+#: ../libpurple/protocols/simple/simple.c:1484
msgid "Could not connect"
msgstr "Не удалось установить соединение"
-#: ../libpurple/protocols/simple/simple.c:1520
-#: ../libpurple/protocols/simple/simple.c:1562
-#: ../libpurple/protocols/simple/simple.c:1575
-#: ../libpurple/protocols/simple/simple.c:1626
+#: ../libpurple/protocols/simple/simple.c:1518
+#: ../libpurple/protocols/simple/simple.c:1560
+#: ../libpurple/protocols/simple/simple.c:1573
+#: ../libpurple/protocols/simple/simple.c:1624
msgid "Could not create listen socket"
msgstr "Не удалось создать сокет для прослушивания"
-#: ../libpurple/protocols/simple/simple.c:1543
+#: ../libpurple/protocols/simple/simple.c:1541
msgid "Couldn't resolve host"
msgstr "Не удалось разрешить имя узла"
-#: ../libpurple/protocols/simple/simple.c:1634
+#: ../libpurple/protocols/simple/simple.c:1632
msgid "Could not resolve hostname"
msgstr "Не удалось разрешить имя узла"
-#: ../libpurple/protocols/simple/simple.c:1651
+#: ../libpurple/protocols/simple/simple.c:1649
msgid "SIP screen names may not contain whitespaces or @ symbols"
msgstr ""
"Идентификаторы пользователей SIP не могут содержать пробелы или символы @"
@@ -9995,36 +10611,36 @@ msgstr ""
#. *< id
#. *< name
#. *< version
-#: ../libpurple/protocols/simple/simple.c:1826
+#: ../libpurple/protocols/simple/simple.c:1824
msgid "SIP/SIMPLE Protocol Plugin"
msgstr "Модуль протокола SIP/SIMPLE"
#. * summary
-#: ../libpurple/protocols/simple/simple.c:1827
+#: ../libpurple/protocols/simple/simple.c:1825
msgid "The SIP/SIMPLE Protocol Plugin"
msgstr "Модуль протокола SIP/SIMPLE"
-#: ../libpurple/protocols/simple/simple.c:1855
+#: ../libpurple/protocols/simple/simple.c:1853
msgid "Publish status (note: everyone may watch you)"
msgstr ""
-#: ../libpurple/protocols/simple/simple.c:1861
+#: ../libpurple/protocols/simple/simple.c:1859
msgid "Use UDP"
msgstr "Использовать UDP"
-#: ../libpurple/protocols/simple/simple.c:1863
+#: ../libpurple/protocols/simple/simple.c:1861
msgid "Use proxy"
msgstr "Использовать прокси"
-#: ../libpurple/protocols/simple/simple.c:1865
+#: ../libpurple/protocols/simple/simple.c:1863
msgid "Proxy"
msgstr "Прокси"
-#: ../libpurple/protocols/simple/simple.c:1867
+#: ../libpurple/protocols/simple/simple.c:1865
msgid "Auth User"
msgstr ""
-#: ../libpurple/protocols/simple/simple.c:1869
+#: ../libpurple/protocols/simple/simple.c:1867
msgid "Auth Domain"
msgstr ""
@@ -10184,7 +10800,8 @@ msgstr ""
msgid "Password Change Successful"
msgstr "Пароль изменён успешно"
-#: ../libpurple/protocols/toc/toc.c:1366
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5460
+#: ../pidgin/gtkblist.c:5814
msgid "_Group:"
msgstr "_Группа:"
@@ -10246,30 +10863,30 @@ msgstr "%s запрашивает передачу файла ему"
msgid "TOC Protocol Plugin"
msgstr "Модуль протокола TOC"
-#: ../libpurple/protocols/yahoo/yahoo.c:808
+#: ../libpurple/protocols/yahoo/yahoo.c:810
msgid "Your Yahoo! message did not get sent."
msgstr "Ваше сообщение Yahoo! не отправлено."
-#: ../libpurple/protocols/yahoo/yahoo.c:878
+#: ../libpurple/protocols/yahoo/yahoo.c:880
#, c-format
msgid "%s just sent you a Buzz!"
msgstr ""
-#: ../libpurple/protocols/yahoo/yahoo.c:928
+#: ../libpurple/protocols/yahoo/yahoo.c:927
#, c-format
msgid "Yahoo! system message for %s:"
msgstr "Системное сообщение Yahoo! для %s:"
-#: ../libpurple/protocols/yahoo/yahoo.c:988
+#: ../libpurple/protocols/yahoo/yahoo.c:986
msgid "Authorization denied message:"
msgstr "Сообщение отказа в авторизации:"
-#: ../libpurple/protocols/yahoo/yahoo.c:1069
+#: ../libpurple/protocols/yahoo/yahoo.c:1067
#, c-format
msgid "%s has (retroactively) denied your request to add them to your list."
msgstr "%s (повторно) не разрешил добавить его в ваш список."
-#: ../libpurple/protocols/yahoo/yahoo.c:1072
+#: ../libpurple/protocols/yahoo/yahoo.c:1070
#, c-format
msgid ""
"%s has (retroactively) denied your request to add them to your list for the "
@@ -10277,11 +10894,11 @@ msgid ""
msgstr ""
"%s (повторно) не разрешил добавить его в ваш список по следующей причине: %s."
-#: ../libpurple/protocols/yahoo/yahoo.c:1075
+#: ../libpurple/protocols/yahoo/yahoo.c:1073
msgid "Add buddy rejected"
msgstr "В добавлении собеседника отказано"
-#: ../libpurple/protocols/yahoo/yahoo.c:1826
+#: ../libpurple/protocols/yahoo/yahoo.c:1824
#, c-format
msgid ""
"The Yahoo server has requested the use of an unrecognized authentication "
@@ -10289,163 +10906,181 @@ msgid ""
"Check %s for updates."
msgstr ""
-#: ../libpurple/protocols/yahoo/yahoo.c:1829
+#: ../libpurple/protocols/yahoo/yahoo.c:1827
msgid "Failed Yahoo! Authentication"
msgstr "Аутентификация Yahoo! завершилась неудачно"
-#: ../libpurple/protocols/yahoo/yahoo.c:1895
+#: ../libpurple/protocols/yahoo/yahoo.c:1893
#, c-format
msgid ""
"You have tried to ignore %s, but the user is on your buddy list. Clicking "
"\"Yes\" will remove and ignore the buddy."
msgstr ""
-#: ../libpurple/protocols/yahoo/yahoo.c:1898
+#: ../libpurple/protocols/yahoo/yahoo.c:1896
msgid "Ignore buddy?"
msgstr "Игнорировать собеседника?"
-#: ../libpurple/protocols/yahoo/yahoo.c:1957
+#: ../libpurple/protocols/yahoo/yahoo.c:1955
msgid "Your account is locked, please log in to the Yahoo! website."
msgstr "Ваша учётная запись заблокирована, войдите с веб-сайта Yahoo!."
-#: ../libpurple/protocols/yahoo/yahoo.c:1960
+#: ../libpurple/protocols/yahoo/yahoo.c:1958
#, c-format
msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
msgstr ""
"Неизвестная ошибка номер %d. Вход с веб-сайта Yahoo! может исправить это."
-#: ../libpurple/protocols/yahoo/yahoo.c:2014
+#: ../libpurple/protocols/yahoo/yahoo.c:2012
#, c-format
msgid "Could not add buddy %s to group %s to the server list on account %s."
msgstr ""
"Не удалось добавить собеседника %s в группу %s в список на сервере учётной "
"записи %s."
-#: ../libpurple/protocols/yahoo/yahoo.c:2017
+#: ../libpurple/protocols/yahoo/yahoo.c:2015
msgid "Could not add buddy to server list"
msgstr "Не удалось добавить собеседника в список на сервере"
-#: ../libpurple/protocols/yahoo/yahoo.c:2136
+#: ../libpurple/protocols/yahoo/yahoo.c:2134
#, c-format
msgid "[ Audible %s/%s/%s.swf ] %s"
msgstr ""
-#: ../libpurple/protocols/yahoo/yahoo.c:2468
+#: ../libpurple/protocols/yahoo/yahoo.c:2474
msgid "Received unexpected HTTP response from server."
msgstr "Получен непредвиденный HTTP-отклик от сервера."
-#: ../libpurple/protocols/yahoo/yahoo.c:2492
-#: ../libpurple/protocols/yahoo/yahoo.c:2671
-#: ../libpurple/protocols/yahoo/yahoo.c:2774
-#: ../libpurple/protocols/yahoo/yahoo.c:2784
+#: ../libpurple/protocols/yahoo/yahoo.c:2498
+#: ../libpurple/protocols/yahoo/yahoo.c:2684
+#: ../libpurple/protocols/yahoo/yahoo.c:2787
+#: ../libpurple/protocols/yahoo/yahoo.c:2797
#: ../libpurple/protocols/yahoo/yahoochat.c:1455
#: ../libpurple/protocols/yahoo/yahoochat.c:1525
#: ../libpurple/protocols/yahoo/ycht.c:585
msgid "Connection problem"
msgstr "Проблема с соединением"
-#: ../libpurple/protocols/yahoo/yahoo.c:2886
-#: ../libpurple/protocols/yahoo/yahoo.c:3497
+#: ../libpurple/protocols/yahoo/yahoo.c:2524
+#, c-format
+msgid ""
+"Lost connection with %s:\n"
+"%s"
+msgstr ""
+"Соединение с %s потеряно:\n"
+"%s"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2549
+#, c-format
+msgid ""
+"Could not establish a connection with %s:\n"
+"%s"
+msgstr ""
+"Не удалось установить соединение с %s:\n"
+"%s"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2899
+#: ../libpurple/protocols/yahoo/yahoo.c:3510
msgid "Not at Home"
msgstr "Не дома"
-#: ../libpurple/protocols/yahoo/yahoo.c:2888
-#: ../libpurple/protocols/yahoo/yahoo.c:3500
+#: ../libpurple/protocols/yahoo/yahoo.c:2901
+#: ../libpurple/protocols/yahoo/yahoo.c:3513
msgid "Not at Desk"
msgstr "Не за столом"
-#: ../libpurple/protocols/yahoo/yahoo.c:2890
-#: ../libpurple/protocols/yahoo/yahoo.c:3503
+#: ../libpurple/protocols/yahoo/yahoo.c:2903
+#: ../libpurple/protocols/yahoo/yahoo.c:3516
msgid "Not in Office"
msgstr "Не в офисе"
-#: ../libpurple/protocols/yahoo/yahoo.c:2894
-#: ../libpurple/protocols/yahoo/yahoo.c:3509
+#: ../libpurple/protocols/yahoo/yahoo.c:2907
+#: ../libpurple/protocols/yahoo/yahoo.c:3522
msgid "On Vacation"
msgstr "В отпуске"
-#: ../libpurple/protocols/yahoo/yahoo.c:2898
-#: ../libpurple/protocols/yahoo/yahoo.c:3515
+#: ../libpurple/protocols/yahoo/yahoo.c:2911
+#: ../libpurple/protocols/yahoo/yahoo.c:3528
msgid "Stepped Out"
msgstr "Вышел"
-#: ../libpurple/protocols/yahoo/yahoo.c:2991
-#: ../libpurple/protocols/yahoo/yahoo.c:3021
+#: ../libpurple/protocols/yahoo/yahoo.c:3004
+#: ../libpurple/protocols/yahoo/yahoo.c:3034
msgid "Not on server list"
msgstr "Не в списке на сервере"
-#: ../libpurple/protocols/yahoo/yahoo.c:3038
-#: ../libpurple/protocols/yahoo/yahoo.c:3096
+#: ../libpurple/protocols/yahoo/yahoo.c:3051
+#: ../libpurple/protocols/yahoo/yahoo.c:3109
msgid "Appear Online"
msgstr ""
-#: ../libpurple/protocols/yahoo/yahoo.c:3041
-#: ../libpurple/protocols/yahoo/yahoo.c:3117
+#: ../libpurple/protocols/yahoo/yahoo.c:3054
+#: ../libpurple/protocols/yahoo/yahoo.c:3130
msgid "Appear Permanently Offline"
msgstr ""
-#: ../libpurple/protocols/yahoo/yahoo.c:3059
+#: ../libpurple/protocols/yahoo/yahoo.c:3072
msgid "Presence"
msgstr "Присутствие"
-#: ../libpurple/protocols/yahoo/yahoo.c:3102
+#: ../libpurple/protocols/yahoo/yahoo.c:3115
msgid "Appear Offline"
msgstr "Вероятно не в сети"
-#: ../libpurple/protocols/yahoo/yahoo.c:3111
+#: ../libpurple/protocols/yahoo/yahoo.c:3124
msgid "Don't Appear Permanently Offline"
msgstr ""
-#: ../libpurple/protocols/yahoo/yahoo.c:3159
+#: ../libpurple/protocols/yahoo/yahoo.c:3172
msgid "Join in Chat"
msgstr "Присоединиться в чате"
-#: ../libpurple/protocols/yahoo/yahoo.c:3165
+#: ../libpurple/protocols/yahoo/yahoo.c:3178
msgid "Initiate Conference"
msgstr "Создать конференцию"
-#: ../libpurple/protocols/yahoo/yahoo.c:3193
+#: ../libpurple/protocols/yahoo/yahoo.c:3206
msgid "Presence Settings"
msgstr "Настройки присутствия"
-#: ../libpurple/protocols/yahoo/yahoo.c:3199
+#: ../libpurple/protocols/yahoo/yahoo.c:3212
msgid "Start Doodling"
msgstr ""
#. XXX Typo: This should be _("Activate which ID?") - fix after string freeze is over
-#: ../libpurple/protocols/yahoo/yahoo.c:3232
+#: ../libpurple/protocols/yahoo/yahoo.c:3245
msgid "Active which ID?"
msgstr "Активировать какой ID?"
-#: ../libpurple/protocols/yahoo/yahoo.c:3243
+#: ../libpurple/protocols/yahoo/yahoo.c:3256
msgid "Join who in chat?"
msgstr "К кому присоединиться в чате?"
-#: ../libpurple/protocols/yahoo/yahoo.c:3255
+#: ../libpurple/protocols/yahoo/yahoo.c:3268
msgid "Activate ID..."
msgstr "Активировать ID..."
-#: ../libpurple/protocols/yahoo/yahoo.c:3259
+#: ../libpurple/protocols/yahoo/yahoo.c:3272
msgid "Join User in Chat..."
msgstr "Присоединиться к пользователю в чате..."
-#: ../libpurple/protocols/yahoo/yahoo.c:3766
+#: ../libpurple/protocols/yahoo/yahoo.c:3779
msgid "You have just sent a Buzz!"
msgstr ""
-#: ../libpurple/protocols/yahoo/yahoo.c:3825
+#: ../libpurple/protocols/yahoo/yahoo.c:3838
msgid "join &lt;room&gt;: Join a chat room on the Yahoo network"
msgstr "join &lt;комната&gt;: Присоединиться к чату в сети Yahoo"
-#: ../libpurple/protocols/yahoo/yahoo.c:3830
+#: ../libpurple/protocols/yahoo/yahoo.c:3843
msgid "list: List rooms on the Yahoo network"
msgstr "list: Вывести список комнат в сети Yahoo"
-#: ../libpurple/protocols/yahoo/yahoo.c:3834
+#: ../libpurple/protocols/yahoo/yahoo.c:3847
msgid "buzz: Buzz a user to get their attention"
msgstr ""
-#: ../libpurple/protocols/yahoo/yahoo.c:3838
+#: ../libpurple/protocols/yahoo/yahoo.c:3851
msgid "doodle: Request user to start a Doodle session"
msgstr ""
@@ -10459,56 +11094,56 @@ msgstr ""
#. *< version
#. * summary
#. * description
-#: ../libpurple/protocols/yahoo/yahoo.c:4046
-#: ../libpurple/protocols/yahoo/yahoo.c:4048
+#: ../libpurple/protocols/yahoo/yahoo.c:4059
+#: ../libpurple/protocols/yahoo/yahoo.c:4061
msgid "Yahoo Protocol Plugin"
msgstr "Модуль протокола Yahoo"
-#: ../libpurple/protocols/yahoo/yahoo.c:4071
+#: ../libpurple/protocols/yahoo/yahoo.c:4084
msgid "Yahoo Japan"
msgstr "Yahoo Japan"
-#: ../libpurple/protocols/yahoo/yahoo.c:4074
+#: ../libpurple/protocols/yahoo/yahoo.c:4087
msgid "Pager server"
msgstr "Сервер пейджера"
-#: ../libpurple/protocols/yahoo/yahoo.c:4077
+#: ../libpurple/protocols/yahoo/yahoo.c:4090
msgid "Japan Pager server"
msgstr "Сервер пейджера Japan"
-#: ../libpurple/protocols/yahoo/yahoo.c:4080
+#: ../libpurple/protocols/yahoo/yahoo.c:4093
msgid "Pager port"
msgstr "Порт пейджера"
-#: ../libpurple/protocols/yahoo/yahoo.c:4083
+#: ../libpurple/protocols/yahoo/yahoo.c:4096
msgid "File transfer server"
msgstr "Сервер передачи файлов"
-#: ../libpurple/protocols/yahoo/yahoo.c:4086
+#: ../libpurple/protocols/yahoo/yahoo.c:4099
msgid "Japan file transfer server"
msgstr "Сервер передачи файлов Japan"
-#: ../libpurple/protocols/yahoo/yahoo.c:4089
+#: ../libpurple/protocols/yahoo/yahoo.c:4102
msgid "File transfer port"
msgstr "Порт передачи файлов"
-#: ../libpurple/protocols/yahoo/yahoo.c:4092
+#: ../libpurple/protocols/yahoo/yahoo.c:4105
msgid "Chat room locale"
msgstr "Языковой формат чата"
-#: ../libpurple/protocols/yahoo/yahoo.c:4095
+#: ../libpurple/protocols/yahoo/yahoo.c:4108
msgid "Ignore conference and chatroom invitations"
msgstr "Игнорировать приглашения в конференции и чаты"
-#: ../libpurple/protocols/yahoo/yahoo.c:4103
+#: ../libpurple/protocols/yahoo/yahoo.c:4116
msgid "Chat room list URL"
msgstr "URL списка чатов"
-#: ../libpurple/protocols/yahoo/yahoo.c:4106
+#: ../libpurple/protocols/yahoo/yahoo.c:4119
msgid "Yahoo Chat server"
msgstr "Сервер чата Yahoo"
-#: ../libpurple/protocols/yahoo/yahoo.c:4109
+#: ../libpurple/protocols/yahoo/yahoo.c:4122
msgid "Yahoo Chat port"
msgstr "Порт чата Yahoo"
@@ -10595,7 +11230,7 @@ msgid "Unable to establish file descriptor."
msgstr "Не удаётся установить дескриптор файла."
#. TODO: what to do here - do we really have to disconnect?
-#: ../libpurple/protocols/yahoo/yahoo_packet.c:289
+#: ../libpurple/protocols/yahoo/yahoo_packet.c:302
msgid "Write Error"
msgstr "Ошибка записи"
@@ -10711,99 +11346,99 @@ msgid "Unable to send to chat %s,%s,%s"
msgstr "Не удаётся отправить в чат %s,%s,%s"
#: ../libpurple/protocols/zephyr/zephyr.c:786
-#: ../libpurple/protocols/zephyr/zephyr.c:1203
+#: ../libpurple/protocols/zephyr/zephyr.c:1204
msgid "User"
msgstr "Пользователь"
#: ../libpurple/protocols/zephyr/zephyr.c:791
-#: ../libpurple/protocols/zephyr/zephyr.c:1209
+#: ../libpurple/protocols/zephyr/zephyr.c:1210
msgid "Hidden or not logged-in"
msgstr "Скрыт или не в сети"
#: ../libpurple/protocols/zephyr/zephyr.c:797
-#: ../libpurple/protocols/zephyr/zephyr.c:1211
+#: ../libpurple/protocols/zephyr/zephyr.c:1212
#, c-format
msgid "<br>At %s since %s"
msgstr "<br>В %s с %s"
-#: ../libpurple/protocols/zephyr/zephyr.c:1545
#: ../libpurple/protocols/zephyr/zephyr.c:1546
+#: ../libpurple/protocols/zephyr/zephyr.c:1547
msgid "Anyone"
msgstr "Любой"
-#: ../libpurple/protocols/zephyr/zephyr.c:2353
+#: ../libpurple/protocols/zephyr/zephyr.c:2354
msgid "_Class:"
msgstr "_Класс:"
-#: ../libpurple/protocols/zephyr/zephyr.c:2359
+#: ../libpurple/protocols/zephyr/zephyr.c:2360
msgid "_Instance:"
msgstr "_Инстанция:"
-#: ../libpurple/protocols/zephyr/zephyr.c:2365
+#: ../libpurple/protocols/zephyr/zephyr.c:2366
msgid "_Recipient:"
msgstr "_Получатель:"
-#: ../libpurple/protocols/zephyr/zephyr.c:2376
+#: ../libpurple/protocols/zephyr/zephyr.c:2377
#, c-format
msgid "Attempt to subscribe to %s,%s,%s failed"
msgstr "Попытка подписки к %s,%s,%s завершилась неудачно"
-#: ../libpurple/protocols/zephyr/zephyr.c:2689
+#: ../libpurple/protocols/zephyr/zephyr.c:2690
msgid "zlocate &lt;nick&gt;: Locate user"
msgstr "zlocate &lt;псевдоним&gt;: Найти пользователя"
-#: ../libpurple/protocols/zephyr/zephyr.c:2694
+#: ../libpurple/protocols/zephyr/zephyr.c:2695
msgid "zl &lt;nick&gt;: Locate user"
msgstr "zl &lt;псевдоним&gt;: Найти пользователя"
-#: ../libpurple/protocols/zephyr/zephyr.c:2699
+#: ../libpurple/protocols/zephyr/zephyr.c:2700
msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
msgstr ""
-#: ../libpurple/protocols/zephyr/zephyr.c:2704
+#: ../libpurple/protocols/zephyr/zephyr.c:2705
msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
msgstr ""
-#: ../libpurple/protocols/zephyr/zephyr.c:2709
+#: ../libpurple/protocols/zephyr/zephyr.c:2710
msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
msgstr ""
-#: ../libpurple/protocols/zephyr/zephyr.c:2715
+#: ../libpurple/protocols/zephyr/zephyr.c:2716
msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
msgstr ""
-#: ../libpurple/protocols/zephyr/zephyr.c:2720
+#: ../libpurple/protocols/zephyr/zephyr.c:2721
msgid ""
"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
msgstr ""
-#: ../libpurple/protocols/zephyr/zephyr.c:2726
+#: ../libpurple/protocols/zephyr/zephyr.c:2727
msgid ""
"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
"<i>instance</i>,*&gt;"
msgstr ""
-#: ../libpurple/protocols/zephyr/zephyr.c:2732
+#: ../libpurple/protocols/zephyr/zephyr.c:2733
msgid ""
"zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
"<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
msgstr ""
-#: ../libpurple/protocols/zephyr/zephyr.c:2738
+#: ../libpurple/protocols/zephyr/zephyr.c:2739
msgid ""
"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
"<i>instance</i>,<i>recipient</i>&gt;"
msgstr ""
-#: ../libpurple/protocols/zephyr/zephyr.c:2743
+#: ../libpurple/protocols/zephyr/zephyr.c:2744
msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
msgstr ""
-#: ../libpurple/protocols/zephyr/zephyr.c:2849
+#: ../libpurple/protocols/zephyr/zephyr.c:2850
msgid "Resubscribe"
msgstr "Подписаться повторно"
-#: ../libpurple/protocols/zephyr/zephyr.c:2852
+#: ../libpurple/protocols/zephyr/zephyr.c:2853
msgid "Retrieve subscriptions from server"
msgstr "Загрузить подписки с сервера"
@@ -10817,45 +11452,45 @@ msgstr "Загрузить подписки с сервера"
#. *< version
#. * summary
#. * description
-#: ../libpurple/protocols/zephyr/zephyr.c:2945
-#: ../libpurple/protocols/zephyr/zephyr.c:2947
+#: ../libpurple/protocols/zephyr/zephyr.c:2946
+#: ../libpurple/protocols/zephyr/zephyr.c:2948
msgid "Zephyr Protocol Plugin"
msgstr "Модуль протокола Zephyr"
-#: ../libpurple/protocols/zephyr/zephyr.c:2972
+#: ../libpurple/protocols/zephyr/zephyr.c:2973
msgid "Use tzc"
msgstr "Использовать tzc"
-#: ../libpurple/protocols/zephyr/zephyr.c:2975
+#: ../libpurple/protocols/zephyr/zephyr.c:2976
msgid "tzc command"
msgstr "Команда tzc"
-#: ../libpurple/protocols/zephyr/zephyr.c:2978
+#: ../libpurple/protocols/zephyr/zephyr.c:2979
msgid "Export to .anyone"
msgstr "Экспортировать в .anyone"
-#: ../libpurple/protocols/zephyr/zephyr.c:2981
+#: ../libpurple/protocols/zephyr/zephyr.c:2982
msgid "Export to .zephyr.subs"
msgstr "Экспортировать в .zephyr.subs"
-#: ../libpurple/protocols/zephyr/zephyr.c:2984
+#: ../libpurple/protocols/zephyr/zephyr.c:2985
msgid "Import from .anyone"
msgstr "Импортировать из .anyone"
-#: ../libpurple/protocols/zephyr/zephyr.c:2987
+#: ../libpurple/protocols/zephyr/zephyr.c:2988
msgid "Import from .zephyr.subs"
msgstr "Импортировать из .zephyr.subs"
-#: ../libpurple/protocols/zephyr/zephyr.c:2990
+#: ../libpurple/protocols/zephyr/zephyr.c:2991
msgid "Realm"
msgstr ""
-#: ../libpurple/protocols/zephyr/zephyr.c:2993
+#: ../libpurple/protocols/zephyr/zephyr.c:2994
msgid "Exposure"
msgstr ""
#: ../libpurple/proxy.c:458 ../libpurple/proxy.c:877 ../libpurple/proxy.c:1032
-#: ../libpurple/proxy.c:1588
+#: ../libpurple/proxy.c:1600
#, c-format
msgid ""
"Unable to create socket:\n"
@@ -10885,7 +11520,7 @@ msgstr "Доступ запрещён: прокси-сервер HTTP запре
msgid "Error resolving %s"
msgstr "Ошибка разрешения имени %s"
-#: ../libpurple/proxy.c:1685
+#: ../libpurple/proxy.c:1697
msgid "Could not resolve host name"
msgstr "Не удалось разрешить имя узла"
@@ -10923,7 +11558,7 @@ msgstr "сохранённые статусы"
msgid "%s is now known as %s.\n"
msgstr "%s теперь известен как %s.\n"
-#: ../libpurple/server.c:674
+#: ../libpurple/server.c:679
#, c-format
msgid ""
"%s has invited %s to the chat room %s:\n"
@@ -10932,73 +11567,73 @@ msgstr ""
"%s приглашает %s в чат %s:\n"
"%s"
-#: ../libpurple/server.c:679
+#: ../libpurple/server.c:684
#, c-format
msgid "%s has invited %s to the chat room %s\n"
msgstr "%s приглашает %s в чат %s\n"
-#: ../libpurple/server.c:683
+#: ../libpurple/server.c:688
msgid "Accept chat invitation?"
msgstr "Принять приглашение в чат?"
-#: ../libpurple/status.c:154
+#: ../libpurple/status.c:152
msgid "Unset"
msgstr "Не установлен"
-#: ../libpurple/status.c:157
+#: ../libpurple/status.c:155
msgid "Unavailable"
msgstr "Недоступен"
-#: ../libpurple/status.c:161
+#: ../libpurple/status.c:159
msgid "Mobile"
msgstr ""
-#: ../libpurple/status.c:610
+#: ../libpurple/status.c:608
#, c-format
msgid "%s changed status from %s to %s"
msgstr "%s изменил статус с %s на %s"
-#: ../libpurple/status.c:620
+#: ../libpurple/status.c:618
#, c-format
msgid "%s is now %s"
msgstr "%s теперь %s"
-#: ../libpurple/status.c:625
+#: ../libpurple/status.c:623
#, c-format
msgid "%s is no longer %s"
msgstr "%s больше не %s"
-#: ../libpurple/status.c:1257
+#: ../libpurple/status.c:1233
#, c-format
msgid "%s became idle"
msgstr "%s начал бездействовать"
-#: ../libpurple/status.c:1274
+#: ../libpurple/status.c:1250
#, c-format
msgid "%s became unidle"
msgstr "%s перестал бездействовать"
-#: ../libpurple/status.c:1336
+#: ../libpurple/status.c:1313
#, c-format
msgid "+++ %s became idle"
msgstr "+++ %s начал бездействовать"
-#: ../libpurple/status.c:1338
+#: ../libpurple/status.c:1315
#, c-format
msgid "+++ %s became unidle"
msgstr "+++ %s перестал бездействовать"
-#: ../libpurple/util.c:681
+#: ../libpurple/util.c:682
#, c-format
msgid "%x %X"
msgstr "%x %X"
-#: ../libpurple/util.c:2495
+#: ../libpurple/util.c:2586
#, c-format
msgid "Error Reading %s"
msgstr "Ошибка чтения %s"
-#: ../libpurple/util.c:2496
+#: ../libpurple/util.c:2587
#, c-format
msgid ""
"An error was encountered reading your %s. They have not been loaded, and "
@@ -11007,15 +11642,15 @@ msgstr ""
"Произошла ошибка при чтении %s. Файл не был загружен, а старый файл был "
"переименован в %s~."
-#: ../libpurple/util.c:2970
+#: ../libpurple/util.c:3060
msgid "Calculating..."
msgstr "Подсчёт..."
-#: ../libpurple/util.c:2973
+#: ../libpurple/util.c:3063
msgid "Unknown."
msgstr "Неизвестно."
-#: ../libpurple/util.c:2999
+#: ../libpurple/util.c:3089
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
@@ -11023,7 +11658,7 @@ msgstr[0] "%d секунда"
msgstr[1] "%d секунды"
msgstr[2] "%d секунд"
-#: ../libpurple/util.c:3011
+#: ../libpurple/util.c:3101
#, c-format
msgid "%d day"
msgid_plural "%d days"
@@ -11031,7 +11666,7 @@ msgstr[0] "%d день"
msgstr[1] "%d дня"
msgstr[2] "%d дней"
-#: ../libpurple/util.c:3019
+#: ../libpurple/util.c:3109
#, c-format
msgid "%s, %d hour"
msgid_plural "%s, %d hours"
@@ -11039,7 +11674,7 @@ msgstr[0] "%s, %d час"
msgstr[1] "%s, %d часа"
msgstr[2] "%s, %d часов"
-#: ../libpurple/util.c:3025
+#: ../libpurple/util.c:3115
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
@@ -11047,7 +11682,7 @@ msgstr[0] "%d час"
msgstr[1] "%d часа"
msgstr[2] "%d часов"
-#: ../libpurple/util.c:3033
+#: ../libpurple/util.c:3123
#, c-format
msgid "%s, %d minute"
msgid_plural "%s, %d minutes"
@@ -11055,7 +11690,7 @@ msgstr[0] "%s, %d минута"
msgstr[1] "%s, %d минуты"
msgstr[2] "%s, %d минут"
-#: ../libpurple/util.c:3039
+#: ../libpurple/util.c:3129
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
@@ -11063,29 +11698,34 @@ msgstr[0] "%d минута"
msgstr[1] "%d минуты"
msgstr[2] "%d минут"
-#: ../libpurple/util.c:3305 ../libpurple/util.c:3603
+#: ../libpurple/util.c:3389
+#, c-format
+msgid "Could not open %s: Redirected too many times"
+msgstr ""
+
+#: ../libpurple/util.c:3426 ../libpurple/util.c:3721
#, c-format
msgid "Unable to connect to %s"
msgstr "Не удаётся соединиться с %s"
-#: ../libpurple/util.c:3431
+#: ../libpurple/util.c:3549
#, c-format
msgid ""
"Unable to allocate enough memory to hold the contents from %s. The web "
"server may be trying something malicious."
msgstr ""
-#: ../libpurple/util.c:3466
+#: ../libpurple/util.c:3584
#, c-format
msgid "Error reading from %s: %s"
msgstr "Ошибка чтения из %s: %s"
-#: ../libpurple/util.c:3497
+#: ../libpurple/util.c:3615
#, c-format
msgid "Error writing to %s: %s"
msgstr "Ошибка записи в %s: %s"
-#: ../libpurple/util.c:3522
+#: ../libpurple/util.c:3640
#, c-format
msgid "Unable to connect to %s: %s"
msgstr "Не удаётся соединиться с %s: %s"
@@ -11111,55 +11751,71 @@ msgid "The orientation of the tray."
msgstr "Ориентация лотка."
#. Build the login options frame.
-#: ../pidgin/gtkaccount.c:398
+#: ../pidgin/gtkaccount.c:409
msgid "Login Options"
msgstr "Параметры входа"
-#: ../pidgin/gtkaccount.c:500
-msgid "Local alias:"
-msgstr "Локальный псевдоним:"
+#: ../pidgin/gtkaccount.c:430
+msgid "Pro_tocol:"
+msgstr "П_ротокол:"
+
+#: ../pidgin/gtkaccount.c:441
+msgid "Screen _name:"
+msgstr "_Идентификатор пользователя:"
+
+#: ../pidgin/gtkaccount.c:528
+msgid "_Local alias:"
+msgstr "_Локальный псевдоним:"
+
+#: ../pidgin/gtkaccount.c:532
+msgid "Remember pass_word"
+msgstr "З_апомнить пароль"
#. Build the user options frame.
-#: ../pidgin/gtkaccount.c:562
+#: ../pidgin/gtkaccount.c:590
msgid "User Options"
msgstr "Параметры пользователя"
+#: ../pidgin/gtkaccount.c:603
+msgid "New _mail notifications"
+msgstr "Уведомления о новой по_чте"
+
#. Buddy icon
-#: ../pidgin/gtkaccount.c:580
-msgid "Use this buddy icon for this account:"
-msgstr "Использовать этот значок собеседника для этой учётной записи:"
+#: ../pidgin/gtkaccount.c:608
+msgid "Use this buddy _icon for this account:"
+msgstr "Использовать этот _значок собеседника для этой учётной записи:"
#. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:700
+#: ../pidgin/gtkaccount.c:728
#, c-format
msgid "%s Options"
msgstr "Параметры %s"
-#: ../pidgin/gtkaccount.c:897
+#: ../pidgin/gtkaccount.c:934
msgid "Use GNOME Proxy Settings"
msgstr "Использовать настройки прокси GNOME"
-#: ../pidgin/gtkaccount.c:898
+#: ../pidgin/gtkaccount.c:935
msgid "Use Global Proxy Settings"
msgstr "Использовать глобальные настройки прокси"
-#: ../pidgin/gtkaccount.c:904
+#: ../pidgin/gtkaccount.c:941
msgid "No Proxy"
msgstr "Нет прокси"
-#: ../pidgin/gtkaccount.c:910
+#: ../pidgin/gtkaccount.c:947
msgid "HTTP"
msgstr "HTTP"
-#: ../pidgin/gtkaccount.c:916
+#: ../pidgin/gtkaccount.c:953
msgid "SOCKS 4"
msgstr "SOCKS 4"
-#: ../pidgin/gtkaccount.c:922
+#: ../pidgin/gtkaccount.c:959
msgid "SOCKS 5"
msgstr "SOCKS 5"
-#: ../pidgin/gtkaccount.c:928 ../pidgin/gtkprefs.c:1100
+#: ../pidgin/gtkaccount.c:965 ../pidgin/gtkprefs.c:1137
msgid "Use Environmental Settings"
msgstr "Использовать настройки окружения"
@@ -11168,60 +11824,60 @@ msgstr "Использовать настройки окружения"
#. A) your network is really slow and you have nothing better to do than
#. look at butterflies.
#. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:967
+#: ../pidgin/gtkaccount.c:1004
msgid "If you look real closely"
msgstr "Если приглядитесь"
#. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:970
+#: ../pidgin/gtkaccount.c:1007
msgid "you can see the butterflies mating"
msgstr "вы можете увидеть спаривающихся бабочек"
-#: ../pidgin/gtkaccount.c:991
+#: ../pidgin/gtkaccount.c:1028
msgid "Proxy Options"
msgstr "Параметры прокси"
-#: ../pidgin/gtkaccount.c:1005 ../pidgin/gtkprefs.c:1094
+#: ../pidgin/gtkaccount.c:1042 ../pidgin/gtkprefs.c:1131
msgid "Proxy _type:"
-msgstr "_Тип прокси:"
+msgstr "Т_ип прокси:"
-#: ../pidgin/gtkaccount.c:1014 ../pidgin/gtkprefs.c:1115
+#: ../pidgin/gtkaccount.c:1051 ../pidgin/gtkprefs.c:1152
msgid "_Host:"
msgstr "_Узел:"
-#: ../pidgin/gtkaccount.c:1018 ../pidgin/gtkprefs.c:1133
+#: ../pidgin/gtkaccount.c:1055 ../pidgin/gtkprefs.c:1170
msgid "_Port:"
msgstr "П_орт:"
-#: ../pidgin/gtkaccount.c:1026
+#: ../pidgin/gtkaccount.c:1063
msgid "_Username:"
msgstr "_Имя пользователя:"
-#: ../pidgin/gtkaccount.c:1033 ../pidgin/gtkprefs.c:1170
+#: ../pidgin/gtkaccount.c:1070 ../pidgin/gtkprefs.c:1207
msgid "Pa_ssword:"
msgstr "Па_роль:"
-#: ../pidgin/gtkaccount.c:1439
+#: ../pidgin/gtkaccount.c:1476
msgid "Add Account"
msgstr "Добавить учётную запись"
-#: ../pidgin/gtkaccount.c:1463
+#: ../pidgin/gtkaccount.c:1500
msgid "_Basic"
msgstr "_Основные"
-#: ../pidgin/gtkaccount.c:1474
+#: ../pidgin/gtkaccount.c:1511
msgid "_Advanced"
msgstr "_Дополнительные"
-#: ../pidgin/gtkaccount.c:1946 ../pidgin/gtkplugin.c:568
+#: ../pidgin/gtkaccount.c:1983 ../pidgin/gtkplugin.c:568
msgid "Enabled"
msgstr "Включено"
-#: ../pidgin/gtkaccount.c:1974
+#: ../pidgin/gtkaccount.c:2011
msgid "Protocol"
msgstr "Протокол"
-#: ../pidgin/gtkaccount.c:2168
+#: ../pidgin/gtkaccount.c:2212
#, c-format
msgid ""
"<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -11245,11 +11901,11 @@ msgstr ""
"учётных записей позже через меню <b>Учётные записи->Добавить/Изменить</b> "
"окна списка собеседников."
-#: ../pidgin/gtkblist.c:722
+#: ../pidgin/gtkblist.c:717
msgid "Join a Chat"
msgstr "Присоединиться к чату"
-#: ../pidgin/gtkblist.c:743
+#: ../pidgin/gtkblist.c:738
msgid ""
"Please enter the appropriate information about the chat you would like to "
"join.\n"
@@ -11257,95 +11913,93 @@ msgstr ""
"Введите соответствующую информацию о чате, к которому вы хотели бы "
"присоединиться.\n"
-#: ../pidgin/gtkblist.c:754 ../pidgin/gtkpounce.c:531
+#. Set up stuff for the account box
+#: ../pidgin/gtkblist.c:749 ../pidgin/gtkblist.c:5408
+#: ../pidgin/gtkblist.c:5775 ../pidgin/gtkpounce.c:531
#: ../pidgin/gtkroomlist.c:399
msgid "_Account:"
msgstr "У_чётная запись:"
-#: ../pidgin/gtkblist.c:1028 ../pidgin/gtkprivacy.c:606
+#: ../pidgin/gtkblist.c:1038 ../pidgin/gtkprivacy.c:606
#: ../pidgin/gtkprivacy.c:620
msgid "_Block"
msgstr "_Блокировать"
-#: ../pidgin/gtkblist.c:1028
+#: ../pidgin/gtkblist.c:1038
msgid "Un_block"
msgstr "Раз_блокировать"
-#: ../pidgin/gtkblist.c:1079
+#: ../pidgin/gtkblist.c:1089
msgid "Get _Info"
msgstr "_Информация"
-#: ../pidgin/gtkblist.c:1082 ../pidgin/pidginstock.c:84
+#: ../pidgin/gtkblist.c:1092 ../pidgin/pidginstock.c:84
msgid "I_M"
msgstr "Мгновенное сооб_щение"
-#: ../pidgin/gtkblist.c:1088
+#: ../pidgin/gtkblist.c:1098
msgid "_Send File"
msgstr "Отправить _файл"
-#: ../pidgin/gtkblist.c:1095
+#: ../pidgin/gtkblist.c:1105
msgid "Add Buddy _Pounce"
msgstr "Добавить п_равило"
-#: ../pidgin/gtkblist.c:1099 ../pidgin/gtkblist.c:1103
-#: ../pidgin/gtkblist.c:1205 ../pidgin/gtkblist.c:1228
+#: ../pidgin/gtkblist.c:1109 ../pidgin/gtkblist.c:1113
+#: ../pidgin/gtkblist.c:1215 ../pidgin/gtkblist.c:1238
msgid "View _Log"
msgstr "Просмотреть _журнал"
-#: ../pidgin/gtkblist.c:1115
-msgid "Alias..."
-msgstr "Псевдоним..."
-
-#: ../pidgin/gtkblist.c:1124 ../pidgin/gtkblist.c:1213
-#: ../pidgin/gtkblist.c:1234
+#: ../pidgin/gtkblist.c:1125 ../pidgin/gtkblist.c:1134
+#: ../pidgin/gtkblist.c:1223 ../pidgin/gtkblist.c:1244
msgid "_Alias..."
msgstr "_Псевдоним..."
-#: ../pidgin/gtkblist.c:1126 ../pidgin/gtkblist.c:1215
-#: ../pidgin/gtkblist.c:1236
+#: ../pidgin/gtkblist.c:1128 ../pidgin/gtkblist.c:1136
+#: ../pidgin/gtkblist.c:1225 ../pidgin/gtkblist.c:1246
msgid "_Remove"
msgstr "_Удалить"
-#: ../pidgin/gtkblist.c:1175
+#: ../pidgin/gtkblist.c:1185
msgid "Add a _Buddy"
msgstr "Добавить _собеседника"
-#: ../pidgin/gtkblist.c:1178
+#: ../pidgin/gtkblist.c:1188
msgid "Add a C_hat"
msgstr "Добавить _чат"
-#: ../pidgin/gtkblist.c:1181
+#: ../pidgin/gtkblist.c:1191
msgid "_Delete Group"
msgstr "_Удалить группу"
-#: ../pidgin/gtkblist.c:1183
+#: ../pidgin/gtkblist.c:1193
msgid "_Rename"
msgstr "Пере_именовать"
#. join button
-#: ../pidgin/gtkblist.c:1201 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkblist.c:1211 ../pidgin/gtkroomlist.c:306
#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:82
msgid "_Join"
msgstr "П_рисоединиться"
-#: ../pidgin/gtkblist.c:1203
+#: ../pidgin/gtkblist.c:1213
msgid "Auto-Join"
msgstr "Присоединяться автоматически"
-#: ../pidgin/gtkblist.c:1241 ../pidgin/gtkblist.c:1264
+#: ../pidgin/gtkblist.c:1251 ../pidgin/gtkblist.c:1274
msgid "_Collapse"
msgstr "_Свернуть"
-#: ../pidgin/gtkblist.c:1269
+#: ../pidgin/gtkblist.c:1279
msgid "_Expand"
msgstr "Р_азвернуть"
-#: ../pidgin/gtkblist.c:1514 ../pidgin/gtkblist.c:1526
-#: ../pidgin/gtkblist.c:4490 ../pidgin/gtkblist.c:4500
+#: ../pidgin/gtkblist.c:1524 ../pidgin/gtkblist.c:1536
+#: ../pidgin/gtkblist.c:4522 ../pidgin/gtkblist.c:4532
msgid "/Tools/Mute Sounds"
msgstr "/Инструменты/Отключить звуки"
-#: ../pidgin/gtkblist.c:1986 ../pidgin/gtkconv.c:4498
+#: ../pidgin/gtkblist.c:1996 ../pidgin/gtkconv.c:4610
#: ../pidgin/gtkpounce.c:423
msgid ""
"You are not currently signed on with an account that can add that buddy."
@@ -11353,126 +12007,117 @@ msgstr ""
"Вы не подключены с учётной записью, позволяющей добавить этого собеседника."
#. Buddies menu
-#: ../pidgin/gtkblist.c:2815
+#: ../pidgin/gtkblist.c:2836
msgid "/_Buddies"
msgstr "/_Собеседники"
-#: ../pidgin/gtkblist.c:2816
+#: ../pidgin/gtkblist.c:2837
msgid "/Buddies/New Instant _Message..."
msgstr "/Собеседники/Новое мгновенное сооб_щение..."
-#: ../pidgin/gtkblist.c:2817
+#: ../pidgin/gtkblist.c:2838
msgid "/Buddies/Join a _Chat..."
msgstr "/Собеседники/Присоединиться к _чату..."
-#: ../pidgin/gtkblist.c:2818
+#: ../pidgin/gtkblist.c:2839
msgid "/Buddies/Get User _Info..."
msgstr "/Собеседники/Получить пользовательскую _информацию..."
-#: ../pidgin/gtkblist.c:2819
+#: ../pidgin/gtkblist.c:2840
msgid "/Buddies/View User _Log..."
msgstr "/Собеседники/Просмотреть _журнал пользователя..."
-#: ../pidgin/gtkblist.c:2821
+#: ../pidgin/gtkblist.c:2842
msgid "/Buddies/Show _Offline Buddies"
msgstr "/Собеседники/Показывать собеседников _не в сети"
-#: ../pidgin/gtkblist.c:2822
+#: ../pidgin/gtkblist.c:2843
msgid "/Buddies/Show _Empty Groups"
msgstr "/Собеседники/Показывать п_устые группы"
-#: ../pidgin/gtkblist.c:2823
+#: ../pidgin/gtkblist.c:2844
msgid "/Buddies/Show Buddy _Details"
msgstr "/Собеседники/Показывать _подробности о собеседнике"
-#: ../pidgin/gtkblist.c:2824
+#: ../pidgin/gtkblist.c:2845
msgid "/Buddies/Show Idle _Times"
msgstr "/Собеседники/Показывать _время бездействия"
-#: ../pidgin/gtkblist.c:2825
+#: ../pidgin/gtkblist.c:2846
msgid "/Buddies/_Sort Buddies"
msgstr "/Собеседники/_Сортировать собеседников"
-#: ../pidgin/gtkblist.c:2827
+#: ../pidgin/gtkblist.c:2848
msgid "/Buddies/_Add Buddy..."
msgstr "/Собеседники/_Добавить собеседника..."
-#: ../pidgin/gtkblist.c:2828
+#: ../pidgin/gtkblist.c:2849
msgid "/Buddies/Add C_hat..."
msgstr "/Собеседники/Добавить ч_ат..."
-#: ../pidgin/gtkblist.c:2829
+#: ../pidgin/gtkblist.c:2850
msgid "/Buddies/Add _Group..."
msgstr "/Собеседники/Добавить _группу..."
-#: ../pidgin/gtkblist.c:2831
+#: ../pidgin/gtkblist.c:2852
+msgid "/Buddies/_About Pidgin"
+msgstr "/Собеседники/_О Pidgin"
+
+#: ../pidgin/gtkblist.c:2853
msgid "/Buddies/_Quit"
msgstr "/Собеседники/В_ыйти"
#. Accounts menu
-#: ../pidgin/gtkblist.c:2834
+#: ../pidgin/gtkblist.c:2856
msgid "/_Accounts"
msgstr "/_Учётные записи"
-#: ../pidgin/gtkblist.c:2835 ../pidgin/gtkblist.c:6413
+#: ../pidgin/gtkblist.c:2857 ../pidgin/gtkblist.c:6473
msgid "/Accounts/Add\\/Edit"
msgstr "/Учётные записи/Добавить\\/Изменить"
#. Tools
-#: ../pidgin/gtkblist.c:2838
+#: ../pidgin/gtkblist.c:2860
msgid "/_Tools"
msgstr "/_Инструменты"
-#: ../pidgin/gtkblist.c:2839
+#: ../pidgin/gtkblist.c:2861
msgid "/Tools/Buddy _Pounces"
msgstr "/Инструменты/_Слежение за собеседниками"
-#: ../pidgin/gtkblist.c:2840
+#: ../pidgin/gtkblist.c:2862
msgid "/Tools/Plu_gins"
msgstr "/Инструменты/_Модули"
-#: ../pidgin/gtkblist.c:2841
+#: ../pidgin/gtkblist.c:2863
msgid "/Tools/Pr_eferences"
msgstr "/Инструменты/_Настройки"
-#: ../pidgin/gtkblist.c:2842
+#: ../pidgin/gtkblist.c:2864
msgid "/Tools/Pr_ivacy"
msgstr "/Инструменты/К_онфиденциальность"
-#: ../pidgin/gtkblist.c:2844
+#: ../pidgin/gtkblist.c:2866
msgid "/Tools/_File Transfers"
msgstr "/Инструменты/Передача _файлов"
-#: ../pidgin/gtkblist.c:2845
+#: ../pidgin/gtkblist.c:2867
msgid "/Tools/R_oom List"
msgstr "/Инструменты/Список _комнат"
-#: ../pidgin/gtkblist.c:2846
+#: ../pidgin/gtkblist.c:2868
msgid "/Tools/System _Log"
msgstr "/Инструменты/Системный _журнал"
-#: ../pidgin/gtkblist.c:2848
+#: ../pidgin/gtkblist.c:2869
+msgid "/Tools/_Debug Window"
+msgstr "/Инструменты/Окно о_тладки"
+
+#: ../pidgin/gtkblist.c:2871
msgid "/Tools/Mute _Sounds"
msgstr "/Инструменты/Отключить _звуки"
-#. Help
-#: ../pidgin/gtkblist.c:2851
-msgid "/_Help"
-msgstr "/_Помощь"
-
-#: ../pidgin/gtkblist.c:2852
-msgid "/Help/Online _Help"
-msgstr "/Помощь/Помощь в _сети"
-
-#: ../pidgin/gtkblist.c:2853
-msgid "/Help/_Debug Window"
-msgstr "/Помощь/Окно _отладки"
-
-#: ../pidgin/gtkblist.c:2854
-msgid "/Help/_About"
-msgstr "/Помощь/О _программе"
-
-#: ../pidgin/gtkblist.c:2882
+#: ../pidgin/gtkblist.c:2899
#, c-format
msgid ""
"\n"
@@ -11481,73 +12126,73 @@ msgstr ""
"\n"
"<b>Учётная запись:</b> %s"
-#: ../pidgin/gtkblist.c:2960
+#: ../pidgin/gtkblist.c:2977
msgid "Buddy Alias"
msgstr "Псевдоним собеседника"
-#: ../pidgin/gtkblist.c:2981
+#: ../pidgin/gtkblist.c:2998
msgid "Logged In"
msgstr "В сети"
-#: ../pidgin/gtkblist.c:3027
+#: ../pidgin/gtkblist.c:3044
msgid "Last Seen"
msgstr "Последнее появление"
-#: ../pidgin/gtkblist.c:3047
+#: ../pidgin/gtkblist.c:3064
msgid "Spooky"
msgstr ""
-#: ../pidgin/gtkblist.c:3049
+#: ../pidgin/gtkblist.c:3066
msgid "Awesome"
msgstr ""
-#: ../pidgin/gtkblist.c:3051
+#: ../pidgin/gtkblist.c:3068
msgid "Rockin'"
msgstr ""
-#: ../pidgin/gtkblist.c:3376
+#: ../pidgin/gtkblist.c:3397
#, c-format
msgid "Idle %dh %02dm"
msgstr "Бездействует %dч %02dм"
-#: ../pidgin/gtkblist.c:3378
+#: ../pidgin/gtkblist.c:3399
#, c-format
msgid "Idle %dm"
msgstr "Бездействует %dм"
-#: ../pidgin/gtkblist.c:3515
+#: ../pidgin/gtkblist.c:3544
msgid "/Buddies/New Instant Message..."
msgstr "/Собеседники/Новое мгновенное сообщение..."
-#: ../pidgin/gtkblist.c:3516 ../pidgin/gtkblist.c:3549
+#: ../pidgin/gtkblist.c:3545 ../pidgin/gtkblist.c:3578
msgid "/Buddies/Join a Chat..."
msgstr "/Собеседники/Присоединиться к чату..."
-#: ../pidgin/gtkblist.c:3517
+#: ../pidgin/gtkblist.c:3546
msgid "/Buddies/Get User Info..."
msgstr "/Собеседники/Получить пользовательскую информацию..."
-#: ../pidgin/gtkblist.c:3518
+#: ../pidgin/gtkblist.c:3547
msgid "/Buddies/Add Buddy..."
msgstr "/Собеседники/Добавить собеседника..."
-#: ../pidgin/gtkblist.c:3519 ../pidgin/gtkblist.c:3552
+#: ../pidgin/gtkblist.c:3548 ../pidgin/gtkblist.c:3581
msgid "/Buddies/Add Chat..."
msgstr "/Собеседники/Добавить чат..."
-#: ../pidgin/gtkblist.c:3520
+#: ../pidgin/gtkblist.c:3549
msgid "/Buddies/Add Group..."
msgstr "/Собеседники/Добавить группу..."
-#: ../pidgin/gtkblist.c:3555
+#: ../pidgin/gtkblist.c:3584
msgid "/Tools/Privacy"
msgstr "/Инструменты/Конфиденциальность"
-#: ../pidgin/gtkblist.c:3558
+#: ../pidgin/gtkblist.c:3587
msgid "/Tools/Room List"
msgstr "/Инструменты/Список комнат"
-#: ../pidgin/gtkblist.c:3655 ../pidgin/gtkdocklet.c:156
+#: ../pidgin/gtkblist.c:3684 ../pidgin/gtkdocklet.c:153
#, c-format
msgid "%d unread message from %s\n"
msgid_plural "%d unread messages from %s\n"
@@ -11555,54 +12200,54 @@ msgstr[0] "%d непрочитанное сообщение от %s\n"
msgstr[1] "%d непрочитанных сообщения от %s\n"
msgstr[2] "%d непрочитанных сообщений от %s\n"
-#: ../pidgin/gtkblist.c:3732
+#: ../pidgin/gtkblist.c:3761
msgid "Manually"
msgstr "Вручную"
-#: ../pidgin/gtkblist.c:3734
+#: ../pidgin/gtkblist.c:3763
msgid "Alphabetically"
msgstr "По алфавиту"
-#: ../pidgin/gtkblist.c:3735
+#: ../pidgin/gtkblist.c:3764
msgid "By status"
msgstr "По статусу"
-#: ../pidgin/gtkblist.c:3736
+#: ../pidgin/gtkblist.c:3765
msgid "By log size"
msgstr "По размеру журнала"
-#: ../pidgin/gtkblist.c:3938 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:3967 ../pidgin/gtkconn.c:178
#, c-format
msgid "%s disconnected"
msgstr "Соединение с %s разорвано"
-#: ../pidgin/gtkblist.c:3948
+#: ../pidgin/gtkblist.c:3977
msgid "Re-enable Account"
msgstr "Повторно включить учётную запись"
-#: ../pidgin/gtkblist.c:3969
+#: ../pidgin/gtkblist.c:4001
#, c-format
msgid "<span color=\"red\">%s disconnected: %s</span>"
msgstr "<span color=\"red\">Соединение с %s разорвано: %s</span>"
-#: ../pidgin/gtkblist.c:4122
+#: ../pidgin/gtkblist.c:4153
msgid "<b>Username:</b>"
msgstr "<b>Имя пользователя:</b>"
-#: ../pidgin/gtkblist.c:4129
+#: ../pidgin/gtkblist.c:4160
msgid "<b>Password:</b>"
msgstr "<b>Пароль:</b>"
-#: ../pidgin/gtkblist.c:4140
+#: ../pidgin/gtkblist.c:4171
msgid "_Login"
msgstr ""
-#: ../pidgin/gtkblist.c:4225
+#: ../pidgin/gtkblist.c:4256
msgid "/Accounts"
msgstr "/Учётные записи"
#. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4239
+#: ../pidgin/gtkblist.c:4270
#, c-format
msgid ""
"<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -11621,23 +12266,23 @@ msgstr ""
#. set the Show Offline Buddies option. must be done
#. * after the treeview or faceprint gets mad. -Robot101
#.
-#: ../pidgin/gtkblist.c:4484
+#: ../pidgin/gtkblist.c:4516
msgid "/Buddies/Show Offline Buddies"
msgstr "/Собеседники/Показывать собеседников не в сети"
-#: ../pidgin/gtkblist.c:4487
+#: ../pidgin/gtkblist.c:4519
msgid "/Buddies/Show Empty Groups"
msgstr "/Собеседники/Показывать пустые группы"
-#: ../pidgin/gtkblist.c:4493
+#: ../pidgin/gtkblist.c:4525
msgid "/Buddies/Show Buddy Details"
msgstr "/Собеседники/Показывать подробности о собеседнике"
-#: ../pidgin/gtkblist.c:4496
+#: ../pidgin/gtkblist.c:4528
msgid "/Buddies/Show Idle Times"
msgstr "/Собеседники/Показывать время бездействия"
-#: ../pidgin/gtkblist.c:5334
+#: ../pidgin/gtkblist.c:5385
msgid ""
"Please enter the screen name of the person you would like to add to your "
"buddy list. You may optionally enter an alias, or nickname, for the buddy. "
@@ -11648,23 +12293,26 @@ msgstr ""
"собеседника. Псевдоним будет показываться вместо идентификатора "
"пользователя, когда это возможно.\n"
-#: ../pidgin/gtkblist.c:5394 ../pidgin/gtkblist.c:5755
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:307
-msgid "Group:"
-msgstr "Группа:"
+#. End of account box
+#: ../pidgin/gtkblist.c:5420
+msgid "_Screen name:"
+msgstr "_Идентификатор пользователя:"
+
+#: ../pidgin/gtkblist.c:5442 ../pidgin/gtkblist.c:5796
+msgid "A_lias:"
+msgstr "_Псевдоним:"
-#: ../pidgin/gtkblist.c:5653
+#: ../pidgin/gtkblist.c:5708
msgid "This protocol does not support chat rooms."
msgstr "Этот протокол не поддерживает чаты."
-#: ../pidgin/gtkblist.c:5669
+#: ../pidgin/gtkblist.c:5724
msgid ""
"You are not currently signed on with any protocols that have the ability to "
"chat."
msgstr "Вы не подключены по протоколам, имеющим поддержку чатов."
-#: ../pidgin/gtkblist.c:5710
+#: ../pidgin/gtkblist.c:5765
msgid ""
"Please enter an alias, and the appropriate information about the chat you "
"would like to add to your buddy list.\n"
@@ -11672,39 +12320,39 @@ msgstr ""
"Введите псевдоним и соответствующую информацию о чате, который вы хотели бы "
"добавить в список собеседников.\n"
-#: ../pidgin/gtkblist.c:5793
+#: ../pidgin/gtkblist.c:5853
msgid "Please enter the name of the group to be added."
msgstr "Введите имя добавляемой группы."
-#: ../pidgin/gtkblist.c:6433
+#: ../pidgin/gtkblist.c:6493
msgid "<PurpleMain>/Accounts/"
msgstr ""
-#: ../pidgin/gtkblist.c:6457
+#: ../pidgin/gtkblist.c:6517
msgid "_Edit Account"
msgstr "_Изменить учётную запись"
-#: ../pidgin/gtkblist.c:6470 ../pidgin/gtkconv.c:2900
+#: ../pidgin/gtkblist.c:6530 ../pidgin/gtkconv.c:2984
msgid "No actions available"
msgstr "Нет доступных действий"
-#: ../pidgin/gtkblist.c:6478
+#: ../pidgin/gtkblist.c:6538
msgid "_Disable"
msgstr "_Выключить"
-#: ../pidgin/gtkblist.c:6490
+#: ../pidgin/gtkblist.c:6550
msgid "Enable Account"
msgstr "Включить учётную запись"
-#: ../pidgin/gtkblist.c:6496
+#: ../pidgin/gtkblist.c:6556
msgid "<PurpleMain>/Accounts/Enable Account"
msgstr ""
-#: ../pidgin/gtkblist.c:6545
+#: ../pidgin/gtkblist.c:6605
msgid "/Tools"
msgstr "/Инструменты"
-#: ../pidgin/gtkblist.c:6615
+#: ../pidgin/gtkblist.c:6675
msgid "/Buddies/Sort Buddies"
msgstr "/Собеседники/Сортировать собеседников"
@@ -11717,22 +12365,22 @@ msgid ""
"re-enable the account."
msgstr ""
-#: ../pidgin/gtkconv.c:782 ../pidgin/gtkconv.c:808
+#: ../pidgin/gtkconv.c:792 ../pidgin/gtkconv.c:818
msgid "That buddy is not on the same protocol as this chat."
msgstr ""
-#: ../pidgin/gtkconv.c:802
+#: ../pidgin/gtkconv.c:812
msgid ""
"You are not currently signed on with an account that can invite that buddy."
msgstr ""
"Вы не подключены с учётной записью, позволяющей пригласить этого собеседника."
-#: ../pidgin/gtkconv.c:855
+#: ../pidgin/gtkconv.c:865
msgid "Invite Buddy Into Chat Room"
msgstr "Пригласить собеседника в чат"
#. Put our happy label in it.
-#: ../pidgin/gtkconv.c:885
+#: ../pidgin/gtkconv.c:895
msgid ""
"Please enter the name of the user you wish to invite, along with an optional "
"invite message."
@@ -11740,188 +12388,196 @@ msgstr ""
"Введите имя пользователя, которого вы хотите пригласить, вместе с "
"необязательным текстом приглашения."
-#: ../pidgin/gtkconv.c:906
+#: ../pidgin/gtkconv.c:916
msgid "_Buddy:"
msgstr "_Собеседник:"
-#: ../pidgin/gtkconv.c:926 ../pidgin/gtksavedstatuses.c:1142
-#: ../pidgin/gtksavedstatuses.c:1478
+#: ../pidgin/gtkconv.c:936 ../pidgin/gtksavedstatuses.c:1141
+#: ../pidgin/gtksavedstatuses.c:1477
msgid "_Message:"
msgstr "Сооб_щение:"
-#: ../pidgin/gtkconv.c:983 ../pidgin/gtkconv.c:2476 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkconv.c:993 ../pidgin/gtkconv.c:2542 ../pidgin/gtkdebug.c:218
#: ../pidgin/gtkft.c:542
msgid "Unable to open file."
msgstr "Не удаётся открыть файл."
-#: ../pidgin/gtkconv.c:989
+#: ../pidgin/gtkconv.c:999
#, c-format
msgid "<h1>Conversation with %s</h1>\n"
msgstr "<h1>Беседа с %s</h1>\n"
-#: ../pidgin/gtkconv.c:1013
+#: ../pidgin/gtkconv.c:1035
msgid "Save Conversation"
msgstr "Сохранить беседу"
-#: ../pidgin/gtkconv.c:1162 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:758
+#: ../pidgin/gtkconv.c:1184 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
msgid "Find"
msgstr "Найти"
-#: ../pidgin/gtkconv.c:1188 ../pidgin/gtkdebug.c:194
+#: ../pidgin/gtkconv.c:1210 ../pidgin/gtkdebug.c:194
msgid "_Search for:"
msgstr "_Искать:"
-#: ../pidgin/gtkconv.c:1340
+#: ../pidgin/gtkconv.c:1393
msgid "Logging started. Future messages in this conversation will be logged."
msgstr ""
"Ведение журнала начато. Последующие сообщения в этой беседе будут записаны."
-#: ../pidgin/gtkconv.c:1348
+#: ../pidgin/gtkconv.c:1401
msgid ""
"Logging stopped. Future messages in this conversation will not be logged."
msgstr ""
"Ведение журнала остановлено. Последующие сообщения в этой беседе не будут "
"записаны."
-#: ../pidgin/gtkconv.c:1596
+#: ../pidgin/gtkconv.c:1649
msgid "Un-Ignore"
msgstr "Не игнорировать"
-#: ../pidgin/gtkconv.c:1599
+#: ../pidgin/gtkconv.c:1652
msgid "Ignore"
msgstr "Игнорировать"
-#: ../pidgin/gtkconv.c:1619
+#: ../pidgin/gtkconv.c:1672
msgid "Get Away Message"
msgstr "Получить сообщение об отсутствии"
-#: ../pidgin/gtkconv.c:1642
+#: ../pidgin/gtkconv.c:1695
msgid "Last said"
msgstr "Последнее сказанное"
-#: ../pidgin/gtkconv.c:2484
+#: ../pidgin/gtkconv.c:2550
msgid "Unable to save icon file to disk."
msgstr "Не удаётся сохранить файл значка на диск."
-#: ../pidgin/gtkconv.c:2535
+#: ../pidgin/gtkconv.c:2601
msgid "Save Icon"
msgstr "Сохранить значок"
-#: ../pidgin/gtkconv.c:2587
+#: ../pidgin/gtkconv.c:2653
msgid "Animate"
msgstr "Анимировать"
-#: ../pidgin/gtkconv.c:2592
+#: ../pidgin/gtkconv.c:2658
msgid "Hide Icon"
msgstr "Скрыть значок"
-#: ../pidgin/gtkconv.c:2595
+#: ../pidgin/gtkconv.c:2661
msgid "Save Icon As..."
msgstr "Сохранить значок как..."
-#: ../pidgin/gtkconv.c:2599
+#: ../pidgin/gtkconv.c:2665
msgid "Set Custom Icon..."
msgstr "Установить собственный значок..."
-#: ../pidgin/gtkconv.c:2612
+#: ../pidgin/gtkconv.c:2678
msgid "Remove Custom Icon"
msgstr "Удалить собственный значок"
#. Conversation menu
-#: ../pidgin/gtkconv.c:2754
+#: ../pidgin/gtkconv.c:2820
msgid "/_Conversation"
msgstr "/_Беседа"
-#: ../pidgin/gtkconv.c:2756
+#: ../pidgin/gtkconv.c:2822
msgid "/Conversation/New Instant _Message..."
msgstr "/Беседа/Новое мгновенное сооб_щение..."
-#: ../pidgin/gtkconv.c:2761
+#: ../pidgin/gtkconv.c:2827
msgid "/Conversation/_Find..."
msgstr "/Беседа/_Найти..."
-#: ../pidgin/gtkconv.c:2763
+#: ../pidgin/gtkconv.c:2829
msgid "/Conversation/View _Log"
msgstr "/Беседа/Просмотреть _журнал"
-#: ../pidgin/gtkconv.c:2764
+#: ../pidgin/gtkconv.c:2830
msgid "/Conversation/_Save As..."
msgstr "/Беседа/Со_хранить как..."
-#: ../pidgin/gtkconv.c:2766
+#: ../pidgin/gtkconv.c:2832
msgid "/Conversation/Clea_r Scrollback"
msgstr "/Беседа/О_чистить"
-#: ../pidgin/gtkconv.c:2770
+#: ../pidgin/gtkconv.c:2836
msgid "/Conversation/Se_nd File..."
msgstr "/Беседа/Отправить _файл..."
-#: ../pidgin/gtkconv.c:2771
+#: ../pidgin/gtkconv.c:2837
msgid "/Conversation/Add Buddy _Pounce..."
msgstr "/Беседа/Добавить п_равило..."
-#: ../pidgin/gtkconv.c:2773
+#: ../pidgin/gtkconv.c:2839
msgid "/Conversation/_Get Info"
msgstr "/Беседа/Получить _информацию"
-#: ../pidgin/gtkconv.c:2775
+#: ../pidgin/gtkconv.c:2841
msgid "/Conversation/In_vite..."
msgstr "/Беседа/Приг_ласить..."
-#: ../pidgin/gtkconv.c:2777
+#: ../pidgin/gtkconv.c:2843
msgid "/Conversation/M_ore"
msgstr "/Беседа/_Ещё"
-#: ../pidgin/gtkconv.c:2781
+#: ../pidgin/gtkconv.c:2847
msgid "/Conversation/Al_ias..."
msgstr "/Беседа/_Псевдоним..."
-#: ../pidgin/gtkconv.c:2783
+#: ../pidgin/gtkconv.c:2849
msgid "/Conversation/_Block..."
msgstr "/Беседа/_Блокировать..."
-#: ../pidgin/gtkconv.c:2785
+#: ../pidgin/gtkconv.c:2851
msgid "/Conversation/_Unblock..."
msgstr "/Беседа/Раз_блокировать..."
-#: ../pidgin/gtkconv.c:2787
+#: ../pidgin/gtkconv.c:2853
msgid "/Conversation/_Add..."
msgstr "/Беседа/_Добавить..."
-#: ../pidgin/gtkconv.c:2789
+#: ../pidgin/gtkconv.c:2855
msgid "/Conversation/_Remove..."
msgstr "/Беседа/_Удалить..."
-#: ../pidgin/gtkconv.c:2794
+#: ../pidgin/gtkconv.c:2860
+msgid "/Conversation/Insert Lin_k..."
+msgstr "/Беседа/Вставить _ссылку..."
+
+#: ../pidgin/gtkconv.c:2862
+msgid "/Conversation/Insert Imag_e..."
+msgstr "/Беседа/Вставить из_ображение..."
+
+#: ../pidgin/gtkconv.c:2868
msgid "/Conversation/_Close"
msgstr "/Беседа/_Закрыть"
#. Options
-#: ../pidgin/gtkconv.c:2798
+#: ../pidgin/gtkconv.c:2872
msgid "/_Options"
msgstr "/_Параметры"
-#: ../pidgin/gtkconv.c:2799
+#: ../pidgin/gtkconv.c:2873
msgid "/Options/Enable _Logging"
msgstr "/Параметры/Вести _журнал"
-#: ../pidgin/gtkconv.c:2800
+#: ../pidgin/gtkconv.c:2874
msgid "/Options/Enable _Sounds"
msgstr "/Параметры/Воспроизводить _звуки"
-#: ../pidgin/gtkconv.c:2801
+#: ../pidgin/gtkconv.c:2875
msgid "/Options/Show Buddy _Icon"
msgstr "/Параметры/Показывать з_начок собеседника"
-#: ../pidgin/gtkconv.c:2803
+#: ../pidgin/gtkconv.c:2877
msgid "/Options/Show Formatting _Toolbars"
msgstr "/Параметры/Показывать _панели форматирования"
-#: ../pidgin/gtkconv.c:2804
+#: ../pidgin/gtkconv.c:2878
msgid "/Options/Show Ti_mestamps"
msgstr "/Параметры/Показывать _время сообщений"
-#: ../pidgin/gtkconv.c:2879
+#: ../pidgin/gtkconv.c:2954
msgid "/Conversation/More"
msgstr "/Беседа/Ещё"
@@ -11930,93 +12586,101 @@ msgstr "/Беседа/Ещё"
#. Make sure the 'Conversation -> More' menuitems are regenerated whenever
#. * the 'Conversation' menu pops up because the entries can change after the
#. * conversation is created.
-#: ../pidgin/gtkconv.c:2924 ../pidgin/gtkconv.c:2956
+#: ../pidgin/gtkconv.c:3008 ../pidgin/gtkconv.c:3040
msgid "/Conversation"
msgstr "/Беседа"
-#: ../pidgin/gtkconv.c:2964
+#: ../pidgin/gtkconv.c:3048
msgid "/Conversation/View Log"
msgstr "/Беседа/Просмотреть журнал"
-#: ../pidgin/gtkconv.c:2970
+#: ../pidgin/gtkconv.c:3054
msgid "/Conversation/Send File..."
msgstr "/Беседа/Отправить файл..."
-#: ../pidgin/gtkconv.c:2974
+#: ../pidgin/gtkconv.c:3058
msgid "/Conversation/Add Buddy Pounce..."
msgstr "/Беседа/Добавить правило..."
-#: ../pidgin/gtkconv.c:2980
+#: ../pidgin/gtkconv.c:3064
msgid "/Conversation/Get Info"
msgstr "/Беседа/Получить информацию"
-#: ../pidgin/gtkconv.c:2984
+#: ../pidgin/gtkconv.c:3068
msgid "/Conversation/Invite..."
msgstr "/Беседа/Пригласить..."
-#: ../pidgin/gtkconv.c:2990
+#: ../pidgin/gtkconv.c:3074
msgid "/Conversation/Alias..."
msgstr "/Беседа/Псевдоним..."
-#: ../pidgin/gtkconv.c:2994
+#: ../pidgin/gtkconv.c:3078
msgid "/Conversation/Block..."
msgstr "/Беседа/Блокировать..."
-#: ../pidgin/gtkconv.c:2998
+#: ../pidgin/gtkconv.c:3082
msgid "/Conversation/Unblock..."
msgstr "/Беседа/Разблокировать..."
-#: ../pidgin/gtkconv.c:3002
+#: ../pidgin/gtkconv.c:3086
msgid "/Conversation/Add..."
msgstr "/Беседа/Добавить..."
-#: ../pidgin/gtkconv.c:3006
+#: ../pidgin/gtkconv.c:3090
msgid "/Conversation/Remove..."
msgstr "/Беседа/Удалить..."
-#: ../pidgin/gtkconv.c:3010
+#: ../pidgin/gtkconv.c:3096
+msgid "/Conversation/Insert Link..."
+msgstr "/Беседа/Вставить ссылку..."
+
+#: ../pidgin/gtkconv.c:3100
+msgid "/Conversation/Insert Image..."
+msgstr "/Беседа/Вставить изображение..."
+
+#: ../pidgin/gtkconv.c:3106
msgid "/Options/Enable Logging"
msgstr "/Параметры/Вести журнал"
-#: ../pidgin/gtkconv.c:3013
+#: ../pidgin/gtkconv.c:3109
msgid "/Options/Enable Sounds"
msgstr "/Параметры/Воспроизводить звуки"
-#: ../pidgin/gtkconv.c:3026
+#: ../pidgin/gtkconv.c:3122
msgid "/Options/Show Formatting Toolbars"
msgstr "/Параметры/Показывать панели форматирования"
-#: ../pidgin/gtkconv.c:3029
+#: ../pidgin/gtkconv.c:3125
msgid "/Options/Show Timestamps"
msgstr "/Параметры/Показывать время сообщений"
-#: ../pidgin/gtkconv.c:3032
+#: ../pidgin/gtkconv.c:3128
msgid "/Options/Show Buddy Icon"
msgstr "/Параметры/Показывать значок собеседника"
-#: ../pidgin/gtkconv.c:3116 ../pidgin/gtkconv.c:3156
+#: ../pidgin/gtkconv.c:3212 ../pidgin/gtkconv.c:3254
msgid "User is typing..."
msgstr "Пользователь набирает сообщение..."
-#: ../pidgin/gtkconv.c:3159
+#: ../pidgin/gtkconv.c:3257
msgid "User has typed something and stopped"
msgstr "Пользователь что-то набрал и остановился"
#. Build the Send To menu
-#: ../pidgin/gtkconv.c:3341
+#: ../pidgin/gtkconv.c:3439
msgid "_Send To"
msgstr "_Адресат"
-#: ../pidgin/gtkconv.c:4049
+#: ../pidgin/gtkconv.c:4153
msgid "_Send"
msgstr "_Отправить"
#. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4197
+#: ../pidgin/gtkconv.c:4304
msgid "0 people in room"
msgstr "0 пользователей в комнате"
-#: ../pidgin/gtkconv.c:5371 ../pidgin/gtkconv.c:5492
+#: ../pidgin/gtkconv.c:5496 ../pidgin/gtkconv.c:5617
#, c-format
msgid "%d person in room"
msgid_plural "%d people in room"
@@ -12024,71 +12688,71 @@ msgstr[0] "%d пользователь в комнате"
msgstr[1] "%d пользователя в комнате"
msgstr[2] "%d пользователей в комнате"
-#: ../pidgin/gtkconv.c:6048 ../pidgin/gtkstatusbox.c:657
+#: ../pidgin/gtkconv.c:6191 ../pidgin/gtkstatusbox.c:657
msgid "Typing"
msgstr "Набирает сообщение"
-#: ../pidgin/gtkconv.c:6054
+#: ../pidgin/gtkconv.c:6197
msgid "Stopped Typing"
msgstr "Прекратил набор сообщения"
-#: ../pidgin/gtkconv.c:6059
+#: ../pidgin/gtkconv.c:6202
msgid "Nick Said"
msgstr "Произнесено имя"
-#: ../pidgin/gtkconv.c:6064 ../pidgin/gtkdocklet.c:511
+#: ../pidgin/gtkconv.c:6207 ../pidgin/gtkdocklet.c:492
msgid "Unread Messages"
msgstr "Непрочитанные сообщения"
-#: ../pidgin/gtkconv.c:6069
+#: ../pidgin/gtkconv.c:6212
msgid "New Event"
msgstr "Новое событие"
-#: ../pidgin/gtkconv.c:7196
+#: ../pidgin/gtkconv.c:7344
msgid "Confirm close"
msgstr "Подтвердить закрытие"
-#: ../pidgin/gtkconv.c:7228
+#: ../pidgin/gtkconv.c:7376
msgid "You have unread messages. Are you sure you want to close the window?"
msgstr "Есть непрочитанные сообщения. Вы действительно хотите закрыть окно?"
-#: ../pidgin/gtkconv.c:7763
+#: ../pidgin/gtkconv.c:7898
msgid "Close other tabs"
msgstr "Закрыть другие вкладки"
-#: ../pidgin/gtkconv.c:7769
+#: ../pidgin/gtkconv.c:7904
msgid "Close all tabs"
msgstr "Закрыть все вкладки"
-#: ../pidgin/gtkconv.c:7777
+#: ../pidgin/gtkconv.c:7912
msgid "Detach this tab"
msgstr "Отделить эту вкладку"
-#: ../pidgin/gtkconv.c:7783
+#: ../pidgin/gtkconv.c:7918
msgid "Close this tab"
msgstr "Закрыть эту вкладку"
-#: ../pidgin/gtkconv.c:8086
+#: ../pidgin/gtkconv.c:8304
msgid "Close conversation"
msgstr "Закрыть беседу"
-#: ../pidgin/gtkconv.c:8550
+#: ../pidgin/gtkconv.c:8827
msgid "Last created window"
msgstr "Последнее созданное окно"
-#: ../pidgin/gtkconv.c:8552
+#: ../pidgin/gtkconv.c:8829
msgid "Separate IM and Chat windows"
msgstr "Отдельные окна мгновенных сообщений и чатов"
-#: ../pidgin/gtkconv.c:8554 ../pidgin/gtkprefs.c:1303
+#: ../pidgin/gtkconv.c:8831 ../pidgin/gtkprefs.c:1340
msgid "New window"
msgstr "Новое окно"
-#: ../pidgin/gtkconv.c:8556
+#: ../pidgin/gtkconv.c:8833
msgid "By group"
msgstr "По группе"
-#: ../pidgin/gtkconv.c:8558
+#: ../pidgin/gtkconv.c:8835
msgid "By account"
msgstr "По учётной записи"
@@ -12096,59 +12760,59 @@ msgstr "По учётной записи"
msgid "Save Debug Log"
msgstr "Сохранить отладочную информацию в журнал"
-#: ../pidgin/gtkdebug.c:596
+#: ../pidgin/gtkdebug.c:581
msgid "Invert"
msgstr "Инвертировать"
-#: ../pidgin/gtkdebug.c:599
+#: ../pidgin/gtkdebug.c:584
msgid "Highlight matches"
msgstr "Подсветить совпадения"
-#: ../pidgin/gtkdebug.c:666
+#: ../pidgin/gtkdebug.c:651
msgid "_Icon Only"
msgstr "Только _значки"
-#: ../pidgin/gtkdebug.c:667
+#: ../pidgin/gtkdebug.c:652
msgid "_Text Only"
msgstr "Только _текст"
-#: ../pidgin/gtkdebug.c:668
+#: ../pidgin/gtkdebug.c:653
msgid "_Both Icon & Text"
msgstr "Значки _и текст"
-#: ../pidgin/gtkdebug.c:804
+#: ../pidgin/gtkdebug.c:774
msgid "Filter"
msgstr "Фильтр"
-#: ../pidgin/gtkdebug.c:823
+#: ../pidgin/gtkdebug.c:793
msgid "Right click for more options."
msgstr "Щёлкните правой кнопкой мыши для доступа к другим параметрам."
-#: ../pidgin/gtkdebug.c:853
+#: ../pidgin/gtkdebug.c:823
msgid "Level "
msgstr "Уровень "
-#: ../pidgin/gtkdebug.c:854 ../pidgin/gtkdebug.c:860
+#: ../pidgin/gtkdebug.c:824 ../pidgin/gtkdebug.c:830
msgid "Select the debug filter level."
msgstr ""
-#: ../pidgin/gtkdebug.c:862
+#: ../pidgin/gtkdebug.c:832
msgid "All"
msgstr "Все"
-#: ../pidgin/gtkdebug.c:863
+#: ../pidgin/gtkdebug.c:833
msgid "Misc"
msgstr "Разное"
-#: ../pidgin/gtkdebug.c:865
+#: ../pidgin/gtkdebug.c:835
msgid "Warning"
msgstr "Предупреждение"
-#: ../pidgin/gtkdebug.c:866
+#: ../pidgin/gtkdebug.c:836
msgid "Error "
msgstr "Ошибка "
-#: ../pidgin/gtkdebug.c:867
+#: ../pidgin/gtkdebug.c:837
msgid "Fatal Error"
msgstr "Неисправимая ошибка"
@@ -12162,8 +12826,8 @@ msgstr "ведущий разработчик"
#: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
#: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
-#: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:88
-#: ../pidgin/gtkdialogs.c:89
+#: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:88
+#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:90
msgid "developer"
msgstr "разработчик"
@@ -12171,11 +12835,11 @@ msgstr "разработчик"
msgid "developer & webmaster"
msgstr "разработчик и веб-мастер"
-#: ../pidgin/gtkdialogs.c:85
+#: ../pidgin/gtkdialogs.c:86
msgid "support"
msgstr "поддержка"
-#: ../pidgin/gtkdialogs.c:86
+#: ../pidgin/gtkdialogs.c:87
msgid "support/QA"
msgstr "поддержка и контроль качества"
@@ -12197,8 +12861,8 @@ msgid "hacker and designated driver [lazy bum]"
msgstr ""
#: ../pidgin/gtkdialogs.c:115
-msgid "Jabber developer"
-msgstr "Jabber-разработчик"
+msgid "XMPP developer"
+msgstr "XMPP-разработчик"
#: ../pidgin/gtkdialogs.c:116
msgid "original author"
@@ -12213,7 +12877,7 @@ msgid "Arabic"
msgstr "Арабский"
#: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126
-#: ../pidgin/gtkdialogs.c:209
+#: ../pidgin/gtkdialogs.c:211
msgid "Bulgarian"
msgstr "Болгарский"
@@ -12226,8 +12890,8 @@ msgstr "Бенгальский"
msgid "Bosnian"
msgstr "Боснийский"
-#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:210
-#: ../pidgin/gtkdialogs.c:211
+#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:213
msgid "Catalan"
msgstr "Каталанский"
@@ -12235,7 +12899,7 @@ msgstr "Каталанский"
msgid "Valencian-Catalan"
msgstr "Валенсийский-каталанский"
-#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:214
msgid "Czech"
msgstr "Чешский"
@@ -12244,7 +12908,7 @@ msgid "Danish"
msgstr "Датский"
#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:215
msgid "German"
msgstr "Немецкий"
@@ -12273,9 +12937,9 @@ msgstr "Британский английский"
msgid "Esperanto"
msgstr "Эсперанто"
-#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:214
-#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
-#: ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:219
msgid "Spanish"
msgstr "Испанский"
@@ -12288,14 +12952,14 @@ msgstr "Баскский"
msgid "Persian"
msgstr "Персидский"
-#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:218
-#: ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:221
msgid "Finnish"
msgstr "Финский"
-#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:220
-#: ../pidgin/gtkdialogs.c:221 ../pidgin/gtkdialogs.c:222
-#: ../pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:223 ../pidgin/gtkdialogs.c:224
+#: ../pidgin/gtkdialogs.c:225
msgid "French"
msgstr "Французский"
@@ -12307,7 +12971,11 @@ msgstr "Галисийский"
msgid "Gujarati"
msgstr "Гуджарати"
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:224
+#: ../pidgin/gtkdialogs.c:159
+msgid "Gujarati Language Team"
+msgstr "Команда переводчиков на гуджарати"
+
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:226
msgid "Hebrew"
msgstr "Иврит"
@@ -12323,24 +12991,32 @@ msgstr "Венгерский"
msgid "Indonesian"
msgstr "Индонезийский"
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:227
msgid "Italian"
msgstr "Итальянский"
-#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:226
-#: ../pidgin/gtkdialogs.c:227 ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:229 ../pidgin/gtkdialogs.c:230
msgid "Japanese"
msgstr "Японский"
-#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:231
msgid "Georgian"
msgstr "Грузинский"
+#: ../pidgin/gtkdialogs.c:166
+msgid "Ubuntu Georgian Translators"
+msgstr "Переводчики Ubuntu на грузинский"
+
#: ../pidgin/gtkdialogs.c:167
msgid "Kannada"
msgstr "Каннада"
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:167
+msgid "Kannada Translation team"
+msgstr "Команда переводчиков на каннада"
+
+#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:232
msgid "Korean"
msgstr "Корейский"
@@ -12349,187 +13025,186 @@ msgstr "Корейский"
msgid "Kurdish"
msgstr "Курдский"
-#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:231
-#: ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:234
msgid "Lithuanian"
msgstr "Литовский"
-#: ../pidgin/gtkdialogs.c:173
+#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:174
+#: ../pidgin/gtkdialogs.c:235
msgid "Macedonian"
msgstr "Македонский"
-#: ../pidgin/gtkdialogs.c:174
+#: ../pidgin/gtkdialogs.c:175
msgid "Bokmål Norwegian"
msgstr "Букмол"
-#: ../pidgin/gtkdialogs.c:175
+#: ../pidgin/gtkdialogs.c:176
msgid "Nepali"
msgstr "Непальский"
-#: ../pidgin/gtkdialogs.c:176
+#: ../pidgin/gtkdialogs.c:177
msgid "Dutch, Flemish"
msgstr "Нидерландский, фламандский"
-#: ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:178
msgid "Norwegian"
msgstr "Норвежский"
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:179
-#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:236
msgid "Polish"
msgstr "Польский"
-#: ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:182
msgid "Portuguese"
msgstr "Португальский"
-#: ../pidgin/gtkdialogs.c:182
+#: ../pidgin/gtkdialogs.c:183
msgid "Portuguese-Brazil"
msgstr "Португальский-бразильский"
-#: ../pidgin/gtkdialogs.c:183
+#: ../pidgin/gtkdialogs.c:184
msgid "Pashto"
msgstr "Пашто"
-#: ../pidgin/gtkdialogs.c:184
+#: ../pidgin/gtkdialogs.c:185
msgid "Romanian"
msgstr "Румынский"
-#: ../pidgin/gtkdialogs.c:185 ../pidgin/gtkdialogs.c:234
-#: ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:238
msgid "Russian"
msgstr "Русский"
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:187
-#: ../pidgin/gtkdialogs.c:236 ../pidgin/gtkdialogs.c:237
-#: ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
+#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241
msgid "Slovak"
msgstr "Словацкий"
-#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:239
+#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:242
msgid "Slovenian"
msgstr "Словенский"
-#: ../pidgin/gtkdialogs.c:189
+#: ../pidgin/gtkdialogs.c:190
msgid "Albanian"
msgstr "Албанский"
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:192
msgid "Serbian"
msgstr "Сербский"
-#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:243
msgid "Swedish"
msgstr "Шведский"
-#: ../pidgin/gtkdialogs.c:193
+#: ../pidgin/gtkdialogs.c:194
msgid "Tamil"
msgstr "Тамильский"
-#: ../pidgin/gtkdialogs.c:194
+#: ../pidgin/gtkdialogs.c:195
msgid "Telugu"
msgstr "Телугу"
-#: ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:196
msgid "Thai"
msgstr "Тайский"
-#: ../pidgin/gtkdialogs.c:196
+#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:244
msgid "Turkish"
msgstr "Турецкий"
-#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:198
msgid "Vietnamese"
msgstr "Вьетнамский"
-#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:198
msgid "T.M.Thanh and the Gnome-Vi Team"
msgstr "T.M.Thanh и команда Gnome-Vi"
-#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:245
msgid "Simplified Chinese"
msgstr "Упрощённый китайский"
-#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:200
+#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:201
+#: ../pidgin/gtkdialogs.c:202
msgid "Hong Kong Chinese"
msgstr "Гонконгский китайский"
-#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:202
-#: ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:203 ../pidgin/gtkdialogs.c:204
+#: ../pidgin/gtkdialogs.c:246
msgid "Traditional Chinese"
msgstr "Традиционный китайский"
-#: ../pidgin/gtkdialogs.c:208
+#: ../pidgin/gtkdialogs.c:210
msgid "Amharic"
msgstr "Амхарский"
-#: ../pidgin/gtkdialogs.c:327
+#: ../pidgin/gtkdialogs.c:331
#, c-format
msgid "About %s"
msgstr "О %s"
-#: ../pidgin/gtkdialogs.c:363
-#, c-format
-msgid ""
-"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, "
-"ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, "
-"Zephyr, Gadu-Gadu, and QQ all at once. It is written using GTK+.<BR><BR>You "
-"may modify and redistribute the program under the terms of the GPL (version "
-"2 or later). A copy of the GPL is contained in the 'COPYING' file "
-"distributed with %s. %s is copyrighted by its contributors. See the "
-"'COPYRIGHT' file for the complete list of contributors. We provide no "
-"warranty for this program.<BR><BR>"
-msgstr ""
-"%s - модульный клиент обмена сообщениями, позволяющий использовать AIM, MSN, "
-"Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus "
-"Sametime, Bonjour, Zephyr, Gadu-Gadu и QQ одновременно. Написан с "
-"использованием GTK+.<BR><BR>Вы можете изменять и распространять программу по "
-"условиям GPL (версии 2 или более поздней). Копия GPL содержится в файле "
-"'COPYING', распространяемом с %s. Авторские права на %s принадлежат "
-"участникам проекта. Полный список участников проекта смотрите в файле "
-"'COPYRIGHT'. Мы не предоставляем никаких гарантий на эту программу.<BR><BR>"
-
-#: ../pidgin/gtkdialogs.c:378
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin-win32 на irc.freenode.net<BR><BR>"
-
-#: ../pidgin/gtkdialogs.c:381
+#: ../pidgin/gtkdialogs.c:369
+#, c-format
+msgid ""
+"%s is a graphical modular messaging client based on libpurple which is "
+"capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
+"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, and QQ all at "
+"once. It is written using GTK+.<BR><BR>You may modify and redistribute the "
+"program under the terms of the GPL (version 2 or later). A copy of the GPL "
+"is contained in the 'COPYING' file distributed with %s. %s is copyrighted "
+"by its contributors. See the 'COPYRIGHT' file for the complete list of "
+"contributors. We provide no warranty for this program.<BR><BR>"
+msgstr ""
+"%s - графический модульный клиент обмена сообщениями, основывающийся на "
+"библиотеке libpurple, позволяющей использовать AIM, MSN, Yahoo!, XMPP, ICQ, "
+"IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, "
+"Gadu-Gadu и QQ одновременно. Написан с использованием GTK+.<BR><BR>Вы "
+"можете изменять и распространять программу по условиям GPL (версии 2 или "
+"более поздней). Копия GPL содержится в файле 'COPYING', распространяемом с %"
+"s. Авторские права на %s принадлежат участникам проекта. Полный список "
+"участников проекта смотрите в файле 'COPYRIGHT'. Мы не предоставляем "
+"никаких гарантий на эту программу.<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:384
msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin на irc.freenode.net<BR><BR>"
-#: ../pidgin/gtkdialogs.c:387
+#: ../pidgin/gtkdialogs.c:389
msgid "Current Developers"
msgstr "Текущие разработчики"
-#: ../pidgin/gtkdialogs.c:402
+#: ../pidgin/gtkdialogs.c:404
msgid "Crazy Patch Writers"
msgstr "Одержимые писатели заплаток"
-#: ../pidgin/gtkdialogs.c:417
+#: ../pidgin/gtkdialogs.c:419
msgid "Retired Developers"
msgstr "Разработчики, отошедшие от дел"
-#: ../pidgin/gtkdialogs.c:432
+#: ../pidgin/gtkdialogs.c:434
msgid "Artists"
msgstr "Художники"
-#: ../pidgin/gtkdialogs.c:447
+#: ../pidgin/gtkdialogs.c:449
msgid "Current Translators"
msgstr "Текущие переводчики"
-#: ../pidgin/gtkdialogs.c:467
+#: ../pidgin/gtkdialogs.c:469
msgid "Past Translators"
msgstr "Предыдущие переводчики"
-#: ../pidgin/gtkdialogs.c:485
+#: ../pidgin/gtkdialogs.c:487
msgid "Debugging Information"
msgstr "Отладочная информация"
-#: ../pidgin/gtkdialogs.c:854
+#: ../pidgin/gtkdialogs.c:865
msgid "Get User Info"
msgstr "Получить пользовательскую информацию"
-#: ../pidgin/gtkdialogs.c:856
+#: ../pidgin/gtkdialogs.c:867
msgid ""
"Please enter the screen name or alias of the person whose info you would "
"like to view."
@@ -12537,11 +13212,11 @@ msgstr ""
"Введите идентификатор пользователя или псевдоним персоны, информацию о "
"которой вы хотели бы просмотреть."
-#: ../pidgin/gtkdialogs.c:946
+#: ../pidgin/gtkdialogs.c:957
msgid "View User Log"
msgstr "Просмотреть журнал пользователя"
-#: ../pidgin/gtkdialogs.c:948
+#: ../pidgin/gtkdialogs.c:959
msgid ""
"Please enter the screen name or alias of the person whose log you would like "
"to view."
@@ -12549,32 +13224,32 @@ msgstr ""
"Введите идентификатор пользователя или псевдоним персоны, журнал которой вы "
"хотели бы просмотреть."
-#: ../pidgin/gtkdialogs.c:968
+#: ../pidgin/gtkdialogs.c:979
msgid "Alias Contact"
msgstr "Псевдоним контакта"
-#: ../pidgin/gtkdialogs.c:969
+#: ../pidgin/gtkdialogs.c:980
msgid "Enter an alias for this contact."
msgstr "Введите псевдоним для этого контакта."
-#: ../pidgin/gtkdialogs.c:991
+#: ../pidgin/gtkdialogs.c:1002
#, c-format
msgid "Enter an alias for %s."
msgstr "Введите псевдоним для %s."
-#: ../pidgin/gtkdialogs.c:993
+#: ../pidgin/gtkdialogs.c:1004
msgid "Alias Buddy"
msgstr "Псевдоним собеседника"
-#: ../pidgin/gtkdialogs.c:1014
+#: ../pidgin/gtkdialogs.c:1025
msgid "Alias Chat"
msgstr "Псевдоним чата"
-#: ../pidgin/gtkdialogs.c:1015
+#: ../pidgin/gtkdialogs.c:1026
msgid "Enter an alias for this chat."
msgstr "Введите псевдоним для этого чата."
-#: ../pidgin/gtkdialogs.c:1054
+#: ../pidgin/gtkdialogs.c:1065
#, c-format
msgid ""
"You are about to remove the contact containing %s and %d other buddy from "
@@ -12592,15 +13267,15 @@ msgstr[2] ""
"Вы удалите контакт, содержащий %s и %d других собеседников из списка "
"собеседников. Хотите продолжить?"
-#: ../pidgin/gtkdialogs.c:1062
+#: ../pidgin/gtkdialogs.c:1073
msgid "Remove Contact"
msgstr "Удалить контакт"
-#: ../pidgin/gtkdialogs.c:1065
+#: ../pidgin/gtkdialogs.c:1076
msgid "_Remove Contact"
msgstr "_Удалить контакт"
-#: ../pidgin/gtkdialogs.c:1096
+#: ../pidgin/gtkdialogs.c:1107
#, c-format
msgid ""
"You are about to merge the group called %s into the group called %s. Do you "
@@ -12608,15 +13283,15 @@ msgid ""
msgstr ""
"Вы добавите содержимое группы %s к содержимому группы %s. Хотите продолжить?"
-#: ../pidgin/gtkdialogs.c:1103
+#: ../pidgin/gtkdialogs.c:1114
msgid "Merge Groups"
msgstr "Объединить группы"
-#: ../pidgin/gtkdialogs.c:1106
+#: ../pidgin/gtkdialogs.c:1117
msgid "_Merge Groups"
msgstr "_Объединить группы"
-#: ../pidgin/gtkdialogs.c:1156
+#: ../pidgin/gtkdialogs.c:1167
#, c-format
msgid ""
"You are about to remove the group %s and all its members from your buddy "
@@ -12625,72 +13300,69 @@ msgstr ""
"Вы удалите группу %s и всех её членов из списка собеседников. Хотите "
"продолжить?"
-#: ../pidgin/gtkdialogs.c:1159
+#: ../pidgin/gtkdialogs.c:1170
msgid "Remove Group"
msgstr "Удалить группу"
-#: ../pidgin/gtkdialogs.c:1162
+#: ../pidgin/gtkdialogs.c:1173
msgid "_Remove Group"
msgstr "_Удалить группу"
-#: ../pidgin/gtkdialogs.c:1195
+#: ../pidgin/gtkdialogs.c:1206
#, c-format
msgid ""
"You are about to remove %s from your buddy list. Do you want to continue?"
msgstr "Вы удалите %s из списка собеседников. Хотите продолжить?"
-#: ../pidgin/gtkdialogs.c:1198
+#: ../pidgin/gtkdialogs.c:1209
msgid "Remove Buddy"
msgstr "Удалить собеседника"
-#: ../pidgin/gtkdialogs.c:1201
+#: ../pidgin/gtkdialogs.c:1212
msgid "_Remove Buddy"
msgstr "_Удалить собеседника"
-#: ../pidgin/gtkdialogs.c:1222
+#: ../pidgin/gtkdialogs.c:1233
#, c-format
msgid ""
"You are about to remove the chat %s from your buddy list. Do you want to "
"continue?"
msgstr "Вы удалите чат %s из списка собеседников. Хотите продолжить?"
-#: ../pidgin/gtkdialogs.c:1225
+#: ../pidgin/gtkdialogs.c:1236
msgid "Remove Chat"
msgstr "Удалить чат"
-#: ../pidgin/gtkdialogs.c:1228
+#: ../pidgin/gtkdialogs.c:1239
msgid "_Remove Chat"
msgstr "_Удалить чат"
-#: ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkdocklet.c:150
msgid "Right-click for more unread messages...\n"
msgstr ""
"Щёлкните правой кнопкой мыши для чтения других непрочитанных сообщений...\n"
-#: ../pidgin/gtkdocklet.c:454
+#: ../pidgin/gtkdocklet.c:435
msgid "Change Status"
msgstr "Изменить статус"
-#: ../pidgin/gtkdocklet.c:506
+#: ../pidgin/gtkdocklet.c:487
msgid "Show Buddy List"
msgstr "Показывать список собеседников"
-#: ../pidgin/gtkdocklet.c:532
+#: ../pidgin/gtkdocklet.c:513
msgid "New Message..."
msgstr "Новое сообщение..."
-#: ../pidgin/gtkdocklet.c:547
+#: ../pidgin/gtkdocklet.c:528
msgid "Mute Sounds"
msgstr "Отключить звуки"
-#: ../pidgin/gtkdocklet.c:554
+#: ../pidgin/gtkdocklet.c:535
msgid "Blink on new message"
msgstr "Мерцать при наличии нового сообщения"
-#. TODO: need a submenu to change status, this needs to "link"
-#. * to the status in the buddy list gtkstatusbox
-#.
-#: ../pidgin/gtkdocklet.c:565
+#: ../pidgin/gtkdocklet.c:542
msgid "Quit"
msgstr "Выйти"
@@ -12780,43 +13452,43 @@ msgstr "_Пауза"
msgid "_Resume"
msgstr "_Возобновить"
-#: ../pidgin/gtkimhtml.c:792
+#: ../pidgin/gtkimhtml.c:796
msgid "Paste as Plain _Text"
msgstr "Вставить как простой _текст"
-#: ../pidgin/gtkimhtml.c:809
+#: ../pidgin/gtkimhtml.c:813
msgid "_Reset formatting"
msgstr "Восстановить _форматирование"
-#: ../pidgin/gtkimhtml.c:1295
+#: ../pidgin/gtkimhtml.c:1309
msgid "Hyperlink color"
msgstr "Цвет гиперссылки"
-#: ../pidgin/gtkimhtml.c:1296
+#: ../pidgin/gtkimhtml.c:1310
msgid "Color to draw hyperlinks."
msgstr "Цвет для отображения гиперссылок."
-#: ../pidgin/gtkimhtml.c:1299
+#: ../pidgin/gtkimhtml.c:1313
msgid "Hyperlink prelight color"
msgstr "Цвет подсветки гиперссылки"
-#: ../pidgin/gtkimhtml.c:1300
+#: ../pidgin/gtkimhtml.c:1314
msgid "Color to draw hyperlinks when mouse is over them."
msgstr "Цвет для отображения гиперссылок при наведении на них курсора мыши."
-#: ../pidgin/gtkimhtml.c:1516
+#: ../pidgin/gtkimhtml.c:1530
msgid "_Copy E-Mail Address"
msgstr "_Скопировать адрес e-mail"
-#: ../pidgin/gtkimhtml.c:1528
+#: ../pidgin/gtkimhtml.c:1542
msgid "_Open Link in Browser"
msgstr "_Открыть ссылку в браузере"
-#: ../pidgin/gtkimhtml.c:1538
+#: ../pidgin/gtkimhtml.c:1552
msgid "_Copy Link Location"
msgstr "_Скопировать ссылку"
-#: ../pidgin/gtkimhtml.c:3202
+#: ../pidgin/gtkimhtml.c:3227
msgid ""
"<span size='larger' weight='bold'>Unrecognized file type</span>\n"
"\n"
@@ -12826,7 +13498,7 @@ msgstr ""
"\n"
"Принимается за PNG."
-#: ../pidgin/gtkimhtml.c:3205
+#: ../pidgin/gtkimhtml.c:3230
msgid ""
"Unrecognized file type\n"
"\n"
@@ -12836,7 +13508,7 @@ msgstr ""
"\n"
"Принимается за PNG."
-#: ../pidgin/gtkimhtml.c:3218
+#: ../pidgin/gtkimhtml.c:3259
#, c-format
msgid ""
"<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -12847,7 +13519,7 @@ msgstr ""
"\n"
"%s"
-#: ../pidgin/gtkimhtml.c:3221
+#: ../pidgin/gtkimhtml.c:3262
#, c-format
msgid ""
"Error saving image\n"
@@ -12858,35 +13530,35 @@ msgstr ""
"\n"
"%s"
-#: ../pidgin/gtkimhtml.c:3301 ../pidgin/gtkimhtml.c:3313
+#: ../pidgin/gtkimhtml.c:3340 ../pidgin/gtkimhtml.c:3352
msgid "Save Image"
msgstr "Сохранить изображение"
-#: ../pidgin/gtkimhtml.c:3341
+#: ../pidgin/gtkimhtml.c:3380
msgid "_Save Image..."
msgstr "_Сохранить изображение..."
-#: ../pidgin/gtkimhtmltoolbar.c:147
+#: ../pidgin/gtkimhtmltoolbar.c:151
msgid "Select Font"
msgstr "Выбрать шрифт"
-#: ../pidgin/gtkimhtmltoolbar.c:226
+#: ../pidgin/gtkimhtmltoolbar.c:230
msgid "Select Text Color"
msgstr "Выбрать цвет текста"
-#: ../pidgin/gtkimhtmltoolbar.c:305
+#: ../pidgin/gtkimhtmltoolbar.c:309
msgid "Select Background Color"
msgstr "Выбрать цвет фона"
-#: ../pidgin/gtkimhtmltoolbar.c:394
+#: ../pidgin/gtkimhtmltoolbar.c:398
msgid "_URL"
msgstr "_URL"
-#: ../pidgin/gtkimhtmltoolbar.c:402
+#: ../pidgin/gtkimhtmltoolbar.c:406
msgid "_Description"
msgstr "_Описание"
-#: ../pidgin/gtkimhtmltoolbar.c:405
+#: ../pidgin/gtkimhtmltoolbar.c:409
msgid ""
"Please enter the URL and description of the link that you want to insert. "
"The description is optional."
@@ -12894,81 +13566,81 @@ msgstr ""
"Введите URL и описание ссылки, которую вы хотите вставить. Описание "
"необязательно."
-#: ../pidgin/gtkimhtmltoolbar.c:409
+#: ../pidgin/gtkimhtmltoolbar.c:413
msgid "Please enter the URL of the link that you want to insert."
msgstr "Введите URL ссылки, которую вы хотите вставить."
-#: ../pidgin/gtkimhtmltoolbar.c:414
+#: ../pidgin/gtkimhtmltoolbar.c:418
msgid "Insert Link"
msgstr "Вставить ссылку"
-#: ../pidgin/gtkimhtmltoolbar.c:418
+#: ../pidgin/gtkimhtmltoolbar.c:422
msgid "_Insert"
msgstr "_Вставить"
-#: ../pidgin/gtkimhtmltoolbar.c:487
+#: ../pidgin/gtkimhtmltoolbar.c:491
#, c-format
msgid "Failed to store image: %s\n"
msgstr "Не удалось сохранить изображение: %s\n"
-#: ../pidgin/gtkimhtmltoolbar.c:513 ../pidgin/gtkimhtmltoolbar.c:523
+#: ../pidgin/gtkimhtmltoolbar.c:517 ../pidgin/gtkimhtmltoolbar.c:527
msgid "Insert Image"
msgstr "Вставить изображение"
-#: ../pidgin/gtkimhtmltoolbar.c:721
+#: ../pidgin/gtkimhtmltoolbar.c:725
msgid "This theme has no available smileys."
msgstr "Эта тема не имеет доступных смайликов."
#. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:735
+#: ../pidgin/gtkimhtmltoolbar.c:739
msgid "Smile!"
msgstr "Смайл!"
-#: ../pidgin/gtkimhtmltoolbar.c:922 ../pidgin/plugins/convcolors.c:287
+#: ../pidgin/gtkimhtmltoolbar.c:926 ../pidgin/plugins/convcolors.c:287
msgid "Bold"
msgstr "Жирный"
-#: ../pidgin/gtkimhtmltoolbar.c:933 ../pidgin/plugins/convcolors.c:294
+#: ../pidgin/gtkimhtmltoolbar.c:937 ../pidgin/plugins/convcolors.c:294
msgid "Italic"
msgstr "Наклонный"
-#: ../pidgin/gtkimhtmltoolbar.c:944 ../pidgin/plugins/convcolors.c:301
+#: ../pidgin/gtkimhtmltoolbar.c:948 ../pidgin/plugins/convcolors.c:301
msgid "Underline"
msgstr "Подчёркнутый"
-#: ../pidgin/gtkimhtmltoolbar.c:960
+#: ../pidgin/gtkimhtmltoolbar.c:964
msgid "Larger font size"
-msgstr "Больший размер шрифта"
+msgstr ""
-#: ../pidgin/gtkimhtmltoolbar.c:972
+#: ../pidgin/gtkimhtmltoolbar.c:976
msgid "Smaller font size"
-msgstr "Меньший размер шрифта "
+msgstr ""
-#: ../pidgin/gtkimhtmltoolbar.c:989
+#: ../pidgin/gtkimhtmltoolbar.c:993
msgid "Font face"
msgstr "Облик шрифта"
-#: ../pidgin/gtkimhtmltoolbar.c:1001
+#: ../pidgin/gtkimhtmltoolbar.c:1005
msgid "Foreground font color"
msgstr "Цвет шрифта"
-#: ../pidgin/gtkimhtmltoolbar.c:1013
+#: ../pidgin/gtkimhtmltoolbar.c:1017
msgid "Background color"
msgstr "Цвет фона"
-#: ../pidgin/gtkimhtmltoolbar.c:1029
+#: ../pidgin/gtkimhtmltoolbar.c:1033
msgid "Reset formatting"
msgstr "Восстановить форматирование"
-#: ../pidgin/gtkimhtmltoolbar.c:1044
+#: ../pidgin/gtkimhtmltoolbar.c:1048
msgid "Insert link"
msgstr "Вставить ссылку"
-#: ../pidgin/gtkimhtmltoolbar.c:1054
+#: ../pidgin/gtkimhtmltoolbar.c:1058
msgid "Insert image"
msgstr "Вставить изображение"
-#: ../pidgin/gtkimhtmltoolbar.c:1065
+#: ../pidgin/gtkimhtmltoolbar.c:1069
msgid "Insert smiley"
msgstr "Вставить смайлик"
@@ -13087,26 +13759,26 @@ msgstr ""
" разделённых запятыми)\n"
" -v, --version показать текущую версию и выйти\n"
-#: ../pidgin/gtkmain.c:498
+#: ../pidgin/gtkmain.c:496
#, c-format
msgid ""
"%s has segfaulted and attempted to dump a core file.\n"
"This is a bug in the software and has happened through\n"
"no fault of your own.\n"
"\n"
-"If you can reproduce the crash, please notify the Pidgin\n"
-"developers by reporting a bug at\n"
-"%sbug.php\n"
+"If you can reproduce the crash, please notify the developers\n"
+"by reporting a bug at:\n"
+"%snewticket/\n"
"\n"
"Please make sure to specify what you were doing at the time\n"
"and post the backtrace from the core file. If you do not know\n"
"how to get the backtrace, please read the instructions at\n"
-"%sgdb.php\n"
+"%swiki/GetABacktrace\n"
"\n"
"If you need further assistance, please IM either SeanEgn or \n"
"LSchiere (via AIM). Contact information for Sean and Luke \n"
"on other protocols is at\n"
-"%scontactinfo.php\n"
+"%swiki/DeveloperPages\n"
msgstr ""
#: ../pidgin/gtknotify.c:337
@@ -13137,22 +13809,22 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../pidgin/gtknotify.c:909
+#: ../pidgin/gtknotify.c:951
#, c-format
msgid "The browser command \"%s\" is invalid."
msgstr "Команда запуска браузера \"%s\" неверна."
-#: ../pidgin/gtknotify.c:911 ../pidgin/gtknotify.c:923
-#: ../pidgin/gtknotify.c:936 ../pidgin/gtknotify.c:1064
+#: ../pidgin/gtknotify.c:953 ../pidgin/gtknotify.c:965
+#: ../pidgin/gtknotify.c:978 ../pidgin/gtknotify.c:1106
msgid "Unable to open URL"
msgstr "Не удаётся открыть URL"
-#: ../pidgin/gtknotify.c:921 ../pidgin/gtknotify.c:934
+#: ../pidgin/gtknotify.c:963 ../pidgin/gtknotify.c:976
#, c-format
msgid "Error launching \"%s\": %s"
msgstr "Ошибка запуска \"%s\": %s"
-#: ../pidgin/gtknotify.c:1065
+#: ../pidgin/gtknotify.c:1107
msgid ""
"The 'Manual' browser command has been chosen, but no command has been set."
msgstr "Был выбран браузер \"Другой\", но команда не была задана."
@@ -13282,7 +13954,7 @@ msgid "Pre_view"
msgstr "Т_ест"
#: ../pidgin/gtkpounce.c:786
-msgid "P_ounce only when my status is not available"
+msgid "P_ounce only when my status is not Available"
msgstr "Выполн_ять только при статусе, отличном от \"Доступен\""
#: ../pidgin/gtkpounce.c:791
@@ -13317,7 +13989,7 @@ msgstr "Значок системного лотка"
msgid "_Show system tray icon:"
msgstr "_Показывать значок системного лотка:"
-#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1648
+#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1686
#: ../pidgin/plugins/timestamp_format.c:42
#: ../pidgin/plugins/timestamp_format.c:51
#: ../pidgin/plugins/win32/winprefs/winprefs.c:338
@@ -13336,7 +14008,7 @@ msgstr "Скрытие окон бесед"
msgid "_Hide new IM conversations:"
msgstr "_Скрывать новые беседы:"
-#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1828
+#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1867
msgid "When away"
msgstr "Во время отсутствия"
@@ -13385,39 +14057,55 @@ msgstr "Справа вертикально"
msgid "N_ew conversations:"
msgstr "_Новые беседы:"
-#: ../pidgin/gtkprefs.c:900
+#: ../pidgin/gtkprefs.c:917
msgid "Show _formatting on incoming messages"
msgstr "Показывать _форматирование во входящих сообщениях"
-#: ../pidgin/gtkprefs.c:903
+#: ../pidgin/gtkprefs.c:920
msgid "Show buddy _icons"
-msgstr "Показывать _значки собеседников"
+msgstr "Показывать з_начки собеседников"
-#: ../pidgin/gtkprefs.c:905
+#: ../pidgin/gtkprefs.c:922
msgid "Enable buddy ic_on animation"
msgstr "Разрешить _анимацию значков собеседников"
-#: ../pidgin/gtkprefs.c:912
+#: ../pidgin/gtkprefs.c:929
msgid "_Notify buddies that you are typing to them"
msgstr "_Уведомлять собеседников, что вы набираете им сообщение"
-#: ../pidgin/gtkprefs.c:915
+#: ../pidgin/gtkprefs.c:932
msgid "Highlight _misspelled words"
msgstr "Подсвечивать слова с _ошибками"
-#: ../pidgin/gtkprefs.c:919
+#: ../pidgin/gtkprefs.c:936
msgid "Use smooth-scrolling"
msgstr "Использовать плавную прокрутку"
-#: ../pidgin/gtkprefs.c:922
+#: ../pidgin/gtkprefs.c:939
msgid "F_lash window when IMs are received"
msgstr "_Мерцать окном при принятии мгновенных сообщений"
-#: ../pidgin/gtkprefs.c:925
+#: ../pidgin/gtkprefs.c:943
+msgid "Font"
+msgstr "Шрифт"
+
+#: ../pidgin/gtkprefs.c:945
+msgid "Use document font from _theme"
+msgstr "Использовать шрифт документа из _темы"
+
+#: ../pidgin/gtkprefs.c:947
+msgid "Use font from _theme"
+msgstr "Использовать шрифт из _темы"
+
+#: ../pidgin/gtkprefs.c:949
+msgid "Conversation _font:"
+msgstr "_Шрифт беседы:"
+
+#: ../pidgin/gtkprefs.c:962
msgid "Default Formatting"
msgstr "Форматирование по умолчанию"
-#: ../pidgin/gtkprefs.c:941
+#: ../pidgin/gtkprefs.c:978
msgid ""
"This is how your outgoing message text will appear when you use protocols "
"that support formatting. :)"
@@ -13425,119 +14113,119 @@ msgstr ""
"Так будет выглядеть текст ваших сообщений с использованием протоколов, "
"поддерживающих форматирование. :)"
-#: ../pidgin/gtkprefs.c:1017
+#: ../pidgin/gtkprefs.c:1054
msgid "ST_UN server:"
msgstr "ST_UN-сервер:"
-#: ../pidgin/gtkprefs.c:1029
+#: ../pidgin/gtkprefs.c:1066
msgid "<span style=\"italic\">Example: stunserver.org</span>"
msgstr "<span style=\"italic\">Пример: stunserver.org</span>"
-#: ../pidgin/gtkprefs.c:1033
+#: ../pidgin/gtkprefs.c:1070
msgid "_Autodetect IP address"
msgstr "Определять IP-адрес _автоматически"
-#: ../pidgin/gtkprefs.c:1042
+#: ../pidgin/gtkprefs.c:1079
msgid "Public _IP:"
msgstr "Публичный _IP:"
-#: ../pidgin/gtkprefs.c:1071
+#: ../pidgin/gtkprefs.c:1108
msgid "Ports"
msgstr "Порты"
-#: ../pidgin/gtkprefs.c:1074
+#: ../pidgin/gtkprefs.c:1111
msgid "_Manually specify range of ports to listen on"
msgstr "Указать диапазон прослушиваемых портов _вручную"
-#: ../pidgin/gtkprefs.c:1077
+#: ../pidgin/gtkprefs.c:1114
msgid "_Start port:"
msgstr "_Начальный порт:"
-#: ../pidgin/gtkprefs.c:1084
+#: ../pidgin/gtkprefs.c:1121
msgid "_End port:"
msgstr "_Конечный порт:"
-#: ../pidgin/gtkprefs.c:1092
+#: ../pidgin/gtkprefs.c:1129
msgid "Proxy Server"
msgstr "Прокси-сервер"
-#: ../pidgin/gtkprefs.c:1096
+#: ../pidgin/gtkprefs.c:1133
msgid "No proxy"
msgstr "Нет прокси"
-#: ../pidgin/gtkprefs.c:1152
+#: ../pidgin/gtkprefs.c:1189
msgid "_User:"
msgstr "_Пользователь:"
-#: ../pidgin/gtkprefs.c:1216
+#: ../pidgin/gtkprefs.c:1253
msgid "Seamonkey"
msgstr ""
-#: ../pidgin/gtkprefs.c:1217
+#: ../pidgin/gtkprefs.c:1254
msgid "Opera"
msgstr "Opera"
-#: ../pidgin/gtkprefs.c:1218
+#: ../pidgin/gtkprefs.c:1255
msgid "Netscape"
msgstr "Netscape"
-#: ../pidgin/gtkprefs.c:1219
+#: ../pidgin/gtkprefs.c:1256
msgid "Mozilla"
msgstr "Mozilla"
-#: ../pidgin/gtkprefs.c:1220
+#: ../pidgin/gtkprefs.c:1257
msgid "Konqueror"
msgstr "Konqueror"
-#: ../pidgin/gtkprefs.c:1221
+#: ../pidgin/gtkprefs.c:1258
msgid "GNOME Default"
msgstr "Браузер GNOME по умолчанию"
-#: ../pidgin/gtkprefs.c:1222
+#: ../pidgin/gtkprefs.c:1259
msgid "Galeon"
msgstr "Galeon"
-#: ../pidgin/gtkprefs.c:1223
+#: ../pidgin/gtkprefs.c:1260
msgid "Firefox"
msgstr "Firefox"
-#: ../pidgin/gtkprefs.c:1224
+#: ../pidgin/gtkprefs.c:1261
msgid "Firebird"
msgstr "Firebird"
-#: ../pidgin/gtkprefs.c:1225
+#: ../pidgin/gtkprefs.c:1262
msgid "Epiphany"
msgstr "Epiphany"
-#: ../pidgin/gtkprefs.c:1234
+#: ../pidgin/gtkprefs.c:1271
msgid "Manual"
msgstr "Другой"
-#: ../pidgin/gtkprefs.c:1287
+#: ../pidgin/gtkprefs.c:1324
msgid "Browser Selection"
msgstr "Выбор браузера"
-#: ../pidgin/gtkprefs.c:1291
+#: ../pidgin/gtkprefs.c:1328
msgid "_Browser:"
msgstr "_Браузер:"
-#: ../pidgin/gtkprefs.c:1299
+#: ../pidgin/gtkprefs.c:1336
msgid "_Open link in:"
msgstr "_Открывать ссылку в:"
-#: ../pidgin/gtkprefs.c:1301
+#: ../pidgin/gtkprefs.c:1338
msgid "Browser default"
msgstr "По умолчанию"
-#: ../pidgin/gtkprefs.c:1302
+#: ../pidgin/gtkprefs.c:1339
msgid "Existing window"
msgstr "Существующее окно"
-#: ../pidgin/gtkprefs.c:1304
+#: ../pidgin/gtkprefs.c:1341
msgid "New tab"
msgstr "Новая вкладка"
-#: ../pidgin/gtkprefs.c:1318
+#: ../pidgin/gtkprefs.c:1355
#, c-format
msgid ""
"_Manual:\n"
@@ -13546,75 +14234,80 @@ msgstr ""
"_Вручную:\n"
"(%s для URL)"
-#: ../pidgin/gtkprefs.c:1358
+#: ../pidgin/gtkprefs.c:1395
msgid "Log _format:"
msgstr "_Формат журнала:"
-#: ../pidgin/gtkprefs.c:1363
+#: ../pidgin/gtkprefs.c:1400
msgid "Log all _instant messages"
msgstr "Записывать все _мгновенные сообщения"
-#: ../pidgin/gtkprefs.c:1365
+#: ../pidgin/gtkprefs.c:1402
msgid "Log all c_hats"
msgstr "Записывать все _чаты"
-#: ../pidgin/gtkprefs.c:1367
+#: ../pidgin/gtkprefs.c:1404
msgid "Log all _status changes to system log"
msgstr "Записывать все изменения _статуса в системный журнал"
-#: ../pidgin/gtkprefs.c:1513
+#: ../pidgin/gtkprefs.c:1512 ../pidgin/gtkprefs.c:1601
+#: ../pidgin/gtkprefs.c:1795
+msgid "(default)"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:1550
msgid "Sound Selection"
msgstr "Выбор звука"
-#: ../pidgin/gtkprefs.c:1523
+#: ../pidgin/gtkprefs.c:1560
msgid "Quietest"
msgstr "Очень тихо"
-#: ../pidgin/gtkprefs.c:1525
+#: ../pidgin/gtkprefs.c:1562
msgid "Quieter"
msgstr "Тихо"
-#: ../pidgin/gtkprefs.c:1527
+#: ../pidgin/gtkprefs.c:1564
msgid "Quiet"
msgstr "Ниже среднего"
-#: ../pidgin/gtkprefs.c:1531
+#: ../pidgin/gtkprefs.c:1568
msgid "Loud"
msgstr "Выше среднего"
-#: ../pidgin/gtkprefs.c:1533
+#: ../pidgin/gtkprefs.c:1570
msgid "Louder"
msgstr "Громко"
-#: ../pidgin/gtkprefs.c:1535
+#: ../pidgin/gtkprefs.c:1572
msgid "Loudest"
msgstr "Очень громко"
-#: ../pidgin/gtkprefs.c:1598
+#: ../pidgin/gtkprefs.c:1635
msgid "Sound Method"
msgstr "Метод воспроизведения звука"
-#: ../pidgin/gtkprefs.c:1599
+#: ../pidgin/gtkprefs.c:1636
msgid "_Method:"
msgstr "_Метод:"
-#: ../pidgin/gtkprefs.c:1601
+#: ../pidgin/gtkprefs.c:1638
msgid "Console beep"
msgstr "Сигнал динамиком"
-#: ../pidgin/gtkprefs.c:1603
+#: ../pidgin/gtkprefs.c:1640
msgid "Automatic"
msgstr "Автоматически"
-#: ../pidgin/gtkprefs.c:1606
+#: ../pidgin/gtkprefs.c:1644
msgid "Command"
msgstr "Команда"
-#: ../pidgin/gtkprefs.c:1607
+#: ../pidgin/gtkprefs.c:1645
msgid "No sounds"
msgstr "Нет звуков"
-#: ../pidgin/gtkprefs.c:1615
+#: ../pidgin/gtkprefs.c:1653
#, c-format
msgid ""
"Sound c_ommand:\n"
@@ -13623,117 +14316,117 @@ msgstr ""
"_Команда воспроизведения звука:\n"
"(%s для имени файла)"
-#: ../pidgin/gtkprefs.c:1641
+#: ../pidgin/gtkprefs.c:1679
msgid "Sound Options"
msgstr "Параметры звука"
-#: ../pidgin/gtkprefs.c:1642
+#: ../pidgin/gtkprefs.c:1680
msgid "Sounds when conversation has _focus"
msgstr "Звуки, когда окно беседы в _фокусе"
-#: ../pidgin/gtkprefs.c:1644
+#: ../pidgin/gtkprefs.c:1682
msgid "Enable sounds:"
msgstr "Воспроизводить звуки:"
-#: ../pidgin/gtkprefs.c:1646
+#: ../pidgin/gtkprefs.c:1684
msgid "Only when available"
msgstr "Только во время присутствия"
-#: ../pidgin/gtkprefs.c:1647
+#: ../pidgin/gtkprefs.c:1685
msgid "Only when not available"
msgstr "Только во время отсутствия"
-#: ../pidgin/gtkprefs.c:1655
+#: ../pidgin/gtkprefs.c:1693
msgid "Volume:"
msgstr "Громкость:"
-#: ../pidgin/gtkprefs.c:1683
+#: ../pidgin/gtkprefs.c:1721
msgid "Sound Events"
msgstr "Звуковые события"
-#: ../pidgin/gtkprefs.c:1734
+#: ../pidgin/gtkprefs.c:1773
msgid "Play"
msgstr "Воспроизводить"
-#: ../pidgin/gtkprefs.c:1741
+#: ../pidgin/gtkprefs.c:1780
msgid "Event"
msgstr "Событие"
-#: ../pidgin/gtkprefs.c:1760
+#: ../pidgin/gtkprefs.c:1799
msgid "Test"
msgstr "Тест"
-#: ../pidgin/gtkprefs.c:1764
+#: ../pidgin/gtkprefs.c:1803
msgid "Reset"
msgstr "Сброс"
-#: ../pidgin/gtkprefs.c:1768
+#: ../pidgin/gtkprefs.c:1807
msgid "Choose..."
msgstr "Выбрать..."
-#: ../pidgin/gtkprefs.c:1811
+#: ../pidgin/gtkprefs.c:1850
msgid "_Report idle time:"
msgstr "Сообщать _время бездействия:"
-#: ../pidgin/gtkprefs.c:1816
+#: ../pidgin/gtkprefs.c:1855
msgid "Based on keyboard or mouse use"
msgstr "Основываясь на использовании клавиатуры или мыши"
-#: ../pidgin/gtkprefs.c:1825
+#: ../pidgin/gtkprefs.c:1864
msgid "_Auto-reply:"
msgstr "_Автоматический ответ:"
-#: ../pidgin/gtkprefs.c:1829
+#: ../pidgin/gtkprefs.c:1868
msgid "When both away and idle"
msgstr "Во время отсутствия и бездействия"
#. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1835
+#: ../pidgin/gtkprefs.c:1874
msgid "Auto-away"
msgstr "Авто-\"Отошёл\""
-#: ../pidgin/gtkprefs.c:1837
+#: ../pidgin/gtkprefs.c:1876
msgid "Change status when _idle"
msgstr "Менять статус при _бездействии"
-#: ../pidgin/gtkprefs.c:1841
+#: ../pidgin/gtkprefs.c:1880
msgid "_Minutes before changing status:"
msgstr "_Минут до изменения статуса:"
-#: ../pidgin/gtkprefs.c:1849
+#: ../pidgin/gtkprefs.c:1888
msgid "Change _status to:"
msgstr "Менять _статус на:"
#. Signon status stuff
-#: ../pidgin/gtkprefs.c:1870
+#: ../pidgin/gtkprefs.c:1909
msgid "Status at Startup"
msgstr "Статус при запуске"
-#: ../pidgin/gtkprefs.c:1872
+#: ../pidgin/gtkprefs.c:1911
msgid "Use status from last _exit at startup"
msgstr "Использовать при запуске статус, бывший до в_ыхода"
-#: ../pidgin/gtkprefs.c:1878
+#: ../pidgin/gtkprefs.c:1917
msgid "Status to a_pply at startup:"
msgstr "_Применить при запуске статус:"
-#: ../pidgin/gtkprefs.c:1916
+#: ../pidgin/gtkprefs.c:1955
msgid "Interface"
msgstr "Интерфейс"
-#: ../pidgin/gtkprefs.c:1918
+#: ../pidgin/gtkprefs.c:1957
msgid "Smiley Themes"
msgstr "Темы смайликов"
-#: ../pidgin/gtkprefs.c:1919
+#: ../pidgin/gtkprefs.c:1958
msgid "Sounds"
msgstr "Звуки"
-#: ../pidgin/gtkprefs.c:1925
+#: ../pidgin/gtkprefs.c:1964
msgid "Browser"
msgstr "Браузер"
-#: ../pidgin/gtkprefs.c:1929
+#: ../pidgin/gtkprefs.c:1968
msgid "Status / Idle"
msgstr "Статус / Бездействие"
@@ -13823,23 +14516,23 @@ msgstr "Вы действительно хотите блокировать %s?"
msgid "Apply"
msgstr "Применить"
-#: ../pidgin/gtkrequest.c:1481
+#: ../pidgin/gtkrequest.c:1482
msgid "That file already exists"
msgstr "Такой файл уже существует"
-#: ../pidgin/gtkrequest.c:1482
+#: ../pidgin/gtkrequest.c:1483
msgid "Would you like to overwrite it?"
msgstr "Хотите перезаписать его?"
-#: ../pidgin/gtkrequest.c:1485
+#: ../pidgin/gtkrequest.c:1486
msgid "Overwrite"
msgstr "Перезаписать"
-#: ../pidgin/gtkrequest.c:1486
+#: ../pidgin/gtkrequest.c:1487
msgid "Choose New Name"
msgstr "Выбрать новое имя"
-#: ../pidgin/gtkrequest.c:1624 ../pidgin/gtkrequest.c:1638
+#: ../pidgin/gtkrequest.c:1625 ../pidgin/gtkrequest.c:1639
msgid "Select Folder..."
msgstr "Выбрать папку..."
@@ -13862,7 +14555,7 @@ msgid "Are you sure you want to delete the selected saved statuses?"
msgstr "Вы действительно хотите удалить выбранные сохранённые статусы?"
#. Use button
-#: ../pidgin/gtksavedstatuses.c:580 ../pidgin/gtksavedstatuses.c:1214
+#: ../pidgin/gtksavedstatuses.c:580 ../pidgin/gtksavedstatuses.c:1213
msgid "_Use"
msgstr "_Применить"
@@ -13874,25 +14567,25 @@ msgstr "Название уже используется. Вы должны вы
msgid "Different"
msgstr "Отличающийся"
-#: ../pidgin/gtksavedstatuses.c:1107
+#: ../pidgin/gtksavedstatuses.c:1106
msgid "_Title:"
msgstr "_Название:"
-#: ../pidgin/gtksavedstatuses.c:1126 ../pidgin/gtksavedstatuses.c:1447
+#: ../pidgin/gtksavedstatuses.c:1125 ../pidgin/gtksavedstatuses.c:1446
msgid "_Status:"
msgstr "_Статус:"
#. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1158
+#: ../pidgin/gtksavedstatuses.c:1157
msgid "Use a _different status for some accounts"
msgstr "Использовать _отличающийся статус для некоторых учётных записей"
#. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1222
+#: ../pidgin/gtksavedstatuses.c:1221
msgid "Sa_ve & Use"
msgstr "Сохранить _и применить"
-#: ../pidgin/gtksavedstatuses.c:1428
+#: ../pidgin/gtksavedstatuses.c:1427
#, c-format
msgid "Status for %s"
msgstr "Статус для %s"
@@ -13949,63 +14642,67 @@ msgstr "Не удалось инициализировать GStreamer."
msgid "Waiting for network connection"
msgstr "Ожидание сетевого соединения"
-#: ../pidgin/gtkutils.c:1320 ../pidgin/gtkutils.c:1343
+#: ../pidgin/gtkutils.c:593
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#: ../pidgin/gtkutils.c:1309 ../pidgin/gtkutils.c:1332
#, c-format
msgid "The following error has occurred loading %s: %s"
msgstr "Произошла следующая ошибка при загрузке %s: %s"
-#: ../pidgin/gtkutils.c:1323 ../pidgin/gtkutils.c:1345
+#: ../pidgin/gtkutils.c:1312 ../pidgin/gtkutils.c:1334
msgid "Failed to load image"
msgstr "Не удалось загрузить изображение"
-#: ../pidgin/gtkutils.c:1419
+#: ../pidgin/gtkutils.c:1408
#, c-format
msgid "Cannot send folder %s."
msgstr "Нельзя отправить папку %s."
-#: ../pidgin/gtkutils.c:1420
+#: ../pidgin/gtkutils.c:1409
#, c-format
msgid ""
"%s cannot transfer a folder. You will need to send the files within "
-"individually"
+"individually."
msgstr ""
-#: ../pidgin/gtkutils.c:1452 ../pidgin/gtkutils.c:1464
-#: ../pidgin/gtkutils.c:1471
+#: ../pidgin/gtkutils.c:1441 ../pidgin/gtkutils.c:1453
+#: ../pidgin/gtkutils.c:1460
msgid "You have dragged an image"
msgstr "Вы перетащили изображение"
-#: ../pidgin/gtkutils.c:1453
+#: ../pidgin/gtkutils.c:1442
msgid ""
"You can send this image as a file transfer, embed it into this message, or "
"use it as the buddy icon for this user."
msgstr ""
-#: ../pidgin/gtkutils.c:1459 ../pidgin/gtkutils.c:1480
+#: ../pidgin/gtkutils.c:1448 ../pidgin/gtkutils.c:1468
msgid "Set as buddy icon"
msgstr "Установить в качестве значка собеседника"
-#: ../pidgin/gtkutils.c:1460 ../pidgin/gtkutils.c:1481
+#: ../pidgin/gtkutils.c:1449 ../pidgin/gtkutils.c:1469
msgid "Send image file"
msgstr "Отправить файл изображения"
-#: ../pidgin/gtkutils.c:1461 ../pidgin/gtkutils.c:1481
+#: ../pidgin/gtkutils.c:1450 ../pidgin/gtkutils.c:1469
msgid "Insert in message"
msgstr "Вставить в сообщение"
-#: ../pidgin/gtkutils.c:1465
+#: ../pidgin/gtkutils.c:1454
msgid "Would you like to set it as the buddy icon for this user?"
msgstr ""
"Хотите установить это изображение в качестве значка собеседника для этого "
"пользователя?"
-#: ../pidgin/gtkutils.c:1472
+#: ../pidgin/gtkutils.c:1461
msgid ""
-"You can send this image as a file transfer or embed it into this message, or "
-"use it as the buddy icon for this user."
+"You can send this image as a file transfer, or use it as the buddy icon for "
+"this user."
msgstr ""
-#: ../pidgin/gtkutils.c:1474
+#: ../pidgin/gtkutils.c:1462
msgid ""
"You can insert this image into this message, or use it as the buddy icon for "
"this user"
@@ -14016,17 +14713,17 @@ msgstr ""
#. * send. The only logical one is "Application," but do we really want to send a binary and nothing else?
#. * Probably not. I'll just give an error and return.
#. The original patch sent the icon used by the launcher. That's probably wrong
-#: ../pidgin/gtkutils.c:1532
+#: ../pidgin/gtkutils.c:1520
msgid "Cannot send launcher"
msgstr "Нельзя отправить ярлык"
-#: ../pidgin/gtkutils.c:1532
+#: ../pidgin/gtkutils.c:1520
msgid ""
"You dragged a desktop launcher. Most likely you wanted to send whatever this "
"launcher points to instead of this launcher itself."
msgstr ""
-#: ../pidgin/gtkutils.c:2302
+#: ../pidgin/gtkutils.c:2267
#, c-format
msgid ""
"<b>File:</b> %s\n"
@@ -14037,25 +14734,25 @@ msgstr ""
"<b>Размер файла:</b> %s\n"
"<b>Размер изображения:</b> %dx%d"
-#: ../pidgin/gtkutils.c:2592
+#: ../pidgin/gtkutils.c:2563
#, c-format
msgid "The file '%s' is too large for %s. Please try a smaller image.\n"
msgstr ""
-#: ../pidgin/gtkutils.c:2594
+#: ../pidgin/gtkutils.c:2565
msgid "Icon Error"
msgstr "Ошибка значка"
-#: ../pidgin/gtkutils.c:2595
+#: ../pidgin/gtkutils.c:2566
msgid "Could not set icon"
msgstr "Не удалось установить значок"
-#: ../pidgin/gtkutils.c:2695
+#: ../pidgin/gtkutils.c:2666
#, c-format
msgid "Failed to open file '%s': %s"
msgstr "Не удалось открыть файл '%s': %s"
-#: ../pidgin/gtkutils.c:2744
+#: ../pidgin/gtkutils.c:2715
#, c-format
msgid ""
"Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -14069,6 +14766,12 @@ msgstr "Сохранить файл"
msgid "Select color"
msgstr "Выбрать цвет"
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../pidgin/pidgin.h:50
+msgid "Pidgin"
+msgstr "Pidgin"
+
#: ../pidgin/pidginstock.c:81
msgid "_Alias"
msgstr "_Псевдоним"
@@ -14093,6 +14796,26 @@ msgstr "_Изменить"
msgid "_Open Mail"
msgstr "Открыть _почту"
+#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:1
+msgid "Default"
+msgstr "По умолчанию"
+
+#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:2
+msgid "Pidgin smileys"
+msgstr "Смайлики Pidgin"
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1
+msgid "Penguin Pimps"
+msgstr ""
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:2
+msgid "Selecting this disables graphical emoticons."
+msgstr ""
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3
+msgid "none"
+msgstr "нет"
+
#: ../pidgin/plugins/cap/cap.c:449
msgid "Display Statistics"
msgstr "Вывести статистику"
@@ -14265,11 +14988,18 @@ msgstr "По количеству бесед"
msgid "Conversation Placement"
msgstr "Расположение бесед"
-#: ../pidgin/plugins/extplacement.c:106
+#. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
+#: ../pidgin/plugins/extplacement.c:105
+msgid ""
+"Note: The preference for \"New conversations\" must be set to \"By "
+"conversation count\"."
+msgstr ""
+
+#: ../pidgin/plugins/extplacement.c:111
msgid "Number of conversations per window"
msgstr "Количество бесед в окне"
-#: ../pidgin/plugins/extplacement.c:112
+#: ../pidgin/plugins/extplacement.c:117
msgid "Separate IM and Chat windows when placing by number"
msgstr ""
"Разделять окна мгновенных сообщений и чатов при расположении по количеству"
@@ -14280,19 +15010,19 @@ msgstr ""
#. *< dependencies
#. *< priority
#. *< id
-#: ../pidgin/plugins/extplacement.c:141
+#: ../pidgin/plugins/extplacement.c:146
msgid "ExtPlacement"
msgstr "Экстра-расположение"
#. *< name
#. *< version
-#: ../pidgin/plugins/extplacement.c:143
+#: ../pidgin/plugins/extplacement.c:148
msgid "Extra conversation placement options."
msgstr "Дополнительные параметры расположения бесед."
#. *< summary
#. * description
-#: ../pidgin/plugins/extplacement.c:145
+#: ../pidgin/plugins/extplacement.c:150
msgid ""
"Restrict the number of conversations per windows, optionally separating IMs "
"and Chats"
@@ -14362,6 +15092,11 @@ msgstr "Обмен мгновенными сообщениями"
msgid "Select a person from your address book below, or add a new person."
msgstr "Ниже выберите персону из адресной книги или добавьте новую персону."
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:307
+msgid "Group:"
+msgstr "Группа:"
+
#. "New Person" button
#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:580
#: ../pidgin/plugins/gevolution/assoc-buddy.c:469
@@ -14393,34 +15128,34 @@ msgstr "Подробности о пользователе"
msgid "_Associate Buddy"
msgstr "Соотнести собеседника"
-#: ../pidgin/plugins/gevolution/gevolution.c:239
-#: ../pidgin/plugins/gevolution/gevolution.c:245
+#: ../pidgin/plugins/gevolution/gevolution.c:238
+#: ../pidgin/plugins/gevolution/gevolution.c:244
msgid "Unable to send e-mail"
msgstr "Не удаётся отправить e-mail"
-#: ../pidgin/plugins/gevolution/gevolution.c:240
+#: ../pidgin/plugins/gevolution/gevolution.c:239
msgid "The evolution executable was not found in the PATH."
msgstr "Исполняемый файл evolution не был найден в PATH."
-#: ../pidgin/plugins/gevolution/gevolution.c:246
+#: ../pidgin/plugins/gevolution/gevolution.c:245
msgid "An e-mail address was not found for this buddy."
msgstr ""
-#: ../pidgin/plugins/gevolution/gevolution.c:272
+#: ../pidgin/plugins/gevolution/gevolution.c:271
msgid "Add to Address Book"
msgstr "Добавить в адресную книгу"
-#: ../pidgin/plugins/gevolution/gevolution.c:284
+#: ../pidgin/plugins/gevolution/gevolution.c:283
msgid "Send E-Mail"
msgstr "Отправить e-mail"
#. Configuration frame
-#: ../pidgin/plugins/gevolution/gevolution.c:411
+#: ../pidgin/plugins/gevolution/gevolution.c:410
msgid "Evolution Integration Configuration"
msgstr "Настройка интеграции с Evolution"
#. Label
-#: ../pidgin/plugins/gevolution/gevolution.c:414
+#: ../pidgin/plugins/gevolution/gevolution.c:413
msgid "Select all accounts that buddies should be auto-added to."
msgstr ""
"Выберите все учётные записи, собеседники которых должны быть добавлены "
@@ -14432,7 +15167,7 @@ msgstr ""
#. *< dependencies
#. *< priority
#. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:526
+#: ../pidgin/plugins/gevolution/gevolution.c:525
msgid "Evolution Integration"
msgstr "Интеграция с Evolution"
@@ -14440,8 +15175,8 @@ msgstr "Интеграция с Evolution"
#. *< version
#. * summary
#. * description
-#: ../pidgin/plugins/gevolution/gevolution.c:529
-#: ../pidgin/plugins/gevolution/gevolution.c:531
+#: ../pidgin/plugins/gevolution/gevolution.c:528
+#: ../pidgin/plugins/gevolution/gevolution.c:530
msgid "Provides integration with Evolution."
msgstr "Предоставляет интеграцию с Evolution."
@@ -14697,7 +15432,7 @@ msgstr "Уведомление о сообщении"
#: ../pidgin/plugins/notify.c:904 ../pidgin/plugins/notify.c:906
msgid "Provides a variety of ways of notifying you of unread messages."
msgstr ""
-"Предоставляет множество способов уведомления вас о непрочтённых сообщениях."
+"Предоставляет множество способов уведомления вас о непрочитанных сообщениях."
#. *< type
#. *< ui_requirement
@@ -14743,38 +15478,30 @@ msgstr "Вторичный цвет курсора"
msgid "Hyperlink Color"
msgstr "Цвет гиперссылки"
-#: ../pidgin/plugins/pidginrc.c:56
-msgid "GtkTreeView Expander Size"
-msgstr "Размер расширителя GtkTreeView"
-
-#: ../pidgin/plugins/pidginrc.c:57
+#: ../pidgin/plugins/pidginrc.c:54
msgid "GtkTreeView Horizontal Separation"
msgstr "Горизонтальное разделение GtkTreeView"
-#: ../pidgin/plugins/pidginrc.c:76
+#: ../pidgin/plugins/pidginrc.c:73
msgid "Conversation Entry"
msgstr "Область ввода окна беседы"
-#: ../pidgin/plugins/pidginrc.c:77
+#: ../pidgin/plugins/pidginrc.c:74
msgid "Conversation History"
msgstr "История бесед"
-#: ../pidgin/plugins/pidginrc.c:78
+#: ../pidgin/plugins/pidginrc.c:75
msgid "Log Viewer"
msgstr "Система просмотра журналов"
-#: ../pidgin/plugins/pidginrc.c:79
+#: ../pidgin/plugins/pidginrc.c:76
msgid "Request Dialog"
msgstr "Диалог запроса"
-#: ../pidgin/plugins/pidginrc.c:80
+#: ../pidgin/plugins/pidginrc.c:77
msgid "Notify Dialog"
msgstr "Диалог уведомления"
-#: ../pidgin/plugins/pidginrc.c:91
-msgid "GtkTreeView Indent Expanders"
-msgstr ""
-
#: ../pidgin/plugins/pidginrc.c:322
msgid "Select Color"
msgstr "Выберите цвет"
@@ -14796,36 +15523,56 @@ msgstr "Шрифт интерфейса GTK+"
msgid "GTK+ Text Shortcut Theme"
msgstr ""
-#: ../pidgin/plugins/pidginrc.c:508
+#.
+#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
+#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
+#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
+#.
+#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
+#. widget_bool_prefs_set[i], hbox);
+#. gtk_size_group_add_widget(labelsg, check);
+#.
+#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
+#. *
+#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
+#. *
+#. gtk_widget_set_sensitive(widget_bool_widgets[i],
+#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
+#. g_signal_connect(G_OBJECT(check), "toggled",
+#. G_CALLBACK(pidgin_toggle_sensitive),
+#. widget_bool_widgets[i]);
+#. }
+#.
+#: ../pidgin/plugins/pidginrc.c:510
msgid "Interface colors"
msgstr "Цвета интерфейса"
-#: ../pidgin/plugins/pidginrc.c:532
+#: ../pidgin/plugins/pidginrc.c:534
msgid "Widget Sizes"
msgstr "Размер виджетов"
-#: ../pidgin/plugins/pidginrc.c:553
+#: ../pidgin/plugins/pidginrc.c:555
msgid "Fonts"
msgstr "Шрифты"
-#: ../pidgin/plugins/pidginrc.c:576
+#: ../pidgin/plugins/pidginrc.c:578
msgid "Tools"
msgstr "Инструменты"
-#: ../pidgin/plugins/pidginrc.c:581
+#: ../pidgin/plugins/pidginrc.c:583
#, c-format
msgid "Write settings to %s%sgtkrc-2.0"
msgstr "Записать настройки в %s%sgtkrc-2.0"
-#: ../pidgin/plugins/pidginrc.c:589
+#: ../pidgin/plugins/pidginrc.c:591
msgid "Re-read gtkrc files"
msgstr "Повторно прочитать файлы gtkrc"
-#: ../pidgin/plugins/pidginrc.c:622
+#: ../pidgin/plugins/pidginrc.c:624
msgid "Pidgin GTK+ Theme Control"
msgstr "Управление темой GTK+ для Pidgin"
-#: ../pidgin/plugins/pidginrc.c:624 ../pidgin/plugins/pidginrc.c:625
+#: ../pidgin/plugins/pidginrc.c:626 ../pidgin/plugins/pidginrc.c:627
msgid "Provides access to commonly used gtkrc settings."
msgstr "Предоставляет доступ к часто используемым настройкам gtkrc."
@@ -14837,41 +15584,32 @@ msgstr "Необработанный"
msgid "Lets you send raw input to text-based protocols."
msgstr ""
"Позволяет вам отправлять необработанный ввод, используя протоколы, "
-"базирующиеся на тексте."
+"основывающиеся на тексте."
#: ../pidgin/plugins/raw.c:178
msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
"'Enter' in the entry box to send. Watch the debug window."
msgstr ""
"Позволяет вам отправлять необработанный ввод, используя протоколы, "
-"базирующиеся на тексте (Jabber, MSN, IRC, TOC). Для отправки нажмите 'Enter' "
+"основывающиеся на тексте (XMPP, MSN, IRC, TOC). Для отправки нажмите 'Enter' "
"в области ввода. Смотрите за окном отладки."
#: ../pidgin/plugins/relnot.c:71
#, c-format
-msgid "You are using %s version %s. The current version is %s.<hr>"
-msgstr "Вы используете %s версии %s. Последняя доступная версия %s.<hr>"
-
-#: ../pidgin/plugins/relnot.c:77
-#, c-format
msgid ""
-"<b>ChangeLog:</b>\n"
-"%s<br><br>"
+"You are using %s version %s. The current version is %s. You can get it "
+"from <a href=\""
msgstr ""
-"<b>Список изменений:</b>\n"
-"%s<br><br>"
+"Вы используете %s версии %s. Последняя доступная версия %s. Вы можете "
+"получить её по адресу <a href=\""
-#: ../pidgin/plugins/relnot.c:82
+#: ../pidgin/plugins/relnot.c:78
#, c-format
-msgid ""
-"You can get version %s from:<br><a href=\"http://pidgin.im/\">http://pidgin."
-"im</a>."
-msgstr ""
-"Вы можете получить версию %s здесь:<br><a href=\"http://pidgin.im/\">http://"
-"pidgin.im</a>."
+msgid "<b>ChangeLog:</b><br>%s"
+msgstr "<b>Список изменений:</b><br>%s"
-#: ../pidgin/plugins/relnot.c:86 ../pidgin/plugins/relnot.c:87
+#: ../pidgin/plugins/relnot.c:83 ../pidgin/plugins/relnot.c:84
msgid "New Version Available"
msgstr "Доступна новая версия"
@@ -14881,19 +15619,19 @@ msgstr "Доступна новая версия"
#. *< dependencies
#. *< priority
#. *< id
-#: ../pidgin/plugins/relnot.c:145
+#: ../pidgin/plugins/relnot.c:142
msgid "Release Notification"
msgstr "Уведомление о выпуске"
#. *< name
#. *< version
#. * summary
-#: ../pidgin/plugins/relnot.c:148
+#: ../pidgin/plugins/relnot.c:145
msgid "Checks periodically for new releases."
msgstr "Периодически проверяет наличие новых версий."
#. * description
-#: ../pidgin/plugins/relnot.c:150
+#: ../pidgin/plugins/relnot.c:147
msgid ""
"Checks periodically for new releases and notifies the user with the "
"ChangeLog."
@@ -15017,10 +15755,8 @@ msgid "Timestamp Format Options"
msgstr "Параметры формата времени"
#: ../pidgin/plugins/timestamp_format.c:26
-#, c-format
-msgid "_Force (traditional %s) 24-hour time format"
-msgstr ""
-"_Принудительно использовать (традиционный для %s) 24-часовой формат времени"
+msgid "_Force 24-hour time format"
+msgstr "_Принудительно использовать 24-часовой формат времени"
#: ../pidgin/plugins/timestamp_format.c:33
msgid "Show dates in..."
@@ -15188,7 +15924,7 @@ msgstr ""
"Параметры, специфичные для Pidgin для Windows, такие как закрепление списка "
"собеседников."
-#: ../pidgin/plugins/xmppconsole.c:665
+#: ../pidgin/plugins/xmppconsole.c:666
msgid "<font color='#777777'>Logged out.</font>"
msgstr ""
@@ -15198,39 +15934,39 @@ msgstr ""
#. *< dependencies
#. *< priority
#. *< id
-#: ../pidgin/plugins/xmppconsole.c:745 ../pidgin/plugins/xmppconsole.c:841
-#: ../pidgin/plugins/xmppconsole.c:860
+#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:842
+#: ../pidgin/plugins/xmppconsole.c:861
msgid "XMPP Console"
msgstr "Консоль XMPP"
-#: ../pidgin/plugins/xmppconsole.c:753
+#: ../pidgin/plugins/xmppconsole.c:754
msgid "Account: "
msgstr "Учётная запись: "
-#: ../pidgin/plugins/xmppconsole.c:780
+#: ../pidgin/plugins/xmppconsole.c:781
msgid "<font color='#777777'>Not connected to XMPP</font>"
msgstr ""
-#: ../pidgin/plugins/xmppconsole.c:790
+#: ../pidgin/plugins/xmppconsole.c:791
msgid "Insert an <iq/> stanza."
msgstr "Вставить станс <iq/>."
-#: ../pidgin/plugins/xmppconsole.c:799
+#: ../pidgin/plugins/xmppconsole.c:800
msgid "Insert a <presence/> stanza."
msgstr "Вставить станс <presence/>."
-#: ../pidgin/plugins/xmppconsole.c:808
+#: ../pidgin/plugins/xmppconsole.c:809
msgid "Insert a <message/> stanza."
msgstr "Вставить станс <message/>."
#. *< name
#. *< version
#. * summary
-#: ../pidgin/plugins/xmppconsole.c:863
+#: ../pidgin/plugins/xmppconsole.c:864
msgid "Send and receive raw XMPP stanzas."
msgstr ""
#. * description
-#: ../pidgin/plugins/xmppconsole.c:865
+#: ../pidgin/plugins/xmppconsole.c:866
msgid "This plugin is useful for debbuging XMPP servers or clients."
msgstr ""