aboutsummaryrefslogtreecommitdiffstats
path: root/po/ru.po
diff options
context:
space:
mode:
authorJP Rosevear <jpr@novell.com>2004-07-05 23:08:43 +0800
committerJP Rosevear <jpr@src.gnome.org>2004-07-05 23:08:43 +0800
commit8893f5137dd77a76ce1fbaa8e8793a40a750f3fb (patch)
tree6ba22cb0aebe343b8c1b9d0980449957e391f989 /po/ru.po
parent44ede0596eeb155117703e54c7a3a5b2c891bced (diff)
downloadgsoc2013-evolution-8893f5137dd77a76ce1fbaa8e8793a40a750f3fb.tar
gsoc2013-evolution-8893f5137dd77a76ce1fbaa8e8793a40a750f3fb.tar.gz
gsoc2013-evolution-8893f5137dd77a76ce1fbaa8e8793a40a750f3fb.tar.bz2
gsoc2013-evolution-8893f5137dd77a76ce1fbaa8e8793a40a750f3fb.tar.lz
gsoc2013-evolution-8893f5137dd77a76ce1fbaa8e8793a40a750f3fb.tar.xz
gsoc2013-evolution-8893f5137dd77a76ce1fbaa8e8793a40a750f3fb.tar.zst
gsoc2013-evolution-8893f5137dd77a76ce1fbaa8e8793a40a750f3fb.zip
bump version, requirements
2004-07-02 JP Rosevear <jpr@novell.com> * configure.in: bump version, requirements 2004-07-02 JP Rosevaer <jpr@novell.com> * Makefile.am (SUBDIRS): Revert previous error change svn path=/trunk/; revision=26583
Diffstat (limited to 'po/ru.po')
-rw-r--r--po/ru.po7434
1 files changed, 4256 insertions, 3178 deletions
diff --git a/po/ru.po b/po/ru.po
index e63bd08755..bcd207e17a 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: ru\n"
-"POT-Creation-Date: 2004-06-03 11:14-0400\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\n"
"PO-Revision-Date: 2004-06-15 16:30+0300\n"
"Last-Translator: Leonid Kanter <leon@asplinux.ru>\n"
"Language-Team: Russian <ru@li.org>\n"
@@ -16,7 +16,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.3.1\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: a11y/addressbook/ea-addressbook-view.c:94
@@ -25,14 +26,6 @@ msgstr ""
msgid "evolution addressbook"
msgstr "адресная книга Evolution"
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr "заголовок контакта: "
-
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr "миникарточка evolution"
-
#: a11y/addressbook/ea-minicard-view.c:101
msgid "current addressbook folder "
msgstr "текущая папка адресной книги "
@@ -53,34 +46,251 @@ msgstr " карточек"
msgid " card"
msgstr " карточку"
-#: addressbook/conduit/address-conduit.c:272
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr "заголовок контакта: "
+
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr "миникарточка evolution"
+
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+#, fuzzy
+msgid "This addressbook could not be opened."
+msgstr "Элемент не может быть послан!\n"
+
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+#, fuzzy
+msgid "Failed to authenticate with LDAP server."
+msgstr ""
+"Сбой аутентификации на сервере IMAP.\n"
+"%s\n"
+"\n"
+
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+msgid "This addressbook server does not have any suggested search bases."
+msgstr ""
+
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information."
+msgstr "Этот сервер не поддерживает информацию LDAPv3 schema"
+
+#. addressbook:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+#, fuzzy
+msgid "Could not get schema information for LDAP server."
+msgstr "Не удается получить список групп с сервера."
+
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+#, fuzzy
+msgid "LDAP server did not respond with valid schema information."
+msgstr "Ответ сервера IMAP не содержит информации о %s"
+
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+#, fuzzy
+msgid "Could not remove addressbook."
+msgstr "Не удается загрузить адресную книгу"
+
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr ""
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+#, fuzzy
+msgid "Category editor not available."
+msgstr "Описание не доступно."
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr ""
+
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+#, fuzzy
+msgid "Unable to open addressbook"
+msgstr "Сохранить в адресной книге"
+
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+#, fuzzy
+msgid "Error loading addressbook."
+msgstr "Ошибка при загрузке адресной книги по умолчанию."
+
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+#, fuzzy
+msgid "Unable to perform search."
+msgstr "Не удается обработать папку спула"
+
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+#, fuzzy
+msgid "Would you like to save your changes?"
+msgstr "Хотите сохранить изменения?"
+
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+msgid "_Discard"
+msgstr "_Отклонить"
+
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+#, fuzzy
+msgid "Cannot move contact."
+msgstr "и одна другой контакт."
+
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+#, fuzzy
+msgid "Unable to save contact(s)."
+msgstr "Не удается разобрать содержимое сообщения"
+
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+#, fuzzy
+msgid "Error saving contacts to {0}: {1}"
+msgstr "Ошибка добавления контакта"
+
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+#, fuzzy
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Evolution Addressbook address viewer"
+
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:275
msgid "Default Sync Address:"
msgstr "Адрес синхронизации по умолчанию:"
-#: addressbook/conduit/address-conduit.c:1151
-#: addressbook/conduit/address-conduit.c:1152
+#: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
msgid "Could not load addressbook"
msgstr "Не удается загрузить адресную книгу"
-#: addressbook/conduit/address-conduit.c:1220
-#: addressbook/conduit/address-conduit.c:1223
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
msgid "Could not read pilot's Address application block"
msgstr "Не удается прочитать блок приложения адресов Пилота"
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Анонимное подключение к серверу LDAP"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
-#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:378
-msgid "Failed to authenticate.\n"
-msgstr "Ошибка проверки подлинности.\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "Автозавершение"
-#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:367
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sВведите пароль для %s (пользователь %s)"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "C_ontacts"
+msgstr "К_онтакты"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Сертификаты"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Configure autocomplete here"
+msgstr "Здесь настраивается автозавершение"
+
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "Контакты"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Адресная книга Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution Addressbook address pop-up"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution Addressbook address viewer"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution Addressbook card viewer"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Evolution Addressbook component"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution S/Mime Certificate Management Control"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution folder settings configuration control"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+msgid "Manage your S/MIME certificates here"
+msgstr "Здесь можно управлять вашими сертификатами S/MIME"
#: addressbook/gui/component/addressbook-component.c:93
msgid "New Contact"
@@ -111,7 +321,8 @@ msgid "New Contacts Group"
msgstr "Создать группу контактов"
#: addressbook/gui/component/addressbook-component.c:110
-msgid "_Contacts Group"
+#, fuzzy
+msgid "Contacts Grou_p"
msgstr "_Группа контактов"
#: addressbook/gui/component/addressbook-component.c:111
@@ -134,15 +345,15 @@ msgid "Migrating `%s':"
msgstr "Переносится '%s':"
#. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:464
+#: addressbook/gui/component/addressbook-migrate.c:489
#: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
#: mail/mail-component.c:245 mail/mail-vfolder.c:218
msgid "On This Computer"
msgstr "На этом компьютере"
#. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/component/addressbook-migrate.c:497
#: addressbook/gui/contact-editor/contact-editor.glade.h:34
#: calendar/gui/migration.c:454 calendar/gui/migration.c:536
#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
@@ -151,19 +362,19 @@ msgid "Personal"
msgstr "Личный"
#. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:480
+#: addressbook/gui/component/addressbook-migrate.c:505
msgid "On LDAP Servers"
msgstr "На серверах LDAP"
-#: addressbook/gui/component/addressbook-migrate.c:608
+#: addressbook/gui/component/addressbook-migrate.c:633
msgid "LDAP Servers"
msgstr "Серверы LDAP"
-#: addressbook/gui/component/addressbook-migrate.c:728
+#: addressbook/gui/component/addressbook-migrate.c:753
msgid "Autocompletion Settings"
msgstr "Настройка автозавершения"
-#: addressbook/gui/component/addressbook-migrate.c:1104
+#: addressbook/gui/component/addressbook-migrate.c:1129
msgid ""
"The location and hierarchy of the Evolution contact folders has changed "
"since Evolution 1.x.\n"
@@ -175,7 +386,7 @@ msgstr ""
"\n"
"Производится преобразование папок для новой версии..."
-#: addressbook/gui/component/addressbook-migrate.c:1118
+#: addressbook/gui/component/addressbook-migrate.c:1143
#, fuzzy
msgid ""
"The format of mailing list contacts has changed.\n"
@@ -187,7 +398,7 @@ msgstr ""
"\n"
"Производится преобразование папок для новой версии..."
-#: addressbook/gui/component/addressbook-migrate.c:1127
+#: addressbook/gui/component/addressbook-migrate.c:1152
#, fuzzy
msgid ""
"The way Evolution stores some phone numbers has changed.\n"
@@ -199,7 +410,7 @@ msgstr ""
"\n"
"Производится преобразование папок для новой версии..."
-#: addressbook/gui/component/addressbook-migrate.c:1137
+#: addressbook/gui/component/addressbook-migrate.c:1162
#, fuzzy
msgid ""
"Evolution's Palm Sync changelog and map files have changed.\n"
@@ -211,36 +422,45 @@ msgstr ""
"\n"
"Производится преобразование папок для новой версии..."
-#: addressbook/gui/component/addressbook-view.c:675
+#: addressbook/gui/component/addressbook-view.c:633
#, c-format
msgid "Address book '%s' will be removed. Are you sure you want to continue?"
msgstr "Адресная книга '%s' будет удалена. Вы действительно хотите продолжить?"
-#: addressbook/gui/component/addressbook-view.c:754
+#: addressbook/gui/component/addressbook-view.c:714
msgid "New Address Book"
msgstr "Новая адресная книга"
-#: addressbook/gui/component/addressbook-view.c:755
-#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
#: ui/evolution-tasks.xml.h:6
msgid "Delete"
msgstr "Удалить"
-#: addressbook/gui/component/addressbook-view.c:756
+#: addressbook/gui/component/addressbook-view.c:716
#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
msgid "Properties..."
msgstr "Свойства..."
-#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:995
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Контакты"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Анонимное подключение к серверу LDAP"
+
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+msgid "Failed to authenticate.\n"
+msgstr "Ошибка проверки подлинности.\n"
+
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sВведите пароль для %s (пользователь %s)"
#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
msgid "EFolderList xml for the list of completion uris"
@@ -262,58 +482,6 @@ msgstr ""
msgid "URI for the folder last used in the select names dialog"
msgstr "URI папки, использовавшейся в последний раз в диалоге выбора имен"
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Autocompletion"
-msgstr "Автозавершение"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "C_ontacts"
-msgstr "К_онтакты"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Certificates"
-msgstr "Сертификаты"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Configure autocomplete here"
-msgstr "Здесь настраивается автозавершение"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook"
-msgstr "Адресная книга Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution Addressbook address pop-up"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution Addressbook address viewer"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution Addressbook card viewer"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook component"
-msgstr "Evolution Addressbook component"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution S/Mime Certificate Management Control"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution folder settings configuration control"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
-msgid "Manage your S/MIME certificates here"
-msgstr "Здесь можно управлять вашими сертификатами S/MIME"
-
#: addressbook/gui/component/ldap-config.glade.h:1
#: addressbook/gui/component/select-names/select-names.glade.h:1
#: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -321,7 +489,7 @@ msgstr "Здесь можно управлять вашими сертифика
#: addressbook/gui/contact-editor/fullname.glade.h:1
#: addressbook/gui/contact-editor/im.glade.h:1
#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
#: calendar/gui/dialogs/calendar-setup.glade.h:1
#: calendar/gui/dialogs/event-page.glade.h:1
#: calendar/gui/dialogs/meeting-page.glade.h:1
@@ -330,8 +498,7 @@ msgstr "Здесь можно управлять вашими сертифика
#: calendar/gui/dialogs/task-page.glade.h:1
#: calendar/gui/dialogs/url-editor-dialog.glade.h:1
#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
msgid "*"
msgstr "*"
@@ -357,6 +524,7 @@ msgid "636"
msgstr "636"
#: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
msgid "<b>Authentication</b>"
msgstr "<b>Проверка подлинности</b>"
@@ -400,13 +568,11 @@ msgid "Anonymously"
msgstr "Анонимно"
#: addressbook/gui/component/ldap-config.glade.h:17
-#: calendar/gui/dialogs/task-editor.c:193
msgid "Basic"
msgstr "Основные"
#: addressbook/gui/component/ldap-config.glade.h:18
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
msgid "Details"
msgstr "Подробности"
@@ -424,7 +590,8 @@ msgstr "Электронная почта"
#: addressbook/gui/component/ldap-config.glade.h:22
#, fuzzy
-msgid "Evolution will use this email address to authenticate you with the server."
+msgid ""
+"Evolution will use this email address to authenticate you with the server."
msgstr "Этот адрес будет использоваться для идентификации вас на сервере"
#: addressbook/gui/component/ldap-config.glade.h:23
@@ -657,33 +824,26 @@ msgid "cards"
msgstr "карточек"
#: addressbook/gui/component/ldap-config.glade.h:60
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
#: mail/mail-config.glade.h:183
msgid "minutes"
msgstr "минут"
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
-msgstr "Выбор контактов из адресной книги"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Интерфейс выбора имени в адресной книге Evolution"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Удалить все"
-#: addressbook/gui/component/select-names/e-select-names.c:702
#: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
#: calendar/gui/dialogs/cal-prefs-dialog.c:724
msgid "Remove"
msgstr "Удалить"
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "Имя"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Удалить все"
-
#: addressbook/gui/component/select-names/e-select-names-popup.c:222
msgid "View Contact List"
msgstr "Просмотр списка контактов"
@@ -698,7 +858,7 @@ msgid "Send HTML Mail?"
msgstr "Отправлять почту в формате HTML?"
#: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
+#: addressbook/gui/widgets/eab-popup-control.c:982
msgid "Add to Contacts"
msgstr "Добавить к контактам"
@@ -706,15 +866,22 @@ msgstr "Добавить к контактам"
msgid "Unnamed Contact"
msgstr "Безымянный контакт"
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "Имя"
+
#: addressbook/gui/component/select-names/e-select-names-table-model.c:351
#: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:224
+#: addressbook/gui/widgets/e-addressbook-view.c:228
msgid "Source"
msgstr "Источник"
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Интерфейс выбора имени в адресной книге Evolution"
+#: addressbook/gui/component/select-names/e-select-names.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+msgid "Select Contacts from Address Book"
+msgstr "Выбор контактов из адресной книги"
#: addressbook/gui/component/select-names/select-names.glade.h:2
msgid "<b>Contacts</b>"
@@ -736,6 +903,11 @@ msgstr "К_атегория:"
msgid "_Find"
msgstr "_Найти"
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Search:"
+msgstr "П_оиск"
+
#: addressbook/gui/contact-editor/contact-editor.glade.h:2
#, fuzzy
msgid "<b>Email</b>"
@@ -781,9 +953,8 @@ msgid "<b>Work</b>"
msgstr "<b>К:</b> "
#: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
-#: addressbook/gui/widgets/eab-contact-display.c:334
-#: addressbook/gui/widgets/eab-contact-display.c:353
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/widgets/eab-contact-display.c:331
msgid "AIM"
msgstr "AIM"
@@ -808,7 +979,6 @@ msgid "Birthday:"
msgstr "День ро_ждения:"
#: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:5
msgid "Calendar:"
msgstr "Календарь:"
@@ -823,15 +993,15 @@ msgid "Company:"
msgstr "Команда:"
#: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:266
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:169
#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
#: addressbook/gui/widgets/e-minicard.c:181
msgid "Contact"
msgstr "Контакт"
#: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:520
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
msgid "Contact Editor"
msgstr "Редактор контактов"
@@ -941,8 +1111,8 @@ msgstr "_Веб-страница:"
#. red
#: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
#: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
#: mail/mail-config.glade.h:157
msgid "Work"
@@ -964,44 +1134,28 @@ msgid "_File under:"
msgstr "Имя файла:"
#: addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
#, fuzzy
msgid "_Where:"
msgstr "С_ервер:"
-#: addressbook/gui/contact-editor/eab-editor.c:315
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Вы действительно хотите\n"
-"удалить эти контакты?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:318
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Вы действительно хотите\n"
-"удалить этот контакт?"
-
#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:365
msgid "Address"
msgstr "Адрес"
#: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:287
#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
#: addressbook/gui/widgets/e-addressbook-model.c:309
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
-#: addressbook/gui/widgets/e-minicard.c:174
#: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:474
#: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
msgid "Editable"
msgstr "Изменяемый"
@@ -1973,133 +2127,125 @@ msgstr "Замбия"
msgid "Zimbabwe"
msgstr "Зимбабве"
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "AOL Instant Messenger"
+
#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:337
-#: addressbook/gui/widgets/eab-contact-display.c:356
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/widgets/eab-contact-display.c:334
msgid "Jabber"
msgstr "Jabber"
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:339
-#: addressbook/gui/widgets/eab-contact-display.c:358
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:338
-#: addressbook/gui/widgets/eab-contact-display.c:357
-msgid "MSN"
-msgstr "MSN"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "Yahoo Messenger"
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:336
-#: addressbook/gui/widgets/eab-contact-display.c:355
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/widgets/eab-contact-display.c:333
msgid "ICQ"
msgstr "ICQ"
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#, fuzzy
-msgid "GroupWise"
-msgstr "Novell GroupWise"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr "Служба"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Location"
+msgstr "Адрес"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "Имя пользователя"
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
msgid "Home"
msgstr "Домашний"
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
msgid "Other"
msgstr "Другие"
-#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr "MSN"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+#, fuzzy
+msgid "GroupWise"
+msgstr "Novell GroupWise"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
msgid "Source Book"
msgstr "Книга-источник"
-#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
msgid "Target Book"
msgstr "Книга назначения"
-#: addressbook/gui/contact-editor/e-contact-editor.c:273
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
msgid "Is New Contact"
msgstr "Является новым конактом"
-#: addressbook/gui/contact-editor/e-contact-editor.c:280
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
msgid "Writable Fields"
msgstr "Поля для записи"
-#: addressbook/gui/contact-editor/e-contact-editor.c:294
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
msgid "Changed"
msgstr "Изменено"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2352
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
msgid "This contact belongs to these categories:"
msgstr "Этот контакт принадлежит следующим категориям:"
#. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2429
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
#, fuzzy
msgid "Please select an image for this contact"
msgstr "Выберите один из следующих вариантов"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2433
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
#, fuzzy
msgid "No image"
msgstr "Нигер"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2636
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
#, fuzzy
msgid ""
"The contact data is invalid:\n"
"\n"
msgstr "Повторяющаяся дата некорректна"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
#, fuzzy
msgid "Invalid contact."
msgstr "%d контактов"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
msgid ""
"The contact cannot be saved to the selected address book. Do you want to "
"discard changes?"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor.c:2727
-#: addressbook/gui/contact-editor/e-contact-editor.c:2751
-msgid "_Discard"
-msgstr "_Отклонить"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
msgid ""
"You are moving the contact from one address book to another, but it cannot "
"be removed from the source. Do you want to save a copy instead?"
msgstr ""
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "AOL Instant Messenger"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "Yahoo Messenger"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "Служба"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:2
-msgid "Location"
-msgstr "Адрес"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "Имя пользователя"
-
#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
msgid "Contact Quick-Add"
msgstr "Быстрое добавление контакта"
@@ -2117,6 +2263,22 @@ msgstr "_Полное имя:"
msgid "E-_mail:"
msgstr "_Эл. адрес:"
+#: addressbook/gui/contact-editor/eab-editor.c:315
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Вы действительно хотите\n"
+"удалить эти контакты?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:318
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Вы действительно хотите\n"
+"удалить этот контакт?"
+
#: addressbook/gui/contact-editor/fulladdr.glade.h:2
msgid "Address _2:"
msgstr "Адрес _2:"
@@ -2242,48 +2404,69 @@ msgid "\n"
msgstr "\n"
#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+msgid "Add an email to the List"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#, fuzzy
+msgid "Insert email adresses from Adress Book"
+msgstr "Выбор контактов из адресной книги"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:706
msgid "Members"
msgstr "Члены"
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "Remove an email address from the List"
+msgstr "Удалить выбранные элементы из списка вложений"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#, fuzzy
+msgid "Select"
+msgstr "Выбрано"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
msgid "_Hide addresses when sending mail to this list"
msgstr "Скрывать адреса при отправке почты в этот список"
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
msgid "_List name:"
msgstr "Имя _списка:"
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
msgid "_Type an email address or drag a contact into the list below:"
msgstr "_Введите эл.адрес или перетащите контакт в список, приведённый ниже:"
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
-msgid "contact-list-editor"
-msgstr "Редактор списка контактов"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: smime/gui/smime-ui.glade.h:48
+msgid "dialog1"
+msgstr "dialog1"
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
#: addressbook/gui/widgets/e-addressbook-model.c:295
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:217
-#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-addressbook-view.c:221
#: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
msgid "Book"
msgstr "Книга"
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
msgid "Is New List"
msgstr "является новым списком"
-#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:728
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
+msgid "Required Participants"
+msgstr "Необходимые участники"
+
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:805
msgid "Contact List Editor"
msgstr "Редактор списка контактов"
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
-msgid "Save List as VCard"
-msgstr "Сохранить список как VCard"
-
#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
msgid "Changed Contact:"
msgstr "Изменённый контакт:"
@@ -2322,427 +2505,11 @@ msgstr ""
"в этой папке. Всё равно хотите добавить?"
#. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:121
+#: addressbook/gui/search/e-addressbook-search-dialog.c:170
#: widgets/misc/e-filter-bar.c:156
msgid "Advanced Search"
msgstr "Расширенный поиск"
-#: addressbook/gui/widgets/eab-contact-display.c:131
-#: addressbook/gui/widgets/eab-contact-display.c:194
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:141
-#: addressbook/gui/widgets/eab-contact-display.c:207
-msgid "map"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:259
-#: addressbook/gui/widgets/eab-contact-display.c:525
-msgid "List Members"
-msgstr "Участники списка"
-
-#: addressbook/gui/widgets/eab-contact-display.c:321
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "E-mail"
-msgstr "Эл. почта"
-
-#: addressbook/gui/widgets/eab-contact-display.c:332
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr "Организация"
-
-#: addressbook/gui/widgets/eab-contact-display.c:333
-msgid "Position"
-msgstr "Должность"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#: addressbook/gui/widgets/eab-contact-display.c:354
-#, fuzzy
-msgid "Groupwise"
-msgstr "Группа"
-
-#: addressbook/gui/widgets/eab-contact-display.c:340
-msgid "Video Conferencing"
-msgstr "Видеоконференции"
-
-#: addressbook/gui/widgets/eab-contact-display.c:341
-#: addressbook/gui/widgets/eab-contact-display.c:362
-msgid "Phone"
-msgstr "Телефон"
-
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Fax"
-msgstr "Факс"
-
-#: addressbook/gui/widgets/eab-contact-display.c:346
-msgid "work"
-msgstr "работа"
-
-#: addressbook/gui/widgets/eab-contact-display.c:359
-msgid "WWW"
-msgstr "WWW"
-
-#: addressbook/gui/widgets/eab-contact-display.c:360
-#: addressbook/gui/widgets/eab-contact-display.c:579
-msgid "Blog"
-msgstr "Блог"
-
-#: addressbook/gui/widgets/eab-contact-display.c:363
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr "Мобильный телефон"
-
-#: addressbook/gui/widgets/eab-contact-display.c:367
-msgid "personal"
-msgstr "личный"
-
-#: addressbook/gui/widgets/eab-contact-display.c:374
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr "Примечание"
-
-#: addressbook/gui/widgets/eab-contact-display.c:540
-msgid "Job Title"
-msgstr "Должность"
-
-#: addressbook/gui/widgets/eab-contact-display.c:544
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "Эл. почта"
-
-#: addressbook/gui/widgets/eab-contact-display.c:571
-msgid "Home page"
-msgstr "Домашняя страничка"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:48
-msgid "Success"
-msgstr "Успешно"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:50
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Repository offline"
-msgstr "Репозиторий вне сети"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:52
-#, fuzzy
-msgid "Address Book does not exist"
-msgstr "Адресная книга не существует"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, fuzzy
-msgid "No Self Contact defined"
-msgstr "Создать список контактов"
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:56
-msgid "Permission denied"
-msgstr "Отказ в доступе"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Contact not found"
-msgstr "Контакт не найден"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact ID already exists"
-msgstr "Идентификатор контакта уже существует"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Protocol not supported"
-msgstr "Протокол не поддерживается"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
-#: camel/camel-service.c:728 camel/camel-service.c:766
-#: camel/camel-service.c:850 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
-msgid "Cancelled"
-msgstr "Отменено"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#, fuzzy
-msgid "Could not cancel"
-msgstr "Не удается открыть \"%s\": %s"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Authentication Failed"
-msgstr "Сбой проверки подлинности"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Required"
-msgstr "Требуется проверка подлинности"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "TLS not Available"
-msgstr "TLS недоступен"
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:66
-#, fuzzy
-msgid "No such source"
-msgstr "Нет такого сообщения"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:67
-msgid "Other error"
-msgstr "Иная ошибка"
-
-#: addressbook/gui/widgets/eab-gui-util.c:90
-msgid ""
-"We were unable to open this addressbook. Please check that the path exists "
-"and that you have permission to access it."
-msgstr ""
-"Не удается открыть эту адресную книгу. Убедитесь, что путь существует и что "
-"у вас имеются необходимые права доступа."
-
-#: addressbook/gui/widgets/eab-gui-util.c:97
-msgid ""
-"We were unable to open this addressbook. This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"Не удается открыть эту адресную книгу. Это значит, что либо введен неверный "
-"URI, либо сервер LDAP недоступен."
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-#, fuzzy
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it. If "
-"you want to use LDAP in Evolution, you must install an LDAP-enabled "
-"Evolution package."
-msgstr ""
-"Эта версия Evolution не имеет встроенной поддержки LDAP. Если вы хотите "
-"использовать LDAP в Evolution, вы должны пересобрать программу из исходных "
-"текстов из CVS после установки OpenLDAP; получить его можно по приведенной "
-"ниже ссылке."
-
-#: addressbook/gui/widgets/eab-gui-util.c:109
-msgid ""
-"We were unable to open this addressbook. This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"Не удается открыть эту адресную книгу. Это значит, что либо введен неверный "
-"URI, либо сервер недоступен."
-
-#: addressbook/gui/widgets/eab-gui-util.c:129
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
-msgstr ""
-"С этим запросом совпало больше карточек, чем \n"
-"настроено для выдачи в сервере или Evolution.\n"
-"Пожалуйста, точнее определите условия поиска, или\n"
-"поднимите ограничения для выдачи результатов в\n"
-"настройках сервера каталога для этой адресной книги."
-
-#: addressbook/gui/widgets/eab-gui-util.c:135
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook. Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
-msgstr ""
-"Время исполнения запроса превысило ограничения сервера\n"
-"или ограничения, определенного для этой адресной книги.\n"
-"Пожалуйста, точнее определите условия поиска или\n"
-"поднимите ограничения времени в настройках сервера\n"
-"каталога для этой адресной книги."
-
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr "База данных для этой адресной книги не смогла обработать текущий запрос."
-
-#: addressbook/gui/widgets/eab-gui-util.c:144
-msgid "The backend for this addressbook refused to perform this query."
-msgstr "База данных для этой адресной книги отказалась обрабатывать текущий запрос."
-
-#: addressbook/gui/widgets/eab-gui-util.c:147
-msgid "This query did not complete successfully."
-msgstr "Этот запрос завершился с ошибкой."
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-msgid "Error adding list"
-msgstr "Ошибка добавления списка"
-
-#: addressbook/gui/widgets/eab-gui-util.c:169
-#: addressbook/gui/widgets/eab-gui-util.c:580
-msgid "Error adding contact"
-msgstr "Ошибка добавления контакта"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying list"
-msgstr "Ошибка изменения списка"
-
-#: addressbook/gui/widgets/eab-gui-util.c:180
-msgid "Error modifying contact"
-msgstr "Ошибка изменения контакта"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-msgid "Error removing list"
-msgstr "Ошибка удаления списка"
-
-#: addressbook/gui/widgets/eab-gui-util.c:192
-#: addressbook/gui/widgets/eab-gui-util.c:538
-msgid "Error removing contact"
-msgstr "Ошибка удаления контакта"
-
-#: addressbook/gui/widgets/eab-gui-util.c:274
-#, c-format
-msgid ""
-"Opening %d contacts will open %d new windows as well.\n"
-"Do you really want to display all of these contacts?"
-msgstr ""
-"Открытие %d контактов также откроет %d новых окон.\n"
-"Вы действительно хотите отобразить все эти контакты?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:300
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s уже существует\n"
-"Хотите переписать?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:304
-msgid "Overwrite"
-msgstr "Перезаписать"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:365
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:499
-msgid "list"
-msgstr "список"
-
-#: addressbook/gui/widgets/eab-gui-util.c:634
-msgid "Move contact to"
-msgstr "Переместить контакт в"
-
-#: addressbook/gui/widgets/eab-gui-util.c:636
-msgid "Copy contact to"
-msgstr "Копировать контакт в"
-
-#: addressbook/gui/widgets/eab-gui-util.c:639
-msgid "Move contacts to"
-msgstr "Переместить контакты в"
-
-#: addressbook/gui/widgets/eab-gui-util.c:641
-msgid "Copy contacts to"
-msgstr "Копировать контакты в"
-
-#: addressbook/gui/widgets/eab-gui-util.c:644
-msgid "Select target addressbook."
-msgstr "Выберите целевую адресную книгу."
-
-#: addressbook/gui/widgets/eab-gui-util.c:867
-msgid "Multiple VCards"
-msgstr "Множество VCards"
-
-#: addressbook/gui/widgets/eab-gui-util.c:870
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard для %s"
-
-#.
-#. * This is the code for the UI thingie that lets you manipulate the e-mail
-#. * addresses (and *only* the e-mail addresses) associated with an existing
-#. * contact.
-#.
-#: addressbook/gui/widgets/eab-popup-control.c:199
-msgid "(none)"
-msgstr "(нет)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Основной эл.адрес"
-
-#: addressbook/gui/widgets/eab-popup-control.c:442
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr "Эл. почта 2"
-
-#: addressbook/gui/widgets/eab-popup-control.c:452
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr "Эл. почта 3"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Выбрать действие"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Создать новый контакт \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Добавить адрес к существующему контакту \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-#, fuzzy
-msgid "Querying Address Book..."
-msgstr "Поиск в адресной книге..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Правка контактной информации"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "Объединить эл.адреса"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, fuzzy, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "и одна другой контакт."
-msgstr[1] "и одна другой контакт."
-msgstr[2] "и одна другой контакт."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-msgid "Show Full VCard"
-msgstr "Показывать всю карточку"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "Показывать компактную карточку"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Сохранить в адресной книге"
-
#: addressbook/gui/widgets/e-addressbook-model.c:148
msgid "No contacts"
msgstr "Нет контактов"
@@ -2757,9 +2524,9 @@ msgstr[2] "%d контактов"
#: addressbook/gui/widgets/e-addressbook-model.c:302
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:231
-#: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-addressbook-view.c:235
#: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:491
msgid "Query"
msgstr "Запрос"
@@ -2775,130 +2542,130 @@ msgstr "Модель"
msgid "Error modifying card"
msgstr "Ошибка при изменении карточки"
-#: addressbook/gui/widgets/e-addressbook-view.c:163
+#: addressbook/gui/widgets/e-addressbook-view.c:167
msgid "Name begins with"
msgstr "Имя начинается с"
-#: addressbook/gui/widgets/e-addressbook-view.c:164
+#: addressbook/gui/widgets/e-addressbook-view.c:168
msgid "Email begins with"
msgstr "Почтовый адрес начинается с"
-#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: addressbook/gui/widgets/e-addressbook-view.c:169
#: calendar/gui/cal-search-bar.c:54
msgid "Category is"
msgstr "Категории "
#. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: addressbook/gui/widgets/e-addressbook-view.c:170
#: calendar/gui/cal-search-bar.c:49
msgid "Any field contains"
msgstr "Любое поле содержит"
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-#: addressbook/gui/widgets/e-addressbook-view.c:172
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
msgid "Advanced..."
msgstr "Дополнительно..."
-#: addressbook/gui/widgets/e-addressbook-view.c:238
+#: addressbook/gui/widgets/e-addressbook-view.c:242
#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
#: calendar/gui/e-meeting-list-view.c:227
#: calendar/gui/e-meeting-time-sel.etspec.h:11
msgid "Type"
msgstr "Тип"
-#: addressbook/gui/widgets/e-addressbook-view.c:508
+#: addressbook/gui/widgets/e-addressbook-view.c:539
msgid "Address Book"
msgstr "Адресная книга"
-#: addressbook/gui/widgets/e-addressbook-view.c:852
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: addressbook/gui/widgets/e-addressbook-view.c:2080
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
#: ui/evolution-addressbook.xml.h:19
#, fuzzy
msgid "Save as VCard..."
msgstr "Сохранить как VCard"
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
msgid "New Contact..."
msgstr "Создать контакт..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
msgid "New Contact List..."
msgstr "Создать список контактов..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
msgid "Go to Folder..."
msgstr "Перейти к папке..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
msgid "Import..."
msgstr "Импорт..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1066
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
msgid "Search for Contacts..."
msgstr "Найти контакты..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
msgid "Address Book Sources..."
msgstr "Источники адресных книг..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
msgid "Pilot Settings..."
msgstr "Настройка Pilot..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
#: ui/evolution-addressbook.xml.h:10
msgid "Forward Contact"
msgstr "Переслать контакт"
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
msgid "Send Message to Contact"
msgstr "Отправить сообщение к контакту"
-#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
msgid "Print"
msgstr "Печать"
-#: addressbook/gui/widgets/e-addressbook-view.c:1077
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
msgid "Print Envelope"
msgstr "Напечатать конверт"
-#: addressbook/gui/widgets/e-addressbook-view.c:1081
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
msgid "Copy to Address Book..."
msgstr "Копировать в адресную книгу..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
msgid "Move to Address Book..."
msgstr "Переместить в адресную книгу..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
msgid "Cut"
msgstr "Вырезать"
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
#: ui/evolution-tasks.xml.h:2
msgid "Copy"
msgstr "Копировать"
-#: addressbook/gui/widgets/e-addressbook-view.c:1087
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
msgid "Paste"
msgstr "Вставить"
-#: addressbook/gui/widgets/e-addressbook-view.c:1092
-#: calendar/gui/e-calendar-view.c:1280
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
+#: calendar/gui/e-calendar-view.c:1327
msgid "Current View"
msgstr "Текущий вид"
#. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
#: calendar/gui/cal-search-bar.c:358
msgid "Any Category"
msgstr "Любая категория"
@@ -2932,6 +2699,8 @@ msgid "Car Phone"
msgstr "Телефон в машине"
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:3
msgid "Categories"
msgstr "Категории"
@@ -2939,6 +2708,21 @@ msgstr "Категории"
msgid "Company Phone"
msgstr "Телефон компании"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "Эл. почта"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+msgid "Email 2"
+msgstr "Эл. почта 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+msgid "Email 3"
+msgstr "Эл. почта 3"
+
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
msgid "Family Name"
msgstr "Фамилия"
@@ -2975,14 +2759,29 @@ msgstr "Журнал"
msgid "Manager"
msgstr "Мeнеджер"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Mobile Phone"
+msgstr "Мобильный телефон"
+
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
msgid "Nickname"
msgstr "Псевдоним"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "Note"
+msgstr "Примечание"
+
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
msgid "Office"
msgstr "Офис"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:345
+msgid "Organization"
+msgstr "Организация"
+
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
msgid "Other Fax"
msgstr "Другой факс"
@@ -3034,29 +2833,21 @@ msgstr "Подразделение"
msgid "Web Site"
msgstr "Веб-сайт"
-#: addressbook/gui/widgets/e-minicard.c:137
#: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
msgid "Width"
msgstr "Ширина"
-#: addressbook/gui/widgets/e-minicard.c:144
#: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
msgid "Height"
msgstr "Высота"
-#: addressbook/gui/widgets/e-minicard.c:152
#: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
msgid "Has Focus"
msgstr "Имеет фокус"
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Выбрано"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Имеет курсор"
-
#: addressbook/gui/widgets/e-minicard-label.c:136
msgid "Field"
msgstr "Поле"
@@ -3073,7 +2864,11 @@ msgstr "Текстовая модель"
msgid "Max field name length"
msgstr "Максимальная длина имени поля"
-#: addressbook/gui/widgets/e-minicard-view.c:142
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Ширина столбца"
+
+#: addressbook/gui/widgets/e-minicard-view.c:164
msgid ""
"\n"
"\n"
@@ -3087,7 +2882,7 @@ msgstr ""
"\n"
"Дважды щелкните здесь, чтобы создать новый контакт."
-#: addressbook/gui/widgets/e-minicard-view.c:145
+#: addressbook/gui/widgets/e-minicard-view.c:167
msgid ""
"\n"
"\n"
@@ -3097,13 +2892,398 @@ msgstr ""
"\n"
"Нет элементов для отображения в этом окне."
-#: addressbook/gui/widgets/e-minicard-view.c:453
+#: addressbook/gui/widgets/e-minicard-view.c:477
msgid "Adapter"
msgstr "Адаптер"
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Ширина столбца"
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Выбрано"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Имеет курсор"
+
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
+msgid "map"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:526
+msgid "List Members"
+msgstr "Участники списка"
+
+#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:324
+msgid "E-mail"
+msgstr "Эл. почта"
+
+#: addressbook/gui/widgets/eab-contact-display.c:346
+msgid "Position"
+msgstr "Должность"
+
+#: addressbook/gui/widgets/eab-contact-display.c:347
+msgid "Video Conferencing"
+msgstr "Видеоконференции"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:363
+msgid "Phone"
+msgstr "Телефон"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+msgid "Fax"
+msgstr "Факс"
+
+#: addressbook/gui/widgets/eab-contact-display.c:353
+msgid "work"
+msgstr "работа"
+
+#: addressbook/gui/widgets/eab-contact-display.c:360
+msgid "WWW"
+msgstr "WWW"
+
+#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:580
+msgid "Blog"
+msgstr "Блог"
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+msgid "personal"
+msgstr "личный"
+
+#: addressbook/gui/widgets/eab-contact-display.c:541
+msgid "Job Title"
+msgstr "Должность"
+
+#: addressbook/gui/widgets/eab-contact-display.c:572
+msgid "Home page"
+msgstr "Домашняя страничка"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:49
+msgid "Success"
+msgstr "Успешно"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:51
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Repository offline"
+msgstr "Репозиторий вне сети"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:53
+#, fuzzy
+msgid "Address Book does not exist"
+msgstr "Адресная книга не существует"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, fuzzy
+msgid "No Self Contact defined"
+msgstr "Создать список контактов"
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:57
+msgid "Permission denied"
+msgstr "Отказ в доступе"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:58
+msgid "Contact not found"
+msgstr "Контакт не найден"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact ID already exists"
+msgstr "Идентификатор контакта уже существует"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Protocol not supported"
+msgstr "Протокол не поддерживается"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+#: calendar/gui/dialogs/task-details-page.glade.h:3
+#: calendar/gui/e-cal-component-preview.c:233
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:724 camel/camel-service.c:762
+#: camel/camel-service.c:846 camel/camel-service.c:886
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
+msgid "Cancelled"
+msgstr "Отменено"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#, fuzzy
+msgid "Could not cancel"
+msgstr "Не удается открыть \"%s\": %s"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:63
+msgid "Authentication Failed"
+msgstr "Сбой проверки подлинности"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Required"
+msgstr "Требуется проверка подлинности"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "TLS not Available"
+msgstr "TLS недоступен"
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:67
+#, fuzzy
+msgid "No such source"
+msgstr "Нет такого сообщения"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:68
+msgid "Other error"
+msgstr "Иная ошибка"
+
+#: addressbook/gui/widgets/eab-gui-util.c:91
+msgid ""
+"We were unable to open this addressbook. Please check that the path exists "
+"and that you have permission to access it."
+msgstr ""
+"Не удается открыть эту адресную книгу. Убедитесь, что путь существует и что "
+"у вас имеются необходимые права доступа."
+
+#: addressbook/gui/widgets/eab-gui-util.c:98
+msgid ""
+"We were unable to open this addressbook. This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"Не удается открыть эту адресную книгу. Это значит, что либо введен неверный "
+"URI, либо сервер LDAP недоступен."
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#, fuzzy
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it. If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+msgstr ""
+"Эта версия Evolution не имеет встроенной поддержки LDAP. Если вы хотите "
+"использовать LDAP в Evolution, вы должны пересобрать программу из исходных "
+"текстов из CVS после установки OpenLDAP; получить его можно по приведенной "
+"ниже ссылке."
+
+#: addressbook/gui/widgets/eab-gui-util.c:110
+msgid ""
+"We were unable to open this addressbook. This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+"Не удается открыть эту адресную книгу. Это значит, что либо введен неверный "
+"URI, либо сервер недоступен."
+
+#: addressbook/gui/widgets/eab-gui-util.c:130
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+"С этим запросом совпало больше карточек, чем \n"
+"настроено для выдачи в сервере или Evolution.\n"
+"Пожалуйста, точнее определите условия поиска, или\n"
+"поднимите ограничения для выдачи результатов в\n"
+"настройках сервера каталога для этой адресной книги."
+
+#: addressbook/gui/widgets/eab-gui-util.c:136
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook. Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+"Время исполнения запроса превысило ограничения сервера\n"
+"или ограничения, определенного для этой адресной книги.\n"
+"Пожалуйста, точнее определите условия поиска или\n"
+"поднимите ограничения времени в настройках сервера\n"
+"каталога для этой адресной книги."
+
+#: addressbook/gui/widgets/eab-gui-util.c:142
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr ""
+"База данных для этой адресной книги не смогла обработать текущий запрос."
+
+#: addressbook/gui/widgets/eab-gui-util.c:145
+msgid "The backend for this addressbook refused to perform this query."
+msgstr ""
+"База данных для этой адресной книги отказалась обрабатывать текущий запрос."
+
+#: addressbook/gui/widgets/eab-gui-util.c:148
+msgid "This query did not complete successfully."
+msgstr "Этот запрос завершился с ошибкой."
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+msgid "Error adding list"
+msgstr "Ошибка добавления списка"
+
+#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:581
+msgid "Error adding contact"
+msgstr "Ошибка добавления контакта"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying list"
+msgstr "Ошибка изменения списка"
+
+#: addressbook/gui/widgets/eab-gui-util.c:181
+msgid "Error modifying contact"
+msgstr "Ошибка изменения контакта"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+msgid "Error removing list"
+msgstr "Ошибка удаления списка"
+
+#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:539
+msgid "Error removing contact"
+msgstr "Ошибка удаления контакта"
+
+#: addressbook/gui/widgets/eab-gui-util.c:275
+#, c-format
+msgid ""
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
+msgstr ""
+"Открытие %d контактов также откроет %d новых окон.\n"
+"Вы действительно хотите отобразить все эти контакты?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:301
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s уже существует\n"
+"Хотите переписать?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:305
+msgid "Overwrite"
+msgstr "Перезаписать"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/widgets/eab-gui-util.c:366
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:500
+msgid "list"
+msgstr "список"
+
+#: addressbook/gui/widgets/eab-gui-util.c:635
+msgid "Move contact to"
+msgstr "Переместить контакт в"
+
+#: addressbook/gui/widgets/eab-gui-util.c:637
+msgid "Copy contact to"
+msgstr "Копировать контакт в"
+
+#: addressbook/gui/widgets/eab-gui-util.c:640
+msgid "Move contacts to"
+msgstr "Переместить контакты в"
+
+#: addressbook/gui/widgets/eab-gui-util.c:642
+msgid "Copy contacts to"
+msgstr "Копировать контакты в"
+
+#: addressbook/gui/widgets/eab-gui-util.c:645
+msgid "Select target addressbook."
+msgstr "Выберите целевую адресную книгу."
+
+#: addressbook/gui/widgets/eab-gui-util.c:868
+msgid "Multiple VCards"
+msgstr "Множество VCards"
+
+#: addressbook/gui/widgets/eab-gui-util.c:871
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard для %s"
+
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * contact.
+#.
+#: addressbook/gui/widgets/eab-popup-control.c:198
+msgid "(none)"
+msgstr "(нет)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:431
+msgid "Primary Email"
+msgstr "Основной эл.адрес"
+
+#: addressbook/gui/widgets/eab-popup-control.c:567
+msgid "Select an Action"
+msgstr "Выбрать действие"
+
+#: addressbook/gui/widgets/eab-popup-control.c:575
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Создать новый контакт \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:591
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Добавить адрес к существующему контакту \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:869
+#, fuzzy
+msgid "Querying Address Book..."
+msgstr "Поиск в адресной книге..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:952
+msgid "Edit Contact Info"
+msgstr "Правка контактной информации"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1007
+msgid "Merge E-Mail Address"
+msgstr "Объединить эл.адреса"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, fuzzy, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "и одна другой контакт."
+msgstr[1] "и одна другой контакт."
+msgstr[2] "и одна другой контакт."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+msgid "Show Full VCard"
+msgstr "Показывать всю карточку"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr "Показывать компактную карточку"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Сохранить в адресной книге"
#: addressbook/gui/widgets/gal-view-factory-minicard.c:24
msgid "Card View"
@@ -3150,6 +3330,11 @@ msgstr "Evolution vCalendar importer"
msgid "VCard (.vcf, .gcrd)"
msgstr ""
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Напечатать конверт"
+
#: addressbook/printing/e-contact-print.c:1000
msgid "Print contacts"
msgstr "Напечатать контакты"
@@ -3159,11 +3344,6 @@ msgstr "Напечатать контакты"
msgid "Print contact"
msgstr "Напечатать контакт"
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Напечатать конверт"
-
#: addressbook/printing/e-contact-print.glade.h:1
msgid "10 pt. Tahoma"
msgstr "10 pt. Tahoma"
@@ -3348,6 +3528,22 @@ msgstr "Проверка печати контакта"
msgid "This should test the contact print code"
msgstr "Проверка кода печати контакта"
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+msgid "Can not open file"
+msgstr "Не удается открыть файл"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Не удается загрузить адресную книгу"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Не удается открыть адресную книгу"
+
#: addressbook/tools/evolution-addressbook-export.c:56
msgid "Specify the output file instead of standard output"
msgstr "Указать файл вместо стандартного вывода"
@@ -3373,7 +3569,8 @@ msgid "Export in asynchronous mode "
msgstr "Экспорт в асинхронном режиме "
#: addressbook/tools/evolution-addressbook-export.c:63
-msgid "The number of cards in one output file in asychronous mode,default size 100."
+msgid ""
+"The number of cards in one output file in asychronous mode,default size 100."
msgstr ""
"Количество карточек в одном файле вывода в асинхронном режиме, по умолчанию "
"100"
@@ -3383,7 +3580,8 @@ msgid "NUMBER"
msgstr "NUMBER"
#: addressbook/tools/evolution-addressbook-export.c:91
-msgid "Command line arguments error, please use --help option to see the usage."
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
msgstr ""
"Ошибка аргументов командной строки, используйте параметр --help, чтобы "
"просмотреть доступные аргументы."
@@ -3404,22 +3602,6 @@ msgstr ""
msgid "Impossible internal error."
msgstr "Невозможная внутренняя ошибка."
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-msgid "Can not open file"
-msgstr "Не удается открыть файл"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-#, fuzzy
-msgid "Couldn't get list of addressbooks"
-msgstr "Не удается загрузить адресную книгу"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-#, fuzzy
-msgid "failed to open book"
-msgstr "Не удается открыть адресную книгу"
-
#: addressbook/tools/evolution-addressbook-import.c:46
msgid "Error loading default addressbook."
msgstr "Ошибка при загрузке адресной книги по умолчанию."
@@ -3436,39 +3618,371 @@ msgstr "Не указано имя файла."
msgid "Unnamed List"
msgstr "Безымянный список"
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr ""
+
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+#, fuzzy
+msgid "Don't Send"
+msgstr "Не удалять"
+
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+#, fuzzy
+msgid "Send Notice"
+msgstr "Отправить:"
+
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+#, fuzzy
+msgid "Are you sure you want to delete this meeting?"
+msgstr "Вы действительно хотите удалить эту учётную запись?"
+
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#, fuzzy
+msgid "Are you sure you want to delete this task?"
+msgstr ""
+"Вы действительно хотите\n"
+"удалить этот контакт?"
+
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr ""
+
+#. calendar:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#, fuzzy
+msgid "Are you sure you want to delete this journal entry?"
+msgstr "Вы действительно хотите удалить эту учётную запись?"
+
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+#, fuzzy
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "Вы действительно хотите удалить эту учётную запись?"
+
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+#, fuzzy
+msgid "Are you sure you want to delete this appointment?"
+msgstr "Вы действительно хотите удалить эту учётную запись?"
+
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+#, fuzzy
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr ""
+"Вы действительно хотите\n"
+"удалить эти контакты?"
+
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+#, fuzzy
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr "Вы действительно хотите удалить эту учётную запись?"
+
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+#, fuzzy
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr ""
+"Вы действительно хотите\n"
+"удалить эти контакты?"
+
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+#, fuzzy
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr ""
+"Вы действительно хотите\n"
+"удалить эти контакты?"
+
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+#, fuzzy
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr ""
+"Вы действительно хотите\n"
+"удалить эти контакты?"
+
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+#, fuzzy
+msgid "Save Appointment"
+msgstr "Встреча"
+
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+#, fuzzy
+msgid "Would you like to save your changes to this appointment?"
+msgstr "Хотите сохранить изменения?"
+
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+#, fuzzy
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr "%s Вы сделали изменения. Отменить их?"
+
+#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+#, fuzzy
+msgid "Discard Changes"
+msgstr "_Отклонить изменения"
+
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "Сохранить сообщение ..."
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Отправить"
+
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+#, fuzzy
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "Evolution vCalendar importer"
+
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+
#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
#: smime/gui/component.c:48
msgid "Enter password"
msgstr "Ввод пароля"
-#: calendar/conduits/calendar/calendar-conduit.c:206
+#: calendar/conduits/calendar/calendar-conduit.c:223
msgid "Split Multi-Day Events:"
msgstr "Разделить многодневные события:"
-#: calendar/conduits/calendar/calendar-conduit.c:1313
-#: calendar/conduits/todo/todo-conduit.c:849
-msgid "Could not start wombat server"
+#: calendar/conduits/calendar/calendar-conduit.c:1330
+#: calendar/conduits/calendar/calendar-conduit.c:1331
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+#, fuzzy
+msgid "Could not start evolution-data-server"
msgstr "Не удается запустить сервер wombat"
-#: calendar/conduits/calendar/calendar-conduit.c:1314
-#: calendar/conduits/todo/todo-conduit.c:850
-msgid "Could not start wombat"
-msgstr "Не удается запустить wombat"
-
-#: calendar/conduits/calendar/calendar-conduit.c:1422
-#: calendar/conduits/calendar/calendar-conduit.c:1425
+#: calendar/conduits/calendar/calendar-conduit.c:1439
+#: calendar/conduits/calendar/calendar-conduit.c:1442
msgid "Could not read pilot's Calendar application block"
msgstr "Не удается прочитать блок приложения календарь Пилота"
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:209
msgid "Default Priority:"
msgstr "Приоритет по умолчанию:"
-#: calendar/conduits/todo/todo-conduit.c:929
#: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
msgid "Could not read pilot's ToDo application block"
msgstr "Не удается прочитать блок приложения заданий Пилота"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Календарь и задачи"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
+msgid "Calendars"
+msgstr "Календари"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Здесь можно настроить вашу временную зону, календарь и список задач"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Календарь и задачи Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution Calendar configuration control"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution Calendar scheduling message viewer"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution Calendar/Task editor"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr "Компонент календаря Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Evolution's Tasks component"
+msgstr "Компонент задач Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Задачи"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Календари"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Задачи"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Evolution Calendar alarm notification service"
+
#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
msgid "Starting:"
msgstr "Начинается:"
@@ -3570,10 +4084,6 @@ msgstr ""
msgid "Do not ask me about this program again."
msgstr "Не задавать больше этот вопрос."
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution Calendar alarm notification service"
-
#: calendar/gui/alarm-notify/notify-main.c:139
msgid "Could not initialize Bonobo"
msgstr "Не удается инициализировать Bonobo"
@@ -3716,9 +4226,30 @@ msgstr "Показывать ли время в 24-часовом формате
msgid "Whether to show week numbers in date navigator"
msgstr "Показывать ли номера недель в навигаторе по датам"
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "\"Коротко\" содержит"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Описание содержит"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Комментарий содержит"
+
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Описание содержит"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr "Прочее"
+
#: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:92
-#: calendar/gui/gnome-cal.c:1705
+#: calendar/gui/dialogs/select-source-dialog.c:108
+#: calendar/gui/gnome-cal.c:1827
#: camel/providers/groupwise/camel-gw-listener.c:311
#: camel/providers/groupwise/camel-gw-listener.c:334
msgid "Calendar"
@@ -3741,8 +4272,8 @@ msgid "Purge events older than"
msgstr ""
#: calendar/gui/calendar-commands.c:363
-#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
msgid "days"
msgstr "дней"
@@ -3753,7 +4284,7 @@ msgstr "%A, %d %B %Y"
#. strftime format %a = abbreviated weekday name, %d = day of month,
#. %b = abbreviated month name. Don't use any other specifiers.
#: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
#: calendar/gui/e-week-view-main-item.c:329
msgid "%a %d %b"
msgstr "%a, %d %b"
@@ -3802,62 +4333,52 @@ msgstr "Не удаётся открыть календарь '%s' для соз
msgid "There is no calendar available for creating events and meetings"
msgstr "Нет доступного календаря для создания событий и совещаний"
-#: calendar/gui/calendar-component.c:963
-msgid ""
-"Selected calendar is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Calendars"
-msgstr "Календари"
-
-#: calendar/gui/calendar-component.c:1234
+#: calendar/gui/calendar-component.c:1224
msgid "New appointment"
msgstr "Новая встреча"
-#: calendar/gui/calendar-component.c:1235
+#: calendar/gui/calendar-component.c:1225
msgid "_Appointment"
msgstr "_Встреча"
-#: calendar/gui/calendar-component.c:1236
+#: calendar/gui/calendar-component.c:1226
msgid "Create a new appointment"
msgstr "Создать новую встречу"
-#: calendar/gui/calendar-component.c:1242
+#: calendar/gui/calendar-component.c:1232
msgid "New meeting"
msgstr "Новое собрание"
-#: calendar/gui/calendar-component.c:1243
+#: calendar/gui/calendar-component.c:1233
msgid "M_eeting"
msgstr "_Собрание"
-#: calendar/gui/calendar-component.c:1244
+#: calendar/gui/calendar-component.c:1234
msgid "Create a new meeting request"
msgstr "Создать новое приглашение на собрание"
-#: calendar/gui/calendar-component.c:1250
+#: calendar/gui/calendar-component.c:1240
msgid "New all day appointment"
msgstr "Новая встреча на весь день"
-#: calendar/gui/calendar-component.c:1251
+#: calendar/gui/calendar-component.c:1241
msgid "All _Day Appointment"
msgstr "Еже_дневная встреча"
-#: calendar/gui/calendar-component.c:1252
+#: calendar/gui/calendar-component.c:1242
msgid "Create a new all-day appointment"
msgstr "Создать новую ежедневную встречу"
-#: calendar/gui/calendar-component.c:1258
+#: calendar/gui/calendar-component.c:1248
msgid "New calendar"
msgstr "Новый календарь"
-#: calendar/gui/calendar-component.c:1259
-msgid "C_alendar"
-msgstr "К_алендарь"
+#: calendar/gui/calendar-component.c:1249
+#, fuzzy
+msgid "Cale_ndar"
+msgstr "Календарь"
-#: calendar/gui/calendar-component.c:1260
+#: calendar/gui/calendar-component.c:1250
msgid "Create a new calendar"
msgstr "Создать новый календарь"
@@ -3887,27 +4408,6 @@ msgstr "Как неделю"
msgid "Month View"
msgstr "как месяц"
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "\"Коротко\" содержит"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Описание содержит"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Комментарий содержит"
-
-#: calendar/gui/cal-search-bar.c:53
-#, fuzzy
-msgid "Location contains"
-msgstr "Описание содержит"
-
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr "Прочее"
-
#: calendar/gui/comp-editor-factory.c:409
msgid "Error while opening the calendar"
msgstr "Ошибка при открытии календаря"
@@ -3925,223 +4425,133 @@ msgstr "Отказ в доступе при открытии календаря"
msgid "open_client(): %s"
msgstr "open_client(): %s"
-#: calendar/gui/dialogs/alarm-options.c:467
-msgid "Audio Alarm Options"
-msgstr "Параметры звукового сигнала"
-
-#: calendar/gui/dialogs/alarm-options.c:476
-msgid "Message Alarm Options"
-msgstr "Параметры сигнала-сообщения"
-
-#: calendar/gui/dialogs/alarm-options.c:485
-msgid "Email Alarm Options"
-msgstr "Параметры сигнала по почте"
-
-#: calendar/gui/dialogs/alarm-options.c:494
-msgid "Program Alarm Options"
-msgstr "Параметры программы-сигнала"
-
-#: calendar/gui/dialogs/alarm-options.c:510
-msgid "Unknown Alarm Options"
-msgstr "Параметры сигнала неизвестного типа"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "Alarm Repeat"
-msgstr "Повторение сигнала"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:3
-msgid "Message to Display:"
-msgstr "Сообщение для отображения:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Message to Send"
-msgstr "Сообщение для отправки"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Play sound:"
-msgstr "Воспроизвести звук:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Repeat the alarm"
-msgstr "Повторить сигнал"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "Run program:"
-msgstr "Запустить программу:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:8
-msgid "Send To:"
-msgstr "Отправить:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "With these arguments:"
-msgstr "С аргументами:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
-msgid "dialog1"
-msgstr "dialog1"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Alarm</b>\t"
+msgstr "<b>К:</b> "
-#: calendar/gui/dialogs/alarm-options.glade.h:12
-msgid "extra times every"
-msgstr "дополнительное время каждые"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "<b>Параметры списка задач</b>"
-#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
-msgid "hours"
-msgstr "часов"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#, fuzzy
+msgid "<b>Repeat</b>"
+msgstr "<b>К:</b> "
-#: calendar/gui/dialogs/alarm-page.c:802
-msgid "Action/Trigger"
-msgstr "Действие/Переключатель"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#, fuzzy
+msgid "Add Alarm"
+msgstr "Добавление нового календаря"
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "_Добавить"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#, fuzzy
+msgid "Custom _message"
+msgstr "Новое сообщение"
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Basics"
-msgstr "Основы"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Custom alarm sound"
+msgstr ""
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
-msgstr "Дата/Время:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "_Сообщения"
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
msgid "Play a sound"
msgstr "Воспроизвести звук"
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
msgid "Pop up an alert"
msgstr ""
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Reminders"
-msgstr "Напоминания"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
msgid "Run a program"
msgstr "Запустить программу"
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+msgid "Send To:"
+msgstr "Отправить:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
msgid "Send an email"
msgstr "Отправить почту"
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Сводка:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "_Учетная запись:"
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
-msgstr "_Параметры..."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "Запустить программу:"
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#, fuzzy
+msgid "_Repeat the alarm"
+msgstr "Повторить сигнал"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "Отправить"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
msgid "after"
msgstr "после"
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
msgid "before"
msgstr "до"
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
msgid "day(s)"
msgstr "дней"
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
msgid "end of appointment"
msgstr "завершение встречи"
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr "дополнительное время каждые"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
msgid "hour(s)"
msgstr "часов"
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
+msgstr "часов"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
msgid "minute(s)"
msgstr "минут"
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
msgid "start of appointment"
msgstr "начало встречи"
-#: calendar/gui/dialogs/calendar-setup.c:172
-msgid "You must specify a location to get the calendar from."
-msgstr "Необходимо указать адрес, откуда можно получить календарь."
-
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "Адрес источника '%s' сформирован неверно."
-
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr "Адрес источника '%s' не является адресом webcal."
-
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr "Источник с именем '%s' уже существует в выбранной группе"
-
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-#, fuzzy
-msgid "Add Calendar"
-msgstr "Добавление нового календаря"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "Группа списка задач"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "_Цвета"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
-msgid "Pick a color"
-msgstr "Выбрать цвет"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Добавление нового календаря"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-#, fuzzy
-msgid "_Add Group"
-msgstr "_Добавить группу..."
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#, fuzzy
-msgid "_Refresh:"
-msgstr "Обновить"
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
+msgstr "Действие/Переключатель"
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-#, fuzzy
-msgid "_Type:"
-msgstr "Тип:"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "_Добавить"
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
#, fuzzy
-msgid "_URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "недели"
+msgid "Alarms"
+msgstr "Сигнал в %s"
#. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
#. has "activatable" set.
@@ -4257,7 +4667,7 @@ msgid "Free/Busy Publishing"
msgstr "Запрос информации о занятости"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1048
+#: calendar/gui/dialogs/recurrence-page.c:1038
#: calendar/gui/e-itip-control.c:556
msgid "Friday"
msgstr "Пятница"
@@ -4271,7 +4681,7 @@ msgid "Minutes"
msgstr "Минут"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1044
+#: calendar/gui/dialogs/recurrence-page.c:1034
#: calendar/gui/e-itip-control.c:552
msgid "Monday"
msgstr "Понедельник"
@@ -4281,7 +4691,7 @@ msgid "S_un"
msgstr "Вск"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1049
+#: calendar/gui/dialogs/recurrence-page.c:1039
#: calendar/gui/e-itip-control.c:557
msgid "Saturday"
msgstr "Суббота"
@@ -4295,7 +4705,7 @@ msgid "Show week _numbers in date navigator"
msgstr "Показывать номера недель в навигаторе по датам"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1050
+#: calendar/gui/dialogs/recurrence-page.c:1040
#: calendar/gui/e-itip-control.c:551
msgid "Sunday"
msgstr "Воскресенье"
@@ -4309,7 +4719,7 @@ msgid "T_hu"
msgstr "Чтв"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1047
+#: calendar/gui/dialogs/recurrence-page.c:1037
#: calendar/gui/e-itip-control.c:555
msgid "Thursday"
msgstr "Четверг"
@@ -4323,7 +4733,7 @@ msgid "Time format:"
msgstr "Формат времени:"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1045
+#: calendar/gui/dialogs/recurrence-page.c:1035
#: calendar/gui/e-itip-control.c:553
msgid "Tuesday"
msgstr "Вторник"
@@ -4333,7 +4743,7 @@ msgid "W_eek starts:"
msgstr "Начало недели:"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1046
+#: calendar/gui/dialogs/recurrence-page.c:1036
#: calendar/gui/e-itip-control.c:554
msgid "Wednesday"
msgstr "Среда"
@@ -4366,7 +4776,8 @@ msgstr "Ужимать выходные дни в представлении м
msgid "_Day begins:"
msgstr "_День начинается:"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
#: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
@@ -4416,6 +4827,80 @@ msgstr "Срд"
msgid "before every appointment"
msgstr "перед каждой встречей"
+#: calendar/gui/dialogs/calendar-setup.c:172
+msgid "You must specify a location to get the calendar from."
+msgstr "Необходимо указать адрес, откуда можно получить календарь."
+
+#: calendar/gui/dialogs/calendar-setup.c:180
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "Адрес источника '%s' сформирован неверно."
+
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr "Адрес источника '%s' не является адресом webcal."
+
+#: calendar/gui/dialogs/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr "Источник с именем '%s' уже существует в выбранной группе"
+
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#, fuzzy
+msgid "Add Calendar"
+msgstr "Добавление нового календаря"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "Группа списка задач"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+msgid "C_olor:"
+msgstr "_Цвета"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "Выбрать цвет"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Добавление нового календаря"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+#, fuzzy
+msgid "_Add Group"
+msgstr "_Добавить группу..."
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+#, fuzzy
+msgid "_Refresh:"
+msgstr "Обновить"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#, fuzzy
+msgid "_Type:"
+msgstr "Тип:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, fuzzy
+msgid "_URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr "недели"
+
#: calendar/gui/dialogs/changed-comp.c:60
msgid "This event has been deleted."
msgstr "Это событие было удалено."
@@ -4460,81 +4945,75 @@ msgstr "%s Вы сделали изменения. Отменить их?"
msgid "%s You have made no changes, update the editor?"
msgstr "%s Вы ничего не изменили. Обновить редактор?"
-#: calendar/gui/dialogs/comp-editor.c:430
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+msgid "Validation error: %s"
+msgstr "Ошибка проверки: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " к "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Выполнено "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Выполнено "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (к дате"
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "К дате"
+
+#: calendar/gui/dialogs/comp-editor.c:264
msgid "Could not update object"
msgstr "Не удается обновить объект"
-#: calendar/gui/dialogs/comp-editor.c:903
-#: calendar/gui/dialogs/comp-editor.c:940
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
msgid "Edit Appointment"
msgstr "Изменить встречу"
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
#, c-format
msgid "Appointment - %s"
msgstr "Встреча - %s"
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
#, c-format
msgid "Task - %s"
msgstr "Задача - %s"
-#: calendar/gui/dialogs/comp-editor.c:914
-#: calendar/gui/dialogs/comp-editor.c:951
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
#, c-format
msgid "Journal entry - %s"
msgstr "Запись в журнале - %s"
-#: calendar/gui/dialogs/comp-editor.c:925
-#: calendar/gui/dialogs/comp-editor.c:961
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
msgid "No summary"
msgstr "Нет Краткого описания"
-#: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
-#: composer/e-msg-composer.c:1193
-msgid "Save as..."
-msgstr "Сохранить как..."
-
-#: calendar/gui/dialogs/comp-editor.c:1479
-#: calendar/gui/dialogs/comp-editor.c:1514
-#: calendar/gui/dialogs/comp-editor.c:1540
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
msgid "Changes made to this item may be discarded if an update arrives"
msgstr ""
"Изменения этого элемента будут отвергнуты, если по эл. почте придет "
"обновление."
-#: calendar/gui/dialogs/comp-editor.c:1576
+#: calendar/gui/dialogs/comp-editor.c:1387
msgid "Unable to use current version!"
msgstr "Не удается использовать текущую версию!"
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Ошибка проверки: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " к "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Выполнено "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Выполнено "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (к дате"
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "К дате"
-
#: calendar/gui/dialogs/copy-source-dialog.c:57
#, fuzzy
msgid "Could not open source"
@@ -4598,8 +5077,9 @@ msgid "The item could not be deleted due to an error"
msgstr "Этот элемент не может быть удален из-за ошибки"
#: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Addressbook..."
-msgstr "Адресная книга..."
+#, fuzzy
+msgid "Contacts..."
+msgstr "Контакты"
#: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
msgid "Delegate To:"
@@ -4609,161 +5089,225 @@ msgstr "Поручить:"
msgid "Enter Delegate"
msgstr "Ввести представителя"
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
msgid "Appointment"
msgstr "Встреча"
-#: calendar/gui/dialogs/event-editor.c:208
-msgid "Reminder"
-msgstr "Напоминание"
-
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:162
msgid "Recurrence"
msgstr "Повторение"
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
msgid "Scheduling"
msgstr "Планировка"
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:176
+#, fuzzy
+msgid "Invitations"
+msgstr "Ориентация"
+
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
msgid "Meeting"
msgstr "Собрание"
-#: calendar/gui/dialogs/event-page.c:460
+#: calendar/gui/dialogs/event-page.c:692
#, fuzzy
msgid "Event with no start date"
msgstr "Дата завершения рашьше даты окончания!"
-#: calendar/gui/dialogs/event-page.c:463
+#: calendar/gui/dialogs/event-page.c:695
msgid "Event with no end date"
msgstr ""
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
msgid "Start date is wrong"
msgstr "Дата начала неверна"
-#: calendar/gui/dialogs/event-page.c:627
+#: calendar/gui/dialogs/event-page.c:865
msgid "End date is wrong"
msgstr "Неверная дата завершения"
-#: calendar/gui/dialogs/event-page.c:650
+#: calendar/gui/dialogs/event-page.c:888
msgid "Start time is wrong"
msgstr "Неверное время начала"
-#: calendar/gui/dialogs/event-page.c:657
+#: calendar/gui/dialogs/event-page.c:895
msgid "End time is wrong"
msgstr "Неверное время завершения"
-#: calendar/gui/dialogs/event-page.c:1264
+#: calendar/gui/dialogs/event-page.c:1605
#, c-format
msgid "Unable to open the calendar '%s'."
msgstr "Не удаётся открыть календарь '%s'."
+#: calendar/gui/dialogs/event-page.c:1799
+#, fuzzy, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "перед каждой встречей"
+msgstr[1] "перед каждой встречей"
+msgstr[2] "перед каждой встречей"
+
+#: calendar/gui/dialogs/event-page.c:1807
+#, fuzzy, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "завершение встречи"
+msgstr[1] "завершение встречи"
+msgstr[2] "завершение встречи"
+
+#: calendar/gui/dialogs/event-page.c:1815
+#, fuzzy, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "перед каждой встречей"
+msgstr[1] "перед каждой встречей"
+msgstr[2] "перед каждой встречей"
+
#: calendar/gui/dialogs/event-page.glade.h:2
-msgid "A_ll day event"
-msgstr "Событие на _весь день"
+#, fuzzy
+msgid "1 day before appointment"
+msgstr "перед каждой встречей"
#: calendar/gui/dialogs/event-page.glade.h:3
-msgid "B_usy"
-msgstr "Занят"
+#, fuzzy
+msgid "1 hour before appointment"
+msgstr "перед каждой встречей"
#: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
-msgstr "Ка_тегории..."
+#, fuzzy
+msgid "15 minutes before appointment"
+msgstr "перед каждой встречей"
+
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "<b>Basics</b>"
+msgstr "<b>Параметры списка задач</b>"
#: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Classification"
-msgstr "Классификация"
+#, fuzzy
+msgid "<b>Date and Time</b>"
+msgstr "<b>К:</b> "
#: calendar/gui/dialogs/event-page.glade.h:7
-msgid "Co_nfidential"
-msgstr "Ко_нфиденциальное"
+msgid "A_ll day event"
+msgstr "Событие на _весь день"
#: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
-msgid "Date & Time"
-msgstr "Дата и время"
+#, fuzzy
+msgid "C_ustomize..."
+msgstr "Сохранить вид пользователя..."
#: calendar/gui/dialogs/event-page.glade.h:9
-msgid "F_ree"
-msgstr "Свободен"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ca_tegories..."
+msgstr "Ка_тегории..."
#: calendar/gui/dialogs/event-page.glade.h:10
+#, fuzzy
+msgid "Cale_ndar:"
+msgstr "Календарь:"
+
+#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Classi_fication:"
+msgstr "Классификация"
+
+#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
+msgstr "Конфиденциальное"
+
+#: calendar/gui/dialogs/event-page.glade.h:13
msgid "L_ocation:"
msgstr "Мес_то:"
-#: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pri_vate"
+#: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
msgstr "Личное"
-#: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Pu_blic"
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
msgstr "Общее"
-#: calendar/gui/dialogs/event-page.glade.h:13
-msgid "Show Time As"
+#: calendar/gui/dialogs/event-page.glade.h:16
+#, fuzzy
+msgid "Show time as _busy"
msgstr "Показать время как"
-#: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/event-page.glade.h:17
#: calendar/gui/dialogs/task-page.glade.h:11
msgid "Su_mmary:"
msgstr "Коротко:"
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:19
+#, fuzzy
+msgid "_Alarm"
+msgstr "О_чистить"
+
+#: calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid "_Description:"
+msgstr "Описание:"
+
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
msgid "_End time:"
msgstr "Коне_ц:"
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
msgid "_Start time:"
msgstr "Нача_ло:"
#. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
-#: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
-#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
+#: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
+#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
+#: mail/mail-config.glade.h:103
#: widgets/e-timezone-dialog/e-timezone-dialog.c:192
#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
#: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
msgid "None"
msgstr "Нет"
-#: calendar/gui/dialogs/meeting-page.c:420
+#: calendar/gui/dialogs/meeting-page.c:443
msgid "The organizer selected no longer has an account."
msgstr "Выбранный организатор больше не имеет учетной записи."
-#: calendar/gui/dialogs/meeting-page.c:426
+#: calendar/gui/dialogs/meeting-page.c:449
msgid "An organizer is required."
msgstr "Требуется организатор."
-#: calendar/gui/dialogs/meeting-page.c:441
+#: calendar/gui/dialogs/meeting-page.c:464
msgid "At least one attendee is required."
msgstr "Требуется как минимум один участник"
-#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/dialogs/meeting-page.c:753
msgid "_Delegate To..."
msgstr "Доверить..."
-#. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
-#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
-msgstr "_Удалить"
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
+msgstr "Удалить"
#: calendar/gui/dialogs/meeting-page.etspec.h:1
#: calendar/gui/e-meeting-list-view.c:218
@@ -4802,36 +5346,45 @@ msgid "Member"
msgstr "Участник"
#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-meeting-list-view.c:241
#: calendar/gui/e-meeting-time-sel.etspec.h:8
msgid "RSVP"
msgstr "Заинтересованное лицо"
#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/dialogs/task-editor.c:158
+#: calendar/gui/e-calendar-table.etspec.h:10
#: calendar/gui/e-meeting-list-view.c:248
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
+#: mail/message-list.etspec.h:12
msgid "Status"
msgstr "Состояние"
#: calendar/gui/dialogs/meeting-page.glade.h:2
#, fuzzy
-msgid "Add A_ttendee"
-msgstr "Участник"
+msgid "<b>Attendees</b>"
+msgstr "<b>К:</b> "
#: calendar/gui/dialogs/meeting-page.glade.h:3
#, fuzzy
-msgid "Add attendees from addressbook."
-msgstr "Добавить отправителя в _адресную книгу"
+msgid "<b>Organizer</b>"
+msgstr "<b>К:</b> "
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "Change Or_ganizer"
+msgstr "Изменить организатора"
#: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Организатор:"
+#: calendar/gui/e-meeting-time-sel.c:415
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "Контакты"
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "_Change Organizer"
-msgstr "Изменить организатора"
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+#, fuzzy
+msgid "_Organizer:"
+msgstr "Организатор:"
#: calendar/gui/dialogs/new-calendar.glade.h:2
msgid "<b>Calendar options</b>"
@@ -4878,8 +5431,10 @@ msgid "You are modifying a recurring task, what would you like to modify?"
msgstr "Вы изменяете повторяющуюся задачу, что именно вы хотите изменить?"
#: calendar/gui/dialogs/recur-comp.c:58
-msgid "You are modifying a recurring journal entry, what would you like to modify?"
-msgstr "Вы изменяете повторяющуюся запись в журнале, что именно вы хотите изменить?"
+msgid ""
+"You are modifying a recurring journal entry, what would you like to modify?"
+msgstr ""
+"Вы изменяете повторяющуюся запись в журнале, что именно вы хотите изменить?"
#: calendar/gui/dialogs/recur-comp.c:72
msgid "This Instance Only"
@@ -4897,147 +5452,142 @@ msgstr "Эту и последующие записи"
msgid "All Instances"
msgstr "Все записи"
-#: calendar/gui/dialogs/recurrence-page.c:542
+#: calendar/gui/dialogs/recurrence-page.c:511
msgid "This appointment contains recurrences that Evolution cannot edit."
msgstr "Эта встреча имеет правила повторения, не редактируемые в Evolution."
-#: calendar/gui/dialogs/recurrence-page.c:816
+#: calendar/gui/dialogs/recurrence-page.c:806
msgid "Recurrence date is invalid"
msgstr "Повторяющаяся дата некорректна"
-#: calendar/gui/dialogs/recurrence-page.c:927
+#: calendar/gui/dialogs/recurrence-page.c:917
msgid "on"
msgstr "в"
-#: calendar/gui/dialogs/recurrence-page.c:988
+#: calendar/gui/dialogs/recurrence-page.c:978
msgid "first"
msgstr "первый"
-#: calendar/gui/dialogs/recurrence-page.c:989
+#: calendar/gui/dialogs/recurrence-page.c:979
msgid "second"
msgstr "секунда"
-#: calendar/gui/dialogs/recurrence-page.c:990
+#: calendar/gui/dialogs/recurrence-page.c:980
msgid "third"
msgstr "третий"
-#: calendar/gui/dialogs/recurrence-page.c:991
+#: calendar/gui/dialogs/recurrence-page.c:981
msgid "fourth"
msgstr "четвертый"
-#: calendar/gui/dialogs/recurrence-page.c:992
+#: calendar/gui/dialogs/recurrence-page.c:982
msgid "last"
msgstr "последний"
-#: calendar/gui/dialogs/recurrence-page.c:1015
+#: calendar/gui/dialogs/recurrence-page.c:1005
msgid "Other Date"
msgstr "Другая дата"
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1033
msgid "day"
msgstr "день"
-#: calendar/gui/dialogs/recurrence-page.c:1180
+#: calendar/gui/dialogs/recurrence-page.c:1170
msgid "on the"
msgstr " "
-#: calendar/gui/dialogs/recurrence-page.c:1366
+#: calendar/gui/dialogs/recurrence-page.c:1356
msgid "occurrences"
msgstr "случаи"
-#: calendar/gui/dialogs/recurrence-page.c:2336
+#: calendar/gui/dialogs/recurrence-page.c:2309
msgid "Date/Time"
msgstr "Дата/Время"
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
-msgid "Every"
-msgstr "Каждый"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
-msgid "Exceptions"
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#, fuzzy
+msgid "<b>Exceptions</b>"
msgstr "Исключения"
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
-msgid "Preview"
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
+#, fuzzy
+msgid "<b>Preview</b>"
msgstr "Предварительный просмотр"
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
-msgid "Recurrence Rule"
-msgstr "Правило повторения"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "_Custom recurrence"
-msgstr "Другое повторение"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
-msgstr "Изменить"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "_No recurrence"
-msgstr "Без повторения"
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#, fuzzy
+msgid "<b>Recurrence</b>"
+msgstr "Повторение"
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:453
-msgid "_Remove"
-msgstr "Удалить"
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Каждый"
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "_Simple recurrence"
-msgstr "Простое повторение"
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#, fuzzy
+msgid "This appointment rec_urs"
+msgstr "_Изменить встречу"
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
msgid "for"
msgstr "в"
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
msgid "forever"
msgstr "всегда"
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
msgid "month(s)"
msgstr "месяцы"
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
msgid "until"
msgstr "до"
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
msgid "week(s)"
msgstr "неделя"
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
msgid "year(s)"
msgstr "год(лет)"
-#: calendar/gui/dialogs/select-source-dialog.c:69
+#: calendar/gui/dialogs/select-source-dialog.c:84
#, fuzzy
msgid "Select destination"
msgstr "Назначение:"
-#: calendar/gui/dialogs/select-source-dialog.c:90
+#: calendar/gui/dialogs/select-source-dialog.c:106
#, fuzzy
msgid "_Destination"
msgstr "Папка _черновиков:"
-#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/dialogs/select-source-dialog.c:108
msgid "Task List"
msgstr "Список задач"
-#: calendar/gui/dialogs/task-details-page.c:406
+#: calendar/gui/dialogs/task-details-page.c:427
msgid "Completed date is wrong"
msgstr "Дата выполнения некорректна"
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgstr "<b>_Отображаемые заголовки письма</b>"
+
#: calendar/gui/dialogs/task-details-page.glade.h:2
-#, no-c-format
-msgid "% _Complete"
-msgstr "% _Выполнено"
+#, fuzzy
+msgid "<span weight=\"bold\">Status</span>"
+msgstr "Отправленные сообщения и черновики"
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
#: calendar/gui/dialogs/task-details-page.glade.h:4
#: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
+#: calendar/gui/print.c:2346
msgid "Completed"
msgstr "Выполнено"
@@ -5049,8 +5599,8 @@ msgstr "Высокий"
#: calendar/gui/dialogs/task-details-page.glade.h:6
#: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
#: calendar/gui/print.c:2343
msgid "In Progress"
msgstr "В процессе"
@@ -5062,22 +5612,22 @@ msgid "Low"
msgstr "Низкий"
#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:959
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
msgid "Normal"
msgstr "Нормальный"
#: calendar/gui/dialogs/task-details-page.glade.h:9
#: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
msgid "Not Started"
msgstr "Не начато"
#: calendar/gui/dialogs/task-details-page.glade.h:10
-msgid "Progress"
-msgstr "Продвижение"
+#, fuzzy
+msgid "P_ercent complete:"
+msgstr "Завершено процентов: %i"
#: calendar/gui/dialogs/task-details-page.glade.h:11
#: calendar/gui/e-calendar-table.c:377
@@ -5101,36 +5651,42 @@ msgstr "Состояние:"
msgid "_Web Page:"
msgstr "_Веб-страница:"
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+msgid "Task"
+msgstr "Задание"
+
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
msgid "Assignment"
msgstr "Назначение"
-#: calendar/gui/dialogs/task-page.c:486
+#: calendar/gui/dialogs/task-page.c:496
msgid "Due date is wrong"
msgstr "Дата выполнения некорректна"
-#: calendar/gui/dialogs/task-page.c:823
+#: calendar/gui/dialogs/task-page.c:831
#, c-format
msgid "Unable to open tasks in '%s'."
msgstr "Не удается открыть задачи в '%s'."
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "Кон_фиденциально"
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, fuzzy
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr "Уведомление о новой почте"
+
+#: calendar/gui/dialogs/task-page.glade.h:3
+#, fuzzy
+msgid "<span weight=\"bold\">Date and Time</span>"
+msgstr "Отправленные сообщения и черновики"
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:7
#: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
msgid "Description:"
msgstr "Описание:"
-#: calendar/gui/dialogs/task-page.glade.h:7
-msgid "Folder:"
-msgstr "Папка:"
-
#: calendar/gui/dialogs/task-page.glade.h:10
#, fuzzy
msgid "Sta_rt date:"
@@ -5141,55 +5697,59 @@ msgstr "Дата начала:"
msgid "_Due date:"
msgstr "Дата выполнения:"
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:13
#, fuzzy
-msgid "Authentication Credentials for HTTP Server"
-msgstr "Неверный ответ от сервера при идентификации."
+msgid "_Group:"
+msgstr "Группа"
#: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "Calendars selected for publishing"
-msgstr "Календари, выбранные для публикации"
+#, fuzzy
+msgid "<b>Free/Busy C_alendars</b>"
+msgstr "<b>Параметры календаря</b>"
#: calendar/gui/dialogs/url-editor-dialog.glade.h:4
#, fuzzy
-msgid "Daily"
-msgstr "День"
+msgid "<b>Publishing Frequency</b>"
+msgstr "Частота публикации"
#: calendar/gui/dialogs/url-editor-dialog.glade.h:5
#, fuzzy
-msgid "Free/Busy Editor"
-msgstr "Информация о занятости"
+msgid "<b>Publishing _Location</b>"
+msgstr "Адрес для публикации занятости"
#: calendar/gui/dialogs/url-editor-dialog.glade.h:6
-msgid "Free/Busy Publishing Location"
-msgstr "Адрес для публикации занятости"
+#, fuzzy
+msgid "Free/Busy Editor"
+msgstr "Информация о занятости"
#: calendar/gui/dialogs/url-editor-dialog.glade.h:7
-msgid "Login name:"
-msgstr "Учетное имя:"
+#, fuzzy
+msgid "_Daily"
+msgstr "День"
#: calendar/gui/dialogs/url-editor-dialog.glade.h:8
-msgid "Password:"
-msgstr "Пароль:"
+#, fuzzy
+msgid "_Manual"
+msgstr "_Почта:"
#: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
-msgstr "Частота публикации"
+#, fuzzy
+msgid "_Password:"
+msgstr "Пароль:"
#: calendar/gui/dialogs/url-editor-dialog.glade.h:10
-msgid "Remember password"
+#, fuzzy
+msgid "_Remember password"
msgstr "Запомнить пароль"
#: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "URL:"
-msgstr "URL:"
+#, fuzzy
+msgid "_Username:"
+msgstr "_Имя пользователя:"
#: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "User Publishes"
-msgstr ""
-
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
-msgid "Weekly"
+#, fuzzy
+msgid "_Weekly"
msgstr "Еженедельно"
#: calendar/gui/e-alarm-list.c:395
@@ -5276,7 +5836,7 @@ msgstr "%s на %s"
msgid "%s for an unknown trigger type"
msgstr "%s для неизвестного типа переключателя"
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2382
#, c-format
msgid "Click to open %s"
msgstr "Нажмите, чтобы открыть %s"
@@ -5285,6 +5845,11 @@ msgstr "Нажмите, чтобы открыть %s"
msgid "Untitled"
msgstr "Неозаглавленное"
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Сводка:"
+
#: calendar/gui/e-cal-component-preview.c:194
#: calendar/gui/e-cal-component-preview.c:205
msgid "Start Date:"
@@ -5296,7 +5861,7 @@ msgstr "Дата выполнения:"
#. write status
#: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:943
+#: calendar/gui/e-itip-control.c:956
msgid "Status:"
msgstr "Состояние:"
@@ -5309,20 +5874,94 @@ msgstr "Приоритет:"
msgid "Web Page:"
msgstr "_Веб-страница:"
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
-msgid "Public"
-msgstr "Общее"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+#, fuzzy
+msgid "End Date"
+msgstr "Дата"
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:330
-msgid "Private"
-msgstr "Личное"
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr "Дата начала"
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:332
-msgid "Confidential"
-msgstr "Конфиденциальное"
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+msgid "Summary"
+msgstr "Сводка"
+
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+msgid "Free"
+msgstr "Свободен"
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "Занят"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "С"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "Ю"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "В"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "З"
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"Географическое положение должно быть введено в формате:\n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "Да"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "Нет"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
+#: camel/camel-gpg-context.c:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Неизвестно"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Повторение"
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr "Назначено"
#: calendar/gui/e-calendar-table.c:396
msgid "0%"
@@ -5368,95 +6007,101 @@ msgstr "90%"
msgid "100%"
msgstr "100%"
-#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "Свободен"
-
-#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Занят"
-
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
+#: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
msgid "Deleting selected objects"
msgstr "Удаление выделенных объектов"
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
+#: calendar/gui/e-calendar-table.c:843 calendar/gui/e-calendar-view.c:751
msgid "Updating objects"
msgstr "Обновление объектов"
-#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
-#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
+#: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
msgid "_Open"
msgstr "_Открыть"
-#: calendar/gui/e-calendar-table.c:1023
+#: calendar/gui/e-calendar-table.c:1020
msgid "Open _Web Page"
msgstr "Открыть _веб-страницу"
-#: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
-#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
+#: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
+#: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
#: ui/evolution-mail-message.xml.h:128
msgid "_Save As..."
msgstr "Со_хранить как..."
-#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
-#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1064
+#: calendar/gui/e-calendar-view.c:1319 calendar/gui/e-calendar-view.c:1342
+#: calendar/gui/e-calendar-view.c:1424 ui/evolution-addressbook.xml.h:40
#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
#: ui/evolution-tasks.xml.h:25
msgid "_Print..."
msgstr "_Печать..."
-#: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-table.c:1026 calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-view.c:1347 calendar/gui/e-calendar-view.c:1390
#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
#: ui/evolution-tasks.xml.h:1
msgid "C_ut"
msgstr "_Вырезать"
-#: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
-#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
-#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
+#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
+#: ui/evolution-tasks.xml.h:20
msgid "_Copy"
msgstr "_Копировать"
-#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
-#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-table.c:1028 calendar/gui/e-calendar-table.c:1062
+#: calendar/gui/e-calendar-view.c:1323 calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1422 ui/evolution-addressbook.xml.h:38
#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
msgid "_Paste"
msgstr "Вст_авить"
-#: calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-calendar-table.c:1032
msgid "_Assign Task"
msgstr "_Назначить задачу"
-#: calendar/gui/e-calendar-table.c:1036
+#: calendar/gui/e-calendar-table.c:1033
msgid "_Forward as iCalendar"
msgstr "_Переслать как iCalendar"
-#: calendar/gui/e-calendar-table.c:1037
+#: calendar/gui/e-calendar-table.c:1034
msgid "_Mark as Complete"
msgstr "По_метить как выполненное"
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1035
msgid "_Mark Selected Tasks as Complete"
msgstr "По_метить выбранную задачу как выполненную"
-#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1061
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "_Удалить"
+
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
msgid "_Delete Selected Tasks"
msgstr "У_далить выделенные задачи"
-#: calendar/gui/e-calendar-table.c:1353
-#: calendar/gui/e-calendar-table.etspec.h:3
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr "Сохранить как..."
+
+#: calendar/gui/e-calendar-table.c:1350
+#: calendar/gui/e-calendar-table.etspec.h:4
msgid "Click to add a task"
msgstr "Щёлкните здесь, чтобы добавить задачу"
@@ -5465,182 +6110,112 @@ msgstr "Щёлкните здесь, чтобы добавить задачу"
msgid "% Complete"
msgstr "% Выполнено"
-#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:615
+#: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
+#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
msgid "Complete"
msgstr "Выполнено"
-#: calendar/gui/e-calendar-table.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:6
#, fuzzy
msgid "Completion date"
msgstr "Дата выполнения"
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.etspec.h:7
#, fuzzy
msgid "Due date"
msgstr "Срок выполнения"
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
msgid "Priority"
msgstr "Приоритет"
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
#, fuzzy
msgid "Start date"
msgstr "Дата начала"
-#: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-cal-list-view.etspec.h:4 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Сводка"
-
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
msgid "Task sort"
msgstr "Сортировка задач"
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
+#: calendar/gui/e-calendar-view.c:1156
+#, fuzzy
+msgid "Moving items"
+msgstr "Перемещение сообщений"
+
+#: calendar/gui/e-calendar-view.c:1158
+#, fuzzy
+msgid "Copying items"
+msgstr "Копирование сообщений"
+
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1400
msgid "New _Appointment..."
msgstr "Новая _встреча..."
-#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1405
msgid "New All Day _Event"
msgstr "Новое ежедневное событие"
-#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1410
msgid "New Meeting"
msgstr "Новое собрание"
-#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1415
msgid "New Task"
msgstr "Новая задача"
-#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1329 ui/evolution-calendar.xml.h:26
#, fuzzy
msgid "Select _Today"
msgstr "Выделить подшивку"
-#: calendar/gui/e-calendar-view.c:1283
+#: calendar/gui/e-calendar-view.c:1330
#, fuzzy
msgid "_Select Date..."
msgstr "_Выбрать..."
-#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1334 ui/evolution-calendar.xml.h:45
msgid "_Publish Free/Busy Information"
msgstr "Опубликовать информацию о занятости"
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1353
#, fuzzy
msgid "Cop_y to Calendar..."
msgstr "Копировать в папку..."
-#: calendar/gui/e-calendar-view.c:1307
+#: calendar/gui/e-calendar-view.c:1354
#, fuzzy
msgid "Mo_ve to Calendar..."
msgstr "Переместить в папку..."
-#: calendar/gui/e-calendar-view.c:1308
+#: calendar/gui/e-calendar-view.c:1355
msgid "_Schedule Meeting..."
msgstr "_Назначить собрание..."
-#: calendar/gui/e-calendar-view.c:1309
+#: calendar/gui/e-calendar-view.c:1356
msgid "_Forward as iCalendar..."
msgstr "_Переслать как iCalendar..."
-#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1361 calendar/gui/e-calendar-view.c:1393
msgid "Delete this _Occurrence"
msgstr "Удалить это вхождение"
-#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
+#: calendar/gui/e-calendar-view.c:1362 calendar/gui/e-calendar-view.c:1394
msgid "Delete _All Occurrences"
msgstr "Удалить все вхождения"
-#: calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1396
msgid "Go to _Today"
msgstr "Перейти к сег_одняшнему дню"
-#: calendar/gui/e-calendar-view.c:1351
+#: calendar/gui/e-calendar-view.c:1398
msgid "_Go to Date..."
msgstr "Пере_йти к дате..."
-#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
+#: calendar/gui/e-calendar-view.c:1428 ui/evolution.xml.h:35
msgid "_Settings..."
msgstr "_Настройка..."
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#, fuzzy
-msgid "End Date"
-msgstr "Дата"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Дата начала"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
-#: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1534
-#: camel/providers/imap4/camel-imap4-engine.c:1561
-#: camel/providers/imap4/camel-imap4-engine.c:1591
-#: camel/providers/imap4/camel-imap4-engine.c:1631
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#: camel/providers/imap4/camel-imap4-utils.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
-#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Неизвестно"
-
-#: calendar/gui/e-cal-model.c:911
-msgid "Recurring"
-msgstr "Повторение"
-
-#: calendar/gui/e-cal-model.c:913
-msgid "Assigned"
-msgstr "Назначено"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "Да"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Нет"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "С"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "Ю"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
-msgid "E"
-msgstr "В"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "З"
-
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Географическое положение должно быть введено в формате:\n"
-"\n"
-"45.436845,125.862501"
-
#. strftime format of a weekday, a date and a time, 24-hour.
#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
#: e-util/e-time-utils.c:393
@@ -5664,36 +6239,36 @@ msgstr ""
"\n"
"%s"
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "Деления через %02i минут"
#. 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.c:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
#: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
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.c:1604 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
#: calendar/gui/e-week-view-main-item.c:343
msgid "%d %b"
msgstr "%d %b"
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "Деления через %02i минут"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "pm"
#: calendar/gui/e-itip-control.c:585
msgid "Yes. (Complex Recurrence)"
@@ -5766,37 +6341,35 @@ msgid ", ending on "
msgstr ", заканчивается на"
#: calendar/gui/e-itip-control.c:686
-msgid "<b>Starts:</b> "
-msgstr "<b>Начинается:</b> "
-
-#: calendar/gui/e-itip-control.c:696
-msgid "<b>Ends:</b> "
-msgstr "<b>Заканчивается:</b>"
+#, fuzzy
+msgid "Starts"
+msgstr "Состояние"
-#: calendar/gui/e-itip-control.c:716
-msgid "<b>Completed:</b> "
-msgstr "<b>Выполнено:</b>"
+#: calendar/gui/e-itip-control.c:699
+msgid "Ends"
+msgstr ""
-#: calendar/gui/e-itip-control.c:726
-msgid "<b>Due:</b> "
-msgstr "<b>К:</b> "
+#: calendar/gui/e-itip-control.c:733
+#, fuzzy
+msgid "Due"
+msgstr "К дате"
-#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
+#: calendar/gui/e-itip-control.c:773 calendar/gui/e-itip-control.c:830
msgid "iCalendar Information"
msgstr "Сведения iCalendar"
#. Title
-#: calendar/gui/e-itip-control.c:781
+#: calendar/gui/e-itip-control.c:790
msgid "iCalendar Error"
msgstr "Ошибка iCalendar"
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
-#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:862 calendar/gui/e-itip-control.c:878
+#: calendar/gui/e-itip-control.c:889 calendar/gui/e-itip-control.c:906
msgid "An unknown person"
msgstr "Неизвестное лицо"
#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:913
msgid ""
"<br> Please review the following information, and then select an action from "
"the menu below."
@@ -5804,307 +6377,289 @@ msgstr ""
"<b> Пересмотрите следующую информацию и выберите действие из расположенного "
"ниже меню."
-#: calendar/gui/e-itip-control.c:918
-msgid "<i>None</i>"
-msgstr "<i>Нет</i>"
-
-#: calendar/gui/e-itip-control.c:929
+#: calendar/gui/e-itip-control.c:942
msgid "Location:"
msgstr "Расположение:"
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-meeting-list-view.c:158
#: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
#: calendar/gui/itip-utils.c:422
msgid "Accepted"
msgstr "Принято"
-#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:425
msgid "Tentatively Accepted"
msgstr "Экспериментально принятый"
-#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
+#: calendar/gui/e-itip-control.c:969 calendar/gui/e-meeting-list-view.c:159
#: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
#: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
msgid "Declined"
msgstr "Отклонено"
-#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
-#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
-#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
+#: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095
+#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1121
msgid "Choose an action:"
msgstr "Выберите действие:"
-#: calendar/gui/e-itip-control.c:1016
+#: calendar/gui/e-itip-control.c:1029
msgid "Update"
msgstr "Обновить"
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
-#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
-#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
-#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
msgid "OK"
msgstr "Ок"
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1057
msgid "Accept"
msgstr "Принять"
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058
msgid "Tentatively accept"
msgstr "Принять экспериментально"
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1059
msgid "Decline"
msgstr "Отклонить"
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1083
msgid "Send Free/Busy Information"
msgstr "Отправить информацию о занятости"
-#: calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096
msgid "Update respondent status"
msgstr "Обновить состояние"
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1109
msgid "Send Latest Information"
msgstr "Отправить последнюю информацию"
-#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:442
#: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
#: ui/evolution-mail-global.xml.h:1
msgid "Cancel"
msgstr "Отменить"
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1198
#, c-format
msgid "<b>%s</b> has published meeting information."
msgstr "<b>%s</b> опубликовал последнюю информацию о собрании."
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1199
msgid "Meeting Information"
msgstr "Информация о собрании"
-#: calendar/gui/e-itip-control.c:1191
+#: calendar/gui/e-itip-control.c:1204
#, c-format
msgid "<b>%s</b> requests the presence of %s at a meeting."
msgstr "<b>%s</b> запрашивает присутствие %s на собрании."
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1206
#, c-format
msgid "<b>%s</b> requests your presence at a meeting."
msgstr "<b>%s</b> запрашивает ваше присутствие на собрании."
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1207
msgid "Meeting Proposal"
msgstr "Предложение собрания"
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1211
#, c-format
msgid "<b>%s</b> wishes to add to an existing meeting."
msgstr "<b>%s</b> желает добавить к существующему собранию."
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1212
msgid "Meeting Update"
msgstr "Обновление собрания"
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1216
#, c-format
msgid "<b>%s</b> wishes to receive the latest meeting information."
msgstr "<b>%s</b> желает получить последнюю информацию о собрании."
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1217
msgid "Meeting Update Request"
msgstr "Запрос обновления собрания"
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1224
#, c-format
msgid "<b>%s</b> has replied to a meeting request."
msgstr "<b>%s</b> ответил на приглашение на собрание."
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1225
msgid "Meeting Reply"
msgstr "Ответ собрания"
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1232
#, c-format
msgid "<b>%s</b> has cancelled a meeting."
msgstr "<b>%s</b> отменил собрание."
-#: calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1233
msgid "Meeting Cancellation"
msgstr "Отмена собрания"
-#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1343
#, c-format
msgid "<b>%s</b> has sent an unintelligible message."
msgstr "<b>%s</b> отправил невразумительное сообщение."
-#: calendar/gui/e-itip-control.c:1228
+#: calendar/gui/e-itip-control.c:1241
msgid "Bad Meeting Message"
msgstr "Неверное сообщение собрания"
-#: calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1266
#, c-format
msgid "<b>%s</b> has published task information."
msgstr "<b>%s</b> опубликовал информацию о задаче"
-#: calendar/gui/e-itip-control.c:1254
+#: calendar/gui/e-itip-control.c:1267
msgid "Task Information"
msgstr "Информация о задаче"
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1272
#, c-format
msgid "<b>%s</b> requests %s to perform a task."
msgstr "<b>%s</b> запрашивает %s для выполнения задачи."
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1274
#, c-format
msgid "<b>%s</b> requests you perform a task."
msgstr "<b>%s</b> запрашивает, чтобы вы выполнили задачу."
-#: calendar/gui/e-itip-control.c:1262
+#: calendar/gui/e-itip-control.c:1275
msgid "Task Proposal"
msgstr "Предложение задачи"
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1279
#, c-format
msgid "<b>%s</b> wishes to add to an existing task."
msgstr "<b>%s</b> желает добавить к существующей задаче."
-#: calendar/gui/e-itip-control.c:1267
+#: calendar/gui/e-itip-control.c:1280
msgid "Task Update"
msgstr "Обновление задачи"
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1284
#, c-format
msgid "<b>%s</b> wishes to receive the latest task information."
msgstr "<b>%s</b> желает получить последнюю информацию о задаче."
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1285
msgid "Task Update Request"
msgstr "Запрос обновления задачи"
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1292
#, c-format
msgid "<b>%s</b> has replied to a task assignment."
msgstr "<b>%s</b> ответил на назначение задачи."
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1293
msgid "Task Reply"
msgstr "Ответ собрания"
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1300
#, c-format
msgid "<b>%s</b> has cancelled a task."
msgstr "<b>%s</b> отменил задачу."
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1301
msgid "Task Cancellation"
msgstr "Отмена задачи"
-#: calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1309
msgid "Bad Task Message"
msgstr "Сообщение календаря"
-#: calendar/gui/e-itip-control.c:1315
+#: calendar/gui/e-itip-control.c:1328
#, c-format
msgid "<b>%s</b> has published free/busy information."
msgstr "<b>%s</b> опубликовал информацию о занятости."
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1329
msgid "Free/Busy Information"
msgstr "Информация о занятости"
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1333
#, c-format
msgid "<b>%s</b> requests your free/busy information."
msgstr "<b>%s</b> запрашивает информацию о вашей занятости."
-#: calendar/gui/e-itip-control.c:1321
+#: calendar/gui/e-itip-control.c:1334
msgid "Free/Busy Request"
msgstr "Запрос информации о занятости"
-#: calendar/gui/e-itip-control.c:1325
+#: calendar/gui/e-itip-control.c:1338
#, c-format
msgid "<b>%s</b> has replied to a free/busy request."
msgstr "<b>%s</b> ответил на запрос информации о занятости."
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1339
msgid "Free/Busy Reply"
msgstr "Ответ занятости"
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1344
msgid "Bad Free/Busy Message"
msgstr "Неверное сообщение о занятости"
-#: calendar/gui/e-itip-control.c:1406
+#: calendar/gui/e-itip-control.c:1419
msgid "The message does not appear to be properly formed"
msgstr "Похоже что сообщение не было правильно сформировано"
-#: calendar/gui/e-itip-control.c:1465
+#: calendar/gui/e-itip-control.c:1478
msgid "The message contains only unsupported requests."
msgstr "Это сообщение содержит только неподдерживаемые запросы"
-#: calendar/gui/e-itip-control.c:1496
+#: calendar/gui/e-itip-control.c:1509
msgid "The attachment does not contain a valid calendar message"
msgstr "Вложение не содержит правильного сообщения календаря."
-#: calendar/gui/e-itip-control.c:1528
+#: calendar/gui/e-itip-control.c:1541
msgid "The attachment has no viewable calendar items"
msgstr "Вложение не содержит пригодных для просмотра элементов календаря."
-#: calendar/gui/e-itip-control.c:1762
+#: calendar/gui/e-itip-control.c:1775
msgid "Update complete\n"
msgstr "Обновление закончено\n"
-#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr ""
-"Статус участника не может быть обновлён, потому что элемент больше не "
-"существует"
-
-#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
+#: calendar/gui/e-itip-control.c:1803
msgid "Object is invalid and cannot be updated\n"
msgstr "Объект некорректен и не может быть обновлен\n"
-#: calendar/gui/e-itip-control.c:1818
+#: calendar/gui/e-itip-control.c:1813
msgid "This response is not from a current attendee. Add as an attendee?"
-msgstr "Этот ответ пришел не от текущего участника. Добавить его, как участника?"
+msgstr ""
+"Этот ответ пришел не от текущего участника. Добавить его, как участника?"
-#: calendar/gui/e-itip-control.c:1830
+#: calendar/gui/e-itip-control.c:1825
msgid "Attendee status could not be updated because of an invalid status!\n"
-msgstr "Статус участника не может быть обновлён из-за неверного текущего статуса!\n"
-
-#: calendar/gui/e-itip-control.c:1849
-msgid "There was an error on the CORBA system\n"
-msgstr "В системе CORBA произошла ошибка\n"
-
-#: calendar/gui/e-itip-control.c:1852
-msgid "Object could not be found\n"
-msgstr "Объект не может быть найден!\n"
-
-#: calendar/gui/e-itip-control.c:1855
-msgid "You don't have the right permissions to update the calendar\n"
-msgstr "У вас нет соответствующих прав для обновления календаря\n"
+msgstr ""
+"Статус участника не может быть обновлён из-за неверного текущего статуса!\n"
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1842
msgid "Attendee status updated\n"
msgstr "Статус участника обновлён!\n"
-#: calendar/gui/e-itip-control.c:1861
-msgid "Attendee status could not be updated!\n"
-msgstr "Статус участника не может быть обновлён!\n"
+#: calendar/gui/e-itip-control.c:1845
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr ""
+"Статус участника не может быть обновлён, потому что элемент больше не "
+"существует"
-#: calendar/gui/e-itip-control.c:1892
+#: calendar/gui/e-itip-control.c:1872
msgid "Removal Complete"
msgstr "Удаление завершено"
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
msgid "Item sent!\n"
msgstr "Элемент отправлен!\n"
-#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
msgid "The item could not be sent!\n"
msgstr "Элемент не может быть послан!\n"
@@ -6133,6 +6688,10 @@ msgstr "Загрузка календаря"
msgid "Loading calendar..."
msgstr "Загрузка календаря..."
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Организатор:"
+
#: calendar/gui/e-itip-control.glade.h:10
msgid "Server Message:"
msgstr "Сообщение сервера:"
@@ -6149,11 +6708,6 @@ msgstr "дата-начала"
msgid "Chair Persons"
msgstr "Председатели"
-#: calendar/gui/e-meeting-list-view.c:60
-#: calendar/gui/e-meeting-list-view.c:457
-msgid "Required Participants"
-msgstr "Необходимые участники"
-
#: calendar/gui/e-meeting-list-view.c:61
msgid "Optional Participants"
msgstr "Дополнительные участники"
@@ -6221,6 +6775,28 @@ msgstr "Передано"
msgid "In Process"
msgstr "В процессе"
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2053
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d %B %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2086 e-util/e-time-utils.c:203
+#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
+msgid "%a %m/%d/%Y"
+msgstr "%a, %d.%m.%Y"
+
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
+msgid "%m/%d/%Y"
+msgstr "%d.%m.%Y"
+
#: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
msgid "Out of Office"
msgstr "Вне офиса"
@@ -6229,98 +6805,64 @@ msgstr "Вне офиса"
msgid "No Information"
msgstr "Нет информации"
-#: calendar/gui/e-meeting-time-sel.c:417
+#: calendar/gui/e-meeting-time-sel.c:432
#, fuzzy
-msgid "Add attendees from addressbook"
-msgstr "Добавить отправителя в _адресную книгу"
-
-#: calendar/gui/e-meeting-time-sel.c:440
-msgid "_Options"
+msgid "O_ptions"
msgstr "Параметры"
-#: calendar/gui/e-meeting-time-sel.c:457
+#: calendar/gui/e-meeting-time-sel.c:449
#, fuzzy
msgid "Show _only working hours"
msgstr "Показывать только рабочие часы"
-#: calendar/gui/e-meeting-time-sel.c:467
+#: calendar/gui/e-meeting-time-sel.c:459
#, fuzzy
msgid "Show _zoomed out"
msgstr "Показывать уменьшенные"
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:474
#, fuzzy
msgid "_Update free/busy"
msgstr "Обновить информацию о занятости"
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:489
msgid "_<<"
msgstr "<_<"
-#: calendar/gui/e-meeting-time-sel.c:515
+#: calendar/gui/e-meeting-time-sel.c:507
msgid "_Autopick"
msgstr "Автовыбор"
-#: calendar/gui/e-meeting-time-sel.c:530
+#: calendar/gui/e-meeting-time-sel.c:522
msgid ">_>"
msgstr ">_>"
-#: calendar/gui/e-meeting-time-sel.c:547
+#: calendar/gui/e-meeting-time-sel.c:539
#, fuzzy
msgid "_All people and resources"
msgstr "Все люди и ресурсы"
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:548
#, fuzzy
msgid "All _people and one resource"
msgstr "Все люди и один ресурс"
-#: calendar/gui/e-meeting-time-sel.c:565
+#: calendar/gui/e-meeting-time-sel.c:557
#, fuzzy
msgid "_Required people"
msgstr "Требуемые люди"
-#: calendar/gui/e-meeting-time-sel.c:574
+#: calendar/gui/e-meeting-time-sel.c:566
#, fuzzy
msgid "Required people and _one resource"
msgstr "Требуемые люди и один ресурс"
-#: calendar/gui/e-meeting-time-sel.c:593
-msgid "Meeting _start time:"
-msgstr "Время _начала собрания:"
-
-#: calendar/gui/e-meeting-time-sel.c:613
-msgid "Meeting _end time:"
-msgstr "Время _завершения собрания:"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2060
-#: calendar/gui/e-meeting-time-sel-item.c:452
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d %B %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2093
-#: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
-#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
-msgid "%a %m/%d/%Y"
-msgstr "%a, %d.%m.%Y"
-
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
-msgid "%m/%d/%Y"
-msgstr "%d.%m.%Y"
-
#: calendar/gui/e-pub-utils.c:300
#, c-format
msgid "Enter the password for %s"
msgstr "Введите пароль для %s"
-#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
+#: calendar/gui/e-tasks.c:709 calendar/gui/gnome-cal.c:2159
#, c-format
msgid ""
"Error on %s:\n"
@@ -6329,117 +6871,52 @@ msgstr ""
"Ошибка в \"%s\":\n"
"%s"
-#. FIXME Loading should be async
-#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:801
+#: calendar/gui/e-tasks.c:755
+msgid "Loading tasks"
+msgstr "Загрузка задач"
+
+#: calendar/gui/e-tasks.c:846
#, c-format
msgid "Opening tasks at %s"
msgstr "Открытие задач %s"
-#: calendar/gui/e-tasks.c:824
-#, c-format
-msgid ""
-"Error opening %s:\n"
-"%s"
-msgstr ""
-"Ошибка открытия %s:\n"
-"%s"
-
-#: calendar/gui/e-tasks.c:845
-msgid "Loading tasks"
-msgstr "Загрузка задач"
-
-#: calendar/gui/e-tasks.c:949
+#: calendar/gui/e-tasks.c:962
msgid "Completing tasks..."
msgstr "Завершение выполнения задач..."
-#: calendar/gui/e-tasks.c:972
+#: calendar/gui/e-tasks.c:985
msgid "Deleting selected objects..."
msgstr "Удаление выделенных объектов..."
-#: calendar/gui/e-tasks.c:999
+#: calendar/gui/e-tasks.c:1012
msgid "Expunging"
msgstr "Очистка папки"
-#: calendar/gui/e-tasks.c:1075
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
-#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Задачи"
+#: calendar/gui/gnome-cal.c:704
+#, fuzzy
+msgid "Updating query"
+msgstr "Обновление объектов"
-#: calendar/gui/gnome-cal.c:1878
+#: calendar/gui/gnome-cal.c:2006
#, fuzzy, c-format
msgid "Loading appointments at %s"
msgstr "Встреча - %s"
-#: calendar/gui/gnome-cal.c:1897
+#: calendar/gui/gnome-cal.c:2025
#, fuzzy, c-format
msgid "Loading tasks at %s"
msgstr "Загрузка задач"
-#: calendar/gui/gnome-cal.c:1920
+#: calendar/gui/gnome-cal.c:2048
#, c-format
msgid "Opening %s"
msgstr "Открывается %s"
-#: calendar/gui/gnome-cal.c:2906
+#: calendar/gui/gnome-cal.c:3003
#, fuzzy
msgid "Purging"
msgstr "Турин"
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr "Календарь и задачи"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Здесь можно настроить вашу временную зону, календарь и список задач"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar and Tasks"
-msgstr "Календарь и задачи Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution Calendar configuration control"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution Calendar scheduling message viewer"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution Calendar/Task editor"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr "Компонент календаря Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Компонент задач Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#, fuzzy
-msgid "_Calendars"
-msgstr "Календари"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Задачи"
-
#: calendar/gui/goto-dialog.glade.h:1
msgid "April"
msgstr "Апрель"
@@ -6787,10 +7264,6 @@ msgstr "Выбранный месяц (%b %Y)"
msgid "Selected year (%Y)"
msgstr "Выбранный год (%Y)"
-#: calendar/gui/print.c:2297
-msgid "Task"
-msgstr "Задание"
-
#: calendar/gui/print.c:2356
#, c-format
msgid "Status: %s"
@@ -6821,7 +7294,7 @@ msgid "Contacts: "
msgstr "Контакты: "
#: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
msgid "Print Preview"
msgstr "Предварительный просмотр"
@@ -6850,7 +7323,7 @@ msgstr[0] "%d контактов"
msgstr[1] "%d контактов"
msgstr[2] "%d контактов"
-#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:498
#, fuzzy, c-format
msgid ", %d selected"
msgid_plural ", %d selected"
@@ -6872,35 +7345,29 @@ msgstr "Не удается открыть список задач '%s' для
msgid "There is no calendar available for creating tasks"
msgstr ""
-#: calendar/gui/tasks-component.c:799
-msgid ""
-"Selected task list is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/tasks-component.c:1040
+#: calendar/gui/tasks-component.c:1030
msgid "New task"
msgstr "Новая задача"
-#: calendar/gui/tasks-component.c:1041
+#: calendar/gui/tasks-component.c:1031
msgid "_Task"
msgstr "_Задача"
-#: calendar/gui/tasks-component.c:1042
+#: calendar/gui/tasks-component.c:1032
msgid "Create a new task"
msgstr "Создать новую задачу"
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:1038
#, fuzzy
msgid "New tasks group"
msgstr "Новая задача"
-#: calendar/gui/tasks-component.c:1049
+#: calendar/gui/tasks-component.c:1039
#, fuzzy
-msgid "_Tasks Group"
+msgid "Tasks Gro_up"
msgstr "Группа списка задач"
-#: calendar/gui/tasks-component.c:1050
+#: calendar/gui/tasks-component.c:1040
#, fuzzy
msgid "Create a new tasks group"
msgstr "Создать новую задачу"
@@ -8579,69 +9046,69 @@ msgstr "Подготовка папки \"%s\" для автономной ра
msgid "You must be working online to complete this operation"
msgstr "Для завершения данной операции необходимо подключение к сети"
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
+#: camel/camel-filter-driver.c:669 camel/camel-filter-search.c:513
#: camel/camel-process.c:48
#, c-format
msgid "Failed to create pipe to '%s': %s"
msgstr "Сбой при создании канала к \"%s\": %s"
-#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-filter-driver.c:713 camel/camel-filter-search.c:549
#: camel/camel-process.c:90
#, c-format
msgid "Failed to create create child process '%s': %s"
msgstr "Сбой при создании дочернего процесса '%s': %s"
-#: camel/camel-filter-driver.c:754
+#: camel/camel-filter-driver.c:756
#, c-format
msgid "Invalid message stream received from %s: %s"
msgstr "Неверный поток сообщений получен из %s: %s"
-#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:945 camel/camel-filter-driver.c:954
msgid "Syncing folders"
msgstr "Синхронизация папок"
-#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
+#: camel/camel-filter-driver.c:1043 camel/camel-filter-driver.c:1420
#, c-format
msgid "Error parsing filter: %s: %s"
msgstr "Не удается разобрать фильтр: %s: %s"
-#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1426
#, c-format
msgid "Error executing filter: %s: %s"
msgstr "Ошибка выполнения фильтра: %s: %s"
-#: camel/camel-filter-driver.c:1108
+#: camel/camel-filter-driver.c:1119
msgid "Unable to open spool folder"
msgstr "Не удается открыть папку спула"
-#: camel/camel-filter-driver.c:1117
+#: camel/camel-filter-driver.c:1128
msgid "Unable to process spool folder"
msgstr "Не удается обработать папку спула"
-#: camel/camel-filter-driver.c:1132
+#: camel/camel-filter-driver.c:1143
#, c-format
msgid "Getting message %d (%d%%)"
msgstr "Получение сообщения %d (%d%%)"
-#: camel/camel-filter-driver.c:1136
+#: camel/camel-filter-driver.c:1147
msgid "Cannot open message"
msgstr "Не удается открыть сообщение"
-#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
+#: camel/camel-filter-driver.c:1148 camel/camel-filter-driver.c:1160
#, c-format
msgid "Failed on message %d"
msgstr "Сбой на сообщении %d"
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
+#: camel/camel-filter-driver.c:1174 camel/camel-filter-driver.c:1265
msgid "Syncing folder"
msgstr "Синхронизация папки"
-#: camel/camel-filter-driver.c:1224
+#: camel/camel-filter-driver.c:1235
#, c-format
msgid "Getting message %d of %d"
msgstr "Получение сообщения %d из %d"
-#: camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:1250
#, c-format
msgid "Failed at message %d of %d"
msgstr "Сбой на сообщении %d из %d"
@@ -8663,43 +9130,6 @@ msgstr "Недопустимые аргументы для user-tag"
msgid "Error executing filter search: %s: %s"
msgstr "Ошибка выполнения поиска фильтра: %s: %s"
-#: camel/camel-folder.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Неподдерживаемая операция: добавить сообщение: для %s"
-
-#: camel/camel-folder.c:1262
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Неподдерживаемая операция: поиск выражения: для %s"
-
-#: camel/camel-folder.c:1302
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Неподдерживаемая операция: поиск по идентификатору пользователя: для %s"
-
-#: camel/camel-folder.c:1416
-msgid "Moving messages"
-msgstr "Перемещение сообщений"
-
-#: camel/camel-folder.c:1416
-msgid "Copying messages"
-msgstr "Копирование сообщений"
-
-#: camel/camel-folder.c:1665
-#, fuzzy
-msgid "Learning junk"
-msgstr "Изменение статуса спама"
-
-#: camel/camel-folder.c:1682
-msgid "Learning non-junk"
-msgstr ""
-
-#: camel/camel-folder.c:1701
-#, fuzzy
-msgid "Filtering new message(s)"
-msgstr "Получение %d сообщений"
-
#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
#, c-format
msgid ""
@@ -8745,7 +9175,45 @@ msgstr "(совпадает все) требует единственного л
msgid "Performing query on unknown header: %s"
msgstr "Запрашивается неизвестный заголовок: %s"
-#: camel/camel-gpg-context.c:720
+#: camel/camel-folder.c:653
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Неподдерживаемая операция: добавить сообщение: для %s"
+
+#: camel/camel-folder.c:1262
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Неподдерживаемая операция: поиск выражения: для %s"
+
+#: camel/camel-folder.c:1302
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr ""
+"Неподдерживаемая операция: поиск по идентификатору пользователя: для %s"
+
+#: camel/camel-folder.c:1416
+msgid "Moving messages"
+msgstr "Перемещение сообщений"
+
+#: camel/camel-folder.c:1416
+msgid "Copying messages"
+msgstr "Копирование сообщений"
+
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Изменение статуса спама"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr ""
+
+#: camel/camel-folder.c:1701
+#, fuzzy
+msgid "Filtering new message(s)"
+msgstr "Получение %d сообщений"
+
+#: camel/camel-gpg-context.c:722
#, c-format
msgid ""
"Unexpected GnuPG status message encountered:\n"
@@ -8756,15 +9224,15 @@ msgstr ""
"\n"
"%s"
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:736
msgid "Failed to parse gpg userid hint."
msgstr "Ошибка при обработке подсказки gpg userid."
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:760
msgid "Failed to parse gpg passphrase request."
msgstr "Ошибка при обработке запроса парольной фразы gpg."
-#: camel/camel-gpg-context.c:772
+#: camel/camel-gpg-context.c:774
#, c-format
msgid ""
"You need a passphrase to unlock the key for\n"
@@ -8773,30 +9241,31 @@ msgstr ""
"Введите ключевую фразу, чтобы разблокировать\n"
"ключ пользователя: \"%s\""
-#: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
-#: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/camel-gpg-context.c:791 camel/camel-gpg-context.c:1283
+#: camel/camel-gpg-context.c:1441 camel/camel-gpg-context.c:1532
+#: camel/camel-gpg-context.c:1639 camel/providers/nntp/camel-nntp-store.c:1231
#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
#: mail/mail-send-recv.c:611
msgid "Cancelled."
msgstr "Отменено."
-#: camel/camel-gpg-context.c:807
+#: camel/camel-gpg-context.c:809
msgid "Failed to unlock secret key: 3 bad passphrases given."
msgstr ""
"Сбой при разблокировании секретного ключа: указано 3 некорректных парольных "
"фразы."
-#: camel/camel-gpg-context.c:813
+#: camel/camel-gpg-context.c:815
#, c-format
msgid "Unexpected response from GnuPG: %s"
msgstr "Неожиданный ответ от GnuPG: %s"
-#: camel/camel-gpg-context.c:864
+#: camel/camel-gpg-context.c:867
msgid "Failed to encrypt: No valid recipients specified."
-msgstr "Не удается зашифровать это сообщение: Не определены корректные получатели"
+msgstr ""
+"Не удается зашифровать это сообщение: Не определены корректные получатели"
-#: camel/camel-gpg-context.c:1141
+#: camel/camel-gpg-context.c:1144
#, c-format
msgid ""
"Failed to GPG %s: %s\n"
@@ -8807,62 +9276,83 @@ msgstr ""
"\n"
"%s"
-#: camel/camel-gpg-context.c:1146
+#: camel/camel-gpg-context.c:1149
#, c-format
msgid "Failed to GPG %s: %s\n"
msgstr "Сбой при кодировании GPG %s: %s\n"
-#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1262 camel/camel-smime-context.c:419
#, fuzzy, c-format
msgid "Could not generate signing data: %s"
msgstr "Не удается записать данные: %s"
-#: camel/camel-gpg-context.c:1273 camel/camel-gpg-context.c:1702
-#: camel/camel-gpg-context.c:1753
+#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1704
+#: camel/camel-gpg-context.c:1755
#, c-format
msgid "Failed to execute gpg: %s"
msgstr "Сбой при исполнении gpg: %s"
-#: camel/camel-gpg-context.c:1297 camel/camel-gpg-context.c:1430
-#: camel/camel-gpg-context.c:1523 camel/camel-gpg-context.c:1546
-#: camel/camel-gpg-context.c:1630 camel/camel-gpg-context.c:1654
-#: camel/camel-gpg-context.c:1724 camel/camel-gpg-context.c:1775
+#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1434
+#: camel/camel-gpg-context.c:1525 camel/camel-gpg-context.c:1548
+#: camel/camel-gpg-context.c:1632 camel/camel-gpg-context.c:1656
+#: camel/camel-gpg-context.c:1726 camel/camel-gpg-context.c:1777
msgid "Failed to execute gpg."
msgstr "Сбой при исполнении gpg."
-#: camel/camel-gpg-context.c:1316
+#: camel/camel-gpg-context.c:1319
msgid "This is a digitally signed message part"
msgstr "Эта часть сообщения подписана цифровой подписью"
-#: camel/camel-gpg-context.c:1397 camel/camel-gpg-context.c:1406
-#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
-#: camel/camel-smime-context.c:739
+#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1406
+#: camel/camel-gpg-context.c:1412 camel/camel-smime-context.c:721
+#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
msgid "Cannot verify message signature: Incorrect message format"
msgstr "Не удается проверить подпись сообщения: Неверный формат сообщения"
-#: camel/camel-gpg-context.c:1413
+#: camel/camel-gpg-context.c:1420
#, c-format
msgid "Cannot verify message signature: could not create temp file: %s"
-msgstr "Не удается проверить подпись сообщения: не удается создать временный файл: %s"
+msgstr ""
+"Не удается проверить подпись сообщения: не удается создать временный файл: %s"
-#: camel/camel-gpg-context.c:1506
+#: camel/camel-gpg-context.c:1508
#, fuzzy, c-format
msgid "Could not generate encrypting data: %s"
msgstr "Не удается записать данные: %s"
-#: camel/camel-gpg-context.c:1564
+#: camel/camel-gpg-context.c:1566
#, fuzzy
msgid "This is a digitally encrypted message part"
msgstr "Эта часть сообщения подписана цифровой подписью"
-#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
+#: camel/camel-gpg-context.c:1663 camel/camel-smime-context.c:994
msgid "Encrypted content"
msgstr "Зашифрованное содержимое"
-#: camel/camel-gpg-context.c:1680
+#: camel/camel-gpg-context.c:1682
msgid "Unable to parse message content"
msgstr "Не удается разобрать содержимое сообщения"
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Не удается создать канал к блокиратору: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Не удается запустить блокиратор: %s"
+
+#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr "Не удается заблокировать \"%s\": ошибка протокола с блокиратором"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Не удается заблокировать \"%s\""
+
#: camel/camel-lock.c:92 camel/camel-lock.c:113
#, c-format
msgid "Could not create lock file for %s: %s"
@@ -8885,26 +9375,6 @@ msgstr "Не удается получить блокировку использ
msgid "Failed to get lock using flock(2): %s"
msgstr "Не удается получить блокировку используя flock(2): %s"
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Не удается создать канал к блокиратору: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Не удается запустить блокиратор: %s"
-
-#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
-#, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "Не удается заблокировать \"%s\": ошибка протокола с блокиратором"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Не удается заблокировать \"%s\""
-
#: camel/camel-movemail.c:107
#, c-format
msgid "Could not check mail file %s: %s"
@@ -8982,7 +9452,8 @@ msgstr "Для чтения почты по запросу к другому н
#: camel/camel-provider.c:172
#, c-format
msgid "Could not load %s: Module loading not supported on this system."
-msgstr "Не удается загрузить %s: Загрузка модулей не поддерживается в этой системе."
+msgstr ""
+"Не удается загрузить %s: Загрузка модулей не поддерживается в этой системе."
#: camel/camel-provider.c:181
#, c-format
@@ -9151,7 +9622,7 @@ msgstr ""
#: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
#: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
#: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1240
+#: camel/providers/imap/camel-imap-store.c:1236
msgid "Bad authentication response from server."
msgstr "Неверный ответ от сервера при идентификации."
@@ -9236,55 +9707,55 @@ msgstr "POP до SMTP, используя не-POP источник"
msgid "Regular expression compilation failed: %s: %s"
msgstr "Сбой компиляции регулярного выражения: %s: %s"
-#: camel/camel-service.c:275
+#: camel/camel-service.c:271
#, c-format
msgid "URL '%s' needs a username component"
msgstr "URL \"%s\" нуждается в компоненте имени пользователя"
-#: camel/camel-service.c:279
+#: camel/camel-service.c:275
#, c-format
msgid "URL '%s' needs a host component"
msgstr "URL \\\"%s\\\" нуждается в компоненте хоста"
-#: camel/camel-service.c:283
+#: camel/camel-service.c:279
#, c-format
msgid "URL '%s' needs a path component"
msgstr "URL \\\"%s\\\" нуждается в компоненте пути"
-#: camel/camel-service.c:733
+#: camel/camel-service.c:729
#, c-format
msgid "Resolving: %s"
msgstr "Поиск узла: %s"
-#: camel/camel-service.c:764 camel/camel-service.c:888
+#: camel/camel-service.c:760 camel/camel-service.c:884
#, c-format
msgid "Failure in name lookup: %s"
msgstr "Ошибка при поиске узла: %s"
-#: camel/camel-service.c:785 camel/camel-service.c:909
+#: camel/camel-service.c:781 camel/camel-service.c:905
#, c-format
msgid "Host lookup failed: cannot create thread: %s"
msgstr "Сбой поиска узла: не удается создать поток: %s"
-#: camel/camel-service.c:798
+#: camel/camel-service.c:794
#, c-format
msgid "Host lookup failed: %s: host not found"
msgstr "Сбой поиска узла: %s: узел не найден"
-#: camel/camel-service.c:801
+#: camel/camel-service.c:797
#, c-format
msgid "Host lookup failed: %s: unknown reason"
msgstr "Сбой поиска узла: %s: причина неизвестна"
-#: camel/camel-service.c:855
+#: camel/camel-service.c:851
msgid "Resolving address"
msgstr "Поиск адреса"
-#: camel/camel-service.c:924
+#: camel/camel-service.c:920
msgid "Host lookup failed: host not found"
msgstr "Сбой поиска узла: узел не найден"
-#: camel/camel-service.c:927
+#: camel/camel-service.c:923
msgid "Host lookup failed: unknown reason"
msgstr "Сбой поиска узла: неизвестная причина"
@@ -9360,7 +9831,7 @@ msgstr "ID _сертификата:"
msgid "Cannot add CMS SignerInfo"
msgstr ""
-#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
#, fuzzy
msgid "Cannot create encoder context"
msgstr "Не удается заблокировать папку %s: %s"
@@ -9456,7 +9927,7 @@ msgstr ""
#: camel/camel-smime-context.c:635
#, fuzzy
-msgid "Can't find signature digests"
+msgid "Cannot find signature digests"
msgstr "Подпись действительна"
#: camel/camel-smime-context.c:651
@@ -9471,48 +9942,47 @@ msgstr "Сбой команды IMAP: %s"
#: camel/camel-smime-context.c:804
#, fuzzy, c-format
-msgid "Can't find certificate for `%s'"
+msgid "Cannot find certificate for `%s'"
msgstr "Не удается создать папку: %s: %s"
#: camel/camel-smime-context.c:811
-msgid "Can't find common bulk encryption algorithm"
+msgid "Cannot find common bulk encryption algorithm"
msgstr ""
#. PORT_GetError(); ??
#: camel/camel-smime-context.c:820
-msgid "Can't allocate slot for encryption bulk key"
+msgid "Cannot allocate slot for encryption bulk key"
msgstr ""
#: camel/camel-smime-context.c:831
#, fuzzy
-msgid "Can't create CMS Message"
-msgstr "Созда_ть правило из сообщения"
+msgid "Cannot create CMS Message"
+msgstr "Не удается открыть сообщение"
#: camel/camel-smime-context.c:837
-msgid "Can't create CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS EnvelopedData"
+msgstr "Не удается открыть сообщение"
#: camel/camel-smime-context.c:843
-msgid "Can't attach CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS EnvelopedData"
+msgstr "Не удается вложить файл %s: %s"
#: camel/camel-smime-context.c:849
-msgid "Can't attach CMS data object"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS data object"
+msgstr "Не удается вложить файл %s: %s"
#: camel/camel-smime-context.c:858
-msgid "Can't create CMS RecipientInfo"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS RecipientInfo"
+msgstr "Не удается открыть сообщение"
#: camel/camel-smime-context.c:863
-msgid "Can't add CMS RecipientInfo"
+msgid "Cannot add CMS RecipientInfo"
msgstr ""
-#: camel/camel-smime-context.c:877
-#, fuzzy
-msgid "Can't create encoder context"
-msgstr "Не удается заблокировать папку %s: %s"
-
#: camel/camel-smime-context.c:888
#, fuzzy
msgid "Failed to add data to encoder"
@@ -9559,7 +10029,8 @@ msgstr "Не удается создать папку: %s: %s"
msgid "Cannot delete folder: %s: Invalid operation"
msgstr "Не удается удалить папку: %s: недопустимая операция"
-#: camel/camel-store.c:439 camel/camel-vee-store.c:387
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
#, c-format
msgid "Cannot rename folder: %s: Invalid operation"
msgstr "Не удается переименовать папку: %s: недопустимая операция"
@@ -9568,8 +10039,8 @@ msgstr "Не удается переименовать папку: %s: недо
msgid "Trash"
msgstr "Корзина"
-#: camel/camel-store.c:779 mail/mail-config.glade.h:95
-#: ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
msgid "Junk"
msgstr "Спам"
@@ -9689,7 +10160,7 @@ msgstr "Использование ключа не обеспечивает по
msgid "Error in application verification"
msgstr "Ошибка при проверке приложения"
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826
#, c-format
msgid ""
"Issuer: %s\n"
@@ -9702,11 +10173,11 @@ msgstr ""
"Отпечаток: %s\n"
"Подпись: %s"
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
msgid "GOOD"
msgstr "GOOD"
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
msgid "BAD"
msgstr "BAD"
@@ -9729,7 +10200,7 @@ msgstr ""
"Принять сертификат в любом случае?"
#. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:835
+#: camel/camel-tcp-stream-ssl.c:836
#, c-format
msgid ""
"SSL Certificate check for %s:\n"
@@ -9744,7 +10215,7 @@ msgstr ""
"\n"
"Всё равно принять?"
-#: camel/camel-tcp-stream-ssl.c:879
+#: camel/camel-tcp-stream-ssl.c:880
#, c-format
msgid ""
"Certificate problem: %s\n"
@@ -9753,7 +10224,7 @@ msgstr ""
"Проблема с сертификатом: %s\n"
"Поставщик: %s"
-#: camel/camel-tcp-stream-ssl.c:931
+#: camel/camel-tcp-stream-ssl.c:932
#, c-format
msgid ""
"Bad certificate domain: %s\n"
@@ -9762,7 +10233,7 @@ msgstr ""
"Некорректный домен сертификата: %s\n"
"Поставщик: %s"
-#: camel/camel-tcp-stream-ssl.c:949
+#: camel/camel-tcp-stream-ssl.c:950
#, c-format
msgid ""
"Certificate expired: %s\n"
@@ -9771,7 +10242,7 @@ msgstr ""
"Истек срок действия сертификата: %s\n"
"Поставщик: %s"
-#: camel/camel-tcp-stream-ssl.c:966
+#: camel/camel-tcp-stream-ssl.c:967
#, c-format
msgid ""
"Certificate revocation list expired: %s\n"
@@ -9780,7 +10251,7 @@ msgstr ""
"Истек срок действия списка аннулированных сертификатов: %s\n"
"Поставщик: %s"
-#: camel/camel-url.c:290
+#: camel/camel-url.c:292
#, c-format
msgid "Could not parse URL `%s'"
msgstr "Не удается разобрать URL \"%s\""
@@ -9804,7 +10275,7 @@ msgstr "Не удается скопировать или переместить
msgid "Cannot delete folder: %s: No such folder"
msgstr "Не удается удалить папку: %s: нет такой папки"
-#: camel/camel-vee-store.c:395
+#: camel/camel-vee-store.c:396
#, c-format
msgid "Cannot rename folder: %s: No such folder"
msgstr "Не удается переименовать папку: %s: нет такой папки"
@@ -9825,14 +10296,15 @@ msgid "Checking for new mail"
msgstr "Проверка новой почты"
#: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:37
#: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
msgid "Check for new messages in all folders"
msgstr "Проверять новую почту во всех папках"
#: camel/providers/groupwise/camel-groupwise-provider.c:59
msgid "Apply filters to new messages in Inbox on this server"
-msgstr "Применить фильтры к новым сообщениям в папке \"Входящие\" на этом сервере"
+msgstr ""
+"Применить фильтры к новым сообщениям в папке \"Входящие\" на этом сервере"
#: camel/providers/groupwise/camel-groupwise-provider.c:62
#: camel/providers/imap/camel-imap-provider.c:70
@@ -9858,8 +10330,8 @@ msgid "For accessing Novell Groupwise servers"
msgstr "Для доступа к серверам Novell Groupwise"
#: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap4/camel-imap4-provider.c:70
#: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
#: camel/providers/imapp/camel-imapp-provider.c:65
#: camel/providers/nntp/camel-nntp-provider.c:71
#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
@@ -9880,320 +10352,28 @@ msgstr ""
msgid "Checklist"
msgstr "список"
-#: camel/providers/imap4/camel-imap4-command.c:629
-#, fuzzy, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Неожиданный ответ от сервера IMAP: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:415
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "Не удается удалить папку: %s: недопустимая операция"
-
-#: camel/providers/imap4/camel-imap4-engine.c:421
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "Не удается получить папку: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1144
-#: camel/providers/imap4/camel-imap4-engine.c:1533
-#: camel/providers/imap4/camel-imap4-engine.c:1560
-#: camel/providers/imap4/camel-imap4-engine.c:1590
-#: camel/providers/imap4/camel-imap4-engine.c:1630
-#, fuzzy, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "Сервер неожиданно отключился: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1145
-msgid "Got BYE response"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-folder.c:335
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "Не удается получить папку: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:341
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "Не удается создать папку: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:476
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "Не удается получить папку: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:481
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "Не удается получить папку: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:616
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr ""
-"Не удается получить сообщение: %s из папки %s\n"
-" %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:621
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr ""
-"Не удается получить сообщение: %s из папки %s\n"
-" %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:746
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "Не удается добавить сообщение к папке mh: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:775
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "Не удается добавить сообщение к папке mh: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:854
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Не удается получить сообщение: %s из папки %s\n"
-" %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:858
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Не удается получить сообщение: %s из папки %s\n"
-" %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:866
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Не удается получить сообщение: %s из папки %s\n"
-" %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:870
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Не удается получить сообщение: %s из папки %s\n"
-" %s"
-
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Папки"
-
-#: camel/providers/imap4/camel-imap4-provider.c:42
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Показывать только те папки, на которые вы подписаны"
-
-#: camel/providers/imap4/camel-imap4-provider.c:44
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Переопределять предлагаемое сервером пространство имён для папок"
-
-#: camel/providers/imap4/camel-imap4-provider.c:46
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Пространство имен"
-
-#: camel/providers/imap4/camel-imap4-provider.c:53
-#, fuzzy
-msgid "IMAPv4rev1"
-msgstr "IMAPv4 "
-
-#: camel/providers/imap4/camel-imap4-provider.c:55
-#, fuzzy
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr "Для чтения и хранения почты на серверах IMAP."
-
-#: camel/providers/imap4/camel-imap4-provider.c:72
-#, fuzzy
-msgid "This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
-"Подключение к серверу IMAP будет производиться с использованием "
-"незашифрованного пароля."
-
-#: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:428
-#, c-format
-msgid "IMAP server %s"
-msgstr "Сервер IMAP %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:430
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "Сервис IMAP для %s на %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:208
-#: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:551
-#: camel/providers/imap/camel-imap-store.c:571
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: camel/providers/smtp/camel-smtp-transport.c:269
-#: camel/providers/smtp/camel-smtp-transport.c:285
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "Не удается подключиться к %s (порт %d): %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:553
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr "SSL недоступен"
-
-#: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:845
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Соединение отменено"
-
-#: camel/providers/imap4/camel-imap4-store.c:261
-#, fuzzy, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr "Не удается подключиться к серверу IMAP %s в защищенном режиме:%s"
-
-#: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:679
-#: camel/providers/imap/camel-imap-store.c:710
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Не удается подключиться к серверу IMAP %s в защищенном режиме:%s"
-
-#: camel/providers/imap4/camel-imap4-store.c:287
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
-msgid "Unknown error"
-msgstr "Неизвестная ошибка"
-
-#: camel/providers/imap4/camel-imap4-store.c:373
-#, fuzzy, c-format
-msgid "Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-"Не удается подключиться к серверу POP %s: Не поддерживается затребованный "
-"механизм идентификации."
-
-#: camel/providers/imap4/camel-imap4-store.c:418
-#, fuzzy, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%sВведите пароль SMTP для %s@%s"
-
-#: camel/providers/imap4/camel-imap4-store.c:492
-#, fuzzy, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "Сбой идентификации на сервере POP %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:723
-#, fuzzy, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "Не удается получить папку: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1885
-#: camel/providers/imap/camel-imap-store.c:2263
-#, fuzzy, c-format
-msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Имя папки \"%s\" некорректно, так как содержит символ \"%c\""
-
-#: camel/providers/imap4/camel-imap4-store.c:826
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "Не удается переименовать папку: %s: недопустимая операция"
-
-#: camel/providers/imap4/camel-imap4-store.c:831
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr "Не удается создать папку: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:859
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "Не удается удалить папку: %s: нет такой папки"
-
-#: camel/providers/imap4/camel-imap4-store.c:891
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "Не удается удалить папку: %s: недопустимая операция"
-
-#: camel/providers/imap4/camel-imap4-store.c:896
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "Не удается удалить папку: %s: недопустимая операция"
-
-#: camel/providers/imap4/camel-imap4-store.c:1037
-#, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#, fuzzy
-msgid "Bad command"
-msgstr "Команда:"
-
-#: camel/providers/imap4/camel-imap4-store.c:1100
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "Не удается удалить папку: %s: недопустимая операция"
-
-#: camel/providers/imap4/camel-imap4-store.c:1105
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr "Не удается создать папку: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:1149
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "Не удается переименовать папку: %s: недопустимая операция"
-
-#: camel/providers/imap4/camel-imap4-store.c:1154
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr "Не удается создать папку: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:85
-#, fuzzy, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Неожиданный ответ от сервера IMAP: %s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:108
-#, fuzzy
-msgid "No data"
-msgstr "Нет данных"
-
-#: camel/providers/imap4/camel-imap4-utils.c:291
-#, fuzzy, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "Сервер неожиданно отключился: %s"
-
#: camel/providers/imap/camel-imap-command.c:218
#: camel/providers/imap/camel-imap-command.c:257
#: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3194
+#: camel/providers/imap/camel-imap-store.c:3190
msgid "Operation cancelled"
msgstr "Операция отменена"
#: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3197
+#: camel/providers/imap/camel-imap-store.c:3193
#, c-format
msgid "Server unexpectedly disconnected: %s"
msgstr "Сервер неожиданно отключился: %s"
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "Неизвестная ошибка"
+
#. for imap ALERT codes, account user@host
#: camel/providers/imap/camel-imap-command.c:320
#, c-format
@@ -10262,7 +10442,7 @@ msgstr ""
" %s"
#: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:244
#: camel/providers/local/camel-mbox-folder.c:418
#: camel/providers/local/camel-mh-folder.c:202
msgid "No such message"
@@ -10291,7 +10471,8 @@ msgstr ""
#: camel/providers/imap/camel-imap-folder.c:2484
#, c-format
-msgid "Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
msgstr ""
#: camel/providers/imap/camel-imap-folder.c:2660
@@ -10333,9 +10514,31 @@ msgstr "Использовать свою строку для подключен
msgid "Command:"
msgstr "Команда:"
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "Папки"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
+msgid "Show only subscribed folders"
+msgstr "Показывать только те папки, на которые вы подписаны"
+
+#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
+msgid "Override server-supplied folder namespace"
+msgstr "Переопределять предлагаемое сервером пространство имён для папок"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
+msgid "Namespace"
+msgstr "Пространство имен"
+
#: camel/providers/imap/camel-imap-provider.c:64
msgid "Apply filters to new messages in INBOX on this server"
-msgstr "Применить фильтры к новым сообщениям в папке \"Входящие\" на этом сервере"
+msgstr ""
+"Применить фильтры к новым сообщениям в папке \"Входящие\" на этом сервере"
#: camel/providers/imap/camel-imap-provider.c:66
#, fuzzy
@@ -10355,43 +10558,92 @@ msgstr "IMAP"
msgid "For reading and storing mail on IMAP servers."
msgstr "Для чтения и хранения почты на серверах IMAP."
-#: camel/providers/imap/camel-imap-store.c:680
-#: camel/providers/pop3/camel-pop3-store.c:228
+#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
+#, c-format
+msgid "IMAP server %s"
+msgstr "Сервер IMAP %s"
+
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "Сервис IMAP для %s на %s"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:269
+#: camel/providers/smtp/camel-smtp-transport.c:285
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr "Не удается подключиться к %s (порт %d): %s"
+
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+msgid "SSL unavailable"
+msgstr "SSL недоступен"
+
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Соединение отменено"
+
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "Не удается подключиться к серверу IMAP %s в защищенном режиме:%s"
+
+#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/pop3/camel-pop3-store.c:233
msgid "SSL/TLS extension not supported."
msgstr "Расширение SSL/TLS не поддерживается"
-#: camel/providers/imap/camel-imap-store.c:711
-#: camel/providers/pop3/camel-pop3-store.c:269
+#: camel/providers/imap/camel-imap-store.c:707
+#: camel/providers/pop3/camel-pop3-store.c:274
msgid "SSL negotiations failed"
msgstr "Сбой согласований SSL"
-#: camel/providers/imap/camel-imap-store.c:848
+#: camel/providers/imap/camel-imap-store.c:844
#, c-format
msgid "Could not connect with command \"%s\": %s"
msgstr "Не удается подключиться командой \"%s\": %s"
-#: camel/providers/imap/camel-imap-store.c:1272
+#: camel/providers/imap/camel-imap-store.c:1268
#, c-format
msgid "IMAP server %s does not support requested authentication type %s"
msgstr "Сервер IMAP %s не поддерживает затребованный тип аутентификации %s"
-#: camel/providers/imap/camel-imap-store.c:1282
+#: camel/providers/imap/camel-imap-store.c:1278
#: camel/providers/smtp/camel-smtp-transport.c:486
#, c-format
msgid "No support for authentication type %s"
msgstr "Аутентификация %s не поддерживается"
-#: camel/providers/imap/camel-imap-store.c:1305
+#: camel/providers/imap/camel-imap-store.c:1301
#: camel/providers/imapp/camel-imapp-store.c:344
#, c-format
msgid "%sPlease enter the IMAP password for %s@%s"
msgstr "%sВведите пароль IMAP для %s@%s"
-#: camel/providers/imap/camel-imap-store.c:1319
+#: camel/providers/imap/camel-imap-store.c:1315
msgid "You didn't enter a password."
msgstr "Вы не ввели пароль."
-#: camel/providers/imap/camel-imap-store.c:1348
+#: camel/providers/imap/camel-imap-store.c:1344
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -10402,30 +10654,282 @@ msgstr ""
"%s\n"
"\n"
-#: camel/providers/imap/camel-imap-store.c:1867
-#: camel/providers/imap/camel-imap-store.c:2057
+#: camel/providers/imap/camel-imap-store.c:1863
+#: camel/providers/imap/camel-imap-store.c:2053
#, c-format
msgid "No such folder %s"
msgstr "Нет такой папки %s"
-#: camel/providers/imap/camel-imap-store.c:1943
-#: camel/providers/imap/camel-imap-store.c:2324
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Имя папки \"%s\" некорректно, так как содержит символ \"%c\""
+
+#: camel/providers/imap/camel-imap-store.c:1939
+#: camel/providers/imap/camel-imap-store.c:2320
msgid "The parent folder is not allowed to contain subfolders"
msgstr "Эта папка не может содержать подпапки"
-#: camel/providers/imap/camel-imap-store.c:1998
-#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/imap/camel-imap-store.c:1994
+#: camel/providers/local/camel-maildir-store.c:139
#: camel/providers/local/camel-mbox-store.c:212
#: camel/providers/local/camel-mh-store.c:236
#, fuzzy, c-format
msgid "Cannot create folder `%s': folder exists."
msgstr "Не удается создать папку: %s: %s"
-#: camel/providers/imap/camel-imap-store.c:2274
+#: camel/providers/imap/camel-imap-store.c:2270
#, c-format
msgid "Unknown parent folder: %s"
msgstr "Неизвестная родительская папка: %s"
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
+#, fuzzy, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "Сбой идентификации на сервере POP %s: %s"
+
+#: camel/providers/imap4/camel-imap4-command.c:656
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Неожиданный ответ от сервера IMAP: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, fuzzy, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "Неожиданный ответ от сервера IMAP: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Не удается удалить папку: %s: недопустимая операция"
+
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Не удается получить папку: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
+#, fuzzy, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "Сервер неожиданно отключился: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:359
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Не удается получить папку: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:365
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Не удается создать папку: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:502
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Не удается получить папку: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:507
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Не удается получить папку: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:697
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Не удается получить сообщение: %s из папки %s\n"
+" %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:702
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+"Не удается получить сообщение: %s из папки %s\n"
+" %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:827
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Не удается добавить сообщение к папке mh: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Не удается добавить сообщение к папке mh: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Не удается получить сообщение: %s из папки %s\n"
+" %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:939
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Не удается получить сообщение: %s из папки %s\n"
+" %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:947
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Не удается получить сообщение: %s из папки %s\n"
+" %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Не удается получить сообщение: %s из папки %s\n"
+" %s"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+#, fuzzy
+msgid "IMAPv4rev1"
+msgstr "IMAPv4 "
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+#, fuzzy
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "Для чтения и хранения почты на серверах IMAP."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+"Подключение к серверу IMAP будет производиться с использованием "
+"незашифрованного пароля."
+
+#: camel/providers/imap4/camel-imap4-store.c:271
+#, fuzzy, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr "Не удается подключиться к серверу IMAP %s в защищенном режиме:%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:383
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Не удается подключиться к серверу POP %s: Не поддерживается затребованный "
+"механизм идентификации."
+
+#: camel/providers/imap4/camel-imap4-store.c:428
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sВведите пароль SMTP для %s@%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:502
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Сбой идентификации на сервере POP %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:733
+#, fuzzy, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "Не удается получить папку: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:847
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Не удается переименовать папку: %s: недопустимая операция"
+
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Не удается создать папку: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Не удается удалить папку: %s: нет такой папки"
+
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Не удается удалить папку: %s: недопустимая операция"
+
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Не удается удалить папку: %s: недопустимая операция"
+
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "Не удается удалить папку: %s: нет такой папки"
+
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr "Не удается переименовать папку: %s: недопустимая операция"
+
+#: camel/providers/imap4/camel-imap4-store.c:1005
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr "Не удается создать папку: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1253
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#, fuzzy
+msgid "Bad command"
+msgstr "Команда:"
+
+#: camel/providers/imap4/camel-imap4-store.c:1331
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Не удается удалить папку: %s: недопустимая операция"
+
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Не удается создать папку: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1396
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Не удается переименовать папку: %s: недопустимая операция"
+
+#: camel/providers/imap4/camel-imap4-store.c:1401
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Не удается создать папку: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:250
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Неожиданный ответ от сервера IMAP: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:273
+#, fuzzy
+msgid "No data"
+msgstr "Нет данных"
+
+#: camel/providers/imap4/camel-imap4-utils.c:456
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "Сервер неожиданно отключился: %s"
+
#: camel/providers/imapp/camel-imapp-provider.c:39
#: camel/providers/pop3/camel-pop3-provider.c:38
msgid "Message storage"
@@ -10591,18 +11095,26 @@ msgstr "Не удается сохранить краткую информаци
msgid "Unable to add message to summary: unknown reason"
msgstr "Не удается добавить сообщение к краткой информации: причина неизвестна"
-#: camel/providers/local/camel-maildir-folder.c:183
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr "Входящие"
+
+#: camel/providers/local/camel-maildir-folder.c:214
msgid "Maildir append message cancelled"
msgstr "Добавление сообщения к папке почтового каталога отменено"
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:217
#, c-format
msgid "Cannot append message to maildir folder: %s: %s"
msgstr "Не удается добавить сообщение к папке почтового каталога: %s: %s"
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:226
-#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
#: camel/providers/local/camel-mbox-folder.c:417
#: camel/providers/local/camel-mbox-folder.c:436
#: camel/providers/local/camel-mbox-folder.c:467
@@ -10618,48 +11130,48 @@ msgstr ""
"Не удается получить сообщение: %s из папки %s\n"
" %s"
-#: camel/providers/local/camel-maildir-folder.c:236
+#: camel/providers/local/camel-maildir-folder.c:267
msgid "Invalid message contents"
msgstr "Неверное содержание сообщения"
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:109
#: camel/providers/local/camel-mbox-store.c:154
#: camel/providers/local/camel-mh-store.c:204
#, fuzzy, c-format
msgid "Cannot get folder `%s': %s"
msgstr "Не удается получить папку: %s: %s"
-#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-maildir-store.c:113
#: camel/providers/local/camel-mbox-store.c:162
#: camel/providers/local/camel-mh-store.c:211
#, fuzzy, c-format
msgid "Cannot get folder `%s': folder does not exist."
msgstr "Папка \"%s\" не существует."
-#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-maildir-store.c:121
#: camel/providers/local/camel-mbox-store.c:184
#: camel/providers/local/camel-mbox-store.c:196
#, fuzzy, c-format
msgid "Cannot create folder `%s': %s"
msgstr "Не удается создать папку: %s: %s"
-#: camel/providers/local/camel-maildir-store.c:134
+#: camel/providers/local/camel-maildir-store.c:136
#, fuzzy, c-format
msgid "Cannot get folder `%s': not a maildir directory."
msgstr "\"%s\" не является почтовым каталогом."
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
#: camel/providers/local/camel-mh-store.c:260
#, c-format
msgid "Could not delete folder `%s': %s"
msgstr "Не удается удалить папку \"%s\": %s"
-#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:177
msgid "not a maildir directory"
msgstr "не является почтовым каталогом"
-#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-maildir-store.c:355
#: camel/providers/local/camel-spool-store.c:284
#: camel/providers/local/camel-spool-store.c:314
#, c-format
@@ -11046,7 +11558,8 @@ msgstr ""
" %s"
#: camel/providers/nntp/camel-nntp-provider.c:43
-msgid "Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+msgid ""
+"Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
msgstr ""
#: camel/providers/nntp/camel-nntp-provider.c:45
@@ -11059,7 +11572,8 @@ msgstr "Новости USENET"
#: camel/providers/nntp/camel-nntp-provider.c:54
msgid "This is a provider for reading from and posting toUSENET newsgroups."
-msgstr "Это провайдер для чтения и отправки сообщений в группы новостей USENET."
+msgstr ""
+"Это провайдер для чтения и отправки сообщений в группы новостей USENET."
#: camel/providers/nntp/camel-nntp-provider.c:73
msgid ""
@@ -11250,20 +11764,25 @@ msgstr ""
msgid "Could not connect to POP server %s (port %d): %s"
msgstr "Не удается подключиться к серверу POP %s (порт %d): %s"
-#: camel/providers/pop3/camel-pop3-store.c:227
-#: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:268
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, fuzzy, c-format
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr "Сбой идентификации на сервере POP %s: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
#, c-format
msgid "Failed to connect to POP server %s in secure mode: %s"
msgstr "Сбой при подключении к серверу POP %s в защищенном режиме: %s"
-#: camel/providers/pop3/camel-pop3-store.c:366
+#: camel/providers/pop3/camel-pop3-store.c:371
#, c-format
msgid "Could not connect to POP server %s"
msgstr "Не удается подключиться к серверу POP %s"
-#: camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:521
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
#, c-format
msgid ""
"Unable to connect to POP server %s: No support for requested authentication "
@@ -11272,28 +11791,28 @@ msgstr ""
"Не удается подключиться к серверу POP %s: Не поддерживается затребованный "
"механизм идентификации."
-#: camel/providers/pop3/camel-pop3-store.c:423
+#: camel/providers/pop3/camel-pop3-store.c:428
#, c-format
msgid "SASL `%s' Login failed for POP server %s: %s"
msgstr "SASL `%s' Ошибка регистрации на сервере POP %s: %s"
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:440
#, c-format
msgid "Cannot login to POP server %s: SASL Protocol error"
msgstr "Не удается зарегистрироваться на сервере POP %s: Ошибка протокола SASL"
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:459
#, c-format
msgid "Failed to authenticate on POP server %s: %s"
msgstr "Сбой идентификации на сервере POP %s: %s"
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:485
#, fuzzy, c-format
msgid "%sPlease enter the POP password for %s on host %s"
msgstr "%sВведите пароль POP для %s@%s"
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
@@ -11302,7 +11821,16 @@ msgstr ""
"Не удается подключиться к серверу POP%s.\n"
"Ошибка отправки пароля: %s"
-#: camel/providers/pop3/camel-pop3-store.c:641
+#: camel/providers/pop3/camel-pop3-store.c:547
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
+msgstr ""
+"Не удается подключиться к серверу POP%s.\n"
+"Ошибка отправки пароля: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:652
#, c-format
msgid "No such folder `%s'."
msgstr "Нет такой папки \"%s\""
@@ -11413,7 +11941,8 @@ msgstr "Запрошенное почтовое действие выполне
#: camel/providers/smtp/camel-smtp-transport.c:194
msgid "User not local; will forward to <forward-path>"
-msgstr "Не локальный пользователь; будет отправлено в соответствии с <forward-path>"
+msgstr ""
+"Не локальный пользователь; будет отправлено в соответствии с <forward-path>"
#: camel/providers/smtp/camel-smtp-transport.c:196
msgid "Requested mail action not taken: mailbox unavailable"
@@ -11433,7 +11962,8 @@ msgstr "Пользователь не локальный; установите <
#: camel/providers/smtp/camel-smtp-transport.c:204
msgid "Requested action not taken: insufficient system storage"
-msgstr "Запрошенное действие не выполнено: недостаточно места в системном хранилище"
+msgstr ""
+"Запрошенное действие не выполнено: недостаточно места в системном хранилище"
#: camel/providers/smtp/camel-smtp-transport.c:206
msgid "Requested mail action aborted: exceeded storage allocation"
@@ -11516,99 +12046,99 @@ msgstr ""
"%s\n"
"\n"
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:657
#, c-format
msgid "SMTP server %s"
msgstr "SMTP сервер %s"
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:659
#, c-format
msgid "SMTP mail delivery via %s"
msgstr "Доставка SMTP почты через %s"
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:677
#, fuzzy
msgid "Cannot send message: service not connected."
msgstr "Не удается отправить сообщение: не определены получатели."
-#: camel/providers/smtp/camel-smtp-transport.c:692
+#: camel/providers/smtp/camel-smtp-transport.c:683
msgid "Cannot send message: sender address not valid."
msgstr "Не удается отправить сообщение: неверный адрес отправителя."
-#: camel/providers/smtp/camel-smtp-transport.c:696
+#: camel/providers/smtp/camel-smtp-transport.c:687
msgid "Sending message"
msgstr "Отправка сообщения"
-#: camel/providers/smtp/camel-smtp-transport.c:711
+#: camel/providers/smtp/camel-smtp-transport.c:702
msgid "Cannot send message: no recipients defined."
msgstr "Не удается отправить сообщение: не определены получатели."
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:713
msgid "Cannot send message: one or more invalid recipients"
msgstr ""
"Не удается отправить сообщение: указан один или несколько некорректных "
"получателей"
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:885
msgid "SMTP Greeting"
msgstr "Приветствие SMTP"
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:934
#, fuzzy, c-format
msgid "HELO command failed: %s"
msgstr "Сбой команды IMAP: %s"
-#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:951
#, fuzzy
msgid "HELO command failed"
msgstr "Сбой команды IMAP: %s"
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1017
msgid "SMTP Authentication"
msgstr "Аутентификация SMTP"
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1023
msgid "Error creating SASL authentication object."
msgstr "Ошибка при создании объекта аутентификации SASL."
-#: camel/providers/smtp/camel-smtp-transport.c:1049
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1040
+#: camel/providers/smtp/camel-smtp-transport.c:1051
#, fuzzy, c-format
msgid "AUTH command failed: %s"
msgstr "Сбой команды IMAP: %s"
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1057
#, fuzzy
msgid "AUTH command failed"
msgstr "Сбой команды IMAP: %s"
-#: camel/providers/smtp/camel-smtp-transport.c:1128
+#: camel/providers/smtp/camel-smtp-transport.c:1119
msgid "Bad authentication response from server.\n"
msgstr "Неверный ответ от сервера при аутентификации.\n"
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1144
#, fuzzy, c-format
msgid "MAIL FROM command failed: %s: mail not sent"
msgstr "Превышено время ожидания ответа на MAIL FROM: %s: почта не отправлена"
-#: camel/providers/smtp/camel-smtp-transport.c:1170
+#: camel/providers/smtp/camel-smtp-transport.c:1161
#, fuzzy
msgid "MAIL FROM command failed"
msgstr "Сбой команды IMAP: %s"
-#: camel/providers/smtp/camel-smtp-transport.c:1194
+#: camel/providers/smtp/camel-smtp-transport.c:1185
#, fuzzy, c-format
msgid "RCPT TO command failed: %s: mail not sent"
msgstr "Превышено время ожидания ответа на RCPT TO: %s: почта не отправлена"
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1204
#, c-format
msgid "RCPT TO <%s> failed"
msgstr "RCPT TO <%s> не удалось"
-#: camel/providers/smtp/camel-smtp-transport.c:1252
-#: camel/providers/smtp/camel-smtp-transport.c:1310
-#: camel/providers/smtp/camel-smtp-transport.c:1329
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1301
+#: camel/providers/smtp/camel-smtp-transport.c:1320
#, fuzzy, c-format
msgid "DATA command failed: %s: mail not sent"
msgstr "Превышено время ожидания ответа на 'DATA': %s: почта не отправлена"
@@ -11616,28 +12146,28 @@ msgstr "Превышено время ожидания ответа на 'DATA':
#. we should have gotten instructions on how to use the DATA command:
#. * 354 Enter mail, end with "." on a line by itself
#.
-#: camel/providers/smtp/camel-smtp-transport.c:1269
-#: camel/providers/smtp/camel-smtp-transport.c:1345
+#: camel/providers/smtp/camel-smtp-transport.c:1260
+#: camel/providers/smtp/camel-smtp-transport.c:1336
#, fuzzy
msgid "DATA command failed"
msgstr "Сбой команды IMAP: %s"
-#: camel/providers/smtp/camel-smtp-transport.c:1368
+#: camel/providers/smtp/camel-smtp-transport.c:1359
#, fuzzy, c-format
msgid "RSET command failed: %s"
msgstr "Сбой команды IMAP: %s"
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1375
#, fuzzy
msgid "RSET command failed"
msgstr "Сбой команды IMAP: %s"
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1398
#, fuzzy, c-format
msgid "QUIT command failed: %s"
msgstr "Сбой команды IMAP: %s"
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1412
#, fuzzy
msgid "QUIT command failed"
msgstr "Сбой команды IMAP: %s"
@@ -11701,100 +12231,6 @@ msgstr "Тип MIME:"
msgid "Suggest automatic display of attachment"
msgstr "Предполагать автоматическое отображение вложения"
-#: composer/e-msg-composer.c:704
-#, fuzzy
-msgid "Cannot sign outgoing message: No signing certificate set for this account"
-msgstr "Всегда подписывать сообщения, когда используется эта учётная запись"
-
-#: composer/e-msg-composer.c:711
-#, fuzzy
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr "Всегда подписывать сообщения, когда используется эта учётная запись"
-
-#: composer/e-msg-composer.c:1283
-#, fuzzy
-msgid "Could not open file"
-msgstr "Не удается открыть файл"
-
-#: composer/e-msg-composer.c:1291
-msgid "Unable to retrieve message from editor"
-msgstr "Не удается получить сообщение из редактора"
-
-#: composer/e-msg-composer.c:1561
-#, fuzzy
-msgid "Untitled Message"
-msgstr "Множество сообщений"
-
-#: composer/e-msg-composer.c:1591
-msgid "Open file"
-msgstr "Открыть файл"
-
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr "Создана автоматически"
-
-#: composer/e-msg-composer.c:2097
-msgid "Signature:"
-msgstr "Подпись:"
-
-#: composer/e-msg-composer.c:2298
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2327
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
-#: composer/e-msg-composer.c:3114
-msgid "Compose a message"
-msgstr "Новое сообщение"
-
-#: composer/e-msg-composer.c:3147
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
-msgstr ""
-"Не удается создать окно редактора:\n"
-"Не удается активировать управляющий элемент выбора адреса."
-
-#: composer/e-msg-composer.c:3175
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component.\n"
-"Please make sure you have the correct version\n"
-"of gtkhtml and libgtkhtml installed.\n"
-msgstr ""
-"Не удается создать окно редактора:\n"
-"Не удается активировать компонент редактора HTML.\n"
-"Убедитесь, что у вас установлены необходимые\n"
-"версии пакетов gtkhtml и libgtkhtml.\n"
-
-#: composer/e-msg-composer.c:3279
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
-"Не удается создать окно редактора:\n"
-"Не удается активировать компонент редактора HTML."
-
-#: composer/e-msg-composer.c:4284
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(Содержимое редактора не является простым текстом и не может "
-"корректироваться.)<b>"
-
#: composer/e-msg-composer-hdrs.c:512
msgid "Posting destination"
msgstr "Назначение:"
@@ -11877,17 +12313,93 @@ msgstr "<щёлкните здесь, чтобы выбрать папку>"
msgid "Attach file(s)"
msgstr "Вложить файл(ы)"
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "Всегда подписывать сообщения, когда используется эта учётная запись"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr "Всегда подписывать сообщения, когда используется эта учётная запись"
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Не удается открыть файл"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Не удается получить сообщение из редактора"
+
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+msgid "Untitled Message"
+msgstr "Множество сообщений"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Открыть файл"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr "Создана автоматически"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Подпись:"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] ""
+msgstr[1] ""
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr "Новое сообщение"
+
+#: composer/e-msg-composer.c:2649
+#, fuzzy, c-format
+msgid "Attached message - %s"
+msgstr "Пересланное сообщение - %s"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, fuzzy, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "Вложить оригинальное сообщение"
+msgstr[1] "Вложить оригинальное сообщение"
+msgstr[2] "Вложить оригинальное сообщение"
+
+#: composer/e-msg-composer.c:4332
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(Содержимое редактора не является простым текстом и не может "
+"корректироваться.)<b>"
+
#. mail-composer:no-attach primary
#: composer/mail-composer-errors.xml.h:2
#, fuzzy
msgid "You cannot attach the file `{0}' to this message."
msgstr "Вложить файл в сообщение"
-#. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
#. mail-composer:attach-notfile primary
#: composer/mail-composer-errors.xml.h:6
msgid "The file `{0}' is not a regular file and cannot be sent in a message."
@@ -11905,54 +12417,68 @@ msgid ""
"directory individually, or create an archive of the directory and attach it."
msgstr ""
-#. mail-composer:recover-autosave title
+#. mail-composer:attach-nomessages primary
#: composer/mail-composer-errors.xml.h:12
#, fuzzy
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "Не удается создать канал: %s"
+
+#. mail-composer:attach-nomessages secondary
+#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr ""
+
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:16
+#, fuzzy
msgid "Unfinished messages found"
msgstr "Непрочитанных сообщений"
#. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:18
#, fuzzy
msgid "Do you want to recover unfinished messages?"
msgstr "Хотите сохранить изменения?"
#. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:16
+#: composer/mail-composer-errors.xml.h:20
msgid ""
"Evolution quit unexpectedly while you were composing a new message. "
"Recovering the message will allow you to continue where you left off."
msgstr ""
-#: composer/mail-composer-errors.xml.h:17
+#: composer/mail-composer-errors.xml.h:21
#, fuzzy
msgid "Don't Recover"
msgstr "Не удалять"
-#: composer/mail-composer-errors.xml.h:18
+#: composer/mail-composer-errors.xml.h:22
#, fuzzy
msgid "Recover"
msgstr "Удалить"
#. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:20
+#: composer/mail-composer-errors.xml.h:24
#, fuzzy
msgid "Could not save to autosave file \"{0}\"."
msgstr "Не удается сохранить файл подписи: %s"
#. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:22
+#: composer/mail-composer-errors.xml.h:26
#, fuzzy
msgid "Error saving to autosave because \"{1}\"."
msgstr "Ошибка сохранения ярлыков."
#. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:24
+#: composer/mail-composer-errors.xml.h:28
msgid "Warning: Modified Message"
msgstr "Внимание: Изменено сообщение"
#. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:26
+#: composer/mail-composer-errors.xml.h:30
#, fuzzy
msgid ""
"Are you sure you want to discard the message, titled '{0}', you are "
@@ -11960,57 +12486,74 @@ msgid ""
msgstr "Вы действительно хотите удалить эту неозаглавленную встречу?"
#. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:32
msgid ""
"Closing this composer window will discard the message permanently, unless "
"you choose to save the message in your Drafts folder. This will allow you to "
"continue the message at a later date."
msgstr ""
-#: composer/mail-composer-errors.xml.h:29
-#, fuzzy
-msgid "Discard Changes"
-msgstr "_Отклонить изменения"
-
-#: composer/mail-composer-errors.xml.h:30
+#: composer/mail-composer-errors.xml.h:34
#, fuzzy
msgid "Save Message"
msgstr "Сохранить сообщение ..."
#. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:32
+#: composer/mail-composer-errors.xml.h:36
#, fuzzy
msgid "Could not create message."
msgstr "Не удается создать канал: %s"
#. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:34
+#: composer/mail-composer-errors.xml.h:38
msgid "Because \"{0}\", you may need to select different mail options."
msgstr ""
#. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:36
+#: composer/mail-composer-errors.xml.h:40
#, fuzzy
msgid "Could not read signature file \"{0}\"."
msgstr "Не удается сохранить файл подписи: %s"
-#. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
#. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:40
+#: composer/mail-composer-errors.xml.h:44
msgid "All accounts have been removed."
msgstr ""
#. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:42
+#: composer/mail-composer-errors.xml.h:46
msgid "You need to configure an account before you can compose mail."
msgstr "Перед созданием нового письма необходимо настроить учетную запись."
+#. mail-composer:no-address-control primary
+#: composer/mail-composer-errors.xml.h:48
+#: composer/mail-composer-errors.xml.h:52
+#, fuzzy
+msgid "Could not create composer window."
+msgstr "Не удается создать канал: %s"
+
+#. mail-composer:no-address-control secondary
+#: composer/mail-composer-errors.xml.h:50
+#, fuzzy
+msgid "Unable to activate the address selector control."
+msgstr ""
+"Не удается создать окно редактора:\n"
+"Не удается активировать управляющий элемент выбора адреса."
+
+#. mail-composer:no-editor-control secondary
+#: composer/mail-composer-errors.xml.h:54
+#, fuzzy
+msgid ""
+"Unable to activate the HTML editor control.\n"
+"\n"
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
+msgstr ""
+"Не удается создать окно редактора:\n"
+"Не удается активировать компонент редактора HTML.\n"
+"Убедитесь, что у вас установлены необходимые\n"
+"версии пакетов gtkhtml и libgtkhtml.\n"
+
#: data/evolution.desktop.in.in.h:1
#, fuzzy
msgid "The Ximian Evolution Groupware Suite"
@@ -12321,11 +12864,6 @@ msgstr "%d-%b-%Y"
msgid "Select a time to compare against"
msgstr "Выбрать время для сравнения"
-#: filter/filter-editor.c:147
-#, fuzzy
-msgid "_Filter Rules"
-msgstr "Правила фильтра"
-
#. filter:no-date primary
#: filter/filter-errors.xml.h:2
#, fuzzy
@@ -12354,19 +12892,8 @@ msgstr "Необходимо указать имя файла."
msgid "File \"{0}\" does not exist or is not a regular file."
msgstr "Файл \"%s\" не существует или не является обычным файлом."
-#. filter:no-folder primary
-#: filter/filter-errors.xml.h:14
-#, fuzzy
-msgid "Missing folder."
-msgstr "Удаление папки \"%s\""
-
-#. filter:no-folder secondary
-#: filter/filter-errors.xml.h:16
-msgid "You must specify a folder."
-msgstr "Необходимо указать папку."
-
#. filter:bad-regexp primary
-#: filter/filter-errors.xml.h:18
+#: filter/filter-errors.xml.h:14
#, fuzzy
msgid "Bad regular expression \"{0}\"."
msgstr ""
@@ -12374,158 +12901,37 @@ msgstr ""
"%s"
#. filter:bad-regexp secondary
-#: filter/filter-errors.xml.h:20
+#: filter/filter-errors.xml.h:16
msgid "Could not compile regular expression \"{1}\"."
msgstr ""
#. filter:no-name primary
-#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
#, fuzzy
msgid "Missing name."
msgstr "Назначение"
#. filter:no-name secondary
-#: filter/filter-errors.xml.h:24
+#: filter/filter-errors.xml.h:20
msgid "You must name this filter."
msgstr "Вы должны наименовать этот фильтр"
-#. filter:no-name-vfolder secondary
-#: filter/filter-errors.xml.h:28
-#, fuzzy
-msgid "You must name this vFolder."
-msgstr "Укажите имя этой виртуальной папки."
-
#. filter:bad-name-notunique primary
-#: filter/filter-errors.xml.h:30
+#: filter/filter-errors.xml.h:22
msgid "Name \"{0}\" already used."
msgstr ""
#. filter:bad-name-notunique secondary
-#: filter/filter-errors.xml.h:32
+#: filter/filter-errors.xml.h:24
msgid "Please choose another name."
msgstr ""
-#. filter:vfolder-no-source primary
-#: filter/filter-errors.xml.h:34
-#, fuzzy
-msgid "No sources selected."
-msgstr "Не был выбран сервер"
-
-#. filter:vfolder-no-source secondary
-#: filter/filter-errors.xml.h:36
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
-msgstr ""
-
#: filter/filter-file.c:288
msgid "Choose a file"
msgstr "Выберите файл"
-#. and now for the action area
-#: filter/filter-filter.c:491
-#, fuzzy
-msgid "<b>Then</b>"
-msgstr "<b>К:</b> "
-
-#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1347
-msgid "Select Folder"
-msgstr "Выбрать папку"
-
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
-msgid " "
-msgstr " "
-
-#: filter/filter.glade.h:2
-#, fuzzy
-msgid "<b>_Filter Rules</b>"
-msgstr "Правила фильтра"
-
-#: filter/filter.glade.h:3
-#, fuzzy
-msgid "<b>vFolder Sources</b>"
-msgstr "Источники виртуальных папок"
-
-#: filter/filter.glade.h:4
-msgid "Compare against"
-msgstr "Сравнивать с"
-
-#: filter/filter.glade.h:5
-msgid "Incoming"
-msgstr "Входящие"
-
-#: filter/filter.glade.h:6
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-"Дата сообщения будет сравниваться относительно\n"
-"12:00am указанной даты."
-
-#: filter/filter.glade.h:8
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-"Дата сообщения будет сравниваться относительно\n"
-"времени запуска фильтра."
-
-#: filter/filter.glade.h:10
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-"Дата сообщения будет сравниваться относительно\n"
-"текущего времени запуска фильтра."
-
-#: filter/filter.glade.h:13
-msgid "a time relative to the current time"
-msgstr "время относительно текущего"
-
-#: filter/filter.glade.h:14
-msgid "ago"
-msgstr "назад"
-
-#: filter/filter.glade.h:18
-msgid "months"
-msgstr "месяцы"
-
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
-msgid "seconds"
-msgstr "секунд"
-
-#: filter/filter.glade.h:20
-msgid "specific folders only"
-msgstr "только указанные папки"
-
-#: filter/filter.glade.h:21
-msgid "the current time"
-msgstr "текущее время"
-
-#: filter/filter.glade.h:22
-msgid "the time you specify"
-msgstr "указанное вами время"
-
-#: filter/filter.glade.h:24
-msgid "with all active remote folders"
-msgstr "со всеми активными удалёнными папками"
-
-#: filter/filter.glade.h:25
-msgid "with all local and active remote folders"
-msgstr "со всеми локальными и активными удалёнными папками"
-
-#: filter/filter.glade.h:26
-msgid "with all local folders"
-msgstr "со всеми локальными папками"
-
-#: filter/filter.glade.h:27
-msgid "years"
-msgstr "годы"
-
-#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
-#: mail/mail-config.glade.h:93
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
msgid "Important"
msgstr "Важное"
@@ -12595,6 +13001,71 @@ msgstr "входящие"
msgid "outgoing"
msgstr "исходящие"
+#: filter/filter.glade.h:1
+#, fuzzy
+msgid "<b>_Filter Rules</b>"
+msgstr "Правила фильтра"
+
+#: filter/filter.glade.h:2
+msgid "Compare against"
+msgstr "Сравнивать с"
+
+#: filter/filter.glade.h:3
+msgid "Incoming"
+msgstr "Входящие"
+
+#: filter/filter.glade.h:4
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"Дата сообщения будет сравниваться относительно\n"
+"12:00am указанной даты."
+
+#: filter/filter.glade.h:6
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"Дата сообщения будет сравниваться относительно\n"
+"времени запуска фильтра."
+
+#: filter/filter.glade.h:8
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"Дата сообщения будет сравниваться относительно\n"
+"текущего времени запуска фильтра."
+
+#: filter/filter.glade.h:11
+msgid "a time relative to the current time"
+msgstr "время относительно текущего"
+
+#: filter/filter.glade.h:12
+msgid "ago"
+msgstr "назад"
+
+#: filter/filter.glade.h:16
+msgid "months"
+msgstr "месяцы"
+
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
+msgid "seconds"
+msgstr "секунд"
+
+#: filter/filter.glade.h:18
+msgid "the current time"
+msgstr "текущее время"
+
+#: filter/filter.glade.h:19
+msgid "the time you specify"
+msgstr "указанное вами время"
+
+#: filter/filter.glade.h:21
+msgid "years"
+msgstr "годы"
+
#: filter/rule-editor.c:285
msgid "Add Rule"
msgstr "Добавить правило"
@@ -12607,60 +13078,72 @@ msgstr "Изменить правило"
msgid "Rule name"
msgstr "Имя правила"
-#: filter/score-editor.c:110
-#, fuzzy
-msgid "_Score Rules"
-msgstr "Правила назначения весов"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
-#: filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Вес"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Настройка редактора"
-#: filter/searchtypes.xml.h:1
-msgid "Body contains"
-msgstr "Тело содержит"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Тут настраиваются параметры почты, включая безопасность и отображение "
+"сообщений"
-#: filter/searchtypes.xml.h:2
-msgid "Body does not contain"
-msgstr "Тело не содержит"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Тут настраиваются проверка правописания, подписи и создание сообщений"
-#: filter/searchtypes.xml.h:3
-msgid "Body or subject contains"
-msgstr "Тело или тема содержат"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Настройте тут учётные записи почты"
-#: filter/searchtypes.xml.h:4
-msgid "Message contains"
-msgstr "Сообщение содержит"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Почта Evolution"
-#: filter/searchtypes.xml.h:5
-msgid "Recipients contain"
-msgstr "\"Получатели\" содержит"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution Mail accounts configuration control"
-#: filter/searchtypes.xml.h:6
-msgid "Sender contains"
-msgstr "\"Отправитель\" содержит"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Компонент Evolution Mail"
-#: filter/searchtypes.xml.h:7
-msgid "Subject contains"
-msgstr "Тема содержит"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Evolution Mail composer"
-#: filter/searchtypes.xml.h:8
-msgid "Subject does not contain"
-msgstr "Тема не содержит"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution Mail composer configuration control"
-#: filter/vfolder-editor.c:108
-#, fuzzy
-msgid "Virtual _Folders"
-msgstr "Виртуальные папки"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Evolution Mail preferences control"
-#: filter/vfolder-rule.c:493
-msgid "_Add"
-msgstr "_Добавить"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+msgid "Mail"
+msgstr "Почта"
-#: filter/vfolder-rule.c:573
-msgid "VFolder source"
-msgstr "Источник виртуальных папок"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Учётные записи"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
+msgid "Mail Preferences"
+msgstr "Настройка почты"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "_Почта:"
#. translators: default account indicator
#: mail/em-account-prefs.c:418
@@ -12693,46 +13176,355 @@ msgstr "Добавить подпись"
msgid "Signature(s)"
msgstr "Подпись(и)"
-#: mail/em-composer-utils.c:888
+#: mail/em-composer-utils.c:887
msgid "-------- Forwarded Message --------"
msgstr "-------- Пересланное сообщение --------"
-#: mail/em-composer-utils.c:1495
+#: mail/em-composer-utils.c:1500
msgid "an unknown sender"
msgstr "неизвестный отправитель"
-#. translators: attribution string used when quoting messages,
-#. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1505
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "В сообщении от %d.%m.%Y %H:%M %%+05d, %%s пишет:"
+#. Note to translators: this is the attribution string used when quoting messages.
+#. * each ${Variable} gets replaced with a value. To see a full list of available
+#. * variables, see em-composer-utils.c:1514
+#: mail/em-composer-utils.c:1547
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+
+#: mail/em-filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
+msgstr "Правила фильтра"
+
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
+#: mail/mail-account-gui.c:1347
+msgid "Select Folder"
+msgstr "Выбрать папку"
+
+#. Automatically generated. Do not edit.
+#: mail/em-filter-i18n.h:2
+msgid "Adjust Score"
+msgstr ""
+
+#: mail/em-filter-i18n.h:3
+#, fuzzy
+msgid "Assign Color"
+msgstr "Назначить задачу"
+
+#: mail/em-filter-i18n.h:4
+#, fuzzy
+msgid "Assign Score"
+msgstr "Назначено"
+
+#: mail/em-filter-i18n.h:5
+#, fuzzy
+msgid "Attachments"
+msgstr "Вложение"
+
+#: mail/em-filter-i18n.h:6
+#, fuzzy
+msgid "Beep"
+msgstr "Белиз"
+
+#: mail/em-filter-i18n.h:7
+#, fuzzy
+msgid "contains"
+msgstr "Тело содержит"
+
+#: mail/em-filter-i18n.h:8
+#, fuzzy
+msgid "Copy to Folder"
+msgstr "_Копировать в папку"
+
+#: mail/em-filter-i18n.h:9
+#, fuzzy
+msgid "Date received"
+msgstr "Получено"
+
+#: mail/em-filter-i18n.h:10
+#, fuzzy
+msgid "Date sent"
+msgstr "Элемент отправлен!\n"
+
+#: mail/em-filter-i18n.h:12
+#, fuzzy
+msgid "Deleted"
+msgstr "Удалить"
+
+#: mail/em-filter-i18n.h:13
+#, fuzzy
+msgid "does not contain"
+msgstr "Тело не содержит"
+
+#: mail/em-filter-i18n.h:14
+#, fuzzy
+msgid "does not end with"
+msgstr "Файл \"%s\" не существует."
+
+#: mail/em-filter-i18n.h:15
+#, fuzzy
+msgid "does not exist"
+msgstr "Файл \"%s\" не существует."
+
+#: mail/em-filter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "Тело не содержит"
+
+#: mail/em-filter-i18n.h:17
+#, fuzzy
+msgid "does not sound like"
+msgstr "Тело не содержит"
+
+#: mail/em-filter-i18n.h:18
+#, fuzzy
+msgid "does not start with"
+msgstr "Не удается запустить wombat"
+
+#: mail/em-filter-i18n.h:19
+msgid "Do Not Exist"
+msgstr ""
+
+#: mail/em-filter-i18n.h:20
+#, fuzzy
+msgid "Draft"
+msgstr "Дата"
+
+#: mail/em-filter-i18n.h:21
+#, fuzzy
+msgid "ends with"
+msgstr "Имя начинается с"
+
+#: mail/em-filter-i18n.h:22
+#, fuzzy
+msgid "Exist"
+msgstr "В_ыйти"
+
+#: mail/em-filter-i18n.h:23
+#, fuzzy
+msgid "exists"
+msgstr "Текст"
+
+#: mail/em-filter-i18n.h:24
+#, fuzzy
+msgid "Expression"
+msgstr "Годен до"
+
+#: mail/em-filter-i18n.h:25
+#, fuzzy
+msgid "Follow Up"
+msgstr "К исполнению"
+
+#: mail/em-filter-i18n.h:27
+#, fuzzy
+msgid "is"
+msgstr "Список"
+
+#: mail/em-filter-i18n.h:28
+#, fuzzy
+msgid "is after"
+msgstr "после"
+
+#: mail/em-filter-i18n.h:29
+#, fuzzy
+msgid "is before"
+msgstr "до"
+
+#: mail/em-filter-i18n.h:30
+#, fuzzy
+msgid "is Flagged"
+msgstr "Отмечено"
+
+#: mail/em-filter-i18n.h:31
+msgid "is greater than"
+msgstr ""
+
+#: mail/em-filter-i18n.h:32
+msgid "is less than"
+msgstr ""
+
+#: mail/em-filter-i18n.h:33
+#, fuzzy
+msgid "is not"
+msgstr "Список"
+
+#: mail/em-filter-i18n.h:34
+#, fuzzy
+msgid "is not Flagged"
+msgstr "Отмечено"
+
+#: mail/em-filter-i18n.h:36
+#, fuzzy
+msgid "Junk Test"
+msgstr "Июнь"
+
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
+#: widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Надпись"
+
+#: mail/em-filter-i18n.h:38
+#, fuzzy
+msgid "Mailing list"
+msgstr "список рассылки %s"
+
+#: mail/em-filter-i18n.h:39
+#, fuzzy
+msgid "Message Body"
+msgstr "Сообщение для отправки"
+
+#: mail/em-filter-i18n.h:40
+#, fuzzy
+msgid "Message Header"
+msgstr "Сообщение для отправки"
+
+#: mail/em-filter-i18n.h:41
+#, fuzzy
+msgid "Message is Junk"
+msgstr "_Сообщения"
+
+#: mail/em-filter-i18n.h:42
+#, fuzzy
+msgid "Message is not Junk"
+msgstr "Пометить как _не спам"
+
+#: mail/em-filter-i18n.h:43
+#, fuzzy
+msgid "Move to Folder"
+msgstr "Переместить в папку"
+
+#: mail/em-filter-i18n.h:44
+#, fuzzy
+msgid "Pipe to Program"
+msgstr "Выйти из программы"
+
+#: mail/em-filter-i18n.h:45
+#, fuzzy
+msgid "Play Sound"
+msgstr "Воспроизвести звук:"
+
+#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Прочитанное"
+
+#: mail/em-filter-i18n.h:47
+#, fuzzy
+msgid "Recipients"
+msgstr "\"Получатели\" содержит"
+
+#: mail/em-filter-i18n.h:48
+msgid "Regex Match"
+msgstr ""
+
+#: mail/em-filter-i18n.h:49
+#, fuzzy
+msgid "Replied to"
+msgstr "Получатели"
+
+#: mail/em-filter-i18n.h:50
+msgid "returns"
+msgstr ""
+
+#: mail/em-filter-i18n.h:51
+msgid "returns greater than"
+msgstr ""
+
+#: mail/em-filter-i18n.h:52
+msgid "returns less than"
+msgstr ""
+
+#: mail/em-filter-i18n.h:53
+#, fuzzy
+msgid "Run Program"
+msgstr "Запустить программу:"
+
+#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Вес"
+
+#: mail/em-filter-i18n.h:55
+#, fuzzy
+msgid "Sender"
+msgstr "Отправить"
+
+#: mail/em-filter-i18n.h:56
+#, fuzzy
+msgid "Set Status"
+msgstr "Состояние"
+
+#: mail/em-filter-i18n.h:57
+#, fuzzy
+msgid "Size (kB)"
+msgstr "Размер"
+
+#: mail/em-filter-i18n.h:58
+msgid "sounds like"
+msgstr ""
+
+#: mail/em-filter-i18n.h:59
+#, fuzzy
+msgid "Source Account"
+msgstr "Книга-источник"
+
+#: mail/em-filter-i18n.h:60
+#, fuzzy
+msgid "Specific header"
+msgstr "только указанные папки"
+
+#: mail/em-filter-i18n.h:61
+msgid "starts with"
+msgstr ""
+
+#: mail/em-filter-i18n.h:63
+#, fuzzy
+msgid "Stop Processing"
+msgstr "Остановить загрузку"
+
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
+#: smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Тема"
+
+#: mail/em-filter-i18n.h:65
+#, fuzzy
+msgid "Unset Status"
+msgstr "Соединенные Штаты"
+
+#. and now for the action area
+#: mail/em-filter-rule.c:488
+#, fuzzy
+msgid "<b>Then</b>"
+msgstr "<b>К:</b> "
#: mail/em-folder-browser.c:129
msgid "Create _Virtual Folder From Search..."
msgstr "Создать _виртуальную папку результатов поиска..."
-#: mail/em-folder-properties.c:120
+#: mail/em-folder-properties.c:122
#, fuzzy
-msgid "Folder properties"
+msgid "Folder Properties"
msgstr "Свойства шрифтов"
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-properties.c:126
-msgid "Properties"
-msgstr "Свойства"
-
#. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:135
-msgid "Folder Name"
-msgstr "Имя папки"
-
-#: mail/em-folder-properties.c:146
-msgid "Total messages"
-msgstr "Всего сообщений"
+#: mail/em-folder-properties.c:161
+#, fuzzy
+msgid "Total message:"
+msgid_plural "Total messages:"
+msgstr[0] "Всего сообщений"
+msgstr[1] "Всего сообщений"
+msgstr[2] "Всего сообщений"
-#: mail/em-folder-properties.c:158
-msgid "Unread messages"
-msgstr "Непрочитанных сообщений"
+#: mail/em-folder-properties.c:173
+#, fuzzy
+msgid "Unread message:"
+msgid_plural "Unread messages:"
+msgstr[0] "Непрочитанных сообщений"
+msgstr[1] "Непрочитанных сообщений"
+msgstr[2] "Непрочитанных сообщений"
#: mail/em-folder-selection-button.c:120
msgid "<click here to select a folder>"
@@ -12742,466 +13534,311 @@ msgstr "<щёлкните здесь, чтобы выбрать папку>"
msgid "Create New Folder"
msgstr "Создание новой папки"
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
-#: mail/mail-component.c:704
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
+#: mail/mail-component.c:709
msgid "Specify where to create the folder:"
msgstr "Укажите, где создать папку:"
-#: mail/em-folder-selector.c:299
+#: mail/em-folder-selector.c:300
#, fuzzy
msgid "Create"
msgstr "Создать новую папку"
-#: mail/em-folder-selector.c:303
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: mail/em-folder-selector.c:304
msgid "Folder _name:"
msgstr "_Имя папки:"
-#: mail/em-folder-tree.c:833
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr "VFolders"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr ""
+
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+msgid "Loading..."
+msgstr "Загрузка..."
+
+#: mail/em-folder-tree.c:846
#, fuzzy, c-format
msgid "Moving folder %s"
msgstr "Удаление папки \"%s\""
-#: mail/em-folder-tree.c:835
+#: mail/em-folder-tree.c:848
#, fuzzy, c-format
msgid "Copying folder %s"
msgstr "Открытие папки \"%s\""
-#: mail/em-folder-tree.c:842 mail/message-list.c:1561
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
#, fuzzy, c-format
msgid "Moving messages into folder %s"
msgstr "Перемещение сообщений в %s"
-#: mail/em-folder-tree.c:844 mail/message-list.c:1563
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
#, fuzzy, c-format
msgid "Copying messages into folder %s"
msgstr "Копирование сообщений в %s"
-#: mail/em-folder-tree.c:860
+#: mail/em-folder-tree.c:873
#, fuzzy
msgid "Cannot drop message(s) into toplevel store"
msgstr "Не удается скопировать или переместить сообщения в виртуальную папку"
-#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
msgid "_Copy to Folder"
msgstr "_Копировать в папку"
-#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
msgid "_Move to Folder"
msgstr "Переместить в папку"
-#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
-#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
-#: mail/message-list.c:1651
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
msgid "_Move"
msgstr "Пере_местить"
-#: mail/em-folder-tree.c:955 mail/message-list.c:1653
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
#, fuzzy
msgid "Cancel _Drag"
msgstr "Отменить задачу"
-#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
-#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
#: mail/importers/evolution-mbox-importer.c:119
#: mail/importers/evolution-outlook-importer.c:133
msgid "Select folder"
msgstr "Выбрать папку"
-#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
#, fuzzy
msgid "C_opy"
msgstr "Копировать"
-#: mail/em-folder-tree.c:2088
+#: mail/em-folder-tree.c:2144
#, fuzzy, c-format
msgid "Creating folder `%s'"
msgstr "Сохранение папки \"%s\""
-#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
#, fuzzy
msgid "Create folder"
msgstr "Создать новую папку"
-#: mail/em-folder-tree.c:2463
+#: mail/em-folder-tree.c:2526
#, c-format
msgid "Rename the \"%s\" folder to:"
msgstr "Переименовать папку \"%s\" в:"
-#: mail/em-folder-tree.c:2465
+#: mail/em-folder-tree.c:2528
msgid "Rename Folder"
msgstr "Переименование папки"
-#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
msgid "_View"
msgstr "_Вид"
-#: mail/em-folder-tree.c:2537
+#: mail/em-folder-tree.c:2604
msgid "Open in _New Window"
msgstr "Открыть в _новом окне"
+#: mail/em-folder-tree.c:2608
+#, fuzzy
+msgid "_Copy..."
+msgstr "_Копировать"
+
+#: mail/em-folder-tree.c:2609
+#, fuzzy
+msgid "_Move..."
+msgstr "Пере_местить"
+
#. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2613
msgid "_New Folder..."
msgstr "_Создать папку..."
-#: mail/em-folder-tree.c:2549
-msgid "_Rename"
+#: mail/em-folder-tree.c:2616
+#, fuzzy
+msgid "_Rename..."
msgstr "Пе_реименовать"
-#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Свойства..."
-
-#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:888
-msgid "VFolders"
-msgstr "VFolders"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
-msgid "Inbox"
-msgstr "Входящие"
-
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
-msgid "Loading..."
-msgstr "Загрузка..."
-
-#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:554
-msgid "Mail"
-msgstr "Почта"
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
+#, fuzzy
+msgid "_Properties"
+msgstr "Свойства"
#. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:690
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
#: ui/evolution-mail-message.xml.h:113
msgid "_Edit as New Message..."
msgstr "_Править как новое сообщение..."
-#: mail/em-folder-view.c:897
+#: mail/em-folder-view.c:901
msgid "_Print"
msgstr "_Печать"
-#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
msgid "_Reply to Sender"
msgstr "О_тветить отправителю"
-#: mail/em-folder-view.c:901 mail/em-popup.c:811
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
#: ui/evolution-mail-message.xml.h:88
msgid "Reply to _List"
msgstr "Ответить в с_писок"
-#: mail/em-folder-view.c:902 mail/em-popup.c:812
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
#: ui/evolution-mail-message.xml.h:87
msgid "Reply to _All"
msgstr "Ответить _всем"
-#: mail/em-folder-view.c:903 mail/em-popup.c:814
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
#: ui/evolution-mail-message.xml.h:114
msgid "_Forward"
msgstr "Пе_реслать"
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:910
msgid "Follo_w Up..."
msgstr "К _исполнению..."
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:911
msgid "Fla_g Completed"
msgstr "_Флаг \"Выполнено\""
-#: mail/em-folder-view.c:908
+#: mail/em-folder-view.c:912
msgid "Cl_ear Flag"
msgstr "О_чистить флаг"
-#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
msgid "Mar_k as Read"
msgstr "По_метить как прочитанные"
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:916
msgid "Mark as _Unread"
msgstr "Пометит_ь как непрочитанные"
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:917
msgid "Mark as _Important"
msgstr "Пометить как важное"
-#: mail/em-folder-view.c:914
+#: mail/em-folder-view.c:918
msgid "_Mark as Unimportant"
msgstr "Пометить как неважное"
-#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
msgid "Mark as _Junk"
msgstr "Пометить как _спам"
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
msgid "Mark as _Not Junk"
msgstr "Пометить как _не спам"
-#: mail/em-folder-view.c:920
+#: mail/em-folder-view.c:924
msgid "U_ndelete"
msgstr "В_осстановить"
-#: mail/em-folder-view.c:923
+#: mail/em-folder-view.c:927
msgid "Mo_ve to Folder..."
msgstr "Переместить в папку..."
-#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
msgid "_Copy to Folder..."
msgstr "_Копировать в папку..."
-#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Надпись"
-
-#: mail/em-folder-view.c:932
+#: mail/em-folder-view.c:936
msgid "Add Sender to Address_book"
msgstr "Добавить отправителя в _адресную книгу"
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:939
msgid "Appl_y Filters"
msgstr "Применить _фильтры"
-#: mail/em-folder-view.c:936
+#: mail/em-folder-view.c:940
#, fuzzy
msgid "F_ilter Junk"
msgstr "Правила фильтра"
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:943
msgid "Crea_te Rule From Message"
msgstr "Созда_ть правило из сообщения"
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:944
msgid "VFolder on _Subject"
msgstr "Виртуальная папка по теме"
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:945
msgid "VFolder on Se_nder"
msgstr "Виртуальная папка по отправителю"
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:946
msgid "VFolder on _Recipients"
msgstr "Виртуальная папка по получателю"
-#: mail/em-folder-view.c:943
+#: mail/em-folder-view.c:947
msgid "VFolder on Mailing _List"
msgstr "Виртуальная папка по списку рассылки"
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:951
msgid "Filter on Sub_ject"
msgstr "Фильтр по теме"
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:952
msgid "Filter on Sen_der"
msgstr "Фильтр по отправителю"
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:953
msgid "Filter on Re_cipients"
msgstr "Фильтр по получателям"
-#: mail/em-folder-view.c:950
+#: mail/em-folder-view.c:954
msgid "Filter on _Mailing List"
msgstr "Фильтр по списку рассылки"
#. default charset used in mail view
-#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
#: mail/mail-config.glade.h:68
msgid "Default"
msgstr "По умолчанию"
-#: mail/em-folder-view.c:1796
+#: mail/em-folder-view.c:1851
msgid "Print Message"
msgstr "Напечатать сообщение"
-#: mail/em-folder-view.c:2076
+#: mail/em-folder-view.c:2112
msgid "_Copy Link Location"
msgstr "_Копировать ссылку"
-#: mail/em-folder-view.c:2341
+#: mail/em-folder-view.c:2377
#, fuzzy, c-format
msgid "Click to mail %s"
msgstr "Щёлкните здесь, чтобы добавить задачу"
-#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
-msgstr "От"
-
-#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
-msgstr "Обратный адрес"
-
-#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Кому"
-
-#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
-msgstr "Копия"
-
-#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
-msgstr "Скр.копия"
-
-#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
-#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
-msgid "Subject"
-msgstr "Тема"
-
-#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Дата"
-
-#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
-msgstr ""
-
-#: mail/em-format.c:993
-#, c-format
-msgid "%s attachment"
-msgstr "вложение %s"
-
-#: mail/em-format.c:1024 mail/em-format.c:1143
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Не удается разобрать сообщение S/MIME: Неизвестная ошибка"
-
-#: mail/em-format.c:1133
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr ""
-
-#: mail/em-format.c:1279
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Не удается разобрать сообщение MIME. Отображается как есть."
-
-#: mail/em-format.c:1298
-msgid "Unsupported signature format"
-msgstr "Неподдерживаемый формат подписи"
-
-#: mail/em-format.c:1306
-#, fuzzy
-msgid "Error verifying signature"
-msgstr "Неизвестная ошибка при проверке подписи"
-
-#: mail/em-format.c:1306
-msgid "Unknown error verifying signature"
-msgstr "Неизвестная ошибка при проверке подписи"
-
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "Получение '%s'"
-
-#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
-msgid "Unsigned"
-msgstr "Не подписано"
-
-#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
-msgid "Valid signature"
-msgstr "Подпись действительна"
-
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
-msgid "Invalid signature"
-msgstr "Подпись недействительна"
-
-#: mail/em-format-html.c:562
-msgid "Valid signature but cannot verify sender"
-msgstr ""
-
-#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
-msgid "Unencrypted"
-msgstr "Не зашифровано"
-
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
-msgid "Encrypted, weak"
-msgstr ""
-
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
-msgid "Encrypted"
-msgstr "Зашифровано"
-
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
-msgid "Encrypted, strong"
-msgstr ""
-
-#: mail/em-format-html.c:820
-msgid "Malformed external-body part."
-msgstr "Часть external-body неверно сформирована"
-
-#: mail/em-format-html.c:850
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Указатель на FTP сайт (%s)"
-
-#: mail/em-format-html.c:861
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Указатель на локальный файл (%s), доступный на сайте \"%s\""
-
-#: mail/em-format-html.c:863
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Указатель на локальный файл (%s)"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Указатель на удаленные данные (%s)"
-
-#: mail/em-format-html.c:895
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Указатель на неизвестные внешние данные (типа \"%s\")"
-
-#: mail/em-format-html.c:1137
-msgid "Formatting message"
-msgstr "Форматирование сообщения"
-
-#. pseudo-header
-#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
-#: mail/em-mailer-prefs.c:930
-msgid "Mailer"
-msgstr "Почтовый клиент"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1550
-msgid "<I> (%a, %R %Z)</I>"
-msgstr ""
-
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1553
-msgid "<I> (%R %Z)</I>"
-msgstr ""
-
#. message-search popup match count string
#: mail/em-format-html-display.c:410
#, c-format
msgid "Matches: %d"
msgstr "Совпадения: %d"
-#: mail/em-format-html-display.c:644
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
+msgid "Unsigned"
+msgstr "Не подписано"
+
+#: mail/em-format-html-display.c:641
#, fuzzy
msgid ""
"This message is not signed. There is no guarantee that this message is "
"authentic."
-msgstr "Это сообщение не подписано. Отправитель не может быть аутентифицирован."
+msgstr ""
+"Это сообщение не подписано. Отправитель не может быть аутентифицирован."
-#: mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
+msgid "Valid signature"
+msgstr "Подпись действительна"
+
+#: mail/em-format-html-display.c:642
#, fuzzy
msgid ""
"This message is signed and is valid meaning that it is very likely that this "
@@ -13210,7 +13847,11 @@ msgstr ""
"Это сообщение подписано действительной подписью, что удостоверяет "
"подлинность отправителя."
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
+msgid "Invalid signature"
+msgstr "Подпись недействительна"
+
+#: mail/em-format-html-display.c:643
msgid ""
"The signature of this message cannot be verified, it may have been altered "
"in transit."
@@ -13218,11 +13859,11 @@ msgstr ""
"Подпись этого сообщения не может быть проверена. Возможно, сообщение было "
"изменено по дороге."
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:644
msgid "Valid signature, cannot verify sender"
msgstr ""
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:644
msgid ""
"This message is signed with a valid signature, but the sender of the message "
"cannot be verified."
@@ -13230,7 +13871,11 @@ msgstr ""
"Это сообщение подписано действительной подписью, но отправитель сообщения не "
"может быть проверен."
-#: mail/em-format-html-display.c:653
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:568
+msgid "Unencrypted"
+msgstr "Не зашифровано"
+
+#: mail/em-format-html-display.c:650
#, fuzzy
msgid ""
"This message is not encrypted. Its content may be viewed in transit across "
@@ -13239,61 +13884,196 @@ msgstr ""
"Это сообщение не зашифровано. Его содержимое может быть просмотрено в "
"процессе передачи по Интернету."
-#: mail/em-format-html-display.c:654
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
+msgid "Encrypted, weak"
+msgstr ""
+
+#: mail/em-format-html-display.c:651
msgid ""
"This message is encrypted, but with a weak encryption algorithm. It would "
"be difficult, but not impossible for an outsider to view the content of this "
"message in a practical amount of time."
msgstr ""
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:652 mail/em-format-html.c:570
+msgid "Encrypted"
+msgstr "Зашифровано"
+
+#: mail/em-format-html-display.c:652
msgid ""
"This message is encrypted. It would be difficult for an outsider to view "
"the content of this message."
msgstr ""
-#: mail/em-format-html-display.c:656
+#: mail/em-format-html-display.c:653 mail/em-format-html.c:571
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html-display.c:653
msgid ""
"This message is encrypted, with a strong encryption algorithm. It would be "
"very difficult for an outsider to view the content of this message in a "
"practical amount of time."
msgstr ""
-#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
+#: mail/em-format-html-display.c:754 smime/gui/smime-ui.glade.h:47
msgid "_View Certificate"
msgstr "_Просмотреть сертификат"
-#: mail/em-format-html-display.c:772
+#: mail/em-format-html-display.c:769
msgid "This certificate is not viewable"
msgstr "Этот сертификат нельзя просмотреть"
-#: mail/em-format-html-display.c:1007
+#: mail/em-format-html-display.c:1004
msgid "Completed on %B %d, %Y, %l:%M %p"
msgstr ""
-#: mail/em-format-html-display.c:1015
+#: mail/em-format-html-display.c:1012
#, fuzzy
msgid "Overdue:"
msgstr "Просроченные задачи:"
-#: mail/em-format-html-display.c:1018
+#: mail/em-format-html-display.c:1015
#, fuzzy
msgid "by %B %d, %Y, %l:%M %p"
msgstr "%b %d %l:%M %p"
-#: mail/em-format-html-display.c:1088
+#: mail/em-format-html-display.c:1085
msgid "_View Inline"
msgstr "_Встроенный просмотр"
-#: mail/em-format-html-display.c:1089
+#: mail/em-format-html-display.c:1086
msgid "_Hide"
msgstr "_Скрыть"
-#: mail/em-format-html-print.c:126
+#: mail/em-format-html-print.c:130
#, c-format
msgid "Page %d of %d"
msgstr "Страница %d из %d"
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "Получение '%s'"
+
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr "Часть external-body неверно сформирована"
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Указатель на FTP сайт (%s)"
+
+#: mail/em-format-html.c:861
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Указатель на локальный файл (%s), доступный на сайте \"%s\""
+
+#: mail/em-format-html.c:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Указатель на локальный файл (%s)"
+
+#: mail/em-format-html.c:884
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Указатель на удаленные данные (%s)"
+
+#: mail/em-format-html.c:895
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Указатель на неизвестные внешние данные (типа \"%s\")"
+
+#: mail/em-format-html.c:1137
+msgid "Formatting message"
+msgstr "Форматирование сообщения"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "От"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
+msgstr "Обратный адрес"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Кому"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "Копия"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
+msgstr "Скр.копия"
+
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:939
+msgid "Mailer"
+msgstr "Почтовый клиент"
+
+#. translators: strftime format for local time equivalent in Date header display, with day
+#: mail/em-format-html.c:1550
+msgid "<I> (%a, %R %Z)</I>"
+msgstr ""
+
+#. translators: strftime format for local time equivalent in Date header display, without day
+#: mail/em-format-html.c:1553
+msgid "<I> (%R %Z)</I>"
+msgstr ""
+
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Дата"
+
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
+msgstr ""
+
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "вложение %s"
+
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Не удается разобрать сообщение S/MIME: Неизвестная ошибка"
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr ""
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Не удается разобрать сообщение MIME. Отображается как есть."
+
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
+msgstr "Неподдерживаемый формат подписи"
+
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Неизвестная ошибка при проверке подписи"
+
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
+msgstr "Неизвестная ошибка при проверке подписи"
+
#: mail/em-junk-filter.c:86
msgid "Spamassassin (built-in)"
msgstr ""
@@ -13407,7 +14187,7 @@ msgstr "Отправить сообщение в список..."
msgid "_Add to Addressbook"
msgstr "_Добавить в адресную книгу"
-#: mail/em-popup.c:967
+#: mail/em-popup.c:985
#, c-format
msgid "Open in %s..."
msgstr "Открыть в %s..."
@@ -13421,7 +14201,7 @@ msgstr "Этот сервер не поддерживает информацию
msgid "Subscribed"
msgstr "Подписан"
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:639
msgid "Folder"
msgstr "Папка"
@@ -13455,11 +14235,24 @@ msgid "Add address"
msgstr "Добавить адрес"
#. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1016
+#: mail/em-utils.c:1019
#, fuzzy, c-format
msgid "Messages from %s"
msgstr "Почта от %s"
+#: mail/em-vfolder-editor.c:104
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "Виртуальные папки"
+
+#: mail/em-vfolder-rule.c:494
+msgid "_Add"
+msgstr "_Добавить"
+
+#: mail/em-vfolder-rule.c:574
+msgid "VFolder source"
+msgstr "Источник виртуальных папок"
+
#: mail/evolution-mail.schemas.in.in.h:1
msgid "Automatic link recognition"
msgstr "Автоматическое распознавание гиперссылок"
@@ -13703,7 +14496,8 @@ msgstr ""
"папке."
#: mail/evolution-mail.schemas.in.in.h:56
-msgid "Prompt the user when he or she tries to send a message without a Subject."
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
msgstr ""
"Предупреждать, если пользователь пытается отправить сообщение с пустым полем "
"Subject."
@@ -13720,15 +14514,18 @@ msgstr "Предупреждать, если пользователь запол
msgid ""
"Prompt when user tries to send HTML mail to recipients that may not want to "
"receive HTML mail."
-msgstr "Предупреждать при отправке сообщений в формате HTML тем, кто не желает этого."
+msgstr ""
+"Предупреждать при отправке сообщений в формате HTML тем, кто не желает этого."
#: mail/evolution-mail.schemas.in.in.h:60
msgid "Prompt when user tries to send a message with no To or Cc recipients."
-msgstr "Предупреждать при попытке отправить сообщение с пустыми полями To и Cc."
+msgstr ""
+"Предупреждать при попытке отправить сообщение с пустыми полями To и Cc."
#: mail/evolution-mail.schemas.in.in.h:61
msgid "Prompt when user tries to send unwanted HTML"
-msgstr "Предупреждать, когда пользователь пытается отправить нежелательный HTML"
+msgstr ""
+"Предупреждать, когда пользователь пытается отправить нежелательный HTML"
#: mail/evolution-mail.schemas.in.in.h:62
msgid "Recognize links in text and replace them."
@@ -13926,64 +14723,33 @@ msgstr ""
msgid "spamd port"
msgstr "Порт spamd"
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Composer Preferences"
-msgstr "Настройка редактора"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure mail preferences, including security and message display, here"
-msgstr ""
-"Тут настраиваются параметры почты, включая безопасность и отображение "
-"сообщений"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Тут настраиваются проверка правописания, подписи и создание сообщений"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configure your email accounts here"
-msgstr "Настройте тут учётные записи почты"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "Почта Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution Mail accounts configuration control"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
-msgstr "Компонент Evolution Mail"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolution Elm importer"
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
-msgstr "Evolution Mail composer"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution Netscape Mail importer"
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution Mail composer configuration control"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolution Outlook Express 4 importer"
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evolution Mail preferences control"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Evolution Pine importer"
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Учётные записи"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Evolution mbox importer"
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
-msgid "Mail Preferences"
-msgstr "Настройка почты"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-#, fuzzy
-msgid "_Mail"
-msgstr "_Почта:"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
#: mail/importers/elm-importer.c:88
msgid "Evolution is importing your old Elm mail"
@@ -14045,34 +14811,6 @@ msgstr "Импорт"
msgid "Importing mailbox"
msgstr "Импорт файлов"
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolution Elm importer"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolution Netscape Mail importer"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolution Outlook Express 4 importer"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Evolution Pine importer"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Evolution mbox importer"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
#: mail/importers/mail-importer.c:360
#, c-format
msgid "Scanning %s"
@@ -14238,80 +14976,93 @@ msgstr "список рассылки %s"
msgid "Add Filter Rule"
msgstr "Добавить правило фильтра"
-#: mail/mail-component.c:461
+#: mail/mail-component.c:459
#, fuzzy, c-format
msgid "%d deleted"
-msgstr "Удалённое"
+msgid_plural "%d deleted"
+msgstr[0] "Удалённое"
+msgstr[1] "Удалённое"
+msgstr[2] "Удалённое"
-#: mail/mail-component.c:463
+#: mail/mail-component.c:461
#, c-format
msgid "%d junk"
-msgstr ""
+msgid_plural "%d junk"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: mail/mail-component.c:486
+#: mail/mail-component.c:484
#, fuzzy, c-format
-msgid "%d drafts"
-msgstr "%d дней"
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "%d дней"
+msgstr[1] "%d дней"
+msgstr[2] "%d дней"
-#: mail/mail-component.c:488
+#: mail/mail-component.c:486
#, fuzzy, c-format
msgid "%d sent"
-msgstr "%d секунд"
+msgid_plural "%d sent"
+msgstr[0] "%d секунд"
+msgstr[1] "%d секунд"
+msgstr[2] "%d секунд"
-#: mail/mail-component.c:490
+#: mail/mail-component.c:488
#, fuzzy, c-format
msgid "%d unsent"
-msgstr "%d секунд"
+msgid_plural "%d unsent"
+msgstr[0] "%d секунд"
+msgstr[1] "%d секунд"
+msgstr[2] "%d секунд"
-#: mail/mail-component.c:494
+#: mail/mail-component.c:492
#, fuzzy, c-format
msgid "%d total"
-msgstr "%d контактов"
+msgid_plural "%d total"
+msgstr[0] "%d контактов"
+msgstr[1] "%d контактов"
+msgstr[2] "%d контактов"
-#: mail/mail-component.c:496
+#: mail/mail-component.c:494
#, c-format
msgid ", %d unread"
-msgstr ""
+msgid_plural ", %d unread"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: mail/mail-component.c:656
+#: mail/mail-component.c:661
msgid "New Mail Message"
msgstr "Новое почтовое сообщение"
-#: mail/mail-component.c:657
+#: mail/mail-component.c:662
msgid "_Mail Message"
msgstr "Почтовое сообщение..."
-#: mail/mail-component.c:658
+#: mail/mail-component.c:663
msgid "Compose a new mail message"
msgstr "Создать новое сообщение"
-#: mail/mail-component.c:664
+#: mail/mail-component.c:669
#, fuzzy
msgid "New Mail Folder"
msgstr "Новая виртуальная папка"
-#: mail/mail-component.c:665
+#: mail/mail-component.c:670
#, fuzzy
msgid "Mail _Folder"
msgstr "Почтовые фильтры"
-#: mail/mail-component.c:666
+#: mail/mail-component.c:671
#, fuzzy
msgid "Create a new mail folder"
msgstr "Создать новый календарь"
-#: mail/mail-component.c:798
+#: mail/mail-component.c:803
msgid "Failed upgrading Mail settings or folders."
msgstr ""
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr "Проверка сервиса"
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr "Подключение к серверу..."
-
#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
msgid "Identity"
msgstr "Подлинность"
@@ -14374,16 +15125,23 @@ msgstr ""
"учетной записи в строке ниже. Это имя будет использовано только для "
"отображения."
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Проверка сервиса"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Подключение к серверу..."
+
+#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+msgid " "
+msgstr " "
+
#: mail/mail-config.glade.h:2
#, fuzzy
msgid " Ch_eck for Supported Types "
msgstr " Проверка поддерживаемых типов "
-#: mail/mail-config.glade.h:4
-#, fuzzy
-msgid "<b>Preview</b>"
-msgstr "Предварительный просмотр"
-
#: mail/mail-config.glade.h:5
#, fuzzy
msgid "<b>SSL is not supported in this build of evolution</b>"
@@ -14659,7 +15417,7 @@ msgstr "Не цитировать исходное сообщение"
msgid "Don't sign _meeting requests (for Outlook compatibility)"
msgstr "Не подписывать приглашения (для совместимости с Outlook)"
-#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
msgid "Done"
msgstr "Готово"
@@ -14990,7 +15748,8 @@ msgstr "Никогда не загружать изображения"
#: mail/mail-config.glade.h:174
msgid "_Prompt when sending HTML messages to contacts that don't want them"
-msgstr "_Предупреждать при отправке сообщений в формате HTML тем, кто не желает этого"
+msgstr ""
+"_Предупреждать при отправке сообщений в формате HTML тем, кто не желает этого"
#: mail/mail-config.glade.h:175
msgid "_Prompt when sending messages with an empty subject line"
@@ -15025,6 +15784,118 @@ msgstr "цвет"
msgid "description"
msgstr "описание"
+#: mail/mail-dialogs.glade.h:1
+msgid ""
+"\n"
+" Please read carefully the license agreement displayed\n"
+" below and tick the check box for accepting it\n"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:7
+#, fuzzy
+msgid "<b>vFolder Sources</b>"
+msgstr "Источники виртуальных папок"
+
+#: mail/mail-dialogs.glade.h:8
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:9
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:10
+#, fuzzy
+msgid "Accept License"
+msgstr "Принято"
+
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+msgid "C_ompleted"
+msgstr "_Завершено"
+
+#: mail/mail-dialogs.glade.h:12
+msgid "Case Sensitive"
+msgstr "Учитывать регистр"
+
+#: mail/mail-dialogs.glade.h:14
+msgid "Find in Message"
+msgstr "Поиск в сообщении"
+
+#: mail/mail-dialogs.glade.h:15
+msgid "Find:"
+msgstr "Поиск:"
+
+#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
+msgid "Flag to Follow Up"
+msgstr "Пометить к исполнению"
+
+#: mail/mail-dialogs.glade.h:17
+msgid "Folder Subscriptions"
+msgstr "Подписка на папки"
+
+#: mail/mail-dialogs.glade.h:18
+msgid "License Agreement"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:19
+msgid "None Selected"
+msgstr "Ничего не выбрано"
+
+#: mail/mail-dialogs.glade.h:20
+msgid "S_erver:"
+msgstr "С_ервер:"
+
+#: mail/mail-dialogs.glade.h:21
+msgid "Security Information"
+msgstr "Сведения о безопасности"
+
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+"Сообщения, помеченные вами к исполнению, перечислены ниже.\n"
+"Выберите действие из меню \"Флаг\"."
+
+#: mail/mail-dialogs.glade.h:25
+#, fuzzy
+msgid "Tick this to accept the license agreement"
+msgstr "Список учетных записей"
+
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+#, fuzzy
+msgid "_Due By:"
+msgstr "Срок до:"
+
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+msgid "_Flag:"
+msgstr "_Флаг:"
+
+#: mail/mail-dialogs.glade.h:28
+msgid "_Subscribe"
+msgstr "Подписаться"
+
+#: mail/mail-dialogs.glade.h:29
+msgid "_Unsubscribe"
+msgstr "Отказаться от подписки"
+
+#: mail/mail-dialogs.glade.h:30
+msgid "specific folders only"
+msgstr "только указанные папки"
+
+#: mail/mail-dialogs.glade.h:31
+msgid "with all active remote folders"
+msgstr "со всеми активными удалёнными папками"
+
+#: mail/mail-dialogs.glade.h:32
+msgid "with all local and active remote folders"
+msgstr "со всеми локальными и активными удалёнными папками"
+
+#: mail/mail-dialogs.glade.h:33
+msgid "with all local folders"
+msgstr "со всеми локальными папками"
+
#. mail:camel-service-auth-invalid primary
#: mail/mail-errors.xml.h:2
#, fuzzy
@@ -15094,7 +15965,8 @@ msgstr ""
#: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
#, fuzzy
msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr "Предупреждать при попытке отправить сообщение с пустыми полями To и Cc."
+msgstr ""
+"Предупреждать при попытке отправить сообщение с пустыми полями To и Cc."
#. mail:ask-send-only-bcc-contact secondary
#: mail/mail-errors.xml.h:24
@@ -15118,7 +15990,8 @@ msgstr ""
#. mail:send-no-recipients primary
#: mail/mail-errors.xml.h:34
-msgid "This message cannot be sent because you have not specified any Recipients"
+msgid ""
+"This message cannot be sent because you have not specified any Recipients"
msgstr ""
#. mail:send-no-recipients secondary
@@ -15232,14 +16105,6 @@ msgstr ""
msgid "{0}."
msgstr ""
-#. mail:session-message-info secondary
-#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
-#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
-#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
-#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
-msgid "{0}"
-msgstr ""
-
#. mail:ask-session-password primary
#: mail/mail-errors.xml.h:82
#, fuzzy
@@ -15341,8 +16206,9 @@ msgstr ""
#. mail:no-rename-folder-exists primary
#: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+#, fuzzy
msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr ""
+msgstr "Не удается переместить папку: %s"
#. mail:no-rename-folder-exists secondary
#: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
@@ -15393,8 +16259,9 @@ msgstr "Не удается открыть \"%s\": %s"
#. mail:account-incomplete primary
#: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+#, fuzzy
msgid "Cannot save changes to account."
-msgstr ""
+msgstr "и одна другой контакт."
#. mail:account-incomplete secondary
#: mail/mail-errors.xml.h:158
@@ -15414,8 +16281,11 @@ msgstr "Удалить выбранные контакты"
#. mail:ask-delete-account primary
#: mail/mail-errors.xml.h:166
+#, fuzzy
msgid "Are you sure you want to delete this account?"
-msgstr "Вы действительно хотите удалить эту учётную запись?"
+msgstr ""
+"Вы действительно хотите\n"
+"удалить этот контакт?"
#. mail:ask-delete-account secondary
#: mail/mail-errors.xml.h:168
@@ -15423,8 +16293,9 @@ msgid "If you proceed, the account information will be deleted permanently."
msgstr ""
#: mail/mail-errors.xml.h:169
+#, fuzzy
msgid "Don't delete"
-msgstr "Не удалять"
+msgstr "Восстановить"
#. mail:no-save-signature primary
#: mail/mail-errors.xml.h:171
@@ -15488,8 +16359,11 @@ msgstr ""
#. mail:vfolder-notunique primary
#: mail/mail-errors.xml.h:190
+#, fuzzy
msgid "Cannot add vFolder \"{0}\"."
msgstr ""
+"Не удается удалить папку:\n"
+"%s"
#. mail:vfolder-updated primary
#: mail/mail-errors.xml.h:194
@@ -15531,13 +16405,44 @@ msgstr ""
" '%s'\n"
"и была обновлена."
-#. mail:ask-migrate-existing primary
+#. mail:no-folder primary
#: mail/mail-errors.xml.h:210
+#, fuzzy
+msgid "Missing folder."
+msgstr "Удаление папки \"%s\""
+
+#. mail:no-folder secondary
+#: mail/mail-errors.xml.h:212
+msgid "You must specify a folder."
+msgstr "Необходимо указать папку."
+
+#. mail:no-name-vfolder secondary
+#: mail/mail-errors.xml.h:216
+#, fuzzy
+msgid "You must name this vFolder."
+msgstr "Укажите имя этой виртуальной папки."
+
+#. mail:vfolder-no-source primary
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "No sources selected."
+msgstr "Не был выбран сервер"
+
+#. mail:vfolder-no-source secondary
+#: mail/mail-errors.xml.h:220
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
+msgstr ""
+
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:224
msgid "Problem migrating old mail folder \"{0}\"."
msgstr ""
#. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:212
+#: mail/mail-errors.xml.h:226
msgid ""
"A non-empty folder at \"{1}\" already exists.\n"
"\n"
@@ -15545,16 +16450,16 @@ msgid ""
"quit.\n"
msgstr ""
-#: mail/mail-errors.xml.h:216
+#: mail/mail-errors.xml.h:230
msgid "Ignore"
msgstr ""
-#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
#, fuzzy
msgid "_Overwrite"
msgstr "Перезаписать"
-#: mail/mail-errors.xml.h:218
+#: mail/mail-errors.xml.h:232
#, fuzzy
msgid "_Append"
msgstr "Отправить"
@@ -15718,7 +16623,7 @@ msgstr ""
msgid "Saving attachment"
msgstr "Сохранение вложения"
-#: mail/mail-ops.c:2015
+#: mail/mail-ops.c:2010
#, c-format
msgid ""
"Cannot create output file: %s:\n"
@@ -15727,45 +16632,21 @@ msgstr ""
"Не удается создать файл вывода: %s\n"
" %s"
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2020
#, c-format
msgid "Could not write data: %s"
msgstr "Не удается записать данные: %s"
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
#, c-format
msgid "Disconnecting from %s"
msgstr "Отключение от %s"
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
#, c-format
msgid "Reconnecting to %s"
msgstr "Переподключение к %s"
-#: mail/mail-search.glade.h:2
-msgid "Case Sensitive"
-msgstr "Учитывать регистр"
-
-#: mail/mail-search.glade.h:3
-msgid "Find in Message"
-msgstr "Поиск в сообщении"
-
-#: mail/mail-search.glade.h:4
-msgid "Find:"
-msgstr "Поиск:"
-
-#: mail/mail-security.glade.h:1
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:2
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:4
-msgid "Security Information"
-msgstr "Сведения о безопасности"
-
#: mail/mail-send-recv.c:157
msgid "Cancelling..."
msgstr "Отмена..."
@@ -15801,24 +16682,24 @@ msgstr "Обновление..."
msgid "Waiting..."
msgstr "Ожидание..."
-#: mail/mail-session.c:239
+#: mail/mail-session.c:240
msgid "User canceled operation."
msgstr "Операция отменена пользователем."
-#: mail/mail-session.c:272
+#: mail/mail-session.c:274
#, c-format
msgid "Enter Password for %s"
msgstr "Введите пароль для %s"
-#: mail/mail-session.c:274
+#: mail/mail-session.c:276
msgid "Enter Password"
msgstr "Ввод пароля"
-#: mail/mail-session.c:297
+#: mail/mail-session.c:304
msgid "_Remember this password"
msgstr "_Запомнить этот пароль"
-#: mail/mail-session.c:298
+#: mail/mail-session.c:305
msgid "_Remember this password for the remainder of this session"
msgstr "_Запомнить этот пароль до завершения этого сеанса"
@@ -15875,15 +16756,15 @@ msgstr "Обновление виртуальных папок для uri: %s"
msgid "Updating vFolders for '%s'"
msgstr "Обновление виртуальных папок для uri: %s"
-#: mail/mail-vfolder.c:958
+#: mail/mail-vfolder.c:942
msgid "vFolders"
msgstr "vFolders"
-#: mail/mail-vfolder.c:997
+#: mail/mail-vfolder.c:981
msgid "Edit VFolder"
msgstr "Править виртуальную папку"
-#: mail/mail-vfolder.c:1081
+#: mail/mail-vfolder.c:1065
msgid "New VFolder"
msgstr "Новая виртуальная папка"
@@ -15947,7 +16828,7 @@ msgstr "%b %d %l:%M %p"
msgid "%b %d %Y"
msgstr "%b %d %Y"
-#: mail/message-list.c:3321
+#: mail/message-list.c:3324
msgid "Generating message list"
msgstr "Создание списка сообщений"
@@ -16003,10 +16884,6 @@ msgstr "Переслать"
msgid "No Response Necessary"
msgstr "Можно не отвечать"
-#: mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Прочитанное"
-
#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
msgid "Reply"
msgstr "Ответить"
@@ -16019,50 +16896,50 @@ msgstr "Ответить всем"
msgid "Review"
msgstr "Проверить"
-#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
-msgid "Flag to Follow Up"
-msgstr "Пометить к исполнению"
+#: mail/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "Тело содержит"
-#: mail/message-tags.glade.h:2
-msgid "C_ompleted"
-msgstr "_Завершено"
+#: mail/searchtypes.xml.h:2
+msgid "Body does not contain"
+msgstr "Тело не содержит"
-#: mail/message-tags.glade.h:4
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
-"Сообщения, помеченные вами к исполнению, перечислены ниже.\n"
-"Выберите действие из меню \"Флаг\"."
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
+msgstr "Тело или тема содержат"
-#: mail/message-tags.glade.h:6
-#, fuzzy
-msgid "_Due By:"
-msgstr "Срок до:"
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
+msgstr "Сообщение содержит"
-#: mail/message-tags.glade.h:7
-msgid "_Flag:"
-msgstr "_Флаг:"
+#: mail/searchtypes.xml.h:5
+msgid "Recipients contain"
+msgstr "\"Получатели\" содержит"
-#: mail/subscribe-dialog.glade.h:1
-msgid "Folder Subscriptions"
-msgstr "Подписка на папки"
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr "\"Отправитель\" содержит"
-#: mail/subscribe-dialog.glade.h:2
-msgid "None Selected"
-msgstr "Ничего не выбрано"
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr "Тема содержит"
-#: mail/subscribe-dialog.glade.h:3
-msgid "S_erver:"
-msgstr "С_ервер:"
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
+msgstr "Тема не содержит"
-#: mail/subscribe-dialog.glade.h:4
-msgid "_Subscribe"
-msgstr "Подписаться"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Оболочка Evolution"
-#: mail/subscribe-dialog.glade.h:5
-msgid "_Unsubscribe"
-msgstr "Отказаться от подписки"
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Evolution Test component"
#: shell/apps_evolution_shell.schemas.in.in.h:1
msgid "480"
@@ -16094,7 +16971,8 @@ msgstr ""
msgid ""
"If set to true, Evolution will start up in offline mode instead of online "
"mode."
-msgstr "Если этот ключ установлен, Evolution будет запускаться в автономном режиме."
+msgstr ""
+"Если этот ключ установлен, Evolution будет запускаться в автономном режиме."
#: shell/apps_evolution_shell.schemas.in.in.h:8
msgid ""
@@ -16103,7 +16981,8 @@ msgid ""
msgstr ""
#: shell/apps_evolution_shell.schemas.in.in.h:9
-msgid "List of paths for the folders to be synchronized to disk for offline usage"
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
msgstr ""
#: shell/apps_evolution_shell.schemas.in.in.h:10
@@ -16126,31 +17005,18 @@ msgstr "Пропускать ли предупреждение о тестово
msgid "mail"
msgstr "почта"
-#: shell/e-shell.c:588 shell/e-shell.c:589
-#, fuzzy, c-format
-msgid "%ld KB"
-msgstr "%d %B"
-
-#: shell/e-shell.c:786
+#: shell/e-active-connection-dialog.glade.h:1
#, fuzzy
-msgid "Uknown system error."
-msgstr "Неизвестная ошибка"
-
-#: shell/e-shell.c:1143
-msgid "Invalid arguments"
-msgstr "Недопустимые аргументы"
-
-#: shell/e-shell.c:1145
-msgid "Cannot register on OAF"
-msgstr "Не удается зарегистрировать в OAF"
+msgid "<b>Active Connections</b>"
+msgstr "Активные соединения"
-#: shell/e-shell.c:1147
-msgid "Configuration Database not found"
-msgstr "База данных настроек не найдена"
+#: shell/e-active-connection-dialog.glade.h:2
+msgid "Active Connections"
+msgstr "Активные соединения"
-#: shell/e-shell.c:1149
-msgid "Generic error"
-msgstr "Обычная ошибка"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr "Нажмите OK для закрытия соединения и перехода на работу вне сети"
#: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
msgid "(Untitled)"
@@ -16329,30 +17195,6 @@ msgstr "Имя папки не может содержать символ \"#\".
msgid "'.' and '..' are reserved folder names."
msgstr "\".\" и \"..\" -- зарезервированные имена папок."
-#: shell/e-shell-window.c:337
-#, fuzzy
-msgid "Evolution is currently online. Click on this button to work offline."
-msgstr ""
-"Ximian Evolution сейчас в сетевом режиме работы. Нажмите на эту кнопку для "
-"перехода в режим работы вне сети."
-
-#: shell/e-shell-window.c:344
-#, fuzzy
-msgid "Evolution is in the process of going offline."
-msgstr "Ximian Evolution в процессе перехода в режим работы вне сети."
-
-#: shell/e-shell-window.c:350
-#, fuzzy
-msgid "Evolution is currently offline. Click on this button to work online."
-msgstr ""
-"Ximian Evolution сейчас в автономном режиме работы. Нажмите на эту кнопку "
-"для перехода в режим работы в сети."
-
-#: shell/e-shell-window.c:637
-#, fuzzy, c-format
-msgid "Switch to %s"
-msgstr "Почта к %s"
-
#: shell/e-shell-window-commands.c:66
msgid "The GNOME Pilot tools do not appear to be installed on this system."
msgstr "Похоже, утилита GNOME Pilot не установлена в этой системе"
@@ -16370,112 +17212,94 @@ msgstr "Bug buddy не установлен."
msgid "Bug buddy could not be run."
msgstr "Не удается запустить Bug buddy."
-#: shell/e-shell-window-commands.c:323
+#: shell/e-shell-window-commands.c:322
#, fuzzy
msgid "Groupware Suite"
msgstr "Группа"
-#: shell/e-shell-window-commands.c:563
+#: shell/e-shell-window-commands.c:562
msgid "_Work Online"
msgstr "Перейти в сетевой режим"
-#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
+#: shell/e-shell-window-commands.c:575 ui/evolution.xml.h:39
msgid "_Work Offline"
msgstr "Ав_тономная работа"
-#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
+#: shell/e-shell-window-commands.c:588 ui/evolution.xml.h:25
msgid "Work Offline"
msgstr "Перейти в режим работы вне сети"
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Флажок"
-
-#: shell/e-user-creatable-items-handler.c:691
-msgid "New"
-msgstr "Создать"
-
-#: shell/evolution-test-component.c:140
+#: shell/e-shell-window.c:337
#, fuzzy
-msgid "New Test"
-msgstr "Новая задача"
+msgid "Evolution is currently online. Click on this button to work offline."
+msgstr ""
+"Ximian Evolution сейчас в сетевом режиме работы. Нажмите на эту кнопку для "
+"перехода в режим работы вне сети."
-#: shell/evolution-test-component.c:141
+#: shell/e-shell-window.c:344
#, fuzzy
-msgid "_Test"
-msgstr "Проверка"
-
-#: shell/evolution-test-component.c:142
-msgid "Create a new test item"
-msgstr "Создать новый тестовый элемент"
+msgid "Evolution is in the process of going offline."
+msgstr "Ximian Evolution в процессе перехода в режим работы вне сети."
-#: shell/glade/e-active-connection-dialog.glade.h:1
+#: shell/e-shell-window.c:350
#, fuzzy
-msgid "<b>Active Connections</b>"
-msgstr "Активные соединения"
-
-#: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Active Connections"
-msgstr "Активные соединения"
+msgid "Evolution is currently offline. Click on this button to work online."
+msgstr ""
+"Ximian Evolution сейчас в автономном режиме работы. Нажмите на эту кнопку "
+"для перехода в режим работы в сети."
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
-msgstr "Нажмите OK для закрытия соединения и перехода на работу вне сети"
+#: shell/e-shell-window.c:637
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Почта к %s"
-#: shell/glade/e-shell-config-default-folders.glade.h:1
-msgid "C_alendar:"
-msgstr "К_алендарь:"
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
-#: shell/glade/e-shell-config-default-folders.glade.h:2
+#: shell/e-shell.c:774
#, fuzzy
-msgid "_Contacts:"
-msgstr "Контакты: "
-
-#: shell/glade/e-shell-config-default-folders.glade.h:3
-msgid "_Mail:"
-msgstr "_Почта:"
-
-#: shell/glade/e-shell-config-default-folders.glade.h:4
-msgid "_Tasks:"
-msgstr "_Задачи:"
+msgid "Uknown system error."
+msgstr "Неизвестная ошибка"
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Folder _type:"
-msgstr "_Тип папки:"
+#: shell/e-shell.c:1131
+msgid "Invalid arguments"
+msgstr "Недопустимые аргументы"
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
-msgid "Open Other User's Folder"
-msgstr "Открыть папку другого пользователя"
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
+msgstr "Не удается зарегистрировать в OAF"
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
-msgid "_Account:"
-msgstr "_Учетная запись:"
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
+msgstr "База данных настроек не найдена"
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr "Имя _папки:"
+#: shell/e-shell.c:1137
+msgid "Generic error"
+msgstr "Обычная ошибка"
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
-msgid "_User:"
-msgstr "_Пользователь:"
+#: shell/e-user-creatable-items-handler.c:691
+msgid "New"
+msgstr "Создать"
-#: shell/glade/evolution-startup-wizard.glade.h:2
+#: shell/evolution-startup-wizard.glade.h:2
msgid "Evolution Setup Assistant"
msgstr "Помощник по установке Evolution"
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/evolution-startup-wizard.glade.h:3
msgid "Importing Files"
msgstr "Импорт файлов"
-#: shell/glade/evolution-startup-wizard.glade.h:4
+#: shell/evolution-startup-wizard.glade.h:4
msgid "Timezone "
msgstr "Часовой пояс "
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/evolution-startup-wizard.glade.h:5
msgid "Welcome"
msgstr "Добро пожаловать"
-#: shell/glade/evolution-startup-wizard.glade.h:6
+#: shell/evolution-startup-wizard.glade.h:6
msgid ""
"Welcome to Evolution. The next few screens will allow\n"
"Evolution to connect to your email accounts, and to import\n"
@@ -16489,7 +17313,7 @@ msgstr ""
"\n"
"Нажмите \"Далее\" для продолжения. "
-#: shell/glade/evolution-startup-wizard.glade.h:11
+#: shell/evolution-startup-wizard.glade.h:11
msgid ""
"You have successfully entered all of the information\n"
"needed to set up Evolution. \n"
@@ -16501,22 +17325,24 @@ msgstr ""
"\n"
"Нажмите \"Применить\" для сохранения параметров. "
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Оболочка Evolution"
+#: shell/evolution-test-component.c:140
+#, fuzzy
+msgid "New Test"
+msgstr "Новая задача"
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#: shell/evolution-test-component.c:141
#, fuzzy
-msgid "Evolution Test"
-msgstr "Evolution"
+msgid "_Test"
+msgstr "Проверка"
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Evolution Test component"
+#: shell/evolution-test-component.c:142
+msgid "Create a new test item"
+msgstr "Создать новый тестовый элемент"
#: shell/importer/import.glade.h:1
msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr "Нажмите \"Импортировать\" для начала импортирования файлов в Evolution."
+msgstr ""
+"Нажмите \"Импортировать\" для начала импортирования файлов в Evolution."
#: shell/importer/import.glade.h:2
msgid "Evolution Import Assistant"
@@ -16574,7 +17400,7 @@ msgid "Evolution can import data from the following files:"
msgstr "Evolution может импортировать данные из следующих файлов:"
#. Preview/Alpha/Beta version warning message
-#: shell/main.c:231
+#: shell/main.c:225
#, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this preview release\n"
@@ -16594,7 +17420,7 @@ msgid ""
"eagerly await your contributions!\n"
msgstr ""
-#: shell/main.c:255
+#: shell/main.c:249
#, fuzzy
msgid ""
"Thanks\n"
@@ -16603,39 +17429,39 @@ msgstr ""
"С благодарностью\n"
"команда Ximian Evolution\n"
-#: shell/main.c:262
+#: shell/main.c:256
msgid "Don't tell me again"
msgstr "Не напоминать больше"
-#: shell/main.c:496
+#: shell/main.c:461
msgid "Start Evolution activating the specified component"
msgstr "Запуск Evolution с активированием указанного компонента"
-#: shell/main.c:498
+#: shell/main.c:463
msgid "Start in offline mode"
msgstr "Запуск в автономном режиме"
-#: shell/main.c:500
+#: shell/main.c:465
msgid "Start in online mode"
msgstr "Запуск в режиме подключения к интернету"
-#: shell/main.c:503
+#: shell/main.c:468
msgid "Forcibly shut down all evolution components"
msgstr "Принудительное закрытие всех компонентов evolution"
-#: shell/main.c:507
+#: shell/main.c:472
msgid "Forcibly re-migrate from Evolution 1.4"
msgstr ""
-#: shell/main.c:510
+#: shell/main.c:475
msgid "Send the debugging output of all components to a file."
msgstr "Записывать отладочный вывод всех компонентов в файл."
-#: shell/main.c:534
+#: shell/main.c:502
msgid "Evolution"
msgstr "Evolution"
-#: shell/main.c:538
+#: shell/main.c:506
#, c-format
msgid ""
"%s: --online and --offline cannot be used together.\n"
@@ -16710,6 +17536,28 @@ msgid ""
"Click help for details."
msgstr ""
+#: smime/gui/ca-trust-dialog.c:91
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
#: smime/gui/certificate-manager.c:556
msgid "Select a cert to import..."
@@ -16940,7 +17788,8 @@ msgid "You have certificates from these organizations that identify you:"
msgstr ""
#: smime/gui/smime-ui.glade.h:43
-msgid "You have certificates on file that identify these certificate authorities:"
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
msgstr ""
#: smime/gui/smime-ui.glade.h:44
@@ -16955,6 +17804,11 @@ msgstr "Ваши сертификаты"
msgid "_Edit CA Trust"
msgstr ""
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+msgid "Certificate already exists"
+msgstr "Сертификат уже существует"
+
#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
msgid "%d/%m/%Y"
msgstr "%d.%m.%Y"
@@ -17159,11 +18013,6 @@ msgstr "Уникальный ID темы"
msgid "Certificate Signature Value"
msgstr "Значение подписи сертификата"
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:608
-msgid "Certificate already exists"
-msgstr "Сертификат уже существует"
-
#: smime/lib/e-pkcs12.c:266
msgid "PKCS12 File Password"
msgstr "Пароль файла PKCS12"
@@ -17194,7 +18043,8 @@ msgstr "Описание вложения."
#: tools/evolution-launch-composer.c:328
msgid "Mark attachment to be shown inline by default."
-msgstr "Пометить вложение, чтобы оно отображалось в теле сообщения по умолчанию."
+msgstr ""
+"Пометить вложение, чтобы оно отображалось в теле сообщения по умолчанию."
#: tools/evolution-launch-composer.c:329
msgid "Default subject for the message."
@@ -17305,8 +18155,8 @@ msgstr "Просмотреть текущий контакт"
#: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
#: ui/evolution-contact-list-editor.xml.h:11
#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
msgid "_Actions"
msgstr "_Действия"
@@ -17715,7 +18565,8 @@ msgid "Hide _Read Messages"
msgstr "Скрыть п_рочитанные сообщения"
#: ui/evolution-mail-list.xml.h:8
-msgid "Hide deleted messages rather than displaying them with a line through them"
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
msgstr "Скрывать сообщения, помеченные как удаленные, вместо их перечеркивания"
#: ui/evolution-mail-list.xml.h:9
@@ -17782,16 +18633,6 @@ msgstr "Обратить выделение"
msgid "_Threaded Message List"
msgstr "Показывать подшивки в списке сообщений"
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
-msgid "Close this window"
-msgstr "Закрыть это окно"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "_Закрыть"
-
#: ui/evolution-mail-message.xml.h:1
#, fuzzy
msgid "A_dd Sender to Address Book"
@@ -18198,6 +19039,16 @@ msgstr "С_ервис"
msgid "_Undelete"
msgstr "Восстановить"
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Закрыть это окно"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
+msgid "_Close"
+msgstr "_Закрыть"
+
#: ui/evolution-message-composer.xml.h:1
msgid "Attach"
msgstr "Вложить"
@@ -18280,10 +19131,6 @@ msgstr "Сохранить текущий файл под другим имен
msgid "Save the message in a specified folder"
msgstr "Сохранить сообщение в указанной папке"
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "Отправить"
-
#: ui/evolution-message-composer.xml.h:25
#: ui/evolution-signature-editor.xml.h:11
msgid "Send the mail in HTML format"
@@ -18855,9 +19702,10 @@ msgid "Evolution Query"
msgstr "Evolution"
#. setup a dummy error
-#: widgets/misc/e-error.c:415
+#: widgets/misc/e-error.c:417
#, fuzzy, c-format
-msgid "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
msgstr "Отправленные сообщения и черновики"
#: widgets/misc/e-expander.c:181
@@ -19014,3 +19862,233 @@ msgstr "%s (...)"
msgid "%s (%d%% complete)"
msgstr "%s (%d%% выполнено)"
+#, fuzzy
+#~ msgid "Authentication Credentials for HTTP Server"
+#~ msgstr "Неверный ответ от сервера при идентификации."
+
+#~ msgid "Calendars selected for publishing"
+#~ msgstr "Календари, выбранные для публикации"
+
+#~ msgid "Login name:"
+#~ msgstr "Учетное имя:"
+
+#~ msgid "URL:"
+#~ msgstr "URL:"
+
+#~ msgid "contact-list-editor"
+#~ msgstr "Редактор списка контактов"
+
+#~ msgid "Save List as VCard"
+#~ msgstr "Сохранить список как VCard"
+
+#, fuzzy
+#~ msgid "Groupwise"
+#~ msgstr "Группа"
+
+#~ msgid "C_alendar"
+#~ msgstr "К_алендарь"
+
+#~ msgid "Audio Alarm Options"
+#~ msgstr "Параметры звукового сигнала"
+
+#~ msgid "Message Alarm Options"
+#~ msgstr "Параметры сигнала-сообщения"
+
+#~ msgid "Email Alarm Options"
+#~ msgstr "Параметры сигнала по почте"
+
+#~ msgid "Program Alarm Options"
+#~ msgstr "Параметры программы-сигнала"
+
+#~ msgid "Unknown Alarm Options"
+#~ msgstr "Параметры сигнала неизвестного типа"
+
+#~ msgid "Alarm Repeat"
+#~ msgstr "Повторение сигнала"
+
+#~ msgid "Message to Display:"
+#~ msgstr "Сообщение для отображения:"
+
+#~ msgid "With these arguments:"
+#~ msgstr "С аргументами:"
+
+#~ msgid "Basics"
+#~ msgstr "Основы"
+
+#~ msgid "Date/Time:"
+#~ msgstr "Дата/Время:"
+
+#~ msgid "Reminders"
+#~ msgstr "Напоминания"
+
+#~ msgid "_Options..."
+#~ msgstr "_Параметры..."
+
+#~ msgid "Addressbook..."
+#~ msgstr "Адресная книга..."
+
+#~ msgid "Reminder"
+#~ msgstr "Напоминание"
+
+#~ msgid "B_usy"
+#~ msgstr "Занят"
+
+#~ msgid "Co_nfidential"
+#~ msgstr "Ко_нфиденциальное"
+
+#~ msgid "Date & Time"
+#~ msgstr "Дата и время"
+
+#~ msgid "F_ree"
+#~ msgstr "Свободен"
+
+#~ msgid "Pri_vate"
+#~ msgstr "Личное"
+
+#~ msgid "Pu_blic"
+#~ msgstr "Общее"
+
+#, fuzzy
+#~ msgid "Add A_ttendee"
+#~ msgstr "Участник"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook."
+#~ msgstr "Добавить отправителя в _адресную книгу"
+
+#~ msgid "Preview"
+#~ msgstr "Предварительный просмотр"
+
+#~ msgid "Recurrence Rule"
+#~ msgstr "Правило повторения"
+
+#~ msgid "_Custom recurrence"
+#~ msgstr "Другое повторение"
+
+#~ msgid "_Modify"
+#~ msgstr "Изменить"
+
+#~ msgid "_No recurrence"
+#~ msgstr "Без повторения"
+
+#~ msgid "_Simple recurrence"
+#~ msgstr "Простое повторение"
+
+#~ msgid "% _Complete"
+#~ msgstr "% _Выполнено"
+
+#~ msgid "Progress"
+#~ msgstr "Продвижение"
+
+#~ msgid "Con_fidential"
+#~ msgstr "Кон_фиденциально"
+
+#~ msgid "Folder:"
+#~ msgstr "Папка:"
+
+#~ msgid "<b>Starts:</b> "
+#~ msgstr "<b>Начинается:</b> "
+
+#~ msgid "<b>Ends:</b> "
+#~ msgstr "<b>Заканчивается:</b>"
+
+#~ msgid "<b>Completed:</b> "
+#~ msgstr "<b>Выполнено:</b>"
+
+#~ msgid "<b>Due:</b> "
+#~ msgstr "<b>К:</b> "
+
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>Нет</i>"
+
+#~ msgid "There was an error on the CORBA system\n"
+#~ msgstr "В системе CORBA произошла ошибка\n"
+
+#~ msgid "Object could not be found\n"
+#~ msgstr "Объект не может быть найден!\n"
+
+#~ msgid "You don't have the right permissions to update the calendar\n"
+#~ msgstr "У вас нет соответствующих прав для обновления календаря\n"
+
+#~ msgid "Attendee status could not be updated!\n"
+#~ msgstr "Статус участника не может быть обновлён!\n"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook"
+#~ msgstr "Добавить отправителя в _адресную книгу"
+
+#~ msgid "_Options"
+#~ msgstr "Параметры"
+
+#~ msgid "Meeting _start time:"
+#~ msgstr "Время _начала собрания:"
+
+#~ msgid "Meeting _end time:"
+#~ msgstr "Время _завершения собрания:"
+
+#~ msgid ""
+#~ "Error opening %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ошибка открытия %s:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Can't find certificate for `%s'"
+#~ msgstr "Не удается создать папку: %s: %s"
+
+#, fuzzy
+#~ msgid "Can't create CMS Message"
+#~ msgstr "Созда_ть правило из сообщения"
+
+#, fuzzy
+#~ msgid "Can't create encoder context"
+#~ msgstr "Не удается заблокировать папку %s: %s"
+
+#~ msgid ""
+#~ "Could not create composer window:\n"
+#~ "Unable to activate HTML editor component."
+#~ msgstr ""
+#~ "Не удается создать окно редактора:\n"
+#~ "Не удается активировать компонент редактора HTML."
+
+#, fuzzy
+#~ msgid "_Score Rules"
+#~ msgstr "Правила назначения весов"
+
+#~ msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+#~ msgstr "В сообщении от %d.%m.%Y %H:%M %%+05d, %%s пишет:"
+
+#~ msgid "Folder Name"
+#~ msgstr "Имя папки"
+
+#~ msgid "_Properties..."
+#~ msgstr "_Свойства..."
+
+#~ msgid "Checkbox"
+#~ msgstr "Флажок"
+
+#~ msgid "C_alendar:"
+#~ msgstr "К_алендарь:"
+
+#, fuzzy
+#~ msgid "_Contacts:"
+#~ msgstr "Контакты: "
+
+#~ msgid "_Mail:"
+#~ msgstr "_Почта:"
+
+#~ msgid "_Tasks:"
+#~ msgstr "_Задачи:"
+
+#~ msgid "Folder _type:"
+#~ msgstr "_Тип папки:"
+
+#~ msgid "Open Other User's Folder"
+#~ msgstr "Открыть папку другого пользователя"
+
+#~ msgid "_Folder Name:"
+#~ msgstr "Имя _папки:"
+
+#~ msgid "_User:"
+#~ msgstr "_Пользователь:"