aboutsummaryrefslogtreecommitdiffstats
path: root/po
diff options
context:
space:
mode:
Diffstat (limited to 'po')
-rw-r--r--po/ChangeLog4
-rw-r--r--po/ru.po3816
2 files changed, 2164 insertions, 1656 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index fed6ed8100..847f6971e9 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2001-04-15 Valek Filippov <frob@df.ru>
+
+ * ru.po: updated russian translation.
+
2001-04-12 Jeffrey Stedfast <fejj@ximian.com>
* POTFILES.in: Removed openpgp-utils.c and added the camel-pgp-*.c
diff --git a/po/ru.po b/po/ru.po
index 65dca02fc4..8618caf6b6 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4,19 +4,19 @@
msgid ""
msgstr ""
"Project-Id-Version: E-volution\n"
-"POT-Creation-Date: 2001-03-15 14:34+0300\n"
-"PO-Revision-Date: 2001-03-15 16:44+03:00\n"
+"POT-Creation-Date: 2001-04-15 17:17+0400\n"
+"PO-Revision-Date: 2001-04-15 17:46+04:00\n"
"Last-Translator: Valek Filippov <frob@df.ru>\n"
"Language-Team: Russian <ru@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=koi8-r\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: addressbook/backend/ebook/e-card.c:3053
+#: addressbook/backend/ebook/e-card.c:3209
msgid "Card: "
msgstr "Карточка: "
-#: addressbook/backend/ebook/e-card.c:3055
+#: addressbook/backend/ebook/e-card.c:3211
msgid ""
"\n"
"Name: "
@@ -24,7 +24,7 @@ msgstr ""
"\n"
"Имя: "
-#: addressbook/backend/ebook/e-card.c:3056
+#: addressbook/backend/ebook/e-card.c:3212
msgid ""
"\n"
" Prefix: "
@@ -32,13 +32,15 @@ msgstr ""
"\n"
" Префикс: "
-#: addressbook/backend/ebook/e-card.c:3057
+#: addressbook/backend/ebook/e-card.c:3213
msgid ""
"\n"
" Given: "
-msgstr "\n Имя: "
+msgstr ""
+"\n"
+" Имя: "
-#: addressbook/backend/ebook/e-card.c:3058
+#: addressbook/backend/ebook/e-card.c:3214
msgid ""
"\n"
" Additional: "
@@ -46,7 +48,7 @@ msgstr ""
"\n"
" Добавочный: "
-#: addressbook/backend/ebook/e-card.c:3059
+#: addressbook/backend/ebook/e-card.c:3215
msgid ""
"\n"
" Family: "
@@ -54,7 +56,7 @@ msgstr ""
"\n"
" Фамилия: "
-#: addressbook/backend/ebook/e-card.c:3060
+#: addressbook/backend/ebook/e-card.c:3216
msgid ""
"\n"
" Suffix: "
@@ -62,7 +64,7 @@ msgstr ""
"\n"
" Суффикс: "
-#: addressbook/backend/ebook/e-card.c:3074
+#: addressbook/backend/ebook/e-card.c:3230
msgid ""
"\n"
"Birth Date: "
@@ -70,7 +72,7 @@ msgstr ""
"\n"
"Дата рождения: "
-#: addressbook/backend/ebook/e-card.c:3085
+#: addressbook/backend/ebook/e-card.c:3241
msgid ""
"\n"
"Address:"
@@ -78,7 +80,7 @@ msgstr ""
"\n"
"Адрес:"
-#: addressbook/backend/ebook/e-card.c:3087
+#: addressbook/backend/ebook/e-card.c:3243
msgid ""
"\n"
" Postal Box: "
@@ -86,7 +88,7 @@ msgstr ""
"\n"
"Почтовый ящик: "
-#: addressbook/backend/ebook/e-card.c:3088
+#: addressbook/backend/ebook/e-card.c:3244
msgid ""
"\n"
" Ext: "
@@ -94,7 +96,7 @@ msgstr ""
"\n"
" Расш.: "
-#: addressbook/backend/ebook/e-card.c:3089
+#: addressbook/backend/ebook/e-card.c:3245
msgid ""
"\n"
" Street: "
@@ -102,7 +104,7 @@ msgstr ""
"\n"
" Улица: "
-#: addressbook/backend/ebook/e-card.c:3090
+#: addressbook/backend/ebook/e-card.c:3246
msgid ""
"\n"
" City: "
@@ -110,7 +112,7 @@ msgstr ""
"\n"
" Город: "
-#: addressbook/backend/ebook/e-card.c:3091
+#: addressbook/backend/ebook/e-card.c:3247
msgid ""
"\n"
" Region: "
@@ -118,7 +120,7 @@ msgstr ""
"\n"
" Область: "
-#: addressbook/backend/ebook/e-card.c:3092
+#: addressbook/backend/ebook/e-card.c:3248
msgid ""
"\n"
" Postal Code: "
@@ -126,7 +128,7 @@ msgstr ""
"\n"
" Почтовый код: "
-#: addressbook/backend/ebook/e-card.c:3093
+#: addressbook/backend/ebook/e-card.c:3249
msgid ""
"\n"
" Country: "
@@ -134,7 +136,7 @@ msgstr ""
"\n"
" Страна: "
-#: addressbook/backend/ebook/e-card.c:3106
+#: addressbook/backend/ebook/e-card.c:3262
msgid ""
"\n"
"Delivery Label: "
@@ -142,7 +144,7 @@ msgstr ""
"\n"
"Метка для доставки:"
-#: addressbook/backend/ebook/e-card.c:3118
+#: addressbook/backend/ebook/e-card.c:3274
msgid ""
"\n"
"Telephones:\n"
@@ -150,7 +152,7 @@ msgstr ""
"\n"
"Телефоны:\n"
-#: addressbook/backend/ebook/e-card.c:3121
+#: addressbook/backend/ebook/e-card.c:3277
msgid ""
"\n"
"Telephone:"
@@ -158,7 +160,7 @@ msgstr ""
"\n"
"Телефон:"
-#: addressbook/backend/ebook/e-card.c:3145
+#: addressbook/backend/ebook/e-card.c:3301
msgid ""
"\n"
"E-mail:\n"
@@ -166,7 +168,7 @@ msgstr ""
"\n"
"Эл.адрес:\n"
-#: addressbook/backend/ebook/e-card.c:3148
+#: addressbook/backend/ebook/e-card.c:3304
msgid ""
"\n"
"E-mail:"
@@ -174,7 +176,7 @@ msgstr ""
"\n"
"Эл.адрес:"
-#: addressbook/backend/ebook/e-card.c:3167
+#: addressbook/backend/ebook/e-card.c:3323
msgid ""
"\n"
"Mailer: "
@@ -182,7 +184,7 @@ msgstr ""
"\n"
"Почтовый клиент: "
-#: addressbook/backend/ebook/e-card.c:3173
+#: addressbook/backend/ebook/e-card.c:3329
msgid ""
"\n"
"Time Zone: "
@@ -190,7 +192,7 @@ msgstr ""
"\n"
"Часовой пояс: "
-#: addressbook/backend/ebook/e-card.c:3181
+#: addressbook/backend/ebook/e-card.c:3337
msgid ""
"\n"
"Geo Location: "
@@ -198,7 +200,7 @@ msgstr ""
"\n"
"Геогр.положение: "
-#: addressbook/backend/ebook/e-card.c:3185
+#: addressbook/backend/ebook/e-card.c:3341
msgid ""
"\n"
"Business Role: "
@@ -206,7 +208,7 @@ msgstr ""
"\n"
"Должность: "
-#: addressbook/backend/ebook/e-card.c:3197
+#: addressbook/backend/ebook/e-card.c:3353
msgid ""
"\n"
"Org: "
@@ -214,7 +216,7 @@ msgstr ""
"\n"
"Орг.:"
-#: addressbook/backend/ebook/e-card.c:3198
+#: addressbook/backend/ebook/e-card.c:3354
msgid ""
"\n"
" Name: "
@@ -222,7 +224,7 @@ msgstr ""
"\n"
" Имя: "
-#: addressbook/backend/ebook/e-card.c:3199
+#: addressbook/backend/ebook/e-card.c:3355
msgid ""
"\n"
" Unit: "
@@ -230,7 +232,7 @@ msgstr ""
"\n"
"Единица: "
-#: addressbook/backend/ebook/e-card.c:3200
+#: addressbook/backend/ebook/e-card.c:3356
msgid ""
"\n"
" Unit2: "
@@ -238,7 +240,7 @@ msgstr ""
"\n"
"Единица2: "
-#: addressbook/backend/ebook/e-card.c:3201
+#: addressbook/backend/ebook/e-card.c:3357
msgid ""
"\n"
" Unit3: "
@@ -246,7 +248,7 @@ msgstr ""
"\n"
"Единица3: "
-#: addressbook/backend/ebook/e-card.c:3202
+#: addressbook/backend/ebook/e-card.c:3358
msgid ""
"\n"
" Unit4: "
@@ -254,7 +256,7 @@ msgstr ""
"\n"
"Единица4: "
-#: addressbook/backend/ebook/e-card.c:3206
+#: addressbook/backend/ebook/e-card.c:3362
msgid ""
"\n"
"Categories: "
@@ -262,7 +264,7 @@ msgstr ""
"\n"
"Категории: "
-#: addressbook/backend/ebook/e-card.c:3207
+#: addressbook/backend/ebook/e-card.c:3363
msgid ""
"\n"
"Comment: "
@@ -280,7 +282,7 @@ msgstr ""
#.
#. add_SoundType (string, crd->sound.type);
#. }
-#: addressbook/backend/ebook/e-card.c:3220
+#: addressbook/backend/ebook/e-card.c:3376
msgid ""
"\n"
"Unique String: "
@@ -288,7 +290,7 @@ msgstr ""
"\n"
"Уникальная строка: "
-#: addressbook/backend/ebook/e-card.c:3223
+#: addressbook/backend/ebook/e-card.c:3379
msgid ""
"\n"
"Public Key: "
@@ -304,15 +306,15 @@ msgstr "Фабрика для импорта файлов GnomeCard в Evolution."
msgid "Imports GnomeCard files into Evolution."
msgstr "Импортирует файлы GnomeCard в Evolution."
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
-#: addressbook/backend/ebook/load-pine-addressbook.c:17
-#: addressbook/backend/ebook/test-client-list.c:18
-#: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1089
-#: addressbook/gui/component/addressbook-factory.c:39
+#: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
+#: addressbook/backend/ebook/load-pine-addressbook.c:22
+#: addressbook/backend/ebook/test-client-list.c:23
+#: addressbook/backend/ebook/test-client.c:33
+#: addressbook/conduit/address-conduit.c:1092
+#: addressbook/gui/component/addressbook-factory.c:43
#: calendar/conduits/calendar/calendar-conduit.c:1151
#: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:68 calendar/gui/main.c:54
+#: calendar/gui/alarm-notify/notify-main.c:72 calendar/gui/main.c:57
msgid "Could not initialize Bonobo"
msgstr "Не удалось инициализировать Bonobo"
@@ -324,20 +326,20 @@ msgstr "Курсор не может быть загружен\n"
msgid "EBook not loaded\n"
msgstr "EBook не загружена\n"
-#: addressbook/conduit/address-conduit.c:651
+#: addressbook/conduit/address-conduit.c:654
#: calendar/conduits/calendar/calendar-conduit.c:731
#: calendar/conduits/todo/todo-conduit.c:545
msgid "Could not start wombat server"
msgstr "Не удалось запустить сервер wombat"
-#: addressbook/conduit/address-conduit.c:652
+#: addressbook/conduit/address-conduit.c:655
#: calendar/conduits/calendar/calendar-conduit.c:732
#: calendar/conduits/todo/todo-conduit.c:546
msgid "Could not start wombat"
msgstr "Не удалось запустить wombat"
-#: addressbook/conduit/address-conduit.c:684
#: addressbook/conduit/address-conduit.c:687
+#: addressbook/conduit/address-conduit.c:690
msgid "Could not read pilot's Address application block"
msgstr "Невозможно прочесть блок приложения адресов Пилота"
@@ -345,7 +347,7 @@ msgstr "Невозможно прочесть блок приложения адресов Пилота"
#: addressbook/gui/component/addressbook-config.glade.h:1
#: calendar/gui/e-meeting-dialog.glade.h:1
#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:7
msgid "Add"
msgstr "Добавить"
@@ -386,7 +388,6 @@ msgstr "Файл как:"
#: addressbook/contact-editor/contact-editor.glade.h:10
#: executive-summary/component/executive-summary-config.glade.h:3
-#: mail/mail-config.glade.h:27
msgid "General"
msgstr "Общее"
@@ -403,7 +404,7 @@ msgid "Phone Types"
msgstr "Тип телефона"
#: addressbook/contact-editor/contact-editor.glade.h:14
-#: addressbook/contact-editor/e-contact-editor.c:1271
+#: addressbook/contact-editor/e-contact-editor.c:1284
msgid "Primary Email"
msgstr "Первый эл.адрес"
@@ -416,7 +417,7 @@ msgid "Web page address:"
msgstr "Адрес web-страницы:"
#: addressbook/contact-editor/contact-editor.glade.h:17
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:74
msgid "_Add"
msgstr "Добавить"
@@ -441,8 +442,8 @@ msgid "_Company:"
msgstr "Компания:"
#: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/mail-config.glade.h:81 ui/evolution-event-editor.xml.h:57
-#: ui/evolution-mail.xml.h:61 ui/evolution-task-editor-dialog.xml.h:69
+#: mail/mail-config.glade.h:75 ui/evolution-event-editor.xml.h:57
+#: ui/evolution-mail.xml.h:93 ui/evolution-task-editor-dialog.xml.h:69
msgid "_Delete"
msgstr "Удалить"
@@ -494,126 +495,122 @@ msgstr "Это почтовый адрес"
msgid "Delete Contact?"
msgstr "Удалить контакт?"
-#: addressbook/contact-editor/e-contact-editor.c:590
+#: addressbook/contact-editor/e-contact-editor.c:603
msgid "This contact belongs to these categories:"
msgstr "Этот контакт принадлежит следующим категориям:"
-#: addressbook/contact-editor/e-contact-editor.c:1229
-#: addressbook/gui/widgets/e-addressbook-view.c:601
+#: addressbook/contact-editor/e-contact-editor.c:1242
+#: addressbook/gui/widgets/e-addressbook-view.c:676
msgid "Assistant"
msgstr "Помощник"
-#: addressbook/contact-editor/e-contact-editor.c:1230
-#: addressbook/contact-editor/e-contact-editor.c:1297
-#: addressbook/gui/widgets/e-addressbook-view.c:581
+#: addressbook/contact-editor/e-contact-editor.c:1243
+#: addressbook/contact-editor/e-contact-editor.c:1310
msgid "Business"
msgstr "Рабочий"
-#: addressbook/contact-editor/e-contact-editor.c:1231
-#: addressbook/gui/widgets/e-addressbook-view.c:588
+#: addressbook/contact-editor/e-contact-editor.c:1244
msgid "Business 2"
msgstr "Рабочий 2"
-#: addressbook/contact-editor/e-contact-editor.c:1232
-#: addressbook/gui/widgets/e-addressbook-view.c:586
+#: addressbook/contact-editor/e-contact-editor.c:1245
+#: addressbook/gui/widgets/e-addressbook-view.c:656
msgid "Business Fax"
msgstr "Рабочий факс"
-#: addressbook/contact-editor/e-contact-editor.c:1233
+#: addressbook/contact-editor/e-contact-editor.c:1246
msgid "Callback"
msgstr "Обратный отзвон"
-#: addressbook/contact-editor/e-contact-editor.c:1234
-#: addressbook/gui/widgets/e-addressbook-view.c:585
+#: addressbook/contact-editor/e-contact-editor.c:1247
msgid "Car"
msgstr "Машина"
-#: addressbook/contact-editor/e-contact-editor.c:1235
+#: addressbook/contact-editor/e-contact-editor.c:1248
msgid "Company"
msgstr "Компания"
-#: addressbook/contact-editor/e-contact-editor.c:1236
-#: addressbook/contact-editor/e-contact-editor.c:1298
-#: addressbook/gui/widgets/e-addressbook-view.c:582
+#: addressbook/contact-editor/e-contact-editor.c:1249
+#: addressbook/contact-editor/e-contact-editor.c:1311
msgid "Home"
msgstr "Домашний"
-#: addressbook/contact-editor/e-contact-editor.c:1237
-#: addressbook/gui/widgets/e-addressbook-view.c:589
+#: addressbook/contact-editor/e-contact-editor.c:1250
msgid "Home 2"
msgstr "Домашний 2"
-#: addressbook/contact-editor/e-contact-editor.c:1238
-#: addressbook/gui/widgets/e-addressbook-view.c:587
+#: addressbook/contact-editor/e-contact-editor.c:1251
+#: addressbook/gui/widgets/e-addressbook-view.c:657
msgid "Home Fax"
msgstr "Домашний Факс"
-#: addressbook/contact-editor/e-contact-editor.c:1239
-#: addressbook/gui/widgets/e-addressbook-view.c:590
+#: addressbook/contact-editor/e-contact-editor.c:1252
+#: addressbook/gui/widgets/e-addressbook-view.c:660
msgid "ISDN"
msgstr "ISDN"
-#: addressbook/contact-editor/e-contact-editor.c:1240
-#: addressbook/gui/widgets/e-addressbook-view.c:584
+#: addressbook/contact-editor/e-contact-editor.c:1253
msgid "Mobile"
msgstr "Мобильный"
-#: addressbook/contact-editor/e-contact-editor.c:1241
-#: addressbook/contact-editor/e-contact-editor.c:1299
-#: addressbook/gui/widgets/e-addressbook-view.c:591
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:46
+#: addressbook/contact-editor/e-contact-editor.c:1254
+#: addressbook/contact-editor/e-contact-editor.c:1312
+#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:40
msgid "Other"
msgstr "Другой"
-#: addressbook/contact-editor/e-contact-editor.c:1242
+#: addressbook/contact-editor/e-contact-editor.c:1255
+#: addressbook/gui/widgets/e-addressbook-view.c:662
msgid "Other Fax"
msgstr "Другой факс"
-#: addressbook/contact-editor/e-contact-editor.c:1243
-#: addressbook/gui/widgets/e-addressbook-view.c:592
+#: addressbook/contact-editor/e-contact-editor.c:1256
+#: addressbook/gui/widgets/e-addressbook-view.c:663
msgid "Pager"
msgstr "Пэйджер"
-#: addressbook/contact-editor/e-contact-editor.c:1244
-#: addressbook/gui/widgets/e-addressbook-view.c:580
+#: addressbook/contact-editor/e-contact-editor.c:1257
msgid "Primary"
msgstr "Первый"
-#: addressbook/contact-editor/e-contact-editor.c:1245
+#: addressbook/contact-editor/e-contact-editor.c:1258
+#: addressbook/gui/widgets/e-addressbook-view.c:664
msgid "Radio"
msgstr "Радио"
-#: addressbook/contact-editor/e-contact-editor.c:1246
+#: addressbook/contact-editor/e-contact-editor.c:1259
+#: addressbook/gui/widgets/e-addressbook-view.c:665
msgid "Telex"
msgstr "Телекс"
-#: addressbook/contact-editor/e-contact-editor.c:1247
+#: addressbook/contact-editor/e-contact-editor.c:1260
msgid "TTY/TDD"
msgstr "TTY/TDD"
-#: addressbook/contact-editor/e-contact-editor.c:1272
-#: addressbook/gui/widgets/e-addressbook-view.c:593
+#: addressbook/contact-editor/e-contact-editor.c:1285
+#: addressbook/gui/widgets/e-addressbook-view.c:668
msgid "Email 2"
msgstr "Эл.адрес 2"
-#: addressbook/contact-editor/e-contact-editor.c:1273
-#: addressbook/gui/widgets/e-addressbook-view.c:594
+#: addressbook/contact-editor/e-contact-editor.c:1286
+#: addressbook/gui/widgets/e-addressbook-view.c:669
msgid "Email 3"
msgstr "Эл.адрес 3"
-#: addressbook/contact-editor/e-contact-quick-add.c:214
+#: addressbook/contact-editor/e-contact-quick-add.c:223
msgid "Contact Quick-Add"
msgstr "Быстрое добавление контакта"
-#: addressbook/contact-editor/e-contact-quick-add.c:216
+#: addressbook/contact-editor/e-contact-quick-add.c:225
msgid "Edit Full"
msgstr "Правка полного имени"
-#: addressbook/contact-editor/e-contact-quick-add.c:253
+#: addressbook/contact-editor/e-contact-quick-add.c:262
+#: addressbook/gui/widgets/e-addressbook-view.c:643
msgid "Full Name"
msgstr "Полное имя:"
-#: addressbook/contact-editor/e-contact-quick-add.c:259
+#: addressbook/contact-editor/e-contact-quick-add.c:268
msgid "E-mail"
msgstr "Эл.адрес"
@@ -729,25 +726,25 @@ msgstr "Суффикс:"
msgid "_Title:"
msgstr "Заголовок:"
-#: addressbook/gui/component/addressbook.c:237
+#: addressbook/gui/component/addressbook.c:241
msgid "As _Minicards"
msgstr "Как миникарточки"
-#: addressbook/gui/component/addressbook.c:243
+#: addressbook/gui/component/addressbook.c:247
#: ui/evolution-addressbook.xml.h:1
msgid "As _Table"
msgstr "Как таблица"
-#: addressbook/gui/component/addressbook.c:412
+#: addressbook/gui/component/addressbook.c:399
#, c-format
msgid "Enter password for %s"
msgstr "Введите пароль для %s"
-#: addressbook/gui/component/addressbook.c:440
+#: addressbook/gui/component/addressbook.c:427
msgid "Unable to open addressbook"
msgstr "Не удалось открыть адресную книгу"
-#: addressbook/gui/component/addressbook.c:445
+#: addressbook/gui/component/addressbook.c:432
msgid ""
"We were unable to open this addressbook. This either\n"
"means you have entered an incorrect URI, or have tried\n"
@@ -767,171 +764,171 @@ msgstr ""
"использовать LDAP, вам надо скачать и установить \n"
"OpenLDAP и перекомпилировать и установить evolution.\n"
-#: addressbook/gui/component/addressbook.c:568
+#: addressbook/gui/component/addressbook.c:555
msgid "Show All"
msgstr "Показать все"
-#: addressbook/gui/component/addressbook.c:570
+#: addressbook/gui/component/addressbook.c:557
msgid "Advanced..."
msgstr "Расширенные..."
-#: addressbook/gui/component/addressbook.c:600
+#: addressbook/gui/component/addressbook.c:587
msgid "Any field contains"
msgstr "Любое поле содержит"
-#: addressbook/gui/component/addressbook.c:601
+#: addressbook/gui/component/addressbook.c:588
msgid "Name contains"
msgstr "Имя содержит"
-#: addressbook/gui/component/addressbook.c:602
+#: addressbook/gui/component/addressbook.c:589
msgid "Email contains"
msgstr "Эл.адрес содержит"
-#: addressbook/gui/component/addressbook.c:745
+#: addressbook/gui/component/addressbook.c:732
msgid "The URI that the Folder Browser will display"
msgstr "URI, который будет показывать программа просмотра папок"
-#: addressbook/gui/component/addressbook-storage.c:95
+#: addressbook/gui/component/addressbook-storage.c:99
msgid "Other Contacts"
msgstr "Другие контакты"
-#: addressbook/gui/component/addressbook-config.c:143
+#: addressbook/gui/component/addressbook-config.c:148
msgid "LDAP Server"
msgstr "Сервер LDAP"
-#: addressbook/gui/component/addressbook-config.c:145
+#: addressbook/gui/component/addressbook-config.c:150
msgid "File"
msgstr "Файл"
-#: addressbook/gui/component/addressbook-config.c:148
+#: addressbook/gui/component/addressbook-config.c:153
msgid "Unknown addressbook type"
msgstr "Неизвестный тип адресной книги"
-#: addressbook/gui/component/addressbook-config.c:158
+#: addressbook/gui/component/addressbook-config.c:163
msgid "None (anonymous mode)"
msgstr "Нет (анонимный режим)"
-#: addressbook/gui/component/addressbook-config.c:160
-#: camel/providers/imap/camel-imap-store.c:261
+#: addressbook/gui/component/addressbook-config.c:165
+#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:145
+#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:43
msgid "Password"
msgstr "Пароль"
-#: addressbook/gui/component/addressbook-config.c:162
+#: addressbook/gui/component/addressbook-config.c:167
msgid "SASL"
msgstr "SASL"
-#: addressbook/gui/component/addressbook-config.c:165
+#: addressbook/gui/component/addressbook-config.c:170
msgid "Unknown auth type"
msgstr "Неизвестная тип авторизации"
-#: addressbook/gui/component/addressbook-config.c:174
+#: addressbook/gui/component/addressbook-config.c:179
msgid "Base"
msgstr "Основа"
-#: addressbook/gui/component/addressbook-config.c:176
+#: addressbook/gui/component/addressbook-config.c:181
msgid "One"
msgstr "Один"
-#: addressbook/gui/component/addressbook-config.c:178
+#: addressbook/gui/component/addressbook-config.c:183
msgid "Subtree"
msgstr "Поддерево"
-#: addressbook/gui/component/addressbook-config.c:181
+#: addressbook/gui/component/addressbook-config.c:186
msgid "Unknown scope type"
msgstr "Неизвестный тип области действия"
-#: addressbook/gui/component/addressbook-config.c:348
+#: addressbook/gui/component/addressbook-config.c:353
msgid "Bind DN:"
msgstr ""
-#: addressbook/gui/component/addressbook-config.c:349
+#: addressbook/gui/component/addressbook-config.c:354
msgid "FIXME Bind DN Help text here"
msgstr ""
-#: addressbook/gui/component/addressbook-config.c:351
+#: addressbook/gui/component/addressbook-config.c:356
+#: mail/mail-config.glade.h:50
msgid "Remember this password"
msgstr "Запомнить этот пароль"
-#: addressbook/gui/component/addressbook-config.c:401
+#: addressbook/gui/component/addressbook-config.c:406
#: mail/mail-config.glade.h:28
msgid "Host:"
msgstr "Хост:"
-#: addressbook/gui/component/addressbook-config.c:402
+#: addressbook/gui/component/addressbook-config.c:407
msgid "FIXME Host help text here."
msgstr ""
-#: addressbook/gui/component/addressbook-config.c:404
+#: addressbook/gui/component/addressbook-config.c:409
msgid "Port:"
msgstr "Порт:"
-#: addressbook/gui/component/addressbook-config.c:405
+#: addressbook/gui/component/addressbook-config.c:410
msgid "FIXME Port help text here."
msgstr ""
-#: addressbook/gui/component/addressbook-config.c:409
+#: addressbook/gui/component/addressbook-config.c:414
msgid "Root DN:"
msgstr ""
-#: addressbook/gui/component/addressbook-config.c:410
+#: addressbook/gui/component/addressbook-config.c:415
msgid "FIXME Root DN help text here."
msgstr ""
-#: addressbook/gui/component/addressbook-config.c:430
+#: addressbook/gui/component/addressbook-config.c:435
msgid "Search Scope:"
msgstr "Поиск области действия:"
-#: addressbook/gui/component/addressbook-config.c:484
-#: mail/mail-config.glade.h:8
+#: addressbook/gui/component/addressbook-config.c:489
msgid "Authentication:"
msgstr "Идентификация:"
-#: addressbook/gui/component/addressbook-config.c:502
-#: mail/mail-config-druid.c:517 mail/mail-config.glade.h:49
+#: addressbook/gui/component/addressbook-config.c:507
+#: mail/mail-config.glade.h:44
msgid "Path:"
msgstr "Путь:"
-#: addressbook/gui/component/addressbook-config.c:503
+#: addressbook/gui/component/addressbook-config.c:508
msgid "FIXME Path Help text here"
msgstr ""
-#: addressbook/gui/component/addressbook-config.c:508
+#: addressbook/gui/component/addressbook-config.c:513
msgid "Create path if it doesn't exist."
msgstr "Создать путь, если он не существует."
-#: addressbook/gui/component/addressbook-config.c:642
+#: addressbook/gui/component/addressbook-config.c:647
msgid "Edit Addressbook"
msgstr "Правка адресной книги"
-#: addressbook/gui/component/addressbook-config.c:644
+#: addressbook/gui/component/addressbook-config.c:649
msgid "Add Addressbook"
msgstr "Добавить адресную книгу"
-#: addressbook/gui/component/addressbook-config.c:660
+#: addressbook/gui/component/addressbook-config.c:665
msgid ""
"Select the kind of addressbook you have, and enter the relevant information "
"about it."
msgstr ""
"Выберите вид вашей адресной книги и введите соответствующую информацию о ней."
-#: addressbook/gui/component/addressbook-config.c:666
-#: mail/mail-config.glade.h:41
+#: addressbook/gui/component/addressbook-config.c:671
+#: mail/mail-config.glade.h:35
msgid "Name:"
msgstr "Имя:"
-#: addressbook/gui/component/addressbook-config.c:667
+#: addressbook/gui/component/addressbook-config.c:672
msgid "FIXME Name help text here"
msgstr ""
-#: addressbook/gui/component/addressbook-config.c:669
+#: addressbook/gui/component/addressbook-config.c:674
#: calendar/gui/e-itip-control.glade.h:6
#: composer/e-msg-composer-attachment.glade.h:3
msgid "Description:"
msgstr "Описание:"
-#: addressbook/gui/component/addressbook-config.c:670
+#: addressbook/gui/component/addressbook-config.c:675
msgid "FIXME Description help text here"
msgstr ""
@@ -940,23 +937,24 @@ msgid "Addressbook Sources"
msgstr "Источники адресных книг"
#: addressbook/gui/component/addressbook-config.glade.h:3
+#: addressbook/gui/widgets/e-addressbook-view.c:578
+#: addressbook/gui/widgets/e-minicard.c:673
#: calendar/gui/e-meeting-dialog.glade.h:8
#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/folder-browser.c:571
-#: mail/mail-config.glade.h:20 mail/mail-view.c:150
+#: filter/libfilter-i18n.h:8 mail/folder-browser.c:597
+#: mail/mail-config.glade.h:19 mail/mail-view.c:156
#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
-#: ui/evolution-mail.xml.h:7 ui/evolution-task-editor-dialog.xml.h:18
+#: ui/evolution-mail.xml.h:11 ui/evolution-task-editor-dialog.xml.h:18
msgid "Delete"
msgstr "Удалить"
#: addressbook/gui/component/addressbook-config.glade.h:4
#: calendar/gui/e-meeting-dialog.glade.h:9 filter/filter.glade.h:3
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:23
msgid "Edit"
msgstr "Правка"
#: addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/widgets/e-addressbook-view.c:578
msgid "Name"
msgstr "Имя"
@@ -964,44 +962,66 @@ msgstr "Имя"
msgid "URI"
msgstr "URI"
-#: addressbook/gui/component/e-address-widget.c:259
-#: addressbook/gui/component/select-names/e-select-names-popup.c:259
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Disable Queries"
+msgstr "Отключить очереди"
+
+#: addressbook/gui/component/e-address-widget.c:365
+msgid "Enable Queries (Dangerous!)"
+msgstr "Включить очереди (Опасно!)"
+
+#: addressbook/gui/component/e-address-widget.c:388
+#: addressbook/gui/component/select-names/e-select-names-popup.c:210
+msgid "Edit Contact Info"
+msgstr "Правка контактной информации"
+
+#: addressbook/gui/component/e-address-widget.c:424
+#: addressbook/gui/component/select-names/e-select-names-popup.c:269
msgid "Add to Contacts"
msgstr "Добавить к контактам"
#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
-msgid "A Bonobo control for displaying an address."
+msgid "A Bonobo control for an address popup."
msgstr ""
#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
-msgid "A sample Bonobo control which displays an addressbook."
+msgid "A Bonobo control for displaying an address."
msgstr ""
#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+msgid "A sample Bonobo control which displays an addressbook."
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
msgid "Control that displays an Evolution addressbook minicard."
msgstr "Что показывать в миникарточках адресной книги Evolution."
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
msgid "Evolution Addressbook minicard viewer"
msgstr "Просмотрщик миникарточек адресной книги Evolution"
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
msgid "Evolution component for handling contacts."
msgstr "Компонент Evolution для обработки контактов."
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
msgid "Factory for the Addressbook Minicard control"
msgstr ""
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
msgid "Factory for the Addressbook's address displayer"
msgstr "Фабрика для отображателя адреса из адресной книги"
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#, fuzzy
+msgid "Factory for the Addressbook's address popup"
+msgstr "Фабрика для отображателя адреса из адресной книги"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
msgid "Factory for the Evolution addressbook component."
msgstr "Фабрика компонента адресной книги Evolution."
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
#, fuzzy
msgid "Factory for the sample Addressbook control"
msgstr "Щелкните здесь для адресной книги"
@@ -1014,20 +1034,17 @@ msgstr "Интерфейс выбора имени в адресной книге Evolution."
msgid "Factory for the Addressbook's name selection interface"
msgstr ""
-#: addressbook/gui/component/select-names/e-select-names-popup.c:121
-#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:9
-#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
+#: addressbook/gui/component/select-names/e-select-names-popup.c:131
+#: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:402
+#: filter/filter-rule.c:549 filter/filter.glade.h:9
+#: shell/e-shortcuts-view.c:265 shell/e-shortcuts-view.c:388
msgid "Remove"
msgstr "Удалить"
-#: addressbook/gui/component/select-names/e-select-names-popup.c:136
+#: addressbook/gui/component/select-names/e-select-names-popup.c:146
msgid "Remove All"
msgstr "Удалить все"
-#: addressbook/gui/component/select-names/e-select-names-popup.c:200
-msgid "Edit Contact Info"
-msgstr "Правка контактной информации"
-
#: addressbook/gui/component/select-names/select-names.glade.h:1
msgid "Find..."
msgstr "Найти..."
@@ -1044,7 +1061,7 @@ msgstr "Выбрать имена"
msgid "Select name from:"
msgstr "Выбрать имена из:"
-#: addressbook/gui/search/e-addressbook-search-dialog.c:150
+#: addressbook/gui/search/e-addressbook-search-dialog.c:158
msgid "Search"
msgstr "Поиск"
@@ -1156,72 +1173,157 @@ msgstr "y"
msgid "z"
msgstr "z"
-#: addressbook/gui/widgets/e-addressbook-view.c:481
-#: addressbook/gui/widgets/e-minicard.c:435
+#: addressbook/gui/widgets/e-addressbook-view.c:513
+#: addressbook/gui/widgets/e-addressbook-view.c:573
+#: addressbook/gui/widgets/e-minicard.c:466
+#: addressbook/gui/widgets/e-minicard.c:668
msgid "Save as VCard"
msgstr "Сохранить как VCard"
+#: addressbook/gui/widgets/e-addressbook-view.c:574
+#: addressbook/gui/widgets/e-minicard.c:669
+msgid "Send contact to other"
+msgstr "Послать контакт другому"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:575
+#: addressbook/gui/widgets/e-minicard.c:670
+msgid "Send message to contact"
+msgstr "Послать сообщение к контакту"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:576
+#: addressbook/gui/widgets/e-minicard.c:671 mail/folder-browser.c:572
+#: mail/mail-view.c:154 ui/evolution-addressbook.xml.h:9
+#: ui/evolution-calendar.xml.h:23 ui/evolution-mail.xml.h:51
+#: ui/evolution-tasks.xml.h:4
+msgid "Print"
+msgstr "Печать"
+
#: addressbook/gui/widgets/e-addressbook-view.c:577
+#: addressbook/gui/widgets/e-minicard.c:672
+msgid "Print Envelope"
+msgstr "Печать конверта"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:641
msgid "* Click here to add a contact *"
msgstr "* Щелкните здесь для добавления контакта *"
-#: addressbook/gui/widgets/e-addressbook-view.c:579
+#: addressbook/gui/widgets/e-addressbook-view.c:642
+msgid "File As"
+msgstr "Файл как"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:644
msgid "Email"
msgstr "Эл.адрес"
-#: addressbook/gui/widgets/e-addressbook-view.c:583
+#: addressbook/gui/widgets/e-addressbook-view.c:645
+msgid "Primary Phone"
+msgstr "Первый телефон"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:646
+msgid "Assistant Phone"
+msgstr "Телефон помощника"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:647
+msgid "Business Phone"
+msgstr "Рабочий телефон"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:648
+msgid "Callback Phone"
+msgstr "Обратный отзвон"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:649
+msgid "Company Phone"
+msgstr "Телефон компании"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:650
+msgid "Home Phone"
+msgstr "Домашний телефон"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:651
msgid "Organization"
msgstr "Организация"
-#: addressbook/gui/widgets/e-addressbook-view.c:595
+#: addressbook/gui/widgets/e-addressbook-view.c:652
+msgid "Business Address"
+msgstr "Рабочий адрес"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:653
+msgid "Home Address"
+msgstr "Домашний адрес"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:654
+msgid "Mobile Phone"
+msgstr "Мобильный телефон"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:655
+msgid "Car Phone"
+msgstr "Телефон в машине"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:658
+msgid "Business Phone 2"
+msgstr "Рабочий телефон 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:659
+msgid "Home Phone 2"
+msgstr "Домашний телефон 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:661
+msgid "Other Phone"
+msgstr "Другие телефоны"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:666
+msgid "TTY"
+msgstr "TTY"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:667
+msgid "Other Address"
+msgstr "Другие адреса"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:670
msgid "Web Site"
msgstr "Сайт в Интернет"
-#: addressbook/gui/widgets/e-addressbook-view.c:596
+#: addressbook/gui/widgets/e-addressbook-view.c:671
msgid "Department"
msgstr "Отдел"
-#: addressbook/gui/widgets/e-addressbook-view.c:597
+#: addressbook/gui/widgets/e-addressbook-view.c:672
msgid "Office"
msgstr "Офис"
-#: addressbook/gui/widgets/e-addressbook-view.c:598
+#: addressbook/gui/widgets/e-addressbook-view.c:673
msgid "Title"
msgstr "Заголовок"
-#: addressbook/gui/widgets/e-addressbook-view.c:599
+#: addressbook/gui/widgets/e-addressbook-view.c:674
msgid "Profession"
msgstr "Профессия"
-#: addressbook/gui/widgets/e-addressbook-view.c:600
+#: addressbook/gui/widgets/e-addressbook-view.c:675
msgid "Manager"
msgstr "Управляющий"
-#: addressbook/gui/widgets/e-addressbook-view.c:602
+#: addressbook/gui/widgets/e-addressbook-view.c:677
msgid "Nickname"
msgstr "Псевдоним"
-#: addressbook/gui/widgets/e-addressbook-view.c:603
+#: addressbook/gui/widgets/e-addressbook-view.c:678
msgid "Spouse"
msgstr "Супруг(а)"
-#: addressbook/gui/widgets/e-addressbook-view.c:604
+#: addressbook/gui/widgets/e-addressbook-view.c:679
msgid "Note"
msgstr "Заметка"
-#: addressbook/gui/widgets/e-addressbook-view.c:605
+#: addressbook/gui/widgets/e-addressbook-view.c:680
msgid "Free-busy URL"
msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:606
-msgid "Click here to add a contact"
-msgstr "Щелкните здесь для добавления контакта"
-
-#: addressbook/gui/widgets/e-minicard-control.c:280
+#: addressbook/gui/widgets/e-minicard-control.c:282
msgid "Save in addressbook"
msgstr "Сохранить в адресной книге"
-#: addressbook/gui/widgets/e-minicard-view.c:141
+#: addressbook/gui/widgets/e-minicard-view.c:166
msgid ""
"\n"
"\n"
@@ -1235,7 +1337,7 @@ msgstr ""
"\n"
"Дважды щелкните здесь для создания нового контакта."
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:25
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:26
msgid "Card View"
msgstr "Просмотр карточек"
@@ -1423,126 +1525,127 @@ msgstr "Невозможно прочесть блок приложения календарь Пилота"
msgid "Could not read pilot's ToDo application block"
msgstr "Невозможно прочесть блок приложения заданий Пилота"
-#: calendar/gui/calendar-commands.c:233
+#: calendar/gui/calendar-commands.c:266
msgid "File not found"
msgstr "Файл не найден"
-#: calendar/gui/calendar-commands.c:257
+#: calendar/gui/calendar-commands.c:290
msgid "Open calendar"
msgstr "Открыть календарь"
-#: calendar/gui/calendar-commands.c:299
+#: calendar/gui/calendar-commands.c:332
msgid "Save calendar"
msgstr "Сохранить календарь"
-#: calendar/gui/calendar-commands.c:451
+#: calendar/gui/calendar-commands.c:468
msgid ""
"Could not create the calendar view. Please check your ORBit and OAF setup."
msgstr ""
"Не удалось создать окно календаря. Пожалуйста проверьте вашу установку ORBit "
"и OAF."
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:901
-#: calendar/gui/e-calendar-table.c:329
+#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:895
+#: calendar/gui/e-calendar-table.c:330
msgid "Public"
msgstr "Общее"
-#: calendar/gui/calendar-model.c:369 calendar/gui/calendar-model.c:903
-#: calendar/gui/e-calendar-table.c:330
+#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:897
+#: calendar/gui/e-calendar-table.c:331
msgid "Private"
msgstr "Личное"
-#: calendar/gui/calendar-model.c:372 calendar/gui/calendar-model.c:905
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:899
+#: calendar/gui/e-calendar-table.c:332
msgid "Confidential"
msgstr "Конфиденциальное"
-#: calendar/gui/calendar-model.c:375 calendar/gui/event-editor.c:1590
-#: calendar/gui/event-editor.c:1617
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1592
+#: calendar/gui/event-editor.c:1619
+#: camel/providers/smtp/camel-smtp-transport.c:218
msgid "Unknown"
msgstr "Неизвестное"
-#: calendar/gui/calendar-model.c:463
+#: calendar/gui/calendar-model.c:457
msgid "N"
msgstr "С"
-#: calendar/gui/calendar-model.c:463
+#: calendar/gui/calendar-model.c:457
msgid "S"
msgstr "Ю"
-#: calendar/gui/calendar-model.c:465
+#: calendar/gui/calendar-model.c:459
msgid "E"
msgstr "В"
-#: calendar/gui/calendar-model.c:465
+#: calendar/gui/calendar-model.c:459
msgid "W"
msgstr "З"
-#: calendar/gui/calendar-model.c:503 calendar/gui/calendar-model.c:1069
+#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1063
#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:351
+#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:660
msgid "High"
msgstr "Высокий"
-#: calendar/gui/calendar-model.c:505 calendar/gui/calendar-model.c:1071
-#: calendar/gui/calendar-model.c:1596
+#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1065
+#: calendar/gui/calendar-model.c:1569
#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:352
+#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:659
msgid "Normal"
msgstr "Нормальный"
-#: calendar/gui/calendar-model.c:507 calendar/gui/calendar-model.c:1073
+#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1067
#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:353
+#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:658
msgid "Low"
msgstr "Низкий"
-#: calendar/gui/calendar-model.c:543 calendar/gui/calendar-model.c:1125
-#: calendar/gui/e-calendar-table.c:405
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1119
+#: calendar/gui/e-calendar-table.c:406
msgid "Transparent"
msgstr "Прозрачный"
-#: calendar/gui/calendar-model.c:546 calendar/gui/calendar-model.c:1127
-#: calendar/gui/e-calendar-table.c:404
+#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1121
+#: calendar/gui/e-calendar-table.c:405
msgid "Opaque"
msgstr "Непрозрачный"
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1179
+#: calendar/gui/calendar-model.c:635 calendar/gui/calendar-model.c:1173
#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-calendar-table.c:426
msgid "Not Started"
msgstr "Не начато"
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1181
+#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1175
#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:427
msgid "In Progress"
msgstr "В процессе"
-#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1183
+#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1177
#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:428
msgid "Completed"
msgstr "Выполнено"
-#: calendar/gui/calendar-model.c:650 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1179
#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:550
+#: camel/camel-service.c:586
msgid "Cancelled"
msgstr "Отменено"
#. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:276
+#: calendar/gui/calendar-model.c:791 e-util/e-time-utils.c:278
msgid "%a %m/%d/%Y %H:%M:%S"
msgstr "%a %m/%d/%Y %H:%M:%S"
#. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:800 e-util/e-time-utils.c:285
+#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:287
msgid "%a %m/%d/%Y %I:%M:%S %p"
msgstr "%a %m/%d/%Y %I:%M:%S %p"
-#: calendar/gui/calendar-model.c:805
+#: calendar/gui/calendar-model.c:799
#, c-format
msgid ""
"The date must be entered in the format: \n"
@@ -1553,7 +1656,7 @@ msgstr ""
"\n"
"%s"
-#: calendar/gui/calendar-model.c:885
+#: calendar/gui/calendar-model.c:879
msgid ""
"The classification must be 'Public', 'Private', 'Confidential' or 'None'"
msgstr ""
@@ -1561,18 +1664,17 @@ msgstr ""
"или \"Никакой\""
#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:899 calendar/gui/calendar-model.c:1123
-#: calendar/gui/calendar-model.c:1177 calendar/gui/e-calendar-table.c:328
-#: calendar/gui/e-calendar-table.c:403 mail/mail-account-editor.c:756
-#: mail/mail-account-editor.c:758 mail/mail-account-editor.c:853
-#: mail/mail-accounts.c:115 mail/mail-config-druid.c:1090
-#: mail/mail-config.glade.h:43 shell/e-shell-view.c:1119
-#: widgets/misc/e-cell-date-edit.c:231 widgets/misc/e-dateedit.c:421
-#: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
+#: calendar/gui/calendar-model.c:893 calendar/gui/calendar-model.c:1117
+#: calendar/gui/calendar-model.c:1171 calendar/gui/e-calendar-table.c:329
+#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:973
+#: mail/mail-accounts.c:120 mail/mail-accounts.c:164
+#: mail/mail-config.glade.h:37 shell/e-shell-view.c:1129
+#: widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:430
+#: widgets/misc/e-dateedit.c:1339 widgets/misc/e-dateedit.c:1454
msgid "None"
msgstr "Нет"
-#: calendar/gui/calendar-model.c:973
+#: calendar/gui/calendar-model.c:967
msgid ""
"The geographical position must be entered in the format: \n"
"\n"
@@ -1582,41 +1684,41 @@ msgstr ""
"\n"
"45.436845,125.862501"
-#: calendar/gui/calendar-model.c:1013
+#: calendar/gui/calendar-model.c:1007
msgid "The percent value must be between 0 and 100, inclusive"
msgstr "Значение процента должно быть между 0 и 100, включительно"
-#: calendar/gui/calendar-model.c:1054
+#: calendar/gui/calendar-model.c:1048
msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
msgstr ""
"Приоритет должен быть \"Высокий\", \"Нормальный\", \"Низкий\" или "
"\"Неопределенный\"."
#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1067
+#: calendar/gui/calendar-model.c:1061
#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/e-calendar-table.c:354
+#: calendar/gui/e-calendar-table.c:355
msgid "Undefined"
msgstr "Неопределенное"
-#: calendar/gui/calendar-model.c:1108
+#: calendar/gui/calendar-model.c:1102
msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
msgstr ""
"Прозрачность должна быть \"Прозрачное\", \"Непрозрачное\" или \"Никакое\"."
-#: calendar/gui/calendar-model.c:1598
+#: calendar/gui/calendar-model.c:1571
msgid "Recurring"
msgstr "Повторение"
-#: calendar/gui/calendar-model.c:1600
+#: calendar/gui/calendar-model.c:1573
msgid "Assigned"
msgstr "Связанное"
-#: calendar/gui/calendar-model.c:1606
+#: calendar/gui/calendar-model.c:1579
msgid "Yes"
msgstr "Да"
-#: calendar/gui/calendar-model.c:1606
+#: calendar/gui/calendar-model.c:1579
msgid "No"
msgstr "Нет"
@@ -1682,24 +1784,24 @@ msgstr ""
msgid "Factory for the alarm notification service"
msgstr "Невозможно инициализировать редактор почты Evolution."
-#: calendar/gui/alarm-notify/notify-main.c:63 calendar/gui/main.c:49
+#: calendar/gui/alarm-notify/notify-main.c:67 calendar/gui/main.c:52
msgid "Could not initialize GNOME"
msgstr "Не удалось инициализировать GNOME"
-#: calendar/gui/alarm-notify/notify-main.c:73
+#: calendar/gui/alarm-notify/notify-main.c:77
#, fuzzy
msgid "Could not create the alarm notify service factory"
msgstr "Не удалось создать временный каталог: %s"
-#: calendar/gui/dialogs/alarm-notify-dialog.c:184
+#: calendar/gui/dialogs/alarm-notify-dialog.c:189
msgid "Alarm on %A %b %d %Y %H:%M"
msgstr "Таймер на %A %b %d %Y %H:%M"
-#: calendar/gui/dialogs/alarm-notify-dialog.c:191
+#: calendar/gui/dialogs/alarm-notify-dialog.c:196
msgid "Notification about your appointment on %A %b %d %Y %H:%M"
msgstr "Уведомление о вашей встрече в %A %b %d %Y %H:%M"
-#: calendar/gui/dialogs/alarm-notify-dialog.c:202
+#: calendar/gui/dialogs/alarm-notify-dialog.c:207
msgid "No summary available."
msgstr "Итог не доступен."
@@ -1788,7 +1890,7 @@ msgid "Display options"
msgstr "Отобразить параметры"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/e-calendar-table.c:161
+#: calendar/gui/e-calendar-table.c:162
msgid "Due Date"
msgstr "Условленная дата"
@@ -1809,7 +1911,7 @@ msgid "Fri"
msgstr "Пят"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:479
+#: calendar/gui/event-editor.c:481
msgid "Friday"
msgstr "Пятница"
@@ -1838,7 +1940,7 @@ msgid "Mon"
msgstr "Пон"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:475
+#: calendar/gui/event-editor.c:477
msgid "Monday"
msgstr "Понедельник"
@@ -1851,11 +1953,12 @@ msgid "Overdue Items:"
msgstr "Просроченные задания:"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: mail/mail-config.glade.h:45
msgid "Pick a color"
msgstr "Выбрать цвет"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/e-calendar-table.c:164
+#: calendar/gui/e-calendar-table.c:165
msgid "Priority"
msgstr "Приоритет"
@@ -1873,7 +1976,7 @@ msgid "Sat"
msgstr "Суб"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/event-editor.c:482
msgid "Saturday"
msgstr "Суббота"
@@ -1898,7 +2001,7 @@ msgid "Sun"
msgstr "Вск"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/event-editor.c:483
msgid "Sunday"
msgstr "Воскресенье"
@@ -1911,7 +2014,7 @@ msgid "Thu"
msgstr "Чтв"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:478
+#: calendar/gui/event-editor.c:480
msgid "Thursday"
msgstr "Четверг"
@@ -1932,7 +2035,7 @@ msgid "Tue"
msgstr "Втр"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:476
+#: calendar/gui/event-editor.c:478
msgid "Tuesday"
msgstr "Вторник"
@@ -1945,7 +2048,7 @@ msgid "Wed"
msgstr "Срд"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:477
+#: calendar/gui/event-editor.c:479
msgid "Wednesday"
msgstr "Среда"
@@ -1958,34 +2061,34 @@ msgid "minutes before they occur."
msgstr "минут до назначенного времени."
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: mail/mail-config.glade.h:84
+#: mail/mail-config.glade.h:78
msgid "seconds."
msgstr "секунд."
-#: calendar/gui/dialogs/delete-comp.c:68
+#: calendar/gui/dialogs/delete-comp.c:70
#, c-format
msgid "Are you sure you want to delete the appointment `%s'?"
msgstr "Вы уверены что вы хотите удалить встречу \"%s\"?"
-#: calendar/gui/dialogs/delete-comp.c:71
+#: calendar/gui/dialogs/delete-comp.c:73
msgid "Are you sure you want to delete this untitled appointment?"
msgstr "Вы уверены что хотите удалить эту неозаглавленную встречу?"
-#: calendar/gui/dialogs/delete-comp.c:77
+#: calendar/gui/dialogs/delete-comp.c:79
#, c-format
msgid "Are you sure you want to delete the task `%s'?"
msgstr "Вы уверены что вы хотите удалить задание \"%s\"?"
-#: calendar/gui/dialogs/delete-comp.c:80
+#: calendar/gui/dialogs/delete-comp.c:82
msgid "Are you sure you want to delete this untitled task?"
msgstr "Вы уверены что хотите удалить это неозаглавленное задание?"
-#: calendar/gui/dialogs/delete-comp.c:86
+#: calendar/gui/dialogs/delete-comp.c:88
#, c-format
msgid "Are you sure you want to delete the journal entry `%s'?"
msgstr "Вы уверены что вы хотите удалить журнальную запись \"%s\"?"
-#: calendar/gui/dialogs/delete-comp.c:89
+#: calendar/gui/dialogs/delete-comp.c:91
msgid "Are you sure want to delete this untitled journal entry?"
msgstr "Вы уверены что хотите удалить эту неозаглавленную журнальную запись?"
@@ -1999,7 +2102,7 @@ msgid "% Comp_lete:"
msgstr "% Выполнения:"
#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
-#: calendar/gui/e-calendar-table.c:157
+#: calendar/gui/e-calendar-table.c:158
#: calendar/gui/event-editor-dialog.glade.h:6
msgid "Classification"
msgstr "Классификация"
@@ -2066,289 +2169,300 @@ msgstr "Приоритет:"
msgid "_Status:"
msgstr "Состояние:"
-#: calendar/gui/dialogs/task-editor.c:689
+#: calendar/gui/dialogs/task-editor.c:697
msgid "Edit Task"
msgstr "Правка задания"
-#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:377
+#: calendar/gui/dialogs/task-editor.c:703 calendar/gui/event-editor.c:379
msgid "No summary"
msgstr "Нет итога"
-#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:383
+#: calendar/gui/dialogs/task-editor.c:709 calendar/gui/event-editor.c:385
#, c-format
msgid "Appointment - %s"
msgstr "Встреча - %s"
-#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:386
+#: calendar/gui/dialogs/task-editor.c:712 calendar/gui/event-editor.c:388
#, c-format
msgid "Task - %s"
msgstr "Задание - %s"
-#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:389
+#: calendar/gui/dialogs/task-editor.c:715 calendar/gui/event-editor.c:391
#, c-format
msgid "Journal entry - %s"
msgstr "Журнальная запись - %s"
-#: calendar/gui/e-calendar-table.c:156
+#: calendar/gui/e-calendar-table.c:157
msgid "Categories"
msgstr "Категории"
-#: calendar/gui/e-calendar-table.c:158
+#: calendar/gui/e-calendar-table.c:159
msgid "Completion Date"
msgstr "Дата выполненения"
-#: calendar/gui/e-calendar-table.c:159
+#: calendar/gui/e-calendar-table.c:160
msgid "End Date"
msgstr "Дата окончания"
-#: calendar/gui/e-calendar-table.c:160
+#: calendar/gui/e-calendar-table.c:161
msgid "Start Date"
msgstr "Дата начала"
-#: calendar/gui/e-calendar-table.c:162
+#: calendar/gui/e-calendar-table.c:163
msgid "Geographical Position"
msgstr "Географическое расположение"
-#: calendar/gui/e-calendar-table.c:163
+#: calendar/gui/e-calendar-table.c:164
msgid "Percent complete"
msgstr "Процент выполненного"
-#: calendar/gui/e-calendar-table.c:165
+#: calendar/gui/e-calendar-table.c:166
msgid "Summary"
msgstr "Итог"
-#: calendar/gui/e-calendar-table.c:166
+#: calendar/gui/e-calendar-table.c:167
msgid "Transparency"
msgstr "Прозрачность"
-#: calendar/gui/e-calendar-table.c:167
+#: calendar/gui/e-calendar-table.c:168
msgid "URL"
msgstr "URL"
-#: calendar/gui/e-calendar-table.c:168
+#: calendar/gui/e-calendar-table.c:169
msgid "Alarms"
msgstr "Аудио Таймеры"
-#: calendar/gui/e-calendar-table.c:169
+#: calendar/gui/e-calendar-table.c:170
msgid "Click here to add a task"
msgstr "Щелкните здесь для добавления задачи"
-#: calendar/gui/e-calendar-table.c:373
+#: calendar/gui/e-calendar-table.c:374
#, c-format
msgid "0%"
msgstr "0%"
-#: calendar/gui/e-calendar-table.c:374
+#: calendar/gui/e-calendar-table.c:375
#, c-format
msgid "10%"
msgstr "10%"
-#: calendar/gui/e-calendar-table.c:375
+#: calendar/gui/e-calendar-table.c:376
#, c-format
msgid "20%"
msgstr "20%"
-#: calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-calendar-table.c:377
#, c-format
msgid "30%"
msgstr "30%"
-#: calendar/gui/e-calendar-table.c:377
+#: calendar/gui/e-calendar-table.c:378
#, c-format
msgid "40%"
msgstr "40%"
-#: calendar/gui/e-calendar-table.c:378
+#: calendar/gui/e-calendar-table.c:379
#, c-format
msgid "50%"
msgstr "50%"
-#: calendar/gui/e-calendar-table.c:379
+#: calendar/gui/e-calendar-table.c:380
#, c-format
msgid "60%"
msgstr "60%"
-#: calendar/gui/e-calendar-table.c:380
+#: calendar/gui/e-calendar-table.c:381
#, c-format
msgid "70%"
msgstr "70%"
-#: calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-calendar-table.c:382
#, c-format
msgid "80%"
msgstr "80%"
-#: calendar/gui/e-calendar-table.c:382
+#: calendar/gui/e-calendar-table.c:383
#, c-format
msgid "90%"
msgstr "90%"
-#: calendar/gui/e-calendar-table.c:383
+#: calendar/gui/e-calendar-table.c:384
#, c-format
msgid "100%"
msgstr "100%"
-#: calendar/gui/e-calendar-table.c:550
+#: calendar/gui/e-calendar-table.c:551
msgid "Mark Complete"
msgstr "Пометить как выполненное"
-#: calendar/gui/e-calendar-table.c:551
+#: calendar/gui/e-calendar-table.c:552
msgid "Mark the task complete"
msgstr "Пометить задание как выполненное"
-#: calendar/gui/e-calendar-table.c:556
+#: calendar/gui/e-calendar-table.c:557
msgid "Edit this task..."
msgstr "Правка этого задания..."
-#: calendar/gui/e-calendar-table.c:557
+#: calendar/gui/e-calendar-table.c:558
msgid "Edit the task"
msgstr "Правка задания"
-#: calendar/gui/e-calendar-table.c:559
+#: calendar/gui/e-calendar-table.c:560
#: ui/evolution-task-editor-dialog.xml.h:19
msgid "Delete this task"
msgstr "Удалить это задание"
-#: calendar/gui/e-calendar-table.c:560
+#: calendar/gui/e-calendar-table.c:561
msgid "Delete the task"
msgstr "Удалить задание"
-#: calendar/gui/e-day-view-time-item.c:516
+#: calendar/gui/e-day-view-time-item.c:519
#, c-format
msgid "%02i minute divisions"
msgstr ""
#. strftime format %A = full weekday name, %d = day of month,
#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:271 calendar/gui/e-day-view.c:1274
-#: calendar/gui/e-week-view-main-item.c:321
+#: calendar/gui/e-day-view-top-item.c:274 calendar/gui/e-day-view.c:1294
+#: calendar/gui/e-week-view-main-item.c:325
msgid "%A %d %B"
msgstr "%A %d %B"
#. strftime format %a = abbreviated weekday name, %d = day of month,
#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:275 calendar/gui/e-day-view.c:1288
-#: calendar/gui/e-week-view-main-item.c:330
+#: calendar/gui/e-day-view-top-item.c:278 calendar/gui/e-day-view.c:1308
+#: calendar/gui/e-week-view-main-item.c:334
msgid "%a %d %b"
msgstr "%a %d %b"
#. strftime format %d = day of month, %b = abbreviated month name.
#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:279 calendar/gui/e-day-view.c:1301
-#: calendar/gui/e-week-view-main-item.c:344
+#: calendar/gui/e-day-view-top-item.c:282 calendar/gui/e-day-view.c:1321
+#: calendar/gui/e-week-view-main-item.c:348
msgid "%d %b"
msgstr "%d %b"
#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:556 calendar/gui/e-week-view.c:290
-#: calendar/gui/print.c:613
+#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
+#: calendar/gui/print.c:617
msgid "am"
msgstr "д.п."
#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:559 calendar/gui/e-week-view.c:293
-#: calendar/gui/print.c:612
+#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
+#: calendar/gui/print.c:616
msgid "pm"
msgstr "п.п."
-#: calendar/gui/e-day-view.c:3020 calendar/gui/e-day-view.c:3034
-#: calendar/gui/e-week-view.c:3228 calendar/gui/e-week-view.c:3242
-msgid "New Appointment..."
-msgstr "Новая встреча..."
+#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
+msgid "New Appointment"
+msgstr "Новая встреча"
-#: calendar/gui/e-day-view.c:3026 calendar/gui/e-week-view.c:3234
-#: mail/folder-browser.c:542 ui/evolution-calendar.xml.h:15
+#: calendar/gui/e-day-view.c:3148 calendar/gui/e-week-view.c:3280
+msgid "New All Day Event"
+msgstr "Новые ежедневное событие"
+
+#: calendar/gui/e-day-view.c:3153 calendar/gui/e-week-view.c:3285
+msgid "Go to Today"
+msgstr "Сегодня"
+
+#: calendar/gui/e-day-view.c:3155 calendar/gui/e-week-view.c:3287
+msgid "Go to Date..."
+msgstr "Перейти к дате..."
+
+#: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3293
+#: mail/folder-browser.c:566 ui/evolution-calendar.xml.h:19
#: ui/evolution-message-composer.xml.h:10
msgid "Open"
msgstr "Открыть"
-#: calendar/gui/e-day-view.c:3028 calendar/gui/e-week-view.c:3236
+#: calendar/gui/e-day-view.c:3164 calendar/gui/e-week-view.c:3295
msgid "Delete this Appointment"
msgstr "Удалить эту встречу"
-#: calendar/gui/e-day-view.c:3030 calendar/gui/e-week-view.c:3238
+#: calendar/gui/e-day-view.c:3166 calendar/gui/e-week-view.c:3297
#: ui/evolution-event-editor.xml.h:45
msgid "Schedule Meeting"
msgstr "Вставить встречу в расписание"
-#: calendar/gui/e-day-view.c:3043 calendar/gui/e-week-view.c:3251
+#: calendar/gui/e-day-view.c:3175 calendar/gui/e-week-view.c:3310
msgid "Make this Occurrence Movable"
msgstr "Сделать эту встречу перемещаемой"
-#: calendar/gui/e-day-view.c:3045 calendar/gui/e-week-view.c:3253
+#: calendar/gui/e-day-view.c:3177 calendar/gui/e-week-view.c:3312
msgid "Delete this Occurrence"
msgstr "Удалить это вхождение"
-#: calendar/gui/e-day-view.c:3047
+#: calendar/gui/e-day-view.c:3179
msgid "Delete all Occurrences"
msgstr "Удалить все вхождения"
-#: calendar/gui/e-itip-control.c:153
+#: calendar/gui/e-itip-control.c:161
msgid "I couldn't update your calendar file!\n"
msgstr "Не удалось обновить ваш файл календаря!\n"
-#: calendar/gui/e-itip-control.c:159 calendar/gui/e-itip-control.c:502
+#: calendar/gui/e-itip-control.c:167 calendar/gui/e-itip-control.c:510
msgid "Component successfully updated."
msgstr "Компонент успешно обновлен."
-#: calendar/gui/e-itip-control.c:165
+#: calendar/gui/e-itip-control.c:173
msgid "There was an error loading the calendar file."
msgstr "При загрузке файла календаря возникла ошибка."
-#: calendar/gui/e-itip-control.c:189
+#: calendar/gui/e-itip-control.c:197
msgid "I couldn't open your calendar file!\n"
msgstr "Не удалось открыть ваш файл календаря!\n"
-#: calendar/gui/e-itip-control.c:450 calendar/gui/e-itip-control.c:521
+#: calendar/gui/e-itip-control.c:458 calendar/gui/e-itip-control.c:529
msgid "I couldn't load your calendar file!\n"
msgstr "Не удалось загрузить ваш файл календаря!\n"
-#: calendar/gui/e-itip-control.c:462
+#: calendar/gui/e-itip-control.c:470
msgid "I couldn't read your calendar file!\n"
msgstr "Не удалось прочесть ваш файл календаря!\n"
-#: calendar/gui/e-itip-control.c:475
+#: calendar/gui/e-itip-control.c:483
msgid "This is a reply from someone who was uninvited!"
msgstr "Это ответ от кого-то кто не был приглашен!"
-#: calendar/gui/e-itip-control.c:491
+#: calendar/gui/e-itip-control.c:499
msgid "I couldn't update your calendar store."
msgstr "Не удалось обновить хранилище вашего календаря."
-#: calendar/gui/e-itip-control.c:532
+#: calendar/gui/e-itip-control.c:540
msgid "I couldn't delete the calendar component!\n"
msgstr "Не удалось удалить компонент календаря!\n"
-#: calendar/gui/e-itip-control.c:542
+#: calendar/gui/e-itip-control.c:550
msgid "Component successfully deleted."
msgstr "Компонент успешно удален."
-#: calendar/gui/e-itip-control.c:686
+#: calendar/gui/e-itip-control.c:694
msgid "I don't recognize this type of calendar component."
msgstr "Не распознан этот тип компонента календаря."
-#: calendar/gui/e-itip-control.c:772
+#: calendar/gui/e-itip-control.c:780
msgid "Add to Calendar"
msgstr "Добавить к календарю"
-#: calendar/gui/e-itip-control.c:806
-msgid "Accept"
-msgstr "Принять"
+#: calendar/gui/e-itip-control.c:814
+msgid " Accept "
+msgstr " Принять "
-#: calendar/gui/e-itip-control.c:807
-msgid "Decline"
-msgstr "Отклонить"
+#: calendar/gui/e-itip-control.c:815
+msgid " Decline "
+msgstr " Отклонить "
-#: calendar/gui/e-itip-control.c:808
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
+#: calendar/gui/e-itip-control.c:816
+#, fuzzy
+msgid " Tentative "
msgstr "Экспериментальный"
-#: calendar/gui/e-itip-control.c:852
+#: calendar/gui/e-itip-control.c:860
msgid "Update Calendar"
msgstr "Обновить календарь"
-#: calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:883
msgid "Cancel Meeting"
msgstr "Отменить встречу"
@@ -2365,7 +2479,7 @@ msgstr ""
msgid "Calendar Message"
msgstr "Сообщение календаря"
-#: calendar/gui/e-itip-control.glade.h:5
+#: calendar/gui/e-itip-control.glade.h:5 mail/mail-format.c:619
msgid "Date:"
msgstr "Дата:"
@@ -2377,9 +2491,9 @@ msgstr "Загрузка календаря..."
msgid "Organizer:"
msgstr "Организатор:"
-#: calendar/gui/e-itip-control.glade.h:10 filter/libfilter-i18n.h:38
-msgid "Sender"
-msgstr "Отправитель"
+#: calendar/gui/e-itip-control.glade.h:10
+msgid "Server Message:"
+msgstr "Сообщение сервера:"
#: calendar/gui/e-itip-control.glade.h:11
msgid "Summary:"
@@ -2467,26 +2581,26 @@ msgstr ""
"Вставить встречу\n"
"в расписание"
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:44
-#: mail/message-list.c:1171
+#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:33
+#: mail/message-list.c:1052
msgid "Status"
msgstr "Состояние"
-#: calendar/gui/e-tasks.c:148 calendar/gui/e-tasks.c:468
-#: calendar/gui/e-tasks.c:501
+#: calendar/gui/e-tasks.c:149 calendar/gui/e-tasks.c:469
+#: calendar/gui/e-tasks.c:502
msgid "All"
msgstr "Все"
-#: calendar/gui/e-tasks.c:154
+#: calendar/gui/e-tasks.c:155
msgid "Category:"
msgstr "Категории:"
-#: calendar/gui/e-tasks.c:297
+#: calendar/gui/e-tasks.c:298
#, c-format
msgid "Could not load the tasks in `%s'"
msgstr "Невозможно загрузить задание в \"%s\""
-#: calendar/gui/e-tasks.c:309
+#: calendar/gui/e-tasks.c:310
#, c-format
msgid "The method required to load `%s' is not supported"
msgstr "Метод необходимый для загрузки \"%s\" не поддерживается"
@@ -2494,11 +2608,15 @@ msgstr "Метод необходимый для загрузки \"%s\" не поддерживается"
#. strftime format %d = day of month, %B = full
#. month name. You can change the order but don't
#. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:338
+#: calendar/gui/e-week-view-main-item.c:342
msgid "%d %B"
msgstr "%d %B"
-#: calendar/gui/e-week-view.c:3255
+#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
+msgid "New Appointment..."
+msgstr "Новая встреча..."
+
+#: calendar/gui/e-week-view.c:3314
msgid "Delete All Occurrences"
msgstr "Удалить все вхождения"
@@ -2535,7 +2653,7 @@ msgid "No recurrence"
msgstr "Без повторения"
#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1577
+#: calendar/gui/event-editor.c:1579
msgid "Play a sound"
msgstr "Воспроизвести звук"
@@ -2556,21 +2674,21 @@ msgid "Reminder"
msgstr "Напоминание"
#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1586
+#: calendar/gui/event-editor.c:1588
msgid "Run a program"
msgstr "Запустить программу"
#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1583
+#: calendar/gui/event-editor.c:1585
msgid "Send an email"
msgstr "Отправить почту"
-#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:25
+#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
msgid "Settings..."
msgstr "Установки..."
#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1580
+#: calendar/gui/event-editor.c:1582
msgid "Show a dialog"
msgstr "Показать диалог"
@@ -2590,12 +2708,11 @@ msgstr "Время начала:"
msgid "_Starting date:"
msgstr "Дата начала:"
-#. Automatically generated. Do not edit.
-#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:2
+#: calendar/gui/event-editor-dialog.glade.h:33 filter/libfilter-i18n.h:36
msgid "after"
msgstr "после"
-#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:6
+#: calendar/gui/event-editor-dialog.glade.h:34 filter/libfilter-i18n.h:37
msgid "before"
msgstr "до"
@@ -2627,7 +2744,7 @@ msgstr "метка26"
msgid "label55"
msgstr "метка26"
-#: calendar/gui/event-editor-dialog.glade.h:42
+#: calendar/gui/event-editor-dialog.glade.h:42 mail/mail-config.glade.h:77
msgid "minute(s)"
msgstr "минуты"
@@ -2651,99 +2768,99 @@ msgstr "неделя"
msgid "year(s)"
msgstr "год"
-#: calendar/gui/event-editor.c:371
+#: calendar/gui/event-editor.c:373
msgid "Edit Appointment"
msgstr "Правка встречи"
-#: calendar/gui/event-editor.c:449
+#: calendar/gui/event-editor.c:451
msgid "on"
msgstr "в"
-#: calendar/gui/event-editor.c:474 filter/filter-datespec.c:65
+#: calendar/gui/event-editor.c:476 filter/filter-datespec.c:81
msgid "day"
msgstr "день"
-#: calendar/gui/event-editor.c:601
+#: calendar/gui/event-editor.c:603
msgid "on the"
msgstr ""
-#: calendar/gui/event-editor.c:608
+#: calendar/gui/event-editor.c:610
msgid "th"
msgstr "ый"
-#: calendar/gui/event-editor.c:754
+#: calendar/gui/event-editor.c:756
msgid "occurrences"
msgstr "случаи"
-#: calendar/gui/event-editor.c:871
+#: calendar/gui/event-editor.c:873
msgid "This appointment contains recurrences that Evolution cannot edit."
msgstr ""
"Эта встреча имеет правила повторения, которые не могут быть отредактированы "
"в Evolution."
-#: calendar/gui/event-editor.c:1532
+#: calendar/gui/event-editor.c:1534
#, c-format
msgid " %d days"
msgstr "%d дней"
-#: calendar/gui/event-editor.c:1534
+#: calendar/gui/event-editor.c:1536
msgid " 1 day"
msgstr " 1 день"
-#: calendar/gui/event-editor.c:1537
+#: calendar/gui/event-editor.c:1539
#, c-format
msgid " %d weeks"
msgstr " %d недель"
-#: calendar/gui/event-editor.c:1539
+#: calendar/gui/event-editor.c:1541
msgid " 1 week"
msgstr " 1 неделя"
-#: calendar/gui/event-editor.c:1542
+#: calendar/gui/event-editor.c:1544
#, c-format
msgid " %d hours"
msgstr " %d часов"
-#: calendar/gui/event-editor.c:1544
+#: calendar/gui/event-editor.c:1546
msgid " 1 hour"
msgstr " 1 час"
-#: calendar/gui/event-editor.c:1547
+#: calendar/gui/event-editor.c:1549
#, c-format
msgid " %d minutes"
msgstr " %d минут"
-#: calendar/gui/event-editor.c:1549
+#: calendar/gui/event-editor.c:1551
msgid " 1 minute"
msgstr " 1 минута"
-#: calendar/gui/event-editor.c:1552
+#: calendar/gui/event-editor.c:1554
#, c-format
msgid " %d seconds"
msgstr " %d секунд"
-#: calendar/gui/event-editor.c:1554
+#: calendar/gui/event-editor.c:1556
msgid " 1 second"
msgstr " 1 секунда"
-#: calendar/gui/event-editor.c:1601
+#: calendar/gui/event-editor.c:1603
msgid " before start of appointment"
msgstr " до начала встречи"
-#: calendar/gui/event-editor.c:1603
+#: calendar/gui/event-editor.c:1605
msgid " after start of appointment"
msgstr " после начала встречи"
-#: calendar/gui/event-editor.c:1611
+#: calendar/gui/event-editor.c:1613
msgid " before end of appointment"
msgstr " перед окончанием встречи"
-#: calendar/gui/event-editor.c:1613
+#: calendar/gui/event-editor.c:1615
msgid " after end of appointment"
msgstr " после окончания встречи"
-#: calendar/gui/event-editor.c:3113 calendar/gui/print.c:1093
-#: calendar/gui/print.c:1095 calendar/gui/print.c:1096
+#: calendar/gui/event-editor.c:3123 calendar/gui/print.c:1097
+#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
msgid "%a %b %d %Y"
msgstr "%a %b %d %Y"
@@ -2779,12 +2896,12 @@ msgstr ""
msgid "Factory for the sample Calendar control"
msgstr ""
-#: calendar/gui/gnome-cal.c:695
+#: calendar/gui/gnome-cal.c:700
#, c-format
msgid "Could not open the folder in `%s'"
msgstr "Невозможно открыть папку \"%s\""
-#: calendar/gui/gnome-cal.c:706
+#: calendar/gui/gnome-cal.c:711
#, c-format
msgid "The method required to open `%s' is not supported"
msgstr "Метод необходимый для открытия \"%s\" не поддерживается"
@@ -2845,201 +2962,201 @@ msgstr "Октябрь"
msgid "September"
msgstr "Сентябрь"
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
msgid "1st"
msgstr "1-ый"
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
msgid "2nd"
msgstr "2-ой"
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
msgid "3rd"
msgstr "3-ий"
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
msgid "4th"
msgstr "4-ый"
-#: calendar/gui/print.c:296
+#: calendar/gui/print.c:300
msgid "5th"
msgstr "5-ый"
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
msgid "6th"
msgstr "6-ой"
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
msgid "7th"
msgstr "7-ой"
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
msgid "8th"
msgstr "8-ой"
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
msgid "9th"
msgstr "9-ый"
-#: calendar/gui/print.c:297
+#: calendar/gui/print.c:301
msgid "10th"
msgstr "10-ый"
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
msgid "11th"
msgstr "11-ый"
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
msgid "12th"
msgstr "12-ый"
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
msgid "13th"
msgstr "13-ый"
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
msgid "14th"
msgstr "14-ый"
-#: calendar/gui/print.c:298
+#: calendar/gui/print.c:302
msgid "15th"
msgstr "15-ый"
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
msgid "16th"
msgstr "16-ый"
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
msgid "17th"
msgstr "17-ый"
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
msgid "18th"
msgstr "18-ый"
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
msgid "19th"
msgstr "19-ый"
-#: calendar/gui/print.c:299
+#: calendar/gui/print.c:303
msgid "20th"
msgstr "20-ый"
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
msgid "21st"
msgstr "21-ый"
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
msgid "22nd"
msgstr "22-ой"
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
msgid "23rd"
msgstr "23-ий"
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
msgid "24th"
msgstr "24-ый"
-#: calendar/gui/print.c:300
+#: calendar/gui/print.c:304
msgid "25th"
msgstr "25-ый"
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
msgid "26th"
msgstr "26-ой"
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
msgid "27th"
msgstr "27-ой"
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
msgid "28th"
msgstr "28-ой"
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
msgid "29th"
msgstr "29-ый"
-#: calendar/gui/print.c:301
+#: calendar/gui/print.c:305
msgid "30th"
msgstr "30-ый"
-#: calendar/gui/print.c:302
+#: calendar/gui/print.c:306
msgid "31st"
msgstr "31-ый"
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
msgid "Su"
msgstr "Вс"
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
msgid "Mo"
msgstr "Пн"
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
msgid "Tu"
msgstr "Вт"
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
msgid "We"
msgstr "Ср"
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
msgid "Th"
msgstr "Чт"
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
msgid "Fr"
msgstr "Пт"
-#: calendar/gui/print.c:358
+#: calendar/gui/print.c:362
msgid "Sa"
msgstr "Cб"
-#: calendar/gui/print.c:944
+#: calendar/gui/print.c:948 views/tasks/galview.xml.h:1
msgid "Tasks"
msgstr "Задания"
#. Day
-#: calendar/gui/print.c:1074
+#: calendar/gui/print.c:1078
msgid "Current day (%a %b %d %Y)"
msgstr "Текущий день (%a %b %d %Y)"
-#: calendar/gui/print.c:1088 calendar/gui/print.c:1092
+#: calendar/gui/print.c:1092 calendar/gui/print.c:1096
msgid "%a %b %d"
msgstr "%a %b %d"
-#: calendar/gui/print.c:1089
+#: calendar/gui/print.c:1093
msgid "%a %d %Y"
msgstr "%a %d %Y"
-#: calendar/gui/print.c:1100
+#: calendar/gui/print.c:1104
#, c-format
msgid "Current week (%s - %s)"
msgstr "Текущая неделя (%s - %s)"
#. Month
-#: calendar/gui/print.c:1108
+#: calendar/gui/print.c:1112
msgid "Current month (%b %Y)"
msgstr "Текущий месяц (%b %Y)"
#. Year
-#: calendar/gui/print.c:1115
+#: calendar/gui/print.c:1119
msgid "Current year (%Y)"
msgstr "Текущий год (%Y)"
-#: calendar/gui/print.c:1152
+#: calendar/gui/print.c:1156
msgid "Print Calendar"
msgstr "Напечатать календарь"
-#: calendar/gui/print.c:1317 mail/mail-callbacks.c:1293
-#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:20
-#: ui/evolution-mail.xml.h:32
+#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1342
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
+#: ui/evolution-mail.xml.h:53
msgid "Print Preview"
msgstr "Просмотр печати"
-#: calendar/gui/tasks-control.c:105
+#: calendar/gui/tasks-control.c:108
msgid "The URI of the tasks folder to display"
msgstr "URI, который будет показан в папке заданий "
@@ -3069,28 +3186,94 @@ msgstr ""
msgid ""
"The method required to load `%s' is not supported; no items from the "
"calendar folder will be migrated to the tasks folder."
-msgstr "Метод требуемый для загрузки \"%s\" не поддерживается, нет элементов из папки календаря для переноса из папки заданий."
+msgstr ""
+"Метод требуемый для загрузки \"%s\" не поддерживается, нет элементов из "
+"папки календаря для переноса из папки заданий."
-#: calendar/gui/weekday-picker.c:313 calendar/gui/weekday-picker.c:408
+#: calendar/gui/weekday-picker.c:315 calendar/gui/weekday-picker.c:410
msgid "SMTWTFS"
msgstr "ПВСЧПСВ"
-#: camel/camel-filter-driver.c:790
+#: camel/camel-cipher-context.c:169
+msgid "Signing is not supported by this cipher"
+msgstr "Подписывание не поддерживается этим шифром"
+
+#: camel/camel-cipher-context.c:209
+#, fuzzy
+msgid "Clearsigning is not supported by this cipher"
+msgstr "Указанный тип не поддерживается для этого носителя"
+
+#: camel/camel-cipher-context.c:249
+msgid "Verifying is not supported by this cipher"
+msgstr "Проверка не поддерживается этим шифром"
+
+#: camel/camel-cipher-context.c:292
+msgid "Encryption is not supported by this cipher"
+msgstr "Шифрование не поддерживается этим шифром"
+
+#: camel/camel-cipher-context.c:334
+msgid "Decryption is not supported by this cipher"
+msgstr "Расшифровка не поддерживается этим шифром"
+
+#: camel/camel-filter-driver.c:534 camel/camel-filter-driver.c:543
+msgid "Syncing folders"
+msgstr "Синхронизация папок"
+
+#: camel/camel-filter-driver.c:643
+msgid "Unable to open spool folder"
+msgstr "Не удалось открыть папку спула"
+
+#: camel/camel-filter-driver.c:652
+msgid "Unable to process spool folder"
+msgstr "Не удалось обработать папку спула"
+
+#: camel/camel-filter-driver.c:666
+msgid "Getting message %d (%d%%)"
+msgstr "Получение сообщения %s"
+
+#: camel/camel-filter-driver.c:670 camel/camel-filter-driver.c:679
+#, c-format
+msgid "Failed message %d"
+msgstr "Сбойное сообщение %d"
+
+#: camel/camel-filter-driver.c:671
+msgid "Cannot open message"
+msgstr "Невозможно открыть сообщение"
+
+#: camel/camel-filter-driver.c:690 camel/camel-filter-driver.c:788
+msgid "Syncing folder"
+msgstr "Синхронизация папки"
+
+#: camel/camel-filter-driver.c:694 camel/camel-filter-driver.c:793
+msgid "Complete"
+msgstr "Выполнено"
+
+#: camel/camel-filter-driver.c:748
+#, c-format
+msgid "Getting message %d of %d"
+msgstr "Получение сообщения %d из %d"
+
+#: camel/camel-filter-driver.c:753 camel/camel-filter-driver.c:771
+#, c-format
+msgid "Failed at message %d of %d"
+msgstr "Сбой на сообщении %d из %d"
+
+#: camel/camel-filter-driver.c:866
#, c-format
msgid "Error parsing filter: %s: %s"
msgstr "Ошибка анализа фильтра: %s: %s"
-#: camel/camel-filter-driver.c:795
+#: camel/camel-filter-driver.c:871
#, c-format
msgid "Error executing filter: %s: %s"
msgstr "Ошибка выполнения фильтра: %s: %s"
-#: camel/camel-filter-search.c:426 camel/camel-filter-search.c:432
+#: camel/camel-filter-search.c:439 camel/camel-filter-search.c:445
#, c-format
msgid "Error executing filter search: %s: %s"
msgstr "Ошибка выполнения поиска фильтра: %s: %s"
-#: camel/camel-folder-search.c:323
+#: camel/camel-folder-search.c:328
#, c-format
msgid ""
"Cannot parse search expression: %s:\n"
@@ -3099,7 +3282,7 @@ msgstr ""
"Ошибка в регулярном выражении \"%s\":\n"
"%s"
-#: camel/camel-folder-search.c:333
+#: camel/camel-folder-search.c:338
#, c-format
msgid ""
"Error executing search expression: %s:\n"
@@ -3108,146 +3291,218 @@ msgstr ""
"Ошибка при выполнении выражения поиска \"%s\":\n"
"%s"
-#: camel/camel-folder-search.c:480 camel/camel-folder-search.c:508
+#: camel/camel-folder-search.c:485 camel/camel-folder-search.c:513
msgid "(match-all) requires a single bool result"
msgstr "(совпадает все) требует единственного логического результата"
-#: camel/camel-folder-search.c:554
+#: camel/camel-folder-search.c:559
#, c-format
msgid "Performing query on unknown header: %s"
msgstr "Совершение запроса на неизвестном заголовке: %s"
-#: camel/camel-folder-search.c:663 camel/camel-folder-search.c:700
+#: camel/camel-folder-search.c:670 camel/camel-folder-search.c:714
msgid "Invalid type in body-contains, expecting string"
msgstr "Недопустимый тип в тело-содержит, ожидается строка"
#. well, this is really only a programatic error
-#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
-#: camel/camel-movemail.c:183
+#: camel/camel-lock.c:92 camel/camel-lock.c:111 camel/camel-movemail.c:138
+#: camel/camel-movemail.c:185
#, c-format
msgid "Could not create lock file for %s: %s"
msgstr "Не удалось создать файл блокировки для %s: %s"
-#: camel/camel-lock.c:149 camel/camel-movemail.c:217
+#: camel/camel-lock.c:151 camel/camel-movemail.c:219
#, c-format
msgid "Timed out trying to get lock file on %s. Try again later."
msgstr ""
"Превышение времени при попытке заблокировать файл %s. Попробуйте еще раз "
"позже."
-#: camel/camel-lock.c:199
+#: camel/camel-lock.c:201
#, c-format
msgid "Failed to get lock using fcntl(2): %s"
msgstr "Не удалось получить lock используя fcntl(2): %s"
-#: camel/camel-lock.c:253
+#: camel/camel-lock.c:255
#, c-format
msgid "Failed to get lock using flock(2): %s"
msgstr "Не удалось получить lock используя flock(2): %s"
-#: camel/camel-movemail.c:99
+#: camel/camel-movemail.c:101
#, c-format
msgid "Could not check mail file %s: %s"
msgstr "Не удалось проверить почтовый файл %s: %s"
-#: camel/camel-movemail.c:146
+#: camel/camel-movemail.c:148
#, c-format
msgid "Could not open mail file %s: %s"
msgstr "Невозможно открыть почтовый файл %s: %s"
-#: camel/camel-movemail.c:156
+#: camel/camel-movemail.c:158
#, c-format
msgid "Could not open temporary mail file %s: %s"
msgstr "Невозможно открыть временный почтовый файл %s: %s"
-#: camel/camel-movemail.c:197
+#: camel/camel-movemail.c:199
#, c-format
msgid "Could not test lock file for %s: %s"
msgstr "Невозможно проверить файл блокировки для %s: %s"
-#: camel/camel-movemail.c:243
+#: camel/camel-movemail.c:245
#, c-format
msgid "Error reading mail file: %s"
msgstr "Ошибка при чтении почтового файла: %s"
-#: camel/camel-movemail.c:254
+#: camel/camel-movemail.c:256
#, c-format
msgid "Error writing mail temp file: %s"
msgstr "Ошибка сохранения временного почтового файла: %s"
-#: camel/camel-movemail.c:272
+#: camel/camel-movemail.c:274
#, c-format
msgid "Failed to store mail in temp file %s: %s"
msgstr "Сбой при сохранении почты во временном файле %s: %s"
-#: camel/camel-movemail.c:304
+#: camel/camel-movemail.c:306
#, c-format
msgid "Could not create pipe: %s"
msgstr "Не удалось создать канал: %s"
-#: camel/camel-movemail.c:316
+#: camel/camel-movemail.c:318
#, c-format
msgid "Could not fork: %s"
msgstr "Не удалось разветвить: %s"
-#: camel/camel-movemail.c:354
+#: camel/camel-movemail.c:356
#, c-format
msgid "Movemail program failed: %s"
msgstr "Сбой программы перемещения почты: %s"
-#: camel/camel-movemail.c:355
+#: camel/camel-movemail.c:357
msgid "(Unknown error)"
msgstr "(Неизвестная ошибка)"
-#: camel/camel-provider.c:137
+#: camel/camel-movemail.c:587
+#, c-format
+msgid "Error copying mail temp file: %s"
+msgstr "Ошибка копирования временного почтового файла: %s"
+
+#: camel/camel-pgp-context.c:186
+#, c-format
+msgid "Please enter your %s passphrase for %s"
+msgstr "Пожалуйста введите вашу %s парольную фразу для %s"
+
+#: camel/camel-pgp-context.c:189
+#, c-format
+msgid "Please enter your %s passphrase"
+msgstr "Пожалуйста введите вашу %s парольную фразу."
+
+#: camel/camel-pgp-context.c:509
+msgid "No plaintext to sign."
+msgstr "Нет текста для подписи."
+
+#: camel/camel-pgp-context.c:516 camel/camel-pgp-context.c:688
+#: camel/camel-pgp-context.c:1021 camel/camel-pgp-context.c:1235
+msgid "No password provided."
+msgstr "Пароль не предоставлен."
+
+#: camel/camel-pgp-context.c:522 camel/camel-pgp-context.c:694
+#: camel/camel-pgp-context.c:877 camel/camel-pgp-context.c:1028
+#: camel/camel-pgp-context.c:1242
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr "Не удалось создать канал к GPG/PGP: %s"
+
+#: camel/camel-pgp-context.c:681
+msgid "No plaintext to clearsign."
+msgstr ""
+
+#: camel/camel-pgp-context.c:871
+msgid "No plaintext to verify."
+msgstr "Нет текста для проверки."
+
+#: camel/camel-pgp-context.c:888
+#, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "Не удалось создать временный файл: %s"
+
+#: camel/camel-pgp-context.c:1011
+msgid "No plaintext to encrypt."
+msgstr "Нет текста для шифрования."
+
+#: camel/camel-pgp-context.c:1037
+msgid "No recipients specified"
+msgstr "Не указаны получатели"
+
+#: camel/camel-pgp-context.c:1227
+msgid "No ciphertext to decrypt."
+msgstr "Нет шифра для дешифрации."
+
+#: camel/camel-provider.c:131
+#, c-format
+msgid "Could not load %s: Module loading not supported on this system."
+msgstr "Не удалось загрузить %s: Загрузка модулей не поддерживается в этой системе."
+
+#: camel/camel-provider.c:140
#, c-format
msgid "Could not load %s: %s"
msgstr "Невозможно загрузить %s: %s"
-#: camel/camel-provider.c:145
+#: camel/camel-provider.c:148
#, c-format
msgid "Could not load %s: No initialization code in module."
msgstr "Невозможно загрузить %s: нет инициализационного кода в модуле."
-#: camel/camel-remote-store.c:181
+#: camel/camel-remote-store.c:186
#, c-format
msgid "%s server %s"
msgstr "%s сервер %s"
-#: camel/camel-remote-store.c:185
+#: camel/camel-remote-store.c:190
#, c-format
msgid "%s service for %s on %s"
msgstr "%s сервис для %s на %s"
-#: camel/camel-remote-store.c:232
+#: camel/camel-remote-store.c:240
msgid "Connection cancelled"
msgstr "Соединение отменено"
-#: camel/camel-remote-store.c:235
-#: camel/providers/smtp/camel-smtp-transport.c:244
+#: camel/camel-remote-store.c:243
+#: camel/providers/smtp/camel-smtp-transport.c:261
#, c-format
msgid "Could not connect to %s (port %d): %s"
msgstr "Не удалось подключиться к %s (порт %d): %s"
-#: camel/camel-remote-store.c:236
+#: camel/camel-remote-store.c:244
msgid "(unknown host)"
msgstr "(неизвестный хост)"
-#: camel/camel-remote-store.c:317 camel/camel-remote-store.c:379
-#: camel/camel-remote-store.c:448
-#: camel/providers/imap/camel-imap-command.c:289
+#: camel/camel-remote-store.c:325 camel/camel-remote-store.c:387
+#: camel/camel-remote-store.c:458
+#: camel/providers/imap/camel-imap-command.c:264
msgid "Operation cancelled"
msgstr "Операция отменена"
-#: camel/camel-remote-store.c:453
+#: camel/camel-remote-store.c:464
msgid "Server unexpectedly disconnected"
msgstr "Сервер неожиданно отключился"
-#: camel/camel-sasl-anonymous.c:97 camel/camel-sasl-plain.c:84
+#: camel/camel-sasl-anonymous.c:33
+msgid "Anonymous"
+msgstr "Anonymous"
+
+#: camel/camel-sasl-anonymous.c:35
+#, fuzzy
+msgid "This option will connect to the server using an anonymous login."
+msgstr ""
+"Подключение к IMAP серверу будет производиться с использованием "
+"незашифрованного пароля."
+
+#: camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
msgid "Authentication failed."
msgstr "Сбой идентификации."
-#: camel/camel-sasl-anonymous.c:106
+#: camel/camel-sasl-anonymous.c:119
#, c-format
msgid ""
"Invalid email address trace information:\n"
@@ -3256,7 +3511,7 @@ msgstr ""
"Неверная трассировочная информация эл.адреса:\n"
"%s"
-#: camel/camel-sasl-anonymous.c:118
+#: camel/camel-sasl-anonymous.c:131
#, fuzzy, c-format
msgid ""
"Invalid opaque trace information:\n"
@@ -3265,7 +3520,7 @@ msgstr ""
"Ошибка при загрузке информации фильтра:\n"
"%s"
-#: camel/camel-sasl-anonymous.c:130
+#: camel/camel-sasl-anonymous.c:143
#, c-format
msgid ""
"Invalid trace information:\n"
@@ -3274,11 +3529,11 @@ msgstr ""
"Неправильная трассировочная информация:\n"
"%s"
-#: camel/camel-sasl-cram-md5.c:32 mail/mail-config.glade.h:10
+#: camel/camel-sasl-cram-md5.c:35
msgid "CRAM-MD5"
msgstr "CRAM-MD5"
-#: camel/camel-sasl-cram-md5.c:34
+#: camel/camel-sasl-cram-md5.c:37
msgid ""
"This option will connect to the server using a secure CRAM-MD5 password, if "
"the server supports it."
@@ -3286,11 +3541,11 @@ msgstr ""
"Подключение к серверу будет производиться с использованием для идентификации "
"протокола CRAM-MD5, если сервер его поддерживает."
-#: camel/camel-sasl-digest-md5.c:37 mail/mail-config.glade.h:18
+#: camel/camel-sasl-digest-md5.c:43
msgid "DIGEST-MD5"
msgstr "DIGEST-MD5"
-#: camel/camel-sasl-digest-md5.c:39
+#: camel/camel-sasl-digest-md5.c:45
msgid ""
"This option will connect to the server using a secure DIGEST-MD5 password, "
"if the server supports it."
@@ -3298,42 +3553,42 @@ msgstr ""
"Подключение к серверу будет производиться с использованием зашифрованного "
"пароля DIGEST-MD5, если сервер его поддерживает."
-#: camel/camel-sasl-digest-md5.c:761
+#: camel/camel-sasl-digest-md5.c:810
msgid "Server challenge too long (>2048 octets)\n"
msgstr ""
-#: camel/camel-sasl-digest-md5.c:770
+#: camel/camel-sasl-digest-md5.c:819
msgid "Server challenge invalid\n"
msgstr ""
-#: camel/camel-sasl-digest-md5.c:776
+#: camel/camel-sasl-digest-md5.c:825
msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
msgstr ""
-#: camel/camel-sasl-digest-md5.c:798
+#: camel/camel-sasl-digest-md5.c:847
msgid "Server response did not contain authorization data\n"
msgstr "Ответ сервера не содержит информации об авторизации\n"
-#: camel/camel-sasl-digest-md5.c:816
+#: camel/camel-sasl-digest-md5.c:865
msgid "Server response contained incomplete authorization data\n"
msgstr "Ответ сервера содержит неполную информацию об авторизации\n"
-#: camel/camel-sasl-digest-md5.c:826
+#: camel/camel-sasl-digest-md5.c:875
#, fuzzy
msgid "Server response does not match\n"
msgstr "Ответ сервера закончился слишком рано."
-#: camel/camel-sasl-kerberos4.c:38
+#: camel/camel-sasl-kerberos4.c:40
msgid "Kerberos 4"
msgstr "Kerberos 4"
-#: camel/camel-sasl-kerberos4.c:40
+#: camel/camel-sasl-kerberos4.c:42
msgid "This option will connect to the server using Kerberos 4 authentication."
msgstr ""
"Подключение к серверу будет производиться с использованием для идентификации "
"протокола Kerberos 4."
-#: camel/camel-sasl-kerberos4.c:158
+#: camel/camel-sasl-kerberos4.c:161
#, c-format
msgid ""
"Could not get Kerberos ticket:\n"
@@ -3342,65 +3597,72 @@ msgstr ""
"Не удалось получить билет Kerberos:\n"
"%s"
-#: camel/camel-sasl-kerberos4.c:215
-#: camel/providers/imap/camel-imap-store.c:381
+#: camel/camel-sasl-kerberos4.c:218
+#: camel/providers/imap/camel-imap-store.c:417
msgid "Bad authentication response from server."
msgstr "Отрицательный ответ идентификации от сервера."
-#: camel/camel-sasl-plain.c:29
-msgid "PLAIN"
-msgstr "PLAIN"
-
-#: camel/camel-sasl-plain.c:31
-msgid ""
-"This option will connect to the server using a the PLAIN SASL mechanism if "
-"the server supports it."
-msgstr "Подключение к серверу будет производиться с использованием механизма PLAIN SASL, если сервер его поддерживает."
+#: camel/camel-sasl-plain.c:34
+#, fuzzy
+msgid "This option will connect to the server using a simple password."
+msgstr ""
+"Подключение к IMAP серверу будет производиться с использованием "
+"незашифрованного пароля."
-#: camel/camel-search-private.c:105
+#: camel/camel-search-private.c:110
#, c-format
msgid "Regular expression compilation failed: %s: %s"
msgstr "Сбой компиляции регулярного выражения: %s: %s"
-#: camel/camel-service.c:142
+#: camel/camel-service.c:152
#, c-format
msgid "URL '%s' needs a username component"
msgstr "URL \"%s\" нуждается в компоненте имени пользователя"
-#: camel/camel-service.c:151
+#: camel/camel-service.c:160
#, c-format
msgid "URL '%s' needs a host component"
msgstr "URL \\\"%s\\\" нуждается в компоненте хоста"
-#: camel/camel-service.c:160
+#: camel/camel-service.c:168
#, c-format
msgid "URL '%s' needs a path component"
msgstr "URL \\\"%s\\\" нуждается в компоненте пути"
-#: camel/camel-service.c:512
+#: camel/camel-service.c:554
#, c-format
-msgid "No such host %s."
-msgstr "Нет такого хоста %s."
+msgid "Resolving: %s"
+msgstr ""
-#: camel/camel-service.c:515
+#: camel/camel-service.c:581
#, c-format
-msgid "Temporarily unable to look up hostname %s."
-msgstr "Временно невозможно найти имя хоста %s."
+msgid "Failure in name lookup: %s"
+msgstr ""
-#: camel/camel-session.c:54
+#: camel/camel-service.c:606
+#, c-format
+msgid "Host lookup failed: %s: host not found"
+msgstr ""
+
+#: camel/camel-service.c:608
+#, c-format
+msgid "Host lookup failed: %s: unknown reason"
+msgstr ""
+
+#: camel/camel-session.c:57
msgid "Virtual folder email provider"
msgstr "Провайдер виртуальных папок электронной почты"
-#: camel/camel-session.c:56
+#: camel/camel-session.c:59
msgid "For reading mail as a query of another set of folders"
msgstr "Для чтения почты по запросу к другому набору папок"
-#: camel/camel-session.c:322
+#: camel/camel-session.c:274 camel/camel-session.c:364
#, c-format
msgid "No provider available for protocol `%s'"
msgstr "Провайдер для протокола \"%s\" не доступен"
-#: camel/camel-session.c:417
+#: camel/camel-session.c:462
#, c-format
msgid ""
"Could not create directory %s:\n"
@@ -3410,117 +3672,140 @@ msgstr ""
"%s"
#. Fill in the new fields
-#: camel/camel-store.c:382 mail/mail-ops.c:942 mail/mail-ops.c:949
-#: mail/mail-ops.c:967 mail/mail-ops.c:968
+#: camel/camel-store.c:380 mail/mail-ops.c:994 mail/mail-ops.c:1001
+#: mail/mail-ops.c:1019 mail/mail-ops.c:1020
msgid "Trash"
msgstr "Мусорная корзина"
-#: camel/camel-url.c:77
-#, c-format
-msgid "URL string `%s' contains no protocol"
-msgstr "Строка URL \"%s\" не содержит протокола"
-
-#: camel/camel-url.c:92
-#, c-format
-msgid "URL string `%s' contains an invalid protocol"
-msgstr "Строка URL \"%s\" содержит недопустимый протокол"
+#: camel/camel-url.c:289
+#, fuzzy, c-format
+msgid "Could not parse URL `%s'"
+msgstr ""
+"Невозможно открыть файл \"%s\":\n"
+"%s"
-#: camel/camel-url.c:152
+#: camel/camel-vee-folder.c:451
#, c-format
-msgid "Port number in URL `%s' is non-numeric"
-msgstr "Номер порта в URL \"%s\" не является числом"
+msgid "No such message %s in %s"
+msgstr "Нет сообщения %s в %s"
-#: camel/camel-vee-folder.c:960
+#: camel/camel-vee-folder.c:545
#, c-format
msgid "No such message: %s"
msgstr "Нет такого сообщения: %s"
-#: camel/providers/imap/camel-imap-command.c:234
+#: camel/providers/imap/camel-imap-command.c:209
#, c-format
msgid "Unexpected response from IMAP server: %s"
msgstr "Неожиданный ответ от сервера IMAP: %s"
-#: camel/providers/imap/camel-imap-command.c:242
+#: camel/providers/imap/camel-imap-command.c:217
#, c-format
msgid "IMAP command failed: %s"
msgstr "Сбой команды IMAP: %s"
-#: camel/providers/imap/camel-imap-command.c:243 shell/e-storage.c:451
+#: camel/providers/imap/camel-imap-command.c:218 shell/e-storage.c:481
msgid "Unknown error"
msgstr "Неизвестная ошибка"
-#: camel/providers/imap/camel-imap-command.c:297
+#: camel/providers/imap/camel-imap-command.c:272
msgid "Server response ended too soon."
msgstr "Ответ сервера закончился слишком рано."
-#: camel/providers/imap/camel-imap-command.c:433
+#: camel/providers/imap/camel-imap-command.c:456
#, c-format
msgid "IMAP server response did not contain %s information"
msgstr "Ответ IMAP сервера не содержит информации об %s"
-#: camel/providers/imap/camel-imap-command.c:469
+#: camel/providers/imap/camel-imap-command.c:490
#, c-format
msgid "Unexpected OK response from IMAP server: %s"
msgstr "Неожиданный ответ \"OK\" от IMAP сервера: %s"
-#: camel/providers/imap/camel-imap-folder.c:199
+#: camel/providers/imap/camel-imap-folder.c:172
#, c-format
msgid "Could not load summary for %s"
msgstr "Невозможно загрузить итог для %s"
-#: camel/providers/imap/camel-imap-folder.c:329
+#: camel/providers/imap/camel-imap-folder.c:351
msgid "Scanning IMAP folder"
msgstr "Сканирование папок IMAP"
-#: camel/providers/imap/camel-imap-folder.c:837
-#: camel/providers/imap/camel-imap-folder.c:999
+#: camel/providers/imap/camel-imap-folder.c:986
+#: camel/providers/imap/camel-imap-folder.c:1197
+msgid "This message is not currently available"
+msgstr "Это сообщение в настоящий момент не доступно"
+
+#: camel/providers/imap/camel-imap-folder.c:1016
+#: camel/providers/imap/camel-imap-folder.c:1231
msgid "Could not find message body in FETCH response."
msgstr "Невозможно найти тело сообщения в ответе FETCH."
-#: camel/providers/imap/camel-imap-provider.c:39
+#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:11
+msgid "Checking for new mail"
+msgstr "Проверка новое почты"
+
+#: camel/providers/imap/camel-imap-provider.c:45
+msgid "Check for new messages in all folders"
+msgstr "Проверка новой почты во всех папках"
+
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:484
+msgid "Folders"
+msgstr "Папки"
+
+#: camel/providers/imap/camel-imap-provider.c:50
+#, fuzzy
+msgid "Show only subscribed folders"
+msgstr "Добавить папку к вашему списку папок подписок"
+
+#: camel/providers/imap/camel-imap-provider.c:52
+msgid "Override server-supplied folder namespace"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:54
+msgid "Namespace"
+msgstr "Пространство имен"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+msgid "Apply filters to new messages in INBOX on this server"
+msgstr "Применить фильтры ко всем новым сообщениям в папке \"Входящие\" (INBOX) на этом сервере"
+
+#: camel/providers/imap/camel-imap-provider.c:63
msgid "IMAPv4"
msgstr "IMAPv4"
-#: camel/providers/imap/camel-imap-provider.c:41
+#: camel/providers/imap/camel-imap-provider.c:65
msgid "For reading and storing mail on IMAP servers."
msgstr "Для чтения и хранения почты на серверах IMAP."
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Secure IMAPv4"
-msgstr "Безопасный IMAPv4"
-
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "For reading and storing mail on IMAP servers over an SSL connection."
-msgstr "Для чтения и хранения почты на серверах IMAP через SSL соединение."
-
-#: camel/providers/imap/camel-imap-store.c:263
+#: camel/providers/imap/camel-imap-provider.c:82
msgid "This option will connect to the IMAP server using a plaintext password."
msgstr ""
"Подключение к IMAP серверу будет производиться с использованием "
"незашифрованного пароля."
-#: camel/providers/imap/camel-imap-store.c:415
+#: camel/providers/imap/camel-imap-store.c:440
#, c-format
msgid "IMAP server %s does not support requested authentication type %s"
msgstr "IMAP сервер %s не поддерживает затребованный тип идентификации %s"
-#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap/camel-imap-store.c:450
+#: camel/providers/smtp/camel-smtp-transport.c:358
#, c-format
msgid "No support for authentication type %s"
msgstr "Идентификация типа %s не поддерживается"
-#: camel/providers/imap/camel-imap-store.c:454
+#: camel/providers/imap/camel-imap-store.c:475
#, c-format
msgid "%sPlease enter the IMAP password for %s@%s"
msgstr "%sПожалуйста, введите пароль IMAP для %s@%s"
-#: camel/providers/imap/camel-imap-store.c:469
-#: camel/providers/smtp/camel-smtp-transport.c:373
+#: camel/providers/imap/camel-imap-store.c:490
+#: camel/providers/smtp/camel-smtp-transport.c:403
msgid "You didn't enter a password."
msgstr "Вы не ввели пароль."
-#: camel/providers/imap/camel-imap-store.c:498
-#: camel/providers/smtp/camel-smtp-transport.c:381
+#: camel/providers/imap/camel-imap-store.c:518
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -3531,89 +3816,98 @@ msgstr ""
"%s\n"
"\n"
-#: camel/providers/imap/camel-imap-store.c:772
+#: camel/providers/imap/camel-imap-store.c:865
+#, fuzzy, c-format
+msgid "%s is not a selectable folder"
+msgstr "Просмотр выбранной папки"
+
+#: camel/providers/imap/camel-imap-store.c:879
#, c-format
msgid "Could not create directory %s: %s"
msgstr "Невозможно создать каталог %s: %s"
-#: camel/providers/local/camel-local-provider.c:36
+#: camel/providers/imap/camel-imap-store.c:1382
+msgid "You must be working online to complete this operation"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:39
msgid "MH-format mail directories"
msgstr "Почтовые каталоги в формате UNIX MH"
-#: camel/providers/local/camel-local-provider.c:37
+#: camel/providers/local/camel-local-provider.c:40
msgid "For storing local mail in MH-like mail directories"
msgstr "Для хранения локальной почты в почтовых каталогах типа MH"
-#: camel/providers/local/camel-local-provider.c:47
+#: camel/providers/local/camel-local-provider.c:49
msgid "Standard Unix mailbox file"
msgstr "Стандартный файл Unix mailbox"
-#: camel/providers/local/camel-local-provider.c:48
+#: camel/providers/local/camel-local-provider.c:50
msgid "For storing local mail in standard mbox format"
msgstr "Для хранения локальной почты в почтовых каталогах формата mbox"
-#: camel/providers/local/camel-local-provider.c:58
+#: camel/providers/local/camel-local-provider.c:59
msgid "Qmail maildir-format mail files"
msgstr "Почтовые файлы в формате почтовых каталогов qmail"
-#: camel/providers/local/camel-local-provider.c:59
+#: camel/providers/local/camel-local-provider.c:60
msgid "For storing local mail in qmail maildir directories"
msgstr "Для хранения локальной почты в почтовых каталогах типа qmail"
-#: camel/providers/local/camel-local-store.c:128
+#: camel/providers/local/camel-local-store.c:129
#, c-format
msgid "Store root %s is not an absolute path"
msgstr ""
-#: camel/providers/local/camel-local-store.c:135
+#: camel/providers/local/camel-local-store.c:136
#, c-format
msgid "Store root %s is not a regular directory"
msgstr ""
-#: camel/providers/local/camel-local-store.c:143
-#: camel/providers/local/camel-local-store.c:159
+#: camel/providers/local/camel-local-store.c:144
+#: camel/providers/local/camel-local-store.c:160
#, c-format
msgid "Cannot get folder: %s: %s"
msgstr "Не удалось получить папку: %s: %s"
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:175
msgid "Local stores do not have an inbox"
msgstr ""
-#: camel/providers/local/camel-local-store.c:184
+#: camel/providers/local/camel-local-store.c:185
#, c-format
msgid "Local mail file %s"
msgstr "Локальный почтовый файл %s"
-#: camel/providers/local/camel-local-store.c:240
+#: camel/providers/local/camel-local-store.c:241
#, c-format
msgid "Could not rename folder %s to %s: %s"
msgstr "Не удалось переименовать папку %s в %s: %s"
-#: camel/providers/local/camel-local-store.c:282
+#: camel/providers/local/camel-local-store.c:283
#, c-format
msgid "Could not delete folder summary file `%s': %s"
msgstr "Не удалось удалить итоговый файл папки \"%s\": %s"
-#: camel/providers/local/camel-local-store.c:292
+#: camel/providers/local/camel-local-store.c:293
#, c-format
msgid "Could not delete folder index file `%s': %s"
msgstr "Не удалось удалить индексный файл папки \"%s\": %s"
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
+#: camel/providers/local/camel-maildir-folder.c:150
+#: camel/providers/local/camel-maildir-folder.c:158
+#: camel/providers/local/camel-maildir-folder.c:169
#, c-format
msgid "Cannot append message to maildir folder: %s: %s"
msgstr "Невозможно добавить сообщение к папке почтового каталога: %s: %s"
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:207
-#: camel/providers/local/camel-maildir-folder.c:215
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:192
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:197
+#: camel/providers/local/camel-maildir-folder.c:209
+#: camel/providers/local/camel-maildir-folder.c:217
+#: camel/providers/local/camel-mbox-folder.c:319
+#: camel/providers/local/camel-mh-folder.c:185
+#: camel/providers/local/camel-mh-folder.c:194
+#: camel/providers/local/camel-mh-folder.c:202
#, c-format
msgid ""
"Cannot get message: %s\n"
@@ -3622,19 +3916,19 @@ msgstr ""
"Невозможно получить сообщение: %s\n"
" %s"
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:317
-#: camel/providers/local/camel-mh-folder.c:183
+#: camel/providers/local/camel-maildir-folder.c:197
+#: camel/providers/local/camel-mbox-folder.c:319
+#: camel/providers/local/camel-mh-folder.c:185
msgid "No such message"
msgstr "Нет такого сообщения"
-#: camel/providers/local/camel-maildir-folder.c:216
-#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:218
+#: camel/providers/local/camel-mh-folder.c:203
msgid "Invalid message contents"
msgstr "Неправильное содержимое сообщения"
-#: camel/providers/local/camel-maildir-store.c:94
-#: camel/providers/local/camel-mh-store.c:88
+#: camel/providers/local/camel-maildir-store.c:96
+#: camel/providers/local/camel-mh-store.c:90
#, c-format
msgid ""
"Could not open folder `%s':\n"
@@ -3643,15 +3937,15 @@ msgstr ""
"Невозможно открыть папку \"%s\":\n"
"%s"
-#: camel/providers/local/camel-maildir-store.c:98
-#: camel/providers/local/camel-mbox-store.c:99
-#: camel/providers/local/camel-mh-store.c:95
+#: camel/providers/local/camel-maildir-store.c:100
+#: camel/providers/local/camel-mbox-store.c:101
+#: camel/providers/local/camel-mh-store.c:97
#, c-format
msgid "Folder `%s' does not exist."
msgstr "Папка \"%s\" не существует."
-#: camel/providers/local/camel-maildir-store.c:105
-#: camel/providers/local/camel-mh-store.c:101
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mh-store.c:103
#, c-format
msgid ""
"Could not create folder `%s':\n"
@@ -3660,37 +3954,42 @@ msgstr ""
"Не удалось создать папку \"%s\":\n"
"%s"
-#: camel/providers/local/camel-maildir-store.c:120
+#: camel/providers/local/camel-maildir-store.c:122
#, c-format
msgid "`%s' is not a maildir directory."
msgstr "\"%s\" не является почтовым каталогом."
-#: camel/providers/local/camel-maildir-store.c:149
-#: camel/providers/local/camel-maildir-store.c:186
-#: camel/providers/local/camel-mh-store.c:125
+#: camel/providers/local/camel-maildir-store.c:151
+#: camel/providers/local/camel-maildir-store.c:188
+#: camel/providers/local/camel-mh-store.c:127
#, c-format
msgid "Could not delete folder `%s': %s"
msgstr ""
"Невозможно удалить папку \"%s\":\n"
"%s"
-#: camel/providers/local/camel-maildir-store.c:150
+#: camel/providers/local/camel-maildir-store.c:152
msgid "not a maildir directory"
msgstr "не является почтовым каталог"
-#: camel/providers/local/camel-mbox-folder.c:201
+#: camel/providers/local/camel-mbox-folder.c:152
+#, fuzzy, c-format
+msgid "Cannot create folder lock on %s: %s"
+msgstr "Не удалось получить папку: %s: %s"
+
+#: camel/providers/local/camel-mbox-folder.c:203
#, c-format
msgid "Cannot open mailbox: %s: %s\n"
msgstr "Не удалось открыть почтовый ящик: %s: %s\n"
-#: camel/providers/local/camel-mbox-folder.c:257
+#: camel/providers/local/camel-mbox-folder.c:259
#, c-format
msgid "Cannot append message to mbox file: %s: %s"
msgstr "Невозможно присоединить сообщение к файлу mbox: %s: %s"
-#: camel/providers/local/camel-mbox-folder.c:333
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:378
+#: camel/providers/local/camel-mbox-folder.c:335
+#: camel/providers/local/camel-mbox-folder.c:367
+#: camel/providers/local/camel-mbox-folder.c:380
#, c-format
msgid ""
"Cannot get message: %s from folder %s\n"
@@ -3699,15 +3998,15 @@ msgstr ""
"Невозможно получить сообщение: %s из папки %s\n"
" %s"
-#: camel/providers/local/camel-mbox-folder.c:366
+#: camel/providers/local/camel-mbox-folder.c:368
msgid "The folder appears to be irrecoverably corrupted."
msgstr "Видимо папка невостановимо испорчена."
-#: camel/providers/local/camel-mbox-folder.c:379
+#: camel/providers/local/camel-mbox-folder.c:381
msgid "Message construction failed: Corrupt mailbox?"
msgstr "Сбой в конструкции сообщения: почтовый ящик поврежден?"
-#: camel/providers/local/camel-mbox-store.c:92
+#: camel/providers/local/camel-mbox-store.c:94
#, c-format
msgid ""
"Could not open file `%s':\n"
@@ -3716,7 +4015,7 @@ msgstr ""
"Невозможно открыть файл \"%s\":\n"
"%s"
-#: camel/providers/local/camel-mbox-store.c:108
+#: camel/providers/local/camel-mbox-store.c:110
#, c-format
msgid ""
"Could not create file `%s':\n"
@@ -3725,14 +4024,14 @@ msgstr ""
"Не удалось создать файл \"%s\":\n"
"%s"
-#: camel/providers/local/camel-mbox-store.c:117
-#: camel/providers/local/camel-mbox-store.c:144
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
#, c-format
msgid "`%s' is not a regular file."
msgstr "%s не является обычным файлом."
-#: camel/providers/local/camel-mbox-store.c:136
-#: camel/providers/local/camel-mbox-store.c:159
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
#, c-format
msgid ""
"Could not delete folder `%s':\n"
@@ -3741,111 +4040,111 @@ msgstr ""
"Невозможно удалить папку \"%s\":\n"
"%s"
-#: camel/providers/local/camel-mbox-store.c:151
+#: camel/providers/local/camel-mbox-store.c:153
#, c-format
msgid "Folder `%s' is not empty. Not deleted."
msgstr "Папка \"%s\" не пуста. Не удалена."
#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
#. it should try and merge the summary info's. This is a bit tricky.
-#: camel/providers/local/camel-mbox-summary.c:240
+#: camel/providers/local/camel-mbox-summary.c:248
msgid "Summarising folder"
msgstr "Суммаризация папки"
-#: camel/providers/local/camel-mbox-summary.c:245
+#: camel/providers/local/camel-mbox-summary.c:253
#, c-format
msgid "Could not open folder: %s: summarising from position %ld: %s"
msgstr "Не удалось открыть папку: %s: итог с позиции %ld: %s"
-#: camel/providers/local/camel-mbox-summary.c:287
+#: camel/providers/local/camel-mbox-summary.c:295
#, c-format
msgid "Fatal mail parser error near position %ld in folder %s"
msgstr "Фатальная ошибка почтового анализатора возле позиции %ld в папке %s"
-#: camel/providers/local/camel-mbox-summary.c:362
+#: camel/providers/local/camel-mbox-summary.c:370
#, c-format
msgid "Cannot summarise folder: %s: %s"
msgstr "Не удалось суммировать папку: %s: %s"
-#: camel/providers/local/camel-mbox-summary.c:493
-#: camel/providers/local/camel-mbox-summary.c:694 mail/mail-ops.c:1328
+#: camel/providers/local/camel-mbox-summary.c:501
+#: camel/providers/local/camel-mbox-summary.c:702 mail/mail-ops.c:1382
msgid "Synchronising folder"
msgstr "Синхронизация папки"
-#: camel/providers/local/camel-mbox-summary.c:498
-#: camel/providers/local/camel-mbox-summary.c:699
+#: camel/providers/local/camel-mbox-summary.c:506
+#: camel/providers/local/camel-mbox-summary.c:707
#, c-format
msgid "Could not open folder to summarise: %s: %s"
msgstr "Не удалось открыть папку для суммаризации: %s: %s"
-#: camel/providers/local/camel-mbox-summary.c:515
+#: camel/providers/local/camel-mbox-summary.c:523
#, c-format
msgid "Cannot open temporary mailbox: %s"
msgstr "Не удалось открыть временный почтовый ящик: %s"
-#: camel/providers/local/camel-mbox-summary.c:540
#: camel/providers/local/camel-mbox-summary.c:548
-#: camel/providers/local/camel-mbox-summary.c:737
+#: camel/providers/local/camel-mbox-summary.c:556
#: camel/providers/local/camel-mbox-summary.c:745
+#: camel/providers/local/camel-mbox-summary.c:753
msgid "Summary and folder mismatch, even after a sync"
msgstr "Несовпадение папки и итога, даже после синхронизации"
-#: camel/providers/local/camel-mbox-summary.c:591
+#: camel/providers/local/camel-mbox-summary.c:599
#, c-format
msgid "Error writing to temp mailbox: %s"
msgstr "Ошибка записи во временный почтовый ящик: %s"
-#: camel/providers/local/camel-mbox-summary.c:608
+#: camel/providers/local/camel-mbox-summary.c:616
#, c-format
msgid "Writing to tmp mailbox failed: %s: %s"
msgstr "Сбой записи во временный почтовый ящик: %s: %s"
-#: camel/providers/local/camel-mbox-summary.c:626
-#: camel/providers/local/camel-mbox-summary.c:795
+#: camel/providers/local/camel-mbox-summary.c:634
+#: camel/providers/local/camel-mbox-summary.c:803
#, c-format
msgid "Could not close source folder %s: %s"
msgstr "Невозможно закрыть исходную папку %s: %s"
-#: camel/providers/local/camel-mbox-summary.c:635
+#: camel/providers/local/camel-mbox-summary.c:643
#, c-format
msgid "Could not close temp folder: %s"
msgstr "Невозможно закрыть временную папку: %s"
-#: camel/providers/local/camel-mbox-summary.c:646
+#: camel/providers/local/camel-mbox-summary.c:654
#, c-format
msgid "Could not rename folder: %s"
msgstr "Не удалось переименовать папку: %s"
-#: camel/providers/local/camel-mbox-summary.c:870
+#: camel/providers/local/camel-mbox-summary.c:878
#, c-format
msgid "Unknown error: %s"
msgstr "Неизвестная ошибка: %s"
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
+#: camel/providers/local/camel-mh-folder.c:149
+#: camel/providers/local/camel-mh-folder.c:157
#, c-format
msgid "Cannot append message to mh folder: %s: %s"
msgstr "Невозможно добавить сообщение к папке mh: %s: %s"
-#: camel/providers/local/camel-mh-store.c:108
+#: camel/providers/local/camel-mh-store.c:110
#, c-format
msgid "`%s' is not a directory."
msgstr "\"%s\" не является каталогом."
-#: camel/providers/nntp/camel-nntp-auth.c:41
+#: camel/providers/nntp/camel-nntp-auth.c:45
#, c-format
msgid "Please enter the NNTP password for %s@%s"
msgstr "Пожалуйста, введите пароль NNTP для %s@%s"
-#: camel/providers/nntp/camel-nntp-auth.c:62
+#: camel/providers/nntp/camel-nntp-auth.c:66
msgid "Server rejected username"
msgstr "Сервер отбросил имя пользователя"
-#: camel/providers/nntp/camel-nntp-auth.c:68
+#: camel/providers/nntp/camel-nntp-auth.c:72
msgid "Failed to send username to server"
msgstr "Сбой при отправке имени пользователя на сервер"
-#: camel/providers/nntp/camel-nntp-auth.c:77
+#: camel/providers/nntp/camel-nntp-auth.c:81
msgid "Server rejected username/password"
msgstr "Сервер отбросил имя пользователя/пароль"
@@ -3869,11 +4168,11 @@ msgstr "Не удалось загрузить файл списка групп для %s: %s"
msgid "Unable to save grouplist file for %s: %s"
msgstr "Не удалось сохранить файл списка групп для %s: %s"
-#: camel/providers/nntp/camel-nntp-provider.c:38
+#: camel/providers/nntp/camel-nntp-provider.c:42
msgid "USENET news"
msgstr "Новости USENET"
-#: camel/providers/nntp/camel-nntp-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:44
msgid "This is a provider for reading from and posting toUSENET newsgroups."
msgstr ""
"Это провайдер для чтения и отправки сообщений в группы новостей USENET."
@@ -3902,34 +4201,47 @@ msgstr ""
msgid "Unable to open or create .newsrc file for %s: %s"
msgstr "Не удалось открыть или создать файл .newsrc для %s: %s"
-#: camel/providers/pop3/camel-pop3-folder.c:145
+#: camel/providers/pop3/camel-pop3-folder.c:149
msgid "Retrieving POP summary"
msgstr "Получение итога POP"
-#: camel/providers/pop3/camel-pop3-folder.c:188
+#: camel/providers/pop3/camel-pop3-folder.c:192
msgid "Could not open folder: message listing was incomplete."
msgstr "Не удалось открыть папку: список сообщений был неполон."
-#: camel/providers/pop3/camel-pop3-folder.c:282
+#: camel/providers/pop3/camel-pop3-folder.c:285
#, c-format
msgid "No message with uid %s"
msgstr "Нет сообщения с uid %s"
-#: camel/providers/pop3/camel-pop3-folder.c:286
+#: camel/providers/pop3/camel-pop3-folder.c:289
#, c-format
msgid "Retrieving POP message %d"
msgstr "Получение сообщения %d по POP"
-#: camel/providers/pop3/camel-pop3-folder.c:304
+#: camel/providers/pop3/camel-pop3-folder.c:307
#, c-format
msgid "Could not retrieve message from POP server %s: %s"
msgstr "Не удалось получить сообщение с POP сервера %s: %s"
-#: camel/providers/pop3/camel-pop3-provider.c:34
+#: camel/providers/pop3/camel-pop3-provider.c:37
+msgid "Message storage"
+msgstr "Хранилище сообщений"
+
+#: camel/providers/pop3/camel-pop3-provider.c:39
+msgid "Leave messages on server"
+msgstr "Сохранять сообщения на сервере"
+
+#: camel/providers/pop3/camel-pop3-provider.c:41
+#, c-format
+msgid "Delete after %s day(s)"
+msgstr "Удалять через %s дней"
+
+#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:42
msgid "POP"
msgstr "POP"
-#: camel/providers/pop3/camel-pop3-provider.c:36
+#: camel/providers/pop3/camel-pop3-provider.c:50
msgid ""
"For connecting to POP servers. The POP protocol can also be used to retrieve "
"mail from certain web mail providers and proprietary email systems."
@@ -3938,18 +4250,7 @@ msgstr ""
"для получения почты от обычных провайдеров Web-почты и специфических систем "
"электронной почты."
-#: camel/providers/pop3/camel-pop3-provider.c:54
-msgid "Secure POP"
-msgstr "Безопасный POP"
-
-#: camel/providers/pop3/camel-pop3-provider.c:56
-msgid ""
-"For connecting to POP servers over an SSL connection. The POP protocol can "
-"also be used to retrieve mail from certain web mail providers and "
-"proprietary email systems."
-msgstr "Для подключения к POP серверам через SSL соединение. POP протокол может быть также использован для получения почты от обычных провайдеров Web-почты и специфических систем электронной почты."
-
-#: camel/providers/pop3/camel-pop3-store.c:147
+#: camel/providers/pop3/camel-pop3-provider.c:69
msgid ""
"This option will connect to the POP server using a plaintext password. This "
"is the only option supported by many POP servers."
@@ -3958,7 +4259,7 @@ msgstr ""
"незашифрованного пароля. Большинством POP серверов поддерживается только "
"этот вариант."
-#: camel/providers/pop3/camel-pop3-store.c:157
+#: camel/providers/pop3/camel-pop3-provider.c:79
msgid ""
"This option will connect to the POP server using an encrypted password via "
"the APOP protocol. This may not work for all users even on servers that "
@@ -3968,29 +4269,29 @@ msgstr ""
"пароля по протоколу APOP. Это может работать не для всех пользователей даже "
"на серверах, которые якобы поддерживают это."
-#: camel/providers/pop3/camel-pop3-store.c:169
+#: camel/providers/pop3/camel-pop3-provider.c:91
msgid ""
"This will connect to the POP server and use Kerberos 4 to authenticate to it."
msgstr ""
"Подключение к POP серверу будет производиться с использованием Kerberos 4 "
"для идентификации."
-#: camel/providers/pop3/camel-pop3-store.c:214
+#: camel/providers/pop3/camel-pop3-store.c:207
#, c-format
msgid "Could not authenticate to KPOP server: %s"
msgstr "Не удалось идентифицироваться на KPOP сервере: %s"
-#: camel/providers/pop3/camel-pop3-store.c:331
+#: camel/providers/pop3/camel-pop3-store.c:319
#, c-format
msgid "Could not connect to POP server on %s."
msgstr "Не удалось подключиться к POP серверу на %s."
-#: camel/providers/pop3/camel-pop3-store.c:378
+#: camel/providers/pop3/camel-pop3-store.c:358
#, c-format
msgid "%sPlease enter the POP3 password for %s@%s"
msgstr "%sПожалуйста, введите POP3 пароль для %s@%s"
-#: camel/providers/pop3/camel-pop3-store.c:397
+#: camel/providers/pop3/camel-pop3-store.c:377
#, c-format
msgid ""
"Unable to connect to POP server.\n"
@@ -3999,12 +4300,12 @@ msgstr ""
"Не удалось подключиться к POP серверу.\n"
"Ошибка отправки имени пользователя: %s"
-#: camel/providers/pop3/camel-pop3-store.c:400
-#: camel/providers/pop3/camel-pop3-store.c:437
+#: camel/providers/pop3/camel-pop3-store.c:380
+#: camel/providers/pop3/camel-pop3-store.c:417
msgid "(Unknown)"
msgstr "(Неизвестное)"
-#: camel/providers/pop3/camel-pop3-store.c:427
+#: camel/providers/pop3/camel-pop3-store.c:407
msgid ""
"Unable to connect to POP server.\n"
"No support for requested authentication mechanism."
@@ -4012,7 +4313,7 @@ msgstr ""
"Не удалось подключиться к POP серверу.\n"
"Не поддерживается затребованный механизм идентификации."
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:415
#, c-format
msgid ""
"Unable to connect to POP server.\n"
@@ -4021,360 +4322,357 @@ msgstr ""
"Не удалось подключиться к POP серверу.\n"
"Ошибка отправки пароля: %s"
-#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:483
#, c-format
msgid "No such folder `%s'."
msgstr "Нет такой папки \"%s\""
-#: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: mail/mail-config.glade.h:61
+#: camel/providers/sendmail/camel-sendmail-provider.c:37
+#: mail/mail-config.glade.h:57
msgid "Sendmail"
msgstr "Sendmail"
-#: camel/providers/sendmail/camel-sendmail-provider.c:36
+#: camel/providers/sendmail/camel-sendmail-provider.c:39
msgid ""
"For delivering mail by passing it to the \"sendmail\" program on the local "
"system."
msgstr ""
"Для доставки почты передачей её программе \"Sendmail\" на локальной системе."
-#: camel/providers/sendmail/camel-sendmail-transport.c:105
+#: camel/providers/sendmail/camel-sendmail-transport.c:107
#, c-format
msgid "Could not create pipe to sendmail: %s: mail not sent"
msgstr "Не удалось создать канал к Sendmail: %s: почта не отправлена"
-#: camel/providers/sendmail/camel-sendmail-transport.c:122
+#: camel/providers/sendmail/camel-sendmail-transport.c:124
#, c-format
msgid "Could not fork sendmail: %s: mail not sent"
msgstr "Не удалось разветвить Sendmail: %s: почта не отправлена"
-#: camel/providers/sendmail/camel-sendmail-transport.c:148
+#: camel/providers/sendmail/camel-sendmail-transport.c:150
#, c-format
msgid "Could not send message: %s"
msgstr "Не удалось отправить сообщение: %s"
-#: camel/providers/sendmail/camel-sendmail-transport.c:161
+#: camel/providers/sendmail/camel-sendmail-transport.c:163
#, c-format
msgid "sendmail exited with signal %s: mail not sent."
msgstr "Sendmail завершила работу с сигналом %s: почта не отправлена."
-#: camel/providers/sendmail/camel-sendmail-transport.c:168
+#: camel/providers/sendmail/camel-sendmail-transport.c:170
#, c-format
msgid "Could not execute %s: mail not sent."
msgstr "Не удалось выполнить %s: почта не отправлена."
-#: camel/providers/sendmail/camel-sendmail-transport.c:173
+#: camel/providers/sendmail/camel-sendmail-transport.c:175
#, c-format
msgid "sendmail exited with status %d: mail not sent."
msgstr "Sendmail завершила работу с состоянием %d: почта не отправлена."
-#: camel/providers/sendmail/camel-sendmail-transport.c:192
+#: camel/providers/sendmail/camel-sendmail-transport.c:194
msgid "Could not find 'From' address in message"
msgstr "Невозможно найти адрес \"От\" в сообщении"
-#: camel/providers/sendmail/camel-sendmail-transport.c:245
+#: camel/providers/sendmail/camel-sendmail-transport.c:247
msgid "sendmail"
msgstr "sendmail"
-#: camel/providers/sendmail/camel-sendmail-transport.c:247
+#: camel/providers/sendmail/camel-sendmail-transport.c:249
msgid "Mail delivery via the sendmail program"
msgstr "Доставка почты через программу sendmail"
-#: camel/providers/smtp/camel-smtp-provider.c:34 mail/mail-config.glade.h:55
+#: camel/providers/smtp/camel-smtp-provider.c:38 mail/mail-config.glade.h:52
msgid "SMTP"
msgstr "SMTP"
-#: camel/providers/smtp/camel-smtp-provider.c:36
+#: camel/providers/smtp/camel-smtp-provider.c:40
msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
msgstr ""
"Для доставки почты с помощью подключения к удаленному почтовому узлу по "
"протоколу SMTP.\n"
-#: camel/providers/smtp/camel-smtp-provider.c:53
-msgid "Secure SMTP"
-msgstr "Безопасный SMTP"
-
-#: camel/providers/smtp/camel-smtp-provider.c:55
-msgid ""
-"For delivering mail by connecting to a remote mailhub using SMTP over an SSL "
-"connection.\n"
-msgstr "Для доставки почты с помощью подключения к удаленному почтовому узлу по протоколу SMTP через SSL соединение.\n"
-
-#: camel/providers/smtp/camel-smtp-transport.c:147
+#: camel/providers/smtp/camel-smtp-transport.c:165
msgid "Syntax error, command unrecognized"
msgstr "Синтаксическая ошибка, команда не распознана"
-#: camel/providers/smtp/camel-smtp-transport.c:149
+#: camel/providers/smtp/camel-smtp-transport.c:167
msgid "Syntax error in parameters or arguments"
msgstr "Синтаксическая ошибка в параметрах или аргументах"
-#: camel/providers/smtp/camel-smtp-transport.c:151
+#: camel/providers/smtp/camel-smtp-transport.c:169
msgid "Command not implemented"
msgstr "Команда не реализована"
-#: camel/providers/smtp/camel-smtp-transport.c:153
+#: camel/providers/smtp/camel-smtp-transport.c:171
msgid "Command parameter not implemented"
msgstr "Параметр команды не реализован"
-#: camel/providers/smtp/camel-smtp-transport.c:155
+#: camel/providers/smtp/camel-smtp-transport.c:173
msgid "System status, or system help reply"
msgstr "Состояние системы или ответ справки системы"
-#: camel/providers/smtp/camel-smtp-transport.c:157
+#: camel/providers/smtp/camel-smtp-transport.c:175
msgid "Help message"
msgstr "Справочное сообщение"
-#: camel/providers/smtp/camel-smtp-transport.c:159
+#: camel/providers/smtp/camel-smtp-transport.c:177
msgid "Service ready"
msgstr "Сервис готов"
-#: camel/providers/smtp/camel-smtp-transport.c:161
+#: camel/providers/smtp/camel-smtp-transport.c:179
msgid "Service closing transmission channel"
msgstr "Сервис закрывает канал передачи"
-#: camel/providers/smtp/camel-smtp-transport.c:163
+#: camel/providers/smtp/camel-smtp-transport.c:181
msgid "Service not available, closing transmission channel"
msgstr "Сервис не доступен, закрытие канала передачи"
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:183
msgid "Requested mail action okay, completed"
msgstr "Запрошенное почтовое действие выполнено"
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:185
msgid "User not local; will forward to <forward-path>"
msgstr "Не локальный пользователь; будет отправлено к <путь-отправки>"
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:187
msgid "Requested mail action not taken: mailbox unavailable"
msgstr "Запрошенное действие с почтой не выполнено: почтовый ящик не доступен"
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:189
msgid "Requested action not taken: mailbox unavailable"
msgstr "Запрошенное действие не выполнено: почтовый ящик не доступен"
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:191
msgid "Requested action aborted: error in processing"
msgstr "Запрошенное действие отменено: ошибка при обработке"
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:193
msgid "User not local; please try <forward-path>"
msgstr "Пользователь не локальный; пожалуйста попробуйте <путь-пересылки>"
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:195
msgid "Requested action not taken: insufficient system storage"
msgstr "Запрошенное действие не выполнено: недостаточно системного хранилища"
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:197
msgid "Requested mail action aborted: exceeded storage allocation"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:199
msgid "Requested action not taken: mailbox name not allowed"
msgstr ""
"Запрошенное действие не выполнено: название почтового ящика недопустимо"
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:201
msgid "Start mail input; end with <CRLF>.<CRLF>"
msgstr "Начало ввода почты; окончание после <CRLF>.<CRLF>"
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:203
msgid "Transaction failed"
msgstr "Сбой транзакции"
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:207
msgid "A password transition is needed"
msgstr "Необходима передача пароля"
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:209
msgid "Authentication mechanism is too weak"
msgstr "Слишком слабый механизм идентификации"
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:211
msgid "Encryption required for requested authentication mechanism"
msgstr "Для запрошенного механизма идентификации требуется шифрование"
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:213
msgid "Temporary authentication failure"
msgstr "Временный сбой идентификации"
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:215
msgid "Authentication required"
msgstr "Идентификация требуется"
-#: camel/providers/smtp/camel-smtp-transport.c:286
+#: camel/providers/smtp/camel-smtp-transport.c:305
#, c-format
msgid "Welcome response error: %s: possibly non-fatal"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/smtp/camel-smtp-transport.c:348
+#, c-format
+msgid "SMTP server %s does not support requested authentication type %s"
+msgstr "SMTP сервер %s не поддерживает затребованный тип идентификации %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:388
#, c-format
msgid "%sPlease enter the SMTP password for %s@%s"
msgstr "%sПожалуйста, введите пароль SMTP для %s@%s"
-#: camel/providers/smtp/camel-smtp-transport.c:466
-msgid "No authentication required"
-msgstr "Идентификация не требуется"
-
-#: camel/providers/smtp/camel-smtp-transport.c:468
+#: camel/providers/smtp/camel-smtp-transport.c:411
+#, c-format
msgid ""
-"This option will connect to the SMTP server without using any kind of "
-"authentication. This should be fine for connecting to most SMTP servers."
+"Unable to authenticate to SMTP server.\n"
+"%s\n"
+"\n"
msgstr ""
-"Подключение к SMTP серверу будет производиться без использования какой либо "
-"идентификации. Этот вариант поддерживается большинством SMTP серверов."
+"Невозможно идентифицироваться на сервере SMTP.\n"
+"%s\n"
+"\n"
-#: camel/providers/smtp/camel-smtp-transport.c:511
+#: camel/providers/smtp/camel-smtp-transport.c:527
#, c-format
msgid "SMTP server %s"
msgstr "SMTP сервер %s"
-#: camel/providers/smtp/camel-smtp-transport.c:513
+#: camel/providers/smtp/camel-smtp-transport.c:529
#, c-format
msgid "SMTP mail delivery via %s"
msgstr "Доставка SMTP почты через %s"
-#: camel/providers/smtp/camel-smtp-transport.c:538
+#: camel/providers/smtp/camel-smtp-transport.c:554
msgid "Cannot send message: sender address not defined."
msgstr "Невозможно отправить сообщение: не определен адрес отправителя."
-#: camel/providers/smtp/camel-smtp-transport.c:545
+#: camel/providers/smtp/camel-smtp-transport.c:561
msgid "Cannot send message: sender address not valid."
msgstr "Невозможно отправить сообщение: неправильный адрес отправителя."
-#: camel/providers/smtp/camel-smtp-transport.c:559
+#: camel/providers/smtp/camel-smtp-transport.c:575
msgid "Cannot send message: no recipients defined."
msgstr "Невозможно отправить сообщение: не определены получатели."
-#: camel/providers/smtp/camel-smtp-transport.c:653
+#: camel/providers/smtp/camel-smtp-transport.c:669
#, c-format
msgid "HELO request timed out: %s: non-fatal"
msgstr "Превышено время ожидания ответа на HELO: %s: не фатально"
-#: camel/providers/smtp/camel-smtp-transport.c:672
+#: camel/providers/smtp/camel-smtp-transport.c:688
#, c-format
msgid "HELO response error: %s: non-fatal"
msgstr "Ошибка ответа HELO: %s: не фатально"
-#: camel/providers/smtp/camel-smtp-transport.c:707
-#: camel/providers/smtp/camel-smtp-transport.c:719
+#: camel/providers/smtp/camel-smtp-transport.c:721
+msgid "Error creating SASL authentication object."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:736
+#: camel/providers/smtp/camel-smtp-transport.c:748
#, c-format
msgid "AUTH request timed out: %s"
msgstr "Превышено время ожидания ответа на запрос AUTH: %s"
-#: camel/providers/smtp/camel-smtp-transport.c:777
+#: camel/providers/smtp/camel-smtp-transport.c:798
msgid "Bad authentication response from server.\n"
msgstr "Отрицательный ответ идентификации от сервера.\n"
-#: camel/providers/smtp/camel-smtp-transport.c:802
+#: camel/providers/smtp/camel-smtp-transport.c:824
#, c-format
msgid "MAIL FROM request timed out: %s: mail not sent"
msgstr "Превышено время ожидания ответа на MAIL FROM: %s: почта не отправлена"
-#: camel/providers/smtp/camel-smtp-transport.c:821
+#: camel/providers/smtp/camel-smtp-transport.c:843
#, c-format
msgid "MAIL FROM response error: %s: mail not sent"
msgstr "Ошибка ответа MAIL FROM: %s: почта не отправлена"
-#: camel/providers/smtp/camel-smtp-transport.c:846
+#: camel/providers/smtp/camel-smtp-transport.c:868
#, c-format
msgid "RCPT TO request timed out: %s: mail not sent"
msgstr "Превышено время ожидания ответа на RCPT TO: %s: почта не отправлена"
-#: camel/providers/smtp/camel-smtp-transport.c:865
+#: camel/providers/smtp/camel-smtp-transport.c:887
#, c-format
msgid "RCPT TO response error: %s: mail not sent"
msgstr "Ошибка ответа RCPT TO: %s: почта не отправлена."
-#: camel/providers/smtp/camel-smtp-transport.c:896
+#: camel/providers/smtp/camel-smtp-transport.c:918
#, c-format
msgid "DATA request timed out: %s: mail not sent"
msgstr "Превышено время ожидания ответа на DATA: %s: почта не отправлена"
-#: camel/providers/smtp/camel-smtp-transport.c:915
+#: camel/providers/smtp/camel-smtp-transport.c:937
#, c-format
msgid "DATA response error: %s: mail not sent"
msgstr "Ошибка ответа DATA: %s: почта не отправлена"
-#: camel/providers/smtp/camel-smtp-transport.c:930
-#: camel/providers/smtp/camel-smtp-transport.c:948
+#: camel/providers/smtp/camel-smtp-transport.c:952
+#: camel/providers/smtp/camel-smtp-transport.c:970
#, c-format
msgid "DATA send timed out: message termination: %s: mail not sent"
msgstr ""
"Превышено время отправки DATA: сообщение прервано: %s: почта не отправлена"
-#: camel/providers/smtp/camel-smtp-transport.c:967
+#: camel/providers/smtp/camel-smtp-transport.c:989
#, c-format
msgid "DATA response error: message termination: %s: mail not sent"
msgstr "Ошибка ответа DATA: сообщение прервано: %s: почта не отправлена"
-#: camel/providers/smtp/camel-smtp-transport.c:991
+#: camel/providers/smtp/camel-smtp-transport.c:1013
#, c-format
msgid "RSET request timed out: %s"
msgstr "Превышено время ожидания ответа на RSET: %s"
-#: camel/providers/smtp/camel-smtp-transport.c:1010
+#: camel/providers/smtp/camel-smtp-transport.c:1032
#, c-format
msgid "RSET response error: %s"
msgstr "Ошибка ответа RSET: %s"
-#: camel/providers/smtp/camel-smtp-transport.c:1033
+#: camel/providers/smtp/camel-smtp-transport.c:1055
#, c-format
msgid "QUIT request timed out: %s: non-fatal"
msgstr "Превышено время ожидания ответа на QUIT: %s: не фатально"
-#: camel/providers/smtp/camel-smtp-transport.c:1052
+#: camel/providers/smtp/camel-smtp-transport.c:1074
#, c-format
msgid "QUIT response error: %s: non-fatal"
msgstr "Ошибка ответа QUIT: %s: не фатально"
-#: composer/e-msg-composer-attachment-bar.c:87
+#: composer/e-msg-composer-attachment-bar.c:95
msgid "1 byte"
msgstr "1 байт"
-#: composer/e-msg-composer-attachment-bar.c:89
+#: composer/e-msg-composer-attachment-bar.c:97
#, c-format
msgid "%u bytes"
msgstr "%u байт"
-#: composer/e-msg-composer-attachment-bar.c:96
+#: composer/e-msg-composer-attachment-bar.c:104
#, c-format
msgid "%.1fK"
msgstr "%.1fК"
-#: composer/e-msg-composer-attachment-bar.c:100
+#: composer/e-msg-composer-attachment-bar.c:108
#, c-format
msgid "%.1fM"
msgstr "%.1fM"
-#: composer/e-msg-composer-attachment-bar.c:104
+#: composer/e-msg-composer-attachment-bar.c:112
#, c-format
msgid "%.1fG"
msgstr "%.1fG"
#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:113
+#: composer/e-msg-composer-attachment-bar.c:332 mail/mail-display.c:120
msgid "attachment"
msgstr "вложение"
-#: composer/e-msg-composer-attachment-bar.c:413
+#: composer/e-msg-composer-attachment-bar.c:421
#: ui/evolution-message-composer.xml.h:2
msgid "Attach a file"
msgstr "Присоединить файл"
-#: composer/e-msg-composer-attachment-bar.c:461
+#: composer/e-msg-composer-attachment-bar.c:469
msgid "Remove selected items from the attachment list"
msgstr "Удалить выбранные элементы из списка вложений"
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:500
msgid "Add attachment..."
msgstr "Добавить вложение..."
-#: composer/e-msg-composer-attachment-bar.c:493
+#: composer/e-msg-composer-attachment-bar.c:501
msgid "Attach a file to the message"
msgstr "Присоединить файл к сообщению"
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1171
-#: ui/evolution-mail.xml.h:1
+#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1052
msgid "Attachment"
msgstr "Вложение"
@@ -4398,52 +4696,52 @@ msgstr "Тип MIME:"
msgid "Send as:"
msgstr "Отправить как:"
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:321
msgid "Click here for the address book"
msgstr "Щелкните здесь для адресной книги"
#.
#. * From:
#.
-#: composer/e-msg-composer-hdrs.c:345 mail/mail-format.c:679
+#: composer/e-msg-composer-hdrs.c:352 mail/mail-format.c:715
msgid "From:"
msgstr "От:"
#.
#. * Reply-To:
#.
-#: composer/e-msg-composer-hdrs.c:351 mail/mail-format.c:681
+#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:717
msgid "Reply-To:"
msgstr "Ответить:"
#.
#. * Subject:
#.
-#: composer/e-msg-composer-hdrs.c:362 mail/mail-format.c:601
+#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:639
msgid "Subject:"
msgstr "Тема:"
-#: composer/e-msg-composer-hdrs.c:376 mail/mail-format.c:683
+#: composer/e-msg-composer-hdrs.c:383 mail/mail-format.c:719
msgid "To:"
msgstr "Кому:"
-#: composer/e-msg-composer-hdrs.c:377
+#: composer/e-msg-composer-hdrs.c:384
msgid "Enter the recipients of the message"
msgstr "Введите получателей сообщения"
-#: composer/e-msg-composer-hdrs.c:380 mail/mail-format.c:685
+#: composer/e-msg-composer-hdrs.c:387 mail/mail-format.c:721
msgid "Cc:"
msgstr "Копия:"
-#: composer/e-msg-composer-hdrs.c:381
+#: composer/e-msg-composer-hdrs.c:388
msgid "Enter the addresses that will receive a carbon copy of the message"
msgstr "Введите адресатов, которые получат копию сообщения"
-#: composer/e-msg-composer-hdrs.c:384
+#: composer/e-msg-composer-hdrs.c:391
msgid "Bcc:"
msgstr "Скр.копия:"
-#: composer/e-msg-composer-hdrs.c:385
+#: composer/e-msg-composer-hdrs.c:392
msgid ""
"Enter the addresses that will receive a carbon copy of the message without "
"appearing in the recipient list of the message."
@@ -4451,7 +4749,7 @@ msgstr ""
"Введите адресатов, которые получат копию сообщения не попав в список "
"получателей."
-#: composer/e-msg-composer.c:518
+#: composer/e-msg-composer.c:528
#, c-format
msgid ""
"Could not open signature file %s:\n"
@@ -4460,26 +4758,32 @@ msgstr ""
"Невозможно открыть файл подписи %s:\n"
"%s"
-#: composer/e-msg-composer.c:706
+#: composer/e-msg-composer.c:716
msgid "Save as..."
msgstr "Сохранить как..."
-#: composer/e-msg-composer.c:717
+#: composer/e-msg-composer.c:727
#, c-format
msgid "Error saving file: %s"
msgstr "Ошибка сохранения файла: %s"
-#: composer/e-msg-composer.c:737
+#: composer/e-msg-composer.c:747
#, c-format
msgid "Error loading file: %s"
msgstr "Ошибка при загрузке файла: %s"
-#: composer/e-msg-composer.c:818 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:192
+#: composer/e-msg-composer.c:819
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
+msgstr ""
+
+#: composer/e-msg-composer.c:877 data/evolution.desktop.in.h:1
+#: shell/e-shell-view-menu.c:206
msgid "Evolution"
msgstr "Эволюция"
-#: composer/e-msg-composer.c:824
+#: composer/e-msg-composer.c:883
msgid ""
"This message has not been sent.\n"
"\n"
@@ -4489,27 +4793,27 @@ msgstr ""
"\n"
"Вы хотите сохранить изменения?"
-#: composer/e-msg-composer.c:849
+#: composer/e-msg-composer.c:908
msgid "Open file"
msgstr "Открыть файл"
-#: composer/e-msg-composer.c:975
+#: composer/e-msg-composer.c:1034
msgid "That file does not exist."
msgstr "Этот файл не существует."
-#: composer/e-msg-composer.c:985
+#: composer/e-msg-composer.c:1044
msgid "That is not a regular file."
msgstr "Это не обычный файл."
-#: composer/e-msg-composer.c:995
+#: composer/e-msg-composer.c:1054
msgid "That file exists but is not readable."
msgstr "Этот файл существует, но не читается."
-#: composer/e-msg-composer.c:1005
+#: composer/e-msg-composer.c:1064
msgid "That file appeared accesible but open(2) failed."
msgstr "Файл выглядит доступным, но произошел сбой open(2)."
-#: composer/e-msg-composer.c:1027
+#: composer/e-msg-composer.c:1086
msgid ""
"The file is very large (more than 100K).\n"
"Are you sure you wish to insert it?"
@@ -4517,19 +4821,19 @@ msgstr ""
"Файл очень большой (больше 100К).\n"
"Вы уверены, что хотите вставить его?"
-#: composer/e-msg-composer.c:1048
+#: composer/e-msg-composer.c:1107
msgid "An error occurred while reading the file."
msgstr "При чтении файла возникла ошибка."
-#: composer/e-msg-composer.c:1349 composer/e-msg-composer.c:1681
+#: composer/e-msg-composer.c:1408 composer/e-msg-composer.c:1740
msgid "Compose a message"
msgstr "Создать сообщение"
-#: composer/e-msg-composer.c:1765
+#: composer/e-msg-composer.c:1829
msgid "Could not create composer window."
msgstr "Невозможно создать окно редактора."
-#: composer/evolution-composer.c:352
+#: composer/evolution-composer.c:355
msgid ""
"Could not create composer window, because you have not yet\n"
"configured any identities in the mail component."
@@ -4537,7 +4841,7 @@ msgstr ""
"Не удалось создать окно редактора, потому что вы еще не настройли\n"
"ни одной личности в почтовом компоненте."
-#: composer/evolution-composer.c:367
+#: composer/evolution-composer.c:370
msgid "Cannot initialize Evolution's composer."
msgstr "Невозможно инициализировать редактор почты Evolution."
@@ -4554,53 +4858,77 @@ msgid "calendar information"
msgstr "информация календаря"
#. strptime format for a date.
-#: e-util/e-time-utils.c:68 e-util/e-time-utils.c:116
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
+#: e-util/e-time-utils.c:69 e-util/e-time-utils.c:117
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
+#: widgets/misc/e-dateedit.c:1282 widgets/misc/e-dateedit.c:1463
msgid "%m/%d/%Y"
msgstr "%m/%d/%Y"
#. strptime format for a time of day, in 12-hour format.
#. If it is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:197
+#: e-util/e-time-utils.c:87 e-util/e-time-utils.c:198
msgid "%I:%M:%S %p%n"
msgstr "%I:%M:%S %p%n"
#. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:89 e-util/e-time-utils.c:200
+#: e-util/e-time-utils.c:90 e-util/e-time-utils.c:201
msgid "%H:%M:%S%n"
msgstr "%H:%M:%S%n"
#. strptime format for time of day, without seconds, 12-hour format.
#. If it is is not appropriate in the locale set to an empty string.
-#: e-util/e-time-utils.c:93 e-util/e-time-utils.c:204
+#: e-util/e-time-utils.c:94 e-util/e-time-utils.c:205
msgid "%I:%M %p%n"
msgstr "%I:%M %p%n"
#. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:96 e-util/e-time-utils.c:207
+#: e-util/e-time-utils.c:97 e-util/e-time-utils.c:208
msgid "%H:%M%n"
msgstr "%H:%M%n"
#. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:267
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
+#: e-util/e-time-utils.c:269
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2503
msgid "%a %m/%d/%Y"
msgstr "%a %m/%d/%Y"
#. strftime format of a weekday, a date and a
#. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:272
+#: e-util/e-time-utils.c:274
msgid "%a %m/%d/%Y %H:%M"
msgstr "%a %m/%d/%Y %H:%M"
#. strftime format of a weekday, a date and a
#. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:281
+#: e-util/e-time-utils.c:283
msgid "%a %m/%d/%Y %I:%M %p"
msgstr "%a %m/%d/%Y %I:%M %p"
+#. strftime format of a time in 24-hour format,
+#. without seconds.
+#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1257
+#: widgets/misc/e-dateedit.c:1316 widgets/misc/e-dateedit.c:1495
+msgid "%H:%M"
+msgstr "%H:%M"
+
+#. strftime format of a time in 24-hour format.
+#: e-util/e-time-utils.c:315
+msgid "%H:%M:%S"
+msgstr "%H:%M:%S"
+
+#. strftime format of a time in 12-hour format,
+#. without seconds.
+#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1260
+#: widgets/misc/e-dateedit.c:1319 widgets/misc/e-dateedit.c:1498
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
+
+#. strftime format of a time in 12-hour format.
+#: e-util/e-time-utils.c:323
+msgid "%I:%M:%S %p"
+msgstr "%I:%M:%S %p"
+
#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
msgid "Evolution component for the executive summary."
msgstr "Компонент Evolution для Executive Summary."
@@ -4679,7 +5007,7 @@ msgstr "Переместить %s в следующую строку"
msgid "Configure %s"
msgstr "Настроить %s"
-#: executive-summary/component/e-summary.c:918
+#: executive-summary/component/e-summary.c:924
#, c-format
msgid ""
"Cannot open the HTML file:\n"
@@ -4688,7 +5016,7 @@ msgstr ""
"Невозможно открыть HTML файл:\n"
"%s"
-#: executive-summary/component/e-summary.c:932
+#: executive-summary/component/e-summary.c:938
#, c-format
msgid ""
"Error reading data:\n"
@@ -4697,7 +5025,7 @@ msgstr ""
"Ошибка при чтении данных:\n"
"%s"
-#: executive-summary/component/e-summary.c:950
+#: executive-summary/component/e-summary.c:956
msgid "File does not have a place for the services.\n"
msgstr ""
@@ -4709,7 +5037,7 @@ msgstr "Внешний вид"
msgid "Background:"
msgstr "Фон:"
-#: executive-summary/component/main.c:60
+#: executive-summary/component/main.c:62
msgid ""
"Executive summary component could not initialize Bonobo.\n"
"If there was a warning message about the RootPOA, it probably means\n"
@@ -4740,87 +5068,87 @@ msgstr "Проверить сервис bonobo"
msgid "Test service"
msgstr "Проверить сервис"
-#: executive-summary/test-service/rdf-summary.c:509
-#: executive-summary/test-service/rdf-summary.c:546
-#: executive-summary/test-service/rdf-summary.c:591
-#: widgets/misc/e-messagebox.c:155
+#: executive-summary/test-service/rdf-summary.c:512
+#: executive-summary/test-service/rdf-summary.c:549
+#: executive-summary/test-service/rdf-summary.c:594
+#: widgets/misc/e-messagebox.c:166
msgid "Error"
msgstr "Ошибка"
-#: executive-summary/test-service/rdf-summary.c:765
+#: executive-summary/test-service/rdf-summary.c:768
msgid "Update automatically"
msgstr "Обновлять автоматически"
-#: executive-summary/test-service/rdf-summary.c:775
+#: executive-summary/test-service/rdf-summary.c:778
msgid "Update now"
msgstr "Обновить сейчас"
-#: executive-summary/test-service/rdf-summary.c:785
+#: executive-summary/test-service/rdf-summary.c:788
msgid "Update every "
msgstr "Обновлять каждые "
-#: executive-summary/test-service/rdf-summary.c:793
-#: filter/filter-datespec.c:67
+#: executive-summary/test-service/rdf-summary.c:796
+#: filter/filter-datespec.c:83
msgid "minutes"
msgstr "минуты"
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:78
msgid "year"
msgstr "год"
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:78
msgid "years"
msgstr "годы"
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:79
msgid "month"
msgstr "месяц"
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:79
msgid "months"
msgstr "месяцы"
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:80
msgid "week"
msgstr "неделя"
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:80
msgid "weeks"
msgstr "недели"
-#: filter/filter-datespec.c:65
+#: filter/filter-datespec.c:81
msgid "days"
msgstr "дни"
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:82
msgid "hour"
msgstr "час"
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:82
msgid "hours"
msgstr "часы"
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:83
msgid "minute"
msgstr "минута"
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:84
msgid "second"
msgstr "секунда"
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:84
msgid "seconds"
msgstr "секунды"
-#: filter/filter-datespec.c:183
+#: filter/filter-datespec.c:199
msgid "Oops. You have forgotten to choose a date."
msgstr "Оп-ля! Вы забыли выбрать дату."
-#: filter/filter-datespec.c:185
+#: filter/filter-datespec.c:201
msgid "Oops. You have chosen an invalid date."
msgstr "Оп-ля! Вы выбрали неправильную дату."
-#: filter/filter-datespec.c:259
+#: filter/filter-datespec.c:275
msgid ""
"The message's date will be compared against\n"
"whatever the time is when the filter is run\n"
@@ -4830,7 +5158,7 @@ msgstr ""
"со временем запуска фильтра, либо \n"
"открытия вирт.папки."
-#: filter/filter-datespec.c:282
+#: filter/filter-datespec.c:298
msgid ""
"The message's date will be compared against\n"
"the time that you specify here."
@@ -4838,7 +5166,7 @@ msgstr ""
"Дата сообщения будет сравниваться с датой,\n"
"которую вы указали здесь."
-#: filter/filter-datespec.c:322
+#: filter/filter-datespec.c:338
msgid ""
"The message's date will be compared against\n"
"a time relative to when the filter is run;\n"
@@ -4849,49 +5177,45 @@ msgstr ""
"например \"неделю назад\"."
#. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:357
+#: filter/filter-datespec.c:373
msgid "the current time"
msgstr "текущее время"
-#: filter/filter-datespec.c:357
+#: filter/filter-datespec.c:373
msgid "a time you specify"
msgstr "указанное вами время"
-#: filter/filter-datespec.c:358
+#: filter/filter-datespec.c:374
msgid "a time relative to the current time"
msgstr "время относительно текущего"
#. The label
-#: filter/filter-datespec.c:416
+#: filter/filter-datespec.c:432
msgid "Compare against"
msgstr "Сравнивать с"
-#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
+#: filter/filter-datespec.c:549 filter/filter-datespec.c:709
msgid "now"
msgstr "сейчас"
-#: filter/filter-datespec.c:690
+#: filter/filter-datespec.c:706
msgid "<click here to select a date>"
msgstr "<щелкните здесь для выбора даты>"
-#: filter/filter-editor.c:126 filter/filter.glade.h:6
+#: filter/filter-editor.c:132 filter/filter.glade.h:6
msgid "Filter Rules"
msgstr "Правила фильтра"
#. and now for the action area
-#: filter/filter-filter.c:424
+#: filter/filter-filter.c:453
msgid "Then"
msgstr "Тогда"
-#: filter/filter-filter.c:437
+#: filter/filter-filter.c:467
msgid "Add action"
msgstr "Добавить действие"
-#: filter/filter-filter.c:443
-msgid "Remove action"
-msgstr "Удалить действие"
-
-#: filter/filter-folder.c:143
+#: filter/filter-folder.c:147
msgid ""
"Oops, you forgot to choose a folder.\n"
"Please go back and specify a valid folder to deliver mail to."
@@ -4899,19 +5223,20 @@ msgstr ""
"Оп-ля... Вы забыли выбрать папку.\n"
"Пожалуйста, вернитесь и укажите правильную папку для доставки почты."
-#: filter/filter-folder.c:218 filter/vfolder-rule.c:279
+#: filter/filter-folder.c:222 filter/vfolder-rule.c:285
+#: mail/mail-account-gui.c:682
msgid "Select Folder"
msgstr "Выбрать папку"
-#: filter/filter-folder.c:243
+#: filter/filter-folder.c:247
msgid "Enter folder URI"
msgstr "Ввести URI папки"
-#: filter/filter-folder.c:289
+#: filter/filter-folder.c:293
msgid "<click here to select a folder>"
msgstr "<щелкните здесь для выбора папки>"
-#: filter/filter-input.c:189
+#: filter/filter-input.c:194
#, c-format
msgid ""
"Error in regular expression '%s':\n"
@@ -4920,56 +5245,38 @@ msgstr ""
"Ошибка в регулярном выражении \"%s\":\n"
"%s"
-#: filter/filter-part.c:467
+#: filter/filter-part.c:475
msgid "Test"
msgstr "Проверка"
-#: filter/filter-rule.c:597
+#: filter/filter-rule.c:626
msgid "Rule name: "
msgstr "Название фильтра: "
-#: filter/filter-rule.c:601
+#: filter/filter-rule.c:630
msgid "Untitled"
msgstr "Неозаглавленное"
-#: filter/filter-rule.c:617
+#: filter/filter-rule.c:646
msgid "If"
msgstr "Если"
-#: filter/filter-rule.c:634
+#: filter/filter-rule.c:664
msgid "Execute actions"
msgstr "Выполнить действия"
-#: filter/filter-rule.c:638
+#: filter/filter-rule.c:668
msgid "if all criteria are met"
msgstr "если удовлетворяет всем критериям"
-#: filter/filter-rule.c:643
+#: filter/filter-rule.c:673
msgid "if any criteria are met"
msgstr "если удовлетворяет любому из критериев"
-#: filter/filter-rule.c:654
+#: filter/filter-rule.c:684
msgid "Add criterion"
msgstr "Добавить критерий"
-#: filter/filter-rule.c:660
-msgid "Remove criterion"
-msgstr "Удалить критерий"
-
-#: filter/filter-system-flag.c:67
-msgid "Replied to"
-msgstr "Ответить"
-
-#. { N_("Deleted"), "Deleted" },
-#. { N_("Draft"), "Draft" },
-#: filter/filter-system-flag.c:70
-msgid "Important"
-msgstr "Важное"
-
-#: filter/filter-system-flag.c:71
-msgid "Read"
-msgstr "Прочитанное"
-
#: filter/filter.glade.h:4
msgid "Edit Filters"
msgstr "Правка фильтров"
@@ -4986,7 +5293,7 @@ msgstr "Входящие"
msgid "Outgoing"
msgstr "Исходящие"
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:126
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
msgid "Virtual Folders"
msgstr "Виртуальные папки"
@@ -5010,277 +5317,308 @@ msgstr ""
msgid "with all local folders"
msgstr ""
-#: filter/libfilter-i18n.h:3
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
msgid "Assign Colour"
msgstr "Связать цвет"
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
msgid "Assign Score"
msgstr "Связать подсчет"
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
msgid "Attachments"
msgstr "Вложения"
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "содержит"
-
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:5
msgid "Copy to Folder"
msgstr "Скопировать в папку"
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:6
msgid "Date received"
msgstr "Дата получения"
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:7
msgid "Date sent"
msgstr "Дата отправки"
-#: filter/libfilter-i18n.h:12
-msgid "does not contain"
-msgstr "не содержит"
-
-#: filter/libfilter-i18n.h:13
-msgid "does not end with"
-msgstr "не заканчивается на"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not exist"
-msgstr "не существует."
-
-#: filter/libfilter-i18n.h:15
-msgid "does not sound like"
-msgstr "звучит не как"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not start with"
-msgstr "не начинается с"
+#: filter/libfilter-i18n.h:9
+msgid "Deleted"
+msgstr "Удаленное"
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:10
msgid "Do Not Exist"
msgstr "Не существует"
-#: filter/libfilter-i18n.h:18
-msgid "ends with"
-msgstr "заканчивается на"
+#: filter/libfilter-i18n.h:11
+msgid "Draft"
+msgstr "Черновик"
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:12
msgid "Exist"
msgstr "Существует"
-#: filter/libfilter-i18n.h:20
-msgid "exists"
-msgstr "cуществуют"
-
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:13
msgid "Expression"
msgstr "Выражение"
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:14
msgid "Forward to Address"
msgstr "Переслать по адресу"
-#: filter/libfilter-i18n.h:23
-msgid "is"
-msgstr "является"
-
-#: filter/libfilter-i18n.h:24
-msgid "is greater than"
-msgstr "больше чем"
-
-#: filter/libfilter-i18n.h:25
-msgid "is less than"
-msgstr "меньше чем"
+#: filter/libfilter-i18n.h:15
+msgid "Important"
+msgstr "Важное"
-#: filter/libfilter-i18n.h:26
-msgid "is not"
+#: filter/libfilter-i18n.h:16
+msgid "Is Not"
msgstr "не является"
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:17
+msgid "Is"
+msgstr "является"
+
+#: filter/libfilter-i18n.h:18
msgid "Mailing list"
msgstr "Список рассылки"
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:19
msgid "Message Body"
msgstr "Тело сообщения"
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:20
msgid "Message Header"
msgstr "Заголовок сообщения"
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:21
msgid "Message was received"
msgstr "Сообщение было получено"
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:22
msgid "Message was sent"
msgstr "Сообщение было отправлено"
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:23
msgid "Move to Folder"
msgstr "Переместить в папку"
-#: filter/libfilter-i18n.h:33
-msgid "on or after"
-msgstr "на или после"
-
-#: filter/libfilter-i18n.h:34
-msgid "on or before"
-msgstr "на или до"
+#: filter/libfilter-i18n.h:24
+msgid "Read"
+msgstr "Прочитанное"
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:25
msgid "Recipients"
msgstr "Получатели"
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:26
msgid "Regex Match"
msgstr "Совпадение рег.выражения"
-#: filter/libfilter-i18n.h:37 filter/score-rule.c:192 filter/score-rule.c:194
-#: mail/message-list.c:1171
+#: filter/libfilter-i18n.h:27
+msgid "Replied to"
+msgstr "Ответить"
+
+#: filter/libfilter-i18n.h:28 filter/score-rule.c:203 filter/score-rule.c:205
+#: mail/message-list.c:1052
msgid "Score"
msgstr "Подсчет"
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:29
+msgid "Sender"
+msgstr "Отправитель"
+
+#: filter/libfilter-i18n.h:30
msgid "Set Status"
msgstr "Установить состояние"
-#: filter/libfilter-i18n.h:40
-msgid "sounds like"
-msgstr "звучит как"
-
-#: filter/libfilter-i18n.h:41 mail/mail-config.glade.h:68
-msgid "Source"
-msgstr "Источник"
+#: filter/libfilter-i18n.h:31
+#, fuzzy
+msgid "Source Account"
+msgstr "Счет"
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:32
msgid "Specific header"
msgstr "Специфический заголовок"
-#: filter/libfilter-i18n.h:43
-msgid "starts with"
-msgstr "начинается с"
-
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:34
msgid "Stop Processing"
msgstr "Остановить обработку"
-#: filter/libfilter-i18n.h:46 mail/message-list.c:1172
+#: filter/libfilter-i18n.h:35 mail/message-list.c:1053
msgid "Subject"
msgstr "Тема"
+#: filter/libfilter-i18n.h:38
+msgid "contains"
+msgstr "содержит"
+
+#: filter/libfilter-i18n.h:39
+msgid "does not contain"
+msgstr "не содержит"
+
+#: filter/libfilter-i18n.h:40
+msgid "does not end with"
+msgstr "не заканчивается на"
+
+#: filter/libfilter-i18n.h:41
+msgid "does not exist"
+msgstr "не существует."
+
+#: filter/libfilter-i18n.h:42
+msgid "does not sound like"
+msgstr "звучит не как"
+
+#: filter/libfilter-i18n.h:43
+msgid "does not start with"
+msgstr "не начинается с"
+
+#: filter/libfilter-i18n.h:44
+msgid "ends with"
+msgstr "заканчивается на"
+
+#: filter/libfilter-i18n.h:45
+msgid "exists"
+msgstr "cуществуют"
+
+#: filter/libfilter-i18n.h:46
+msgid "is greater than"
+msgstr "больше чем"
+
#: filter/libfilter-i18n.h:47
+msgid "is less than"
+msgstr "меньше чем"
+
+#: filter/libfilter-i18n.h:48
+msgid "is not"
+msgstr "не является"
+
+#: filter/libfilter-i18n.h:49
+msgid "is"
+msgstr "является"
+
+#: filter/libfilter-i18n.h:50
+msgid "on or after"
+msgstr "на или после"
+
+#: filter/libfilter-i18n.h:51
+msgid "on or before"
+msgstr "на или до"
+
+#: filter/libfilter-i18n.h:52
+msgid "sounds like"
+msgstr "звучит как"
+
+#: filter/libfilter-i18n.h:53
+msgid "starts with"
+msgstr "начинается с"
+
+#: filter/libfilter-i18n.h:54
msgid "was after"
msgstr "было после"
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:55
msgid "was before"
msgstr "было до"
-#: filter/score-editor.c:126
-#, fuzzy
+#: filter/score-editor.c:130
msgid "Score Rules"
-msgstr "Правка правила подсчета"
+msgstr "Правила подсчета"
-#: mail/component-factory.c:306
+#: mail/component-factory.c:329
msgid "Cannot initialize Evolution's mail component."
msgstr "Невозможно инициализировать почтовый компонент \"Эволюции\"."
-#: mail/component-factory.c:379
+#: mail/component-factory.c:402
msgid "Cannot register storage with shell"
msgstr "Не удалось зарегистрировать хранилище с помощью оболочки"
-#: mail/folder-browser-factory.c:237
+#: mail/folder-browser-factory.c:211
#, c-format
msgid "Properties for \"%s\""
msgstr "Свойства для \"%s\""
-#: mail/folder-browser-factory.c:239 ui/evolution-event-editor.xml.h:39
+#: mail/folder-browser-factory.c:213 ui/evolution-event-editor.xml.h:39
#: ui/evolution-task-editor-dialog.xml.h:42
msgid "Properties"
msgstr "Свойства"
-#: mail/folder-browser.c:219
+#: mail/folder-browser.c:225
msgid "Store search as vFolder"
msgstr "Сохранить результаты поиска в виртуальной папке"
-#: mail/folder-browser.c:509
+#: mail/folder-browser.c:533
msgid "VFolder on Subject"
msgstr "Вирт.папка по теме"
-#: mail/folder-browser.c:512
+#: mail/folder-browser.c:536
msgid "VFolder on Sender"
msgstr "Вирт.папка по отправителю"
-#: mail/folder-browser.c:515
+#: mail/folder-browser.c:539
msgid "VFolder on Recipients"
msgstr "Вирт.папка по получателю"
-#: mail/folder-browser.c:518 mail/folder-browser.c:702
+#: mail/folder-browser.c:542 mail/folder-browser.c:733
msgid "VFolder on Mailing List"
msgstr "Вирт.папка по списку рассылки"
-#: mail/folder-browser.c:524
+#: mail/folder-browser.c:548
msgid "Filter on Subject"
msgstr "Фильтр по теме"
-#: mail/folder-browser.c:527
+#: mail/folder-browser.c:551
msgid "Filter on Sender"
msgstr "Фильтр по отправителю"
-#: mail/folder-browser.c:530
+#: mail/folder-browser.c:554
msgid "Filter on Recipients"
msgstr "Фильтр по получателю"
-#: mail/folder-browser.c:533 mail/folder-browser.c:701
+#: mail/folder-browser.c:557 mail/folder-browser.c:732
msgid "Filter on Mailing List"
msgstr "Фильтр по списку рассылки"
-#: mail/folder-browser.c:544
+#: mail/folder-browser.c:568
+msgid "Resend"
+msgstr "Перепослать"
+
+#: mail/folder-browser.c:570
msgid "Save As..."
msgstr "Сохранить как..."
-#: mail/folder-browser.c:546 mail/mail-view.c:148
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:19
-#: ui/evolution-mail.xml.h:31 ui/evolution-tasks.xml.h:4
-msgid "Print"
-msgstr "Печать"
-
-#: mail/folder-browser.c:551
+#: mail/folder-browser.c:577
msgid "Reply to Sender"
msgstr "Ответить отправителю"
-#: mail/folder-browser.c:553 mail/mail-view.c:141 ui/evolution-mail.xml.h:39
+#: mail/folder-browser.c:579 mail/mail-view.c:147 ui/evolution-mail.xml.h:61
msgid "Reply to All"
msgstr "Ответить всем"
-#: mail/folder-browser.c:555 mail/mail-view.c:144 ui/evolution-mail.xml.h:15
+#: mail/folder-browser.c:581 mail/mail-view.c:150 ui/evolution-mail.xml.h:25
msgid "Forward"
msgstr "Переслать"
-#: mail/folder-browser.c:557
+#: mail/folder-browser.c:583 ui/evolution-mail.xml.h:27
msgid "Forward inline"
msgstr "Переслать встроенное"
-#: mail/folder-browser.c:560
+#: mail/folder-browser.c:586
msgid "Mark as Read"
msgstr "Пометить как прочитанное"
-#: mail/folder-browser.c:562
+#: mail/folder-browser.c:588
msgid "Mark as Unread"
msgstr "Пометить как непрочтенное"
-#: mail/folder-browser.c:567
+#: mail/folder-browser.c:593
msgid "Move to Folder..."
msgstr "Переместить в папку..."
-#: mail/folder-browser.c:569
+#: mail/folder-browser.c:595
msgid "Copy to Folder..."
msgstr "Скопировать в папку..."
-#: mail/folder-browser.c:573
+#: mail/folder-browser.c:599 ui/evolution-mail.xml.h:82
msgid "Undelete"
msgstr "Восстановить"
@@ -5288,20 +5626,20 @@ msgstr "Восстановить"
#. GTK_SIGNAL_FUNC (addrbook_sender), NULL, 0 },
#. { "", NULL,
#. GTK_SIGNAL_FUNC (NULL), NULL, 0 },
-#: mail/folder-browser.c:583
+#: mail/folder-browser.c:609 ui/evolution-mail.xml.h:1
msgid "Apply Filters"
msgstr "Применить фильтры"
-#: mail/folder-browser.c:587
+#: mail/folder-browser.c:613
msgid "Create Rule From Message"
msgstr "Создать правило из сообщения"
-#: mail/folder-browser.c:704
+#: mail/folder-browser.c:735
#, c-format
msgid "Filter on Mailing List (%s)"
msgstr "Фильтр по списку рассылки (%s)"
-#: mail/folder-browser.c:705
+#: mail/folder-browser.c:736
#, c-format
msgid "VFolder on Mailing List (%s)"
msgstr "Вирт.папка по списку рассылки (%s)"
@@ -5372,65 +5710,65 @@ msgstr "mbox"
msgid "mh"
msgstr "mh"
-#: mail/mail-accounts.c:116
+#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
msgid " (default)"
msgstr "(Исх.значения)"
-#: mail/mail-accounts.c:224 mail/mail-accounts.c:228
+#: mail/mail-accounts.c:197
+msgid "Disable"
+msgstr "Отключить"
+
+#: mail/mail-accounts.c:199 mail/mail-config.glade.h:25
+msgid "Enable"
+msgstr "Включить"
+
+#: mail/mail-accounts.c:280 mail/mail-accounts.c:284
msgid "Are you sure you want to delete this account?"
msgstr "Вы уверены что хотите удалить этот счет?"
-#: mail/mail-accounts.c:334 mail/mail-accounts.c:338
+#: mail/mail-accounts.c:418 mail/mail-accounts.c:422
msgid "Are you sure you want to delete this news account?"
msgstr "Вы уверены что хотите удалить этот новый счет?"
#. give our dialog an OK button and title
-#: mail/mail-accounts.c:423
+#: mail/mail-accounts.c:536
msgid "Evolution Account Manager"
msgstr "Диспетчер счетов Evolution"
-#: mail/mail-account-editor.c:307
-msgid ""
-"One or more of your servers are not configured correctly.\n"
-"Do you wish to save anyway?"
-msgstr ""
-"Один или более ваших серверов не настроены корректно.\n"
-"Сохранить в любом случае?"
+#: mail/mail-account-editor.c:105
+msgid "You have not filled in all of the required information."
+msgstr "Вы не ввели всю необходимую информацию."
#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:706
+#: mail/mail-account-editor.c:173
msgid "Evolution Account Editor"
msgstr "Редактор счетов Evolution"
-#: mail/mail-account-editor.c:727
-msgid "Unspecified"
-msgstr "Неопределенное"
-
-#: mail/mail-autofilter.c:71
+#: mail/mail-autofilter.c:70
#, c-format
msgid "Mail to %s"
msgstr "Почта для %s"
-#: mail/mail-autofilter.c:214
+#: mail/mail-autofilter.c:213
#, c-format
msgid "Subject is %s"
msgstr "Тема -- %s"
-#: mail/mail-autofilter.c:230
+#: mail/mail-autofilter.c:229
#, c-format
msgid "Mail from %s"
msgstr "Почта от %s"
-#: mail/mail-autofilter.c:286
+#: mail/mail-autofilter.c:285
#, c-format
msgid "%s mailing list"
msgstr "%s список рассылки"
-#: mail/mail-autofilter.c:336 mail/mail-autofilter.c:358
+#: mail/mail-autofilter.c:335 mail/mail-autofilter.c:357
msgid "Add Filter Rule"
msgstr "Добавить правило фильтра"
-#: mail/mail-callbacks.c:85
+#: mail/mail-callbacks.c:93
msgid ""
"You have not configured the mail client.\n"
"You need to do this before you can send,\n"
@@ -5442,7 +5780,7 @@ msgstr ""
"отправлять, принимать или редактировать почту.\n"
"Вы хотите настроить это сейчас?"
-#: mail/mail-callbacks.c:138
+#: mail/mail-callbacks.c:146
msgid ""
"You need to configure an identity\n"
"before you can compose mail."
@@ -5450,7 +5788,7 @@ msgstr ""
"Вы должны настроить пользователя\n"
"до того как вы сможете послать почту."
-#: mail/mail-callbacks.c:150
+#: mail/mail-callbacks.c:158
msgid ""
"You need to configure a mail transport\n"
"before you can compose mail."
@@ -5458,11 +5796,11 @@ msgstr ""
"Вы должны настроить передачу почты\n"
"до того как вы сможете послать почту."
-#: mail/mail-callbacks.c:194
+#: mail/mail-callbacks.c:202
msgid "You have not set a mail transport method"
msgstr "Вы не установили метод транспортировки почты"
-#: mail/mail-callbacks.c:227
+#: mail/mail-callbacks.c:235
msgid ""
"This message has no subject.\n"
"Really send?"
@@ -5470,32 +5808,32 @@ msgstr ""
"Это сообщение не имеет темы.\n"
"Послать его?"
-#: mail/mail-callbacks.c:294
-msgid "You must configure an account before you can send this email."
-msgstr "Вы должны настроить счет до того как вы сможете послать почту."
-
-#: mail/mail-callbacks.c:316
+#: mail/mail-callbacks.c:308
msgid "You must specify recipients in order to send this message."
msgstr "Вы должны указать получателей, чтобы отправить это сообщение."
-#: mail/mail-callbacks.c:579
+#: mail/mail-callbacks.c:351
+msgid "You must configure an account before you can send this email."
+msgstr "Вы должны настроить счет до того как вы сможете послать почту."
+
+#: mail/mail-callbacks.c:591
#, c-format
msgid "On %s, %s wrote:\n"
msgstr "%s, %s написал:\n"
-#: mail/mail-callbacks.c:761
+#: mail/mail-callbacks.c:773
msgid "Forwarded message:\n"
msgstr "Пересланное сообщение:\n"
-#: mail/mail-callbacks.c:864
+#: mail/mail-callbacks.c:876
msgid "Move message(s) to"
msgstr "Переместить сообщение в"
-#: mail/mail-callbacks.c:866
+#: mail/mail-callbacks.c:878
msgid "Copy message(s) to"
msgstr "Скопировать сообщения в"
-#: mail/mail-callbacks.c:1007
+#: mail/mail-callbacks.c:1019
msgid ""
"You may only edit messages saved\n"
"in the Drafts folder."
@@ -5503,11 +5841,19 @@ msgstr ""
"Вы можете править только сообщения\n"
"сохраненные в папке \"Черновики\"."
-#: mail/mail-callbacks.c:1040 mail/mail-display.c:83
+#: mail/mail-callbacks.c:1056
+msgid ""
+"You may only resend messages\n"
+"in the Sent folder."
+msgstr ""
+"Вы можете только перепослать сообщения\n"
+"из папки \"Отправленные\"."
+
+#: mail/mail-callbacks.c:1089 mail/mail-display.c:90
msgid "Overwrite file?"
msgstr "Переписать файл?"
-#: mail/mail-callbacks.c:1044 mail/mail-display.c:87
+#: mail/mail-callbacks.c:1093 mail/mail-display.c:94
msgid ""
"A file by that name already exists.\n"
"Overwrite it?"
@@ -5515,15 +5861,15 @@ msgstr ""
"Файл с таким названием уже существует.\n"
"Переписать его?"
-#: mail/mail-callbacks.c:1088
+#: mail/mail-callbacks.c:1137
msgid "Save Message As..."
msgstr "Сохранить сообщение как..."
-#: mail/mail-callbacks.c:1090
+#: mail/mail-callbacks.c:1139
msgid "Save Messages As..."
msgstr "Сохранить сообщения как..."
-#: mail/mail-callbacks.c:1204
+#: mail/mail-callbacks.c:1253
#, c-format
msgid ""
"Error loading filter information:\n"
@@ -5532,45 +5878,53 @@ msgstr ""
"Ошибка при загрузке информации фильтра:\n"
"%s"
-#: mail/mail-callbacks.c:1253
+#: mail/mail-callbacks.c:1302 ui/evolution-mail.xml.h:52
msgid "Print Message"
msgstr "Печать сообщения"
-#: mail/mail-callbacks.c:1300
+#: mail/mail-callbacks.c:1349
msgid "Printing of message failed"
msgstr "Сбой печати сообщения"
+#: mail/mail-config.c:1043 mail/mail-config.c:1046
+msgid "Connecting to server..."
+msgstr "Подключение к серверу..."
+
#: mail/mail-config.glade.h:1
+msgid " Check for supported types "
+msgstr " Проверка поддерживаемых типов "
+
+#: mail/mail-config.glade.h:2
+msgid " color"
+msgstr " цвет"
+
+#: mail/mail-config.glade.h:3
msgid "Account"
msgstr "Счет"
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:4
msgid "Account Information"
msgstr "Информация о счете"
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:5
msgid "Account Management"
msgstr "Управление счетами"
-#: mail/mail-config.glade.h:5
-msgid "Advanced"
-msgstr "Расширенные"
-
#: mail/mail-config.glade.h:6
+msgid "Accounts"
+msgstr "Счета"
+
+#: mail/mail-config.glade.h:8
msgid "Authentication"
msgstr "Идентификация"
-#: mail/mail-config.glade.h:7
-msgid "Authentication Type:"
-msgstr "Тип идентификации"
-
#: mail/mail-config.glade.h:9
-msgid "Automatically check mail every"
-msgstr "Автоматически проверять почту каждые"
+msgid "Authentication Type: "
+msgstr "Тип идентификации: "
-#: mail/mail-config.glade.h:11
-msgid "Check settings"
-msgstr "Проверить установки"
+#: mail/mail-config.glade.h:10
+msgid "Automatically check for new mail every"
+msgstr "Автоматически проверять почту каждые"
#: mail/mail-config.glade.h:12
msgid ""
@@ -5588,199 +5942,164 @@ msgstr ""
"\n"
"Нажмите \"Завершить\", чтобы сохранить ваши настройки."
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:18
msgid "De_fault"
msgstr "Исх.значения"
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:20
msgid "Done"
msgstr "Сделано"
-#: mail/mail-config.glade.h:23
-msgid "Email Address:"
-msgstr "Эл.адрес:"
+#: mail/mail-config.glade.h:21
+msgid "Drafts"
+msgstr "Черновики"
+
+#: mail/mail-config.glade.h:22
+msgid "Drafts folder:"
+msgstr "Папка черновиков:"
#: mail/mail-config.glade.h:24
-msgid "Email address:"
+msgid "Email Address:"
msgstr "Эл.адрес:"
-#: mail/mail-config.glade.h:25
-msgid "Evolution Mail Configuration"
-msgstr "Настройка почты Evolution"
-
#: mail/mail-config.glade.h:26
msgid "Full Name:"
msgstr "Полное имя:"
+#: mail/mail-config.glade.h:27
+msgid "Highlight citations with "
+msgstr "Подсвечивать цитаты "
+
#: mail/mail-config.glade.h:29
-msgid "Hostname:"
-msgstr "Имя хоста:"
+msgid "IMAPv4 "
+msgstr "IMAPv4"
#: mail/mail-config.glade.h:30
-msgid "IMAP"
-msgstr "IMAP"
-
-#: mail/mail-config.glade.h:31
msgid "Identity"
msgstr "Именование"
-#: mail/mail-config.glade.h:32
-msgid "Include this account when receiving mail"
-msgstr "Включить этот счет при получении почты"
-
-#: mail/mail-config.glade.h:33
-msgid "Keep mail on server"
-msgstr "Сохранять почту на сервере"
-
-#: mail/mail-config.glade.h:34
-msgid "Kerberos"
-msgstr "Kerberos"
-
-#: mail/mail-config.glade.h:35
-msgid "Mail"
-msgstr "Почта"
-
-#: mail/mail-config.glade.h:36
-msgid "Mail Account"
-msgstr "Почтовый счет"
+#: mail/mail-config.glade.h:31
+msgid "Kerberos "
+msgstr "Kerberos "
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:32
msgid "Mail Configuration"
msgstr "Настройка почты"
-#: mail/mail-config.glade.h:38
-msgid "Mail Configuration Druid"
-msgstr "Помощник по настройке почты"
-
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:33
msgid "Make this my default account"
msgstr "Сделать моим счетом по умолчанию"
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:34
msgid "Mark messages as \"Read\" after:"
msgstr "Помечать сообщения как \"Прочитанные\" после:"
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:36
msgid "News"
msgstr "Новые"
-#: mail/mail-config.glade.h:44
-msgid "Optional"
-msgstr "Дополнительные"
+#: mail/mail-config.glade.h:38
+msgid "Optional Information"
+msgstr "Дополнительная информация"
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:39
msgid "Organization:"
msgstr "Организация:"
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:41
msgid "PGP binary path:"
msgstr "Путь к программе PGP:"
-#: mail/mail-config.glade.h:48
-msgid "Password:"
-msgstr "Пароль:"
-
-#: mail/mail-config.glade.h:50
-msgid "Plain Text"
-msgstr "Простой текст"
+#: mail/mail-config.glade.h:46
+msgid "Qmail maildir "
+msgstr "Почтовый каталог Qmail "
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:47
msgid "Receiving Email"
msgstr "Получение эл.почты"
-#: mail/mail-config.glade.h:52
-msgid "Remember my password"
-msgstr "Запомнить мой пароль"
+#: mail/mail-config.glade.h:48
+msgid "Receiving Mail"
+msgstr "Получение эл.почты"
+
+#: mail/mail-config.glade.h:49
+msgid "Receiving Options"
+msgstr "Получение параметров"
+
+#: mail/mail-config.glade.h:51
+msgid "Required Information"
+msgstr "Необходимая информация"
#: mail/mail-config.glade.h:53
-msgid "Reply address:"
-msgstr "Адрес для ответа:"
+msgid "Select PGP binary"
+msgstr "Выбрать программу PGP"
#: mail/mail-config.glade.h:54
-msgid "Required"
-msgstr "Требуется"
+msgid "Send mail in HTML format by default."
+msgstr "По умолчанию отправлять почту в формате HTML."
-#: mail/mail-config.glade.h:56
-msgid "Save password"
-msgstr "Сохранить пароль"
+#: mail/mail-config.glade.h:55
+msgid "Sending Email"
+msgstr "Отправка эл.почты"
-#: mail/mail-config.glade.h:57
-msgid "Select PGP binary"
-msgstr "Выбрать программу PGP"
+#: mail/mail-config.glade.h:56
+msgid "Sending Mail"
+msgstr "Отправка эл.почты"
#: mail/mail-config.glade.h:58
-msgid "Select signature file"
-msgstr "Выбрать файл подписи"
+msgid "Sent"
+msgstr "Отправленное"
#: mail/mail-config.glade.h:59
-msgid "Send mail in HTML format by default."
-msgstr "По умолчанию отправлять почту в формате HTML."
+msgid "Sent and Draft Messages"
+msgstr "Отправленные сообщения и черновики"
#: mail/mail-config.glade.h:60
-msgid "Sending Email"
-msgstr "Отправка эл.почты"
+msgid "Sent messages folder:"
+msgstr "Папка отправленных сообщений:"
-#: mail/mail-config.glade.h:62
+#: mail/mail-config.glade.h:61
msgid "Server Configuration"
msgstr "Настройка сервера"
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:62
msgid "Server Type: "
msgstr "Тип сервера:"
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:63
msgid "Server requires authentication"
msgstr "Сервер требует идентификации"
-#: mail/mail-config.glade.h:65
-msgid "Server type:"
-msgstr "Тип сервера:"
-
-#: mail/mail-config.glade.h:66
+#: mail/mail-config.glade.h:64
msgid "Signature file:"
msgstr "Файл подписи:"
-#: mail/mail-config.glade.h:67
-msgid "Signature:"
-msgstr "Подпись:"
-
-#: mail/mail-config.glade.h:69
+#: mail/mail-config.glade.h:65
msgid "Sources"
msgstr "Источники"
-#: mail/mail-config.glade.h:70
-msgid "This server requires a secure connection (SSL)"
-msgstr "Этот сервер требует защищенного подключения (SSL)"
-
-#: mail/mail-config.glade.h:71
-msgid "Transport"
-msgstr "Транспорт"
+#: mail/mail-config.glade.h:66
+msgid "Special Folders"
+msgstr "Специальные папки"
-#: mail/mail-config.glade.h:72
-msgid "Transport Authentication"
-msgstr "Идентификация транспорта"
+#: mail/mail-config.glade.h:67
+#, fuzzy
+msgid "Standard Unix mbox"
+msgstr "Стандартный файл Unix mailbox"
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:68
msgid "Type"
msgstr "Тип"
-#: mail/mail-config.glade.h:74
-msgid ""
-"Type the name by which you would like to refer to these servers. For "
-"example: \"Work\" or \"Home\"."
-msgstr ""
-"Введите название, по которому вы хотите указывать эти серверы. Например: "
-"\"Работа\" или \"Дом\"."
-
-#: mail/mail-config.glade.h:75
-msgid "User Information"
-msgstr "Информация о пользователе"
+#: mail/mail-config.glade.h:69
+msgid "Use secure connection (SSL)"
+msgstr "Использовать защищенное подключение (SSL)"
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:70
msgid "Username:"
msgstr "Имя пользователя:"
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:71
msgid ""
"Welcome to the Evolution Mail Configuration Druid.\n"
"\n"
@@ -5790,150 +6109,175 @@ msgstr ""
"\n"
"Нажмите \"След.\" для начала."
-#: mail/mail-config.glade.h:82 ui/evolution-event-editor.xml.h:58
+#: mail/mail-config.glade.h:76 ui/evolution-event-editor.xml.h:58
#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:28
+#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:29
msgid "_Edit"
msgstr "Правка"
-#: mail/mail-config.glade.h:83
-msgid "minutes."
-msgstr "минут."
+#: mail/mail-config-druid.c:99
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
-#: mail/mail-config-druid.c:421
-#, c-format
+#: mail/mail-config-druid.c:101
msgid ""
-"Failed to verify the incoming mail configuration.\n"
-"You may experience problems retrieving your mail from %s"
+"Please enter information about your incoming mail server below. If you don't "
+"know what kind of server you use, contact your system administrator or "
+"Internet Service Provider."
msgstr ""
-"Сбой при проверке настроек входящей почты.\n"
-"У вас могут возникнуть проблемы с получением вашей почты с %s"
-#: mail/mail-config-druid.c:515
-msgid "Namespace:"
-msgstr "Пространство имен:"
+#: mail/mail-config-druid.c:105
+msgid ""
+"Please enter information about your outgoing mail protocol below. If you "
+"don't know which protocol you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
-#: mail/mail-config-druid.c:708
-#, c-format
+#: mail/mail-config-druid.c:107
msgid ""
-"Failed to verify the outgoing mail configuration.\n"
-"You may experience problems sending your mail using %s"
+"You are almost done with the mail configuration process. The identity, "
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
msgstr ""
-"Сбой при проверке настроек исходящей почты.\n"
-"У вас могут возникнуть проблемы с отправкой вашей почты через %s"
#. set window title
-#: mail/mail-config-druid.c:1215
+#: mail/mail-config-druid.c:445
msgid "Evolution Account Wizard"
msgstr "Помощник по счетам Evolution"
-#: mail/mail-display.c:189
+#: mail/mail-display.c:194
msgid "Save Attachment"
msgstr "Сохранить вложение"
-#: mail/mail-display.c:229
+#: mail/mail-display.c:234
#, c-format
msgid "Could not create temporary directory: %s"
msgstr "Не удалось создать временный каталог: %s"
-#: mail/mail-display.c:290
+#: mail/mail-display.c:295
msgid "Save to Disk..."
msgstr "Сохранить на диске..."
-#: mail/mail-display.c:292
+#: mail/mail-display.c:297
#, c-format
msgid "Open in %s..."
msgstr "Открыть в %s..."
-#: mail/mail-display.c:294
+#: mail/mail-display.c:299
msgid "View Inline"
msgstr "Встроенный просмотр"
-#: mail/mail-display.c:323
+#: mail/mail-display.c:334
msgid "External Viewer"
msgstr "Внешняя программа просмотра"
-#: mail/mail-display.c:346
+#: mail/mail-display.c:357
#, c-format
msgid "View Inline (via %s)"
msgstr "Встроенный просмотр (через %s)"
-#: mail/mail-display.c:350
+#: mail/mail-display.c:361
msgid "Hide"
msgstr "Скрыть"
-#: mail/mail-format.c:506
+#: mail/mail-display.c:1102
+msgid "Open link in browser"
+msgstr "Открыть ссылку в браузере"
+
+#: mail/mail-display.c:1104
+msgid "Save as (FIXME)"
+msgstr "Сохранить как (FIXME)"
+
+#: mail/mail-display.c:1106
+msgid "Copy location (FIXME)"
+msgstr "Скопировать положение (FIXME)"
+
+#: mail/mail-format.c:518
#, c-format
msgid "%s attachment"
msgstr "%s вложение"
-#: mail/mail-format.c:704
+#: mail/mail-format.c:560
+#, fuzzy
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Не удалось открыть папку: список сообщений был неполон."
+
+#: mail/mail-format.c:742
msgid "Loading message content"
msgstr "Загрузка содержимого сообщения"
-#: mail/mail-format.c:993
+#: mail/mail-format.c:1036
+msgid "No GPG/PGP program configured."
+msgstr "Программа GPG/PGP не настроена."
+
+#: mail/mail-format.c:1051
msgid "Encrypted message not displayed"
msgstr "Зашифрованное сообщение не отображается"
-#: mail/mail-format.c:999
+#: mail/mail-format.c:1057
msgid "Encrypted message"
msgstr "Зашифрованное сообщение"
-#: mail/mail-format.c:1000
+#: mail/mail-format.c:1058
msgid "Click icon to decrypt."
msgstr "Щелкните на пиктограмме для дешифрации."
-#: mail/mail-format.c:1069 mail/mail-format.c:1456
+#: mail/mail-format.c:1148 mail/mail-format.c:1536
msgid "This message is digitally signed and has been found to be authentic."
msgstr ""
"Это сообщение с цифровой подписью, которая прошла проверку идентичности."
-#: mail/mail-format.c:1077 mail/mail-format.c:1464
+#: mail/mail-format.c:1156 mail/mail-format.c:1544
msgid "This message is digitally signed but can not be proven to be authentic."
msgstr ""
"Это сообщение с цифровой подписью, которая не может быть проверена на "
"идентичность."
-#: mail/mail-format.c:1677
+#: mail/mail-format.c:1757
#, c-format
msgid "Pointer to FTP site (%s)"
msgstr "Указатель на FTP сайт (%s)"
-#: mail/mail-format.c:1689
+#: mail/mail-format.c:1769
#, c-format
msgid "Pointer to local file (%s) valid at site \"%s\""
msgstr ""
-#: mail/mail-format.c:1693
+#: mail/mail-format.c:1773
#, c-format
msgid "Pointer to local file (%s)"
msgstr "Указатель на локальный файл (%s)"
-#: mail/mail-format.c:1727
+#: mail/mail-format.c:1807
#, c-format
msgid "Pointer to unknown external data (\"%s\" type)"
msgstr "Указатель на неизвестные внешние данные (типа \"%s\")"
-#: mail/mail-format.c:1732
+#: mail/mail-format.c:1812
msgid "Malformed external-body part."
msgstr ""
-#: mail/mail-local.c:335
+#: mail/mail-local.c:337
#, c-format
msgid "No such folder %s"
msgstr "Нет такой папки %s"
-#: mail/mail-local.c:508
+#: mail/mail-local.c:509
#, c-format
msgid "Opening '%s'"
msgstr "Открытие \"%s\""
-#: mail/mail-local.c:786
+#: mail/mail-local.c:787
#, c-format
msgid "Changing folder \"%s\" to \"%s\" format"
msgstr "Изменение папки \"%s\" в формат \"%s\""
-#: mail/mail-local.c:790
+#: mail/mail-local.c:791
#, c-format
msgid "Change folder \"%s\" to \"%s\" format"
msgstr "Изменить папку \"%s\" в формат \"%s\""
@@ -5959,20 +6303,20 @@ msgstr "Создание новой папки"
msgid "Copying messages"
msgstr "Копирование сообщений"
-#: mail/mail-local.c:928
+#: mail/mail-local.c:924
#, c-format
msgid ""
"Cannot save folder metainfo; you'll probably find you can't\n"
"open this folder anymore: %s"
msgstr ""
-#: mail/mail-local.c:967
+#: mail/mail-local.c:963
msgid ""
"If you can no longer open this mailbox, then\n"
"you may need to repair it manually."
msgstr ""
-#: mail/mail-mt.c:177
+#: mail/mail-mt.c:190
#, c-format
msgid ""
"Error while '%s':\n"
@@ -5981,7 +6325,7 @@ msgstr ""
"Ошибка при \"%s\":\n"
"%s"
-#: mail/mail-mt.c:179
+#: mail/mail-mt.c:192
#, c-format
msgid ""
"Error while performing operation:\n"
@@ -5990,96 +6334,105 @@ msgstr ""
"Ошибка при выполнении операции:\n"
"%s"
-#: mail/mail-mt.c:502 mail/mail-mt.c:531 mail/mail-mt.c:878
+#: mail/mail-mt.c:515 mail/mail-mt.c:544 mail/mail-mt.c:891
msgid "Working"
msgstr "Обработка"
-#: mail/mail-mt.c:666 mail/session.c:91
+#: mail/mail-mt.c:679 mail/session.c:98
msgid "Do you accept?"
msgstr "Вы согласны?"
-#: mail/mail-mt.c:860
+#: mail/mail-mt.c:873
msgid "Evolution progress"
msgstr "Продвижение Evolution"
-#: mail/mail-ops.c:516
+#: mail/mail-ops.c:587
#, c-format
msgid "Sending \"%s\""
msgstr "Отправка \"%s\""
-#: mail/mail-ops.c:518
+#: mail/mail-ops.c:589
msgid "Sending message"
msgstr "Отправка сообщения"
-#: mail/mail-ops.c:752
+#: mail/mail-ops.c:704
+#, c-format
+msgid "Sending message %d of %d"
+msgstr "Отправка сообщения %d из %d"
+
+#: mail/mail-ops.c:723
+#, c-format
+msgid "Failed on message %d of %d"
+msgstr "Сбой на сообщении %d из %d"
+
+#: mail/mail-ops.c:725 mail/mail-send-recv.c:475
+msgid "Complete."
+msgstr "Выполнено."
+
+#: mail/mail-ops.c:811
msgid "Saving message to folder"
msgstr "Сохранение сообщения в папке"
-#: mail/mail-ops.c:825
+#: mail/mail-ops.c:884
#, c-format
msgid "Moving messages to %s"
msgstr "Перемещение сообщений в %s"
-#: mail/mail-ops.c:825
+#: mail/mail-ops.c:884
#, c-format
msgid "Copying messages to %s"
msgstr "Копирование сообщений в %s"
-#: mail/mail-ops.c:842
+#: mail/mail-ops.c:900
msgid "Moving"
msgstr "Перемещение"
-#: mail/mail-ops.c:845
+#: mail/mail-ops.c:903
msgid "Copying"
msgstr "Копирование"
-#: mail/mail-ops.c:856
-#, c-format
-msgid "%s message %d of %d (uid \"%s\")"
-msgstr "%s сообщения %d из %d (uid \"%s\")"
-
-#: mail/mail-ops.c:927
+#: mail/mail-ops.c:978
#, c-format
msgid "Scanning folders in \"%s\""
msgstr "Считывание папок в \"%s\""
-#: mail/mail-ops.c:1085
+#: mail/mail-ops.c:1139
msgid "Forwarded messages"
msgstr "Пересланные сообщения"
-#: mail/mail-ops.c:1126 mail/mail-ops.c:1264
+#: mail/mail-ops.c:1180 mail/mail-ops.c:1318
#, c-format
msgid "Opening folder %s"
msgstr "Открытие папки \"%s\""
-#: mail/mail-ops.c:1193
+#: mail/mail-ops.c:1247
#, c-format
msgid "Opening store %s"
msgstr "Открытие хранилища %s"
-#: mail/mail-ops.c:1380
+#: mail/mail-ops.c:1434
msgid "Expunging folder"
msgstr "Вычеркивание папки"
-#: mail/mail-ops.c:1429
+#: mail/mail-ops.c:1483
#, c-format
msgid "Retrieving message %s"
msgstr "Получение сообщения %s"
-#: mail/mail-ops.c:1496
+#: mail/mail-ops.c:1550
msgid "Retrieving messages"
msgstr "Получение сообщений"
-#: mail/mail-ops.c:1506
+#: mail/mail-ops.c:1560
#, c-format
msgid "Retrieving message number %d of %d (uid \"%s\")"
msgstr "Перемещение сообщения номер %d из %d (uid \"%s\")"
-#: mail/mail-ops.c:1580
+#: mail/mail-ops.c:1634
msgid "Saving messages"
msgstr "Сохранение сообщений"
-#: mail/mail-ops.c:1659
+#: mail/mail-ops.c:1713
#, c-format
msgid ""
"Unable to create output file: %s\n"
@@ -6088,12 +6441,12 @@ msgstr ""
"Не удалось создать файл вывода: %s\n"
" %s"
-#: mail/mail-ops.c:1672
+#: mail/mail-ops.c:1726
#, c-format
msgid "Saving message %d of %d (uid \"%s\")"
msgstr "Сохранение сообщения %d из %d (uid \"%s\")"
-#: mail/mail-ops.c:1686
+#: mail/mail-ops.c:1740
#, c-format
msgid ""
"Error saving messages to: %s:\n"
@@ -6102,11 +6455,11 @@ msgstr ""
"Ошибка сохранения сообщений в: %s:\n"
" %s"
-#: mail/mail-ops.c:1760
+#: mail/mail-ops.c:1814
msgid "Saving attachment"
msgstr "Сохранение вложения"
-#: mail/mail-ops.c:1775
+#: mail/mail-ops.c:1829
#, c-format
msgid ""
"Cannot create output file: %s:\n"
@@ -6115,75 +6468,71 @@ msgstr ""
"Не удалось создать файл вывода: %s\n"
" %s"
-#: mail/mail-ops.c:1803
+#: mail/mail-ops.c:1857
#, c-format
msgid "Could not write data: %s"
msgstr "Невозможно записать данные: %s"
-#: mail/mail-search-dialogue.c:107
+#: mail/mail-search-dialogue.c:113
msgid "_Search"
msgstr "Поиск"
-#: mail/mail-send-recv.c:136
+#: mail/mail-send-recv.c:138
msgid "Cancelling ..."
msgstr "Отмена..."
-#: mail/mail-send-recv.c:231
+#: mail/mail-send-recv.c:233
msgid "Send & Receive mail"
msgstr "Получение и отправка почты"
-#: mail/mail-send-recv.c:234
+#: mail/mail-send-recv.c:236
msgid "Receiving"
msgstr "Получение"
-#: mail/mail-send-recv.c:283
+#: mail/mail-send-recv.c:285
msgid "Updating ..."
msgstr "Обновление..."
-#: mail/mail-send-recv.c:285 mail/mail-send-recv.c:331
+#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
msgid "Waiting ..."
msgstr "Ожидание..."
-#: mail/mail-send-recv.c:304
+#: mail/mail-send-recv.c:306
msgid "Sending"
msgstr "Отправка"
-#: mail/mail-send-recv.c:469
+#: mail/mail-send-recv.c:471
msgid "Cancelled."
msgstr "Отменено."
-#: mail/mail-send-recv.c:473
-msgid "Complete."
-msgstr "Выполнено."
-
-#: mail/mail-summary.c:111
+#: mail/mail-summary.c:109
msgid "Incomplete message written on pipe!"
msgstr "Неполное сообщение записано в канал!"
-#: mail/mail-tools.c:138
+#: mail/mail-tools.c:141
#, c-format
msgid "Couldn't create temporary mbox `%s': %s"
msgstr "Не удалось создать временный mbox \"%s\": %s"
-#: mail/mail-tools.c:185
+#: mail/mail-tools.c:188
#, c-format
msgid "[%s] (forwarded message)"
msgstr "[%s] (пересланное сообщение)"
-#: mail/mail-tools.c:195
+#: mail/mail-tools.c:198
msgid "Fwd: (no subject)"
msgstr "Пересл.: (нет темы)"
-#: mail/mail-tools.c:212
+#: mail/mail-tools.c:215
#, c-format
msgid "Forwarded message - %s"
msgstr "Пересланное сообщение - %s"
-#: mail/mail-tools.c:214
+#: mail/mail-tools.c:217
msgid "Forwarded message (no subject)"
msgstr "Пересланное сообщение (без темы)"
-#: mail/mail-tools.c:411
+#: mail/mail-tools.c:414
#, c-format
msgid ""
"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
@@ -6192,185 +6541,156 @@ msgstr ""
"-----Пересылаемое сообщение-----<br><b>От:</b> %s<br><b>Кому:</b> \"\n"
"\"%s<br><b>Тема:</b> %s<br>"
-#: mail/mail-vfolder.c:248
+#: mail/mail-vfolder.c:249
msgid "VFolders"
msgstr "Вирт.папки"
-#: mail/mail-vfolder.c:426
+#: mail/mail-vfolder.c:427
msgid "New VFolder"
msgstr "Новая вирт.папка"
#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:38
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:60
msgid "Reply"
msgstr "Ответить"
-#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:66
msgid "Reply to the sender of this message"
msgstr "Ответить отправителю этого сообщения"
-#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
+#: mail/mail-view.c:147 ui/evolution-mail.xml.h:64
msgid "Reply to all recipients of this message"
msgstr "Ответить всем получателям этого сообщения"
-#: mail/mail-view.c:144 ui/evolution-mail.xml.h:17
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:29
msgid "Forward this message"
msgstr "Переслать это сообщение"
-#: mail/mail-view.c:148 ui/evolution-mail.xml.h:34
+#: mail/mail-view.c:154 ui/evolution-mail.xml.h:57
msgid "Print the selected message"
msgstr "Распечатать выделенное сообщение"
-#: mail/mail-view.c:150 ui/evolution-mail.xml.h:8
+#: mail/mail-view.c:156 ui/evolution-mail.xml.h:13
msgid "Delete this message"
msgstr "Удалить это сообщение"
-#: mail/message-list.c:618
+#: mail/message-list.c:648
msgid "Unseen"
msgstr "Непрочитанное"
-#: mail/message-list.c:621
+#: mail/message-list.c:649
msgid "Seen"
msgstr "Прочитанное"
-#: mail/message-list.c:624
+#: mail/message-list.c:650
msgid "Answered"
msgstr "Отвечено"
-#: mail/message-list.c:627
+#: mail/message-list.c:651
msgid "Multiple Unseen Messages"
msgstr "Множество непросмотренных сообщений"
-#: mail/message-list.c:630
+#: mail/message-list.c:652
msgid "Multiple Messages"
msgstr "Множество сообщений"
-#: mail/message-list.c:952
-#, c-format
-msgid "[ %s ]"
-msgstr "[ %s ]"
+#: mail/message-list.c:656
+msgid "Lowest"
+msgstr "Самый низкий"
-#. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:964 mail/message-list.c:980
-#, c-format
-msgid "%s, et al."
-msgstr "%s, и т.д."
+#: mail/message-list.c:657
+msgid "Lower"
+msgstr "Низкий"
+
+#: mail/message-list.c:661
+msgid "Higher"
+msgstr "Высокий"
-#: mail/message-list.c:967 mail/message-list.c:983
-msgid "<unknown>"
-msgstr "<неизвестное>"
+#: mail/message-list.c:662
+msgid "Highest"
+msgstr "Самый высокий"
-#: mail/message-list.c:1035
+#: mail/message-list.c:912
msgid "?"
msgstr "?"
-#: mail/message-list.c:1042
+#: mail/message-list.c:919
msgid "Today %l:%M %p"
msgstr "Сегодня %I:%M %p"
-#: mail/message-list.c:1051
+#: mail/message-list.c:928
msgid "Yesterday %l:%M %p"
msgstr "Вчера %l:%M %p"
-#: mail/message-list.c:1063
+#: mail/message-list.c:940
msgid "%a %l:%M %p"
msgstr "%a %l:%M %p"
-#: mail/message-list.c:1071
+#: mail/message-list.c:948
msgid "%b %d %l:%M %p"
msgstr "%b %d %l:%M %p"
-#: mail/message-list.c:1073
+#: mail/message-list.c:950
msgid "%b %d %Y"
msgstr "%b %d %Y"
-#: mail/message-list.c:1171
+#: mail/message-list.c:1052
msgid "Flagged"
msgstr "Отмеченное"
-#: mail/message-list.c:1172
+#: mail/message-list.c:1053
msgid "From"
msgstr "От"
-#: mail/message-list.c:1172
+#: mail/message-list.c:1053
msgid "Date"
msgstr "Дата"
-#: mail/message-list.c:1172
+#: mail/message-list.c:1053
msgid "Received"
msgstr "Получения"
-#: mail/message-list.c:1173
+#: mail/message-list.c:1054
msgid "To"
msgstr "Кому"
-#: mail/message-list.c:1173
+#: mail/message-list.c:1054
msgid "Size"
msgstr "Размер"
-#: mail/openpgp-utils.c:89
-#, c-format
-msgid "Please enter your %s passphrase for %s"
-msgstr "Пожалуйста введите вашу %s парольную фразу для %s"
-
-#: mail/openpgp-utils.c:92
-#, c-format
-msgid "Please enter your %s passphrase"
-msgstr "Пожалуйста введите вашу %s парольную фразу."
-
-#: mail/openpgp-utils.c:452 mail/openpgp-utils.c:558 mail/openpgp-utils.c:760
-#: mail/openpgp-utils.c:913 mail/openpgp-utils.c:1071
-msgid "No GPG/PGP program available."
-msgstr "Недоступна программа GPG/PGP."
-
-#: mail/openpgp-utils.c:459 mail/openpgp-utils.c:567 mail/openpgp-utils.c:767
-#: mail/openpgp-utils.c:920
-msgid "No password provided."
-msgstr "Пароль не предоставлен."
-
-#: mail/openpgp-utils.c:467 mail/openpgp-utils.c:574 mail/openpgp-utils.c:773
-#: mail/openpgp-utils.c:928 mail/openpgp-utils.c:1077
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
-msgstr "Не удалось создать канал к GPG/PGP: %s"
-
-#: mail/openpgp-utils.c:588
-msgid "No recipients specified"
-msgstr "Не указаны получатели"
-
-#: mail/openpgp-utils.c:1088
-#, c-format
-msgid "Couldn't create temp file: %s"
-msgstr "Не удалось создать временный файл: %s"
-
-#: mail/subscribe-dialog.c:64 shell/e-storage-set-view.c:44
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:46
msgid "Folder"
msgstr "Папка"
-#: mail/subscribe-dialog.c:65
+#: mail/subscribe-dialog.c:77
msgid "Store"
msgstr "Хранить"
-#: mail/subscribe-dialog.c:147
+#: mail/subscribe-dialog.c:138
msgid "Display folders starting with:"
msgstr "Показать папки начинающиеся с:"
-#: mail/subscribe-dialog.c:177
+#: mail/subscribe-dialog.c:168
#, c-format
msgid "Getting store for \"%s\""
msgstr ""
-#: mail/subscribe-dialog.c:280
+#: mail/subscribe-dialog.c:271
#, c-format
msgid "Subscribing to folder \"%s\""
msgstr "Подписывание на папку \"%s\""
-#: mail/subscribe-dialog.c:282
+#: mail/subscribe-dialog.c:273
#, c-format
msgid "Unsubscribing to folder \"%s\""
msgstr "Отписывание от папки \"%s\""
+#. Construct the app
+#: mail/subscribe-dialog.c:873
+msgid "Manage Subscriptions"
+msgstr "Управление подписками"
+
#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
msgid "Folder name:"
msgstr "Название папки:"
@@ -6383,9 +6703,23 @@ msgstr "Тип папки:"
msgid "Specify where to create the folder:"
msgstr "Указать где создать папку:"
+#: shell/importer/importer.c:87
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+"Выберите файл, который вы хотите импортировать в Evolution и выберите тип "
+"файла из списка.\n"
+"\n"
+"Вы можете выбрать \"Автоматический\" если вы не знаете и Evolution "
+"попытается опознать его."
+
#. Importer isn't ready yet.
#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:157
+#: shell/importer/importer.c:182
#, c-format
msgid ""
"Importing %s\n"
@@ -6396,7 +6730,7 @@ msgstr ""
"Импортер не готов.\n"
"5 секунд ожидания перед повтором."
-#: shell/importer/importer.c:175 shell/importer/importer.c:202
+#: shell/importer/importer.c:202 shell/importer/importer.c:233
#, c-format
msgid ""
"Importing %s\n"
@@ -6405,7 +6739,7 @@ msgstr ""
"Импортирование %s\n"
"Импортирование элемента %d."
-#: shell/importer/importer.c:309
+#: shell/importer/importer.c:341
#, c-format
msgid ""
"There is no importer that is able to handle\n"
@@ -6414,11 +6748,11 @@ msgstr ""
"Нет импортера, который способен обработать\n"
"%s"
-#: shell/importer/importer.c:319
+#: shell/importer/importer.c:351
msgid "Importing"
msgstr "Импортирование"
-#: shell/importer/importer.c:327
+#: shell/importer/importer.c:359
#, c-format
msgid ""
"Importing %s.\n"
@@ -6427,12 +6761,17 @@ msgstr ""
"Импортирование %s.\n"
"Начато %s"
-#: shell/importer/importer.c:342
+#: shell/importer/importer.c:372
+#, c-format
+msgid "Error starting %s"
+msgstr "Ошибка при загрузке %s"
+
+#: shell/importer/importer.c:387
#, c-format
msgid "Error loading %s"
msgstr "Ошибка при загрузке %s"
-#: shell/importer/importer.c:357
+#: shell/importer/importer.c:402
#, c-format
msgid ""
"Importing %s\n"
@@ -6441,40 +6780,26 @@ msgstr ""
"Импортирование %s\n"
"Импортирование элемента 1."
-#: shell/importer/importer.c:428
+#: shell/importer/importer.c:473
msgid "Automatic"
msgstr "Автоматическое"
-#: shell/importer/importer.c:478
+#: shell/importer/importer.c:523
msgid "Filename:"
msgstr "Имя файла:"
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:483
+#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
msgid "Select a file"
msgstr "Выбрать файл"
-#: shell/importer/importer.c:493
+#: shell/importer/importer.c:538
msgid "File type:"
msgstr "Тип файла:"
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:574
+#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
msgid "Import"
msgstr "Импортировать"
-#: shell/importer/importer.c:609
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
-"Выберите файл, который вы хотите импортировать в Evolution и выберите тип "
-"файла из списка.\n"
-"\n"
-"Вы можете выбрать \"Автоматический\" если вы не знаете и Evolution "
-"попытается опознать его."
-
#: shell/importer/import.glade.h:1
msgid "Click \"Import\" to begin importing the file into Evolution. "
msgstr ""
@@ -6498,11 +6823,11 @@ msgstr ""
"Этот помощник проведет вас через процесс импорта\n"
"внешних файлов в Evolution."
-#: shell/e-setup.c:112 shell/e-setup.c:185
+#: shell/e-setup.c:118 shell/e-setup.c:191
msgid "Evolution installation"
msgstr "Установка Evolution"
-#: shell/e-setup.c:116
+#: shell/e-setup.c:122
msgid ""
"This new version of Evolution needs to install additional files\n"
"into your personal Evolution directory"
@@ -6510,30 +6835,30 @@ msgstr ""
"Этой новой версии Evolution требуется установить дополнительные файлы\n"
"в ваш личный каталог Evolution"
-#: shell/e-setup.c:117
+#: shell/e-setup.c:123
msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
msgstr ""
"Пожалуйста нажмите \"Ок\", чтобы установить файлы или \"Отмена\" для выхода."
-#: shell/e-setup.c:157
+#: shell/e-setup.c:163
msgid "Could not update files correctly"
msgstr "Невозможно обновить файлы корректно"
-#: shell/e-setup.c:160 shell/e-setup.c:228
+#: shell/e-setup.c:166 shell/e-setup.c:234
msgid "Evolution files successfully installed."
msgstr "Файлы Evolution успешно установлены."
-#: shell/e-setup.c:189
+#: shell/e-setup.c:195
msgid "This seems to be the first time you are running Evolution."
msgstr "Похоже вы запустили Evolution в первый раз."
-#: shell/e-setup.c:190
+#: shell/e-setup.c:196
msgid "Please click \"OK\" to install the Evolution user files under"
msgstr ""
"Пожалуйста нажмите \"Ок\", чтобы установить пользовательские файлы Evolution "
"в"
-#: shell/e-setup.c:209
+#: shell/e-setup.c:215
#, c-format
msgid ""
"Cannot create the directory\n"
@@ -6544,7 +6869,7 @@ msgstr ""
"%s\n"
"Ошибка: %s"
-#: shell/e-setup.c:224
+#: shell/e-setup.c:230
#, c-format
msgid ""
"Cannot copy files into\n"
@@ -6553,7 +6878,7 @@ msgstr ""
"Невозможно скопировать файлы в\n"
"\"%s\"."
-#: shell/e-setup.c:249
+#: shell/e-setup.c:255
#, c-format
msgid ""
"The file `%s' is not a directory.\n"
@@ -6564,7 +6889,7 @@ msgstr ""
"Пожалуйста, переместите его, чтобы позволить\n"
"установить файлы пользователя Evolution."
-#: shell/e-setup.c:261
+#: shell/e-setup.c:267
#, c-format
msgid ""
"The directory `%s' exists but is not the\n"
@@ -6575,7 +6900,7 @@ msgstr ""
"Пожалуйста, удалите его, чтобы позволить\n"
"установить файлы пользователя Evolution."
-#: shell/e-shell-folder-creation-dialog.c:96
+#: shell/e-shell-folder-creation-dialog.c:99
#, c-format
msgid ""
"Cannot create the specified folder:\n"
@@ -6584,11 +6909,11 @@ msgstr ""
"Невозможно создать указанную папку:\n"
"%s"
-#: shell/e-shell-folder-creation-dialog.c:153
+#: shell/e-shell-folder-creation-dialog.c:156
msgid "The specified folder name is not valid."
msgstr "Указанное имя папки не допустимо."
-#: shell/e-shell-folder-creation-dialog.c:245
+#: shell/e-shell-folder-creation-dialog.c:248
msgid "Evolution - Create new folder"
msgstr "Эволюция - Создать новую папку"
@@ -6600,27 +6925,27 @@ msgstr ""
"Тип выбранной папки не подходит для\n"
"запрошенного действия."
-#: shell/e-shell-folder-selection-dialog.c:318
+#: shell/e-shell-folder-selection-dialog.c:319
msgid "New..."
msgstr "Новая..."
-#: shell/e-shell-folder-title-bar.c:451 shell/e-shell-folder-title-bar.c:452
+#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
msgid "(Untitled)"
msgstr "(Без заголовка)"
-#: shell/e-shell-view-menu.c:159
+#: shell/e-shell-view-menu.c:173
msgid "Bug buddy was not found in your $PATH."
msgstr "Bug-buddy не был найден в вашем $PATH."
-#: shell/e-shell-view-menu.c:165
+#: shell/e-shell-view-menu.c:179
msgid "Bug buddy could not be run."
msgstr "Bug-buddy не может быть запущен."
-#: shell/e-shell-view-menu.c:194
+#: shell/e-shell-view-menu.c:208
msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
msgstr "Copyright (C) 1999-2001 Ximian, Inc."
-#: shell/e-shell-view-menu.c:196
+#: shell/e-shell-view-menu.c:210
msgid ""
"Evolution is a suite of groupware applications\n"
"for mail, calendaring, and contact management\n"
@@ -6630,34 +6955,30 @@ msgstr ""
"ведения календарей и контактной информации для\n"
"групповой работы в среде GNOME."
-#: shell/e-shell-view-menu.c:360
+#: shell/e-shell-view-menu.c:374
msgid "Go to folder..."
msgstr "Перейти к папке..."
-#: shell/e-shell-view.c:143
+#: shell/e-shell-view.c:148
msgid "(No folder displayed)"
msgstr "(Папки не показаны)"
-#: shell/e-shell-view.c:474
-msgid "Folders"
-msgstr "Папки"
-
-#: shell/e-shell-view.c:1124
+#: shell/e-shell-view.c:1134
#, c-format
msgid "%s - Evolution %s"
msgstr "%s - Evolution %s"
-#: shell/e-shell-view.c:1126
+#: shell/e-shell-view.c:1136
#, c-format
msgid "%s - Evolution %s [%s]"
msgstr "%s - Evolution %s [%s]"
-#: shell/e-shell.c:372
+#: shell/e-shell.c:378
#, c-format
msgid "Cannot set up local storage -- %s"
msgstr "Невозможно установить локальное хранилище -- %s"
-#: shell/e-shell.c:1242
+#: shell/e-shell.c:1248
#, c-format
msgid ""
"Ooops! The view for `%s' have died unexpectedly. :-(\n"
@@ -6666,15 +6987,15 @@ msgstr ""
"Оп-ля! Окно для \"%s\" неожиданно умерло. :-(\n"
"Возможно это означает, что компонент %s рухнул."
-#: shell/e-shortcuts-view.c:123
+#: shell/e-shortcuts-view.c:134
msgid "Create new shortcut group"
msgstr "Создать новую группу закладок"
-#: shell/e-shortcuts-view.c:126
+#: shell/e-shortcuts-view.c:137
msgid "Group name:"
msgstr "Название группы:"
-#: shell/e-shortcuts-view.c:249
+#: shell/e-shortcuts-view.c:260
#, c-format
msgid ""
"Do you really want to remove group\n"
@@ -6683,73 +7004,73 @@ msgstr ""
"Вы действительно хотите удалить группу\n"
"\"%s\" из панели закладок?"
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:265
msgid "Don't remove"
msgstr "Не удалять"
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:276
msgid "_Small Icons"
msgstr "Маленькие пиктограммы"
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:277
msgid "Show the shortcuts as small icons"
msgstr "Показать закладки как маленькие пиктограммы"
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:279
msgid "_Large Icons"
msgstr "Большие пиктограммы"
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:280
msgid "Show the shortcuts as large icons"
msgstr "Показать закладки как большие пиктограммы"
-#: shell/e-shortcuts-view.c:280
+#: shell/e-shortcuts-view.c:291
msgid "_New Group..."
msgstr "Новая группа..."
-#: shell/e-shortcuts-view.c:281
+#: shell/e-shortcuts-view.c:292
msgid "Create a new shortcut group"
msgstr "Создать новую группу закладок"
-#: shell/e-shortcuts-view.c:283
+#: shell/e-shortcuts-view.c:294
msgid "_Remove This Group..."
msgstr "Удалить эту группу..."
-#: shell/e-shortcuts-view.c:284
+#: shell/e-shortcuts-view.c:295
msgid "Remove this shortcut group"
msgstr "Удалить эту группу закладок"
-#: shell/e-shortcuts-view.c:289
+#: shell/e-shortcuts-view.c:300
msgid "_Hide the Shortcut Bar"
msgstr "Скрыть строку закладок"
-#: shell/e-shortcuts-view.c:290
+#: shell/e-shortcuts-view.c:301
msgid "Hide the shortcut bar"
msgstr "Скрыть строку закладок"
-#: shell/e-shortcuts-view.c:374
+#: shell/e-shortcuts-view.c:385
msgid "Activate"
msgstr "Активировать"
-#: shell/e-shortcuts-view.c:374
+#: shell/e-shortcuts-view.c:385
msgid "Activate this shortcut"
msgstr "Активировать эту закладку"
-#: shell/e-shortcuts-view.c:377
+#: shell/e-shortcuts-view.c:388
msgid "Remove this shortcut from the shortcut bar"
msgstr "Удалить эту закладку из строки закладок"
-#: shell/e-shortcuts.c:375
+#: shell/e-shortcuts.c:379
msgid "Error saving shortcuts."
msgstr "Ошибка сохранения закладок."
-#: shell/e-storage-set-view.c:468 ui/evolution-event-editor.xml.h:76
+#: shell/e-storage-set-view.c:649 ui/evolution-event-editor.xml.h:76
#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:42
+#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:43
msgid "_View"
msgstr "Просмотр"
-#: shell/e-storage-set-view.c:468
+#: shell/e-storage-set-view.c:649
msgid "View the selected folder"
msgstr "Просмотр выбранной папки"
@@ -6757,47 +7078,47 @@ msgstr "Просмотр выбранной папки"
msgid "(No name)"
msgstr "(Без имени)"
-#: shell/e-storage.c:429
+#: shell/e-storage.c:459
msgid "No error"
msgstr "Нет ошибки"
-#: shell/e-storage.c:431
+#: shell/e-storage.c:461
msgid "Generic error"
msgstr "Обычная ошибка"
-#: shell/e-storage.c:433
+#: shell/e-storage.c:463
msgid "A folder with the same name already exists"
msgstr "Папка с таким названием уже существует"
-#: shell/e-storage.c:435
+#: shell/e-storage.c:465
msgid "The specified folder type is not valid"
msgstr "Указанный тип папки не допустим"
-#: shell/e-storage.c:437
+#: shell/e-storage.c:467
msgid "I/O error"
msgstr "Ошибка ввода/вывода"
-#: shell/e-storage.c:439
+#: shell/e-storage.c:469
msgid "Not enough space to create the folder"
msgstr "Недостаточно места для создания папки"
-#: shell/e-storage.c:441
+#: shell/e-storage.c:471
msgid "The specified folder was not found"
msgstr "Указанная папка не найдена"
-#: shell/e-storage.c:443
+#: shell/e-storage.c:473
msgid "Function not implemented in this storage"
msgstr "Функция не реализована для этого носителя"
-#: shell/e-storage.c:445
+#: shell/e-storage.c:475
msgid "Permission denied"
msgstr "Отказ в доступе"
-#: shell/e-storage.c:447
+#: shell/e-storage.c:477
msgid "Operation not supported"
msgstr "Операция не поддерживается"
-#: shell/e-storage.c:449
+#: shell/e-storage.c:479
msgid "The specified type is not supported in this storage"
msgstr "Указанный тип не поддерживается для этого носителя"
@@ -6805,7 +7126,8 @@ msgstr "Указанный тип не поддерживается для этого носителя"
msgid "The Evolution shell."
msgstr "Оболочка Evolution."
-#: shell/main.c:74
+#: shell/main.c:83
+#, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this PREVIEW RELEASE\n"
"of the Evolution groupware suite.\n"
@@ -6827,7 +7149,8 @@ msgstr ""
"Привет! Спасибо, что нашли время скачать эту предварительную версию\n"
"набора групповых приложений \"Evolution\".\n"
"\n"
-"Evolution еще не завершена. Некоторые свойства почти работают, но в некоторых\n"
+"Evolution еще не завершена. Некоторые свойства почти работают, но в "
+"некоторых\n"
"случаях не правильно или только наполовину. Если вы не можете понять как\n"
"сделать что-нибудь, возможно это потому, что это невозможно =)\n"
"\n"
@@ -6841,7 +7164,7 @@ msgstr ""
"Мы надеемся, что вам понравятся результаты нашей упорной работы и мы\n"
"рассчитываем на ваше участие!\n"
-#: shell/main.c:99
+#: shell/main.c:108
msgid ""
"Thanks\n"
"The Evolution Team\n"
@@ -6849,15 +7172,19 @@ msgstr ""
"С благодарностью\n"
"Команда Evolution\n"
-#: shell/main.c:130
+#: shell/main.c:139
msgid "Cannot initialize the Evolution shell."
msgstr "Невозможно инициализировать оболочку \"Эволюции\"."
-#: shell/main.c:176
-msgid "Disable."
-msgstr "Отключено."
+#: shell/main.c:185
+msgid "Disable splash screen"
+msgstr "Отключить заставку"
-#: shell/main.c:196
+#: shell/main.c:186
+msgid "Send the debugging output of all components to a file."
+msgstr "Записывать отладочный вывод всех компонентов в файл."
+
+#: shell/main.c:219
msgid "Cannot initialize the Bonobo component system."
msgstr "Не удалось инициализировать компонентную систему Bonobo."
@@ -6881,8 +7208,7 @@ msgstr "Поиск контакта"
msgid "New contact"
msgstr "Новый контакт"
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:18
-#: ui/evolution-mail.xml.h:30
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:50
msgid "Previews the message to be printed"
msgstr "Просмотр печатаемых сообщений"
@@ -6890,7 +7216,7 @@ msgstr "Просмотр печатаемых сообщений"
msgid "Print contacts"
msgstr "Печать контактов"
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:49
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:79
msgid "Stop"
msgstr "Стоп"
@@ -6914,7 +7240,7 @@ msgstr "Источники адресных книг..."
msgid "_Contact"
msgstr "Контакты"
-#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:35
+#: ui/evolution-addressbook.xml.h:18 ui/evolution-calendar.xml.h:42
#: ui/evolution-contact-editor.xml.h:15
msgid "_Print..."
msgstr "Печать..."
@@ -6923,9 +7249,9 @@ msgstr "Печать..."
msgid "_Search for contacts"
msgstr "Поиск контактов"
-#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:37
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:76
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:41
+#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
+#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:112
+#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:42
msgid "_Tools"
msgstr "Инструменты"
@@ -6938,117 +7264,149 @@ msgid "Alter preferences"
msgstr "Другие настройки"
#: ui/evolution-calendar.xml.h:4
+msgid "Create a new all day Event"
+msgstr "Создать новое ежедневное событие"
+
+#: ui/evolution-calendar.xml.h:5
msgid "Create a new appointment"
msgstr "Создать новую встречу"
-#: ui/evolution-calendar.xml.h:5
+#: ui/evolution-calendar.xml.h:6
msgid "Create a new calendar"
msgstr "Создать новый календарь"
-#: ui/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:7
msgid "Day"
msgstr "День"
-#: ui/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:8
msgid "Go To"
msgstr "Перейти к"
-#: ui/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:9
msgid "Go back in time"
msgstr "Перейти в прошлое"
-#: ui/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:10
msgid "Go forward in time"
msgstr "Перейти в будущее"
-#: ui/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:11
+msgid "Go to _Date"
+msgstr "Перейти к дате"
+
+#: ui/evolution-calendar.xml.h:12
+msgid "Go to _Today"
+msgstr "Перейти к сегодняшнему дню"
+
+#: ui/evolution-calendar.xml.h:13
msgid "Go to a specific date"
msgstr "Перейти к указанной дате"
-#: ui/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:14
msgid "Go to present time"
msgstr "Перейти к настоящему времени"
-#: ui/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:15
msgid "Month"
msgstr "Месяц"
-#: ui/evolution-calendar.xml.h:13
-msgid "New Appointment"
-msgstr "Новая встреча"
+#: ui/evolution-calendar.xml.h:17
+msgid "New _Event"
+msgstr "Новое событие"
-#: ui/evolution-calendar.xml.h:14 ui/evolution-event-editor.xml.h:29
+#: ui/evolution-calendar.xml.h:18 ui/evolution-event-editor.xml.h:29
#: ui/evolution-task-editor-dialog.xml.h:32
msgid "Next"
msgstr "След."
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:20
msgid "Open Calendar"
msgstr "Открыть календарь"
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:21
msgid "Prev"
msgstr "Пред."
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:22
+msgid "Previews the calendar to be printed"
+msgstr "Просмотр печатаемого календаря"
+
+#: ui/evolution-calendar.xml.h:25
msgid "Print calendar"
msgstr "Напечатать календарь"
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:26
msgid "Print this Calendar"
msgstr "Напечатать этот календарь"
-#: ui/evolution-calendar.xml.h:23 ui/evolution-message-composer.xml.h:15
+#: ui/evolution-calendar.xml.h:27 ui/evolution-message-composer.xml.h:15
msgid "Save As"
msgstr "Сохранить как"
-#: ui/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:28
msgid "Save calendar as something else"
msgstr "Сохранить календарь как что-нибудь еще"
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:30
msgid "Show 1 day"
msgstr "Показать 1 день"
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:31
msgid "Show 1 month"
msgstr "Показать 1 месяц"
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:32
msgid "Show 1 week"
msgstr "Показать 1 неделю"
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:33
msgid "Show the working week"
msgstr "Показать рабочую неделю"
-#: ui/evolution-calendar.xml.h:30 widgets/misc/e-cell-date-edit.c:223
-#: widgets/misc/e-dateedit.c:413
+#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:226
+#: widgets/misc/e-dateedit.c:422
msgid "Today"
msgstr "Сегодня"
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:35
+msgid "W_ork Week"
+msgstr "Рабочая неделя"
+
+#: ui/evolution-calendar.xml.h:36
msgid "Week"
msgstr "Неделя"
-#: ui/evolution-calendar.xml.h:32
+#: ui/evolution-calendar.xml.h:37
msgid "_Appointment"
msgstr "Встреча"
-#: ui/evolution-calendar.xml.h:33 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:37
+#: ui/evolution-calendar.xml.h:38
+msgid "_Day"
+msgstr "День"
+
+#: ui/evolution-calendar.xml.h:39
+msgid "_Month"
+msgstr "Месяц"
+
+#: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
+#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:38
msgid "_New"
msgstr "Новый"
-#: ui/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:41
msgid "_Open Calendar"
msgstr "Открыть календарь"
-#: ui/evolution-calendar.xml.h:36 ui/evolution-mail.xml.h:73
+#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:108
#: ui/evolution-tasks.xml.h:8
msgid "_Save As..."
msgstr "Сохранить как..."
+#: ui/evolution-calendar.xml.h:45
+msgid "_Week"
+msgstr "Неделя"
+
#: ui/evolution-contact-editor.xml.h:2
msgid "Delete this item"
msgstr "Удалить этот элемент"
@@ -7071,7 +7429,7 @@ msgid "Print this item"
msgstr "Печать этого элемента"
#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-mail.xml.h:35 ui/evolution-task-editor-dialog.xml.h:41
+#: ui/evolution-mail.xml.h:58 ui/evolution-task-editor-dialog.xml.h:41
msgid "Print..."
msgstr "Печать..."
@@ -7104,7 +7462,7 @@ msgstr "Послать сообщение к контакту..."
#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:29
+#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:30
msgid "_File"
msgstr "Файл"
@@ -7158,7 +7516,7 @@ msgstr "Закрыть эту встречу"
msgid "Cop_y to Folder... (FIXME)"
msgstr "Скопировать в папку... (FIXME)"
-#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:4
+#: ui/evolution-event-editor.xml.h:13 ui/evolution-mail.xml.h:7
#: ui/evolution-task-editor-dialog.xml.h:14
msgid "Copy"
msgstr "Скопировать"
@@ -7248,7 +7606,7 @@ msgid "Print Setup"
msgstr "Настройка страницы"
#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:233
+#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:239
msgid "Save"
msgstr "Сохранить"
@@ -7269,7 +7627,8 @@ msgstr "Вставить встречу в расписание"
msgid "Schedule some sort of a meeting"
msgstr "Вставить в расписание встречу некоторого типа"
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-task-editor-dialog.xml.h:57
+#: ui/evolution-event-editor.xml.h:48 ui/evolution-mail.xml.h:69
+#: ui/evolution-task-editor-dialog.xml.h:57
msgid "Select All"
msgstr "Выбрать все"
@@ -7291,12 +7650,12 @@ msgid "_About..."
msgstr "О программе..."
#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:26
+#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:27
msgid "_Close"
msgstr "Закрыть"
#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:28
msgid "_Contact (FIXME)"
msgstr "Контакт (FIXME)"
@@ -7310,7 +7669,7 @@ msgid "_Debug"
msgstr "Отладка"
#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:33
+#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:34
msgid "_Help"
msgstr "Справка"
@@ -7347,7 +7706,7 @@ msgstr "Вставить"
msgid "_Print"
msgstr "Печать"
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:72
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:104
#: ui/evolution-task-editor-dialog.xml.h:83
msgid "_Properties..."
msgstr "Свойства..."
@@ -7357,7 +7716,7 @@ msgid "_Select All"
msgstr "Выбрать все"
#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:41
msgid "_Task (FIXME)"
msgstr "Задание (FIXME)"
@@ -7386,230 +7745,359 @@ msgid "New Mail"
msgstr "Новое сообщение"
#: ui/evolution-mail.xml.h:2
+msgid "Apply any new filters to the mail in this box"
+msgstr "Применить все новые фильтры к почте в этом ящике"
+
+#: ui/evolution-mail.xml.h:3
+msgid "Change the properties of this folder"
+msgstr "Изменить свойства этой папки"
+
+#: ui/evolution-mail.xml.h:4
msgid "Compose"
msgstr "Создать"
-#: ui/evolution-mail.xml.h:3
+#: ui/evolution-mail.xml.h:5
msgid "Compose a new message"
msgstr "Создать новое сообщение"
-#: ui/evolution-mail.xml.h:5
+#: ui/evolution-mail.xml.h:6
+msgid "Configure Folder..."
+msgstr "Настроить папку..."
+
+#: ui/evolution-mail.xml.h:8
msgid "Copy message to a new folder"
msgstr "Скопировать сообщение в новую папку"
-#: ui/evolution-mail.xml.h:6
+#: ui/evolution-mail.xml.h:9
+msgid "Copy selected messages to another folder"
+msgstr "Скопировать выбранные сообщения в другую папку"
+
+#: ui/evolution-mail.xml.h:10
msgid "Create _Virtual Folder From Message"
msgstr "Создать вирт.папку из сообщения"
-#: ui/evolution-mail.xml.h:9
+#: ui/evolution-mail.xml.h:12
+msgid "Delete the selected messages"
+msgstr "Удалить выбранные сообщения"
+
+#: ui/evolution-mail.xml.h:14
msgid "Display all of the message headers"
msgstr "Показать все заголовки сообщения"
-#: ui/evolution-mail.xml.h:10
-msgid "Empty Trash"
+#: ui/evolution-mail.xml.h:15
+msgid "Edit Message"
+msgstr "Правка сообщения"
+
+#: ui/evolution-mail.xml.h:16
+msgid "Edit the current message"
+msgstr "Правка текущего сообщения"
+
+#: ui/evolution-mail.xml.h:17
+msgid "Empty _Trash"
msgstr "Очистить корзину"
-#: ui/evolution-mail.xml.h:11
+#: ui/evolution-mail.xml.h:18
+msgid "Expunge"
+msgstr "Вычеркнуть"
+
+#: ui/evolution-mail.xml.h:19
+msgid "Filter on Mailing _List"
+msgstr "Фильтр по списку рассылки"
+
+#: ui/evolution-mail.xml.h:20
msgid "Filter on Se_nder"
msgstr "Фильтр по отправителю"
-#: ui/evolution-mail.xml.h:12
+#: ui/evolution-mail.xml.h:21
msgid "Filter on _Recipients"
msgstr "Фильтр по получателю"
-#: ui/evolution-mail.xml.h:13
+#: ui/evolution-mail.xml.h:22
msgid "Filter on _Subject"
msgstr "Фильтр по теме"
-#: ui/evolution-mail.xml.h:14
+#: ui/evolution-mail.xml.h:23
+msgid "Finaly remove all mails tagged for deletion"
+msgstr "Окончательно удалить всю почту помеченную для удаления"
+
+#: ui/evolution-mail.xml.h:24
msgid "Forget _Passwords"
msgstr "Забыть пароли"
-#: ui/evolution-mail.xml.h:16
+#: ui/evolution-mail.xml.h:26
msgid "Forward As"
msgstr "Переслать как"
-#: ui/evolution-mail.xml.h:18
-msgid "Full Headers"
+#: ui/evolution-mail.xml.h:28
+msgid "Forward the selected mail to someone"
+msgstr "Переслать выбранную почту кому-то"
+
+#: ui/evolution-mail.xml.h:30
+msgid "Forward this message in-line with your mail, so you can edit it"
+msgstr "Переслать это сообщение вставленным в ваше письмо, чтобы вы могли править его"
+
+#: ui/evolution-mail.xml.h:31
+msgid "Full _Headers"
msgstr "Полные заголовки"
-#: ui/evolution-mail.xml.h:19
+#: ui/evolution-mail.xml.h:32
+msgid "Hide Deleted Messages"
+msgstr "Скрыть удаленные сообщения"
+
+#: ui/evolution-mail.xml.h:33
msgid "Hide S_elected Messages"
msgstr "Скрыть выделенные сообщения"
-#: ui/evolution-mail.xml.h:20
+#: ui/evolution-mail.xml.h:34
msgid "Hide _Deleted Messages"
msgstr "Скрыть удаленные сообщения"
-#: ui/evolution-mail.xml.h:21
+#: ui/evolution-mail.xml.h:35
msgid "Hide _Read messages"
msgstr "Скрыть прочитанные сообщения"
-#: ui/evolution-mail.xml.h:22
-msgid "Inline"
-msgstr "Встроенный"
+#: ui/evolution-mail.xml.h:36
+msgid "Invert Selection"
+msgstr "Обратить выделение"
-#: ui/evolution-mail.xml.h:23
+#: ui/evolution-mail.xml.h:37
msgid "Manage _Subscriptions..."
msgstr "Управление подписками..."
-#: ui/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:38
msgid "Mar_k as Read"
msgstr "Пометить как прочитанное"
-#: ui/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:39
msgid "Mark All as R_ead"
msgstr "Пометить все как прочитанное"
-#: ui/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:40
+msgid "Mark As Read"
+msgstr "Пометить как прочитанное"
+
+#: ui/evolution-mail.xml.h:41
+msgid "Mark As U_nread"
+msgstr "Пометить как непрочитанное"
+
+#: ui/evolution-mail.xml.h:42
msgid "Mark as U_nread"
msgstr "Пометить как непрочтенное"
-#: ui/evolution-mail.xml.h:27
-msgid "Message _Display"
-msgstr "Окно сообщения"
+#: ui/evolution-mail.xml.h:43
+msgid "Mark the selected messages as having been read"
+msgstr "Пометить выбранные сообщения как уже прочитанные"
-#: ui/evolution-mail.xml.h:28
+#: ui/evolution-mail.xml.h:44
+msgid "Mark the selected messages as not having been read"
+msgstr "Пометить выбранные сообщения как ещё не прочитанные"
+
+#: ui/evolution-mail.xml.h:45
msgid "Move"
msgstr "Переместить"
-#: ui/evolution-mail.xml.h:29
+#: ui/evolution-mail.xml.h:46
msgid "Move message to a new folder"
msgstr "Переместить сообщение в новую папку"
-#: ui/evolution-mail.xml.h:33
+#: ui/evolution-mail.xml.h:47
+msgid "Move selected messages to another folder"
+msgstr "Переместить выбранные сообщения в другую папку"
+
+#: ui/evolution-mail.xml.h:48
+msgid "Open in New Window"
+msgstr "Открыть в новом окне"
+
+#: ui/evolution-mail.xml.h:49
+msgid "Open the current message in a new window"
+msgstr "Отправить текущее сообщение в новом окне"
+
+#: ui/evolution-mail.xml.h:54
+msgid "Print Preview of message..."
+msgstr "Просмотр печати сообщения..."
+
+#: ui/evolution-mail.xml.h:55
msgid "Print message to the printer"
msgstr "Распечатать сообщение на принтере"
-#: ui/evolution-mail.xml.h:36
-msgid "Quoted"
-msgstr "Процитированное"
+#: ui/evolution-mail.xml.h:56
+msgid "Print message..."
+msgstr "Печать сообщения..."
-#: ui/evolution-mail.xml.h:37
+#: ui/evolution-mail.xml.h:59
msgid "Redirect (FIXME: implement me)"
msgstr "Перенаправить (FIXME: не реализовано)"
-#: ui/evolution-mail.xml.h:40
+#: ui/evolution-mail.xml.h:62
msgid "Reply to _All"
msgstr "Ответить всем"
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:63
+msgid "Reply to all"
+msgstr "Ответить всем"
+
+#: ui/evolution-mail.xml.h:65
+msgid "Reply to sender"
+msgstr "Ответить отправителю"
+
+#: ui/evolution-mail.xml.h:67
msgid "S_ource"
msgstr "Источник"
-#: ui/evolution-mail.xml.h:44 ui/evolution-subscribe.xml.h:7
+#: ui/evolution-mail.xml.h:68
+msgid "Save the message into a new file"
+msgstr "Сохранить сообщение в новом файле"
+
+#: ui/evolution-mail.xml.h:70 ui/evolution-subscribe.xml.h:7
msgid "Select _All"
msgstr "Выбрать все"
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:71
msgid "Select _Thread"
msgstr "Выбрать подшивку"
-#: ui/evolution-mail.xml.h:46
-msgid "Send and Receive"
+#: ui/evolution-mail.xml.h:72
+msgid "Send / Receive"
msgstr "Получение и отправка"
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:73
+msgid "Send a reply to the person who sent you this mail"
+msgstr "Послать ответ тому кто прислал это сообщение"
+
+#: ui/evolution-mail.xml.h:74
+msgid "Send a single mail in reply to all the selected mail"
+msgstr "Послать одно письмо в ответ на все выбранные сообщения"
+
+#: ui/evolution-mail.xml.h:75
+msgid ""
+"Send queued mail\n"
+" and retrieve new mail"
+msgstr ""
+"Отправить почту из очереди\n"
+" и получить новую почту"
+
+#: ui/evolution-mail.xml.h:77
msgid "Send queued mail and retrieve new mail"
msgstr "Отправить почту из очереди и получить новую почту"
-#: ui/evolution-mail.xml.h:48
+#: ui/evolution-mail.xml.h:78
msgid "Show _All"
msgstr "Показать все"
-#: ui/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:80
msgid "Threaded Message list"
msgstr "Список подшитых сообщений"
-#: ui/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:81
+#, fuzzy
+msgid "Un-delete the selected messages"
+msgstr "Распечатать выделенное сообщение"
+
+#: ui/evolution-mail.xml.h:83
+msgid "VFolder on Mailing _List"
+msgstr "Вирт.папка по списку рассылки"
+
+#: ui/evolution-mail.xml.h:84
msgid "VFolder on Se_nder"
msgstr "Вирт.папка по отправителю"
-#: ui/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:85
msgid "VFolder on _Recipients"
msgstr "Вирт.папка по получателю"
-#: ui/evolution-mail.xml.h:53
+#: ui/evolution-mail.xml.h:86
msgid "VFolder on _Subject"
msgstr "Вирт.папка по теме"
-#: ui/evolution-mail.xml.h:54
+#: ui/evolution-mail.xml.h:87
msgid "View Raw Message Source"
msgstr "Просмотр исходного текста сообщения"
-#: ui/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:88
msgid "Virtual Folder _Editor..."
msgstr "Редактор виртуальных папок..."
-#: ui/evolution-mail.xml.h:56
-msgid "_Actions"
-msgstr "Действия"
-
-#: ui/evolution-mail.xml.h:57
+#: ui/evolution-mail.xml.h:89
msgid "_Apply Filters"
msgstr "Применить фильтры"
-#: ui/evolution-mail.xml.h:58
-msgid "_Compose"
-msgstr "Создать"
+#: ui/evolution-mail.xml.h:90
+msgid "_Attachment"
+msgstr "Вложение"
-#: ui/evolution-mail.xml.h:59
+#: ui/evolution-mail.xml.h:91
msgid "_Copy to Folder..."
msgstr "Скопировать в папку..."
-#: ui/evolution-mail.xml.h:60
+#: ui/evolution-mail.xml.h:92
msgid "_Create Filter From Message"
msgstr "Создать фильтр из сообщения"
-#: ui/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:94
msgid "_Expunge"
msgstr "Вычеркнуть"
-#: ui/evolution-mail.xml.h:63
+#: ui/evolution-mail.xml.h:95
msgid "_Filters..."
msgstr "Фильтры..."
-#: ui/evolution-mail.xml.h:64 ui/evolution.xml.h:30
+#: ui/evolution-mail.xml.h:96 ui/evolution.xml.h:31
msgid "_Folder"
msgstr "Папка"
-#: ui/evolution-mail.xml.h:65
+#: ui/evolution-mail.xml.h:97
msgid "_Forward"
msgstr "Переслать"
-#: ui/evolution-mail.xml.h:66 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:98
+msgid "_Inline"
+msgstr "Встроенное"
+
+#: ui/evolution-mail.xml.h:99 ui/evolution-subscribe.xml.h:12
msgid "_Invert Selection"
msgstr "Обратить выделение"
-#: ui/evolution-mail.xml.h:67
+#: ui/evolution-mail.xml.h:100
msgid "_Mail Message"
msgstr "Почтовое сообщение"
-#: ui/evolution-mail.xml.h:68
+#: ui/evolution-mail.xml.h:101
msgid "_Mail Settings..."
msgstr "Установки почты..."
-#: ui/evolution-mail.xml.h:69
-msgid "_Message Hiding"
-msgstr "Скрытие сообщение"
-
-#: ui/evolution-mail.xml.h:70
+#: ui/evolution-mail.xml.h:102
msgid "_Move to Folder..."
msgstr "Переместить в папку..."
-#: ui/evolution-mail.xml.h:71
+#: ui/evolution-mail.xml.h:103
msgid "_Open Selected Items"
msgstr "Открыть выделенные элементы"
-#: ui/evolution-mail.xml.h:74
-msgid "_Send and Receive"
-msgstr "Получение и отправка"
+#: ui/evolution-mail.xml.h:105
+msgid "_Quoted"
+msgstr "Процитированное"
-#: ui/evolution-mail.xml.h:75
+#: ui/evolution-mail.xml.h:106
+msgid "_Reply"
+msgstr "Ответить"
+
+#: ui/evolution-mail.xml.h:107
+msgid "_Resend Messages"
+msgstr "Перепослать сообщения"
+
+#: ui/evolution-mail.xml.h:109
+msgid "_Save Message As..."
+msgstr "Сохранить сообщение как..."
+
+#: ui/evolution-mail.xml.h:110
+msgid "_Send / Receive"
+msgstr "Получить и отправить"
+
+#: ui/evolution-mail.xml.h:111
msgid "_Threaded"
msgstr "Подшитые"
-#: ui/evolution-mail.xml.h:77
+#: ui/evolution-mail.xml.h:113
msgid "_Undelete"
msgstr "Восстановить"
@@ -7854,7 +8342,7 @@ msgstr "Откат"
msgid "Undo the last action"
msgstr "Отменить последнее действие"
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:25
+#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:26
msgid "_Appointment (FIXME)"
msgstr "Встреча (FIXME)"
@@ -7978,117 +8466,129 @@ msgstr "Работать вне сети"
msgid "_About Evolution..."
msgstr "О программе..."
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:25
+msgid "_Actions"
+msgstr "Действия"
+
+#: ui/evolution.xml.h:32
msgid "_Folder Bar"
msgstr "Строка папки"
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:33
msgid "_Go to Folder..."
msgstr "Перейти к папке..."
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:35
msgid "_Import file..."
msgstr "Импортировать файл..."
-#: ui/evolution.xml.h:35
+#: ui/evolution.xml.h:36
msgid "_Index"
msgstr "Индекс"
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:37
msgid "_Mail message"
msgstr "Почтовое сообщение"
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:39
msgid "_New Folder"
msgstr "Новая папка"
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:40
msgid "_Shortcut Bar"
msgstr "Строка закладок"
#. This is a strftime() format string %A = full weekday name,
#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2475
msgid "%A, %B %d, %Y"
msgstr "%A, %B %d, %Y"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:390
+msgid "Tentative"
+msgstr "Экспериментальный"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:391
msgid "Busy"
msgstr "Занят"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
msgid "Out of Office"
msgstr "Вне офиса"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
msgid "No Information"
msgstr "Нет информации"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:409
msgid "_Invite Others..."
msgstr "Пригласить других..."
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:429
msgid "_Options"
msgstr "Параметры"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:446
msgid "Show _Only Working Hours"
msgstr "Показывать только рабочие часы"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:459
msgid "Show _Zoomed Out"
msgstr "Показывать уменьшенные"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:477
msgid "_Update Free/Busy"
msgstr "Обновить Свободен/Занят"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:495
msgid "_<<"
msgstr "<<"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:512
msgid "_Autopick"
msgstr "Автовыбор"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:526
msgid ">_>"
msgstr ">>"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:543
msgid "_All People and Resources"
msgstr "Все люди и ресурсы"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:556
msgid "All _People and One Resource"
msgstr "Все люди и один ресурс"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:569
msgid "_Required People"
msgstr "Требуемые люди"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:582
msgid "Required People and _One Resource"
msgstr "Требуемые люди и один ресурс"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:605
msgid "Meeting _start time:"
msgstr "Время начала собрания:"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:629
msgid "Meeting _end time:"
msgstr "Время завершения собрания:"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:742
msgid "All Attendees"
msgstr "Все сопровождение"
-#: widgets/menus/gal-view-menus.c:171
+#: widgets/menus/gal-view-menus.c:177
msgid "_Current View"
msgstr "Текущий просмотр"
+#: widgets/menus/gal-view-menus.c:196
+msgid "Define Views"
+msgstr ""
+
#. Translators: These are the first characters of each day of the
#. week, 'M' for 'Monday', 'T' for Tuesday etc.
#: widgets/misc/e-calendar-item.c:421
@@ -8100,88 +8600,92 @@ msgstr "ПВСЧПСВ"
msgid "%B %Y"
msgstr "%B %Y"
-#: widgets/misc/e-cell-date-edit.c:215 widgets/misc/e-dateedit.c:407
+#: widgets/misc/e-cell-date-edit.c:218 widgets/misc/e-dateedit.c:416
msgid "Now"
msgstr "Сейчас"
-#: widgets/misc/e-cell-date-edit.c:239
+#: widgets/misc/e-cell-date-edit.c:242
msgid "OK"
msgstr "Ок"
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#: widgets/misc/e-cell-date-edit.c:456 widgets/misc/e-cell-date-edit.c:672
-#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
-#: widgets/misc/e-dateedit.c:1486
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. strftime format of a time in 24-hour format.
-#.
-#: widgets/misc/e-cell-date-edit.c:460
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#: widgets/misc/e-cell-date-edit.c:465 widgets/misc/e-cell-date-edit.c:675
-#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
-#: widgets/misc/e-dateedit.c:1489
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#. strftime format of a time in 12-hour format.
-#.
-#: widgets/misc/e-cell-date-edit.c:469
-msgid "%I:%M:%S %p"
-msgstr "%I:%M:%S %p"
-
-#. FIXME: Better message needed.
-#: widgets/misc/e-cell-date-edit.c:736
-msgid "The time is invalid"
-msgstr "Не допустимое время"
+#: widgets/misc/e-cell-date-edit.c:723
+#, c-format
+msgid "The time must be in the format: %s"
+msgstr "Время должно быть в формате: %s"
#: widgets/misc/e-clipped-label.c:107
msgid "..."
msgstr "..."
-#: widgets/misc/e-filter-bar.c:160
+#: widgets/misc/e-filter-bar.c:166
msgid "Save Search"
msgstr "Сохранить результаты поиска"
-#: widgets/misc/e-filter-bar.c:231
+#: widgets/misc/e-filter-bar.c:237
msgid "Advanced Search"
msgstr "Расширенный поиск"
-#: widgets/misc/e-filter-bar.c:311
+#: widgets/misc/e-filter-bar.c:317
msgid "Advanced ..."
msgstr "Расширенный..."
-#: widgets/misc/e-messagebox.c:141
+#: widgets/misc/e-messagebox.c:152
msgid "Information"
msgstr "Информация"
-#: widgets/misc/e-messagebox.c:148
+#: widgets/misc/e-messagebox.c:159
msgid "Warning"
msgstr "Предупреждение"
-#: widgets/misc/e-messagebox.c:162
+#: widgets/misc/e-messagebox.c:173
msgid "Question"
msgstr "Вопрос"
-#: widgets/misc/e-messagebox.c:169
+#: widgets/misc/e-messagebox.c:180
msgid "Message"
msgstr "Сообщение"
#. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:213
+#: widgets/misc/e-messagebox.c:224
msgid "Don't show this message again."
msgstr "Не показывать это сообщение снова."
-#: widgets/misc/e-search-bar.c:140
+#: widgets/misc/e-search-bar.c:148
msgid "Sear_ch"
msgstr "Поиск"
+#: views/addressbook/galview.xml.h:1
+msgid "Adress Cards"
+msgstr "Визитная карточка"
+
+#: views/addressbook/galview.xml.h:2
+msgid "By Company"
+msgstr "По компании"
+
+#: views/addressbook/galview.xml.h:3
+msgid "Phone List"
+msgstr "Список телефонов"
+
+#: views/mail/galview.xml.h:1
+msgid "By Sender"
+msgstr "По отправителю"
+
+#: views/mail/galview.xml.h:2
+msgid "By Status"
+msgstr "По состоянию"
+
+#: views/mail/galview.xml.h:3
+msgid "By Subject"
+msgstr "По теме"
+
+#: views/mail/galview.xml.h:4
+msgid "Messages"
+msgstr "Сообщения"
+
+#: views/tasks/galview.xml.h:2
+msgid "With Category"
+msgstr "C категорией:"
+
#: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
msgid "The Personal Addressbook Server"
msgstr "Сервер персональных адресных книг"
@@ -8190,14 +8694,14 @@ msgstr "Сервер персональных адресных книг"
msgid "The Personal Calendar Server; calendar factory"
msgstr "Персональный календарный сервер; фабрика календаря"
-#: wombat/wombat.c:153
+#: wombat/wombat.c:173
msgid "setup_vfs(): could not initialize GNOME-VFS"
msgstr "setup_vfs(): Не удалось инициализировать GNOME-VFS"
-#: wombat/wombat.c:165
+#: wombat/wombat.c:185
msgid "init_corba(): could not initialize GNOME"
msgstr "init_corba(): Не удалось инициализировать GNOME"
-#: wombat/wombat.c:178
+#: wombat/wombat.c:198
msgid "init_bonobo(): could not initialize Bonobo"
msgstr "init_bonobo(): Не удалось инициализировать Bonobo"