aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonid Kanter <lkanter@src.gnome.org>2006-02-16 00:41:53 +0800
committerLeonid Kanter <lkanter@src.gnome.org>2006-02-16 00:41:53 +0800
commitac643b60b6d5d784cc4af0857eea0f54fd1c9f07 (patch)
tree81a592356a231774a9573532224c86b0728f203f
parent97ee36d91d77f0652c5d3fa6ad3b5dd8edfc09e7 (diff)
downloadgsoc2013-evolution-ac643b60b6d5d784cc4af0857eea0f54fd1c9f07.tar
gsoc2013-evolution-ac643b60b6d5d784cc4af0857eea0f54fd1c9f07.tar.gz
gsoc2013-evolution-ac643b60b6d5d784cc4af0857eea0f54fd1c9f07.tar.bz2
gsoc2013-evolution-ac643b60b6d5d784cc4af0857eea0f54fd1c9f07.tar.lz
gsoc2013-evolution-ac643b60b6d5d784cc4af0857eea0f54fd1c9f07.tar.xz
gsoc2013-evolution-ac643b60b6d5d784cc4af0857eea0f54fd1c9f07.tar.zst
gsoc2013-evolution-ac643b60b6d5d784cc4af0857eea0f54fd1c9f07.zip
Updated Russian translation
svn path=/trunk/; revision=31532
-rw-r--r--po/ChangeLog4
-rw-r--r--po/ru.po8945
2 files changed, 4989 insertions, 3960 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index a195a9eec3..1ed3b762d2 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2006-02-15 Leonid Kanter <leon@asplinux.ru>
+
+ * ru.po: Updated Russian translation
+
2006-02-15 Žygimantas Beručka <zygis@gnome.org>
* lt.po: Updated Lithuanian translation.
diff --git a/po/ru.po b/po/ru.po
index c33f0558ac..0d5c4f88c8 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,38 +1,38 @@
-# translation of evolution to Russian
-# Copyright (C) 2000,2002,2003, 2004, 2005 Free Software Foundation, Inc.
+# translation of evolution.HEAD.ru.po to
+# translation of evolution.HEAD.po to
+# Copyright (C) 2000,2002,2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+#
# Valek Filippov <frob@df.ru>, 2000.
# Dmitry Mastrukov <dmitry@taurussoft.org>, 2001-2003.
-# Leonid Kanter <leon@asplinux.ru>, 2001-2003, 2004, 2005.
+# Leonid Kanter <leon@asplinux.ru>, 2001-2003, 2004, 2005, 2006.
# Michael Yakhontov <mvy@asplinux.ru>, 2003, 2005.
-#
msgid ""
msgstr ""
-"Project-Id-Version: ru\n"
+"Project-Id-Version: evolution.HEAD.ru\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-30 01:31+0400\n"
-"PO-Revision-Date: 2005-09-30 01:38+0400\n"
+"POT-Creation-Date: 2006-02-06 14:40+0100\n"
+"PO-Revision-Date: 2006-02-15 18:38+0200\n"
"Last-Translator: Leonid Kanter <leon@asplinux.ru>\n"
"Language-Team: <gnome-cyr@gnome.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.10.2\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: KBabel 1.11.1\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: ../a11y/addressbook/ea-addressbook-view.c:94
#: ../a11y/addressbook/ea-addressbook-view.c:103
#: ../a11y/addressbook/ea-minicard-view.c:169
msgid "evolution addressbook"
-msgstr "адресная книга Evolution"
+msgstr "evolution addressbook"
#: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:225
+#: ../addressbook/gui/component/addressbook-component.c:226
msgid "New Contact"
msgstr "Создать контакт"
#: ../a11y/addressbook/ea-minicard-view.c:35
-#: ../addressbook/gui/component/addressbook-component.c:233
+#: ../addressbook/gui/component/addressbook-component.c:234
msgid "New Contact List"
msgstr "Создать список контактов"
@@ -45,8 +45,7 @@ msgstr[1] "в текущей папке адресной книги имеютс
msgstr[2] "в текущей папке адресной книги имеются %d карточек"
#: ../a11y/addressbook/ea-minicard.c:31
-#: ../calendar/gui/alarm-notify/alarm-queue.c:953
-#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-message-composer.xml.h:12
msgid "Open"
msgstr "Открыть"
@@ -91,23 +90,23 @@ msgstr "событие обзора календаря"
msgid "Grab Focus"
msgstr "Перехватывать фокус"
-#: ../a11y/calendar/ea-cal-view.c:306
+#: ../a11y/calendar/ea-cal-view.c:302
msgid "New Appointment"
msgstr "Новая встреча"
-#: ../a11y/calendar/ea-cal-view.c:307
+#: ../a11y/calendar/ea-cal-view.c:303
msgid "New All Day Event"
msgstr "Новое ежедневное событие"
-#: ../a11y/calendar/ea-cal-view.c:308 ../calendar/gui/e-calendar-view.c:1505
+#: ../a11y/calendar/ea-cal-view.c:304
msgid "New Meeting"
msgstr "Новое собрание"
-#: ../a11y/calendar/ea-cal-view.c:309
+#: ../a11y/calendar/ea-cal-view.c:305
msgid "Go to Today"
msgstr "Перейти к сегодняшнему дню"
-#: ../a11y/calendar/ea-cal-view.c:310
+#: ../a11y/calendar/ea-cal-view.c:306
msgid "Go to Date"
msgstr "Перейти к дате"
@@ -147,7 +146,7 @@ msgid "calendar view for one or more days"
msgstr "окно календаря для просмотра одного или более дней"
#: ../a11y/calendar/ea-gnome-calendar.c:187
-#: ../calendar/gui/calendar-component.c:660
+#: ../calendar/gui/calendar-component.c:661
msgid "%A %d %b %Y"
msgstr "%A, %d %b %Y"
@@ -158,18 +157,18 @@ msgstr "%A, %d %b %Y"
#. You can change the order but don't change the
#. specifiers or add anything.
#: ../a11y/calendar/ea-gnome-calendar.c:190
-#: ../calendar/gui/calendar-component.c:663
+#: ../calendar/gui/calendar-component.c:664
#: ../calendar/gui/e-day-view-top-item.c:719 ../calendar/gui/e-day-view.c:1510
-#: ../calendar/gui/e-week-view-main-item.c:321
+#: ../calendar/gui/e-week-view-main-item.c:322
msgid "%a %d %b"
msgstr "%a, %d %b"
#: ../a11y/calendar/ea-gnome-calendar.c:192
#: ../a11y/calendar/ea-gnome-calendar.c:197
#: ../a11y/calendar/ea-gnome-calendar.c:199
-#: ../calendar/gui/calendar-component.c:665
-#: ../calendar/gui/calendar-component.c:670
-#: ../calendar/gui/calendar-component.c:672
+#: ../calendar/gui/calendar-component.c:666
+#: ../calendar/gui/calendar-component.c:671
+#: ../calendar/gui/calendar-component.c:673
msgid "%a %d %b %Y"
msgstr "%a, %d %b %Y"
@@ -177,10 +176,10 @@ msgstr "%a, %d %b %Y"
#: ../a11y/calendar/ea-gnome-calendar.c:222
#: ../a11y/calendar/ea-gnome-calendar.c:228
#: ../a11y/calendar/ea-gnome-calendar.c:230
-#: ../calendar/gui/calendar-component.c:684
-#: ../calendar/gui/calendar-component.c:691
-#: ../calendar/gui/calendar-component.c:697
-#: ../calendar/gui/calendar-component.c:699
+#: ../calendar/gui/calendar-component.c:685
+#: ../calendar/gui/calendar-component.c:692
+#: ../calendar/gui/calendar-component.c:698
+#: ../calendar/gui/calendar-component.c:700
msgid "%d %b %Y"
msgstr "%d %b %Y"
@@ -190,15 +189,15 @@ msgstr "%d %b %Y"
#. month name. You can change the order but don't
#. change the specifiers or add anything.
#: ../a11y/calendar/ea-gnome-calendar.c:220
-#: ../calendar/gui/calendar-component.c:689
+#: ../calendar/gui/calendar-component.c:690
#: ../calendar/gui/e-day-view-top-item.c:723 ../calendar/gui/e-day-view.c:1526
-#: ../calendar/gui/e-week-view-main-item.c:335
+#: ../calendar/gui/e-week-view-main-item.c:336
msgid "%d %b"
msgstr "%d %b"
#: ../a11y/calendar/ea-gnome-calendar.c:247
#: ../a11y/calendar/ea-gnome-calendar.c:255
-#: ../calendar/importers/icalendar-importer.c:738
+#: ../calendar/importers/icalendar-importer.c:772
msgid "Gnome Calendar"
msgstr "Календарь Gnome"
@@ -284,7 +283,7 @@ msgstr "Ячейка таблицы"
#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:44
#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:119
-#: ../widgets/table/e-table-click-to-add.c:575
+#: ../widgets/table/e-table-click-to-add.c:574
msgid "click to add"
msgstr "нажмите, чтобы добавить"
@@ -361,45 +360,53 @@ msgid "Could not remove addressbook."
msgstr "Не удается удалить адресную книгу."
#: ../addressbook/addressbook.error.xml.h:8
+msgid ""
+"Currently you can access only GroupWise System Address Book from Evolution. "
+"Please use some other GroupWise mail client once, to get your GroupWise "
+"Frequent Contacts and Groupwise Personal Contacts folders."
+msgstr "В настоящее время вы можете получить доступ только к адресной книге системы GroupWise из Evolution. Пожалуйста, используйте какой-нибудь другой почтовый клиент GroupWise, чтобы получить доступ к папкам Часто Используемых Контактов и Личной Информации GroupWise."
+
+#: ../addressbook/addressbook.error.xml.h:9
msgid "Delete address book '{0}'?"
msgstr "Удалить адресную книгу '{0}'?"
-#: ../addressbook/addressbook.error.xml.h:9
+#: ../addressbook/addressbook.error.xml.h:10
msgid "Error loading addressbook."
msgstr "Ошибка загрузки адресной книги."
-#: ../addressbook/addressbook.error.xml.h:10
+#: ../addressbook/addressbook.error.xml.h:11
msgid "Error saving {0} to {1}: {2}"
msgstr "Ошибка сохранения {0} в {1}: {2}"
-#: ../addressbook/addressbook.error.xml.h:11
+#: ../addressbook/addressbook.error.xml.h:12
msgid "Failed to authenticate with LDAP server."
msgstr "Сбой аутентификации на сервере LDAP."
-#: ../addressbook/addressbook.error.xml.h:12
+#: ../addressbook/addressbook.error.xml.h:13
+msgid "GroupWise Address book creation:"
+msgstr "Создание Адресной книги GroupWise:"
+
+#: ../addressbook/addressbook.error.xml.h:14
msgid "LDAP server did not respond with valid schema information."
msgstr "Ответ сервера LDAP не содержит поддерживаемой информации схемы."
-#: ../addressbook/addressbook.error.xml.h:13
+#: ../addressbook/addressbook.error.xml.h:15
msgid "Server Version"
msgstr "Версия сервера"
-#: ../addressbook/addressbook.error.xml.h:14
-#: ../calendar/calendar.error.xml.h:44
+#: ../addressbook/addressbook.error.xml.h:16
msgid "Some features may not work properly with your current server"
msgstr "Некоторые функции могут работать некорректно с вашим текущим сервером"
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:17
msgid "The Evolution addressbook has quit unexpectedly."
msgstr "Работа компонента адресной книги Evolution неожиданно завершилась."
-#: ../addressbook/addressbook.error.xml.h:16
-msgid ""
-"The image you have selected is large. Do you want to resize and store it?"
-msgstr ""
-"Выбранное вами изображение слишком велико. Изменить размер перед сохранением?"
+#: ../addressbook/addressbook.error.xml.h:18
+msgid "The image you have selected is large. Do you want to resize and store it?"
+msgstr "Выбранное вами изображение слишком велико. Изменить размер перед сохранением?"
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:19
msgid ""
"This LDAP server may use an older version of LDAP, which does not support "
"this functionality or it may be misconfigured. Ask your administrator for "
@@ -410,19 +417,19 @@ msgstr ""
"Выясните у системного администратора, какие базы поиска поддерживает этот "
"сервер."
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:20
msgid "This address book will be removed permanently."
msgstr "Эта адресная книга будет окончательно удалена."
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:21
msgid "This addressbook could not be opened."
msgstr "Эта адресная книга не может быть открыта."
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:22
msgid "This addressbook server does not have any suggested search bases."
msgstr "Этот сервер адресной книги не содержит поддерживаемых баз поиска."
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:23
msgid ""
"This addressbook server might be unreachable or the server name may be "
"misspelled or your network connection could be down."
@@ -430,27 +437,27 @@ msgstr ""
"Возможно, сервер адресной книги недоступен, имя сервера может быть введено "
"неправильно или соединение с сетью отсутствует."
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:24
msgid "This server does not support LDAPv3 schema information."
msgstr "Этот сервер не поддерживает информацию LDAPv3 schema."
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:25
msgid "Unable to open addressbook"
msgstr "Не удается открыть адресную книгу"
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:26
msgid "Unable to perform search."
msgstr "Не удается произвести поиск."
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:27
msgid "Unable to save {0}."
msgstr "Не удается сохранить {0}."
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:28
msgid "Would you like to save your changes?"
msgstr "Сохранить изменения?"
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:29
msgid ""
"You are attempting to move a contact from one addressbook to another but it "
"cannot be removed from the source. Do you want to save a copy instead?"
@@ -458,8 +465,7 @@ msgstr ""
"Вы пытаетесь переместить контакт из одной адресной книги в другую, но он не "
"может быть удален из источника. Сохранить копию контакта?"
-#: ../addressbook/addressbook.error.xml.h:28
-#: ../calendar/calendar.error.xml.h:59
+#: ../addressbook/addressbook.error.xml.h:30
msgid ""
"You are connecting to an unsupported GroupWise server and may encounter "
"problems using Evolution. For best results the server should be upgraded to "
@@ -469,48 +475,47 @@ msgstr ""
"с проблемами при использовании Evolution. Для получения лучших результатов "
"сервер должен быть обновлен до поддерживаемой версии"
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:31
msgid ""
"You have made modifications to this contact. Do you want to save these "
"changes?"
msgstr "Этот контакт содержит несохраненные изменения. Сохранить изменения?"
-#: ../addressbook/addressbook.error.xml.h:30
-msgid ""
-"Your contacts for {0} will not be available until Evolution is restarted."
+#: ../addressbook/addressbook.error.xml.h:32
+msgid "Your contacts for {0} will not be available until Evolution is restarted."
msgstr "Ваши контакты для {0} не будут доступны до перезапуска Evolution."
-#: ../addressbook/addressbook.error.xml.h:31 ../mail/em-vfolder-rule.c:495
+#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:496
#: ../plugins/groupwise-features/junk-settings.glade.h:4
#: ../plugins/groupwise-features/properties.glade.h:10
#: ../widgets/table/e-table-config.glade.h:15
msgid "_Add"
msgstr "_Добавить"
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:34
msgid "_Discard"
msgstr "_Отклонить"
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:35
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
msgid "{0}"
msgstr "{0}"
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:36
msgid "{1}"
msgstr "{1}"
-#: ../addressbook/conduit/address-conduit.c:298
+#: ../addressbook/conduit/address-conduit.c:300
msgid "Default Sync Address:"
msgstr "Адрес синхронизации по умолчанию:"
-#: ../addressbook/conduit/address-conduit.c:1183
-#: ../addressbook/conduit/address-conduit.c:1184
+#: ../addressbook/conduit/address-conduit.c:1241
+#: ../addressbook/conduit/address-conduit.c:1242
msgid "Could not load addressbook"
msgstr "Не удается загрузить адресную книгу"
-#: ../addressbook/conduit/address-conduit.c:1252
-#: ../addressbook/conduit/address-conduit.c:1255
+#: ../addressbook/conduit/address-conduit.c:1310
+#: ../addressbook/conduit/address-conduit.c:1313
msgid "Could not read pilot's Address application block"
msgstr "Не удается прочитать блок приложения адресов Пилота"
@@ -532,30 +537,31 @@ msgstr "Здесь настраивается автозавершение"
#. Create the contacts group
#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1180
-#: ../calendar/gui/calendar-component.c:246 ../calendar/gui/migration.c:388
+#: ../addressbook/gui/component/addressbook-view.c:1334
+#: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
+#: ../plugins/exchange-operations/exchange-folder.c:585
msgid "Contacts"
msgstr "Контакты"
#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook"
+msgid "Evolution Address Book"
msgstr "Адресная книга Evolution"
#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution Addressbook address pop-up"
+msgid "Evolution Address Book address pop-up"
+msgstr "Выпадающий адрес адресной книги Evolution"
#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution Addressbook address viewer"
+msgid "Evolution Address Book address viewer"
+msgstr "Evolution Address Book address viewer"
#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution Addressbook card viewer"
+msgid "Evolution Address Book card viewer"
+msgstr "Evolution Address Book card viewer"
#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook component"
-msgstr "Evolution Addressbook component"
+msgid "Evolution Address Book component"
+msgstr "Evolution Address Book component"
#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
msgid "Evolution S/Mime Certificate Management Control"
@@ -571,12 +577,14 @@ msgstr "Здесь можно управлять вашими сертифика
#. create the local source group
#. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:137
-#: ../addressbook/gui/component/addressbook-migrate.c:502
-#: ../calendar/gui/calendar-component.c:208 ../calendar/gui/migration.c:462
-#: ../calendar/gui/migration.c:555 ../calendar/gui/tasks-component.c:188
-#: ../mail/em-folder-tree-model.c:197 ../mail/em-folder-tree-model.c:199
-#: ../mail/mail-component.c:292 ../mail/mail-vfolder.c:223
+#: ../addressbook/gui/component/addressbook-component.c:141
+#: ../addressbook/gui/component/addressbook-migrate.c:483
+#: ../calendar/gui/calendar-component.c:209
+#: ../calendar/gui/memos-component.c:194 ../calendar/gui/migration.c:474
+#: ../calendar/gui/migration.c:567 ../calendar/gui/migration.c:1075
+#: ../calendar/gui/tasks-component.c:190 ../mail/em-folder-tree-model.c:199
+#: ../mail/em-folder-tree-model.c:201 ../mail/mail-component.c:299
+#: ../mail/mail-vfolder.c:223
msgid "On This Computer"
msgstr "На этом компьютере"
@@ -585,132 +593,134 @@ msgstr "На этом компьютере"
#. Create the default Person task list
#. Create the default Person addressbook
#. orange
-#: ../addressbook/gui/component/addressbook-component.c:145
-#: ../addressbook/gui/component/addressbook-migrate.c:510
+#: ../addressbook/gui/component/addressbook-component.c:149
+#: ../addressbook/gui/component/addressbook-migrate.c:491
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: ../calendar/gui/calendar-component.c:216 ../calendar/gui/migration.c:470
-#: ../calendar/gui/migration.c:563 ../calendar/gui/tasks-component.c:196
-#: ../filter/filter-label.c:123 ../mail/em-migrate.c:1043
-#: ../mail/mail-config.c:78 ../mail/mail-config.glade.h:104
+#: ../calendar/gui/calendar-component.c:217
+#: ../calendar/gui/memos-component.c:202 ../calendar/gui/migration.c:482
+#: ../calendar/gui/migration.c:575 ../calendar/gui/migration.c:1083
+#: ../calendar/gui/tasks-component.c:198 ../filter/filter-label.c:123
+#: ../mail/em-migrate.c:1054 ../mail/mail-config.glade.h:105
msgid "Personal"
msgstr "Личная"
#. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:155
-#: ../addressbook/gui/component/addressbook-migrate.c:520
+#: ../addressbook/gui/component/addressbook-component.c:159
+#: ../addressbook/gui/component/addressbook-migrate.c:501
msgid "On LDAP Servers"
msgstr "На серверах LDAP"
-#: ../addressbook/gui/component/addressbook-component.c:226
+#: ../addressbook/gui/component/addressbook-component.c:227
msgid "_Contact"
msgstr "Контакт"
-#: ../addressbook/gui/component/addressbook-component.c:227
+#: ../addressbook/gui/component/addressbook-component.c:228
msgid "Create a new contact"
msgstr "Создание нового контакта"
-#: ../addressbook/gui/component/addressbook-component.c:234
+#: ../addressbook/gui/component/addressbook-component.c:235
msgid "Contact _List"
msgstr "Список _контактов"
-#: ../addressbook/gui/component/addressbook-component.c:235
+#: ../addressbook/gui/component/addressbook-component.c:236
msgid "Create a new contact list"
msgstr "Создание нового списка контактов"
-#: ../addressbook/gui/component/addressbook-component.c:241
-#: ../addressbook/gui/component/addressbook-config.c:1118
-#: ../addressbook/gui/component/addressbook-view.c:763
+#: ../addressbook/gui/component/addressbook-component.c:242
+#: ../addressbook/gui/component/addressbook-config.c:1202
msgid "New Address Book"
msgstr "Новая адресная книга"
-#: ../addressbook/gui/component/addressbook-component.c:242
+#: ../addressbook/gui/component/addressbook-component.c:243
msgid "Address _Book"
msgstr "Адресная _книга"
-#: ../addressbook/gui/component/addressbook-component.c:243
+#: ../addressbook/gui/component/addressbook-component.c:244
msgid "Create a new address book"
msgstr "Создать новую адресную книгу"
-#: ../addressbook/gui/component/addressbook-component.c:385
-msgid "Failed upgrading Addressbook settings or folders."
+#: ../addressbook/gui/component/addressbook-component.c:382
+msgid "Failed upgrading Address Book settings or folders."
msgstr "Ошибка обновления параметров или папок Адресной книги."
-#: ../addressbook/gui/component/addressbook-config.c:313
+#: ../addressbook/gui/component/addressbook-config.c:329
msgid "Base"
msgstr "Base"
-#: ../addressbook/gui/component/addressbook-config.c:508
+#: ../addressbook/gui/component/addressbook-config.c:530
#: ../calendar/gui/dialogs/calendar-setup.c:192
#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
msgid "_Type:"
msgstr "_Тип:"
-#: ../addressbook/gui/component/addressbook-config.c:607
+#: ../addressbook/gui/component/addressbook-config.c:632
msgid "Copy book content locally for offline operation"
msgstr "Скопировать книгу локально для автономной работы"
-#: ../addressbook/gui/component/addressbook-config.c:902
-#: ../addressbook/gui/component/ldap-config.glade.h:23
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: ../calendar/gui/dialogs/calendar-setup.c:366
-#: ../calendar/gui/dialogs/calendar-setup.c:377
-#: ../mail/em-folder-properties.c:215 ../mail/mail-config.glade.h:85
+#: ../addressbook/gui/component/addressbook-config.c:981
+#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../mail/em-folder-properties.c:217 ../mail/mail-config.glade.h:86
#: ../smime/gui/smime-ui.glade.h:28
msgid "General"
msgstr "Общие"
-#: ../addressbook/gui/component/addressbook-config.c:903
-#: ../mail/importers/pine-importer.c:393
-msgid "Addressbook"
+#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../addressbook/gui/widgets/e-addressbook-view.c:563
+#: ../mail/importers/pine-importer.c:392
+msgid "Address Book"
msgstr "Адресная книга"
-#: ../addressbook/gui/component/addressbook-config.c:907
+#: ../addressbook/gui/component/addressbook-config.c:986
msgid "Server Information"
msgstr "Сведения о сервере"
-#: ../addressbook/gui/component/addressbook-config.c:909
+#: ../addressbook/gui/component/addressbook-config.c:988
msgid "Authentication"
msgstr "Аутентификация"
-#: ../addressbook/gui/component/addressbook-config.c:912
-#: ../addressbook/gui/component/ldap-config.glade.h:18
+#: ../addressbook/gui/component/addressbook-config.c:991
+#: ../addressbook/gui/component/ldap-config.glade.h:17
#: ../mail/mail-dialogs.glade.h:7 ../smime/gui/smime-ui.glade.h:20
msgid "Details"
msgstr "Подробности"
-#: ../addressbook/gui/component/addressbook-config.c:913
+#: ../addressbook/gui/component/addressbook-config.c:992
msgid "Searching"
msgstr "Поиск"
-#: ../addressbook/gui/component/addressbook-config.c:915
+#: ../addressbook/gui/component/addressbook-config.c:994
msgid "Downloading"
msgstr "Загрузка"
-#: ../addressbook/gui/component/addressbook-config.c:1116
-#: ../addressbook/gui/component/ldap-config.glade.h:14
+#: ../addressbook/gui/component/addressbook-config.c:1200
+#: ../addressbook/gui/component/ldap-config.glade.h:13
msgid "Address Book Properties"
msgstr "Свойства адресной книги"
-#: ../addressbook/gui/component/addressbook-migrate.c:72
-#: ../calendar/gui/migration.c:142 ../mail/em-migrate.c:1190
+#: ../addressbook/gui/component/addressbook-migrate.c:73
+#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1201
msgid "Migrating..."
msgstr "Перенос..."
-#: ../addressbook/gui/component/addressbook-migrate.c:124
-#: ../calendar/gui/migration.c:189 ../mail/em-migrate.c:1231
+#: ../addressbook/gui/component/addressbook-migrate.c:125
+#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1242
#, c-format
msgid "Migrating `%s':"
msgstr "Переносится '%s':"
-#: ../addressbook/gui/component/addressbook-migrate.c:648
+#: ../addressbook/gui/component/addressbook-migrate.c:629
msgid "LDAP Servers"
msgstr "Серверы LDAP"
-#: ../addressbook/gui/component/addressbook-migrate.c:763
+#: ../addressbook/gui/component/addressbook-migrate.c:744
msgid "Autocompletion Settings"
msgstr "Настройка автозавершения"
-#: ../addressbook/gui/component/addressbook-migrate.c:1134
+#: ../addressbook/gui/component/addressbook-migrate.c:1119
msgid ""
"The location and hierarchy of the Evolution contact folders has changed "
"since Evolution 1.x.\n"
@@ -722,7 +732,7 @@ msgstr ""
"\n"
"Производится преобразование папок для новой версии..."
-#: ../addressbook/gui/component/addressbook-migrate.c:1148
+#: ../addressbook/gui/component/addressbook-migrate.c:1133
msgid ""
"The format of mailing list contacts has changed.\n"
"\n"
@@ -732,7 +742,7 @@ msgstr ""
"\n"
"Производится преобразование папок для новой версии..."
-#: ../addressbook/gui/component/addressbook-migrate.c:1157
+#: ../addressbook/gui/component/addressbook-migrate.c:1142
msgid ""
"The way Evolution stores some phone numbers has changed.\n"
"\n"
@@ -742,7 +752,7 @@ msgstr ""
"\n"
"Производится преобразование папок для новой версии..."
-#: ../addressbook/gui/component/addressbook-migrate.c:1167
+#: ../addressbook/gui/component/addressbook-migrate.c:1152
msgid ""
"Evolution's Palm Sync changelog and map files have changed.\n"
"\n"
@@ -752,22 +762,54 @@ msgstr ""
"\n"
"Производится преобразование ваших данных Pilot Sync..."
-#: ../addressbook/gui/component/addressbook-view.c:764
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
-#: ../calendar/gui/calendar-component.c:537
-#: ../calendar/gui/tasks-component.c:441 ../mail/em-filter-i18n.h:11
-#: ../ui/evolution-addressbook.xml.h:8 ../ui/evolution-calendar.xml.h:5
-#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Удалить"
+#: ../addressbook/gui/component/addressbook-view.c:434
+#: ../mail/em-folder-utils.c:503
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "Переименовать папку \"%s\" в:"
+
+#: ../addressbook/gui/component/addressbook-view.c:437
+#: ../mail/em-folder-utils.c:505
+msgid "Rename Folder"
+msgstr "Переименование папки"
-#: ../addressbook/gui/component/addressbook-view.c:766
+#: ../addressbook/gui/component/addressbook-view.c:442
+#: ../mail/em-folder-utils.c:511
+msgid "Folder names cannot contain '/'"
+msgstr "Имена папок не может содержать '/'"
+
+#: ../addressbook/gui/component/addressbook-view.c:445
+msgid "A Folder with this name already exists"
+msgstr "Папка с таким именем уже существует"
+
+#: ../addressbook/gui/component/addressbook-view.c:953
+msgid "_New Address Book"
+msgstr "_Новая адресная книга"
+
+#. FIXME: need to disable for undeletable folders
+#: ../addressbook/gui/component/addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:979
#: ../calendar/gui/calendar-component.c:538
-#: ../calendar/gui/tasks-component.c:442
-msgid "Properties..."
-msgstr "Свойства..."
+#: ../calendar/gui/e-calendar-table.c:1196
+#: ../calendar/gui/e-calendar-view.c:1628 ../calendar/gui/e-memo-table.c:871
+#: ../calendar/gui/tasks-component.c:443 ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-view.c:1091 ../ui/evolution-addressbook.xml.h:49
+#: ../ui/evolution-calendar.xml.h:38 ../ui/evolution-mail-list.xml.h:30
+#: ../ui/evolution-memos.xml.h:16 ../ui/evolution-tasks.xml.h:24
+msgid "_Delete"
+msgstr "_Удалить"
+
+#: ../addressbook/gui/component/addressbook-view.c:956
+msgid "Save As Vcard..."
+msgstr "Сохранить как VCard..."
-#: ../addressbook/gui/component/addressbook-view.c:1191
+#: ../addressbook/gui/component/addressbook-view.c:958
+#: ../calendar/gui/calendar-component.c:539
+#: ../calendar/gui/tasks-component.c:444
+msgid "_Properties..."
+msgstr "_Свойства..."
+
+#: ../addressbook/gui/component/addressbook-view.c:1345
msgid "Contact Source Selector"
msgstr "Выбор источника контактов"
@@ -775,13 +817,13 @@ msgstr "Выбор источника контактов"
msgid "Accessing LDAP Server anonymously"
msgstr "Анонимное подключение к серверу LDAP"
-#: ../addressbook/gui/component/addressbook.c:191
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:490
+#: ../addressbook/gui/component/addressbook.c:197
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:492
msgid "Failed to authenticate.\n"
msgstr "Ошибка проверки подлинности.\n"
-#: ../addressbook/gui/component/addressbook.c:198
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:469
+#: ../addressbook/gui/component/addressbook.c:204
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:471
#, c-format
msgid "Enter password for %s (user %s)"
msgstr "Введите пароль для %s (пользователь %s)"
@@ -827,7 +869,7 @@ msgid "URI for the folder last used in the select names dialog."
msgstr "URI папки, использовавшейся в последний раз в диалоге выбора имен"
#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
msgid "Vertical pane position"
msgstr "Позиция вертикальной панели"
@@ -836,127 +878,120 @@ msgid "Whether to show the preview pane."
msgstr "Показывать ли панель предварительного просмотра."
#: ../addressbook/gui/component/ldap-config.glade.h:1
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
-#: ../addressbook/gui/contact-editor/fullname.glade.h:1
-#: ../addressbook/gui/contact-editor/im.glade.h:1
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
-#: ../calendar/gui/dialogs/event-page.glade.h:1
-#: ../calendar/gui/dialogs/new-calendar.glade.h:1
-#: ../calendar/gui/dialogs/new-task-list.glade.h:1
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../mail/message-tags.glade.h:1
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
-#: ../plugins/groupwise-features/properties.glade.h:1
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
-#: ../widgets/menus/gal-view-new-dialog.glade.h:1
-#: ../widgets/misc/e-attachment.glade.h:1
-#: ../widgets/misc/gal-categories.glade.h:1
-msgid "*"
-msgstr "*"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:2
msgid "1"
msgstr "1"
-#: ../addressbook/gui/component/ldap-config.glade.h:3
+#: ../addressbook/gui/component/ldap-config.glade.h:2
msgid "3268"
msgstr "3268"
-#: ../addressbook/gui/component/ldap-config.glade.h:4
+#: ../addressbook/gui/component/ldap-config.glade.h:3
msgid "389"
msgstr "389"
-#: ../addressbook/gui/component/ldap-config.glade.h:5
+#: ../addressbook/gui/component/ldap-config.glade.h:4
msgid "5"
msgstr "5"
-#: ../addressbook/gui/component/ldap-config.glade.h:6
+#: ../addressbook/gui/component/ldap-config.glade.h:5
msgid "636"
msgstr "636"
-#: ../addressbook/gui/component/ldap-config.glade.h:7
+#: ../addressbook/gui/component/ldap-config.glade.h:6
#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
msgid "<b>Authentication</b>"
msgstr "<b>Проверка подлинности</b>"
-#: ../addressbook/gui/component/ldap-config.glade.h:8
+#: ../addressbook/gui/component/ldap-config.glade.h:7
msgid "<b>Display</b>"
msgstr "<b>Отображение</b>"
-#: ../addressbook/gui/component/ldap-config.glade.h:9
+#: ../addressbook/gui/component/ldap-config.glade.h:8
msgid "<b>Downloading</b>"
msgstr "<b>Загрузка</b>"
-#: ../addressbook/gui/component/ldap-config.glade.h:10
+#: ../addressbook/gui/component/ldap-config.glade.h:9
msgid "<b>Searching</b>"
msgstr "<b>Поиск</b>"
-#: ../addressbook/gui/component/ldap-config.glade.h:11
+#: ../addressbook/gui/component/ldap-config.glade.h:10
msgid "<b>Server Information</b>"
msgstr "<b>Сведения о сервере</b>"
-#: ../addressbook/gui/component/ldap-config.glade.h:12
+#: ../addressbook/gui/component/ldap-config.glade.h:11
msgid "<b>Type:</b>"
msgstr "<b>Тип:</b>"
-#: ../addressbook/gui/component/ldap-config.glade.h:13
+#: ../addressbook/gui/component/ldap-config.glade.h:12
msgid "Add Address Book"
msgstr "Добавить адресную книгу"
-#: ../addressbook/gui/component/ldap-config.glade.h:15
-#: ../mail/em-account-editor.c:302 ../mail/em-account-editor.c:759
+#: ../addressbook/gui/component/ldap-config.glade.h:14
+#: ../mail/em-account-editor.c:304 ../mail/em-account-editor.c:769
msgid "Always"
msgstr "Всегда"
-#: ../addressbook/gui/component/ldap-config.glade.h:16
+#: ../addressbook/gui/component/ldap-config.glade.h:15
msgid "Anonymously"
msgstr "Анонимно"
-#: ../addressbook/gui/component/ldap-config.glade.h:17
+#: ../addressbook/gui/component/ldap-config.glade.h:16
msgid "Basic"
msgstr "Основные"
-#: ../addressbook/gui/component/ldap-config.glade.h:19
+#: ../addressbook/gui/component/ldap-config.glade.h:18
msgid "Distinguished name"
msgstr "Отличительное имя (DN)"
-#: ../addressbook/gui/component/ldap-config.glade.h:20
+#: ../addressbook/gui/component/ldap-config.glade.h:19
msgid "Email address"
msgstr "Электронная почта"
-#: ../addressbook/gui/component/ldap-config.glade.h:21
-msgid ""
-"Evolution will use this email address to authenticate you with the server."
+#: ../addressbook/gui/component/ldap-config.glade.h:20
+msgid "Evolution will use this email address to authenticate you with the server."
msgstr "Этот адрес будет использоваться для идентификации вас на сервере."
-#: ../addressbook/gui/component/ldap-config.glade.h:22
+#: ../addressbook/gui/component/ldap-config.glade.h:21
msgid "Find Possible Search Bases"
msgstr "Найти возможные базы поиска"
-#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../addressbook/gui/component/ldap-config.glade.h:23
msgid "Lo_gin:"
msgstr "_Имя пользователя:"
-#: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:300 ../mail/em-account-editor.c:758
+#: ../addressbook/gui/component/ldap-config.glade.h:24
+#: ../mail/em-account-editor.c:302 ../mail/em-account-editor.c:768
msgid "Never"
msgstr "Никогда"
-#: ../addressbook/gui/component/ldap-config.glade.h:26
+#: ../addressbook/gui/component/ldap-config.glade.h:25
msgid "One"
msgstr "Один уровень"
+#: ../addressbook/gui/component/ldap-config.glade.h:26
+msgid "Search Filter"
+msgstr "Фильтр поиска"
+
#: ../addressbook/gui/component/ldap-config.glade.h:27
msgid "Search _base:"
msgstr "_База поиска:"
#: ../addressbook/gui/component/ldap-config.glade.h:28
+msgid "Search _filter:"
+msgstr "_Фильтр поиска:"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:29
+msgid "Search filter"
+msgstr "Фильтр поиска"
+
+#: ../addressbook/gui/component/ldap-config.glade.h:30
+msgid ""
+"Search filter is the type of the objects searched for, while performing the "
+"search. If this is not modified, by default search will be performed on "
+"objectclass of the type \"person\"."
+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."
@@ -964,7 +999,7 @@ msgstr ""
"Выбор этой опции означает, что Evolution будет устанавливать соединение с "
"вашим сервером LDAP только в том случае, если он поддерживает SSL or TLS."
-#: ../addressbook/gui/component/ldap-config.glade.h:29
+#: ../addressbook/gui/component/ldap-config.glade.h:32
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 "
@@ -976,7 +1011,7 @@ msgstr ""
"если вы и ваш сервер LDAP находятся за межсетевым экраном, то Evolution не "
"будет использовать SSL/TLS, так как ваше соединение уже достаточно безопасно."
-#: ../addressbook/gui/component/ldap-config.glade.h:30
+#: ../addressbook/gui/component/ldap-config.glade.h:33
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 "
@@ -985,17 +1020,18 @@ msgstr ""
"Выбор этой опции означает, что ваш сервер не поддерживает протоколы SSL и "
"TLS . Это означает, что ваше соединение с сервером будет уязвимым для атак. "
-#: ../addressbook/gui/component/ldap-config.glade.h:31
+#: ../addressbook/gui/component/ldap-config.glade.h:34
msgid "Sub"
msgstr "Все нижние уровни"
-#: ../addressbook/gui/component/ldap-config.glade.h:32
+#: ../addressbook/gui/component/ldap-config.glade.h:35
msgid "Supported Search Bases"
msgstr "Поддерживаемые базы поиска"
-#: ../addressbook/gui/component/ldap-config.glade.h:33
+#: ../addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
msgid ""
-"The search base is the distinguished name (DN) of the entry where your "
+"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 "
"root of the directory tree."
msgstr ""
@@ -1003,7 +1039,7 @@ msgstr ""
"откуда начнется ваш поиск. Если вы оставите это поле пустым, то поиск "
"начнется с корня дерева каталогов."
-#: ../addressbook/gui/component/ldap-config.glade.h:34
+#: ../addressbook/gui/component/ldap-config.glade.h:37
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 "
@@ -1015,13 +1051,13 @@ msgstr ""
"каталогом начала поиска. Глубина поиска \"one\" включает в себя элементы на "
"один уровень ниже каталога начала поиска."
-#: ../addressbook/gui/component/ldap-config.glade.h:35
+#: ../addressbook/gui/component/ldap-config.glade.h:38
msgid ""
"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
"\"."
msgstr "Полное имя вашего сервера LDAP. Например: \"ldap.mycompany.com\"."
-#: ../addressbook/gui/component/ldap-config.glade.h:36
+#: ../addressbook/gui/component/ldap-config.glade.h:39
msgid ""
"This is the maximum number of entries to download. Setting this number to be "
"too large will slow down your address book."
@@ -1029,7 +1065,7 @@ msgstr ""
"Максимальное число элементов для загрузки. Установка очень большого значения "
"может серьезно замедлить работу вашей адресной книги."
-#: ../addressbook/gui/component/ldap-config.glade.h:37
+#: ../addressbook/gui/component/ldap-config.glade.h:40
msgid ""
"This is the method Evolution will use to authenticate you. Note that "
"setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1039,7 +1075,7 @@ msgstr ""
"что установка этого параметра в \"Адрес эл. почты\" требует анонимного "
"доступа к вашему серверу LDAP."
-#: ../addressbook/gui/component/ldap-config.glade.h:38
+#: ../addressbook/gui/component/ldap-config.glade.h:41
msgid ""
"This is the name for this server that will appear in your Evolution folder "
"list. It is for display purposes only. "
@@ -1047,7 +1083,7 @@ msgstr ""
"Это имя сервера будет появляться в списке каталогов Evolution. Оно "
"используется только для отображения. "
-#: ../addressbook/gui/component/ldap-config.glade.h:39
+#: ../addressbook/gui/component/ldap-config.glade.h:42
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 "
@@ -1057,36 +1093,36 @@ msgstr ""
"Список стандартных портов ранее уже был предоставлен. Спросите вашего "
"системного администратора, какой из них вам необходимо использовать."
-#: ../addressbook/gui/component/ldap-config.glade.h:40
+#: ../addressbook/gui/component/ldap-config.glade.h:43
msgid "Using distinguished name (DN)"
msgstr "По отличительному имени (DN)"
-#: ../addressbook/gui/component/ldap-config.glade.h:41
+#: ../addressbook/gui/component/ldap-config.glade.h:44
msgid "Using email address"
msgstr "По почтовому адресу"
-#: ../addressbook/gui/component/ldap-config.glade.h:42
-#: ../mail/em-account-editor.c:301
+#: ../addressbook/gui/component/ldap-config.glade.h:45
+#: ../mail/em-account-editor.c:303
msgid "Whenever Possible"
msgstr "Когда это возможно"
-#: ../addressbook/gui/component/ldap-config.glade.h:43
+#: ../addressbook/gui/component/ldap-config.glade.h:46
msgid "_Add Address Book"
msgstr "_Добавить адресную книгу"
-#: ../addressbook/gui/component/ldap-config.glade.h:44
+#: ../addressbook/gui/component/ldap-config.glade.h:47
msgid "_Download limit:"
msgstr "Ограничение загрузки:"
-#: ../addressbook/gui/component/ldap-config.glade.h:45
+#: ../addressbook/gui/component/ldap-config.glade.h:48
msgid "_Find Possible Search Bases"
msgstr "_Найти поддерживаемые базы поиска"
-#: ../addressbook/gui/component/ldap-config.glade.h:46
+#: ../addressbook/gui/component/ldap-config.glade.h:49
msgid "_Login method:"
msgstr "_Метод подключения:"
-#: ../addressbook/gui/component/ldap-config.glade.h:47
+#: ../addressbook/gui/component/ldap-config.glade.h:50
#: ../calendar/gui/dialogs/calendar-setup.c:244
#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
#: ../mail/mail-config.glade.h:164
@@ -1094,41 +1130,70 @@ msgstr "_Метод подключения:"
msgid "_Name:"
msgstr "_Имя:"
-#: ../addressbook/gui/component/ldap-config.glade.h:48
+#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../plugins/publish-calendar/publish-calendar.glade.h:23
msgid "_Port:"
msgstr "_Порт:"
-#: ../addressbook/gui/component/ldap-config.glade.h:49
+#: ../addressbook/gui/component/ldap-config.glade.h:52
msgid "_Search scope:"
msgstr "_Диапазон поиска:"
-#: ../addressbook/gui/component/ldap-config.glade.h:50
+#: ../addressbook/gui/component/ldap-config.glade.h:53
#: ../mail/mail-config.glade.h:171
+#: ../plugins/publish-calendar/publish-calendar.glade.h:26
msgid "_Server:"
msgstr "_Сервер:"
-#: ../addressbook/gui/component/ldap-config.glade.h:51
+#: ../addressbook/gui/component/ldap-config.glade.h:54
msgid "_Timeout:"
msgstr "_Задержка:"
-#: ../addressbook/gui/component/ldap-config.glade.h:52
+#: ../addressbook/gui/component/ldap-config.glade.h:55
msgid "_Use secure connection:"
msgstr "Использовать _защищенное соединение:"
-#: ../addressbook/gui/component/ldap-config.glade.h:53
+#: ../addressbook/gui/component/ldap-config.glade.h:56
msgid "cards"
msgstr "карточек"
-#: ../addressbook/gui/component/ldap-config.glade.h:54
+#: ../addressbook/gui/component/ldap-config.glade.h:57
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
+#: ../calendar/gui/alarm-notify/util.c:64
+#: ../calendar/gui/alarm-notify/util.c:66
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
#: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../filter/filter.glade.h:16 ../mail/em-account-editor.c:1951
-#: ../plugins/calendar-http/calendar-http.c:263
+#: ../calendar/gui/dialogs/event-page.glade.h:20 ../calendar/gui/misc.c:111
+#: ../calendar/gui/misc.c:113 ../filter/filter.glade.h:16
+#: ../mail/em-account-editor.c:1989
+#: ../plugins/calendar-http/calendar-http.c:286
#: ../plugins/calendar-weather/calendar-weather.c:563
msgid "minutes"
msgstr "минут"
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: ../addressbook/gui/contact-editor/fullname.glade.h:1
+#: ../addressbook/gui/contact-editor/im.glade.h:1
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: ../calendar/gui/dialogs/cal-attachment.glade.h:1
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
+#: ../calendar/gui/dialogs/memo-page.glade.h:1
+#: ../calendar/gui/dialogs/new-calendar.glade.h:1
+#: ../calendar/gui/dialogs/new-task-list.glade.h:1
+#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: ../composer/e-msg-composer-attachment.glade.h:1
+#: ../mail/message-tags.glade.h:1
+#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
+#: ../plugins/groupwise-features/properties.glade.h:1
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+#: ../widgets/misc/e-attachment.glade.h:1
+#: ../widgets/misc/gal-categories.glade.h:1
+msgid "*"
+msgstr "*"
+
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
msgid "<b>Email</b>"
msgstr "<b>Электронная почта</b>"
@@ -1166,23 +1231,23 @@ msgid "<b>Work</b>"
msgstr "<b>Рабочий</b>"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
#: ../addressbook/gui/widgets/eab-contact-display.c:348
msgid "AIM"
msgstr "AIM"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:272
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:274
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:170
#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
#: ../addressbook/gui/widgets/e-minicard.c:182
msgid "Contact"
msgstr "Контакт"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:525
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:540
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2353
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:566
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2402
msgid "Contact Editor"
msgstr "Редактор контактов"
@@ -1195,7 +1260,7 @@ msgid "Image"
msgstr "Изображение"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
msgid "MSN Messenger"
msgstr "MSN Messenger"
@@ -1208,7 +1273,7 @@ msgid "Ni_ckname:"
msgstr "Псевдон_им:"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
msgid "Novell Groupwise"
msgstr "Novell Groupwise"
@@ -1222,10 +1287,10 @@ msgstr "Телефон"
#. red
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:235
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:201
-#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1042
-#: ../mail/mail-config.c:77 ../mail/mail-config.glade.h:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1053
+#: ../mail/mail-config.glade.h:154
msgid "Work"
msgstr "Служебное"
@@ -1247,11 +1312,13 @@ msgid "_Birthday:"
msgstr "_День рождения:"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../plugins/itip-formatter/itip-view.c:1662
+#: ../plugins/itip-formatter/itip-view.c:1652
msgid "_Calendar:"
msgstr "_Календарь:"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
+#: ../ui/evolution-task-editor.xml.h:18
msgid "_Categories"
msgstr "_Категории"
@@ -1316,7 +1383,7 @@ msgstr "Область, край:"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
#: ../addressbook/gui/contact-editor/fullname.glade.h:18
msgid "_Title:"
-msgstr "Заголовок:"
+msgstr "_Обращение:"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
msgid "_Video Chat:"
@@ -1339,17 +1406,17 @@ msgstr "_Где:"
msgid "_Zip/Postal Code:"
msgstr "_Почтовый индекс:"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:96
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
#: ../addressbook/gui/widgets/eab-contact-display.c:367
#: ../addressbook/gui/widgets/eab-contact-display.c:382
msgid "Address"
msgstr "Адрес"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:300
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:104
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:302
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:184
#: ../addressbook/gui/widgets/e-addressbook-model.c:310
#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
#: ../addressbook/gui/widgets/e-minicard-label.c:164
@@ -1357,1088 +1424,1088 @@ msgstr "Адрес"
#: ../addressbook/gui/widgets/e-minicard-view.c:520
#: ../addressbook/gui/widgets/e-minicard.c:175
#: ../widgets/menus/gal-define-views-model.c:181
-#: ../widgets/table/e-cell-text.c:1768 ../widgets/text/e-entry.c:1312
-#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3584
-#: ../widgets/text/e-text.c:3585
+#: ../widgets/table/e-cell-text.c:1772 ../widgets/text/e-entry.c:1312
+#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3607
+#: ../widgets/text/e-text.c:3608
msgid "Editable"
msgstr "Изменяемый"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
msgid "United States"
msgstr "Соединенные Штаты"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
msgid "Afghanistan"
msgstr "Афганистан"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
msgid "Albania"
msgstr "Албания"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
msgid "Algeria"
msgstr "Алжир"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
msgid "American Samoa"
msgstr "Американское Самоа"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
msgid "Andorra"
msgstr "Андорра"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
msgid "Angola"
msgstr "Ангола"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
msgid "Anguilla"
msgstr "Ангилья"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
msgid "Antarctica"
msgstr "Антарктика"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
msgid "Antigua And Barbuda"
msgstr "Антигуа и Барбуды"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
msgid "Argentina"
msgstr "Аргентина"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
msgid "Armenia"
msgstr "Армения"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
msgid "Aruba"
msgstr "Аруба"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
msgid "Australia"
msgstr "Австралия"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
msgid "Austria"
msgstr "Австрия"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
msgid "Azerbaijan"
msgstr "Азербайджан"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
msgid "Bahamas"
msgstr "Багамы"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
msgid "Bahrain"
msgstr "Бахрейн"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
msgid "Bangladesh"
msgstr "Бангладеш"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
msgid "Barbados"
msgstr "Барбадос"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
msgid "Belarus"
msgstr "Беларусь"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
msgid "Belgium"
msgstr "Бельгия"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
msgid "Belize"
msgstr "Белиз"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
msgid "Benin"
msgstr "Бенин"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
msgid "Bermuda"
msgstr "Бермуды"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
msgid "Bhutan"
msgstr "Бутан"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
msgid "Bolivia"
msgstr "Боливия"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
msgid "Bosnia And Herzegowina"
msgstr "Босния и Герцеговина"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
msgid "Botswana"
msgstr "Ботсвана"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
msgid "Bouvet Island"
msgstr "Остров Буве"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
msgid "Brazil"
msgstr "Бразилия"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
msgid "British Indian Ocean Territory"
msgstr "Британская территория Индийского океана"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
msgid "Brunei Darussalam"
msgstr "Бруней"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
msgid "Bulgaria"
msgstr "Болгария"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
msgid "Burkina Faso"
msgstr "Буркина Фасо"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
msgid "Burundi"
msgstr "Бурунди"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
msgid "Cambodia"
msgstr "Камбоджа"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
msgid "Cameroon"
msgstr "Камерун"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
msgid "Canada"
msgstr "Канада"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
msgid "Cape Verde"
msgstr "Кейп Верде"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
msgid "Cayman Islands"
msgstr "Каймановы острова"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
msgid "Central African Republic"
msgstr "Центрально-Африканская Республика"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
msgid "Chad"
msgstr "Чад"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
msgid "Chile"
msgstr "Чили"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
msgid "China"
msgstr "Китай"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
msgid "Christmas Island"
msgstr "Остров Рождества"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
msgid "Cocos (Keeling) Islands"
msgstr "Кокосовые острова"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
msgid "Colombia"
msgstr "Колумбия"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
msgid "Comoros"
msgstr "Коморос"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
msgid "Congo"
msgstr "Конго"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
msgid "Congo, The Democratic Republic Of The"
msgstr "Демократическая республика Конго"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
msgid "Cook Islands"
msgstr "Острова Кука"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
msgid "Costa Rica"
msgstr "Коста-Рика"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
msgid "Cote d'Ivoire"
msgstr "Кот-д-Ивуар"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
msgid "Croatia"
msgstr "Хорватия"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
msgid "Cuba"
msgstr "Куба"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
msgid "Cyprus"
msgstr "Кипр"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
msgid "Czech Republic"
msgstr "Чешская республика"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
msgid "Denmark"
msgstr "Дания"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
msgid "Djibouti"
msgstr "Джибути"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
msgid "Dominica"
msgstr "Доминика"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
msgid "Dominican Republic"
msgstr "Доминиканская республика"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
msgid "Ecuador"
msgstr "Эквадор"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
msgid "Egypt"
msgstr "Египет"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
msgid "El Salvador"
msgstr "Сальвадор"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
msgid "Equatorial Guinea"
msgstr "Экваториальная Гвинея"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
msgid "Eritrea"
msgstr "Эритрея"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
msgid "Estonia"
msgstr "Эстония"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
msgid "Ethiopia"
msgstr "Эфиопия"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
msgid "Falkland Islands"
msgstr "Фолклендские о-ва"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
msgid "Faroe Islands"
msgstr "Фарерские острова"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
msgid "Fiji"
msgstr "Фиджи"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
msgid "Finland"
msgstr "Финляндия"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
msgid "France"
msgstr "Франция"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
msgid "French Guiana"
msgstr "Французская Гвиана"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
msgid "French Polynesia"
msgstr "Французская Полинезия"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
msgid "French Southern Territories"
msgstr "Южные французские территории"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
msgid "Gabon"
msgstr "Габон"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
msgid "Gambia"
msgstr "Гамбия"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
msgid "Georgia"
msgstr "Грузия"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
msgid "Germany"
msgstr "Германия"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
msgid "Ghana"
msgstr "Гана"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
msgid "Gibraltar"
msgstr "Гибралтар"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
msgid "Greece"
msgstr "Греция"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
msgid "Greenland"
msgstr "Гренландия"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
msgid "Grenada"
msgstr "Гренада"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
msgid "Guadeloupe"
msgstr "Гваделупа"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
msgid "Guam"
msgstr "Гуам"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
msgid "Guatemala"
msgstr "Гватемала"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
msgid "Guernsey"
msgstr "Guernsey"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
msgid "Guinea"
msgstr "Гвинея"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
msgid "Guinea-bissau"
msgstr "Гвинея Бисау"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
msgid "Guyana"
msgstr "Гвиана"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
msgid "Haiti"
msgstr "Гаити"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
msgid "Heard And McDonald Islands"
msgstr "Острова Heard и Макдональд"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
msgid "Holy See"
msgstr "Holy See"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
msgid "Honduras"
msgstr "Гондурас"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
msgid "Hong Kong"
msgstr "Гонконг"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
msgid "Hungary"
msgstr "Венгрия"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
msgid "Iceland"
msgstr "Исландия"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
msgid "India"
msgstr "Индия"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
msgid "Indonesia"
msgstr "Индонезия"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
msgid "Iran"
msgstr "Иран"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
msgid "Iraq"
msgstr "Ирак"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
msgid "Ireland"
msgstr "Ирландия"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
msgid "Isle of Man"
msgstr "Остров Мэн"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
msgid "Israel"
msgstr "Израиль"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
msgid "Italy"
msgstr "Италия"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
msgid "Jamaica"
msgstr "Ямайка"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
msgid "Japan"
msgstr "Япония"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
msgid "Jersey"
msgstr "Джерси"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
msgid "Jordan"
msgstr "Иордания"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
msgid "Kazakhstan"
msgstr "Казахстан"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
msgid "Kenya"
msgstr "Кения"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
msgid "Kiribati"
msgstr "Кирибати"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
msgid "Korea, Democratic People's Republic Of"
msgstr "Корейская Народно-Демократическая Республика"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
msgid "Korea, Republic Of"
msgstr "Республика Корея"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
msgid "Kuwait"
msgstr "Кувейт"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
msgid "Kyrgyzstan"
msgstr "Киргизстан"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
msgid "Laos"
msgstr "Лаос"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
msgid "Latvia"
msgstr "Латвия"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
msgid "Lebanon"
msgstr "Ливан"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
msgid "Lesotho"
msgstr "Лесото"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
msgid "Liberia"
msgstr "Либерия"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
msgid "Libya"
msgstr "Ливия"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
msgid "Liechtenstein"
msgstr "Лихтенштейн"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
msgid "Lithuania"
msgstr "Литва"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
msgid "Luxembourg"
msgstr "Люксембург"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
msgid "Macao"
msgstr "Макао"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
msgid "Macedonia"
msgstr "Македония"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
msgid "Madagascar"
msgstr "Мадагаскар"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
msgid "Malawi"
msgstr "Малави"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
msgid "Malaysia"
msgstr "Малайзия"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
msgid "Maldives"
msgstr "Мальдивы"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
msgid "Mali"
msgstr "Мали"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
msgid "Malta"
msgstr "Мальта"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
msgid "Marshall Islands"
msgstr "Маршалловы о-ва"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
msgid "Martinique"
msgstr "Мартиника"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
msgid "Mauritania"
msgstr "Мавритания"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
msgid "Mauritius"
msgstr "Маврикий"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
msgid "Mayotte"
msgstr "Майот"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
msgid "Mexico"
msgstr "Мексика"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
msgid "Micronesia"
msgstr "Микронезия"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
msgid "Moldova, Republic Of"
msgstr "Республика Молдова"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
msgid "Monaco"
msgstr "Монако"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
msgid "Mongolia"
msgstr "Монголия"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
msgid "Montserrat"
msgstr "Монтсеррат"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
msgid "Morocco"
msgstr "Марокко"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
msgid "Mozambique"
msgstr "Мозамбик"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
msgid "Myanmar"
msgstr "Мьянма"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
msgid "Namibia"
msgstr "Намибия"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
msgid "Nauru"
msgstr "Науру"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
msgid "Nepal"
msgstr "Непал"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
msgid "Netherlands"
msgstr "Нидерланды"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
msgid "Netherlands Antilles"
msgstr "Нидерландские Антиллы"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
msgid "New Caledonia"
msgstr "Новая Каледония"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
msgid "New Zealand"
msgstr "Новая Зеландия"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
msgid "Nicaragua"
msgstr "Никарагуа"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
msgid "Niger"
msgstr "Нигер"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
msgid "Nigeria"
msgstr "Нигерия"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
msgid "Niue"
msgstr "Острова Ниуе"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
msgid "Norfolk Island"
msgstr "Норфолкские острова"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
msgid "Northern Mariana Islands"
msgstr "Северные Марианские острова"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
msgid "Norway"
msgstr "Норвегия"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
msgid "Oman"
msgstr "Оман"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
msgid "Pakistan"
msgstr "Пакистан"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
msgid "Palau"
msgstr "Палау"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
msgid "Palestinian Territory"
msgstr "Палестинские территории"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
msgid "Panama"
msgstr "Панама"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
msgid "Papua New Guinea"
msgstr "Папуа Новая Гвинея"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
msgid "Paraguay"
msgstr "Парагвай"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
msgid "Peru"
msgstr "Перу"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
msgid "Philippines"
msgstr "Филиппины"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
msgid "Pitcairn"
msgstr "Питкерн"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
msgid "Poland"
msgstr "Польша"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
msgid "Portugal"
msgstr "Португалия"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
msgid "Puerto Rico"
msgstr "Пуэрто-Рико"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
msgid "Qatar"
msgstr "Катар"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
msgid "Reunion"
msgstr "Реюньон"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
msgid "Romania"
msgstr "Румыния"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
msgid "Russian Federation"
msgstr "Российская Федерация"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
msgid "Rwanda"
msgstr "Руанда"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
msgid "Saint Kitts And Nevis"
msgstr "Сент-Киттс и Невис"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
msgid "Saint Lucia"
msgstr "Санта Люсия"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
msgid "Saint Vincent And The Grenadines"
msgstr "Сент-Винсент и Гренадины"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
msgid "Samoa"
msgstr "Самоа"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
msgid "San Marino"
msgstr "Сан-Марино"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
msgid "Sao Tome And Principe"
msgstr "Сан-Томе и Принсипи"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
msgid "Saudi Arabia"
msgstr "Саудовская Аравия"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
msgid "Senegal"
msgstr "Сенегал"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
msgid "Serbia And Montenegro"
msgstr "Сербия и Черногория"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
msgid "Seychelles"
msgstr "Сейшеллы"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
msgid "Sierra Leone"
msgstr "Сьерра-Леоне"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
msgid "Singapore"
msgstr "Сингапур"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
msgid "Slovakia"
msgstr "Словакия"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
msgid "Slovenia"
msgstr "Словения"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
msgid "Solomon Islands"
msgstr "Соломоновы о-ва"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
msgid "Somalia"
msgstr "Сомали"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
msgid "South Africa"
msgstr "Южная Африка"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
msgid "South Georgia And The South Sandwich Islands"
msgstr "Южная Георгия и Южные Сандвичевы острова"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
msgid "Spain"
msgstr "Испания"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
msgid "Sri Lanka"
msgstr "Шри Ланка"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
msgid "St. Helena"
msgstr "Остров Святой Елены"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
msgid "St. Pierre And Miquelon"
msgstr "Сен-Пьер и Микелон"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
msgid "Sudan"
msgstr "Судан"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
msgid "Suriname"
msgstr "Суринам"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
msgid "Svalbard And Jan Mayen Islands"
msgstr "Острова Свалбард и Йан Майен"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
msgid "Swaziland"
msgstr "Свазилэнд"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
msgid "Sweden"
msgstr "Швеция"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
msgid "Switzerland"
msgstr "Швейцария"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
msgid "Syria"
msgstr "Сирия"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
msgid "Taiwan"
msgstr "Тайвань"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
msgid "Tajikistan"
msgstr "Таджикистан"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
msgid "Tanzania, United Republic Of"
msgstr "Соединённая Республика Танзания"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
msgid "Thailand"
msgstr "Таиланд"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
msgid "Timor-Leste"
msgstr "Тимор-Лист"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
msgid "Togo"
msgstr "Того"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
msgid "Tokelau"
msgstr "Токелау"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
msgid "Tonga"
msgstr "Тонга"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
msgid "Trinidad And Tobago"
msgstr "Тринидад и Тобаго"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
msgid "Tunisia"
msgstr "Тунис"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
msgid "Turkey"
msgstr "Турция"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
msgid "Turkmenistan"
msgstr "Туркменистан"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
msgid "Turks And Caicos Islands"
msgstr "Острова Теркс и Кэйкос"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
msgid "Tuvalu"
msgstr "Тувалу"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
msgid "Uganda"
msgstr "Уганда"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
msgid "Ukraine"
msgstr "Украина"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
msgid "United Arab Emirates"
msgstr "Объединённые Арабские Эмираты"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
msgid "United Kingdom"
msgstr "Соединённое Королевство"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
msgid "United States Minor Outlying Islands"
msgstr "United States Minor Outlying Islands"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
msgid "Uruguay"
msgstr "Уругвай"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
msgid "Uzbekistan"
msgstr "Узбекистан"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
msgid "Vanuatu"
msgstr "Вануату"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
msgid "Venezuela"
msgstr "Венесуэла"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
msgid "Viet Nam"
msgstr "Вьетнам"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
msgid "Virgin Islands, British"
msgstr "Британские Вирджинские о-ва"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
msgid "Virgin Islands, U.S."
msgstr "Американские Вирджинские о-ва"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
msgid "Wallis And Futuna Islands"
msgstr "Острова Вэлис и Футуна"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
msgid "Western Sahara"
msgstr "Западная Сахара"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:375
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
msgid "Yemen"
msgstr "Йемен"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:376
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
msgid "Zambia"
msgstr "Замбия"
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
+#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:378
msgid "Zimbabwe"
msgstr "Зимбабве"
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-#: ../plugins/exchange-operations/exchange-delegates.c:936
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:717
-#: ../plugins/plugin-manager/plugin-manager.c:44
-#: ../plugins/save-attachments/save-attachments.c:362
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
+#: ../plugins/exchange-operations/exchange-delegates.c:934
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
+#: ../plugins/plugin-manager/plugin-manager.c:42
+#: ../plugins/save-attachments/save-attachments.c:369
#: ../widgets/menus/gal-view-new-dialog.c:73
msgid "Name"
msgstr "Имя"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:62
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
msgid "AOL Instant Messenger"
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/contact-editor/e-contact-editor-im.c:65
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
#: ../addressbook/gui/widgets/eab-contact-display.c:351
msgid "Jabber"
msgstr "Jabber"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:66
msgid "Yahoo Messenger"
msgstr "Yahoo Messenger"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
#: ../addressbook/gui/widgets/eab-contact-display.c:350
msgid "ICQ"
msgstr "ICQ"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:119
msgid "Service"
msgstr "Служба"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:587
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
#: ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../plugins/publish-calendar/publish-calendar.c:478
#: ../plugins/save-calendar/csv-format.c:400
msgid "Location"
msgstr "Адрес"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:135
msgid "Username"
msgstr "Имя пользователя"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:231
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
msgid "Home"
msgstr "Домашний"
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:239
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:205
msgid "Other"
msgstr "Другие"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
#: ../addressbook/gui/widgets/eab-contact-display.c:353
msgid "Yahoo"
msgstr "Yahoo"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
#: ../addressbook/gui/widgets/eab-contact-display.c:352
msgid "MSN"
msgstr "MSN"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
#: ../addressbook/gui/widgets/eab-contact-display.c:349
msgid "GroupWise"
msgstr "GroupWise"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:258
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:260
msgid "Source Book"
msgstr "Книга-источник"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:265
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:267
msgid "Target Book"
msgstr "Книга назначения"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:279
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:281
msgid "Is New Contact"
msgstr "Является новым контактом"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:286
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:288
msgid "Writable Fields"
msgstr "Поля для записи"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:293
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:295
msgid "Required Fields"
msgstr "Требуемые поля"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:307
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:309
msgid "Changed"
msgstr "Изменено"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:535
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2348
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:561
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2397
#, c-format
msgid "Contact Editor - %s"
msgstr "Редактор контактов - %s"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2661
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2757
msgid "Please select an image for this contact"
msgstr "Выберите изображение для этого контакта"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2662
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2758
msgid "No image"
msgstr "Нет изображения"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2941
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3042
msgid ""
"The contact data is invalid:\n"
"\n"
@@ -2446,27 +2513,31 @@ msgstr ""
"Данные контакта неверны:\n"
"\n"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2993
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3094
msgid "Invalid contact."
msgstr "Неверный контакт."
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:277
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:291
msgid "Contact Quick-Add"
msgstr "Быстрое добавление контакта"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:280
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:294
msgid "_Edit Full"
msgstr "_Изменить все"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:306
-msgid "_Full name:"
-msgstr "_Полное имя:"
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:337
+msgid "_Full name"
+msgstr "_Полное имя"
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:347
+msgid "E-_mail"
+msgstr "_Эл. почта:"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:316
-msgid "E-_mail:"
-msgstr "_Эл. адрес:"
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:357
+msgid "_Select Address Book"
+msgstr "_Выберите адресную книгу"
-#: ../addressbook/gui/contact-editor/eab-editor.c:323
+#: ../addressbook/gui/contact-editor/eab-editor.c:322
#, c-format
msgid ""
"Are you sure you want\n"
@@ -2475,7 +2546,7 @@ msgstr ""
"Вы действительно хотите\n"
"удалить список контактов (%s) ?"
-#: ../addressbook/gui/contact-editor/eab-editor.c:326
+#: ../addressbook/gui/contact-editor/eab-editor.c:325
msgid ""
"Are you sure you want\n"
"to delete these contact lists?"
@@ -2483,7 +2554,7 @@ msgstr ""
"Вы действительно хотите\n"
"удалить эти списки контактов?"
-#: ../addressbook/gui/contact-editor/eab-editor.c:331
+#: ../addressbook/gui/contact-editor/eab-editor.c:330
#, c-format
msgid ""
"Are you sure you want\n"
@@ -2492,7 +2563,7 @@ msgstr ""
"Вы действительно хотите\n"
"удалить контакт (%s) ?"
-#: ../addressbook/gui/contact-editor/eab-editor.c:334
+#: ../addressbook/gui/contact-editor/eab-editor.c:333
msgid ""
"Are you sure you want\n"
"to delete these contacts?"
@@ -2600,7 +2671,7 @@ msgstr "Служба сообщений:"
#: ../addressbook/gui/contact-editor/im.glade.h:5
#: ../plugins/calendar-weather/calendar-weather.c:409
#: ../plugins/exchange-operations/exchange-calendar.c:234
-#: ../plugins/exchange-operations/exchange-contacts.c:214
+#: ../plugins/exchange-operations/exchange-contacts.c:216
msgid "_Location:"
msgstr "_Расположение:"
@@ -2613,7 +2684,7 @@ msgid "Add an email to the List"
msgstr "Добавить адрес эл. почты в список"
#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:834
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:846
msgid "Contact List Editor"
msgstr "Редактор списка контактов"
@@ -2645,7 +2716,7 @@ msgstr "_Выделить"
msgid "_Type an email address or drag a contact into the list below:"
msgstr "_Введите эл.адрес или перетащите контакт в список, приведённый ниже:"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
#: ../addressbook/gui/widgets/e-addressbook-model.c:296
#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
#: ../addressbook/gui/widgets/e-addressbook-view.c:223
@@ -2654,15 +2725,15 @@ msgstr "_Введите эл.адрес или перетащите контак
msgid "Book"
msgstr "Книга"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:177
msgid "Is New List"
msgstr "является новым списком"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:707
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:719
msgid "_Members"
msgstr "_Участники"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:710
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:722
msgid "Contact List Members"
msgstr "Участники списка контактов"
@@ -2703,11 +2774,28 @@ msgstr ""
"Имя или эл.адрес этого контактного лица уже существуют\n"
"в этой папке. Всё равно хотите добавить?"
-#. FIXME: get the toplevel window...
-#: ../addressbook/gui/search/e-addressbook-search-dialog.c:160
-#: ../widgets/misc/e-filter-bar.c:156
-msgid "Advanced Search"
-msgstr "Расширенный поиск"
+#. We attach subitems below
+#: ../addressbook/gui/widgets/addresstypes.xml.h:1
+#: ../addressbook/gui/widgets/e-addressbook-view.c:172
+#: ../calendar/gui/cal-search-bar.c:53
+msgid "Any field contains"
+msgstr "Любое поле содержит"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.c:171
+#: ../calendar/gui/cal-search-bar.c:50
+msgid "Category is"
+msgstr "Категории "
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../addressbook/gui/widgets/e-addressbook-view.c:170
+msgid "Email begins with"
+msgstr "Почтовый адрес начинается с"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:4
+#: ../addressbook/gui/widgets/e-addressbook-view.c:169
+msgid "Name begins with"
+msgstr "Имя начинается с"
#: ../addressbook/gui/widgets/e-addressbook-model.c:148
msgid "No contacts"
@@ -2734,12 +2822,12 @@ msgid "Error getting book view"
msgstr "Ошибка при получении вида книги"
#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
-#: ../widgets/table/e-table-click-to-add.c:503
+#: ../widgets/table/e-table-click-to-add.c:502
#: ../widgets/table/e-table-selection-model.c:311
-#: ../widgets/table/e-table.c:3344
+#: ../widgets/table/e-table.c:3329
#: ../widgets/table/e-tree-selection-model.c:825
#: ../widgets/text/e-entry.c:1235 ../widgets/text/e-entry.c:1236
-#: ../widgets/text/e-text.c:3448 ../widgets/text/e-text.c:3449
+#: ../widgets/text/e-text.c:3471 ../widgets/text/e-text.c:3472
msgid "Model"
msgstr "Модель"
@@ -2747,30 +2835,6 @@ msgstr "Модель"
msgid "Error modifying card"
msgstr "Ошибка при изменении карточки"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:169
-msgid "Name begins with"
-msgstr "Имя начинается с"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:170
-msgid "Email begins with"
-msgstr "Почтовый адрес начинается с"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:171
-#: ../calendar/gui/cal-search-bar.c:53
-msgid "Category is"
-msgstr "Категории "
-
-#. We attach subitems below
-#: ../addressbook/gui/widgets/e-addressbook-view.c:172
-#: ../calendar/gui/cal-search-bar.c:48
-msgid "Any field contains"
-msgstr "Любое поле содержит"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:173
-#: ../addressbook/gui/widgets/e-addressbook-view.c:178
-msgid "Advanced..."
-msgstr "Дополнительно..."
-
#: ../addressbook/gui/widgets/e-addressbook-view.c:230
msgid "Source"
msgstr "Источник"
@@ -2778,96 +2842,101 @@ msgstr "Источник"
#: ../addressbook/gui/widgets/e-addressbook-view.c:244
#: ../calendar/gui/dialogs/meeting-page.etspec.h:11
#: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:370
+#: ../calendar/gui/e-meeting-list-view.c:479
#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
+#: ../calendar/gui/e-memo-table.etspec.h:5
msgid "Type"
msgstr "Тип"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:544
-msgid "Address Book"
-msgstr "Адресная книга"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:807
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2014
-#: ../ui/evolution-addressbook.xml.h:19
+#: ../addressbook/gui/widgets/e-addressbook-view.c:834
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2068
+#: ../ui/evolution-addressbook.xml.h:31
msgid "Save as VCard..."
msgstr "Сохранить как VCard..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:930
-#: ../calendar/gui/e-calendar-table.c:1163
-#: ../calendar/gui/e-calendar-view.c:1528 ../ui/evolution-addressbook.xml.h:37
+#: ../addressbook/gui/widgets/e-addressbook-view.c:957
+#: ../calendar/gui/dialogs/comp-editor.c:1095
+#: ../calendar/gui/e-calendar-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:1606 ../calendar/gui/e-memo-table.c:854
+#: ../ui/evolution-addressbook.xml.h:56
msgid "_Open"
msgstr "_Открыть"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:932
-msgid "New Contact..."
-msgstr "Создать контакт..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:959
+msgid "_New Contact..."
+msgstr "Со_здать контакт..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:933
-msgid "New Contact List..."
-msgstr "Создать список контактов..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:960
+msgid "New Contact _List..."
+msgstr "Соз_дать список контактов..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:937
-#: ../ui/evolution-addressbook.xml.h:10
-msgid "Forward Contact"
-msgstr "Переслать контакт"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:963
+msgid "_Save as VCard..."
+msgstr "_Сохранить как VCard..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:938
-msgid "Forward Contacts"
-msgstr "Переслать контакты"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:964
+msgid "_Forward Contact"
+msgstr "_Переслать контакт"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:939
-msgid "Send Message to Contact"
-msgstr "Отправить сообщение к контакту"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:965
+msgid "_Forward Contacts"
+msgstr "_Переслать контакты"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
-msgid "Send Message to List"
-msgstr "Отправить сообщение в список"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:966
+msgid "Send _Message to Contact"
+msgstr "Отправить _сообщение к контакту"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
-msgid "Send Message to Contacts"
-msgstr "Отправить сообщение к контактам"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:967
+msgid "Send _Message to List"
+msgstr "Отправить _сообщение в список"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
-#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2501
-#: ../ui/evolution-addressbook.xml.h:16 ../ui/evolution-calendar.xml.h:19
-#: ../ui/evolution-mail-message.xml.h:76 ../ui/evolution-tasks.xml.h:14
-msgid "Print"
-msgstr "Печать"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:968
+msgid "Send _Message to Contacts"
+msgstr "Отправить _сообщение к контактам"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
-msgid "Copy to Address Book..."
-msgstr "Копировать в адресную книгу..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:969
+msgid "_Print"
+msgstr "_Печать"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
-msgid "Move to Address Book..."
-msgstr "Переместить в адресную книгу..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:972
+msgid "Cop_y to Address Book..."
+msgstr "Коп_ировать в адресную книгу..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
-#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "Вырезать"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:973
+msgid "Mo_ve to Address Book..."
+msgstr "Пере_местить в адресную книгу..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
-#: ../calendar/gui/calendar-component.c:536
-#: ../calendar/gui/tasks-component.c:440 ../ui/evolution-addressbook.xml.h:2
-#: ../ui/evolution-mail-message.xml.h:11 ../ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "Копировать"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:976
+#: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
+msgid "Cu_t"
+msgstr "_Вырезать"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
-#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "Вставить"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../calendar/gui/calendar-component.c:537
+#: ../calendar/gui/dialogs/comp-editor.c:445
+#: ../calendar/gui/e-calendar-table.c:1184
+#: ../calendar/gui/e-calendar-view.c:1613 ../calendar/gui/e-memo-table.c:862
+#: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3098
+#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1077
+#: ../mail/message-list.c:1729 ../ui/evolution-addressbook.xml.h:46
+#: ../ui/evolution-calendar.xml.h:37 ../ui/evolution-composer-entries.xml.h:13
+#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:104
+#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
+msgid "_Copy"
+msgstr "_Копировать"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.c:978
+msgid "P_aste"
+msgstr "Вст_авить"
#. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1565
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1601
#: ../calendar/gui/cal-search-bar.c:346
msgid "Any Category"
msgstr "Любая категория"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1764
+#. FIXME: Allow range selection in table views, as in minicard view
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1803
msgid "Print cards"
msgstr "Напечатать карточки"
@@ -2900,9 +2969,10 @@ msgid "Car Phone"
msgstr "Телефон в машине"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/task-page.glade.h:6
+#: ../calendar/gui/dialogs/event-page.glade.h:8
#: ../calendar/gui/e-cal-list-view.etspec.h:1
#: ../calendar/gui/e-calendar-table.etspec.h:3
+#: ../calendar/gui/e-memo-table.etspec.h:1
msgid "Categories"
msgstr "Категории"
@@ -2912,17 +2982,15 @@ msgstr "Телефон компании"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
#: ../addressbook/gui/widgets/eab-contact-display.c:567
-#: ../smime/lib/e-cert.c:826
+#: ../smime/lib/e-cert.c:827
msgid "Email"
msgstr "Эл. почта"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-popup-control.c:441
msgid "Email 2"
msgstr "Эл. почта 2"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: ../addressbook/gui/widgets/eab-popup-control.c:451
msgid "Email 3"
msgstr "Эл. почта 3"
@@ -3007,9 +3075,9 @@ msgstr "Радио"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
#: ../calendar/gui/dialogs/meeting-page.etspec.h:9
-#: ../calendar/gui/e-meeting-list-view.c:378
+#: ../calendar/gui/e-meeting-list-view.c:490
#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:725
msgid "Role"
msgstr "Должность"
@@ -3046,31 +3114,31 @@ msgstr "Веб-сайт"
#: ../addressbook/gui/widgets/e-minicard-label.c:115
#: ../addressbook/gui/widgets/e-minicard.c:138
#: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
-#: ../widgets/misc/e-reflow.c:1437 ../widgets/misc/e-reflow.c:1438
-#: ../widgets/table/e-table-click-to-add.c:517
+#: ../widgets/misc/e-reflow.c:1434 ../widgets/misc/e-reflow.c:1435
+#: ../widgets/table/e-table-click-to-add.c:516
#: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-field-chooser-item.c:667
-#: ../widgets/table/e-table-group-container.c:971
-#: ../widgets/table/e-table-group-container.c:972
+#: ../widgets/table/e-table-field-chooser-item.c:656
+#: ../widgets/table/e-table-group-container.c:967
+#: ../widgets/table/e-table-group-container.c:968
#: ../widgets/table/e-table-group-leaf.c:629
#: ../widgets/table/e-table-group-leaf.c:630
-#: ../widgets/table/e-table-item.c:3012 ../widgets/table/e-table-item.c:3013
-#: ../widgets/text/e-text.c:3626 ../widgets/text/e-text.c:3627
+#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
+#: ../widgets/text/e-text.c:3649 ../widgets/text/e-text.c:3650
msgid "Width"
msgstr "Ширина"
#: ../addressbook/gui/widgets/e-minicard-label.c:122
#: ../addressbook/gui/widgets/e-minicard.c:145
#: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
-#: ../widgets/misc/e-reflow.c:1445 ../widgets/misc/e-reflow.c:1446
-#: ../widgets/table/e-table-click-to-add.c:524
-#: ../widgets/table/e-table-field-chooser-item.c:674
-#: ../widgets/table/e-table-group-container.c:964
-#: ../widgets/table/e-table-group-container.c:965
+#: ../widgets/misc/e-reflow.c:1442 ../widgets/misc/e-reflow.c:1443
+#: ../widgets/table/e-table-click-to-add.c:523
+#: ../widgets/table/e-table-field-chooser-item.c:663
+#: ../widgets/table/e-table-group-container.c:960
+#: ../widgets/table/e-table-group-container.c:961
#: ../widgets/table/e-table-group-leaf.c:622
#: ../widgets/table/e-table-group-leaf.c:623
-#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
-#: ../widgets/text/e-text.c:3634 ../widgets/text/e-text.c:3635
+#: ../widgets/table/e-table-item.c:3024 ../widgets/table/e-table-item.c:3025
+#: ../widgets/text/e-text.c:3657 ../widgets/text/e-text.c:3658
msgid "Height"
msgstr "Высота"
@@ -3222,107 +3290,107 @@ msgid "Home page"
msgstr "Домашняя страничка"
#. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:49
+#: ../addressbook/gui/widgets/eab-gui-util.c:50
msgid "Success"
msgstr "Успешно"
#. E_BOOK_ERROR_INVALID_ARG
#. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:51
+#: ../addressbook/gui/widgets/eab-gui-util.c:52
msgid "Backend busy"
msgstr "Компонент занят"
#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:52
+#: ../addressbook/gui/widgets/eab-gui-util.c:53
msgid "Repository offline"
msgstr "Репозиторий вне сети"
#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:53
+#: ../addressbook/gui/widgets/eab-gui-util.c:54
msgid "Address Book does not exist"
msgstr "Адресная книга не существует"
#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:54
+#: ../addressbook/gui/widgets/eab-gui-util.c:55
msgid "No Self Contact defined"
msgstr "Свой контакт не определен"
#. E_BOOK_ERROR_URI_NOT_LOADED
#. E_BOOK_ERROR_URI_ALREADY_LOADED
#. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
msgid "Permission denied"
msgstr "Отказ в доступе"
#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
msgid "Contact not found"
msgstr "Контакт не найден"
#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
msgid "Contact ID already exists"
msgstr "Идентификатор контакта уже существует"
#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
msgid "Protocol not supported"
msgstr "Протокол не поддерживается"
#. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
#: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:232
-#: ../calendar/gui/e-cal-model-tasks.c:348
-#: ../calendar/gui/e-cal-model-tasks.c:661
-#: ../calendar/gui/e-calendar-table.c:456 ../calendar/gui/print.c:2364
-msgid "Cancelled"
+#: ../calendar/gui/e-cal-component-preview.c:234
+#: ../calendar/gui/e-cal-model-tasks.c:349
+#: ../calendar/gui/e-cal-model-tasks.c:662
+#: ../calendar/gui/e-calendar-table.c:464 ../calendar/gui/print.c:2377
+msgid "Canceled"
msgstr "Отменено"
#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
msgid "Could not cancel"
msgstr "Не удается отменить"
#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
+#: ../addressbook/gui/widgets/eab-gui-util.c:64
#: ../calendar/gui/comp-editor-factory.c:438
msgid "Authentication Failed"
msgstr "Сбой проверки подлинности"
#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
msgid "Authentication Required"
msgstr "Требуется проверка подлинности"
#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
msgid "TLS not Available"
msgstr "TLS недоступен"
#. E_BOOK_ERROR_CORBA_EXCEPTION
#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
msgid "No such source"
msgstr "Нет такого источника"
#. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
msgid "Not available in offline mode"
msgstr "Недоступно в автономном режиме"
#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
msgid "Other error"
msgstr "Иная ошибка"
#. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
msgid "Invalid server version"
msgstr "Неверная версия сервера"
-#: ../addressbook/gui/widgets/eab-gui-util.c:93
+#: ../addressbook/gui/widgets/eab-gui-util.c:94
msgid ""
"We were unable to open this addressbook. This either means this book is not "
"marked for offline usage or not yet downloaded for offline usage. Please "
@@ -3333,7 +3401,7 @@ msgstr ""
"автономного использования. Загрузите эту книгу в режиме подключения к сети, "
"чтобы получить доступ к ее содержимому"
-#: ../addressbook/gui/widgets/eab-gui-util.c:102
+#: ../addressbook/gui/widgets/eab-gui-util.c:103
#, c-format
msgid ""
"We were unable to open this addressbook. Please check that the path %s "
@@ -3342,7 +3410,7 @@ msgstr ""
"Не удается открыть эту адресную книгу. Убедитесь, что путь %s существует и "
"что у вас имеются необходимые права доступа."
-#: ../addressbook/gui/widgets/eab-gui-util.c:110
+#: ../addressbook/gui/widgets/eab-gui-util.c:112
msgid ""
"We were unable to open this addressbook. This either means you have entered "
"an incorrect URI, or the LDAP server is unreachable."
@@ -3350,7 +3418,7 @@ msgstr ""
"Не удается открыть эту адресную книгу. Это значит, что либо введен неверный "
"URI, либо сервер LDAP недоступен."
-#: ../addressbook/gui/widgets/eab-gui-util.c:115
+#: ../addressbook/gui/widgets/eab-gui-util.c:117
msgid ""
"This version of Evolution does not have LDAP support compiled in to it. If "
"you want to use LDAP in Evolution, you must install an LDAP-enabled "
@@ -3360,7 +3428,7 @@ msgstr ""
"использовать LDAP в Evolution, необходимо установить пакет Evolution с "
"поддержкой LDAP."
-#: ../addressbook/gui/widgets/eab-gui-util.c:122
+#: ../addressbook/gui/widgets/eab-gui-util.c:124
msgid ""
"We were unable to open this addressbook. This either means you have entered "
"an incorrect URI, or the server is unreachable."
@@ -3368,7 +3436,7 @@ msgstr ""
"Не удается открыть эту адресную книгу. Это значит, что либо введен неверный "
"URI, либо сервер недоступен."
-#: ../addressbook/gui/widgets/eab-gui-util.c:145
+#: ../addressbook/gui/widgets/eab-gui-util.c:147
msgid ""
"More cards matched this query than either the server is \n"
"configured to return or Evolution is configured to display.\n"
@@ -3381,7 +3449,7 @@ msgstr ""
"поднимите ограничения для выдачи результатов в\n"
"настройках сервера каталога для этой адресной книги."
-#: ../addressbook/gui/widgets/eab-gui-util.c:151
+#: ../addressbook/gui/widgets/eab-gui-util.c:153
msgid ""
"The time to execute this query exceeded the server limit or the limit\n"
"you have configured for this addressbook. Please make your search\n"
@@ -3394,47 +3462,45 @@ msgstr ""
"поднимите ограничения времени в настройках сервера\n"
"каталога для этой адресной книги."
-#: ../addressbook/gui/widgets/eab-gui-util.c:157
+#: ../addressbook/gui/widgets/eab-gui-util.c:159
msgid "The backend for this addressbook was unable to parse this query."
-msgstr ""
-"База данных для этой адресной книги не смогла обработать текущий запрос."
+msgstr "База данных для этой адресной книги не смогла обработать текущий запрос."
-#: ../addressbook/gui/widgets/eab-gui-util.c:160
+#: ../addressbook/gui/widgets/eab-gui-util.c:162
msgid "The backend for this addressbook refused to perform this query."
-msgstr ""
-"База данных для этой адресной книги отказалась обрабатывать текущий запрос."
+msgstr "База данных для этой адресной книги отказалась обрабатывать текущий запрос."
-#: ../addressbook/gui/widgets/eab-gui-util.c:163
+#: ../addressbook/gui/widgets/eab-gui-util.c:165
msgid "This query did not complete successfully."
msgstr "Этот запрос завершился с ошибкой."
-#: ../addressbook/gui/widgets/eab-gui-util.c:185
+#: ../addressbook/gui/widgets/eab-gui-util.c:187
msgid "Error adding list"
msgstr "Ошибка добавления списка"
-#: ../addressbook/gui/widgets/eab-gui-util.c:185
-#: ../addressbook/gui/widgets/eab-gui-util.c:693
+#: ../addressbook/gui/widgets/eab-gui-util.c:187
+#: ../addressbook/gui/widgets/eab-gui-util.c:695
msgid "Error adding contact"
msgstr "Ошибка добавления контакта"
-#: ../addressbook/gui/widgets/eab-gui-util.c:196
+#: ../addressbook/gui/widgets/eab-gui-util.c:198
msgid "Error modifying list"
msgstr "Ошибка изменения списка"
-#: ../addressbook/gui/widgets/eab-gui-util.c:196
+#: ../addressbook/gui/widgets/eab-gui-util.c:198
msgid "Error modifying contact"
msgstr "Ошибка изменения контакта"
-#: ../addressbook/gui/widgets/eab-gui-util.c:208
+#: ../addressbook/gui/widgets/eab-gui-util.c:210
msgid "Error removing list"
msgstr "Ошибка удаления списка"
-#: ../addressbook/gui/widgets/eab-gui-util.c:208
-#: ../addressbook/gui/widgets/eab-gui-util.c:648
+#: ../addressbook/gui/widgets/eab-gui-util.c:210
+#: ../addressbook/gui/widgets/eab-gui-util.c:650
msgid "Error removing contact"
msgstr "Ошибка удаления контакта"
-#: ../addressbook/gui/widgets/eab-gui-util.c:290
+#: ../addressbook/gui/widgets/eab-gui-util.c:292
#, c-format
msgid ""
"Opening %d contact will open %d new window as well.\n"
@@ -3452,7 +3518,7 @@ msgstr[2] ""
"Открытие %d контактов также откроет %d новых окон.\n"
"Вы действительно хотите отобразить все эти контакты?"
-#: ../addressbook/gui/widgets/eab-gui-util.c:319
+#: ../addressbook/gui/widgets/eab-gui-util.c:321
#, c-format
msgid ""
"%s already exists\n"
@@ -3461,15 +3527,15 @@ msgstr ""
"%s уже существует\n"
"Хотите переписать?"
-#: ../addressbook/gui/widgets/eab-gui-util.c:323
+#: ../addressbook/gui/widgets/eab-gui-util.c:325
msgid "Overwrite"
msgstr "Перезаписать"
#. more than one, finding the total number of contacts might
#. * hit performance while saving large number of contacts
#.
-#: ../addressbook/gui/widgets/eab-gui-util.c:368
-#: ../addressbook/gui/widgets/eab-gui-util.c:371
+#: ../addressbook/gui/widgets/eab-gui-util.c:370
+#: ../addressbook/gui/widgets/eab-gui-util.c:373
msgid "contact"
msgid_plural "contacts"
msgstr[0] "контакт"
@@ -3477,78 +3543,57 @@ msgstr[1] "контакта"
msgstr[2] "контактов"
#. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:418
+#: ../addressbook/gui/widgets/eab-gui-util.c:420
msgid "card.vcf"
msgstr "card.vcf"
-#: ../addressbook/gui/widgets/eab-gui-util.c:594
+#: ../addressbook/gui/widgets/eab-gui-util.c:457
+msgid "Select Address Book"
+msgstr "Выберите адресную книгу"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:596
msgid "list"
msgstr "список"
-#: ../addressbook/gui/widgets/eab-gui-util.c:754
+#: ../addressbook/gui/widgets/eab-gui-util.c:756
msgid "Move contact to"
msgstr "Переместить контакт в"
-#: ../addressbook/gui/widgets/eab-gui-util.c:756
+#: ../addressbook/gui/widgets/eab-gui-util.c:758
msgid "Copy contact to"
msgstr "Копировать контакт в"
-#: ../addressbook/gui/widgets/eab-gui-util.c:759
+#: ../addressbook/gui/widgets/eab-gui-util.c:761
msgid "Move contacts to"
msgstr "Переместить контакты в"
-#: ../addressbook/gui/widgets/eab-gui-util.c:761
+#: ../addressbook/gui/widgets/eab-gui-util.c:763
msgid "Copy contacts to"
msgstr "Копировать контакты в"
-#: ../addressbook/gui/widgets/eab-gui-util.c:764
-msgid "Select target addressbook."
-msgstr "Выберите целевую адресную книгу."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:987
+#: ../addressbook/gui/widgets/eab-gui-util.c:989
msgid "Multiple VCards"
msgstr "Множество VCards"
-#: ../addressbook/gui/widgets/eab-gui-util.c:990
+#: ../addressbook/gui/widgets/eab-gui-util.c:992
#, c-format
msgid "VCard for %s"
msgstr "VCard для %s"
-#.
-#. * This is the code for the UI thingie that lets you manipulate the e-mail
-#. * addresses (and *only* the e-mail addresses) associated with an existing
-#. * contact.
-#.
-#: ../addressbook/gui/widgets/eab-popup-control.c:198
-msgid "(none)"
-msgstr "(нет)"
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:431
-msgid "Primary Email"
-msgstr "Основной эл.адрес"
+#: ../addressbook/gui/widgets/eab-gui-util.c:1033
+#: ../addressbook/gui/widgets/eab-gui-util.c:1051
+msgid "Contact information"
+msgstr "Контактная информация"
-#: ../addressbook/gui/widgets/eab-popup-control.c:567
-msgid "Select an Action"
-msgstr "Выбрать действие"
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:575
+#: ../addressbook/gui/widgets/eab-gui-util.c:1053
#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Создать новый контакт \"%s\""
+msgid "Contact information for %s"
+msgstr "Контактная информация %s"
-#: ../addressbook/gui/widgets/eab-popup-control.c:591
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Добавить адрес к существующему контакту \"%s\""
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:869
+#: ../addressbook/gui/widgets/eab-popup-control.c:287
msgid "Querying Address Book..."
msgstr "Запрашивается адресная книга..."
-#: ../addressbook/gui/widgets/eab-popup-control.c:968
-msgid "Merge E-Mail Address"
-msgstr "Объединить эл.адреса"
-
#: ../addressbook/gui/widgets/eab-vcard-control.c:139
#, c-format
msgid "There is one other contact."
@@ -3578,26 +3623,56 @@ msgstr "Вид карточек"
msgid "GTK Tree View"
msgstr "Как дерево GTK"
-#: ../addressbook/importers/evolution-ldif-importer.c:486
-#: ../addressbook/importers/evolution-vcard-importer.c:249
-#: ../calendar/importers/icalendar-importer.c:311
-#: ../calendar/importers/icalendar-importer.c:643 ../shell/shell.error.xml.h:6
+#: ../addressbook/importers/evolution-csv-importer.c:624
+#: ../mail/importers/evolution-outlook-importer.c:264
+#: ../mail/importers/netscape-importer.c:1252
+msgid "Importing..."
+msgstr "Импорт..."
+
+#: ../addressbook/importers/evolution-csv-importer.c:826
+msgid "Outlook CSV or Tab (.csv, .tab)"
+msgstr "Outlook CSV или Tab (.csv, .tab)"
+
+#: ../addressbook/importers/evolution-csv-importer.c:827
+msgid "Outlook CSV and Tab Importer"
+msgstr "Программа импортирования Outlook CSV или Tab"
+
+#: ../addressbook/importers/evolution-csv-importer.c:835
+msgid "Mozilla CSV or Tab (.csv, .tab)"
+msgstr "Mozilla CSV или Tab (.csv, .tab)"
+
+#: ../addressbook/importers/evolution-csv-importer.c:836
+msgid "Mozilla CSV and Tab Importer"
+msgstr "Программа импортирования Mozilla CSV или Tab"
+
+#: ../addressbook/importers/evolution-csv-importer.c:844
+msgid "Evolution CSV or Tab (.csv, .tab)"
+msgstr "Evolution CSV или Tab (.csv, .tab)"
+
+#: ../addressbook/importers/evolution-csv-importer.c:845
+msgid "Evolution CSV and Tab Importer"
+msgstr "Программа импортирования Evolution CSV и Tab"
+
+#: ../addressbook/importers/evolution-ldif-importer.c:583
+#: ../addressbook/importers/evolution-vcard-importer.c:250
+#: ../calendar/importers/icalendar-importer.c:312
+#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
msgid "Importing ..."
msgstr "Импортируется ..."
-#: ../addressbook/importers/evolution-ldif-importer.c:652
+#: ../addressbook/importers/evolution-ldif-importer.c:761
msgid "LDAP Data Interchange Format (.ldif)"
msgstr "Формат обмена данными LDAP"
-#: ../addressbook/importers/evolution-ldif-importer.c:653
+#: ../addressbook/importers/evolution-ldif-importer.c:762
msgid "Evolution LDIF importer"
msgstr "Evolution LDIF importer"
-#: ../addressbook/importers/evolution-vcard-importer.c:529
+#: ../addressbook/importers/evolution-vcard-importer.c:554
msgid "VCard (.vcf, .gcrd)"
msgstr "VCard (.vcf, .gcrd)"
-#: ../addressbook/importers/evolution-vcard-importer.c:530
+#: ../addressbook/importers/evolution-vcard-importer.c:555
msgid "Evolution VCard Importer"
msgstr "Evolution VCard Importer"
@@ -3606,12 +3681,12 @@ msgstr "Evolution VCard Importer"
msgid "Print envelope"
msgstr "Напечатать конверт"
-#: ../addressbook/printing/e-contact-print.c:1001
+#: ../addressbook/printing/e-contact-print.c:1033
msgid "Print contacts"
msgstr "Напечатать контакты"
-#: ../addressbook/printing/e-contact-print.c:1066
-#: ../addressbook/printing/e-contact-print.c:1093
+#: ../addressbook/printing/e-contact-print.c:1124
+#: ../addressbook/printing/e-contact-print.c:1152
msgid "Print contact"
msgstr "Напечатать контакт"
@@ -3656,11 +3731,11 @@ msgid "Format"
msgstr "Формат"
#: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../widgets/table/e-table-click-to-add.c:496
+#: ../widgets/table/e-table-click-to-add.c:495
#: ../widgets/table/e-table-field-chooser-dialog.c:91
-#: ../widgets/table/e-table-field-chooser-item.c:660
-#: ../widgets/table/e-table-field-chooser.c:93
-#: ../widgets/table/e-table-header-item.c:1831
+#: ../widgets/table/e-table-field-chooser-item.c:649
+#: ../widgets/table/e-table-field-chooser.c:91
+#: ../widgets/table/e-table-header-item.c:1825
#: ../widgets/table/e-table-selection-model.c:318
msgid "Header"
msgstr "Верхний колонтитул"
@@ -3714,7 +3789,7 @@ msgid "Options"
msgstr "Параметры"
#: ../addressbook/printing/e-contact-print.glade.h:24
-#: ../e-util/eggtrayicon.c:118
+#: ../e-util/eggtrayicon.c:120
msgid "Orientation"
msgstr "Ориентация"
@@ -3764,9 +3839,9 @@ msgstr "С тенью"
#. FIXME: Take care of i18n
#: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:940
+#: ../plugins/exchange-operations/exchange-account-setup.c:955
#: ../plugins/exchange-operations/exchange-calendar.c:224
-#: ../plugins/exchange-operations/exchange-contacts.c:197
+#: ../plugins/exchange-operations/exchange-contacts.c:199
msgid "Size:"
msgstr "Размер:"
@@ -3816,17 +3891,17 @@ msgstr "Проверка печати контакта"
msgid "This should test the contact print code"
msgstr "Проверка кода печати контакта"
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:664
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:700
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:49
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:667
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:703
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
msgid "Can not open file"
msgstr "Не удается открыть файл"
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
msgid "Couldn't get list of addressbooks"
msgstr "Не удается получить список адресных книг"
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
msgid "failed to open book"
msgstr "не удается открыть книгу"
@@ -3855,8 +3930,7 @@ msgid "Export in asynchronous mode"
msgstr "Экспорт в асинхронном режиме"
#: ../addressbook/tools/evolution-addressbook-export.c:63
-msgid ""
-"The number of cards in one output file in asychronous mode, default size 100."
+msgid "The number of cards in one output file in asychronous mode, default size 100."
msgstr ""
"Количество карточек в одном файле вывода в асинхронном режиме, размер по "
"умолчанию 100"
@@ -3866,8 +3940,7 @@ msgid "NUMBER"
msgstr "NUMBER"
#: ../addressbook/tools/evolution-addressbook-export.c:91
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
+msgid "Command line arguments error, please use --help option to see the usage."
msgstr ""
"Ошибка аргументов командной строки, используйте параметр --help, чтобы "
"просмотреть доступные аргументы."
@@ -3902,161 +3975,139 @@ msgstr "Не указано имя файла."
#: ../calendar/calendar.error.xml.h:1
msgid ""
-" There are few attachments getting downloaded. Saving the appointment will "
-"cause the appointment to be saved without those pending attachments "
-msgstr ""
-" Несколько вложений еще загружаются. Сохранение встречи приведет к тому, что "
-"она будет сохранена без этих вложений."
-
-#: ../calendar/calendar.error.xml.h:2
-msgid ""
-" There are few attachments getting downloaded. Saving the task will cause "
-"the task to be saved without those pending attachments "
-msgstr ""
-" Несколько вложений еще загружаются. Сохранение задачи приведет к тому, что "
-"она будет сохранена без этих вложений."
-
-#: ../calendar/calendar.error.xml.h:3
-msgid ""
-"Adding a meaningful Summary to your appointment will give your recipients an "
+"Adding a meaningful summary to your appointment will give your recipients an "
"idea of what your appointment is about."
msgstr ""
"Если добавить содержательную Сводку к встрече, получателям будет проще "
"понять, чему будет посвящена встреча."
-#: ../calendar/calendar.error.xml.h:4
+#: ../calendar/calendar.error.xml.h:2
msgid ""
-"Adding a meaningful Summary to your task will give your recipients an idea "
+"Adding a meaningful summary to your task will give your recipients an idea "
"of what your task is about."
msgstr ""
"Если добавить содержательную Сводку к задаче, получателям будет проще "
"понять, чему посвящена эта задача."
-#: ../calendar/calendar.error.xml.h:5
+#: ../calendar/calendar.error.xml.h:3
msgid ""
"All information in these journal entries will be deleted and can not be "
"restored."
msgstr "Вся информация из этих записей журнала будет безвозвратно удалена."
-#: ../calendar/calendar.error.xml.h:6
-msgid ""
-"All information in this journal will be deleted and can not be restored."
+#: ../calendar/calendar.error.xml.h:4
+msgid "All information in this journal will be deleted and can not be restored."
msgstr "Вся информация из этого журнала будет удалена безвозвратно."
-#: ../calendar/calendar.error.xml.h:7
+#: ../calendar/calendar.error.xml.h:5
msgid ""
"All information on these appointments will be deleted and can not be "
"restored."
msgstr "Все сведения об этих встречах будут безвозвратно удалены."
-#: ../calendar/calendar.error.xml.h:8
+#: ../calendar/calendar.error.xml.h:6
msgid "All information on these tasks will be deleted and can not be restored."
msgstr "Вся информация о этих задачах будет безвозвратно удалена."
-#: ../calendar/calendar.error.xml.h:9
-msgid ""
-"All information on this appointment will be deleted and can not be restored."
+#: ../calendar/calendar.error.xml.h:7
+msgid "All information on this appointment will be deleted and can not be restored."
msgstr "Все сведения об этой встрече будут безвозвратно удалены."
-#: ../calendar/calendar.error.xml.h:10
+#: ../calendar/calendar.error.xml.h:8
msgid ""
"All information on this journal entry will be deleted and can not be "
"restored."
msgstr "Вся информация об этом журнале будет окончательно удалена."
-#: ../calendar/calendar.error.xml.h:11
-msgid ""
-"All information on this meeting will be deleted and can not be restored."
+#: ../calendar/calendar.error.xml.h:9
+msgid "All information on this meeting will be deleted and can not be restored."
msgstr "Все сведения об этом собрании будут безвозвратно удалены."
-#: ../calendar/calendar.error.xml.h:12
+#: ../calendar/calendar.error.xml.h:10
msgid "All information on this task will be deleted and can not be restored."
msgstr "Все сведения об этой задаче будут безвозвратно удалены."
-#: ../calendar/calendar.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:11
msgid "Are you sure you want to delete the '{0}' task?"
msgstr "Вы действительно хотите удалить задачу '{0}'?"
-#: ../calendar/calendar.error.xml.h:14
+#: ../calendar/calendar.error.xml.h:12
msgid "Are you sure you want to delete the appointment titled '{0}'?"
msgstr "Вы действительно хотите удалить встречу с заголовком '{0}'?"
-#: ../calendar/calendar.error.xml.h:15
+#: ../calendar/calendar.error.xml.h:13
msgid "Are you sure you want to delete the journal entry '{0}'?"
msgstr "Вы действительно хотите удалить запись журнала '{0}'?"
-#: ../calendar/calendar.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:14
msgid "Are you sure you want to delete these {0} appointments?"
msgstr "Вы действительно хотите удалить встречи {0}?"
-#: ../calendar/calendar.error.xml.h:17
+#: ../calendar/calendar.error.xml.h:15
msgid "Are you sure you want to delete these {0} journal entries?"
msgstr "Вы действительно хотите удалить эти {0} записи журнала?"
-#: ../calendar/calendar.error.xml.h:18
+#: ../calendar/calendar.error.xml.h:16
msgid "Are you sure you want to delete these {0} tasks?"
msgstr "Вы действительно хотите удалить эти {0} задачи?"
-#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:17
msgid "Are you sure you want to delete this appointment?"
msgstr "Вы действительно хотите удалить эту встречу?"
-#: ../calendar/calendar.error.xml.h:20
+#: ../calendar/calendar.error.xml.h:18
msgid "Are you sure you want to delete this journal entry?"
msgstr "Вы действительно хотите удалить эту запись журнала?"
-#: ../calendar/calendar.error.xml.h:21
+#: ../calendar/calendar.error.xml.h:19
msgid "Are you sure you want to delete this meeting?"
msgstr "Вы действительно хотите удалить это собрание?"
-#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/calendar.error.xml.h:20
msgid "Are you sure you want to delete this task?"
msgstr "Вы действительно хотите удалить эту задачу?"
-#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/calendar.error.xml.h:21
msgid "Are you sure you want to send the appointment without a summary?"
msgstr "Вы действительно хотите отправить встречу без сводки?"
-#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:22
msgid "Are you sure you want to send the task without a summary?"
msgstr "Вы действительно хотите отправить задачу без сводки?"
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:23
+msgid "Cannot create a new event"
+msgstr "Не удаётся создать новое событие"
+
+#: ../calendar/calendar.error.xml.h:24
msgid "Delete calendar '{0}'?"
msgstr "Удалить календарь '{0}'?"
+#: ../calendar/calendar.error.xml.h:25
+msgid "Delete memo list '{0}'?"
+msgstr "Удалить список заметок '{0}'?"
+
#: ../calendar/calendar.error.xml.h:26
msgid "Delete task list '{0}'?"
msgstr "Удалить список задач '{0}'?"
#: ../calendar/calendar.error.xml.h:27
-msgid "Discard Changes"
-msgstr "Отклонить изменения"
-
-#: ../calendar/calendar.error.xml.h:28
-msgid "Don't Send"
+msgid "Do not Send"
msgstr "Не отправлять"
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:28
msgid "Download in progress. Do you want to save the appointment?"
msgstr "Идет процесс загрузки. Вы действительно сохранить эту встречу?"
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:29
msgid "Download in progress. Do you want to save the task?"
msgstr "Идет процесс загрузки. Сохранить эту задачу?"
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:30
msgid "Editor could not be loaded."
msgstr "Реактор не может быть загружен."
-#: ../calendar/calendar.error.xml.h:32
-msgid ""
-"Email invitations will be sent to all participants and allow them to RSVP."
-msgstr ""
-"Сообщения будут разосланы по эл. почте всем участникам, чтобы разрешить им "
-"RSVP."
-
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:31
msgid ""
"Email invitations will be sent to all participants and allow them to accept "
"this task."
@@ -4064,52 +4115,50 @@ msgstr ""
"Приглашения будут разосланы по эл. почте всем участникам, чтобы они смогли "
"принять эту задачу."
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:32
+msgid "Email invitations will be sent to all participants and allow them to reply."
+msgstr "Сообщения будут разосланы по эл. почте всем участникам, чтобы дать им возможность ответить."
+
+#: ../calendar/calendar.error.xml.h:33
msgid "Error loading calendar"
msgstr "Ошибка загрузки календеря"
+#: ../calendar/calendar.error.xml.h:34
+msgid "Error loading memo list"
+msgstr "Ошибка загрузки списка заметок"
+
#: ../calendar/calendar.error.xml.h:35
msgid "Error loading task list"
msgstr "Ошибка загрузки списка задач"
#: ../calendar/calendar.error.xml.h:36
msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
+"If you do not send a cancelation notice, the other participants may not know "
"the journal has been deleted."
-msgstr ""
-"Если вы не отправите уведомление об отмене, другие участники могут не "
-"узнать, что журнал был удалён."
+msgstr "Если вы не отправите уведомление об отмене, другие участники могут не узнать, что журнал был удалён."
#: ../calendar/calendar.error.xml.h:37
msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
+"If you do not send a cancelation notice, the other participants may not know "
"the meeting is canceled."
-msgstr ""
-"Если уведомление не будет разослано, остальные участники могут не знать, что "
-"собрание отменено."
+msgstr "Если уведомление не будет разослано, остальные участники могут не знать, что собрание отменено."
#: ../calendar/calendar.error.xml.h:38
msgid ""
-"If you don't send a cancellation notice, the other participants may not know "
+"If you do not send a cancelation notice, the other participants may not know "
"the task has been deleted."
-msgstr ""
-"Если вы не отправите уведомление об отмене, другие участники могут не "
-"узнать, что задача была удалена."
+msgstr "Если вы не отправите уведомление об отмене, другие участники могут не узнать, что задача была удалена."
#: ../calendar/calendar.error.xml.h:39
-msgid "Save Changes"
-msgstr "Сохранить изменения"
-
-#: ../calendar/calendar.error.xml.h:40
-#: ../ui/evolution-message-composer.xml.h:28
+#: ../ui/evolution-message-composer.xml.h:29
msgid "Send"
msgstr "Отправить"
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:40
msgid "Send Notice"
msgstr "Отправить уведомление"
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:41
msgid ""
"Sending updated information allows other participants to keep their "
"calendars up to date."
@@ -4117,7 +4166,7 @@ msgstr ""
"Рассылка обновленной информации позволит другим участникам поддерживать свои "
"календари в текущем состоянии."
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:42
msgid ""
"Sending updated information allows other participants to keep their task "
"lists up to date."
@@ -4125,129 +4174,203 @@ msgstr ""
"Отправка обновлений позволяет другим участникам поддерживать их список задач "
"в текущем состоянии."
+#: ../calendar/calendar.error.xml.h:43
+msgid ""
+"Some attachments are being downloaded. Saving the appointment would result "
+"in the loss of these attachments."
+msgstr "Несколько вложений еще загружаются. Сохранение встречи приведет к тому, что она будет сохранена без этих вложений."
+
+#: ../calendar/calendar.error.xml.h:44
+msgid ""
+"Some attachments are being downloaded. Saving the task would result in the "
+"loss of these attachments."
+msgstr ""
+"Несколько вложений еще загружаются. Сохранение задачи приведет к тому, что "
+"она будет сохранена без этих вложений."
+
#: ../calendar/calendar.error.xml.h:45
+msgid "Some features may not work properly with your current server."
+msgstr "Некоторые функции могут работать некорректно с вашим текущим сервером."
+
+#: ../calendar/calendar.error.xml.h:46
msgid "The Evolution calendar has quit unexpectedly."
msgstr "Работа компонента календаря Evolution неожиданно завершилась."
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:47
msgid "The Evolution tasks have quit unexpectedly."
msgstr "Работа компонента задач Evolution неожиданно завершилась."
-#: ../calendar/calendar.error.xml.h:47
-msgid "The calendar is not marked for offline usage"
-msgstr "Этот календарь не отмечен для автономного использования"
-
#: ../calendar/calendar.error.xml.h:48
-msgid "The task list is not marked for offline usage"
-msgstr "Этот список задач не отмечен для автономного использования"
+msgid "The calendar is not marked for offline usage."
+msgstr "Этот календарь не отмечен для автономного использования."
#: ../calendar/calendar.error.xml.h:49
+msgid "The calendar you have selected is read-only"
+msgstr "Выбранный вами календарь отмечен только для чтения"
+
+#: ../calendar/calendar.error.xml.h:50
+msgid "The memo list is not marked for offline usage"
+msgstr "Этот список заметок не отмечен для автономного использования"
+
+#: ../calendar/calendar.error.xml.h:51
+msgid "The task list is not marked for offline usage."
+msgstr "Этот список задач не отмечен для автономного использования."
+
+#: ../calendar/calendar.error.xml.h:52
msgid "This calendar will be removed permanently."
msgstr "Этот календарь будет окончательно удален."
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:53
+msgid "This memo list will be removed permanently."
+msgstr "Заметка будет окончательно удалена."
+
+#: ../calendar/calendar.error.xml.h:54
msgid "This task list will be removed permanently."
msgstr "Задача будет окончательно удалена."
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:55
msgid "Would you like to save your changes to this appointment?"
msgstr "Сохранить изменения этой встречи?"
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:56
+msgid "Would you like to save your changes to this memo?"
+msgstr "Сохранить изменения этой заметки?"
+
+#: ../calendar/calendar.error.xml.h:57
msgid "Would you like to save your changes to this task?"
msgstr "Сохранить изменения этой задачи?"
-#: ../calendar/calendar.error.xml.h:53
-msgid "Would you like to send a cancellation notice for this journal entry?"
+#: ../calendar/calendar.error.xml.h:58
+msgid "Would you like to send a cancelation notice for this journal entry?"
msgstr "Разослать уведомление об отмене этой записи в журнале?"
-#: ../calendar/calendar.error.xml.h:54
-msgid "Would you like to send all the participants a cancellation notice?"
+#: ../calendar/calendar.error.xml.h:59
+msgid "Would you like to send all the participants a cancelation notice?"
msgstr "Разослать всем участникам уведомление об отмене?"
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:60
msgid "Would you like to send meeting invitations to participants?"
msgstr "Разослать приглашения на собрание участникам?"
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:61
msgid "Would you like to send this task to participants?"
msgstr "Разослать эту задачу участникам?"
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:62
msgid "Would you like to send updated meeting information to participants?"
msgstr "Разослать обновленную информацию о собрании участникам?"
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:63
msgid "Would you like to send updated task information to participants?"
msgstr "Разослать обновленные сведения о задаче участникам?"
-#: ../calendar/calendar.error.xml.h:60
-msgid "You have made changes to this appointment, but not yet saved them."
+#: ../calendar/calendar.error.xml.h:64
+msgid ""
+"You are connecting to an unsupported GroupWise server and may encounter "
+"problems using Evolution. For best results, the server should be upgraded to "
+"a supported version."
+msgstr ""
+"Вы подключаетесь к неподдерживаемому серверу GroupWise и можете столкнуться "
+"с проблемами при использовании Evolution. Для получения лучших результатов "
+"сервер должен быть обновлен до поддерживаемой версии."
+
+#: ../calendar/calendar.error.xml.h:65
+msgid "You have changed this appointment, but not yet saved it."
msgstr "Вы сделали изменения этой встречи, но не сохранили их."
-#: ../calendar/calendar.error.xml.h:61
-msgid "You have made changes to this task, but not yet saved them."
+#: ../calendar/calendar.error.xml.h:66
+msgid "You have changed this task, but not yet saved it."
msgstr "Вы сделали изменения этой задачи, но не сохранили их."
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:67
+msgid "You have made changes to this memo, but not yet saved them."
+msgstr "Вы сделали изменения этой заметки, но не сохранили их."
+
+#: ../calendar/calendar.error.xml.h:68
msgid "Your calendars will not be available until Evolution is restarted."
msgstr "Ваши календари будут недоступны до перезапуска Evolution."
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:69
msgid "Your tasks will not be available until Evolution is restarted."
msgstr "Ваши задачи будут недоступны до перезапуска Evolution."
-#: ../calendar/calendar.error.xml.h:64
-#: ../ui/evolution-message-composer.xml.h:51
-#: ../ui/evolution-signature-editor.xml.h:15
+#: ../calendar/calendar.error.xml.h:70
+#: ../composer/mail-composer.error.xml.h:27
+msgid "_Discard Changes"
+msgstr "_Отклонить изменения"
+
+#: ../calendar/calendar.error.xml.h:71 ../ui/evolution-editor.xml.h:23
+#: ../ui/evolution-message-composer.xml.h:53
msgid "_Save"
msgstr "_Сохранить"
-#: ../calendar/calendar.error.xml.h:65
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:123
+#: ../calendar/calendar.error.xml.h:72
+msgid "_Save Changes"
+msgstr "_Сохранить изменения"
+
+#: ../calendar/calendar.error.xml.h:73
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:134
msgid "_Send"
msgstr "_Отправить"
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:74
msgid "{0}."
msgstr "{0}."
-#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:301
-#: ../smime/gui/component.c:48
+#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:323
+#: ../smime/gui/component.c:50
msgid "Enter password"
msgstr "Введите пароль"
-#: ../calendar/conduits/calendar/calendar-conduit.c:246
+#: ../calendar/conduits/calendar/calendar-conduit.c:255
msgid "Split Multi-Day Events:"
msgstr "Разделить многодневные события:"
-#: ../calendar/conduits/calendar/calendar-conduit.c:1365
-#: ../calendar/conduits/calendar/calendar-conduit.c:1366
-#: ../calendar/conduits/todo/todo-conduit.c:879
-#: ../calendar/conduits/todo/todo-conduit.c:880
+#: ../calendar/conduits/calendar/calendar-conduit.c:1432
+#: ../calendar/conduits/calendar/calendar-conduit.c:1433
+#: ../calendar/conduits/memo/memo-conduit.c:854
+#: ../calendar/conduits/memo/memo-conduit.c:855
+#: ../calendar/conduits/todo/todo-conduit.c:1032
+#: ../calendar/conduits/todo/todo-conduit.c:1033
msgid "Could not start evolution-data-server"
msgstr "Не удается запустить evolution-data-server"
-#: ../calendar/conduits/calendar/calendar-conduit.c:1474
-#: ../calendar/conduits/calendar/calendar-conduit.c:1477
+#: ../calendar/conduits/calendar/calendar-conduit.c:1529
+#: ../calendar/conduits/calendar/calendar-conduit.c:1532
msgid "Could not read pilot's Calendar application block"
msgstr "Не удается прочитать блок приложения календарь Пилота"
-#: ../calendar/conduits/todo/todo-conduit.c:234
+#: ../calendar/conduits/memo/memo-conduit.c:937
+#: ../calendar/conduits/memo/memo-conduit.c:940
+msgid "Could not read pilot's Memo application block"
+msgstr "Не удается прочитать блок приложения заметок Пилота"
+
+#: ../calendar/conduits/memo/memo-conduit.c:976
+#: ../calendar/conduits/memo/memo-conduit.c:979
+msgid "Could not write pilot's Memo application block"
+msgstr "Не удается прочитать блок приложения заметок"
+
+#: ../calendar/conduits/todo/todo-conduit.c:239
msgid "Default Priority:"
msgstr "Приоритет по умолчанию:"
-#: ../calendar/conduits/todo/todo-conduit.c:959
-#: ../calendar/conduits/todo/todo-conduit.c:962
+#: ../calendar/conduits/todo/todo-conduit.c:1112
+#: ../calendar/conduits/todo/todo-conduit.c:1115
msgid "Could not read pilot's ToDo application block"
msgstr "Не удается прочитать блок приложения заданий Пилота"
+#: ../calendar/conduits/todo/todo-conduit.c:1151
+#: ../calendar/conduits/todo/todo-conduit.c:1154
+msgid "Could not write pilot's ToDo application block"
+msgstr "Не удается прочитать блок приложения ToDo пилота"
+
#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+#: ../plugins/itip-formatter/itip-formatter.c:1968
msgid "Calendar and Tasks"
msgstr "Календарь и задачи"
#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1309
+#: ../calendar/gui/calendar-component.c:1291
msgid "Calendars"
msgstr "Календари"
@@ -4276,26 +4399,41 @@ msgid "Evolution's Calendar component"
msgstr "Компонент календаря Evolution"
#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution's Memos component"
+msgstr "Компонент заметок Evolution"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
msgid "Evolution's Tasks component"
msgstr "Компонент задач Evolution"
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#: ../calendar/gui/e-tasks.c:1260 ../calendar/gui/print.c:1822
-#: ../calendar/gui/tasks-component.c:519
-#: ../calendar/gui/tasks-component.c:1012 ../calendar/gui/tasks-control.c:457
-#: ../calendar/importers/icalendar-importer.c:79
-#: ../calendar/importers/icalendar-importer.c:707
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Memo_s"
+msgstr "_Заметки"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: ../calendar/gui/e-memos.c:1092 ../calendar/gui/memos-component.c:530
+#: ../calendar/gui/memos-component.c:1000 ../calendar/gui/memos-control.c:340
+msgid "Memos"
+msgstr "Заметки"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#: ../calendar/gui/e-tasks.c:1334 ../calendar/gui/print.c:1833
+#: ../calendar/gui/tasks-component.c:521
+#: ../calendar/gui/tasks-component.c:1015 ../calendar/gui/tasks-control.c:472
+#: ../calendar/importers/icalendar-importer.c:80
+#: ../calendar/importers/icalendar-importer.c:741
+#: ../plugins/exchange-operations/exchange-folder.c:591
#: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:589
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:591
#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
msgid "Tasks"
msgstr "Задачи"
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
msgid "_Calendars"
msgstr "_Календари"
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
#: ../views/tasks/galview.xml.h:3
msgid "_Tasks"
msgstr "_Задачи"
@@ -4305,25 +4443,32 @@ msgid "Evolution Calendar alarm notification service"
msgstr "Evolution Calendar alarm notification service"
#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
+#: ../calendar/gui/alarm-notify/util.c:64
+#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/misc.c:111
+#: ../calendar/gui/misc.c:113
msgid "minute"
msgid_plural "minutes"
msgstr[0] "минута"
msgstr[1] "минуты"
msgstr[2] "минут"
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:248
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:130
+#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
+#: ../plugins/calendar-http/calendar-http.c:287
+#: ../plugins/calendar-weather/calendar-weather.c:564
+msgid "hours"
+msgid_plural "hours"
+msgstr[0] "час"
+msgstr[1] "часа"
+msgstr[2] "часов"
+
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:270
msgid "Start time"
msgstr "Время начала"
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:347
-#, c-format
-msgid ""
-"<big><b>%s</b></big>\n"
-"%s until %s"
-msgstr ""
-"<big><b>%s</b></big>\n"
-"%s до %s"
-
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4
msgid "Appointments"
@@ -4331,8 +4476,10 @@ msgstr "Встречи"
#. Location
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/e-itip-control.c:1120
-#: ../plugins/itip-formatter/itip-view.c:884
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1272
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1278
+#: ../calendar/gui/e-itip-control.c:1119
+#: ../plugins/itip-formatter/itip-view.c:880
msgid "Location:"
msgstr "Адрес:"
@@ -4341,17 +4488,17 @@ msgid "Snooze _time:"
msgstr "Напомнить _через:"
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
#: ../calendar/gui/dialogs/recurrence-page.glade.h:6
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:158
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:13
-#: ../ui/evolution-addressbook.xml.h:34 ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:8
-#: ../ui/evolution-mail-messagedisplay.xml.h:5
-#: ../ui/evolution-message-composer.xml.h:44
-#: ../ui/evolution-signature-editor.xml.h:12
-#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:23
-#: ../ui/evolution.xml.h:33
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:159
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
+#: ../plugins/publish-calendar/publish-calendar.glade.h:20
+#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:39
+#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:17
+#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
+#: ../ui/evolution-message-composer.xml.h:46
+#: ../ui/evolution-signature-editor.xml.h:24
+#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
+#: ../ui/evolution.xml.h:40
msgid "_Edit"
msgstr "_Правка"
@@ -4359,54 +4506,36 @@ msgstr "_Правка"
msgid "_Snooze"
msgstr "Напомнить по_зже"
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-msgid "description of appointment"
-msgstr "описание встречи"
-
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
msgid "location of appointment"
msgstr "место проведения встречи"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:954
-msgid "Dismiss"
-msgstr "Закрыть"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:955
-msgid "Dismiss All"
-msgstr "Закрыть все"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1037
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1111
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1254
msgid "No summary available."
msgstr "Сводка недоступна."
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1046
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1048
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1120
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1122
msgid "No description available."
msgstr "Описание не доступно."
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1056
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1130
msgid "No location information available."
msgstr "Данные об адресе недоступны."
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1072
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1188
#, c-format
-msgid ""
-"Alarm on %s\n"
-"%s\n"
-"Starting at %s\n"
-"Ending at %s"
-msgstr ""
-"Напоминание о %s\n"
-"%s\n"
-"Начало в %s\n"
-"Окончание в %s"
+msgid "You have %d alarms"
+msgstr "У вас есть %d сигналов"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1175
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1199
+#. FIXME
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1348
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1372
msgid "Warning"
msgstr "Предупреждение"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1179
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1352
msgid ""
"Evolution does not support calendar reminders with\n"
"email notifications yet, but this reminder was\n"
@@ -4418,7 +4547,7 @@ msgstr ""
"Вместо этого Evolution отобразит нормальный диалог\n"
"напоминания."
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1205
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1378
#, c-format
msgid ""
"An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4435,7 +4564,7 @@ msgstr ""
"\n"
"Вы действительно хотите запустить эту программу?"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1219
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1392
msgid "Do not ask me about this program again."
msgstr "Не задавать больше этот вопрос."
@@ -4443,7 +4572,7 @@ msgstr "Не задавать больше этот вопрос."
msgid "Could not initialize Bonobo"
msgstr "Не удается инициализировать Bonobo"
-#: ../calendar/gui/alarm-notify/notify-main.c:151
+#: ../calendar/gui/alarm-notify/notify-main.c:153
msgid "Could not create the alarm notify service factory"
msgstr "Не удается создать фабрику сервиса уведомления о сигнале"
@@ -4451,6 +4580,62 @@ msgstr "Не удается создать фабрику сервиса уве
msgid "invalid time"
msgstr "неправильное время"
+#. Can't be zero
+#: ../calendar/gui/alarm-notify/util.c:58 ../calendar/gui/misc.c:105
+#, c-format
+msgid "(%d seconds)"
+msgstr "(%d секунд)"
+
+#: ../calendar/gui/alarm-notify/util.c:64 ../calendar/gui/misc.c:111
+#, c-format
+msgid "(%d %s %d %s)"
+msgstr "(%d %s %d %s)"
+
+#: ../calendar/gui/alarm-notify/util.c:64
+#: ../calendar/gui/dialogs/recurrence-page.c:992 ../calendar/gui/misc.c:111
+msgid "second"
+msgstr "секунда"
+
+#: ../calendar/gui/alarm-notify/util.c:64 ../calendar/gui/misc.c:111
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:177
+msgid "seconds"
+msgstr "секунд"
+
+#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/misc.c:113
+#, c-format
+msgid "(%d %s)"
+msgstr "(%d %s)"
+
+#: ../calendar/gui/alarm-notify/util.c:77 ../calendar/gui/misc.c:124
+#, c-format
+msgid " %u second"
+msgstr "%u секунд"
+
+#: ../calendar/gui/alarm-notify/util.c:77 ../calendar/gui/misc.c:124
+#, c-format
+msgid " %u seconds"
+msgstr "%u секунд"
+
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/misc.c:126
+#, c-format
+msgid " %u minute"
+msgstr " %u минута"
+
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/misc.c:126
+#, c-format
+msgid " %u minutes"
+msgstr " %u минут"
+
+#: ../calendar/gui/alarm-notify/util.c:81 ../calendar/gui/misc.c:128
+#, c-format
+msgid "%u hour"
+msgstr "%u час"
+
+#: ../calendar/gui/alarm-notify/util.c:81 ../calendar/gui/misc.c:128
+#, c-format
+msgid "%u hours"
+msgstr "%u часов"
+
#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
msgid "Alarm programs"
msgstr "Программы сигналов"
@@ -4472,8 +4657,7 @@ msgid "Calendars to run alarms for"
msgstr "Календари для запуска напоминаний"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
-msgid ""
-"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
msgstr ""
"Цвет маркера времени в расписании (для значения по умолчанию оставьте "
"пустым)."
@@ -4507,11 +4691,11 @@ msgid "Default reminder value"
msgstr "Значение напоминания по умолчанию"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
-msgid "Free/busy server urls"
+msgid "Free/busy server URLs"
msgstr "URL сервера свободен/занят"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
-msgid "Free/busy template url"
+msgid "Free/busy template URL"
msgstr "URL шаблона свободен/занят"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
@@ -4540,16 +4724,15 @@ msgstr "Час начала рабочего дня, в 24-часовом фор
#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
msgid "Intervals shown in Day and Work Week views, in minutes."
-msgstr ""
-"Интервалы, отображаемые в режимах \"День\" и \"Рабочая неделя\", в минутах."
+msgstr "Интервалы, отображаемые в режимах \"День\" и \"Рабочая неделя\", в минутах."
#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
msgid "Last alarm time"
msgstr "Время последнего сигнала"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
-msgid "List of server urls for free/busy publishing."
-msgstr "Список url серверов для публикации сведений о занятости."
+msgid "List of server URLs for free/busy publishing."
+msgstr "Список URL серверов для публикации сведений о занятости."
#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
msgid "Marcus Bains Line"
@@ -4580,7 +4763,7 @@ msgid "Month view vertical pane position"
msgstr "Позиция вертикальной панели в обзоре месяца"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
-msgid "Number of units for determining for a default reminder."
+msgid "Number of units for determining a default reminder."
msgstr "Количество единиц для напоминания по умолчанию."
#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
@@ -4636,26 +4819,67 @@ msgid "Programs that are allowed to be run by alarms."
msgstr "Программы, которые разрешено использовать как часть сигналов."
#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
-msgid "Show appointment end times in week and month views"
-msgstr "Показывать время окончания встреч в обзоре недели и месяца"
+msgid "Show RSVP field in the event/task/meeting editor"
+msgstr "Отображать поле \"Просьба ответить\" в редакторе событий/задач/собраний"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
-msgid "Show display alarms in notification tray"
-msgstr "Показывать экранные сигналы в области уведомления"
+msgid "Show Role field in the event/task/meeting editor"
+msgstr "Отображать поле \"Должность\" в редакторе событий/задач/собраний"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+msgid "Show appointment end times in week and month views"
+msgstr "Отображать время окончания встреч в обзоре недели и месяца"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+msgid "Show categories field in the event/meeting/task editor"
+msgstr "Отображать поле категорий в редакторе событий/задач/собраний"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+msgid "Show display alarms in notification tray"
+msgstr "Отображать экранные сигналы в области уведомления"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+msgid "Show status field in the event/task/meeting editor"
+msgstr "Отображать поле состояния в редакторе событий/задач/собраний"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.in.h:73
+msgid "Show the \"Preview\" pane"
+msgstr "Показывать панель предварительного просмотра"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.in.h:74
+msgid "Show the \"Preview\" pane."
+msgstr "Отображать панель предварительного просмотра."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+msgid "Show timezone field in the event/meeting editor"
+msgstr "Отображать поле часового пояса в редакторе событий/собраний"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+msgid "Show type field in the event/task/meeting editor"
+msgstr "Отображать поле \"тип\" в редакторе событий/задач/собраний"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
msgid "Show week numbers in date navigator"
msgstr "Показывать номера недель в навигаторе по датам"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
msgid "Tasks due today color"
msgstr "Цвет задач на сегодня"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
msgid "Tasks vertical pane position"
msgstr "Позиция вертикальной панели задач"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#, no-c-format
+msgid ""
+"The URL template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain."
+msgstr "Шаблон URL для отправки данных о занятости. %u заменяется на левую часть почтового адреса (имя пользователя), %d - домен."
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
msgid ""
"The default timezone to use for dates and times in the calendar, as an "
"untranslated Olsen timezone database location like \"America/New York\"."
@@ -4664,63 +4888,53 @@ msgstr ""
"непереведенного имени Olsen из базы часовых поясов, например \"America/New "
"York\"."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
-#, no-c-format
-msgid ""
-"The url template to use as a free/busy data fallback, %u is replaced by the "
-"user part of the mail address and %d is replaced by the domain."
-msgstr ""
-"Шаблон URL для отправки данных о занятости. %u заменяется на левую часть "
-"почтового адреса (имя пользователя), %d - домен."
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
msgid "Time divisions"
msgstr "Разделители времени"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
msgid "Time the last alarm ran, in time_t."
msgstr "Время последнего запуска сигнала, в формате in time_t."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
msgid "Timezone"
msgstr "Часовой пояс"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
msgid "Twenty four hour time format"
msgstr "24-часовой формат времени"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
msgstr "Единицы напоминания по умолчанию, \"minutes\", \"hours\" или \"days\"."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
-msgid ""
-"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
msgstr ""
"Единицы для определения момента скрытия задач, \"minutes\", \"hours\" или "
"\"days\"."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
msgid "Week start"
msgstr "Начало недели"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
msgstr "День, с которого начинается неделя, с воскресенья (0) до субботы (6)"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
msgid "Whether or not to use the notification tray for display alarms."
msgstr "Использовать или нет область уведомления для отображения сигналов."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
msgid "Whether to ask for confirmation when deleting an appointment or task."
msgstr "Запрашивать подтверждение при удалении встречи или задачи."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
msgid "Whether to ask for confirmation when expunging appointments and tasks."
msgstr "Запрашивать подтверждение при очистке встречи или задачи."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
msgid ""
"Whether to compress weekends in the month view, which puts Saturday and "
"Sunday in the space of one weekday."
@@ -4728,57 +4942,79 @@ msgstr ""
"Ужимать ли выходные дни в обзоре месяца (суббота и воскресенье занимают "
"место одного рабочего дня)."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
msgid "Whether to display the end time of events in the week and month views."
msgstr "Показывать ли время завершения событий в обзоре недели и месяца."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
-msgid ""
-"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
msgstr "Отображать ли маркер текущего времени в календаре."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
msgid "Whether to hide completed tasks in the tasks view."
msgstr "Скрывать ли завершенные задачи в обзоре задач."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
msgid "Whether to set a default reminder for appointments."
msgstr "Устанавливать ли напоминание для событий по умолчанию."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
-msgid ""
-"Whether to show times in twenty four hour format instead of using am/pm."
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+msgid "Whether to show RSVP field in the event/task/meeting editor"
+msgstr "Отображать ли поле \"Просьба ответить\" в редакторе событий/задач/собраний"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
+msgid "Whether to show categories field in the event/meeting editor"
+msgstr "Отображать ли поле категорий в редакторе событий/собраний"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
+msgid "Whether to show role field in the event/task/meeting editor"
+msgstr "Отображать ли поле \"Должность\" в редакторе событий/задач/собраний"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
+msgid "Whether to show status field in the event/task/meeting editor"
+msgstr "Отображать ли поле состояния в редакторе событий/задач/собраний"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+msgid "Whether to show times in twenty four hour format instead of using am/pm."
msgstr "Показывать ли время в 24-часовом формате вместо am/pm."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+msgid "Whether to show timezone field in the event/meeting editor"
+msgstr "Отображать ли поле часового пояса в редакторе событий/задач/собраний"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
+msgid "Whether to show type field in the event/task/meeting editor"
+msgstr "Отображать ли поле \"тип\" в редакторе событий/задач/собраний"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
msgid "Whether to show week numbers in the date navigator."
msgstr "Показывать ли номера недель в навигаторе по датам."
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
msgid "Work days"
msgstr "Рабочие дни"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
msgid "Workday end hour"
msgstr "Час завершения рабочего дня"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
msgid "Workday end minute"
msgstr "Минуты завершения рабочего дня"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
msgid "Workday start hour"
msgstr "Час начала рабочего дня"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
msgid "Workday start minute"
msgstr "Минута начала рабочего дня"
-#: ../calendar/gui/cal-search-bar.c:49
+#: ../calendar/gui/cal-search-bar.c:48
msgid "Summary contains"
msgstr "Сводка содержит"
-#: ../calendar/gui/cal-search-bar.c:50
+#: ../calendar/gui/cal-search-bar.c:49
msgid "Description contains"
msgstr "Описание содержит"
@@ -4794,17 +5030,28 @@ msgstr "Адрес содержит"
msgid "Unmatched"
msgstr "Прочее"
+#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2514
+#: ../ui/evolution-addressbook.xml.h:26 ../ui/evolution-calendar.xml.h:18
+#: ../ui/evolution-mail-message.xml.h:75 ../ui/evolution-memos.xml.h:11
+#: ../ui/evolution-tasks.xml.h:14
+msgid "Print"
+msgstr "Печать"
+
#: ../calendar/gui/calendar-commands.c:119
-#: ../calendar/gui/calendar-component.c:708
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/gnome-cal.c:2094
+#: ../calendar/gui/calendar-component.c:709
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/gnome-cal.c:2123
+#: ../plugins/exchange-operations/exchange-folder.c:579
#: ../plugins/groupwise-account-setup/camel-gw-listener.c:383
#: ../plugins/groupwise-account-setup/camel-gw-listener.c:413
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:588
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:590
+#: ../plugins/hula-account-setup/camel-hula-listener.c:379
+#: ../plugins/hula-account-setup/camel-hula-listener.c:408
+#: ../plugins/publish-calendar/publish-calendar.glade.h:5
msgid "Calendar"
msgstr "Календарь"
-#: ../calendar/gui/calendar-commands.c:354
+#: ../calendar/gui/calendar-commands.c:348
msgid ""
"This operation will permanently erase all events older than the selected "
"amount of time. If you continue, you will not be able to recover these "
@@ -4813,104 +5060,106 @@ msgstr ""
"Это действие безвозвратно уничтожит все события старше указанного промежутка "
"времени. Если вы продолжите, вы не сможете восстановить эти события."
-#: ../calendar/gui/calendar-commands.c:360
+#: ../calendar/gui/calendar-commands.c:354
msgid "Purge events older than"
msgstr "Очистить элементы старше чем"
-#: ../calendar/gui/calendar-commands.c:365
+#: ../calendar/gui/calendar-commands.c:359
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
-#: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:265
+#: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:288
#: ../plugins/calendar-weather/calendar-weather.c:565
#: ../widgets/misc/e-send-options.glade.h:36
msgid "days"
msgstr "дней"
#. Create the On the web source group
+#. Create the LDAP source group
#. Create the Webcal source group
#. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:234 ../calendar/gui/migration.c:489
-#: ../calendar/gui/migration.c:582 ../calendar/gui/tasks-component.c:215
+#: ../calendar/gui/calendar-component.c:235
+#: ../calendar/gui/memos-component.c:221 ../calendar/gui/migration.c:501
+#: ../calendar/gui/migration.c:594 ../calendar/gui/migration.c:1102
+#: ../calendar/gui/tasks-component.c:217
msgid "On The Web"
msgstr "В Сети"
-#: ../calendar/gui/calendar-component.c:252 ../calendar/gui/migration.c:391
+#: ../calendar/gui/calendar-component.c:253 ../calendar/gui/migration.c:403
msgid "Birthdays & Anniversaries"
msgstr "Дни рождения и годовщины"
#. Create the weather group
-#: ../calendar/gui/calendar-component.c:258
+#: ../calendar/gui/calendar-component.c:259
#: ../plugins/calendar-weather/calendar-weather.c:100
msgid "Weather"
msgstr "Погода"
-#: ../calendar/gui/calendar-component.c:535
-#: ../calendar/gui/dialogs/calendar-setup.c:449
-msgid "New Calendar"
-msgstr "Новый календарь"
+#: ../calendar/gui/calendar-component.c:536
+msgid "_New Calendar"
+msgstr "_Создать календарь"
-#: ../calendar/gui/calendar-component.c:858
+#: ../calendar/gui/calendar-component.c:840
msgid "Failed upgrading calendars."
msgstr "Ошибка обновления календарей."
-#: ../calendar/gui/calendar-component.c:1154
+#: ../calendar/gui/calendar-component.c:1139
#, c-format
msgid "Unable to open the calendar '%s' for creating events and meetings"
msgstr "Не удаётся открыть календарь '%s' для создания событий и совещаний"
-#: ../calendar/gui/calendar-component.c:1170
+#: ../calendar/gui/calendar-component.c:1152
msgid "There is no calendar available for creating events and meetings"
msgstr "Нет доступного календаря для создания событий и совещаний"
-#: ../calendar/gui/calendar-component.c:1284
+#: ../calendar/gui/calendar-component.c:1266
msgid "Calendar Source Selector"
msgstr "Выбор источника календаря"
-#: ../calendar/gui/calendar-component.c:1475
+#: ../calendar/gui/calendar-component.c:1457
msgid "New appointment"
msgstr "Новая встреча"
-#: ../calendar/gui/calendar-component.c:1476
+#: ../calendar/gui/calendar-component.c:1458
msgid "_Appointment"
msgstr "_Встреча"
-#: ../calendar/gui/calendar-component.c:1477
+#: ../calendar/gui/calendar-component.c:1459
msgid "Create a new appointment"
msgstr "Создать новую встречу"
-#: ../calendar/gui/calendar-component.c:1483
+#: ../calendar/gui/calendar-component.c:1465
msgid "New meeting"
msgstr "Новое собрание"
-#: ../calendar/gui/calendar-component.c:1484
+#: ../calendar/gui/calendar-component.c:1466
msgid "M_eeting"
msgstr "_Собрание"
-#: ../calendar/gui/calendar-component.c:1485
+#: ../calendar/gui/calendar-component.c:1467
msgid "Create a new meeting request"
msgstr "Создать новое приглашение на собрание"
-#: ../calendar/gui/calendar-component.c:1491
+#: ../calendar/gui/calendar-component.c:1473
msgid "New all day appointment"
msgstr "Новая встреча на весь день"
-#: ../calendar/gui/calendar-component.c:1492
+#: ../calendar/gui/calendar-component.c:1474
msgid "All Day A_ppointment"
msgstr "_Ежедневная встреча"
-#: ../calendar/gui/calendar-component.c:1493
+#: ../calendar/gui/calendar-component.c:1475
msgid "Create a new all-day appointment"
msgstr "Создать новую ежедневную встречу"
-#: ../calendar/gui/calendar-component.c:1499
+#: ../calendar/gui/calendar-component.c:1481
msgid "New calendar"
msgstr "Новый календарь"
-#: ../calendar/gui/calendar-component.c:1500
+#: ../calendar/gui/calendar-component.c:1482
msgid "Cale_ndar"
msgstr "Кале_ндарь"
-#: ../calendar/gui/calendar-component.c:1501
+#: ../calendar/gui/calendar-component.c:1483
msgid "Create a new calendar"
msgstr "Создать новый календарь"
@@ -4942,10 +5191,14 @@ msgstr "Метод открытия календаря не поддержива
msgid "Permission denied to open the calendar"
msgstr "Отказ в доступе при открытии календаря"
-#: ../calendar/gui/comp-editor-factory.c:444 ../shell/e-shell.c:1267
+#: ../calendar/gui/comp-editor-factory.c:444 ../shell/e-shell.c:1271
msgid "Unknown error"
msgstr "Неизвестная ошибка"
+#: ../calendar/gui/dialogs/alarm-dialog.c:567
+msgid "Edit Alarm"
+msgstr "Изменить сигнал"
+
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
msgid "<b>Alarm</b>"
msgstr "<b>Сигнал</b>"
@@ -4975,17 +5228,17 @@ msgid "Mes_sage:"
msgstr "_Сообщение:"
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:444
+#: ../calendar/gui/e-alarm-list.c:449
msgid "Play a sound"
msgstr "Воспроизвести звук"
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:448
+#: ../calendar/gui/e-alarm-list.c:453
msgid "Pop up an alert"
msgstr "Выводить предупреждение"
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:456
+#: ../calendar/gui/e-alarm-list.c:461
msgid "Run a program"
msgstr "Выполнить программу"
@@ -4994,7 +5247,7 @@ msgid "Send To:"
msgstr "Отправить:"
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
-#: ../calendar/gui/e-alarm-list.c:452
+#: ../calendar/gui/e-alarm-list.c:457
msgid "Send an email"
msgstr "Отправить почту"
@@ -5039,13 +5292,6 @@ msgstr "дополнительное время каждые"
msgid "hour(s)"
msgstr "часов"
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
-#: ../filter/filter.glade.h:15 ../plugins/calendar-http/calendar-http.c:264
-#: ../plugins/calendar-weather/calendar-weather.c:564
-msgid "hours"
-msgstr "часов"
-
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
msgid "minute(s)"
msgstr "минут"
@@ -5054,7 +5300,7 @@ msgstr "минут"
msgid "start of appointment"
msgstr "начало встречи"
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:199
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:232
msgid "Action/Trigger"
msgstr "Действие/Переключатель"
@@ -5063,70 +5309,12 @@ msgid "A_dd"
msgstr "_Добавить"
#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:4
+#: ../ui/evolution-event-editor.xml.h:2
msgid "Alarms"
msgstr "Сигналы"
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:110
-#: ../composer/e-msg-composer-attachment-bar.c:105
-#: ../widgets/misc/e-attachment-bar.c:106
-#, c-format
-msgid "%.0fK"
-msgstr "%.0fКБ"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:113
-#: ../composer/e-msg-composer-attachment-bar.c:108
-#: ../widgets/misc/e-attachment-bar.c:109
-#, c-format
-msgid "%.0fM"
-msgstr "%.0fМБ"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:116
-#: ../composer/e-msg-composer-attachment-bar.c:111
-#: ../widgets/misc/e-attachment-bar.c:112
-#, c-format
-msgid "%.0fG"
-msgstr "%.0fГБ"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:311
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:1106
-#: ../calendar/gui/dialogs/comp-editor.c:2440
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:444
-#: ../mail/em-utils.c:481 ../widgets/misc/e-attachment-bar.c:341
-msgid "attachment"
-msgstr "вложение"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:473
-#: ../calendar/gui/dialogs/comp-editor.c:1083
-#: ../calendar/gui/dialogs/meeting-page.c:887
-#: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3400
-#: ../plugins/groupwise-features/junk-settings.glade.h:8
-#: ../plugins/groupwise-features/properties.glade.h:14
-#: ../widgets/table/e-table-config.glade.h:18
-msgid "_Remove"
-msgstr "Удалить"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:474
-#: ../calendar/gui/dialogs/comp-editor.c:1084
-#: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3401 ../mail/em-folder-tree.c:2058
-#: ../ui/evolution-mail-list.xml.h:29
-msgid "_Properties"
-msgstr "_Свойства"
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:476
-#: ../calendar/gui/dialogs/comp-editor.c:1086
-#: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3403
-msgid "_Add attachment..."
-msgstr "_Добавить вложение..."
-
-#: ../calendar/gui/dialogs/cal-attachment-bar.c:736
-#: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:963
-msgid "Attachment Bar"
-msgstr "Панель вложений"
-
#: ../calendar/gui/dialogs/cal-attachment-select-file.c:96
#: ../calendar/gui/dialogs/cal-attachment-select-file.c:115
#: ../calendar/gui/dialogs/cal-attachment.glade.h:6
@@ -5138,33 +5326,9 @@ msgid "Suggest automatic display of attachment"
msgstr "Предполагать автоматическое отображение вложения"
#: ../calendar/gui/dialogs/cal-attachment-select-file.c:190
-#: ../composer/e-msg-composer-select-file.c:241
msgid "Attach file(s)"
msgstr "Вложить файл(ы)"
-#: ../calendar/gui/dialogs/cal-attachment.c:210
-#: ../calendar/gui/dialogs/cal-attachment.c:226
-#: ../calendar/gui/dialogs/cal-attachment.c:319
-#: ../calendar/gui/dialogs/cal-attachment.c:335
-#: ../composer/e-msg-composer-attachment.c:187
-#: ../composer/e-msg-composer-attachment.c:203
-#: ../composer/e-msg-composer-attachment.c:297
-#: ../composer/e-msg-composer-attachment.c:313
-#: ../widgets/misc/e-attachment.c:221 ../widgets/misc/e-attachment.c:237
-#: ../widgets/misc/e-attachment.c:425 ../widgets/misc/e-attachment.c:441
-#, c-format
-msgid "Cannot attach file %s: %s"
-msgstr "Не удается вложить файл %s: %s"
-
-#: ../calendar/gui/dialogs/cal-attachment.c:218
-#: ../calendar/gui/dialogs/cal-attachment.c:327
-#: ../composer/e-msg-composer-attachment.c:195
-#: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:229 ../widgets/misc/e-attachment.c:433
-#, c-format
-msgid "Cannot attach file %s: not a regular file"
-msgstr "Не удается вложить файл %s: не обычный файл"
-
#: ../calendar/gui/dialogs/cal-attachment.glade.h:2
#: ../composer/e-msg-composer-attachment.glade.h:2
#: ../widgets/misc/e-attachment.glade.h:2
@@ -5172,8 +5336,8 @@ msgid "Attachment Properties"
msgstr "Свойства вложения"
#: ../calendar/gui/dialogs/cal-attachment.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:267
-#: ../calendar/gui/e-itip-control.c:1166
+#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-itip-control.c:1165
#: ../calendar/gui/e-itip-control.glade.h:6
#: ../composer/e-msg-composer-attachment.glade.h:3
#: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
@@ -5192,296 +5356,255 @@ msgstr "Имя файла:"
msgid "MIME type:"
msgstr "Тип MIME:"
-#. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:576
-#: ../mail/em-account-prefs.c:504 ../mail/em-composer-prefs.c:891
-#: ../plugins/plugin-manager/plugin-manager.c:213
-msgid "Enabled"
-msgstr "Включено"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:730
-msgid "Are you sure you want to remove this URL?"
-msgstr "Вы действительно хотите удалить этот URL?"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:733
-msgid "Remove"
-msgstr "Удалить"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:738
-msgid "Don't Remove"
-msgstr "Не удалять"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:853
-#: ../mail/em-account-prefs.c:330 ../mail/em-account-prefs.c:375
-#: ../mail/em-account-prefs.c:406
-msgid "Disable"
-msgstr "Отключить"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:820
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:855
-#: ../mail/em-account-prefs.c:330 ../mail/em-account-prefs.c:375
-#: ../mail/em-account-prefs.c:408
-msgid "Enable"
-msgstr "Включить"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
-msgid "05 minutes"
-msgstr "05 минут"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-msgid "10 minutes"
-msgstr "10 минут"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
-msgid "15 minutes"
-msgstr "15 минут"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
-msgid "30 minutes"
-msgstr "30 минут"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:469
+msgid "Selected Calendars for Alarms"
+msgstr "Календари - источники сигналов"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "60 minutes"
-msgstr "60 минут"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+msgid ""
+"60 minutes\n"
+"30 minutes\n"
+"15 minutes\n"
+"10 minutes\n"
+"05 minutes"
+msgstr ""
+"60 минут\n"
+"30 минут\n"
+"15 минут\n"
+"10 минут\n"
+"05 минут"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "<b>Alerts</b>"
-msgstr "<b>Сигналы</b> "
+#, no-c-format
+msgid "<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgstr ""
+"<i>%u и %d будут заменены на пользователя и домен из адреса электронной "
+"почты.</i>"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "<b>Default Free/Busy Server</b>"
-msgstr "<b>Сервер \"Свободен/занят\" по умолчанию</b>"
+#: ../mail/mail-config.glade.h:9
+msgid "<span weight=\"bold\">Alerts</span>"
+msgstr "<span weight=\"bold\">Сигналы</span>"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-msgid "<b>General</b>"
-msgstr "<b>Общие</b> "
+msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
+msgstr "<span weight=\"bold\">Сервер \"Свободен/Занят\" по умолчанию</span>"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "<b>Publishing</b>"
-msgstr "<b>Публикация</b>"
+#: ../mail/mail-config.glade.h:18
+#: ../plugins/itip-formatter/itip-formatter.c:1977
+#: ../plugins/publish-calendar/publish-calendar.glade.h:1
+msgid "<span weight=\"bold\">General</span>"
+msgstr "<span weight=\"bold\">Общие</span>"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-msgid "<b>Task List</b>"
-msgstr "<b>Список задач</b>"
+msgid "<span weight=\"bold\">Task List</span>"
+msgstr "<span weight=\"bold\">Список задач</span>"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "<b>Time</b>"
-msgstr "<b>Время</b> "
+msgid "<span weight=\"bold\">Time</span>"
+msgstr "<span weight=\"bold\">Время</span>"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "<b>Work Week</b>"
-msgstr "<b>Рабочая неделя</b> "
+msgid "<span weight=\"bold\">Work Week</span>"
+msgstr "<span weight=\"bold\">Рабочая неделя</span>"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#, no-c-format
-msgid ""
-"<i>%u and %d will be replaced by user and domain from the email address.</i>"
-msgstr ""
-"<i>%u и %d будут заменены на пользователя и домен из адреса электронной "
-"почты.</i>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "Calendar and Tasks Settings"
-msgstr "Параметры календаря и задач"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-msgid "Color for overdue tasks"
-msgstr "Цвет для просроченных задач"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Color for tasks due today"
-msgstr "Цвет для задач на сегодня"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
msgid "Day _ends:"
msgstr "День _заканчивается:"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Days"
-msgstr "Дней"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
msgid "Display"
msgstr "Отображение"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: ../mail/mail-config.glade.h:74
-msgid "E_nable"
-msgstr "_Включить"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/event-editor.c:572
+#: ../ui/evolution-event-editor.xml.h:8
msgid "Free/Busy"
msgstr "Cвободен/занят"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1048
-#: ../calendar/gui/e-itip-control.c:734
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/recurrence-page.c:1051
+#: ../calendar/gui/e-itip-control.c:733
msgid "Friday"
msgstr "Пятница"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Hours"
-msgstr "Часов"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Minutes"
-msgstr "Минут"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+msgid ""
+"Minutes\n"
+"Hours\n"
+"Days"
+msgstr ""
+"Минуты\n"
+"Часы\n"
+"Дни"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: ../calendar/gui/dialogs/recurrence-page.c:1044
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
+#: ../calendar/gui/e-itip-control.c:729
msgid "Monday"
msgstr "Понедельник"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Publishing Table"
-msgstr "Таблица публикации"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+msgid ""
+"Monday\n"
+"Tuesday\n"
+"Wednesday\n"
+"Thursday\n"
+"Friday\n"
+"Saturday\n"
+"Sunday"
+msgstr ""
+"Понедельник\n"
+"Вторник\n"
+"Среда\n"
+"Четверг\n"
+"Пятница\n"
+"Суббота\n"
+"Воскресенье"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
+#: ../mail/mail-config.glade.h:106
+msgid "Pick a color"
+msgstr "Выбрать цвет"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
msgid "S_un"
msgstr "Вск"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ../calendar/gui/dialogs/recurrence-page.c:1049
-#: ../calendar/gui/e-itip-control.c:735
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/recurrence-page.c:1052
+#: ../calendar/gui/e-itip-control.c:734
msgid "Saturday"
msgstr "Суббота"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+msgid "Select the calendars for alarm notification"
+msgstr "Выберите календари для сигналов"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
msgid "Sh_ow a reminder"
msgstr "Показывать _напоминание"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
msgid "Show week _numbers in date navigator"
msgstr "Показывать номера недель в навигаторе по датам"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: ../calendar/gui/dialogs/recurrence-page.c:1050
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
+#: ../calendar/gui/e-itip-control.c:728
msgid "Sunday"
msgstr "Воскресенье"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
msgid "T_asks due today:"
msgstr "Задачи на _сегодняшний день:"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
msgid "T_hu"
msgstr "Чтв"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
msgid "Template:"
msgstr "Шаблон:"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: ../calendar/gui/dialogs/recurrence-page.c:1047
-#: ../calendar/gui/e-itip-control.c:733
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: ../calendar/gui/dialogs/recurrence-page.c:1050
+#: ../calendar/gui/e-itip-control.c:732
msgid "Thursday"
msgstr "Четверг"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/event-page.glade.h:15
msgid "Time _zone:"
msgstr "Часовой _пояс:"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
msgid "Time format:"
msgstr "Формат времени:"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#: ../calendar/gui/dialogs/recurrence-page.c:1045
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: ../calendar/gui/dialogs/recurrence-page.c:1048
+#: ../calendar/gui/e-itip-control.c:730
msgid "Tuesday"
msgstr "Вторник"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "W_eek starts:"
-msgstr "Начало недели:"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: ../calendar/gui/dialogs/recurrence-page.c:1046
-#: ../calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/recurrence-page.c:1049
+#: ../calendar/gui/e-itip-control.c:731
msgid "Wednesday"
msgstr "Среда"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#. A weekday like "Monday" follows
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+msgid "Wee_k starts on:"
+msgstr "Неделя начинается с:"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
msgid "Work days:"
msgstr "Рабочие дни:"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
msgid "_12 hour (AM/PM)"
msgstr "12-часовой (AM/PM)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
msgid "_24 hour"
msgstr "24-часовой"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-msgid "_Add URL"
-msgstr "_Добавить URL"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
msgid "_Ask for confirmation when deleting items"
msgstr "Запрашивать подтверждение при удалении элементов"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
msgid "_Compress weekends in month view"
msgstr "Ужимать выходные дни в представлении месяца"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
msgid "_Day begins:"
msgstr "_День начинается:"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
msgid "_Fri"
msgstr "Пят"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
msgid "_Hide completed tasks after"
msgstr "Скрывать выполненные задачи через"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
msgid "_Mon"
msgstr "Пон"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
msgid "_Overdue tasks:"
msgstr "Просроченные задачи:"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
msgid "_Sat"
msgstr "Суб"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-msgid "_Show appointment end times in week and month views"
-msgstr "_Показывать время окончания встреч в обзоре недели и месяца"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+msgid "_Show appointment end times in week and month view"
+msgstr "_Отображать время окончания встреч в обзоре недели и месяца"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
msgid "_Time divisions:"
msgstr "Разделители времени:"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
msgid "_Tue"
msgstr "Втр"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
msgid "_Wed"
msgstr "Срд"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
msgid "before every appointment"
msgstr "перед каждой встречей"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
-msgid "option menu to choose reminder units"
-msgstr "меню выбора единиц напоминания"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
-msgid "option menu to choose time units"
-msgstr "меню выбора единиц времени"
-
#: ../calendar/gui/dialogs/calendar-setup.c:287
msgid "Copy calendar contents locally for offline operation"
msgstr "Скопировать содержимое календаря локально для автономных операций"
@@ -5490,23 +5613,40 @@ msgstr "Скопировать содержимое календаря лока
msgid "Copy task list contents locally for offline operation"
msgstr "Скопировать содержимое списка задач локально для автономной работы"
-#: ../calendar/gui/dialogs/calendar-setup.c:341
+#: ../calendar/gui/dialogs/calendar-setup.c:292
+msgid "Copy memo list contents locally for offline operation"
+msgstr "Скопировать список заметок локально для автономной работы"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:343
#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
msgid "C_olor:"
msgstr "_Цвет:"
-#: ../calendar/gui/dialogs/calendar-setup.c:378
+#: ../calendar/gui/dialogs/calendar-setup.c:380
msgid "Tasks List"
msgstr "Список задач"
-#: ../calendar/gui/dialogs/calendar-setup.c:447
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+msgid "Memos List"
+msgstr "Список заметок"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:460
msgid "Calendar Properties"
msgstr "Свойства календаря"
-#: ../calendar/gui/dialogs/calendar-setup.c:515
+#: ../calendar/gui/dialogs/calendar-setup.c:462
+msgid "New Calendar"
+msgstr "Новый календарь"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:528
msgid "Task List Properties"
msgstr "Свойства списка задач"
+#: ../calendar/gui/dialogs/calendar-setup.c:594
+#: ../calendar/gui/memos-component.c:450
+msgid "New Memo List"
+msgstr "Новый список заметок"
+
#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
msgid "Add Calendar"
msgstr "Добавить календарь"
@@ -5515,11 +5655,6 @@ msgstr "Добавить календарь"
msgid "Add Task List"
msgstr "Добавить список задач"
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
-#: ../mail/mail-config.glade.h:105
-msgid "Pick a color"
-msgstr "Выбрать цвет"
-
#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
msgid "_Add Calendar"
msgstr "_Добавить календарь"
@@ -5529,18 +5664,19 @@ msgid "_Add Task List"
msgstr "_Добавить список задач"
#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
-#: ../plugins/calendar-http/calendar-http.c:248
+#: ../plugins/calendar-http/calendar-http.c:271
#: ../plugins/calendar-weather/calendar-weather.c:548
msgid "_Refresh:"
msgstr "_Обновить:"
#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
-#: ../plugins/calendar-http/calendar-http.c:120
+#: ../plugins/caldav/caldav-source.c:247
+#: ../plugins/calendar-http/calendar-http.c:133
msgid "_URL:"
msgstr "_URL:"
#: ../calendar/gui/dialogs/calendar-setup.glade.h:15
-#: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:266
+#: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:289
#: ../plugins/calendar-weather/calendar-weather.c:566
msgid "weeks"
msgstr "недели"
@@ -5589,40 +5725,40 @@ msgstr "%s Вы сделали изменения. Отменить их?"
msgid "%s You have made no changes, update the editor?"
msgstr "%s Вы ничего не изменили. Обновить редактор?"
-#: ../calendar/gui/dialogs/comp-editor-page.c:464
+#: ../calendar/gui/dialogs/comp-editor-page.c:515
#, c-format
msgid "Validation error: %s"
msgstr "Ошибка проверки: %s"
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2261
+#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2272
msgid " to "
msgstr " к "
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2265
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2276
msgid " (Completed "
msgstr " (Завершено "
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2267
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2278
msgid "Completed "
msgstr "Завершено "
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2272
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2283
msgid " (Due "
msgstr " (к дате"
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2274
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2285
msgid "Due "
msgstr "К дате"
-#: ../calendar/gui/dialogs/comp-editor.c:190 ../composer/e-msg-composer.c:2664
+#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2850
#, c-format
msgid "Attached message - %s"
msgstr "Вложенное сообщение - %s"
#. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:195
-#: ../calendar/gui/dialogs/comp-editor.c:365 ../composer/e-msg-composer.c:2669
-#: ../composer/e-msg-composer.c:2846
+#: ../calendar/gui/dialogs/comp-editor.c:212
+#: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2855
+#: ../composer/e-msg-composer.c:3034
#, c-format
msgid "Attached message"
msgid_plural "%d attached messages"
@@ -5630,32 +5766,22 @@ msgstr[0] "%d вложенное сообщение"
msgstr[1] "%d вложенных сообщения"
msgstr[2] "%d вложенных сообщений"
-#: ../calendar/gui/dialogs/comp-editor.c:428
-#: ../calendar/gui/e-calendar-table.c:1171
-#: ../calendar/gui/e-calendar-view.c:1535 ../composer/e-msg-composer.c:2911
-#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1035
-#: ../mail/message-list.c:1718 ../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:102 ../ui/evolution-tasks.xml.h:21
-msgid "_Copy"
-msgstr "_Копировать"
-
-#: ../calendar/gui/dialogs/comp-editor.c:429 ../composer/e-msg-composer.c:2912
+#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3099
#: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:931 ../mail/message-list.c:1719
+#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1730
msgid "_Move"
msgstr "Пере_местить"
-#: ../calendar/gui/dialogs/comp-editor.c:431 ../composer/e-msg-composer.c:2914
-#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1721
+#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3101
+#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1732
msgid "Cancel _Drag"
msgstr "Отменить _перенос"
-#: ../calendar/gui/dialogs/comp-editor.c:774
+#: ../calendar/gui/dialogs/comp-editor.c:806
msgid "Could not update object"
msgstr "Не удается обновить объект"
-#: ../calendar/gui/dialogs/comp-editor.c:977 ../composer/e-msg-composer.c:2318
+#: ../calendar/gui/dialogs/comp-editor.c:952 ../composer/e-msg-composer.c:2479
#, c-format
msgid "<b>%d</b> Attachment"
msgid_plural "<b>%d</b> Attachments"
@@ -5663,59 +5789,100 @@ msgstr[0] "<b>%d</b> вложение"
msgstr[1] "<b>%d</b> вложения"
msgstr[2] "<b>%d</b> вложений"
-#: ../calendar/gui/dialogs/comp-editor.c:1249
-msgid "_Attachment Bar (drop attachments here)"
-msgstr "_Панель вложений (для перетаскивания вложений)"
+#: ../calendar/gui/dialogs/comp-editor.c:984
+msgid "Hide Attachment _Bar"
+msgstr "Скрыть _панель вложений"
+
+#: ../calendar/gui/dialogs/comp-editor.c:987
+#: ../calendar/gui/dialogs/comp-editor.c:1459
+msgid "Show Attachment _Bar"
+msgstr "Показать _панель вложений"
-#: ../calendar/gui/dialogs/comp-editor.c:1850
-#: ../calendar/gui/dialogs/comp-editor.c:1893
+#: ../calendar/gui/dialogs/comp-editor.c:1096
+#: ../calendar/gui/dialogs/event-page.c:1898
+#: ../calendar/gui/dialogs/meeting-page.c:914
+#: ../calendar/gui/dialogs/task-page.c:1206
+#: ../composer/e-msg-composer-attachment-bar.c:470
+#: ../composer/e-msg-composer.c:3597
+#: ../plugins/groupwise-features/junk-settings.glade.h:8
+#: ../plugins/groupwise-features/properties.glade.h:14
+#: ../widgets/table/e-table-config.glade.h:18
+msgid "_Remove"
+msgstr "_Удалить"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1097
+#: ../composer/e-msg-composer-attachment-bar.c:471
+#: ../composer/e-msg-composer.c:3598 ../mail/em-folder-tree.c:2058
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
+msgid "_Properties"
+msgstr "_Свойства"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1099
+#: ../composer/e-msg-composer-attachment-bar.c:473
+#: ../composer/e-msg-composer.c:3600
+msgid "_Add attachment..."
+msgstr "_Добавить вложение..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1483
+msgid "Attachment Button: Press space key to toggle attachment bar"
+msgstr "Кнопка вложений. Нажмите, чтобы переключить отображение панели вложений"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2090
+#: ../calendar/gui/dialogs/comp-editor.c:2133
msgid "Edit Appointment"
msgstr "Изменить встречу"
-#: ../calendar/gui/dialogs/comp-editor.c:1856
-#: ../calendar/gui/dialogs/comp-editor.c:1899
+#: ../calendar/gui/dialogs/comp-editor.c:2096
+#: ../calendar/gui/dialogs/comp-editor.c:2139
#, c-format
msgid "Meeting - %s"
msgstr "Собрание - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:1858
-#: ../calendar/gui/dialogs/comp-editor.c:1901
+#: ../calendar/gui/dialogs/comp-editor.c:2098
+#: ../calendar/gui/dialogs/comp-editor.c:2141
#, c-format
msgid "Appointment - %s"
msgstr "Встреча - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:1862
-#: ../calendar/gui/dialogs/comp-editor.c:1905
+#: ../calendar/gui/dialogs/comp-editor.c:2102
+#: ../calendar/gui/dialogs/comp-editor.c:2145
#, c-format
msgid "Assigned Task - %s"
msgstr "Назначенная задача - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:1864
-#: ../calendar/gui/dialogs/comp-editor.c:1907
+#: ../calendar/gui/dialogs/comp-editor.c:2104
+#: ../calendar/gui/dialogs/comp-editor.c:2147
#, c-format
msgid "Task - %s"
msgstr "Задача - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:1867
-#: ../calendar/gui/dialogs/comp-editor.c:1910
+#: ../calendar/gui/dialogs/comp-editor.c:2107
+#: ../calendar/gui/dialogs/comp-editor.c:2150
#, c-format
msgid "Journal entry - %s"
msgstr "Запись в журнале - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:1878
-#: ../calendar/gui/dialogs/comp-editor.c:1920
+#: ../calendar/gui/dialogs/comp-editor.c:2118
+#: ../calendar/gui/dialogs/comp-editor.c:2160
msgid "No summary"
msgstr "Нет Краткого описания"
-#: ../calendar/gui/dialogs/comp-editor.c:2528
-#: ../calendar/gui/dialogs/comp-editor.c:2561
-#: ../calendar/gui/dialogs/comp-editor.c:2585
+#: ../calendar/gui/dialogs/comp-editor.c:2670
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:156
+#: ../mail/em-utils.c:502 ../mail/em-utils.c:539
+#: ../widgets/misc/e-attachment-bar.c:339
+msgid "attachment"
+msgstr "вложение"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2763
+#: ../calendar/gui/dialogs/comp-editor.c:2820
+#: ../calendar/gui/dialogs/comp-editor.c:2844
msgid "Changes made to this item may be discarded if an update arrives"
msgstr ""
"Изменения этого элемента будут отвергнуты, если по эл. почте придет "
"обновление."
-#: ../calendar/gui/dialogs/comp-editor.c:2609
+#: ../calendar/gui/dialogs/comp-editor.c:2868
msgid "Unable to use current version!"
msgstr "Не удается использовать текущую версию!"
@@ -5792,64 +5959,95 @@ msgstr "Поручить:"
msgid "Enter Delegate"
msgstr "Ввести представителя"
-#: ../calendar/gui/dialogs/event-editor.c:141 ../calendar/gui/print.c:2298
-msgid "Appointment"
-msgstr "Встреча"
+#: ../calendar/gui/dialogs/event-editor.c:547
+msgid "Appoint_ment"
+msgstr "Встре_ча"
-#: ../calendar/gui/dialogs/event-editor.c:150
+#: ../calendar/gui/dialogs/event-editor.c:551
+#: ../ui/evolution-event-editor.xml.h:14
msgid "Recurrence"
msgstr "Повторение"
-#: ../calendar/gui/dialogs/event-editor.c:164
-#: ../calendar/gui/dialogs/event-editor.c:248
-#: ../calendar/gui/dialogs/event-editor.c:422
-msgid "Scheduling"
-msgstr "Планировка"
+#: ../calendar/gui/dialogs/event-page.c:807
+#: ../calendar/gui/dialogs/event-page.c:2720
+msgid "This event has alarms"
+msgstr "Это событие имеет сигналы"
-#: ../calendar/gui/dialogs/event-editor.c:174
-msgid "Delegatees"
-msgstr "Доверенные лица"
+#: ../calendar/gui/dialogs/event-page.c:873
+#: ../calendar/gui/dialogs/event-page.glade.h:7
+msgid "Cale_ndar:"
+msgstr "Кале_ндарь:"
-#: ../calendar/gui/dialogs/event-editor.c:178
-msgid "Attendees"
-msgstr "Участники"
+#: ../calendar/gui/dialogs/event-page.c:879
+#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/meeting-page.glade.h:5
+#: ../calendar/gui/dialogs/task-page.c:446
+msgid "Or_ganizer:"
+msgstr "Ор_ганизатор:"
+
+#: ../calendar/gui/dialogs/event-page.c:917
+msgid "_Delegatees"
+msgstr "_Представители"
-#: ../calendar/gui/dialogs/event-editor.c:251
-#: ../calendar/gui/dialogs/event-editor.c:425
-msgid "Invitations"
-msgstr "Приглашения"
+#: ../calendar/gui/dialogs/event-page.c:919
+msgid "Atte_ndees"
+msgstr "_Участники"
-#: ../calendar/gui/dialogs/event-page.c:731
+#: ../calendar/gui/dialogs/event-page.c:1086
msgid "Event with no start date"
msgstr "Событие без даты начала"
-#: ../calendar/gui/dialogs/event-page.c:734
+#: ../calendar/gui/dialogs/event-page.c:1089
msgid "Event with no end date"
msgstr "Событие без даты завершения"
-#: ../calendar/gui/dialogs/event-page.c:900
-#: ../calendar/gui/dialogs/task-page.c:556
+#: ../calendar/gui/dialogs/event-page.c:1257
+#: ../calendar/gui/dialogs/task-page.c:851
msgid "Start date is wrong"
msgstr "Дата начала неверна"
-#: ../calendar/gui/dialogs/event-page.c:910
+#: ../calendar/gui/dialogs/event-page.c:1267
msgid "End date is wrong"
msgstr "Неверная дата завершения"
-#: ../calendar/gui/dialogs/event-page.c:933
+#: ../calendar/gui/dialogs/event-page.c:1290
msgid "Start time is wrong"
msgstr "Неверное время начала"
-#: ../calendar/gui/dialogs/event-page.c:940
+#: ../calendar/gui/dialogs/event-page.c:1297
msgid "End time is wrong"
msgstr "Неверное время завершения"
-#: ../calendar/gui/dialogs/event-page.c:1686
+#: ../calendar/gui/dialogs/event-page.c:1452
+#: ../calendar/gui/dialogs/meeting-page.c:469
+#: ../calendar/gui/dialogs/task-page.c:908
+msgid "The organizer selected no longer has an account."
+msgstr "Выбранный организатор больше не имеет учетной записи."
+
+#: ../calendar/gui/dialogs/event-page.c:1458
+#: ../calendar/gui/dialogs/meeting-page.c:475
+#: ../calendar/gui/dialogs/task-page.c:914
+msgid "An organizer is required."
+msgstr "Требуется организатор."
+
+#: ../calendar/gui/dialogs/event-page.c:1473
+#: ../calendar/gui/dialogs/meeting-page.c:490
+#: ../calendar/gui/dialogs/task-page.c:929
+msgid "At least one attendee is required."
+msgstr "Требуется как минимум один участник"
+
+#: ../calendar/gui/dialogs/event-page.c:1899
+#: ../calendar/gui/dialogs/meeting-page.c:915
+#: ../calendar/gui/dialogs/task-page.c:1207
+msgid "_Add "
+msgstr "_Добавить "
+
+#: ../calendar/gui/dialogs/event-page.c:2627
#, c-format
msgid "Unable to open the calendar '%s'."
msgstr "Не удаётся открыть календарь '%s'."
-#: ../calendar/gui/dialogs/event-page.c:1892
+#: ../calendar/gui/dialogs/event-page.c:2922
#, c-format
msgid "%d day before appointment"
msgid_plural "%d days before appointment"
@@ -5857,7 +6055,7 @@ msgstr[0] "%d день до встречи"
msgstr[1] "%d дня до встречи"
msgstr[2] "%d дней до встречи"
-#: ../calendar/gui/dialogs/event-page.c:1900
+#: ../calendar/gui/dialogs/event-page.c:2930
#, c-format
msgid "%d hour before appointment"
msgid_plural "%d hours before appointment"
@@ -5865,7 +6063,7 @@ msgstr[0] "%d час до встречи"
msgstr[1] "%d часа до встречи"
msgstr[2] "%d часов до встречи"
-#: ../calendar/gui/dialogs/event-page.c:1908
+#: ../calendar/gui/dialogs/event-page.c:2938
#, c-format
msgid "%d minute before appointement"
msgid_plural "%d minutes before appointment"
@@ -5873,168 +6071,104 @@ msgstr[0] "%d минута до встречи"
msgstr[1] "%d минуты до встречи"
msgstr[2] "%d минут до встречи"
-#: ../calendar/gui/dialogs/event-page.glade.h:2
+#: ../calendar/gui/dialogs/event-page.c:2954
+msgid "Customize"
+msgstr "Настроить"
+
+#. an empty string is the same as 'None'
+#. Put the "None" and "UTC" entries at the top of the combo's list.
+#. When "None" is selected we want the field to be cleared.
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
+#: ../calendar/gui/dialogs/event-page.c:2959
+#: ../calendar/gui/dialogs/meeting-page.c:321
+#: ../calendar/gui/dialogs/meeting-page.glade.h:4
+#: ../calendar/gui/e-cal-model-tasks.c:654
+#: ../calendar/gui/e-itip-control.c:1105 ../composer/e-msg-composer.c:2271
+#: ../filter/filter-rule.c:889 ../mail/em-account-editor.c:693
+#: ../mail/em-account-editor.c:1358 ../mail/em-account-prefs.c:468
+#: ../mail/em-junk-hook.c:78
+#: ../plugins/calendar-weather/calendar-weather.c:370
+#: ../plugins/calendar-weather/calendar-weather.c:424
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
+#: ../plugins/itip-formatter/itip-formatter.c:1626
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:192
+#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:475
+#: ../widgets/misc/e-dateedit.c:1505 ../widgets/misc/e-dateedit.c:1719
+msgid "None"
+msgstr "Нет"
+
+#: ../calendar/gui/dialogs/event-page.glade.h:1
msgid "1 day before appointment"
msgstr "1 день до встречи"
-#: ../calendar/gui/dialogs/event-page.glade.h:3
+#: ../calendar/gui/dialogs/event-page.glade.h:2
msgid "1 hour before appointment"
msgstr "1 час до встречи"
-#: ../calendar/gui/dialogs/event-page.glade.h:4
+#: ../calendar/gui/dialogs/event-page.glade.h:3
msgid "15 minutes before appointment"
msgstr "15 минут до встречи"
#: ../calendar/gui/dialogs/event-page.glade.h:5
#: ../calendar/gui/dialogs/task-page.glade.h:1
-msgid "<b>Basics</b>"
-msgstr "<b>Основные</b>"
+msgid "Atte_ndees..."
+msgstr "Уч_астники"
#: ../calendar/gui/dialogs/event-page.glade.h:6
-#: ../calendar/gui/dialogs/task-page.glade.h:2
-msgid "<b>Date and Time</b>"
-msgstr "<b>Дата и время</b> "
-
-#: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.glade.h:3
-msgid "<b>Send Options</b>"
-msgstr "<b>Параметры отправки</b>"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:8
-msgid "A_ll day event"
-msgstr "Событие на _весь день"
+#: ../calendar/gui/dialogs/memo-page.glade.h:2
+msgid "Ca_tegories..."
+msgstr "Ка_тегории..."
#: ../calendar/gui/dialogs/event-page.glade.h:9
-#: ../calendar/gui/dialogs/task-page.glade.h:4
-msgid "Ad_vanced send options"
-msgstr "До_полнительные параметры отправки"
+msgid "Custom Alarm:"
+msgstr "Другой сигнал:"
#: ../calendar/gui/dialogs/event-page.glade.h:10
-msgid "C_ustomize..."
-msgstr "Н_астроить..."
+#: ../calendar/gui/dialogs/task-page.glade.h:3
+msgid "D_escription:"
+msgstr "_Описание:"
#: ../calendar/gui/dialogs/event-page.glade.h:11
-#: ../calendar/gui/dialogs/task-page.glade.h:5
-msgid "Ca_tegories..."
-msgstr "Ка_тегории..."
-
-#: ../calendar/gui/dialogs/event-page.glade.h:12
-msgid "Cale_ndar:"
-msgstr "Кале_ндарь:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:13
-#: ../calendar/gui/dialogs/task-page.glade.h:7
-msgid "Classi_fication:"
-msgstr "Класси_фикация:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:14
-#: ../calendar/gui/dialogs/task-page.glade.h:8
-#: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:360
-msgid "Confidential"
-msgstr "Конфиденциальное"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:15
msgid "Event Description"
msgstr "Описание события"
-#: ../calendar/gui/dialogs/event-page.glade.h:16
+#: ../calendar/gui/dialogs/event-page.glade.h:12
msgid "Locat_ion:"
msgstr "Располо_жение:"
-#: ../calendar/gui/dialogs/event-page.glade.h:17
-#: ../calendar/gui/dialogs/task-page.glade.h:10
-#: ../calendar/gui/e-cal-list-view.c:253 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:359
-msgid "Private"
-msgstr "Личное"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:18
-#: ../calendar/gui/dialogs/task-page.glade.h:11
-#: ../calendar/gui/e-cal-list-view.c:252 ../calendar/gui/e-cal-model.c:314
-#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:358
-msgid "Public"
-msgstr "Общее"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:19
-msgid "Show time as _busy"
-msgstr "Показать время как _занят"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:20
-#: ../calendar/gui/dialogs/task-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/task-page.glade.h:6
msgid "Su_mmary:"
msgstr "Коротко:"
-#: ../calendar/gui/dialogs/event-page.glade.h:21
-msgid "This appointment has customized alarms"
-msgstr "Эта встреча имеет свои сигналы"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:22
+#: ../calendar/gui/dialogs/event-page.glade.h:16
msgid "_Alarm"
msgstr "_Сигнал"
-#: ../calendar/gui/dialogs/event-page.glade.h:23
-msgid "_Description:"
-msgstr "_Описание:"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:24
-#: ../calendar/gui/e-meeting-time-sel.c:642
-msgid "_End time:"
-msgstr "Коне_ц:"
+#: ../calendar/gui/dialogs/event-page.glade.h:17
+msgid "_Time:"
+msgstr "_Время:"
-#: ../calendar/gui/dialogs/event-page.glade.h:25
-#: ../calendar/gui/e-meeting-time-sel.c:615
-msgid "_Start time:"
-msgstr "Нача_ло:"
+#: ../calendar/gui/dialogs/event-page.glade.h:18
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
+msgid "for"
+msgstr "в"
-#: ../calendar/gui/dialogs/meeting-page.c:303
-msgid "<b>Dele_gatees</b>"
-msgstr "<b>_Доверенные лица</b> "
+#: ../calendar/gui/dialogs/event-page.glade.h:21
+#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
+msgid "until"
+msgstr "до"
#: ../calendar/gui/dialogs/meeting-page.c:307
-msgid "<b>From:</b>"
-msgstr "<b>От:</b>"
+msgid "Dele_gatees"
+msgstr "Пре_дставители"
-#. an empty string is the same as 'None'
-#. Put the "None" and "UTC" entries at the top of the combo's list.
-#. When "None" is selected we want the field to be cleared.
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
#: ../calendar/gui/dialogs/meeting-page.c:313
-#: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:653
-#: ../calendar/gui/e-itip-control.c:1106 ../composer/e-msg-composer.c:2122
-#: ../filter/filter-rule.c:881 ../mail/em-account-editor.c:683
-#: ../mail/em-account-editor.c:1348 ../mail/em-account-prefs.c:464
-#: ../mail/em-folder-view.c:1064 ../mail/em-junk-hook.c:78
-#: ../plugins/calendar-weather/calendar-weather.c:370
-#: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
-#: ../plugins/itip-formatter/itip-formatter.c:1627
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:190
-#: ../widgets/misc/e-cell-date-edit.c:248 ../widgets/misc/e-dateedit.c:465
-#: ../widgets/misc/e-dateedit.c:1504 ../widgets/misc/e-dateedit.c:1673
-msgid "None"
-msgstr "Нет"
-
-#: ../calendar/gui/dialogs/meeting-page.c:461
-msgid "The organizer selected no longer has an account."
-msgstr "Выбранный организатор больше не имеет учетной записи."
-
-#: ../calendar/gui/dialogs/meeting-page.c:467
-msgid "An organizer is required."
-msgstr "Требуется организатор."
-
-#: ../calendar/gui/dialogs/meeting-page.c:482
-msgid "At least one attendee is required."
-msgstr "Требуется как минимум один участник"
-
-#: ../calendar/gui/dialogs/meeting-page.c:884
-msgid "_Delegate To..."
-msgstr "_Поручить..."
+msgid "From:"
+msgstr "От кого:"
#: ../calendar/gui/dialogs/meeting-page.etspec.h:1
-#: ../calendar/gui/e-meeting-list-view.c:358
#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
msgid "Attendee"
msgstr "Участник"
@@ -6042,7 +6176,7 @@ msgstr "Участник"
#: ../calendar/gui/dialogs/meeting-page.etspec.h:2
#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
msgid "Click here to add an attendee"
-msgstr "* Щёлкните здесь, чтобы добавить контакт *"
+msgstr "Нажмите, чтобы добавить участника"
#: ../calendar/gui/dialogs/meeting-page.etspec.h:3
#: ../calendar/gui/e-meeting-time-sel.etspec.h:3
@@ -6069,16 +6203,16 @@ msgstr "Язык"
msgid "Member"
msgstr "Участник"
+#. To translators: RSVP means "please reply"
#: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:386
+#: ../calendar/gui/e-meeting-list-view.c:502
#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
msgid "RSVP"
-msgstr "Заинтересованное лицо"
+msgstr "Просьба ответить"
#: ../calendar/gui/dialogs/meeting-page.etspec.h:10
-#: ../calendar/gui/dialogs/task-editor.c:146
#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:394
+#: ../calendar/gui/e-meeting-list-view.c:513
#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
#: ../mail/message-list.etspec.h:12
msgid "Status"
@@ -6093,13 +6227,8 @@ msgid "C_hange Organizer"
msgstr "И_зменить организатора"
#: ../calendar/gui/dialogs/meeting-page.glade.h:3
-#: ../calendar/gui/e-meeting-time-sel.c:428
-msgid "Con_tacts..."
-msgstr "Кон_такты..."
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "Or_ganizer:"
-msgstr "Ор_ганизатор:"
+msgid "Co_ntacts..."
+msgstr "Ко_нтакты..."
#: ../calendar/gui/dialogs/meeting-page.glade.h:6
msgid "Organizer"
@@ -6110,6 +6239,25 @@ msgstr "Организатор"
msgid "Organizer:"
msgstr "Организатор:"
+#: ../calendar/gui/dialogs/memo-editor.c:229 ../calendar/gui/print.c:2313
+msgid "Memo"
+msgstr "Заметка"
+
+#: ../calendar/gui/dialogs/memo-page.c:551
+#, c-format
+msgid "Unable to open memos in '%s'."
+msgstr "Не удается открыть заметки в '%s'."
+
+#: ../calendar/gui/dialogs/memo-page.glade.h:3
+#: ../calendar/gui/dialogs/task-page.c:439
+#: ../calendar/gui/dialogs/task-page.glade.h:9
+msgid "_Group:"
+msgstr "_Группа:"
+
+#: ../calendar/gui/dialogs/memo-page.glade.h:4
+msgid "_Memo Content:"
+msgstr "Содержание _заметки:"
+
#: ../calendar/gui/dialogs/new-calendar.glade.h:2
msgid "<b>Calendar options</b>"
msgstr "<b>Параметры календаря</b>"
@@ -6147,22 +6295,20 @@ msgid "Task List Name"
msgstr "Имя списка задач"
#: ../calendar/gui/dialogs/recur-comp.c:52
-msgid "You are modifying a recurring event, what would you like to modify?"
-msgstr "Вы изменяете повторяющееся событие, что именно вы хотите изменить?"
+msgid "You are modifying a recurring event. What would you like to modify?"
+msgstr "Вы изменяете повторяющееся событие. Что именно вы хотите изменить?"
#: ../calendar/gui/dialogs/recur-comp.c:54
-msgid "You are delegating a recurring event, what would like to delegate?"
+msgid "You are delegating a recurring event. What would you like to delegate?"
msgstr "Вы поручаете повторяющееся событие, что именно вы хотите поручить?"
#: ../calendar/gui/dialogs/recur-comp.c:58
-msgid "You are modifying a recurring task, what would you like to modify?"
-msgstr "Вы изменяете повторяющуюся задачу, что именно вы хотите изменить?"
+msgid "You are modifying a recurring task. What would you like to modify?"
+msgstr "Вы изменяете повторяющуюся задачу. Что именно вы хотите изменить?"
#: ../calendar/gui/dialogs/recur-comp.c:62
-msgid ""
-"You are modifying a recurring journal entry, what would you like to modify?"
-msgstr ""
-"Вы изменяете повторяющуюся запись в журнале, что именно вы хотите изменить?"
+msgid "You are modifying a recurring journal entry. What would you like to modify?"
+msgstr "Вы изменяете повторяющуюся запись в журнале. Что именно вы хотите изменить?"
#: ../calendar/gui/dialogs/recur-comp.c:90
msgid "This Instance Only"
@@ -6180,55 +6326,51 @@ msgstr "Эту и последующие записи"
msgid "All Instances"
msgstr "Все записи"
-#: ../calendar/gui/dialogs/recurrence-page.c:496
+#: ../calendar/gui/dialogs/recurrence-page.c:499
msgid "This appointment contains recurrences that Evolution cannot edit."
msgstr "Эта встреча имеет правила повторения, не редактируемые в Evolution."
-#: ../calendar/gui/dialogs/recurrence-page.c:817
+#: ../calendar/gui/dialogs/recurrence-page.c:820
msgid "Recurrence date is invalid"
msgstr "Повторяющаяся дата некорректна"
-#: ../calendar/gui/dialogs/recurrence-page.c:928
+#: ../calendar/gui/dialogs/recurrence-page.c:931
msgid "on"
msgstr "в"
-#: ../calendar/gui/dialogs/recurrence-page.c:988
+#: ../calendar/gui/dialogs/recurrence-page.c:991
msgid "first"
msgstr "первый"
-#: ../calendar/gui/dialogs/recurrence-page.c:989
-msgid "second"
-msgstr "секунда"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:990
+#: ../calendar/gui/dialogs/recurrence-page.c:993
msgid "third"
msgstr "третий"
-#: ../calendar/gui/dialogs/recurrence-page.c:991
+#: ../calendar/gui/dialogs/recurrence-page.c:994
msgid "fourth"
msgstr "четвертый"
-#: ../calendar/gui/dialogs/recurrence-page.c:992
+#: ../calendar/gui/dialogs/recurrence-page.c:995
msgid "last"
msgstr "последний"
-#: ../calendar/gui/dialogs/recurrence-page.c:1015
+#: ../calendar/gui/dialogs/recurrence-page.c:1018
msgid "Other Date"
msgstr "Другая дата"
-#: ../calendar/gui/dialogs/recurrence-page.c:1043
+#: ../calendar/gui/dialogs/recurrence-page.c:1046
msgid "day"
msgstr "день"
-#: ../calendar/gui/dialogs/recurrence-page.c:1180
+#: ../calendar/gui/dialogs/recurrence-page.c:1183
msgid "on the"
msgstr " "
-#: ../calendar/gui/dialogs/recurrence-page.c:1369
+#: ../calendar/gui/dialogs/recurrence-page.c:1372
msgid "occurrences"
msgstr "случаи"
-#: ../calendar/gui/dialogs/recurrence-page.c:2325
+#: ../calendar/gui/dialogs/recurrence-page.c:2343
msgid "Date/Time"
msgstr "Дата/Время"
@@ -6253,10 +6395,6 @@ msgstr "Каждый"
msgid "This appointment rec_urs"
msgstr "Эта встреча повтор_яется"
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
-msgid "for"
-msgstr "в"
-
#: ../calendar/gui/dialogs/recurrence-page.glade.h:9
msgid "forever"
msgstr "всегда"
@@ -6265,10 +6403,6 @@ msgstr "всегда"
msgid "month(s)"
msgstr "месяцы"
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "until"
-msgstr "до"
-
#: ../calendar/gui/dialogs/recurrence-page.glade.h:12
msgid "week(s)"
msgstr "неделя"
@@ -6277,12 +6411,12 @@ msgstr "неделя"
msgid "year(s)"
msgstr "год(лет)"
-#: ../calendar/gui/dialogs/task-details-page.c:410
-#: ../calendar/gui/dialogs/task-details-page.c:430
+#: ../calendar/gui/dialogs/task-details-page.c:411
+#: ../calendar/gui/dialogs/task-details-page.c:431
msgid "Completed date is wrong"
msgstr "Дата выполнения некорректна"
-#: ../calendar/gui/dialogs/task-details-page.c:522
+#: ../calendar/gui/dialogs/task-details-page.c:523
msgid "Web Page"
msgstr "Веб-страница"
@@ -6297,48 +6431,48 @@ msgstr "<span weight=\"bold\">Состояние</span>"
#. Pass TRUE as is_utc, so it gets converted to the current
#. timezone.
#: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:229
-#: ../calendar/gui/e-cal-model-tasks.c:346
-#: ../calendar/gui/e-cal-model-tasks.c:659
-#: ../calendar/gui/e-calendar-table.c:455 ../calendar/gui/e-itip-control.c:898
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
-#: ../calendar/gui/print.c:2361 ../plugins/save-calendar/csv-format.c:390
+#: ../calendar/gui/e-cal-component-preview.c:231
+#: ../calendar/gui/e-cal-model-tasks.c:347
+#: ../calendar/gui/e-cal-model-tasks.c:660
+#: ../calendar/gui/e-calendar-table.c:463 ../calendar/gui/e-itip-control.c:897
+#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
+#: ../calendar/gui/print.c:2374 ../plugins/save-calendar/csv-format.c:390
msgid "Completed"
msgstr "Завершена"
#: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:248
-#: ../calendar/gui/e-calendar-table.c:380 ../mail/message-list.c:1018
+#: ../calendar/gui/e-cal-component-preview.c:250
+#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1016
msgid "High"
msgstr "Высокий"
#: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:226
-#: ../calendar/gui/e-cal-model-tasks.c:344
-#: ../calendar/gui/e-cal-model-tasks.c:657
-#: ../calendar/gui/e-cal-model-tasks.c:732
-#: ../calendar/gui/e-calendar-table.c:454 ../calendar/gui/print.c:2358
+#: ../calendar/gui/e-cal-component-preview.c:228
+#: ../calendar/gui/e-cal-model-tasks.c:345
+#: ../calendar/gui/e-cal-model-tasks.c:658
+#: ../calendar/gui/e-cal-model-tasks.c:733
+#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2371
msgid "In Progress"
msgstr "Выполняется"
#: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-calendar-table.c:382 ../mail/message-list.c:1016
+#: ../calendar/gui/e-cal-component-preview.c:254
+#: ../calendar/gui/e-calendar-table.c:390 ../mail/message-list.c:1014
msgid "Low"
msgstr "Низкий"
#: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model.c:919 ../calendar/gui/e-calendar-table.c:381
-#: ../mail/message-list.c:1017
+#: ../calendar/gui/e-cal-component-preview.c:252
+#: ../calendar/gui/e-cal-model.c:920 ../calendar/gui/e-calendar-table.c:389
+#: ../mail/message-list.c:1015
msgid "Normal"
msgstr "Нормальный"
#: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:236
-#: ../calendar/gui/e-cal-model-tasks.c:342
-#: ../calendar/gui/e-cal-model-tasks.c:655
-#: ../calendar/gui/e-calendar-table.c:453 ../calendar/gui/print.c:2355
+#: ../calendar/gui/e-cal-component-preview.c:238
+#: ../calendar/gui/e-cal-model-tasks.c:343
+#: ../calendar/gui/e-cal-model-tasks.c:656
+#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/print.c:2368
msgid "Not Started"
msgstr "Не началась"
@@ -6347,66 +6481,65 @@ msgid "P_ercent complete:"
msgstr "Выполн_ено (%):"
#: ../calendar/gui/dialogs/task-details-page.glade.h:11
-#: ../calendar/gui/e-calendar-table.c:383
+msgid "Stat_us:"
+msgstr "Сост_ояние:"
+
+#: ../calendar/gui/dialogs/task-details-page.glade.h:12
+#: ../calendar/gui/e-calendar-table.c:391
msgid "Undefined"
msgstr "Не определен"
-#: ../calendar/gui/dialogs/task-details-page.glade.h:12
+#: ../calendar/gui/dialogs/task-details-page.glade.h:13
msgid "_Date completed:"
msgstr "_Дата выполнения:"
-#: ../calendar/gui/dialogs/task-details-page.glade.h:13
+#: ../calendar/gui/dialogs/task-details-page.glade.h:14
#: ../widgets/misc/e-send-options.glade.h:31
msgid "_Priority:"
msgstr "_Приоритет:"
-#: ../calendar/gui/dialogs/task-details-page.glade.h:14
-msgid "_Status:"
-msgstr "Состояние:"
-
#: ../calendar/gui/dialogs/task-details-page.glade.h:15
msgid "_Web Page:"
msgstr "_Веб-страница:"
-#: ../calendar/gui/dialogs/task-editor.c:137 ../calendar/gui/print.c:2300
-msgid "Task"
-msgstr "Задание"
+#: ../calendar/gui/dialogs/task-editor.c:420
+#: ../calendar/gui/tasks-component.c:1174
+msgid "_Task"
+msgstr "_Задача"
-#: ../calendar/gui/dialogs/task-editor.c:161
-#: ../calendar/gui/dialogs/task-editor.c:223
-#: ../calendar/gui/dialogs/task-editor.c:380
-msgid "Assignment"
-msgstr "Назначение"
+#: ../calendar/gui/dialogs/task-editor.c:424
+msgid "Task Details"
+msgstr "Описание задачи"
-#: ../calendar/gui/dialogs/task-page.c:529
+#: ../calendar/gui/dialogs/task-page.c:824
msgid "Due date is wrong"
msgstr "Дата выполнения некорректна"
-#: ../calendar/gui/dialogs/task-page.c:873
+#: ../calendar/gui/dialogs/task-page.c:1659
#, c-format
msgid "Unable to open tasks in '%s'."
msgstr "Не удается открыть задачи в '%s'."
-#: ../calendar/gui/dialogs/task-page.glade.h:9
-msgid "D_escription:"
-msgstr "_Описание:"
+#: ../calendar/gui/dialogs/task-page.glade.h:2
+msgid "Categor_ies..."
+msgstr "Категор_ии..."
-#: ../calendar/gui/dialogs/task-page.glade.h:12
+#: ../calendar/gui/dialogs/task-page.glade.h:4
+msgid "Or_ganiser:"
+msgstr "Ор_ганизатор:"
+
+#: ../calendar/gui/dialogs/task-page.glade.h:5
msgid "Sta_rt date:"
msgstr "Да_та начала:"
-#: ../calendar/gui/dialogs/task-page.glade.h:14
-msgid "Task Description"
-msgstr "Описание задачи"
+#: ../calendar/gui/dialogs/task-page.glade.h:7
+msgid "Time zone:"
+msgstr "Часовой пояс:"
-#: ../calendar/gui/dialogs/task-page.glade.h:15
+#: ../calendar/gui/dialogs/task-page.glade.h:8
msgid "_Due date:"
msgstr "Дата _выполнения:"
-#: ../calendar/gui/dialogs/task-page.glade.h:16
-msgid "_Group:"
-msgstr "_Группа:"
-
#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
msgid "<b>Free/Busy C_alendars</b>"
msgstr "<b>К_алендари занятости</b>"
@@ -6432,14 +6565,17 @@ msgid "_Manual"
msgstr "_Вручную"
#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
+#: ../plugins/publish-calendar/publish-calendar.glade.h:22
msgid "_Password:"
msgstr "_Пароль:"
#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
+#: ../plugins/publish-calendar/publish-calendar.glade.h:25
msgid "_Remember password"
msgstr "_Запомнить пароль"
#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
+#: ../plugins/publish-calendar/publish-calendar.glade.h:27
msgid "_Username:"
msgstr "_Имя пользователя:"
@@ -6447,7 +6583,8 @@ msgstr "_Имя пользователя:"
msgid "_Weekly"
msgstr "Еже_недельно"
-#: ../calendar/gui/e-alarm-list.c:395
+#. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:396
#, c-format
msgid "%d day"
msgid_plural "%d days"
@@ -6455,7 +6592,8 @@ msgstr[0] "%d день"
msgstr[1] "%d дня"
msgstr[2] "%d дней"
-#: ../calendar/gui/e-alarm-list.c:400
+#. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:402
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
@@ -6463,7 +6601,8 @@ msgstr[0] "%d неделя"
msgstr[1] "%d недели"
msgstr[2] "%d недель"
-#: ../calendar/gui/e-alarm-list.c:405
+#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:408
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
@@ -6471,7 +6610,8 @@ msgstr[0] "%d час"
msgstr[1] "%d часа"
msgstr[2] "%d часов"
-#: ../calendar/gui/e-alarm-list.c:410
+#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:414
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
@@ -6479,7 +6619,8 @@ msgstr[0] "%d минута"
msgstr[1] "%d минуты"
msgstr[2] "%d минут"
-#: ../calendar/gui/e-alarm-list.c:415
+#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
+#: ../calendar/gui/e-alarm-list.c:420
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
@@ -6487,96 +6628,127 @@ msgstr[0] "%d секунда"
msgstr[1] "%d секунды"
msgstr[2] "%d секунд"
-#: ../calendar/gui/e-alarm-list.c:462
+#: ../calendar/gui/e-alarm-list.c:467
msgid "Unknown action to be performed"
msgstr "Неизвестное действие для выполнения"
#. Translator: The first %s refers to the base, which would be actions like
#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:476
+#: ../calendar/gui/e-alarm-list.c:481
#, c-format
msgid "%s %s before the start of the appointment"
msgstr "%s %s до начала встречи"
#. Translator: The first %s refers to the base, which would be actions like
#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../calendar/gui/e-alarm-list.c:481
+#: ../calendar/gui/e-alarm-list.c:486
#, c-format
msgid "%s %s after the start of the appointment"
msgstr "%s %s после начала встречи"
#. Translator: The %s refers to the base, which would be actions like
#. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:488
+#: ../calendar/gui/e-alarm-list.c:493
#, c-format
msgid "%s at the start of the appointment"
msgstr "%s в начале встречи"
-#: ../calendar/gui/e-alarm-list.c:497
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
+#: ../calendar/gui/e-alarm-list.c:504
#, c-format
msgid "%s %s before the end of the appointment"
msgstr "%s %s перед окончанием встречи"
-#: ../calendar/gui/e-alarm-list.c:500
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
+#: ../calendar/gui/e-alarm-list.c:509
#, c-format
msgid "%s %s after the end of the appointment"
msgstr "%s %s после окончания встречи"
-#: ../calendar/gui/e-alarm-list.c:505
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound"
+#: ../calendar/gui/e-alarm-list.c:516
#, c-format
msgid "%s at the end of the appointment"
msgstr "%s в конце встречи"
-#: ../calendar/gui/e-alarm-list.c:527
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
+#: ../calendar/gui/e-alarm-list.c:540
#, c-format
msgid "%s at %s"
msgstr "%s на %s"
-#: ../calendar/gui/e-alarm-list.c:533
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound". "Trigger types" are absolute or relative dates
+#: ../calendar/gui/e-alarm-list.c:548
#, c-format
msgid "%s for an unknown trigger type"
msgstr "%s для неизвестного типа переключателя"
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2703
+#: ../calendar/gui/e-cal-component-memo-preview.c:72
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2823
#, c-format
msgid "Click to open %s"
msgstr "Нажмите, чтобы открыть %s"
-#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:796
+#: ../calendar/gui/e-cal-component-memo-preview.c:201
+msgid "Memo:"
+msgstr "Заметка:"
+
+#: ../calendar/gui/e-cal-component-memo-preview.c:234
+#: ../calendar/gui/e-cal-component-preview.c:301
+msgid "Web Page:"
+msgstr "Веб-страница:"
+
+#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:804
msgid "Untitled"
msgstr "Неозаглавленное"
-#: ../calendar/gui/e-cal-component-preview.c:186
-#: ../calendar/gui/e-itip-control.c:1110
+#: ../calendar/gui/e-cal-component-preview.c:188
+#: ../calendar/gui/e-itip-control.c:1109
#: ../calendar/gui/e-itip-control.glade.h:11
msgid "Summary:"
msgstr "Сводка:"
-#: ../calendar/gui/e-cal-component-preview.c:193
-#: ../calendar/gui/e-cal-component-preview.c:204
+#: ../calendar/gui/e-cal-component-preview.c:195
+#: ../calendar/gui/e-cal-component-preview.c:206
msgid "Start Date:"
msgstr "Дата начала:"
-#: ../calendar/gui/e-cal-component-preview.c:215
+#: ../calendar/gui/e-cal-component-preview.c:217
msgid "Due Date:"
msgstr "Дата выполнения:"
#. write status
#. Status
-#: ../calendar/gui/e-cal-component-preview.c:222
-#: ../calendar/gui/e-itip-control.c:1134
-#: ../plugins/exchange-operations/exchange-account-setup.c:265
-#: ../plugins/itip-formatter/itip-view.c:909
+#: ../calendar/gui/e-cal-component-preview.c:224
+#: ../calendar/gui/e-itip-control.c:1133
+#: ../plugins/exchange-operations/exchange-account-setup.c:269
+#: ../plugins/itip-formatter/itip-view.c:905
msgid "Status:"
msgstr "Состояние:"
-#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-cal-component-preview.c:248
msgid "Priority:"
msgstr "Приоритет:"
-#: ../calendar/gui/e-cal-component-preview.c:299
-msgid "Web Page:"
-msgstr "Веб-страница:"
+#: ../calendar/gui/e-cal-list-view.c:255 ../calendar/gui/e-cal-model.c:314
+#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:366
+msgid "Public"
+msgstr "Общее"
+
+#: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
+#: ../calendar/gui/e-calendar-table.c:367
+msgid "Private"
+msgstr "Личное"
+
+#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
+#: ../calendar/gui/e-calendar-table.c:368
+msgid "Confidential"
+msgstr "Конфиденциальное"
#: ../calendar/gui/e-cal-list-view.etspec.h:2
msgid "End Date"
@@ -6588,22 +6760,23 @@ msgstr "Дата начала"
#: ../calendar/gui/e-cal-list-view.etspec.h:5
#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../mail/mail-dialogs.glade.h:16 ../plugins/save-calendar/csv-format.c:386
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:16
+#: ../plugins/save-calendar/csv-format.c:386
msgid "Summary"
msgstr "Сводка"
-#: ../calendar/gui/e-cal-model-calendar.c:180
-#: ../calendar/gui/e-calendar-table.c:432
+#: ../calendar/gui/e-cal-model-calendar.c:183
+#: ../calendar/gui/e-calendar-table.c:440
msgid "Free"
msgstr "Свободен"
-#: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:433
-#: ../calendar/gui/e-meeting-time-sel.c:412
+#: ../calendar/gui/e-cal-model-calendar.c:186
+#: ../calendar/gui/e-calendar-table.c:441
+#: ../calendar/gui/e-meeting-time-sel.c:415
msgid "Busy"
msgstr "Занят"
-#: ../calendar/gui/e-cal-model-tasks.c:607
+#: ../calendar/gui/e-cal-model-tasks.c:608
msgid ""
"The geographical position must be entered in the format: \n"
"\n"
@@ -6613,180 +6786,206 @@ msgstr ""
"\n"
"45.436845,125.862501"
-#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model-tasks.c:1019 ../calendar/gui/e-cal-model.c:926
#: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:168 ../calendar/gui/e-meeting-store.c:178
-#: ../calendar/gui/e-meeting-store.c:808
+#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
+#: ../calendar/gui/e-meeting-store.c:809
#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
msgid "Yes"
msgstr "Да"
-#: ../calendar/gui/e-cal-model-tasks.c:1018 ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model-tasks.c:1019 ../calendar/gui/e-cal-model.c:926
#: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:180
+#: ../calendar/gui/e-meeting-store.c:181
#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
msgid "No"
msgstr "Нет"
#. This is the default filename used for temporary file creation
#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-model.c:330
-#: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.c:1292
+#: ../calendar/gui/e-cal-popup.c:107 ../calendar/gui/e-cal-popup.c:122
+#: ../calendar/gui/e-cal-popup.c:166 ../calendar/gui/e-itip-control.c:1150
+#: ../calendar/gui/e-itip-control.c:1291
#: ../calendar/gui/e-meeting-list-view.c:168
#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:224 ../mail/em-utils.c:1244
+#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:160
+#: ../calendar/gui/e-meeting-store.c:225 ../mail/em-utils.c:1312
#: ../plugins/itip-formatter/itip-formatter.c:240
-#: ../plugins/itip-formatter/itip-formatter.c:1652
-#: ../plugins/plugin-manager/plugin-manager.c:72
-#: ../widgets/misc/e-attachment-bar.c:659
+#: ../plugins/itip-formatter/itip-formatter.c:1651
+#: ../plugins/plugin-manager/plugin-manager.c:68
+#: ../widgets/misc/e-attachment-bar.c:686
#: ../widgets/misc/e-charset-picker.c:62
msgid "Unknown"
msgstr "Неизвестно"
-#: ../calendar/gui/e-cal-model.c:921
+#: ../calendar/gui/e-cal-model.c:922
msgid "Recurring"
msgstr "Повторение"
-#: ../calendar/gui/e-cal-model.c:923
+#: ../calendar/gui/e-cal-model.c:924
msgid "Assigned"
msgstr "Назначено"
-#: ../calendar/gui/e-calendar-table.c:402
+#: ../calendar/gui/e-cal-popup.c:172 ../mail/em-popup.c:412
+msgid "Save As..."
+msgstr "Сохранить как..."
+
+#: ../calendar/gui/e-cal-popup.c:188 ../mail/em-format-html-display.c:1909
+msgid "Select folder to save selected attachments..."
+msgstr "Выберите папку для сохранения выделенных вложений..."
+
+#: ../calendar/gui/e-cal-popup.c:217 ../mail/em-popup.c:437
+#, c-format
+msgid "untitled_image.%s"
+msgstr "untitled_image.%s"
+
+#: ../calendar/gui/e-cal-popup.c:271 ../calendar/gui/e-calendar-table.c:1178
+#: ../calendar/gui/e-calendar-view.c:1607 ../calendar/gui/e-memo-table.c:856
+#: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
+msgid "_Save As..."
+msgstr "Со_хранить как..."
+
+#: ../calendar/gui/e-cal-popup.c:272 ../mail/em-popup.c:555
+#: ../mail/em-popup.c:566
+msgid "Set as _Background"
+msgstr "Установить как _фон"
+
+#: ../calendar/gui/e-cal-popup.c:273
+msgid "_Save Selected"
+msgstr "_Сохранить выделенное"
+
+#: ../calendar/gui/e-cal-popup.c:395 ../mail/em-popup.c:775
+#, c-format
+msgid "Open in %s..."
+msgstr "Открыть в программе %s..."
+
+#: ../calendar/gui/e-calendar-table.c:410
msgid "0%"
msgstr "0%"
-#: ../calendar/gui/e-calendar-table.c:403
+#: ../calendar/gui/e-calendar-table.c:411
msgid "10%"
msgstr "10%"
-#: ../calendar/gui/e-calendar-table.c:404
+#: ../calendar/gui/e-calendar-table.c:412
msgid "20%"
msgstr "20%"
-#: ../calendar/gui/e-calendar-table.c:405
+#: ../calendar/gui/e-calendar-table.c:413
msgid "30%"
msgstr "30%"
-#: ../calendar/gui/e-calendar-table.c:406
+#: ../calendar/gui/e-calendar-table.c:414
msgid "40%"
msgstr "40%"
-#: ../calendar/gui/e-calendar-table.c:407
+#: ../calendar/gui/e-calendar-table.c:415
msgid "50%"
msgstr "50%"
-#: ../calendar/gui/e-calendar-table.c:408
+#: ../calendar/gui/e-calendar-table.c:416
msgid "60%"
msgstr "60%"
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:417
msgid "70%"
msgstr "70%"
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:418
msgid "80%"
msgstr "80%"
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:419
msgid "90%"
msgstr "90%"
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:420
msgid "100%"
msgstr "100%"
-#: ../calendar/gui/e-calendar-table.c:514
+#: ../calendar/gui/e-calendar-table.c:527
msgid "Task Table"
msgstr "Таблица задач"
-#: ../calendar/gui/e-calendar-table.c:692
-#: ../calendar/gui/e-calendar-view.c:661
+#: ../calendar/gui/e-calendar-table.c:705
+#: ../calendar/gui/e-calendar-view.c:678 ../calendar/gui/e-memo-table.c:435
msgid "Deleting selected objects"
msgstr "Удаление выделенных объектов"
-#: ../calendar/gui/e-calendar-table.c:871
-#: ../calendar/gui/e-calendar-view.c:789
+#: ../calendar/gui/e-calendar-table.c:884
+#: ../calendar/gui/e-calendar-view.c:806 ../calendar/gui/e-memo-table.c:612
msgid "Updating objects"
msgstr "Обновление объектов"
-#: ../calendar/gui/e-calendar-table.c:1021
-#: ../calendar/gui/e-calendar-view.c:1105 ../composer/e-msg-composer.c:1243
+#: ../calendar/gui/e-calendar-table.c:1034
+#: ../calendar/gui/e-calendar-view.c:1141 ../calendar/gui/e-memo-table.c:744
+#: ../composer/e-msg-composer.c:1349
msgid "Save as..."
msgstr "Сохранить как..."
-#: ../calendar/gui/e-calendar-table.c:1164
+#: ../calendar/gui/e-calendar-table.c:1177 ../calendar/gui/e-memo-table.c:855
msgid "Open _Web Page"
msgstr "Открыть _веб-страницу"
-#: ../calendar/gui/e-calendar-table.c:1165
-#: ../calendar/gui/e-calendar-view.c:1529 ../mail/em-folder-view.c:1045
-#: ../mail/em-popup.c:541 ../mail/em-popup.c:552
-msgid "_Save As..."
-msgstr "Со_хранить как..."
-
-#: ../calendar/gui/e-calendar-table.c:1166
-#: ../calendar/gui/e-calendar-view.c:1509
-#: ../calendar/gui/e-calendar-view.c:1530 ../mail/em-folder-view.c:1046
+#: ../calendar/gui/e-calendar-table.c:1179
+#: ../calendar/gui/e-calendar-view.c:1592
+#: ../calendar/gui/e-calendar-view.c:1608 ../calendar/gui/e-memo-table.c:857
+#: ../mail/em-folder-view.c:1088
#: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:40 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:119 ../ui/evolution-tasks.xml.h:27
+#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:42
+#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-tasks.xml.h:29
msgid "_Print..."
msgstr "_Печать..."
-#: ../calendar/gui/e-calendar-table.c:1170
-#: ../calendar/gui/e-calendar-view.c:1534 ../ui/evolution-addressbook.xml.h:1
-#: ../ui/evolution-calendar.xml.h:1 ../ui/evolution-tasks.xml.h:1
+#: ../calendar/gui/e-calendar-table.c:1183
+#: ../calendar/gui/e-calendar-view.c:1612 ../calendar/gui/e-memo-table.c:861
+#: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
+#: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
msgid "C_ut"
msgstr "_Вырезать"
-#: ../calendar/gui/e-calendar-table.c:1172
-#: ../calendar/gui/e-calendar-view.c:1512
-#: ../calendar/gui/e-calendar-view.c:1536 ../ui/evolution-addressbook.xml.h:38
-#: ../ui/evolution-calendar.xml.h:43 ../ui/evolution-composer-entries.xml.h:9
-#: ../ui/evolution-tasks.xml.h:26
+#: ../calendar/gui/e-calendar-table.c:1185
+#: ../calendar/gui/e-calendar-view.c:1595
+#: ../calendar/gui/e-calendar-view.c:1614 ../calendar/gui/e-memo-table.c:863
+#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:41
+#: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
+#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
msgid "_Paste"
msgstr "Вст_авить"
-#: ../calendar/gui/e-calendar-table.c:1176 ../ui/evolution-tasks.xml.h:20
+#: ../calendar/gui/e-calendar-table.c:1189 ../ui/evolution-tasks.xml.h:22
msgid "_Assign Task"
msgstr "_Назначить задачу"
-#: ../calendar/gui/e-calendar-table.c:1177 ../ui/evolution-tasks.xml.h:24
+#: ../calendar/gui/e-calendar-table.c:1190 ../calendar/gui/e-memo-table.c:867
+#: ../ui/evolution-tasks.xml.h:26
msgid "_Forward as iCalendar"
msgstr "_Переслать как iCalendar"
-#: ../calendar/gui/e-calendar-table.c:1178
+#: ../calendar/gui/e-calendar-table.c:1191
msgid "_Mark as Complete"
msgstr "По_метить как выполненное"
-#: ../calendar/gui/e-calendar-table.c:1179
+#: ../calendar/gui/e-calendar-table.c:1192
msgid "_Mark Selected Tasks as Complete"
msgstr "По_метить выбранную задачу как выполненную"
-#. FIXME: need to disable for undeletable folders
-#: ../calendar/gui/e-calendar-table.c:1183
-#: ../calendar/gui/e-calendar-view.c:1548 ../mail/em-folder-tree.c:2054
-#: ../mail/em-folder-view.c:1049 ../ui/evolution-addressbook.xml.h:33
-#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:27
-#: ../ui/evolution-tasks.xml.h:22
-msgid "_Delete"
-msgstr "_Удалить"
-
-#: ../calendar/gui/e-calendar-table.c:1184
+#: ../calendar/gui/e-calendar-table.c:1197
msgid "_Delete Selected Tasks"
msgstr "У_далить выделенные задачи"
-#: ../calendar/gui/e-calendar-table.c:1335
+#: ../calendar/gui/e-calendar-table.c:1430
#: ../calendar/gui/e-calendar-table.etspec.h:4
msgid "Click to add a task"
-msgstr "Щёлкните здесь, чтобы добавить задачу"
+msgstr "Нажмите, чтобы добавить задачу"
#: ../calendar/gui/e-calendar-table.etspec.h:2
#, no-c-format
msgid "% Complete"
msgstr "% Завершено"
-#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:617
+#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:627
msgid "Complete"
msgstr "Завершена"
@@ -6811,97 +7010,120 @@ msgstr "Дата начала"
msgid "Task sort"
msgstr "Сортировка задач"
-#: ../calendar/gui/e-calendar-view.c:1231
+#: ../calendar/gui/e-calendar-view.c:1267
msgid "Moving items"
msgstr "Перемещение элементов"
-#: ../calendar/gui/e-calendar-view.c:1233
+#: ../calendar/gui/e-calendar-view.c:1269
msgid "Copying items"
msgstr "Копирование элементов"
-#: ../calendar/gui/e-calendar-view.c:1503
+#: ../calendar/gui/e-calendar-view.c:1586
msgid "New _Appointment..."
msgstr "Новая _встреча..."
-#: ../calendar/gui/e-calendar-view.c:1504
+#: ../calendar/gui/e-calendar-view.c:1587
msgid "New All Day _Event"
msgstr "Новое ежедневное событие"
-#: ../calendar/gui/e-calendar-view.c:1506
-msgid "New Task"
-msgstr "Новая задача"
+#: ../calendar/gui/e-calendar-view.c:1588
+msgid "New _Meeting"
+msgstr "Новое _собрание"
+
+#: ../calendar/gui/e-calendar-view.c:1589
+msgid "New _Task"
+msgstr "Новая _задача"
#. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1516
-msgid "Current View"
-msgstr "Текущий вид"
+#: ../calendar/gui/e-calendar-view.c:1599
+msgid "_Current View"
+msgstr "_Текущий вид"
-#: ../calendar/gui/e-calendar-view.c:1518 ../ui/evolution-calendar.xml.h:26
-msgid "Select _Today"
+#: ../calendar/gui/e-calendar-view.c:1601
+msgid "Select T_oday"
msgstr "Выделить _сегодняшний день"
-#: ../calendar/gui/e-calendar-view.c:1519
+#: ../calendar/gui/e-calendar-view.c:1602
msgid "_Select Date..."
-msgstr "_Выделить дату..."
-
-#. TODO: Why is this in a context menu when it applies globally?
-#: ../calendar/gui/e-calendar-view.c:1524 ../ui/evolution-calendar.xml.h:45
-msgid "_Publish Free/Busy Information"
-msgstr "Опубликовать информацию о занятости"
+msgstr "Выделить _дату..."
-#: ../calendar/gui/e-calendar-view.c:1540
+#: ../calendar/gui/e-calendar-view.c:1618
msgid "Cop_y to Calendar..."
msgstr "Коп_ировать в календарь..."
-#: ../calendar/gui/e-calendar-view.c:1541
+#: ../calendar/gui/e-calendar-view.c:1619
msgid "Mo_ve to Calendar..."
-msgstr "Пере_местить в Календарь..."
+msgstr "Пере_местить в календарь..."
-#: ../calendar/gui/e-calendar-view.c:1542
+#: ../calendar/gui/e-calendar-view.c:1620
msgid "_Delegate Meeting..."
msgstr "_Поручить собрание..."
-#: ../calendar/gui/e-calendar-view.c:1543
+#: ../calendar/gui/e-calendar-view.c:1621
msgid "_Schedule Meeting..."
msgstr "_Назначить собрание..."
-#: ../calendar/gui/e-calendar-view.c:1544
+#: ../calendar/gui/e-calendar-view.c:1622
msgid "_Forward as iCalendar..."
msgstr "_Переслать как iCalendar..."
-#: ../calendar/gui/e-calendar-view.c:1549
+#: ../calendar/gui/e-calendar-view.c:1623
+msgid "_Reply"
+msgstr "_Ответить"
+
+#: ../calendar/gui/e-calendar-view.c:1624 ../mail/em-folder-view.c:1082
+#: ../mail/em-popup.c:559 ../mail/em-popup.c:570
+#: ../ui/evolution-mail-message.xml.h:82
+msgid "Reply to _All"
+msgstr "Ответить _всем"
+
+#: ../calendar/gui/e-calendar-view.c:1629
msgid "Make this Occurrence _Movable"
msgstr "Сделать это вхождение пере_мещаемым"
-#: ../calendar/gui/e-calendar-view.c:1550
+#: ../calendar/gui/e-calendar-view.c:1630
msgid "Delete this _Occurrence"
msgstr "Удалить это вхождение"
-#: ../calendar/gui/e-calendar-view.c:1551
+#: ../calendar/gui/e-calendar-view.c:1631
msgid "Delete _All Occurrences"
msgstr "Удалить все вхождения"
+#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-view.c:2045
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "Организатор: %s <%s>"
+
+#. With SunOne accouts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-view.c:2049
+#, c-format
+msgid "Organizer: %s"
+msgstr "Организатор: %s"
+
+#. To Translators: It will display "Location: PlaceOfTheMeeting"
+#: ../calendar/gui/e-calendar-view.c:2064 ../calendar/gui/print.c:2341
+#, c-format
+msgid "Location: %s"
+msgstr "Адрес: %s"
+
+#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
+#: ../calendar/gui/e-calendar-view.c:2095
+#, c-format
+msgid "Time: %s %s"
+msgstr "Время: %s %s"
+
#. strftime format of a weekday, a date and a time, 24-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
-#: ../calendar/gui/e-cell-date-edit-text.c:115 ../e-util/e-time-utils.c:180
-#: ../e-util/e-time-utils.c:393
+#: ../calendar/gui/e-cell-date-edit-text.c:116
msgid "%a %m/%d/%Y %H:%M:%S"
msgstr "%a, %d.%m.%Y %H:%M:%S"
#. strftime format of a weekday, a date and a time, 12-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
-#: ../calendar/gui/e-cell-date-edit-text.c:118 ../e-util/e-time-utils.c:175
-#: ../e-util/e-time-utils.c:402
+#: ../calendar/gui/e-cell-date-edit-text.c:119
msgid "%a %m/%d/%Y %I:%M:%S %p"
msgstr "%a, %d.%m.%Y %I:%M:%S %p"
-#: ../calendar/gui/e-cell-date-edit-text.c:123
+#: ../calendar/gui/e-cell-date-edit-text.c:124
#, c-format
msgid ""
"The date must be entered in the format: \n"
@@ -6912,7 +7134,11 @@ msgstr ""
"\n"
"%s"
-#: ../calendar/gui/e-day-view-time-item.c:553
+#. TO TRANSLATORS: %02i is the number of minutes; this is a context menu entry
+#. * to change the length of the time division in the calendar day view, e.g.
+#. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
+#.
+#: ../calendar/gui/e-day-view-time-item.c:557
#, c-format
msgid "%02i minute divisions"
msgstr "Деления через %02i минут"
@@ -6924,27 +7150,27 @@ msgstr "Деления через %02i минут"
#. order but don't change the specifiers or add
#. anything.
#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1493
-#: ../calendar/gui/e-week-view-main-item.c:312 ../calendar/gui/print.c:1517
+#: ../calendar/gui/e-week-view-main-item.c:313 ../calendar/gui/print.c:1528
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:748 ../calendar/gui/e-week-view.c:512
-#: ../calendar/gui/print.c:841
+#: ../calendar/gui/print.c:843
msgid "am"
msgstr "am"
#. String to use in 12-hour time format for times in the afternoon.
#: ../calendar/gui/e-day-view.c:751 ../calendar/gui/e-week-view.c:515
-#: ../calendar/gui/print.c:843
+#: ../calendar/gui/print.c:845
msgid "pm"
msgstr "pm"
-#: ../calendar/gui/e-itip-control.c:763
+#: ../calendar/gui/e-itip-control.c:762
msgid "Yes. (Complex Recurrence)"
msgstr "Да. (Сложное повторение)"
-#: ../calendar/gui/e-itip-control.c:774
+#: ../calendar/gui/e-itip-control.c:773
#, c-format
msgid "Every day"
msgid_plural "Every %d days"
@@ -6952,7 +7178,7 @@ msgstr[0] "Каждый %d день"
msgstr[1] "Каждые %d дня"
msgstr[2] "Каждые %d дней"
-#: ../calendar/gui/e-itip-control.c:779
+#: ../calendar/gui/e-itip-control.c:778
#, c-format
msgid "Every week"
msgid_plural "Every %d weeks"
@@ -6960,7 +7186,7 @@ msgstr[0] "Каждую %d неделю"
msgstr[1] "Каждые %d недели"
msgstr[2] "Каждые %d недель"
-#: ../calendar/gui/e-itip-control.c:781
+#: ../calendar/gui/e-itip-control.c:780
#, c-format
msgid "Every week on "
msgid_plural "Every %d weeks on "
@@ -6968,21 +7194,21 @@ msgstr[0] "Каждую %d неделю в "
msgstr[1] "Каждые %d недели в "
msgstr[2] "Каждые %d недель в "
-#: ../calendar/gui/e-itip-control.c:789
+#: ../calendar/gui/e-itip-control.c:788
msgid " and "
msgstr " и "
-#: ../calendar/gui/e-itip-control.c:796
+#: ../calendar/gui/e-itip-control.c:795
#, c-format
msgid "The %s day of "
msgstr "%s дней "
-#: ../calendar/gui/e-itip-control.c:809
+#: ../calendar/gui/e-itip-control.c:808
#, c-format
msgid "The %s %s of "
msgstr "%s %s "
-#: ../calendar/gui/e-itip-control.c:816
+#: ../calendar/gui/e-itip-control.c:815
#, c-format
msgid "every month"
msgid_plural "every %d months"
@@ -6990,7 +7216,7 @@ msgstr[0] "каждый %d месяц"
msgstr[1] "каждые %d месяца"
msgstr[2] "каждые %d месяцев"
-#: ../calendar/gui/e-itip-control.c:820
+#: ../calendar/gui/e-itip-control.c:819
#, c-format
msgid "Every year"
msgid_plural "Every %d years"
@@ -6998,7 +7224,7 @@ msgstr[0] "Каждый %d год"
msgstr[1] "Каждые %d года"
msgstr[2] "Каждые %d лет"
-#: ../calendar/gui/e-itip-control.c:831
+#: ../calendar/gui/e-itip-control.c:830
#, c-format
msgid "a total of %d time"
msgid_plural " a total of %d times"
@@ -7006,34 +7232,34 @@ msgstr[0] " всего %d раз"
msgstr[1] " всего %d раза"
msgstr[2] " всего %d раз"
-#: ../calendar/gui/e-itip-control.c:840
+#: ../calendar/gui/e-itip-control.c:839
msgid ", ending on "
msgstr ", заканчивается на"
-#: ../calendar/gui/e-itip-control.c:864
+#: ../calendar/gui/e-itip-control.c:863
msgid "Starts"
msgstr "Начинается"
-#: ../calendar/gui/e-itip-control.c:877
+#: ../calendar/gui/e-itip-control.c:876
msgid "Ends"
msgstr "Заканчивается"
-#: ../calendar/gui/e-itip-control.c:911
+#: ../calendar/gui/e-itip-control.c:910
#: ../plugins/save-calendar/csv-format.c:395
msgid "Due"
msgstr "Срок завершения"
-#: ../calendar/gui/e-itip-control.c:951 ../calendar/gui/e-itip-control.c:1008
+#: ../calendar/gui/e-itip-control.c:950 ../calendar/gui/e-itip-control.c:1007
msgid "iCalendar Information"
msgstr "Сведения iCalendar"
#. Title
-#: ../calendar/gui/e-itip-control.c:968
+#: ../calendar/gui/e-itip-control.c:967
msgid "iCalendar Error"
msgstr "Ошибка iCalendar"
-#: ../calendar/gui/e-itip-control.c:1040 ../calendar/gui/e-itip-control.c:1056
-#: ../calendar/gui/e-itip-control.c:1067 ../calendar/gui/e-itip-control.c:1084
+#: ../calendar/gui/e-itip-control.c:1039 ../calendar/gui/e-itip-control.c:1055
+#: ../calendar/gui/e-itip-control.c:1066 ../calendar/gui/e-itip-control.c:1083
#: ../plugins/itip-formatter/itip-view.c:338
#: ../plugins/itip-formatter/itip-view.c:339
#: ../plugins/itip-formatter/itip-view.c:406
@@ -7042,7 +7268,7 @@ msgid "An unknown person"
msgstr "Неизвестное лицо"
#. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1091
+#: ../calendar/gui/e-itip-control.c:1090
msgid ""
"<br> Please review the following information, and then select an action from "
"the menu below."
@@ -7050,263 +7276,258 @@ msgstr ""
"<b> Пересмотрите следующую информацию и выберите действие из расположенного "
"ниже меню."
-#: ../calendar/gui/e-itip-control.c:1139
+#: ../calendar/gui/e-itip-control.c:1138
#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../calendar/gui/itip-utils.c:548
-#: ../plugins/itip-formatter/itip-formatter.c:1640
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/itip-utils.c:669
+#: ../plugins/itip-formatter/itip-formatter.c:1639
msgid "Accepted"
msgstr "Принято"
-#: ../calendar/gui/e-itip-control.c:1143 ../calendar/gui/itip-utils.c:551
-#: ../plugins/itip-formatter/itip-formatter.c:1643
+#: ../calendar/gui/e-itip-control.c:1142 ../calendar/gui/itip-utils.c:672
+#: ../plugins/itip-formatter/itip-formatter.c:1642
msgid "Tentatively Accepted"
msgstr "Экспериментально принятый"
-#: ../calendar/gui/e-itip-control.c:1147
+#: ../calendar/gui/e-itip-control.c:1146
#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/itip-utils.c:554 ../calendar/gui/itip-utils.c:583
-#: ../plugins/itip-formatter/itip-formatter.c:1646
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
+#: ../plugins/itip-formatter/itip-formatter.c:1645
msgid "Declined"
msgstr "Отклонено"
-#: ../calendar/gui/e-itip-control.c:1231
+#: ../calendar/gui/e-itip-control.c:1230
msgid ""
-"The meeting has been cancelled, however it could not be found in your "
+"The meeting has been canceled, however it could not be found in your "
"calendars"
-msgstr ""
-"Собрание было отменено, но оно не может быть найдено в ваших календарях"
+msgstr "Собрание было отменено, но оно не может быть найдено в ваших календарях"
-#: ../calendar/gui/e-itip-control.c:1233
-msgid ""
-"The task has been cancelled, however it could not be found in your task lists"
-msgstr ""
-"Задача была отменена, но она не может быть найдена в ваших списках задач"
+#: ../calendar/gui/e-itip-control.c:1232
+msgid "The task has been canceled, however it could not be found in your task lists"
+msgstr "Задача была отменена, но она не может быть найдена в ваших списках задач"
-#: ../calendar/gui/e-itip-control.c:1312
+#: ../calendar/gui/e-itip-control.c:1311
#, c-format
msgid "<b>%s</b> has published meeting information."
msgstr "<b>%s</b> опубликовал последнюю информацию о собрании."
-#: ../calendar/gui/e-itip-control.c:1313
+#: ../calendar/gui/e-itip-control.c:1312
msgid "Meeting Information"
msgstr "Информация о собрании"
-#: ../calendar/gui/e-itip-control.c:1319
+#: ../calendar/gui/e-itip-control.c:1318
#, 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:1321
+#: ../calendar/gui/e-itip-control.c:1320
#, c-format
msgid "<b>%s</b> requests your presence at a meeting."
msgstr "<b>%s</b> запрашивает ваше присутствие на собрании."
-#: ../calendar/gui/e-itip-control.c:1322
+#: ../calendar/gui/e-itip-control.c:1321
msgid "Meeting Proposal"
msgstr "Предложение собрания"
#. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1328
+#: ../calendar/gui/e-itip-control.c:1327
#, c-format
msgid "<b>%s</b> wishes to add to an existing meeting."
msgstr "<b>%s</b> желает добавить к существующему собранию."
-#: ../calendar/gui/e-itip-control.c:1329
+#: ../calendar/gui/e-itip-control.c:1328
msgid "Meeting Update"
msgstr "Обновление собрания"
-#: ../calendar/gui/e-itip-control.c:1333
+#: ../calendar/gui/e-itip-control.c:1332
#, c-format
msgid "<b>%s</b> wishes to receive the latest meeting information."
msgstr "<b>%s</b> желает получить последнюю информацию о собрании."
-#: ../calendar/gui/e-itip-control.c:1334
+#: ../calendar/gui/e-itip-control.c:1333
msgid "Meeting Update Request"
msgstr "Запрос обновления собрания"
-#: ../calendar/gui/e-itip-control.c:1341
+#: ../calendar/gui/e-itip-control.c:1340
#, c-format
msgid "<b>%s</b> has replied to a meeting request."
msgstr "<b>%s</b> ответил на приглашение на собрание."
-#: ../calendar/gui/e-itip-control.c:1342
+#: ../calendar/gui/e-itip-control.c:1341
msgid "Meeting Reply"
msgstr "Ответ собрания"
-#: ../calendar/gui/e-itip-control.c:1349
+#: ../calendar/gui/e-itip-control.c:1348
#, c-format
-msgid "<b>%s</b> has cancelled a meeting."
+msgid "<b>%s</b> has canceled a meeting."
msgstr "<b>%s</b> отменил собрание."
-#: ../calendar/gui/e-itip-control.c:1350
-msgid "Meeting Cancellation"
+#: ../calendar/gui/e-itip-control.c:1349
+msgid "Meeting Cancelation"
msgstr "Отмена собрания"
-#: ../calendar/gui/e-itip-control.c:1360 ../calendar/gui/e-itip-control.c:1437
-#: ../calendar/gui/e-itip-control.c:1477
+#: ../calendar/gui/e-itip-control.c:1359 ../calendar/gui/e-itip-control.c:1436
+#: ../calendar/gui/e-itip-control.c:1476
#, c-format
msgid "<b>%s</b> has sent an unintelligible message."
msgstr "<b>%s</b> отправил невразумительное сообщение."
-#: ../calendar/gui/e-itip-control.c:1361
+#: ../calendar/gui/e-itip-control.c:1360
msgid "Bad Meeting Message"
msgstr "Неверное сообщение собрания"
-#: ../calendar/gui/e-itip-control.c:1388
+#: ../calendar/gui/e-itip-control.c:1387
#, c-format
msgid "<b>%s</b> has published task information."
msgstr "<b>%s</b> опубликовал информацию о задаче"
-#: ../calendar/gui/e-itip-control.c:1389
+#: ../calendar/gui/e-itip-control.c:1388
msgid "Task Information"
msgstr "Информация о задаче"
-#: ../calendar/gui/e-itip-control.c:1396
+#: ../calendar/gui/e-itip-control.c:1395
#, c-format
msgid "<b>%s</b> requests %s to perform a task."
msgstr "<b>%s</b> запрашивает %s для выполнения задачи."
-#: ../calendar/gui/e-itip-control.c:1398
+#: ../calendar/gui/e-itip-control.c:1397
#, c-format
msgid "<b>%s</b> requests you perform a task."
msgstr "<b>%s</b> запрашивает, чтобы вы выполнили задачу."
-#: ../calendar/gui/e-itip-control.c:1399
+#: ../calendar/gui/e-itip-control.c:1398
msgid "Task Proposal"
msgstr "Предложение задачи"
#. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1405
+#: ../calendar/gui/e-itip-control.c:1404
#, c-format
msgid "<b>%s</b> wishes to add to an existing task."
msgstr "<b>%s</b> желает добавить к существующей задаче."
-#: ../calendar/gui/e-itip-control.c:1406
+#: ../calendar/gui/e-itip-control.c:1405
msgid "Task Update"
msgstr "Обновление задачи"
-#: ../calendar/gui/e-itip-control.c:1410
+#: ../calendar/gui/e-itip-control.c:1409
#, c-format
msgid "<b>%s</b> wishes to receive the latest task information."
msgstr "<b>%s</b> желает получить последнюю информацию о задаче."
-#: ../calendar/gui/e-itip-control.c:1411
+#: ../calendar/gui/e-itip-control.c:1410
msgid "Task Update Request"
msgstr "Запрос обновления задачи"
-#: ../calendar/gui/e-itip-control.c:1418
+#: ../calendar/gui/e-itip-control.c:1417
#, c-format
msgid "<b>%s</b> has replied to a task assignment."
msgstr "<b>%s</b> ответил на назначение задачи."
-#: ../calendar/gui/e-itip-control.c:1419
+#: ../calendar/gui/e-itip-control.c:1418
msgid "Task Reply"
msgstr "Ответ собрания"
-#: ../calendar/gui/e-itip-control.c:1426
+#: ../calendar/gui/e-itip-control.c:1425
#, c-format
-msgid "<b>%s</b> has cancelled a task."
-msgstr "<b>%s</b> отменил задачу."
+msgid "<b>%s</b> has canceled a task."
+msgstr "<b>%s</b> отменил собрание."
-#: ../calendar/gui/e-itip-control.c:1427
-msgid "Task Cancellation"
-msgstr "Отмена задачи"
+#: ../calendar/gui/e-itip-control.c:1426
+msgid "Task Cancelation"
+msgstr "Отмена собрания"
-#: ../calendar/gui/e-itip-control.c:1438
+#: ../calendar/gui/e-itip-control.c:1437
msgid "Bad Task Message"
msgstr "Сообщение календаря"
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1461
#, c-format
msgid "<b>%s</b> has published free/busy information."
msgstr "<b>%s</b> опубликовал информацию о занятости."
-#: ../calendar/gui/e-itip-control.c:1463
+#: ../calendar/gui/e-itip-control.c:1462
msgid "Free/Busy Information"
msgstr "Информация о занятости"
-#: ../calendar/gui/e-itip-control.c:1467
+#: ../calendar/gui/e-itip-control.c:1466
#, c-format
msgid "<b>%s</b> requests your free/busy information."
msgstr "<b>%s</b> запрашивает информацию о вашей занятости."
-#: ../calendar/gui/e-itip-control.c:1468
+#: ../calendar/gui/e-itip-control.c:1467
msgid "Free/Busy Request"
msgstr "Запрос информации о занятости"
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1471
#, c-format
msgid "<b>%s</b> has replied to a free/busy request."
msgstr "<b>%s</b> ответил на запрос информации о занятости."
-#: ../calendar/gui/e-itip-control.c:1473
+#: ../calendar/gui/e-itip-control.c:1472
msgid "Free/Busy Reply"
msgstr "Ответ занятости"
-#: ../calendar/gui/e-itip-control.c:1478
+#: ../calendar/gui/e-itip-control.c:1477
msgid "Bad Free/Busy Message"
msgstr "Неверное сообщение о занятости"
-#: ../calendar/gui/e-itip-control.c:1553
+#: ../calendar/gui/e-itip-control.c:1552
msgid "The message does not appear to be properly formed"
msgstr "Похоже что сообщение не было правильно сформировано"
-#: ../calendar/gui/e-itip-control.c:1612
+#: ../calendar/gui/e-itip-control.c:1611
msgid "The message contains only unsupported requests."
msgstr "Это сообщение содержит только неподдерживаемые запросы"
-#: ../calendar/gui/e-itip-control.c:1645
+#: ../calendar/gui/e-itip-control.c:1644
msgid "The attachment does not contain a valid calendar message"
msgstr "Вложение не содержит правильного сообщения календаря."
-#: ../calendar/gui/e-itip-control.c:1677
+#: ../calendar/gui/e-itip-control.c:1676
msgid "The attachment has no viewable calendar items"
msgstr "Вложение не содержит пригодных для просмотра элементов календаря."
-#: ../calendar/gui/e-itip-control.c:1911
+#: ../calendar/gui/e-itip-control.c:1910
msgid "Update complete\n"
msgstr "Обновление закончено\n"
-#: ../calendar/gui/e-itip-control.c:1939
+#: ../calendar/gui/e-itip-control.c:1938
msgid "Object is invalid and cannot be updated\n"
msgstr "Объект некорректен и не может быть обновлен\n"
-#: ../calendar/gui/e-itip-control.c:1949
+#: ../calendar/gui/e-itip-control.c:1948
msgid "This response is not from a current attendee. Add as an attendee?"
-msgstr ""
-"Этот ответ пришел не от текущего участника. Добавить его, как участника?"
+msgstr "Этот ответ пришел не от текущего участника. Добавить его, как участника?"
-#: ../calendar/gui/e-itip-control.c:1961
+#: ../calendar/gui/e-itip-control.c:1960
msgid "Attendee status could not be updated because of an invalid status!\n"
-msgstr ""
-"Статус участника не может быть обновлён из-за неверного текущего статуса!\n"
+msgstr "Статус участника не может быть обновлён из-за неверного текущего статуса!\n"
-#: ../calendar/gui/e-itip-control.c:1978
+#: ../calendar/gui/e-itip-control.c:1977
msgid "Attendee status updated\n"
msgstr "Статус участника обновлён!\n"
-#: ../calendar/gui/e-itip-control.c:1981
-#: ../plugins/itip-formatter/itip-formatter.c:1025
+#: ../calendar/gui/e-itip-control.c:1980
+#: ../plugins/itip-formatter/itip-formatter.c:1029
msgid "Attendee status can not be updated because the item no longer exists"
msgstr ""
"Статус участника не может быть обновлён, потому что элемент больше не "
"существует"
-#: ../calendar/gui/e-itip-control.c:2011
+#: ../calendar/gui/e-itip-control.c:2010
msgid "Removal Complete"
msgstr "Удаление завершено"
-#: ../calendar/gui/e-itip-control.c:2034 ../calendar/gui/e-itip-control.c:2082
+#: ../calendar/gui/e-itip-control.c:2033 ../calendar/gui/e-itip-control.c:2081
msgid "Item sent!\n"
msgstr "Элемент отправлен!\n"
-#: ../calendar/gui/e-itip-control.c:2036 ../calendar/gui/e-itip-control.c:2086
+#: ../calendar/gui/e-itip-control.c:2035 ../calendar/gui/e-itip-control.c:2085
msgid "The item could not be sent!\n"
msgstr "Элемент не может быть послан!\n"
-#: ../calendar/gui/e-itip-control.c:2166
+#: ../calendar/gui/e-itip-control.c:2165
msgid "Choose an action:"
msgstr "Выберите действие:"
@@ -7340,8 +7561,8 @@ msgstr "Обновить состояние"
msgid "Send Latest Information"
msgstr "Отправить последнюю информацию"
-#: ../calendar/gui/e-itip-control.c:2380 ../calendar/gui/itip-utils.c:571
-#: ../mail/mail-send-recv.c:414 ../mail/mail-send-recv.c:466
+#: ../calendar/gui/e-itip-control.c:2380 ../calendar/gui/itip-utils.c:692
+#: ../mail/mail-send-recv.c:423 ../mail/mail-send-recv.c:476
#: ../ui/evolution-mail-global.xml.h:1
msgid "Cancel"
msgstr "Отменить"
@@ -7401,76 +7622,81 @@ msgid "Resources"
msgstr "Ресурсы"
#: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/e-meeting-store.c:802
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
+#: ../calendar/gui/e-meeting-store.c:803
msgid "Individual"
msgstr "Индивидуально"
#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
#: ../widgets/table/e-table-config-no-group.glade.h:7
#: ../widgets/table/e-table-config.glade.h:6
msgid "Group"
msgstr "Группа"
#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
msgid "Resource"
msgstr "Источник"
#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
msgid "Room"
msgstr "Комната"
#: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
msgid "Chair"
msgstr "Председатель"
#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/e-meeting-store.c:805
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
+#: ../calendar/gui/e-meeting-store.c:806
msgid "Required Participant"
msgstr "Требуемые участники"
#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
msgid "Optional Participant"
msgstr "Дополнительные участники"
#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
msgid "Non-Participant"
msgstr "Не участвует"
#: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/e-meeting-store.c:815
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
+#: ../calendar/gui/e-meeting-store.c:816
msgid "Needs Action"
msgstr "Необходимое действие"
#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
-#: ../calendar/gui/e-meeting-time-sel.c:411
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/e-meeting-time-sel.c:414
msgid "Tentative"
msgstr "Экспериментальный"
#: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
-#: ../calendar/gui/itip-utils.c:557
-#: ../plugins/itip-formatter/itip-formatter.c:1649
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../calendar/gui/itip-utils.c:678
+#: ../plugins/itip-formatter/itip-formatter.c:1648
msgid "Delegated"
msgstr "Поручено"
-#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
+#. The extra space is just a hack to occupy more space for Attendee
+#: ../calendar/gui/e-meeting-list-view.c:463
+msgid "Attendee "
+msgstr "Участник "
+
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
msgid "In Process"
msgstr "В процессе"
#. This is a strftime() format string %A = full weekday name,
#. %B = full month name, %d = month day, %Y = full year.
#: ../calendar/gui/e-meeting-time-sel-item.c:444
-#: ../calendar/gui/e-meeting-time-sel.c:2102
+#: ../calendar/gui/e-meeting-time-sel.c:2105
msgid "%A, %B %d, %Y"
msgstr "%A, %d %B %Y"
@@ -7478,83 +7704,99 @@ msgstr "%A, %d %B %Y"
#. name, %m = month number, %d = month day, %Y = full year.
#. This is a strftime() format string %a = abbreviated weekday name,
#. %m = month number, %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
#: ../calendar/gui/e-meeting-time-sel-item.c:448
-#: ../calendar/gui/e-meeting-time-sel.c:2135 ../e-util/e-time-utils.c:203
-#: ../e-util/e-time-utils.c:296 ../e-util/e-time-utils.c:384
+#: ../calendar/gui/e-meeting-time-sel.c:2138
msgid "%a %m/%d/%Y"
msgstr "%a, %d.%m.%Y"
#. This is a strftime() format string %m = month number,
#. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
-#: ../calendar/gui/e-meeting-time-sel-item.c:452 ../e-util/e-time-utils.c:238
-#: ../e-util/e-time-utils.c:299 ../widgets/misc/e-dateedit.c:1682
+#: ../calendar/gui/e-meeting-time-sel-item.c:452
msgid "%m/%d/%Y"
msgstr "%d.%m.%Y"
-#: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:416 ../designs/OOA/ooa.glade.h:11
msgid "Out of Office"
msgstr "Не на работе"
-#: ../calendar/gui/e-meeting-time-sel.c:414
+#: ../calendar/gui/e-meeting-time-sel.c:417
msgid "No Information"
msgstr "Нет информации"
-#: ../calendar/gui/e-meeting-time-sel.c:445
+#: ../calendar/gui/e-meeting-time-sel.c:431
+msgid "Con_tacts..."
+msgstr "Кон_такты..."
+
+#: ../calendar/gui/e-meeting-time-sel.c:448
msgid "O_ptions"
msgstr "_Параметры"
-#: ../calendar/gui/e-meeting-time-sel.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:465
msgid "Show _only working hours"
msgstr "Показывать _только рабочие часы"
-#: ../calendar/gui/e-meeting-time-sel.c:472
+#: ../calendar/gui/e-meeting-time-sel.c:475
msgid "Show _zoomed out"
msgstr "Показывать уменьшенный"
-#: ../calendar/gui/e-meeting-time-sel.c:487
+#: ../calendar/gui/e-meeting-time-sel.c:490
msgid "_Update free/busy"
msgstr "_Обновить информацию о занятости"
-#: ../calendar/gui/e-meeting-time-sel.c:502
+#: ../calendar/gui/e-meeting-time-sel.c:505
msgid "_<<"
msgstr "<_<"
-#: ../calendar/gui/e-meeting-time-sel.c:520
+#: ../calendar/gui/e-meeting-time-sel.c:523
msgid "_Autopick"
msgstr "Автовыбор"
-#: ../calendar/gui/e-meeting-time-sel.c:535
+#: ../calendar/gui/e-meeting-time-sel.c:538
msgid ">_>"
msgstr ">_>"
-#: ../calendar/gui/e-meeting-time-sel.c:552
+#: ../calendar/gui/e-meeting-time-sel.c:555
msgid "_All people and resources"
msgstr "_Все люди и ресурсы"
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:564
msgid "All _people and one resource"
msgstr "Все _люди и один ресурс"
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:573
msgid "_Required people"
msgstr "_Требуемые люди"
-#: ../calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:582
msgid "Required people and _one resource"
msgstr "Требуемые люди и _один ресурс"
-#: ../calendar/gui/e-pub-utils.c:300
-#, c-format
-msgid "Enter the password for %s"
-msgstr "Введите пароль для %s"
+#: ../calendar/gui/e-meeting-time-sel.c:618
+msgid "_Start time:"
+msgstr "Нача_ло:"
+
+#: ../calendar/gui/e-meeting-time-sel.c:645
+msgid "_End time:"
+msgstr "Коне_ц:"
+
+#: ../calendar/gui/e-memo-table.c:276
+msgid "Memo Table"
+msgstr "Таблица заметок"
+
+#: ../calendar/gui/e-memo-table.c:872
+msgid "_Delete Selected Memos"
+msgstr "_Удалить выделенные заметки"
+
+#: ../calendar/gui/e-memo-table.c:995 ../calendar/gui/e-memo-table.etspec.h:2
+msgid "Click to add a memo"
+msgstr "Нажмите, чтобы добавить заметку"
-#: ../calendar/gui/e-tasks.c:798 ../calendar/gui/gnome-cal.c:2532
+#: ../calendar/gui/e-memo-table.etspec.h:3
+msgid "Memo sort"
+msgstr "Сортировка заметок"
+
+#: ../calendar/gui/e-memos.c:728 ../calendar/gui/e-tasks.c:823
+#: ../calendar/gui/gnome-cal.c:2571
#, c-format
msgid ""
"Error on %s:\n"
@@ -7563,24 +7805,38 @@ msgstr ""
"Ошибка в \"%s\":\n"
"%s"
-#: ../calendar/gui/e-tasks.c:846
+#: ../calendar/gui/e-memos.c:776
+msgid "Loading memos"
+msgstr "Загрузка заметок"
+
+#: ../calendar/gui/e-memos.c:861
+#, c-format
+msgid "Opening memos at %s"
+msgstr "Открываются заметки в %s"
+
+#: ../calendar/gui/e-memos.c:1034 ../calendar/gui/e-tasks.c:1226
+msgid "Deleting selected objects..."
+msgstr "Удаление выделенных объектов..."
+
+#: ../calendar/gui/e-pub-utils.c:322
+#, c-format
+msgid "Enter the password for %s"
+msgstr "Введите пароль для %s"
+
+#: ../calendar/gui/e-tasks.c:871
msgid "Loading tasks"
msgstr "Загрузка задач"
-#: ../calendar/gui/e-tasks.c:930
+#: ../calendar/gui/e-tasks.c:958
#, c-format
msgid "Opening tasks at %s"
msgstr "Открытие задач %s"
-#: ../calendar/gui/e-tasks.c:1129
+#: ../calendar/gui/e-tasks.c:1203
msgid "Completing tasks..."
msgstr "Завершение выполнения задач..."
-#: ../calendar/gui/e-tasks.c:1152
-msgid "Deleting selected objects..."
-msgstr "Удаление выделенных объектов..."
-
-#: ../calendar/gui/e-tasks.c:1179
+#: ../calendar/gui/e-tasks.c:1253
msgid "Expunging"
msgstr "Очистка папки"
@@ -7591,45 +7847,42 @@ msgstr "Кнопка часового пояса"
#. strftime format %d = day of month, %B = full
#. month name. You can change the order but don't
#. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:329 ../calendar/gui/print.c:1501
+#: ../calendar/gui/e-week-view-main-item.c:330 ../calendar/gui/print.c:1512
msgid "%d %B"
msgstr "%d %B"
-#: ../calendar/gui/gnome-cal.c:789
+#: ../calendar/gui/gnome-cal.c:792
msgid "Updating query"
msgstr "Обновляется очередь"
-#. bonobo displays this string so it must be in locale
-#: ../calendar/gui/gnome-cal.c:2209 ../widgets/menus/gal-view-instance.c:585
-#: ../widgets/menus/gal-view-menus.c:350
-msgid "Custom View"
-msgstr "Вид пользователя"
+#: ../calendar/gui/gnome-cal.c:2246
+msgid "_Custom View"
+msgstr "_Пользовательский вид"
-#: ../calendar/gui/gnome-cal.c:2210 ../widgets/menus/gal-view-instance.c:586
-msgid "Save Custom View"
-msgstr "Сохранить параметры обзора"
+#: ../calendar/gui/gnome-cal.c:2247
+msgid "_Save Custom View"
+msgstr "_Сохранить изменённый вид"
-#: ../calendar/gui/gnome-cal.c:2215 ../widgets/menus/gal-view-instance.c:590
-#: ../widgets/menus/gal-view-menus.c:372
-msgid "Define Views..."
-msgstr "Режимы просмотра..."
+#: ../calendar/gui/gnome-cal.c:2252
+msgid "_Define Views..."
+msgstr "_Определить виды..."
-#: ../calendar/gui/gnome-cal.c:2378
+#: ../calendar/gui/gnome-cal.c:2414
#, c-format
msgid "Loading appointments at %s"
msgstr "Загрузка встреч на %s"
-#: ../calendar/gui/gnome-cal.c:2397
+#: ../calendar/gui/gnome-cal.c:2433
#, c-format
msgid "Loading tasks at %s"
msgstr "Загрузка задач на %s"
-#: ../calendar/gui/gnome-cal.c:2498
+#: ../calendar/gui/gnome-cal.c:2537
#, c-format
msgid "Opening %s"
msgstr "Открывается %s"
-#: ../calendar/gui/gnome-cal.c:3389
+#: ../calendar/gui/gnome-cal.c:3458
msgid "Purging"
msgstr "Очистка"
@@ -7689,61 +7942,140 @@ msgstr "Сентябрь"
msgid "_Select Today"
msgstr "_Выделить сегодняшний день"
-#: ../calendar/gui/itip-utils.c:353 ../calendar/gui/itip-utils.c:402
-#: ../calendar/gui/itip-utils.c:442
+#: ../calendar/gui/itip-utils.c:412 ../calendar/gui/itip-utils.c:461
+#: ../calendar/gui/itip-utils.c:563
msgid "An organizer must be set."
msgstr "Организатор должен быть назначен."
-#: ../calendar/gui/itip-utils.c:389
+#: ../calendar/gui/itip-utils.c:448
msgid "At least one attendee is necessary"
msgstr "Необходим как минимум один участник"
-#: ../calendar/gui/itip-utils.c:510 ../calendar/gui/itip-utils.c:632
+#: ../calendar/gui/itip-utils.c:631 ../calendar/gui/itip-utils.c:757
msgid "Event information"
msgstr "Информация о событии"
-#: ../calendar/gui/itip-utils.c:512 ../calendar/gui/itip-utils.c:634
+#: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:759
msgid "Task information"
msgstr "Информация о задаче"
-#: ../calendar/gui/itip-utils.c:514 ../calendar/gui/itip-utils.c:636
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:761
msgid "Journal information"
msgstr "Информация дневника"
-#: ../calendar/gui/itip-utils.c:516 ../calendar/gui/itip-utils.c:654
+#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:779
msgid "Free/Busy information"
msgstr "Информация о занятости"
-#: ../calendar/gui/itip-utils.c:518
+#: ../calendar/gui/itip-utils.c:639
msgid "Calendar information"
msgstr "Информация календаря"
-#: ../calendar/gui/itip-utils.c:567
+#: ../calendar/gui/itip-utils.c:688
msgid "Updated"
msgstr "Обновлено"
-#: ../calendar/gui/itip-utils.c:575
+#: ../calendar/gui/itip-utils.c:696
msgid "Refresh"
msgstr "Обновить"
-#: ../calendar/gui/itip-utils.c:579
+#: ../calendar/gui/itip-utils.c:700
msgid "Counter-proposal"
msgstr "Контр-предложение"
-#: ../calendar/gui/itip-utils.c:650
+#: ../calendar/gui/itip-utils.c:775
#, c-format
msgid "Free/Busy information (%s to %s)"
msgstr "Информация о занятости (%s в %s)"
-#: ../calendar/gui/itip-utils.c:660
+#: ../calendar/gui/itip-utils.c:785
msgid "iCalendar information"
msgstr "Информация iCalendar"
-#: ../calendar/gui/itip-utils.c:815
+#: ../calendar/gui/itip-utils.c:940
msgid "You must be an attendee of the event."
msgstr "Вы должны быть участником события."
-#: ../calendar/gui/migration.c:151
+#: ../calendar/gui/memos-component.c:451 ../ui/evolution-addressbook.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
+#: ../ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "Копировать"
+
+#: ../calendar/gui/memos-component.c:452 ../mail/em-filter-i18n.h:11
+#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
+#: ../ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Удалить"
+
+#: ../calendar/gui/memos-component.c:453
+msgid "Properties..."
+msgstr "Свойства..."
+
+#: ../calendar/gui/memos-component.c:526
+#, c-format
+msgid "%d memo"
+msgid_plural "%d memos"
+msgstr[0] "%d заметка"
+msgstr[1] "%d заметки"
+msgstr[2] "%d заметок"
+
+#: ../calendar/gui/memos-component.c:528 ../calendar/gui/tasks-component.c:519
+#: ../mail/mail-component.c:560
+#, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] ", выделено %d"
+msgstr[1] ", выделено %d"
+msgstr[2] ", выделено %d"
+
+#: ../calendar/gui/memos-component.c:575
+msgid "Failed upgrading memos."
+msgstr "Не удалось обновить заметки."
+
+#: ../calendar/gui/memos-component.c:871
+#, c-format
+msgid "Unable to open the memo list '%s' for creating events and meetings"
+msgstr "Не удается открыть список заметок '%s' для создания событий и собраний"
+
+#: ../calendar/gui/memos-component.c:884
+msgid "There is no calendar available for creating memos"
+msgstr "Нет календаря, доступного для создания заметок"
+
+#: ../calendar/gui/memos-component.c:975
+msgid "Memo Source Selector"
+msgstr "Выбор источника заметок"
+
+#: ../calendar/gui/memos-component.c:1158
+msgid "New memo"
+msgstr "Новая заметка"
+
+#: ../calendar/gui/memos-component.c:1159
+msgid "_Memo"
+msgstr "_Заметка"
+
+#: ../calendar/gui/memos-component.c:1160
+msgid "Create a new memo"
+msgstr "Создать новую заметку"
+
+#: ../calendar/gui/memos-component.c:1166
+msgid "New memo list"
+msgstr "Новый список заметок"
+
+#: ../calendar/gui/memos-component.c:1167
+msgid "Memo l_ist"
+msgstr "Список з_аметок"
+
+#: ../calendar/gui/memos-component.c:1168
+msgid "Create a new memo list"
+msgstr "Создать новый список заметок"
+
+#: ../calendar/gui/memos-control.c:340
+msgid "Print Memos"
+msgstr "Напечатать заметки"
+
+#: ../calendar/gui/migration.c:162
msgid ""
"The location and hierarchy of the Evolution task folders has changed since "
"Evolution 1.x.\n"
@@ -7755,7 +8087,7 @@ msgstr ""
"\n"
"Производится преобразование папок для новой версии..."
-#: ../calendar/gui/migration.c:155
+#: ../calendar/gui/migration.c:166
msgid ""
"The location and hierarchy of the Evolution calendar folders has changed "
"since Evolution 1.x.\n"
@@ -7768,260 +8100,264 @@ msgstr ""
"Производится преобразование папок для новой версии..."
#. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:748 ../calendar/gui/migration.c:915
+#: ../calendar/gui/migration.c:765 ../calendar/gui/migration.c:933
msgid "Unable to migrate old settings from evolution/config.xmldb"
msgstr "Не удается преобразовать старые параметры из evolution/config.xmldb"
#. FIXME: domain/code
-#: ../calendar/gui/migration.c:777
+#: ../calendar/gui/migration.c:794
#, c-format
msgid "Unable to migrate calendar `%s'"
msgstr "Не удается преобразовать календарь '%s'"
#. FIXME: domain/code
-#: ../calendar/gui/migration.c:944
+#: ../calendar/gui/migration.c:962
#, c-format
msgid "Unable to migrate tasks `%s'"
msgstr "Не удается открыть задачи в '%s'"
-#: ../calendar/gui/print.c:492
+#: ../calendar/gui/print.c:493
msgid "1st"
msgstr "1-ое"
-#: ../calendar/gui/print.c:492
+#: ../calendar/gui/print.c:493
msgid "2nd"
msgstr "2-ое"
-#: ../calendar/gui/print.c:492
+#: ../calendar/gui/print.c:493
msgid "3rd"
msgstr "3-ье"
-#: ../calendar/gui/print.c:492
+#: ../calendar/gui/print.c:493
msgid "4th"
msgstr "4-ое"
-#: ../calendar/gui/print.c:492
+#: ../calendar/gui/print.c:493
msgid "5th"
msgstr "5-ое"
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:494
msgid "6th"
msgstr "6-ое"
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:494
msgid "7th"
msgstr "7-ое"
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:494
msgid "8th"
msgstr "8-ое"
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:494
msgid "9th"
msgstr "9-ое"
-#: ../calendar/gui/print.c:493
+#: ../calendar/gui/print.c:494
msgid "10th"
msgstr "10-ое"
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:495
msgid "11th"
msgstr "11-ое"
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:495
msgid "12th"
msgstr "12-ое"
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:495
msgid "13th"
msgstr "13-ое"
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:495
msgid "14th"
msgstr "14-ое"
-#: ../calendar/gui/print.c:494
+#: ../calendar/gui/print.c:495
msgid "15th"
msgstr "15-ое"
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:496
msgid "16th"
msgstr "16-ое"
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:496
msgid "17th"
msgstr "17-ое"
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:496
msgid "18th"
msgstr "18-ое"
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:496
msgid "19th"
msgstr "19-ое"
-#: ../calendar/gui/print.c:495
+#: ../calendar/gui/print.c:496
msgid "20th"
msgstr "20-ое"
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:497
msgid "21st"
msgstr "21-ое"
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:497
msgid "22nd"
msgstr "22-ое"
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:497
msgid "23rd"
msgstr "23-ье"
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:497
msgid "24th"
msgstr "24-ое"
-#: ../calendar/gui/print.c:496
+#: ../calendar/gui/print.c:497
msgid "25th"
msgstr "25-ое"
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:498
msgid "26th"
msgstr "26-ое"
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:498
msgid "27th"
msgstr "27-ое"
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:498
msgid "28th"
msgstr "28-ое"
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:498
msgid "29th"
msgstr "29-ое"
-#: ../calendar/gui/print.c:497
+#: ../calendar/gui/print.c:498
msgid "30th"
msgstr "30-ое"
-#: ../calendar/gui/print.c:498
+#: ../calendar/gui/print.c:499
msgid "31st"
msgstr "31-ое"
-#: ../calendar/gui/print.c:573
+#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=Thursday
+#: ../calendar/gui/print.c:575
msgid "Su"
msgstr "Вс"
-#: ../calendar/gui/print.c:573
+#: ../calendar/gui/print.c:575
msgid "Mo"
msgstr "Пн"
-#: ../calendar/gui/print.c:573
+#: ../calendar/gui/print.c:575
msgid "Tu"
msgstr "Вт"
-#: ../calendar/gui/print.c:573
+#: ../calendar/gui/print.c:575
msgid "We"
msgstr "Ср"
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:576
msgid "Th"
msgstr "Чт"
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:576
msgid "Fr"
msgstr "Пт"
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:576
msgid "Sa"
msgstr "Cб"
#. Day
-#: ../calendar/gui/print.c:1917
+#: ../calendar/gui/print.c:1928
msgid "Selected day (%a %b %d %Y)"
msgstr "Выбранный день (%a, %b %d %Y)"
-#: ../calendar/gui/print.c:1942 ../calendar/gui/print.c:1946
+#: ../calendar/gui/print.c:1953 ../calendar/gui/print.c:1957
msgid "%a %b %d"
msgstr "%a, %b %d"
-#: ../calendar/gui/print.c:1943
+#: ../calendar/gui/print.c:1954
msgid "%a %d %Y"
msgstr "%a, %d %Y"
-#: ../calendar/gui/print.c:1947 ../calendar/gui/print.c:1949
-#: ../calendar/gui/print.c:1950
+#: ../calendar/gui/print.c:1958 ../calendar/gui/print.c:1960
+#: ../calendar/gui/print.c:1961
msgid "%a %b %d %Y"
msgstr "%a, %b %d %Y"
-#: ../calendar/gui/print.c:1954
+#: ../calendar/gui/print.c:1965
#, c-format
msgid "Selected week (%s - %s)"
msgstr "Выбранная неделя (%s - %s)"
#. Month
-#: ../calendar/gui/print.c:1962
+#: ../calendar/gui/print.c:1973
msgid "Selected month (%b %Y)"
msgstr "Выбранный месяц (%b %Y)"
#. Year
-#: ../calendar/gui/print.c:1969
+#: ../calendar/gui/print.c:1980
msgid "Selected year (%Y)"
msgstr "Выбранный год (%Y)"
-#: ../calendar/gui/print.c:2320
+#: ../calendar/gui/print.c:2309
+msgid "Appointment"
+msgstr "Встреча"
+
+#: ../calendar/gui/print.c:2311
+msgid "Task"
+msgstr "Задание"
+
+#: ../calendar/gui/print.c:2333
#, c-format
msgid "Summary: %s"
msgstr "Сводка: %s"
-#: ../calendar/gui/print.c:2328
-#, c-format
-msgid "Location: %s"
-msgstr "Адрес: %s"
-
-#: ../calendar/gui/print.c:2371
+#: ../calendar/gui/print.c:2384
#, c-format
msgid "Status: %s"
msgstr "Состояние: %s"
-#: ../calendar/gui/print.c:2388
+#: ../calendar/gui/print.c:2401
#, c-format
msgid "Priority: %s"
msgstr "Приоритет: %s"
-#: ../calendar/gui/print.c:2400
+#: ../calendar/gui/print.c:2413
#, c-format
msgid "Percent Complete: %i"
msgstr "Завершено процентов: %i"
-#: ../calendar/gui/print.c:2412
+#: ../calendar/gui/print.c:2425
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: ../calendar/gui/print.c:2426
+#: ../calendar/gui/print.c:2439
#, c-format
msgid "Categories: %s"
msgstr "Категории: %s"
-#: ../calendar/gui/print.c:2437
+#: ../calendar/gui/print.c:2450
msgid "Contacts: "
msgstr "Контакты: "
-#: ../calendar/gui/print.c:2577 ../calendar/gui/print.c:2665
-#: ../calendar/gui/print.c:2791 ../mail/em-format-html-print.c:178
+#: ../calendar/gui/print.c:2590 ../calendar/gui/print.c:2678
+#: ../calendar/gui/print.c:2804 ../mail/em-format-html-print.c:178
msgid "Print Preview"
msgstr "Предварительный просмотр"
-#: ../calendar/gui/print.c:2612
+#: ../calendar/gui/print.c:2625
msgid "Print Item"
msgstr "Напечатать элемент"
-#: ../calendar/gui/tasks-component.c:439
-msgid "New Task List"
-msgstr "Новый список задач"
+#: ../calendar/gui/tasks-component.c:441
+msgid "_New Task List"
+msgstr "_Новый список задач"
-#: ../calendar/gui/tasks-component.c:515
+#: ../calendar/gui/tasks-component.c:517
#, c-format
msgid "%d task"
msgid_plural "%d tasks"
@@ -8029,68 +8365,56 @@ msgstr[0] "%d задача"
msgstr[1] "%d задачи"
msgstr[2] "%d задач"
-#: ../calendar/gui/tasks-component.c:517 ../mail/mail-component.c:548
-#, c-format
-msgid ", %d selected"
-msgid_plural ", %d selected"
-msgstr[0] ", выделено %d"
-msgstr[1] ", выделено %d"
-msgstr[2] ", выделено %d"
-
-#: ../calendar/gui/tasks-component.c:564
+#: ../calendar/gui/tasks-component.c:566
msgid "Failed upgrading tasks."
msgstr "Не удалось обновить задачи."
-#: ../calendar/gui/tasks-component.c:872
+#: ../calendar/gui/tasks-component.c:877
#, c-format
msgid "Unable to open the task list '%s' for creating events and meetings"
msgstr "Не удается открыть список задач '%s' для создания событий и собраний"
-#: ../calendar/gui/tasks-component.c:887
+#: ../calendar/gui/tasks-component.c:890
msgid "There is no calendar available for creating tasks"
msgstr "Нет календаря, доступного для создания задач"
-#: ../calendar/gui/tasks-component.c:987
+#: ../calendar/gui/tasks-component.c:990
msgid "Task Source Selector"
msgstr "Выбор источника задач"
-#: ../calendar/gui/tasks-component.c:1170
+#: ../calendar/gui/tasks-component.c:1173
msgid "New task"
msgstr "Новая задача"
-#: ../calendar/gui/tasks-component.c:1171
-msgid "_Task"
-msgstr "_Задача"
-
-#: ../calendar/gui/tasks-component.c:1172
+#: ../calendar/gui/tasks-component.c:1175
msgid "Create a new task"
msgstr "Создать новую задачу"
-#: ../calendar/gui/tasks-component.c:1178
+#: ../calendar/gui/tasks-component.c:1181
msgid "New assigned task"
msgstr "Новая назначенная задача"
-#: ../calendar/gui/tasks-component.c:1179
+#: ../calendar/gui/tasks-component.c:1182
msgid "Assigne_d Task"
msgstr "Назначенная за_дача"
-#: ../calendar/gui/tasks-component.c:1180
+#: ../calendar/gui/tasks-component.c:1183
msgid "Create a new assigned task"
msgstr "Создать новую назначенную задачу"
-#: ../calendar/gui/tasks-component.c:1186
+#: ../calendar/gui/tasks-component.c:1189
msgid "New task list"
msgstr "Новый список задач"
-#: ../calendar/gui/tasks-component.c:1187
+#: ../calendar/gui/tasks-component.c:1190
msgid "Task l_ist"
msgstr "Сп_исок задач"
-#: ../calendar/gui/tasks-component.c:1188
+#: ../calendar/gui/tasks-component.c:1191
msgid "Create a new task list"
msgstr "Создать новый список задач"
-#: ../calendar/gui/tasks-control.c:419
+#: ../calendar/gui/tasks-control.c:435
msgid ""
"This operation will permanently erase all tasks marked as completed. If you "
"continue, you will not be able to recover these tasks.\n"
@@ -8102,11 +8426,11 @@ msgstr ""
"\n"
"Действительно уничтожить эти задания?"
-#: ../calendar/gui/tasks-control.c:422
+#: ../calendar/gui/tasks-control.c:438
msgid "Do not ask me again."
msgstr "Не задавать больше этот вопрос."
-#: ../calendar/gui/tasks-control.c:457
+#: ../calendar/gui/tasks-control.c:472
msgid "Print Tasks"
msgstr "Напечатать задачи"
@@ -8115,40 +8439,40 @@ msgstr "Напечатать задачи"
msgid "SMTWTFS"
msgstr "ПВСЧПСВ"
-#: ../calendar/importers/icalendar-importer.c:78
+#: ../calendar/importers/icalendar-importer.c:79
msgid "Appointments and Meetings"
msgstr "Встречи и собрания"
-#: ../calendar/importers/icalendar-importer.c:336
-#: ../calendar/importers/icalendar-importer.c:586
+#: ../calendar/importers/icalendar-importer.c:337
+#: ../calendar/importers/icalendar-importer.c:620
msgid "Opening calendar"
msgstr "Открывается календарь"
-#: ../calendar/importers/icalendar-importer.c:429
+#: ../calendar/importers/icalendar-importer.c:444
msgid "iCalendar files (.ics)"
msgstr "Файлы iCalendar (.ics)"
-#: ../calendar/importers/icalendar-importer.c:430
+#: ../calendar/importers/icalendar-importer.c:445
msgid "Evolution iCalendar importer"
msgstr "Evolution iCalendar importer"
-#: ../calendar/importers/icalendar-importer.c:494
-msgid "Reminder!!"
-msgstr "Напоминание!!"
+#: ../calendar/importers/icalendar-importer.c:521
+msgid "Reminder!"
+msgstr "Напоминание!"
-#: ../calendar/importers/icalendar-importer.c:539
+#: ../calendar/importers/icalendar-importer.c:573
msgid "vCalendar files (.vcf)"
msgstr "Файлы vCalendar (.vcf)"
-#: ../calendar/importers/icalendar-importer.c:540
+#: ../calendar/importers/icalendar-importer.c:574
msgid "Evolution vCalendar importer"
msgstr "Evolution vCalendar importer"
-#: ../calendar/importers/icalendar-importer.c:702
+#: ../calendar/importers/icalendar-importer.c:736
msgid "Calendar Events"
msgstr "События календаря"
-#: ../calendar/importers/icalendar-importer.c:739
+#: ../calendar/importers/icalendar-importer.c:773
msgid "Evolution Calendar intelligent importer"
msgstr "Интеллектуальный импортер календаря Evolution"
@@ -9682,17 +10006,57 @@ msgstr "Pacific/Wallis"
msgid "Pacific/Yap"
msgstr "Тихий океан/о-в Яп"
-#: ../composer/e-msg-composer-hdrs.c:558
+#: ../composer/e-msg-composer-attachment-bar.c:105
+#: ../widgets/misc/e-attachment-bar.c:107
+#, c-format
+msgid "%.0fK"
+msgstr "%.0fКБ"
+
+#: ../composer/e-msg-composer-attachment-bar.c:108
+#: ../widgets/misc/e-attachment-bar.c:110
+#, c-format
+msgid "%.0fM"
+msgstr "%.0fМБ"
+
+#: ../composer/e-msg-composer-attachment-bar.c:111
+#: ../widgets/misc/e-attachment-bar.c:113
+#, c-format
+msgid "%.0fG"
+msgstr "%.0fГБ"
+
+#: ../composer/e-msg-composer-attachment-bar.c:740
+#: ../widgets/misc/e-attachment-bar.c:986
+msgid "Attachment Bar"
+msgstr "Панель вложений"
+
+#: ../composer/e-msg-composer-attachment.c:187
+#: ../composer/e-msg-composer-attachment.c:203
+#: ../composer/e-msg-composer-attachment.c:297
+#: ../composer/e-msg-composer-attachment.c:313
+#: ../widgets/misc/e-attachment.c:238 ../widgets/misc/e-attachment.c:254
+#: ../widgets/misc/e-attachment.c:441 ../widgets/misc/e-attachment.c:457
+#, c-format
+msgid "Cannot attach file %s: %s"
+msgstr "Не удается вложить файл %s: %s"
+
+#: ../composer/e-msg-composer-attachment.c:195
+#: ../composer/e-msg-composer-attachment.c:305
+#: ../widgets/misc/e-attachment.c:246 ../widgets/misc/e-attachment.c:449
+#, c-format
+msgid "Cannot attach file %s: not a regular file"
+msgstr "Не удается вложить файл %s: не обычный файл"
+
+#: ../composer/e-msg-composer-hdrs.c:557
msgid "Posting destination"
msgstr "Назначение:"
-#: ../composer/e-msg-composer-hdrs.c:559
+#: ../composer/e-msg-composer-hdrs.c:558
msgid "Choose folders to post the message to."
msgstr "Выберите папки для помещения в них сообщений."
-#: ../composer/e-msg-composer-hdrs.c:593
+#: ../composer/e-msg-composer-hdrs.c:589
msgid "Click here for the address book"
-msgstr "Щёлкните здесь, чтобы создать адресную книгу"
+msgstr "Нажмите, чтобы создать адресную книгу"
#.
#. * Reply-To:
@@ -9701,45 +10065,45 @@ msgstr "Щёлкните здесь, чтобы создать адресную
#. * because that causes from_changed to be called, which
#. * expects the reply_to fields to be initialized.
#.
-#: ../composer/e-msg-composer-hdrs.c:623
+#: ../composer/e-msg-composer-hdrs.c:619
msgid "_Reply-To:"
msgstr "Об_ратный адрес:"
#.
#. * From
#.
-#: ../composer/e-msg-composer-hdrs.c:630
+#: ../composer/e-msg-composer-hdrs.c:626
msgid "Fr_om:"
msgstr "_От кого:"
#.
#. * Subject
#.
-#: ../composer/e-msg-composer-hdrs.c:637
+#: ../composer/e-msg-composer-hdrs.c:633
msgid "S_ubject:"
msgstr "_Тема:"
-#: ../composer/e-msg-composer-hdrs.c:646
+#: ../composer/e-msg-composer-hdrs.c:642
msgid "_To:"
msgstr "_Кому:"
-#: ../composer/e-msg-composer-hdrs.c:647
+#: ../composer/e-msg-composer-hdrs.c:643
msgid "Enter the recipients of the message"
msgstr "Перечислите получателей сообщения"
-#: ../composer/e-msg-composer-hdrs.c:650
+#: ../composer/e-msg-composer-hdrs.c:646
msgid "_Cc:"
msgstr "Ко_пия:"
-#: ../composer/e-msg-composer-hdrs.c:651
+#: ../composer/e-msg-composer-hdrs.c:647
msgid "Enter the addresses that will receive a carbon copy of the message"
msgstr "Введите адреса, получающие копию сообщения"
-#: ../composer/e-msg-composer-hdrs.c:654
+#: ../composer/e-msg-composer-hdrs.c:650
msgid "_Bcc:"
msgstr "_Скр.копия:"
-#: ../composer/e-msg-composer-hdrs.c:655
+#: ../composer/e-msg-composer-hdrs.c:651
msgid ""
"Enter the addresses that will receive a carbon copy of the message without "
"appearing in the recipient list of the message."
@@ -9750,15 +10114,15 @@ msgstr ""
#.
#. * Post-To
#.
-#: ../composer/e-msg-composer-hdrs.c:662
+#: ../composer/e-msg-composer-hdrs.c:658
msgid "_Post To:"
msgstr "По_местить в:"
-#: ../composer/e-msg-composer-hdrs.c:667
+#: ../composer/e-msg-composer-hdrs.c:663
msgid "Click here to select folders to post to"
msgstr "Нажмите, чтобы выбрать папки для помещения в них сообщений"
-#: ../composer/e-msg-composer-hdrs.c:673
+#: ../composer/e-msg-composer-hdrs.c:669
msgid "Post To:"
msgstr "Отправить на:"
@@ -9766,14 +10130,17 @@ msgstr "Отправить на:"
msgid "A_ttach"
msgstr "В_ложить"
-#: ../composer/e-msg-composer.c:738
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
+#: ../composer/e-msg-composer-select-file.c:239
+msgid "Insert Attachment"
+msgstr "Вставить вложение"
+
+#: ../composer/e-msg-composer.c:828
+msgid "Cannot sign outgoing message: No signing certificate set for this account"
msgstr ""
"Не удается подписать исходящее сообщение: нет сертификата подписи для этой "
"учетной записи"
-#: ../composer/e-msg-composer.c:745
+#: ../composer/e-msg-composer.c:835
msgid ""
"Cannot encrypt outgoing message: No encryption certificate set for this "
"account"
@@ -9781,47 +10148,52 @@ msgstr ""
"Не удается зашифровать исходящее сообщение: нет сертификата шифрования для "
"этой учетной записи"
-#: ../composer/e-msg-composer.c:1224 ../composer/e-msg-composer.c:1257
+#: ../composer/e-msg-composer.c:1295 ../composer/e-msg-composer.c:2508
+msgid "Hide _Attachment Bar"
+msgstr "Скрыть панель _вложений"
+
+#: ../composer/e-msg-composer.c:1298 ../composer/e-msg-composer.c:2511
+#: ../composer/e-msg-composer.c:3843
+msgid "Show _Attachment Bar"
+msgstr "Показать панель _вложений"
+
+#: ../composer/e-msg-composer.c:1330 ../composer/e-msg-composer.c:1364
#: ../plugins/mail-remote/e-corba-utils.c:135
msgid "Unknown reason"
msgstr "Неизвестная причина"
-#: ../composer/e-msg-composer.c:1294
+#: ../composer/e-msg-composer.c:1402
msgid "Could not open file"
msgstr "Не удается открыть файл"
-#: ../composer/e-msg-composer.c:1302
+#: ../composer/e-msg-composer.c:1410
msgid "Unable to retrieve message from editor"
msgstr "Не удается получить сообщение из редактора"
-#: ../composer/e-msg-composer.c:1572
+#: ../composer/e-msg-composer.c:1689
msgid "Untitled Message"
msgstr "Неозаглавленное сообщение"
#. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1606
+#: ../composer/e-msg-composer.c:1724
msgid "Open File"
msgstr "Открыть файл"
-#: ../composer/e-msg-composer.c:2006 ../mail/em-account-editor.c:588
-#: ../mail/em-account-editor.c:633 ../mail/em-account-editor.c:700
+#: ../composer/e-msg-composer.c:2151 ../mail/em-account-editor.c:598
+#: ../mail/em-account-editor.c:643 ../mail/em-account-editor.c:710
msgid "Autogenerated"
msgstr "Создана автоматически"
-#: ../composer/e-msg-composer.c:2105
+#: ../composer/e-msg-composer.c:2254
msgid "Si_gnature:"
msgstr "По_дпись:"
-#: ../composer/e-msg-composer.c:2347 ../composer/e-msg-composer.c:3527
-#: ../composer/e-msg-composer.c:3528
-msgid "Compose a message"
+#: ../composer/e-msg-composer.c:2522 ../composer/e-msg-composer.c:3725
+#: ../composer/e-msg-composer.c:3728
+msgid "Compose Message"
msgstr "Новое сообщение"
-#: ../composer/e-msg-composer.c:3643
-msgid "_Attachment Bar"
-msgstr "Панель _вложений"
-
-#: ../composer/e-msg-composer.c:4720
+#: ../composer/e-msg-composer.c:4952
msgid ""
"<b>(The composer contains a non-text message body, which cannot be edited.)"
"<b>"
@@ -9854,7 +10226,7 @@ msgid "Because &quot;{0}&quot;, you may need to select different mail options."
msgstr "Причина: &quot;{0}&quot;, вам следует выбрать другие параметры почты."
#: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:19
msgid "Because &quot;{1}&quot;."
msgstr "Потому что &quot;{1}&quot;."
@@ -9897,18 +10269,14 @@ msgid "Do you want to recover unfinished messages?"
msgstr "Восстановить незавершенные сообщения?"
#: ../composer/mail-composer.error.xml.h:14
-msgid "Don't Recover"
-msgstr "Не восстанавливать"
-
-#: ../composer/mail-composer.error.xml.h:15
msgid "Download in progress. Do you want to send the mail?"
msgstr "Идет процесс загрузки. Вы действительно хотите отправить почту?"
-#: ../composer/mail-composer.error.xml.h:16
+#: ../composer/mail-composer.error.xml.h:15
msgid "Error saving to autosave because &quot;{1}&quot;."
msgstr "Ошибка записи файла автосохранения. Причина: &quot;{1}&quot;."
-#: ../composer/mail-composer.error.xml.h:17
+#: ../composer/mail-composer.error.xml.h:16
msgid ""
"Evolution quit unexpectedly while you were composing a new message. "
"Recovering the message will allow you to continue where you left off."
@@ -9917,16 +10285,11 @@ msgstr ""
"нового сообщения. Восстановление сообщения поможет вам продолжить с места "
"последнего изменения."
-#: ../composer/mail-composer.error.xml.h:18
-msgid "Recover"
-msgstr "Восстановить"
-
-#: ../composer/mail-composer.error.xml.h:19
+#: ../composer/mail-composer.error.xml.h:17
msgid "The file `{0}' is not a regular file and cannot be sent in a message."
-msgstr ""
-"Файл `{0}' не является обычным файлом и не может быть отправлен в сообщении."
+msgstr "Файл `{0}' не является обычным файлом и не может быть отправлен в сообщении."
-#: ../composer/mail-composer.error.xml.h:20
+#: ../composer/mail-composer.error.xml.h:18
msgid ""
"To attach the contents of this directory, either attach the files in this "
"directory individually, or create an archive of the directory and attach it."
@@ -9935,7 +10298,7 @@ msgstr ""
"отдельности, либо создайте архив, включающий все файлы из каталога, и "
"вложите этот архив."
-#: ../composer/mail-composer.error.xml.h:21
+#: ../composer/mail-composer.error.xml.h:19
msgid ""
"Unable to activate the HTML editor control.\n"
"\n"
@@ -9947,29 +10310,33 @@ msgstr ""
"Убедитесь, что у вас установлены необходимые\n"
"версии пакетов gtkhtml и libgtkhtml."
-#: ../composer/mail-composer.error.xml.h:24
+#: ../composer/mail-composer.error.xml.h:22
msgid "Unable to activate the address selector control."
msgstr "Не удается активировать управляющий элемент выбора адреса."
-#: ../composer/mail-composer.error.xml.h:25
+#: ../composer/mail-composer.error.xml.h:23
msgid "Unfinished messages found"
msgstr "Найдены незавершенные сообщения"
-#: ../composer/mail-composer.error.xml.h:26
+#: ../composer/mail-composer.error.xml.h:24
msgid "Warning: Modified Message"
msgstr "Внимание: Изменено сообщение"
-#: ../composer/mail-composer.error.xml.h:27
+#: ../composer/mail-composer.error.xml.h:25
msgid "You cannot attach the file `{0}' to this message."
msgstr "Вы не можете вложить файл `{0}' в это сообщение."
-#: ../composer/mail-composer.error.xml.h:28
+#: ../composer/mail-composer.error.xml.h:26
msgid "You need to configure an account before you can compose mail."
msgstr "Перед созданием нового письма необходимо настроить учетную запись."
+#: ../composer/mail-composer.error.xml.h:28
+msgid "_Don't Recover"
+msgstr "_Не восстанавливать"
+
#: ../composer/mail-composer.error.xml.h:29
-msgid "_Discard Changes"
-msgstr "_Отклонить изменения"
+msgid "_Recover"
+msgstr "_Восстановить"
#: ../composer/mail-composer.error.xml.h:30
msgid "_Save Message"
@@ -9977,7 +10344,7 @@ msgstr "_Сохранить сообщение"
#: ../data/evolution.desktop.in.in.h:1
#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:509
+#: ../shell/main.c:511
msgid "Evolution"
msgstr "Evolution"
@@ -10030,7 +10397,7 @@ msgid "I am currently out of the office"
msgstr "Я сейчас не на работе"
#: ../designs/OOA/ooa.glade.h:10
-msgid "No, Don't Change Status"
+msgid "No, Do not Change Status"
msgstr "Нет, не изменять состояние"
#: ../designs/OOA/ooa.glade.h:12
@@ -10097,7 +10464,7 @@ msgstr ""
"Что должна делать программа Evolution, когда приходит письмо с запросом "
"подтверждения прочтения?"
-#: ../e-util/e-dialog-utils.c:267
+#: ../e-util/e-dialog-utils.c:281
msgid ""
"A file by that name already exists.\n"
"Overwrite it?"
@@ -10105,7 +10472,7 @@ msgstr ""
"Файл с таким именем уже существует.\n"
"Перезаписать его?"
-#: ../e-util/e-dialog-utils.c:269 ../e-util/e-system.error.xml.h:6
+#: ../e-util/e-dialog-utils.c:283 ../e-util/e-system.error.xml.h:6
msgid "Overwrite file?"
msgstr "Перезаписать файл?"
@@ -10126,10 +10493,9 @@ msgid "Evolution Query"
msgstr "Запрос Evolution"
#. setup a dummy error
-#: ../e-util/e-error.c:438
+#: ../e-util/e-error.c:442
#, c-format
-msgid ""
-"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgid "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
msgstr ""
"<span weight=\"bold\">Внутренняя ошибка, неизвестная ошибка '%s' requested</"
"span>"
@@ -10150,109 +10516,11 @@ msgstr "Перезаписать этот файл?"
msgid "File exists &quot;{0}&quot;."
msgstr "Файл существует &quot;{0}&quot;."
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:122
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:133
msgid "_Overwrite"
msgstr "_Перезаписать"
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format, without seconds.
-#. strftime 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
-msgid "%a %m/%d/%Y %I:%M %p"
-msgstr "%a, %d.%m.%Y %I:%M %p"
-
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
-#: ../e-util/e-time-utils.c:190 ../e-util/e-time-utils.c:389
-msgid "%a %m/%d/%Y %H:%M"
-msgstr "%a, %d.%m.%Y %H:%M"
-
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format, without minutes or seconds.
-#: ../e-util/e-time-utils.c:195
-msgid "%a %m/%d/%Y %I %p"
-msgstr "%a, %d.%m.%Y %I %p"
-
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format, without minutes or seconds.
-#: ../e-util/e-time-utils.c:200
-msgid "%a %m/%d/%Y %H"
-msgstr "%a, %d.%m.%Y %H"
-
-#. strptime format of a date and a time, in 12-hour format.
-#: ../e-util/e-time-utils.c:211
-msgid "%m/%d/%Y %I:%M:%S %p"
-msgstr "%d.%m.%Y %I:%M:%S %p"
-
-#. strptime format of a date and a time, in 24-hour format.
-#: ../e-util/e-time-utils.c:215
-msgid "%m/%d/%Y %H:%M:%S"
-msgstr "%d.%m.%Y %H:%M:%S"
-
-#. strptime format of a date and a time, in 12-hour format,
-#. without seconds.
-#: ../e-util/e-time-utils.c:220
-msgid "%m/%d/%Y %I:%M %p"
-msgstr "%d.%m.%Y %I:%M %p"
-
-#. strptime format of a date and a time, in 24-hour format,
-#. without seconds.
-#: ../e-util/e-time-utils.c:225
-msgid "%m/%d/%Y %H:%M"
-msgstr "%d.%m.%Y %H:%M"
-
-#. strptime format of a date and a time, in 12-hour format,
-#. without minutes or seconds.
-#: ../e-util/e-time-utils.c:230
-msgid "%m/%d/%Y %I %p"
-msgstr "%d.%m.%Y %I %p"
-
-#. strptime format of a date and a time, in 24-hour format,
-#. without minutes or seconds.
-#: ../e-util/e-time-utils.c:235
-msgid "%m/%d/%Y %H"
-msgstr "%d.%m.%Y %H"
-
-#. strptime format for a time of day, in 12-hour format.
-#. strftime format of a time in 12-hour format.
-#: ../e-util/e-time-utils.c:339 ../e-util/e-time-utils.c:438
-msgid "%I:%M:%S %p"
-msgstr "%I:%M:%S %p"
-
-#. strptime format for a time of day, in 24-hour format.
-#. strftime format of a time in 24-hour format.
-#: ../e-util/e-time-utils.c:343 ../e-util/e-time-utils.c:430
-msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
-
-#. strptime format for time of day, without seconds,
-#. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: ../e-util/e-time-utils.c:348 ../e-util/e-time-utils.c:435
-#: ../widgets/misc/e-dateedit.c:1438 ../widgets/misc/e-dateedit.c:1720
-msgid "%I:%M %p"
-msgstr "%I:%M %p"
-
-#. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: ../e-util/e-time-utils.c:352 ../e-util/e-time-utils.c:427
-#: ../widgets/misc/e-dateedit.c:1435 ../widgets/misc/e-dateedit.c:1717
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. strptime format for hour and AM/PM, 12-hour format.
-#: ../e-util/e-time-utils.c:356
-msgid "%I %p"
-msgstr "%I %p"
-
-#: ../e-util/eggtrayicon.c:119
+#: ../e-util/eggtrayicon.c:121
msgid "The orientation of the tray."
msgstr "Ориентация лотка."
@@ -10314,7 +10582,7 @@ msgstr[2] "%d лет назад"
#: ../filter/filter-datespec.c:285
msgid "<click here to select a date>"
-msgstr "<щёлкните здесь, чтобы выбрать дату>"
+msgstr "<нажмите, чтобы выбрать дату>"
#: ../filter/filter-datespec.c:288 ../filter/filter-datespec.c:299
msgid "now"
@@ -10329,25 +10597,24 @@ msgstr "%d-%b-%Y"
msgid "Select a time to compare against"
msgstr "Выбрать время для сравнения"
-#: ../filter/filter-file.c:288
+#: ../filter/filter-file.c:289
msgid "Choose a file"
msgstr "Выберите файл"
#: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1041 ../mail/mail-config.c:76
-#: ../mail/mail-config.glade.h:91
+#: ../mail/em-migrate.c:1052 ../mail/mail-config.glade.h:92
msgid "Important"
msgstr "Важное"
#. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1044
-#: ../mail/mail-config.c:79 ../mail/mail-config.glade.h:145
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1055
+#: ../mail/mail-config.glade.h:146
msgid "To Do"
msgstr "Выполнить"
#. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1045
-#: ../mail/mail-config.c:80 ../mail/mail-config.glade.h:95
+#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1056
+#: ../mail/mail-config.glade.h:96
msgid "Later"
msgstr "Позже"
@@ -10355,48 +10622,52 @@ msgstr "Позже"
msgid "Test"
msgstr "Проверка"
-#: ../filter/filter-rule.c:791
-msgid "_Rule name:"
-msgstr "Имя п_равила:"
+#: ../filter/filter-rule.c:799
+msgid "_Search name:"
+msgstr "_Имя поиска:"
-#: ../filter/filter-rule.c:819
-msgid "If"
-msgstr "Если"
+#: ../filter/filter-rule.c:827
+msgid "Find items that meet the following criteria"
+msgstr "Найти элементы, которые соответствуют следующему критерию"
-#: ../filter/filter-rule.c:858
-msgid "if all criteria are met"
-msgstr "если удовлетворяет всем критериям"
+#: ../filter/filter-rule.c:866
+msgid "If all criteria are met"
+msgstr "Если удовлетворяет всем критериям"
-#: ../filter/filter-rule.c:858
-msgid "if any criteria are met"
-msgstr "если удовлетворяет любому из критериев"
+#: ../filter/filter-rule.c:866
+msgid "If any criteria are met"
+msgstr "Если удовлетворяет любому из критериев"
-#: ../filter/filter-rule.c:860
-msgid "Execute actions"
-msgstr "Выполнить действия"
+#: ../filter/filter-rule.c:868
+msgid "Find items:"
+msgstr "Найти элементы:"
-#: ../filter/filter-rule.c:881
+#: ../filter/filter-rule.c:889
msgid "All related"
msgstr "Всё связанное"
-#: ../filter/filter-rule.c:881
+#: ../filter/filter-rule.c:889
msgid "Replies"
msgstr "Ответы"
-#: ../filter/filter-rule.c:881
+#: ../filter/filter-rule.c:889
msgid "Replies and parents"
msgstr "Ответы и родительские"
-#: ../filter/filter-rule.c:883
+#: ../filter/filter-rule.c:889
+msgid "No reply or parent"
+msgstr "Не является ответом или родительским"
+
+#: ../filter/filter-rule.c:891
msgid "Include threads"
-msgstr "Включая нити"
+msgstr "Включая подшивки"
-#: ../filter/filter-rule.c:978 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:291
+#: ../filter/filter-rule.c:986 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:349
msgid "Incoming"
msgstr "Входящие"
-#: ../filter/filter-rule.c:978 ../mail/em-utils.c:292
+#: ../filter/filter-rule.c:986 ../mail/em-utils.c:350
msgid "Outgoing"
msgstr "Исходящие"
@@ -10420,7 +10691,7 @@ msgstr "Отсутствует дата."
msgid "Missing file name."
msgstr "Отсутствует имя файла."
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:65
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:71
msgid "Missing name."
msgstr "Отсутствует имя."
@@ -10492,10 +10763,6 @@ msgstr "назад"
msgid "months"
msgstr "месяцы"
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:177
-msgid "seconds"
-msgstr "секунд"
-
#: ../filter/filter.glade.h:19
msgid "the current time"
msgstr "текущее время"
@@ -10508,15 +10775,15 @@ msgstr "указанное вами время"
msgid "years"
msgstr "годы"
-#: ../filter/rule-editor.c:290
+#: ../filter/rule-editor.c:292
msgid "Add Rule"
msgstr "Добавить правило"
-#: ../filter/rule-editor.c:366
+#: ../filter/rule-editor.c:368
msgid "Edit Rule"
msgstr "Изменить правило"
-#: ../filter/rule-editor.c:698
+#: ../filter/rule-editor.c:735
msgid "Rule name"
msgstr "Имя правила"
@@ -10525,8 +10792,7 @@ msgid "Composer Preferences"
msgstr "Настройка редактора"
#: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
+msgid "Configure mail preferences, including security and message display, here"
msgstr ""
"Тут настраиваются параметры почты, включая безопасность и отображение "
"сообщений"
@@ -10563,11 +10829,11 @@ msgstr "Evolution Mail composer configuration control"
msgid "Evolution Mail preferences control"
msgstr "Evolution Mail preferences control"
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:494
-#: ../mail/importers/elm-importer.c:342
-#: ../mail/importers/netscape-importer.c:1902
-#: ../mail/importers/pine-importer.c:388 ../mail/mail-component.c:561
-#: ../mail/mail-component.c:648
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:517
+#: ../mail/importers/elm-importer.c:341
+#: ../mail/importers/netscape-importer.c:1903
+#: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:578
+#: ../mail/mail-component.c:579 ../mail/mail-component.c:664
#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
msgid "Mail"
msgstr "Почта"
@@ -10577,7 +10843,7 @@ msgid "Mail Accounts"
msgstr "Учётные записи"
#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:99
msgid "Mail Preferences"
msgstr "Настройка почты"
@@ -10585,12 +10851,12 @@ msgstr "Настройка почты"
msgid "_Mail"
msgstr "_Почта"
-#: ../mail/em-account-editor.c:387
+#: ../mail/em-account-editor.c:395
#, c-format
msgid "%s License Agreement"
msgstr "%s Лицензионное соглашение"
-#: ../mail/em-account-editor.c:394
+#: ../mail/em-account-editor.c:402
#, c-format
msgid ""
"\n"
@@ -10603,104 +10869,121 @@ msgstr ""
"для %s, приведенное ниже\n"
"и установите флажок, чтобы принять его\n"
-#: ../mail/em-account-editor.c:464 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:495
+#: ../mail/em-account-editor.c:474 ../mail/em-filter-folder-element.c:237
+#: ../mail/em-vfolder-rule.c:496
msgid "Select Folder"
msgstr "Выбрать папку"
-#: ../mail/em-account-editor.c:760
+#: ../mail/em-account-editor.c:770
msgid "Ask for each message"
msgstr "Запрашивать для каждого сообщения"
-#: ../mail/em-account-editor.c:1724 ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:1749 ../mail/mail-config.glade.h:91
msgid "Identity"
msgstr "Подлинность"
-#: ../mail/em-account-editor.c:1760 ../mail/mail-config.glade.h:117
+#: ../mail/em-account-editor.c:1798 ../mail/mail-config.glade.h:118
msgid "Receiving Email"
msgstr "Получение почты"
-#: ../mail/em-account-editor.c:1943
+#: ../mail/em-account-editor.c:1981
msgid "Automatically check for _new mail every"
msgstr "Автоматически проверять _новую почту каждые"
-#: ../mail/em-account-editor.c:2111 ../mail/mail-config.glade.h:128
+#: ../mail/em-account-editor.c:2162 ../mail/mail-config.glade.h:130
msgid "Sending Email"
msgstr "Отправка эл.почты"
-#: ../mail/em-account-editor.c:2165 ../mail/mail-config.glade.h:68
+#: ../mail/em-account-editor.c:2221 ../mail/mail-config.glade.h:68
msgid "Defaults"
msgstr "По умолчанию"
#. Security settings
-#: ../mail/em-account-editor.c:2226 ../mail/mail-config.glade.h:122
-#: ../plugins/exchange-operations/exchange-account-setup.c:313
+#: ../mail/em-account-editor.c:2287 ../mail/mail-config.glade.h:123
+#: ../plugins/exchange-operations/exchange-account-setup.c:317
msgid "Security"
msgstr "Безопасность"
#. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2263 ../mail/em-account-editor.c:2337
+#: ../mail/em-account-editor.c:2324 ../mail/em-account-editor.c:2415
msgid "Receiving Options"
msgstr "Параметры получения"
-#: ../mail/em-account-editor.c:2264 ../mail/em-account-editor.c:2338
+#: ../mail/em-account-editor.c:2325 ../mail/em-account-editor.c:2416
msgid "Checking for New Mail"
msgstr "Проверка новой почты"
-#: ../mail/em-account-editor.c:2662 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2755 ../mail/mail-config.glade.h:34
msgid "Account Editor"
msgstr "Редактор учетных записей"
-#: ../mail/em-account-editor.c:2662 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2755 ../mail/mail-config.glade.h:80
msgid "Evolution Account Assistant"
msgstr "Помощник по учетным записям Evolution"
+#: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
+#: ../mail/em-account-prefs.c:407
+msgid "Disable"
+msgstr "Отключить"
+
+#: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
+#: ../mail/em-account-prefs.c:409
+msgid "Enable"
+msgstr "Включить"
+
#. translators: default account indicator
-#: ../mail/em-account-prefs.c:455
+#: ../mail/em-account-prefs.c:459
msgid "[Default]"
msgstr "[По умолчанию]"
-#: ../mail/em-account-prefs.c:510
+#. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
+#: ../mail/em-account-prefs.c:512 ../mail/em-composer-prefs.c:930
+#: ../plugins/plugin-manager/plugin-manager.c:205
+#: ../plugins/publish-calendar/publish-calendar.c:474
+msgid "Enabled"
+msgstr "Включено"
+
+#: ../mail/em-account-prefs.c:518
msgid "Account name"
msgstr "Имя учётной записи"
-#: ../mail/em-account-prefs.c:512
+#: ../mail/em-account-prefs.c:520
msgid "Protocol"
msgstr "Протокол"
-#: ../mail/em-account-prefs.c:517
+#: ../mail/em-account-prefs.c:525
msgid "Mail Accounts Table"
msgstr "Таблица учетных записей"
-#: ../mail/em-composer-prefs.c:307 ../mail/em-composer-prefs.c:430
-#: ../mail/mail-config.c:958
+#: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
+#: ../mail/mail-config.c:967
msgid "Unnamed"
msgstr "Без названия"
-#: ../mail/em-composer-prefs.c:897
+#: ../mail/em-composer-prefs.c:936
msgid "Language(s)"
msgstr "Язык(и)"
-#: ../mail/em-composer-prefs.c:940
+#: ../mail/em-composer-prefs.c:979
msgid "Add signature script"
msgstr "Добавить скрипт подписи"
-#: ../mail/em-composer-prefs.c:960
+#: ../mail/em-composer-prefs.c:999
msgid "Signature(s)"
msgstr "Подпись(и)"
-#: ../mail/em-composer-utils.c:853 ../mail/em-format-quote.c:389
+#: ../mail/em-composer-utils.c:863 ../mail/em-format-quote.c:389
msgid "-------- Forwarded Message --------"
msgstr "-------- Пересланное сообщение --------"
-#: ../mail/em-composer-utils.c:1648
+#: ../mail/em-composer-utils.c:1658
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:1695
+#: ../mail/em-composer-utils.c:1705
msgid ""
"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
"${TimeZone}, ${Sender} wrote:"
@@ -10708,7 +10991,7 @@ msgstr ""
"В ${AbbrevWeekdayName}, ${Day}/${Month}/${Year} в ${24Hour}:${Minute} "
"${TimeZone}, ${Sender} пишет:"
-#: ../mail/em-filter-editor.c:147
+#: ../mail/em-filter-editor.c:155
msgid "_Filter Rules"
msgstr "_Правила фильтра"
@@ -10837,8 +11120,8 @@ msgstr "не является"
msgid "is not Flagged"
msgstr "не отмечено"
-#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
-#: ../ui/evolution-mail-message.xml.h:47
+#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:94
+#: ../ui/evolution-mail-message.xml.h:48
msgid "Junk"
msgstr "Спам"
@@ -10846,8 +11129,7 @@ msgstr "Спам"
msgid "Junk Test"
msgstr "Тест на спам"
-#: ../mail/em-filter-i18n.h:37 ../mail/em-folder-view.c:1063
-#: ../widgets/misc/e-expander.c:189
+#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:189
msgid "Label"
msgstr "Метка"
@@ -10887,7 +11169,7 @@ msgstr "Передать программе через канал"
msgid "Play Sound"
msgstr "Воспроизвести звук"
-#: ../mail/em-filter-i18n.h:47 ../mail/message-tag-followup.c:80
+#: ../mail/em-filter-i18n.h:47 ../mail/message-tag-followup.c:81
msgid "Read"
msgstr "Прочитанное"
@@ -10955,12 +11237,12 @@ msgstr "начинается с"
msgid "Stop Processing"
msgstr "Остановить обработку"
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1572
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1582
#: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
-#: ../mail/em-mailer-prefs.c:88 ../mail/message-list.etspec.h:13
-#: ../mail/message-tag-followup.c:330
+#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:13
+#: ../mail/message-tag-followup.c:336
#: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1131
+#: ../smime/lib/e-cert.c:1132
msgid "Subject"
msgstr "Тема"
@@ -10973,33 +11255,35 @@ msgstr "Сбросить состояние"
msgid "<b>Then</b>"
msgstr "<b>Тогда</b>"
-#: ../mail/em-folder-browser.c:134
+#: ../mail/em-folder-browser.c:144
msgid "C_reate Search Folder From Search..."
msgstr "Со_здать папку по результатам поиска..."
#. TODO: can this be done in a loop?
-#: ../mail/em-folder-properties.c:144
-msgid "Total message:"
+#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
+#: ../mail/em-folder-properties.c:145
+msgid "Total messages:"
msgid_plural "Total messages:"
msgstr[0] "Всего сообщений:"
msgstr[1] "Всего сообщений:"
msgstr[2] "Всего сообщений:"
-#: ../mail/em-folder-properties.c:156
-msgid "Unread message:"
+#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
+#: ../mail/em-folder-properties.c:158
+msgid "Unread messages:"
msgid_plural "Unread messages:"
msgstr[0] "Непрочитанных сообщений:"
msgstr[1] "Непрочитанных сообщений:"
msgstr[2] "Непрочитанных сообщений:"
-#: ../mail/em-folder-properties.c:278
+#: ../mail/em-folder-properties.c:289
#: ../plugins/groupwise-features/properties.glade.h:3
msgid "Folder Properties"
msgstr "Свойства папки"
#: ../mail/em-folder-selection-button.c:123
msgid "<click here to select a folder>"
-msgstr "<щёлкните здесь, чтобы выбрать папку>"
+msgstr "<нажмите, чтобы выбрать папку>"
#: ../mail/em-folder-selector.c:261
msgid "Create"
@@ -11009,34 +11293,35 @@ msgstr "Создать"
msgid "Folder _name:"
msgstr "_Имя папки:"
-#: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
-#: ../mail/mail-vfolder.c:937 ../mail/mail-vfolder.c:1007
+#: ../mail/em-folder-tree-model.c:203 ../mail/em-folder-tree-model.c:205
+#: ../mail/mail-vfolder.c:938 ../mail/mail-vfolder.c:1011
msgid "Search Folders"
msgstr "Папки поиска"
#. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:207 ../mail/em-folder-tree-model.c:209
+#: ../mail/em-folder-tree-model.c:209 ../mail/em-folder-tree-model.c:211
msgid "UNMATCHED"
msgstr "UNMATCHED"
-#: ../mail/em-folder-tree-model.c:469 ../mail/mail-component.c:144
+#: ../mail/em-folder-tree-model.c:484 ../mail/mail-component.c:151
msgid "Drafts"
msgstr "Черновики"
#. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:472 ../mail/mail-component.c:143
+#: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:150
+#: ../plugins/exchange-operations/exchange-folder.c:597
msgid "Inbox"
msgstr "Входящие"
-#: ../mail/em-folder-tree-model.c:475 ../mail/mail-component.c:145
+#: ../mail/em-folder-tree-model.c:490 ../mail/mail-component.c:152
msgid "Outbox"
msgstr "Исходящие"
-#: ../mail/em-folder-tree-model.c:477 ../mail/mail-component.c:146
+#: ../mail/em-folder-tree-model.c:492 ../mail/mail-component.c:153
msgid "Sent"
msgstr "Отправленные"
-#: ../mail/em-folder-tree-model.c:499 ../mail/em-folder-tree-model.c:803
+#: ../mail/em-folder-tree-model.c:514 ../mail/em-folder-tree-model.c:818
msgid "Loading..."
msgstr "Загрузка..."
@@ -11054,12 +11339,12 @@ msgstr "Перемещение папки %s"
msgid "Copying folder %s"
msgstr "Копирование папки %s"
-#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1623
+#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1634
#, c-format
msgid "Moving messages into folder %s"
msgstr "Перемещение сообщений в папку %s"
-#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1625
+#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1636
#, c-format
msgid "Copying messages into folder %s"
msgstr "Копирование сообщений в папку %s"
@@ -11068,23 +11353,24 @@ msgstr "Копирование сообщений в папку %s"
msgid "Cannot drop message(s) into toplevel store"
msgstr "Нельзя перетащить сообщение в хранилище верхнего уровня"
-#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:103
+#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:105
msgid "_Copy to Folder"
msgstr "_Копировать в папку"
-#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:113
+#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:118
msgid "_Move to Folder"
msgstr "Переместить в папку"
-#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1057
+#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1059
#, c-format
msgid "Scanning folders in \"%s\""
msgstr "Сканирование папок на \"%s\""
-#: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:44
-#: ../ui/evolution-mail-global.xml.h:22
+#: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:64
+#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:24
#: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:54 ../ui/evolution.xml.h:46
+#: ../ui/evolution-message-composer.xml.h:56 ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution.xml.h:52
msgid "_View"
msgstr "_Вид"
@@ -11105,11 +11391,11 @@ msgstr "Пере_местить..."
msgid "_New Folder..."
msgstr "_Создать папку..."
-#: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:30
+#: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:34
msgid "_Rename..."
msgstr "Пе_реименовать..."
-#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:119
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:130
msgid "_Empty Trash"
msgstr "О_чистить корзину"
@@ -11118,29 +11404,16 @@ msgstr "О_чистить корзину"
msgid "Copying `%s' to `%s'"
msgstr "Копирование `%s' в `%s'"
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:931
-#: ../mail/em-folder-view.c:946 ../mail/importers/evolution-mbox-importer.c:85
-#: ../mail/importers/evolution-outlook-importer.c:134
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:973
+#: ../mail/em-folder-view.c:988 ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-outlook-importer.c:139
msgid "Select folder"
msgstr "Выбрать папку"
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:946
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:988
msgid "C_opy"
msgstr "_Копировать"
-#: ../mail/em-folder-utils.c:503
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Переименовать папку \"%s\" в:"
-
-#: ../mail/em-folder-utils.c:505
-msgid "Rename Folder"
-msgstr "Переименование папки"
-
-#: ../mail/em-folder-utils.c:511
-msgid "Folder names cannot contain '/'"
-msgstr "Имена папок не может содержать '/'"
-
#: ../mail/em-folder-utils.c:581
#: ../plugins/groupwise-features/share-folder-common.c:141
#, c-format
@@ -11149,175 +11422,178 @@ msgstr "Создание папки `%s'"
#: ../mail/em-folder-utils.c:730
#: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:387
+#: ../plugins/groupwise-features/share-folder-common.c:384
msgid "Create folder"
msgstr "Создать новую папку"
#: ../mail/em-folder-utils.c:730
#: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:387
+#: ../plugins/groupwise-features/share-folder-common.c:384
msgid "Specify where to create the folder:"
msgstr "Укажите, где создать папку:"
-#: ../mail/em-folder-view.c:1039 ../mail/em-popup.c:546 ../mail/em-popup.c:557
-msgid "Reply to _All"
-msgstr "Ответить _всем"
-
-#: ../mail/em-folder-view.c:1040 ../ui/evolution-mail-message.xml.h:121
+#: ../mail/em-folder-view.c:1081 ../ui/evolution-mail-message.xml.h:127
msgid "_Reply to Sender"
msgstr "О_тветить отправителю"
-#: ../mail/em-folder-view.c:1041 ../mail/em-popup.c:548 ../mail/em-popup.c:559
-#: ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1083 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../ui/evolution-mail-message.xml.h:110
msgid "_Forward"
msgstr "Пе_реслать"
-#: ../mail/em-folder-view.c:1044 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:107
msgid "_Edit as New Message..."
msgstr "_Править как новое сообщение..."
-#: ../mail/em-folder-view.c:1050
+#: ../mail/em-folder-view.c:1092
msgid "U_ndelete"
msgstr "В_осстановить"
-#: ../mail/em-folder-view.c:1051 ../ui/evolution-addressbook.xml.h:36
+#: ../mail/em-folder-view.c:1093
msgid "_Move to Folder..."
msgstr "Переместить в папку..."
-#: ../mail/em-folder-view.c:1052 ../ui/evolution-addressbook.xml.h:32
+#: ../mail/em-folder-view.c:1094
msgid "_Copy to Folder..."
msgstr "_Копировать в папку..."
-#: ../mail/em-folder-view.c:1055
+#: ../mail/em-folder-view.c:1097
msgid "Mar_k as Read"
msgstr "По_метить как прочитанные"
-#: ../mail/em-folder-view.c:1056
+#: ../mail/em-folder-view.c:1098
msgid "Mark as _Unread"
msgstr "Пометить как _непрочтенные"
-#: ../mail/em-folder-view.c:1057
+#: ../mail/em-folder-view.c:1099
msgid "Mark as _Important"
msgstr "Пометить как важное"
-#: ../mail/em-folder-view.c:1058
+#: ../mail/em-folder-view.c:1100
msgid "_Mark as Unimportant"
msgstr "Пометить как неважное"
-#: ../mail/em-folder-view.c:1059
+#: ../mail/em-folder-view.c:1101
msgid "Mark as _Junk"
msgstr "Пометить как _спам"
-#: ../mail/em-folder-view.c:1060
+#: ../mail/em-folder-view.c:1102
msgid "Mark as _Not Junk"
msgstr "Пометить как _не спам"
-#: ../mail/em-folder-view.c:1061
+#: ../mail/em-folder-view.c:1103
msgid "Mark for Follo_w Up..."
msgstr "Пометить к _исполнению..."
-#: ../mail/em-folder-view.c:1069
+#: ../mail/em-folder-view.c:1105
+msgid "_Label"
+msgstr "_Метка"
+
+#: ../mail/em-folder-view.c:1106
+msgid "_None"
+msgstr "_Нет"
+
+#: ../mail/em-folder-view.c:1111
msgid "Fla_g Completed"
msgstr "_Флаг \"Завершена\""
-#: ../mail/em-folder-view.c:1070
+#: ../mail/em-folder-view.c:1112
msgid "Cl_ear Flag"
msgstr "О_чистить флаг"
-#: ../mail/em-folder-view.c:1073
+#: ../mail/em-folder-view.c:1115
msgid "Crea_te Rule From Message"
msgstr "Созда_ть правило из сообщения"
-#: ../mail/em-folder-view.c:1074
+#: ../mail/em-folder-view.c:1116
msgid "Search Folder from _Subject"
msgstr "Папка поиска по _теме"
-#: ../mail/em-folder-view.c:1075
+#: ../mail/em-folder-view.c:1117
msgid "Search Folder from Se_nder"
msgstr "Папка поиска по _отправителю"
-#: ../mail/em-folder-view.c:1076
+#: ../mail/em-folder-view.c:1118
msgid "Search Folder from _Recipients"
msgstr "Папка поиска по _получателю"
-#: ../mail/em-folder-view.c:1077
+#: ../mail/em-folder-view.c:1119
msgid "Search Folder from Mailing _List"
msgstr "Папка поиска по списку _рассылки"
-#: ../mail/em-folder-view.c:1081
+#: ../mail/em-folder-view.c:1123
msgid "Filter on Sub_ject"
msgstr "Фильтр по теме"
-#: ../mail/em-folder-view.c:1082
+#: ../mail/em-folder-view.c:1124
msgid "Filter on Sen_der"
msgstr "Фильтр по отправителю"
-#: ../mail/em-folder-view.c:1083
+#: ../mail/em-folder-view.c:1125
msgid "Filter on Re_cipients"
msgstr "Фильтр по получателям"
-#: ../mail/em-folder-view.c:1084
+#: ../mail/em-folder-view.c:1126
msgid "Filter on _Mailing List"
msgstr "Фильтр по списку рассылки"
#. default charset used in mail view
-#: ../mail/em-folder-view.c:1921 ../mail/em-folder-view.c:1965
+#: ../mail/em-folder-view.c:1968 ../mail/em-folder-view.c:2012
msgid "Default"
msgstr "По умолчанию"
-#: ../mail/em-folder-view.c:2064
+#: ../mail/em-folder-view.c:2111
#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
#: ../plugins/print-message/print-message.c:87
msgid "Print Message"
msgstr "Напечатать сообщение"
-#: ../mail/em-folder-view.c:2220
+#: ../mail/em-folder-view.c:2267
msgid "Unable to retrieve message"
msgstr "Не удается получить сообщение"
-#: ../mail/em-folder-view.c:2413
+#: ../mail/em-folder-view.c:2460
msgid "_Copy Link Location"
msgstr "_Копировать ссылку"
-#: ../mail/em-folder-view.c:2415
+#: ../mail/em-folder-view.c:2462
msgid "Create _Search Folder"
msgstr "Создать папку поиска"
-#: ../mail/em-folder-view.c:2416
+#: ../mail/em-folder-view.c:2463
msgid "_From this Address"
msgstr "_ этого адреса"
-#: ../mail/em-folder-view.c:2417
+#: ../mail/em-folder-view.c:2464
msgid "_To this Address"
msgstr "_По этому адресу"
-#: ../mail/em-folder-view.c:2698
+#: ../mail/em-folder-view.c:2818
#, c-format
msgid "Click to mail %s"
msgstr "Нажмите, чтобы написать письмо %s"
#. message-search popup match count string
-#: ../mail/em-format-html-display.c:455
+#: ../mail/em-format-html-display.c:494
#, c-format
msgid "Matches: %d"
msgstr "Совпадения: %d"
-#: ../mail/em-format-html-display.c:706 ../mail/em-format-html.c:597
+#: ../mail/em-format-html-display.c:754 ../mail/em-format-html.c:607
msgid "Unsigned"
msgstr "Не подписано"
-#: ../mail/em-format-html-display.c:706
+#: ../mail/em-format-html-display.c:754
msgid ""
"This message is not signed. There is no guarantee that this message is "
"authentic."
-msgstr ""
-"Это сообщение не подписано. Отправитель не может быть аутентифицирован."
+msgstr "Это сообщение не подписано. Отправитель не может быть аутентифицирован."
-#: ../mail/em-format-html-display.c:707 ../mail/em-format-html.c:598
+#: ../mail/em-format-html-display.c:755 ../mail/em-format-html.c:608
msgid "Valid signature"
msgstr "Подпись действительна"
-#: ../mail/em-format-html-display.c:707
+#: ../mail/em-format-html-display.c:755
msgid ""
"This message is signed and is valid meaning that it is very likely that this "
"message is authentic."
@@ -11325,11 +11601,11 @@ msgstr ""
"Это сообщение подписано действительной подписью, что удостоверяет "
"подлинность отправителя."
-#: ../mail/em-format-html-display.c:708 ../mail/em-format-html.c:599
+#: ../mail/em-format-html-display.c:756 ../mail/em-format-html.c:609
msgid "Invalid signature"
msgstr "Подпись недействительна"
-#: ../mail/em-format-html-display.c:708
+#: ../mail/em-format-html-display.c:756
msgid ""
"The signature of this message cannot be verified, it may have been altered "
"in transit."
@@ -11337,11 +11613,11 @@ msgstr ""
"Подпись этого сообщения не может быть проверена. Возможно, сообщение было "
"изменено по дороге."
-#: ../mail/em-format-html-display.c:709
+#: ../mail/em-format-html-display.c:757
msgid "Valid signature, cannot verify sender"
msgstr "Подпись действительна, не удается проверить отправителя"
-#: ../mail/em-format-html-display.c:709
+#: ../mail/em-format-html-display.c:757
msgid ""
"This message is signed with a valid signature, but the sender of the message "
"cannot be verified."
@@ -11349,37 +11625,35 @@ msgstr ""
"Это сообщение подписано действительной подписью, но отправитель сообщения не "
"может быть проверен."
-#: ../mail/em-format-html-display.c:715 ../mail/em-format-html.c:606
+#: ../mail/em-format-html-display.c:763 ../mail/em-format-html.c:616
msgid "Unencrypted"
msgstr "Не зашифровано"
-#: ../mail/em-format-html-display.c:715
+#: ../mail/em-format-html-display.c:763
msgid ""
-"This message is not encrypted. Its content may be viewed in transit across "
+"This message is not encrypted. Its content may be viewed in transit across "
"the Internet."
-msgstr ""
-"Это сообщение не зашифровано. Его содержимое может быть просмотрено в "
-"процессе передачи по Интернету."
+msgstr "Это сообщение не зашифровано. Его содержимое может быть просмотрено в процессе передачи по Интернету."
-#: ../mail/em-format-html-display.c:716 ../mail/em-format-html.c:607
+#: ../mail/em-format-html-display.c:764 ../mail/em-format-html.c:617
msgid "Encrypted, weak"
msgstr "Зашифровано, уязвимый шифр"
-#: ../mail/em-format-html-display.c:716
+#: ../mail/em-format-html-display.c:764
msgid ""
-"This message is encrypted, but with a weak encryption algorithm. It would "
-"be difficult, but not impossible for an outsider to view the content of this "
+"This message is encrypted, but with a weak encryption algorithm. It would be "
+"difficult, but not impossible for an outsider to view the content of this "
"message in a practical amount of time."
msgstr ""
"Это сообщение зашифровано с использованием уязвимого алгоритма шифрования. "
"Посторонние лица могут, хотя и с определенными трудностями, получить доступ "
"к содержимому письма за разумное время."
-#: ../mail/em-format-html-display.c:717 ../mail/em-format-html.c:608
+#: ../mail/em-format-html-display.c:765 ../mail/em-format-html.c:618
msgid "Encrypted"
msgstr "Зашифровано"
-#: ../mail/em-format-html-display.c:717
+#: ../mail/em-format-html-display.c:765
msgid ""
"This message is encrypted. It would be difficult for an outsider to view "
"the content of this message."
@@ -11387,13 +11661,13 @@ msgstr ""
"Это сообщение зашифровано. Посторонним лицам будет очень сложно просмотреть "
"содержимое этого сообщения."
-#: ../mail/em-format-html-display.c:718 ../mail/em-format-html.c:609
+#: ../mail/em-format-html-display.c:766 ../mail/em-format-html.c:619
msgid "Encrypted, strong"
msgstr "Зашифровано, стойкий шифр"
-#: ../mail/em-format-html-display.c:718
+#: ../mail/em-format-html-display.c:766
msgid ""
-"This message is encrypted, with a strong encryption algorithm. It would be "
+"This message is encrypted, with a strong encryption algorithm. It would be "
"very difficult for an outsider to view the content of this message in a "
"practical amount of time."
msgstr ""
@@ -11401,173 +11675,177 @@ msgstr ""
"Для постороннего будет очень сложным просмотреть содержимое этого сообщения "
"в разумный период времени."
-#: ../mail/em-format-html-display.c:819 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:867 ../smime/gui/smime-ui.glade.h:48
msgid "_View Certificate"
msgstr "_Просмотреть сертификат"
-#: ../mail/em-format-html-display.c:834
+#: ../mail/em-format-html-display.c:882
msgid "This certificate is not viewable"
msgstr "Этот сертификат нельзя просмотреть"
-#: ../mail/em-format-html-display.c:1116
+#: ../mail/em-format-html-display.c:1170
msgid "Completed on %B %d, %Y, %l:%M %p"
msgstr "Выполнено %d %b %Y, %l:%M %p"
-#: ../mail/em-format-html-display.c:1124
+#: ../mail/em-format-html-display.c:1178
msgid "Overdue:"
msgstr "Просрочена:"
-#: ../mail/em-format-html-display.c:1127
+#: ../mail/em-format-html-display.c:1181
msgid "by %B %d, %Y, %l:%M %p"
msgstr "от %B %d, %Y, %l:%M %p"
-#: ../mail/em-format-html-display.c:1187
+#: ../mail/em-format-html-display.c:1241
msgid "_View Inline"
msgstr "_Встроенный просмотр"
-#: ../mail/em-format-html-display.c:1188
+#: ../mail/em-format-html-display.c:1242
msgid "_Hide"
msgstr "_Скрыть"
-#: ../mail/em-format-html-display.c:1189
+#: ../mail/em-format-html-display.c:1243
msgid "_Fit to Width"
msgstr "_Уместить по ширине"
-#: ../mail/em-format-html-display.c:1190
+#: ../mail/em-format-html-display.c:1244
msgid "Show _Original Size"
msgstr "Показать _исходный размер"
-#: ../mail/em-format-html-display.c:1560
+#: ../mail/em-format-html-display.c:1663
msgid "Attachment Button"
msgstr "Кнопка вложения"
-#: ../mail/em-format-html-display.c:1767
+#: ../mail/em-format-html-display.c:1870
msgid "Select folder to save all attachments..."
msgstr "Выберите папку для сохранения всех вложений..."
-#: ../mail/em-format-html-display.c:1806
-msgid "Select folder to save selected attachments..."
-msgstr "Выберите папку для сохранения выделенных вложений..."
-
-#: ../mail/em-format-html-display.c:1814
-msgid "Save Selected..."
-msgstr "Сохранить выделенные..."
+#: ../mail/em-format-html-display.c:1917
+msgid "_Save Selected..."
+msgstr "_Сохранить выделенные..."
#. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:1881
+#: ../mail/em-format-html-display.c:1984
#, c-format
-msgid "%d attachment"
-msgid_plural "%d attachments"
-msgstr[0] "%d вложение"
-msgstr[1] "%d вложения"
-msgstr[2] "%d вложений"
+msgid "%d attachme_nt"
+msgid_plural "%d attachme_nts"
+msgstr[0] "%d вложе_ние"
+msgstr[1] "%d вложе_ния"
+msgstr[2] "%d вложе_ний"
-#: ../mail/em-format-html-display.c:1945
+#: ../mail/em-format-html-display.c:1991 ../mail/em-format-html-display.c:2067
+msgid "S_ave"
+msgstr "С_охранить"
+
+#: ../mail/em-format-html-display.c:2002
+msgid "S_ave All"
+msgstr "С_охранить все"
+
+#: ../mail/em-format-html-display.c:2061
+msgid "Toggle Attachment Bar"
+msgstr "Переключить панель вложений"
+
+#: ../mail/em-format-html-display.c:2063
msgid "No Attachment"
msgstr "Нет вложений"
-#: ../mail/em-format-html-display.c:1948
-msgid "Save All"
-msgstr "Сохранить все"
-
#: ../mail/em-format-html-print.c:130
#, c-format
msgid "Page %d of %d"
msgstr "Страница %d из %d"
-#: ../mail/em-format-html.c:473 ../mail/em-format-html.c:475
+#: ../mail/em-format-html.c:483 ../mail/em-format-html.c:485
#, c-format
msgid "Retrieving `%s'"
msgstr "Получение '%s'"
-#: ../mail/em-format-html.c:600
+#: ../mail/em-format-html.c:610
msgid "Valid signature but cannot verify sender"
msgstr "Подпись действительна, но проверить отправителя не удается"
-#: ../mail/em-format-html.c:870
+#: ../mail/em-format-html.c:880
msgid "Malformed external-body part."
msgstr "Часть external-body неверно сформирована"
-#: ../mail/em-format-html.c:900
+#: ../mail/em-format-html.c:910
#, c-format
msgid "Pointer to FTP site (%s)"
msgstr "Указатель на FTP сайт (%s)"
-#: ../mail/em-format-html.c:911
+#: ../mail/em-format-html.c:921
#, c-format
msgid "Pointer to local file (%s) valid at site \"%s\""
msgstr "Указатель на локальный файл (%s), доступный на сайте \"%s\""
-#: ../mail/em-format-html.c:913
+#: ../mail/em-format-html.c:923
#, c-format
msgid "Pointer to local file (%s)"
msgstr "Указатель на локальный файл (%s)"
-#: ../mail/em-format-html.c:934
+#: ../mail/em-format-html.c:944
#, c-format
msgid "Pointer to remote data (%s)"
msgstr "Указатель на удаленные данные (%s)"
-#: ../mail/em-format-html.c:945
+#: ../mail/em-format-html.c:955
#, c-format
msgid "Pointer to unknown external data (\"%s\" type)"
msgstr "Указатель на неизвестные внешние данные (типа \"%s\")"
-#: ../mail/em-format-html.c:1171
+#: ../mail/em-format-html.c:1181
msgid "Formatting message"
msgstr "Форматирование сообщения"
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:83
-#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:326
+#: ../mail/em-format-html.c:1474 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:85
+#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:332
msgid "From"
msgstr "От"
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:84
+#: ../mail/em-format-html.c:1474 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:86
msgid "Reply-To"
msgstr "Обратный адрес"
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:85
+#: ../mail/em-format-html.c:1474 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:87
#: ../mail/message-list.etspec.h:14
msgid "To"
msgstr "Кому"
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:86
+#: ../mail/em-format-html.c:1474 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:88
msgid "Cc"
msgstr "Копия"
-#: ../mail/em-format-html.c:1464 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:87
+#: ../mail/em-format-html.c:1474 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:89
msgid "Bcc"
msgstr "Скр.копия"
#. pseudo-header
-#: ../mail/em-format-html.c:1576 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:990
+#: ../mail/em-format-html.c:1586 ../mail/em-format-quote.c:322
+#: ../mail/em-mailer-prefs.c:1000
msgid "Mailer"
msgstr "Почтовый клиент"
#. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1603
+#: ../mail/em-format-html.c:1613
msgid "<I> (%a, %R %Z)</I>"
msgstr "<I> (%a, %R %Z)</I>"
#. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1606
+#: ../mail/em-format-html.c:1616
msgid "<I> (%R %Z)</I>"
msgstr "<I> (%R %Z)</I>"
-#: ../mail/em-format-html.c:1616 ../mail/em-format-quote.c:329
-#: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:89
+#: ../mail/em-format-html.c:1626 ../mail/em-format-quote.c:329
+#: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:91
#: ../mail/message-list.etspec.h:2
msgid "Date"
msgstr "Дата"
-#: ../mail/em-format-html.c:1639 ../mail/em-format.c:851
-#: ../mail/em-mailer-prefs.c:90
+#: ../mail/em-format-html.c:1649 ../mail/em-format.c:851
+#: ../mail/em-mailer-prefs.c:92
msgid "Newsgroups"
msgstr "Группы новостей"
@@ -11600,23 +11878,23 @@ msgstr "Ошибка проверки подписи"
msgid "Unknown error verifying signature"
msgstr "Неизвестная ошибка при проверке подписи"
-#: ../mail/em-mailer-prefs.c:101
+#: ../mail/em-mailer-prefs.c:103
msgid "Every time"
msgstr "Каждый раз"
-#: ../mail/em-mailer-prefs.c:102
+#: ../mail/em-mailer-prefs.c:104
msgid "Once per day"
msgstr "Один раз в день"
-#: ../mail/em-mailer-prefs.c:103
+#: ../mail/em-mailer-prefs.c:105
msgid "Once per week"
msgstr "Один раз в неделю"
-#: ../mail/em-mailer-prefs.c:104
+#: ../mail/em-mailer-prefs.c:106
msgid "Once per month"
msgstr "Один раз в месяц"
-#: ../mail/em-migrate.c:1198
+#: ../mail/em-migrate.c:1209
msgid ""
"The location and hierarchy of the Evolution mailbox folders has changed "
"since Evolution 1.x.\n"
@@ -11628,48 +11906,47 @@ msgstr ""
"\n"
"Подождите, пока Evolution преобразует ваши папки..."
-#: ../mail/em-migrate.c:1632
+#: ../mail/em-migrate.c:1648
#, c-format
msgid "Unable to create new folder `%s': %s"
msgstr "Не удается создать папку `%s': %s"
-#: ../mail/em-migrate.c:1658
+#: ../mail/em-migrate.c:1674
#, c-format
msgid "Unable to copy folder `%s' to `%s': %s"
msgstr "Не удается скопировать дескриптор файла: `%s' в `%s': %s"
-#: ../mail/em-migrate.c:1843
+#: ../mail/em-migrate.c:1859
#, c-format
msgid "Unable to scan for existing mailboxes at `%s': %s"
msgstr "Не удается сканировать имеющиеся почтовые ящики на `%s': %s"
-#: ../mail/em-migrate.c:2047
+#: ../mail/em-migrate.c:2063
#, c-format
msgid "Unable to open old POP keep-on-server data `%s': %s"
msgstr "Не удается открыть сохраненные на сервере POP данные '%s': %s"
-#: ../mail/em-migrate.c:2061
+#: ../mail/em-migrate.c:2077
#, c-format
msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr ""
-"Не удается создать каталог для хранения данных на сервере POP3 `%s': %s"
+msgstr "Не удается создать каталог для хранения данных на сервере POP3 `%s': %s"
-#: ../mail/em-migrate.c:2090
+#: ../mail/em-migrate.c:2106
#, c-format
msgid "Unable to copy POP3 keep-on-server data `%s': %s"
msgstr "Не удается скопировать сохраненные на сервере POP3 данные `%s': %s"
-#: ../mail/em-migrate.c:2561 ../mail/em-migrate.c:2573
+#: ../mail/em-migrate.c:2577 ../mail/em-migrate.c:2589
#, c-format
msgid "Failed to create local mail storage `%s': %s"
msgstr "Ошибка создания локального хранилища почты`%s': %s"
-#: ../mail/em-migrate.c:2693
+#: ../mail/em-migrate.c:2712
#, c-format
msgid "Unable to create local mail folders at `%s': %s"
msgstr "Не удается создать локальные почтовые папки в `%s': %s"
-#: ../mail/em-migrate.c:2711
+#: ../mail/em-migrate.c:2731
msgid ""
"Unable to read settings from previous Evolution install, `evolution/config."
"xmldb' does not exist or is corrupt."
@@ -11677,97 +11954,79 @@ msgstr ""
"Не удается прочитаь данные предыдущей установки Evolution, `evolution/config/"
"xmldb' не существует или поврежден."
-#: ../mail/em-popup.c:399
-msgid "Save As..."
-msgstr "Сохранить как..."
-
-#: ../mail/em-popup.c:424
-#, c-format
-msgid "untitled_image.%s"
-msgstr "untitled_image.%s"
-
-#: ../mail/em-popup.c:542 ../mail/em-popup.c:553
-msgid "Set as _Background"
-msgstr "Установить как _фон"
-
-#: ../mail/em-popup.c:544 ../mail/em-popup.c:555
+#: ../mail/em-popup.c:557 ../mail/em-popup.c:568
msgid "_Reply to sender"
msgstr "Ответить отп_равителю"
-#: ../mail/em-popup.c:545 ../mail/em-popup.c:556
+#: ../mail/em-popup.c:558 ../mail/em-popup.c:569
#: ../ui/evolution-mail-message.xml.h:83
msgid "Reply to _List"
msgstr "Ответить в _список"
-#: ../mail/em-popup.c:607
+#: ../mail/em-popup.c:620
msgid "_Open Link in Browser"
msgstr "_Открыть ссылку в браузере"
-#: ../mail/em-popup.c:608
+#: ../mail/em-popup.c:621
msgid "_Send New Message To..."
msgstr "_Отправить новое сообщение к..."
-#: ../mail/em-popup.c:609
-msgid "_Add to Addressbook"
+#: ../mail/em-popup.c:622
+msgid "_Add to Address Book"
msgstr "_Добавить в адресную книгу"
-#: ../mail/em-popup.c:762
-#, c-format
-msgid "Open in %s..."
-msgstr "Открыть в программе %s..."
-
-#: ../mail/em-subscribe-editor.c:614
+#: ../mail/em-subscribe-editor.c:615
msgid "This store does not support subscriptions, or they are not enabled."
msgstr "Этот сервер не поддерживает подписку, или подписка запрещена."
-#: ../mail/em-subscribe-editor.c:643
+#: ../mail/em-subscribe-editor.c:644
msgid "Subscribed"
msgstr "Подписан"
-#: ../mail/em-subscribe-editor.c:647
+#: ../mail/em-subscribe-editor.c:648
msgid "Folder"
msgstr "Папка"
#. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:862
+#: ../mail/em-subscribe-editor.c:869
msgid "Please select a server."
msgstr "Пожалуйста, выберите сервер."
-#: ../mail/em-subscribe-editor.c:883
+#: ../mail/em-subscribe-editor.c:890
msgid "No server has been selected"
msgstr "Не был выбран сервер"
-#: ../mail/em-utils.c:105
-msgid "Don't show this message again."
-msgstr "Не показывать это сообщение снова."
+#: ../mail/em-utils.c:124
+msgid "Do not show this message again."
+msgstr "Не выводить больше это сообщение."
-#: ../mail/em-utils.c:299
+#: ../mail/em-utils.c:357
msgid "Filters"
msgstr "Настройки фильтров"
-#: ../mail/em-utils.c:442 ../mail/em-utils.c:479
+#: ../mail/em-utils.c:500 ../mail/em-utils.c:537
msgid "message"
msgstr "сообщение"
-#: ../mail/em-utils.c:614
+#: ../mail/em-utils.c:672
msgid "Save Message..."
msgstr "Сохранить сообщение ..."
-#: ../mail/em-utils.c:663
+#: ../mail/em-utils.c:721
msgid "Add address"
msgstr "Добавить адрес"
#. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1142
+#: ../mail/em-utils.c:1205
#, c-format
msgid "Messages from %s"
msgstr "Сообщения от %s"
-#: ../mail/em-vfolder-editor.c:104
+#: ../mail/em-vfolder-editor.c:112
msgid "Search _Folders"
msgstr "_Папки поиска"
-#: ../mail/em-vfolder-rule.c:575
+#: ../mail/em-vfolder-rule.c:576
msgid "Search Folder source"
msgstr "Источник папок поиска"
@@ -11861,8 +12120,7 @@ msgstr "Очищать все корзины при выходе из Evolution.
#: ../mail/evolution-mail.schemas.in.in.h:23
msgid "Enable caret mode, so that you can see a cursor when reading mail."
-msgstr ""
-"Включить режим каретки, то есть вы сможете видеть курсор при чтении почты."
+msgstr "Включить режим каретки, то есть вы сможете видеть курсор при чтении почты."
#: ../mail/evolution-mail.schemas.in.in.h:24
msgid "Enable/disable caret mode"
@@ -11995,8 +12253,8 @@ msgid "Message Window default width"
msgstr "Ширина окна сообщения по умолчанию"
#: ../mail/evolution-mail.schemas.in.in.h:50
-msgid "Message-display style (normal, full headers, source)"
-msgstr "Тип отображения сообщения (нормальное, все заголовки, исходный текст)"
+msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
+msgstr "Тип отображения сообщения (\"normal\", \"full headers\", \"source\")"
#: ../mail/evolution-mail.schemas.in.in.h:51
msgid "Minimum days between emptying the trash on exit"
@@ -12025,8 +12283,7 @@ msgstr ""
"папке."
#: ../mail/evolution-mail.schemas.in.in.h:57
-msgid ""
-"Prompt the user when he or she tries to send a message without a Subject."
+msgid "Prompt the user when he or she tries to send a message without a Subject."
msgstr ""
"Предупреждать, если пользователь пытается отправить сообщение с пустым полем "
"Subject."
@@ -12049,18 +12306,15 @@ msgstr ""
msgid ""
"Prompt when user tries to send HTML mail to recipients that may not want to "
"receive HTML mail."
-msgstr ""
-"Предупреждать при отправке сообщений в формате HTML тем, кто не желает этого."
+msgstr "Предупреждать при отправке сообщений в формате HTML тем, кто не желает этого."
#: ../mail/evolution-mail.schemas.in.in.h:62
msgid "Prompt when user tries to send a message with no To or Cc recipients."
-msgstr ""
-"Предупреждать при попытке отправить сообщение с пустыми полями To и Cc."
+msgstr "Предупреждать при попытке отправить сообщение с пустыми полями To и Cc."
#: ../mail/evolution-mail.schemas.in.in.h:63
msgid "Prompt when user tries to send unwanted HTML"
-msgstr ""
-"Предупреждать, когда пользователь пытается отправить нежелательный HTML"
+msgstr "Предупреждать, когда пользователь пытается отправить нежелательный HTML"
#: ../mail/evolution-mail.schemas.in.in.h:64
msgid "Recognize links in text and replace them."
@@ -12098,14 +12352,6 @@ msgstr "Показывать удаленные сообщения (как пе
msgid "Show deleted messages in the message-list"
msgstr "Показывать удаленные сообщения в списке сообщений"
-#: ../mail/evolution-mail.schemas.in.in.h:73
-msgid "Show the \"Preview\" pane"
-msgstr "Показывать панель предварительного просмотра"
-
-#: ../mail/evolution-mail.schemas.in.in.h:74
-msgid "Show the \"Preview\" pane."
-msgstr "Показывать панель предварительного просмотра."
-
#: ../mail/evolution-mail.schemas.in.in.h:75
msgid "Sound file to play when new mail arrives."
msgstr "Звуковой файл, воспроизводимый при приходе новой почты."
@@ -12254,70 +12500,65 @@ msgstr ""
"Переходить ли к разворачиванию подшивок по теме, если сообщения не содержат "
"заголовков In-Reply-To и References."
-#: ../mail/importers/elm-importer.c:193
+#: ../mail/importers/elm-importer.c:192
msgid "Importing Elm data"
msgstr "Импорт данных Elm"
-#: ../mail/importers/elm-importer.c:382
+#: ../mail/importers/elm-importer.c:381
msgid "Evolution Elm importer"
msgstr "Evolution Elm importer"
-#: ../mail/importers/elm-importer.c:383
+#: ../mail/importers/elm-importer.c:382
msgid "Import mail from Elm."
msgstr "Импорт почты из Elm."
-#: ../mail/importers/evolution-mbox-importer.c:82
-#: ../mail/importers/evolution-outlook-importer.c:131
+#: ../mail/importers/evolution-mbox-importer.c:83
+#: ../mail/importers/evolution-outlook-importer.c:136
msgid "Destination folder:"
msgstr "Папка назначения:"
-#: ../mail/importers/evolution-mbox-importer.c:85
-#: ../mail/importers/evolution-outlook-importer.c:134
+#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/importers/evolution-outlook-importer.c:139
msgid "Select folder to import into"
msgstr "Выберите папку для импорта"
-#: ../mail/importers/evolution-mbox-importer.c:216
+#: ../mail/importers/evolution-mbox-importer.c:223
msgid "Berkeley Mailbox (mbox)"
msgstr "Berkeley Mailbox (mbox)"
-#: ../mail/importers/evolution-mbox-importer.c:217
+#: ../mail/importers/evolution-mbox-importer.c:224
msgid "Importer Berkeley Mailbox format folders"
msgstr "Импорт папок в формате Berkeley Mailbox"
-#: ../mail/importers/evolution-outlook-importer.c:257
-#: ../mail/importers/mail-importer.c:230 ../shell/e-shell-importer.c:516
+#: ../mail/importers/evolution-outlook-importer.c:262
+#: ../mail/importers/mail-importer.c:234 ../shell/e-shell-importer.c:518
#, c-format
msgid "Importing `%s'"
msgstr "Импорт `%s'"
-#: ../mail/importers/evolution-outlook-importer.c:259
-#: ../mail/importers/netscape-importer.c:1251
-msgid "Importing..."
-msgstr "Импорт..."
-
-#: ../mail/importers/evolution-outlook-importer.c:261
-#: ../mail/importers/netscape-importer.c:1253
-#: ../plugins/startup-wizard/startup-wizard.c:236
-#: ../shell/e-shell-importer.c:523
+#: ../mail/importers/evolution-outlook-importer.c:266
+#: ../mail/importers/netscape-importer.c:1254
+#: ../plugins/startup-wizard/startup-wizard.c:237
+#: ../shell/e-shell-importer.c:525
msgid "Please wait"
msgstr "Подождите пожалуйста"
-#: ../mail/importers/evolution-outlook-importer.c:305
-#: ../mail/importers/mail-importer.c:144
+#: ../mail/importers/evolution-outlook-importer.c:310
+#: ../mail/importers/mail-importer.c:148
msgid "Importing mailbox"
msgstr "Импорт из файла mailbox"
-#: ../mail/importers/mail-importer.c:373
+#: ../mail/importers/mail-importer.c:377
#, c-format
msgid "Scanning %s"
msgstr "Сканирование %s"
-#: ../mail/importers/netscape-importer.c:73
+#: ../mail/importers/netscape-importer.c:74
#, c-format
msgid "Priority Filter \"%s\""
msgstr "Фильтр приоритета \"%s\""
-#: ../mail/importers/netscape-importer.c:662
+#: ../mail/importers/netscape-importer.c:663
msgid ""
"Some of your Netscape email filters are based on\n"
"email priorities, which are not used in Evolution.\n"
@@ -12343,7 +12584,7 @@ msgstr ""
"импортированные фильтры и убедитесь, что они работают, \n"
"как и предполагалось."
-#: ../mail/importers/netscape-importer.c:686
+#: ../mail/importers/netscape-importer.c:687
msgid ""
"Some of your Netscape email filters use\n"
"the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -12354,7 +12595,7 @@ msgstr ""
"используют возможности \"Игнорировать связи\" или \"Соблюдать связи\",\n"
"не поддерживаемые в Evolution. Эти фильтры будут сброшены."
-#: ../mail/importers/netscape-importer.c:703
+#: ../mail/importers/netscape-importer.c:704
msgid ""
"Some of your Netscape email filters test the\n"
"body of emails for (in)equality to a given string,\n"
@@ -12367,23 +12608,23 @@ msgstr ""
"что не поддерживается в Evolution. Эти фильтры будут изменены\n"
"на проверку наличия (отсутствия) заданной строки в теле письма."
-#: ../mail/importers/netscape-importer.c:1250
+#: ../mail/importers/netscape-importer.c:1251
msgid "Evolution is importing your old Netscape data"
msgstr "Импорт информации из Netscape"
-#: ../mail/importers/netscape-importer.c:1707
+#: ../mail/importers/netscape-importer.c:1708
msgid "Importing Netscape data"
msgstr "Импорт данных Netscape"
-#: ../mail/importers/netscape-importer.c:1907
+#: ../mail/importers/netscape-importer.c:1908
msgid "Settings"
msgstr "Настройки"
-#: ../mail/importers/netscape-importer.c:1912
+#: ../mail/importers/netscape-importer.c:1913
msgid "Mail Filters"
msgstr "Почтовые фильтры"
-#: ../mail/importers/netscape-importer.c:1933
+#: ../mail/importers/netscape-importer.c:1934
msgid ""
"Evolution has found Netscape mail files.\n"
"Would you like them to be imported into Evolution?"
@@ -12391,43 +12632,43 @@ msgstr ""
"Найдены почтовые файлы Netscape.\n"
"Хотите импортировать их в Evolution?"
-#: ../mail/importers/pine-importer.c:230
+#: ../mail/importers/pine-importer.c:229
msgid "Importing Pine data"
msgstr "Импорт данных Pine"
-#: ../mail/importers/pine-importer.c:434
+#: ../mail/importers/pine-importer.c:433
msgid "Evolution Pine importer"
msgstr "Evolution Pine importer"
-#: ../mail/importers/pine-importer.c:435
+#: ../mail/importers/pine-importer.c:434
msgid "Import mail from Pine."
msgstr "Импорт почты из Pine"
-#: ../mail/mail-autofilter.c:78
+#: ../mail/mail-autofilter.c:79
#, c-format
msgid "Mail to %s"
msgstr "Почта к %s"
-#: ../mail/mail-autofilter.c:242 ../mail/mail-autofilter.c:281
+#: ../mail/mail-autofilter.c:243 ../mail/mail-autofilter.c:282
#, c-format
msgid "Mail from %s"
msgstr "Почта от %s"
-#: ../mail/mail-autofilter.c:265
+#: ../mail/mail-autofilter.c:266
#, c-format
msgid "Subject is %s"
msgstr "Тема %s"
-#: ../mail/mail-autofilter.c:300
+#: ../mail/mail-autofilter.c:301
#, c-format
msgid "%s mailing list"
msgstr "список рассылки %s"
-#: ../mail/mail-autofilter.c:369
+#: ../mail/mail-autofilter.c:372
msgid "Add Filter Rule"
msgstr "Добавить правило фильтра"
-#: ../mail/mail-component.c:509
+#: ../mail/mail-component.c:521
#, c-format
msgid "%d deleted"
msgid_plural "%d deleted"
@@ -12435,7 +12676,7 @@ msgstr[0] "%d удаленное"
msgstr[1] "%d удаленных"
msgstr[2] "%d удаленных"
-#: ../mail/mail-component.c:511
+#: ../mail/mail-component.c:523
#, c-format
msgid "%d junk"
msgid_plural "%d junk"
@@ -12443,7 +12684,7 @@ msgstr[0] "%d спам"
msgstr[1] "%d спам"
msgstr[2] "%d спам"
-#: ../mail/mail-component.c:534
+#: ../mail/mail-component.c:546
#, c-format
msgid "%d draft"
msgid_plural "%d drafts"
@@ -12451,7 +12692,7 @@ msgstr[0] "%d черновиков"
msgstr[1] "%d черновика"
msgstr[2] "%d черновиков"
-#: ../mail/mail-component.c:536
+#: ../mail/mail-component.c:548
#, c-format
msgid "%d sent"
msgid_plural "%d sent"
@@ -12459,7 +12700,7 @@ msgstr[0] "%d отправленное"
msgstr[1] "%d отправленных"
msgstr[2] "%d отправленных"
-#: ../mail/mail-component.c:538
+#: ../mail/mail-component.c:550
#, c-format
msgid "%d unsent"
msgid_plural "%d unsent"
@@ -12467,7 +12708,7 @@ msgstr[0] "%d неотправленное"
msgstr[1] "%d неотправленных"
msgstr[2] "%d неотправленных"
-#: ../mail/mail-component.c:542
+#: ../mail/mail-component.c:554
#, c-format
msgid "%d total"
msgid_plural "%d total"
@@ -12475,7 +12716,7 @@ msgstr[0] "%d всего"
msgstr[1] "%d всего"
msgstr[2] "%d всего"
-#: ../mail/mail-component.c:544
+#: ../mail/mail-component.c:556
#, c-format
msgid ", %d unread"
msgid_plural ", %d unread"
@@ -12483,34 +12724,58 @@ msgstr[0] ", %d непрочитанное"
msgstr[1] ", %d непрочитанных"
msgstr[2] ", %d непрочитанных"
-#: ../mail/mail-component.c:765
+#: ../mail/mail-component.c:779
msgid "New Mail Message"
msgstr "Новое почтовое сообщение"
-#: ../mail/mail-component.c:766
+#: ../mail/mail-component.c:780
msgid "_Mail Message"
msgstr "_Почтовое сообщение"
-#: ../mail/mail-component.c:767
+#: ../mail/mail-component.c:781
msgid "Compose a new mail message"
msgstr "Создать новое сообщение"
-#: ../mail/mail-component.c:773
+#: ../mail/mail-component.c:787
msgid "New Mail Folder"
msgstr "Новая почтовая папка"
-#: ../mail/mail-component.c:774
+#: ../mail/mail-component.c:788
msgid "Mail _Folder"
msgstr "По_чтовая папка"
-#: ../mail/mail-component.c:775
+#: ../mail/mail-component.c:789
msgid "Create a new mail folder"
msgstr "Создать новую почтовую папку"
-#: ../mail/mail-component.c:919
+#: ../mail/mail-component.c:933
msgid "Failed upgrading Mail settings or folders."
msgstr "Ошибка обновления параметров почты или папок."
+#: ../mail/mail-config.c:85
+msgid "I_mportant"
+msgstr "_Важное"
+
+#. red
+#: ../mail/mail-config.c:86
+msgid "_Work"
+msgstr "_Служебное"
+
+#. orange
+#: ../mail/mail-config.c:87
+msgid "_Personal"
+msgstr "_Личное"
+
+#. forest green
+#: ../mail/mail-config.c:88
+msgid "_To Do"
+msgstr "В_ыполнить"
+
+#. blue
+#: ../mail/mail-config.c:89
+msgid "_Later"
+msgstr "_Позже"
+
#: ../mail/mail-config.glade.h:1 ../mail/mail-dialogs.glade.h:1
#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
@@ -12526,12 +12791,12 @@ msgid "<b>SSL is not supported in this build of Evolution</b>"
msgstr "<b>SSL не поддерживается в этой сборке Evolution</b>"
#: ../mail/mail-config.glade.h:5
-msgid "<b>S_ignatures</b>"
-msgstr "<b>_Подписи</b> "
+msgid "<b>Sig_natures</b>"
+msgstr "<b>_Подписи</b>"
#: ../mail/mail-config.glade.h:6
msgid "<b>_Languages</b>"
-msgstr "<b>_Языки</b> "
+msgstr "<b>_Языки</b>"
#: ../mail/mail-config.glade.h:7
msgid "<small>This will make the the filter more reliable, but slower</small>"
@@ -12541,10 +12806,6 @@ msgstr "<small>Это сделает фильтр более надежным,
msgid "<span weight=\"bold\">Account Information</span>"
msgstr "<span weight=\"bold\">Описание учетной записи</span>"
-#: ../mail/mail-config.glade.h:9
-msgid "<span weight=\"bold\">Alerts</span>"
-msgstr "<span weight=\"bold\">Сигналы</span>"
-
#: ../mail/mail-config.glade.h:10
msgid "<span weight=\"bold\">Authentication Type</span>"
msgstr "<span weight=\"bold\">Тип аутентификации</span>"
@@ -12577,11 +12838,6 @@ msgstr "<span weight=\"bold\">Отображаемые _заголовки</span
msgid "<span weight=\"bold\">Filter Options</span>"
msgstr "<span weight=\"bold\">Параметры фильтра</span>"
-#: ../mail/mail-config.glade.h:18
-#: ../plugins/itip-formatter/itip-formatter.c:1977
-msgid "<span weight=\"bold\">General</span>"
-msgstr "<span weight=\"bold\">Общие</span>"
-
#: ../mail/mail-config.glade.h:19
msgid "<span weight=\"bold\">Labels and Colors</span>"
msgstr "<span weight=\"bold\">Ярлыки и цвета</span>"
@@ -12607,6 +12863,7 @@ msgid "<span weight=\"bold\">New Mail Notification</span>"
msgstr "<span weight=\"bold\">Уведомление о новой почте</span>"
#: ../mail/mail-config.glade.h:25
+#: ../plugins/publish-calendar/publish-calendar.glade.h:3
msgid "<span weight=\"bold\">Optional Information</span>"
msgstr "<span weight=\"bold\">Дополнительная информация</span>"
@@ -12689,7 +12946,7 @@ msgid "Attachment"
msgstr "Вложение"
#: ../mail/mail-config.glade.h:46
-msgid "Automatically _insert smiley images"
+msgid "Automatically insert _smiley images"
msgstr "Автоматически вставлять _изображения эмоций"
#: ../mail/mail-config.glade.h:47
@@ -12713,7 +12970,7 @@ msgid "Ch_eck for Supported Types "
msgstr "Пров_ерка поддерживаемых типов "
#: ../mail/mail-config.glade.h:52
-msgid "Check _incoming mail for junk"
+msgid "Check in_coming mail for junk"
msgstr "Проверять, _являются ли входящие сообщения спамом"
#: ../mail/mail-config.glade.h:53
@@ -12784,6 +13041,11 @@ msgstr "Готово"
msgid "Drafts _Folder:"
msgstr "Папка _черновиков:"
+#: ../mail/mail-config.glade.h:74
+#: ../plugins/publish-calendar/publish-calendar.glade.h:9
+msgid "E_nable"
+msgstr "_Включить"
+
#: ../mail/mail-config.glade.h:75
msgid "Email Accounts"
msgstr "Учетные записи"
@@ -12805,8 +13067,8 @@ msgid "Encrypt out_going messages (by default)"
msgstr "_Шифровать исходящие сообщения (по умолчанию)"
#: ../mail/mail-config.glade.h:81
-msgid "Execute Command..."
-msgstr "Выполнить команду..."
+msgid "Fi_xed width Font:"
+msgstr "_Моноширинный:"
#: ../mail/mail-config.glade.h:82
msgid "Fi_xed-width:"
@@ -12820,47 +13082,51 @@ msgstr "Свойства шрифтов"
msgid "Format messages in _HTML"
msgstr "Форматировать сообщения в _HTML"
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:85
+msgid "Full Nam_e:"
+msgstr "_Полное имя:"
+
+#: ../mail/mail-config.glade.h:87
msgid "HTML Mail"
msgstr "Почта HTML"
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:88
msgid "Headers"
msgstr "Заголовки"
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:89
msgid "Highlight _quotations with"
msgstr "Выделять _цитирование цветом:"
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:90
msgid "I_nclude remote tests"
msgstr "В_ключить удаленные тесты"
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
msgid "Inline"
msgstr "Встроенное"
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:95
msgid "Languages Table"
msgstr "Таблица языков"
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:97
msgid "Mail Configuration"
msgstr "Настройка почты"
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:98
msgid "Mail Headers Table"
msgstr "Таблица заголовков почты"
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:100
msgid "Mailbox location"
msgstr "Расположение почтового ящика"
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
msgid "Message Composer"
msgstr "Составление сообщения"
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
msgid ""
"Note: you will not be prompted for a password until you connect for the "
"first time"
@@ -12868,19 +13134,19 @@ msgstr ""
"Примечание: вам не будет предложено ввести пароль до первого подключения к "
"серверу"
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:103
msgid "Or_ganization:"
msgstr "О_рганизация:"
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
msgid "PGP/GPG _Key ID:"
msgstr "Идентификатор ключа PGP/GPG:"
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:107
msgid "Play sound file when new mail arri_ves"
msgstr "_Воспроизводить звуковой файл при приходе новой почты"
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:108
msgid ""
"Please enter a descriptive name for this account in the space below.\n"
"This name will be used for display purposes only."
@@ -12888,7 +13154,7 @@ msgstr ""
"Введите имя, описывающее эту учетную запись.\n"
"Это имя будет использоваться только на экране."
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:110
msgid ""
"Please enter information about the way you will send mail. If you are not "
"sure, ask your system administrator or Internet Service Provider."
@@ -12896,7 +13162,7 @@ msgstr ""
"Введите информацию о способе отправки электронной почты. Если вы не уверены, "
"свяжитесь со своим системным администратором или поставщиком услуг Интернета."
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
msgid ""
"Please enter your name and email address below. The \"optional\" fields "
"below do not need to be filled in, unless you wish to include this "
@@ -12906,117 +13172,117 @@ msgstr ""
"обязательны для заполнения, если только вы не хотите включать эти сведения в "
"отправляемую вами почту."
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
msgid "Please select among the following options"
msgstr "Выберите один из следующих вариантов"
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
msgid "Pr_ompt when sending messages with only Bcc recipients defined"
msgstr ""
"Пр_едупреждать при отправке сообщений, в которых определены только "
"получатели скрытой копии."
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:114
msgid "Quote original message"
msgstr "Цитировать исходное сообщение"
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:115
msgid "Quoted"
msgstr "Процитировано"
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:116
msgid "Re_member password"
msgstr "За_помнить пароль"
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
msgid "Re_ply-To:"
msgstr "_Обратный адрес:"
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
msgid "Remember _password"
msgstr "Запомнить _пароль"
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
msgid "S_elect..."
msgstr "В_ыбрать..."
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
msgid "S_tandard Font:"
msgstr "С_тандартный шрифт:"
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
msgid "Se_lect..."
msgstr "В_ыбрать..."
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:124
msgid "Select HTML fixed width font"
msgstr "Выберите шрифт HTML фиксированной ширины"
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:125
msgid "Select HTML fixed width font for printing"
msgstr "Выберите шрифт HTML фиксированной ширины для печати"
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
msgid "Select HTML variable width font"
msgstr "Выберите шрифт HTML переменной ширины"
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:127
msgid "Select HTML variable width font for printing"
msgstr "Выберите шрифт HTML переменной ширины для печати"
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:128
+msgid "Select sound file"
+msgstr "Выбрать звуковой файл"
+
+#: ../mail/mail-config.glade.h:129
msgid "Send message receipts:"
msgstr "Отправлять отчеты:"
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:131
msgid "Sending Mail"
msgstr "Отправка почты"
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:132
msgid "Sent _Messages Folder:"
msgstr "Папка _отправленных сообщений:"
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:133
msgid "Ser_ver requires authentication"
msgstr "Т_ребуется проверка подлинности"
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:134
msgid "Server _Type: "
msgstr "_Тип сервера: "
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:135
msgid "Sig_ning certificate:"
msgstr "Се_ртификат подписи:"
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:136
msgid "Signat_ure:"
msgstr "Подп_ись:"
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:137
msgid "Signatures"
msgstr "Подписи"
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:138
msgid "Signatures Table"
msgstr "Таблица подписей"
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:139
msgid "Specify _filename:"
msgstr "Имя _файла:"
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:140
msgid "Spell Checking"
msgstr "Проверка орфографии"
-#: ../mail/mail-config.glade.h:139
-msgid "T_erminal Font:"
-msgstr "Шрифт т_ерминала:"
-
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:141
msgid "T_ype: "
msgstr "_Тип: "
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:142
msgid ""
"The list of languages here reflects only the languages for which you have a "
"dictionary installed."
@@ -13024,7 +13290,7 @@ msgstr ""
"Этот список языков перечисляет только те языки, для которых у вас "
"установлены словари."
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:143
msgid ""
"The output of this script will be used as your\n"
"signature. The name you specify will be used\n"
@@ -13034,7 +13300,7 @@ msgstr ""
"в качестве вашей подписи. Имя, указанное вами,\n"
"будет использоваться только для отображения. "
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:147
msgid ""
"Type the name by which you would like to refer to this account.\n"
"For example: \"Work\" or \"Personal\""
@@ -13042,15 +13308,15 @@ msgstr ""
"Укажите имя, используемое для дальнейших обращений к этой \n"
"учетной записи. Например, \"Служебная\" или \"Личная\""
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:149 ../plugins/caldav/caldav-source.c:282
msgid "User_name:"
msgstr "_Имя пользователя:"
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.glade.h:150
msgid "V_ariable-width:"
msgstr "_Переменной ширины:"
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:151
msgid ""
"Welcome to the Evolution Mail Configuration Assistant.\n"
"\n"
@@ -13060,30 +13326,26 @@ msgstr ""
"\n"
"Нажмите \"Далее\" для начала настройки. "
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:155
msgid "_Add Signature"
msgstr "_Добавить подпись"
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:156
msgid "_Always load images from the Internet"
msgstr "_Всегда загружать изображения из Интернета"
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:157
msgid "_Do not notify me when new mail arrives"
msgstr "_Не уведомлять о приходе новой почты"
-#: ../mail/mail-config.glade.h:157
-msgid "_Don't sign meeting requests (for Outlook compatibility)"
+#: ../mail/mail-config.glade.h:158
+msgid "_Do not sign meeting requests (for Outlook compatibility)"
msgstr "_Не подписывать запросы собраний (для совместимости с Outlook)"
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:160
msgid "_Forward style:"
msgstr "Стиль _пересылки:"
-#: ../mail/mail-config.glade.h:160
-msgid "_Full Name:"
-msgstr "_Полное имя:"
-
#: ../mail/mail-config.glade.h:161
msgid "_Load images in mail from contacts"
msgstr "_Загружать изображения из почты от контактов"
@@ -13105,9 +13367,8 @@ msgid "_Path:"
msgstr "Путь:"
#: ../mail/mail-config.glade.h:167
-msgid "_Prompt when sending HTML messages to contacts that don't want them"
-msgstr ""
-"П_редупреждать при отправке сообщений в формате HTML тем, кто не желает этого"
+msgid "_Prompt when sending HTML messages to contacts that do not want them"
+msgstr "П_редупреждать при отправке сообщений в формате HTML тем, кто не желает этого"
#: ../mail/mail-config.glade.h:168
msgid "_Prompt when sending messages with an empty subject line"
@@ -13154,7 +13415,7 @@ msgid "<span weight=\"bold\">Encryption</span>"
msgstr "<span weight=\"bold\">Шифрование</span>"
#: ../mail/mail-dialogs.glade.h:5
-msgid "Case _Sensitive"
+msgid "Case _sensitive"
msgstr "Учитывать _регистр"
#: ../mail/mail-dialogs.glade.h:6 ../mail/message-tags.glade.h:2
@@ -13169,7 +13430,7 @@ msgstr "_Найти:"
msgid "Find in Message"
msgstr "Поиск в сообщении"
-#: ../mail/mail-dialogs.glade.h:10 ../mail/message-tag-followup.c:295
+#: ../mail/mail-dialogs.glade.h:10 ../mail/message-tag-followup.c:297
#: ../mail/message-tags.glade.h:3
msgid "Flag to Follow Up"
msgstr "Пометить к исполнению"
@@ -13243,26 +13504,26 @@ msgstr "со всеми локальными и активными удалён
msgid "with all local folders"
msgstr "со всеми локальными папками"
-#: ../mail/mail-folder-cache.c:855
+#: ../mail/mail-folder-cache.c:861
#, c-format
msgid "Pinging %s"
msgstr "Ping на %s"
-#: ../mail/mail-ops.c:102
+#: ../mail/mail-ops.c:104
msgid "Filtering Folder"
msgstr "Фильтрация папки"
-#: ../mail/mail-ops.c:263
+#: ../mail/mail-ops.c:265
msgid "Fetching Mail"
msgstr "Получение эл.почты"
#. sending mail, filtering failed
-#: ../mail/mail-ops.c:563
+#: ../mail/mail-ops.c:565
#, c-format
msgid "Failed to apply outgoing filters: %s"
msgstr "Ошибка применения фильтров исходящей почты: %s"
-#: ../mail/mail-ops.c:575 ../mail/mail-ops.c:604
+#: ../mail/mail-ops.c:577 ../mail/mail-ops.c:606
#, c-format
msgid ""
"Failed to append to %s: %s\n"
@@ -13271,100 +13532,100 @@ msgstr ""
"Ошибка добавления в %s: %s\n"
"Производится добавление в локальную папку \"Отправленные\"."
-#: ../mail/mail-ops.c:621
+#: ../mail/mail-ops.c:623
#, c-format
msgid "Failed to append to local `Sent' folder: %s"
msgstr "Ошибка сохранения в локальной папке \"Отправленные\": %s"
-#: ../mail/mail-ops.c:733
+#: ../mail/mail-ops.c:735
#, c-format
msgid "Sending message %d of %d"
msgstr "Отправка сообщения %d из %d"
-#: ../mail/mail-ops.c:758
+#: ../mail/mail-ops.c:760
#, c-format
msgid "Failed to send %d of %d messages"
msgstr "Не удалось отправить %d из %d сообщений"
-#: ../mail/mail-ops.c:760 ../mail/mail-send-recv.c:613
-msgid "Cancelled."
+#: ../mail/mail-ops.c:762 ../mail/mail-send-recv.c:623
+msgid "Canceled."
msgstr "Отменено."
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:764
msgid "Complete."
msgstr "Выполнено."
-#: ../mail/mail-ops.c:859
+#: ../mail/mail-ops.c:861
msgid "Saving message to folder"
msgstr "Сохранение сообщения в папке"
-#: ../mail/mail-ops.c:944
+#: ../mail/mail-ops.c:946
#, c-format
msgid "Moving messages to %s"
msgstr "Перемещение сообщений в %s"
-#: ../mail/mail-ops.c:944
+#: ../mail/mail-ops.c:946
#, c-format
msgid "Copying messages to %s"
msgstr "Копирование сообщений в %s"
-#: ../mail/mail-ops.c:1167
+#: ../mail/mail-ops.c:1169
msgid "Forwarded messages"
msgstr "Пересланные сообщения"
-#: ../mail/mail-ops.c:1210
+#: ../mail/mail-ops.c:1212
#, c-format
msgid "Opening folder %s"
msgstr "Открытие папки \"%s\""
-#: ../mail/mail-ops.c:1282
+#: ../mail/mail-ops.c:1284
#, c-format
msgid "Opening store %s"
msgstr "Открытие хранилища %s"
-#: ../mail/mail-ops.c:1360
+#: ../mail/mail-ops.c:1362
#, c-format
msgid "Removing folder %s"
msgstr "Удаление папки \"%s\""
-#: ../mail/mail-ops.c:1454
+#: ../mail/mail-ops.c:1456
#, c-format
msgid "Storing folder '%s'"
msgstr "Сохранение папки \"%s\""
-#: ../mail/mail-ops.c:1519
+#: ../mail/mail-ops.c:1521
#, c-format
msgid "Expunging and storing account '%s'"
msgstr "Очистка и сохранение учетной записи '%s'"
-#: ../mail/mail-ops.c:1520
+#: ../mail/mail-ops.c:1522
#, c-format
msgid "Storing account '%s'"
msgstr "Сохранение учётной записи '%s'"
-#: ../mail/mail-ops.c:1575
+#: ../mail/mail-ops.c:1577
msgid "Refreshing folder"
msgstr "Обновление папки"
-#: ../mail/mail-ops.c:1611 ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1613 ../mail/mail-ops.c:1664
msgid "Expunging folder"
msgstr "Очистка папки"
-#: ../mail/mail-ops.c:1659
+#: ../mail/mail-ops.c:1661
#, c-format
msgid "Emptying trash in '%s'"
msgstr "Очистка корзины в '%s'"
-#: ../mail/mail-ops.c:1660
+#: ../mail/mail-ops.c:1662
msgid "Local Folders"
msgstr "Локальные папки"
-#: ../mail/mail-ops.c:1743
+#: ../mail/mail-ops.c:1745
#, c-format
msgid "Retrieving message %s"
msgstr "Получение сообщения %s"
-#: ../mail/mail-ops.c:1853
+#: ../mail/mail-ops.c:1855
#, c-format
msgid "Retrieving %d message"
msgid_plural "Retrieving %d messages"
@@ -13372,7 +13633,7 @@ msgstr[0] "Получение %d сообщения"
msgstr[1] "Получение %d сообщений"
msgstr[2] "Получение %d сообщений"
-#: ../mail/mail-ops.c:1939
+#: ../mail/mail-ops.c:1941
#, c-format
msgid "Saving %d message"
msgid_plural "Saving %d messsages"
@@ -13380,7 +13641,7 @@ msgstr[0] "Подписывается %d сообщение"
msgstr[1] "Подписывается %d сообщения"
msgstr[2] "Подписывается %d сообщений"
-#: ../mail/mail-ops.c:1989
+#: ../mail/mail-ops.c:1991
#, c-format
msgid ""
"Unable to create output file: %s\n"
@@ -13389,7 +13650,7 @@ msgstr ""
"Не удается создать файл вывода: %s\n"
" %s"
-#: ../mail/mail-ops.c:2017
+#: ../mail/mail-ops.c:2019
#, c-format
msgid ""
"Error saving messages to: %s:\n"
@@ -13398,11 +13659,11 @@ msgstr ""
"Ошибка сохранения сообщений в: %s:\n"
" %s"
-#: ../mail/mail-ops.c:2088
+#: ../mail/mail-ops.c:2090
msgid "Saving attachment"
msgstr "Сохранение вложения"
-#: ../mail/mail-ops.c:2100
+#: ../mail/mail-ops.c:2102
#, c-format
msgid ""
"Cannot create output file: %s:\n"
@@ -13411,110 +13672,116 @@ msgstr ""
"Не удается создать файл вывода: %s\n"
" %s"
-#: ../mail/mail-ops.c:2110
+#: ../mail/mail-ops.c:2112
#, c-format
msgid "Could not write data: %s"
msgstr "Не удается записать данные: %s"
-#: ../mail/mail-ops.c:2260
+#: ../mail/mail-ops.c:2262
#, c-format
msgid "Disconnecting from %s"
msgstr "Отключение от %s"
-#: ../mail/mail-ops.c:2260
+#: ../mail/mail-ops.c:2262
#, c-format
msgid "Reconnecting to %s"
msgstr "Переподключение к %s"
-#: ../mail/mail-ops.c:2376
+#: ../mail/mail-ops.c:2378
msgid "Checking Service"
msgstr "Проверка сервиса"
#: ../mail/mail-send-recv.c:158
-msgid "Cancelling..."
+msgid "Canceling..."
msgstr "Отмена..."
-#: ../mail/mail-send-recv.c:265
+#: ../mail/mail-send-recv.c:266 ../mail/mail-send-recv.c:268
#, c-format
-msgid "Server: %s, Type: %s"
-msgstr "Сервер: %s, Тип: %s"
+msgid "<b>%s (%s)</b> : %s"
+msgstr "<b>%s (%s)</b> : %s"
-#: ../mail/mail-send-recv.c:267
+#: ../mail/mail-send-recv.c:270
#, c-format
-msgid "Path: %s, Type: %s"
-msgstr "Путь: %s, Тип: %s"
+msgid "<b>%s (%s)</b>"
+msgstr "<b>%s (%s)</b>"
-#: ../mail/mail-send-recv.c:269
+#: ../mail/mail-send-recv.c:274 ../mail/mail-send-recv.c:276
#, c-format
-msgid "Type: %s"
-msgstr "Тип: %s"
+msgid "<b>%s</b> : %s"
+msgstr "<b>%s</b> : %s"
-#: ../mail/mail-send-recv.c:320
+#: ../mail/mail-send-recv.c:278
+#, c-format
+msgid "<b>%s</b>"
+msgstr "<b>%s</b>"
+
+#: ../mail/mail-send-recv.c:329
msgid "Send & Receive Mail"
msgstr "Получение и отправка почты"
-#: ../mail/mail-send-recv.c:327
+#: ../mail/mail-send-recv.c:336
msgid "Cancel _All"
msgstr "Отменить _все"
-#: ../mail/mail-send-recv.c:416
+#: ../mail/mail-send-recv.c:425
msgid "Updating..."
msgstr "Обновление..."
-#: ../mail/mail-send-recv.c:416 ../mail/mail-send-recv.c:468
+#: ../mail/mail-send-recv.c:425 ../mail/mail-send-recv.c:478
msgid "Waiting..."
msgstr "Ожидание..."
-#: ../mail/mail-send-recv.c:699
+#: ../mail/mail-send-recv.c:709
msgid "Checking for new mail"
msgstr "Проверка новой почты"
-#: ../mail/mail-session.c:207
+#: ../mail/mail-session.c:204
+#: ../plugins/exchange-operations/exchange-config-listener.c:681
#, c-format
msgid "Enter Password for %s"
msgstr "Введите пароль для %s"
-#: ../mail/mail-session.c:209
+#: ../mail/mail-session.c:206
msgid "Enter Password"
msgstr "Ввод пароля"
-#: ../mail/mail-session.c:244
+#: ../mail/mail-session.c:241
msgid "User canceled operation."
msgstr "Операция отменена пользователем."
-#: ../mail/mail-signature-editor.c:372
+#: ../mail/mail-signature-editor.c:384
msgid "Edit signature"
msgstr "Редактирование подписи"
-#: ../mail/mail-signature-editor.c:412
+#: ../mail/mail-signature-editor.c:431
msgid "Enter a name for this signature."
msgstr "Введите имя для этой подписи."
-#: ../mail/mail-signature-editor.c:415
+#: ../mail/mail-signature-editor.c:434
#: ../plugins/groupwise-features/properties.glade.h:5
msgid "Name:"
msgstr "Имя:"
-#: ../mail/mail-tools.c:115
+#: ../mail/mail-tools.c:120
#, c-format
msgid "Could not create spool directory `%s': %s"
msgstr "Не удается создать каталог очереди '%s': %s"
-#: ../mail/mail-tools.c:143
+#: ../mail/mail-tools.c:150
#, c-format
msgid "Trying to movemail a non-mbox source `%s'"
msgstr "Попытка переместить почту из не-mbox источника `%s'"
-#: ../mail/mail-tools.c:249
+#: ../mail/mail-tools.c:256
#, c-format
msgid "Forwarded message - %s"
msgstr "Пересланное сообщение - %s"
-#: ../mail/mail-tools.c:251
+#: ../mail/mail-tools.c:258
msgid "Forwarded message"
msgstr "Пересланные сообщения"
-#: ../mail/mail-tools.c:291
+#: ../mail/mail-tools.c:298
#, c-format
msgid "Invalid folder: `%s'"
msgstr "Неверная папка: '%s'"
@@ -13534,17 +13801,16 @@ msgstr "Обновление папок поиска для '%s:%s'"
msgid "Updating Search Folders for '%s'"
msgstr "Обновление папок писка для '%s'"
-#: ../mail/mail-vfolder.c:1046
+#: ../mail/mail-vfolder.c:1050
msgid "Edit Search Folder"
msgstr "Изменить папку поиска"
-#: ../mail/mail-vfolder.c:1130
+#: ../mail/mail-vfolder.c:1134
msgid "New Search Folder"
msgstr "Новая папка поиска"
#: ../mail/mail.error.xml.h:1
-msgid ""
-"A folder named &quot;{1}&quot; already exists. Please use a different name."
+msgid "A folder named &quot;{1}&quot; already exists. Please use a different name."
msgstr "Папка с именем &quot;{1}&quot; уже существует. Используйте другое имя."
#: ../mail/mail.error.xml.h:2
@@ -13560,34 +13826,45 @@ msgstr ""
"содержимое, или выйти.\n"
#: ../mail/mail.error.xml.h:6
+#, fuzzy
msgid ""
-"A read receipt notification has been requested for &quot;{1}&quot;. Send "
-"the reciept notification to {0}?"
+"A read receipt notification has been requested for &quot;{1}&quot;. Send the "
+"receipt notification to {0}?"
msgstr ""
"Было запрошено уведомление о прочтении для &quot;{1}&quot;. Послать "
"уведомление к {0}?"
#: ../mail/mail.error.xml.h:7
msgid ""
+"A signature already exists with the name &quot;{0}&quot;. Please specify a "
+"different name."
+msgstr "Подпись с именем &quot;{1}&quot; уже существует. Используйте другое имя."
+
+#: ../mail/mail.error.xml.h:8
+msgid ""
"Adding a meaningful Subject line to your messages will give your recipients "
"an idea of what your mail is about."
msgstr ""
"Если добавить содержательную Тему к сообщению, получателю сообщения легче "
"будет понять, о чем ваше письмо."
-#: ../mail/mail.error.xml.h:8
+#: ../mail/mail.error.xml.h:9
msgid "Are you sure you want to delete this account and all its proxies?"
msgstr "Вы действительно хотите удалить эту учётную запись и все его прокси?"
-#: ../mail/mail.error.xml.h:9
+#: ../mail/mail.error.xml.h:10
msgid "Are you sure you want to delete this account?"
msgstr "Вы действительно хотите удалить эту учётную запись?"
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:11
+msgid "Are you sure you want to disable this account and delete all its proxies?"
+msgstr "Вы действительно хотите удалить эту учётную запись и все её прокси?"
+
+#: ../mail/mail.error.xml.h:12
msgid "Are you sure you want to open {0} messages at once?"
msgstr "Вы действительно хотите открыть {0} сообщений одновременно?"
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:13
msgid ""
"Are you sure you want to permanently remove all the deleted messages in all "
"folders?"
@@ -13595,7 +13872,7 @@ msgstr ""
"Вы действительно хотите окончательно уничтожить все удаленные сообщения во "
"всех папках?"
-#: ../mail/mail.error.xml.h:12
+#: ../mail/mail.error.xml.h:14
msgid ""
"Are you sure you want to permanently remove all the deleted messages in "
"folder &quot;{0}&quot;?"
@@ -13603,178 +13880,187 @@ msgstr ""
"Вы действительно хотите окончательно уничтожить все удаленные сообщения в "
"папке &quot;{0}&quot;?"
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:15
msgid "Are you sure you want to send a message in HTML format?"
msgstr "Вы действительно хотите отправить сообщение в формате HTML?"
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:16
msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr ""
-"Вы действительно хотите отправить сообщение получателям только слепой копии?"
+msgstr "Вы действительно хотите отправить сообщение получателям только слепой копии?"
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:17
msgid "Are you sure you want to send a message without a subject?"
msgstr "Вы действительно хотите отправить сообщение с пустым полем \"тема\"?"
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:18
msgid "Because &quot;{0}&quot;."
msgstr "Потому что &quot;{0}&quot;."
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:20
msgid "Because &quot;{2}&quot;."
msgstr "Потому что &quot;{2}&quot;."
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:21
+msgid "Blank Signature"
+msgstr "Пустая подпись"
+
+#: ../mail/mail.error.xml.h:22
msgid "Cannot add Search Folder &quot;{0}&quot;."
-msgstr "Не удается добавить вирт. папку &quot;{0}&quot;."
+msgstr "Не удается добавить папку поиска &quot;{0}&quot;."
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:23
msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
msgstr "Не удается скопировать папку &quot;{0}&quot; в &quot;{1}&quot;."
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:24
msgid "Cannot create folder &quot;{0}&quot;."
msgstr "Не удается создать папку &quot;{0}&quot;."
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:25
msgid "Cannot create temporary save directory."
msgstr "Не удается создать каталог для временного сохранения."
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:26
msgid "Cannot create the save directory, because &quot;{1}&quot;"
msgstr "Не удается создать каталог для сохранения, потому что &quot;{1}&quot;"
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:27
msgid "Cannot delete folder &quot;{0}&quot;."
msgstr "Не удается удалить папку &quot;{0}&quot;."
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:28
msgid "Cannot delete system folder &quot;{0}&quot;."
msgstr "Не удается удалить системную папку &quot;{0}&quot;."
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:29
msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
msgstr ""
"Не удается изменить виртуальную папку &quot;{0}&quot;, потому что такая "
"папка не существует."
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:30
msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
msgstr "Не удается переместить папку &quot;{0}&quot; to &quot;{1}&quot;."
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:31
msgid "Cannot open source &quot;{1}&quot;"
msgstr "Не удается открыть источник &quot;{1}&quot;"
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:32
msgid "Cannot open source &quot;{2}&quot;."
msgstr "Не удается открыть источник &quot;{2}&quot;."
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:33
msgid "Cannot open target &quot;{2}&quot;."
msgstr "Не удается открыть назначение &quot;{2}&quot;."
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:34
msgid ""
"Cannot read the license file &quot;{0}&quot;, due to an installation "
-"problem. You will not be able to use this provider until you can accept its "
+"problem. You will not be able to use this provider until you can accept its "
"license."
msgstr ""
"Не удается прочитать файл лицензии &quot;{0}&quot;, из-за проблемы с "
-"установкой. Вы не сможете использовать этого провайдера, пока не примете "
+"установкой. Вы не сможете использовать этого провайдера, пока не примете "
"его лицензию."
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:35
msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
msgstr "Не удается переименовать &quot;{0}&quot; в &quot;{1}&quot;."
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:36
msgid "Cannot rename or move system folder &quot;{0}&quot;."
-msgstr ""
-"Не удается переименовать или переместить системную папку &quot;{0}&quot;."
+msgstr "Не удается переименовать или переместить системную папку &quot;{0}&quot;."
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:37
msgid "Cannot save changes to account."
msgstr "Не удается сохранить изменения учетной записи."
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:38
msgid "Cannot save to directory &quot;{0}&quot;."
msgstr "Не удается сохранить в каталог &quot;{0}&quot;."
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:39
msgid "Cannot save to file &quot;{0}&quot;."
msgstr "Не удается сохранить в файл &quot;{0}&quot;."
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:40
msgid "Cannot set signature script &quot;{0}&quot;."
msgstr "Не удается установить скрипт подписи &quot;{0}&quot;."
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:41
msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
+"Check to make sure your password is spelled correctly. Remember that many "
"passwords are case sensitive; your caps lock might be on."
msgstr ""
-"Убедитесь, что ваш пароль введен правильно. Помните, что многие пароли "
-"чувствительны к регистру, поэтому клавиша \"Caps Lock\" должна быть "
-"отключена."
+"Убедитесь, что ваш пароль введен правильно. Помните, что многие пароли "
+"чувствительны к регистру, поэтому режим \"Caps Lock\" должен быть отключен."
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:42
msgid "Could not save signature file."
msgstr "Не удается сохранить файл подписи."
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:43
msgid "Delete &quot;{0}&quot;?"
msgstr "Удалить &quot;{0}&quot;?"
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:44
msgid "Delete account?"
msgstr "Удалить учетную запись?"
-#: ../mail/mail.error.xml.h:42
-msgid "Discard changed?"
+#: ../mail/mail.error.xml.h:45
+msgid "Discard changes?"
msgstr "Отклонить изменения?"
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:46
+msgid "Do not delete"
+msgstr "Не удалять"
+
+#: ../mail/mail.error.xml.h:47
+msgid "Do not disable"
+msgstr "Не отключать"
+
+#: ../mail/mail.error.xml.h:48
msgid "Do you want the operation to be performed in the subfolders?"
msgstr "Выполнить действие над подпапками?"
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:49
+msgid "Do you want to mark all the message as read?"
+msgstr "Пометить все сообщения как прочитанные?"
+
+#: ../mail/mail.error.xml.h:50
msgid "Do you wish to save your changes?"
msgstr "Сохранить изменения?"
-#: ../mail/mail.error.xml.h:45
-msgid "Don't delete"
-msgstr "Не удалять"
-
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:51
msgid "Enter password."
msgstr "Введите пароль."
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:52
msgid "Error loading filter definitions."
msgstr "Ошибка загрузки определений фильтров."
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:53
msgid "Error while performing operation."
msgstr "Ошибка при выполнении операции."
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:54
msgid "Error while {0}."
msgstr "Ошибка при {0}."
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:55
msgid "File exists but cannot overwrite it."
msgstr "Файл существует, но не может быть перезаписан."
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:56
msgid "File exists but is not a regular file."
msgstr "Файл существует, но не является обычным файлом."
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:57
msgid "If you continue, you will not be able to recover these messages."
msgstr "Если вы продолжите, вы не сможете восстановить эти сообщения."
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:58
msgid ""
"If you delete the folder, all of its contents and its subfolders contents "
"will be deleted permanently."
@@ -13782,20 +14068,23 @@ msgstr ""
"Если вы удалите эту папку, всё ее содержимое и содержимое всех подпапок "
"будет окончательно удалено."
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:59
+msgid "If you proceed, all proxy accounts will be deleted permanently."
+msgstr "Если вы продолжите, сведения о учетной записи будут безвозвратно удалены."
+
+#: ../mail/mail.error.xml.h:60
msgid ""
"If you proceed, the account information and\n"
"all proxy information will be deleted permanently."
msgstr ""
"Если вы продолжите, сведения о учетной записи и\n"
-"приложенная информация будут окончательно удалены."
+"приложенная информация будут безвозвратно удалены."
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:62
msgid "If you proceed, the account information will be deleted permanently."
-msgstr ""
-"Если вы продолжите, сведения о учетной записи будут окончательно удалены."
+msgstr "Если вы продолжите, сведения о учетной записи будут безвозвратно удалены."
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:63
msgid ""
"If you quit, these messages will not be sent until Evolution is started "
"again."
@@ -13803,19 +14092,19 @@ msgstr ""
"Если вы выйдете, эти сообщения не будут отправлены до повторного запуска "
"Evolution."
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:64
msgid "Ignore"
msgstr "Игнорировать"
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:65
msgid "Invalid authentication"
msgstr "Неподдерживаемая аутентификация"
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:66
msgid "Mail filters automatically updated."
msgstr "Почтовые фильтры автоматически обновлены."
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:67
msgid ""
"Many email systems add an Apparently-To header to messages that only have "
"BCC recipients. This header, if added, will list all of your recipients to "
@@ -13827,33 +14116,37 @@ msgstr ""
"список будет открыт. Чтобы избежать этого, следует добавить хотя бы одного "
"получателя в поле Кому: или Копия:."
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:68
msgid "Mark all messages as read"
msgstr "Пометить все сообщения как прочитанные"
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:69
msgid "Mark all messages as read in the selected folder"
msgstr "Пометить все сообщения как прочитанные в выбранной папке"
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:70
msgid "Missing folder."
msgstr "Несуществующая папка."
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:72
msgid "No sources selected."
msgstr "Не выбрано ни одного источника"
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:73
msgid "Opening too many messages at once may take a long time."
msgstr ""
"Для открытия слишком большого количества сообщений одновременно может "
"понадобиться много времени."
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:74
msgid "Please check your account settings and try again."
msgstr "Проверьте параметры вашей учетной записи и попробуйте еще раз."
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:75
+msgid "Please enable the account or send using another account."
+msgstr "Включите учетную запись или используйте для отправки другую учетную запись."
+
+#: ../mail/mail.error.xml.h:76
msgid ""
"Please enter a valid email address in the To: field. You can search for "
"email addresses by clicking on the To: button next to the entry box."
@@ -13861,7 +14154,7 @@ msgstr ""
"Введите правильный адрес эл. почты в поле \"Кому:\". Вы можете найти адрес в "
"адресной книге, нажав кнопку \"Кому:\" рядом с полем ввода."
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:77
msgid ""
"Please make sure the following recipients are willing and able to receive "
"HTML email:\n"
@@ -13873,41 +14166,49 @@ msgstr ""
"{0}\n"
"Отправить всё равно?"
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:80
+msgid "Please provide an unique name to identify this signature."
+msgstr "Введите уникальное имя для идентификации этой подписи."
+
+#: ../mail/mail.error.xml.h:81
msgid "Please wait."
msgstr "Подождите, пожалуйста."
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:82
msgid "Problem migrating old mail folder &quot;{0}&quot;."
msgstr "Проблема при преобразовании старой почтовой папки &quot;{0}&quot;."
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:83
msgid "Querying server"
msgstr "Запрашивается сервер"
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:84
msgid "Querying server for a list of supported authentication mechanisms."
msgstr ""
"Опрашивается сервер для получения списка поддерживаемых механизмов "
"аутентификации."
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:85
msgid "Read receipt requested."
msgstr "Запрошен отчет о прочтении."
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:86
msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
msgstr "Действительно удалить папку &quot;{0}&quot; и все её подпапки?"
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:87
msgid "Search Folders automatically updated."
msgstr "Папки поиска автоматически обновлены."
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:88
msgid "Send Receipt"
msgstr "Отправить отчет"
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:89
+msgid "Signature Already Exists"
+msgstr "Подпись уже существует"
+
+#: ../mail/mail.error.xml.h:90
msgid ""
"System folders are required for Ximian Evolution to function correctly and "
"cannot be renamed, moved, or deleted."
@@ -13915,7 +14216,7 @@ msgstr ""
"Системные папки требуются для правильной работы Ximian Evolution и не могут "
"быть переименованы, перемещены или удалены."
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:91
msgid ""
"The contact list you are sending to is configured to hide list recipients.\n"
"\n"
@@ -13932,7 +14233,7 @@ msgstr ""
"список будет открыт. Чтобы избежать этого, следует добавить хотя бы одного "
"получателя в поле Кому: или Копия:."
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:94
msgid ""
"The following Search Folder(s):\n"
"{0}\n"
@@ -13946,7 +14247,7 @@ msgstr ""
" &quot;{1}&quot;\n"
"и были обновлены."
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:99
msgid ""
"The following filter rule(s):\n"
"{0}\n"
@@ -13960,12 +14261,13 @@ msgstr ""
" &quot;{1}&quot;\n"
"И были обновлены."
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:104
+#, fuzzy
msgid ""
-"The message was sent via the &quot;sendmail&quot; external application. "
+"The message was sent via the &quot;sendmail&quot; external application. "
"Sendmail reports the following error: status 67: mail not sent.\n"
-"The message is stored in the Outbox folder. Check the message for errors "
-"and resend."
+"The message is stored in the Outbox folder. Check the message for errors and "
+"resend."
msgstr ""
"Сообщение было отправлено при помощи внешнего приложения &quot;"
"sendmail&quot;. Sendmail сообщил о следующей ошибке: состояние 67: почта не "
@@ -13973,11 +14275,11 @@ msgstr ""
"Сообщение сохранено в папке \"Исходящие\". Проверьте сообщение на ошибки и "
"отправьте еще раз."
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:106
msgid "The script file must exist and be executable."
msgstr "Скрипт должен существовать и быть исполняемым."
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:107
msgid ""
"This folder may have been added implicitly,\n"
"go to the Search Folder editor to add it explicitly, if required."
@@ -13985,13 +14287,17 @@ msgstr ""
"Эта папка должна быть добавлена явно,\n"
" перейдите в редактор виртуальных папок и добавьте её, если требуется."
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:109
msgid ""
-"This message cannot be sent because you have not specified any Recipients"
-msgstr ""
-"Сообщение не может быть отправлено, поскольку не указан ни один получатель"
+"This message cannot be sent because the account you chose to send with is "
+"not enabled"
+msgstr "Сообщение не может быть отправлено, потому что выбранная учетная запись отключена"
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:110
+msgid "This message cannot be sent because you have not specified any recipients"
+msgstr "Сообщение не может быть отправлено, потому что не указан ни один получатель"
+
+#: ../mail/mail.error.xml.h:111
msgid ""
"This server does not support this type of authentication and may not support "
"authentication at all."
@@ -13999,55 +14305,59 @@ msgstr ""
"Ваш сервер не поддерживает этот тип аутентификации и, возможно, не "
"поддерживает аутентификацию вообще."
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:112
msgid "This signature has been changed, but has not been saved."
msgstr "Подпись была изменена, но не была сохранена."
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:113
+msgid ""
+"This will mark all the messages as read in the selected folder and its sub "
+"folders."
+msgstr "Пометить все сообщения как прочитанные в выбранной папке и её подпапках."
+
+#: ../mail/mail.error.xml.h:114
msgid "Unable to connect to the GroupWise server."
msgstr "Не удается подключиться к серверу GroupWise."
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:115
msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
+"Unable to open the drafts folder for this account. Use the system drafts "
"folder instead?"
-msgstr ""
-"Не удается открыть папку черновиков для этой учетной записи. Использовать "
-"вместо этого системную папку черновиков?"
+msgstr "Не удается открыть папку черновиков для этой учетной записи. Использовать вместо этого системную папку черновиков?"
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:116
msgid "Unable to read license file."
msgstr "Не удается прочитать файл лицензии."
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:117
msgid "Use _Default"
msgstr "По _умолчанию"
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:118
msgid "Use default drafts folder?"
msgstr "Использовать папку черновиков по умолчанию?"
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:119
msgid "You have not filled in all of the required information."
msgstr "Вы не ввели всю необходимую информацию."
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:120
msgid "You have unsent messages, do you wish to quit anyway?"
msgstr "У вас есть неотправленные сообщения, вы действительно хотите выйти?"
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:121
msgid "You may not create two accounts with the same name."
msgstr "Вы не можете создать две учетные записи с одинаковым именем."
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:122
msgid "You must name this Search Folder."
msgstr "Укажите имя этой папки поиска."
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:123
msgid "You must specify a folder."
msgstr "Необходимо указать папку."
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:124
msgid ""
"You must specify at least one folder as a source.\n"
"Either by selecting the folders individually, and/or by selecting all local "
@@ -14057,99 +14367,98 @@ msgstr ""
"Либо указав локальные папки индивидуально, либо выбрав все локальные папки, "
"все удаленные папки, или и то и другое."
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:126
msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
-msgstr ""
-"Ошибка регистрации на сервере &quot;{0}&quot; под именем &quot;{0}&quot;."
+msgstr "Ошибка регистрации на сервере &quot;{0}&quot; под именем &quot;{0}&quot;."
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:127
msgid "Your message with the subject &quot;{0}&quot; was not delivered."
msgstr "Ваше сообщение с темой &quot;{0}&quot; не было доставлено."
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:128
msgid "_Append"
msgstr "_Добавить"
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:129
msgid "_Discard changes"
msgstr "_Отклонить изменения"
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:131
msgid "_Expunge"
msgstr "Уни_чтожить удаленные"
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:132
msgid "_Open Messages"
msgstr "_Открыть сообщения"
-#: ../mail/message-list.c:1006
+#: ../mail/message-list.c:1004
msgid "Unseen"
msgstr "Непрочитано"
-#: ../mail/message-list.c:1007
+#: ../mail/message-list.c:1005
msgid "Seen"
msgstr "Прочитано"
-#: ../mail/message-list.c:1008
+#: ../mail/message-list.c:1006
msgid "Answered"
msgstr "Отвечено"
-#: ../mail/message-list.c:1009
+#: ../mail/message-list.c:1007
msgid "Multiple Unseen Messages"
msgstr "Множество непрочитанных сообщений"
-#: ../mail/message-list.c:1010
+#: ../mail/message-list.c:1008
msgid "Multiple Messages"
msgstr "Множество сообщений"
-#: ../mail/message-list.c:1014
+#: ../mail/message-list.c:1012
msgid "Lowest"
msgstr "Самый низкий"
-#: ../mail/message-list.c:1015
+#: ../mail/message-list.c:1013
msgid "Lower"
msgstr "Низкий"
-#: ../mail/message-list.c:1019
+#: ../mail/message-list.c:1017
msgid "Higher"
msgstr "Высокий"
-#: ../mail/message-list.c:1020
+#: ../mail/message-list.c:1018
msgid "Highest"
msgstr "Самый высокий"
-#: ../mail/message-list.c:1348 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1346 ../widgets/table/e-cell-date.c:57
msgid "?"
msgstr "?"
#. strftime format of a time,
#. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1355 ../plugins/itip-formatter/itip-view.c:198
+#: ../mail/message-list.c:1353 ../plugins/itip-formatter/itip-view.c:198
#: ../widgets/table/e-cell-date.c:72
msgid "Today %l:%M %p"
msgstr "Сегодня %I:%M %p"
-#: ../mail/message-list.c:1364 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1362 ../widgets/table/e-cell-date.c:82
msgid "Yesterday %l:%M %p"
msgstr "Вчера %l:%M %p"
-#: ../mail/message-list.c:1376 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1374 ../widgets/table/e-cell-date.c:94
msgid "%a %l:%M %p"
msgstr "%a %l:%M %p"
-#: ../mail/message-list.c:1384 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1382 ../widgets/table/e-cell-date.c:102
msgid "%b %d %l:%M %p"
msgstr "%b %d %l:%M %p"
-#: ../mail/message-list.c:1386 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1384 ../widgets/table/e-cell-date.c:104
msgid "%b %d %Y"
msgstr "%b %d %Y"
-#: ../mail/message-list.c:2052
+#: ../mail/message-list.c:2068
msgid "Message List"
msgstr "Список сообщений"
-#: ../mail/message-list.c:3397
+#: ../mail/message-list.c:3446
msgid "Generating message list"
msgstr "Создание списка сообщений"
@@ -14178,42 +14487,43 @@ msgid "Received"
msgstr "Получено"
#: ../mail/message-list.etspec.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
msgid "Size"
msgstr "Размер"
-#: ../mail/message-tag-followup.c:74
+#: ../mail/message-tag-followup.c:75
msgid "Call"
msgstr "Позвонить"
-#: ../mail/message-tag-followup.c:75
+#: ../mail/message-tag-followup.c:76
msgid "Do Not Forward"
msgstr "Не пересылать"
-#: ../mail/message-tag-followup.c:76
+#: ../mail/message-tag-followup.c:77
msgid "Follow-Up"
msgstr "К исполнению"
-#: ../mail/message-tag-followup.c:77
+#: ../mail/message-tag-followup.c:78
msgid "For Your Information"
msgstr "Для сведения"
-#: ../mail/message-tag-followup.c:78 ../ui/evolution-mail-message.xml.h:41
+#: ../mail/message-tag-followup.c:79 ../ui/evolution-mail-message.xml.h:42
msgid "Forward"
msgstr "Переслать"
-#: ../mail/message-tag-followup.c:79
+#: ../mail/message-tag-followup.c:80
msgid "No Response Necessary"
msgstr "Можно не отвечать"
-#: ../mail/message-tag-followup.c:81 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:80
msgid "Reply"
msgstr "Ответить"
-#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:82
+#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:81
msgid "Reply to All"
msgstr "Ответить всем"
-#: ../mail/message-tag-followup.c:83
+#: ../mail/message-tag-followup.c:84
msgid "Review"
msgstr "Проверить"
@@ -14241,6 +14551,14 @@ msgstr "Тема содержит"
msgid "Subject or Sender contains"
msgstr "Тема или Отправитель содержит"
+#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
+msgid "Local Address Books"
+msgstr "Локальные адресные книги"
+
+#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
+msgid "Provides core functionality for local address books."
+msgstr "Предоставляет базовую функциональность для локальных адресных книг."
+
#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
msgid ""
"A formatter plugin which displays audio attachments inline and allows you to "
@@ -14289,7 +14607,8 @@ msgstr "Перезапустить Evolution"
msgid "A plugin for backing up and restore Evolution data and settings."
msgstr "Модуль для сохранения и восстановление данных и параметров Evolution."
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
+#. the path to the shared library
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
msgid "Backup and restore plugin"
msgstr "Модуль сохранения и восстановления"
@@ -14305,46 +14624,39 @@ msgstr "Сохранение и восстановление данных и п
msgid "Restore Settings..."
msgstr "Восстановить параметры..."
-#: ../plugins/bbdb/bbdb.c:410
+#: ../plugins/bbdb/bbdb.c:429
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
msgid "Automatic Contacts"
msgstr "Автоматические контакты"
-#: ../plugins/bbdb/bbdb.c:419
+#: ../plugins/bbdb/bbdb.c:438
msgid "<span weight=\"bold\">Automatic Contacts</span>"
msgstr "<span weight=\"bold\">Автоматические контакты</span>"
#. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:432
-msgid ""
-"_Automatically create entries in the addressbook when responding to mail"
+#: ../plugins/bbdb/bbdb.c:451
+msgid "_Automatically create entries in the addressbook when responding to mail"
msgstr "_Автоматически создает записи в адресной книге при ответе на сообщения"
-#: ../plugins/bbdb/bbdb.c:450
+#: ../plugins/bbdb/bbdb.c:472
msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
msgstr "<span weight=\"bold\">Контакты мгновенных сообщений</span>"
#. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:463
-msgid ""
-"Periodically synchronize contact information and images from my _instant "
-"messenger"
-msgstr ""
-"Пер_иодическая синхронизация сведений о контактах и изображений из программы "
-"обмена мгновенными сообщениями Gaim"
+#: ../plugins/bbdb/bbdb.c:485
+msgid "Periodically synchronize contact information and images from gaim buddy list"
+msgstr "Периодически синхронизирует контактную информацию и изображения из списка контактов Gaim"
#. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:470
+#: ../plugins/bbdb/bbdb.c:502
msgid "Synchronize with _buddy list now"
msgstr "Синхронизировать со списком контактов сейчас"
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
-msgid "Automatic contacts"
-msgstr "Автоматические контакты"
-
#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
msgid ""
"Automatically fills your addressbook with names and email addresses as you "
-"reply to mails. Also fills in IM contact information from your buddy lists."
+"reply to messages. Also fills in IM contact information from your buddy "
+"lists."
msgstr ""
"Автоматически добавляет в адресную книгу имена и адреса адресатов, когда вы "
"отвечаете на сообщения. Также заполняет контактные данные из списка "
@@ -14354,6 +14666,14 @@ msgstr ""
msgid "BBDB"
msgstr "BBDB"
+#: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
+msgid "CalDAV"
+msgstr "CalDAV"
+
+#: ../plugins/caldav/caldav-source.c:269
+msgid "Use _SSL"
+msgstr "Использовать _SSL"
+
#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
msgid "Local Calendars"
msgstr "Локальные календари"
@@ -14362,6 +14682,10 @@ msgstr "Локальные календари"
msgid "Provides core functionality for local calendars."
msgstr "Предоставляет базовую функциональность для локальных календарей."
+#: ../plugins/calendar-http/calendar-http.c:339
+msgid "_Secure connection"
+msgstr "Использовать _защищенное соединение"
+
#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
msgid "HTTP Calendars"
msgstr "Календари HTTP"
@@ -14444,16 +14768,14 @@ msgid "Check whether Evolution is the default mailer"
msgstr "Проверять, является ли Evolution почтовой программой по умолчанию"
#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:2
-msgid ""
-"Every time Evolution starts, check whether or not it is the default mailer."
+msgid "Every time Evolution starts, check whether or not it is the default mailer."
msgstr ""
"Проверять при каждом запуске, является ли Evolution почтовой программой по "
"умолчанию."
#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
msgid "Checks whether Evolution is the default mail client on startup."
-msgstr ""
-"Проверяет при запуске, является ли Evolution почтовым клиентом по умолчанию."
+msgstr "Проверяет при запуске, является ли Evolution почтовым клиентом по умолчанию."
#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
msgid "Default Mail Client "
@@ -14468,6 +14790,17 @@ msgstr "Сделать Evolution вашим почтовым клиентом п
msgid "Mark as default folder"
msgstr "Пометить как папку по умолчанию"
+#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
+msgid "Default Sources"
+msgstr "Источники по умолчанию"
+
+#: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
+#, fuzzy
+msgid ""
+"Provides functionallity for marking a calendar or addressbook as the default "
+"one."
+msgstr "Предоставляет базовую функциональность для календарей погоды."
+
#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
msgid "Open Other User's Folder"
msgstr "Открыть папку другого пользователя"
@@ -14510,11 +14843,11 @@ msgstr ""
"Этот параметр позволит подключиться к серверу Exchange средствами "
"стандартной аутентификации (незащищенный текстовый пароль)."
-#: ../plugins/exchange-operations/exchange-account-setup.c:253
+#: ../plugins/exchange-operations/exchange-account-setup.c:257
msgid "Out Of Office"
msgstr "Не на работе"
-#: ../plugins/exchange-operations/exchange-account-setup.c:260
+#: ../plugins/exchange-operations/exchange-account-setup.c:264
msgid ""
"The message specified below will be automatically sent to \n"
"each person who sends mail to you while you are out of the office."
@@ -14522,71 +14855,72 @@ msgstr ""
"Сообщение, указанное ниже, будет автоматически отправлено\n"
"всем лицам, приславшим вам почту во время вашего отсутствия на работе."
-#: ../plugins/exchange-operations/exchange-account-setup.c:272
-#: ../plugins/exchange-operations/exchange-account-setup.c:277
+#: ../plugins/exchange-operations/exchange-account-setup.c:276
+#: ../plugins/exchange-operations/exchange-account-setup.c:281
msgid "I am out of the office"
msgstr "Я сейчас на работе"
-#: ../plugins/exchange-operations/exchange-account-setup.c:273
-#: ../plugins/exchange-operations/exchange-account-setup.c:276
+#: ../plugins/exchange-operations/exchange-account-setup.c:277
+#: ../plugins/exchange-operations/exchange-account-setup.c:280
msgid "I am in the office"
msgstr "Я сейчас на работе"
#. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:324
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
msgid "Change the password for Exchange account"
msgstr "Изменить пароль учетной записи Exchange"
-#: ../plugins/exchange-operations/exchange-account-setup.c:326
+#: ../plugins/exchange-operations/exchange-account-setup.c:330
#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
msgid "Change Password"
msgstr "Изменить пароль"
#. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:331
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
msgid "Manage the delegate settings for Exchange account"
msgstr "Управление параметрами поручения для учетной записи Exchange"
-#: ../plugins/exchange-operations/exchange-account-setup.c:333
+#: ../plugins/exchange-operations/exchange-account-setup.c:337
msgid "Delegation Assitant"
msgstr "Помощник по поручению"
#. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:345
+#: ../plugins/exchange-operations/exchange-account-setup.c:349
msgid "Miscelleneous"
msgstr "Разное"
#. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:355
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
msgid "View the size of all Exchange folders"
msgstr "Просмотр размера всех папок Excange"
-#: ../plugins/exchange-operations/exchange-account-setup.c:357
+#: ../plugins/exchange-operations/exchange-account-setup.c:361
msgid "Folders Size"
msgstr "Размер папок"
-#: ../plugins/exchange-operations/exchange-account-setup.c:364
+#: ../plugins/exchange-operations/exchange-account-setup.c:368
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
msgid "Exchange Settings"
msgstr "Параметры Exchange"
-#: ../plugins/exchange-operations/exchange-account-setup.c:611
-msgid "_OWA Url:"
-msgstr "URL _OWA:"
+#: ../plugins/exchange-operations/exchange-account-setup.c:609
+msgid "_OWA URL:"
+msgstr "_OWA URL:"
-#: ../plugins/exchange-operations/exchange-account-setup.c:636
+#: ../plugins/exchange-operations/exchange-account-setup.c:635
msgid "A_uthenticate"
msgstr "А_утентификация"
-#: ../plugins/exchange-operations/exchange-account-setup.c:824
+#: ../plugins/exchange-operations/exchange-account-setup.c:828
msgid "Authentication Type"
msgstr "Тип аутентификации"
-#: ../plugins/exchange-operations/exchange-account-setup.c:838
+#: ../plugins/exchange-operations/exchange-account-setup.c:842
msgid "Ch_eck for Supported Types"
msgstr "Пров_ерить поддерживаемые типы"
#: ../plugins/exchange-operations/exchange-calendar.c:192
-#: ../plugins/exchange-operations/exchange-contacts.c:162
+#: ../plugins/exchange-operations/exchange-contacts.c:164
msgid ""
"Evolution is in offline mode. You cannot create or modify folders now.\n"
"Please switch to online mode for such operations."
@@ -14626,12 +14960,22 @@ msgstr "Новый пароль:"
msgid "Your current password has expired. Please change your password now."
msgstr "Срок действия вашего текущего пароля истёк. Измените пароль."
+#: ../plugins/exchange-operations/exchange-config-listener.c:633
+#, c-format
+msgid "Your password will expire in the next %d days"
+msgstr "Срок действия вашего пароля истекает через %d дней"
+
#: ../plugins/exchange-operations/exchange-delegates-user.c:144
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:576
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
msgid "Custom"
msgstr "Настраиваемый"
#: ../plugins/exchange-operations/exchange-delegates-user.c:191
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
+msgid "Delegate Permissions"
+msgstr "Права представителя"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:202
#: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
#, c-format
msgid "Permissions for %s"
@@ -14646,34 +14990,34 @@ msgstr "Поручить"
msgid "Remove the delegate %s?"
msgstr "Удалить представителя %s?"
-#: ../plugins/exchange-operations/exchange-delegates.c:679
+#: ../plugins/exchange-operations/exchange-delegates.c:680
msgid "Could not access Active Directory"
msgstr "Нет доступа к Active Directory"
-#: ../plugins/exchange-operations/exchange-delegates.c:694
+#: ../plugins/exchange-operations/exchange-delegates.c:692
msgid "Could not find self in Active Directory"
msgstr "Не удается найти себя в Active Directory"
-#: ../plugins/exchange-operations/exchange-delegates.c:707
+#: ../plugins/exchange-operations/exchange-delegates.c:705
#, c-format
msgid "Could not find delegate %s in Active Directory"
msgstr "Не удается найти представителя %s в Active Directory"
-#: ../plugins/exchange-operations/exchange-delegates.c:719
+#: ../plugins/exchange-operations/exchange-delegates.c:717
#, c-format
msgid "Could not remove delegate %s"
msgstr "Не удается удалить представителя %s"
-#: ../plugins/exchange-operations/exchange-delegates.c:779
+#: ../plugins/exchange-operations/exchange-delegates.c:777
msgid "Could not update list of delegates."
msgstr "Не удается обновить список представителей."
-#: ../plugins/exchange-operations/exchange-delegates.c:797
+#: ../plugins/exchange-operations/exchange-delegates.c:795
#, c-format
msgid "Could not add delegate %s"
msgstr "Не удается добавить представителя %s"
-#: ../plugins/exchange-operations/exchange-delegates.c:965
+#: ../plugins/exchange-operations/exchange-delegates.c:963
msgid "Error reading delegates list."
msgstr "Ошибка чтения списка представителей."
@@ -14681,35 +15025,33 @@ msgstr "Ошибка чтения списка представителей."
msgid "Author (read, create)"
msgstr "Автор (чтение, создание)"
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:2
+#. Translators: This is used for permissions for <user> for the folder Calendar.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
msgid "C_alendar:"
msgstr "К_алендарь:"
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
+#. Translators: This is used for permissions for <user> for the folder Contacts.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
msgid "Co_ntacts:"
msgstr "Ко_нтакты:"
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:4
-msgid "Delegate Permissions"
-msgstr "Права представителя"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
msgid "Delegates"
msgstr "Представители"
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
msgid "Editor (read, create, edit)"
msgstr "Редактор (чтение, создание, изменение)"
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
msgid "Permissions for"
msgstr "Права для"
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
msgid "Reviewer (read-only)"
msgstr "Обозреватель (только чтение)"
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:12
msgid ""
"These users will be able to send mail on your behalf\n"
"and access your folders with the permissions you give them."
@@ -14718,15 +15060,17 @@ msgstr ""
"имени и получат доступ к вашим папкам с правами,\n"
"которые вы им предоставите."
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:12
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:14
msgid "_Delegate can see private items"
msgstr "_Представитель может видеть личные элементы"
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:14
+#. Translators: This is used for permissions for <user> for the folder Inbox.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:17
msgid "_Inbox:"
msgstr "_Входящие:"
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
+#. Translators: This is used for permissions for <user> for the folder Tasks.
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:19
msgid "_Tasks:"
msgstr "_Задачи:"
@@ -14735,45 +15079,66 @@ msgstr "_Задачи:"
msgid "Permissions..."
msgstr "Права доступа..."
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:136
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:135
msgid "Folder Name"
msgstr "Имя папки"
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:140
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:139
msgid "Folder Size"
msgstr "Размер папки"
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:279
+#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
+msgid "Subscribe to Other User's Folder"
+msgstr "Подписка на папку другого пользователя"
+
#: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
msgid "Exchange Folder Tree"
msgstr "Дерево папок Exchange"
-#: ../plugins/exchange-operations/exchange-folder.c:62
-#: ../plugins/exchange-operations/exchange-folder.c:223
-#: ../plugins/exchange-operations/exchange-folder.c:233
+#: ../plugins/exchange-operations/exchange-folder.c:66
+#: ../plugins/exchange-operations/exchange-folder.c:229
+#: ../plugins/exchange-operations/exchange-folder.c:239
msgid "Unsubscribe Folder..."
msgstr "Отписаться от папки..."
-#: ../plugins/exchange-operations/exchange-folder.c:460
-#: ../plugins/exchange-operations/exchange-folder.c:520
+#: ../plugins/exchange-operations/exchange-folder.c:463
+#: ../plugins/exchange-operations/exchange-folder.c:523
#, c-format
msgid "Really unsubscribe from folder \"%s\"?"
msgstr "Действительно отписаться от папки \"%s\"?"
-#: ../plugins/exchange-operations/exchange-folder.c:472
-#: ../plugins/exchange-operations/exchange-folder.c:532
+#: ../plugins/exchange-operations/exchange-folder.c:475
+#: ../plugins/exchange-operations/exchange-folder.c:535
#, c-format
msgid "Unsubscribe from \"%s\""
msgstr "Отписаться от \"%s\""
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:301
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
+msgid "Password Expiry Warning..."
+msgstr "Срок действия пароля истекает"
+
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:2
+msgid "Your password will expire in 7 days..."
+msgstr "Срок действия вашего пароля истекает через 7 дней..."
+
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:3
+msgid "_Change Password"
+msgstr "_Изменить пароль"
+
+#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:4
+msgid "ok_button"
+msgstr "ok_button"
+
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:305
msgid "(Permission denied.)"
msgstr "(Доступ запрещен.)"
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:409
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
msgid "Add User:"
msgstr "Добавить пользователя:"
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:409
+#: ../plugins/exchange-operations/exchange-permissions-dialog.c:413
msgid "Add User"
msgstr "Добавить пользователя"
@@ -14838,7 +15203,7 @@ msgid "Select User"
msgstr "Выберите пользователя"
#: ../plugins/exchange-operations/exchange-user-dialog.c:182
-msgid "Addressbook..."
+msgid "Address Book..."
msgstr "Адресная книга..."
#: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:1
@@ -14849,6 +15214,16 @@ msgstr "Подписка на контакты другого пользоват
msgid "Subscribe to Other User's Calendar"
msgstr "Подписка на календарь другого пользователя"
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
+msgid ""
+"A plugin that handles a collection of Exchange account specific operations "
+"and features."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
+msgid "Exchange Operations"
+msgstr "Параметры Exchange"
+
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
msgid "Cannot change password due to configuration problems."
msgstr "Не удается изменить пароль из-за проблем с настройкой."
@@ -14885,67 +15260,66 @@ msgstr ""
"и попробуйте еще раз."
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:9
+msgid "Could not connect to Exchange server."
+msgstr "Не удается подключиться к серверу Exchange"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
msgid "Could not connect to server {0}."
msgstr "Не удается подключиться к серверу {0}."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:10
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
msgid "Could not determine folder permissions for delegates."
msgstr "Не удается определить права папки для представителей."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
msgid "Could not find Exchange Web Storage System."
msgstr "Не удается найти Exchange Web Storage System."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
msgid "Could not locate server {0}."
msgstr "Не удается найти сервер {0}."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
msgid "Could not make {0} a delegate"
msgstr "Не удается сделать {0} представителем"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
msgid "Could not read folder permissions"
msgstr "Не удается прочитать права папки"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
msgid "Could not read folder permissions."
msgstr "Не удается прочитать права папки."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
msgid "Could not read out-of-office state"
msgstr "Не удается прочитать состояние \"не-на-работе\""
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
msgid "Could not update folder permissions."
msgstr "Не удается обновить права папки."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
msgid "Could not update out-of-office state"
msgstr "Не удается обновить состояние \"не-на-работе\""
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
msgid "Exchange Account is offline."
msgstr "Учетная запись Exchange отключена."
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
-msgid "Exchange Connector access error."
-msgstr "Ошибка доступа Exchange Connector."
-
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
msgid ""
"Exchange Connector requires access to certain\n"
"functionality on the Exchange Server that appears\n"
-"to be disabled or blocked. (This is usually \n"
-"unintentional.) Your Exchange Administrator will \n"
+"to be disabled or blocked. (This is usually \n"
+"unintentional.) Your Exchange Administrator will \n"
"need to enable this functionality in order for \n"
-"you to be able to use Ximian Connector.\n"
+"you to be able to use Evolution Exchange Connector.\n"
"\n"
"For information to provide to your Exchange \n"
"administrator, please follow the link below:\n"
"\n"
-"http://support.novell.com/cgi-bin/search/searchtid.cgi?/ximian/ximian328."
-"html\n"
+"{0}\n"
" "
msgstr ""
"Exchange Connector требует доступа к некоторой\n"
@@ -14958,8 +15332,7 @@ msgstr ""
"Чтобы предоставить дополнительные сведения\n"
"вашему администратору Exchange, следуйте по ссылке:\n"
"\n"
-"http://support.novell.com/cgi-bin/search/searchtid.cgi?/ximian/ximian328."
-"html\n"
+"{0}\n"
" "
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:33
@@ -14979,7 +15352,7 @@ msgid "Folder offline"
msgstr "Папка отключена"
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
-#: ../shell/e-shell.c:1265
+#: ../shell/e-shell.c:1269
msgid "Generic error"
msgstr "Общая ошибка"
@@ -15049,11 +15422,9 @@ msgstr "Сервер Exchange несовместим с Exchange Connector."
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
msgid ""
-"The server is runinng Exchange 5.5. Exchange Connector \n"
+"The server is running Exchange 5.5. Exchange Connector \n"
"supports Microsoft Exchange 2000 and 2003 only."
-msgstr ""
-"На этом сервере работает Exchange 5.5.\n"
-" Exchange Connector поддерживает только Microsoft Exchange 2000 и 2003."
+msgstr "На этом сервере работает Exchange 5.5. Exchange Connector\n поддерживает только Microsoft Exchange 2000 и 2003."
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
msgid ""
@@ -15097,15 +15468,15 @@ msgid "Unsupported operation"
msgstr "Неподдерживаемое действие"
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
-msgid "You are nearing your quota available for storing mails on this server."
-msgstr "Вы почти достигли квоту сохранения сообщений на этом сервере."
+msgid "You are nearing your quota available for storing mail on this server."
+msgstr "Вы почти достигли квоты сохранения сообщений на этом сервере."
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
msgid "You cannot make yourself your own delegate"
msgstr "Вы не можете сделать себя своим представителем"
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
-msgid "You have exceeded your quota for storing mails on this server."
+msgid "You have exceeded your quota for storing mail on this server."
msgstr "Вы превысили квоту для сохранения сообщений на этом сервере."
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
@@ -15114,27 +15485,21 @@ msgstr "Вы можете настроить только одну учетну
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
msgid ""
-"Your current usage is : {0}KB. Try to clear up some space by deleting some "
-"mails."
-msgstr ""
-"Сейчас вы используете: {0}KB. Попробуйте очистить место, удалив какое-то "
-"количество сообщений."
+"Your current usage is: {0} KB. Try to clear up some space by deleting some "
+"mail."
+msgstr "Сейчас вы используете: {0}KB. Попробуйте очистить место, удалив некоторое количество сообщений."
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
msgid ""
-"Your current usage is : {0}KB. You will not be able to either send or "
-"recieve mails now."
-msgstr ""
-"Сейчас вы используете: {0}KB. Вы не сможете ни отправлять, ни получать "
-"сообщения."
+"Your current usage is: {0} KB. You will not be able to either send or "
+"receive mail now."
+msgstr "Сейчас вы используете: {0}KB. Вы не сможете ни отправлять, ни получать сообщения."
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
msgid ""
-"Your current usage is : {0}KB. You will not be able to send mails till you "
-"clear up some space by deleting some mails."
-msgstr ""
-"Сейчас вы используете: {0}KB. Вы не сможете отправлять сообщения, пока не "
-"очистите место путем удаления некоторого количества сообщений."
+"Your current usage is: {0} KB. You will not be able to send mail until you "
+"clear up some space by deleting some mail."
+msgstr "Сейчас вы используете: {0}KB. Вы не сможете отправлять сообщения, пока не очистите место путем удаления некоторого количества сообщений."
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
msgid "Your password has expired."
@@ -15160,10 +15525,6 @@ msgstr "Подписаться на задачи другого пользова
msgid "Check folder permissions"
msgstr "Проверьте права папки"
-#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
-msgid "Subscribe to Other User's Folder"
-msgstr "Подписка на папку другого пользователя"
-
#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:57
#, c-format
msgid "Unsubscribing from folder \"%s\""
@@ -15171,8 +15532,7 @@ msgstr "Отмена подписки на папку \"%s\""
#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
msgid "Allows unsubscribing of mail folders in the folder tree context menu."
-msgstr ""
-"Позволяет отменять подписку на почтовые папки в контекстном меню папки."
+msgstr "Позволяет отменять подписку на почтовые папки в контекстном меню папки."
#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
msgid "Unsubscribe Folders"
@@ -15199,7 +15559,7 @@ msgid "Junk Mail Settings..."
msgstr "..."
#: ../plugins/groupwise-features/junk-settings.glade.h:1
-msgid "<b>Junk List :</b>"
+msgid "<b>Junk List:</b>"
msgstr "<b>Список спама:</b>"
#: ../plugins/groupwise-features/junk-settings.glade.h:2
@@ -15228,6 +15588,7 @@ msgid "Add Send Options to groupwise messages"
msgstr "Добавить Параметры Отправки к сообщениям groupwise"
#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
+#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
#: ../widgets/misc/e-send-options.glade.h:17
msgid "Send Options"
msgstr "Параметры отправки"
@@ -15245,11 +15606,11 @@ msgid "Accept Tentatively"
msgstr "Принять в порядке эксперимента"
#: ../plugins/groupwise-features/properties.glade.h:2
-msgid "<b>Users :</b>"
-msgstr "<b>Пользователи:</b> "
+msgid "<b>Users:</b>"
+msgstr "<b>Пользователи:</b>"
#: ../plugins/groupwise-features/properties.glade.h:4
-#: ../widgets/table/e-table-click-to-add.c:510
+#: ../widgets/table/e-table-click-to-add.c:509
msgid "Message"
msgstr "Сообщение"
@@ -15266,7 +15627,7 @@ msgid "_Contacts..."
msgstr "_Контакты..."
#: ../plugins/groupwise-features/properties.glade.h:12
-msgid "_Cutomize notification message"
+msgid "_Customize notification message"
msgstr "_Настроить сообщение уведомления"
#: ../plugins/groupwise-features/properties.glade.h:13
@@ -15318,7 +15679,7 @@ msgid "Subscribe to my _notifications"
msgstr "Подписаться на мои _уведомления"
#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:126
msgid "_Read"
msgstr "_Чтение"
@@ -15330,13 +15691,6 @@ msgstr "_Запись"
msgid "Proxy"
msgstr "Прокси"
-#: ../plugins/groupwise-features/proxy-listing.glade.h:2
-#: ../smime/gui/smime-ui.glade.h:49
-#: ../widgets/table/e-table-config-no-group.glade.h:20
-#: ../widgets/table/e-table-config.glade.h:21
-msgid "dialog1"
-msgstr "dialog1"
-
#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1
msgid "<b>Account Name</b>"
msgstr "<b>Имя учётной записи</b>"
@@ -15345,19 +15699,23 @@ msgstr "<b>Имя учётной записи</b>"
msgid "Proxy Login"
msgstr "Учетная запись прокси"
-#: ../plugins/groupwise-features/proxy-login.c:219
-#: ../plugins/groupwise-features/proxy-login.c:261
-#: ../plugins/groupwise-features/proxy.c:497
+#: ../plugins/groupwise-features/proxy-login.c:220
+#: ../plugins/groupwise-features/proxy-login.c:263
+#: ../plugins/groupwise-features/proxy.c:502
#: ../plugins/groupwise-features/send-options.c:83
#, c-format
msgid "%sEnter password for %s (user %s)"
msgstr "%sВведите пароль для %s (пользователь %s)"
-#: ../plugins/groupwise-features/proxy-login.c:484
+#: ../plugins/groupwise-features/proxy-login.c:505
msgid "_Proxy Login..."
msgstr "Учетная запись _прокси..."
-#: ../plugins/groupwise-features/proxy.c:679
+#: ../plugins/groupwise-features/proxy.c:698
+msgid "The Proxy tab will be available only when the account is online."
+msgstr "Вкладка \"Прокси\" будет доступна только в том случае, когда учетная запись включена."
+
+#: ../plugins/groupwise-features/proxy.c:703
msgid "The Proxy tab will be available only when the account is enabled."
msgstr ""
"Вкладка \"Прокси\" будет доступна только в том случае, когда учетная запись "
@@ -15375,91 +15733,209 @@ msgstr "Введите пользователей и установите пра
msgid "New _Shared Folder..."
msgstr "Новая _общая папка..."
-#: ../plugins/groupwise-features/share-folder-common.c:453
+#: ../plugins/groupwise-features/share-folder-common.c:446
msgid "Sharing"
msgstr "Общий доступ"
-#: ../plugins/groupwise-features/status-track.c:235
+#: ../plugins/groupwise-features/status-track.c:242
msgid "Track Message Status..."
msgstr "Отслеживать состояние сообщения..."
-#: ../plugins/itip-formatter/itip-formatter.c:724
+#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
+msgid "A plugin to setup hula calendar sources."
+msgstr "Модуль для настройки источников календарей Hula."
+
+#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
+msgid "Hula Account Setup"
+msgstr "Настройка учетной записи Hula"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:83
+msgid "_Import to Calendar"
+msgstr "_Импортировать в календарь"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:88
+msgid "_Import to Tasks"
+msgstr "_Импортировать в задачи"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:197
+msgid "Import ICS"
+msgstr "Импорт ICS"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:225
+msgid "Select Task List"
+msgstr "Выберите список задач"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:229
+msgid "Select Calendar"
+msgstr "Выберите календарь"
+
+#: ../plugins/import-ics-attachments/icsimporter.c:260
+#: ../shell/e-shell-importer.c:703
+msgid "_Import"
+msgstr "_Импорт"
+
+#: ../plugins/ipod-sync/ical-format.c:137
+#: ../plugins/save-calendar/ical-format.c:137
+msgid "iCalendar format (.ics)"
+msgstr "Формат iCalendar (.ics)"
+
+#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
+msgid "Synchronize the selected task/calendar/addressbook with Apple iPod"
+msgstr "Синхронизирует выделенную задачу/календарь/адресную книгу с Apple iPod"
+
+#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
+msgid "Synchronize to iPod"
+msgstr "Синхронизирует с iPod"
+
+#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
+msgid "iPod Synchronization"
+msgstr "Синхронизация с iPod"
+
+#: ../plugins/ipod-sync/sync.c:158
+msgid "No output directory!"
+msgstr "Нет каталога вывода!"
+
+#: ../plugins/ipod-sync/sync.c:159
+msgid ""
+"The output directory was not found on iPod! Please ensure that iPod has been "
+"correctly set up and try again."
+msgstr "Каталог вывода не найден на iPod! Убедитесь, что iPod корректно настроен, и попробуйте еще раз."
+
+#: ../plugins/ipod-sync/sync.c:174 ../plugins/ipod-sync/sync.c:202
+msgid "Could not export data!"
+msgstr "Не удается экспортировать данные!"
+
+#: ../plugins/ipod-sync/sync.c:203
+msgid "Exporting data failed."
+msgstr "Сбой экспорта данных."
+
+#: ../plugins/ipod-sync/sync.c:231
+msgid "Could not open addressbook!"
+msgstr "Не удается открыть адресную книгу!"
+
+#: ../plugins/ipod-sync/sync.c:232
+msgid "Could not open the Evolution addressbook to export data."
+msgstr "Не удается открыть адресную книгу Evolution для экспорта данных."
+
+#: ../plugins/ipod-sync/sync.c:291
+msgid "Could not open calendar/todo!"
+msgstr "Не удается открыть календарь/todo!"
+
+#: ../plugins/ipod-sync/sync.c:292
+msgid "Could not open the Evolution calendar/todo list to export data."
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:275
+#: ../plugins/itip-formatter/itip-formatter.c:392
+#, c-format
+msgid "Failed to load the calendar '%s'"
+msgstr "Не удаётся загрузить календарь '%s'"
+
+#: ../plugins/itip-formatter/itip-formatter.c:407
+#, c-format
+msgid "An appointment in the calendar '%s' conflicts with this meeting"
+msgstr "Встреча в календаре '%s' конфликтует с этим собранием"
+
+#: ../plugins/itip-formatter/itip-formatter.c:433
+#, c-format
+msgid "Found the appointment in the calendar '%s'"
+msgstr "Встреча найдена в календаре '%s'"
+
+#: ../plugins/itip-formatter/itip-formatter.c:488
+msgid "Unable to find any calendars"
+msgstr "Не удается найти ни одного календаря"
+
+#: ../plugins/itip-formatter/itip-formatter.c:495
+msgid "Unable to find this meeting in any calendar"
+msgstr "Не удаётся найти эту встречу ни в одном календаре"
+
+#: ../plugins/itip-formatter/itip-formatter.c:499
+msgid "Unable to find this task in any task list"
+msgstr "Не удаётся найти эту задачу ни в одном списке задач"
+
+#: ../plugins/itip-formatter/itip-formatter.c:503
+msgid "Unable to find this journal entry in any journal"
+msgstr "Не удаётся найти эту запись ни в одном журнале"
+
+#: ../plugins/itip-formatter/itip-formatter.c:529
+msgid "Searching for an existing version of this appointment"
+msgstr "Поиск существующей версии этой встречи"
+
+#: ../plugins/itip-formatter/itip-formatter.c:726
msgid "Unable to parse item"
msgstr "Не удается разобрать элемент"
-#: ../plugins/itip-formatter/itip-formatter.c:780
+#: ../plugins/itip-formatter/itip-formatter.c:782
#, c-format
msgid "Unable to send item to calendar '%s'. %s"
msgstr "Не удаётся отправить элемент в календарь '%s'. %s"
-#: ../plugins/itip-formatter/itip-formatter.c:791
+#: ../plugins/itip-formatter/itip-formatter.c:793
#, c-format
msgid "Sent to calendar '%s' as accepted"
msgstr "Отправлен в календарь '%s' как принятый"
-#: ../plugins/itip-formatter/itip-formatter.c:795
+#: ../plugins/itip-formatter/itip-formatter.c:797
#, c-format
msgid "Sent to calendar '%s' as tentative"
msgstr "Отправлен в календарь '%s' как пробный"
-#: ../plugins/itip-formatter/itip-formatter.c:800
+#: ../plugins/itip-formatter/itip-formatter.c:802
#, c-format
msgid "Sent to calendar '%s' as declined"
msgstr "Отправлен в календарь '%s' как отклоненный"
-#: ../plugins/itip-formatter/itip-formatter.c:805
+#: ../plugins/itip-formatter/itip-formatter.c:807
#, c-format
-msgid "Sent to calendar '%s' as cancelled"
+msgid "Sent to calendar '%s' as canceled"
msgstr "Отправлен в календарь '%s' как отмененный"
-#: ../plugins/itip-formatter/itip-formatter.c:898
+#: ../plugins/itip-formatter/itip-formatter.c:900
#, c-format
msgid "Organizer has removed the delegate %s "
msgstr "Организатор удалил представителя %s "
-#: ../plugins/itip-formatter/itip-formatter.c:905
-msgid "Sent a cancellation notice to the delegate"
+#: ../plugins/itip-formatter/itip-formatter.c:907
+#, fuzzy
+msgid "Sent a cancelation notice to the delegate"
msgstr "Представителю отправлено сообщение об отмене"
-#: ../plugins/itip-formatter/itip-formatter.c:907
-msgid "Could not send the cancellation notice to the delegate"
+#: ../plugins/itip-formatter/itip-formatter.c:909
+msgid "Could not send the cancelation notice to the delegate"
msgstr "Невозможно отправить уведомление об отмене представителю"
-#: ../plugins/itip-formatter/itip-formatter.c:991
+#: ../plugins/itip-formatter/itip-formatter.c:994
msgid "Attendee status could not be updated because the status is invalid"
-msgstr ""
-"Статус участника не может быть обновлён из-за неверного текущего статуса"
+msgstr "Статус участника не может быть обновлён из-за неверного текущего статуса"
-#: ../plugins/itip-formatter/itip-formatter.c:1017
+#: ../plugins/itip-formatter/itip-formatter.c:1021
#, c-format
msgid "Unable to update attendee. %s"
msgstr "Не удается обновить участника. %s"
-#: ../plugins/itip-formatter/itip-formatter.c:1021
+#: ../plugins/itip-formatter/itip-formatter.c:1025
msgid "Attendee status updated"
msgstr "Статус участника обновлён"
-#: ../plugins/itip-formatter/itip-formatter.c:1148
+#: ../plugins/itip-formatter/itip-formatter.c:1152
msgid "The calendar attached is not valid"
msgstr "Вложенный календарь недействителен"
-#: ../plugins/itip-formatter/itip-formatter.c:1149
+#: ../plugins/itip-formatter/itip-formatter.c:1153
msgid ""
-"The message claims to contain a calendar, but the calendar is not valid "
+"The message claims to contain a calendar, but the calendar is not a valid "
"iCalendar."
-msgstr ""
-"Это сообщение претендует, что содержит календарь, но календарь не является "
-"действительным iCalendar."
+msgstr "Это сообщение претендует, что содержит календарь, но календарь не является действительным iCalendar."
-#: ../plugins/itip-formatter/itip-formatter.c:1183
-#: ../plugins/itip-formatter/itip-formatter.c:1198
-#: ../plugins/itip-formatter/itip-formatter.c:1274
+#: ../plugins/itip-formatter/itip-formatter.c:1187
+#: ../plugins/itip-formatter/itip-formatter.c:1202
+#: ../plugins/itip-formatter/itip-formatter.c:1278
msgid "The item in the calendar is not valid"
msgstr "Элемент в календаре недействителен"
-#: ../plugins/itip-formatter/itip-formatter.c:1184
-#: ../plugins/itip-formatter/itip-formatter.c:1199
-#: ../plugins/itip-formatter/itip-formatter.c:1275
+#: ../plugins/itip-formatter/itip-formatter.c:1188
+#: ../plugins/itip-formatter/itip-formatter.c:1203
+#: ../plugins/itip-formatter/itip-formatter.c:1279
msgid ""
"The message does contain a calendar, but the calendar contains no events, "
"tasks or free/busy information"
@@ -15467,11 +15943,11 @@ msgstr ""
"Это сообщение содержит календарь, но календарь не содержит событий, задач "
"или сведений о занятости."
-#: ../plugins/itip-formatter/itip-formatter.c:1209
+#: ../plugins/itip-formatter/itip-formatter.c:1213
msgid "The calendar attached contains multiple items"
msgstr "Вложенный календарь содержит несколько элементов"
-#: ../plugins/itip-formatter/itip-formatter.c:1210
+#: ../plugins/itip-formatter/itip-formatter.c:1214
msgid ""
"To process all of these items, the file should be saved and the calendar "
"imported"
@@ -15479,10 +15955,6 @@ msgstr ""
"Чтобы обработать все эти элементы, файл должен быть сохранен и календарь "
"должен быть импортирован"
-#: ../plugins/itip-formatter/itip-formatter.c:1968
-msgid "Meetings and Tasks"
-msgstr "Собрания и задачи"
-
#. Delete message after acting
#. FIXME Need a schema for this
#: ../plugins/itip-formatter/itip-formatter.c:1991
@@ -15503,8 +15975,8 @@ msgid "Conflict Search Table"
msgstr "Таблица поиска конфликтов"
#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:240 ../widgets/misc/e-dateedit.c:457
+#: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:32
+#: ../widgets/misc/e-cell-date-edit.c:241 ../widgets/misc/e-dateedit.c:467
msgid "Today"
msgstr "Сегодня"
@@ -15682,8 +16154,7 @@ msgstr "<b>%s</b> желает добавить к существующему с
#: ../plugins/itip-formatter/itip-view.c:367
#, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following meeting:"
+msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
msgstr "<b>%s</b> желает получить последнюю информацию о следующем собрании:"
#: ../plugins/itip-formatter/itip-view.c:370
@@ -15693,12 +16164,12 @@ msgstr "<b>%s</b> вернул следующий ответ на собрани
#: ../plugins/itip-formatter/itip-view.c:374
#, c-format
-msgid "<b>%s</b> through %s has cancelled the following meeting:"
+msgid "<b>%s</b> through %s has canceled the following meeting:"
msgstr "<b>%s</b> через %s отменил следующее собрание:"
#: ../plugins/itip-formatter/itip-view.c:376
#, c-format
-msgid "<b>%s</b> has cancelled the following meeting."
+msgid "<b>%s</b> has canceled the following meeting."
msgstr "<b>%s</b> отменил следующее собрание."
#: ../plugins/itip-formatter/itip-view.c:379
@@ -15767,12 +16238,12 @@ msgstr "<b>%s</b> вернул следующий ответ на назначе
#: ../plugins/itip-formatter/itip-view.c:442
#, c-format
-msgid "<b>%s</b> through %s has cancelled the following assigned task:"
+msgid "<b>%s</b> through %s has canceled the following assigned task:"
msgstr "<b>%s</b> через %s отменил следующую назначенную задачу:"
#: ../plugins/itip-formatter/itip-view.c:444
#, c-format
-msgid "<b>%s</b> has cancelled the following assigned task:"
+msgid "<b>%s</b> has canceled the following assigned task:"
msgstr "<b>%s</b> отменил следующую назначенную задачу:"
#: ../plugins/itip-formatter/itip-view.c:447
@@ -15790,27 +16261,85 @@ msgstr "<b>%s</b> через %s отклонил следующую назнач
msgid "<b>%s</b> has declined the following assigned task:"
msgstr "<b>%s</b> отклонил следующие назначенные задачи:"
+#. Everything gets the open button
+#: ../plugins/itip-formatter/itip-view.c:705
+msgid "_Open Calendar"
+msgstr "_Открыть календарь"
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:710
+#: ../plugins/itip-formatter/itip-view.c:715
+#: ../plugins/itip-formatter/itip-view.c:720
+#: ../plugins/itip-formatter/itip-view.c:736
+#: ../plugins/itip-formatter/itip-view.c:741
+msgid "_Accept"
+msgstr "_Принять"
+
+#: ../plugins/itip-formatter/itip-view.c:713
+msgid "_Decline all"
+msgstr "_Отклонить все"
+
+#: ../plugins/itip-formatter/itip-view.c:713
+#: ../plugins/itip-formatter/itip-view.c:718
+#: ../plugins/itip-formatter/itip-view.c:734
+#: ../plugins/itip-formatter/itip-view.c:739
+msgid "_Decline"
+msgstr "_Отклонить"
+
+#: ../plugins/itip-formatter/itip-view.c:714
+#, fuzzy
+msgid "_Tentative all"
+msgstr "Экспериментальный"
+
+#: ../plugins/itip-formatter/itip-view.c:714
+#: ../plugins/itip-formatter/itip-view.c:719
+#: ../plugins/itip-formatter/itip-view.c:735
+#: ../plugins/itip-formatter/itip-view.c:740
+#, fuzzy
+msgid "_Tentative"
+msgstr "Экспериментальный"
+
+#: ../plugins/itip-formatter/itip-view.c:715
+#, fuzzy
+msgid "_Accept all"
+msgstr "Принять"
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:724
+#, fuzzy
+msgid "_Send Information"
+msgstr "Сведения о сервере"
+
+#. FIXME Is this really the right button?
+#: ../plugins/itip-formatter/itip-view.c:728
+msgid "_Update Attendee Status"
+msgstr "_Обновить состояние участника"
+
+#: ../plugins/itip-formatter/itip-view.c:731
+msgid "_Update"
+msgstr "_Обновить"
+
#. Start time
-#: ../plugins/itip-formatter/itip-view.c:892
+#: ../plugins/itip-formatter/itip-view.c:888
msgid "Start time:"
msgstr "Время начала:"
#. End time
-#: ../plugins/itip-formatter/itip-view.c:901
+#: ../plugins/itip-formatter/itip-view.c:897
msgid "End time:"
msgstr "Время завершения:"
#. Comment
-#: ../plugins/itip-formatter/itip-view.c:917
-#: ../plugins/itip-formatter/itip-view.c:967
+#: ../plugins/itip-formatter/itip-view.c:913
+#: ../plugins/itip-formatter/itip-view.c:963
msgid "Comment:"
msgstr "Комментарий:"
-#: ../plugins/itip-formatter/itip-view.c:981
+#: ../plugins/itip-formatter/itip-view.c:977
msgid "Send u_pdates to attendees"
msgstr "Отправить о_бновления к участникам"
-#: ../plugins/itip-formatter/itip-view.c:990
+#: ../plugins/itip-formatter/itip-view.c:986
msgid "A_pply to all instances"
msgstr "П_рименить ко всем записям"
@@ -15835,8 +16364,7 @@ msgid "This meeting has been delegated"
msgstr "Это собрание было поручено"
#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
-msgid ""
-"This response is not from a current attendee. Add the sender as an attendee?"
+msgid "This response is not from a current attendee. Add the sender as an attendee?"
msgstr ""
"Этот ответ пришел не от текущего участника. Добавить отправителя как "
"участника?"
@@ -15872,8 +16400,7 @@ msgid "No store available"
msgstr "Нет доступного хранилища"
#: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:1
-msgid ""
-"A plugin which implements a CORBA interface for accessing mail data remotely."
+msgid "A plugin which implements a CORBA interface for accessing mail data remotely."
msgstr ""
"Модуль, который реализует интерфейс CORBA для удаленного доступа к почтовым "
"данным."
@@ -15902,10 +16429,10 @@ msgstr "Сообщение в собрание"
msgid ""
"A plugin which allows the creation of tasks from the contents of a mail "
"message."
-msgstr ""
-"Модуль, который позволяет создание задач из содержимого почтового сообщения."
+msgstr "Модуль, который позволяет создание задач из содержимого почтового сообщения."
#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
msgid "Con_vert to Task"
msgstr "Прео_бразовать в задачу"
@@ -15913,6 +16440,10 @@ msgstr "Прео_бразовать в задачу"
msgid "Mail to task"
msgstr "Сообщение в задачу"
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
+msgid "Convert the selected message to a new task"
+msgstr "Преобразовать выделенное сообщение в новую задачу"
+
#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
msgid "Contact list _owner"
@@ -15948,7 +16479,7 @@ msgstr ""
#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
msgid "_Post message to list"
-msgstr "_Опубликовать сообщение в списке"
+msgstr "О_публиковать сообщение в списке"
#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
@@ -16028,8 +16559,7 @@ msgstr ""
msgid ""
"This message does not contain the header information required for this "
"action."
-msgstr ""
-"Заголовок сообщения не содержит информации, необходимой для этого действия."
+msgstr "Заголовок сообщения не содержит информации, необходимой для этого действия."
#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
msgid "_Edit message"
@@ -16041,8 +16571,7 @@ msgstr "_Отправить сообщение"
#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
msgid "Contact the owner of the mailing list this message belongs to"
-msgstr ""
-"Связаться с владельцем списка рассылки, которому принадлежит это сообщение"
+msgstr "Связаться с владельцем списка рассылки, которому принадлежит это сообщение"
#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
msgid "Get an archive of the list this message belongs to"
@@ -16056,8 +16585,7 @@ msgstr ""
#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
msgid "Post a message to the mailing list this message belongs to"
-msgstr ""
-"Опубликовать сообщение в списке рассылки, которому принадлежит это сообщение"
+msgstr "Опубликовать сообщение в списке рассылки, которому принадлежит это сообщение"
#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9
msgid "Subscribe to the mailing list this message belongs to"
@@ -16067,6 +16595,19 @@ msgstr "Подписаться на список рассылки, которо
msgid "Unsubscribe to the mailing list this message belongs to"
msgstr "Отписаться от списка рассылки, которому принадлежит это сообщение"
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
+msgid "Mark All Read"
+msgstr "Пометить как прочитанные"
+
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
+#, fuzzy
+msgid "Mark me_ssages as read"
+msgstr "Пометить все сообщения как прочитанные"
+
+#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
+msgid "Used for marking all the messages under a folder as read"
+msgstr ""
+
#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
msgid "Mark calendar offline"
msgstr "Пометить календарь для автономной работы"
@@ -16107,8 +16648,10 @@ msgstr "Уведомление о новой почте"
msgid "A plugin for managing which plugins are enabled or disabled."
msgstr "Модуль для управления другими модулями"
+#. Setup the ui
#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-msgid "Plugin manager"
+#: ../plugins/plugin-manager/plugin-manager.c:180
+msgid "Plugin Manager"
msgstr "Мeнеджер модулей"
#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
@@ -16116,45 +16659,33 @@ msgid "Enable and disable plugins"
msgstr "Включает и отключает модули"
#: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
-msgid "Plugins"
-msgstr "Модули"
+msgid "_Plugins"
+msgstr "_Модули"
-#: ../plugins/plugin-manager/plugin-manager.c:45
+#: ../plugins/plugin-manager/plugin-manager.c:43
msgid "Author(s)"
msgstr "Автор(ы)"
-#: ../plugins/plugin-manager/plugin-manager.c:46
-msgid "Id"
-msgstr "Id"
-
-#: ../plugins/plugin-manager/plugin-manager.c:47
-msgid "Path"
-msgstr "Путь"
-
-#: ../plugins/plugin-manager/plugin-manager.c:48
+#: ../plugins/plugin-manager/plugin-manager.c:44
#: ../widgets/table/e-table-config-no-group.glade.h:6
#: ../widgets/table/e-table-config.glade.h:5
msgid "Description"
msgstr "Описание"
-#. Setup the ui
-#: ../plugins/plugin-manager/plugin-manager.c:188
-msgid "Plugin Manager"
-msgstr "Мeнеджер модулей"
-
-#: ../plugins/plugin-manager/plugin-manager.c:201
+#: ../plugins/plugin-manager/plugin-manager.c:193
msgid "Note: Some changes will not take effect until restart"
msgstr "Примечание: Некоторые изменения не вступят в силу до перезапуска"
-#: ../plugins/plugin-manager/plugin-manager.c:210
-#: ../plugins/plugin-manager/plugin-manager.c:271
+#: ../plugins/plugin-manager/plugin-manager.c:202
+#: ../plugins/plugin-manager/plugin-manager.c:262
msgid "Plugin"
msgstr "Модуль"
#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
+#, fuzzy
msgid ""
"A test plugin which demonstrates a formatter plugin which lets you choose to "
-"disable HTML mails.\n"
+"disable HTML messages.\n"
"\n"
"This plugin is unsupported demonstration code only.\n"
msgstr ""
@@ -16193,8 +16724,9 @@ msgid "Gives an option to print mail from composer"
msgstr "Предоставляет возможность печати сообщения из редактора"
#: ../plugins/print-message/org-gnome-print-message.xml.h:1
-#: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:20
-#: ../ui/evolution-mail-message.xml.h:77 ../ui/evolution-tasks.xml.h:15
+#: ../ui/evolution-addressbook.xml.h:27 ../ui/evolution-calendar.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:76 ../ui/evolution-memos.xml.h:12
+#: ../ui/evolution-tasks.xml.h:15
msgid "Print Pre_view"
msgstr "Пред_варительный просмотр"
@@ -16202,23 +16734,115 @@ msgstr "Пред_варительный просмотр"
msgid "Prints the message"
msgstr "Печатает сообщение"
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:98
+#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
+msgid "Evolution Profiler"
+msgstr "Профайлер Evolution"
+
+#: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
+msgid "Writes a log of profiling data events."
+msgstr ""
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
+msgid "Allows calendars to be published to the web"
+msgstr ""
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
+msgid "Calendar Publishing"
+msgstr "Публикация календарей"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+msgid "Locations"
+msgstr "Адреса"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
+#, fuzzy
+msgid "_Publish Calendar Information"
+msgstr "Сведения iCalendar"
+
+#: ../plugins/publish-calendar/publish-calendar.c:386
+msgid "Are you sure you want to remove this URL?"
+msgstr "Вы действительно хотите удалить этот URL?"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:2
+msgid "<span weight=\"bold\">Location</span>"
+msgstr "<span weight=\"bold\">Адрес</span>"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:4
+msgid "<span weight=\"bold\">Sources</span>"
+msgstr "<span weight=\"bold\">Источники</span>"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:6
+msgid ""
+"Daily\n"
+"Weekly\n"
+"Manual (via Actions menu)"
+msgstr ""
+"Ежедневно\n"
+"Еженедельно\n"
+"Вручную (из меню Действия)"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:10
+msgid "Publishing Location"
+msgstr "Адрес для публикации"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:11
+msgid "Publishing _Frequency:"
+msgstr "_Частота публикации:"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:12
+msgid ""
+"SSH\n"
+"Public FTP\n"
+"FTP (with login)\n"
+"Windows share\n"
+"WebDAV (HTTP)\n"
+"Secure WebDAV (HTTPS)\n"
+"Custom Location"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:19
+#, fuzzy
+msgid "Service _type:"
+msgstr "_Тип сервера: "
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:21
+#, fuzzy
+msgid "_File:"
+msgstr "_Файл"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:24
+#, fuzzy
+msgid "_Publish as:"
+msgstr "Таблица публикации"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:28
+#, fuzzy
+msgid ""
+"iCal\n"
+"Free/Busy"
+msgstr "Cвободен/занят"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:101
msgid "Spamassassin (built-in)"
msgstr "Spamassassin (встроенный)"
#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-msgid "Sa junk-plugin"
-msgstr "Sa спам-модуль"
+msgid ""
+"Filters junk messages using Spamassassin. This plugin requires Spamassassin "
+"to be installed."
+msgstr ""
#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "learns junk messages using spamd."
-msgstr "изучает спам-сообщения при помощи spamd."
+#, fuzzy
+msgid "Spamassassin junk plugin"
+msgstr "Spamassassin (встроенный)"
#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
msgid "A plugin for saving all attachments or parts of a message at once."
msgstr "Модуль для сохранения всех вложений или частей сообщения одновременно."
-#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:2
+#. the path to the shared library
+#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
msgid "Save attachments"
msgstr "Сохраненить вложения"
@@ -16230,17 +16854,16 @@ msgstr "Сохранить вложения ..."
msgid "Save all attachments"
msgstr "Сохранить все вложения"
-#: ../plugins/save-attachments/save-attachments.c:331
+#: ../plugins/save-attachments/save-attachments.c:338
msgid "Select save base name"
msgstr "Выбрать базовое имя для сохранения"
-#: ../plugins/save-attachments/save-attachments.c:351
+#: ../plugins/save-attachments/save-attachments.c:358
msgid "MIME Type"
msgstr "Тип MIME"
-#: ../plugins/save-attachments/save-attachments.c:359
-#: ../ui/evolution-message-composer.xml.h:18
-#: ../ui/evolution-signature-editor.xml.h:6
+#: ../plugins/save-attachments/save-attachments.c:366
+#: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:19
msgid "Save"
msgstr "Сохранить"
@@ -16253,8 +16876,8 @@ msgid "%F %T"
msgstr "%d/%m/%Y %T"
#: ../plugins/save-calendar/csv-format.c:385
-msgid "Uid"
-msgstr "Uid"
+msgid "UID"
+msgstr "UID"
#: ../plugins/save-calendar/csv-format.c:387
msgid "Description List"
@@ -16289,8 +16912,9 @@ msgid "percent Done"
msgstr "процент выполнения"
#: ../plugins/save-calendar/csv-format.c:398
-msgid "Url"
-msgstr "Url"
+#, fuzzy
+msgid "URL"
+msgstr "_URL:"
#: ../plugins/save-calendar/csv-format.c:399
msgid "Attendees List"
@@ -16324,10 +16948,6 @@ msgstr "Инкапсулировать значения в:"
msgid "Comma separated value format (.csv)"
msgstr "Значения, разделенные запятыми (.csv)"
-#: ../plugins/save-calendar/ical-format.c:137
-msgid "iCalendar format (.ics)"
-msgstr "Формат iCalendar (.ics)"
-
#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
msgid "Save Selected"
msgstr "Сохранить выделенное"
@@ -16353,20 +16973,11 @@ msgstr "%d/%m/%Y %T"
msgid "RDF format (.rdf)"
msgstr "Формат RDF (.rdf)"
-#: ../plugins/save-calendar/save-calendar.c:171
-#: ../plugins/save-calendar/save-calendar.c:181
+#: ../plugins/save-calendar/save-calendar.c:169
+#: ../plugins/save-calendar/save-calendar.c:179
msgid "Select destination file"
msgstr "Выберите файл назначения"
-#: ../plugins/save-calendar/save-calendar.c:216
-#, c-format
-msgid ""
-"The suggested filename extension of this filetype (%s) is unused in the "
-"chosen filename. Do you want to continue?"
-msgstr ""
-"Подразумеваемое расширение имени файла для этого типа (%s) не используется в "
-"выбранном имени файла. Продолжить?"
-
#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
msgid "Select one source"
msgstr "Выбор одного источника"
@@ -16384,6 +16995,10 @@ msgid "_Show only this Task List"
msgstr "_Отображать только этот список задач"
#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
+msgid "A plugin that handles the Startup wizard."
+msgstr ""
+
+#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
msgid "Startup wizard"
msgstr "Запуск помощника"
@@ -16408,18 +17023,18 @@ msgstr ""
"Нажмите \"Далее\" для продолжения. "
#: ../plugins/startup-wizard/startup-wizard.c:140
-#: ../shell/e-shell-importer.c:145
+#: ../shell/e-shell-importer.c:147
msgid "Please select the information that you would like to import:"
msgstr "Пожалуйста, укажите, какую информацию вы хотите импортировать:"
-#: ../plugins/startup-wizard/startup-wizard.c:154
-#: ../shell/e-shell-importer.c:398
+#: ../plugins/startup-wizard/startup-wizard.c:155
+#: ../shell/e-shell-importer.c:400
#, c-format
msgid "From %s:"
msgstr "Из %s:"
-#: ../plugins/startup-wizard/startup-wizard.c:234
-#: ../shell/e-shell-importer.c:509
+#: ../plugins/startup-wizard/startup-wizard.c:235
+#: ../shell/e-shell-importer.c:511
msgid "Importing data."
msgstr "Импорт данных."
@@ -16489,8 +17104,7 @@ msgid "Last upgraded configuration version"
msgstr "Версия последней обновленной конфигурации"
#: ../shell/apps_evolution_shell.schemas.in.in.h:8
-msgid ""
-"List of paths for the folders to be synchronized to disk for offline usage"
+msgid "List of paths for the folders to be synchronized to disk for offline usage"
msgstr ""
"Список путей для папок, которые будут синхронизироваться на диск для "
"автономной работы"
@@ -16500,39 +17114,47 @@ msgid "Printer settings"
msgstr "Параметры принтера"
#: ../shell/apps_evolution_shell.schemas.in.in.h:10
+#, fuzzy
+msgid "Sidebar is visible"
+msgstr "Панель инструментов видимая"
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:11
msgid "Skip development warning dialog"
msgstr "Пропускать диалог предупреждения о тестовой версии"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11 ../shell/main.c:468
+#: ../shell/apps_evolution_shell.schemas.in.in.h:12 ../shell/main.c:470
msgid "Start in offline mode"
msgstr "Запуск в автономном режиме"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13
+#, fuzzy
msgid ""
-"The configuration version of Evolution, with major/minor/configuration level"
+"The configuration version of Evolution, with major/minor/configuration level "
+"(for example \"2.6.0\")."
msgstr "Версия конфигурации Evolution, с уровнями major/minor/configuration"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.in.h:14
msgid "The default height for the main window, in pixels."
msgstr "Высота основного окна по умолчанию, в пикселах."
-#: ../shell/apps_evolution_shell.schemas.in.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
msgid "The default width for the main window, in pixels."
msgstr "Ширина основного окна по умолчанию, в пикселах."
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
msgid "The default width for the sidebar, in pixels."
msgstr "Ширина боковой панели по умолчанию, в пикселах."
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#, fuzzy
msgid ""
"The last upgraded configuration version of Evolution, with major/minor/"
-"configuration level"
+"configuration level (for example \"2.6.0\")."
msgstr ""
"Версия последней обновленной версии Evolution, с уровнями major/minor/"
"configuration"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
msgid ""
"The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -16542,35 +17164,38 @@ msgstr ""
"\"toolbar\". Если установлено значение \"toolbar\", стиль кнопок "
"соответствует системным параметрам среды GNOME."
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
msgid "Toolbar is visible"
msgstr "Панель инструментов видимая"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
msgid "Whether Evolution will start up in offline mode instead of online mode."
-msgstr ""
-"Если этот ключ установлен, Evolution будет запускаться в автономном режиме."
+msgstr "Если этот ключ установлен, Evolution будет запускаться в автономном режиме."
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#, fuzzy
+msgid "Whether the sidebar should be visible."
+msgstr "Должна ли панель инструментов быть видимой."
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
msgid "Whether the toolbar should be visible."
msgstr "Должна ли панель инструментов быть видимой."
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
-msgid ""
-"Whether the warning dialog in development versions of Evolution is skipped."
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+msgid "Whether the warning dialog in development versions of Evolution is skipped."
msgstr ""
"Если этот ключ установлен, диалог предупреждения в тестовых версиях "
"Evolution не отображается."
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
msgid "Whether the window buttons should be visible."
msgstr "Должны ли быть видимыми кнопки окон."
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
msgid "Window button style"
msgstr "Стиль кнопок окон"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
msgid "Window buttons are visible"
msgstr "Кнопки окон видимы"
@@ -16586,16 +17211,16 @@ msgstr "Активные соединения"
msgid "Click OK to close these connections and go offline"
msgstr "Нажмите OK для закрытия соединения и перехода на работу вне сети"
-#: ../shell/e-shell-folder-title-bar.c:586
-#: ../shell/e-shell-folder-title-bar.c:587
+#: ../shell/e-shell-folder-title-bar.c:584
+#: ../shell/e-shell-folder-title-bar.c:585
msgid "(Untitled)"
msgstr "(Без заголовка)"
-#: ../shell/e-shell-importer.c:133
+#: ../shell/e-shell-importer.c:135
msgid "Choose the type of importer to run:"
msgstr "Выберите тип импортера для запуска:"
-#: ../shell/e-shell-importer.c:136
+#: ../shell/e-shell-importer.c:138
msgid ""
"Choose the file that you want to import into Evolution, and select what type "
"of file it is from the list.\n"
@@ -16609,11 +17234,11 @@ msgstr ""
"Вы можете выбрать \"Автоматический\" если вы не знаете его, а Evolution "
"попытается распознать его самостоятельно."
-#: ../shell/e-shell-importer.c:142
+#: ../shell/e-shell-importer.c:144
msgid "Choose the destination for this import"
msgstr "Выберите назначение для этого импорта"
-#: ../shell/e-shell-importer.c:148
+#: ../shell/e-shell-importer.c:150
msgid ""
"Evolution checked for settings to import from the following\n"
"applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -16626,33 +17251,30 @@ msgstr ""
"импортировать. Если вы хотите попробовать еще раз,\n"
"нажмите клавишу \"Назад\".\n"
-#: ../shell/e-shell-importer.c:283
+#: ../shell/e-shell-importer.c:285
msgid "F_ilename:"
msgstr "_Имя файла:"
-#: ../shell/e-shell-importer.c:288
+#: ../shell/e-shell-importer.c:290
msgid "Select a file"
msgstr "Выбрать файл"
-#: ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:302
msgid "File _type:"
msgstr "_Тип файла:"
-#: ../shell/e-shell-importer.c:336
+#: ../shell/e-shell-importer.c:338
msgid "Import data and settings from _older programs"
msgstr "Импорт данных и настроек из _старых программ"
-#: ../shell/e-shell-importer.c:339
+#: ../shell/e-shell-importer.c:341
msgid "Import a _single file"
msgstr "Импорт _одного файла"
-#: ../shell/e-shell-importer.c:698
-msgid "_Import"
-msgstr "_Импорт"
-
#: ../shell/e-shell-settings-dialog.c:318
-msgid "Evolution Settings"
-msgstr "Параметры Evolution"
+#, fuzzy
+msgid "Evolution Preferences"
+msgstr "Evolution Mail preferences control"
#: ../shell/e-shell-utils.c:118
msgid "No folder name specified."
@@ -16694,7 +17316,7 @@ msgstr "Не удается запустить Bug buddy."
#. The translator-credits string is for translators to list
#. * per language credits for translation, displayed in the
#. * about box
-#: ../shell/e-shell-window-commands.c:533
+#: ../shell/e-shell-window-commands.c:530
msgid "translator-credits"
msgstr ""
"Valek Filippov <frob@df.ru>\n"
@@ -16702,7 +17324,7 @@ msgstr ""
"Leonid Kanter <leon@asplinux.ru>\n"
"Michael Yakhontov <mvy@asplinux.ru>"
-#: ../shell/e-shell-window-commands.c:547
+#: ../shell/e-shell-window-commands.c:544
msgid "Groupware Suite"
msgstr "Пакет для групповой работы"
@@ -16710,7 +17332,7 @@ msgstr "Пакет для групповой работы"
msgid "_Work Online"
msgstr "Перейти в сетевой режим"
-#: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:49
+#: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:54
msgid "_Work Offline"
msgstr "Ав_тономная работа"
@@ -16718,49 +17340,51 @@ msgstr "Ав_тономная работа"
msgid "Work Offline"
msgstr "Перейти в режим работы вне сети"
-#: ../shell/e-shell-window.c:343
-msgid "Evolution is currently online. Click on this button to work offline."
+#: ../shell/e-shell-window.c:368
+#, fuzzy
+msgid "Evolution is currently online. Click on this button to work offline."
msgstr ""
"Evolution сейчас в сетевом режиме работы. Нажмите на эту кнопку для перехода "
"в автономный режим."
-#: ../shell/e-shell-window.c:351
+#: ../shell/e-shell-window.c:376
msgid "Evolution is in the process of going offline."
msgstr "Evolution находится в процессе перехода в автономный режим работы."
-#: ../shell/e-shell-window.c:358
-msgid "Evolution is currently offline. Click on this button to work online."
+#: ../shell/e-shell-window.c:383
+#, fuzzy
+msgid "Evolution is currently offline. Click on this button to work online."
msgstr ""
"Evolution сейчас работает в автономном режиме. Нажмите на эту кнопку для "
"перехода в режим работы в сети."
-#: ../shell/e-shell-window.c:735
+#: ../shell/e-shell-window.c:783
#, c-format
msgid "Switch to %s"
msgstr "Переключиться в %s"
-#: ../shell/e-shell.c:623
+#: ../shell/e-shell.c:633
msgid "Uknown system error."
msgstr "Неизвестная системная ошибка."
-#: ../shell/e-shell.c:825 ../shell/e-shell.c:826
+#: ../shell/e-shell.c:829 ../shell/e-shell.c:830
#, c-format
msgid "%ld KB"
msgstr "%ld КБ"
-#: ../shell/e-shell.c:1257 ../widgets/misc/e-cell-date-edit.c:256
+#: ../shell/e-shell.c:1261 ../widgets/misc/e-cell-date-edit.c:257
msgid "OK"
msgstr "Ок"
-#: ../shell/e-shell.c:1259
+#: ../shell/e-shell.c:1263
msgid "Invalid arguments"
msgstr "Недопустимые аргументы"
-#: ../shell/e-shell.c:1261
+#: ../shell/e-shell.c:1265
msgid "Cannot register on OAF"
msgstr "Не удается зарегистрировать в OAF"
-#: ../shell/e-shell.c:1263
+#: ../shell/e-shell.c:1267
msgid "Configuration Database not found"
msgstr "База данных настроек не найдена"
@@ -16782,8 +17406,7 @@ msgstr "Создать новый тестовый элемент"
#: ../shell/import.glade.h:1
msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr ""
-"Нажмите \"Импортировать\" для начала импортирования файлов в Evolution."
+msgstr "Нажмите \"Импортировать\" для начала импортирования файлов в Evolution."
#: ../shell/import.glade.h:2
msgid "Evolution Import Assistant"
@@ -16821,7 +17444,7 @@ msgstr ""
#. Preview/Alpha/Beta version warning message
#: ../shell/main.c:230
-#, no-c-format
+#, fuzzy, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this preview release\n"
"of the Evolution groupware suite.\n"
@@ -16832,7 +17455,7 @@ msgid ""
"If you want a stable version of Evolution, we urge you to uninstall\n"
"this version, and install version %s instead.\n"
"\n"
-"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"If you find bugs, please report them to us at bugzilla.gnome.org.\n"
"This product comes with no warranty and is not intended for\n"
"individuals prone to violent fits of anger.\n"
"\n"
@@ -16865,34 +17488,35 @@ msgstr ""
"команда Evolution\n"
#: ../shell/main.c:261
-msgid "Don't tell me again"
+#, fuzzy
+msgid "Do not tell me again"
msgstr "Не напоминать больше"
-#: ../shell/main.c:466
+#: ../shell/main.c:468
msgid "Start Evolution activating the specified component"
msgstr "Запуск Evolution с активированием указанного компонента"
-#: ../shell/main.c:470
+#: ../shell/main.c:472
msgid "Start in online mode"
msgstr "Запуск в режиме подключения к интернету"
-#: ../shell/main.c:473
+#: ../shell/main.c:475
msgid "Forcibly shut down all Evolution components"
msgstr "Принудительное завершение работы всех компонентов Evolution"
-#: ../shell/main.c:477
+#: ../shell/main.c:479
msgid "Forcibly re-migrate from Evolution 1.4"
msgstr "Принудительная повторная миграция с Evolution 1.4"
-#: ../shell/main.c:480
+#: ../shell/main.c:482
msgid "Send the debugging output of all components to a file."
msgstr "Записывать отладочный вывод всех компонентов в файл."
-#: ../shell/main.c:482
+#: ../shell/main.c:484
msgid "Disable loading of any plugins."
msgstr "Запретить загрузку любых модулей."
-#: ../shell/main.c:513
+#: ../shell/main.c:515
#, c-format
msgid ""
"%s: --online and --offline cannot be used together.\n"
@@ -16918,9 +17542,10 @@ msgid "Evolution can not start."
msgstr "Не удается запустить Evolution."
#: ../shell/shell.error.xml.h:5
+#, fuzzy
msgid ""
"Forgetting your passwords will clear all remembered passwords. You will be "
-"reprompted next time they are needed. "
+"reprompted next time they are needed."
msgstr ""
"Выполнение этой команды приведет к забыванию всех сохраненных паролей. При "
"необходимости пароли будут снова запрашиваться."
@@ -16934,8 +17559,9 @@ msgid "Really delete old data?"
msgstr "Вы действительно хотите удалить старые данные?"
#: ../shell/shell.error.xml.h:9
+#, fuzzy
msgid ""
-"The entire contents of the &quot;evolution&quot; directory is about to be be "
+"The entire contents of the &quot;evolution&quot; directory are about to be "
"permanently removed.\n"
"\n"
"It is suggested you manually verify that all of your mail, contact, and "
@@ -16956,12 +17582,13 @@ msgstr ""
"вмешательства.\n"
#: ../shell/shell.error.xml.h:15
+#, fuzzy
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 &quot;"
-"evolution&quot; directory will be removed permanently. If you choose to "
-"keep this data, then you may manually remove the contents of &quot;"
+"evolution&quot; directory will be removed permanently. If you choose to keep "
+"this data, then you may manually remove the contents of &quot;"
"evolution&quot; at your convenience.\n"
msgstr ""
"Предыдущая версия Evolution сохраняла данные в другом каталоге.\n"
@@ -16976,8 +17603,9 @@ msgid "Upgrade from previous version failed: {0}"
msgstr "Сбой обновления с предыдущей версии:{0}"
#: ../shell/shell.error.xml.h:20
+#, fuzzy
msgid ""
-"Upgrading your data and settings will require upto {0} of disk space, but "
+"Upgrading your data and settings will require up to {0} of disk space, but "
"you only have {1} available.\n"
"\n"
"You will need to make more space available in your home directory before you "
@@ -17036,7 +17664,7 @@ msgstr ""
"\n"
"ЕСли вы решите продолжить, вы утратите доступ к некоторым старым данным.\n"
-#: ../smime/gui/ca-trust-dialog.c:96
+#: ../smime/gui/ca-trust-dialog.c:104
#, c-format
msgid ""
"Certificate '%s' is a CA certificate.\n"
@@ -17047,7 +17675,7 @@ msgstr ""
"\n"
"Изменить доверие сертификата:"
-#: ../smime/gui/cert-trust-dialog.c:145
+#: ../smime/gui/cert-trust-dialog.c:154
msgid ""
"Because you trust the certificate authority that issued this certificate, "
"then you trust the authenticity of this certificate unless otherwise "
@@ -17056,7 +17684,7 @@ msgstr ""
"Поскольку вы доверяете поставщику этого сертификата, вы доверяете также и "
"аутентичности этого сертификата, если тут не отмечено иначе"
-#: ../smime/gui/cert-trust-dialog.c:149
+#: ../smime/gui/cert-trust-dialog.c:158
msgid ""
"Because you do not trust the certificate authority that issued this "
"certificate, then you do not trust the authenticity of this certificate "
@@ -17065,60 +17693,60 @@ msgstr ""
"Поскольку вы не доверяете поставщику этого сертификата, вы не доверяете и "
"аутентичности этого сертификата, если здесь не указано иначе."
-#: ../smime/gui/certificate-manager.c:134
-#: ../smime/gui/certificate-manager.c:142
-#: ../smime/gui/certificate-manager.c:377
-#: ../smime/gui/certificate-manager.c:385
-#: ../smime/gui/certificate-manager.c:597
-#: ../smime/gui/certificate-manager.c:605
+#: ../smime/gui/certificate-manager.c:136
+#: ../smime/gui/certificate-manager.c:144
+#: ../smime/gui/certificate-manager.c:375
+#: ../smime/gui/certificate-manager.c:383
+#: ../smime/gui/certificate-manager.c:595
+#: ../smime/gui/certificate-manager.c:603
msgid "Select a certificate to import..."
msgstr "Выберите сертификат для импорта..."
-#: ../smime/gui/certificate-manager.c:265
-#: ../smime/gui/certificate-manager.c:474
-#: ../smime/gui/certificate-manager.c:692
+#: ../smime/gui/certificate-manager.c:267
+#: ../smime/gui/certificate-manager.c:472
+#: ../smime/gui/certificate-manager.c:690
msgid "Certificate Name"
msgstr "Имя сертификата"
-#: ../smime/gui/certificate-manager.c:274
-#: ../smime/gui/certificate-manager.c:492
+#: ../smime/gui/certificate-manager.c:276
+#: ../smime/gui/certificate-manager.c:490
msgid "Purposes"
msgstr "Назначения"
-#: ../smime/gui/certificate-manager.c:283 ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:569
+#: ../smime/gui/certificate-manager.c:285 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/lib/e-cert.c:570
msgid "Serial Number"
msgstr "Серийный номер"
-#: ../smime/gui/certificate-manager.c:291
+#: ../smime/gui/certificate-manager.c:293
msgid "Expires"
msgstr "Годен до"
-#: ../smime/gui/certificate-manager.c:483
+#: ../smime/gui/certificate-manager.c:481
msgid "E-Mail Address"
msgstr "Электронная почта"
-#: ../smime/gui/certificate-viewer.c:334
+#: ../smime/gui/certificate-viewer.c:341
#, c-format
msgid "Certificate Viewer: %s"
msgstr "Просмотр сертификата: %s"
-#: ../smime/gui/component.c:45
+#: ../smime/gui/component.c:47
#, c-format
msgid "Enter the password for `%s'"
msgstr "Введите пароль для '%s'"
#. we're setting the password initially
-#: ../smime/gui/component.c:68
+#: ../smime/gui/component.c:70
msgid "Enter new password for certificate database"
msgstr "Введите новый пароль для базы данных сертификатов"
-#: ../smime/gui/component.c:70
+#: ../smime/gui/component.c:72
msgid "Enter new password"
msgstr "Введите новый пароль"
#. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:119
+#: ../smime/gui/e-cert-selector.c:121
#, c-format
msgid ""
"Issued to:\n"
@@ -17127,7 +17755,7 @@ msgstr ""
"Выпущен для:\n"
" Тема: %s\n"
-#: ../smime/gui/e-cert-selector.c:120
+#: ../smime/gui/e-cert-selector.c:122
#, c-format
msgid ""
"Issued by:\n"
@@ -17136,7 +17764,7 @@ msgstr ""
"Выпущен:\n"
" Тема: %s\n"
-#: ../smime/gui/e-cert-selector.c:167
+#: ../smime/gui/e-cert-selector.c:174
msgid "Select certificate"
msgstr "Выберите сертификат"
@@ -17197,7 +17825,7 @@ msgstr ""
"вам необходимо просмотреть сертификат, его политику и процедуры (если "
"доступны)."
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1076
+#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1077
msgid "Certificate"
msgstr "Сертификат"
@@ -17273,11 +17901,11 @@ msgstr "Подразделение организации (OU)"
msgid "SHA1 Fingerprint"
msgstr "Отпечаток SHA1"
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:818
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:819
msgid "SSL Client Certificate"
msgstr "Сертификат клиента SSL"
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:822
+#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:823
msgid "SSL Server Certificate"
msgstr "Сертификат сервере SSL"
@@ -17306,16 +17934,14 @@ msgid "You have certificates from these organizations that identify you:"
msgstr "У вас есть идентифицирующие вас сертификаты от следующих организаций:"
#: ../smime/gui/smime-ui.glade.h:44
-msgid ""
-"You have certificates on file that identify these certificate authorities:"
+msgid "You have certificates on file that identify these certificate authorities:"
msgstr ""
"У вас в файле имеются сертификаты, которые идентифицируют следующих "
"поставщиков:"
#: ../smime/gui/smime-ui.glade.h:45
msgid "You have certificates on file that identify these people:"
-msgstr ""
-"У вас в файле имеются сертификаты, которые идентифицируют следующих лиц:"
+msgstr "У вас в файле имеются сертификаты, которые идентифицируют следующих лиц:"
#: ../smime/gui/smime-ui.glade.h:46
msgid "Your Certificates"
@@ -17326,247 +17952,206 @@ msgid "_Edit CA Trust"
msgstr "_Изменить доверие поставщику"
#. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:651
+#: ../smime/lib/e-cert-db.c:664
msgid "Certificate already exists"
msgstr "Сертификат уже существует"
-#: ../smime/lib/e-cert.c:238 ../smime/lib/e-cert.c:248
+#: ../smime/lib/e-cert.c:239 ../smime/lib/e-cert.c:249
msgid "%d/%m/%Y"
msgstr "%d.%m.%Y"
#. x509 certificate usage types
-#: ../smime/lib/e-cert.c:424
+#: ../smime/lib/e-cert.c:425
msgid "Sign"
msgstr "Подписать"
-#: ../smime/lib/e-cert.c:425
+#: ../smime/lib/e-cert.c:426
msgid "Encrypt"
msgstr "Зашифровать"
-#: ../smime/lib/e-cert.c:530
+#: ../smime/lib/e-cert.c:531
msgid "Version"
msgstr "Версия"
-#: ../smime/lib/e-cert.c:545
+#: ../smime/lib/e-cert.c:546
msgid "Version 1"
msgstr "Версия 1"
-#: ../smime/lib/e-cert.c:548
+#: ../smime/lib/e-cert.c:549
msgid "Version 2"
msgstr "Версия 2"
-#: ../smime/lib/e-cert.c:551
+#: ../smime/lib/e-cert.c:552
msgid "Version 3"
msgstr "Версия 3"
-#: ../smime/lib/e-cert.c:633
+#: ../smime/lib/e-cert.c:634
msgid "PKCS #1 MD2 With RSA Encryption"
msgstr "PKCS #1 MD2 с шифрованием RSA"
-#: ../smime/lib/e-cert.c:636
+#: ../smime/lib/e-cert.c:637
msgid "PKCS #1 MD5 With RSA Encryption"
msgstr "PKCS #1 MD5 с шифрованием RSA"
-#: ../smime/lib/e-cert.c:639
+#: ../smime/lib/e-cert.c:640
msgid "PKCS #1 SHA-1 With RSA Encryption"
msgstr "PKCS #1 SHA-1 с шифрованием RSA"
-#: ../smime/lib/e-cert.c:642
-msgid "C"
-msgstr "C"
-
-#: ../smime/lib/e-cert.c:645
-msgid "CN"
-msgstr "CN"
-
-#: ../smime/lib/e-cert.c:648
-msgid "OU"
-msgstr "OU"
-
-#: ../smime/lib/e-cert.c:651
-msgid "O"
-msgstr "O"
-
-#: ../smime/lib/e-cert.c:654
-msgid "L"
-msgstr "L"
-
-#: ../smime/lib/e-cert.c:657
-msgid "DN"
-msgstr "DN"
-
-#: ../smime/lib/e-cert.c:660
-msgid "DC"
-msgstr "DC"
-
-#: ../smime/lib/e-cert.c:663
-msgid "ST"
-msgstr "ST"
-
-#: ../smime/lib/e-cert.c:666
+#: ../smime/lib/e-cert.c:667
msgid "PKCS #1 RSA Encryption"
msgstr "PKCS #1 шифрование RSA"
-#: ../smime/lib/e-cert.c:669
+#: ../smime/lib/e-cert.c:670
msgid "Certificate Key Usage"
msgstr "Использование ключа сертификата"
-#: ../smime/lib/e-cert.c:672
+#: ../smime/lib/e-cert.c:673
msgid "Netscape Certificate Type"
msgstr "Тип сертификата Netscape"
-#: ../smime/lib/e-cert.c:675
+#: ../smime/lib/e-cert.c:676
msgid "Certificate Authority Key Identifier"
msgstr "Идентификатор ключа поставщика"
-#: ../smime/lib/e-cert.c:678
-msgid "UID"
-msgstr "UID"
-
-#: ../smime/lib/e-cert.c:681
-msgid "E"
-msgstr "В"
-
-#: ../smime/lib/e-cert.c:687
+#: ../smime/lib/e-cert.c:688
#, c-format
msgid "Object Identifier (%s)"
msgstr "Идентификатор объекта (%s)"
-#: ../smime/lib/e-cert.c:738
+#: ../smime/lib/e-cert.c:739
msgid "Algorithm Identifier"
msgstr "Идентификатор алгоритма"
-#: ../smime/lib/e-cert.c:746
+#: ../smime/lib/e-cert.c:747
msgid "Algorithm Parameters"
msgstr "Параметры алгоритма"
-#: ../smime/lib/e-cert.c:768
+#: ../smime/lib/e-cert.c:769
msgid "Subject Public Key Info"
msgstr "Описание публичного ключа предмета"
-#: ../smime/lib/e-cert.c:773
+#: ../smime/lib/e-cert.c:774
msgid "Subject Public Key Algorithm"
msgstr "Алгоритм публичного ключа предмета"
-#: ../smime/lib/e-cert.c:788
+#: ../smime/lib/e-cert.c:789
msgid "Subject's Public Key"
msgstr "Публичный ключ темы"
-#: ../smime/lib/e-cert.c:809 ../smime/lib/e-cert.c:858
+#: ../smime/lib/e-cert.c:810 ../smime/lib/e-cert.c:859
msgid "Error: Unable to process extension"
msgstr "Ошибка: не удается обработать расширение"
-#: ../smime/lib/e-cert.c:830 ../smime/lib/e-cert.c:842
+#: ../smime/lib/e-cert.c:831 ../smime/lib/e-cert.c:843
msgid "Object Signer"
msgstr "Объект подписан"
-#: ../smime/lib/e-cert.c:834
+#: ../smime/lib/e-cert.c:835
msgid "SSL Certificate Authority"
msgstr "Поставщик сертификата SSL"
-#: ../smime/lib/e-cert.c:838
+#: ../smime/lib/e-cert.c:839
msgid "Email Certificate Authority"
msgstr "Поставщик сертификата эл. почты"
-#: ../smime/lib/e-cert.c:866
+#: ../smime/lib/e-cert.c:867
msgid "Signing"
msgstr "Подписывание"
-#: ../smime/lib/e-cert.c:870
+#: ../smime/lib/e-cert.c:871
msgid "Non-repudiation"
msgstr "Нет отказа"
-#: ../smime/lib/e-cert.c:874
+#: ../smime/lib/e-cert.c:875
msgid "Key Encipherment"
msgstr "Шифрование ключа"
-#: ../smime/lib/e-cert.c:878
+#: ../smime/lib/e-cert.c:879
msgid "Data Encipherment"
msgstr "Шифрование данных"
-#: ../smime/lib/e-cert.c:882
+#: ../smime/lib/e-cert.c:883
msgid "Key Agreement"
msgstr "Соглашение ключа"
-#: ../smime/lib/e-cert.c:886
+#: ../smime/lib/e-cert.c:887
msgid "Certificate Signer"
msgstr "Сертификат подписан"
-#: ../smime/lib/e-cert.c:890
+#: ../smime/lib/e-cert.c:891
msgid "CRL Signer"
msgstr "CRL подписан"
-#: ../smime/lib/e-cert.c:938
+#: ../smime/lib/e-cert.c:939
msgid "Critical"
msgstr "Критично"
-#: ../smime/lib/e-cert.c:940 ../smime/lib/e-cert.c:943
+#: ../smime/lib/e-cert.c:941 ../smime/lib/e-cert.c:944
msgid "Not Critical"
msgstr "Не критично"
-#: ../smime/lib/e-cert.c:964
+#: ../smime/lib/e-cert.c:965
msgid "Extensions"
msgstr "Расширения"
-#: ../smime/lib/e-cert.c:1035
+#: ../smime/lib/e-cert.c:1036
#, c-format
msgid "%s = %s"
msgstr "%s = %s"
-#: ../smime/lib/e-cert.c:1091 ../smime/lib/e-cert.c:1211
+#: ../smime/lib/e-cert.c:1092 ../smime/lib/e-cert.c:1212
msgid "Certificate Signature Algorithm"
msgstr "Алгоритм подписи сертификата"
-#: ../smime/lib/e-cert.c:1100
+#: ../smime/lib/e-cert.c:1101
msgid "Issuer"
msgstr "Поставщик"
-#: ../smime/lib/e-cert.c:1154
+#: ../smime/lib/e-cert.c:1155
msgid "Issuer Unique ID"
msgstr "Уникальный ID поставщика"
-#: ../smime/lib/e-cert.c:1173
+#: ../smime/lib/e-cert.c:1174
msgid "Subject Unique ID"
msgstr "Уникальный ID темы"
-#: ../smime/lib/e-cert.c:1216
+#: ../smime/lib/e-cert.c:1217
msgid "Certificate Signature Value"
msgstr "Значение подписи сертификата"
-#: ../smime/lib/e-pkcs12.c:264
+#: ../smime/lib/e-pkcs12.c:266
msgid "PKCS12 File Password"
msgstr "Пароль файла PKCS12"
-#: ../smime/lib/e-pkcs12.c:264
+#: ../smime/lib/e-pkcs12.c:266
msgid "Enter password for PKCS12 file:"
msgstr "Введите пароль для файла PKCS12:"
-#: ../smime/lib/e-pkcs12.c:363
+#: ../smime/lib/e-pkcs12.c:365
msgid "Imported Certificate"
msgstr "Импортированный сертификат"
-#: ../tools/evolution-launch-composer.c:324
+#: ../tools/evolution-launch-composer.c:321
msgid "An attachment to add."
msgstr "Вложение, которое будет добавлено."
-#: ../tools/evolution-launch-composer.c:325
+#: ../tools/evolution-launch-composer.c:322
msgid "Content type of the attachment."
msgstr "Тип вложения (content-type)."
-#: ../tools/evolution-launch-composer.c:326
+#: ../tools/evolution-launch-composer.c:323
msgid "The filename to display in the mail."
msgstr "Имя файла, которое будет отображаться в письме."
-#: ../tools/evolution-launch-composer.c:327
+#: ../tools/evolution-launch-composer.c:324
msgid "Description of the attachment."
msgstr "Описание вложения."
-#: ../tools/evolution-launch-composer.c:328
+#: ../tools/evolution-launch-composer.c:325
msgid "Mark attachment to be shown inline by default."
-msgstr ""
-"Пометить вложение, чтобы оно отображалось в теле сообщения по умолчанию."
+msgstr "Пометить вложение, чтобы оно отображалось в теле сообщения по умолчанию."
-#: ../tools/evolution-launch-composer.c:329
+#: ../tools/evolution-launch-composer.c:326
msgid "Default subject for the message."
msgstr "Тема сообщения по умолчанию."
@@ -17583,108 +18168,232 @@ msgstr "Не удается выполнить '%s': %s\n"
msgid "Shutting down %s (%s)\n"
msgstr "Останавливается %s (%s)\n"
+#: ../ui/evolution-addressbook.xml.h:1
+#, fuzzy
+msgid "Address _Book Properties"
+msgstr "Свойства адресной книги"
+
#: ../ui/evolution-addressbook.xml.h:3
+#, fuzzy
+msgid "Change the properties of the selected folder"
+msgstr "Изменить свойства этой папки"
+
+#: ../ui/evolution-addressbook.xml.h:4
+#, fuzzy
+msgid "Co_py All Contacts To..."
+msgstr "Копировать контакты в"
+
+#: ../ui/evolution-addressbook.xml.h:5
+#, fuzzy
+msgid "Contact _Preview"
+msgstr "Проверка печати контакта"
+
+#: ../ui/evolution-addressbook.xml.h:7
msgid "Copy Selected Contacts to Another Folder..."
msgstr "Копировать выделенные контакты в другую папку..."
-#: ../ui/evolution-addressbook.xml.h:4 ../ui/evolution-calendar.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:8
+#, fuzzy
+msgid "Copy the contacts of the selected folder into another folder"
+msgstr "Копировать выделенную папку в другую папку"
+
+#: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:2
msgid "Copy the selection"
msgstr "Копировать выделение"
-#: ../ui/evolution-addressbook.xml.h:5
+#: ../ui/evolution-addressbook.xml.h:10
msgid "Copy to Folder..."
msgstr "Копировать в папку..."
-#: ../ui/evolution-addressbook.xml.h:7 ../ui/evolution-calendar.xml.h:3
+#: ../ui/evolution-addressbook.xml.h:11
+#, fuzzy
+msgid "Create a new addressbook folder"
+msgstr "Создать новую адресную книгу"
+
+#: ../ui/evolution-addressbook.xml.h:12
+#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-memos.xml.h:4
+#: ../ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Вырезать"
+
+#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-calendar.xml.h:3
msgid "Cut the selection"
msgstr "Вырезать выделение"
-#: ../ui/evolution-addressbook.xml.h:9
+#: ../ui/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Del_ete Address Book"
+msgstr "Новая адресная книга"
+
+#: ../ui/evolution-addressbook.xml.h:16
msgid "Delete selected contacts"
msgstr "Удалить выбранные контакты"
-#: ../ui/evolution-addressbook.xml.h:11
+#: ../ui/evolution-addressbook.xml.h:17
+#, fuzzy
+msgid "Delete the selected folder"
+msgstr "Восстановить выделенные сообщения"
+
+#: ../ui/evolution-addressbook.xml.h:18
+msgid "Forward Contact"
+msgstr "Переслать контакт"
+
+#: ../ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Mo_ve All Contacts To..."
+msgstr "Переместить контакты в"
+
+#: ../ui/evolution-addressbook.xml.h:20
msgid "Move Selected Contacts to Another Folder..."
msgstr "Переместить выделенные контакты в другую папку..."
-#: ../ui/evolution-addressbook.xml.h:12
+#: ../ui/evolution-addressbook.xml.h:21
+#, fuzzy
+msgid "Move the contacts of the selected folder into another folder"
+msgstr "Переместить выделенную папку в другую папку"
+
+#: ../ui/evolution-addressbook.xml.h:22
msgid "Move to Folder..."
msgstr "Переместить в папку..."
-#: ../ui/evolution-addressbook.xml.h:14 ../ui/evolution-calendar.xml.h:16
+#: ../ui/evolution-addressbook.xml.h:23
+#: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-memos.xml.h:8
+#: ../ui/evolution-tasks.xml.h:11
+msgid "Paste"
+msgstr "Вставить"
+
+#: ../ui/evolution-addressbook.xml.h:24 ../ui/evolution-calendar.xml.h:15
msgid "Paste the clipboard"
msgstr "Вставить выделение"
-#: ../ui/evolution-addressbook.xml.h:15
+#: ../ui/evolution-addressbook.xml.h:25
msgid "Previews the contacts to be printed"
msgstr "Посмотреть на вид контактов на печати"
-#: ../ui/evolution-addressbook.xml.h:18
+#: ../ui/evolution-addressbook.xml.h:28
msgid "Print selected contacts"
msgstr "Напечатать выбранные контакты"
-#: ../ui/evolution-addressbook.xml.h:20
+#: ../ui/evolution-addressbook.xml.h:29
+#, fuzzy
+msgid "Rename the selected folder"
+msgstr "Переименовать папку \"%s\" в:"
+
+#: ../ui/evolution-addressbook.xml.h:30
+#, fuzzy
+msgid "S_ave Address Book As VCard"
+msgstr "Новая адресная книга"
+
+#: ../ui/evolution-addressbook.xml.h:32
msgid "Save selected contacts as a VCard."
msgstr "Сохранить выбранные контакты как VCard."
-#: ../ui/evolution-addressbook.xml.h:21 ../widgets/text/e-text.c:2684
+#: ../ui/evolution-addressbook.xml.h:33
+#, fuzzy
+msgid "Save the contacts of the selected folder as VCard"
+msgstr "Сохранить выбранные контакты как VCard."
+
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2709
msgid "Select All"
msgstr "Выбрать все"
-#: ../ui/evolution-addressbook.xml.h:22
+#: ../ui/evolution-addressbook.xml.h:35
+#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:12
+#: ../ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "В_ыделить все"
+
+#: ../ui/evolution-addressbook.xml.h:36
msgid "Select all contacts"
msgstr "Выбрать все контакты"
-#: ../ui/evolution-addressbook.xml.h:23
+#: ../ui/evolution-addressbook.xml.h:37
msgid "Send a message to the selected contacts."
msgstr "Отправить сообщение к выбранным контактам."
-#: ../ui/evolution-addressbook.xml.h:24
+#: ../ui/evolution-addressbook.xml.h:38
msgid "Send message to contact"
msgstr "Отправить сообщение к контакту"
-#: ../ui/evolution-addressbook.xml.h:25
+#: ../ui/evolution-addressbook.xml.h:39
msgid "Send selected contacts to another person."
msgstr "Переслать выбранные контакты другому лицу."
-#: ../ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-addressbook.xml.h:40
msgid "Show contact preview window"
msgstr "Показать окно просмотра контакта"
-#: ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-addressbook.xml.h:41
+#, fuzzy
+msgid "St_op"
+msgstr "Стоп"
+
+#: ../ui/evolution-addressbook.xml.h:42
msgid "Stop"
msgstr "Стоп"
-#: ../ui/evolution-addressbook.xml.h:28
+#: ../ui/evolution-addressbook.xml.h:43
msgid "Stop Loading"
msgstr "Остановить загрузку"
-#: ../ui/evolution-addressbook.xml.h:29
+#: ../ui/evolution-addressbook.xml.h:44
msgid "View the current contact"
msgstr "Просмотреть текущий контакт"
-#: ../ui/evolution-addressbook.xml.h:30 ../ui/evolution-calendar.xml.h:38
-#: ../ui/evolution-mail-list.xml.h:26 ../ui/evolution-tasks.xml.h:19
+#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:36
+#: ../ui/evolution-tasks.xml.h:21
msgid "_Actions"
msgstr "_Действия"
-#: ../ui/evolution-addressbook.xml.h:35
+#: ../ui/evolution-addressbook.xml.h:47
+#, fuzzy
+msgid "_Copy Contact to..."
+msgstr "Копировать контакт в"
+
+#: ../ui/evolution-addressbook.xml.h:48
+#, fuzzy
+msgid "_Copy Folder Contacts To"
+msgstr "_Копировать папку в..."
+
+#: ../ui/evolution-addressbook.xml.h:50
+#, fuzzy
+msgid "_Delete Contact"
+msgstr "Контакт"
+
+#: ../ui/evolution-addressbook.xml.h:52
msgid "_Forward Contact..."
msgstr "Переслать контакт..."
-#: ../ui/evolution-addressbook.xml.h:39
-msgid "_Preview Pane"
-msgstr "Панель предварительного просмотра"
+#: ../ui/evolution-addressbook.xml.h:53
+#, fuzzy
+msgid "_Move Contact to..."
+msgstr "Переместить контакт в"
-#: ../ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard..."
+#: ../ui/evolution-addressbook.xml.h:54
+#, fuzzy
+msgid "_Move Folder Contacts To"
+msgstr "Пере_местить папку в..."
+
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:46
+msgid "_New"
+msgstr "_Создать"
+
+#: ../ui/evolution-addressbook.xml.h:60
+#, fuzzy
+msgid "_Rename"
+msgstr "Пе_реименовать..."
+
+#: ../ui/evolution-addressbook.xml.h:61
+#, fuzzy
+msgid "_Save Contact as VCard..."
msgstr "_Сохранить как VCard..."
-#: ../ui/evolution-addressbook.xml.h:42
-msgid "_Select All"
-msgstr "В_ыделить все"
+#: ../ui/evolution-addressbook.xml.h:62
+#, fuzzy
+msgid "_Save Folder Contacts As VCard"
+msgstr "Сохранить выбранные контакты как VCard."
-#: ../ui/evolution-addressbook.xml.h:43
+#: ../ui/evolution-addressbook.xml.h:63
msgid "_Send Message to Contact..."
msgstr "Отправить _сообщение к контакту..."
@@ -17705,132 +18414,324 @@ msgid "Delete this Occurrence"
msgstr "Удалить это вхождение"
#: ../ui/evolution-calendar.xml.h:9
-msgid "Delete this occurrence"
-msgstr "Удалить это вхождение"
-
-#: ../ui/evolution-calendar.xml.h:10
msgid "Go To"
msgstr "Перейти к"
-#: ../ui/evolution-calendar.xml.h:11
+#: ../ui/evolution-calendar.xml.h:10
msgid "Go back"
msgstr "Перейти в прошлое"
-#: ../ui/evolution-calendar.xml.h:12
+#: ../ui/evolution-calendar.xml.h:11
msgid "Go forward"
msgstr "Перейти в будущее"
-#: ../ui/evolution-calendar.xml.h:13
+#: ../ui/evolution-calendar.xml.h:12
msgid "List"
msgstr "Список"
-#: ../ui/evolution-calendar.xml.h:14
+#: ../ui/evolution-calendar.xml.h:13
msgid "Month"
msgstr "Месяц"
-#: ../ui/evolution-calendar.xml.h:15 ../ui/evolution-mail-message.xml.h:59
+#: ../ui/evolution-calendar.xml.h:14 ../ui/evolution-mail-message.xml.h:58
msgid "Next"
-msgstr "Следующий"
+msgstr "Вперёд"
-#: ../ui/evolution-calendar.xml.h:17
+#: ../ui/evolution-calendar.xml.h:16
msgid "Previews the calendar to be printed"
msgstr "Посмотреть на вид календаря на печати"
-#: ../ui/evolution-calendar.xml.h:18 ../ui/evolution-mail-message.xml.h:75
+#: ../ui/evolution-calendar.xml.h:17 ../ui/evolution-mail-message.xml.h:74
msgid "Previous"
-msgstr "Предыдущий"
+msgstr "Назад"
-#: ../ui/evolution-calendar.xml.h:21
+#: ../ui/evolution-calendar.xml.h:20
msgid "Print this calendar"
msgstr "Напечатать этот календарь"
-#: ../ui/evolution-calendar.xml.h:22
-msgid "Publish Free/Busy information for this calendar"
-msgstr "Опубликовать информацию о занятости для этого календаря"
-
-#: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
+#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-tasks.xml.h:17
msgid "Purg_e"
msgstr "О_чистить"
-#: ../ui/evolution-calendar.xml.h:24
+#: ../ui/evolution-calendar.xml.h:22
msgid "Purge old appointments and meetings"
msgstr "Очистить старые встречи и собрания"
-#: ../ui/evolution-calendar.xml.h:25
+#: ../ui/evolution-calendar.xml.h:23
msgid "Select _Date"
msgstr "Выделить _дату"
-#: ../ui/evolution-calendar.xml.h:27
+#: ../ui/evolution-calendar.xml.h:24
+msgid "Select _Today"
+msgstr "Выделить _сегодняшний день"
+
+#: ../ui/evolution-calendar.xml.h:25
msgid "Select a specific date"
msgstr "Выделить указанную дату"
-#: ../ui/evolution-calendar.xml.h:28
+#: ../ui/evolution-calendar.xml.h:26
msgid "Select today"
msgstr "Выделить сегодняшний день"
-#: ../ui/evolution-calendar.xml.h:29
+#: ../ui/evolution-calendar.xml.h:27
msgid "Show as list"
msgstr "Показать как список"
-#: ../ui/evolution-calendar.xml.h:30
+#: ../ui/evolution-calendar.xml.h:28
msgid "Show one day"
msgstr "Показать 1 день"
-#: ../ui/evolution-calendar.xml.h:31
+#: ../ui/evolution-calendar.xml.h:29
msgid "Show one month"
msgstr "Показать 1 месяц"
-#: ../ui/evolution-calendar.xml.h:32
+#: ../ui/evolution-calendar.xml.h:30
msgid "Show one week"
msgstr "Показать 1 неделю"
-#: ../ui/evolution-calendar.xml.h:33
+#: ../ui/evolution-calendar.xml.h:31
msgid "Show the working week"
msgstr "Показать рабочую неделю"
-#: ../ui/evolution-calendar.xml.h:35
+#: ../ui/evolution-calendar.xml.h:33
msgid "View the current appointment"
msgstr "Просмотреть текущую встречу"
-#: ../ui/evolution-calendar.xml.h:36
+#: ../ui/evolution-calendar.xml.h:34
msgid "Week"
msgstr "Неделя"
-#: ../ui/evolution-calendar.xml.h:37
+#: ../ui/evolution-calendar.xml.h:35
msgid "Work Week"
msgstr "Рабочая неделя"
-#: ../ui/evolution-calendar.xml.h:42
+#: ../ui/evolution-calendar.xml.h:40
msgid "_Open Appointment"
msgstr "_Открыть встречу"
-#: ../ui/evolution-composer-entries.xml.h:1
+#: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:7
msgid "Copy selected text to the clipboard"
msgstr "Копировать выделенный текст в буфер обмена"
-#: ../ui/evolution-composer-entries.xml.h:2
-msgid "Cu_t"
-msgstr "_Вырезать"
-
#: ../ui/evolution-composer-entries.xml.h:3
+msgid "Copy selection to clipboard"
+msgstr "Копировать выделенный текст в буфер обмена"
+
+#: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:9
msgid "Cut selected text to the clipboard"
msgstr "Вырезать выделенный текст в буфер обмена"
-#: ../ui/evolution-composer-entries.xml.h:4
+#: ../ui/evolution-composer-entries.xml.h:7
+msgid "Cut selection to clipboard"
+msgstr "Вырезать выделенный текст в буфер обмена"
+
+#: ../ui/evolution-composer-entries.xml.h:9
+msgid "Paste from clipboard"
+msgstr "Вставить из буфера обмена"
+
+#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:10
msgid "Paste text from the clipboard"
msgstr "Вставить текст из буфера обмена"
-#: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-subscribe.xml.h:6
-msgid "Select _All"
-msgstr "В_ыделить все"
-
-#: ../ui/evolution-composer-entries.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:13
msgid "Select all text"
msgstr "Выделить весь текст"
-#: ../ui/evolution-executive-summary.xml.h:1
-msgid "Customize My Evolution"
-msgstr "Настроить My Evolution"
+#: ../ui/evolution-editor.xml.h:1 ../ui/evolution-message-composer.xml.h:1
+msgid "Attach"
+msgstr "Вложить"
+
+#: ../ui/evolution-editor.xml.h:2
+msgid "Click here to attach a file"
+msgstr "Нажмите, чтобы вложить файл"
+
+#: ../ui/evolution-editor.xml.h:3
+msgid "Click here to close the current window"
+msgstr "Нажмите, чтобы закрыть текущее окно"
+
+#: ../ui/evolution-editor.xml.h:4
+msgid "Click here to save the current window"
+msgstr "Нажмите, чтобы сохранить текущее окно"
+
+#: ../ui/evolution-editor.xml.h:5
+msgid "Click here to view help available"
+msgstr "Нажмите, чтобы просмотреть справку"
+
+#.
+#. <cmd name="FileSave" _label="Save"
+#. _tip="Save the current file" pixtype="stock" pixname="Save"
+#. accel="*Ctrl*s"/>
+#.
+#: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
+#: ../ui/evolution-message-composer.xml.h:3
+#: ../ui/evolution-signature-editor.xml.h:7
+msgid "Close"
+msgstr "Закрыть"
+
+#: ../ui/evolution-editor.xml.h:14 ../ui/evolution-message-composer.xml.h:41
+msgid "_Attachment..."
+msgstr "_Вложение..."
+
+#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-message-composer.xml.h:44 ../ui/evolution-subscribe.xml.h:9
+msgid "_Close"
+msgstr "_Закрыть"
+
+#: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-message-composer.xml.h:47
+#: ../ui/evolution-signature-editor.xml.h:25
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:41
+msgid "_File"
+msgstr "_Файл"
+
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:43
+msgid "_Help"
+msgstr "_Справка"
+
+#: ../ui/evolution-editor.xml.h:20
+msgid "_Insert"
+msgstr "_Вставить"
+
+#: ../ui/evolution-editor.xml.h:21
+msgid "_Options"
+msgstr "_Параметры"
+
+#: ../ui/evolution-event-editor.xml.h:1
+msgid "Alar_ms"
+msgstr "Сиг_налы"
+
+#: ../ui/evolution-event-editor.xml.h:3
+msgid "All day Event"
+msgstr "Событие на весь день"
+
+#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
+#: ../ui/evolution-task-editor.xml.h:1
+msgid "Classify as Confidential"
+msgstr "Классифицировать как Конфиденциальное"
+
+#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-memo-editor.xml.h:2
+#: ../ui/evolution-task-editor.xml.h:2
+msgid "Classify as Private"
+msgstr "Классифицировать как личное"
+
+#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-memo-editor.xml.h:3
+#: ../ui/evolution-task-editor.xml.h:3
+msgid "Classify as public"
+msgstr "Классифицировать как публичное"
+
+#: ../ui/evolution-event-editor.xml.h:7
+msgid "Click here to set or unset alarms for this event"
+msgstr "Нажмите, чтобы установить или сбросить сигналы для этого события"
+
+#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
+msgid "Insert advanced send options"
+msgstr "Вставить дополнительные параметры оправки"
+
+#: ../ui/evolution-event-editor.xml.h:10
+msgid "Make this a recurring event"
+msgstr "Сделать это событие повторяющимся"
+
+#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
+#: ../ui/evolution-task-editor.xml.h:6
+#, fuzzy
+msgid "Pu_blic"
+msgstr "Общее"
+
+#: ../ui/evolution-event-editor.xml.h:12
+#, fuzzy
+msgid "Query free / busy information for the attendees"
+msgstr "Опубликовать информацию о занятости для этого календаря"
+
+#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
+#, fuzzy
+msgid "R_ole Field"
+msgstr "Поле \"_Кому\""
+
+#: ../ui/evolution-event-editor.xml.h:16
+msgid "Show time as b_usy"
+msgstr "Показать время как _занят"
+
+#: ../ui/evolution-event-editor.xml.h:17 ../ui/evolution-task-editor.xml.h:11
+msgid "Time _Zone"
+msgstr "Часовой _пояс"
+
+#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:12
+#, fuzzy
+msgid "Toggles whether the Attendee Type field is displayed"
+msgstr "Переключить отображение поля \"Кому\""
+
+#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:13
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "Переключить отображение поля \"Просьба ответить\""
+
+#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:14
+msgid "Toggles whether the Role field is displayed"
+msgstr ""
+
+#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:15
+#, fuzzy
+msgid "Toggles whether the Status field is displayed"
+msgstr "Переключить отображение поля \"Кому\""
+
+#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:16
+#, fuzzy
+msgid "Toggles whether the time zone is displayed"
+msgstr "Переключить отображение выбора для поля \"От\""
+
+#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-memo-editor.xml.h:5
+#: ../ui/evolution-task-editor.xml.h:17
+#, fuzzy
+msgid "Toggles whether to display categories"
+msgstr "Переключить отображение поля \"Кому\""
+
+#: ../ui/evolution-event-editor.xml.h:24
+#, fuzzy
+msgid "Toggles whether to have All day Event"
+msgstr "Переключить отображение поля \"Кому\""
+
+#: ../ui/evolution-event-editor.xml.h:25
+#, fuzzy
+msgid "Toggles whether to show time as busy"
+msgstr "Переключить отображение поля \"Кому\""
+
+#: ../ui/evolution-event-editor.xml.h:26
+msgid "_All day Event"
+msgstr "Событие на _весь день"
+
+#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:7
+#: ../ui/evolution-task-editor.xml.h:19
+msgid "_Classification"
+msgstr "_Классификация"
+
+#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:8
+#: ../ui/evolution-task-editor.xml.h:20
+msgid "_Confidential"
+msgstr "_Конфиденциальное"
+
+#: ../ui/evolution-event-editor.xml.h:30
+msgid "_Free/Busy"
+msgstr "Cво_боден/Занят"
+
+#: ../ui/evolution-event-editor.xml.h:31 ../ui/evolution-memo-editor.xml.h:9
+#: ../ui/evolution-task-editor.xml.h:21
+msgid "_Private"
+msgstr "_Личное"
+
+#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-task-editor.xml.h:22
+msgid "_RSVP"
+msgstr "П_росьба ответить"
+
+#: ../ui/evolution-event-editor.xml.h:33
+msgid "_Recurrence"
+msgstr "_Повторение"
+
+#: ../ui/evolution-event-editor.xml.h:34 ../ui/evolution-task-editor.xml.h:25
+msgid "_Status Field"
+msgstr "Поле _состояния"
+
+#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:26
+msgid "_Type Field"
+msgstr "Поле _типа"
#: ../ui/evolution-mail-global.xml.h:2
msgid "Cancel the current mail operation"
@@ -17856,60 +18757,56 @@ msgstr "Создать или исправить правила фильтрац
msgid "Empty _Trash"
msgstr "О_чистить корзину"
-#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:6
+#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:11
#: ../ui/evolution-subscribe.xml.h:2
msgid "F_older"
-msgstr "_Папка"
+msgstr "П_апка"
#: ../ui/evolution-mail-global.xml.h:9
-msgid "Message F_ilters"
-msgstr "Ф_ильтры сообщений"
-
-#: ../ui/evolution-mail-global.xml.h:10
-msgid "Message _List As"
-msgstr "Список сообщений _как"
-
-#: ../ui/evolution-mail-global.xml.h:11
msgid "Message _Preview"
msgstr "_Предварительный просмотр сообщения"
-#: ../ui/evolution-mail-global.xml.h:12
+#: ../ui/evolution-mail-global.xml.h:10
msgid "Move the selected folder into another folder"
msgstr "Переместить выделенную папку в другую папку"
-#: ../ui/evolution-mail-global.xml.h:13
+#. Alphabetical by name, yo
+#: ../ui/evolution-mail-global.xml.h:12
msgid "Permanently remove all deleted messages from all folders"
msgstr "Уничтожить все сообщения, помеченные как удаленные, во всех папках"
-#: ../ui/evolution-mail-global.xml.h:14
+#: ../ui/evolution-mail-global.xml.h:13
msgid "Search F_olders"
-msgstr "Папки п_оиска"
+msgstr "П_апки поиска"
-#: ../ui/evolution-mail-global.xml.h:15
+#: ../ui/evolution-mail-global.xml.h:14
msgid "Show message preview window"
msgstr "Показать окно просмотра сообщения"
-#: ../ui/evolution-mail-global.xml.h:16
+#: ../ui/evolution-mail-global.xml.h:15
msgid "Subscribe or unsubscribe to folders on remote servers"
msgstr "Подписаться или отказаться от подписки на папки на удаленном сервере"
-#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-global.xml.h:16
msgid "_Copy Folder To..."
msgstr "_Копировать папку в..."
+#: ../ui/evolution-mail-global.xml.h:17
+msgid "_Message Filters"
+msgstr "_Фильтры сообщений"
+
#: ../ui/evolution-mail-global.xml.h:18
msgid "_Move Folder To..."
msgstr "Пере_местить папку в..."
#: ../ui/evolution-mail-global.xml.h:19
-msgid "_New Search _Folder (FIXME)"
-msgstr "Новая папка _поиска (ИСПРАВИТЬ)"
-
-#: ../ui/evolution-mail-global.xml.h:20
msgid "_New..."
msgstr "_Создать..."
-#: ../ui/evolution-mail-global.xml.h:21
+#.
+#. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
+#.
+#: ../ui/evolution-mail-global.xml.h:23
msgid "_Subscriptions"
msgstr "_Подписки"
@@ -17921,99 +18818,115 @@ msgstr "Изменить имя этой папки"
msgid "Change the properties of this folder"
msgstr "Изменить свойства этой папки"
-#: ../ui/evolution-mail-list.xml.h:3 ../ui/evolution-mail-message.xml.h:12
+#: ../ui/evolution-mail-list.xml.h:3
+msgid "Collapse All _Threads"
+msgstr "Группировать по под_шивкам"
+
+#: ../ui/evolution-mail-list.xml.h:4
+msgid "Collapse all message threads"
+msgstr "Свернуть все подшивки сообщений"
+
+#: ../ui/evolution-mail-list.xml.h:5
msgid "Copy selected message(s) to the clipboard"
msgstr "Копировать выбранные сообщения в буфер обмена"
-#: ../ui/evolution-mail-list.xml.h:4 ../ui/evolution-mail-message.xml.h:23
+#. Alphabetical by name, yo
+#: ../ui/evolution-mail-list.xml.h:7
msgid "Cut selected message(s) to the clipboard"
msgstr "Вырезать выбранные сообщения в буфер обмена"
-#: ../ui/evolution-mail-list.xml.h:5
+#: ../ui/evolution-mail-list.xml.h:8
+msgid "E_xpand All Threads"
+msgstr "_Развернуть все подшивки"
+
+#: ../ui/evolution-mail-list.xml.h:9
msgid "E_xpunge"
msgstr "Уни_чтожить удаленные"
-#: ../ui/evolution-mail-list.xml.h:7
-msgid "Group By _Threads"
-msgstr "Группировать по под_шивкам"
+#: ../ui/evolution-mail-list.xml.h:10
+msgid "Expand all message threads"
+msgstr "Развернуть все подшивки сообщений"
-#: ../ui/evolution-mail-list.xml.h:8
+#: ../ui/evolution-mail-list.xml.h:12
msgid "Hide S_elected Messages"
msgstr "Скрыть выд_еленные сообщения"
-#: ../ui/evolution-mail-list.xml.h:9
+#: ../ui/evolution-mail-list.xml.h:13
msgid "Hide _Deleted Messages"
msgstr "Скрывать сообщения, помеченные как удаленные"
-#: ../ui/evolution-mail-list.xml.h:10
+#: ../ui/evolution-mail-list.xml.h:14
msgid "Hide _Read Messages"
msgstr "Скрыть п_рочитанные сообщения"
-#: ../ui/evolution-mail-list.xml.h:11
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
+#: ../ui/evolution-mail-list.xml.h:15
+msgid "Hide deleted messages rather than displaying them with a line through them"
msgstr "Скрывать сообщения, помеченные как удаленные, вместо их перечеркивания"
-#: ../ui/evolution-mail-list.xml.h:12
-msgid "Mar_k Messages as Read"
+#: ../ui/evolution-mail-list.xml.h:16
+msgid "Mar_k All Messages as Read"
msgstr "Пометить сообщения как \"_Прочитанные\""
-#: ../ui/evolution-mail-list.xml.h:13 ../ui/evolution-mail-message.xml.h:68
+#: ../ui/evolution-mail-list.xml.h:17
msgid "Paste message(s) from the clipboard"
msgstr "Вставить сообщения из буфера обмена"
-#: ../ui/evolution-mail-list.xml.h:14
+#: ../ui/evolution-mail-list.xml.h:18
msgid "Permanently remove all deleted messages from this folder"
msgstr "Уничтожить все сообщения, помеченные как удаленные, в этой папке"
-#: ../ui/evolution-mail-list.xml.h:15
+#: ../ui/evolution-mail-list.xml.h:19
msgid "Permanently remove this folder"
msgstr "Окончетельно удалить эту папку"
-#: ../ui/evolution-mail-list.xml.h:16
+#: ../ui/evolution-mail-list.xml.h:20
msgid "Select Message _Thread"
msgstr "Выделить _подшивку сообщений"
-#: ../ui/evolution-mail-list.xml.h:17
+#: ../ui/evolution-mail-list.xml.h:21
msgid "Select _All Messages"
msgstr "Выделить _все сообщения"
-#: ../ui/evolution-mail-list.xml.h:18
+#: ../ui/evolution-mail-list.xml.h:22
msgid "Select all and only the messages that are not currently selected"
msgstr "Выделить все невыделенные сообщения"
-#: ../ui/evolution-mail-list.xml.h:19
+#: ../ui/evolution-mail-list.xml.h:23
msgid "Select all messages in the same thread as the selected message"
msgstr "Выделить все сообщения в той же подшивке, что и выделенное сообщение"
-#: ../ui/evolution-mail-list.xml.h:20
+#: ../ui/evolution-mail-list.xml.h:24
msgid "Select all visible messages"
msgstr "Выделить все видимые сообщения"
-#: ../ui/evolution-mail-list.xml.h:21
+#: ../ui/evolution-mail-list.xml.h:25
msgid "Sh_ow Hidden Messages"
msgstr "Показать скрытые сообщения"
-#: ../ui/evolution-mail-list.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:26
msgid "Show messages that have been temporarily hidden"
msgstr "Показать сообщения, которые были временно скрыты"
-#: ../ui/evolution-mail-list.xml.h:23
+#: ../ui/evolution-mail-list.xml.h:27
msgid "Temporarily hide all messages that have already been read"
msgstr "Временно скрыть все прочитанные сообщения"
-#: ../ui/evolution-mail-list.xml.h:24
+#: ../ui/evolution-mail-list.xml.h:28
msgid "Temporarily hide the selected messages"
msgstr "Временно скрыть выбранные сообщения"
-#: ../ui/evolution-mail-list.xml.h:25
+#: ../ui/evolution-mail-list.xml.h:29
msgid "Threaded Message list"
msgstr "Показывать подшитые по теме сообщения в списке сообщений"
-#: ../ui/evolution-mail-list.xml.h:28 ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-list.xml.h:31
+msgid "_Group By Threads"
+msgstr "_Группировать по подшивкам"
+
+#: ../ui/evolution-mail-list.xml.h:32 ../ui/evolution-mail-message.xml.h:116
#: ../ui/evolution-mail-messagedisplay.xml.h:7
msgid "_Message"
-msgstr "С_ообщение"
+msgstr "Сооб_щение"
#: ../ui/evolution-mail-message.xml.h:1
msgid "A_dd Sender to Address Book"
@@ -18023,42 +18936,47 @@ msgstr "_Добавить отправителя в адресную книгу"
msgid "A_pply Filters"
msgstr "Применить _фильтры"
-#: ../ui/evolution-mail-message.xml.h:3
+#. Alphabetical by name, yo
+#: ../ui/evolution-mail-message.xml.h:4
msgid "Add Sender to Address Book"
msgstr "Добавить отправителя в адресную книгу"
-#: ../ui/evolution-mail-message.xml.h:4
+#: ../ui/evolution-mail-message.xml.h:5
msgid "All Message _Headers"
msgstr "Все _заголовки сообщения"
-#: ../ui/evolution-mail-message.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:6
msgid "Apply filter rules to the selected messages"
msgstr "Применить фильтры к выбранным сообщениям"
-#: ../ui/evolution-mail-message.xml.h:6
+#: ../ui/evolution-mail-message.xml.h:7
msgid "Check for _Junk"
msgstr "Проверить на _спам"
-#: ../ui/evolution-mail-message.xml.h:7
+#: ../ui/evolution-mail-message.xml.h:8
msgid "Compose _New Message"
msgstr "Созд_ать новое сообщение"
-#: ../ui/evolution-mail-message.xml.h:8
+#: ../ui/evolution-mail-message.xml.h:9
msgid "Compose a reply to all of the recipients of the selected message"
msgstr "Ответить всем получателям этого сообщения"
-#: ../ui/evolution-mail-message.xml.h:9
+#: ../ui/evolution-mail-message.xml.h:10
msgid "Compose a reply to the mailing list of the selected message"
msgstr "Ответить в список рассылки этого сообщения"
-#: ../ui/evolution-mail-message.xml.h:10
+#: ../ui/evolution-mail-message.xml.h:11
msgid "Compose a reply to the sender of the selected message"
msgstr "Ответить отправителю этого сообщения"
-#: ../ui/evolution-mail-message.xml.h:13
+#: ../ui/evolution-mail-message.xml.h:12
msgid "Copy selected messages to another folder"
msgstr "Копировать выбранные сообщения в другую папку"
+#: ../ui/evolution-mail-message.xml.h:13
+msgid "Copy selected messages to the clipboard"
+msgstr "Копировать выделенные сообщения в буфер обмена"
+
#: ../ui/evolution-mail-message.xml.h:14
msgid "Create R_ule"
msgstr "Создать прав_ило"
@@ -18095,6 +19013,10 @@ msgstr "Создать правило для фильтрации сообщен
msgid "Create a rule to filter messages with this subject"
msgstr "Создать правило для фильтрации сообщений с этой темой"
+#: ../ui/evolution-mail-message.xml.h:23
+msgid "Cut selected messages to the clipboard"
+msgstr "Вырезать выделенные сообщения в буфер обмена"
+
#: ../ui/evolution-mail-message.xml.h:24
msgid "Decrease the text size"
msgstr "Уменьшить размер текста"
@@ -18108,12 +19030,12 @@ msgid "Display the next message"
msgstr "Показать следующее сообщение"
#: ../ui/evolution-mail-message.xml.h:28
-msgid "Display the next unread message"
-msgstr "Показать следующее непрочитанное сообщение"
+msgid "Display the next thread"
+msgstr "Показать следующую подшивку"
#: ../ui/evolution-mail-message.xml.h:29
-msgid "Display the next unread thread"
-msgstr "Показать следующую непрочитанную подшивку"
+msgid "Display the next unread message"
+msgstr "Показать следующее непрочитанное сообщение"
#: ../ui/evolution-mail-message.xml.h:30
msgid "Display the previous important message"
@@ -18128,166 +19050,166 @@ msgid "Display the previous unread message"
msgstr "Показать предыдущее непрочитанное сообщение"
#: ../ui/evolution-mail-message.xml.h:33
+msgid "F_orward As..."
+msgstr "П_ереслать как..."
+
+#: ../ui/evolution-mail-message.xml.h:34
msgid "Filter on Mailing _List..."
msgstr "Фильтр по списку рассылки..."
-#: ../ui/evolution-mail-message.xml.h:34
+#: ../ui/evolution-mail-message.xml.h:35
msgid "Filter on Se_nder..."
msgstr "Фильтр по отправителю..."
-#: ../ui/evolution-mail-message.xml.h:35
+#: ../ui/evolution-mail-message.xml.h:36
msgid "Filter on _Recipients..."
msgstr "Фильтр по получателю..."
-#: ../ui/evolution-mail-message.xml.h:36
+#: ../ui/evolution-mail-message.xml.h:37
msgid "Filter on _Subject..."
msgstr "Фильтр по теме..."
-#: ../ui/evolution-mail-message.xml.h:37
+#: ../ui/evolution-mail-message.xml.h:38
msgid "Filter the selected messages for junk status"
msgstr "Фильтровать выбранные сообщения по состоянию \"спам\""
-#: ../ui/evolution-mail-message.xml.h:38
-msgid "Flag selected message(s) for follow-up"
-msgstr "Пометить выбранные сообщения к исполнению"
-
#: ../ui/evolution-mail-message.xml.h:39
+msgid "Flag selected messages for follow-up"
+msgstr "Пометить выделенные сообщения к исполнению"
+
+#: ../ui/evolution-mail-message.xml.h:40
msgid "Follow _Up..."
msgstr "К _исполнению..."
-#: ../ui/evolution-mail-message.xml.h:40
+#: ../ui/evolution-mail-message.xml.h:41
msgid "Force images in HTML mail to be loaded"
msgstr "Включить загрузку картинок в почте в формате HTML"
-#: ../ui/evolution-mail-message.xml.h:42
+#: ../ui/evolution-mail-message.xml.h:43
msgid "Forward the selected message in the body of a new message"
msgstr "Переслать выбранное сообщение в теле нового сообщения"
-#: ../ui/evolution-mail-message.xml.h:43
+#: ../ui/evolution-mail-message.xml.h:44
msgid "Forward the selected message quoted like a reply"
msgstr "Переслать выбранное сообщение процитированным как при ответе"
-#: ../ui/evolution-mail-message.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:45
msgid "Forward the selected message to someone"
msgstr "Переслать выбранное сообщение кому-либо"
-#: ../ui/evolution-mail-message.xml.h:45
+#: ../ui/evolution-mail-message.xml.h:46
msgid "Forward the selected message to someone as an attachment"
msgstr "Переслать выбранное сообщение кому-либо как вложение"
-#: ../ui/evolution-mail-message.xml.h:46
+#: ../ui/evolution-mail-message.xml.h:47
msgid "Increase the text size"
msgstr "Увеличить размер текста"
-#: ../ui/evolution-mail-message.xml.h:48
+#: ../ui/evolution-mail-message.xml.h:49
msgid "Mar_k as"
msgstr "По_метить как"
-#: ../ui/evolution-mail-message.xml.h:49
-msgid "Mark the selected message(s) as having been read"
-msgstr "Пометить выбранные сообщения как уже прочитанные"
-
#: ../ui/evolution-mail-message.xml.h:50
-msgid "Mark the selected message(s) as important"
-msgstr "Пометить выбранные сообщения как важные"
+msgid "Mark the selected messages as having been read"
+msgstr "Пометить выделенные сообщения как уже прочитанные"
#: ../ui/evolution-mail-message.xml.h:51
-msgid "Mark the selected message(s) as junk"
-msgstr "Пометить выбранные сообщения как спам"
+msgid "Mark the selected messages as important"
+msgstr "Пометить выделенные сообщения как важные"
#: ../ui/evolution-mail-message.xml.h:52
-msgid "Mark the selected message(s) as not being junk"
-msgstr "Пометить выбранные сообщения как не спам"
+msgid "Mark the selected messages as junk"
+msgstr "Пометить выделенные сообщения как спам"
#: ../ui/evolution-mail-message.xml.h:53
-msgid "Mark the selected message(s) as not having been read"
-msgstr "Пометить выбранные сообщения как еще не прочитанные"
+msgid "Mark the selected messages as not being junk"
+msgstr "Пометить выделенные сообщения как не спам"
#: ../ui/evolution-mail-message.xml.h:54
-msgid "Mark the selected message(s) as unimportant"
-msgstr "Пометить выбранные сообщения как неважные"
+msgid "Mark the selected messages as not having been read"
+msgstr "Пометить выделенные сообщения как еще не прочитанные"
#: ../ui/evolution-mail-message.xml.h:55
-msgid "Mark the selected messages for deletion"
-msgstr "Пометить выбранные сообщения для удаления"
+msgid "Mark the selected messages as unimportant"
+msgstr "Пометить выделенные сообщения как неважные"
#: ../ui/evolution-mail-message.xml.h:56
-msgid "Message Source"
-msgstr "Исходный текст сообщения"
+msgid "Mark the selected messages for deletion"
+msgstr "Пометить выбранные сообщения для удаления"
#: ../ui/evolution-mail-message.xml.h:57
-msgid "Move"
-msgstr "Переместить"
-
-#: ../ui/evolution-mail-message.xml.h:58
-msgid "Move selected message(s) to another folder"
-msgstr "Переместить выбранные сообщения в другую папку"
+msgid "Move selected messages to another folder"
+msgstr "Переместить выделенные сообщения в другую папку"
-#: ../ui/evolution-mail-message.xml.h:60
+#: ../ui/evolution-mail-message.xml.h:59
msgid "Next _Important Message"
msgstr "Следующему важному сообщению"
-#: ../ui/evolution-mail-message.xml.h:61
+#: ../ui/evolution-mail-message.xml.h:60
msgid "Next _Thread"
msgstr "Следующей подшивке"
-#: ../ui/evolution-mail-message.xml.h:62
+#: ../ui/evolution-mail-message.xml.h:61
msgid "Next _Unread Message"
msgstr "Следующему непрочитанному сообщению"
-#: ../ui/evolution-mail-message.xml.h:63
+#: ../ui/evolution-mail-message.xml.h:62
msgid "Not Junk"
msgstr "Не спам"
-#: ../ui/evolution-mail-message.xml.h:64
+#: ../ui/evolution-mail-message.xml.h:63
msgid "Open a window for composing a mail message"
msgstr "Открыть окно для создания почтового сообщения"
+#: ../ui/evolution-mail-message.xml.h:64
+msgid "Open the selected messages in a new window"
+msgstr "Отправить выделенные сообщения в новом окне"
+
#: ../ui/evolution-mail-message.xml.h:65
-msgid "Open the selected message in a new window"
-msgstr "Отправить выбранное сообщение в новом окне"
+msgid "Open the selected messages in the composer for editing"
+msgstr "Открыть выделенные сообщения в редакторе для изменения"
#: ../ui/evolution-mail-message.xml.h:66
-msgid "Open the selected message in the composer for editing"
-msgstr "Открыть выбранные сообщения в редакторе для изменения"
-
-#: ../ui/evolution-mail-message.xml.h:67
msgid "P_revious Unread Message"
msgstr "Предыдущему непрочитанному сообщению"
-#: ../ui/evolution-mail-message.xml.h:69
+#: ../ui/evolution-mail-message.xml.h:67
+msgid "Paste messages from the clipboard"
+msgstr "Вставить сообщения из буфера обмена"
+
+#: ../ui/evolution-mail-message.xml.h:68
msgid "Pos_t New Message to Folder"
msgstr "Поместить но_вое сообщение в папку"
-#: ../ui/evolution-mail-message.xml.h:70
+#: ../ui/evolution-mail-message.xml.h:69
msgid "Post a Repl_y"
msgstr "По_местить ответ"
-#: ../ui/evolution-mail-message.xml.h:71
+#: ../ui/evolution-mail-message.xml.h:70
msgid "Post a message to a Public folder"
msgstr "Поместить сообщение в публичную папку"
-#: ../ui/evolution-mail-message.xml.h:72
+#: ../ui/evolution-mail-message.xml.h:71
msgid "Post a reply to a message in a Public folder"
msgstr "Поместить ответ на сообщение в публичной папке"
-#: ../ui/evolution-mail-message.xml.h:73
+#: ../ui/evolution-mail-message.xml.h:72
msgid "Pr_evious Important Message"
msgstr "Предыдущему важному сообщению"
-#: ../ui/evolution-mail-message.xml.h:74
+#: ../ui/evolution-mail-message.xml.h:73
msgid "Preview the message to be printed"
msgstr "Посмотреть вид сообщения на печати"
-#: ../ui/evolution-mail-message.xml.h:78
+#: ../ui/evolution-mail-message.xml.h:77
msgid "Print this message"
msgstr "Напечатать это сообщение"
-#: ../ui/evolution-mail-message.xml.h:79
+#: ../ui/evolution-mail-message.xml.h:78
msgid "Re_direct"
msgstr "Пе_ренаправить"
-#: ../ui/evolution-mail-message.xml.h:80
+#: ../ui/evolution-mail-message.xml.h:79
msgid "Redirect (bounce) the selected message to someone"
msgstr "Переслать выбранное сообщение кому-либо от своего имени"
@@ -18296,8 +19218,8 @@ msgid "Reset the text to its original size"
msgstr "Установить размер текста в исходный"
#: ../ui/evolution-mail-message.xml.h:85
-msgid "Save the message as a text file"
-msgstr "Сохранить сообщение в текстовом файле"
+msgid "Save the selected messages as a text file"
+msgstr "Сохранить выделенные сообщения в текстовом файле"
#: ../ui/evolution-mail-message.xml.h:86
msgid "Search Folder from Mailing _List..."
@@ -18336,19 +19258,19 @@ msgid "Show a blinking cursor in the body of displayed messages"
msgstr "Показывать мигающий курсор в теле отображаемых сообщений"
#: ../ui/evolution-mail-message.xml.h:95
-msgid "Show message in the normal style"
-msgstr "Показывать сообщение в обычном стиле"
+msgid "Show messages in the normal style"
+msgstr "Отображать сообщения в обычном стиле"
#: ../ui/evolution-mail-message.xml.h:96
-msgid "Show message with all email headers"
-msgstr "Показывать сообщение со всеми заголовками"
+msgid "Show messages with all email headers"
+msgstr "Отображать сообщения со всеми заголовками"
#: ../ui/evolution-mail-message.xml.h:97
msgid "Show the raw email source of the message"
-msgstr "Показывать полный исходный текст сообщения"
+msgstr "Отображать полный исходный текст сообщения"
#: ../ui/evolution-mail-message.xml.h:98
-msgid "Un-delete the selected messages"
+msgid "Undelete the selected messages"
msgstr "Восстановить выделенные сообщения"
#: ../ui/evolution-mail-message.xml.h:99
@@ -18360,279 +19282,321 @@ msgid "Zoom _Out"
msgstr "У_меньшить"
#: ../ui/evolution-mail-message.xml.h:101
+msgid "_Attached"
+msgstr "_Вложение"
+
+#: ../ui/evolution-mail-message.xml.h:102
msgid "_Caret Mode"
msgstr "Режим _каретки"
-#: ../ui/evolution-mail-message.xml.h:104
+#: ../ui/evolution-mail-message.xml.h:103
+msgid "_Clear Flag"
+msgstr "О_чистить флаг"
+
+#: ../ui/evolution-mail-message.xml.h:106
msgid "_Delete Message"
msgstr "_Удалить сообщение"
-#: ../ui/evolution-mail-message.xml.h:106
+#: ../ui/evolution-mail-message.xml.h:108
msgid "_Find in Message..."
msgstr "_Поиск в сообщении..."
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:109
+msgid "_Flag Completed"
+msgstr "_Флаг \"Завершено\""
+
+#: ../ui/evolution-mail-message.xml.h:111
msgid "_Go To"
msgstr "_Перейти к"
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:112
msgid "_Important"
msgstr "_Важное"
-#: ../ui/evolution-mail-message.xml.h:110
+#: ../ui/evolution-mail-message.xml.h:113
+msgid "_Inline"
+msgstr "В_строенное"
+
+#: ../ui/evolution-mail-message.xml.h:114
msgid "_Junk"
msgstr "_Спам"
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:115
msgid "_Load Images"
msgstr "_Загрузить изображения"
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:117
+msgid "_Message Source"
+msgstr "_Исходный текст сообщения"
+
+#: ../ui/evolution-mail-message.xml.h:119
msgid "_Next Message"
msgstr "_Следующее сообшение"
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:120
msgid "_Normal Size"
-msgstr "_Обычный размер"
+msgstr "Обычный размер"
-#: ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-message.xml.h:121
msgid "_Not Junk"
msgstr "_Не спам"
-#: ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:122
msgid "_Open in New Window"
msgstr "_Открыть в новом окне"
-#: ../ui/evolution-mail-message.xml.h:118
+#: ../ui/evolution-mail-message.xml.h:123
msgid "_Previous Message"
msgstr "_Предыдущее сообщение"
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:125
+msgid "_Quoted"
+msgstr "_Цитирование"
+
+#: ../ui/evolution-mail-message.xml.h:128
msgid "_Save Message..."
msgstr "_Сохранить сообщение..."
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:129
msgid "_Undelete Message"
-msgstr "_Восстановить сообщение"
+msgstr "В_осстановить сообщение"
-#: ../ui/evolution-mail-message.xml.h:124
+#: ../ui/evolution-mail-message.xml.h:130
msgid "_Unread"
msgstr "_Непрочитано"
-#: ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-mail-message.xml.h:131
msgid "_Zoom In"
msgstr "У_величить"
-#: ../ui/evolution-mail-messagedisplay.xml.h:1
-#: ../ui/evolution-message-composer.xml.h:4
-#: ../ui/evolution-signature-editor.xml.h:2
-msgid "Close"
-msgstr "Закрыть"
-
#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
msgid "Close this window"
msgstr "Закрыть это окно"
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:17
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:16
msgid "Main toolbar"
msgstr "Главная панель инструментов"
-#: ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-message-composer.xml.h:42 ../ui/evolution-subscribe.xml.h:9
-msgid "_Close"
-msgstr "_Закрыть"
+#: ../ui/evolution-memos.xml.h:3
+msgid "Copy selected memo"
+msgstr "Копировать выделенную заметку"
-#: ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-message-composer.xml.h:45
-#: ../ui/evolution-signature-editor.xml.h:13
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:34
-msgid "_File"
-msgstr "_Файл"
+#: ../ui/evolution-memos.xml.h:5
+msgid "Cut selected memo"
+msgstr "Вырезать выделенную заметку"
-#: ../ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "Вложить"
+#: ../ui/evolution-memos.xml.h:7
+msgid "Delete selected memos"
+msgstr "Удалить выделенные заметки"
+
+#: ../ui/evolution-memos.xml.h:9
+msgid "Paste memo from the clipboard"
+msgstr "Вставить заметки из буфера обмена"
+
+#: ../ui/evolution-memos.xml.h:10
+msgid "Previews the list of memos to be printed"
+msgstr "Предварительный просмотр списка заметок перед печатью"
+
+#: ../ui/evolution-memos.xml.h:13
+msgid "Print the list of memos"
+msgstr "Распечатать список заметок"
+
+#: ../ui/evolution-memos.xml.h:14
+msgid "View the selected memo"
+msgstr "Просмотреть выделенные заметки"
+
+#: ../ui/evolution-memos.xml.h:18
+msgid "_Open Memo"
+msgstr "_Открыть заметку"
#: ../ui/evolution-message-composer.xml.h:2
msgid "Attach a file"
msgstr "Вложить файл"
-#: ../ui/evolution-message-composer.xml.h:3
-msgid "Check to get delivery notification when your message is read"
-msgstr ""
-"Установите, чтобы получить уведомление о доставке по прочтении вашего "
-"сообщения"
-
-#: ../ui/evolution-message-composer.xml.h:5
-#: ../ui/evolution-signature-editor.xml.h:3
+#.
+#. <cmd name="FileSave" _label="Save"
+#. _tip="Save the current file" pixtype="stock" pixname="Save"
+#. accel="*Ctrl*s"/>
+#.
+#: ../ui/evolution-message-composer.xml.h:4
+#: ../ui/evolution-signature-editor.xml.h:13
msgid "Close the current file"
msgstr "Закрыть текущий файл"
-#: ../ui/evolution-message-composer.xml.h:6
+#: ../ui/evolution-message-composer.xml.h:5
msgid "Delete all but signature"
msgstr "Удалить все кроме подписи"
-#: ../ui/evolution-message-composer.xml.h:7
+#: ../ui/evolution-message-composer.xml.h:6
msgid "Encrypt this message with PGP"
msgstr "Зашифровать это сообщение с помощью PGP"
-#: ../ui/evolution-message-composer.xml.h:8
+#: ../ui/evolution-message-composer.xml.h:7
msgid "Encrypt this message with your S/MIME Encryption Certificate"
msgstr "Зашифровать это сообщение вашим сертификатом шифрования S/MIME"
-#: ../ui/evolution-message-composer.xml.h:9
-#: ../ui/evolution-signature-editor.xml.h:4
+#: ../ui/evolution-message-composer.xml.h:8
+#: ../ui/evolution-signature-editor.xml.h:14
msgid "For_mat"
msgstr "Фор_мат"
+#: ../ui/evolution-message-composer.xml.h:9
+msgid "Get delivery notification when your message is read"
+msgstr ""
+"Установите, чтобы получить уведомление о доставке по прочтении вашего "
+"сообщения"
+
#: ../ui/evolution-message-composer.xml.h:10
msgid "HT_ML"
msgstr "HTML"
-#: ../ui/evolution-message-composer.xml.h:12
+#: ../ui/evolution-message-composer.xml.h:11
+#: ../ui/evolution-signature-editor.xml.h:16
+msgid "I_nsert"
+msgstr "_Вставить"
+
+#: ../ui/evolution-message-composer.xml.h:13
msgid "Open a file"
msgstr "Открыть файл"
-#: ../ui/evolution-message-composer.xml.h:13
+#: ../ui/evolution-message-composer.xml.h:14
msgid "PGP Encrypt"
msgstr "Зашифровать с помощью PGP"
-#: ../ui/evolution-message-composer.xml.h:14
+#: ../ui/evolution-message-composer.xml.h:15
msgid "PGP Sign"
msgstr "Подписать с помощью PGP"
-#: ../ui/evolution-message-composer.xml.h:15
-msgid "Request read receipt"
+#: ../ui/evolution-message-composer.xml.h:16
+msgid "R_equest Read Receipt"
msgstr "Запросить отчет о прочтении"
-#: ../ui/evolution-message-composer.xml.h:16
+#: ../ui/evolution-message-composer.xml.h:17
msgid "S/MIME Encrypt"
msgstr "Зашифровать с помощью S/MIME"
-#: ../ui/evolution-message-composer.xml.h:17
+#: ../ui/evolution-message-composer.xml.h:18
msgid "S/MIME Sign"
msgstr "Подписать с помощью S/MIME"
-#: ../ui/evolution-message-composer.xml.h:19
+#: ../ui/evolution-message-composer.xml.h:20
msgid "Save As"
msgstr "Сохранить как"
-#: ../ui/evolution-message-composer.xml.h:20
+#: ../ui/evolution-message-composer.xml.h:21
msgid "Save Draft"
msgstr "Сохранить черновик"
-#: ../ui/evolution-message-composer.xml.h:21
+#: ../ui/evolution-message-composer.xml.h:22
msgid "Save _As..."
msgstr "Сохранить как..."
-#: ../ui/evolution-message-composer.xml.h:22
+#: ../ui/evolution-message-composer.xml.h:23
msgid "Save _Draft"
msgstr "Сохранить _черновик"
-#: ../ui/evolution-message-composer.xml.h:23
+#: ../ui/evolution-message-composer.xml.h:24
msgid "Save as draft"
msgstr "Сохранить как черновик"
-#: ../ui/evolution-message-composer.xml.h:24
+#: ../ui/evolution-message-composer.xml.h:25
msgid "Save in folder..."
msgstr "Сохранить в папке..."
-#: ../ui/evolution-message-composer.xml.h:25
-#: ../ui/evolution-signature-editor.xml.h:9
+#: ../ui/evolution-message-composer.xml.h:26
msgid "Save the current file"
msgstr "Сохранить текущий файл"
-#: ../ui/evolution-message-composer.xml.h:26
+#: ../ui/evolution-message-composer.xml.h:27
msgid "Save the current file with a different name"
msgstr "Сохранить текущий файл под другим именем"
-#: ../ui/evolution-message-composer.xml.h:27
+#: ../ui/evolution-message-composer.xml.h:28
msgid "Save the message in a specified folder"
msgstr "Сохранить сообщение в указанной папке"
-#: ../ui/evolution-message-composer.xml.h:29
-#: ../ui/evolution-signature-editor.xml.h:11
+#: ../ui/evolution-message-composer.xml.h:30
+#: ../ui/evolution-signature-editor.xml.h:23
msgid "Send the mail in HTML format"
msgstr "Отправить почту в формате HTML"
-#: ../ui/evolution-message-composer.xml.h:30
+#: ../ui/evolution-message-composer.xml.h:31
msgid "Send this message"
msgstr "Отправить это сообщение"
-#: ../ui/evolution-message-composer.xml.h:31
+#: ../ui/evolution-message-composer.xml.h:32
+msgid "Set the message priority to high"
+msgstr "Установить высокий приоритет сообщения"
+
+#: ../ui/evolution-message-composer.xml.h:33
msgid "Sign this message with your PGP key"
msgstr "Подписать это сообщение вашим PGP-ключом"
-#: ../ui/evolution-message-composer.xml.h:32
+#: ../ui/evolution-message-composer.xml.h:34
msgid "Sign this message with your S/MIME Signature Certificate"
msgstr "Подписать это сообщение вашим сертификатом шифрования S/MIME"
-#: ../ui/evolution-message-composer.xml.h:33
+#: ../ui/evolution-message-composer.xml.h:35
msgid "Toggles whether the BCC field is displayed"
msgstr "Переключить отображение поля скрытой копии"
-#: ../ui/evolution-message-composer.xml.h:34
+#: ../ui/evolution-message-composer.xml.h:36
msgid "Toggles whether the CC field is displayed"
msgstr "Переключить отображение поля копии"
-#: ../ui/evolution-message-composer.xml.h:35
+#: ../ui/evolution-message-composer.xml.h:37
msgid "Toggles whether the From chooser is displayed"
msgstr "Переключить отображение выбора для поля \"От\""
-#: ../ui/evolution-message-composer.xml.h:36
+#: ../ui/evolution-message-composer.xml.h:38
msgid "Toggles whether the Post-To field is displayed"
msgstr "Переключить отображение поля \"Post-To\""
-#: ../ui/evolution-message-composer.xml.h:37
+#: ../ui/evolution-message-composer.xml.h:39
msgid "Toggles whether the Reply-To field is displayed"
msgstr "Переключить отображение поля \"Обратный адрес\""
-#: ../ui/evolution-message-composer.xml.h:38
+#: ../ui/evolution-message-composer.xml.h:40
msgid "Toggles whether the To field is displayed"
msgstr "Переключить отображение поля \"Кому\""
-#: ../ui/evolution-message-composer.xml.h:39
-msgid "_Attachment..."
-msgstr "_Вложение..."
-
-#: ../ui/evolution-message-composer.xml.h:40
+#: ../ui/evolution-message-composer.xml.h:42
msgid "_Bcc Field"
msgstr "Поле скрытой копии"
-#: ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-message-composer.xml.h:43
msgid "_Cc Field"
msgstr "Поле копии"
-#: ../ui/evolution-message-composer.xml.h:43
+#: ../ui/evolution-message-composer.xml.h:45
msgid "_Delete all"
msgstr "Удалить все"
-#: ../ui/evolution-message-composer.xml.h:46
+#: ../ui/evolution-message-composer.xml.h:48
msgid "_From Field"
msgstr "Поле \"От\""
-#: ../ui/evolution-message-composer.xml.h:47
-#: ../ui/evolution-signature-editor.xml.h:14
-msgid "_Insert"
-msgstr "_Вставить"
-
-#: ../ui/evolution-message-composer.xml.h:48
+#: ../ui/evolution-message-composer.xml.h:49
msgid "_Open..."
msgstr "_Открыть..."
-#: ../ui/evolution-message-composer.xml.h:49
+#: ../ui/evolution-message-composer.xml.h:50
msgid "_Post-To Field"
msgstr "Поле \"Post-To\""
-#: ../ui/evolution-message-composer.xml.h:50
+#: ../ui/evolution-message-composer.xml.h:51
+msgid "_Prioritize Message"
+msgstr "Изменить _приоритет сообщения"
+
+#: ../ui/evolution-message-composer.xml.h:52
msgid "_Reply-To Field"
msgstr "Поле \"Об_ратный адрес\""
-#: ../ui/evolution-message-composer.xml.h:52
+#: ../ui/evolution-message-composer.xml.h:54
msgid "_Security"
msgstr "_Безопасность"
-#: ../ui/evolution-message-composer.xml.h:53
+#: ../ui/evolution-message-composer.xml.h:55
msgid "_To Field"
msgstr "Поле \"_Кому\""
@@ -18640,19 +19604,22 @@ msgstr "Поле \"_Кому\""
msgid "C_lose"
msgstr "Закрыть"
-#: ../ui/evolution-signature-editor.xml.h:5
+#: ../ui/evolution-signature-editor.xml.h:15
msgid "H_TML"
msgstr "_HTML"
-#: ../ui/evolution-signature-editor.xml.h:7
+#: ../ui/evolution-signature-editor.xml.h:17
msgid "Save and Close"
msgstr "Сохранить и закрыть"
-#: ../ui/evolution-signature-editor.xml.h:8
+#.
+#. <menuitem name="FileSave" verb="" _label="_Save"/>
+#.
+#: ../ui/evolution-signature-editor.xml.h:21
msgid "Save and _Close"
msgstr "Сохранить и _закрыть"
-#: ../ui/evolution-signature-editor.xml.h:10
+#: ../ui/evolution-signature-editor.xml.h:22
msgid "Save the current file and close the window"
msgstr "Сохранить текущий файл и закрыть окно"
@@ -18684,13 +19651,33 @@ msgstr "Отказаться от подписки"
msgid "_Invert Selection"
msgstr "Обратить выделение"
+#: ../ui/evolution-task-editor.xml.h:4
+msgid "Click change / view the status details of the task"
+msgstr ""
+
+#: ../ui/evolution-task-editor.xml.h:9
+msgid "Status Details"
+msgstr "Подробности состояния"
+
+#: ../ui/evolution-task-editor.xml.h:10
+msgid "Time Zone"
+msgstr "Часовой пояс"
+
+#: ../ui/evolution-task-editor.xml.h:23
+msgid "_Send Options"
+msgstr "Параметры _отправки"
+
+#: ../ui/evolution-task-editor.xml.h:24
+msgid "_Status Details"
+msgstr ""
+
#: ../ui/evolution-tasks.xml.h:3
-msgid "Copy selected task"
-msgstr "Копировать выбранную задачу"
+msgid "Copy selected tasks"
+msgstr "Копировать выделенные задачи"
#: ../ui/evolution-tasks.xml.h:5
-msgid "Cut selected task"
-msgstr "Вырезать выбранную задачу"
+msgid "Cut selected tasks"
+msgstr "Вырезать выделенные задачи"
#: ../ui/evolution-tasks.xml.h:7
msgid "Delete completed tasks"
@@ -18709,8 +19696,8 @@ msgid "Mark selected tasks as complete"
msgstr "Пометить выбранные задачи как выполненные"
#: ../ui/evolution-tasks.xml.h:12
-msgid "Paste task from the clipboard"
-msgstr "Вставить задачу из буфера обмена"
+msgid "Paste tasks from the clipboard"
+msgstr "Вставить задачи из буфера обмена"
#: ../ui/evolution-tasks.xml.h:13
msgid "Previews the list of tasks to be printed"
@@ -18721,10 +19708,18 @@ msgid "Print the list of tasks"
msgstr "Распечатать список задач"
#: ../ui/evolution-tasks.xml.h:18
+msgid "Show task preview window"
+msgstr "Показать окно просмотра задачи"
+
+#: ../ui/evolution-tasks.xml.h:19
+msgid "Task _Preview"
+msgstr "_Предварительный просмотр задачи"
+
+#: ../ui/evolution-tasks.xml.h:20
msgid "View the selected task"
msgstr "Просмотреть выбранную задачу"
-#: ../ui/evolution-tasks.xml.h:25
+#: ../ui/evolution-tasks.xml.h:27
msgid "_Open Task"
msgstr "_Открыть задачу"
@@ -18761,45 +19756,45 @@ msgid "Display window buttons with text only"
msgstr "Отображать кнопки окна только с текстом"
#: ../ui/evolution.xml.h:10
-msgid "Evolution _FAQ"
-msgstr "Evolution _ЧАВО"
-
-#: ../ui/evolution.xml.h:11
msgid "Exit the program"
msgstr "Выйти из программы"
-#: ../ui/evolution.xml.h:12
-msgid "Forget _Passwords"
-msgstr "Забыть _пароли"
-
-#: ../ui/evolution.xml.h:13
+#: ../ui/evolution.xml.h:11
msgid "Forget remembered passwords so you will be prompted for them again"
msgstr "Забыть запомненные пароли, вы будете спрошены о них опять"
-#: ../ui/evolution.xml.h:14
+#: ../ui/evolution.xml.h:12
msgid "Hide window buttons"
msgstr "Скрыть кнопки окна"
-#: ../ui/evolution.xml.h:15
+#: ../ui/evolution.xml.h:13
+msgid "I_mport..."
+msgstr "_Импорт..."
+
+#: ../ui/evolution.xml.h:14
msgid "Icons _and text"
msgstr "Зн_ачки и текст"
-#: ../ui/evolution.xml.h:16
+#: ../ui/evolution.xml.h:15
msgid "Import data from other programs"
msgstr "Импортировать данные из других программ"
-#: ../ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:17
msgid "New _Window"
-msgstr "Новое _окно"
+msgstr "_Новое окно"
-#: ../ui/evolution.xml.h:19
+#: ../ui/evolution.xml.h:18
msgid "Prefere_nces"
-msgstr "Пара_метры"
+msgstr "П_араметры"
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:19
msgid "Send / Receive"
msgstr "Отправить/получить"
+#: ../ui/evolution.xml.h:20
+msgid "Send / _Receive"
+msgstr "_Отправить / Получить"
+
#: ../ui/evolution.xml.h:21
msgid "Send queued items and retrieve new items"
msgstr "Отправить элементы из очереди и получить новые элементы"
@@ -18813,90 +19808,90 @@ msgid "Show information about Evolution"
msgstr "Показать информацию о программе Ximian Evolution"
#: ../ui/evolution.xml.h:24
+msgid "Side _Bar"
+msgstr "_Боковая панель"
+
+#: ../ui/evolution.xml.h:25
+msgid "Status _Bar"
+msgstr "_Строка состояния"
+
+#: ../ui/evolution.xml.h:26
msgid "Submit Bug Report"
msgstr "Отправить сообщение об ошибке"
-#: ../ui/evolution.xml.h:25
+#. <menuitem name="HelpFAQ" verb=""
+#. _label="Evolution _FAQ"/>
+#.
+#. <separator/>
+#: ../ui/evolution.xml.h:31
msgid "Submit _Bug Report"
-msgstr "Отправить сообщение об оши_бке"
+msgstr "О_тправить сообщение об ошибке"
-#: ../ui/evolution.xml.h:26
+#: ../ui/evolution.xml.h:32
msgid "Submit a bug report using Bug Buddy"
msgstr "Отправить сообщение об ошибке, используя программу \"Баг Бадди\""
-#: ../ui/evolution.xml.h:27
+#: ../ui/evolution.xml.h:33
msgid "Toggle whether we are working offline."
msgstr "Переключить работу в/вне сети."
-#: ../ui/evolution.xml.h:28
+#: ../ui/evolution.xml.h:34
msgid "Tool_bar"
msgstr "Па_нель инструментов"
-#: ../ui/evolution.xml.h:29
+#: ../ui/evolution.xml.h:35
msgid "Tool_bar style"
msgstr "Стиль панели _инструментов"
-#: ../ui/evolution.xml.h:30
+#: ../ui/evolution.xml.h:36
+msgid "View/Hide the Side Bar"
+msgstr "Показать/спрятать строку состояния"
+
+#: ../ui/evolution.xml.h:37
msgid "View/Hide the Status Bar"
msgstr "Показать или спрятать строку состояния."
-#: ../ui/evolution.xml.h:31
-msgid "_About Evolution..."
-msgstr "_О программе Ximian Evolution"
+#: ../ui/evolution.xml.h:38
+msgid "_About"
+msgstr "_О программе"
-#: ../ui/evolution.xml.h:32
+#: ../ui/evolution.xml.h:39
msgid "_Close Window"
msgstr "_Закрыть окно"
-#: ../ui/evolution.xml.h:35
-msgid "_Help"
-msgstr "_Справка"
+#: ../ui/evolution.xml.h:42
+msgid "_Forget Passwords"
+msgstr "_Забыть пароли"
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution.xml.h:44
msgid "_Hide buttons"
msgstr "_Скрыть кнопки"
-#: ../ui/evolution.xml.h:37
+#: ../ui/evolution.xml.h:45
msgid "_Icons only"
msgstr "Только _значки"
-#: ../ui/evolution.xml.h:38
-msgid "_Import..."
-msgstr "_Импорт..."
-
-#: ../ui/evolution.xml.h:39
-msgid "_New"
-msgstr "_Создать"
-
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:47
msgid "_Quick Reference"
msgstr "_Быстрая справка"
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:48
msgid "_Quit"
msgstr "В_ыход"
-#: ../ui/evolution.xml.h:42
-msgid "_Send / Receive"
-msgstr "_Отправить / Получить"
-
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:49
msgid "_Switcher Appearance"
msgstr "Вид _переключателя"
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:50
msgid "_Synchronization Options..."
msgstr "Параметры _синхронизации..."
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:51
msgid "_Text only"
msgstr "_Только текст"
-#: ../ui/evolution.xml.h:47
-msgid "_View Status Bar"
-msgstr "_Строка состояния"
-
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:53
msgid "_Window"
msgstr "_Окно"
@@ -18956,6 +19951,10 @@ msgstr "По флагу \"_К исполнению\""
msgid "_Messages"
msgstr "С_ообщения"
+#: ../views/memos/galview.xml.h:1
+msgid "_Memos"
+msgstr "_Заметки"
+
#: ../views/tasks/galview.xml.h:1
msgid "With _Due Date"
msgstr "С _датой выполнения"
@@ -18964,8 +19963,8 @@ msgstr "С _датой выполнения"
msgid "With _Status"
msgstr "С _состоянием"
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:195
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:637
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:197
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:642
msgid "UTC"
msgstr "UTC"
@@ -19021,9 +20020,9 @@ msgid "_Edit..."
msgstr "_Изменить..."
#: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1845
-#: ../widgets/table/e-table-scrolled.c:224
-#: ../widgets/table/e-table-scrolled.c:225
+#: ../widgets/table/e-table-header-item.c:1839
+#: ../widgets/table/e-table-scrolled.c:222
+#: ../widgets/table/e-table-scrolled.c:223
msgid "Table"
msgstr "Таблица"
@@ -19043,9 +20042,24 @@ msgstr "_Создать новый обзор"
msgid "_Replace existing view"
msgstr "_Заменить существующий обзор"
+#. bonobo displays this string so it must be in locale
+#: ../widgets/menus/gal-view-instance.c:587
+#: ../widgets/menus/gal-view-menus.c:350
+msgid "Custom View"
+msgstr "Вид пользователя"
+
+#: ../widgets/menus/gal-view-instance.c:588
+msgid "Save Custom View"
+msgstr "Сохранить параметры обзора"
+
+#: ../widgets/menus/gal-view-instance.c:592
+#: ../widgets/menus/gal-view-menus.c:372
+msgid "Define Views..."
+msgstr "Режимы просмотра..."
+
#: ../widgets/menus/gal-view-menus.c:291
-msgid "_Current View"
-msgstr "Показывать"
+msgid "C_urrent View"
+msgstr "Тек_ущий вид"
#: ../widgets/menus/gal-view-menus.c:359
msgid "Save Custom View..."
@@ -19073,12 +20087,12 @@ msgstr "Тип обзора:"
#. Translators: These are the first characters of each day of the
#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: ../widgets/misc/e-calendar-item.c:415
+#: ../widgets/misc/e-calendar-item.c:416
msgid "MTWTFSS"
msgstr "ПВСЧПСВ"
#. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1097
+#: ../widgets/misc/e-calendar-item.c:1093
msgid "%B %Y"
msgstr "%B %Y"
@@ -19090,62 +20104,62 @@ msgstr "Предыдущая кнопка"
msgid "Month Calendar"
msgstr "Календарь месяца"
-#: ../widgets/misc/e-canvas-background.c:456
-#: ../widgets/misc/e-canvas-background.c:457 ../widgets/text/e-entry.c:1284
-#: ../widgets/text/e-entry.c:1285 ../widgets/text/e-text.c:3540
-#: ../widgets/text/e-text.c:3541
+#: ../widgets/misc/e-canvas-background.c:457
+#: ../widgets/misc/e-canvas-background.c:458 ../widgets/text/e-entry.c:1284
+#: ../widgets/text/e-entry.c:1285 ../widgets/text/e-text.c:3563
+#: ../widgets/text/e-text.c:3564
msgid "Fill color"
msgstr "Цвет заполнения"
-#: ../widgets/misc/e-canvas-background.c:463
#: ../widgets/misc/e-canvas-background.c:464
-#: ../widgets/misc/e-canvas-background.c:470
-#: ../widgets/misc/e-canvas-background.c:471 ../widgets/text/e-entry.c:1291
+#: ../widgets/misc/e-canvas-background.c:465
+#: ../widgets/misc/e-canvas-background.c:471
+#: ../widgets/misc/e-canvas-background.c:472 ../widgets/text/e-entry.c:1291
#: ../widgets/text/e-entry.c:1292 ../widgets/text/e-entry.c:1298
-#: ../widgets/text/e-entry.c:1299 ../widgets/text/e-text.c:3547
-#: ../widgets/text/e-text.c:3548 ../widgets/text/e-text.c:3555
-#: ../widgets/text/e-text.c:3556
+#: ../widgets/text/e-entry.c:1299 ../widgets/text/e-text.c:3570
+#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3578
+#: ../widgets/text/e-text.c:3579
msgid "GDK fill color"
msgstr "Цвет заполнения"
-#: ../widgets/misc/e-canvas-background.c:477
-#: ../widgets/misc/e-canvas-background.c:478 ../widgets/text/e-entry.c:1305
-#: ../widgets/text/e-entry.c:1306 ../widgets/text/e-text.c:3562
-#: ../widgets/text/e-text.c:3563
+#: ../widgets/misc/e-canvas-background.c:478
+#: ../widgets/misc/e-canvas-background.c:479 ../widgets/text/e-entry.c:1305
+#: ../widgets/text/e-entry.c:1306 ../widgets/text/e-text.c:3585
+#: ../widgets/text/e-text.c:3586
msgid "Fill stipple"
msgstr "Пунктир заполнения"
-#: ../widgets/misc/e-canvas-background.c:484
#: ../widgets/misc/e-canvas-background.c:485
+#: ../widgets/misc/e-canvas-background.c:486
msgid "X1"
msgstr "X1"
-#: ../widgets/misc/e-canvas-background.c:491
#: ../widgets/misc/e-canvas-background.c:492
+#: ../widgets/misc/e-canvas-background.c:493
msgid "X2"
msgstr "X2"
-#: ../widgets/misc/e-canvas-background.c:498
#: ../widgets/misc/e-canvas-background.c:499
+#: ../widgets/misc/e-canvas-background.c:500
msgid "Y1"
msgstr "Y1"
-#: ../widgets/misc/e-canvas-background.c:505
#: ../widgets/misc/e-canvas-background.c:506
+#: ../widgets/misc/e-canvas-background.c:507
msgid "Y2"
msgstr "Y2"
-#: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1430
-#: ../widgets/table/e-table-group-container.c:978
+#: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1427
+#: ../widgets/table/e-table-group-container.c:974
#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3005
+#: ../widgets/table/e-table-item.c:3011
msgid "Minimum width"
msgstr "Минимальная ширина"
-#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1431
-#: ../widgets/table/e-table-group-container.c:979
+#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1428
+#: ../widgets/table/e-table-group-container.c:975
#: ../widgets/table/e-table-group-leaf.c:637
-#: ../widgets/table/e-table-item.c:3006
+#: ../widgets/table/e-table-item.c:3012
msgid "Minimum Width"
msgstr "Минимальная ширина"
@@ -19154,11 +20168,11 @@ msgstr "Минимальная ширина"
msgid "Spacing"
msgstr "Пространство"
-#: ../widgets/misc/e-cell-date-edit.c:232 ../widgets/misc/e-dateedit.c:451
+#: ../widgets/misc/e-cell-date-edit.c:233 ../widgets/misc/e-dateedit.c:461
msgid "Now"
msgstr "Сейчас"
-#: ../widgets/misc/e-cell-date-edit.c:801
+#: ../widgets/misc/e-cell-date-edit.c:793
#, c-format
msgid "The time must be in the format: %s"
msgstr "Время должно быть в формате: %s"
@@ -19239,7 +20253,6 @@ msgid "Unknown character set: %s"
msgstr "Неизвестный набор символов: %s"
#: ../widgets/misc/e-charset-picker.c:216
-#: ../widgets/misc/e-charset-picker.c:479
msgid "Character Encoding"
msgstr "Кодировка символов"
@@ -19251,38 +20264,52 @@ msgstr "Введите используемый набор символов"
msgid "Other..."
msgstr "Другая..."
+#: ../widgets/misc/e-charset-picker.c:479
+msgid "Ch_aracter Encoding"
+msgstr "Ко_дировка символов"
+
#: ../widgets/misc/e-clipped-label.c:111
msgid "..."
msgstr "..."
-#: ../widgets/misc/e-dateedit.c:316
+#: ../widgets/misc/e-dateedit.c:321
msgid "Date and Time Entry"
msgstr "Ввод даты и времени"
-#: ../widgets/misc/e-dateedit.c:335
+#: ../widgets/misc/e-dateedit.c:340
msgid "Text entry to input date"
msgstr "Поле для текстового ввода даты"
-#: ../widgets/misc/e-dateedit.c:336
+#: ../widgets/misc/e-dateedit.c:341
msgid "Text Date Entry"
msgstr "Текстовый ввод даты"
-#: ../widgets/misc/e-dateedit.c:353
+#: ../widgets/misc/e-dateedit.c:362
msgid "Click this button to show a calendar"
msgstr "Нажмите эту кнопку для отображения календаря"
-#: ../widgets/misc/e-dateedit.c:354
+#: ../widgets/misc/e-dateedit.c:363
msgid "Date Button"
msgstr "Кнопка даты"
-#: ../widgets/misc/e-dateedit.c:374
+#: ../widgets/misc/e-dateedit.c:384
msgid "Combo box to select time"
msgstr "Выпадающий список для выбора времени"
-#: ../widgets/misc/e-dateedit.c:375
+#: ../widgets/misc/e-dateedit.c:385
msgid "Time Combo Box"
msgstr "Выпадающий список времени"
+#. This is a strftime() format. %H = hour (0-23), %M = minute.
+#: ../widgets/misc/e-dateedit.c:1436 ../widgets/misc/e-dateedit.c:1763
+msgid "%H:%M"
+msgstr "%H:%M"
+
+#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
+#: ../widgets/misc/e-dateedit.c:1439 ../widgets/misc/e-dateedit.c:1766
+msgid "%I:%M %p"
+msgstr "%I:%M %p"
+
#: ../widgets/misc/e-expander.c:181
msgid "Expanded"
msgstr "Расширенный"
@@ -19319,11 +20346,11 @@ msgstr "Виджет метки"
msgid "A widget to display in place of the usual expander label"
msgstr "Виджет, отображаемый на месте обычной метки расширителя"
-#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3318
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3312
msgid "Expander Size"
msgstr "Размер расширителя"
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3319
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3313
msgid "Size of the expander arrow"
msgstr "Размер стрелки расширителя"
@@ -19335,16 +20362,21 @@ msgstr "Пространство индикатора"
msgid "Spacing around expander arrow"
msgstr "Пространство вокруг стрелки расширителя"
-#: ../widgets/misc/e-filter-bar.c:195
+#. FIXME: get the toplevel window...
+#: ../widgets/misc/e-filter-bar.c:163
+msgid "Advanced Search"
+msgstr "Расширенный поиск"
+
+#: ../widgets/misc/e-filter-bar.c:202
msgid "_Searches"
msgstr "_Поиски"
-#: ../widgets/misc/e-filter-bar.c:197
-msgid "Search Editor"
-msgstr "Редактор поиска"
+#: ../widgets/misc/e-filter-bar.c:204
+msgid "Searches"
+msgstr "Поиски"
#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:220
+#: ../widgets/misc/e-filter-bar.c:227
msgid "Save Search"
msgstr "Сохранить результаты поиска"
@@ -19364,11 +20396,11 @@ msgstr "_Расширенный поиск..."
msgid "Choose Image"
msgstr "Выберите изображение"
-#: ../widgets/misc/e-map.c:647
+#: ../widgets/misc/e-map.c:627
msgid "World Map"
msgstr "Карта мира"
-#: ../widgets/misc/e-map.c:649
+#: ../widgets/misc/e-map.c:629
msgid ""
"Mouse-based interactive map widget for selecting timezone. Keyboard users "
"should select the timezone from the below combo box instead."
@@ -19388,55 +20420,55 @@ msgstr "Синхронизировать личные записи:"
msgid "Sync Categories:"
msgstr "Категории:"
-#: ../widgets/misc/e-reflow.c:1452 ../widgets/misc/e-reflow.c:1453
+#: ../widgets/misc/e-reflow.c:1449 ../widgets/misc/e-reflow.c:1450
msgid "Empty message"
msgstr "Пустое сообщение"
-#: ../widgets/misc/e-reflow.c:1459 ../widgets/misc/e-reflow.c:1460
+#: ../widgets/misc/e-reflow.c:1456 ../widgets/misc/e-reflow.c:1457
msgid "Reflow model"
msgstr "Reflow model"
-#: ../widgets/misc/e-reflow.c:1466 ../widgets/misc/e-reflow.c:1467
+#: ../widgets/misc/e-reflow.c:1463 ../widgets/misc/e-reflow.c:1464
msgid "Column width"
msgstr "Ширина столбца"
#. To translators: This is the accessibility name of
#. the search bar's text entry widget
-#: ../widgets/misc/e-search-bar.c:346
+#: ../widgets/misc/e-search-bar.c:371
msgid "Search Text Entry"
msgstr "Поиск текста"
-#: ../widgets/misc/e-search-bar.c:550
+#: ../widgets/misc/e-search-bar.c:588
msgid "_Search"
msgstr "П_оиск"
-#: ../widgets/misc/e-search-bar.c:556
+#: ../widgets/misc/e-search-bar.c:594
msgid "_Find Now"
msgstr "_Найти сейчас"
-#: ../widgets/misc/e-search-bar.c:557 ../widgets/misc/e-search-bar.c:944
+#: ../widgets/misc/e-search-bar.c:595 ../widgets/misc/e-search-bar.c:982
msgid "_Clear"
msgstr "О_чистить"
-#: ../widgets/misc/e-search-bar.c:648
+#: ../widgets/misc/e-search-bar.c:686
msgid "Search Type"
msgstr "Тип поиска"
-#: ../widgets/misc/e-search-bar.c:852
+#: ../widgets/misc/e-search-bar.c:890
msgid "Item ID"
msgstr "ID элемента"
-#: ../widgets/misc/e-search-bar.c:859
+#: ../widgets/misc/e-search-bar.c:897
msgid "Subitem ID"
msgstr "ID субэлемента"
-#: ../widgets/misc/e-search-bar.c:866 ../widgets/text/e-entry.c:1249
-#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3462
-#: ../widgets/text/e-text.c:3463
+#: ../widgets/misc/e-search-bar.c:904 ../widgets/text/e-entry.c:1249
+#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3485
+#: ../widgets/text/e-text.c:3486
msgid "Text"
msgstr "Текст"
-#: ../widgets/misc/e-search-bar.c:946
+#: ../widgets/misc/e-search-bar.c:984
msgid "Find _Now"
msgstr "Найти _сейчас"
@@ -19462,7 +20494,7 @@ msgstr "Режим выделения"
msgid "Cursor Mode"
msgstr "Режим курсора"
-#: ../widgets/misc/e-send-options.c:521
+#: ../widgets/misc/e-send-options.c:522
msgid "When de_leted:"
msgstr "Когда уда_лено:"
@@ -19541,21 +20573,21 @@ msgstr ""
"Низкий"
#: ../widgets/misc/e-send-options.glade.h:23
-msgid "W_ithin"
-msgstr "_В течении"
-
-#: ../widgets/misc/e-send-options.glade.h:24
msgid "When acce_pted:"
msgstr "_При получении:"
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.glade.h:24
msgid "When co_mpleted:"
msgstr "При _завершении:"
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.glade.h:25
msgid "When decli_ned:"
msgstr "При _отказе:"
+#: ../widgets/misc/e-send-options.glade.h:26
+msgid "Wi_thin"
+msgstr "_В течении"
+
#: ../widgets/misc/e-send-options.glade.h:27
msgid "_After:"
msgstr "_После:"
@@ -19599,8 +20631,8 @@ msgid "%s (%d%% complete)"
msgstr "%s (%d%% выполнено)"
#: ../widgets/misc/e-url-entry.c:107
-msgid "click here to go to url"
-msgstr "нажмите, чтобы перейти по ссылке"
+msgid "Click here to go to URL"
+msgstr "Нажмите, чтобы перейти по ссылке"
#: ../widgets/misc/gal-categories.glade.h:2
msgid "Edit Master Category List..."
@@ -19638,23 +20670,23 @@ msgstr "Столбец, имеющий фокус"
msgid "Unselected Column"
msgstr "Невыделенный столбец"
-#: ../widgets/table/e-cell-text.c:1740
+#: ../widgets/table/e-cell-text.c:1744
msgid "Strikeout Column"
msgstr "Перечёркнутый столбец"
-#: ../widgets/table/e-cell-text.c:1747
+#: ../widgets/table/e-cell-text.c:1751
msgid "Underline Column"
msgstr "Подчёркнутый столбец"
-#: ../widgets/table/e-cell-text.c:1754
+#: ../widgets/table/e-cell-text.c:1758
msgid "Bold Column"
msgstr "Столбец с жирным текстом"
-#: ../widgets/table/e-cell-text.c:1761
+#: ../widgets/table/e-cell-text.c:1765
msgid "Color Column"
msgstr "Цветной столбец"
-#: ../widgets/table/e-cell-text.c:1775
+#: ../widgets/table/e-cell-text.c:1779
msgid "BG Color Column"
msgstr "Цвет фона столбца"
@@ -19702,7 +20734,6 @@ msgid "Sh_ow these fields in order:"
msgstr "_Отображать эти поля в порядке:"
#: ../widgets/table/e-table-config-no-group.glade.h:12
-#: ../widgets/table/e-table-config.c:563
#: ../widgets/table/e-table-config.glade.h:10
msgid "Show Fields"
msgstr "Отображать поля"
@@ -19761,10 +20792,6 @@ msgstr "Без сортировки"
msgid "No grouping"
msgstr "Без группирования"
-#: ../widgets/table/e-table-config.c:584
-msgid "Available Fields"
-msgstr "Доступные поля"
-
#: ../widgets/table/e-table-config.glade.h:17
msgid "_Group By..."
msgstr "_Группировать по..."
@@ -19774,16 +20801,16 @@ msgid "_Show these fields in order:"
msgstr "_Отображать эти поля в порядке:"
#: ../widgets/table/e-table-field-chooser-dialog.c:77
-#: ../widgets/table/e-table-field-chooser-item.c:646
-#: ../widgets/table/e-table-field-chooser.c:79
-#: ../widgets/table/e-table-header-item.c:1810
+#: ../widgets/table/e-table-field-chooser-item.c:635
+#: ../widgets/table/e-table-field-chooser.c:77
+#: ../widgets/table/e-table-header-item.c:1804
msgid "DnD code"
msgstr "Код технологии DnD"
#: ../widgets/table/e-table-field-chooser-dialog.c:84
-#: ../widgets/table/e-table-field-chooser-item.c:653
-#: ../widgets/table/e-table-field-chooser.c:86
-#: ../widgets/table/e-table-header-item.c:1824
+#: ../widgets/table/e-table-field-chooser-item.c:642
+#: ../widgets/table/e-table-field-chooser.c:84
+#: ../widgets/table/e-table-header-item.c:1818
msgid "Full Header"
msgstr "Полный заголовок"
@@ -19803,201 +20830,198 @@ msgstr ""
"Чтобы добавить столбец в вашу таблицу,\n"
"перетащите его в нужное место."
-#: ../widgets/table/e-table-group-container.c:350
+#: ../widgets/table/e-table-group-container.c:346
#, c-format
msgid "%s : %s (%d item)"
msgstr "%s : %s (%d элемент)"
-#: ../widgets/table/e-table-group-container.c:351
+#: ../widgets/table/e-table-group-container.c:347
#, c-format
msgid "%s : %s (%d items)"
msgstr "%s : %s (%d элементов)"
-#: ../widgets/table/e-table-group-container.c:356
+#: ../widgets/table/e-table-group-container.c:352
#, c-format
msgid "%s (%d item)"
msgstr "%s (%d элемент)"
-#: ../widgets/table/e-table-group-container.c:357
+#: ../widgets/table/e-table-group-container.c:353
#, c-format
msgid "%s (%d items)"
msgstr "%s (%d элементов)"
-#: ../widgets/table/e-table-group-container.c:901
-#: ../widgets/table/e-table-group-container.c:902
+#: ../widgets/table/e-table-group-container.c:897
+#: ../widgets/table/e-table-group-container.c:898
#: ../widgets/table/e-table-group-leaf.c:573
#: ../widgets/table/e-table-group-leaf.c:574
-#: ../widgets/table/e-table-item.c:2963 ../widgets/table/e-table-item.c:2964
+#: ../widgets/table/e-table-item.c:2969 ../widgets/table/e-table-item.c:2970
msgid "Alternating Row Colors"
msgstr "Альтернативные цвета строки"
-#: ../widgets/table/e-table-group-container.c:908
-#: ../widgets/table/e-table-group-container.c:909
+#: ../widgets/table/e-table-group-container.c:904
+#: ../widgets/table/e-table-group-container.c:905
#: ../widgets/table/e-table-group-leaf.c:580
#: ../widgets/table/e-table-group-leaf.c:581
-#: ../widgets/table/e-table-item.c:2970 ../widgets/table/e-table-item.c:2971
-#: ../widgets/table/e-tree.c:3271 ../widgets/table/e-tree.c:3272
+#: ../widgets/table/e-table-item.c:2976 ../widgets/table/e-table-item.c:2977
+#: ../widgets/table/e-tree.c:3265 ../widgets/table/e-tree.c:3266
msgid "Horizontal Draw Grid"
msgstr "Горизонтальная таблица для рисования"
-#: ../widgets/table/e-table-group-container.c:915
-#: ../widgets/table/e-table-group-container.c:916
+#: ../widgets/table/e-table-group-container.c:911
+#: ../widgets/table/e-table-group-container.c:912
#: ../widgets/table/e-table-group-leaf.c:587
#: ../widgets/table/e-table-group-leaf.c:588
-#: ../widgets/table/e-table-item.c:2977 ../widgets/table/e-table-item.c:2978
-#: ../widgets/table/e-tree.c:3277 ../widgets/table/e-tree.c:3278
+#: ../widgets/table/e-table-item.c:2983 ../widgets/table/e-table-item.c:2984
+#: ../widgets/table/e-tree.c:3271 ../widgets/table/e-tree.c:3272
msgid "Vertical Draw Grid"
msgstr "Вертикальная таблица для рисования"
-#: ../widgets/table/e-table-group-container.c:922
-#: ../widgets/table/e-table-group-container.c:923
+#: ../widgets/table/e-table-group-container.c:918
+#: ../widgets/table/e-table-group-container.c:919
#: ../widgets/table/e-table-group-leaf.c:594
#: ../widgets/table/e-table-group-leaf.c:595
-#: ../widgets/table/e-table-item.c:2984 ../widgets/table/e-table-item.c:2985
-#: ../widgets/table/e-tree.c:3283 ../widgets/table/e-tree.c:3284
+#: ../widgets/table/e-table-item.c:2990 ../widgets/table/e-table-item.c:2991
+#: ../widgets/table/e-tree.c:3277 ../widgets/table/e-tree.c:3278
msgid "Draw focus"
msgstr "Фокус рисования"
-#: ../widgets/table/e-table-group-container.c:929
-#: ../widgets/table/e-table-group-container.c:930
+#: ../widgets/table/e-table-group-container.c:925
+#: ../widgets/table/e-table-group-container.c:926
#: ../widgets/table/e-table-group-leaf.c:601
#: ../widgets/table/e-table-group-leaf.c:602
-#: ../widgets/table/e-table-item.c:2991 ../widgets/table/e-table-item.c:2992
+#: ../widgets/table/e-table-item.c:2997 ../widgets/table/e-table-item.c:2998
msgid "Cursor mode"
msgstr "Режим курсора"
-#: ../widgets/table/e-table-group-container.c:936
-#: ../widgets/table/e-table-group-container.c:937
+#: ../widgets/table/e-table-group-container.c:932
+#: ../widgets/table/e-table-group-container.c:933
#: ../widgets/table/e-table-group-leaf.c:615
#: ../widgets/table/e-table-group-leaf.c:616
-#: ../widgets/table/e-table-item.c:2956 ../widgets/table/e-table-item.c:2957
+#: ../widgets/table/e-table-item.c:2962 ../widgets/table/e-table-item.c:2963
msgid "Selection model"
msgstr "Модель выделения"
-#: ../widgets/table/e-table-group-container.c:943
-#: ../widgets/table/e-table-group-container.c:944
+#: ../widgets/table/e-table-group-container.c:939
+#: ../widgets/table/e-table-group-container.c:940
#: ../widgets/table/e-table-group-leaf.c:608
#: ../widgets/table/e-table-group-leaf.c:609
-#: ../widgets/table/e-table-item.c:2998 ../widgets/table/e-table-item.c:2999
-#: ../widgets/table/e-table.c:3316 ../widgets/table/e-tree.c:3265
-#: ../widgets/table/e-tree.c:3266
+#: ../widgets/table/e-table-item.c:3004 ../widgets/table/e-table-item.c:3005
+#: ../widgets/table/e-table.c:3301 ../widgets/table/e-tree.c:3259
+#: ../widgets/table/e-tree.c:3260
msgid "Length Threshold"
msgstr "Порог длины"
-#: ../widgets/table/e-table-group-container.c:950
-#: ../widgets/table/e-table-group-container.c:951
+#: ../widgets/table/e-table-group-container.c:946
+#: ../widgets/table/e-table-group-container.c:947
#: ../widgets/table/e-table-group-leaf.c:650
#: ../widgets/table/e-table-group-leaf.c:651
-#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
-#: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3297
-#: ../widgets/table/e-tree.c:3298
+#: ../widgets/table/e-table-item.c:3038 ../widgets/table/e-table-item.c:3039
+#: ../widgets/table/e-table.c:3308 ../widgets/table/e-tree.c:3291
+#: ../widgets/table/e-tree.c:3292
msgid "Uniform row height"
msgstr "Общая высота строки"
-#: ../widgets/table/e-table-group-container.c:957
-#: ../widgets/table/e-table-group-container.c:958
+#: ../widgets/table/e-table-group-container.c:953
+#: ../widgets/table/e-table-group-container.c:954
#: ../widgets/table/e-table-group-leaf.c:643
#: ../widgets/table/e-table-group-leaf.c:644
msgid "Frozen"
msgstr "Заморожена"
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1466
msgid "Customize Current View"
msgstr "Настроить текущий вид"
-#: ../widgets/table/e-table-header-item.c:1492
+#: ../widgets/table/e-table-header-item.c:1486
msgid "Sort Ascending"
msgstr "Возрастающая сортировка"
-#: ../widgets/table/e-table-header-item.c:1493
+#: ../widgets/table/e-table-header-item.c:1487
msgid "Sort Descending"
msgstr "Убывающая сортировка"
-#: ../widgets/table/e-table-header-item.c:1494
+#: ../widgets/table/e-table-header-item.c:1488
msgid "Unsort"
msgstr "Без сортировки"
-#: ../widgets/table/e-table-header-item.c:1496
+#: ../widgets/table/e-table-header-item.c:1490
msgid "Group By This Field"
msgstr "Группировать по этому полю"
-#: ../widgets/table/e-table-header-item.c:1497
+#: ../widgets/table/e-table-header-item.c:1491
msgid "Group By Box"
msgstr "Группировать по ящику"
-#: ../widgets/table/e-table-header-item.c:1499
+#: ../widgets/table/e-table-header-item.c:1493
msgid "Remove This Column"
msgstr "Убрать этот столбец"
-#: ../widgets/table/e-table-header-item.c:1500
+#: ../widgets/table/e-table-header-item.c:1494
msgid "Add a Column..."
msgstr "Добавить столбец..."
-#: ../widgets/table/e-table-header-item.c:1502
+#: ../widgets/table/e-table-header-item.c:1496
msgid "Alignment"
msgstr "Выравнивание"
-#: ../widgets/table/e-table-header-item.c:1503
+#: ../widgets/table/e-table-header-item.c:1497
msgid "Best Fit"
msgstr "Лучшее заполнение"
-#: ../widgets/table/e-table-header-item.c:1504
+#: ../widgets/table/e-table-header-item.c:1498
msgid "Format Columns..."
msgstr "Формат столбцов..."
-#: ../widgets/table/e-table-header-item.c:1506
+#: ../widgets/table/e-table-header-item.c:1500
msgid "Customize Current View..."
msgstr "Настроить текущий вид..."
-#: ../widgets/table/e-table-header-item.c:1817 ../widgets/text/e-entry.c:1263
+#: ../widgets/table/e-table-header-item.c:1811 ../widgets/text/e-entry.c:1263
#: ../widgets/text/e-entry.c:1264
msgid "Fontset"
msgstr "Набор шрифтов"
-#: ../widgets/table/e-table-header-item.c:1838
+#: ../widgets/table/e-table-header-item.c:1832
#: ../widgets/table/e-table-sorter.c:175
msgid "Sort Info"
msgstr "Информация по сортировке"
-#: ../widgets/table/e-table-header-item.c:1852
-#: ../widgets/table/e-tree-scrolled.c:223
-#: ../widgets/table/e-tree-scrolled.c:224
+#: ../widgets/table/e-table-header-item.c:1846
+#: ../widgets/table/e-tree-scrolled.c:221
+#: ../widgets/table/e-tree-scrolled.c:222
msgid "Tree"
msgstr "Дерево"
-#: ../widgets/table/e-table-item.c:2942 ../widgets/table/e-table-item.c:2943
+#: ../widgets/table/e-table-item.c:2948 ../widgets/table/e-table-item.c:2949
msgid "Table header"
msgstr "Заголовок таблицы"
-#: ../widgets/table/e-table-item.c:2949 ../widgets/table/e-table-item.c:2950
+#: ../widgets/table/e-table-item.c:2955 ../widgets/table/e-table-item.c:2956
msgid "Table model"
msgstr "Модель таблицы"
-#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
+#: ../widgets/table/e-table-item.c:3031 ../widgets/table/e-table-item.c:3032
msgid "Cursor row"
msgstr "Строка с курсором"
-#: ../widgets/table/e-table.c:3330
-msgid "Always Search"
+#: ../widgets/table/e-table.c:3315 ../widgets/table/e-tree.c:3298
+#: ../widgets/table/e-tree.c:3299
+msgid "Always search"
msgstr "Всегда искать"
-#: ../widgets/table/e-table.c:3337
+#: ../widgets/table/e-table.c:3322
msgid "Use click to add"
msgstr "Использовать щелчок для добавления"
-#: ../widgets/table/e-tree.c:3290 ../widgets/table/e-tree.c:3291
+#: ../widgets/table/e-tree.c:3284 ../widgets/table/e-tree.c:3285
msgid "ETree table adapter"
msgstr "Адаптер таблиц ETree"
-#: ../widgets/table/e-tree.c:3304 ../widgets/table/e-tree.c:3305
-msgid "Always search"
-msgstr "Всегда искать"
-
-#: ../widgets/table/e-tree.c:3311
+#: ../widgets/table/e-tree.c:3305
msgid "Retro Look"
msgstr "Ретро-вид"
-#: ../widgets/table/e-tree.c:3312
+#: ../widgets/table/e-tree.c:3306
msgid "Draw lines and +/- expanders."
msgstr "Отображать линии и расширители +/-."
@@ -20014,7 +21038,7 @@ msgid "This should test the minicard canvas item"
msgstr "Проверка "
#: ../widgets/text/e-entry.c:1242 ../widgets/text/e-entry.c:1243
-#: ../widgets/text/e-text.c:3455 ../widgets/text/e-text.c:3456
+#: ../widgets/text/e-text.c:3478 ../widgets/text/e-text.c:3479
msgid "Event Processor"
msgstr "Процессор событий"
@@ -20027,57 +21051,57 @@ msgid "GDKFont"
msgstr "GDKFont"
#: ../widgets/text/e-entry.c:1277 ../widgets/text/e-entry.c:1278
-#: ../widgets/text/e-text.c:3491 ../widgets/text/e-text.c:3492
+#: ../widgets/text/e-text.c:3514 ../widgets/text/e-text.c:3515
msgid "Justification"
msgstr "Выравнивание"
#: ../widgets/text/e-entry.c:1319 ../widgets/text/e-entry.c:1320
-#: ../widgets/text/e-text.c:3591 ../widgets/text/e-text.c:3592
+#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
msgid "Use ellipsis"
msgstr "Использовать многоточие"
#: ../widgets/text/e-entry.c:1326 ../widgets/text/e-entry.c:1327
-#: ../widgets/text/e-text.c:3598 ../widgets/text/e-text.c:3599
+#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
msgid "Ellipsis"
msgstr "Многоточие"
#: ../widgets/text/e-entry.c:1333 ../widgets/text/e-entry.c:1334
-#: ../widgets/text/e-text.c:3605 ../widgets/text/e-text.c:3606
+#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
msgid "Line wrap"
msgstr "Перенос строк"
#: ../widgets/text/e-entry.c:1340 ../widgets/text/e-entry.c:1341
-#: ../widgets/text/e-text.c:3612 ../widgets/text/e-text.c:3613
+#: ../widgets/text/e-text.c:3635 ../widgets/text/e-text.c:3636
msgid "Break characters"
msgstr "Символы разрыва"
#: ../widgets/text/e-entry.c:1347 ../widgets/text/e-entry.c:1348
-#: ../widgets/text/e-text.c:3619 ../widgets/text/e-text.c:3620
+#: ../widgets/text/e-text.c:3642 ../widgets/text/e-text.c:3643
msgid "Max lines"
msgstr "Максимальное число трок"
#: ../widgets/text/e-entry.c:1354 ../widgets/text/e-entry.c:1355
-#: ../widgets/text/e-text.c:3648 ../widgets/text/e-text.c:3649
+#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
msgid "Allow newlines"
msgstr "Допускать символы новой строки"
#: ../widgets/text/e-entry.c:1361 ../widgets/text/e-entry.c:1362
-#: ../widgets/text/e-text.c:3641 ../widgets/text/e-text.c:3642
+#: ../widgets/text/e-text.c:3664 ../widgets/text/e-text.c:3665
msgid "Draw borders"
msgstr "Рисовать границы"
#: ../widgets/text/e-entry.c:1368 ../widgets/text/e-entry.c:1369
-#: ../widgets/text/e-text.c:3655 ../widgets/text/e-text.c:3656
+#: ../widgets/text/e-text.c:3678 ../widgets/text/e-text.c:3679
msgid "Draw background"
msgstr "Рисовать фон"
#: ../widgets/text/e-entry.c:1375 ../widgets/text/e-entry.c:1376
-#: ../widgets/text/e-text.c:3662 ../widgets/text/e-text.c:3663
+#: ../widgets/text/e-text.c:3685 ../widgets/text/e-text.c:3686
msgid "Draw button"
msgstr "Рисовать кнопки"
#: ../widgets/text/e-entry.c:1382 ../widgets/text/e-entry.c:1383
-#: ../widgets/text/e-text.c:3669 ../widgets/text/e-text.c:3670
+#: ../widgets/text/e-text.c:3692 ../widgets/text/e-text.c:3693
msgid "Cursor position"
msgstr "Позиция курсора"
@@ -20085,58 +21109,59 @@ msgstr "Позиция курсора"
msgid "Emulate label resize"
msgstr "Эмуляция изменения размера ярлыка"
-#: ../widgets/text/e-text.c:2696
+#: ../widgets/text/e-text.c:2721
msgid "Input Methods"
msgstr "Методы ввода"
-#: ../widgets/text/e-text.c:3469 ../widgets/text/e-text.c:3470
+#: ../widgets/text/e-text.c:3492 ../widgets/text/e-text.c:3493
msgid "Bold"
msgstr "Жирный"
-#: ../widgets/text/e-text.c:3476 ../widgets/text/e-text.c:3477
+#: ../widgets/text/e-text.c:3499 ../widgets/text/e-text.c:3500
msgid "Strikeout"
msgstr "Перечёркнутый"
-#: ../widgets/text/e-text.c:3483 ../widgets/text/e-text.c:3484
+#: ../widgets/text/e-text.c:3506 ../widgets/text/e-text.c:3507
msgid "Anchor"
msgstr "Якорь"
-#: ../widgets/text/e-text.c:3498 ../widgets/text/e-text.c:3499
+#: ../widgets/text/e-text.c:3521 ../widgets/text/e-text.c:3522
msgid "Clip Width"
msgstr "Ширина отсечения"
-#: ../widgets/text/e-text.c:3505 ../widgets/text/e-text.c:3506
+#: ../widgets/text/e-text.c:3528 ../widgets/text/e-text.c:3529
msgid "Clip Height"
msgstr "Высота отсечения"
-#: ../widgets/text/e-text.c:3512 ../widgets/text/e-text.c:3513
+#: ../widgets/text/e-text.c:3535 ../widgets/text/e-text.c:3536
msgid "Clip"
msgstr "Отсечение"
-#: ../widgets/text/e-text.c:3519 ../widgets/text/e-text.c:3520
+#: ../widgets/text/e-text.c:3542 ../widgets/text/e-text.c:3543
msgid "Fill clip rectangle"
msgstr "Заполнять область отсечения"
-#: ../widgets/text/e-text.c:3526 ../widgets/text/e-text.c:3527
+#: ../widgets/text/e-text.c:3549 ../widgets/text/e-text.c:3550
msgid "X Offset"
msgstr "Смещение по оси X"
-#: ../widgets/text/e-text.c:3533 ../widgets/text/e-text.c:3534
+#: ../widgets/text/e-text.c:3556 ../widgets/text/e-text.c:3557
msgid "Y Offset"
msgstr "Смещение по оси Y"
-#: ../widgets/text/e-text.c:3569 ../widgets/text/e-text.c:3570
+#: ../widgets/text/e-text.c:3592 ../widgets/text/e-text.c:3593
msgid "Text width"
msgstr "Ширина текста"
-#: ../widgets/text/e-text.c:3576 ../widgets/text/e-text.c:3577
+#: ../widgets/text/e-text.c:3599 ../widgets/text/e-text.c:3600
msgid "Text height"
msgstr "Высота текста"
-#: ../widgets/text/e-text.c:3676 ../widgets/text/e-text.c:3677
+#: ../widgets/text/e-text.c:3699 ../widgets/text/e-text.c:3700
msgid "IM Context"
msgstr "Контест метода ввода (IM)"
-#: ../widgets/text/e-text.c:3683 ../widgets/text/e-text.c:3684
+#: ../widgets/text/e-text.c:3706 ../widgets/text/e-text.c:3707
msgid "Handle Popup"
msgstr "Обрабатывать всплывающие окна"
+