aboutsummaryrefslogtreecommitdiffstats
path: root/po/ru.po
diff options
context:
space:
mode:
authorJP Rosevear <jpr@src.gnome.org>2004-06-04 02:02:56 +0800
committerJP Rosevear <jpr@src.gnome.org>2004-06-04 02:02:56 +0800
commit3048b4c9decd91d7c5baa0a9ec29f98a91976f1a (patch)
treeba6f25a662319846fd160fdb8d2211cc058f11af /po/ru.po
parentdae1aa0ac0d5aa9e220f9de63b30f65ee0961665 (diff)
downloadgsoc2013-evolution-3048b4c9decd91d7c5baa0a9ec29f98a91976f1a.tar.gz
gsoc2013-evolution-3048b4c9decd91d7c5baa0a9ec29f98a91976f1a.tar.zst
gsoc2013-evolution-3048b4c9decd91d7c5baa0a9ec29f98a91976f1a.zip
Merge from release branch.
svn path=/trunk/; revision=26178
Diffstat (limited to 'po/ru.po')
-rw-r--r--po/ru.po3794
1 files changed, 1905 insertions, 1889 deletions
diff --git a/po/ru.po b/po/ru.po
index ac2065bc4e..fb1b5ca213 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: ru\n"
-"POT-Creation-Date: 2004-05-19 14:00-0400\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
"PO-Revision-Date: 2004-02-27 17:10+0200\n"
"Last-Translator: Leonid Kanter <leon@asplinux.ru>\n"
"Language-Team: Russian <ru@li.org>\n"
@@ -64,13 +64,13 @@ msgstr "карточек"
msgid "Default Sync Address:"
msgstr "Адрес синхронизации по умолчанию:"
-#: addressbook/conduit/address-conduit.c:1150
#: addressbook/conduit/address-conduit.c:1151
+#: addressbook/conduit/address-conduit.c:1152
msgid "Could not load addressbook"
msgstr "Не удается загрузить адресную книгу"
-#: addressbook/conduit/address-conduit.c:1219
-#: addressbook/conduit/address-conduit.c:1222
+#: addressbook/conduit/address-conduit.c:1220
+#: addressbook/conduit/address-conduit.c:1223
msgid "Could not read pilot's Address application block"
msgstr "Не удается прочитать блок приложения адресов Пилота"
@@ -78,13 +78,13 @@ msgstr "Не удается прочитать блок приложения а
msgid "Accessing LDAP Server anonymously"
msgstr "Анонимное подключение к серверу LDAP"
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: 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:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
+#: 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)"
@@ -128,51 +128,23 @@ msgstr "_Контакты:"
msgid "Create a new contacts group"
msgstr "Создать новую группу ярлыков"
-#: addressbook/gui/component/addressbook-component.c:182
+#: addressbook/gui/component/addressbook-component.c:184
msgid "Failed upgrading Addressbook settings or folders."
msgstr ""
-#: addressbook/gui/component/addressbook-config.c:483
-msgid "Failed to connect to LDAP server"
-msgstr "Не удается подключиться к серверу LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:507
-msgid "Failed to authenticate with LDAP server"
-msgstr "Сбой аутентификации на сервере LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:535
-msgid "Could not perform query on Root DSE"
-msgstr "Не удается выполнить запрос в корневом DSE"
-
-#: addressbook/gui/component/addressbook-config.c:840
-msgid "The server responded with no supported search bases"
-msgstr "Сервер отвечает без поддержки баз поиска"
-
-#: addressbook/gui/component/addressbook-config.c:1245
-msgid "This server does not support LDAPv3 schema information"
-msgstr "Этот сервер не поддерживает информацию LDAPv3 schema"
-
-#: addressbook/gui/component/addressbook-config.c:1266
-msgid "Error retrieving schema information"
-msgstr "Ошибка при загрузке информации schema"
-
-#: addressbook/gui/component/addressbook-config.c:1274
-msgid "Server did not respond with valid schema information"
-msgstr "Сервер не отвечает корректной информацией schema"
-
#: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
msgid "Migrating..."
msgstr "Перенос..."
#: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
#, c-format
msgid "Migrating `%s':"
msgstr "Переносится '%s':"
#. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:438
+#: addressbook/gui/component/addressbook-migrate.c:464
#: 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/mail-component.c:245 mail/mail-vfolder.c:218
@@ -180,28 +152,28 @@ msgid "On This Computer"
msgstr "На этом компьютере"
#. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: 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:918 mail/mail-config.c:78
-#: mail/mail-config.glade.h:106
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
+#: mail/mail-config.glade.h:109
msgid "Personal"
msgstr "Личный"
#. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:454
+#: addressbook/gui/component/addressbook-migrate.c:480
msgid "On LDAP Servers"
msgstr "На серверах LDAP"
-#: addressbook/gui/component/addressbook-migrate.c:582
+#: addressbook/gui/component/addressbook-migrate.c:608
msgid "LDAP Servers"
msgstr "Серверы LDAP"
-#: addressbook/gui/component/addressbook-migrate.c:702
+#: addressbook/gui/component/addressbook-migrate.c:728
msgid "Autocompletion Settings"
msgstr "Настройка автозавершения"
-#: addressbook/gui/component/addressbook-migrate.c:1076
+#: addressbook/gui/component/addressbook-migrate.c:1104
msgid ""
"The location and hierarchy of the Evolution contact folders has changed "
"since Evolution 1.x.\n"
@@ -213,7 +185,7 @@ msgstr ""
"\n"
"Производится преобразование папок для новой версии..."
-#: addressbook/gui/component/addressbook-migrate.c:1090
+#: addressbook/gui/component/addressbook-migrate.c:1118
#, fuzzy
msgid ""
"The format of mailing list contacts has changed.\n"
@@ -225,7 +197,7 @@ msgstr ""
"\n"
"Производится преобразование папок для новой версии..."
-#: addressbook/gui/component/addressbook-migrate.c:1099
+#: addressbook/gui/component/addressbook-migrate.c:1127
#, fuzzy
msgid ""
"The way Evolution stores some phone numbers has changed.\n"
@@ -237,7 +209,7 @@ msgstr ""
"\n"
"Производится преобразование папок для новой версии..."
-#: addressbook/gui/component/addressbook-migrate.c:1109
+#: addressbook/gui/component/addressbook-migrate.c:1137
#, fuzzy
msgid ""
"Evolution's Palm Sync changelog and map files have changed.\n"
@@ -249,39 +221,34 @@ msgstr ""
"\n"
"Производится преобразование папок для новой версии..."
-#: addressbook/gui/component/addressbook-view.c:674
+#: addressbook/gui/component/addressbook-view.c:675
#, fuzzy, c-format
msgid "Address book '%s' will be removed. Are you sure you want to continue?"
msgstr "Адресная книга '%s' будет удалена. Вы действительно хотите продолжить?"
-#: addressbook/gui/component/addressbook-view.c:761
+#: addressbook/gui/component/addressbook-view.c:754
#, fuzzy
msgid "New Address Book"
msgstr "Новая адресная книга"
-#: addressbook/gui/component/addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
-#: filter/libfilter-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
+#: addressbook/gui/component/addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: 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
#: 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:763
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-view.c:756
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
msgid "Properties..."
msgstr "Свойства..."
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/addressbook-view.c:1002
+#. Create the contacts group
+#: addressbook/gui/component/addressbook-view.c:995
#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
#: calendar/gui/migration.c:373
msgid "Contacts"
msgstr "Контакты"
@@ -362,10 +329,6 @@ msgid "Manage your S/MIME certificates here"
msgstr "Здесь можно управлять вашими сертификатами S/Mime"
#: addressbook/gui/component/ldap-config.glade.h:1
-msgid " S_how Supported Bases "
-msgstr " _Показывать поддерживаемые типы "
-
-#: addressbook/gui/component/ldap-config.glade.h:2
#: addressbook/gui/component/select-names/select-names.glade.h:1
#: addressbook/gui/contact-editor/contact-editor.glade.h:1
#: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -380,205 +343,170 @@ msgstr " _Показывать поддерживаемые типы "
#: calendar/gui/dialogs/new-task-list.glade.h:1
#: 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:2
+#: 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
#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
msgid "*"
msgstr "*"
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
msgid "1"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1:00"
-msgstr "1:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
msgid "3268"
msgstr "3268"
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
msgid "389"
msgstr "389"
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
msgid "5"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr "5:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
msgid "636"
msgstr "636"
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
#, fuzzy
msgid "<b>Authentication</b>"
msgstr "Проверка подлинности"
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
#, fuzzy
msgid "<b>Display</b>"
msgstr "Отображение"
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
#, fuzzy
msgid "<b>Downloading</b>"
msgstr "<b>Отправка эл.почты:</b>"
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
#, fuzzy
msgid "<b>Searching</b>"
msgstr "Поиск"
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
#, fuzzy
msgid "<b>Server Information</b>"
msgstr "Шаг 2: Сведения о сервере"
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
#, fuzzy
msgid "<b>Type:</b>"
msgstr "<b>К:</b> "
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
#, fuzzy
msgid "Add Contacts Group"
msgstr "_Контакты:"
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
#, fuzzy
msgid "Address Book Properties"
msgstr "Свойства адресной книги"
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
+#: mail/mail-config.glade.h:42
msgid "Always"
msgstr "Всегда"
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
msgid "Anonymously"
msgstr "Анонимно"
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: 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:21
-msgid "Connecting"
-msgstr "Подключение"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: 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
msgid "Details"
msgstr "Подробности"
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Distinguished _name:"
-msgstr "Отличительное _имя (DN):"
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
#, fuzzy
msgid "Distinguished name"
msgstr "Отличительное _имя (DN):"
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
#, fuzzy
msgid "Download limit:"
msgstr "Ограничение загрузки:"
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
#, fuzzy
msgid "Email address"
msgstr "Электронная почта:"
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "Email address:"
-msgstr "Электронная почта:"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr ""
-"Evolution будет использовать это значение DN для проверки вашей подлинности "
-"на сервере"
-
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
msgid ""
-"Evolution will use this email address to authenticate you with the server"
+"Evolution will use this email address to authenticate you with the server."
msgstr "Этот адрес будет использоваться для идентификации вас на сервере"
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:23
#, fuzzy
msgid "Find Possible Search Bases"
msgstr "Поддерживаемые базы поиска"
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
msgid "General"
msgstr "Общие"
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
+#: mail/mail-config.glade.h:102
msgid "Never"
msgstr "Никогда"
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr "Один"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
msgid "Only locations within starting point"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "S_earch scope: "
-msgstr "_Диапазон поиска: "
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "База поиска:"
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
#, fuzzy
msgid "Search base only"
msgstr "База поиска:"
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
msgid "Search base:"
msgstr "База поиска:"
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
#, fuzzy
msgid "Search scope:"
msgstr "_Диапазон поиска: "
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr "Поиск"
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
+#, fuzzy
msgid ""
"Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
msgstr ""
"Выбор этой опции означает, что Evolution будет устанавливать соединение с "
"вашим\n"
"сервером LDAP только в том случае, если он поддерживает SSL or TLS."
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
msgid ""
"Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
msgstr ""
"Выбор этой опции означает, что Evolution будет пытаться использовать SSL/"
"TLS\n"
@@ -587,71 +515,64 @@ msgstr ""
"вы и ваш сервер LDAP находятся за межсетевым экраном, то Evolution не будет\n"
"использовать SSL/TLS, так как ваше соединение уже достаточно безопасно."
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
+#, fuzzy
msgid ""
"Selecting this option means that your server does not support either SSL or "
-"TLS. This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS. This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
msgstr ""
"Выбор этой опции означает, что ваш сервер не поддерживает протоколы SSL\n"
"и TLS . Это означает, что ваше соединение с сервером будет уязвимым для атак."
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
msgid "Starting point and locations within it"
msgstr ""
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr "Под"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
msgid "Supported Search Bases"
msgstr "Поддерживаемые базы поиска"
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
msgid ""
"The search base is the distinguished name (DN) of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
msgstr ""
"База поиска является известным именем записи (DN - distinguished name),\n"
"откуда начнется ваш поиск. Если вы оставите это поле пустым,\n"
"то поиск начнется с корня дерева каталогов."
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
+#, fuzzy
msgid ""
"The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
msgstr ""
"Глубина поиска определяет, как далеко вниз по дереву каталогов будет\n"
"осуществляться поиск. Глубина поиска \"sub\" включает все элементы\n"
"под каталогом начала поиска. Глубина поиска \"one\" включает в себя\n"
"элементы на один уровень ниже каталога начала поиска.\n"
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:38
msgid ""
"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
"\"."
msgstr "Полное имя вашего сервера LDAP. Например: \"ldap.mycompany.com\"."
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
#, fuzzy
msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
"too large will slow down your address book."
msgstr ""
"Максимальное число элементов для загрузки. Установка очень большого\n"
"значения может серьезно замедлить работу вашей адресной книги."
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
msgid ""
"This is the method evolution will use to authenticate you. Note that "
"setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -661,140 +582,119 @@ msgstr ""
"что установка этого параметра в \"Адрес эл. почты\" требует анонимного "
"доступа к вашему серверу LDAP."
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
msgid ""
"This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
msgstr ""
"Это имя сервера будет появляться в списке каталогов Evolution.\n"
"Оно используется только для отображения."
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
+#, fuzzy
msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
msgstr ""
"Порт сервера LDAP, на котором Evolution будет устанавливать соединение.\n"
"Список стандартных портов ранее уже был предоставлен. Спросите вашего\n"
"системного администратора, какой из них вам необходимо использовать."
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
-msgstr "Этот параметр определяет, как долго будет производиться поиск."
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
#, fuzzy
msgid "Timeout:"
msgstr "Формат времени:"
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr "И_спользовать SSL/TLS:"
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
msgid "Using distinguished name (DN)"
msgstr "По отличительному имени (DN)"
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
msgid "Using email address"
msgstr "По почтовому адресу"
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:154
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
+#: mail/mail-config.glade.h:156
msgid "Whenever Possible"
msgstr "Когда это возможно"
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
#, fuzzy
msgid "_Add Contacts Group"
msgstr "_Контакты:"
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "_Display name:"
-msgstr "Показать имя:"
-
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
msgid "_Download limit:"
msgstr "Ограничение загрузки:"
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
#, fuzzy
msgid "_Email address:"
msgstr "Электронная почта:"
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "_Find Possible Search Bases"
+msgstr "Поддерживаемые базы поиска"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
msgid "_Log in method:"
msgstr "_Метод подключения:"
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "Регистрация"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
msgid "_Name:"
msgstr "_Имя:"
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "_Port number:"
-msgstr "_Номер порта:"
-
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:54
#, fuzzy
msgid "_Port:"
msgstr "Приоритет:"
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid "_Search base:"
-msgstr "_База поиска:"
-
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr "Имя _сервера:"
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "_Диапазон поиска: "
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
#, fuzzy
msgid "_Server:"
msgstr "С_ервер:"
-#: addressbook/gui/component/ldap-config.glade.h:84
-msgid "_Timeout (minutes):"
-msgstr "_Задержка (минут):"
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "Формат времени:"
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
#, fuzzy
msgid "_Use secure connection:"
msgstr "Использовать _защищенное соединение (SSL)"
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
msgid "cards"
msgstr "карточек"
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid "connecting-tab"
-msgstr "вкладка соединения"
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid "general-tab"
-msgstr "общая вкладка"
-
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:60
#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
-#: mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: mail/mail-config.glade.h:183
msgid "minutes"
msgstr "минут"
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "searching-tab"
-msgstr "вкладка поиска"
-
-#: addressbook/gui/component/select-names/e-select-names.c:497
+#: 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/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names.c:702
#: addressbook/gui/component/select-names/e-select-names-popup.c:215
#: calendar/gui/dialogs/cal-prefs-dialog.c:724
msgid "Remove"
@@ -834,7 +734,7 @@ 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:222
+#: addressbook/gui/widgets/e-addressbook-view.c:224
msgid "Source"
msgstr "Источник"
@@ -907,9 +807,9 @@ msgid "<b>Work</b>"
msgstr "<b>К:</b> "
#: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: 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
msgid "AIM"
msgstr "AIM"
@@ -949,15 +849,15 @@ msgid "Company:"
msgstr "Команда:"
#: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:271
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
#: 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:1527
+#: addressbook/gui/contact-editor/e-contact-editor.c:520
msgid "Contact Editor"
msgstr "Редактор контактов"
@@ -981,83 +881,80 @@ msgid "Full _Name..."
msgstr "По_лное имя..."
#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr "Домашний"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
#, fuzzy
msgid "Home Page:"
msgstr "Домашняя страничка"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#, fuzzy
-msgid "Job title:"
-msgstr "Должность:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/e-itip-control.c:936
-msgid "Location:"
-msgstr "Расположение:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
msgid "MSN Messenger"
msgstr "MSN Messenger"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
#, fuzzy
msgid "Mailing Address"
msgstr "Электронная почта"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
#, fuzzy
msgid "Manager:"
msgstr "Мeнеджер"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
#, fuzzy
msgid "Ni_ckname:"
msgstr "Псевдон_им:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
#, fuzzy
msgid "Notes:"
msgstr "Примечания:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
#: addressbook/gui/contact-editor/e-contact-editor-im.c:63
#, fuzzy
msgid "Novell Groupwise"
msgstr "Novell GroupWise"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:203
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "Другие"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+msgid "Office:"
+msgstr "Ком_ната:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
#, fuzzy
msgid "PO Box:"
msgstr "Аб.ящик:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
#, fuzzy
msgid "Personal Information"
msgstr "Дополнительная информация"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
#, fuzzy
msgid "Profession:"
msgstr "Професси_я:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#, fuzzy
+msgid "Spouse:"
+msgstr "С_упруг(а):"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
#, fuzzy
msgid "State/Province:"
msgstr "Область, край:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#, fuzzy
+msgid "Title:"
+msgstr "Заголовок:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
#: addressbook/gui/contact-editor/contact-editor.glade.h:41
#, fuzzy
msgid "Wants to receive HTML mail"
@@ -1065,15 +962,15 @@ msgstr "Согласен получать почту в формате _HTML"
#: addressbook/gui/contact-editor/contact-editor.glade.h:42
#, fuzzy
-msgid "Webcam:"
-msgstr "Веб-страница:"
+msgid "Web Log:"
+msgstr "_Веб-страница:"
#. red
#: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
#: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
-#: mail/mail-config.glade.h:155
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
+#: mail/mail-config.glade.h:157
msgid "Work"
msgstr "Служебное"
@@ -1093,19 +990,12 @@ msgid "_File under:"
msgstr "Имя файла:"
#: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
#, fuzzy
msgid "_Where:"
msgstr "С_ервер:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr ""
-
-#: addressbook/gui/contact-editor/eab-editor.c:316
+#: addressbook/gui/contact-editor/eab-editor.c:315
msgid ""
"Are you sure you want\n"
"to delete these contacts?"
@@ -1113,7 +1003,7 @@ msgstr ""
"Вы действительно хотите\n"
"удалить эти контакты?"
-#: addressbook/gui/contact-editor/eab-editor.c:319
+#: addressbook/gui/contact-editor/eab-editor.c:318
msgid ""
"Are you sure you want\n"
"to delete this contact?"
@@ -1122,16 +1012,16 @@ msgstr ""
"удалить этот контакт?"
#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
msgid "Address"
msgstr "Адрес"
#: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:292
+#: 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:174
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
#: addressbook/gui/widgets/e-addressbook-model.c:309
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
#: addressbook/gui/widgets/e-minicard.c:174
@@ -2109,87 +1999,110 @@ msgstr "Замбия"
msgid "Zimbabwe"
msgstr "Зимбабве"
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
msgid "Jabber"
msgstr "Jabber"
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: 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:187
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: 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.c:188
+#: 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:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
msgid "ICQ"
msgstr "ICQ"
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
#, fuzzy
msgid "GroupWise"
msgstr "Novell GroupWise"
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr "Домашний"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr "Другие"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
msgid "Source Book"
msgstr "Книга-источник"
-#: addressbook/gui/contact-editor/e-contact-editor.c:264
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
msgid "Target Book"
msgstr "Книга назначения"
-#: addressbook/gui/contact-editor/e-contact-editor.c:278
+#: addressbook/gui/contact-editor/e-contact-editor.c:273
msgid "Is New Contact"
msgstr "Является новым конактом"
-#: addressbook/gui/contact-editor/e-contact-editor.c:285
+#: addressbook/gui/contact-editor/e-contact-editor.c:280
msgid "Writable Fields"
msgstr "Поля для записи"
-#: addressbook/gui/contact-editor/e-contact-editor.c:299
+#: addressbook/gui/contact-editor/e-contact-editor.c:294
msgid "Changed"
msgstr "Изменено"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
-msgid "Category editor not available."
-msgstr "Редактор категорий недоступен."
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
msgid "This contact belongs to these categories:"
msgstr "Этот контакт принадлежит следующим категориям:"
#. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
#, fuzzy
msgid "Please select an image for this contact"
msgstr "Выберите один из следующих вариантов"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
#, fuzzy
msgid "No image"
msgstr "Нигер"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
#, fuzzy
msgid ""
-"The following entries are invalid:\n"
+"The contact data is invalid:\n"
"\n"
-msgstr "В настоящий момент активны следующие соединения:"
+msgstr "Повторяющаяся дата некорректна"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2738
-#, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr "Не удается найти элемент управления для поля: \"%s\""
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#, fuzzy
+msgid "Invalid contact."
+msgstr "%d контактов"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+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
+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"
@@ -2222,7 +2135,7 @@ msgid "_Edit Full"
msgstr "_Изменить все"
#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:166
msgid "_Full Name:"
msgstr "_Полное имя:"
@@ -2370,30 +2283,30 @@ msgstr "Имя _списка:"
msgid "_Type an email address or drag a contact into the list below:"
msgstr "_Введите эл.адрес или перетащите контакт в список, приведённый ниже:"
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
msgid "contact-list-editor"
msgstr "Редактор списка контактов"
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
#: addressbook/gui/widgets/e-addressbook-model.c:295
#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:215
+#: addressbook/gui/widgets/e-addressbook-view.c:217
#: addressbook/gui/widgets/e-minicard-view.c:460
#: addressbook/gui/widgets/e-minicard-view-widget.c:105
msgid "Book"
msgstr "Книга"
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
msgid "Is New List"
msgstr "является новым списком"
#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
msgid "Contact List Editor"
msgstr "Редактор списка контактов"
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
msgid "Save List as VCard"
msgstr "Сохранить список как VCard"
@@ -2440,119 +2353,119 @@ msgstr ""
msgid "Advanced Search"
msgstr "Расширенный поиск"
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
+#: 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:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
+#: 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:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
+#: 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:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: 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:340
+#: 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:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
msgid "Position"
msgstr "Должность"
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: 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:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
msgid "Video Conferencing"
msgstr "Видеоконференции"
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: 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:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
msgid "Fax"
msgstr "Факс"
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
msgid "work"
msgstr "работа"
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
msgid "WWW"
msgstr "WWW"
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: 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:371
+#: 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:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
msgid "personal"
msgstr "личный"
-#: addressbook/gui/widgets/eab-contact-display.c:382
+#: 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:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
msgid "Job Title"
msgstr "Должность"
-#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/eab-contact-display.c:544
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
+#: smime/lib/e-cert.c:826
msgid "Email"
msgstr "Эл. почта"
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
msgid "Home page"
msgstr "Домашняя страничка"
#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: 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:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
msgid "Backend busy"
msgstr ""
#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: 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:54
+#: 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:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
#, fuzzy
msgid "No Self Contact defined"
msgstr "Создать список контактов"
@@ -2560,27 +2473,27 @@ 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:58
+#: 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:59
+#: 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:60
+#: 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:61
+#: addressbook/gui/widgets/eab-gui-util.c:59
msgid "Protocol not supported"
msgstr "Протокол не поддерживается"
#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: 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
@@ -2593,39 +2506,39 @@ msgid "Cancelled"
msgstr "Отменено"
#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: 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:64
+#: addressbook/gui/widgets/eab-gui-util.c:62
msgid "Authentication Failed"
msgstr "Сбой проверки подлинности"
#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: 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:66
+#: 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:68
+#: 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:69
+#: addressbook/gui/widgets/eab-gui-util.c:67
msgid "Other error"
msgstr "Иная ошибка"
-#: addressbook/gui/widgets/eab-gui-util.c:103
+#: 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."
@@ -2633,7 +2546,7 @@ msgstr ""
"Не удается открыть эту адресную книгу. Убедитесь, что путь существует и что "
"у вас имеются необходимые права доступа."
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: 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."
@@ -2641,18 +2554,19 @@ msgstr ""
"Не удается открыть эту адресную книгу. Это значит, что либо введен неверный "
"URI, либо сервер LDAP недоступен."
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: 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 compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
+"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:124
+#: 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."
@@ -2660,11 +2574,7 @@ msgstr ""
"Не удается открыть эту адресную книгу. Это значит, что либо введен неверный "
"URI, либо сервер недоступен."
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "Unable to open addressbook"
-msgstr "Не удается открыть адресную книгу"
-
-#: addressbook/gui/widgets/eab-gui-util.c:162
+#: 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"
@@ -2677,7 +2587,7 @@ msgstr ""
"поднимите ограничения для выдачи результатов в\n"
"настройках сервера каталога для этой адресной книги."
-#: addressbook/gui/widgets/eab-gui-util.c:168
+#: 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"
@@ -2690,55 +2600,47 @@ msgstr ""
"поднимите ограничения времени в настройках сервера\n"
"каталога для этой адресной книги."
-#: addressbook/gui/widgets/eab-gui-util.c:174
+#: 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:177
+#: 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:180
+#: addressbook/gui/widgets/eab-gui-util.c:147
msgid "This query did not complete successfully."
msgstr "Этот запрос завершился с ошибкой."
-#: addressbook/gui/widgets/eab-gui-util.c:206
-msgid "Do you want to save changes?"
-msgstr "Хотите сохранить изменения?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:208
-msgid "_Discard"
-msgstr "_Отклонить"
-
-#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:169
msgid "Error adding list"
msgstr "Ошибка добавления списка"
-#: addressbook/gui/widgets/eab-gui-util.c:229
-#: addressbook/gui/widgets/eab-gui-util.c:652
+#: 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:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
msgid "Error modifying list"
msgstr "Ошибка изменения списка"
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
msgid "Error modifying contact"
msgstr "Ошибка изменения контакта"
-#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:192
msgid "Error removing list"
msgstr "Ошибка удаления списка"
-#: addressbook/gui/widgets/eab-gui-util.c:252
-#: addressbook/gui/widgets/eab-gui-util.c:610
+#: 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:334
+#: addressbook/gui/widgets/eab-gui-util.c:274
#, c-format
msgid ""
"Opening %d contacts will open %d new windows as well.\n"
@@ -2747,7 +2649,7 @@ msgstr ""
"Открытие %d контактов также откроет %d новых окон.\n"
"Вы действительно хотите отобразить все эти контакты?"
-#: addressbook/gui/widgets/eab-gui-util.c:360
+#: addressbook/gui/widgets/eab-gui-util.c:300
#, c-format
msgid ""
"%s already exists\n"
@@ -2756,49 +2658,44 @@ msgstr ""
"%s уже существует\n"
"Хотите переписать?"
-#: addressbook/gui/widgets/eab-gui-util.c:364
+#: addressbook/gui/widgets/eab-gui-util.c:304
msgid "Overwrite"
msgstr "Перезаписать"
-#: addressbook/gui/widgets/eab-gui-util.c:400
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "Ошибка сохранения %s: %s"
-
#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:437
+#: addressbook/gui/widgets/eab-gui-util.c:365
msgid "card.vcf"
msgstr "card.vcf"
-#: addressbook/gui/widgets/eab-gui-util.c:571
+#: addressbook/gui/widgets/eab-gui-util.c:499
msgid "list"
msgstr "список"
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:634
msgid "Move contact to"
msgstr "Переместить контакт в"
-#: addressbook/gui/widgets/eab-gui-util.c:708
+#: addressbook/gui/widgets/eab-gui-util.c:636
msgid "Copy contact to"
msgstr "Копировать контакт в"
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:639
msgid "Move contacts to"
msgstr "Переместить контакты в"
-#: addressbook/gui/widgets/eab-gui-util.c:713
+#: addressbook/gui/widgets/eab-gui-util.c:641
msgid "Copy contacts to"
msgstr "Копировать контакты в"
-#: addressbook/gui/widgets/eab-gui-util.c:716
+#: addressbook/gui/widgets/eab-gui-util.c:644
msgid "Select target addressbook."
msgstr "Выберите целевую адресную книгу."
-#: addressbook/gui/widgets/eab-gui-util.c:939
+#: addressbook/gui/widgets/eab-gui-util.c:867
msgid "Multiple VCards"
msgstr "Множество VCards"
-#: addressbook/gui/widgets/eab-gui-util.c:942
+#: addressbook/gui/widgets/eab-gui-util.c:870
#, c-format
msgid "VCard for %s"
msgstr "VCard для %s"
@@ -2888,7 +2785,7 @@ 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:229
+#: addressbook/gui/widgets/e-addressbook-view.c:231
#: addressbook/gui/widgets/e-minicard-view.c:467
#: addressbook/gui/widgets/e-minicard-view-widget.c:112
msgid "Query"
@@ -2906,142 +2803,131 @@ msgstr "Модель"
msgid "Error modifying card"
msgstr "Ошибка при изменении карточки"
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:163
msgid "Name begins with"
msgstr "Имя начинается с"
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:164
msgid "Email begins with"
msgstr "Почтовый адрес начинается с"
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: calendar/gui/cal-search-bar.c:54
msgid "Category is"
msgstr "Категории "
#. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
+#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: calendar/gui/cal-search-bar.c:49
msgid "Any field contains"
msgstr "Любое поле содержит"
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+#: addressbook/gui/widgets/e-addressbook-view.c:172
msgid "Advanced..."
msgstr "Дополнительно..."
-#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-addressbook-view.c:238
#: calendar/gui/dialogs/meeting-page.etspec.h:11
#: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:249
+#: 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:506
+#: addressbook/gui/widgets/e-addressbook-view.c:508
msgid "Address Book"
msgstr "Адресная книга"
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2076
+#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:2080
#: ui/evolution-addressbook.xml.h:19
#, fuzzy
msgid "Save as VCard..."
msgstr "Сохранить как VCard"
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
msgid "New Contact..."
msgstr "Создать контакт..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
msgid "New Contact List..."
msgstr "Создать список контактов..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
msgid "Go to Folder..."
msgstr "Перейти к папке..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
msgid "Import..."
msgstr "Импорт..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
msgid "Search for Contacts..."
msgstr "Найти контакты..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
msgid "Address Book Sources..."
msgstr "Источники адресных книг..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1069
msgid "Pilot Settings..."
msgstr "Настройка Pilot..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
#: ui/evolution-addressbook.xml.h:10
msgid "Forward Contact"
msgstr "Переслать контакт"
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
msgid "Send Message to Contact"
msgstr "Отправить сообщение к контакту"
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1075 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:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
msgid "Print Envelope"
msgstr "Напечатать конверт"
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
msgid "Copy to Address Book..."
msgstr "Копировать в адресную книгу..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
msgid "Move to Address Book..."
msgstr "Переместить в адресную книгу..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
msgid "Cut"
msgstr "Вырезать"
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: 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:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
msgid "Paste"
msgstr "Вставить"
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:1092
+#: calendar/gui/e-calendar-view.c:1280
msgid "Current View"
msgstr "Текущий вид"
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-"Произошла ошибка в базе данных адресной книги\n"
-"%s.\n"
-"Необходимо перезапустить Evolution."
-
#. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1667
-#: calendar/gui/cal-search-bar.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: calendar/gui/cal-search-bar.c:358
msgid "Any Category"
msgstr "Любая категория"
@@ -3147,7 +3033,7 @@ msgstr "Радио"
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-list-view.c:234
#: calendar/gui/e-meeting-time-sel.etspec.h:9
msgid "Role"
msgstr "Должность"
@@ -3292,12 +3178,12 @@ msgstr "Evolution vCalendar importer"
msgid "VCard (.vcf, .gcrd)"
msgstr ""
-#: addressbook/printing/e-contact-print.c:998
+#: addressbook/printing/e-contact-print.c:1000
msgid "Print contacts"
msgstr "Напечатать контакты"
-#: addressbook/printing/e-contact-print.c:1064
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1066
+#: addressbook/printing/e-contact-print.c:1093
msgid "Print contact"
msgstr "Напечатать контакт"
@@ -3548,15 +3434,21 @@ msgstr ""
msgid "Impossible internal error."
msgstr "Невозможная внутренняя ошибка."
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+#: 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:78
-msgid "Can not load URI"
-msgstr "Не удается загрузить URI"
+#: 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."
@@ -3574,7 +3466,7 @@ msgstr "Не указано имя файла."
msgid "Unnamed List"
msgstr "Безымянный список"
-#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
#: smime/gui/component.c:48
msgid "Enter password"
msgstr "Ввод пароля"
@@ -3855,10 +3747,10 @@ msgid "Whether to show week numbers in date navigator"
msgstr "Показывать ли номера недель в навигаторе по датам"
#: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:88
-#: calendar/gui/gnome-cal.c:1703
-#: camel/providers/groupwise/camel-gw-listener.c:304
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/gnome-cal.c:1705
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
msgid "Calendar"
msgstr "Календарь"
@@ -3880,7 +3772,7 @@ msgstr ""
#: calendar/gui/calendar-commands.c:363
#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
msgid "days"
msgstr "дней"
@@ -4025,24 +3917,24 @@ msgstr "Как неделю"
msgid "Month View"
msgstr "как месяц"
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
msgid "Summary contains"
msgstr "\"Коротко\" содержит"
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
msgid "Description contains"
msgstr "Описание содержит"
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:52
msgid "Comment contains"
msgstr "Комментарий содержит"
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:53
#, fuzzy
msgid "Location contains"
msgstr "Описание содержит"
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
msgid "Unmatched"
msgstr "Прочее"
@@ -4063,23 +3955,23 @@ msgstr "Отказ в доступе при открытии календаря"
msgid "open_client(): %s"
msgstr "open_client(): %s"
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:467
msgid "Audio Alarm Options"
msgstr "Параметры звукового сигнала"
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:476
msgid "Message Alarm Options"
msgstr "Параметры сигнала-сообщения"
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:485
msgid "Email Alarm Options"
msgstr "Параметры сигнала по почте"
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:494
msgid "Program Alarm Options"
msgstr "Параметры программы-сигнала"
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:510
msgid "Unknown Alarm Options"
msgstr "Параметры сигнала неизвестного типа"
@@ -4115,7 +4007,7 @@ msgstr "Отправить:"
msgid "With these arguments:"
msgstr "С аргументами:"
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
msgid "dialog1"
msgstr "dialog1"
@@ -4124,7 +4016,7 @@ msgid "extra times every"
msgstr "дополнительное время каждые"
#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
msgid "hours"
msgstr "часов"
@@ -4170,7 +4062,7 @@ 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:927 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
msgid "Summary:"
msgstr "Сводка:"
@@ -4200,7 +4092,6 @@ msgid "hour(s)"
msgstr "часов"
#: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
msgid "minute(s)"
msgstr "минут"
@@ -4208,26 +4099,26 @@ msgstr "минут"
msgid "start of appointment"
msgstr "начало встречи"
-#: calendar/gui/dialogs/calendar-setup.c:170
+#: 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:178
+#: 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:193
+#: 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:265
+#: 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:278
+#: calendar/gui/dialogs/calendar-setup.c:288
#, c-format
msgid ""
"The group '%s' is remote. You must specify a location to get the calendar "
@@ -4249,56 +4140,36 @@ msgstr "Группа списка задач"
msgid "C_olor:"
msgstr "_Цвета"
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-msgstr "Свойства календаря"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+#: 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:8
-msgid "Remote"
-msgstr "Удаленный"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "Task List Properties"
-msgstr "Свойства списка задач"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
#, fuzzy
msgid "_Add Calendar"
msgstr "Добавление нового календаря"
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
#, fuzzy
msgid "_Add Group"
msgstr "_Добавить группу..."
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-msgid "_Refresh Interval:"
-msgstr "_Интервал обновления:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
#, fuzzy
msgid "_Refresh:"
msgstr "Обновить"
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-msgid "_Source URL:"
-msgstr "URL _источника:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
#, fuzzy
msgid "_Type:"
msgstr "Тип:"
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
#, fuzzy
msgid "_URL:"
msgstr "URL:"
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
msgid "weeks"
msgstr "недели"
@@ -4406,7 +4277,7 @@ msgid "Display"
msgstr "Отображение"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
msgid "E_nable"
msgstr "_Включить"
@@ -4417,7 +4288,7 @@ msgstr "Запрос информации о занятости"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
#: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:563
+#: calendar/gui/e-itip-control.c:556
msgid "Friday"
msgstr "Пятница"
@@ -4431,7 +4302,7 @@ msgstr "Минут"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
#: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/e-itip-control.c:552
msgid "Monday"
msgstr "Понедельник"
@@ -4441,7 +4312,7 @@ msgstr "Вск"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
#: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/e-itip-control.c:557
msgid "Saturday"
msgstr "Суббота"
@@ -4455,7 +4326,7 @@ msgstr "Показывать номера недель в навигаторе
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
#: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:551
msgid "Sunday"
msgstr "Воскресенье"
@@ -4469,7 +4340,7 @@ msgstr "Чтв"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
#: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/e-itip-control.c:555
msgid "Thursday"
msgstr "Четверг"
@@ -4483,7 +4354,7 @@ msgstr "Формат времени:"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
#: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:560
+#: calendar/gui/e-itip-control.c:553
msgid "Tuesday"
msgstr "Вторник"
@@ -4493,7 +4364,7 @@ msgstr "Начало недели:"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
#: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-itip-control.c:554
msgid "Wednesday"
msgstr "Среда"
@@ -4526,7 +4397,7 @@ msgid "_Day begins:"
msgstr "_День начинается:"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
-#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: 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
#: ui/evolution-message-composer.xml.h:43
@@ -4575,81 +4446,46 @@ msgstr "Срд"
msgid "before every appointment"
msgstr "перед каждой встречей"
-#: calendar/gui/dialogs/cancel-comp.c:57
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"Удаляемое событие является собранием, хотите отправить уведомление об отмене?"
-
-#: calendar/gui/dialogs/cancel-comp.c:60
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr "Вы действительно хотите отменить и удалить это собрание?"
-
-#: calendar/gui/dialogs/cancel-comp.c:66
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"Удаляемое событие является назначенной задачей, хотите отправить уведомление "
-"об отмене?"
-
-#: calendar/gui/dialogs/cancel-comp.c:69
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr "Вы действительно хотите отменить и удалить эту задачу?"
-
-#: calendar/gui/dialogs/cancel-comp.c:75
-msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr ""
-"Удаляемое событие является опубликованной записью в журнале,хотите отправить "
-"уведомление об отмене?"
-
-#: calendar/gui/dialogs/cancel-comp.c:78
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr "Вы действительно хотите отменить и удалить эту запись в журнале?"
-
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:60
msgid "This event has been deleted."
msgstr "Это событие было удалено."
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
msgid "This task has been deleted."
msgstr "Эта задача была удалена."
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
msgid "This journal entry has been deleted."
msgstr "Эта запись в журнале была удалена."
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:77
#, c-format
msgid "%s You have made changes. Forget those changes and close the editor?"
msgstr "%s Вы сделали изменения. Отменить их и закрыть редактор?"
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:79
#, c-format
msgid "%s You have made no changes, close the editor?"
msgstr "%s Вы ничего не изменили. Закрыть редактор?"
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:84
msgid "This event has been changed."
msgstr "Это событие было изменено."
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
msgid "This task has been changed."
msgstr "Эта задача была изменена."
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
msgid "This journal entry has been changed."
msgstr "Эта запись в журнале была изменена."
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:101
#, c-format
msgid "%s You have made changes. Forget those changes and update the editor?"
msgstr "%s Вы сделали изменения. Отменить их?"
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:103
#, c-format
msgid "%s You have made no changes, update the editor?"
msgstr "%s Вы ничего не изменили. Обновить редактор?"
@@ -4687,7 +4523,7 @@ msgid "No summary"
msgstr "Нет Краткого описания"
#: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
#: composer/e-msg-composer.c:1193
msgid "Save as..."
msgstr "Сохранить как..."
@@ -4743,102 +4579,51 @@ msgstr "Назначение:"
msgid "Destination is read only"
msgstr ""
-#: calendar/gui/dialogs/delete-comp.c:95
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Вы действительно хотите удалить встречу \"%s\"?"
-
-#: calendar/gui/dialogs/delete-comp.c:98
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Вы действительно хотите удалить эту неозаглавленную встречу?"
-
-#: calendar/gui/dialogs/delete-comp.c:104
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Вы действительно хотите удалить задачу \"%s\"?"
-
-#: calendar/gui/dialogs/delete-comp.c:107
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Вы действительно хотите удалить эту неозаглавленную задачу?"
-
-#: calendar/gui/dialogs/delete-comp.c:113
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "Вы действительно хотите удалить запись в журнале \"%s\"?"
-
-#: calendar/gui/dialogs/delete-comp.c:116
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Вы действительно хотите удалить эту неозаглавленную запись в журнале?"
-
-#: calendar/gui/dialogs/delete-comp.c:131
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d appointment?"
-msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] "Вы действительно хотите удалить %d встреч?"
-msgstr[1] "Вы действительно хотите удалить %d встреч?"
-msgstr[2] "Вы действительно хотите удалить %d встреч?"
-
-#: calendar/gui/dialogs/delete-comp.c:138
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d task?"
-msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] "Вы действительно хотите удалить %d задач?"
-msgstr[1] "Вы действительно хотите удалить %d задач?"
-msgstr[2] "Вы действительно хотите удалить %d задач?"
-
-#: calendar/gui/dialogs/delete-comp.c:145
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d journal entry?"
-msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] "Вы действительно хотите удалить %d записей в журнале?"
-msgstr[1] "Вы действительно хотите удалить %d записей в журнале?"
-msgstr[2] "Вы действительно хотите удалить %d записей в журнале?"
-
-#: calendar/gui/dialogs/delete-error.c:52
+#: calendar/gui/dialogs/delete-error.c:54
msgid "The event could not be deleted due to a corba error"
msgstr "Это событие не может быть удалено из-за ошибки corba"
-#: calendar/gui/dialogs/delete-error.c:55
+#: calendar/gui/dialogs/delete-error.c:57
msgid "The task could not be deleted due to a corba error"
msgstr "Эта задача не может быть удалена из-за ошибки corba"
-#: calendar/gui/dialogs/delete-error.c:58
+#: calendar/gui/dialogs/delete-error.c:60
msgid "The journal entry could not be deleted due to a corba error"
msgstr "Эта запись в журнале не может быть удалена из-за ошибки corba"
-#: calendar/gui/dialogs/delete-error.c:61
+#: calendar/gui/dialogs/delete-error.c:63
msgid "The item could not be deleted due to a corba error"
msgstr "Этот элемент не может быть удален из-за ошибки corba"
-#: calendar/gui/dialogs/delete-error.c:68
+#: calendar/gui/dialogs/delete-error.c:70
msgid "The event could not be deleted because permission was denied"
msgstr "Это событие не может быть удалено: нет доступа"
-#: calendar/gui/dialogs/delete-error.c:71
+#: calendar/gui/dialogs/delete-error.c:73
msgid "The task could not be deleted because permission was denied"
msgstr "Эта задача не может быть удалена: недостаточно прав"
-#: calendar/gui/dialogs/delete-error.c:74
+#: calendar/gui/dialogs/delete-error.c:76
msgid "The journal entry could not be deleted because permission was denied"
msgstr "Эта запись в журнале не может быть удалена: недостаточно прав"
-#: calendar/gui/dialogs/delete-error.c:77
+#: calendar/gui/dialogs/delete-error.c:79
msgid "The item could not be deleted because permission was denied"
msgstr "Этот элемент не может быть удален: нет доступа"
-#: calendar/gui/dialogs/delete-error.c:84
+#: calendar/gui/dialogs/delete-error.c:86
msgid "The event could not be deleted due to an error"
msgstr "Это событие не может быть удалено из-за ошибки"
-#: calendar/gui/dialogs/delete-error.c:87
+#: calendar/gui/dialogs/delete-error.c:89
msgid "The task could not be deleted due to an error"
msgstr "Эта задача не может быть удалена из-за ошибки"
-#: calendar/gui/dialogs/delete-error.c:90
+#: calendar/gui/dialogs/delete-error.c:92
msgid "The journal entry could not be deleted due to an error"
msgstr "Эта запись в журнале не может быть удалена из-за ошибки"
-#: calendar/gui/dialogs/delete-error.c:93
+#: calendar/gui/dialogs/delete-error.c:95
msgid "The item could not be deleted due to an error"
msgstr "Этот элемент не может быть удален из-за ошибки"
@@ -4972,11 +4757,11 @@ msgstr "Нача_ло:"
#. an empty string is the same as 'None'
#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: 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:1559
-#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
+#: mail/em-folder-view.c:928 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
@@ -5002,8 +4787,8 @@ 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:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2557 mail/em-folder-view.c:919
+#: 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
@@ -5011,7 +4796,7 @@ msgid "_Delete"
msgstr "_Удалить"
#: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:240
+#: calendar/gui/e-meeting-list-view.c:218
#: calendar/gui/e-meeting-time-sel.etspec.h:1
msgid "Attendee"
msgstr "Участник"
@@ -5047,16 +4832,15 @@ msgid "Member"
msgstr "Участник"
#: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1047 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/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
-#: mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
msgid "Status"
msgstr "Состояние"
@@ -5065,20 +4849,20 @@ msgstr "Состояние"
msgid "Add A_ttendee"
msgstr "Участник"
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "Добавить отправителя в _адресную книгу"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
#: calendar/gui/e-itip-control.glade.h:9
msgid "Organizer:"
msgstr "Организатор:"
-#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/dialogs/meeting-page.glade.h:6
msgid "_Change Organizer"
msgstr "Изменить организатора"
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
-msgstr "Пригласить других..."
-
#: calendar/gui/dialogs/new-calendar.glade.h:2
msgid "<b>Calendar options</b>"
msgstr "<b>Параметры календаря</b>"
@@ -5226,7 +5010,7 @@ msgid "_No recurrence"
msgstr "Без повторения"
#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:450
+#: composer/e-msg-composer-attachment-bar.c:453
msgid "_Remove"
msgstr "Удалить"
@@ -5258,55 +5042,20 @@ msgstr "неделя"
msgid "year(s)"
msgstr "год(лет)"
-#: calendar/gui/dialogs/save-comp.c:53
-msgid ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Это событие было изменено, но не сохранено.\n"
-"\n"
-"Сохранить изменения?"
-
-#: calendar/gui/dialogs/save-comp.c:57
-msgid "_Discard Changes"
-msgstr "_Отклонить изменения"
-
-#: calendar/gui/dialogs/save-comp.c:62
-msgid "Save Event"
-msgstr "Сохранить событие"
-
-#: calendar/gui/dialogs/select-source-dialog.c:65
+#: calendar/gui/dialogs/select-source-dialog.c:69
#, fuzzy
msgid "Select destination"
msgstr "Назначение:"
-#: calendar/gui/dialogs/select-source-dialog.c:86
+#: calendar/gui/dialogs/select-source-dialog.c:90
#, fuzzy
msgid "_Destination"
msgstr "Папка _черновиков:"
-#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/dialogs/select-source-dialog.c:92
msgid "Task List"
msgstr "Список задач"
-#: calendar/gui/dialogs/send-comp.c:57
-msgid "The meeting information has been created. Send it?"
-msgstr "Была создана информация о собрании. Отправить ее?"
-
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The meeting information has changed. Send an updated version?"
-msgstr "Информация о собрании была изменена. Отправить обновлённую версию?"
-
-#: calendar/gui/dialogs/send-comp.c:67
-msgid "The task assignment information has been created. Send it?"
-msgstr ""
-"Информация о назначении задачи была изменена. Отправить обновлённую версию?"
-
-#: calendar/gui/dialogs/send-comp.c:71
-msgid "The task information has changed. Send an updated version?"
-msgstr "Информация о задаче была изменена. Отправить обновлённую версию?"
-
#: calendar/gui/dialogs/task-details-page.c:406
msgid "Completed date is wrong"
msgstr "Дата выполнения некорректна"
@@ -5326,7 +5075,7 @@ msgstr "Выполнено"
#: calendar/gui/dialogs/task-details-page.glade.h:5
#: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
msgid "High"
msgstr "Высокий"
@@ -5340,14 +5089,14 @@ msgstr "В процессе"
#: calendar/gui/dialogs/task-details-page.glade.h:7
#: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
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:957
+#: mail/message-list.c:959
msgid "Normal"
msgstr "Нормальный"
@@ -5405,8 +5154,8 @@ msgstr "Кон_фиденциально"
#: calendar/gui/dialogs/task-page.glade.h:6
#: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
+#: calendar/gui/e-itip-control.c:975 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 "Описание:"
@@ -5579,7 +5328,7 @@ msgstr "Дата выполнения:"
#. write status
#: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:950
+#: calendar/gui/e-itip-control.c:943
msgid "Status:"
msgstr "Состояние:"
@@ -5664,12 +5413,12 @@ msgstr "Занят"
msgid "Deleting selected objects"
msgstr "Удаление выделенных объектов"
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
msgid "Updating objects"
msgstr "Обновление объектов"
#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: 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
msgid "_Open"
msgstr "_Открыть"
@@ -5679,15 +5428,15 @@ 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:1291 calendar/gui/e-calendar-view.c:1376
-#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
+#: 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
#: 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:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
+#: 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
#: 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
@@ -5695,24 +5444,24 @@ msgid "_Print..."
msgstr "_Печать..."
#: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
#: 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:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2550
-#: mail/message-list.c:1644 ui/evolution-addressbook.xml.h:31
+#: 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
msgid "_Copy"
msgstr "_Копировать"
#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
+#: 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
#: 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"
@@ -5781,71 +5530,71 @@ msgstr "Сводка"
msgid "Task sort"
msgstr "Сортировка задач"
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
msgid "New _Appointment..."
msgstr "Новая _встреча..."
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
msgid "New All Day _Event"
msgstr "Новое ежедневное событие"
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
msgid "New Meeting"
msgstr "Новое собрание"
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
msgid "New Task"
msgstr "Новая задача"
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
#, fuzzy
msgid "Select _Today"
msgstr "Выделить подшивку"
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
#, fuzzy
msgid "_Select Date..."
msgstr "_Выбрать..."
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
msgid "_Publish Free/Busy Information"
msgstr "Опубликовать информацию о занятости"
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1306
#, fuzzy
msgid "Cop_y to Calendar..."
msgstr "Копировать в папку..."
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
#, fuzzy
msgid "Mo_ve to Calendar..."
msgstr "Переместить в папку..."
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
msgid "_Schedule Meeting..."
msgstr "_Назначить собрание..."
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
msgid "_Forward as iCalendar..."
msgstr "_Переслать как iCalendar..."
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
msgid "Delete this _Occurrence"
msgstr "Удалить это вхождение"
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
msgid "Delete _All Occurrences"
msgstr "Удалить все вхождения"
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
msgid "Go to _Today"
msgstr "Перейти к сег_одняшнему дню"
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
msgid "_Go to Date..."
msgstr "Пере_йти к дате..."
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
msgid "_Settings..."
msgstr "_Настройка..."
@@ -5860,9 +5609,9 @@ 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:967 calendar/gui/e-itip-control.c:1169
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
+#: 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
@@ -5888,13 +5637,13 @@ 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:168 calendar/gui/e-meeting-store.c:159
+#: 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:169 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
msgid "No"
msgstr "Нет"
@@ -5906,7 +5655,7 @@ msgstr "С"
msgid "S"
msgstr "Ю"
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
msgid "E"
msgstr "В"
@@ -5978,11 +5727,11 @@ msgstr "%d %b"
msgid "%02i minute divisions"
msgstr "Деления через %02i минут"
-#: calendar/gui/e-itip-control.c:592
+#: calendar/gui/e-itip-control.c:585
msgid "Yes. (Complex Recurrence)"
msgstr "Да. (Сложное повторение)"
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:596
#, fuzzy, c-format
msgid "Every day"
msgid_plural "Every %d days"
@@ -5990,7 +5739,7 @@ msgstr[0] "Каждый день"
msgstr[1] "Каждый день"
msgstr[2] "Каждый день"
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:601
#, fuzzy, c-format
msgid "Every week"
msgid_plural "Every %d weeks"
@@ -5998,7 +5747,7 @@ msgstr[0] "Каждую неделю"
msgstr[1] "Каждую неделю"
msgstr[2] "Каждую неделю"
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:603
#, fuzzy, c-format
msgid "Every week on "
msgid_plural "Every %d weeks on "
@@ -6006,21 +5755,21 @@ msgstr[0] "Каждую неделю в "
msgstr[1] "Каждую неделю в "
msgstr[2] "Каждую неделю в "
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:611
msgid " and "
msgstr " и "
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:618
#, c-format
msgid "The %s day of "
msgstr "%s дней "
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:631
#, c-format
msgid "The %s %s of "
msgstr "%s %s "
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:638
#, fuzzy, c-format
msgid "every month"
msgid_plural "every %d months"
@@ -6028,7 +5777,7 @@ msgstr[0] "каждый месяц"
msgstr[1] "каждый месяц"
msgstr[2] "каждый месяц"
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:642
#, fuzzy, c-format
msgid "Every year"
msgid_plural "Every %d years"
@@ -6036,7 +5785,7 @@ msgstr[0] "Каждый год"
msgstr[1] "Каждый год"
msgstr[2] "Каждый год"
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:653
#, fuzzy, c-format
msgid "a total of %d time"
msgid_plural " a total of %d times"
@@ -6044,42 +5793,42 @@ msgstr[0] " всего %d раз"
msgstr[1] " всего %d раз"
msgstr[2] " всего %d раз"
-#: calendar/gui/e-itip-control.c:669
+#: calendar/gui/e-itip-control.c:662
msgid ", ending on "
msgstr ", заканчивается на"
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:686
msgid "<b>Starts:</b> "
msgstr "<b>Начинается:</b> "
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:696
msgid "<b>Ends:</b> "
msgstr "<b>Заканчивается:</b>"
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:716
msgid "<b>Completed:</b> "
msgstr "<b>Выполнено:</b>"
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:726
msgid "<b>Due:</b> "
msgstr "<b>К:</b> "
-#: calendar/gui/e-itip-control.c:771 calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
msgid "iCalendar Information"
msgstr "Сведения iCalendar"
#. Title
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:781
msgid "iCalendar Error"
msgstr "Ошибка iCalendar"
-#: calendar/gui/e-itip-control.c:859 calendar/gui/e-itip-control.c:875
-#: calendar/gui/e-itip-control.c:886 calendar/gui/e-itip-control.c:903
+#: 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
msgid "An unknown person"
msgstr "Неизвестное лицо"
#. Describe what the user can do
-#: calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-itip-control.c:903
msgid ""
"<br> Please review the following information, and then select an action from "
"the menu below."
@@ -6087,305 +5836,309 @@ msgstr ""
"<b> Пересмотрите следующую информацию и выберите действие из расположенного "
"ниже меню."
-#: calendar/gui/e-itip-control.c:925
+#: calendar/gui/e-itip-control.c:918
msgid "<i>None</i>"
msgstr "<i>Нет</i>"
-#: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:929
+msgid "Location:"
+msgstr "Расположение:"
+
+#: calendar/gui/e-itip-control.c:948 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:959 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
msgid "Tentatively Accepted"
msgstr "Экспериментально принятый"
-#: calendar/gui/e-itip-control.c:963 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:956 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:1022 calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1076 calendar/gui/e-itip-control.c:1089
-#: calendar/gui/e-itip-control.c:1102 calendar/gui/e-itip-control.c:1115
+#: 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
msgid "Choose an action:"
msgstr "Выберите действие:"
-#: calendar/gui/e-itip-control.c:1023
+#: calendar/gui/e-itip-control.c:1016
msgid "Update"
msgstr "Обновить"
-#: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
-#: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
+#: 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
msgid "OK"
msgstr "Ок"
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1044
msgid "Accept"
msgstr "Принять"
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1045
msgid "Tentatively accept"
msgstr "Принять экспериментально"
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1046
msgid "Decline"
msgstr "Отклонить"
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1070
msgid "Send Free/Busy Information"
msgstr "Отправить информацию о занятости"
-#: calendar/gui/e-itip-control.c:1090
+#: calendar/gui/e-itip-control.c:1083
msgid "Update respondent status"
msgstr "Обновить состояние"
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1096
msgid "Send Latest Information"
msgstr "Отправить последнюю информацию"
-#: calendar/gui/e-itip-control.c:1116 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1109 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:1192
+#: calendar/gui/e-itip-control.c:1185
#, c-format
msgid "<b>%s</b> has published meeting information."
msgstr "<b>%s</b> опубликовал последнюю информацию о собрании."
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1186
msgid "Meeting Information"
msgstr "Информация о собрании"
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1191
#, 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:1200
+#: calendar/gui/e-itip-control.c:1193
#, c-format
msgid "<b>%s</b> requests your presence at a meeting."
msgstr "<b>%s</b> запрашивает ваше присутствие на собрании."
-#: calendar/gui/e-itip-control.c:1201
+#: calendar/gui/e-itip-control.c:1194
msgid "Meeting Proposal"
msgstr "Предложение собрания"
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1198
#, c-format
msgid "<b>%s</b> wishes to add to an existing meeting."
msgstr "<b>%s</b> желает добавить к существующему собранию."
-#: calendar/gui/e-itip-control.c:1206
+#: calendar/gui/e-itip-control.c:1199
msgid "Meeting Update"
msgstr "Обновление собрания"
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1203
#, c-format
msgid "<b>%s</b> wishes to receive the latest meeting information."
msgstr "<b>%s</b> желает получить последнюю информацию о собрании."
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1204
msgid "Meeting Update Request"
msgstr "Запрос обновления собрания"
-#: calendar/gui/e-itip-control.c:1218
+#: calendar/gui/e-itip-control.c:1211
#, c-format
msgid "<b>%s</b> has replied to a meeting request."
msgstr "<b>%s</b> ответил на приглашение на собрание."
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1212
msgid "Meeting Reply"
msgstr "Ответ собрания"
-#: calendar/gui/e-itip-control.c:1226
+#: calendar/gui/e-itip-control.c:1219
#, c-format
msgid "<b>%s</b> has cancelled a meeting."
msgstr "<b>%s</b> отменил собрание."
-#: calendar/gui/e-itip-control.c:1227
+#: calendar/gui/e-itip-control.c:1220
msgid "Meeting Cancellation"
msgstr "Отмена собрания"
-#: calendar/gui/e-itip-control.c:1234 calendar/gui/e-itip-control.c:1302
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
#, c-format
msgid "<b>%s</b> has sent an unintelligible message."
msgstr "<b>%s</b> отправил невразумительное сообщение."
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1228
msgid "Bad Meeting Message"
msgstr "Неверное сообщение собрания"
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1253
#, c-format
msgid "<b>%s</b> has published task information."
msgstr "<b>%s</b> опубликовал информацию о задаче"
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1254
msgid "Task Information"
msgstr "Информация о задаче"
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1259
#, c-format
msgid "<b>%s</b> requests %s to perform a task."
msgstr "<b>%s</b> запрашивает %s для выполнения задачи."
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1261
#, c-format
msgid "<b>%s</b> requests you perform a task."
msgstr "<b>%s</b> запрашивает, чтобы вы выполнили задачу."
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1262
msgid "Task Proposal"
msgstr "Предложение задачи"
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1266
#, c-format
msgid "<b>%s</b> wishes to add to an existing task."
msgstr "<b>%s</b> желает добавить к существующей задаче."
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1267
msgid "Task Update"
msgstr "Обновление задачи"
-#: calendar/gui/e-itip-control.c:1278
+#: calendar/gui/e-itip-control.c:1271
#, c-format
msgid "<b>%s</b> wishes to receive the latest task information."
msgstr "<b>%s</b> желает получить последнюю информацию о задаче."
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1272
msgid "Task Update Request"
msgstr "Запрос обновления задачи"
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1279
#, c-format
msgid "<b>%s</b> has replied to a task assignment."
msgstr "<b>%s</b> ответил на назначение задачи."
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1280
msgid "Task Reply"
msgstr "Ответ собрания"
-#: calendar/gui/e-itip-control.c:1294
+#: calendar/gui/e-itip-control.c:1287
#, c-format
msgid "<b>%s</b> has cancelled a task."
msgstr "<b>%s</b> отменил задачу."
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1288
msgid "Task Cancellation"
msgstr "Отмена задачи"
-#: calendar/gui/e-itip-control.c:1303
+#: calendar/gui/e-itip-control.c:1296
msgid "Bad Task Message"
msgstr "Сообщение календаря"
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1315
#, c-format
msgid "<b>%s</b> has published free/busy information."
msgstr "<b>%s</b> опубликовал информацию о занятости."
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1316
msgid "Free/Busy Information"
msgstr "Информация о занятости"
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1320
#, c-format
msgid "<b>%s</b> requests your free/busy information."
msgstr "<b>%s</b> запрашивает информацию о вашей занятости."
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1321
msgid "Free/Busy Request"
msgstr "Запрос информации о занятости"
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1325
#, c-format
msgid "<b>%s</b> has replied to a free/busy request."
msgstr "<b>%s</b> ответил на запрос информации о занятости."
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1326
msgid "Free/Busy Reply"
msgstr "Ответ занятости"
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1331
msgid "Bad Free/Busy Message"
msgstr "Неверное сообщение о занятости"
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1406
msgid "The message does not appear to be properly formed"
msgstr "Похоже что сообщение не было правильно сформировано"
-#: calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1465
msgid "The message contains only unsupported requests."
msgstr "Это сообщение содержит только неподдерживаемые запросы"
-#: calendar/gui/e-itip-control.c:1503
+#: calendar/gui/e-itip-control.c:1496
msgid "The attachment does not contain a valid calendar message"
msgstr "Вложение не содержит правильного сообщения календаря."
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1528
msgid "The attachment has no viewable calendar items"
msgstr "Вложение не содержит пригодных для просмотра элементов календаря."
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:1762
msgid "Update complete\n"
msgstr "Обновление закончено\n"
-#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
+#: 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:1815 calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
msgid "Object is invalid and cannot be updated\n"
msgstr "Объект некорректен и не может быть обновлен\n"
-#: calendar/gui/e-itip-control.c:1825
+#: calendar/gui/e-itip-control.c:1818
msgid "This response is not from a current attendee. Add as an attendee?"
msgstr ""
"Этот ответ пришел не от текущего участника. Добавить его, как участника?"
-#: calendar/gui/e-itip-control.c:1837
+#: calendar/gui/e-itip-control.c:1830
msgid "Attendee status could not be updated because of an invalid status!\n"
msgstr ""
"Статус участника не может быть обновлён из-за неверного текущего статуса!\n"
-#: calendar/gui/e-itip-control.c:1856
+#: 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:1859
+#: calendar/gui/e-itip-control.c:1852
msgid "Object could not be found\n"
msgstr "Объект не может быть найден!\n"
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1855
msgid "You don't have the right permissions to update the calendar\n"
msgstr "У вас нет соответствующих прав для обновления календаря\n"
-#: calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1858
msgid "Attendee status updated\n"
msgstr "Статус участника обновлён!\n"
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1861
msgid "Attendee status could not be updated!\n"
msgstr "Статус участника не может быть обновлён!\n"
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1892
msgid "Removal Complete"
msgstr "Удаление завершено"
-#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
msgid "Item sent!\n"
msgstr "Элемент отправлен!\n"
-#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
msgid "The item could not be sent!\n"
msgstr "Элемент не может быть послан!\n"
@@ -6426,74 +6179,74 @@ msgstr "дата-завершения"
msgid "date-start"
msgstr "дата-начала"
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
msgid "Chair Persons"
msgstr "Председатели"
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:479
+#: 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:64
+#: calendar/gui/e-meeting-list-view.c:61
msgid "Optional Participants"
msgstr "Дополнительные участники"
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
msgid "Resources"
msgstr "Ресурсы"
-#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
#: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
msgid "Individual"
msgstr "Индивидуально"
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
#: calendar/gui/e-meeting-store.c:109
msgid "Group"
msgstr "Группа"
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
#: calendar/gui/e-meeting-store.c:111
msgid "Resource"
msgstr "Источник"
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
#: calendar/gui/e-meeting-store.c:113
msgid "Room"
msgstr "Комната"
-#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
#: calendar/gui/e-meeting-store.c:142
msgid "Chair"
msgstr "Председатель"
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
#: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
msgid "Required Participant"
msgstr "Требуемые участники"
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
#: calendar/gui/e-meeting-store.c:146
msgid "Optional Participant"
msgstr "Дополнительные участники"
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
#: calendar/gui/e-meeting-store.c:148
msgid "Non-Participant"
msgstr "Не участвует"
-#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
#: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
msgid "Needs Action"
msgstr "Необходимое действие"
-#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
#: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
msgid "Tentative"
msgstr "Экспериментальный"
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
#: calendar/gui/e-meeting-store.c:208
msgid "Delegated"
msgstr "Передано"
@@ -6510,20 +6263,28 @@ msgstr "Вне офиса"
msgid "No Information"
msgstr "Нет информации"
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "Добавить отправителя в _адресную книгу"
+
#: calendar/gui/e-meeting-time-sel.c:440
msgid "_Options"
msgstr "Параметры"
#: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+#, fuzzy
+msgid "Show _only working hours"
msgstr "Показывать только рабочие часы"
#: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+#, fuzzy
+msgid "Show _zoomed out"
msgstr "Показывать уменьшенные"
#: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+#, fuzzy
+msgid "_Update free/busy"
msgstr "Обновить информацию о занятости"
#: calendar/gui/e-meeting-time-sel.c:497
@@ -6539,19 +6300,23 @@ msgid ">_>"
msgstr ">_>"
#: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+#, fuzzy
+msgid "_All people and resources"
msgstr "Все люди и ресурсы"
#: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+#, fuzzy
+msgid "All _people and one resource"
msgstr "Все люди и один ресурс"
#: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+#, fuzzy
+msgid "_Required people"
msgstr "Требуемые люди"
#: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+#, fuzzy
+msgid "Required people and _one resource"
msgstr "Требуемые люди и один ресурс"
#: calendar/gui/e-meeting-time-sel.c:593
@@ -6589,7 +6354,7 @@ msgstr "%d.%m.%Y"
msgid "Enter the password for %s"
msgstr "Введите пароль для %s"
-#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
#, c-format
msgid ""
"Error on %s:\n"
@@ -6598,19 +6363,14 @@ msgstr ""
"Ошибка в \"%s\":\n"
"%s"
-#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
#. FIXME Loading should be async
#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:686
+#: calendar/gui/e-tasks.c:801
#, c-format
msgid "Opening tasks at %s"
msgstr "Открытие задач %s"
-#: calendar/gui/e-tasks.c:709
+#: calendar/gui/e-tasks.c:824
#, c-format
msgid ""
"Error opening %s:\n"
@@ -6619,52 +6379,47 @@ msgstr ""
"Ошибка открытия %s:\n"
"%s"
-#: calendar/gui/e-tasks.c:730
+#: calendar/gui/e-tasks.c:845
msgid "Loading tasks"
msgstr "Загрузка задач"
-#: calendar/gui/e-tasks.c:834
+#: calendar/gui/e-tasks.c:949
msgid "Completing tasks..."
msgstr "Завершение выполнения задач..."
-#: calendar/gui/e-tasks.c:857
+#: calendar/gui/e-tasks.c:972
msgid "Deleting selected objects..."
msgstr "Удаление выделенных объектов..."
-#: calendar/gui/e-tasks.c:884
+#: calendar/gui/e-tasks.c:999
msgid "Expunging"
msgstr "Очистка папки"
-#: calendar/gui/e-tasks.c:960
+#: 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:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: 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:1876
+#: calendar/gui/gnome-cal.c:1878
#, fuzzy, c-format
msgid "Loading appointments at %s"
msgstr "Встреча - %s"
-#: calendar/gui/gnome-cal.c:1895
+#: calendar/gui/gnome-cal.c:1897
#, fuzzy, c-format
msgid "Loading tasks at %s"
msgstr "Загрузка задач"
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1920
#, c-format
msgid "Opening %s"
msgstr "Открывается %s"
-#: calendar/gui/gnome-cal.c:2048
-#, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2894
+#: calendar/gui/gnome-cal.c:2906
#, fuzzy
msgid "Purging"
msgstr "Турин"
@@ -6865,7 +6620,7 @@ msgid "On The Web"
msgstr "В Сети"
#. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
msgid "Unable to migrate old settings from evolution/config.xmldb"
msgstr ""
@@ -6876,7 +6631,7 @@ msgid "Unable to migrate calendar `%s'"
msgstr "Не удаётся открыть календарь '%s'."
#. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
#, fuzzy, c-format
msgid "Unable to migrate tasks `%s'"
msgstr "Не удается открыть задачи в '%s'."
@@ -7112,16 +6867,16 @@ msgstr "Напечатать элемент"
msgid "Print Setup"
msgstr "Настройка печати"
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
#, c-format
msgid "Task List '%s' will be removed. Are you sure you want to continue?"
msgstr "Список задач '%s' будет удален. Вы действительно хотите продолжить?"
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
msgid "New Task List"
msgstr "Новый список задач"
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
#, fuzzy, c-format
msgid "%d task"
msgid_plural "%d tasks"
@@ -7129,7 +6884,7 @@ msgstr[0] "%d контактов"
msgstr[1] "%d контактов"
msgstr[2] "%d контактов"
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
#, fuzzy, c-format
msgid ", %d selected"
msgid_plural ", %d selected"
@@ -7137,49 +6892,49 @@ msgstr[0] "Удалённое"
msgstr[1] "Удалённое"
msgstr[2] "Удалённое"
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
#, fuzzy
msgid "Failed upgrading tasks."
msgstr "Загрузка задач"
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
#, c-format
msgid "Unable to open the task list '%s' for creating events and meetings"
msgstr "Не удается открыть список задач '%s' для создания событий и собраний"
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
msgid "There is no calendar available for creating tasks"
msgstr ""
-#: calendar/gui/tasks-component.c:576
+#: 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:804
+#: calendar/gui/tasks-component.c:1040
msgid "New task"
msgstr "Новая задача"
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
msgid "_Task"
msgstr "_Задача"
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
msgid "Create a new task"
msgstr "Создать новую задачу"
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
#, fuzzy
msgid "New tasks group"
msgstr "Новая задача"
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
#, fuzzy
msgid "_Tasks Group"
msgstr "Группа списка задач"
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
#, fuzzy
msgid "Create a new tasks group"
msgstr "Создать новую задачу"
@@ -8947,12 +8702,12 @@ msgstr "Ошибка выполнения поиска фильтра: %s: %s"
msgid "Unsupported operation: append message: for %s"
msgstr "Неподдерживаемая операция: добавить сообщение: для %s"
-#: camel/camel-folder.c:1259
+#: camel/camel-folder.c:1262
#, c-format
msgid "Unsupported operation: search by expression: for %s"
msgstr "Неподдерживаемая операция: поиск выражения: для %s"
-#: camel/camel-folder.c:1299
+#: camel/camel-folder.c:1302
#, c-format
msgid "Unsupported operation: search by uids: for %s"
msgstr ""
@@ -8966,11 +8721,16 @@ msgstr "Перемещение сообщений"
msgid "Copying messages"
msgstr "Копирование сообщений"
-#: camel/camel-folder.c:1666
-msgid "Learning junk and/or non junk message(s)"
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Изменение статуса спама"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
msgstr ""
-#: camel/camel-folder.c:1695
+#: camel/camel-folder.c:1701
#, fuzzy
msgid "Filtering new message(s)"
msgstr "Получение %d сообщений"
@@ -9005,17 +8765,17 @@ msgstr ""
msgid "(match-threads) requires a match type string"
msgstr ""
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
#, fuzzy
msgid "(match-threads) expects an array result"
msgstr "(совпадает все) требует единственного логического результата"
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
#, fuzzy
msgid "(match-threads) requires the folder set"
msgstr "(совпадает все) требует единственного логического результата"
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
#, c-format
msgid "Performing query on unknown header: %s"
msgstr "Запрашивается неизвестный заголовок: %s"
@@ -9050,7 +8810,8 @@ msgstr ""
#: 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 mail/mail-ops.c:706
+#: camel/camel-gpg-context.c:1637 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 "Отменено."
@@ -9428,7 +9189,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:1212
+#: camel/providers/imap/camel-imap-store.c:1240
msgid "Bad authentication response from server."
msgstr "Неверный ответ от сервера при идентификации."
@@ -9813,40 +9574,40 @@ msgstr "Команда не реализована"
msgid "export keys: unimplemented"
msgstr ""
-#: camel/camel-store.c:214
+#: camel/camel-store.c:213
msgid "Cannot get folder: Invalid operation on this store"
msgstr "Не удается получить папку: недопустимая операция в этом хранилище"
-#: camel/camel-store.c:244
+#: camel/camel-store.c:243
#, fuzzy, c-format
msgid "Cannot create folder `%s': folder exists"
msgstr "Не удается создать папку: %s: %s"
-#: camel/camel-store.c:295
+#: camel/camel-store.c:297
msgid "Cannot create folder: Invalid operation on this store"
msgstr "Не удается создать папку: недопустимая операция в этом хранилище"
-#: camel/camel-store.c:323
+#: camel/camel-store.c:325
#, fuzzy, c-format
msgid "Cannot create folder: %s: folder exists"
msgstr "Не удается создать папку: %s: %s"
-#: camel/camel-store.c:387 camel/camel-vee-store.c:354
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
#, c-format
msgid "Cannot delete folder: %s: Invalid operation"
msgstr "Не удается удалить папку: %s: недопустимая операция"
-#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#: camel/camel-store.c:439 camel/camel-vee-store.c:387
#, c-format
msgid "Cannot rename folder: %s: Invalid operation"
msgstr "Не удается переименовать папку: %s: недопустимая операция"
-#: camel/camel-store.c:811
+#: camel/camel-store.c:777
msgid "Trash"
msgstr "Корзина"
-#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
+#: ui/evolution-mail-message.xml.h:48
msgid "Junk"
msgstr "Спам"
@@ -10076,12 +9837,12 @@ msgstr "Нет сообщения %s в %s"
msgid "Cannot copy or move messages into a Virtual Folder"
msgstr "Не удается скопировать или переместить сообщения в виртуальную папку"
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:374
#, c-format
msgid "Cannot delete folder: %s: No such folder"
msgstr "Не удается удалить папку: %s: нет такой папки"
-#: camel/camel-vee-store.c:398
+#: camel/camel-vee-store.c:395
#, c-format
msgid "Cannot rename folder: %s: No such folder"
msgstr "Не удается переименовать папку: %s: нет такой папки"
@@ -10126,25 +9887,25 @@ msgstr "Адресная книга"
msgid "Post Office Agent SOAP Port:"
msgstr ""
-#: camel/providers/groupwise/camel-groupwise-provider.c:80
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
msgid "Novell GroupWise"
msgstr "Novell GroupWise"
-#: camel/providers/groupwise/camel-groupwise-provider.c:82
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
#, fuzzy
msgid "For accessing Novell Groupwise servers"
msgstr "Для доступа к серверам Novell Groupwise"
-#: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: 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/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:105
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
msgid "Password"
msgstr "Пароль"
-#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
#: camel/providers/imap/camel-imap-provider.c:95
#: camel/providers/imapp/camel-imapp-provider.c:67
msgid "This option will connect to the IMAP server using a plaintext password."
@@ -10152,8 +9913,8 @@ msgstr ""
"Подключение к серверу IMAP будет производиться с использованием "
"незашифрованного пароля."
-#: camel/providers/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
#, fuzzy
msgid "Checklist"
msgstr "список"
@@ -10298,13 +10059,13 @@ msgstr ""
"незашифрованного пароля."
#: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:429
+#: 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:431
+#: camel/providers/imap/camel-imap-store.c:430
#, c-format
msgid "IMAP service for %s on %s"
msgstr "Сервис IMAP для %s на %s"
@@ -10314,7 +10075,7 @@ msgstr "Сервис IMAP для %s на %s"
#: 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:140
+#: 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
@@ -10331,10 +10092,10 @@ 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:815
+#: camel/providers/imap/camel-imap-store.c:845
#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: 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 "Соединение отменено"
@@ -10347,8 +10108,8 @@ msgid ""
msgstr "Не удается подключиться к серверу IMAP %s в защищенном режиме:%s"
#: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
+#: 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"
@@ -10357,7 +10118,7 @@ msgstr "Не удается подключиться к серверу IMAP %s
#: 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:1109
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
msgid "Unknown error"
msgstr "Неизвестная ошибка"
@@ -10385,8 +10146,8 @@ 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:1857
-#: camel/providers/imap/camel-imap-store.c:2235
+#: 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\""
@@ -10465,12 +10226,12 @@ 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:3168
+#: camel/providers/imap/camel-imap-store.c:3194
msgid "Operation cancelled"
msgstr "Операция отменена"
#: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3171
+#: camel/providers/imap/camel-imap-store.c:3197
#, c-format
msgid "Server unexpectedly disconnected: %s"
msgstr "Сервер неожиданно отключился: %s"
@@ -10534,13 +10295,6 @@ msgid "Unable to retrieve message: %s"
msgstr "Не удается получить сообщение: %s"
#: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
#, c-format
msgid ""
"Cannot get message: %s\n"
@@ -10550,15 +10304,15 @@ msgstr ""
" %s"
#: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
msgid "No such message"
msgstr "Нет такого сообщения"
#: camel/providers/imap/camel-imap-folder.c:2019
-#: camel/providers/imap/camel-imap-folder.c:2621
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/imap/camel-imap-folder.c:2622
+#: camel/providers/nntp/camel-nntp-folder.c:220
msgid "This message is not currently available"
msgstr "Это сообщение в настоящий момент недоступно"
@@ -10567,7 +10321,23 @@ msgstr "Это сообщение в настоящий момент недос
msgid "Fetching summary information for new messages"
msgstr "Получение краткой информации по новым сообщениям "
-#: camel/providers/imap/camel-imap-folder.c:2659
+#: camel/providers/imap/camel-imap-folder.c:2463
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2471
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2484
+#, c-format
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2660
msgid "Could not find message body in FETCH response."
msgstr "Не удается найти тело сообщения в ответе на команду FETCH."
@@ -10629,43 +10399,43 @@ msgstr "IMAP"
msgid "For reading and storing mail on IMAP servers."
msgstr "Для чтения и хранения почты на серверах IMAP."
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:680
#: camel/providers/pop3/camel-pop3-store.c:228
msgid "SSL/TLS extension not supported."
msgstr "Расширение SSL/TLS не поддерживается"
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:711
#: camel/providers/pop3/camel-pop3-store.c:269
msgid "SSL negotiations failed"
msgstr "Сбой согласований SSL"
-#: camel/providers/imap/camel-imap-store.c:818
+#: camel/providers/imap/camel-imap-store.c:848
#, c-format
msgid "Could not connect with command \"%s\": %s"
msgstr "Не удается подключиться командой \"%s\": %s"
-#: camel/providers/imap/camel-imap-store.c:1242
+#: camel/providers/imap/camel-imap-store.c:1272
#, c-format
msgid "IMAP server %s does not support requested authentication type %s"
msgstr "Сервер IMAP %s не поддерживает затребованный тип аутентификации %s"
-#: camel/providers/imap/camel-imap-store.c:1252
+#: camel/providers/imap/camel-imap-store.c:1282
#: 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:1275
+#: camel/providers/imap/camel-imap-store.c:1305
#: 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:1289
+#: camel/providers/imap/camel-imap-store.c:1319
msgid "You didn't enter a password."
msgstr "Вы не ввели пароль."
-#: camel/providers/imap/camel-imap-store.c:1318
+#: camel/providers/imap/camel-imap-store.c:1348
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -10676,18 +10446,18 @@ msgstr ""
"%s\n"
"\n"
-#: camel/providers/imap/camel-imap-store.c:1839
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:1867
+#: camel/providers/imap/camel-imap-store.c:2057
#, c-format
msgid "No such folder %s"
msgstr "Нет такой папки %s"
-#: camel/providers/imap/camel-imap-store.c:1915
-#: camel/providers/imap/camel-imap-store.c:2296
+#: camel/providers/imap/camel-imap-store.c:1943
+#: camel/providers/imap/camel-imap-store.c:2324
msgid "The parent folder is not allowed to contain subfolders"
msgstr "Эта папка не может содержать подпапки"
-#: camel/providers/imap/camel-imap-store.c:1970
+#: camel/providers/imap/camel-imap-store.c:1998
#: camel/providers/local/camel-maildir-store.c:137
#: camel/providers/local/camel-mbox-store.c:212
#: camel/providers/local/camel-mh-store.c:236
@@ -10695,7 +10465,7 @@ msgstr "Эта папка не может содержать подпапки"
msgid "Cannot create folder `%s': folder exists."
msgstr "Не удается создать папку: %s: %s"
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:2274
#, c-format
msgid "Unknown parent folder: %s"
msgstr "Неизвестная родительская папка: %s"
@@ -10727,20 +10497,20 @@ msgid "Index message body data"
msgstr "Индексировать данные тела сообщения"
#. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
#, c-format
msgid "~%s (%s)"
msgstr "~%s (%s)"
#. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
#, c-format
msgid "mailbox:%s (%s)"
msgstr "почтовый ящик: %s: (%s)"
#. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
@@ -10801,7 +10571,7 @@ msgstr ""
#: camel/providers/local/camel-local-store.c:142
#: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:356
+#: camel/providers/local/camel-mbox-store.c:355
#: camel/providers/local/camel-spool-store.c:116
#, c-format
msgid "Store root %s is not an absolute path"
@@ -10874,8 +10644,25 @@ msgstr "Добавление сообщения к папке почтового
msgid "Cannot append message to maildir folder: %s: %s"
msgstr "Не удается добавить сообщение к папке почтового каталога: %s: %s"
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: 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-mbox-folder.c:417
+#: camel/providers/local/camel-mbox-folder.c:436
+#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:475
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-mh-folder.c:221
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+" %s"
+msgstr ""
+"Не удается получить сообщение: %s из папки %s\n"
+" %s"
+
+#: camel/providers/local/camel-maildir-folder.c:236
msgid "Invalid message contents"
msgstr "Неверное содержание сообщения"
@@ -10916,9 +10703,9 @@ msgstr "Не удается удалить папку \"%s\": %s"
msgid "not a maildir directory"
msgstr "не является почтовым каталогом"
-#: camel/providers/local/camel-maildir-store.c:341
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
#, c-format
msgid "Could not scan folder `%s': %s"
msgstr "Не удается просканировать папку \"%s\": %s"
@@ -10965,27 +10752,18 @@ msgstr "Добавление почты отменено"
msgid "Cannot append message to mbox file: %s: %s"
msgstr "Не удается добавить сообщение к файлу mbox: %s: %s"
-#: camel/providers/local/camel-mbox-folder.c:435
-#: camel/providers/local/camel-mbox-folder.c:466
-#: camel/providers/local/camel-mbox-folder.c:474
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-" %s"
-msgstr ""
-"Не удается получить сообщение: %s из папки %s\n"
-" %s"
-
-#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:468
msgid "The folder appears to be irrecoverably corrupted."
msgstr "Видимо, папка невостановимо испорчена."
-#: camel/providers/local/camel-mbox-folder.c:475
-msgid "Message construction failed: Corrupt mailbox?"
+#: camel/providers/local/camel-mbox-folder.c:476
+#: camel/providers/local/camel-mh-folder.c:222
+#, fuzzy
+msgid "Message construction failed."
msgstr "Сбой при создании сообщения: почтовый ящик поврежден?"
#: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
msgid "Cannot create a folder by this name."
msgstr "Не удается создать папку с таким именем."
@@ -11015,30 +10793,30 @@ msgstr "\"%s\" не является обычным файлом."
msgid "Folder `%s' is not empty. Not deleted."
msgstr "Папка \"%s\" не пуста. Не удалена."
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
#, c-format
msgid "Cannot create directory `%s': %s."
msgstr "Не удается создать каталог '%s': %s."
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
#, c-format
msgid "Cannot create folder: %s: %s"
msgstr "Не удается создать папку: %s: %s"
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
msgid "Folder already exists"
msgstr "Папка уже существует"
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
msgid "The new folder name is illegal."
msgstr "Имя новой папки недопустимо."
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
#, fuzzy, c-format
msgid "Could not rename `%s': `%s': %s"
msgstr "Не удается переименовать \"%s\": %s"
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
#, fuzzy, c-format
msgid "Could not rename '%s' to %s: %s"
msgstr "Не удается переименовать %s в %s: %s"
@@ -11231,7 +11009,7 @@ msgstr ""
"Папка может быть испорчена, копия сохранена в \"%s\""
#: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
#, c-format
msgid "Please enter the NNTP password for %s@%s"
msgstr "Введите пароль NNTP для %s@%s"
@@ -11248,18 +11026,10 @@ msgstr "Сбой передачи имени пользователя на се
msgid "Server rejected username/password"
msgstr "Сервер отверг имя пользователя/пароль"
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "Отменено пользователем"
-
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
#: camel/providers/pop3/camel-pop3-folder.c:433
#: camel/providers/pop3/camel-pop3-folder.c:494
#: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11268,64 +11038,51 @@ msgstr "Отменено пользователем"
msgid "Cannot get message %s: %s"
msgstr "Не удается получить сообщение %s: %s"
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr "Отменено пользователем"
+
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
#, c-format
msgid "Internal error: uid in invalid format: %s"
msgstr "Внутренняя ошибка: uid в неверном формате: %s"
-#: camel/providers/nntp/camel-nntp-folder.c:201
-#, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr "Не удается получить статью %s с сервера NNTP"
-
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
-msgstr ""
-
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
#: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
-#, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:441
+#: camel/providers/nntp/camel-nntp-folder.c:375
#, fuzzy, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr ""
-"Ошибка при автосохранении сообщения: %s\n"
-" %s"
+msgid "Posting failed: %s"
+msgstr "Сбой операции: %s"
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
msgid "You cannot post NNTP messages while working offline!"
msgstr ""
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
msgid "You cannot copy messages from a NNTP folder!"
msgstr "Вы не можете копировать сообщения из папки NNTP!"
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
msgid "Could not get group list from server."
msgstr "Не удается получить список групп с сервера."
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
#, fuzzy, c-format
msgid "Unable to load grouplist file for %s: %s"
msgstr ""
"Не удается создать файл вывода: %s\n"
" %s"
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
#, fuzzy, c-format
msgid "Unable to save grouplist file for %s: %s"
msgstr ""
@@ -11358,26 +11115,29 @@ msgstr ""
"Подключение к серверу NNTP будет производиться с использованием "
"незашифрованного пароля."
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr "Сбой команды NNTP: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:227
#, c-format
msgid "Could not read greeting from %s: %s"
msgstr "Не удается считать приветствие из %s: %s"
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
#, c-format
msgid "NNTP server %s returned error code %d: %s"
msgstr "Сервер NNTP %s вернул код ошибки %d: %s"
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
#, c-format
msgid "USENET News via %s"
msgstr "Новости USENET через %s"
-#: camel/providers/nntp/camel-nntp-store.c:640
-msgid "Stream error"
-msgstr "Ошибка потока"
-
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
#, c-format
msgid ""
"Error retrieving newsgroups:\n"
@@ -11388,75 +11148,75 @@ msgstr ""
"\n"
" %s"
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: camel/providers/nntp/camel-nntp-store.c:872
msgid ""
"You cannot subscribe to this newsgroup:\n"
"\n"
"No such newsgroup. The selected item is a probably a parent folder."
msgstr ""
-#: camel/providers/nntp/camel-nntp-store.c:767
+#: camel/providers/nntp/camel-nntp-store.c:904
msgid ""
"You cannot unsubscribe to this newsgroup:\n"
"\n"
"newsgroup does not exist!"
msgstr ""
-#: camel/providers/nntp/camel-nntp-store.c:792
+#: camel/providers/nntp/camel-nntp-store.c:929
msgid "You cannot create a folder in a News store: subscribe instead."
msgstr ""
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
#, fuzzy
msgid "You cannot rename a folder in a News store."
msgstr "Не удается переименовать папку %s в %s: %s"
-#: camel/providers/nntp/camel-nntp-store.c:808
+#: camel/providers/nntp/camel-nntp-store.c:945
#, fuzzy
msgid "You cannot remove a folder in a News store: unsubscribe instead."
msgstr "Не удается переместить папку в собственную подпапку."
-#: camel/providers/nntp/camel-nntp-summary.c:253
-#, c-format
-msgid "Connection error: %s"
-msgstr "Ошибка соединения: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:262
-#, c-format
-msgid "No such folder: %s"
-msgstr "Нет такой папки: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1118
+#, fuzzy
+msgid "Authentication requested but not username provided"
+msgstr "Требуется аутентификация"
-#: camel/providers/nntp/camel-nntp-summary.c:268
-#, c-format
-msgid "Could not get group: %s"
-msgstr "Не удается получить группу: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1146
+#, fuzzy, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "Сбой идентификации на сервере POP %s: %s"
-#: camel/providers/nntp/camel-nntp-summary.c:333
+#: camel/providers/nntp/camel-nntp-store.c:1262
#, fuzzy
-msgid "Could not get messages: unspecified error"
-msgstr "Не удается получить сообщения: неуказанная ошибка"
+msgid "Not connected."
+msgstr "Нет контактов"
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-store.c:1311
#, c-format
-msgid "NNTP Command failed: %s"
-msgstr "Сбой команды NNTP: %s"
+msgid "No such folder: %s"
+msgstr "Нет такой папки: %s"
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
#, c-format
msgid "%s: Scanning new messages"
msgstr "%s: Поиск новых сообщений"
-#: camel/providers/nntp/camel-nntp-summary.c:558
-#, c-format
-msgid "Unknown server response: %s"
-msgstr "Неизвестный ответ сервера: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:225
+#, fuzzy, c-format
+msgid "Unexpected server response from xover: %s"
+msgstr "Неожиданный ответ от сервера IMAP: %s"
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:328
+#, fuzzy, c-format
+msgid "Unexpected server response from head: %s"
+msgstr "Неожиданный ответ от GnuPG: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:368
msgid "Use cancel"
msgstr "Использование отменено"
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
#, c-format
msgid "Operation failed: %s"
msgstr "Сбой операции: %s"
@@ -11504,7 +11264,7 @@ msgstr "Удалять через %s дней"
msgid "Disable support for all POP3 extensions"
msgstr "Запретить поддержку всех расширений POP3"
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
msgid "POP"
msgstr "POP"
@@ -11594,7 +11354,7 @@ msgid "No such folder `%s'."
msgstr "Нет такой папки \"%s\""
#: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:132
msgid "Sendmail"
msgstr "Sendmail"
@@ -11646,7 +11406,7 @@ msgstr "sendmail"
msgid "Mail delivery via the sendmail program"
msgstr "Доставка почты через программу sendmail"
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
msgid "SMTP"
msgstr "SMTP"
@@ -11945,19 +11705,19 @@ msgstr "%.0fM"
msgid "%.0fG"
msgstr "%.0fG"
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
msgid "attachment"
msgstr "вложение"
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:454
msgid "Remove selected items from the attachment list"
msgstr "Удалить выбранные элементы из списка вложений"
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:494
msgid "Add attachment..."
msgstr "Добавить вложение..."
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:495
msgid "Attach a file to the message"
msgstr "Вложить файл в сообщение"
@@ -12020,7 +11780,7 @@ msgstr "Множество сообщений"
msgid "Open file"
msgstr "Открыть файл"
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
msgid "Autogenerated"
msgstr "Создана автоматически"
@@ -12169,17 +11929,17 @@ msgstr "Вложить файл(ы)"
#. mail-composer:no-attach primary
#: composer/mail-composer-errors.xml.h:2
#, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
+msgid "You cannot attach the file `{0}' to this message."
msgstr "Вложить файл в сообщение"
#. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
+#: 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."
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
msgstr ""
#. mail-composer:attach-directory primary
@@ -12274,7 +12034,7 @@ msgstr "Не удается создать канал: %s"
#. mail-composer:no-build-message secondary
#: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+msgid "Because \"{0}\", you may need to select different mail options."
msgstr ""
#. mail-composer:no-sig-file primary
@@ -12284,8 +12044,10 @@ msgid "Could not read signature file \"{0}\"."
msgstr "Не удается сохранить файл подписи: %s"
#. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
+#: 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
@@ -12717,11 +12479,11 @@ msgid "<b>Then</b>"
msgstr "<b>К:</b> "
#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1335
+#: mail/mail-account-gui.c:1347
msgid "Select Folder"
msgstr "Выбрать папку"
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
msgid " "
msgstr " "
@@ -12779,7 +12541,7 @@ msgstr "назад"
msgid "months"
msgstr "месяцы"
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
msgid "seconds"
msgstr "секунд"
@@ -12811,20 +12573,20 @@ msgstr "со всеми локальными папками"
msgid "years"
msgstr "годы"
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:916
-#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
msgid "Important"
msgstr "Важное"
#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
-#: mail/mail-config.glade.h:145
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
msgid "To Do"
msgstr "Выполнить"
#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
-#: mail/mail-config.glade.h:94
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
msgid "Later"
msgstr "Позже"
@@ -12882,254 +12644,6 @@ msgstr "входящие"
msgid "outgoing"
msgstr "исходящие"
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Adjust Score"
-msgstr "Скорректировать вес"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr "Назначить цвет"
-
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr "Назначить вес"
-
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr "Вложения"
-
-#: filter/libfilter-i18n.h:6
-msgid "Beep"
-msgstr "Звуковой сигнал"
-
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "содержит"
-
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
-msgstr "Копировать в папку"
-
-#: filter/libfilter-i18n.h:9
-msgid "Date received"
-msgstr "Дата получения"
-
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
-msgstr "Дата отправки"
-
-#: filter/libfilter-i18n.h:12
-msgid "Deleted"
-msgstr "Удалённое"
-
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "не содержит"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "не заканчивается на"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "не существует."
-
-#: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr "не возвращает"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "звучит не как"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "не начинается с"
-
-#: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "Не существует"
-
-#: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "Черновик"
-
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "заканчивается на"
-
-#: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr "Существует"
-
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "cуществуют"
-
-#: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr "Выражение"
-
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr "К исполнению"
-
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "является"
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "после"
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "до"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "отмечено"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "больше чем"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "меньше чем"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "не является"
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "не отмечено"
-
-#: filter/libfilter-i18n.h:36
-msgid "Junk Test"
-msgstr "Проверка на спам"
-
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
-#: widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Надпись"
-
-#: filter/libfilter-i18n.h:38
-msgid "Mailing list"
-msgstr "Список рассылки"
-
-#: filter/libfilter-i18n.h:39
-msgid "Message Body"
-msgstr "Тело сообщения"
-
-#: filter/libfilter-i18n.h:40
-msgid "Message Header"
-msgstr "Заголовок сообщения"
-
-#: filter/libfilter-i18n.h:41
-msgid "Message is Junk"
-msgstr "Это сообщение - спам"
-
-#: filter/libfilter-i18n.h:42
-msgid "Message is not Junk"
-msgstr "Это сообщение - не спам"
-
-#: filter/libfilter-i18n.h:43
-msgid "Move to Folder"
-msgstr "Переместить в папку"
-
-#: filter/libfilter-i18n.h:44
-#, fuzzy
-msgid "Pipe to Program"
-msgstr "Выйти из программы"
-
-#: filter/libfilter-i18n.h:45
-msgid "Play Sound"
-msgstr "Воспроизвести звук"
-
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Прочитанное"
-
-#: filter/libfilter-i18n.h:47
-msgid "Recipients"
-msgstr "Получатели"
-
-#: filter/libfilter-i18n.h:48
-msgid "Regex Match"
-msgstr "Совпадение рег.выражения"
-
-#: filter/libfilter-i18n.h:49
-msgid "Replied to"
-msgstr "В ответ на"
-
-#: filter/libfilter-i18n.h:50
-msgid "returns"
-msgstr "возвращает"
-
-#: filter/libfilter-i18n.h:51
-msgid "returns greater than"
-msgstr "возвращает больше чем"
-
-#: filter/libfilter-i18n.h:52
-msgid "returns less than"
-msgstr "возвращает меньше чем"
-
-#: filter/libfilter-i18n.h:53
-#, fuzzy
-msgid "Run Program"
-msgstr "Запустить программу:"
-
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Вес"
-
-#: filter/libfilter-i18n.h:55
-msgid "Sender"
-msgstr "Отправитель"
-
-#: filter/libfilter-i18n.h:56
-msgid "Set Status"
-msgstr "Установить состояние"
-
-#: filter/libfilter-i18n.h:57
-msgid "Size (kB)"
-msgstr "Размер (кб)"
-
-#: filter/libfilter-i18n.h:58
-msgid "sounds like"
-msgstr "звучит как"
-
-#: filter/libfilter-i18n.h:59
-msgid "Source Account"
-msgstr "Исходная учетная запись"
-
-#: filter/libfilter-i18n.h:60
-msgid "Specific header"
-msgstr "Специфичный заголовок"
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "начинается с"
-
-#: filter/libfilter-i18n.h:63
-msgid "Stop Processing"
-msgstr "Остановить обработку"
-
-#: filter/libfilter-i18n.h:64 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:1079
-msgid "Subject"
-msgstr "Тема"
-
-#: filter/libfilter-i18n.h:65
-msgid "Unset Status"
-msgstr "Снять состояние"
-
#: filter/rule-editor.c:285
msgid "Add Rule"
msgstr "Добавить правило"
@@ -13147,6 +12661,11 @@ msgstr "Имя правила"
msgid "_Score Rules"
msgstr "Правила назначения весов"
+#: filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Вес"
+
#: filter/searchtypes.xml.h:1
msgid "Body contains"
msgstr "Тело содержит"
@@ -13227,13 +12746,13 @@ msgstr "Подпись(и)"
msgid "-------- Forwarded Message --------"
msgstr "-------- Пересланное сообщение --------"
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
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:1509
+#: mail/em-composer-utils.c:1505
msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
msgstr "В сообщении от %d.%m.%Y %H:%M %%s пишет:"
@@ -13272,8 +12791,8 @@ msgstr "<щёлкните здесь, чтобы выбрать папку>"
msgid "Create New Folder"
msgstr "Создание новой папки"
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:701
+#: 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
msgid "Specify where to create the folder:"
msgstr "Укажите, где создать папку:"
@@ -13288,105 +12807,106 @@ msgstr "Создать новую папку"
msgid "Folder _name:"
msgstr "_Имя папки:"
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree.c:833
#, fuzzy, c-format
msgid "Moving folder %s"
msgstr "Удаление папки \"%s\""
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:835
#, fuzzy, c-format
msgid "Copying folder %s"
msgstr "Открытие папки \"%s\""
-#: mail/em-folder-tree.c:848 mail/message-list.c:1555
+#: mail/em-folder-tree.c:842 mail/message-list.c:1561
#, fuzzy, c-format
msgid "Moving messages into folder %s"
msgstr "Перемещение сообщений в %s"
-#: mail/em-folder-tree.c:850 mail/message-list.c:1557
+#: mail/em-folder-tree.c:844 mail/message-list.c:1563
#, fuzzy, c-format
msgid "Copying messages into folder %s"
msgstr "Копирование сообщений в %s"
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:860
#, fuzzy
msgid "Cannot drop message(s) into toplevel store"
msgstr "Не удается скопировать или переместить сообщения в виртуальную папку"
-#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
msgid "_Copy to Folder"
msgstr "_Копировать в папку"
-#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
msgid "_Move to Folder"
msgstr "Переместить в папку"
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2551 mail/em-folder-view.c:798
-#: mail/message-list.c:1645
+#: 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
msgid "_Move"
msgstr "Пере_местить"
-#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#: mail/em-folder-tree.c:955 mail/message-list.c:1653
#, fuzzy
msgid "Cancel _Drag"
msgstr "Отменить задачу"
-#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: 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/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
msgid "Select folder"
msgstr "Выбрать папку"
-#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
#, fuzzy
msgid "C_opy"
msgstr "Копировать"
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2088
#, fuzzy, c-format
msgid "Creating folder `%s'"
msgstr "Сохранение папки \"%s\""
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
#, fuzzy
msgid "Create folder"
msgstr "Создать новую папку"
-#: mail/em-folder-tree.c:2474
+#: mail/em-folder-tree.c:2463
#, c-format
msgid "Rename the \"%s\" folder to:"
msgstr "Переименовать папку \"%s\" в:"
-#: mail/em-folder-tree.c:2476
+#: mail/em-folder-tree.c:2465
msgid "Rename Folder"
msgstr "Переименование папки"
-#: mail/em-folder-tree.c:2545 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2536 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:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
msgid "_View"
msgstr "_Вид"
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2537
msgid "Open in _New Window"
msgstr "Открыть в _новом окне"
#. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2555
+#: mail/em-folder-tree.c:2546
msgid "_New Folder..."
msgstr "_Создать папку..."
-#: mail/em-folder-tree.c:2558
+#: mail/em-folder-tree.c:2549
msgid "_Rename"
msgstr "Пе_реименовать"
-#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
+#: 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:889
+#: mail/mail-vfolder.c:888
msgid "VFolders"
msgstr "VFolders"
@@ -13400,19 +12920,19 @@ msgstr ""
msgid "Inbox"
msgstr "Входящие"
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+#: 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:551
+#: mail/mail-component.c:554
msgid "Mail"
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:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:690
#: ui/evolution-mail-message.xml.h:113
msgid "_Edit as New Message..."
msgstr "_Править как новое сообщение..."
@@ -13425,17 +12945,17 @@ msgstr "_Печать"
msgid "_Reply to Sender"
msgstr "О_тветить отправителю"
-#: mail/em-folder-view.c:901 mail/em-popup.c:810
+#: mail/em-folder-view.c:901 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:811
+#: mail/em-folder-view.c:902 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:813
+#: mail/em-folder-view.c:903 mail/em-popup.c:814
#: ui/evolution-mail-message.xml.h:114
msgid "_Forward"
msgstr "Пе_реслать"
@@ -13488,6 +13008,10 @@ msgstr "Переместить в папку..."
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
msgid "Add Sender to Address_book"
msgstr "Добавить отправителя в _адресную книгу"
@@ -13538,12 +13062,12 @@ msgid "Filter on _Mailing List"
msgstr "Фильтр по списку рассылки"
#. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
-#: mail/mail-config.glade.h:66
+#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/mail-config.glade.h:68
msgid "Default"
msgstr "По умолчанию"
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1796
msgid "Print Message"
msgstr "Напечатать сообщение"
@@ -13582,12 +13106,18 @@ msgstr "Копия"
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:1584 mail/em-mailer-prefs.c:89
+#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
msgid "Newsgroups"
msgstr ""
@@ -13779,7 +13309,7 @@ msgid ""
"practical amount of time."
msgstr ""
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
msgid "_View Certificate"
msgstr "_Просмотреть сертификат"
@@ -13837,7 +13367,7 @@ msgstr "Каждую неделю"
msgid "Once per month"
msgstr "каждый месяц"
-#: mail/em-migrate.c:1072
+#: mail/em-migrate.c:1168
msgid ""
"The location and hierarchy of the Evolution mailbox folders has changed "
"since Evolution 1.x.\n"
@@ -13845,89 +13375,89 @@ msgid ""
"Please be patient while Evolution migrates your folders..."
msgstr ""
-#: mail/em-migrate.c:1506
+#: mail/em-migrate.c:1602
#, fuzzy, c-format
msgid "Unable to create new folder `%s': %s"
msgstr "Не удается создать папку: %s: %s"
-#: mail/em-migrate.c:1532
+#: mail/em-migrate.c:1628
#, fuzzy, c-format
msgid "Unable to copy folder `%s' to `%s': %s"
msgstr ""
"Не удается скопировать дескриптор файла: %s\n"
"%s"
-#: mail/em-migrate.c:1715
+#: mail/em-migrate.c:1811
#, fuzzy, c-format
msgid "Unable to scan for existing mailboxes at `%s': %s"
msgstr ""
"Не удается создать файл вывода: %s\n"
" %s"
-#: mail/em-migrate.c:1919
+#: mail/em-migrate.c:2015
#, fuzzy, c-format
msgid "Unable to open old POP keep-on-server data `%s': %s"
msgstr "Сбой идентификации на сервере POP %s: %s"
-#: mail/em-migrate.c:1933
+#: mail/em-migrate.c:2029
#, fuzzy, c-format
msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
msgstr "Сбой при создании канала к \"%s\": %s"
-#: mail/em-migrate.c:1962
+#: mail/em-migrate.c:2058
#, c-format
msgid "Unable to copy POP3 keep-on-server data `%s': %s"
msgstr ""
-#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
#, fuzzy, c-format
msgid "Failed to create local mail storage `%s': %s"
msgstr "Сбой при создании канала к \"%s\": %s"
-#: mail/em-migrate.c:2480
+#: mail/em-migrate.c:2576
#, fuzzy, c-format
msgid "Unable to create local mail folders at `%s': %s"
msgstr ""
"Не удается создать файл вывода: %s\n"
" %s"
-#: mail/em-migrate.c:2498
+#: mail/em-migrate.c:2594
msgid ""
"Unable to read settings from previous Evolution install, `evolution/config."
"xmldb' does not exist or is corrupt."
msgstr ""
-#: mail/em-popup.c:699
+#: mail/em-popup.c:700
msgid "Save As..."
msgstr "Сохранить как..."
-#: mail/em-popup.c:717
+#: mail/em-popup.c:718
#, fuzzy, c-format
msgid "untitled_image.%s"
msgstr "Неозаглавленное сообщение"
-#: mail/em-popup.c:807
+#: mail/em-popup.c:808
msgid "Set as _Background"
msgstr "Установить как _фон"
-#: mail/em-popup.c:809
+#: mail/em-popup.c:810
msgid "_Reply to sender"
msgstr "Ответить отп_равителю"
-#: mail/em-popup.c:858
+#: mail/em-popup.c:859
msgid "_Open Link in Browser"
msgstr "_Открыть ссылку в браузере"
-#: mail/em-popup.c:859
+#: mail/em-popup.c:860
#, fuzzy
msgid "Se_nd message to..."
msgstr "Отправить сообщение в список..."
-#: mail/em-popup.c:860
+#: mail/em-popup.c:861
msgid "_Add to Addressbook"
msgstr "_Добавить в адресную книгу"
-#: mail/em-popup.c:966
+#: mail/em-popup.c:967
#, c-format
msgid "Open in %s..."
msgstr "Открыть в %s..."
@@ -14501,7 +14031,7 @@ msgstr "Evolution Mail preferences control"
msgid "Mail Accounts"
msgstr "Учётные записи"
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
msgid "Mail Preferences"
msgstr "Настройка почты"
@@ -14515,15 +14045,15 @@ msgid "Evolution is importing your old Elm mail"
msgstr "Импорт вашей почты из Elm"
#: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
#: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
msgid "Importing..."
msgstr "Импорт..."
#: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
msgid "Please wait"
msgstr "Подождите пожалуйста"
@@ -14546,23 +14076,25 @@ msgid "Elm"
msgstr "Elm"
#: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
#, fuzzy
msgid "Destination folder:"
msgstr "Папка _черновиков:"
#: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
#, fuzzy
msgid "Select folder to import into"
msgstr "Выберите сертификат для импорта..."
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
#: mail/importers/mail-importer.c:226
#, fuzzy, c-format
msgid "Importing `%s'"
msgstr "Импорт"
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
#: mail/importers/mail-importer.c:140
#, fuzzy
msgid "Importing mailbox"
@@ -14725,15 +14257,15 @@ msgstr ""
msgid "%s License Agreement"
msgstr ""
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
msgid "_Host:"
msgstr "Сервер:"
-#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
msgid "User_name:"
msgstr "_Имя пользователя:"
-#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
msgid "_Path:"
msgstr "Путь:"
@@ -14796,34 +14328,34 @@ msgstr "%d контактов"
msgid ", %d unread"
msgstr ""
-#: mail/mail-component.c:653
+#: mail/mail-component.c:656
msgid "New Mail Message"
msgstr "Новое почтовое сообщение"
-#: mail/mail-component.c:654
+#: mail/mail-component.c:657
msgid "_Mail Message"
msgstr "Почтовое сообщение..."
-#: mail/mail-component.c:655
+#: mail/mail-component.c:658
msgid "Compose a new mail message"
msgstr "Создать новое сообщение"
-#: mail/mail-component.c:661
+#: mail/mail-component.c:664
#, fuzzy
msgid "New Mail Folder"
msgstr "Новая виртуальная папка"
-#: mail/mail-component.c:662
+#: mail/mail-component.c:665
#, fuzzy
msgid "Mail _Folder"
msgstr "Почтовые фильтры"
-#: mail/mail-component.c:663
+#: mail/mail-component.c:666
#, fuzzy
msgid "Create a new mail folder"
msgstr "Создать новый календарь"
-#: mail/mail-component.c:795
+#: mail/mail-component.c:798
msgid "Failed upgrading Mail settings or folders."
msgstr ""
@@ -14835,7 +14367,7 @@ msgstr "Проверка сервиса"
msgid "Connecting to server..."
msgstr "Подключение к серверу..."
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
msgid "Identity"
msgstr "Подлинность"
@@ -14850,7 +14382,7 @@ msgstr ""
"отправляемую вами почту."
#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
msgid "Receiving Mail"
msgstr "Получение почты"
@@ -14867,7 +14399,7 @@ msgstr ""
msgid "Please select among the following options"
msgstr "Выберите один из следующих вариантов"
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
msgid "Sending Mail"
msgstr "Отправка почты"
@@ -14879,7 +14411,7 @@ msgstr ""
"Введите информацию о способе отправки электронной почты. Если вы не уверены, "
"свяжитесь со своим системным администратором или поставщиком услуг Интернета."
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
msgid "Account Management"
msgstr "Управление учетными записями"
@@ -14897,249 +14429,254 @@ msgstr ""
"учетной записи в строке ниже. Это имя будет использовано только для "
"отображения."
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:2
#, fuzzy
msgid " Ch_eck for Supported Types "
msgstr " Проверка поддерживаемых типов "
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
#, fuzzy
msgid "<b>Preview</b>"
msgstr "Предварительный просмотр"
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
#, fuzzy
msgid "<b>SSL is not supported in this build of evolution</b>"
msgstr "(В этой сборке Evolution SSL не поддерживается)"
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
#, fuzzy
msgid "<b>S_ignatures</b>"
msgstr "<b>Состояние:</b> "
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
#, fuzzy
msgid "<b>_Languages</b>"
msgstr "<b>Состояние:</b> "
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
+msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
msgid "<span weight=\"bold\">Account Information</span>"
msgstr ""
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:10
msgid "<span weight=\"bold\">Alerts</span>"
msgstr ""
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
msgid "<span weight=\"bold\">Authentication Type</span>"
msgstr ""
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
msgid "<span weight=\"bold\">Authentication</span>"
msgstr ""
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
#, fuzzy
msgid "<span weight=\"bold\">Checking for New Mail</span>"
msgstr "Проверка новой почты"
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
msgid "<span weight=\"bold\">Composing Messages</span>"
msgstr ""
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
msgid "<span weight=\"bold\">Configuration</span>"
msgstr ""
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:16
msgid "<span weight=\"bold\">Default Behavior</span>"
msgstr ""
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
msgid "<span weight=\"bold\">Delete Mail</span>"
msgstr ""
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
#, fuzzy
msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
msgstr "<b>_Отображаемые заголовки письма</b>"
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
msgid "<span weight=\"bold\">Filter Options</span>"
msgstr ""
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
msgid "<span weight=\"bold\">General</span>"
msgstr ""
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:21
msgid "<span weight=\"bold\">Labels and Colors</span>"
msgstr ""
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
msgid "<span weight=\"bold\">Loading Images</span>"
msgstr ""
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
msgid "<span weight=\"bold\">Message Display</span>"
msgstr ""
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
msgid "<span weight=\"bold\">Message Fonts</span>"
msgstr ""
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
#, fuzzy
msgid "<span weight=\"bold\">New Mail Notification</span>"
msgstr "Уведомление о новой почте"
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
msgid "<span weight=\"bold\">Optional Information</span>"
msgstr ""
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
msgid "<span weight=\"bold\">Options</span>"
msgstr ""
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
#, fuzzy
msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
msgstr "Pretty Good Privacy (PGP/GPG)"
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
msgid "<span weight=\"bold\">Printed Fonts</span>"
msgstr ""
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
msgid "<span weight=\"bold\">Required Information</span>"
msgstr ""
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
msgstr ""
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
msgid "<span weight=\"bold\">Security</span>"
msgstr ""
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
#, fuzzy
msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
msgstr "Отправленные сообщения и черновики"
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:34
msgid "<span weight=\"bold\">Server Configuration</span>"
msgstr ""
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:35
#, fuzzy
msgid "A_lso encrypt to self when sending encrypted mail"
msgstr "Всегда шифровать моим ключом, когда посылается шифрованная почта"
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
msgid "Account Editor"
msgstr "Редактор учетных записей"
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
#, fuzzy
msgid "Add Ne_w Signature..."
msgstr "Добавить новую подпись..."
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
#, fuzzy
msgid "Add _Script"
msgstr "Добавить _скрипт"
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
msgid "Al_ways encrypt to myself when sending encrypted mail"
msgstr "Всегда шифровать моим ключом при отправке зашифрованной почты"
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
#, fuzzy
msgid "Alway_s carbon-copy (cc) to:"
msgstr "Всегда отправлять копию (Cc) на:"
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
#, fuzzy
msgid "Always _blind carbon-copy (bcc) to:"
msgstr "Всегда отправлять невидимую копию (Bcc) на:"
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
#, fuzzy
msgid "Always _sign outgoing messages when using this account"
msgstr "Всегда подписывать сообщения, когда используется эта учетная запись"
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
msgid "Always _trust keys in my keyring when encrypting"
msgstr "Всегда доверять ключам в моем наборе ключей при кодировании"
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
msgid "Attach original message"
msgstr "Вложить оригинальное сообщение"
-#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
msgid "Attachment"
msgstr "Вложение"
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
#, fuzzy
msgid "Automatically _insert smiley images"
msgstr "_Автоматически вставлять изображение эмоций"
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
#, fuzzy
msgid "Automatically check for _new mail every"
msgstr "_Автоматически проверять новую почту каждые"
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
msgid "Baltic (ISO-8859-13)"
msgstr "Baltic (ISO-8859-13)"
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
msgid "Baltic (ISO-8859-4)"
msgstr "Baltic (ISO-8859-4)"
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
#, fuzzy
msgid "Beep w_hen new mail arrives"
msgstr "_Звуковой сигнал при приходе новой почты"
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
msgid "C_haracter set:"
msgstr "_Набор символов:"
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
#, fuzzy
msgid "Ch_eck for Supported Types "
msgstr " Проверка поддерживаемых типов "
-#: mail/mail-config.glade.h:53
-msgid "Check _Incoming Mail"
-msgstr "Проверять _входящую почту"
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Check _incoming mail for junk"
+msgstr "Проверять, являются ли входящие сообщения спамом"
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
msgid "Check spelling while I _type"
msgstr "Проверять орфографию в процессе ввода _текста"
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
msgid "Checks incoming mail messages to be Junk"
msgstr "Проверяет, являются ли входящие сообщения спамом"
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
msgid "Color for _misspelled words:"
msgstr "Цвет для _ошибочных слов:"
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
#, fuzzy
msgid "Colors"
msgstr "_Цвета"
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
#, fuzzy
msgid "Confirm _when expunging a folder"
msgstr "_Запрашивать подтверждение очистки папки от удаленных сообщений"
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
msgid ""
"Congratulations, your mail configuration is complete.\n"
"\n"
@@ -15155,116 +14692,121 @@ msgstr ""
"\n"
"Нажмите \"Применить\", чтобы сохранить ваши настройки."
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
msgid "De_fault"
msgstr "Сделать основной"
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
#, fuzzy
msgid "Default character e_ncoding:"
msgstr "_Кодировка символов по умолчанию:"
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
#, fuzzy
msgid "Defaults"
msgstr "По _умолчанию"
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
msgid "Do not quote original message"
msgstr "Не цитировать исходное сообщение"
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
msgid "Don't sign _meeting requests (for Outlook compatibility)"
msgstr "Не подписывать приглашения (для совместимости с Outlook)"
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
msgid "Done"
msgstr "Готово"
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
#, fuzzy
msgid "Drafts _Folder:"
msgstr "Папка _черновиков:"
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
msgid "Email Accounts"
msgstr "Учетные записи электронной почты"
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
#, fuzzy
msgid "Email _Address:"
msgstr "_Электронная почта:"
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
#, fuzzy
msgid "Empty trash folders on e_xit"
msgstr "_Очищать корзину при выходе"
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
#, fuzzy
msgid "Encry_ption certificate:"
msgstr "ID _сертификата:"
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
msgid "Evolution Account Assistant"
msgstr "Помощник по учетным записям Evolution"
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
msgid "Execute Command..."
msgstr "Выполнить команду..."
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
#, fuzzy
msgid "Fi_xed-width:"
msgstr "Фиксированная ширина:"
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
msgid "Font Properties"
msgstr "Свойства шрифтов"
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
msgid "Format messages in _HTML"
msgstr "Форматировать сообщения в _HTML"
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
#, fuzzy
msgid "HTML Mail"
msgstr "Почта _HTML"
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:88
#, fuzzy
msgid "Headers"
msgstr "_Заголовки"
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
msgid "Highlight _quotations with"
msgstr "Выделять _цитирование:"
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
msgid "IMAPv4 "
msgstr "IMAPv4 "
#: mail/mail-config.glade.h:91
+#, fuzzy
+msgid "I_nclude remote tests"
+msgstr "Включить:"
+
+#: mail/mail-config.glade.h:94
msgid "Inline"
msgstr "Встроенное"
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
msgid "Kerberos "
msgstr "Kerberos "
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
msgid "Mail Configuration"
msgstr "Настройка почты"
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
msgid "Mailbox location"
msgstr "Расположение почтового ящика"
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
msgid "Message Composer"
msgstr "Составление сообщения"
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
msgid ""
"Note: you will not be prompted for a password until you connect for the "
"first time"
@@ -15272,147 +14814,147 @@ msgstr ""
"Примечание: вам не будет предложено ввести пароль до первого подключения к "
"серверу"
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
msgid "Or_ganization:"
msgstr "О_рганизация:"
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
msgid "PGP/GPG _Key ID:"
msgstr "Идентификатор ключа PGP/GPG:"
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
#, fuzzy
msgid "Play sound file when new mail arri_ves"
msgstr "_Воспроизводить звуковой файл при приходе новой почты"
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
msgid "Pr_ompt when sending messages with only Bcc recipients defined"
msgstr ""
"Пр_едупреждать при отправке сообщений, в которых определены только "
"получатели скрытой копии."
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
msgid "Qmail maildir "
msgstr "Почтовый каталог Qmail "
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
msgid "Quote original message"
msgstr "Цитировать исходное сообщение"
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
msgid "Quoted"
msgstr "Процитировано"
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
#, fuzzy
msgid "Re_member password"
msgstr "Запомнить пароль"
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
msgid "Re_ply-To:"
msgstr "_Обратный адрес:"
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
msgid "Receiving Email"
msgstr "Получение почты"
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:120
#, fuzzy
msgid "Receiving Options"
msgstr "П_араметры получения"
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
#, fuzzy
msgid "Remember _password"
msgstr "Запомнить пароль"
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
#, fuzzy
msgid "S_tandard Font:"
msgstr "_Стандартный шрифт:"
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
#, fuzzy
msgid "Security"
msgstr "_Безопасность"
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:125
msgid "Select HTML fixed width font"
msgstr "Выберите шрифт HTML фиксированной ширины"
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:126
msgid "Select HTML fixed width font for printing"
msgstr "Выберите шрифт HTML фиксированной ширины для печати"
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:127
msgid "Select HTML variable width font"
msgstr "Выберите шрифт HTML переменной ширины"
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:128
msgid "Select HTML variable width font for printing"
msgstr "Выберите шрифт HTML переменной ширины для печати"
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:129
#, fuzzy
msgid "Select..."
msgstr "_Выбрать..."
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:130
msgid "Sending Email"
msgstr "Отправка эл.почты"
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:133
#, fuzzy
msgid "Sent _Messages Folder:"
msgstr "Папка отправленных сообщений:"
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:134
msgid "Ser_ver requires authentication"
msgstr "Т_ребуется проверка подлинности"
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:135
msgid "Server _Type: "
msgstr "Тип сервера:"
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:136
#, fuzzy
msgid "Si_gning certificate:"
msgstr "ID _сертификата:"
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:137
#, fuzzy
msgid "Signat_ure:"
msgstr "Подпись:"
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:138
#, fuzzy
msgid "Signatures"
msgstr "_Подписи"
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:139
msgid "Specify _filename:"
msgstr "Имя _файла:"
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:140
#, fuzzy
msgid "Spell Checking"
msgstr "Проверка _орфографии"
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:141
msgid "Standard Unix mbox"
msgstr "Стандартный файл Unix mbox"
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:142
#, fuzzy
msgid "T_erminal Font:"
msgstr "Шрифт _терминала:"
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:143
#, fuzzy
msgid "T_ype: "
msgstr "Тип:"
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
msgid ""
"The output of this script will be used as your\n"
"signature. The name you specify will be used\n"
@@ -15422,7 +14964,7 @@ msgstr ""
"в качестве вашей подписи. Имя, указанное вами,\n"
"будет использоваться только для отображения. "
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
msgid ""
"This page allows you to configure spell checking behavior and language. The "
"list of languages here reflects only the languages for which you have a "
@@ -15432,7 +14974,7 @@ msgstr ""
"орфографии. В списке языков отображены те, для которых у вас установлены "
"словари."
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:149
msgid ""
"Type the name by which you would like to refer to this account.\n"
"For example: \"Work\" or \"Personal\""
@@ -15440,15 +14982,11 @@ msgstr ""
"Укажите имя, используемое для дальнейших обращений к этой \n"
"учетной записи. Например, \"Служебная\" или \"Личная\""
-#: mail/mail-config.glade.h:148
-msgid "Use _Daemon"
-msgstr "Использовать _демон"
-
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
msgid "V_ariable-width:"
msgstr "_Переменной ширины:"
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:153
msgid ""
"Welcome to the Evolution Mail Configuration Assistant.\n"
"\n"
@@ -15458,92 +14996,88 @@ msgstr ""
"\n"
"Нажмите \"Далее\" для начала настройки. "
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:158
msgid "_Add Signature"
msgstr "Добавить подпись"
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:159
#, fuzzy
msgid "_Always load images from the Internet"
msgstr "Всегда загружать изображения"
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:160
#, fuzzy
msgid "_Digitally sign outgoing messages (by default)"
msgstr "Всегда подписывать сообщения, когда используется эта учетная запись"
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:161
msgid "_Do not notify me when new mail arrives"
msgstr "_Не уведомлять о приходе новой почты"
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:163
msgid "_Enable"
msgstr "_Включить"
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
msgid "_Encrypt outgoing messages (by default)"
msgstr "_Шифровать исходящие сообщения (по умолчанию)"
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:165
msgid "_Forward style:"
msgstr "Стиль _пересылки:"
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:168
msgid "_Load images if sender is in address book"
msgstr "_Загружать изображения, если отправитель есть в адресной книге"
-#: mail/mail-config.glade.h:167
-msgid "_Local Tests Only"
-msgstr "Только _локальные тесты"
-
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
msgid "_Make this my default account"
msgstr "_Сделать основной учетной записью"
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
msgid "_Mark messages as read after"
msgstr "По_мечать сообщения как \"Прочитанные\" через:"
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
#, fuzzy
msgid "_Never load images from the Internet"
msgstr "Никогда не загружать изображения"
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
msgid "_Prompt when sending HTML messages to contacts that don't want them"
msgstr ""
"_Предупреждать при отправке сообщений в формате HTML тем, кто не желает этого"
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:175
msgid "_Prompt when sending messages with an empty subject line"
msgstr "_Предупреждать при отправке сообщений с пустой темой"
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
msgid "_Reply style:"
msgstr "Стиль _ответа:"
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
msgid "_Script:"
msgstr "_Скрипт:"
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
msgid "_Show animated images"
msgstr "_Показывать анимированные изображения "
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
#, fuzzy
msgid "_Use Secure Connection (SSL):"
msgstr "Использовать _защищенное соединение (SSL)"
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
msgid "_Use the same fonts as other applications"
msgstr "_Использовать такие же шрифты, как и прочие приложения"
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
msgid "color"
msgstr "цвет"
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
msgid "description"
msgstr "описание"
@@ -15718,7 +15252,7 @@ msgstr ""
#. mail:camel-exception primary
#: mail/mail-errors.xml.h:57
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgid "Your message with the subject \"{0}\" was not delivered."
msgstr ""
#. mail:camel-exception secondary
@@ -15784,11 +15318,6 @@ msgstr ""
msgid "Cannot save to directory \"{0}\"."
msgstr "Не удается создать каталог '%s': %s."
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
#. mail:no-create-path primary
#: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
#: mail/mail-errors.xml.h:106
@@ -15810,12 +15339,6 @@ msgstr "Не удается создать каталог '%s': %s."
msgid "Cannot create temporary save directory."
msgstr "Не удается создать временный каталог: %s"
-#. mail:no-create-tmp-path secondary
-#: 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:no-write-path-exists secondary
#: mail/mail-errors.xml.h:104
#, fuzzy
@@ -16094,29 +15617,25 @@ msgstr "Перезаписать"
msgid "_Append"
msgstr "Отправить"
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:785
#, c-format
msgid "Pinging %s"
msgstr "Ping на %s"
-#: mail/mail-mt.c:897
-msgid "Working"
-msgstr "Обработка"
-
-#: mail/mail-ops.c:99
+#: mail/mail-ops.c:98
msgid "Filtering Folder"
msgstr "Фильтрация папки"
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:259
msgid "Fetching Mail"
msgstr "Получение эл.почты"
-#: mail/mail-ops.c:543
+#: mail/mail-ops.c:542
#, c-format
msgid "Failed to apply outgoing filters: %s"
msgstr "Ошибка применения фильтров исходящей почты: %s"
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:567
#, c-format
msgid ""
"Failed to append to %s: %s\n"
@@ -16125,101 +15644,101 @@ msgstr ""
"Ошибка добавления в %s: %s\n"
"Производится добавление в локальную папку \"Отправленные\"."
-#: mail/mail-ops.c:577
+#: mail/mail-ops.c:576
#, c-format
msgid "Failed to append to local `Sent' folder: %s"
msgstr "Ошибка сохранения в локальной папке \"Отправленные\": %s"
-#: mail/mail-ops.c:673
+#: mail/mail-ops.c:672
#, c-format
msgid "Sending message %d of %d"
msgstr "Отправка сообщения %d из %d"
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:703
#, fuzzy, c-format
msgid "Failed to send %d of %d messages"
msgstr "Сбой на сообщении %d из %d"
-#: mail/mail-ops.c:708
+#: mail/mail-ops.c:707
msgid "Complete."
msgstr "Выполнено."
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:804
msgid "Saving message to folder"
msgstr "Сохранение сообщения в папке"
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
#, c-format
msgid "Moving messages to %s"
msgstr "Перемещение сообщений в %s"
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
#, c-format
msgid "Copying messages to %s"
msgstr "Копирование сообщений в %s"
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:1002
#, c-format
msgid "Scanning folders in \"%s\""
msgstr "Сканирование папок на \"%s\""
-#: mail/mail-ops.c:1116
+#: mail/mail-ops.c:1115
msgid "Forwarded messages"
msgstr "Пересланные сообщения"
-#: mail/mail-ops.c:1159
+#: mail/mail-ops.c:1158
#, c-format
msgid "Opening folder %s"
msgstr "Открытие папки \"%s\""
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1230
#, c-format
msgid "Opening store %s"
msgstr "Открытие хранилища %s"
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1308
#, c-format
msgid "Removing folder %s"
msgstr "Удаление папки \"%s\""
-#: mail/mail-ops.c:1403
+#: mail/mail-ops.c:1402
#, c-format
msgid "Storing folder '%s'"
msgstr "Сохранение папки \"%s\""
-#: mail/mail-ops.c:1468
+#: mail/mail-ops.c:1467
#, c-format
msgid "Expunging and storing account '%s'"
msgstr ""
-#: mail/mail-ops.c:1469
+#: mail/mail-ops.c:1468
#, fuzzy, c-format
msgid "Storing account '%s'"
msgstr "Сохранение папки \"%s\""
-#: mail/mail-ops.c:1524
+#: mail/mail-ops.c:1523
msgid "Refreshing folder"
msgstr "Обновление папки"
-#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
+#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
msgid "Expunging folder"
msgstr "Очистка папки"
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1607
#, c-format
msgid "Emptying trash in '%s'"
msgstr "Очистка корзины в '%s'"
-#: mail/mail-ops.c:1609
+#: mail/mail-ops.c:1608
msgid "Local Folders"
msgstr "Локальные папки"
-#: mail/mail-ops.c:1692
+#: mail/mail-ops.c:1691
#, c-format
msgid "Retrieving message %s"
msgstr "Получение сообщения %s"
-#: mail/mail-ops.c:1764
+#: mail/mail-ops.c:1763
#, fuzzy, c-format
msgid "Retrieving %d message"
msgid_plural "Retrieving %d messages"
@@ -16227,7 +15746,7 @@ msgstr[0] "Получение %d сообщений"
msgstr[1] "Получение %d сообщений"
msgstr[2] "Получение %d сообщений"
-#: mail/mail-ops.c:1850
+#: mail/mail-ops.c:1849
#, fuzzy, c-format
msgid "Saving %d message"
msgid_plural "Saving %d messsages"
@@ -16235,7 +15754,7 @@ msgstr[0] "Сохранение %d сообщений"
msgstr[1] "Сохранение %d сообщений"
msgstr[2] "Сохранение %d сообщений"
-#: mail/mail-ops.c:1900
+#: mail/mail-ops.c:1899
#, c-format
msgid ""
"Unable to create output file: %s\n"
@@ -16244,7 +15763,7 @@ msgstr ""
"Не удается создать файл вывода: %s\n"
" %s"
-#: mail/mail-ops.c:1928
+#: mail/mail-ops.c:1927
#, c-format
msgid ""
"Error saving messages to: %s:\n"
@@ -16253,11 +15772,11 @@ msgstr ""
"Ошибка сохранения сообщений в: %s:\n"
" %s"
-#: mail/mail-ops.c:1999
+#: mail/mail-ops.c:1998
msgid "Saving attachment"
msgstr "Сохранение вложения"
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2015
#, c-format
msgid ""
"Cannot create output file: %s:\n"
@@ -16266,17 +15785,17 @@ msgstr ""
"Не удается создать файл вывода: %s\n"
" %s"
-#: mail/mail-ops.c:2046
+#: mail/mail-ops.c:2045
#, c-format
msgid "Could not write data: %s"
msgstr "Не удается записать данные: %s"
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
#, c-format
msgid "Disconnecting from %s"
msgstr "Отключение от %s"
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
#, c-format
msgid "Reconnecting to %s"
msgstr "Переподключение к %s"
@@ -16340,24 +15859,24 @@ msgstr "Обновление..."
msgid "Waiting..."
msgstr "Ожидание..."
-#: mail/mail-session.c:238
+#: mail/mail-session.c:239
msgid "User canceled operation."
msgstr "Операция отменена пользователем."
-#: mail/mail-session.c:271
+#: mail/mail-session.c:272
#, c-format
msgid "Enter Password for %s"
msgstr "Введите пароль для %s"
-#: mail/mail-session.c:273
+#: mail/mail-session.c:274
msgid "Enter Password"
msgstr "Ввод пароля"
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
msgid "_Remember this password"
msgstr "_Запомнить этот пароль"
-#: mail/mail-session.c:297
+#: mail/mail-session.c:298
msgid "_Remember this password for the remainder of this session"
msgstr "_Запомнить этот пароль до завершения этого сеанса"
@@ -16414,79 +15933,79 @@ msgstr "Обновление виртуальных папок для uri: %s"
msgid "Updating vFolders for '%s'"
msgstr "Обновление виртуальных папок для uri: %s"
-#: mail/mail-vfolder.c:959
+#: mail/mail-vfolder.c:958
msgid "vFolders"
msgstr "vFolders"
-#: mail/mail-vfolder.c:998
+#: mail/mail-vfolder.c:997
msgid "Edit VFolder"
msgstr "Править виртуальную папку"
-#: mail/mail-vfolder.c:1082
+#: mail/mail-vfolder.c:1081
msgid "New VFolder"
msgstr "Новая виртуальная папка"
-#: mail/message-list.c:946
+#: mail/message-list.c:948
msgid "Unseen"
msgstr "Непрочитано"
-#: mail/message-list.c:947
+#: mail/message-list.c:949
msgid "Seen"
msgstr "Прочитано"
-#: mail/message-list.c:948
+#: mail/message-list.c:950
msgid "Answered"
msgstr "Отвечено"
-#: mail/message-list.c:949
+#: mail/message-list.c:951
msgid "Multiple Unseen Messages"
msgstr "Множество непрочитанных сообщений"
-#: mail/message-list.c:950
+#: mail/message-list.c:952
msgid "Multiple Messages"
msgstr "Множество сообщений"
-#: mail/message-list.c:954
+#: mail/message-list.c:956
msgid "Lowest"
msgstr "Самый низкий"
-#: mail/message-list.c:955
+#: mail/message-list.c:957
msgid "Lower"
msgstr "Низкий"
-#: mail/message-list.c:959
+#: mail/message-list.c:961
msgid "Higher"
msgstr "Высокий"
-#: mail/message-list.c:960
+#: mail/message-list.c:962
msgid "Highest"
msgstr "Самый высокий"
-#: mail/message-list.c:1279
+#: mail/message-list.c:1285
msgid "?"
msgstr "?"
-#: mail/message-list.c:1286
+#: mail/message-list.c:1292
msgid "Today %l:%M %p"
msgstr "Сегодня %I:%M %p"
-#: mail/message-list.c:1295
+#: mail/message-list.c:1301
msgid "Yesterday %l:%M %p"
msgstr "Вчера %l:%M %p"
-#: mail/message-list.c:1307
+#: mail/message-list.c:1313
msgid "%a %l:%M %p"
msgstr "%a %l:%M %p"
-#: mail/message-list.c:1315
+#: mail/message-list.c:1321
msgid "%b %d %l:%M %p"
msgstr "%b %d %l:%M %p"
-#: mail/message-list.c:1317
+#: mail/message-list.c:1323
msgid "%b %d %Y"
msgstr "%b %d %Y"
-#: mail/message-list.c:3300
+#: mail/message-list.c:3321
msgid "Generating message list"
msgstr "Создание списка сообщений"
@@ -16542,6 +16061,10 @@ 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 "Ответить"
@@ -16644,44 +16167,48 @@ msgid ""
msgstr ""
#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid "Toolbar is visible"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:11
msgid "Whether Evolution should start up in offline mode"
msgstr "Должен ли Evolution запускаться в автономном режиме"
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
msgid "Whether to skip the development warning dialog"
msgstr "Пропускать ли предупреждение о тестовой версии"
-#: shell/apps_evolution_shell.schemas.in.in.h:12
+#: shell/apps_evolution_shell.schemas.in.in.h:14
msgid "mail"
msgstr "почта"
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr "Создана для вас"
-
-#: shell/e-shell.c:545 shell/e-shell.c:546
+#: shell/e-shell.c:588 shell/e-shell.c:589
#, fuzzy, c-format
msgid "%ld KB"
msgstr "%d %B"
-#: shell/e-shell.c:744
+#: shell/e-shell.c:786
#, fuzzy
msgid "Uknown system error."
msgstr "Неизвестная ошибка"
-#: shell/e-shell.c:1101
+#: shell/e-shell.c:1143
msgid "Invalid arguments"
msgstr "Недопустимые аргументы"
-#: shell/e-shell.c:1103
+#: shell/e-shell.c:1145
msgid "Cannot register on OAF"
msgstr "Не удается зарегистрировать в OAF"
-#: shell/e-shell.c:1105
+#: shell/e-shell.c:1147
msgid "Configuration Database not found"
msgstr "База данных настроек не найдена"
-#: shell/e-shell.c:1107
+#: shell/e-shell.c:1149
msgid "Generic error"
msgstr "Обычная ошибка"
@@ -16737,7 +16264,7 @@ msgstr ""
msgid "Select importer"
msgstr "Выбрать импортер"
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
#, c-format
msgid "File %s does not exist"
msgstr "Файл \"%s\" не существует."
@@ -16765,31 +16292,32 @@ msgstr ""
"Импорт %s\n"
"Импорт элемента 1."
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
msgid "Automatic"
msgstr "Автоматическое"
-#: shell/e-shell-importer.c:598
-msgid "_Filename:"
-msgstr "_Имя файла:"
+#: shell/e-shell-importer.c:626
+#, fuzzy
+msgid "F_ilename:"
+msgstr "Имя файла:"
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
msgid "Select a file"
msgstr "Выбрать файл"
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
msgid "File _type:"
msgstr "_Тип файла:"
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
msgid "Import data and settings from _older programs"
msgstr "Импорт данных и настроек из _старых программ"
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
msgid "Import a _single file"
msgstr "Импорт _одного файла"
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
msgid ""
"Please wait...\n"
"Scanning for existing setups"
@@ -16797,26 +16325,26 @@ msgstr ""
"Пожалуйста подождите...\n"
"Сканирование существующих настроек"
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
msgid "Starting Intelligent Importers"
msgstr "Запуск интеллектуального импортера"
-#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
#, c-format
msgid "From %s:"
msgstr "Из %s:"
-#: shell/e-shell-importer.c:1044
+#: shell/e-shell-importer.c:1073
#, fuzzy, c-format
msgid "No importer available for file %s"
msgstr "Провайдер для протокола \"%s\" не доступен"
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
#, fuzzy
msgid "Unable to execute importer"
msgstr "Сбой при исполнении gpg."
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
msgid "_Import"
msgstr "_Импорт"
@@ -16861,61 +16389,61 @@ msgstr "Имя папки не может содержать символ \"#\".
msgid "'.' and '..' are reserved folder names."
msgstr "\".\" и \"..\" -- зарезервированные имена папок."
-#: shell/e-shell-window.c:336
+#: 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:343
+#: shell/e-shell-window.c:344
#, fuzzy
msgid "Evolution is in the process of going offline."
msgstr "Ximian Evolution в процессе перехода в режим работы вне сети."
-#: shell/e-shell-window.c:349
+#: 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:621
+#: shell/e-shell-window.c:637
#, fuzzy, c-format
msgid "Switch to %s"
msgstr "Почта к %s"
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
msgid "The GNOME Pilot tools do not appear to be installed on this system."
msgstr "Похоже, утилита GNOME Pilot не установлена в этой системе"
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
#, c-format
msgid "Error executing %s."
msgstr "Ошибка выполнения %s."
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
msgid "Bug buddy is not installed."
msgstr "Bug buddy не установлен."
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
msgid "Bug buddy could not be run."
msgstr "Не удается запустить Bug buddy."
-#: shell/e-shell-window-commands.c:171
+#: shell/e-shell-window-commands.c:323
#, fuzzy
-msgid "About Evolution"
-msgstr "О программе Ximian Evolution"
+msgid "Groupware Suite"
+msgstr "Группа"
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
msgid "_Work Online"
msgstr "Перейти в сетевой режим"
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
msgid "_Work Offline"
msgstr "Ав_тономная работа"
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
msgid "Work Offline"
msgstr "Перейти в режим работы вне сети"
@@ -16927,43 +16455,6 @@ msgstr "Флажок"
msgid "New"
msgstr "Создать"
-#: shell/evolution-shell-component-utils.c:115
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Неизвестная ошибка."
-
-#: shell/evolution-shell-component-utils.c:118
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Ошибка системы компонентов:\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:125
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Ошибка системы активации:\n"
-"%s"
-
#: shell/evolution-test-component.c:140
#, fuzzy
msgid "New Test"
@@ -17280,30 +16771,30 @@ msgid ""
"Click help for details."
msgstr ""
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
msgid "Select a cert to import..."
msgstr "Выберите сертификат для импорта..."
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
msgid "Certificate Name"
msgstr "Имя сертификата"
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
msgid "Purposes"
msgstr "Назначения"
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
msgid "Serial Number"
msgstr "Серийный номер"
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
msgid "Expires"
msgstr "Годен до"
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
msgid "E-Mail Address"
msgstr "Электронная почта"
@@ -17349,6 +16840,11 @@ msgstr ""
"Выпущен:\n"
" Тема: %s\n"
+#: smime/gui/e-cert-selector.c:169
+#, fuzzy
+msgid "Select certificate"
+msgstr "Сертификат клиента SSL"
+
#: smime/gui/smime-ui.glade.h:1
msgid "<Not Part of Certificate>"
msgstr "<Не является частью сертификата>"
@@ -17403,7 +16899,7 @@ msgid ""
"and its policy and procedures (if available)."
msgstr ""
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
msgid "Certificate"
msgstr "Сертификат"
@@ -17423,19 +16919,23 @@ msgstr "Общее имя (CN)"
msgid "Contact Certificates"
msgstr "Сертификаты контактов"
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
-msgstr "Доверять \"%s\" для следующих целей?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
+msgstr ""
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
msgid "Dummy window only"
msgstr ""
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
msgid "Edit"
msgstr "Правка"
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "Поставщик сертификата эл. почты"
+
#: smime/gui/smime-ui.glade.h:24
msgid "Email Recipient Certificate"
msgstr "Сертификат получателя почты"
@@ -17468,251 +16968,261 @@ msgstr "Подразделение организации (OU)"
msgid "SHA1 Fingerprint"
msgstr "Отпечаток SHA1"
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
msgid "SSL Client Certificate"
msgstr "Сертификат клиента SSL"
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
msgid "SSL Server Certificate"
msgstr "Сертификат сервере SSL"
#: smime/gui/smime-ui.glade.h:37
-msgid "Trust this CA to identify email users."
+msgid "Trust the authenticity of this certificate"
msgstr ""
#: smime/gui/smime-ui.glade.h:38
-msgid "Trust this CA to identify software developers."
+msgid "Trust this CA to identify email users."
msgstr ""
#: smime/gui/smime-ui.glade.h:39
-msgid "Trust this CA to identify web sites."
+msgid "Trust this CA to identify software developers."
msgstr ""
#: smime/gui/smime-ui.glade.h:40
-msgid "View"
-msgstr "Просмотр"
+msgid "Trust this CA to identify web sites."
+msgstr ""
#: smime/gui/smime-ui.glade.h:41
-msgid "View Certificate"
-msgstr "Просмотр сертификата"
+msgid "View"
+msgstr "Просмотр"
#: smime/gui/smime-ui.glade.h:42
-#, fuzzy
-msgid "You have been asked to trust a new Certificate Authority (CA)."
-msgstr "Некорректная авторизация сертификата (CA)"
-
-#: smime/gui/smime-ui.glade.h:43
msgid "You have certificates from these organizations that identify you:"
msgstr ""
-#: smime/gui/smime-ui.glade.h:44
+#: smime/gui/smime-ui.glade.h:43
msgid ""
"You have certificates on file that identify these certificate authorities:"
msgstr ""
-#: smime/gui/smime-ui.glade.h:45
+#: smime/gui/smime-ui.glade.h:44
msgid "You have certificates on file that identify these people:"
msgstr ""
-#: smime/gui/smime-ui.glade.h:46
+#: smime/gui/smime-ui.glade.h:45
msgid "Your Certificates"
msgstr "Ваши сертификаты"
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/gui/smime-ui.glade.h:46
+msgid "_Edit CA Trust"
+msgstr ""
+
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
msgid "%d/%m/%Y"
msgstr "%d.%m.%Y"
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "Stauning"
+
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "Зашифровано"
+
+#: smime/lib/e-cert.c:530
msgid "Version"
msgstr "Версия"
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
msgid "Version 1"
msgstr "Версия 1"
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
msgid "Version 2"
msgstr "Версия 2"
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
msgid "Version 3"
msgstr "Версия 3"
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
msgid "PKCS #1 MD2 With RSA Encryption"
msgstr ""
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
msgid "PKCS #1 MD5 With RSA Encryption"
msgstr ""
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
msgid "PKCS #1 SHA-1 With RSA Encryption"
msgstr ""
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
msgid "C"
msgstr "C"
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
msgid "CN"
msgstr "CN"
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
msgid "OU"
msgstr "OU"
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
msgid "O"
msgstr "O"
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
msgid "L"
msgstr "L"
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
msgid "DN"
msgstr "DN"
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
msgid "DC"
msgstr "DC"
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
msgid "ST"
msgstr "ST"
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
msgid "PKCS #1 RSA Encryption"
msgstr ""
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
msgid "Certificate Key Usage"
msgstr "Использование ключа сертификата"
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
msgid "Netscape Certificate Type"
msgstr "Тип сертификата Netscape"
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
msgid "Certificate Authority Key Identifier"
msgstr "Идентификатор ключа поставщика"
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
msgid "UID"
msgstr "UID"
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
#, c-format
msgid "Object Identifier (%s)"
msgstr "Идентификатор объекта (%s)"
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
msgid "Algorithm Identifier"
msgstr "Идентификатор алгоритма"
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
msgid "Algorithm Parameters"
msgstr "Параметры алгоритма"
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
msgid "Subject Public Key Info"
msgstr ""
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
msgid "Subject Public Key Algorithm"
msgstr ""
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
msgid "Subject's Public Key"
msgstr "Публичный ключ темы"
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
msgid "Error: Unable to process extension"
msgstr "Ошибка: не удается обработать расширение"
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
msgid "Object Signer"
msgstr "Объект подписан"
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
msgid "SSL Certificate Authority"
msgstr "Поставщик сертификата SSL"
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
msgid "Email Certificate Authority"
msgstr "Поставщик сертификата эл. почты"
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
#, fuzzy
msgid "Signing"
msgstr "Stauning"
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
#, fuzzy
msgid "Non-repudiation"
msgstr "Нет информации"
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
msgid "Key Encipherment"
msgstr ""
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
#, fuzzy
msgid "Data Encipherment"
msgstr "вложение"
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
msgid "Key Agreement"
msgstr ""
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
msgid "Certificate Signer"
msgstr "Сертификат подписан"
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
msgid "CRL Signer"
msgstr "CRL подписан"
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
msgid "Critical"
msgstr "Критично"
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
msgid "Not Critical"
msgstr "Не критично"
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
msgid "Extensions"
msgstr "Расширения"
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
#, c-format
msgid "%s = %s"
msgstr "%s = %s"
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
msgid "Certificate Signature Algorithm"
msgstr "Алгоритм подписи сертификата"
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
msgid "Issuer"
msgstr "Поставщик"
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
msgid "Issuer Unique ID"
msgstr ""
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
msgid "Subject Unique ID"
msgstr "Уникальный ID темы"
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
msgid "Certificate Signature Value"
msgstr "Значение подписи сертификата"
#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
+#: smime/lib/e-cert-db.c:608
msgid "Certificate already exists"
msgstr "Сертификат уже существует"
@@ -17860,7 +17370,7 @@ msgstr "Просмотреть текущий контакт"
#: 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-tasks.xml.h:19 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
msgid "_Actions"
msgstr "_Действия"
@@ -18023,7 +17533,7 @@ msgstr "Закрыть"
#: ui/evolution-contact-list-editor.xml.h:2
#: ui/evolution-mail-messagedisplay.xml.h:1
#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
msgid "Close"
msgstr "Закрыть"
@@ -18036,7 +17546,7 @@ msgid "Delete this item"
msgstr "Удалить этот элемент"
#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
msgid "Main toolbar"
msgstr "Главная панель инструментов"
@@ -18079,7 +17589,7 @@ msgstr "Сохранить этот элемент на диске"
#: ui/evolution-mail-messagedisplay.xml.h:7
#: ui/evolution-message-composer.xml.h:44
#: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
msgid "_File"
msgstr "_Файл"
@@ -18336,13 +17846,13 @@ msgstr "Обратить выделение"
msgid "_Threaded Message List"
msgstr "Показывать подшивки в списке сообщений"
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: 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:26
+#: ui/evolution.xml.h:28
msgid "_Close"
msgstr "_Закрыть"
@@ -18744,7 +18254,7 @@ msgstr "Предыдущему сообщению"
msgid "_Quoted"
msgstr "Как _цитирование"
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
msgid "_Tools"
msgstr "С_ервис"
@@ -19041,108 +18551,122 @@ msgid "_Open Task"
msgstr "_Открыть задачу"
#: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr "О программе Ximian Evolution..."
+#, fuzzy
+msgid "About Evolution..."
+msgstr "О программе Ximian Evolution"
#: ui/evolution.xml.h:2
msgid "Change Evolution's settings"
msgstr "Изменить настройки Evolution"
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the visibility of the toolbar"
+msgstr "Изменить свойства этой папки"
+
+#: ui/evolution.xml.h:6
#, fuzzy
msgid "Create a new window displaying this folder"
msgstr "Создать новый календарь"
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
msgid "E_xit"
msgstr "В_ыйти"
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "_Часто задаваемые вопросы по Evolution"
+
+#: ui/evolution.xml.h:9
msgid "Exit the program"
msgstr "Выйти из программы"
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
msgid "Forget _Passwords"
msgstr "Забыть пароли"
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
msgid "Forget remembered passwords so you will be prompted for them again"
msgstr "Забыть запомненные пароли, вы будете спрошены о них опять"
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
msgid "Import data from other programs"
msgstr "Импортировать данные из других программ"
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
#, fuzzy
msgid "New _Window"
msgstr "_Окно"
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
msgid "Pi_lot Settings..."
msgstr "Изменить настройки утилиты _Pilot..."
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
msgid "Send / Receive"
msgstr "Отправить/получить"
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
msgid "Send queued items and retrieve new items"
msgstr "Отправить элементы из очереди и получить новые элементы"
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
msgid "Set up Pilot configuration"
msgstr "Настроить утилиту Pilot"
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+#, fuzzy
+msgid "Show information about Evolution"
msgstr "Показать информацию о программе Ximian Evolution"
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
msgid "Submit Bug Report"
msgstr "Отправить сообщение об ошибке"
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
msgid "Submit _Bug Report"
msgstr "Отправить сообщение об оши_бке"
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
msgid "Submit a bug report using Bug Buddy"
msgstr "Отправить сообщение об ошибке, используя программу \"Баг Бадди\""
-#: ui/evolution.xml.h:21
-msgid "Toggle whether we are working offline."
-msgstr "Переключить работу в/вне сети."
-
#: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
-msgstr "_Часто задаваемые вопросы по Evolution"
+#, fuzzy
+msgid "T_oolbar"
+msgstr "Главная панель инструментов"
#: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
-msgstr "_О программе Ximian Evolution..."
+msgid "Toggle whether we are working offline."
+msgstr "Переключить работу в/вне сети."
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "О программе Ximian Evolution"
+
+#: ui/evolution.xml.h:30
msgid "_Help"
msgstr "_Справка"
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
msgid "_Import..."
msgstr "_Импорт.."
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
msgid "_New"
msgstr "_Создать"
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
msgid "_Quick Reference"
msgstr "_Быстрая справка"
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
msgid "_Send / Receive"
msgstr "_Получить и отправить"
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
#, fuzzy
msgid "_Window"
msgstr "_Окно"
@@ -19215,7 +18739,7 @@ msgid "With _Status"
msgstr "Установить состояние"
#: widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:626
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
msgid "UTC"
msgstr "UTC"
@@ -19372,30 +18896,30 @@ msgstr "Другая..."
msgid "..."
msgstr "..."
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:121
+#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:122
#, fuzzy
msgid "Evolution Error"
msgstr "Evolution"
-#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:120
#, fuzzy
msgid "Evolution Warning"
msgstr "Почта Evolution"
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:119
#, fuzzy
msgid "Evolution Information"
msgstr "Информация о собрании"
-#: widgets/misc/e-error.c:120
+#: widgets/misc/e-error.c:121
#, fuzzy
msgid "Evolution Query"
msgstr "Evolution"
#. setup a dummy error
-#: widgets/misc/e-error.c:410
+#: widgets/misc/e-error.c:415
#, fuzzy, c-format
msgid ""
"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19545,16 +19069,517 @@ msgstr ""
"Не удается сохранить в '%s'\n"
" %s"
-#: widgets/misc/e-task-widget.c:211
+#: widgets/misc/e-task-widget.c:212
#, c-format
msgid "%s (...)"
msgstr "%s (...)"
-#: widgets/misc/e-task-widget.c:216
+#: widgets/misc/e-task-widget.c:217
#, c-format
msgid "%s (%d%% complete)"
msgstr "%s (%d%% выполнено)"
+#~ msgid "Failed to connect to LDAP server"
+#~ msgstr "Не удается подключиться к серверу LDAP"
+
+#~ msgid "Failed to authenticate with LDAP server"
+#~ msgstr "Сбой аутентификации на сервере LDAP"
+
+#~ msgid "Could not perform query on Root DSE"
+#~ msgstr "Не удается выполнить запрос в корневом DSE"
+
+#~ msgid "The server responded with no supported search bases"
+#~ msgstr "Сервер отвечает без поддержки баз поиска"
+
+#~ msgid "This server does not support LDAPv3 schema information"
+#~ msgstr "Этот сервер не поддерживает информацию LDAPv3 schema"
+
+#~ msgid "Error retrieving schema information"
+#~ msgstr "Ошибка при загрузке информации schema"
+
+#~ msgid "Server did not respond with valid schema information"
+#~ msgstr "Сервер не отвечает корректной информацией schema"
+
+#~ msgid " S_how Supported Bases "
+#~ msgstr " _Показывать поддерживаемые типы "
+
+#~ msgid "1:00"
+#~ msgstr "1:00"
+
+#~ msgid "5:00"
+#~ msgstr "5:00"
+
+#~ msgid "Connecting"
+#~ msgstr "Подключение"
+
+#~ msgid "Distinguished _name:"
+#~ msgstr "Отличительное _имя (DN):"
+
+#~ msgid "Email address:"
+#~ msgstr "Электронная почта:"
+
+#~ msgid "Evolution will use this DN to authenticate you with the server"
+#~ msgstr ""
+#~ "Evolution будет использовать это значение DN для проверки вашей "
+#~ "подлинности на сервере"
+
+#~ msgid "One"
+#~ msgstr "Один"
+
+#~ msgid "S_earch scope: "
+#~ msgstr "_Диапазон поиска: "
+
+#~ msgid "Searching"
+#~ msgstr "Поиск"
+
+#~ msgid "Sub"
+#~ msgstr "Под"
+
+#~ msgid "This option controls how long a search will be run."
+#~ msgstr "Этот параметр определяет, как долго будет производиться поиск."
+
+#~ msgid "U_se SSL/TLS:"
+#~ msgstr "И_спользовать SSL/TLS:"
+
+#~ msgid "_Display name:"
+#~ msgstr "Показать имя:"
+
+#~ msgid "_Port number:"
+#~ msgstr "_Номер порта:"
+
+#~ msgid "_Search base:"
+#~ msgstr "_База поиска:"
+
+#~ msgid "_Server name:"
+#~ msgstr "Имя _сервера:"
+
+#~ msgid "_Timeout (minutes):"
+#~ msgstr "_Задержка (минут):"
+
+#~ msgid "connecting-tab"
+#~ msgstr "вкладка соединения"
+
+#~ msgid "general-tab"
+#~ msgstr "общая вкладка"
+
+#~ msgid "searching-tab"
+#~ msgstr "вкладка поиска"
+
+#, fuzzy
+#~ msgid "Job title:"
+#~ msgstr "Должность:"
+
+#, fuzzy
+#~ msgid "Webcam:"
+#~ msgstr "Веб-страница:"
+
+#~ msgid "Category editor not available."
+#~ msgstr "Редактор категорий недоступен."
+
+#, fuzzy
+#~ msgid ""
+#~ "The following entries are invalid:\n"
+#~ "\n"
+#~ msgstr "В настоящий момент активны следующие соединения:"
+
+#~ msgid "Could not find widget for a field: `%s'"
+#~ msgstr "Не удается найти элемент управления для поля: \"%s\""
+
+#~ msgid "Do you want to save changes?"
+#~ msgstr "Хотите сохранить изменения?"
+
+#~ msgid "Error saving %s: %s"
+#~ msgstr "Ошибка сохранения %s: %s"
+
+#~ msgid ""
+#~ "The addressbook backend for\n"
+#~ "%s\n"
+#~ "has crashed. You will have to restart Evolution in order to use it again"
+#~ msgstr ""
+#~ "Произошла ошибка в базе данных адресной книги\n"
+#~ "%s.\n"
+#~ "Необходимо перезапустить Evolution."
+
+#~ msgid "Can not load URI"
+#~ msgstr "Не удается загрузить URI"
+
+#~ msgid "Calendar Properties"
+#~ msgstr "Свойства календаря"
+
+#~ msgid "Remote"
+#~ msgstr "Удаленный"
+
+#~ msgid "Task List Properties"
+#~ msgstr "Свойства списка задач"
+
+#~ msgid "_Refresh Interval:"
+#~ msgstr "_Интервал обновления:"
+
+#~ msgid "_Source URL:"
+#~ msgstr "URL _источника:"
+
+#~ msgid ""
+#~ "The event being deleted is a meeting, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "Удаляемое событие является собранием, хотите отправить уведомление об "
+#~ "отмене?"
+
+#~ msgid "Are you sure you want to cancel and delete this meeting?"
+#~ msgstr "Вы действительно хотите отменить и удалить это собрание?"
+
+#~ msgid ""
+#~ "The task being deleted is assigned, would you like to send a cancellation "
+#~ "notice?"
+#~ msgstr ""
+#~ "Удаляемое событие является назначенной задачей, хотите отправить "
+#~ "уведомление об отмене?"
+
+#~ msgid "Are you sure you want to cancel and delete this task?"
+#~ msgstr "Вы действительно хотите отменить и удалить эту задачу?"
+
+#~ msgid ""
+#~ "The journal entry being deleted is published, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "Удаляемое событие является опубликованной записью в журнале,хотите "
+#~ "отправить уведомление об отмене?"
+
+#~ msgid "Are you sure you want to cancel and delete this journal entry?"
+#~ msgstr "Вы действительно хотите отменить и удалить эту запись в журнале?"
+
+#~ msgid "Are you sure you want to delete the appointment `%s'?"
+#~ msgstr "Вы действительно хотите удалить встречу \"%s\"?"
+
+#~ msgid "Are you sure you want to delete this untitled appointment?"
+#~ msgstr "Вы действительно хотите удалить эту неозаглавленную встречу?"
+
+#~ msgid "Are you sure you want to delete the task `%s'?"
+#~ msgstr "Вы действительно хотите удалить задачу \"%s\"?"
+
+#~ msgid "Are you sure you want to delete this untitled task?"
+#~ msgstr "Вы действительно хотите удалить эту неозаглавленную задачу?"
+
+#~ msgid "Are you sure you want to delete the journal entry `%s'?"
+#~ msgstr "Вы действительно хотите удалить запись в журнале \"%s\"?"
+
+#~ msgid "Are you sure want to delete this untitled journal entry?"
+#~ msgstr ""
+#~ "Вы действительно хотите удалить эту неозаглавленную запись в журнале?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d appointment?"
+#~ msgid_plural "Are you sure you want to delete %d appointments?"
+#~ msgstr[0] "Вы действительно хотите удалить %d встреч?"
+#~ msgstr[1] "Вы действительно хотите удалить %d встреч?"
+#~ msgstr[2] "Вы действительно хотите удалить %d встреч?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d task?"
+#~ msgid_plural "Are you sure you want to delete %d tasks?"
+#~ msgstr[0] "Вы действительно хотите удалить %d задач?"
+#~ msgstr[1] "Вы действительно хотите удалить %d задач?"
+#~ msgstr[2] "Вы действительно хотите удалить %d задач?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d journal entry?"
+#~ msgid_plural "Are you sure you want to delete %d journal entries?"
+#~ msgstr[0] "Вы действительно хотите удалить %d записей в журнале?"
+#~ msgstr[1] "Вы действительно хотите удалить %d записей в журнале?"
+#~ msgstr[2] "Вы действительно хотите удалить %d записей в журнале?"
+
+#~ msgid "_Invite Others..."
+#~ msgstr "Пригласить других..."
+
+#~ msgid ""
+#~ "This event has been changed, but has not been saved.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "Это событие было изменено, но не сохранено.\n"
+#~ "\n"
+#~ "Сохранить изменения?"
+
+#~ msgid "_Discard Changes"
+#~ msgstr "_Отклонить изменения"
+
+#~ msgid "Save Event"
+#~ msgstr "Сохранить событие"
+
+#~ msgid "The meeting information has been created. Send it?"
+#~ msgstr "Была создана информация о собрании. Отправить ее?"
+
+#~ msgid "The meeting information has changed. Send an updated version?"
+#~ msgstr "Информация о собрании была изменена. Отправить обновлённую версию?"
+
+#~ msgid "The task assignment information has been created. Send it?"
+#~ msgstr ""
+#~ "Информация о назначении задачи была изменена. Отправить обновлённую "
+#~ "версию?"
+
+#~ msgid "The task information has changed. Send an updated version?"
+#~ msgstr "Информация о задаче была изменена. Отправить обновлённую версию?"
+
+#~ msgid "Could not get article %s from NNTP server"
+#~ msgstr "Не удается получить статью %s с сервера NNTP"
+
+#, fuzzy
+#~ msgid "Error posting message: %s: message not posted"
+#~ msgstr ""
+#~ "Ошибка при автосохранении сообщения: %s\n"
+#~ " %s"
+
+#~ msgid "Stream error"
+#~ msgstr "Ошибка потока"
+
+#~ msgid "Connection error: %s"
+#~ msgstr "Ошибка соединения: %s"
+
+#~ msgid "Could not get group: %s"
+#~ msgstr "Не удается получить группу: %s"
+
+#, fuzzy
+#~ msgid "Could not get messages: unspecified error"
+#~ msgstr "Не удается получить сообщения: неуказанная ошибка"
+
+#~ msgid "Unknown server response: %s"
+#~ msgstr "Неизвестный ответ сервера: %s"
+
+#~ msgid "Adjust Score"
+#~ msgstr "Скорректировать вес"
+
+#~ msgid "Assign Color"
+#~ msgstr "Назначить цвет"
+
+#~ msgid "Assign Score"
+#~ msgstr "Назначить вес"
+
+#~ msgid "Attachments"
+#~ msgstr "Вложения"
+
+#~ msgid "Beep"
+#~ msgstr "Звуковой сигнал"
+
+#~ msgid "contains"
+#~ msgstr "содержит"
+
+#~ msgid "Copy to Folder"
+#~ msgstr "Копировать в папку"
+
+#~ msgid "Date received"
+#~ msgstr "Дата получения"
+
+#~ msgid "Date sent"
+#~ msgstr "Дата отправки"
+
+#~ msgid "Deleted"
+#~ msgstr "Удалённое"
+
+#~ msgid "does not contain"
+#~ msgstr "не содержит"
+
+#~ msgid "does not end with"
+#~ msgstr "не заканчивается на"
+
+#~ msgid "does not exist"
+#~ msgstr "не существует."
+
+#~ msgid "does not return"
+#~ msgstr "не возвращает"
+
+#~ msgid "does not sound like"
+#~ msgstr "звучит не как"
+
+#~ msgid "does not start with"
+#~ msgstr "не начинается с"
+
+#~ msgid "Do Not Exist"
+#~ msgstr "Не существует"
+
+#~ msgid "Draft"
+#~ msgstr "Черновик"
+
+#~ msgid "ends with"
+#~ msgstr "заканчивается на"
+
+#~ msgid "Exist"
+#~ msgstr "Существует"
+
+#~ msgid "exists"
+#~ msgstr "cуществуют"
+
+#~ msgid "Expression"
+#~ msgstr "Выражение"
+
+#~ msgid "Follow Up"
+#~ msgstr "К исполнению"
+
+#~ msgid "is"
+#~ msgstr "является"
+
+#~ msgid "is after"
+#~ msgstr "после"
+
+#~ msgid "is before"
+#~ msgstr "до"
+
+#~ msgid "is Flagged"
+#~ msgstr "отмечено"
+
+#~ msgid "is greater than"
+#~ msgstr "больше чем"
+
+#~ msgid "is less than"
+#~ msgstr "меньше чем"
+
+#~ msgid "is not"
+#~ msgstr "не является"
+
+#~ msgid "is not Flagged"
+#~ msgstr "не отмечено"
+
+#~ msgid "Junk Test"
+#~ msgstr "Проверка на спам"
+
+#~ msgid "Mailing list"
+#~ msgstr "Список рассылки"
+
+#~ msgid "Message Body"
+#~ msgstr "Тело сообщения"
+
+#~ msgid "Message Header"
+#~ msgstr "Заголовок сообщения"
+
+#~ msgid "Message is Junk"
+#~ msgstr "Это сообщение - спам"
+
+#~ msgid "Message is not Junk"
+#~ msgstr "Это сообщение - не спам"
+
+#~ msgid "Move to Folder"
+#~ msgstr "Переместить в папку"
+
+#, fuzzy
+#~ msgid "Pipe to Program"
+#~ msgstr "Выйти из программы"
+
+#~ msgid "Play Sound"
+#~ msgstr "Воспроизвести звук"
+
+#~ msgid "Recipients"
+#~ msgstr "Получатели"
+
+#~ msgid "Regex Match"
+#~ msgstr "Совпадение рег.выражения"
+
+#~ msgid "Replied to"
+#~ msgstr "В ответ на"
+
+#~ msgid "returns"
+#~ msgstr "возвращает"
+
+#~ msgid "returns greater than"
+#~ msgstr "возвращает больше чем"
+
+#~ msgid "returns less than"
+#~ msgstr "возвращает меньше чем"
+
+#, fuzzy
+#~ msgid "Run Program"
+#~ msgstr "Запустить программу:"
+
+#~ msgid "Sender"
+#~ msgstr "Отправитель"
+
+#~ msgid "Set Status"
+#~ msgstr "Установить состояние"
+
+#~ msgid "Size (kB)"
+#~ msgstr "Размер (кб)"
+
+#~ msgid "sounds like"
+#~ msgstr "звучит как"
+
+#~ msgid "Source Account"
+#~ msgstr "Исходная учетная запись"
+
+#~ msgid "Specific header"
+#~ msgstr "Специфичный заголовок"
+
+#~ msgid "starts with"
+#~ msgstr "начинается с"
+
+#~ msgid "Stop Processing"
+#~ msgstr "Остановить обработку"
+
+#~ msgid "Unset Status"
+#~ msgstr "Снять состояние"
+
+#~ msgid "Check _Incoming Mail"
+#~ msgstr "Проверять _входящую почту"
+
+#~ msgid "Use _Daemon"
+#~ msgstr "Использовать _демон"
+
+#~ msgid "_Local Tests Only"
+#~ msgstr "Только _локальные тесты"
+
+#~ msgid "Working"
+#~ msgstr "Обработка"
+
+#~ msgid "Brought to you by"
+#~ msgstr "Создана для вас"
+
+#~ msgid "_Filename:"
+#~ msgstr "_Имя файла:"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "Unknown error."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Неизвестная ошибка."
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the component system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Ошибка системы компонентов:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the activation system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Ошибка системы активации:\n"
+#~ "%s"
+
+#~ msgid "Do you want to trust \"%s\" for the following purposes?"
+#~ msgstr "Доверять \"%s\" для следующих целей?"
+
+#~ msgid "View Certificate"
+#~ msgstr "Просмотр сертификата"
+
+#, fuzzy
+#~ msgid "You have been asked to trust a new Certificate Authority (CA)."
+#~ msgstr "Некорректная авторизация сертификата (CA)"
+
+#~ msgid "About Ximian Evolution..."
+#~ msgstr "О программе Ximian Evolution..."
+
+#~ msgid "_About Ximian Evolution..."
+#~ msgstr "_О программе Ximian Evolution..."
+
#~ msgid "Evolution Addressbook folder viewer"
#~ msgstr "Evolution Addressbook folder viewer"
@@ -19857,9 +19882,6 @@ msgstr "%s (%d%% выполнено)"
#~ msgid "Primary _email:"
#~ msgstr "_Эл. почта:"
-#~ msgid "S_pouse:"
-#~ msgstr "С_упруг(а):"
-
#~ msgid "_Business:"
#~ msgstr "Рабочий:"
@@ -19875,9 +19897,6 @@ msgstr "%s (%d%% выполнено)"
#~ msgid "_Mobile:"
#~ msgstr "Сотовый:"
-#~ msgid "_Office:"
-#~ msgstr "Ком_ната:"
-
#~ msgid "_Public Calendar URL:"
#~ msgstr "URI _публичного календаря:"
@@ -20494,9 +20513,6 @@ msgstr "%s (%d%% выполнено)"
#~ msgid "Failed on message %d of %d"
#~ msgstr "Сбой на сообщении %d из %d"
-#~ msgid "Changing junk status"
-#~ msgstr "Изменение статуса спама"
-
#~ msgid "Search"
#~ msgstr "Найти"