aboutsummaryrefslogtreecommitdiffstats
path: root/po/ru.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/ru.po')
-rw-r--r--po/ru.po1267
1 files changed, 700 insertions, 567 deletions
diff --git a/po/ru.po b/po/ru.po
index 06e959e5df..0ad8212809 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: ru\n"
-"POT-Creation-Date: 2004-07-19 15:12-0400\n"
+"POT-Creation-Date: 2004-08-02 15:35-0400\n"
"PO-Revision-Date: 2004-07-13 16:22+0300\n"
"Last-Translator: Leonid Kanter <leon@asplinux.ru>\n"
"Language-Team: Russian <ru@li.org>\n"
@@ -225,17 +225,17 @@ msgstr ""
"Если вы выйдете, эти сообщения не будут отправлены до повторного запуска "
"Evolution."
-#: addressbook/conduit/address-conduit.c:275
+#: addressbook/conduit/address-conduit.c:298
msgid "Default Sync Address:"
msgstr "Адрес синхронизации по умолчанию:"
-#: addressbook/conduit/address-conduit.c:1156
-#: addressbook/conduit/address-conduit.c:1157
+#: addressbook/conduit/address-conduit.c:1181
+#: addressbook/conduit/address-conduit.c:1182
msgid "Could not load addressbook"
msgstr "Не удается загрузить адресную книгу"
-#: addressbook/conduit/address-conduit.c:1225
-#: addressbook/conduit/address-conduit.c:1228
+#: addressbook/conduit/address-conduit.c:1250
+#: addressbook/conduit/address-conduit.c:1253
msgid "Could not read pilot's Address application block"
msgstr "Не удается прочитать блок приложения адресов Пилота"
@@ -261,8 +261,8 @@ msgstr "Здесь настраивается автозавершение"
#. Create the contacts group
#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/gui/component/addressbook-view.c:1044
-#: calendar/gui/migration.c:373
+#: addressbook/gui/component/addressbook-view.c:1104
+#: calendar/gui/migration.c:377
msgid "Contacts"
msgstr "Контакты"
@@ -323,64 +323,66 @@ msgid "Create a new contact list"
msgstr "Создание нового списка контактов"
#: addressbook/gui/component/addressbook-component.c:109
-msgid "New Contacts Group"
-msgstr "Создать группу контактов"
+#: addressbook/gui/component/addressbook-view.c:773
+msgid "New Address Book"
+msgstr "Новая адресная книга"
#: addressbook/gui/component/addressbook-component.c:110
#, fuzzy
-msgid "Contacts Grou_p"
-msgstr "_Группа контактов"
+msgid "Address _Book"
+msgstr "Адресная _книга:"
#: addressbook/gui/component/addressbook-component.c:111
-msgid "Create a new contacts group"
-msgstr "Создать новую группу контактов"
+#, fuzzy
+msgid "Create a new address book"
+msgstr "Создать новую задачу"
#: addressbook/gui/component/addressbook-component.c:184
msgid "Failed upgrading Addressbook settings or folders."
msgstr "Ошибка обновления параметров или папок Адресной книги."
-#: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
+#: addressbook/gui/component/addressbook-migrate.c:72
+#: calendar/gui/migration.c:141 mail/em-migrate.c:1160
msgid "Migrating..."
msgstr "Перенос..."
-#: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
+#: addressbook/gui/component/addressbook-migrate.c:124
+#: calendar/gui/migration.c:188 mail/em-migrate.c:1201
#, c-format
msgid "Migrating `%s':"
msgstr "Переносится '%s':"
#. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:489
-#: calendar/gui/migration.c:446 calendar/gui/migration.c:528
+#: addressbook/gui/component/addressbook-migrate.c:493
+#: calendar/gui/migration.c:450 calendar/gui/migration.c:532
#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
#: mail/mail-component.c:245 mail/mail-vfolder.c:218
msgid "On This Computer"
msgstr "На этом компьютере"
#. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:497
+#: addressbook/gui/component/addressbook-migrate.c:501
#: addressbook/gui/contact-editor/contact-editor.glade.h:34
-#: calendar/gui/migration.c:454 calendar/gui/migration.c:536
+#: calendar/gui/migration.c:458 calendar/gui/migration.c:540
#: 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:505
+#: addressbook/gui/component/addressbook-migrate.c:509
msgid "On LDAP Servers"
msgstr "На серверах LDAP"
-#: addressbook/gui/component/addressbook-migrate.c:633
+#: addressbook/gui/component/addressbook-migrate.c:637
msgid "LDAP Servers"
msgstr "Серверы LDAP"
-#: addressbook/gui/component/addressbook-migrate.c:748
+#: addressbook/gui/component/addressbook-migrate.c:752
msgid "Autocompletion Settings"
msgstr "Настройка автозавершения"
-#: addressbook/gui/component/addressbook-migrate.c:1119
+#: addressbook/gui/component/addressbook-migrate.c:1123
msgid ""
"The location and hierarchy of the Evolution contact folders has changed "
"since Evolution 1.x.\n"
@@ -392,7 +394,7 @@ msgstr ""
"\n"
"Производится преобразование папок для новой версии..."
-#: addressbook/gui/component/addressbook-migrate.c:1133
+#: addressbook/gui/component/addressbook-migrate.c:1137
msgid ""
"The format of mailing list contacts has changed.\n"
"\n"
@@ -402,7 +404,7 @@ msgstr ""
"\n"
"Производится преобразование папок для новой версии..."
-#: addressbook/gui/component/addressbook-migrate.c:1142
+#: addressbook/gui/component/addressbook-migrate.c:1146
msgid ""
"The way Evolution stores some phone numbers has changed.\n"
"\n"
@@ -412,7 +414,7 @@ msgstr ""
"\n"
"Производится преобразование папок для новой версии..."
-#: addressbook/gui/component/addressbook-migrate.c:1152
+#: addressbook/gui/component/addressbook-migrate.c:1156
msgid ""
"Evolution's Palm Sync changelog and map files have changed.\n"
"\n"
@@ -422,18 +424,14 @@ msgstr ""
"\n"
"Производится преобразование ваших данных Pilot Sync..."
-#: addressbook/gui/component/addressbook-view.c:633
+#: addressbook/gui/component/addressbook-view.c:671
#, c-format
msgid "Address book '%s' will be removed. Are you sure you want to continue?"
msgstr "Адресная книга '%s' будет удалена. Вы действительно хотите продолжить?"
-#: addressbook/gui/component/addressbook-view.c:714
-msgid "New Address Book"
-msgstr "Новая адресная книга"
-
-#: addressbook/gui/component/addressbook-view.c:715
-#: addressbook/gui/widgets/e-addressbook-view.c:1119
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: addressbook/gui/component/addressbook-view.c:774
+#: addressbook/gui/widgets/e-addressbook-view.c:1124
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:376
#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
#: ui/evolution-contact-editor.xml.h:3
@@ -442,8 +440,8 @@ msgstr "Новая адресная книга"
msgid "Delete"
msgstr "Удалить"
-#: addressbook/gui/component/addressbook-view.c:716
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
+#: addressbook/gui/component/addressbook-view.c:775
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:378
msgid "Properties..."
msgstr "Свойства..."
@@ -452,12 +450,12 @@ msgid "Accessing LDAP Server anonymously"
msgstr "Анонимное подключение к серверу LDAP"
#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:388
+#: camel/providers/groupwise/camel-gw-listener.c:417
msgid "Failed to authenticate.\n"
msgstr "Ошибка проверки подлинности.\n"
#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:377
+#: camel/providers/groupwise/camel-gw-listener.c:406
#, c-format
msgid "%sEnter password for %s (user %s)"
msgstr "%sВведите пароль для %s (пользователь %s)"
@@ -549,8 +547,9 @@ msgid "<b>Type:</b>"
msgstr "<b>Тип:</b>"
#: addressbook/gui/component/ldap-config.glade.h:13
-msgid "Add Contacts Group"
-msgstr "Добавить группу контактов"
+#, fuzzy
+msgid "Add Address Book"
+msgstr "Адресная книга"
#: addressbook/gui/component/ldap-config.glade.h:14
msgid "Address Book Properties"
@@ -579,35 +578,36 @@ msgid "Distinguished name"
msgstr "Отличительное имя (DN)"
#: addressbook/gui/component/ldap-config.glade.h:20
-msgid "Download limit:"
-msgstr "Ограничение загрузки:"
-
-#: addressbook/gui/component/ldap-config.glade.h:21
msgid "Email address"
msgstr "Электронная почта"
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:21
msgid ""
"Evolution will use this email address to authenticate you with the server."
msgstr "Этот адрес будет использоваться для идентификации вас на сервере."
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
msgid "Find Possible Search Bases"
msgstr "Найти возможные базы поиска"
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:23
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
msgid "General"
msgstr "Общие"
+#: addressbook/gui/component/ldap-config.glade.h:24
+#, fuzzy
+msgid "Lo_gin:"
+msgstr "Регистрация"
+
#: 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:26
-msgid "Only locations within starting point"
+msgid "One"
msgstr ""
#: addressbook/gui/component/ldap-config.glade.h:27
@@ -615,18 +615,6 @@ msgid "Search _base:"
msgstr "_База поиска:"
#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Search base only"
-msgstr "Только база поиска"
-
-#: addressbook/gui/component/ldap-config.glade.h:29
-msgid "Search base:"
-msgstr "База поиска:"
-
-#: addressbook/gui/component/ldap-config.glade.h:30
-msgid "Search scope:"
-msgstr "Диапазон поиска:"
-
-#: addressbook/gui/component/ldap-config.glade.h:31
msgid ""
"Selecting this option means that Evolution will only connect to your LDAP "
"server if your LDAP server supports SSL or TLS."
@@ -634,7 +622,7 @@ msgstr ""
"Выбор этой опции означает, что Evolution будет устанавливать соединение с "
"вашим сервером LDAP только в том случае, если он поддерживает SSL or TLS."
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:29
msgid ""
"Selecting this option means that Evolution will only try to use SSL/TLS if "
"you are in a insecure environment. For example, if you and your LDAP server "
@@ -646,7 +634,7 @@ msgstr ""
"если вы и ваш сервер LDAP находятся за межсетевым экраном, то Evolution не "
"будет использовать SSL/TLS, так как ваше соединение уже достаточно безопасно."
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:30
msgid ""
"Selecting this option means that your server does not support either SSL or "
"TLS. This means that your connection will be insecure, and that you will be "
@@ -655,15 +643,16 @@ msgstr ""
"Выбор этой опции означает, что ваш сервер не поддерживает протоколы SSL и "
"TLS . Это означает, что ваше соединение с сервером будет уязвимым для атак. "
-#: addressbook/gui/component/ldap-config.glade.h:34
-msgid "Starting point and locations within it"
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:31
+#, fuzzy
+msgid "Sub"
+msgstr "Вс"
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:32
msgid "Supported Search Bases"
msgstr "Поддерживаемые базы поиска"
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:33
msgid ""
"The search base is the distinguished name (DN) of the entry where your "
"searches will begin. If you leave this blank, the search will begin at the "
@@ -673,7 +662,7 @@ msgstr ""
"откуда начнется ваш поиск. Если вы оставите это поле пустым, то поиск "
"начнется с корня дерева каталогов."
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:34
msgid ""
"The search scope defines how deep you would like the search to extend down "
"the directory tree. A search scope of \"sub\" will include all entries below "
@@ -685,13 +674,13 @@ msgstr ""
"каталогом начала поиска. Глубина поиска \"one\" включает в себя элементы на "
"один уровень ниже каталога начала поиска."
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:35
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:39
+#: addressbook/gui/component/ldap-config.glade.h:36
msgid ""
"This is the maximum number of entries to download. Setting this number to be "
"too large will slow down your address book."
@@ -699,7 +688,7 @@ msgstr ""
"Максимальное число элементов для загрузки. Установка очень большого значения "
"может серьезно замедлить работу вашей адресной книги."
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:37
msgid ""
"This is the method evolution will use to authenticate you. Note that "
"setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -709,7 +698,7 @@ msgstr ""
"что установка этого параметра в \"Адрес эл. почты\" требует анонимного "
"доступа к вашему серверу LDAP."
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:38
msgid ""
"This is the name for this server that will appear in your Evolution folder "
"list. It is for display purposes only. "
@@ -717,7 +706,7 @@ msgstr ""
"Это имя сервера будет появляться в списке каталогов Evolution. Оно "
"используется только для отображения. "
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:39
msgid ""
"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 "
@@ -727,80 +716,68 @@ msgstr ""
"Список стандартных портов ранее уже был предоставлен. Спросите вашего "
"системного администратора, какой из них вам необходимо использовать."
-#: addressbook/gui/component/ldap-config.glade.h:43
-msgid "Timeout:"
-msgstr "Задержка:"
-
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:40
msgid "Using distinguished name (DN)"
msgstr "По отличительному имени (DN)"
-#: addressbook/gui/component/ldap-config.glade.h:45
+#: addressbook/gui/component/ldap-config.glade.h:41
msgid "Using email address"
msgstr "По почтовому адресу"
-#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
+#: addressbook/gui/component/ldap-config.glade.h:42 mail/mail-account-gui.c:80
#: mail/mail-config.glade.h:156
msgid "Whenever Possible"
msgstr "Когда это возможно"
-#: addressbook/gui/component/ldap-config.glade.h:47
-msgid "_Add Contacts Group"
-msgstr "_Добавить группу контактов"
+#: addressbook/gui/component/ldap-config.glade.h:43
+#, fuzzy
+msgid "_Add Address Book"
+msgstr "_Добавить в адресную книгу"
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:44
msgid "_Download limit:"
msgstr "Ограничение загрузки:"
-#: addressbook/gui/component/ldap-config.glade.h:49
-msgid "_Email address:"
-msgstr "_Электронная почта:"
-
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:45
#, fuzzy
msgid "_Find Possible Search Bases"
msgstr "Поддерживаемые базы поиска"
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:46
msgid "_Log in method:"
msgstr "_Метод подключения:"
-#: addressbook/gui/component/ldap-config.glade.h:52
-#, fuzzy
-msgid "_Log in:"
-msgstr "Регистрация"
-
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:47
#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
msgid "_Name:"
msgstr "_Имя:"
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:48
msgid "_Port:"
msgstr "_Порт:"
-#: addressbook/gui/component/ldap-config.glade.h:55
+#: addressbook/gui/component/ldap-config.glade.h:49
#, fuzzy
msgid "_Search scope:"
msgstr "_Диапазон поиска: "
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:50
msgid "_Server:"
msgstr "_Сервер:"
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:51
msgid "_Timeout:"
msgstr "_Задержка:"
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:52
msgid "_Use secure connection:"
msgstr "Использовать _защищенное соединение:"
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:53
msgid "cards"
msgstr "карточек"
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:54
#: calendar/gui/dialogs/alarm-dialog.glade.h:27
#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
#: mail/mail-config.glade.h:183
@@ -924,7 +901,7 @@ 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:331
+#: addressbook/gui/widgets/eab-contact-display.c:333
msgid "AIM"
msgstr "AIM"
@@ -1085,8 +1062,8 @@ msgid "_Where:"
msgstr "С_ервер:"
#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:350
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/widgets/eab-contact-display.c:352
+#: addressbook/gui/widgets/eab-contact-display.c:367
msgid "Address"
msgstr "Адрес"
@@ -2078,7 +2055,7 @@ msgstr "AOL Instant Messenger"
#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
#: addressbook/gui/contact-editor/e-contact-editor.c:185
-#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:336
msgid "Jabber"
msgstr "Jabber"
@@ -2088,7 +2065,7 @@ msgstr "Yahoo Messenger"
#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
#: addressbook/gui/contact-editor/e-contact-editor.c:188
-#: addressbook/gui/widgets/eab-contact-display.c:333
+#: addressbook/gui/widgets/eab-contact-display.c:335
msgid "ICQ"
msgstr "ICQ"
@@ -2117,17 +2094,17 @@ msgid "Other"
msgstr "Другие"
#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:338
msgid "Yahoo"
msgstr "Yahoo"
#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:337
msgid "MSN"
msgstr "MSN"
#: addressbook/gui/contact-editor/e-contact-editor.c:189
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:334
msgid "GroupWise"
msgstr "GroupWise"
@@ -2209,7 +2186,7 @@ msgstr "_Полное имя:"
msgid "E-_mail:"
msgstr "_Эл. адрес:"
-#: addressbook/gui/contact-editor/eab-editor.c:315
+#: addressbook/gui/contact-editor/eab-editor.c:319
msgid ""
"Are you sure you want\n"
"to delete these contacts?"
@@ -2217,7 +2194,7 @@ msgstr ""
"Вы действительно хотите\n"
"удалить эти контакты?"
-#: addressbook/gui/contact-editor/eab-editor.c:318
+#: addressbook/gui/contact-editor/eab-editor.c:322
msgid ""
"Are you sure you want\n"
"to delete this contact?"
@@ -2517,97 +2494,97 @@ msgstr "Дополнительно..."
msgid "Type"
msgstr "Тип"
-#: addressbook/gui/widgets/e-addressbook-view.c:539
+#: addressbook/gui/widgets/e-addressbook-view.c:544
msgid "Address Book"
msgstr "Адресная книга"
-#: addressbook/gui/widgets/e-addressbook-view.c:883
-#: addressbook/gui/widgets/e-addressbook-view.c:1103
-#: addressbook/gui/widgets/e-addressbook-view.c:2093
+#: addressbook/gui/widgets/e-addressbook-view.c:888
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
+#: addressbook/gui/widgets/e-addressbook-view.c:2098
#: ui/evolution-addressbook.xml.h:19
msgid "Save as VCard..."
msgstr "Сохранить как VCard..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
msgid "New Contact..."
msgstr "Создать контакт..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1091
+#: addressbook/gui/widgets/e-addressbook-view.c:1096
msgid "New Contact List..."
msgstr "Создать список контактов..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1094
+#: addressbook/gui/widgets/e-addressbook-view.c:1099
msgid "Go to Folder..."
msgstr "Перейти к папке..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1095
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
msgid "Import..."
msgstr "Импорт..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1097
+#: addressbook/gui/widgets/e-addressbook-view.c:1102
msgid "Search for Contacts..."
msgstr "Найти контакты..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1098
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
msgid "Address Book Sources..."
msgstr "Источники адресных книг..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1100
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
msgid "Pilot Settings..."
msgstr "Настройка Pilot..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1104
+#: addressbook/gui/widgets/e-addressbook-view.c:1109
#: ui/evolution-addressbook.xml.h:10
msgid "Forward Contact"
msgstr "Переслать контакт"
-#: addressbook/gui/widgets/e-addressbook-view.c:1105
+#: addressbook/gui/widgets/e-addressbook-view.c:1110
msgid "Send Message to Contact"
msgstr "Отправить сообщение к контакту"
-#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1111 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:1108
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
msgid "Print Envelope"
msgstr "Напечатать конверт"
-#: addressbook/gui/widgets/e-addressbook-view.c:1112
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
msgid "Copy to Address Book..."
msgstr "Копировать в адресную книгу..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1113
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
msgid "Move to Address Book..."
msgstr "Переместить в адресную книгу..."
-#: addressbook/gui/widgets/e-addressbook-view.c:1116
+#: addressbook/gui/widgets/e-addressbook-view.c:1121
#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
msgid "Cut"
msgstr "Вырезать"
-#: addressbook/gui/widgets/e-addressbook-view.c:1117
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
+#: addressbook/gui/widgets/e-addressbook-view.c:1122
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:374
#: 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:1118
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
msgid "Paste"
msgstr "Вставить"
-#: addressbook/gui/widgets/e-addressbook-view.c:1123
-#: calendar/gui/e-calendar-view.c:1351
+#: addressbook/gui/widgets/e-addressbook-view.c:1128
+#: calendar/gui/e-calendar-view.c:1347
msgid "Current View"
msgstr "Текущий вид"
#. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1678
+#: addressbook/gui/widgets/e-addressbook-view.c:1683
#: calendar/gui/cal-search-bar.c:358
msgid "Any Category"
msgstr "Любая категория"
@@ -2651,7 +2628,7 @@ msgid "Company Phone"
msgstr "Телефон компании"
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+#: addressbook/gui/widgets/eab-contact-display.c:547 smime/lib/e-cert.c:826
msgid "Email"
msgstr "Эл. почта"
@@ -2702,7 +2679,7 @@ msgid "Manager"
msgstr "Мeнеджер"
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:366
msgid "Mobile Phone"
msgstr "Мобильный телефон"
@@ -2711,7 +2688,7 @@ msgid "Nickname"
msgstr "Псевдоним"
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:377
msgid "Note"
msgstr "Примечание"
@@ -2720,7 +2697,7 @@ msgid "Office"
msgstr "Офис"
#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:347
msgid "Organization"
msgstr "Организация"
@@ -2846,65 +2823,65 @@ msgstr "Выбрано"
msgid "Has Cursor"
msgstr "Имеет курсор"
-#: addressbook/gui/widgets/eab-contact-display.c:131
-#: addressbook/gui/widgets/eab-contact-display.c:194
+#: addressbook/gui/widgets/eab-contact-display.c:133
+#: addressbook/gui/widgets/eab-contact-display.c:196
msgid "(map)"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:141
-#: addressbook/gui/widgets/eab-contact-display.c:207
+#: addressbook/gui/widgets/eab-contact-display.c:143
+#: addressbook/gui/widgets/eab-contact-display.c:209
msgid "map"
msgstr ""
-#: addressbook/gui/widgets/eab-contact-display.c:259
-#: addressbook/gui/widgets/eab-contact-display.c:526
+#: addressbook/gui/widgets/eab-contact-display.c:261
+#: addressbook/gui/widgets/eab-contact-display.c:528
msgid "List Members"
msgstr "Участники списка"
-#: addressbook/gui/widgets/eab-contact-display.c:322
#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:326
msgid "E-mail"
msgstr "Эл. почта"
-#: addressbook/gui/widgets/eab-contact-display.c:346
+#: addressbook/gui/widgets/eab-contact-display.c:348
msgid "Position"
msgstr "Должность"
-#: addressbook/gui/widgets/eab-contact-display.c:347
+#: addressbook/gui/widgets/eab-contact-display.c:349
msgid "Video Conferencing"
msgstr "Видеоконференции"
-#: addressbook/gui/widgets/eab-contact-display.c:348
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:365
msgid "Phone"
msgstr "Телефон"
-#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:351
msgid "Fax"
msgstr "Факс"
-#: addressbook/gui/widgets/eab-contact-display.c:353
+#: addressbook/gui/widgets/eab-contact-display.c:355
msgid "work"
msgstr "работа"
-#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:362
msgid "WWW"
msgstr "WWW"
-#: addressbook/gui/widgets/eab-contact-display.c:361
-#: addressbook/gui/widgets/eab-contact-display.c:580
+#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:582
msgid "Blog"
msgstr "Блог"
-#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:370
msgid "personal"
msgstr "личный"
-#: addressbook/gui/widgets/eab-contact-display.c:541
+#: addressbook/gui/widgets/eab-contact-display.c:543
msgid "Job Title"
msgstr "Должность"
-#: addressbook/gui/widgets/eab-contact-display.c:572
+#: addressbook/gui/widgets/eab-contact-display.c:574
msgid "Home page"
msgstr "Домашняя страничка"
@@ -3209,7 +3186,7 @@ msgstr[1] "и %d других контактов."
msgstr[2] "и %d других контактов."
#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
+#: addressbook/gui/widgets/eab-vcard-control.c:272
msgid "Show Full VCard"
msgstr "Показывать всю карточку"
@@ -3217,7 +3194,7 @@ msgstr "Показывать всю карточку"
msgid "Show Compact VCard"
msgstr "Показывать компактную карточку"
-#: addressbook/gui/widgets/eab-vcard-control.c:278
+#: addressbook/gui/widgets/eab-vcard-control.c:277
msgid "Save in addressbook"
msgstr "Сохранить в адресной книге"
@@ -3826,34 +3803,34 @@ msgstr ""
"Если вы выйдете, эти сообщения не будут отправлены до повторного запуска "
"Evolution."
-#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:48 calendar/gui/e-pub-utils.c:301
#: smime/gui/component.c:48
msgid "Enter password"
msgstr "Ввод пароля"
-#: calendar/conduits/calendar/calendar-conduit.c:223
+#: calendar/conduits/calendar/calendar-conduit.c:246
msgid "Split Multi-Day Events:"
msgstr "Разделить многодневные события:"
-#: calendar/conduits/calendar/calendar-conduit.c:1330
-#: calendar/conduits/calendar/calendar-conduit.c:1331
-#: calendar/conduits/todo/todo-conduit.c:852
-#: calendar/conduits/todo/todo-conduit.c:853
+#: calendar/conduits/calendar/calendar-conduit.c:1356
+#: calendar/conduits/calendar/calendar-conduit.c:1357
+#: calendar/conduits/todo/todo-conduit.c:879
+#: calendar/conduits/todo/todo-conduit.c:880
#, fuzzy
msgid "Could not start evolution-data-server"
msgstr "Не удается запустить сервер wombat"
-#: calendar/conduits/calendar/calendar-conduit.c:1439
-#: calendar/conduits/calendar/calendar-conduit.c:1442
+#: calendar/conduits/calendar/calendar-conduit.c:1465
+#: calendar/conduits/calendar/calendar-conduit.c:1468
msgid "Could not read pilot's Calendar application block"
msgstr "Не удается прочитать блок приложения календарь Пилота"
-#: calendar/conduits/todo/todo-conduit.c:209
+#: calendar/conduits/todo/todo-conduit.c:234
msgid "Default Priority:"
msgstr "Приоритет по умолчанию:"
-#: calendar/conduits/todo/todo-conduit.c:932
-#: calendar/conduits/todo/todo-conduit.c:935
+#: calendar/conduits/todo/todo-conduit.c:959
+#: calendar/conduits/todo/todo-conduit.c:962
msgid "Could not read pilot's ToDo application block"
msgstr "Не удается прочитать блок приложения заданий Пилота"
@@ -3903,10 +3880,10 @@ msgid "Evolution's Tasks component"
msgstr "Компонент задач Evolution"
#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:1194 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:418 calendar/gui/tasks-component.c:880
-#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
+#: calendar/gui/e-tasks.c:1198 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:419 calendar/gui/tasks-component.c:884
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:83
+#: calendar/importers/icalendar-importer.c:709
msgid "Tasks"
msgstr "Задачи"
@@ -4032,7 +4009,7 @@ msgstr "Не удается инициализировать Bonobo"
msgid "Could not create the alarm notify service factory"
msgstr "Не удается создать фабрику сервиса уведомления о сигнале"
-#: calendar/gui/alarm-notify/util.c:37
+#: calendar/gui/alarm-notify/util.c:41
msgid "invalid time"
msgstr "неправильное время"
@@ -4188,10 +4165,10 @@ msgid "Unmatched"
msgstr "Прочее"
#: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:564
-#: calendar/gui/dialogs/select-source-dialog.c:108
+#: calendar/gui/dialogs/select-source-dialog.c:112
#: calendar/gui/gnome-cal.c:1858
-#: camel/providers/groupwise/camel-gw-listener.c:315
-#: camel/providers/groupwise/camel-gw-listener.c:338
+#: camel/providers/groupwise/camel-gw-listener.c:331
+#: camel/providers/groupwise/camel-gw-listener.c:361
msgid "Calendar"
msgstr "Календарь"
@@ -4319,7 +4296,8 @@ msgid "New all day appointment"
msgstr "Новая встреча на весь день"
#: calendar/gui/calendar-component.c:1255
-msgid "All _Day Appointment"
+#, fuzzy
+msgid "All Day A_ppointment"
msgstr "Еже_дневная встреча"
#: calendar/gui/calendar-component.c:1256
@@ -4811,8 +4789,8 @@ msgstr "Добавление нового календаря"
#: calendar/gui/dialogs/calendar-setup.glade.h:3
#, fuzzy
-msgid "Add Tasks Group"
-msgstr "Группа списка задач"
+msgid "Add Task List"
+msgstr "Добавить новый список задач"
#: calendar/gui/dialogs/calendar-setup.glade.h:4
#, fuzzy
@@ -4965,17 +4943,17 @@ msgstr ""
msgid "Unable to use current version!"
msgstr "Не удается использовать текущую версию!"
-#: calendar/gui/dialogs/copy-source-dialog.c:57
+#: calendar/gui/dialogs/copy-source-dialog.c:61
#, fuzzy
msgid "Could not open source"
msgstr "Не удается открыть \"%s\": %s"
-#: calendar/gui/dialogs/copy-source-dialog.c:65
+#: calendar/gui/dialogs/copy-source-dialog.c:69
#, fuzzy
msgid "Could not open destination"
msgstr "Назначение:"
-#: calendar/gui/dialogs/copy-source-dialog.c:74
+#: calendar/gui/dialogs/copy-source-dialog.c:78
msgid "Destination is read only"
msgstr ""
@@ -5055,15 +5033,12 @@ msgid "Scheduling"
msgstr "Планировка"
#: calendar/gui/dialogs/event-editor.c:176
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384
#, fuzzy
msgid "Invitations"
msgstr "Ориентация"
-#: calendar/gui/dialogs/event-editor.c:242
-#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
-msgid "Meeting"
-msgstr "Собрание"
-
#: calendar/gui/dialogs/event-page.c:692
#, fuzzy
msgid "Event with no start date"
@@ -5170,23 +5145,24 @@ msgstr "Классификация"
#: calendar/gui/dialogs/event-page.glade.h:12
#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:349 calendar/gui/e-calendar-table.c:377
+#: calendar/gui/e-cal-model.c:355 calendar/gui/e-calendar-table.c:377
msgid "Confidential"
msgstr "Конфиденциальное"
#: calendar/gui/dialogs/event-page.glade.h:13
-msgid "L_ocation:"
-msgstr "Мес_то:"
+#, fuzzy
+msgid "Locat_ion:"
+msgstr "Расположение:"
#: calendar/gui/dialogs/event-page.glade.h:14
#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:347 calendar/gui/e-calendar-table.c:376
+#: calendar/gui/e-cal-model.c:353 calendar/gui/e-calendar-table.c:376
msgid "Private"
msgstr "Личное"
#: calendar/gui/dialogs/event-page.glade.h:15
#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:338 calendar/gui/e-cal-model.c:345
+#: calendar/gui/e-cal-model.c:344 calendar/gui/e-cal-model.c:351
#: calendar/gui/e-calendar-table.c:375
msgid "Public"
msgstr "Общее"
@@ -5226,10 +5202,10 @@ msgid "_Start time:"
msgstr "Нача_ло:"
#. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:313
-#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: calendar/gui/dialogs/meeting-page.c:316
+#: calendar/gui/dialogs/meeting-page.glade.h:5
#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
-#: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
+#: composer/e-msg-composer.c:2097 filter/filter-rule.c:877
#: mail/em-account-prefs.c:427 mail/em-folder-view.c:933
#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
#: mail/mail-config.glade.h:103
@@ -5239,23 +5215,23 @@ msgstr "Нача_ло:"
msgid "None"
msgstr "Нет"
-#: calendar/gui/dialogs/meeting-page.c:443
+#: calendar/gui/dialogs/meeting-page.c:449
msgid "The organizer selected no longer has an account."
msgstr "Выбранный организатор больше не имеет учетной записи."
-#: calendar/gui/dialogs/meeting-page.c:449
+#: calendar/gui/dialogs/meeting-page.c:455
msgid "An organizer is required."
msgstr "Требуется организатор."
-#: calendar/gui/dialogs/meeting-page.c:464
+#: calendar/gui/dialogs/meeting-page.c:470
msgid "At least one attendee is required."
msgstr "Требуется как минимум один участник"
-#: calendar/gui/dialogs/meeting-page.c:753
+#: calendar/gui/dialogs/meeting-page.c:764
msgid "_Delegate To..."
msgstr "Доверить..."
-#: calendar/gui/dialogs/meeting-page.c:757
+#: calendar/gui/dialogs/meeting-page.c:768
#: composer/e-msg-composer-attachment-bar.c:453
msgid "_Remove"
msgstr "Удалить"
@@ -5313,28 +5289,28 @@ msgstr "Состояние"
#: calendar/gui/dialogs/meeting-page.glade.h:2
#, fuzzy
-msgid "<b>Attendees</b>"
+msgid "<b>Att_endees</b>"
msgstr "<b>Сигналы</b> "
#: calendar/gui/dialogs/meeting-page.glade.h:3
#, fuzzy
-msgid "<b>Organizer</b>"
-msgstr "<b>Прочее</b> "
-
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-#, fuzzy
-msgid "Change Or_ganizer"
+msgid "C_hange Organizer"
msgstr "Изменить организатора"
-#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/dialogs/meeting-page.glade.h:4
#: calendar/gui/e-meeting-time-sel.c:415
#, fuzzy
msgid "Con_tacts..."
msgstr "Контакты"
-#: calendar/gui/dialogs/meeting-page.glade.h:7
+#: calendar/gui/dialogs/meeting-page.glade.h:6
#, fuzzy
-msgid "_Organizer:"
+msgid "Or_ganizer:"
+msgstr "Организатор:"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
msgstr "Организатор:"
#: calendar/gui/dialogs/new-calendar.glade.h:2
@@ -5502,17 +5478,17 @@ msgstr "неделя"
msgid "year(s)"
msgstr "год(лет)"
-#: calendar/gui/dialogs/select-source-dialog.c:84
+#: calendar/gui/dialogs/select-source-dialog.c:88
#, fuzzy
msgid "Select destination"
msgstr "Назначение:"
-#: calendar/gui/dialogs/select-source-dialog.c:106
+#: calendar/gui/dialogs/select-source-dialog.c:110
#, fuzzy
msgid "_Destination"
msgstr "Папка _черновиков:"
-#: calendar/gui/dialogs/select-source-dialog.c:108
+#: calendar/gui/dialogs/select-source-dialog.c:112
msgid "Task List"
msgstr "Список задач"
@@ -5543,7 +5519,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:397 mail/message-list.c:960
+#: calendar/gui/e-calendar-table.c:397 mail/message-list.c:1012
msgid "High"
msgstr "Высокий"
@@ -5557,13 +5533,13 @@ msgstr "В процессе"
#: calendar/gui/dialogs/task-details-page.glade.h:7
#: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:399 mail/message-list.c:958
+#: calendar/gui/e-calendar-table.c:399 mail/message-list.c:1010
msgid "Low"
msgstr "Низкий"
#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:930
-#: calendar/gui/e-calendar-table.c:398 mail/message-list.c:959
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:943
+#: calendar/gui/e-calendar-table.c:398 mail/message-list.c:1011
msgid "Normal"
msgstr "Нормальный"
@@ -5631,10 +5607,8 @@ msgid "<span weight=\"bold\">Date and Time</span>"
msgstr "<span weight=\"bold\">Удаление почты</span>"
#: calendar/gui/dialogs/task-page.glade.h:7
-#: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
-msgid "Description:"
+#, fuzzy
+msgid "D_escription:"
msgstr "Описание:"
#: calendar/gui/dialogs/task-page.glade.h:10
@@ -5786,7 +5760,7 @@ msgstr "%s на %s"
msgid "%s for an unknown trigger type"
msgstr "%s для неизвестного типа переключателя"
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2380
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2385
#, c-format
msgid "Click to open %s"
msgstr "Нажмите, чтобы открыть %s"
@@ -5819,6 +5793,12 @@ msgstr "Состояние:"
msgid "Priority:"
msgstr "Приоритет:"
+#: calendar/gui/e-cal-component-preview.c:268
+#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
+msgid "Description:"
+msgstr "Описание:"
+
#: calendar/gui/e-cal-component-preview.c:300
#, fuzzy
msgid "Web Page:"
@@ -5838,11 +5818,11 @@ msgstr "Дата начала"
msgid "Summary"
msgstr "Сводка"
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:449
+#: calendar/gui/e-cal-model-calendar.c:175 calendar/gui/e-calendar-table.c:449
msgid "Free"
msgstr "Свободен"
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:450
+#: calendar/gui/e-cal-model-calendar.c:178 calendar/gui/e-calendar-table.c:450
#: calendar/gui/e-meeting-time-sel.c:399
msgid "Busy"
msgstr "Занят"
@@ -5873,43 +5853,43 @@ msgstr ""
"\n"
"45.436845,125.862501"
-#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:936
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:949
#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
msgid "Yes"
msgstr "Да"
-#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:936
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:949
#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
msgid "No"
msgstr "Нет"
#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:351 calendar/gui/e-cal-model.c:354
-#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-cal-model.c:357 calendar/gui/e-cal-model.c:360
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1187
#: 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:1763 camel/camel-gpg-context.c:1814
#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1379
-#: camel/providers/imap4/camel-imap4-engine.c:1406
-#: camel/providers/imap4/camel-imap4-engine.c:1436
-#: camel/providers/imap4/camel-imap4-engine.c:1476
-#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-engine.c:1382
+#: camel/providers/imap4/camel-imap4-engine.c:1412
+#: camel/providers/imap4/camel-imap4-engine.c:1444
+#: camel/providers/imap4/camel-imap4-engine.c:1486
+#: camel/providers/imap4/camel-imap4-store.c:1222
#: camel/providers/imap4/camel-imap4-utils.c:457
#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1121
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1123
#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
#: widgets/misc/e-charset-picker.c:62
msgid "Unknown"
msgstr "Неизвестно"
-#: calendar/gui/e-cal-model.c:932
+#: calendar/gui/e-cal-model.c:945
msgid "Recurring"
msgstr "Повторение"
-#: calendar/gui/e-cal-model.c:934
+#: calendar/gui/e-cal-model.c:947
msgid "Assigned"
msgstr "Назначено"
@@ -5961,79 +5941,79 @@ msgstr "100%"
msgid "Deleting selected objects"
msgstr "Удаление выделенных объектов"
-#: calendar/gui/e-calendar-table.c:866 calendar/gui/e-calendar-view.c:762
+#: calendar/gui/e-calendar-table.c:867 calendar/gui/e-calendar-view.c:762
msgid "Updating objects"
msgstr "Обновление объектов"
-#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1083
-#: calendar/gui/e-calendar-view.c:1364 calendar/gui/e-calendar-view.c:1444
+#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1084
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1440
#: mail/em-folder-view.c:899 ui/evolution-addressbook.xml.h:37
msgid "_Open"
msgstr "_Открыть"
-#: calendar/gui/e-calendar-table.c:1043
+#: calendar/gui/e-calendar-table.c:1044
msgid "Open _Web Page"
msgstr "Открыть _веб-страницу"
-#: calendar/gui/e-calendar-table.c:1044 calendar/gui/e-calendar-table.c:1089
-#: calendar/gui/e-calendar-view.c:1365 calendar/gui/e-calendar-view.c:1450
+#: calendar/gui/e-calendar-table.c:1045 calendar/gui/e-calendar-table.c:1090
+#: calendar/gui/e-calendar-view.c:1361 calendar/gui/e-calendar-view.c:1446
#: mail/em-folder-view.c:901 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:1045 calendar/gui/e-calendar-table.c:1087
-#: calendar/gui/e-calendar-view.c:1343 calendar/gui/e-calendar-view.c:1366
-#: calendar/gui/e-calendar-view.c:1448 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:1046 calendar/gui/e-calendar-table.c:1088
+#: calendar/gui/e-calendar-view.c:1339 calendar/gui/e-calendar-view.c:1362
+#: calendar/gui/e-calendar-view.c:1444 ui/evolution-addressbook.xml.h:40
#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
#: ui/evolution-tasks.xml.h:25
msgid "_Print..."
msgstr "_Печать..."
-#: calendar/gui/e-calendar-table.c:1049 calendar/gui/e-calendar-table.c:1078
-#: calendar/gui/e-calendar-view.c:1371 calendar/gui/e-calendar-view.c:1414
+#: calendar/gui/e-calendar-table.c:1050 calendar/gui/e-calendar-table.c:1079
+#: calendar/gui/e-calendar-view.c:1367 calendar/gui/e-calendar-view.c:1410
#: 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:1050 calendar/gui/e-calendar-table.c:1076
-#: calendar/gui/e-calendar-view.c:1372 calendar/gui/e-calendar-view.c:1412
-#: mail/em-folder-tree.c:965 mail/message-list.c:1650
+#: calendar/gui/e-calendar-table.c:1051 calendar/gui/e-calendar-table.c:1077
+#: calendar/gui/e-calendar-view.c:1368 calendar/gui/e-calendar-view.c:1408
+#: mail/em-folder-tree.c:965 mail/message-list.c:1702
#: 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:1051 calendar/gui/e-calendar-table.c:1085
-#: calendar/gui/e-calendar-view.c:1347 calendar/gui/e-calendar-view.c:1373
-#: calendar/gui/e-calendar-view.c:1446 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-table.c:1052 calendar/gui/e-calendar-table.c:1086
+#: calendar/gui/e-calendar-view.c:1343 calendar/gui/e-calendar-view.c:1369
+#: calendar/gui/e-calendar-view.c:1442 ui/evolution-addressbook.xml.h:38
#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
msgid "_Paste"
msgstr "Вст_авить"
-#: calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-table.c:1056
msgid "_Assign Task"
msgstr "_Назначить задачу"
-#: calendar/gui/e-calendar-table.c:1056
+#: calendar/gui/e-calendar-table.c:1057
msgid "_Forward as iCalendar"
msgstr "_Переслать как iCalendar"
-#: calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-table.c:1058
msgid "_Mark as Complete"
msgstr "По_метить как выполненное"
-#: calendar/gui/e-calendar-table.c:1058
+#: calendar/gui/e-calendar-table.c:1059
msgid "_Mark Selected Tasks as Complete"
msgstr "По_метить выбранную задачу как выполненную"
#. FIXME: need to disable for undeletable folders
-#: calendar/gui/e-calendar-table.c:1062 calendar/gui/e-calendar-table.c:1080
-#: calendar/gui/e-calendar-view.c:1384 calendar/gui/e-calendar-view.c:1416
+#: calendar/gui/e-calendar-table.c:1063 calendar/gui/e-calendar-table.c:1081
+#: calendar/gui/e-calendar-view.c:1380 calendar/gui/e-calendar-view.c:1412
#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:924
#: 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
@@ -6041,16 +6021,16 @@ msgstr "По_метить выбранную задачу как выполне
msgid "_Delete"
msgstr "_Удалить"
-#: calendar/gui/e-calendar-table.c:1063 calendar/gui/e-calendar-table.c:1081
+#: calendar/gui/e-calendar-table.c:1064 calendar/gui/e-calendar-table.c:1082
msgid "_Delete Selected Tasks"
msgstr "У_далить выделенные задачи"
-#: calendar/gui/e-calendar-table.c:1195 calendar/gui/e-calendar-view.c:1064
-#: composer/e-msg-composer.c:1193
+#: calendar/gui/e-calendar-table.c:1196 calendar/gui/e-calendar-view.c:1060
+#: composer/e-msg-composer.c:1178
msgid "Save as..."
msgstr "Сохранить как..."
-#: calendar/gui/e-calendar-table.c:1373
+#: calendar/gui/e-calendar-table.c:1374
#: calendar/gui/e-calendar-table.etspec.h:4
msgid "Click to add a task"
msgstr "Щёлкните здесь, чтобы добавить задачу"
@@ -6088,81 +6068,81 @@ msgstr "Дата начала"
msgid "Task sort"
msgstr "Сортировка задач"
-#: calendar/gui/e-calendar-view.c:1180
+#: calendar/gui/e-calendar-view.c:1176
#, fuzzy
msgid "Moving items"
msgstr "Перемещение сообщений"
-#: calendar/gui/e-calendar-view.c:1182
+#: calendar/gui/e-calendar-view.c:1178
#, fuzzy
msgid "Copying items"
msgstr "Копирование сообщений"
-#: calendar/gui/e-calendar-view.c:1336 calendar/gui/e-calendar-view.c:1424
+#: calendar/gui/e-calendar-view.c:1332 calendar/gui/e-calendar-view.c:1420
msgid "New _Appointment..."
msgstr "Новая _встреча..."
-#: calendar/gui/e-calendar-view.c:1337 calendar/gui/e-calendar-view.c:1429
+#: calendar/gui/e-calendar-view.c:1333 calendar/gui/e-calendar-view.c:1425
msgid "New All Day _Event"
msgstr "Новое ежедневное событие"
-#: calendar/gui/e-calendar-view.c:1338 calendar/gui/e-calendar-view.c:1434
+#: calendar/gui/e-calendar-view.c:1334 calendar/gui/e-calendar-view.c:1430
msgid "New Meeting"
msgstr "Новое собрание"
-#: calendar/gui/e-calendar-view.c:1339 calendar/gui/e-calendar-view.c:1439
+#: calendar/gui/e-calendar-view.c:1335 calendar/gui/e-calendar-view.c:1435
msgid "New Task"
msgstr "Новая задача"
-#: calendar/gui/e-calendar-view.c:1353 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1349 ui/evolution-calendar.xml.h:26
#, fuzzy
msgid "Select _Today"
msgstr "Выделить подшивку"
-#: calendar/gui/e-calendar-view.c:1354
+#: calendar/gui/e-calendar-view.c:1350
#, fuzzy
msgid "_Select Date..."
msgstr "_Выбрать..."
-#: calendar/gui/e-calendar-view.c:1358 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1354 ui/evolution-calendar.xml.h:45
msgid "_Publish Free/Busy Information"
msgstr "Опубликовать информацию о занятости"
-#: calendar/gui/e-calendar-view.c:1377
+#: calendar/gui/e-calendar-view.c:1373
#, fuzzy
msgid "Cop_y to Calendar..."
msgstr "Копировать в папку..."
-#: calendar/gui/e-calendar-view.c:1378
+#: calendar/gui/e-calendar-view.c:1374
#, fuzzy
msgid "Mo_ve to Calendar..."
msgstr "Переместить в папку..."
-#: calendar/gui/e-calendar-view.c:1379
+#: calendar/gui/e-calendar-view.c:1375
msgid "_Schedule Meeting..."
msgstr "_Назначить собрание..."
-#: calendar/gui/e-calendar-view.c:1380
+#: calendar/gui/e-calendar-view.c:1376
msgid "_Forward as iCalendar..."
msgstr "_Переслать как iCalendar..."
-#: calendar/gui/e-calendar-view.c:1385 calendar/gui/e-calendar-view.c:1417
+#: calendar/gui/e-calendar-view.c:1381 calendar/gui/e-calendar-view.c:1413
msgid "Delete this _Occurrence"
msgstr "Удалить это вхождение"
-#: calendar/gui/e-calendar-view.c:1386 calendar/gui/e-calendar-view.c:1418
+#: calendar/gui/e-calendar-view.c:1382 calendar/gui/e-calendar-view.c:1414
msgid "Delete _All Occurrences"
msgstr "Удалить все вхождения"
-#: calendar/gui/e-calendar-view.c:1420
+#: calendar/gui/e-calendar-view.c:1416
msgid "Go to _Today"
msgstr "Перейти к сег_одняшнему дню"
-#: calendar/gui/e-calendar-view.c:1422
+#: calendar/gui/e-calendar-view.c:1418
msgid "_Go to Date..."
msgstr "Пере_йти к дате..."
-#: calendar/gui/e-calendar-view.c:1452 ui/evolution.xml.h:35
+#: calendar/gui/e-calendar-view.c:1448 ui/evolution.xml.h:35
msgid "_Settings..."
msgstr "_Настройка..."
@@ -6202,13 +6182,13 @@ msgid "%A %d %B"
msgstr "%A, %d %B"
#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:583
#: calendar/gui/print.c:838
msgid "am"
msgstr "am"
#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:586
#: calendar/gui/print.c:840
msgid "pm"
msgstr "pm"
@@ -6342,7 +6322,7 @@ msgstr "Отклонено"
#: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056
#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095
-#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1121
+#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1133
msgid "Choose an action:"
msgstr "Выберите действие:"
@@ -6352,8 +6332,8 @@ msgstr "Обновить"
#: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
-#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
-#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1135
+#: shell/e-shell.c:1210 widgets/misc/e-cell-date-edit.c:265
msgid "OK"
msgstr "Ок"
@@ -6381,228 +6361,239 @@ msgstr "Обновить состояние"
msgid "Send Latest Information"
msgstr "Отправить последнюю информацию"
-#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1119
+msgid ""
+"The meeting has been cancelled, however it could not be found in your "
+"calendars"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1121
+msgid ""
+"The task has been cancelled, however it could not be found in your task lists"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1134 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:1198
+#: calendar/gui/e-itip-control.c:1210
#, c-format
msgid "<b>%s</b> has published meeting information."
msgstr "<b>%s</b> опубликовал последнюю информацию о собрании."
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1211
msgid "Meeting Information"
msgstr "Информация о собрании"
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1216
#, 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:1206
+#: calendar/gui/e-itip-control.c:1218
#, c-format
msgid "<b>%s</b> requests your presence at a meeting."
msgstr "<b>%s</b> запрашивает ваше присутствие на собрании."
-#: calendar/gui/e-itip-control.c:1207
+#: calendar/gui/e-itip-control.c:1219
msgid "Meeting Proposal"
msgstr "Предложение собрания"
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1253
#, c-format
msgid "<b>%s</b> wishes to add to an existing meeting."
msgstr "<b>%s</b> желает добавить к существующему собранию."
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1254
msgid "Meeting Update"
msgstr "Обновление собрания"
-#: calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1258
#, c-format
msgid "<b>%s</b> wishes to receive the latest meeting information."
msgstr "<b>%s</b> желает получить последнюю информацию о собрании."
-#: calendar/gui/e-itip-control.c:1217
+#: calendar/gui/e-itip-control.c:1259
msgid "Meeting Update Request"
msgstr "Запрос обновления собрания"
-#: calendar/gui/e-itip-control.c:1224
+#: calendar/gui/e-itip-control.c:1266
#, c-format
msgid "<b>%s</b> has replied to a meeting request."
msgstr "<b>%s</b> ответил на приглашение на собрание."
-#: calendar/gui/e-itip-control.c:1225
+#: calendar/gui/e-itip-control.c:1267
msgid "Meeting Reply"
msgstr "Ответ собрания"
-#: calendar/gui/e-itip-control.c:1232
+#: calendar/gui/e-itip-control.c:1274
#, c-format
msgid "<b>%s</b> has cancelled a meeting."
msgstr "<b>%s</b> отменил собрание."
-#: calendar/gui/e-itip-control.c:1233
+#: calendar/gui/e-itip-control.c:1275
msgid "Meeting Cancellation"
msgstr "Отмена собрания"
-#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1308
-#: calendar/gui/e-itip-control.c:1343
+#: calendar/gui/e-itip-control.c:1282 calendar/gui/e-itip-control.c:1350
+#: calendar/gui/e-itip-control.c:1385
#, c-format
msgid "<b>%s</b> has sent an unintelligible message."
msgstr "<b>%s</b> отправил невразумительное сообщение."
-#: calendar/gui/e-itip-control.c:1241
+#: calendar/gui/e-itip-control.c:1283
msgid "Bad Meeting Message"
msgstr "Неверное сообщение собрания"
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1308
#, c-format
msgid "<b>%s</b> has published task information."
msgstr "<b>%s</b> опубликовал информацию о задаче"
-#: calendar/gui/e-itip-control.c:1267
+#: calendar/gui/e-itip-control.c:1309
msgid "Task Information"
msgstr "Информация о задаче"
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1314
#, c-format
msgid "<b>%s</b> requests %s to perform a task."
msgstr "<b>%s</b> запрашивает %s для выполнения задачи."
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1316
#, c-format
msgid "<b>%s</b> requests you perform a task."
msgstr "<b>%s</b> запрашивает, чтобы вы выполнили задачу."
-#: calendar/gui/e-itip-control.c:1275
+#: calendar/gui/e-itip-control.c:1317
msgid "Task Proposal"
msgstr "Предложение задачи"
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1321
#, c-format
msgid "<b>%s</b> wishes to add to an existing task."
msgstr "<b>%s</b> желает добавить к существующей задаче."
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1322
msgid "Task Update"
msgstr "Обновление задачи"
-#: calendar/gui/e-itip-control.c:1284
+#: calendar/gui/e-itip-control.c:1326
#, c-format
msgid "<b>%s</b> wishes to receive the latest task information."
msgstr "<b>%s</b> желает получить последнюю информацию о задаче."
-#: calendar/gui/e-itip-control.c:1285
+#: calendar/gui/e-itip-control.c:1327
msgid "Task Update Request"
msgstr "Запрос обновления задачи"
-#: calendar/gui/e-itip-control.c:1292
+#: calendar/gui/e-itip-control.c:1334
#, c-format
msgid "<b>%s</b> has replied to a task assignment."
msgstr "<b>%s</b> ответил на назначение задачи."
-#: calendar/gui/e-itip-control.c:1293
+#: calendar/gui/e-itip-control.c:1335
msgid "Task Reply"
msgstr "Ответ собрания"
-#: calendar/gui/e-itip-control.c:1300
+#: calendar/gui/e-itip-control.c:1342
#, c-format
msgid "<b>%s</b> has cancelled a task."
msgstr "<b>%s</b> отменил задачу."
-#: calendar/gui/e-itip-control.c:1301
+#: calendar/gui/e-itip-control.c:1343
msgid "Task Cancellation"
msgstr "Отмена задачи"
-#: calendar/gui/e-itip-control.c:1309
+#: calendar/gui/e-itip-control.c:1351
msgid "Bad Task Message"
msgstr "Сообщение календаря"
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1370
#, c-format
msgid "<b>%s</b> has published free/busy information."
msgstr "<b>%s</b> опубликовал информацию о занятости."
-#: calendar/gui/e-itip-control.c:1329
+#: calendar/gui/e-itip-control.c:1371
msgid "Free/Busy Information"
msgstr "Информация о занятости"
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1375
#, c-format
msgid "<b>%s</b> requests your free/busy information."
msgstr "<b>%s</b> запрашивает информацию о вашей занятости."
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1376
msgid "Free/Busy Request"
msgstr "Запрос информации о занятости"
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1380
#, c-format
msgid "<b>%s</b> has replied to a free/busy request."
msgstr "<b>%s</b> ответил на запрос информации о занятости."
-#: calendar/gui/e-itip-control.c:1339
+#: calendar/gui/e-itip-control.c:1381
msgid "Free/Busy Reply"
msgstr "Ответ занятости"
-#: calendar/gui/e-itip-control.c:1344
+#: calendar/gui/e-itip-control.c:1386
msgid "Bad Free/Busy Message"
msgstr "Неверное сообщение о занятости"
-#: calendar/gui/e-itip-control.c:1419
+#: calendar/gui/e-itip-control.c:1461
msgid "The message does not appear to be properly formed"
msgstr "Похоже что сообщение не было правильно сформировано"
-#: calendar/gui/e-itip-control.c:1478
+#: calendar/gui/e-itip-control.c:1520
msgid "The message contains only unsupported requests."
msgstr "Это сообщение содержит только неподдерживаемые запросы"
-#: calendar/gui/e-itip-control.c:1509
+#: calendar/gui/e-itip-control.c:1551
msgid "The attachment does not contain a valid calendar message"
msgstr "Вложение не содержит правильного сообщения календаря."
-#: calendar/gui/e-itip-control.c:1541
+#: calendar/gui/e-itip-control.c:1583
msgid "The attachment has no viewable calendar items"
msgstr "Вложение не содержит пригодных для просмотра элементов календаря."
-#: calendar/gui/e-itip-control.c:1775
+#: calendar/gui/e-itip-control.c:1817
msgid "Update complete\n"
msgstr "Обновление закончено\n"
-#: calendar/gui/e-itip-control.c:1803
+#: calendar/gui/e-itip-control.c:1845
msgid "Object is invalid and cannot be updated\n"
msgstr "Объект некорректен и не может быть обновлен\n"
-#: calendar/gui/e-itip-control.c:1813
+#: calendar/gui/e-itip-control.c:1855
msgid "This response is not from a current attendee. Add as an attendee?"
msgstr ""
"Этот ответ пришел не от текущего участника. Добавить его, как участника?"
-#: calendar/gui/e-itip-control.c:1825
+#: calendar/gui/e-itip-control.c:1867
msgid "Attendee status could not be updated because of an invalid status!\n"
msgstr ""
"Статус участника не может быть обновлён из-за неверного текущего статуса!\n"
-#: calendar/gui/e-itip-control.c:1842
+#: calendar/gui/e-itip-control.c:1884
msgid "Attendee status updated\n"
msgstr "Статус участника обновлён!\n"
-#: calendar/gui/e-itip-control.c:1845
+#: calendar/gui/e-itip-control.c:1887
msgid "Attendee status can not be updated because the item no longer exists"
msgstr ""
"Статус участника не может быть обновлён, потому что элемент больше не "
"существует"
-#: calendar/gui/e-itip-control.c:1872
+#: calendar/gui/e-itip-control.c:1914
msgid "Removal Complete"
msgstr "Удаление завершено"
-#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
+#: calendar/gui/e-itip-control.c:1937 calendar/gui/e-itip-control.c:1985
msgid "Item sent!\n"
msgstr "Элемент отправлен!\n"
-#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
+#: calendar/gui/e-itip-control.c:1939 calendar/gui/e-itip-control.c:1989
msgid "The item could not be sent!\n"
msgstr "Элемент не может быть послан!\n"
@@ -6631,10 +6622,6 @@ msgstr "Загрузка календаря"
msgid "Loading calendar..."
msgstr "Загрузка календаря..."
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Организатор:"
-
#: calendar/gui/e-itip-control.glade.h:10
msgid "Server Message:"
msgstr "Сообщение сервера:"
@@ -6721,14 +6708,14 @@ msgstr "В процессе"
#. This is a strftime() format string %A = full weekday name,
#. %B = full month name, %d = month day, %Y = full year.
#: calendar/gui/e-meeting-time-sel-item.c:452
-#: calendar/gui/e-meeting-time-sel.c:2053
+#: calendar/gui/e-meeting-time-sel.c:2069
msgid "%A, %B %d, %Y"
msgstr "%A, %d %B %Y"
#. This is a strftime() format string %a = abbreviated weekday
#. name, %m = month number, %d = month day, %Y = full year.
#: calendar/gui/e-meeting-time-sel-item.c:456
-#: calendar/gui/e-meeting-time-sel.c:2086 e-util/e-time-utils.c:203
+#: calendar/gui/e-meeting-time-sel.c:2102 e-util/e-time-utils.c:203
#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
msgid "%a %m/%d/%Y"
msgstr "%a, %d.%m.%Y"
@@ -6805,7 +6792,7 @@ msgstr "Требуемые люди и один ресурс"
msgid "Enter the password for %s"
msgstr "Введите пароль для %s"
-#: calendar/gui/e-tasks.c:744 calendar/gui/gnome-cal.c:2250
+#: calendar/gui/e-tasks.c:744 calendar/gui/gnome-cal.c:2255
#, c-format
msgid ""
"Error on %s:\n"
@@ -6818,20 +6805,20 @@ msgstr ""
msgid "Loading tasks"
msgstr "Загрузка задач"
-#: calendar/gui/e-tasks.c:869
+#: calendar/gui/e-tasks.c:873
#, c-format
msgid "Opening tasks at %s"
msgstr "Открытие задач %s"
-#: calendar/gui/e-tasks.c:1066
+#: calendar/gui/e-tasks.c:1070
msgid "Completing tasks..."
msgstr "Завершение выполнения задач..."
-#: calendar/gui/e-tasks.c:1089
+#: calendar/gui/e-tasks.c:1093
msgid "Deleting selected objects..."
msgstr "Удаление выделенных объектов..."
-#: calendar/gui/e-tasks.c:1116
+#: calendar/gui/e-tasks.c:1120
msgid "Expunging"
msgstr "Очистка папки"
@@ -6840,22 +6827,22 @@ msgstr "Очистка папки"
msgid "Updating query"
msgstr "Обновление объектов"
-#: calendar/gui/gnome-cal.c:2036
+#: calendar/gui/gnome-cal.c:2038
#, fuzzy, c-format
msgid "Loading appointments at %s"
msgstr "Встреча - %s"
-#: calendar/gui/gnome-cal.c:2055
+#: calendar/gui/gnome-cal.c:2057
#, fuzzy, c-format
msgid "Loading tasks at %s"
msgstr "Загрузка задач"
-#: calendar/gui/gnome-cal.c:2139
+#: calendar/gui/gnome-cal.c:2144
#, c-format
msgid "Opening %s"
msgstr "Открывается %s"
-#: calendar/gui/gnome-cal.c:3106
+#: calendar/gui/gnome-cal.c:3111
#, fuzzy
msgid "Purging"
msgstr "Турин"
@@ -6972,7 +6959,7 @@ msgstr "Информация iCalendar"
msgid "You must be an attendee of the event."
msgstr "Вы должны быть участником события."
-#: calendar/gui/migration.c:146
+#: calendar/gui/migration.c:150
msgid ""
"The location and hierarchy of the Evolution task folders has changed since "
"Evolution 1.x.\n"
@@ -6984,7 +6971,7 @@ msgstr ""
"\n"
"Производится преобразование папок для новой версии..."
-#: calendar/gui/migration.c:150
+#: calendar/gui/migration.c:154
msgid ""
"The location and hierarchy of the Evolution calendar folders has changed "
"since Evolution 1.x.\n"
@@ -6996,28 +6983,28 @@ msgstr ""
"\n"
"Производится преобразование папок для новой версии..."
-#: calendar/gui/migration.c:376
+#: calendar/gui/migration.c:380
msgid "Birthdays & Anniversaries"
msgstr "Дни рождения и годовщины"
#. Create the Webcal source group
-#: calendar/gui/migration.c:462 calendar/gui/migration.c:544
+#: calendar/gui/migration.c:466 calendar/gui/migration.c:548
msgid "On The Web"
msgstr "В Сети"
#. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
+#: calendar/gui/migration.c:712 calendar/gui/migration.c:864
msgid "Unable to migrate old settings from evolution/config.xmldb"
msgstr ""
#. FIXME: domain/code
-#: calendar/gui/migration.c:737
+#: calendar/gui/migration.c:741
#, fuzzy, c-format
msgid "Unable to migrate calendar `%s'"
msgstr "Не удаётся открыть календарь '%s'."
#. FIXME: domain/code
-#: calendar/gui/migration.c:889
+#: calendar/gui/migration.c:893
#, fuzzy, c-format
msgid "Unable to migrate tasks `%s'"
msgstr "Не удается открыть задачи в '%s'."
@@ -7249,16 +7236,16 @@ msgstr "Напечатать элемент"
msgid "Print Setup"
msgstr "Настройка печати"
-#: calendar/gui/tasks-component.c:313
+#: calendar/gui/tasks-component.c:314
#, c-format
msgid "Task List '%s' will be removed. Are you sure you want to continue?"
msgstr "Список задач '%s' будет удален. Вы действительно хотите продолжить?"
-#: calendar/gui/tasks-component.c:371
+#: calendar/gui/tasks-component.c:372
msgid "New Task List"
msgstr "Новый список задач"
-#: calendar/gui/tasks-component.c:414
+#: calendar/gui/tasks-component.c:415
#, fuzzy, c-format
msgid "%d task"
msgid_plural "%d tasks"
@@ -7266,7 +7253,7 @@ msgstr[0] "%d контактов"
msgstr[1] "%d контактов"
msgstr[2] "%d контактов"
-#: calendar/gui/tasks-component.c:416 mail/mail-component.c:498
+#: calendar/gui/tasks-component.c:417 mail/mail-component.c:498
#, fuzzy, c-format
msgid ", %d selected"
msgid_plural ", %d selected"
@@ -7274,45 +7261,60 @@ msgstr[0] "Удалённое"
msgstr[1] "Удалённое"
msgstr[2] "Удалённое"
-#: calendar/gui/tasks-component.c:463
+#: calendar/gui/tasks-component.c:464
#, fuzzy
msgid "Failed upgrading tasks."
msgstr "Загрузка задач"
-#: calendar/gui/tasks-component.c:755
+#: calendar/gui/tasks-component.c:756
#, c-format
msgid "Unable to open the task list '%s' for creating events and meetings"
msgstr "Не удается открыть список задач '%s' для создания событий и собраний"
-#: calendar/gui/tasks-component.c:767
+#: calendar/gui/tasks-component.c:768
msgid "There is no calendar available for creating tasks"
msgstr ""
-#: calendar/gui/tasks-component.c:1038
+#: calendar/gui/tasks-component.c:1042
msgid "New task"
msgstr "Новая задача"
-#: calendar/gui/tasks-component.c:1039
+#: calendar/gui/tasks-component.c:1043
msgid "_Task"
msgstr "_Задача"
-#: calendar/gui/tasks-component.c:1040
+#: calendar/gui/tasks-component.c:1044
msgid "Create a new task"
msgstr "Создать новую задачу"
-#: calendar/gui/tasks-component.c:1046
+#: calendar/gui/tasks-component.c:1050
#, fuzzy
-msgid "New tasks group"
-msgstr "Новая задача"
+msgid "New assigned task"
+msgstr "Назначить задачу"
-#: calendar/gui/tasks-component.c:1047
+#: calendar/gui/tasks-component.c:1051
#, fuzzy
-msgid "Tasks Gro_up"
-msgstr "Группа списка задач"
+msgid "Assigne_d Task"
+msgstr "Назначить задачу"
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:1052
#, fuzzy
-msgid "Create a new tasks group"
+msgid "Create a new assigned task"
+msgstr "Создать новую задачу"
+
+#: calendar/gui/tasks-component.c:1058
+#, fuzzy
+msgid "New task list"
+msgstr "Новый список задач"
+
+#: calendar/gui/tasks-component.c:1059
+#, fuzzy
+msgid "Task l_ist"
+msgstr "Список задач"
+
+#: calendar/gui/tasks-component.c:1060
+#, fuzzy
+msgid "Create a new task list"
msgstr "Создать новую задачу"
#: calendar/gui/tasks-control.c:367
@@ -7359,20 +7361,20 @@ msgstr "Файлы iCalendar (.ics)"
msgid "vCalendar files (.vcf)"
msgstr "Файлы vCalendar (.vcf)"
-#: calendar/importers/icalendar-importer.c:78
+#: calendar/importers/icalendar-importer.c:82
#, fuzzy
msgid "Appointments and Meetings"
msgstr "Очистить старые встречи и собрания"
-#: calendar/importers/icalendar-importer.c:490
+#: calendar/importers/icalendar-importer.c:494
msgid "Reminder!!"
msgstr "Напоминание!!"
-#: calendar/importers/icalendar-importer.c:698
+#: calendar/importers/icalendar-importer.c:702
msgid "Calendar Events"
msgstr "События календаря"
-#: calendar/importers/icalendar-importer.c:723
+#: calendar/importers/icalendar-importer.c:727
msgid ""
"Evolution has found Gnome Calendar files.\n"
"Would you like to import them into Evolution?"
@@ -7380,7 +7382,7 @@ msgstr ""
"Evolution обнаружены файлы календаря Gnome.\n"
"Хотите импортировать их в Evolution?"
-#: calendar/importers/icalendar-importer.c:730
+#: calendar/importers/icalendar-importer.c:734
msgid "Gnome Calendar"
msgstr "Календарь Gnome"
@@ -10273,30 +10275,49 @@ msgid "Apply filters to new messages in Inbox on this server"
msgstr ""
"Применить фильтры к новым сообщениям в папке \"Входящие\" на этом сервере"
-#: camel/providers/groupwise/camel-groupwise-provider.c:62
+#: camel/providers/groupwise/camel-groupwise-provider.c:61
+#: camel/providers/imap/camel-imap-provider.c:66
+msgid "Check new messages for Junk contents"
+msgstr "Проверять, являются ли новые сообщения спамом"
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:63
+#: camel/providers/imap/camel-imap-provider.c:68
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr ""
+"Проверять, являются ли новые сообщения спамом, только в папке \"Входящие\""
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:65
#: camel/providers/imap/camel-imap-provider.c:70
msgid "Automatically synchronize remote mail locally"
msgstr "Автоматически синхронизировать удаленную почту локально"
-#: camel/providers/groupwise/camel-groupwise-provider.c:66
+#: camel/providers/groupwise/camel-groupwise-provider.c:69
#, fuzzy
msgid "Address Book And Calendar"
msgstr "Адресная книга"
-#: camel/providers/groupwise/camel-groupwise-provider.c:69
+#: camel/providers/groupwise/camel-groupwise-provider.c:72
+msgid "Post Office Agent:"
+msgstr ""
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:75
msgid "Post Office Agent SOAP Port:"
msgstr ""
-#: camel/providers/groupwise/camel-groupwise-provider.c:83
+#: camel/providers/groupwise/camel-groupwise-provider.c:78
+msgid "Use ssl"
+msgstr ""
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:92
msgid "Novell GroupWise"
msgstr "Novell GroupWise"
-#: camel/providers/groupwise/camel-groupwise-provider.c:85
+#: camel/providers/groupwise/camel-groupwise-provider.c:94
#, fuzzy
msgid "For accessing Novell Groupwise servers"
msgstr "Для доступа к серверам Novell Groupwise"
-#: camel/providers/groupwise/camel-groupwise-provider.c:100
+#: camel/providers/groupwise/camel-groupwise-provider.c:109
#: camel/providers/imap/camel-imap-provider.c:93
#: camel/providers/imap4/camel-imap4-provider.c:70
#: camel/providers/imapp/camel-imapp-provider.c:65
@@ -10305,7 +10326,7 @@ msgstr "Для доступа к серверам Novell Groupwise"
msgid "Password"
msgstr "Пароль"
-#: camel/providers/groupwise/camel-groupwise-provider.c:102
+#: camel/providers/groupwise/camel-groupwise-provider.c:111
#: 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."
@@ -10313,8 +10334,8 @@ msgstr ""
"Подключение к серверу IMAP будет производиться с использованием "
"незашифрованного пароля."
-#: camel/providers/groupwise/camel-gw-listener.c:316
-#: camel/providers/groupwise/camel-gw-listener.c:339
+#: camel/providers/groupwise/camel-gw-listener.c:332
+#: camel/providers/groupwise/camel-gw-listener.c:362
#, fuzzy
msgid "Checklist"
msgstr "список"
@@ -10322,22 +10343,22 @@ msgstr "список"
#: 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:3190
+#: camel/providers/imap/camel-imap-store.c:3191
msgid "Operation cancelled"
msgstr "Операция отменена"
#: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3193
+#: camel/providers/imap/camel-imap-store.c:3194
#, c-format
msgid "Server unexpectedly disconnected: %s"
msgstr "Сервер неожиданно отключился: %s"
#: camel/providers/imap/camel-imap-command.c:303
#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/imap4/camel-imap4-store.c:282
#: camel/providers/pop3/camel-pop3-store.c:543
#: camel/providers/pop3/camel-pop3-store.c:550
-#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1220
msgid "Unknown error"
msgstr "Неизвестная ошибка"
@@ -10507,15 +10528,6 @@ msgid "Apply filters to new messages in INBOX on this server"
msgstr ""
"Применить фильтры к новым сообщениям в папке \"Входящие\" на этом сервере"
-#: camel/providers/imap/camel-imap-provider.c:66
-msgid "Check new messages for Junk contents"
-msgstr "Проверять, являются ли новые сообщения спамом"
-
-#: camel/providers/imap/camel-imap-provider.c:68
-msgid "Only check for Junk messages in the INBOX folder"
-msgstr ""
-"Проверять, являются ли новые сообщения спамом, только в папке \"Входящие\""
-
#: camel/providers/imap/camel-imap-provider.c:76
msgid "IMAP"
msgstr "IMAP"
@@ -10525,21 +10537,21 @@ msgid "For reading and storing mail on IMAP servers."
msgstr "Для чтения и хранения почты на серверах IMAP."
#: camel/providers/imap/camel-imap-store.c:424
-#: camel/providers/imap4/camel-imap4-store.c:175
+#: camel/providers/imap4/camel-imap4-store.c:176
#, c-format
msgid "IMAP server %s"
msgstr "Сервер IMAP %s"
#: camel/providers/imap/camel-imap-store.c:426
-#: camel/providers/imap4/camel-imap4-store.c:177
+#: camel/providers/imap4/camel-imap4-store.c:178
#, c-format
msgid "IMAP service for %s on %s"
msgstr "Сервис IMAP для %s на %s"
#: camel/providers/imap/camel-imap-store.c:547
#: camel/providers/imap/camel-imap-store.c:567
-#: camel/providers/imap4/camel-imap4-store.c:218
-#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imap4/camel-imap4-store.c:213
+#: camel/providers/imap4/camel-imap4-store.c:229
#: camel/providers/imapp/camel-imapp-store.c:231
#: camel/providers/nntp/camel-nntp-store.c:209
#: camel/providers/pop3/camel-pop3-store.c:175
@@ -10550,7 +10562,7 @@ msgid "Could not connect to %s (port %d): %s"
msgstr "Не удается подключиться к %s (порт %d): %s"
#: camel/providers/imap/camel-imap-store.c:549
-#: camel/providers/imap4/camel-imap4-store.c:220
+#: camel/providers/imap4/camel-imap4-store.c:215
#: camel/providers/pop3/camel-pop3-store.c:177
#: camel/providers/smtp/camel-smtp-transport.c:271
msgid "SSL unavailable"
@@ -10558,7 +10570,7 @@ msgstr "SSL недоступен"
#: camel/providers/imap/camel-imap-store.c:564
#: camel/providers/imap/camel-imap-store.c:841
-#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imap4/camel-imap4-store.c:226
#: camel/providers/imapp/camel-imapp-store.c:228
#: camel/providers/nntp/camel-nntp-store.c:206
#: camel/providers/nntp/camel-nntp-store.c:224
@@ -10568,7 +10580,7 @@ msgstr "Соединение отменено"
#: camel/providers/imap/camel-imap-store.c:675
#: camel/providers/imap/camel-imap-store.c:706
-#: camel/providers/imap4/camel-imap4-store.c:296
+#: camel/providers/imap4/camel-imap4-store.c:281
#, c-format
msgid "Failed to connect to IMAP server %s in secure mode: %s"
msgstr "Не удается подключиться к серверу IMAP %s в защищенном режиме:%s"
@@ -10628,7 +10640,7 @@ msgstr "Нет такой папки %s"
#: camel/providers/imap/camel-imap-store.c:1881
#: camel/providers/imap/camel-imap-store.c:2259
-#: camel/providers/imap4/camel-imap4-store.c:796
+#: camel/providers/imap4/camel-imap4-store.c:763
#, fuzzy, c-format
msgid ""
"The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10663,34 +10675,29 @@ msgstr "Сбой идентификации на сервере POP %s: %s"
msgid "Unexpected response from IMAP4 server %s: %s"
msgstr "Неожиданный ответ от сервера IMAP: %s"
-#: camel/providers/imap4/camel-imap4-engine.c:232
+#: camel/providers/imap4/camel-imap4-engine.c:229
#, fuzzy, c-format
msgid "Unexpected greeting from IMAP server %s."
msgstr "Неожиданный ответ от сервера IMAP: %s"
-#: camel/providers/imap4/camel-imap4-engine.c:416
+#: camel/providers/imap4/camel-imap4-engine.c:413
#, fuzzy, c-format
msgid "Cannot select folder `%s': Invalid mailbox name"
msgstr "Не удается удалить папку: %s: недопустимая операция"
-#: camel/providers/imap4/camel-imap4-engine.c:422
+#: camel/providers/imap4/camel-imap4-engine.c:419
#, fuzzy, c-format
msgid "Cannot select folder `%s': Bad command"
msgstr "Не удается получить папку: %s: %s"
-#: camel/providers/imap4/camel-imap4-engine.c:997
-#: camel/providers/imap4/camel-imap4-engine.c:1378
-#: camel/providers/imap4/camel-imap4-engine.c:1405
-#: camel/providers/imap4/camel-imap4-engine.c:1435
-#: camel/providers/imap4/camel-imap4-engine.c:1475
+#: camel/providers/imap4/camel-imap4-engine.c:1381
+#: camel/providers/imap4/camel-imap4-engine.c:1411
+#: camel/providers/imap4/camel-imap4-engine.c:1443
+#: camel/providers/imap4/camel-imap4-engine.c:1485
#, fuzzy, c-format
msgid "IMAP4 server %s unexpectedly disconnected: %s"
msgstr "Сервер неожиданно отключился: %s"
-#: camel/providers/imap4/camel-imap4-engine.c:998
-msgid "Got BYE response"
-msgstr ""
-
#: camel/providers/imap4/camel-imap4-folder.c:359
#, fuzzy, c-format
msgid "Cannot sync flags to folder `%s': Unknown"
@@ -10781,14 +10788,14 @@ msgstr ""
"Подключение к серверу IMAP будет производиться с использованием "
"незашифрованного пароля."
-#: camel/providers/imap4/camel-imap4-store.c:271
+#: camel/providers/imap4/camel-imap4-store.c:256
#, fuzzy, c-format
msgid ""
"Failed to connect to IMAP server %s in secure mode: Server does not support "
"STARTTLS"
msgstr "Не удается подключиться к серверу IMAP %s в защищенном режиме:%s"
-#: camel/providers/imap4/camel-imap4-store.c:383
+#: camel/providers/imap4/camel-imap4-store.c:362
#, fuzzy, c-format
msgid ""
"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
@@ -10796,87 +10803,87 @@ msgstr ""
"Не удается подключиться к серверу POP %s: Не поддерживается затребованный "
"механизм идентификации."
-#: camel/providers/imap4/camel-imap4-store.c:428
+#: camel/providers/imap4/camel-imap4-store.c:407
#, fuzzy, c-format
msgid "%sPlease enter the IMAP password for %s on host %s"
msgstr "%sВведите пароль SMTP для %s@%s"
-#: camel/providers/imap4/camel-imap4-store.c:502
+#: camel/providers/imap4/camel-imap4-store.c:477
#, fuzzy, c-format
msgid "Cannot authenticate to IMAP server %s using %s"
msgstr "Сбой идентификации на сервере POP %s: %s"
-#: camel/providers/imap4/camel-imap4-store.c:733
+#: camel/providers/imap4/camel-imap4-store.c:700
#, fuzzy, c-format
msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
msgstr "Не удается получить папку: %s: %s"
-#: camel/providers/imap4/camel-imap4-store.c:847
+#: camel/providers/imap4/camel-imap4-store.c:814
#, fuzzy, c-format
msgid "Cannot create folder `%s': Invalid mailbox name"
msgstr "Не удается переименовать папку: %s: недопустимая операция"
-#: camel/providers/imap4/camel-imap4-store.c:853
+#: camel/providers/imap4/camel-imap4-store.c:820
#, fuzzy, c-format
msgid "Cannot create folder `%s': Bad command"
msgstr "Не удается создать папку: %s: %s"
-#: camel/providers/imap4/camel-imap4-store.c:884
+#: camel/providers/imap4/camel-imap4-store.c:851
#, fuzzy, c-format
msgid "Cannot delete folder `%s': Special folder"
msgstr "Не удается удалить папку: %s: нет такой папки"
-#: camel/providers/imap4/camel-imap4-store.c:943
+#: camel/providers/imap4/camel-imap4-store.c:910
#, fuzzy, c-format
msgid "Cannot delete folder `%s': Invalid mailbox name"
msgstr "Не удается удалить папку: %s: недопустимая операция"
-#: camel/providers/imap4/camel-imap4-store.c:948
+#: camel/providers/imap4/camel-imap4-store.c:915
#, fuzzy, c-format
msgid "Cannot delete folder `%s': Bad command"
msgstr "Не удается удалить папку: %s: недопустимая операция"
-#: camel/providers/imap4/camel-imap4-store.c:968
+#: camel/providers/imap4/camel-imap4-store.c:935
#, fuzzy, c-format
msgid "Cannot rename folder `%s' to `%s': Special folder"
msgstr "Не удается удалить папку: %s: нет такой папки"
-#: camel/providers/imap4/camel-imap4-store.c:1000
+#: camel/providers/imap4/camel-imap4-store.c:967
#, fuzzy, c-format
msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
msgstr "Не удается переименовать папку: %s: недопустимая операция"
-#: camel/providers/imap4/camel-imap4-store.c:1005
+#: camel/providers/imap4/camel-imap4-store.c:972
#, fuzzy, c-format
msgid "Cannot rename folder `%s' to `%s': Bad command"
msgstr "Не удается создать папку: %s: %s"
-#: camel/providers/imap4/camel-imap4-store.c:1253
+#: camel/providers/imap4/camel-imap4-store.c:1220
#, c-format
msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
msgstr ""
-#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-store.c:1222
#, fuzzy
msgid "Bad command"
msgstr "Команда:"
-#: camel/providers/imap4/camel-imap4-store.c:1331
+#: camel/providers/imap4/camel-imap4-store.c:1298
#, fuzzy, c-format
msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
msgstr "Не удается удалить папку: %s: недопустимая операция"
-#: camel/providers/imap4/camel-imap4-store.c:1336
+#: camel/providers/imap4/camel-imap4-store.c:1303
#, fuzzy, c-format
msgid "Cannot subscribe to folder `%s': Bad command"
msgstr "Не удается создать папку: %s: %s"
-#: camel/providers/imap4/camel-imap4-store.c:1396
+#: camel/providers/imap4/camel-imap4-store.c:1363
#, fuzzy, c-format
msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
msgstr "Не удается переименовать папку: %s: недопустимая операция"
-#: camel/providers/imap4/camel-imap4-store.c:1401
+#: camel/providers/imap4/camel-imap4-store.c:1368
#, fuzzy, c-format
msgid "Cannot unsubscribe from folder `%s': Bad command"
msgstr "Не удается создать папку: %s: %s"
@@ -11680,8 +11687,8 @@ msgstr "Нет сообщения с uid %s"
msgid "Retrieving POP message %d"
msgstr "Получение сообщения %d по POP"
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
-#: composer/e-msg-composer.c:1246
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1210
+#: composer/e-msg-composer.c:1231
msgid "Unknown reason"
msgstr "Неизвестная причина"
@@ -12153,7 +12160,7 @@ msgstr "%.0fM"
msgid "%.0fG"
msgstr "%.0fG"
-#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:410
msgid "attachment"
msgstr "вложение"
@@ -12169,13 +12176,13 @@ msgstr "Добавить вложение..."
msgid "Attach a file to the message"
msgstr "Вложить файл в сообщение"
-#: composer/e-msg-composer-attachment.c:169
-#: composer/e-msg-composer-attachment.c:185
+#: composer/e-msg-composer-attachment.c:173
+#: composer/e-msg-composer-attachment.c:189
#, c-format
msgid "Cannot attach file %s: %s"
msgstr "Не удается вложить файл %s: %s"
-#: composer/e-msg-composer-attachment.c:177
+#: composer/e-msg-composer-attachment.c:181
#, c-format
msgid "Cannot attach file %s: not a regular file"
msgstr "Не удается вложить файл %s: не обычный файл"
@@ -12292,59 +12299,59 @@ msgid ""
"account"
msgstr "Всегда подписывать сообщения, когда используется эта учётная запись"
-#: composer/e-msg-composer.c:1283
+#: composer/e-msg-composer.c:1268
#, fuzzy
msgid "Could not open file"
msgstr "Не удается открыть файл"
-#: composer/e-msg-composer.c:1291
+#: composer/e-msg-composer.c:1276
msgid "Unable to retrieve message from editor"
msgstr "Не удается получить сообщение из редактора"
-#: composer/e-msg-composer.c:1561
+#: composer/e-msg-composer.c:1546
#, fuzzy
msgid "Untitled Message"
msgstr "Множество сообщений"
-#: composer/e-msg-composer.c:1591
+#: composer/e-msg-composer.c:1576
msgid "Open file"
msgstr "Открыть файл"
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+#: composer/e-msg-composer.c:1983 mail/mail-account-gui.c:1491
msgid "Autogenerated"
msgstr "Создана автоматически"
-#: composer/e-msg-composer.c:2097
+#: composer/e-msg-composer.c:2082
msgid "Signature:"
msgstr "Подпись:"
-#: composer/e-msg-composer.c:2298
+#: composer/e-msg-composer.c:2283
#, c-format
msgid "<b>%d</b> File Attached"
msgid_plural "<b>%d</b> Files Attached"
msgstr[0] ""
msgstr[1] ""
-#: composer/e-msg-composer.c:2327
+#: composer/e-msg-composer.c:2312
msgid "Hide _Attachment Bar (drop attachments here)"
msgstr ""
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+#: composer/e-msg-composer.c:2315 composer/e-msg-composer.c:3271
msgid "Show _Attachment Bar (drop attachments here)"
msgstr ""
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
-#: composer/e-msg-composer.c:3179
+#: composer/e-msg-composer.c:2332 composer/e-msg-composer.c:3163
+#: composer/e-msg-composer.c:3164
msgid "Compose a message"
msgstr "Новое сообщение"
-#: composer/e-msg-composer.c:2649
+#: composer/e-msg-composer.c:2634
#, fuzzy, c-format
msgid "Attached message - %s"
msgstr "Пересланное сообщение - %s"
#. translators, this count will always be >1
-#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#: composer/e-msg-composer.c:2639 composer/e-msg-composer.c:2783
#, fuzzy, c-format
msgid "Attached message"
msgid_plural "%d attached messages"
@@ -12352,7 +12359,7 @@ msgstr[0] "Вложить оригинальное сообщение"
msgstr[1] "Вложить оригинальное сообщение"
msgstr[2] "Вложить оригинальное сообщение"
-#: composer/e-msg-composer.c:4332
+#: composer/e-msg-composer.c:4341
msgid ""
"<b>(The composer contains a non-text message body, which cannot be edited.)"
"<b>"
@@ -12642,7 +12649,7 @@ msgstr ""
"Что должна делать программа Evolution, когда приходит письмо с запросом "
"подтверждения прочтения?"
-#: e-util/e-dialog-utils.c:249
+#: e-util/e-dialog-utils.c:253
msgid ""
"A file by that name already exists.\n"
"Overwrite it?"
@@ -12651,7 +12658,7 @@ msgstr ""
"Перезаписать его?"
#. system:ask-save-file-exists-overwrite title
-#: e-util/e-dialog-utils.c:251 widgets/misc/e-system-errors.xml.h:2
+#: e-util/e-dialog-utils.c:255 widgets/misc/e-system-errors.xml.h:2
msgid "Overwrite file?"
msgstr "Перезаписать файл?"
@@ -12663,14 +12670,6 @@ msgstr "Запомнить этот пароль"
msgid "Remember this password for the remainder of this session"
msgstr "Запомнить этот пароль до окончания этой сессии"
-#: e-util/e-pilot-settings.c:93
-msgid "Sync Private Records:"
-msgstr "Синхронизировать личные записи:"
-
-#: e-util/e-pilot-settings.c:102
-msgid "Sync Categories:"
-msgstr "Категории:"
-
#. strptime format of a weekday, a date and a time,
#. in 12-hour format, without seconds.
#: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
@@ -13094,7 +13093,7 @@ msgstr "Evolution Mail preferences control"
#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:419
#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
-#: mail/mail-component.c:559
+#: mail/mail-component.c:557
msgid "Mail"
msgstr "Почта"
@@ -13141,18 +13140,18 @@ msgstr "Добавить подпись"
msgid "Signature(s)"
msgstr "Подпись(и)"
-#: mail/em-composer-utils.c:887
+#: mail/em-composer-utils.c:889
msgid "-------- Forwarded Message --------"
msgstr "-------- Пересланное сообщение --------"
-#: mail/em-composer-utils.c:1500
+#: mail/em-composer-utils.c:1502
msgid "an unknown sender"
msgstr "неизвестный отправитель"
#. Note to translators: this is the attribution string used when quoting messages.
#. * each ${Variable} gets replaced with a value. To see a full list of available
#. * variables, see em-composer-utils.c:1514
-#: mail/em-composer-utils.c:1547
+#: mail/em-composer-utils.c:1549
msgid ""
"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
"${TimeZone}, ${Sender} wrote:"
@@ -13500,7 +13499,7 @@ msgid "Create New Folder"
msgstr "Создание новой папки"
#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
-#: mail/mail-component.c:709
+#: mail/mail-component.c:707
msgid "Specify where to create the folder:"
msgstr "Укажите, где создать папку:"
@@ -13537,12 +13536,12 @@ msgstr "Удаление папки \"%s\""
msgid "Copying folder %s"
msgstr "Открытие папки \"%s\""
-#: mail/em-folder-tree.c:855 mail/message-list.c:1561
+#: mail/em-folder-tree.c:855 mail/message-list.c:1613
#, fuzzy, c-format
msgid "Moving messages into folder %s"
msgstr "Перемещение сообщений в %s"
-#: mail/em-folder-tree.c:857 mail/message-list.c:1563
+#: mail/em-folder-tree.c:857 mail/message-list.c:1615
#, fuzzy, c-format
msgid "Copying messages into folder %s"
msgstr "Копирование сообщений в %s"
@@ -13561,11 +13560,11 @@ msgid "_Move to Folder"
msgstr "Переместить в папку"
#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
-#: mail/em-folder-view.c:803 mail/message-list.c:1651
+#: mail/em-folder-view.c:803 mail/message-list.c:1703
msgid "_Move"
msgstr "Пере_местить"
-#: mail/em-folder-tree.c:968 mail/message-list.c:1653
+#: mail/em-folder-tree.c:968 mail/message-list.c:1705
#, fuzzy
msgid "Cancel _Drag"
msgstr "Отменить задачу"
@@ -13587,7 +13586,7 @@ msgstr "Копировать"
msgid "Creating folder `%s'"
msgstr "Сохранение папки \"%s\""
-#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:707
#, fuzzy
msgid "Create folder"
msgstr "Создать новую папку"
@@ -13763,20 +13762,20 @@ msgid "Filter on _Mailing List"
msgstr "Фильтр по списку рассылки"
#. default charset used in mail view
-#: mail/em-folder-view.c:1712 mail/em-folder-view.c:1752
+#: mail/em-folder-view.c:1711 mail/em-folder-view.c:1751
#: mail/mail-config.glade.h:68
msgid "Default"
msgstr "По умолчанию"
-#: mail/em-folder-view.c:1849
+#: mail/em-folder-view.c:1848
msgid "Print Message"
msgstr "Напечатать сообщение"
-#: mail/em-folder-view.c:2110
+#: mail/em-folder-view.c:2115
msgid "_Copy Link Location"
msgstr "_Копировать ссылку"
-#: mail/em-folder-view.c:2375
+#: mail/em-folder-view.c:2380
#, fuzzy, c-format
msgid "Click to mail %s"
msgstr "Щёлкните здесь, чтобы добавить задачу"
@@ -14082,41 +14081,41 @@ msgstr ""
"Не удается скопировать дескриптор файла: %s\n"
"%s"
-#: mail/em-migrate.c:1811
+#: mail/em-migrate.c:1813
#, fuzzy, c-format
msgid "Unable to scan for existing mailboxes at `%s': %s"
msgstr ""
"Не удается создать файл вывода: %s\n"
" %s"
-#: mail/em-migrate.c:2015
+#: mail/em-migrate.c:2017
#, fuzzy, c-format
msgid "Unable to open old POP keep-on-server data `%s': %s"
msgstr "Сбой идентификации на сервере POP %s: %s"
-#: mail/em-migrate.c:2029
+#: mail/em-migrate.c:2031
#, fuzzy, c-format
msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
msgstr "Сбой при создании канала к \"%s\": %s"
-#: mail/em-migrate.c:2058
+#: mail/em-migrate.c:2060
#, c-format
msgid "Unable to copy POP3 keep-on-server data `%s': %s"
msgstr ""
-#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
+#: mail/em-migrate.c:2415 mail/em-migrate.c:2427
#, fuzzy, c-format
msgid "Failed to create local mail storage `%s': %s"
msgstr "Сбой при создании канала к \"%s\": %s"
-#: mail/em-migrate.c:2576
+#: mail/em-migrate.c:2578
#, fuzzy, c-format
msgid "Unable to create local mail folders at `%s': %s"
msgstr ""
"Не удается создать файл вывода: %s\n"
" %s"
-#: mail/em-migrate.c:2594
+#: mail/em-migrate.c:2596
msgid ""
"Unable to read settings from previous Evolution install, `evolution/config."
"xmldb' does not exist or is corrupt."
@@ -14179,28 +14178,28 @@ msgstr "Пожалуйста, выберите сервер."
msgid "No server has been selected"
msgstr "Не был выбран сервер"
-#: mail/em-utils.c:102
+#: mail/em-utils.c:104
msgid "Don't show this message again."
msgstr "Не показывать это сообщение снова."
-#: mail/em-utils.c:292
+#: mail/em-utils.c:294
msgid "Filters"
msgstr "Настройки фильтров"
-#: mail/em-utils.c:406
+#: mail/em-utils.c:408
msgid "message"
msgstr "сообщение"
-#: mail/em-utils.c:509
+#: mail/em-utils.c:511
msgid "Save Message..."
msgstr "Сохранить сообщение ..."
-#: mail/em-utils.c:558
+#: mail/em-utils.c:560
msgid "Add address"
msgstr "Добавить адрес"
#. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1019
+#: mail/em-utils.c:1021
#, fuzzy, c-format
msgid "Messages from %s"
msgstr "Почта от %s"
@@ -14995,33 +14994,33 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: mail/mail-component.c:661
+#: mail/mail-component.c:659
msgid "New Mail Message"
msgstr "Новое почтовое сообщение"
-#: mail/mail-component.c:662
+#: mail/mail-component.c:660
msgid "_Mail Message"
msgstr "_Почтовое сообщение"
-#: mail/mail-component.c:663
+#: mail/mail-component.c:661
msgid "Compose a new mail message"
msgstr "Создать новое сообщение"
-#: mail/mail-component.c:669
+#: mail/mail-component.c:667
#, fuzzy
msgid "New Mail Folder"
msgstr "Новая виртуальная папка"
-#: mail/mail-component.c:670
+#: mail/mail-component.c:668
#, fuzzy
msgid "Mail _Folder"
msgstr "Почтовые фильтры"
-#: mail/mail-component.c:671
+#: mail/mail-component.c:669
msgid "Create a new mail folder"
msgstr ""
-#: mail/mail-component.c:803
+#: mail/mail-component.c:801
msgid "Failed upgrading Mail settings or folders."
msgstr ""
@@ -16343,7 +16342,14 @@ msgstr "Перезаписать"
msgid "_Append"
msgstr "Отправить"
-#: mail/mail-folder-cache.c:785
+#. mail:gw-accountsetup-error primary
+#: mail/mail-errors.xml.h:234
+msgid ""
+"Could not connect to {0}. Groupwise account setup is incomplete. You may "
+"need to setup the account again"
+msgstr ""
+
+#: mail/mail-folder-cache.c:795
#, c-format
msgid "Pinging %s"
msgstr "Ping на %s"
@@ -16645,67 +16651,67 @@ msgstr "Править виртуальную папку"
msgid "New VFolder"
msgstr "Новая виртуальная папка"
-#: mail/message-list.c:948
+#: mail/message-list.c:1000
msgid "Unseen"
msgstr "Непрочитано"
-#: mail/message-list.c:949
+#: mail/message-list.c:1001
msgid "Seen"
msgstr "Прочитано"
-#: mail/message-list.c:950
+#: mail/message-list.c:1002
msgid "Answered"
msgstr "Отвечено"
-#: mail/message-list.c:951
+#: mail/message-list.c:1003
msgid "Multiple Unseen Messages"
msgstr "Множество непрочитанных сообщений"
-#: mail/message-list.c:952
+#: mail/message-list.c:1004
msgid "Multiple Messages"
msgstr "Множество сообщений"
-#: mail/message-list.c:956
+#: mail/message-list.c:1008
msgid "Lowest"
msgstr "Самый низкий"
-#: mail/message-list.c:957
+#: mail/message-list.c:1009
msgid "Lower"
msgstr "Низкий"
-#: mail/message-list.c:961
+#: mail/message-list.c:1013
msgid "Higher"
msgstr "Высокий"
-#: mail/message-list.c:962
+#: mail/message-list.c:1014
msgid "Highest"
msgstr "Самый высокий"
-#: mail/message-list.c:1285
+#: mail/message-list.c:1337
msgid "?"
msgstr "?"
-#: mail/message-list.c:1292
+#: mail/message-list.c:1344
msgid "Today %l:%M %p"
msgstr "Сегодня %I:%M %p"
-#: mail/message-list.c:1301
+#: mail/message-list.c:1353
msgid "Yesterday %l:%M %p"
msgstr "Вчера %l:%M %p"
-#: mail/message-list.c:1313
+#: mail/message-list.c:1365
msgid "%a %l:%M %p"
msgstr "%a %l:%M %p"
-#: mail/message-list.c:1321
+#: mail/message-list.c:1373
msgid "%b %d %l:%M %p"
msgstr "%b %d %l:%M %p"
-#: mail/message-list.c:1323
+#: mail/message-list.c:1375
msgid "%b %d %Y"
msgstr "%b %d %Y"
-#: mail/message-list.c:3324
+#: mail/message-list.c:3376
msgid "Generating message list"
msgstr "Создание списка сообщений"
@@ -16857,23 +16863,28 @@ msgid ""
msgstr ""
#: shell/apps_evolution_shell.schemas.in.in.h:9
+#, fuzzy
+msgid "Last upgraded Evolution configuration version"
+msgstr "Версия конфигурации Evolution"
+
+#: shell/apps_evolution_shell.schemas.in.in.h:10
msgid ""
"List of paths for the folders to be synchronized to disk for offline usage"
msgstr ""
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: shell/apps_evolution_shell.schemas.in.in.h:11
msgid "Toolbar is visible"
msgstr "Панель инструментов видимая"
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: shell/apps_evolution_shell.schemas.in.in.h:12
msgid "Whether Evolution should start up in offline mode"
msgstr "Должен ли Evolution запускаться в автономном режиме"
-#: shell/apps_evolution_shell.schemas.in.in.h:12
+#: shell/apps_evolution_shell.schemas.in.in.h:13
msgid "Whether the toolbar should be visible."
msgstr "Должна ли панель инструментов быть видимой."
-#: shell/apps_evolution_shell.schemas.in.in.h:13
+#: shell/apps_evolution_shell.schemas.in.in.h:14
msgid "Whether to skip the development warning dialog"
msgstr "Пропускать ли предупреждение о тестовой версии"
@@ -17063,36 +17074,36 @@ msgstr "Имя папки не может содержать символ \"#\".
msgid "'.' and '..' are reserved folder names."
msgstr "\".\" и \"..\" -- зарезервированные имена папок."
-#: shell/e-shell-window-commands.c:66
+#: shell/e-shell-window-commands.c:67
msgid "The GNOME Pilot tools do not appear to be installed on this system."
msgstr "Похоже, утилита GNOME Pilot не установлена в этой системе"
-#: shell/e-shell-window-commands.c:74
+#: shell/e-shell-window-commands.c:75
#, c-format
msgid "Error executing %s."
msgstr "Ошибка выполнения %s."
-#: shell/e-shell-window-commands.c:123
+#: shell/e-shell-window-commands.c:124
msgid "Bug buddy is not installed."
msgstr "Bug buddy не установлен."
-#: shell/e-shell-window-commands.c:131
+#: shell/e-shell-window-commands.c:132
msgid "Bug buddy could not be run."
msgstr "Не удается запустить Bug buddy."
-#: shell/e-shell-window-commands.c:322
+#: shell/e-shell-window-commands.c:323
msgid "Groupware Suite"
msgstr "Пакет Groupware"
-#: shell/e-shell-window-commands.c:562
+#: shell/e-shell-window-commands.c:563
msgid "_Work Online"
msgstr "Перейти в сетевой режим"
-#: shell/e-shell-window-commands.c:575 ui/evolution.xml.h:39
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
msgid "_Work Offline"
msgstr "Ав_тономная работа"
-#: shell/e-shell-window-commands.c:588 ui/evolution.xml.h:25
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
msgid "Work Offline"
msgstr "Перейти в режим работы вне сети"
@@ -17117,28 +17128,28 @@ msgstr ""
msgid "Switch to %s"
msgstr "Переключиться в %s"
-#: shell/e-shell.c:588 shell/e-shell.c:589
+#: shell/e-shell.c:585
+msgid "Uknown system error."
+msgstr "Неизвестная системная ошибка."
+
+#: shell/e-shell.c:789 shell/e-shell.c:790
#, c-format
msgid "%ld KB"
msgstr "%ld КБ"
-#: shell/e-shell.c:774
-msgid "Uknown system error."
-msgstr "Неизвестная системная ошибка."
-
-#: shell/e-shell.c:1131
+#: shell/e-shell.c:1212
msgid "Invalid arguments"
msgstr "Недопустимые аргументы"
-#: shell/e-shell.c:1133
+#: shell/e-shell.c:1214
msgid "Cannot register on OAF"
msgstr "Не удается зарегистрировать в OAF"
-#: shell/e-shell.c:1135
+#: shell/e-shell.c:1216
msgid "Configuration Database not found"
msgstr "База данных настроек не найдена"
-#: shell/e-shell.c:1137
+#: shell/e-shell.c:1218
msgid "Generic error"
msgstr "Обычная ошибка"
@@ -17365,18 +17376,58 @@ msgstr ""
msgid "Continue"
msgstr "Продолжить"
+#. shell:upgrade-remove-1-4 title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:19
+msgid "Delete old data from version {0}?"
+msgstr ""
+
+#. shell:upgrade-remove-1-4 secondary
+#: shell/shell-errors.xml.h:21
+msgid ""
+"The previous version of evolution stored its data in a different location.\n"
+"\n"
+"If you choose to remove this data, the entire contents of the \"evolution\" "
+"directory will be removed permanently. If you choose to keep this data, "
+"then you may manually remove the contents of \"evolution\" at your "
+"convenience.\n"
+msgstr ""
+
+#: shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Keep"
+msgstr "Белиз"
+
+#. shell:upgrade-remove-1-4-confirm title
+#: shell/shell-errors.xml.h:27 shell/shell-errors.xml.h:29
+msgid "Really delete old data?"
+msgstr ""
+
+#. shell:upgrade-remove-1-4-confirm secondary
+#: shell/shell-errors.xml.h:31
+msgid ""
+"The entire contents of the \"evolution\" directory is about to be be "
+"permanently removed.\n"
+"\n"
+"It is suggested you manually verify that all of your mail, contact, and "
+"calendar data is present, and that this version of Evolution operates "
+"correctly before deleting this old data.\n"
+"\n"
+"Once deleted, you cannot downgrade to the previous version of Evolution "
+"without manual intervention.\n"
+msgstr ""
+
#. shell:noshell title
-#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#: shell/shell-errors.xml.h:38 shell/shell-errors.xml.h:46
msgid "Cannot start Evolution"
msgstr "Не удается запустить Evolution"
#. shell:noshell primary
-#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#: shell/shell-errors.xml.h:40 shell/shell-errors.xml.h:48
msgid "Evolution can not start."
msgstr "Не удается запустить Evolution."
#. shell:noshell secondary
-#: shell/shell-errors.xml.h:21
+#: shell/shell-errors.xml.h:42
msgid ""
"Your system configuration does not match your Evolution configuration.\n"
"\n"
@@ -17384,7 +17435,7 @@ msgid ""
msgstr ""
#. shell:noshell-reason secondary
-#: shell/shell-errors.xml.h:29
+#: shell/shell-errors.xml.h:50
msgid ""
"Your system configuration does not match your Evolution configuration:\n"
"\n"
@@ -17862,15 +17913,15 @@ msgstr "Уникальный ID темы"
msgid "Certificate Signature Value"
msgstr "Значение подписи сертификата"
-#: smime/lib/e-pkcs12.c:266
+#: smime/lib/e-pkcs12.c:263
msgid "PKCS12 File Password"
msgstr "Пароль файла PKCS12"
-#: smime/lib/e-pkcs12.c:266
+#: smime/lib/e-pkcs12.c:263
msgid "Enter password for PKCS12 file:"
msgstr "Введите пароль для файла PKCS12:"
-#: smime/lib/e-pkcs12.c:365
+#: smime/lib/e-pkcs12.c:362
msgid "Imported Certificate"
msgstr "Импортированный сертификат"
@@ -18303,6 +18354,10 @@ msgstr "Переслать как i_Calendar"
msgid "Forward this item via email"
msgstr "Переслать этот элемент через эл.почту"
+#: ui/evolution-event-editor.xml.h:6
+msgid "Meeting"
+msgstr "Собрание"
+
#: ui/evolution-event-editor.xml.h:7
msgid "Obtain the latest meeting information"
msgstr "Получить последнюю информацию по совещанию"
@@ -19505,26 +19560,26 @@ msgstr "Другая..."
msgid "..."
msgstr "..."
-#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
-#: widgets/misc/e-error.c:122
+#: widgets/misc/e-error.c:83 widgets/misc/e-error.c:84
+#: widgets/misc/e-error.c:126
msgid "Evolution Error"
msgstr "Ошибка Evolution"
-#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
-#: widgets/misc/e-error.c:120
+#: widgets/misc/e-error.c:85 widgets/misc/e-error.c:86
+#: widgets/misc/e-error.c:124
msgid "Evolution Warning"
msgstr "Предупреждение Evolution"
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:123
msgid "Evolution Information"
msgstr "Информация Evolution"
-#: widgets/misc/e-error.c:121
+#: widgets/misc/e-error.c:125
msgid "Evolution Query"
msgstr "Запрос Evolution"
#. setup a dummy error
-#: widgets/misc/e-error.c:417
+#: widgets/misc/e-error.c:421
#, fuzzy, c-format
msgid ""
"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19617,6 +19672,19 @@ msgstr "_Дополнительно..."
msgid "Choose Image"
msgstr "Выберите изображение"
+#: widgets/misc/e-pilot-settings.c:103
+#, fuzzy
+msgid "Sync with:"
+msgstr "Имя начинается с"
+
+#: widgets/misc/e-pilot-settings.c:111
+msgid "Sync Private Records:"
+msgstr "Синхронизировать личные записи:"
+
+#: widgets/misc/e-pilot-settings.c:120
+msgid "Sync Categories:"
+msgstr "Категории:"
+
#: widgets/misc/e-search-bar.c:540
msgid "_Search"
msgstr "П_оиск"
@@ -19675,6 +19743,71 @@ msgstr "%s (...)"
msgid "%s (%d%% complete)"
msgstr "%s (%d%% выполнено)"
+#~ msgid "New Contacts Group"
+#~ msgstr "Создать группу контактов"
+
+#, fuzzy
+#~ msgid "Contacts Grou_p"
+#~ msgstr "_Группа контактов"
+
+#~ msgid "Create a new contacts group"
+#~ msgstr "Создать новую группу контактов"
+
+#~ msgid "Add Contacts Group"
+#~ msgstr "Добавить группу контактов"
+
+#~ msgid "Download limit:"
+#~ msgstr "Ограничение загрузки:"
+
+#~ msgid "Search base only"
+#~ msgstr "Только база поиска"
+
+#~ msgid "Search base:"
+#~ msgstr "База поиска:"
+
+#~ msgid "Search scope:"
+#~ msgstr "Диапазон поиска:"
+
+#~ msgid "Timeout:"
+#~ msgstr "Задержка:"
+
+#~ msgid "_Add Contacts Group"
+#~ msgstr "_Добавить группу контактов"
+
+#~ msgid "_Email address:"
+#~ msgstr "_Электронная почта:"
+
+#, fuzzy
+#~ msgid "_Log in:"
+#~ msgstr "Регистрация"
+
+#, fuzzy
+#~ msgid "Add Tasks Group"
+#~ msgstr "Группа списка задач"
+
+#~ msgid "L_ocation:"
+#~ msgstr "Мес_то:"
+
+#, fuzzy
+#~ msgid "<b>Organizer</b>"
+#~ msgstr "<b>Прочее</b> "
+
+#, fuzzy
+#~ msgid "_Organizer:"
+#~ msgstr "Организатор:"
+
+#, fuzzy
+#~ msgid "New tasks group"
+#~ msgstr "Новая задача"
+
+#, fuzzy
+#~ msgid "Tasks Gro_up"
+#~ msgstr "Группа списка задач"
+
+#, fuzzy
+#~ msgid "Create a new tasks group"
+#~ msgstr "Создать новую задачу"
+
#~ msgid "contact-list-editor"
#~ msgstr "Редактор списка контактов"