aboutsummaryrefslogtreecommitdiffstats
path: root/po/ru.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/ru.po')
-rw-r--r--po/ru.po4636
1 files changed, 2711 insertions, 1925 deletions
diff --git a/po/ru.po b/po/ru.po
index ecc542e5b4..5369af2878 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,11 +1,10 @@
# Copyright (C) 2000 Free Software Foundation, Inc.
# Valek Filippov <frob@df.ru>, 2000.
#
-#: mail/component-factory.c:97 mail/component-factory.c:98
msgid ""
msgstr ""
"Project-Id-Version: E-volution\n"
-"POT-Creation-Date: 2001-08-22 18:50-0400\n"
+"POT-Creation-Date: 2001-09-21 18:31-0400\n"
"PO-Revision-Date: 2001-08-10 17:53+0400\n"
"Last-Translator: Valek Filippov <frob@df.ru>\n"
"Language-Team: Russian <ru@li.org>\n"
@@ -21,11 +20,312 @@ msgstr "Фабрика для импорта файлов VCard в Evolution."
msgid "Imports VCard files into Evolution."
msgstr "Импортирует файлы VCard в Evolution."
-#: addressbook/backend/ebook/e-card.c:3595
+#: addressbook/backend/ebook/e-card-simple.c:58
+#: addressbook/gui/widgets/e-addressbook-view.c:868
+msgid "File As"
+msgstr "Файл как"
+
+#: addressbook/backend/ebook/e-card-simple.c:59
+#, fuzzy
+msgid "Name"
+msgstr "Имя:"
+
+#: addressbook/backend/ebook/e-card-simple.c:60
+#, fuzzy
+msgid "Family Name"
+msgstr "Полное имя:"
+
+#: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/gui/widgets/e-addressbook-view.c:870
+msgid "Email"
+msgstr "Эл.адрес"
+
+#: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/gui/contact-editor/e-contact-editor.c:1609
+msgid "Primary"
+msgstr "Первый"
+
+#: addressbook/backend/ebook/e-card-simple.c:62
+#, fuzzy
+msgid "Prim"
+msgstr "Первый"
+
+#: addressbook/backend/ebook/e-card-simple.c:63
+#: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/gui/contact-editor/e-contact-editor.c:1594
+#: addressbook/gui/widgets/e-addressbook-view.c:902
+msgid "Assistant"
+msgstr "Помощник"
+
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/gui/contact-editor/e-contact-editor.c:1595
+#: addressbook/gui/contact-editor/e-contact-editor.c:1662
+msgid "Business"
+msgstr "Рабочий"
+
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:69
+#, fuzzy
+msgid "Bus"
+msgstr "Занят"
+
+#: addressbook/backend/ebook/e-card-simple.c:65
+#: addressbook/gui/contact-editor/e-contact-editor.c:1598
+msgid "Callback"
+msgstr "Обратный отзвон"
+
+#: addressbook/backend/ebook/e-card-simple.c:66
+#: addressbook/gui/contact-editor/e-contact-editor.c:1600
+msgid "Company"
+msgstr "Компания"
+
+#: addressbook/backend/ebook/e-card-simple.c:66
+#, fuzzy
+msgid "Comp"
+msgstr "Скопировать"
+
+#: addressbook/backend/ebook/e-card-simple.c:67
+#: addressbook/backend/ebook/e-card-simple.c:70
+#: addressbook/gui/contact-editor/e-contact-editor.c:1601
+#: addressbook/gui/contact-editor/e-contact-editor.c:1663
+msgid "Home"
+msgstr "Домашний"
+
+#: addressbook/backend/ebook/e-card-simple.c:68
+#: addressbook/gui/widgets/e-addressbook-view.c:877
+msgid "Organization"
+msgstr "Организация"
+
+#: addressbook/backend/ebook/e-card-simple.c:68
+#, fuzzy
+msgid "Org"
+msgstr ""
+"\n"
+"Орг.:"
+
+#: addressbook/backend/ebook/e-card-simple.c:71
+#: addressbook/gui/contact-editor/e-contact-editor.c:1605
+msgid "Mobile"
+msgstr "Мобильный"
+
+#: addressbook/backend/ebook/e-card-simple.c:72
+#: addressbook/gui/contact-editor/e-contact-editor.c:1599
+msgid "Car"
+msgstr "Машина"
+
+#: addressbook/backend/ebook/e-card-simple.c:73
+#: addressbook/gui/contact-editor/e-contact-editor.c:1597
+#: addressbook/gui/widgets/e-addressbook-view.c:882
+msgid "Business Fax"
+msgstr "Рабочий факс"
+
+#: addressbook/backend/ebook/e-card-simple.c:73
+#, fuzzy
+msgid "Bus Fax"
+msgstr "Рабочий факс"
+
+#: addressbook/backend/ebook/e-card-simple.c:74
+#: addressbook/gui/contact-editor/e-contact-editor.c:1603
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+msgid "Home Fax"
+msgstr "Домашний Факс"
+
+#: addressbook/backend/ebook/e-card-simple.c:75
+#: addressbook/gui/contact-editor/e-contact-editor.c:1596
+msgid "Business 2"
+msgstr "Рабочий 2"
+
+#: addressbook/backend/ebook/e-card-simple.c:75
+#, fuzzy
+msgid "Bus 2"
+msgstr "Занят"
+
+#: addressbook/backend/ebook/e-card-simple.c:76
+#: addressbook/gui/contact-editor/e-contact-editor.c:1602
+msgid "Home 2"
+msgstr "Домашний 2"
+
+#: addressbook/backend/ebook/e-card-simple.c:77
+#: addressbook/gui/contact-editor/e-contact-editor.c:1604
+#: addressbook/gui/widgets/e-addressbook-view.c:886
+msgid "ISDN"
+msgstr "ISDN"
+
+#: addressbook/backend/ebook/e-card-simple.c:78
+#: addressbook/backend/ebook/e-card-simple.c:84
+#: addressbook/gui/contact-editor/e-contact-editor.c:1606
+#: addressbook/gui/contact-editor/e-contact-editor.c:1664
+#: mail/mail-config.glade.h:51
+msgid "Other"
+msgstr "Другой"
+
+#: addressbook/backend/ebook/e-card-simple.c:79
+#: addressbook/gui/contact-editor/e-contact-editor.c:1607
+#: addressbook/gui/widgets/e-addressbook-view.c:888
+msgid "Other Fax"
+msgstr "Другой факс"
+
+#: addressbook/backend/ebook/e-card-simple.c:80
+#: addressbook/gui/contact-editor/e-contact-editor.c:1608
+#: addressbook/gui/widgets/e-addressbook-view.c:889
+msgid "Pager"
+msgstr "Пэйджер"
+
+#: addressbook/backend/ebook/e-card-simple.c:81
+#: addressbook/gui/contact-editor/e-contact-editor.c:1610
+#: addressbook/gui/widgets/e-addressbook-view.c:890
+msgid "Radio"
+msgstr "Радио"
+
+#: addressbook/backend/ebook/e-card-simple.c:82
+#: addressbook/gui/contact-editor/e-contact-editor.c:1611
+#: addressbook/gui/widgets/e-addressbook-view.c:891
+msgid "Telex"
+msgstr "Телекс"
+
+#: addressbook/backend/ebook/e-card-simple.c:83
+#: addressbook/gui/widgets/e-addressbook-view.c:892
+msgid "TTY"
+msgstr "TTY"
+
+#: addressbook/backend/ebook/e-card-simple.c:85
+#: addressbook/gui/component/e-address-popup.c:476
+#: addressbook/gui/contact-editor/e-contact-editor.c:1637
+#: addressbook/gui/widgets/e-addressbook-view.c:894
+msgid "Email 2"
+msgstr "Эл.адрес 2"
+
+#: addressbook/backend/ebook/e-card-simple.c:86
+#: addressbook/gui/component/e-address-popup.c:486
+#: addressbook/gui/contact-editor/e-contact-editor.c:1638
+#: addressbook/gui/widgets/e-addressbook-view.c:895
+msgid "Email 3"
+msgstr "Эл.адрес 3"
+
+#: addressbook/backend/ebook/e-card-simple.c:87
+#: addressbook/gui/widgets/e-addressbook-view.c:896
+msgid "Web Site"
+msgstr "Сайт в Интернет"
+
+#: addressbook/backend/ebook/e-card-simple.c:87
+msgid "Url"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:88
+#: addressbook/gui/widgets/e-addressbook-view.c:897
+msgid "Department"
+msgstr "Отдел"
+
+#: addressbook/backend/ebook/e-card-simple.c:88
+msgid "Dep"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:89
+#: addressbook/gui/widgets/e-addressbook-view.c:898
+msgid "Office"
+msgstr "Офис"
+
+#: addressbook/backend/ebook/e-card-simple.c:89
+#, fuzzy
+msgid "Off"
+msgstr "Офис"
+
+#: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/gui/widgets/e-addressbook-view.c:899
+msgid "Title"
+msgstr "Заголовок"
+
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/gui/widgets/e-addressbook-view.c:900
+msgid "Profession"
+msgstr "Профессия"
+
+#: addressbook/backend/ebook/e-card-simple.c:91
+msgid "Prof"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:92
+#: addressbook/gui/widgets/e-addressbook-view.c:901
+msgid "Manager"
+msgstr "Управляющий"
+
+#: addressbook/backend/ebook/e-card-simple.c:92
+#, fuzzy
+msgid "Man"
+msgstr "Май"
+
+#: addressbook/backend/ebook/e-card-simple.c:93
+msgid "Ass"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/gui/widgets/e-addressbook-view.c:903
+msgid "Nickname"
+msgstr "Псевдоним"
+
+#: addressbook/backend/ebook/e-card-simple.c:94
+#, fuzzy
+msgid "Nick"
+msgstr "Псевдоним"
+
+#: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/gui/widgets/e-addressbook-view.c:904
+msgid "Spouse"
+msgstr "Супруг(а)"
+
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/gui/widgets/e-addressbook-view.c:905
+msgid "Note"
+msgstr "Заметка"
+
+#: addressbook/backend/ebook/e-card-simple.c:97
+#, fuzzy
+msgid "Calendar URI"
+msgstr "Календарь"
+
+#: addressbook/backend/ebook/e-card-simple.c:97
+msgid "CALUri"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/gui/widgets/e-addressbook-view.c:906
+msgid "Free-busy URL"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:98
+msgid "FBUrl"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:99
+#, fuzzy
+msgid "Anniversary"
+msgstr "Годовщина:"
+
+#: addressbook/backend/ebook/e-card-simple.c:99
+msgid "Anniv"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card-simple.c:100
+#, fuzzy
+msgid "Birth Date"
+msgstr ""
+"\n"
+"Дата рождения: "
+
+#: addressbook/backend/ebook/e-card-simple.c:103
+#: calendar/gui/e-calendar-table.etspec.h:4
+#, fuzzy
+msgid "Categories"
+msgstr ""
+"\n"
+"Категории: "
+
+#: addressbook/backend/ebook/e-card.c:3564
msgid "Card: "
msgstr "Карточка: "
-#: addressbook/backend/ebook/e-card.c:3597
+#: addressbook/backend/ebook/e-card.c:3566
msgid ""
"\n"
"Name: "
@@ -33,7 +333,7 @@ msgstr ""
"\n"
"Имя: "
-#: addressbook/backend/ebook/e-card.c:3598
+#: addressbook/backend/ebook/e-card.c:3567
msgid ""
"\n"
" Prefix: "
@@ -41,7 +341,7 @@ msgstr ""
"\n"
" Префикс: "
-#: addressbook/backend/ebook/e-card.c:3599
+#: addressbook/backend/ebook/e-card.c:3568
msgid ""
"\n"
" Given: "
@@ -49,7 +349,7 @@ msgstr ""
"\n"
" Имя: "
-#: addressbook/backend/ebook/e-card.c:3600
+#: addressbook/backend/ebook/e-card.c:3569
msgid ""
"\n"
" Additional: "
@@ -57,7 +357,7 @@ msgstr ""
"\n"
" Добавочный: "
-#: addressbook/backend/ebook/e-card.c:3601
+#: addressbook/backend/ebook/e-card.c:3570
msgid ""
"\n"
" Family: "
@@ -65,7 +365,7 @@ msgstr ""
"\n"
" Фамилия: "
-#: addressbook/backend/ebook/e-card.c:3602
+#: addressbook/backend/ebook/e-card.c:3571
msgid ""
"\n"
" Suffix: "
@@ -73,7 +373,7 @@ msgstr ""
"\n"
" Суффикс: "
-#: addressbook/backend/ebook/e-card.c:3616
+#: addressbook/backend/ebook/e-card.c:3585
msgid ""
"\n"
"Birth Date: "
@@ -81,7 +381,7 @@ msgstr ""
"\n"
"Дата рождения: "
-#: addressbook/backend/ebook/e-card.c:3627
+#: addressbook/backend/ebook/e-card.c:3596
msgid ""
"\n"
"Address:"
@@ -89,7 +389,7 @@ msgstr ""
"\n"
"Адрес:"
-#: addressbook/backend/ebook/e-card.c:3629
+#: addressbook/backend/ebook/e-card.c:3598
msgid ""
"\n"
" Postal Box: "
@@ -97,7 +397,7 @@ msgstr ""
"\n"
"Почтовый ящик: "
-#: addressbook/backend/ebook/e-card.c:3630
+#: addressbook/backend/ebook/e-card.c:3599
msgid ""
"\n"
" Ext: "
@@ -105,7 +405,7 @@ msgstr ""
"\n"
" Расш.: "
-#: addressbook/backend/ebook/e-card.c:3631
+#: addressbook/backend/ebook/e-card.c:3600
msgid ""
"\n"
" Street: "
@@ -113,7 +413,7 @@ msgstr ""
"\n"
" Улица: "
-#: addressbook/backend/ebook/e-card.c:3632
+#: addressbook/backend/ebook/e-card.c:3601
msgid ""
"\n"
" City: "
@@ -121,7 +421,7 @@ msgstr ""
"\n"
" Город: "
-#: addressbook/backend/ebook/e-card.c:3633
+#: addressbook/backend/ebook/e-card.c:3602
msgid ""
"\n"
" Region: "
@@ -129,7 +429,7 @@ msgstr ""
"\n"
" Область: "
-#: addressbook/backend/ebook/e-card.c:3634
+#: addressbook/backend/ebook/e-card.c:3603
msgid ""
"\n"
" Postal Code: "
@@ -137,7 +437,7 @@ msgstr ""
"\n"
" Почтовый код: "
-#: addressbook/backend/ebook/e-card.c:3635
+#: addressbook/backend/ebook/e-card.c:3604
msgid ""
"\n"
" Country: "
@@ -145,7 +445,7 @@ msgstr ""
"\n"
" Страна: "
-#: addressbook/backend/ebook/e-card.c:3648
+#: addressbook/backend/ebook/e-card.c:3617
msgid ""
"\n"
"Delivery Label: "
@@ -153,7 +453,7 @@ msgstr ""
"\n"
"Метка для доставки:"
-#: addressbook/backend/ebook/e-card.c:3660
+#: addressbook/backend/ebook/e-card.c:3629
msgid ""
"\n"
"Telephones:\n"
@@ -161,7 +461,7 @@ msgstr ""
"\n"
"Телефоны:\n"
-#: addressbook/backend/ebook/e-card.c:3663
+#: addressbook/backend/ebook/e-card.c:3632
msgid ""
"\n"
"Telephone:"
@@ -169,7 +469,7 @@ msgstr ""
"\n"
"Телефон:"
-#: addressbook/backend/ebook/e-card.c:3687
+#: addressbook/backend/ebook/e-card.c:3656
msgid ""
"\n"
"E-mail:\n"
@@ -177,7 +477,7 @@ msgstr ""
"\n"
"Эл.адрес:\n"
-#: addressbook/backend/ebook/e-card.c:3690
+#: addressbook/backend/ebook/e-card.c:3659
msgid ""
"\n"
"E-mail:"
@@ -185,7 +485,7 @@ msgstr ""
"\n"
"Эл.адрес:"
-#: addressbook/backend/ebook/e-card.c:3709
+#: addressbook/backend/ebook/e-card.c:3678
msgid ""
"\n"
"Mailer: "
@@ -193,7 +493,7 @@ msgstr ""
"\n"
"Почтовый клиент: "
-#: addressbook/backend/ebook/e-card.c:3715
+#: addressbook/backend/ebook/e-card.c:3684
msgid ""
"\n"
"Time Zone: "
@@ -201,7 +501,7 @@ msgstr ""
"\n"
"Часовой пояс: "
-#: addressbook/backend/ebook/e-card.c:3723
+#: addressbook/backend/ebook/e-card.c:3692
msgid ""
"\n"
"Geo Location: "
@@ -209,7 +509,7 @@ msgstr ""
"\n"
"Геогр.положение: "
-#: addressbook/backend/ebook/e-card.c:3727
+#: addressbook/backend/ebook/e-card.c:3696
msgid ""
"\n"
"Business Role: "
@@ -217,7 +517,7 @@ msgstr ""
"\n"
"Должность: "
-#: addressbook/backend/ebook/e-card.c:3739
+#: addressbook/backend/ebook/e-card.c:3708
msgid ""
"\n"
"Org: "
@@ -225,7 +525,7 @@ msgstr ""
"\n"
"Орг.:"
-#: addressbook/backend/ebook/e-card.c:3740
+#: addressbook/backend/ebook/e-card.c:3709
msgid ""
"\n"
" Name: "
@@ -233,7 +533,7 @@ msgstr ""
"\n"
" Имя: "
-#: addressbook/backend/ebook/e-card.c:3741
+#: addressbook/backend/ebook/e-card.c:3710
msgid ""
"\n"
" Unit: "
@@ -241,7 +541,7 @@ msgstr ""
"\n"
"Единица: "
-#: addressbook/backend/ebook/e-card.c:3742
+#: addressbook/backend/ebook/e-card.c:3711
msgid ""
"\n"
" Unit2: "
@@ -249,7 +549,7 @@ msgstr ""
"\n"
"Единица2: "
-#: addressbook/backend/ebook/e-card.c:3743
+#: addressbook/backend/ebook/e-card.c:3712
msgid ""
"\n"
" Unit3: "
@@ -257,7 +557,7 @@ msgstr ""
"\n"
"Единица3: "
-#: addressbook/backend/ebook/e-card.c:3744
+#: addressbook/backend/ebook/e-card.c:3713
msgid ""
"\n"
" Unit4: "
@@ -265,7 +565,7 @@ msgstr ""
"\n"
"Единица4: "
-#: addressbook/backend/ebook/e-card.c:3748
+#: addressbook/backend/ebook/e-card.c:3717
msgid ""
"\n"
"Categories: "
@@ -273,7 +573,7 @@ msgstr ""
"\n"
"Категории: "
-#: addressbook/backend/ebook/e-card.c:3749
+#: addressbook/backend/ebook/e-card.c:3718
msgid ""
"\n"
"Comment: "
@@ -291,7 +591,7 @@ msgstr ""
#.
#. add_SoundType (string, crd->sound.type);
#. }
-#: addressbook/backend/ebook/e-card.c:3762
+#: addressbook/backend/ebook/e-card.c:3731
msgid ""
"\n"
"Unique String: "
@@ -299,7 +599,7 @@ msgstr ""
"\n"
"Уникальная строка: "
-#: addressbook/backend/ebook/e-card.c:3765
+#: addressbook/backend/ebook/e-card.c:3734
msgid ""
"\n"
"Public Key: "
@@ -307,11 +607,11 @@ msgstr ""
"\n"
"Публичный ключ: "
-#: addressbook/backend/ebook/e-card.c:4037
+#: addressbook/backend/ebook/e-card.c:4087
msgid "Multiple VCards"
msgstr "Множество VCards"
-#: addressbook/backend/ebook/e-card.c:4045
+#: addressbook/backend/ebook/e-card.c:4095
#, c-format
msgid "VCard for %s"
msgstr "VCard для %s"
@@ -320,36 +620,95 @@ msgstr "VCard для %s"
#: addressbook/backend/ebook/load-pine-addressbook.c:22
#: addressbook/backend/ebook/test-client-list.c:23
#: addressbook/backend/ebook/test-client.c:33
-#: addressbook/conduit/address-conduit.c:1100
+#: addressbook/conduit/address-conduit.c:1119
#: addressbook/gui/component/addressbook-factory.c:48
#: calendar/conduits/calendar/calendar-conduit.c:1204
#: calendar/conduits/todo/todo-conduit.c:1018
-#: calendar/gui/alarm-notify/notify-main.c:100 calendar/gui/main.c:58
+#: calendar/gui/alarm-notify/notify-main.c:78 calendar/gui/main.c:63
msgid "Could not initialize Bonobo"
msgstr "Не удалось инициализировать Bonobo"
-#: addressbook/conduit/address-conduit.c:201
+#: addressbook/backend/pas/pas-backend-file.c:257
+#: addressbook/backend/pas/pas-backend-ldap.c:2047
+#, fuzzy
+msgid "Searching..."
+msgstr "Поиск"
+
+#: addressbook/backend/pas/pas-backend-file.c:259
+#, fuzzy
+msgid "Loading..."
+msgstr "Ожидание..."
+
+#. need a different error message here.
+#: addressbook/backend/pas/pas-backend-file.c:268
+#, fuzzy
+msgid "Error in search expression."
+msgstr ""
+"Ошибка при выполнении выражения поиска \"%s\":\n"
+"%s"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:467
+#, fuzzy
+msgid "Connecting to LDAP server..."
+msgstr "Подключение к серверу..."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:477
+#, fuzzy
+msgid "Unable to connect to LDAP server."
+msgstr ""
+"Невозможно идентифицироваться на сервере IMAP.\n"
+"%s\n"
+"\n"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:493
+#, fuzzy
+msgid "Waiting for connection to LDAP server..."
+msgstr "Подключение к серверу..."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:862
+#, fuzzy
+msgid "Adding card to LDAP server..."
+msgstr "Подключение к серверу..."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:959
+#, fuzzy
+msgid "Removing card from LDAP server..."
+msgstr "Удаление карточек..."
+
+#: addressbook/backend/pas/pas-backend-ldap.c:1064
+msgid "Modifying card from LDAP server..."
+msgstr ""
+
+#: addressbook/backend/pas/pas-backend-ldap.c:1992
+msgid "Receiving LDAP search results..."
+msgstr ""
+
+#: addressbook/backend/pas/pas-backend-ldap.c:1997
+msgid "Restarting search."
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:204
msgid "Cursor could not be loaded\n"
msgstr "Курсор не может быть загружен\n"
-#: addressbook/conduit/address-conduit.c:214
+#: addressbook/conduit/address-conduit.c:217
msgid "EBook not loaded\n"
msgstr "EBook не загружена\n"
-#: addressbook/conduit/address-conduit.c:662
+#: addressbook/conduit/address-conduit.c:681
#: calendar/conduits/calendar/calendar-conduit.c:778
#: calendar/conduits/todo/todo-conduit.c:592
msgid "Could not start wombat server"
msgstr "Не удалось запустить сервер wombat"
-#: addressbook/conduit/address-conduit.c:663
+#: addressbook/conduit/address-conduit.c:682
#: calendar/conduits/calendar/calendar-conduit.c:779
#: calendar/conduits/todo/todo-conduit.c:593
msgid "Could not start wombat"
msgstr "Не удалось запустить wombat"
-#: addressbook/conduit/address-conduit.c:695
-#: addressbook/conduit/address-conduit.c:698
+#: addressbook/conduit/address-conduit.c:714
+#: addressbook/conduit/address-conduit.c:717
msgid "Could not read pilot's Address application block"
msgstr "Невозможно прочесть блок приложения адресов Пилота"
@@ -391,28 +750,36 @@ msgid "Factory for the Addressbook's address popup"
msgstr "Фабрика для отображателя адреса из адресной книги"
#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Evolution addressbook component."
-msgstr "Фабрика компонента адресной книги Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
#, fuzzy
msgid "Factory for the sample Addressbook control"
msgstr "Щелкните здесь для адресной книги"
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:66
#: calendar/gui/dialogs/comp-editor-util.c:281
-#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:175
-#: shell/e-shortcuts.c:1048
+#: calendar/gui/dialogs/comp-editor-util.c:337 shell/e-local-storage.c:173
+#: shell/e-shortcuts.c:1062
msgid "Contacts"
msgstr "Контакты"
-#: addressbook/gui/component/addressbook-component.c:68
+#: addressbook/gui/component/addressbook-component.c:66
#, fuzzy
msgid "Folder containing contact information"
msgstr ""
"Ошибка при загрузке информации фильтра:\n"
"%s"
+#: addressbook/gui/component/addressbook-component.c:68
+#, fuzzy
+msgid "LDAP Server"
+msgstr "Сервер NNTP"
+
+#: addressbook/gui/component/addressbook-component.c:68
+#, fuzzy
+msgid "LDAP server containing contact information"
+msgstr ""
+"Ошибка при загрузке информации фильтра:\n"
+"%s"
+
#: addressbook/gui/component/addressbook-component.c:386
#: ui/evolution-addressbook.xml.h:11
#, fuzzy
@@ -434,7 +801,7 @@ msgstr "Список контакты"
msgid "New Contact _List"
msgstr "Список контакты"
-#: addressbook/gui/component/addressbook-config.c:144
+#: addressbook/gui/component/addressbook-config.c:188
msgid "Edit Addressbook"
msgstr "Правка адресной книги"
@@ -464,7 +831,7 @@ msgid "Base"
msgstr "Основа"
#: addressbook/gui/component/addressbook-config.glade.h:7
-#: calendar/gui/dialogs/task-editor.c:151
+#: calendar/gui/dialogs/task-editor.c:172
msgid "Basic"
msgstr "Основные"
@@ -534,19 +901,20 @@ msgid "_Account name:"
msgstr "Название счёта:"
#: addressbook/gui/component/addressbook-config.glade.h:22
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:7
-#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:18
+#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:7
+#: mail/mail-config.glade.h:90 my-evolution/my-evolution.glade.h:20
msgid "_Add"
msgstr "Добавить"
#: addressbook/gui/component/addressbook-config.glade.h:23
#: filter/filter.glade.h:9 mail/mail-config.glade.h:95
-#: ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-calendar.xml.h:39
+#: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
#: ui/evolution-message-composer.xml.h:48
#: ui/evolution-signature-editor.xml.h:7 ui/evolution-subscribe.xml.h:10
-#: ui/evolution.xml.h:36
+#: ui/evolution-tasks.xml.h:16
msgid "_Edit"
msgstr "Правка"
@@ -562,32 +930,32 @@ msgstr "Порт:"
msgid "_Server name:"
msgstr "Название сервера:"
-#: addressbook/gui/component/addressbook-storage.c:138
+#: addressbook/gui/component/addressbook-storage.c:163
msgid "Other Contacts"
msgstr "Другие контакты"
-#: addressbook/gui/component/addressbook.c:386
+#: addressbook/gui/component/addressbook.c:393
#, c-format
msgid "Please enter your email address and password for access to %s"
msgstr "Пожалуйста введите ваш эл.адрес и парольную фразу для доступа к %s"
-#: addressbook/gui/component/addressbook.c:394
+#: addressbook/gui/component/addressbook.c:401
msgid "LDAP Authentication"
msgstr "Идентификация LDAP"
-#: addressbook/gui/component/addressbook.c:405
+#: addressbook/gui/component/addressbook.c:412
msgid "Email Address:"
msgstr "Эл.адрес:"
-#: addressbook/gui/component/addressbook.c:418
+#: addressbook/gui/component/addressbook.c:425
msgid "Password:"
msgstr "Пароль:"
-#: addressbook/gui/component/addressbook.c:481
+#: addressbook/gui/component/addressbook.c:488
msgid "Unable to open addressbook"
msgstr "Не удалось открыть адресную книгу"
-#: addressbook/gui/component/addressbook.c:488
+#: addressbook/gui/component/addressbook.c:495
msgid ""
"We were unable to open this addressbook. This either\n"
"means you have entered an incorrect URI, or the LDAP server\n"
@@ -597,7 +965,7 @@ msgstr ""
"что либо вы ввели неправильный URI, либо LDAP\n"
"сервер не отвечает"
-#: addressbook/gui/component/addressbook.c:493
+#: addressbook/gui/component/addressbook.c:500
msgid ""
"This version of Evolution does not have LDAP support\n"
"compiled in to it. If you want to use LDAP in Evolution\n"
@@ -609,7 +977,7 @@ msgstr ""
"перекомпилировать программу из исходных текстов в CVS после\n"
"установки OpenLDAP полученного по приведённой ниже ссылке.\n"
-#: addressbook/gui/component/addressbook.c:501
+#: addressbook/gui/component/addressbook.c:508
msgid ""
"We were unable to open this addressbook. Please check that the\n"
"path exists and that you have permission to access it."
@@ -617,39 +985,39 @@ msgstr ""
"Не удалось открыть эту адресную книгу. Проверьте, что путь существует\n"
"и что у вас есть необходимые права доступа."
-#: addressbook/gui/component/addressbook.c:642
+#: addressbook/gui/component/addressbook.c:649
#: calendar/gui/cal-search-bar.c:55
msgid "Any field contains"
msgstr "Любое поле содержит"
-#: addressbook/gui/component/addressbook.c:643
+#: addressbook/gui/component/addressbook.c:650
msgid "Name contains"
msgstr "Имя содержит"
-#: addressbook/gui/component/addressbook.c:644
+#: addressbook/gui/component/addressbook.c:651
msgid "Email contains"
msgstr "Эл.адрес содержит"
-#: addressbook/gui/component/addressbook.c:645
+#: addressbook/gui/component/addressbook.c:652
#: calendar/gui/cal-search-bar.c:59
#, fuzzy
msgid "Category is"
msgstr "Категории:"
#. We attach subitems below
-#: addressbook/gui/component/addressbook.c:646 widgets/misc/e-filter-bar.h:97
+#: addressbook/gui/component/addressbook.c:653 widgets/misc/e-filter-bar.h:97
#: widgets/misc/e-filter-bar.h:104
msgid "Advanced..."
msgstr "Расширенные..."
#. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:874
+#: addressbook/gui/component/addressbook.c:883
#: calendar/gui/cal-search-bar.c:412
#, fuzzy
msgid "Any Category"
msgstr "Категории:"
-#: addressbook/gui/component/addressbook.c:912
+#: addressbook/gui/component/addressbook.c:925
msgid "The URI that the Folder Browser will display"
msgstr "URI, который будет показывать программа просмотра папок"
@@ -663,23 +1031,11 @@ msgid "(none)"
msgstr "(нет)"
#: addressbook/gui/component/e-address-popup.c:466
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: addressbook/gui/contact-editor/e-contact-editor.c:1603
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/e-contact-editor.c:1636
msgid "Primary Email"
msgstr "Первый эл.адрес"
-#: addressbook/gui/component/e-address-popup.c:476
-#: addressbook/gui/contact-editor/e-contact-editor.c:1604
-#: addressbook/gui/widgets/e-addressbook-view.c:860
-msgid "Email 2"
-msgstr "Эл.адрес 2"
-
-#: addressbook/gui/component/e-address-popup.c:486
-#: addressbook/gui/contact-editor/e-contact-editor.c:1605
-#: addressbook/gui/widgets/e-addressbook-view.c:861
-msgid "Email 3"
-msgstr "Эл.адрес 3"
-
#: addressbook/gui/component/e-address-popup.c:579
msgid "Select an Action"
msgstr "Выбрать действие"
@@ -700,13 +1056,13 @@ msgstr "Запрос к адресной книге..."
#: addressbook/gui/component/e-address-popup.c:934
#: addressbook/gui/component/e-address-widget.c:388
-#: addressbook/gui/component/select-names/e-select-names-popup.c:310
+#: addressbook/gui/component/select-names/e-select-names-popup.c:307
msgid "Edit Contact Info"
msgstr "Правка контактной информации"
#: addressbook/gui/component/e-address-popup.c:963
#: addressbook/gui/component/e-address-widget.c:424
-#: addressbook/gui/component/select-names/e-select-names-popup.c:383
+#: addressbook/gui/component/select-names/e-select-names-popup.c:486
msgid "Add to Contacts"
msgstr "Добавить к контактам"
@@ -730,31 +1086,50 @@ msgstr "Интерфейс выбора имени в адресной книге Evolution."
msgid "Factory for the Addressbook's name selection interface"
msgstr ""
-#: addressbook/gui/component/select-names/e-select-names-popup.c:156
-#: addressbook/gui/component/select-names/e-select-names.c:729
-#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:401
-#: filter/filter-rule.c:543 shell/e-shortcuts-view.c:176
-#: shell/e-shortcuts-view.c:385
+#: addressbook/gui/component/select-names/e-select-names-popup.c:164
+#: addressbook/gui/component/select-names/e-select-names.c:764
+#: composer/e-msg-composer-attachment-bar.c:477 filter/filter-filter.c:436
+#: filter/filter-rule.c:613 shell/e-shortcuts-view.c:181
msgid "Remove"
msgstr "Удалить"
-#: addressbook/gui/component/select-names/e-select-names-popup.c:171
+#: addressbook/gui/component/select-names/e-select-names-popup.c:179
msgid "Remove All"
msgstr "Удалить все"
-#: addressbook/gui/component/select-names/e-select-names-popup.c:195
+#: addressbook/gui/component/select-names/e-select-names-popup.c:203
msgid "Send HTML Mail?"
msgstr "Отправка эл.почты в HTML?"
-#: addressbook/gui/component/select-names/e-select-names-popup.c:368
+#: addressbook/gui/component/select-names/e-select-names-popup.c:406
+#, fuzzy
+msgid "Edit Contact List"
+msgstr "Список контакты"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:424
+#, fuzzy
+msgid "Unnamed Contact List"
+msgstr "Неназванный контакт"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:441
+#, c-format
+msgid "(%d not shown)"
+msgstr ""
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:507
msgid "Unnamed Contact"
msgstr "Неназванный контакт"
-#: addressbook/gui/component/select-names/e-select-names.c:487
-msgid "Unable to get local storage. This should never happen."
+#: addressbook/gui/component/select-names/e-select-names.c:521
+msgid ""
+"Evolution is unable to get the addressbook local storage. This may have been "
+"caused by the evolution-addressbook component crashing. To help us better "
+"understand and ultimately resolve this problem, please send an e-mail to Jon "
+"Trowbridge <trow@ximian.com> with a detailed description of the "
+"circumstances under which this error occurred. Thank you."
msgstr ""
-#: addressbook/gui/component/select-names/e-select-names.c:560
+#: addressbook/gui/component/select-names/e-select-names.c:598
msgid "Select Contacts from Addressbook"
msgstr ""
@@ -811,238 +1186,177 @@ msgid "Ca_tegories..."
msgstr "Категории..."
#: addressbook/gui/contact-editor/contact-editor.glade.h:5
+msgid "Collaboration"
+msgstr ""
+
+#. Construct the app
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: addressbook/gui/contact-editor/e-contact-editor.c:1241
msgid "Contact Editor"
msgstr "Редактор контактов"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: calendar/gui/dialogs/task-editor.c:156
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: calendar/gui/dialogs/task-editor.c:177
msgid "Details"
msgstr "Детали"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/contact-editor.glade.h:8
#, fuzzy
msgid "File A_s:"
msgstr "Файл как:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:8
+#: addressbook/gui/contact-editor/contact-editor.glade.h:9
msgid "General"
msgstr "Общее"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:10
msgid "New phone type"
msgstr "Новый тип телефона"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:10
+#: addressbook/gui/contact-editor/contact-editor.glade.h:11
msgid "No_tes:"
msgstr "Заметки:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:11
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
msgid "Organi_zation:"
msgstr "Организация:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
msgid "Phone Types"
msgstr "Тип телефона"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
msgid "Wants to receive _HTML mail"
msgstr "Хочет получать почту в HTML"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
msgid "_Address..."
msgstr "Адрес..."
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
msgid "_Assistant's name:"
msgstr "Имя помощника:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:19
msgid "_Birthday:"
msgstr "День рождения:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
msgid "_Business"
msgstr "Рабочий"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
+#, fuzzy
+msgid "_Calendar Information:"
+msgstr "информация календаря"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
#: calendar/gui/dialogs/event-page.glade.h:12
#: calendar/gui/dialogs/task-page.glade.h:10
msgid "_Contacts..."
msgstr "Контакты..."
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-#: calendar/gui/dialogs/meeting-page.c:1476 filter/filter.glade.h:8
-#: mail/folder-browser.c:1322 mail/mail-config.glade.h:94
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/meeting-page.c:834 filter/filter.glade.h:8
+#: mail/folder-browser.c:1371 mail/mail-config.glade.h:94
#: ui/evolution-calendar.xml.h:38 ui/evolution-mail-message.xml.h:88
#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:35
msgid "_Delete"
msgstr "Удалить"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
msgid "_Department:"
msgstr "Отдел"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#, fuzzy
+msgid "_Free/Busy Information:"
+msgstr "Необходимая информация"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
msgid "_Full Name..."
msgstr "Полное имя..."
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
msgid "_Home"
msgstr "Домашний"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
msgid "_Job title:"
msgstr "Должность:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
msgid "_Manager's Name:"
msgstr "Имя менеджера:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
msgid "_Mobile"
msgstr "Мобильный"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
msgid "_Nickname:"
msgstr "Псевдоним:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
msgid "_Office:"
msgstr "Офис:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
msgid "_Profession:"
msgstr "Профессия:"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
msgid "_Spouse:"
msgstr "Супруг(а):"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
msgid "_This is the mailing address"
msgstr "Это почтовый адрес"
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
#, fuzzy
msgid "_Web page address:"
msgstr "Адрес web-страницы:"
#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+#, fuzzy
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr "Вы уверены что хотите удалить этот счет?"
+
+#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
msgid "Delete Contact?"
msgstr "Удалить контакт?"
-#: addressbook/gui/contact-editor/e-contact-editor.c:730
+#: addressbook/gui/contact-editor/e-contact-editor.c:759
msgid "This contact belongs to these categories:"
msgstr "Этот контакт принадлежит следующим категориям:"
-#: addressbook/gui/contact-editor/e-contact-editor.c:1561
-#: addressbook/gui/widgets/e-addressbook-view.c:868
-msgid "Assistant"
-msgstr "Помощник"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1562
-#: addressbook/gui/contact-editor/e-contact-editor.c:1629
-msgid "Business"
-msgstr "Рабочий"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1563
-msgid "Business 2"
-msgstr "Рабочий 2"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1564
-#: addressbook/gui/widgets/e-addressbook-view.c:848
-msgid "Business Fax"
-msgstr "Рабочий факс"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1565
-msgid "Callback"
-msgstr "Обратный отзвон"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1566
-msgid "Car"
-msgstr "Машина"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1567
-msgid "Company"
-msgstr "Компания"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1568
-#: addressbook/gui/contact-editor/e-contact-editor.c:1630
-msgid "Home"
-msgstr "Домашний"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1569
-msgid "Home 2"
-msgstr "Домашний 2"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1570
-#: addressbook/gui/widgets/e-addressbook-view.c:849
-msgid "Home Fax"
-msgstr "Домашний Факс"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1571
-#: addressbook/gui/widgets/e-addressbook-view.c:852
-msgid "ISDN"
-msgstr "ISDN"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1572
-msgid "Mobile"
-msgstr "Мобильный"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1573
-#: addressbook/gui/contact-editor/e-contact-editor.c:1631
-#: mail/mail-config.glade.h:51
-msgid "Other"
-msgstr "Другой"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1574
-#: addressbook/gui/widgets/e-addressbook-view.c:854
-msgid "Other Fax"
-msgstr "Другой факс"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1575
-#: addressbook/gui/widgets/e-addressbook-view.c:855
-msgid "Pager"
-msgstr "Пэйджер"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1576
-msgid "Primary"
-msgstr "Первый"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1577
-#: addressbook/gui/widgets/e-addressbook-view.c:856
-msgid "Radio"
-msgstr "Радио"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1578
-#: addressbook/gui/widgets/e-addressbook-view.c:857
-msgid "Telex"
-msgstr "Телекс"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1579
+#: addressbook/gui/contact-editor/e-contact-editor.c:1612
msgid "TTY/TDD"
msgstr "TTY/TDD"
-#: addressbook/gui/contact-editor/e-contact-editor.c:2198
+#: addressbook/gui/contact-editor/e-contact-editor.c:2234
#, fuzzy, c-format
msgid "Could not find widget for a field: `%s'"
msgstr "Не удалось удалить итоговый файл папки \"%s\": %s"
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:265
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
msgid "Contact Quick-Add"
msgstr "Быстрое добавление контакта"
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:267
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:285
msgid "Edit Full"
msgstr "Правка полного имени"
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:293
-#: addressbook/gui/widgets/e-addressbook-view.c:835
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:311
+#: addressbook/gui/widgets/e-addressbook-view.c:869
msgid "Full Name"
msgstr "Полное имя:"
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:299
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:317
msgid "E-mail"
msgstr "Эл.адрес"
@@ -2234,161 +2548,68 @@ msgid "Advanced Search"
msgstr "Расширенный поиск"
#: addressbook/gui/search/e-addressbook-search-dialog.c:152
-#: mail/mail-search.c:260
+#: mail/mail-search.c:264
msgid "Search"
msgstr "Поиск"
-#: addressbook/gui/widgets/alphabet.glade.h:1
-msgid "123"
-msgstr "123"
-
-#: addressbook/gui/widgets/alphabet.glade.h:2
-msgid "a"
-msgstr "a"
-
-#: addressbook/gui/widgets/alphabet.glade.h:3
-msgid "b"
-msgstr "b"
-
-#: addressbook/gui/widgets/alphabet.glade.h:4
-msgid "c"
-msgstr "c"
-
-#: addressbook/gui/widgets/alphabet.glade.h:5
-msgid "d"
-msgstr "d"
-
-#: addressbook/gui/widgets/alphabet.glade.h:6
-msgid "e"
-msgstr "e"
-
-#: addressbook/gui/widgets/alphabet.glade.h:7
-msgid "f"
-msgstr "f"
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
-msgid "g"
-msgstr "g"
-
-#: addressbook/gui/widgets/alphabet.glade.h:9
-msgid "h"
-msgstr "h"
-
-#: addressbook/gui/widgets/alphabet.glade.h:10
-msgid "i"
-msgstr "i"
-
-#: addressbook/gui/widgets/alphabet.glade.h:11
-msgid "j"
-msgstr "j"
-
-#: addressbook/gui/widgets/alphabet.glade.h:12
-msgid "k"
-msgstr "k"
-
-#: addressbook/gui/widgets/alphabet.glade.h:13
-msgid "l"
-msgstr "l"
-
-#: addressbook/gui/widgets/alphabet.glade.h:14
-msgid "m"
-msgstr "m"
-
-#: addressbook/gui/widgets/alphabet.glade.h:15
-msgid "n"
-msgstr "n"
-
-#: addressbook/gui/widgets/alphabet.glade.h:16
-msgid "o"
-msgstr "o"
-
-#: addressbook/gui/widgets/alphabet.glade.h:17
-msgid "p"
-msgstr "p"
-
-#: addressbook/gui/widgets/alphabet.glade.h:18
-msgid "q"
-msgstr "q"
-
-#: addressbook/gui/widgets/alphabet.glade.h:19
-msgid "r"
-msgstr "r"
-
-#: addressbook/gui/widgets/alphabet.glade.h:20
-msgid "s"
-msgstr "s"
-
-#: addressbook/gui/widgets/alphabet.glade.h:21
-msgid "t"
-msgstr "t"
-
-#: addressbook/gui/widgets/alphabet.glade.h:22
-msgid "u"
-msgstr "u"
-
-#: addressbook/gui/widgets/alphabet.glade.h:23
-msgid "v"
-msgstr "v"
-
-#: addressbook/gui/widgets/alphabet.glade.h:24
-msgid "w"
-msgstr "w"
-
-#: addressbook/gui/widgets/alphabet.glade.h:25
-msgid "x"
-msgstr "x"
+#: addressbook/gui/widgets/e-addressbook-model.c:121
+#, fuzzy
+msgid "No cards"
+msgstr "Не начато"
-#: addressbook/gui/widgets/alphabet.glade.h:26
-msgid "y"
-msgstr "y"
+#: addressbook/gui/widgets/e-addressbook-model.c:124
+#, fuzzy
+msgid "1 card"
+msgstr "Напечатать календарь"
-#: addressbook/gui/widgets/alphabet.glade.h:27
-msgid "z"
-msgstr "z"
+#: addressbook/gui/widgets/e-addressbook-model.c:127
+#, fuzzy, c-format
+msgid "%d cards"
+msgstr "%d секунд"
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:137
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
-#: addressbook/gui/widgets/e-addressbook-view.c:655
-#: addressbook/gui/widgets/e-addressbook-view.c:717
-#: addressbook/gui/widgets/e-addressbook-view.c:1345
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:138
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
+#: addressbook/gui/widgets/e-addressbook-view.c:691
+#: addressbook/gui/widgets/e-addressbook-view.c:753
+#: addressbook/gui/widgets/e-addressbook-view.c:1373
#: ui/evolution-addressbook.xml.h:19
msgid "Save as VCard"
msgstr "Сохранить как VCard"
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:265
-#: shell/e-shortcuts-view.c:378 ui/evolution-message-composer.xml.h:13
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:266
+#: ui/evolution-message-composer.xml.h:13
msgid "Open"
msgstr "Открыть"
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:267
-#: addressbook/gui/widgets/e-addressbook-view.c:718
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
+#: addressbook/gui/widgets/e-addressbook-view.c:754
#: ui/evolution-addressbook.xml.h:10
#, fuzzy
msgid "Forward Contact"
msgstr "Переслать вложенное"
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:268
-#: addressbook/gui/widgets/e-addressbook-view.c:719
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
+#: addressbook/gui/widgets/e-addressbook-view.c:755
#, fuzzy
msgid "Send Message to Contact"
msgstr "Послать сообщение к контакту"
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:269
-#: addressbook/gui/widgets/e-addressbook-view.c:720
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:270
+#: addressbook/gui/widgets/e-addressbook-view.c:756
#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:63
#: ui/my-evolution.xml.h:2
msgid "Print"
msgstr "Печать"
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:271
-#: addressbook/gui/widgets/e-addressbook-view.c:722
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:272
+#: addressbook/gui/widgets/e-addressbook-view.c:758
msgid "Print Envelope"
msgstr "Печать конверта"
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:273
-#: addressbook/gui/widgets/e-addressbook-view.c:724 filter/libfilter-i18n.h:8
-#: mail/mail-accounts.c:283 ui/evolution-addressbook.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:274
+#: addressbook/gui/widgets/e-addressbook-view.c:760 filter/libfilter-i18n.h:11
+#: mail/mail-accounts.c:281 ui/evolution-addressbook.xml.h:8
#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:16
#: ui/evolution-tasks.xml.h:8
@@ -2397,7 +2618,7 @@ msgstr "Удалить"
#: addressbook/gui/widgets/e-addressbook-table-adapter.c:128
#: addressbook/gui/widgets/e-addressbook-util.c:68
-#: addressbook/gui/widgets/e-minicard.c:451
+#: addressbook/gui/widgets/e-minicard.c:452
msgid "Error modifying card"
msgstr "Ошибка при изменении карточки"
@@ -2406,7 +2627,7 @@ msgid "Success"
msgstr "Успешно"
#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1652
+#: camel/providers/imap/camel-imap-command.c:340 shell/e-shell.c:1710
#: shell/e-storage.c:515
msgid "Unknown error"
msgstr "Неизвестная ошибка"
@@ -2433,10 +2654,10 @@ msgid "Protocol not supported"
msgstr "Протокол не поддерживается"
#: addressbook/gui/widgets/e-addressbook-util.c:41
-#: calendar/gui/calendar-model.c:689 calendar/gui/calendar-model.c:1198
+#: calendar/gui/calendar-model.c:733 calendar/gui/calendar-model.c:1274
#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:545
-#: camel/camel-service.c:581
+#: calendar/gui/e-calendar-table.c:404 camel/camel-service.c:544
+#: camel/camel-service.c:580
msgid "Cancelled"
msgstr "Отменено"
@@ -2461,134 +2682,85 @@ msgid "Error removing list"
msgstr "Ошибка при удалении списка"
#: addressbook/gui/widgets/e-addressbook-util.c:78
-#: addressbook/gui/widgets/e-addressbook-view.c:1218
+#: addressbook/gui/widgets/e-addressbook-view.c:1248
msgid "Error removing card"
msgstr "Ошибка при удалении карточки"
-#: addressbook/gui/widgets/e-addressbook-view.c:833
-msgid "* Click here to add a contact *"
-msgstr "* Щелкните здесь для добавления контакта *"
+#. Translators: put here a list of labels you want to see on buttons in
+#. addressbook. You may use any character to separate labels but it must
+#. also be placed at the begining ot the string
+#: addressbook/gui/widgets/e-addressbook-view.c:399
+msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:834
-msgid "File As"
-msgstr "Файл как"
+#. Translators: put here a list of characters that correspond to buttons
+#. in addressbook. You may use any character to separate labels but it
+#. must also be placed at the begining ot the string.
+#. Use lower case letters if possible.
+#: addressbook/gui/widgets/e-addressbook-view.c:404
+msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+msgstr ""
-#: addressbook/gui/widgets/e-addressbook-view.c:836
-msgid "Email"
-msgstr "Эл.адрес"
+#: addressbook/gui/widgets/e-addressbook-view.c:867
+msgid "* Click here to add a contact *"
+msgstr "* Щелкните здесь для добавления контакта *"
-#: addressbook/gui/widgets/e-addressbook-view.c:837
+#: addressbook/gui/widgets/e-addressbook-view.c:871
msgid "Primary Phone"
msgstr "Первый телефон"
-#: addressbook/gui/widgets/e-addressbook-view.c:838
+#: addressbook/gui/widgets/e-addressbook-view.c:872
msgid "Assistant Phone"
msgstr "Телефон помощника"
-#: addressbook/gui/widgets/e-addressbook-view.c:839
+#: addressbook/gui/widgets/e-addressbook-view.c:873
msgid "Business Phone"
msgstr "Рабочий телефон"
-#: addressbook/gui/widgets/e-addressbook-view.c:840
+#: addressbook/gui/widgets/e-addressbook-view.c:874
msgid "Callback Phone"
msgstr "Обратный отзвон"
-#: addressbook/gui/widgets/e-addressbook-view.c:841
+#: addressbook/gui/widgets/e-addressbook-view.c:875
msgid "Company Phone"
msgstr "Телефон компании"
-#: addressbook/gui/widgets/e-addressbook-view.c:842
+#: addressbook/gui/widgets/e-addressbook-view.c:876
msgid "Home Phone"
msgstr "Домашний телефон"
-#: addressbook/gui/widgets/e-addressbook-view.c:843
-msgid "Organization"
-msgstr "Организация"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:844
+#: addressbook/gui/widgets/e-addressbook-view.c:878
msgid "Business Address"
msgstr "Рабочий адрес"
-#: addressbook/gui/widgets/e-addressbook-view.c:845
+#: addressbook/gui/widgets/e-addressbook-view.c:879
msgid "Home Address"
msgstr "Домашний адрес"
-#: addressbook/gui/widgets/e-addressbook-view.c:846
+#: addressbook/gui/widgets/e-addressbook-view.c:880
msgid "Mobile Phone"
msgstr "Мобильный телефон"
-#: addressbook/gui/widgets/e-addressbook-view.c:847
+#: addressbook/gui/widgets/e-addressbook-view.c:881
msgid "Car Phone"
msgstr "Телефон в машине"
-#: addressbook/gui/widgets/e-addressbook-view.c:850
+#: addressbook/gui/widgets/e-addressbook-view.c:884
msgid "Business Phone 2"
msgstr "Рабочий телефон 2"
-#: addressbook/gui/widgets/e-addressbook-view.c:851
+#: addressbook/gui/widgets/e-addressbook-view.c:885
msgid "Home Phone 2"
msgstr "Домашний телефон 2"
-#: addressbook/gui/widgets/e-addressbook-view.c:853
+#: addressbook/gui/widgets/e-addressbook-view.c:887
msgid "Other Phone"
msgstr "Другие телефоны"
-#: addressbook/gui/widgets/e-addressbook-view.c:858
-msgid "TTY"
-msgstr "TTY"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:859
+#: addressbook/gui/widgets/e-addressbook-view.c:893
msgid "Other Address"
msgstr "Другие адреса"
-#: addressbook/gui/widgets/e-addressbook-view.c:862
-msgid "Web Site"
-msgstr "Сайт в Интернет"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:863
-msgid "Department"
-msgstr "Отдел"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:864
-msgid "Office"
-msgstr "Офис"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:865
-msgid "Title"
-msgstr "Заголовок"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:866
-msgid "Profession"
-msgstr "Профессия"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:867
-msgid "Manager"
-msgstr "Управляющий"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:869
-msgid "Nickname"
-msgstr "Псевдоним"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:870
-msgid "Spouse"
-msgstr "Супруг(а)"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:871
-msgid "Note"
-msgstr "Заметка"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:872
-msgid "Free-busy URL"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1215
-msgid "Done."
-msgstr "Сделано"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1247
-msgid "Removing cards..."
-msgstr "Удаление карточек..."
-
#: addressbook/gui/widgets/e-minicard-control.c:283
msgid "Save in addressbook"
msgstr "Сохранить в адресной книге"
@@ -2779,13 +2951,13 @@ msgstr "Ширина:"
msgid "_Font..."
msgstr "Шрифт..."
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1092
#, fuzzy
msgid "Print cards"
msgstr "Напечатать календарь"
-#: addressbook/printing/e-contact-print.c:1111
-#: addressbook/printing/e-contact-print.c:1133
+#: addressbook/printing/e-contact-print.c:1112
+#: addressbook/printing/e-contact-print.c:1134
#, fuzzy
msgid "Print card"
msgstr "Напечатать календарь"
@@ -2832,22 +3004,23 @@ msgid "Factory for the Calendar Summary component."
msgstr ""
#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
-msgid "Factory for the Evolution calendar component."
-msgstr "Фабрика компонента календаря Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
msgid "Factory for the calendar iTip view control"
msgstr ""
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
msgid "Factory for the sample Calendar control"
msgstr ""
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
#, fuzzy
msgid "Factory to centralize calendar component editor dialogs"
msgstr "Фабрика компонента календаря Evolution."
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+#, fuzzy
+msgid "Factory to create a component editor factory"
+msgstr "Фабрика компонента календаря Evolution."
+
#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
msgid "Alarm notification service"
msgstr ""
@@ -2918,178 +3091,169 @@ msgstr "Время дремания (минут)"
msgid "_Edit appointment"
msgstr "Правка встречи"
-#: calendar/gui/alarm-notify/alarm-queue.c:487
+#: calendar/gui/alarm-notify/alarm-queue.c:629
msgid "No description available."
msgstr "Описание не доступно."
-#: calendar/gui/alarm-notify/alarm-queue.c:700
-#: calendar/gui/alarm-notify/alarm-queue.c:999
-#: calendar/gui/alarm-notify/alarm-queue.c:1055
-msgid "Reminder of your appointment at "
-msgstr "Напоминать обо всех встречах"
-
-#: calendar/gui/alarm-notify/alarm-queue.c:991
-msgid "Snooze"
-msgstr "Короткий сон"
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:1004
-#: calendar/gui/alarm-notify/alarm-queue.c:1059
-msgid "Ok"
-msgstr "Ok"
+#: calendar/gui/alarm-notify/alarm-queue.c:689
+msgid ""
+"Evolution does not support calendar reminders with\n"
+"email notifications yet, but this reminder was\n"
+"configured to send an email. Evolution will display\n"
+"a normal reminder dialog box instead."
+msgstr ""
-#: calendar/gui/alarm-notify/notify-main.c:58
+#: calendar/gui/alarm-notify/alarm-queue.c:740
#, c-format
msgid ""
-"It is %s. The Unix time is %ld right now. We just thought you may like to "
-"know."
-msgstr "Это %s. Сейчас %ld. Мы просто подумали, что вы хотите это знать."
+"An Evolution Calendar reminder is about to trigger.\n"
+"This reminder is configured to run the following program:\n"
+"\n"
+" %s\n"
+"\n"
+"Are you sure you want to run this program?"
+msgstr ""
-#: calendar/gui/alarm-notify/notify-main.c:95 calendar/gui/main.c:53
+#: calendar/gui/alarm-notify/notify-main.c:73 calendar/gui/main.c:58
msgid "Could not initialize GNOME"
msgstr "Не удалось инициализировать GNOME"
-#: calendar/gui/alarm-notify/notify-main.c:103 calendar/gui/main.c:72
+#: calendar/gui/alarm-notify/notify-main.c:81 calendar/gui/main.c:106
msgid "Could not initialize gnome-vfs"
msgstr "Не удалось инициализировать gnome-vfs"
-#: calendar/gui/alarm-notify/notify-main.c:115
+#: calendar/gui/alarm-notify/notify-main.c:90
#, fuzzy
msgid "Could not create the alarm notify service factory"
msgstr "Не удалось создать временный каталог: %s"
-#: calendar/gui/calendar-commands.c:414
+#: calendar/gui/calendar-commands.c:439
msgid "%A %d %B %Y"
msgstr "%A %d %B %Y"
#. strftime format %a = abbreviated weekday name, %d = day of month,
#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:417 calendar/gui/e-day-view-top-item.c:289
-#: calendar/gui/e-day-view.c:1368 calendar/gui/e-week-view-main-item.c:334
+#: calendar/gui/calendar-commands.c:442 calendar/gui/e-day-view-top-item.c:289
+#: calendar/gui/e-day-view.c:1388 calendar/gui/e-week-view-main-item.c:334
msgid "%a %d %b"
msgstr "%a %d %b"
-#: calendar/gui/calendar-commands.c:419 calendar/gui/calendar-commands.c:424
-#: calendar/gui/calendar-commands.c:426
+#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-commands.c:449
+#: calendar/gui/calendar-commands.c:451
msgid "%a %d %b %Y"
msgstr "%a %d %b %Y"
-#: calendar/gui/calendar-commands.c:435
-#, c-format
-msgid "%d"
-msgstr "%d"
-
-#: calendar/gui/calendar-commands.c:437 calendar/gui/calendar-commands.c:444
-#: calendar/gui/calendar-commands.c:450 calendar/gui/calendar-commands.c:452
+#: calendar/gui/calendar-commands.c:462 calendar/gui/calendar-commands.c:469
+#: calendar/gui/calendar-commands.c:475 calendar/gui/calendar-commands.c:477
msgid "%d %B %Y"
msgstr "%d %B %Y"
#. 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/calendar-commands.c:442
-#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1436
-#: my-evolution/e-summary-calendar.c:240
+#: calendar/gui/calendar-commands.c:467
+#: calendar/gui/e-week-view-main-item.c:342 calendar/gui/print.c:1442
msgid "%d %B"
msgstr "%d %B"
-#: calendar/gui/calendar-commands.c:604
+#: calendar/gui/calendar-commands.c:677
msgid ""
"Could not create the calendar view. Please check your ORBit and OAF setup."
msgstr ""
"Не удалось создать окно календаря. Пожалуйста проверьте вашу установку ORBit "
"и OAF."
-#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:925
+#: calendar/gui/calendar-model.c:399 calendar/gui/calendar-model.c:1001
#: calendar/gui/e-calendar-table.c:307
msgid "Private"
msgstr "Личное"
-#: calendar/gui/calendar-model.c:358 calendar/gui/calendar-model.c:927
+#: calendar/gui/calendar-model.c:402 calendar/gui/calendar-model.c:1003
#: calendar/gui/e-calendar-table.c:308
msgid "Confidential"
msgstr "Конфиденциальное"
-#: calendar/gui/calendar-model.c:361 calendar/gui/e-calendar-table.c:306
+#: calendar/gui/calendar-model.c:405 calendar/gui/e-calendar-table.c:306
msgid "Public"
msgstr "Общее"
-#: calendar/gui/calendar-model.c:454
+#: calendar/gui/calendar-model.c:498
msgid "N"
msgstr "С"
-#: calendar/gui/calendar-model.c:454
+#: calendar/gui/calendar-model.c:498
msgid "S"
msgstr "Ю"
-#: calendar/gui/calendar-model.c:456
+#: calendar/gui/calendar-model.c:500
msgid "E"
msgstr "В"
-#: calendar/gui/calendar-model.c:456
+#: calendar/gui/calendar-model.c:500
msgid "W"
msgstr "З"
-#: calendar/gui/calendar-model.c:494 calendar/gui/calendar-model.c:1107
+#: calendar/gui/calendar-model.c:538 calendar/gui/calendar-model.c:1183
#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:648
+#: calendar/gui/e-calendar-table.c:328 mail/message-list.c:652
msgid "High"
msgstr "Высокий"
-#: calendar/gui/calendar-model.c:496 calendar/gui/calendar-model.c:1109
-#: calendar/gui/calendar-model.c:1624
+#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1185
+#: calendar/gui/calendar-model.c:1700
#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:647
+#: calendar/gui/e-calendar-table.c:329 mail/message-list.c:651
msgid "Normal"
msgstr "Нормальный"
-#: calendar/gui/calendar-model.c:498 calendar/gui/calendar-model.c:1111
+#: calendar/gui/calendar-model.c:542 calendar/gui/calendar-model.c:1187
#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:646
+#: calendar/gui/e-calendar-table.c:330 mail/message-list.c:650
msgid "Low"
msgstr "Низкий"
-#: calendar/gui/calendar-model.c:529 calendar/gui/calendar-model.c:1144
+#: calendar/gui/calendar-model.c:573 calendar/gui/calendar-model.c:1220
#: calendar/gui/e-calendar-table.c:380
msgid "Free"
msgstr "Свободен"
-#: calendar/gui/calendar-model.c:531 calendar/gui/e-calendar-table.c:381
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+#: calendar/gui/calendar-model.c:575 calendar/gui/e-calendar-table.c:381
+#: calendar/gui/e-meeting-time-sel.c:393
msgid "Busy"
msgstr "Занят"
-#: calendar/gui/calendar-model.c:680 calendar/gui/calendar-model.c:1192
+#: calendar/gui/calendar-model.c:724 calendar/gui/calendar-model.c:1268
#: calendar/gui/dialogs/task-details-page.glade.h:10
#: calendar/gui/e-calendar-table.c:401
msgid "Not Started"
msgstr "Не начато"
-#: calendar/gui/calendar-model.c:683 calendar/gui/calendar-model.c:1194
+#: calendar/gui/calendar-model.c:727 calendar/gui/calendar-model.c:1270
#: calendar/gui/dialogs/task-details-page.glade.h:7
#: calendar/gui/e-calendar-table.c:402
msgid "In Progress"
msgstr "В процессе"
-#: calendar/gui/calendar-model.c:686 calendar/gui/calendar-model.c:1196
-#: calendar/gui/dialogs/meeting-page.c:673
-#: calendar/gui/dialogs/meeting-page.c:696
+#: calendar/gui/calendar-model.c:730 calendar/gui/calendar-model.c:1272
#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:403
+#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-meeting-model.c:298
+#: calendar/gui/e-meeting-model.c:321
msgid "Completed"
msgstr "Выполнено"
#. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:839 e-util/e-time-utils.c:317
+#: calendar/gui/calendar-model.c:915 e-util/e-time-utils.c:163
+#: e-util/e-time-utils.c:354
msgid "%a %m/%d/%Y %H:%M:%S"
msgstr "%a %m/%d/%Y %H:%M:%S"
#. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:842 e-util/e-time-utils.c:326
+#: calendar/gui/calendar-model.c:918 e-util/e-time-utils.c:158
+#: e-util/e-time-utils.c:363
msgid "%a %m/%d/%Y %I:%M:%S %p"
msgstr "%a %m/%d/%Y %I:%M:%S %p"
-#: calendar/gui/calendar-model.c:847
+#: calendar/gui/calendar-model.c:923
#, c-format
msgid ""
"The date must be entered in the format: \n"
@@ -3100,7 +3264,7 @@ msgstr ""
"\n"
"%s"
-#: calendar/gui/calendar-model.c:1011
+#: calendar/gui/calendar-model.c:1087
msgid ""
"The geographical position must be entered in the format: \n"
"\n"
@@ -3110,51 +3274,50 @@ msgstr ""
"\n"
"45.436845,125.862501"
-#: calendar/gui/calendar-model.c:1051
+#: calendar/gui/calendar-model.c:1127
msgid "The percent value must be between 0 and 100, inclusive"
msgstr "Значение процента должно быть между 0 и 100, включительно"
-#: calendar/gui/calendar-model.c:1092
+#: calendar/gui/calendar-model.c:1168
msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
msgstr ""
"Приоритет должен быть \"Высокий\", \"Нормальный\", \"Низкий\" или "
"\"Неопределенный\"."
#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1105
+#: calendar/gui/calendar-model.c:1181
#: calendar/gui/dialogs/task-details-page.glade.h:13
#: calendar/gui/e-calendar-table.c:331
msgid "Undefined"
msgstr "Неопределенное"
#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1190 calendar/gui/dialogs/meeting-page.c:368
-#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1417
-#: mail/mail-accounts.c:144 mail/mail-accounts.c:392
-#: mail/mail-config.glade.h:49 shell/e-shell-view.c:1454
+#: calendar/gui/calendar-model.c:1266 calendar/gui/dialogs/meeting-page.c:332
+#: calendar/gui/dialogs/meeting-page.glade.h:1 mail/mail-account-gui.c:1444
+#: mail/mail-accounts.c:143 mail/mail-accounts.c:390
+#: mail/mail-config.glade.h:49
#: widgets/e-timezone-dialog/e-timezone-dialog.c:203
#: widgets/misc/e-cell-date-edit.c:240 widgets/misc/e-dateedit.c:447
-#: widgets/misc/e-dateedit.c:1407 widgets/misc/e-dateedit.c:1522
+#: widgets/misc/e-dateedit.c:1428 widgets/misc/e-dateedit.c:1543
msgid "None"
msgstr "Нет"
-#: calendar/gui/calendar-model.c:1626
+#: calendar/gui/calendar-model.c:1702
msgid "Recurring"
msgstr "Повторение"
-#: calendar/gui/calendar-model.c:1628
+#: calendar/gui/calendar-model.c:1704
msgid "Assigned"
msgstr "Связанное"
-#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:645
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/dialogs/meeting-page.c:1187
-#: calendar/gui/dialogs/meeting-page.c:1283
+#: calendar/gui/calendar-model.c:1710 calendar/gui/e-meeting-model.c:270
+#: calendar/gui/e-meeting-model.c:280 calendar/gui/e-meeting-model.c:506
+#: calendar/gui/e-meeting-model.c:702
msgid "Yes"
msgstr "Да"
-#: calendar/gui/calendar-model.c:1634 calendar/gui/dialogs/meeting-page.c:657
-#: calendar/gui/dialogs/meeting-page.c:1284
+#: calendar/gui/calendar-model.c:1710 calendar/gui/e-meeting-model.c:282
+#: calendar/gui/e-meeting-model.c:703
msgid "No"
msgstr "Нет"
@@ -3186,45 +3349,45 @@ msgstr "Описание содержит"
msgid "Comment contains"
msgstr "Коментарий содержит"
-#: calendar/gui/cal-search-bar.c:416
+#: calendar/gui/cal-search-bar.c:416 mail/mail-ops.c:1054
msgid "Unmatched"
msgstr ""
-#: calendar/gui/component-factory.c:55 my-evolution/my-evolution.glade.h:6
-#: shell/e-local-storage.c:174 shell/e-shortcuts.c:1046
+#: calendar/gui/component-factory.c:62 my-evolution/my-evolution.glade.h:6
+#: shell/e-local-storage.c:172 shell/e-shortcuts.c:1056
msgid "Calendar"
msgstr "Календарь"
-#: calendar/gui/component-factory.c:55
+#: calendar/gui/component-factory.c:63
msgid "Folder containing appointments and events"
msgstr ""
-#: calendar/gui/component-factory.c:56 calendar/gui/print.c:1707
-#: my-evolution/e-summary-tasks.c:212 my-evolution/e-summary-tasks.c:228
-#: shell/e-local-storage.c:180 shell/e-shortcuts.c:1047
+#: calendar/gui/component-factory.c:67 calendar/gui/print.c:1719
+#: my-evolution/e-summary-tasks.c:215 my-evolution/e-summary-tasks.c:231
+#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1059
#: views/tasks/galview.xml.h:1
msgid "Tasks"
msgstr "Задания"
-#: calendar/gui/component-factory.c:56
+#: calendar/gui/component-factory.c:68
#, fuzzy
msgid "Folder containing to-do items"
msgstr "Вирт.папка по списку рассылки"
-#: calendar/gui/component-factory.c:402 ui/evolution-calendar.xml.h:7
+#: calendar/gui/component-factory.c:593 ui/evolution-calendar.xml.h:7
msgid "Create a new appointment"
msgstr "Создать новую встречу"
-#: calendar/gui/component-factory.c:403 calendar/gui/e-day-view.c:3400
+#: calendar/gui/component-factory.c:594 calendar/gui/e-day-view.c:3420
msgid "New _Appointment"
msgstr "Новая встреча"
-#: calendar/gui/component-factory.c:408 ui/evolution-calendar.xml.h:8
+#: calendar/gui/component-factory.c:599 ui/evolution-calendar.xml.h:8
#: ui/evolution-tasks.xml.h:5
msgid "Create a new task"
msgstr "Создать новое задание"
-#: calendar/gui/component-factory.c:409
+#: calendar/gui/component-factory.c:600
#, fuzzy
msgid "New _Task"
msgstr "Новое задание"
@@ -3233,24 +3396,24 @@ msgstr "Новое задание"
msgid "The URI that the calendar will display"
msgstr "URI, который будет показывать календарь"
-#: calendar/gui/dialogs/alarm-options.c:357
+#: calendar/gui/dialogs/alarm-options.c:359
msgid "Audio Alarm Options"
msgstr "Параметры аудио таймеров"
-#: calendar/gui/dialogs/alarm-options.c:366
+#: calendar/gui/dialogs/alarm-options.c:368
msgid "Message Alarm Options"
msgstr "Параметры сообщений таймера"
-#: calendar/gui/dialogs/alarm-options.c:375
+#: calendar/gui/dialogs/alarm-options.c:377
#, fuzzy
msgid "Mail Alarm Options"
msgstr "Отобразить параметры"
-#: calendar/gui/dialogs/alarm-options.c:384
+#: calendar/gui/dialogs/alarm-options.c:386
msgid "Program Alarm Options"
msgstr ""
-#: calendar/gui/dialogs/alarm-options.c:393
+#: calendar/gui/dialogs/alarm-options.c:395
msgid "Unknown Alarm Options"
msgstr ""
@@ -3259,26 +3422,28 @@ msgid "Alarm Repeat"
msgstr ""
#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "FIXME: mail alarm options"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-options.glade.h:3
#, fuzzy
msgid "Message to Display"
msgstr "Хранилище сообщений"
-#: calendar/gui/dialogs/alarm-options.glade.h:4
+#: calendar/gui/dialogs/alarm-options.glade.h:3
msgid "Play sound:"
msgstr "Воспроизвести звук:"
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:4
msgid "Repeat the alarm"
msgstr ""
-#: calendar/gui/dialogs/alarm-options.glade.h:6
+#: calendar/gui/dialogs/alarm-options.glade.h:5
msgid "Run program:"
msgstr "Запустить программу:"
+#: calendar/gui/dialogs/alarm-options.glade.h:6
+msgid ""
+"This is an email reminder, but Evolution does not yet support this kind of "
+"reminders. You will not be able to edit the options for this reminder."
+msgstr ""
+
#: calendar/gui/dialogs/alarm-options.glade.h:7
msgid "With these arguments:"
msgstr "С такими аргументами:"
@@ -3300,95 +3465,92 @@ msgstr "часы"
msgid "minutes"
msgstr "минуты"
-#: calendar/gui/dialogs/alarm-page.c:332
+#: calendar/gui/dialogs/alarm-page.c:303
#, c-format
msgid "%d days"
msgstr "%d дней"
-#: calendar/gui/dialogs/alarm-page.c:334
+#: calendar/gui/dialogs/alarm-page.c:305
msgid "1 day"
msgstr "1 день"
-#: calendar/gui/dialogs/alarm-page.c:337
+#: calendar/gui/dialogs/alarm-page.c:308
#, c-format
msgid "%d weeks"
msgstr "%d недель"
-#: calendar/gui/dialogs/alarm-page.c:339
+#: calendar/gui/dialogs/alarm-page.c:310
msgid "1 week"
msgstr "1 неделя"
-#: calendar/gui/dialogs/alarm-page.c:342
+#: calendar/gui/dialogs/alarm-page.c:313
#, c-format
msgid "%d hours"
msgstr "%d часов"
-#: calendar/gui/dialogs/alarm-page.c:344
+#: calendar/gui/dialogs/alarm-page.c:315
msgid "1 hour"
msgstr "1 час"
-#: calendar/gui/dialogs/alarm-page.c:347
+#: calendar/gui/dialogs/alarm-page.c:318
#, c-format
msgid "%d minutes"
msgstr "%d минут"
-#: calendar/gui/dialogs/alarm-page.c:349
+#: calendar/gui/dialogs/alarm-page.c:320
msgid "1 minute"
msgstr "1 минута"
-#: calendar/gui/dialogs/alarm-page.c:352
+#: calendar/gui/dialogs/alarm-page.c:323
#, c-format
msgid "%d seconds"
msgstr "%d секунд"
-#: calendar/gui/dialogs/alarm-page.c:354
+#: calendar/gui/dialogs/alarm-page.c:325
msgid "1 second"
msgstr "1 секунда"
-#: calendar/gui/dialogs/alarm-page.c:379
+#: calendar/gui/dialogs/alarm-page.c:350
#: calendar/gui/dialogs/alarm-page.glade.h:4
msgid "Play a sound"
msgstr "Воспроизвести звук"
-#: calendar/gui/dialogs/alarm-page.c:383
+#: calendar/gui/dialogs/alarm-page.c:354
#: calendar/gui/dialogs/alarm-page.glade.h:3
msgid "Display a message"
msgstr "Показать сообщение"
-#: calendar/gui/dialogs/alarm-page.c:387
-#: calendar/gui/dialogs/alarm-page.glade.h:7
+#: calendar/gui/dialogs/alarm-page.c:358
msgid "Send an email"
msgstr "Отправить почту"
-#: calendar/gui/dialogs/alarm-page.c:391
+#: calendar/gui/dialogs/alarm-page.c:362
#: calendar/gui/dialogs/alarm-page.glade.h:6
msgid "Run a program"
msgstr "Запустить программу"
-#: calendar/gui/dialogs/alarm-page.c:397 calendar/gui/dialogs/alarm-page.c:433
-#: calendar/gui/dialogs/meeting-page.c:601
-#: calendar/gui/dialogs/meeting-page.c:636
-#: calendar/gui/dialogs/meeting-page.c:701
-#: calendar/gui/dialogs/meeting-page.c:1255
-#: calendar/gui/dialogs/meeting-page.c:1271
+#: calendar/gui/dialogs/alarm-page.c:368 calendar/gui/dialogs/alarm-page.c:404
+#: calendar/gui/e-meeting-model.c:226 calendar/gui/e-meeting-model.c:261
+#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:674
+#: calendar/gui/e-meeting-model.c:690
#: camel/providers/smtp/camel-smtp-transport.c:224
#: widgets/misc/e-charset-picker.c:58 widgets/misc/e-charset-picker.c:438
msgid "Unknown"
msgstr "Неизвестное"
-#: calendar/gui/dialogs/alarm-page.c:409
+#: calendar/gui/dialogs/alarm-page.c:380
msgid "before start of appointment"
msgstr "до начала встречи"
-#: calendar/gui/dialogs/alarm-page.c:412
+#: calendar/gui/dialogs/alarm-page.c:383
msgid "after start of appointment"
msgstr "после начала встречи"
-#: calendar/gui/dialogs/alarm-page.c:422
+#: calendar/gui/dialogs/alarm-page.c:393
msgid "before end of appointment"
msgstr "перед окончанием встречи"
-#: calendar/gui/dialogs/alarm-page.c:425
+#: calendar/gui/dialogs/alarm-page.c:396
msgid "after end of appointment"
msgstr "после окончания встречи"
@@ -3406,42 +3568,43 @@ msgstr "Дата/Время:"
msgid "Reminders"
msgstr "Напоминания"
-#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/alarm-page.glade.h:7
#: calendar/gui/dialogs/recurrence-page.glade.h:8
#: calendar/gui/e-itip-control.glade.h:11
msgid "Summary:"
msgstr "Итог:"
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-page.glade.h:10
msgid "_Options..."
msgstr "Параметры..."
-#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:34
+#. Automatically generated. Do not edit.
+#: calendar/gui/dialogs/alarm-page.glade.h:11 filter/libfilter-i18n.h:2
msgid "after"
msgstr "после"
-#: calendar/gui/dialogs/alarm-page.glade.h:13 filter/libfilter-i18n.h:35
+#: calendar/gui/dialogs/alarm-page.glade.h:12 filter/libfilter-i18n.h:6
msgid "before"
msgstr "до"
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-page.glade.h:13
#: calendar/gui/dialogs/recurrence-page.glade.h:14
msgid "day(s)"
msgstr "день"
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-page.glade.h:14
msgid "end of appointment"
msgstr "завершение встречи"
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-page.glade.h:15
msgid "hour(s)"
msgstr "часы"
-#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:115
+#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:116
msgid "minute(s)"
msgstr "минуты"
-#: calendar/gui/dialogs/alarm-page.glade.h:18
+#: calendar/gui/dialogs/alarm-page.glade.h:17
msgid "start of appointment"
msgstr "начало встречи"
@@ -3494,7 +3657,7 @@ msgid "First day of wee_k:"
msgstr "Первый день недели:"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:969
+#: calendar/gui/dialogs/recurrence-page.c:955
msgid "Friday"
msgstr "Пятница"
@@ -3509,7 +3672,7 @@ msgid "Minutes"
msgstr "минуты"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:965
+#: calendar/gui/dialogs/recurrence-page.c:951
msgid "Monday"
msgstr "Понедельник"
@@ -3519,7 +3682,7 @@ msgid "O_verdue tasks:"
msgstr "Просроченные задания"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:970
+#: calendar/gui/dialogs/recurrence-page.c:956
msgid "Saturday"
msgstr "Суббота"
@@ -3544,7 +3707,7 @@ msgid "Su_n"
msgstr "Вск"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/recurrence-page.c:971
+#: calendar/gui/dialogs/recurrence-page.c:957
msgid "Sunday"
msgstr "Воскресенье"
@@ -3564,7 +3727,7 @@ msgid "Tas_ks due today:"
msgstr "Задания установленные на сегодня"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/recurrence-page.c:968
+#: calendar/gui/dialogs/recurrence-page.c:954
msgid "Thursday"
msgstr "Четверг"
@@ -3587,12 +3750,12 @@ msgid "Time format:"
msgstr "Формат времени:"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:966
+#: calendar/gui/dialogs/recurrence-page.c:952
msgid "Tuesday"
msgstr "Вторник"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/recurrence-page.c:967
+#: calendar/gui/dialogs/recurrence-page.c:953
msgid "Wednesday"
msgstr "Среда"
@@ -3735,57 +3898,57 @@ msgstr ""
msgid "%s You have made no changes, update the editor?"
msgstr ""
-#: calendar/gui/dialogs/comp-editor-util.c:159 calendar/gui/print.c:2116
+#: calendar/gui/dialogs/comp-editor-util.c:159 calendar/gui/print.c:2128
msgid " to "
msgstr ""
-#: calendar/gui/dialogs/comp-editor-util.c:163 calendar/gui/print.c:2120
+#: calendar/gui/dialogs/comp-editor-util.c:163 calendar/gui/print.c:2132
msgid " (Completed "
msgstr " (Выполнено "
-#: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2122
+#: calendar/gui/dialogs/comp-editor-util.c:165 calendar/gui/print.c:2134
msgid "Completed "
msgstr "Выполнено "
-#: calendar/gui/dialogs/comp-editor-util.c:170 calendar/gui/print.c:2127
+#: calendar/gui/dialogs/comp-editor-util.c:170 calendar/gui/print.c:2139
msgid " (Due "
msgstr ""
-#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2129
+#: calendar/gui/dialogs/comp-editor-util.c:172 calendar/gui/print.c:2141
#, fuzzy
msgid "Due "
msgstr "Условленная дата"
-#: calendar/gui/dialogs/comp-editor.c:462
+#: calendar/gui/dialogs/comp-editor.c:515
msgid "Edit Appointment"
msgstr "Правка встречи"
-#: calendar/gui/dialogs/comp-editor.c:467
+#: calendar/gui/dialogs/comp-editor.c:520
#, c-format
msgid "Appointment - %s"
msgstr "Встреча - %s"
-#: calendar/gui/dialogs/comp-editor.c:470
+#: calendar/gui/dialogs/comp-editor.c:523
#, c-format
msgid "Task - %s"
msgstr "Задание - %s"
-#: calendar/gui/dialogs/comp-editor.c:473
+#: calendar/gui/dialogs/comp-editor.c:526
#, c-format
msgid "Journal entry - %s"
msgstr "Журнальная запись - %s"
-#: calendar/gui/dialogs/comp-editor.c:487
+#: calendar/gui/dialogs/comp-editor.c:540
msgid "No summary"
msgstr "Нет итога"
-#: calendar/gui/dialogs/comp-editor.c:857 mail/mail-callbacks.c:1490
-#: mail/mail-display.c:99
+#: calendar/gui/dialogs/comp-editor.c:950 mail/mail-callbacks.c:1662
+#: mail/mail-display.c:100
msgid "Overwrite file?"
msgstr "Переписать файл?"
-#: calendar/gui/dialogs/comp-editor.c:861 mail/mail-callbacks.c:1496
-#: mail/mail-display.c:103
+#: calendar/gui/dialogs/comp-editor.c:954 mail/mail-callbacks.c:1668
+#: mail/mail-display.c:104
msgid ""
"A file by that name already exists.\n"
"Overwrite it?"
@@ -3793,53 +3956,53 @@ msgstr ""
"Файл с таким названием уже существует.\n"
"Переписать его?"
-#: calendar/gui/dialogs/comp-editor.c:924 ui/evolution-comp-editor.xml.h:13
+#: calendar/gui/dialogs/comp-editor.c:1017 ui/evolution-comp-editor.xml.h:13
#: widgets/misc/e-filter-bar.h:101
msgid "Save As..."
msgstr "Сохранить как..."
-#: calendar/gui/dialogs/comp-editor.c:1077
+#: calendar/gui/dialogs/comp-editor.c:1170
msgid "Unable to obtain current version!"
msgstr ""
-#: calendar/gui/dialogs/delete-comp.c:84
+#: calendar/gui/dialogs/delete-comp.c:90
#, c-format
msgid "Are you sure you want to delete the appointment `%s'?"
msgstr "Вы уверены что вы хотите удалить встречу \"%s\"?"
-#: calendar/gui/dialogs/delete-comp.c:87
+#: calendar/gui/dialogs/delete-comp.c:93
msgid "Are you sure you want to delete this untitled appointment?"
msgstr "Вы уверены что хотите удалить эту неозаглавленную встречу?"
-#: calendar/gui/dialogs/delete-comp.c:93
+#: calendar/gui/dialogs/delete-comp.c:99
#, c-format
msgid "Are you sure you want to delete the task `%s'?"
msgstr "Вы уверены что вы хотите удалить задание \"%s\"?"
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/delete-comp.c:102
msgid "Are you sure you want to delete this untitled task?"
msgstr "Вы уверены что хотите удалить это неозаглавленное задание?"
-#: calendar/gui/dialogs/delete-comp.c:102
+#: calendar/gui/dialogs/delete-comp.c:108
#, c-format
msgid "Are you sure you want to delete the journal entry `%s'?"
msgstr "Вы уверены что вы хотите удалить журнальную запись \"%s\"?"
-#: calendar/gui/dialogs/delete-comp.c:105
+#: calendar/gui/dialogs/delete-comp.c:111
msgid "Are you sure want to delete this untitled journal entry?"
msgstr "Вы уверены что хотите удалить эту неозаглавленную журнальную запись?"
-#: calendar/gui/dialogs/delete-comp.c:120
+#: calendar/gui/dialogs/delete-comp.c:126
#, c-format
msgid "Are you sure you want to delete %d appointments?"
msgstr "Вы уверены в том, что хотите удалить %d встреч?"
-#: calendar/gui/dialogs/delete-comp.c:125
+#: calendar/gui/dialogs/delete-comp.c:131
#, c-format
msgid "Are you sure you want to delete %d tasks?"
msgstr "Вы уверены в том, что хотите удалить %d заданий?"
-#: calendar/gui/dialogs/delete-comp.c:130
+#: calendar/gui/dialogs/delete-comp.c:136
#, c-format
msgid "Are you sure you want to delete %d journal entries?"
msgstr "Вы уверены в том, что хотите удалить %d журнальных записей?"
@@ -3859,20 +4022,26 @@ msgstr "Удалить..."
msgid "Enter Delegate"
msgstr "Удаленное"
-#: calendar/gui/dialogs/event-editor.c:156
+#: calendar/gui/dialogs/event-editor.c:181
msgid "Appointment"
msgstr "Встреча"
-#: calendar/gui/dialogs/event-editor.c:161
+#: calendar/gui/dialogs/event-editor.c:186
msgid "Reminder"
msgstr "Напоминание"
-#: calendar/gui/dialogs/event-editor.c:166
+#: calendar/gui/dialogs/event-editor.c:191
msgid "Recurrence"
msgstr "Повторение"
-#: calendar/gui/dialogs/event-editor.c:171
-#: calendar/gui/dialogs/event-editor.c:273
+#: calendar/gui/dialogs/event-editor.c:198
+#: calendar/gui/dialogs/event-editor.c:345
+#, fuzzy
+msgid "Scheduling"
+msgstr "Вставить встречу в расписание"
+
+#: calendar/gui/dialogs/event-editor.c:203
+#: calendar/gui/dialogs/event-editor.c:348
msgid "Meeting"
msgstr "Совещание"
@@ -3914,7 +4083,7 @@ msgid "Pu_blic"
msgstr "Общее"
#: calendar/gui/dialogs/event-page.glade.h:10
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
msgid "Show Time As"
msgstr "Показать время как"
@@ -3931,179 +4100,106 @@ msgstr "Время окончания:"
msgid "_Start time:"
msgstr "Время начала:"
-#: calendar/gui/dialogs/meeting-page.c:576
-#: calendar/gui/dialogs/meeting-page.c:593
-#: calendar/gui/dialogs/meeting-page.c:1183
-#: calendar/gui/dialogs/meeting-page.c:1251
-msgid "Individual"
-msgstr "Индивидуальное"
-
-#: calendar/gui/dialogs/meeting-page.c:578
-#: calendar/gui/dialogs/meeting-page.c:595
-#: calendar/gui/dialogs/meeting-page.c:1252
-msgid "Group"
-msgstr "Группа"
-
-#: calendar/gui/dialogs/meeting-page.c:580
-#: calendar/gui/dialogs/meeting-page.c:597
-#: calendar/gui/dialogs/meeting-page.c:1253
-msgid "Resource"
-msgstr "Источник"
-
-#: calendar/gui/dialogs/meeting-page.c:582
-#: calendar/gui/dialogs/meeting-page.c:599
-#: calendar/gui/dialogs/meeting-page.c:1254
-msgid "Room"
-msgstr "Комната"
-
-#: calendar/gui/dialogs/meeting-page.c:611
-#: calendar/gui/dialogs/meeting-page.c:628
-#: calendar/gui/dialogs/meeting-page.c:1267
-msgid "Chair"
-msgstr "Председатель"
-
-#: calendar/gui/dialogs/meeting-page.c:613
-#: calendar/gui/dialogs/meeting-page.c:630
-#: calendar/gui/dialogs/meeting-page.c:1185
-#: calendar/gui/dialogs/meeting-page.c:1268
-msgid "Required Participant"
-msgstr "Требуемые участники"
-
-#: calendar/gui/dialogs/meeting-page.c:615
-#: calendar/gui/dialogs/meeting-page.c:632
-#: calendar/gui/dialogs/meeting-page.c:1269
-msgid "Optional Participant"
-msgstr "Дополнительные участники"
-
-#: calendar/gui/dialogs/meeting-page.c:617
-#: calendar/gui/dialogs/meeting-page.c:634
-#: calendar/gui/dialogs/meeting-page.c:1270
-msgid "Non-Participant"
-msgstr ""
-
-#: calendar/gui/dialogs/meeting-page.c:663
-#: calendar/gui/dialogs/meeting-page.c:686
-#: calendar/gui/dialogs/meeting-page.c:1193
-#: calendar/gui/dialogs/meeting-page.c:1296
-#, fuzzy
-msgid "Needs Action"
-msgstr "Добавить действие"
-
-#: calendar/gui/dialogs/meeting-page.c:665
-#: calendar/gui/dialogs/meeting-page.c:688
-#: calendar/gui/dialogs/meeting-page.c:1297
-msgid "Accepted"
-msgstr "Принято"
-
-#: calendar/gui/dialogs/meeting-page.c:667
-#: calendar/gui/dialogs/meeting-page.c:690
-#: calendar/gui/dialogs/meeting-page.c:1298
-msgid "Declined"
-msgstr "Отклонено"
-
-#: calendar/gui/dialogs/meeting-page.c:669
-#: calendar/gui/dialogs/meeting-page.c:692
-#: calendar/gui/dialogs/meeting-page.c:1299
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
-msgid "Tentative"
-msgstr "Экспериментальный"
-
-#: calendar/gui/dialogs/meeting-page.c:671
-#: calendar/gui/dialogs/meeting-page.c:694
-#: calendar/gui/dialogs/meeting-page.c:1300
-#, fuzzy
-msgid "Delegated"
-msgstr "Удаленное"
-
-#: calendar/gui/dialogs/meeting-page.c:675
-#: calendar/gui/dialogs/meeting-page.c:698
-msgid "In Process"
-msgstr "В процессе"
-
-#: calendar/gui/dialogs/meeting-page.c:737
+#: calendar/gui/dialogs/meeting-page.c:504
msgid "That person is already attending the meeting!"
msgstr "Этот человек уже участвует в совещании!"
-#: calendar/gui/dialogs/meeting-page.c:788
-#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:548
+#: calendar/gui/dialogs/meeting-page.c:583
#, fuzzy
msgid "Chair Persons"
msgstr "Телефон в машине"
-#: calendar/gui/dialogs/meeting-page.c:790
-#: calendar/gui/dialogs/meeting-page.c:842
-#: calendar/gui/dialogs/meeting-page.c:962
+#: calendar/gui/dialogs/meeting-page.c:550
+#: calendar/gui/dialogs/meeting-page.c:583
+#: calendar/gui/dialogs/meeting-page.c:703
msgid "Required Participants"
msgstr "Требуемые участники"
-#: calendar/gui/dialogs/meeting-page.c:792
-#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:552
+#: calendar/gui/dialogs/meeting-page.c:583
msgid "Optional Participants"
msgstr "Дополнительные участники"
-#: calendar/gui/dialogs/meeting-page.c:794
-#: calendar/gui/dialogs/meeting-page.c:842
+#: calendar/gui/dialogs/meeting-page.c:554
+#: calendar/gui/dialogs/meeting-page.c:583
#, fuzzy
msgid "Non-Participants"
msgstr "Дополнительные участники"
-#: calendar/gui/dialogs/meeting-page.c:920
+#: calendar/gui/dialogs/meeting-page.c:661
#, fuzzy
msgid "Sent By:"
msgstr "Отправленное"
-#: calendar/gui/dialogs/meeting-page.c:1471
+#: calendar/gui/dialogs/meeting-page.c:829
#, fuzzy
msgid "_Delegate To..."
msgstr "Удалить..."
#: calendar/gui/dialogs/meeting-page.etspec.h:1
+#: calendar/gui/e-meeting-time-sel.etspec.h:1
#, fuzzy
msgid "Attendee"
msgstr "Все сопровождение"
#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#: calendar/gui/e-meeting-time-sel.etspec.h:2
+#, fuzzy
+msgid "Click here to add an attendee"
+msgstr "* Щелкните здесь для добавления контакта *"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
#, fuzzy
msgid "Common Name"
msgstr "Название счёта"
-#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
#, fuzzy
msgid "Delegated From"
msgstr "Удаленное"
-#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
#, fuzzy
msgid "Delegated To"
msgstr "Удаленное"
-#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
#, fuzzy
msgid "Language"
msgstr "Управляющий"
-#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
#, fuzzy
msgid "Member"
msgstr "Члены"
-#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-meeting-time-sel.etspec.h:8
msgid "RSVP"
msgstr ""
-#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
#, fuzzy
msgid "Role"
msgstr "Правила"
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-calendar-table.etspec.h:14 filter/libfilter-i18n.h:31
+#: calendar/gui/dialogs/meeting-page.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:49
#: mail/message-list.etspec.h:8
msgid "Status"
msgstr "Состояние"
-#: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:17 mail/mail-config.glade.h:85
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11 mail/mail-config.glade.h:85
#: shell/glade/e-active-connection-dialog.glade.h:5
msgid "Type"
msgstr "Тип"
@@ -4125,34 +4221,34 @@ msgstr "Пригласить других"
msgid "_Other Organizer"
msgstr "Другой организатор"
-#: calendar/gui/dialogs/recurrence-page.c:436 calendar/gui/print.c:1839
-#: calendar/gui/print.c:1841 calendar/gui/print.c:1842
+#: calendar/gui/dialogs/recurrence-page.c:422 calendar/gui/print.c:1851
+#: calendar/gui/print.c:1853 calendar/gui/print.c:1854
msgid "%a %b %d %Y"
msgstr "%a %b %d %Y"
-#: calendar/gui/dialogs/recurrence-page.c:584
+#: calendar/gui/dialogs/recurrence-page.c:570
msgid "This appointment contains recurrences that Evolution cannot edit."
msgstr ""
"Эта встреча имеет правила повторения, которые не могут быть отредактированы "
"в Evolution."
-#: calendar/gui/dialogs/recurrence-page.c:938
+#: calendar/gui/dialogs/recurrence-page.c:924
msgid "on"
msgstr "в"
-#: calendar/gui/dialogs/recurrence-page.c:964 filter/filter-datespec.c:83
+#: calendar/gui/dialogs/recurrence-page.c:950 filter/filter-datespec.c:83
msgid "day"
msgstr "день"
-#: calendar/gui/dialogs/recurrence-page.c:1094
+#: calendar/gui/dialogs/recurrence-page.c:1080
msgid "on the"
msgstr ""
-#: calendar/gui/dialogs/recurrence-page.c:1102
+#: calendar/gui/dialogs/recurrence-page.c:1088
msgid "th"
msgstr "ый"
-#: calendar/gui/dialogs/recurrence-page.c:1275
+#: calendar/gui/dialogs/recurrence-page.c:1261
msgid "occurrences"
msgstr "случаи"
@@ -4247,7 +4343,7 @@ msgid "Progress"
msgstr "Продвижение"
#: calendar/gui/dialogs/task-details-page.glade.h:12
-#: my-evolution/e-summary-preferences.c:897
+#: my-evolution/e-summary-preferences.c:910
msgid "URL:"
msgstr "URL:"
@@ -4259,8 +4355,8 @@ msgstr "Приоритет:"
msgid "_Status:"
msgstr "Состояние:"
-#: calendar/gui/dialogs/task-editor.c:161
-#: calendar/gui/dialogs/task-editor.c:239
+#: calendar/gui/dialogs/task-editor.c:184
+#: calendar/gui/dialogs/task-editor.c:285
#, fuzzy
msgid "Assignment"
msgstr "Связанное"
@@ -4338,29 +4434,30 @@ msgstr "90%"
msgid "100%"
msgstr "100%"
-#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3421
-#: calendar/gui/e-week-view.c:3264 mail/folder-browser.c:1287
+#: calendar/gui/e-calendar-table.c:850 calendar/gui/e-day-view.c:3441
+#: calendar/gui/e-week-view.c:3288 mail/folder-browser.c:1336
+#: shell/e-shortcuts-view.c:385
msgid "_Open"
msgstr "Открыть"
-#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3430
-#: calendar/gui/e-week-view.c:3273 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:854 calendar/gui/e-day-view.c:3450
+#: calendar/gui/e-week-view.c:3297 ui/evolution-addressbook.xml.h:1
#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
msgid "C_ut"
msgstr "Вырезать"
-#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3432
-#: calendar/gui/e-week-view.c:3275 ui/evolution-addressbook.xml.h:33
+#: calendar/gui/e-calendar-table.c:856 calendar/gui/e-day-view.c:3452
+#: calendar/gui/e-week-view.c:3299 ui/evolution-addressbook.xml.h:33
#: ui/evolution-calendar.xml.h:37 ui/evolution-mail-list.xml.h:24
#: ui/evolution-tasks.xml.h:14
msgid "_Copy"
msgstr "Скопировать"
-#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3407
-#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3251
-#: calendar/gui/e-week-view.c:3277 ui/evolution-addressbook.xml.h:35
-#: ui/evolution-calendar.xml.h:39 ui/evolution-mail-list.xml.h:28
-#: ui/evolution-tasks.xml.h:16
+#: calendar/gui/e-calendar-table.c:858 calendar/gui/e-day-view.c:3427
+#: calendar/gui/e-day-view.c:3454 calendar/gui/e-week-view.c:3275
+#: calendar/gui/e-week-view.c:3301 ui/evolution-addressbook.xml.h:36
+#: ui/evolution-calendar.xml.h:40 ui/evolution-mail-list.xml.h:29
+#: ui/evolution-tasks.xml.h:17
msgid "_Paste"
msgstr "Вставить"
@@ -4381,6 +4478,7 @@ msgid "_Delete Selected Tasks"
msgstr "Удалить выбранные задания"
#: calendar/gui/e-calendar-table.c:1130
+#: calendar/gui/e-calendar-table.etspec.h:6
#, fuzzy
msgid "Click to add a task"
msgstr "Щелкните здесь для добавления задачи"
@@ -4389,62 +4487,55 @@ msgstr "Щелкните здесь для добавления задачи"
msgid "Alarms"
msgstr ""
-#: calendar/gui/e-calendar-table.etspec.h:4
-#, fuzzy
-msgid "Categories"
-msgstr ""
-"\n"
-"Категории: "
-
-#: calendar/gui/e-calendar-table.etspec.h:6 camel/camel-filter-driver.c:699
-#: camel/camel-filter-driver.c:815
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:702
+#: camel/camel-filter-driver.c:819
msgid "Complete"
msgstr "Выполнено"
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
#, fuzzy
msgid "Completion Date"
msgstr "Выполнено"
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
#, fuzzy
msgid "Due Date"
msgstr "Условленная дата:"
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-calendar-table.etspec.h:10
#, fuzzy
msgid "End Date"
msgstr "Дата"
-#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-calendar-table.etspec.h:11
msgid "Geographical Position"
msgstr ""
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
#, fuzzy
msgid "Priority"
msgstr "Приоритет:"
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
#, fuzzy
msgid "Start Date"
msgstr "Дата начала:"
#. FIXME: Inbox shortcut should point to something else for
#. people who won't care about using /Local Folders/Inbox
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: my-evolution/component-factory.c:30 shell/e-shortcuts.c:1044
-#: shell/e-storage-set-view.c:1466 shell/e-summary-storage.c:78
+#: calendar/gui/e-calendar-table.etspec.h:16
+#: my-evolution/component-factory.c:30 shell/e-shortcuts.c:1050
+#: shell/e-storage-set-view.c:1424 shell/e-summary-storage.c:80
#, fuzzy
msgid "Summary"
msgstr "Итог:"
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
#, fuzzy
msgid "Task sort"
msgstr "Список заданий"
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:19
#, fuzzy
msgid "URL"
msgstr "URL:"
@@ -4456,253 +4547,308 @@ msgstr ""
#. strftime format %A = full weekday name, %d = day of month,
#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1354
-#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1452
+#: calendar/gui/e-day-view-top-item.c:285 calendar/gui/e-day-view.c:1374
+#: calendar/gui/e-week-view-main-item.c:325 calendar/gui/print.c:1458
msgid "%A %d %B"
msgstr "%A %d %B"
#. strftime format %d = day of month, %b = abbreviated month name.
#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1381
+#: calendar/gui/e-day-view-top-item.c:293 calendar/gui/e-day-view.c:1401
#: calendar/gui/e-week-view-main-item.c:348
msgid "%d %b"
msgstr "%d %b"
#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:588 calendar/gui/e-week-view.c:324
-#: calendar/gui/print.c:759
+#: calendar/gui/e-day-view.c:608 calendar/gui/e-week-view.c:344
+#: calendar/gui/print.c:765
msgid "am"
msgstr "д.п."
#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:591 calendar/gui/e-week-view.c:327
-#: calendar/gui/print.c:761
+#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:347
+#: calendar/gui/print.c:767
msgid "pm"
msgstr "п.п."
-#: calendar/gui/e-day-view.c:3402 calendar/gui/e-week-view.c:3246
+#: calendar/gui/e-day-view.c:3422 calendar/gui/e-week-view.c:3270
msgid "New All Day _Event"
msgstr "Новое ежедневное событие"
-#: calendar/gui/e-day-view.c:3412 calendar/gui/e-week-view.c:3256
+#: calendar/gui/e-day-view.c:3432 calendar/gui/e-week-view.c:3280
#: ui/evolution-calendar.xml.h:17
msgid "Go to _Today"
msgstr "Перейти к сегодняшнему дню"
-#: calendar/gui/e-day-view.c:3414 calendar/gui/e-week-view.c:3258
+#: calendar/gui/e-day-view.c:3434 calendar/gui/e-week-view.c:3282
msgid "_Go to Date..."
msgstr "Перейти к дате..."
-#: calendar/gui/e-day-view.c:3423 calendar/gui/e-week-view.c:3266
+#: calendar/gui/e-day-view.c:3443 calendar/gui/e-week-view.c:3290
msgid "_Delete this Appointment"
msgstr "Удалить эту встречу"
-#: calendar/gui/e-day-view.c:3442 calendar/gui/e-week-view.c:3291
+#: calendar/gui/e-day-view.c:3462 calendar/gui/e-week-view.c:3315
msgid "Make this Occurrence _Movable"
msgstr "Сделать эту вхождение перемещаемым"
-#: calendar/gui/e-day-view.c:3444 calendar/gui/e-week-view.c:3293
+#: calendar/gui/e-day-view.c:3464 calendar/gui/e-week-view.c:3317
msgid "Delete this _Occurrence"
msgstr "Удалить это вхождение"
-#: calendar/gui/e-day-view.c:3446 calendar/gui/e-week-view.c:3295
+#: calendar/gui/e-day-view.c:3466 calendar/gui/e-week-view.c:3319
msgid "Delete _All Occurrences"
msgstr "Удалить все вхождения"
-#: calendar/gui/e-itip-control.c:617
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:649
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:664
+#, c-format
+msgid "<b>Summary:</b> %s<br><br>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:664
+msgid "<i>None</i>"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:674
+#, fuzzy, c-format
+msgid "<b>Description:</b> %s"
+msgstr "Описание:"
+
+#: calendar/gui/e-itip-control.c:710
#, c-format
msgid "<b>%s</b> has published meeting information."
msgstr ""
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:711
#, fuzzy
msgid "Meeting Information"
msgstr "Дополнительная информация"
-#: calendar/gui/e-itip-control.c:622
+#: calendar/gui/e-itip-control.c:715
#, c-format
msgid "<b>%s</b> requests your presence at a meeting."
msgstr ""
-#: calendar/gui/e-itip-control.c:623
+#: calendar/gui/e-itip-control.c:716
#, fuzzy
msgid "Meeting Proposal"
msgstr "Совещание"
-#: calendar/gui/e-itip-control.c:627
+#: calendar/gui/e-itip-control.c:720
#, c-format
msgid "<b>%s</b> wishes to add to an existing meeting."
msgstr ""
-#: calendar/gui/e-itip-control.c:628
+#: calendar/gui/e-itip-control.c:721
#, fuzzy
msgid "Meeting Update"
msgstr "Время завершения собрания:"
-#: calendar/gui/e-itip-control.c:632
+#: calendar/gui/e-itip-control.c:725
#, c-format
msgid "<b>%s</b> wishes to receive the latest meeting information."
msgstr ""
-#: calendar/gui/e-itip-control.c:633
+#: calendar/gui/e-itip-control.c:726
msgid "Meeting Update Request"
msgstr ""
-#: calendar/gui/e-itip-control.c:637
+#: calendar/gui/e-itip-control.c:730
#, fuzzy, c-format
-msgid "<b>%s</b> has replyed to a meeting request."
+msgid "<b>%s</b> has replied to a meeting request."
msgstr "Это запрос совещания."
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:731
#, fuzzy
msgid "Meeting Reply"
msgstr "Совещание"
-#: calendar/gui/e-itip-control.c:642
+#: calendar/gui/e-itip-control.c:735
#, c-format
msgid "<b>%s</b> has cancelled a meeting."
msgstr ""
-#: calendar/gui/e-itip-control.c:643
+#: calendar/gui/e-itip-control.c:736
#, fuzzy
msgid "Meeting Cancellation"
msgstr "Выбрать действие"
-#: calendar/gui/e-itip-control.c:647 calendar/gui/e-itip-control.c:695
-#: calendar/gui/e-itip-control.c:728
+#: calendar/gui/e-itip-control.c:740 calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:821
#, c-format
msgid "<b>%s</b> has sent an unintelligible message."
msgstr ""
-#: calendar/gui/e-itip-control.c:648
+#: calendar/gui/e-itip-control.c:741
#, fuzzy
msgid "Bad Meeting Message"
msgstr "Поиск в сообщении"
-#: calendar/gui/e-itip-control.c:665
+#: calendar/gui/e-itip-control.c:758
#, c-format
msgid "<b>%s</b> has published task information."
msgstr ""
-#: calendar/gui/e-itip-control.c:666
+#: calendar/gui/e-itip-control.c:759
#, fuzzy
msgid "Task Information"
msgstr "Информация"
-#: calendar/gui/e-itip-control.c:670
+#: calendar/gui/e-itip-control.c:763
#, c-format
msgid "<b>%s</b> requests you perform a task."
msgstr ""
-#: calendar/gui/e-itip-control.c:671
+#: calendar/gui/e-itip-control.c:764
msgid "Task Proposal"
msgstr ""
-#: calendar/gui/e-itip-control.c:675
+#: calendar/gui/e-itip-control.c:768
#, c-format
msgid "<b>%s</b> wishes to add to an existing task."
msgstr ""
-#: calendar/gui/e-itip-control.c:676
+#: calendar/gui/e-itip-control.c:769
#, fuzzy
msgid "Task Update"
msgstr "было после"
-#: calendar/gui/e-itip-control.c:680
+#: calendar/gui/e-itip-control.c:773
#, c-format
msgid "<b>%s</b> wishes to receive the latest task information."
msgstr ""
-#: calendar/gui/e-itip-control.c:681
+#: calendar/gui/e-itip-control.c:774
msgid "Task Update Request"
msgstr ""
-#: calendar/gui/e-itip-control.c:685
-#, c-format
-msgid "<b>%s</b> has replyed to a task assignment."
-msgstr ""
+#: calendar/gui/e-itip-control.c:778
+#, fuzzy, c-format
+msgid "<b>%s</b> has replied to a task assignment."
+msgstr "Это запрос совещания."
-#: calendar/gui/e-itip-control.c:686
+#: calendar/gui/e-itip-control.c:779
#, fuzzy
msgid "Task Reply"
msgstr "Ответить"
-#: calendar/gui/e-itip-control.c:690
+#: calendar/gui/e-itip-control.c:783
#, c-format
msgid "<b>%s</b> has cancelled a task."
msgstr ""
-#: calendar/gui/e-itip-control.c:691
+#: calendar/gui/e-itip-control.c:784
#, fuzzy
msgid "Task Cancellation"
msgstr "Отменить операцию"
-#: calendar/gui/e-itip-control.c:696
+#: calendar/gui/e-itip-control.c:789
#, fuzzy
msgid "Bad Task Message"
msgstr "Сообщение календаря"
-#: calendar/gui/e-itip-control.c:713
+#: calendar/gui/e-itip-control.c:806
#, fuzzy, c-format
msgid "<b>%s</b> has published free/busy information."
msgstr "Необходимая информация"
-#: calendar/gui/e-itip-control.c:714
+#: calendar/gui/e-itip-control.c:807
#, fuzzy
msgid "Free/Busy Information"
msgstr "Необходимая информация"
-#: calendar/gui/e-itip-control.c:718
+#: calendar/gui/e-itip-control.c:811
#, c-format
msgid "<b>%s</b> requests your free/busy information."
msgstr ""
-#: calendar/gui/e-itip-control.c:719
+#: calendar/gui/e-itip-control.c:812
msgid "Free/Busy Request"
msgstr ""
-#: calendar/gui/e-itip-control.c:723
-#, c-format
-msgid "<b>%s</b> has replyed to a free/busy request."
-msgstr ""
+#: calendar/gui/e-itip-control.c:816
+#, fuzzy, c-format
+msgid "<b>%s</b> has replied to a free/busy request."
+msgstr "Это запрос совещания."
-#: calendar/gui/e-itip-control.c:724
+#: calendar/gui/e-itip-control.c:817
msgid "Free/Busy Reply"
msgstr ""
-#: calendar/gui/e-itip-control.c:729
+#: calendar/gui/e-itip-control.c:822
#, fuzzy
msgid "Bad Free/Busy Message"
msgstr "Предыдущее сообщение"
-#: calendar/gui/e-itip-control.c:940
-msgid "I couldn't update your calendar file!\n"
-msgstr "Не удалось обновить ваш файл календаря!\n"
+#: calendar/gui/e-itip-control.c:889
+#, fuzzy
+msgid "The message does not appear to be properly formed"
+msgstr "Видимо папка невостановимо испорчена."
-#: calendar/gui/e-itip-control.c:942
+#: calendar/gui/e-itip-control.c:908
+msgid "The message contains only unsupported requests."
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:936 calendar/gui/e-itip-control.c:942
+msgid "The attachment does not contain a valid calendar message"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1061
+#, fuzzy
+msgid "Calendar file could not be updated!\n"
+msgstr "Курсор не может быть загружен\n"
+
+#: calendar/gui/e-itip-control.c:1063
#, fuzzy
msgid "Update complete\n"
msgstr "Дата выполнения:"
-#: calendar/gui/e-itip-control.c:967
+#: calendar/gui/e-itip-control.c:1107
+msgid "Attendee status could not be updated because of an invalid status!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1115
+msgid "Attendee status ould not be updated!\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1117
+msgid "Attendee status updated\n"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1119
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:1147
#, fuzzy
msgid "I couldn't remove the item from your calendar file!\n"
msgstr "Не удалось открыть ваш файл календаря!\n"
-#: calendar/gui/e-itip-control.c:969
+#: calendar/gui/e-itip-control.c:1149
#, fuzzy
msgid "Removal Complete"
msgstr "% Выполнения:"
-#: calendar/gui/e-itip-control.c:1001 calendar/gui/e-itip-control.c:1029
+#: calendar/gui/e-itip-control.c:1181 calendar/gui/e-itip-control.c:1216
#, fuzzy
msgid "Item sent!\n"
msgstr "Дата отправки"
-#: calendar/gui/e-itip-control.c:1003 calendar/gui/e-itip-control.c:1031
+#: calendar/gui/e-itip-control.c:1183 calendar/gui/e-itip-control.c:1220
msgid "The item could not be sent!\n"
msgstr ""
+#: calendar/gui/e-itip-control.c:1380
+msgid "Unable to find any of your identities in the attendees list!\n"
+msgstr ""
+
#: calendar/gui/e-itip-control.glade.h:2
#, no-c-format
msgid "%P %%"
@@ -4740,6 +4886,163 @@ msgstr "дата-завершения"
msgid "date-start"
msgstr "дата-начала"
+#: calendar/gui/e-meeting-model.c:201 calendar/gui/e-meeting-model.c:218
+#: calendar/gui/e-meeting-model.c:502 calendar/gui/e-meeting-model.c:670
+msgid "Individual"
+msgstr "Индивидуальное"
+
+#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
+#: calendar/gui/e-meeting-model.c:671
+msgid "Group"
+msgstr "Группа"
+
+#: calendar/gui/e-meeting-model.c:205 calendar/gui/e-meeting-model.c:222
+#: calendar/gui/e-meeting-model.c:672
+msgid "Resource"
+msgstr "Источник"
+
+#: calendar/gui/e-meeting-model.c:207 calendar/gui/e-meeting-model.c:224
+#: calendar/gui/e-meeting-model.c:673
+msgid "Room"
+msgstr "Комната"
+
+#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
+#: calendar/gui/e-meeting-model.c:686
+msgid "Chair"
+msgstr "Председатель"
+
+#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
+#: calendar/gui/e-meeting-model.c:504 calendar/gui/e-meeting-model.c:687
+msgid "Required Participant"
+msgstr "Требуемые участники"
+
+#: calendar/gui/e-meeting-model.c:240 calendar/gui/e-meeting-model.c:257
+#: calendar/gui/e-meeting-model.c:688
+msgid "Optional Participant"
+msgstr "Дополнительные участники"
+
+#: calendar/gui/e-meeting-model.c:242 calendar/gui/e-meeting-model.c:259
+#: calendar/gui/e-meeting-model.c:689
+msgid "Non-Participant"
+msgstr ""
+
+#: calendar/gui/e-meeting-model.c:288 calendar/gui/e-meeting-model.c:311
+#: calendar/gui/e-meeting-model.c:512 calendar/gui/e-meeting-model.c:715
+#, fuzzy
+msgid "Needs Action"
+msgstr "Добавить действие"
+
+#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
+#: calendar/gui/e-meeting-model.c:716
+msgid "Accepted"
+msgstr "Принято"
+
+#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
+#: calendar/gui/e-meeting-model.c:717
+msgid "Declined"
+msgstr "Отклонено"
+
+#: calendar/gui/e-meeting-model.c:294 calendar/gui/e-meeting-model.c:317
+#: calendar/gui/e-meeting-model.c:718 calendar/gui/e-meeting-time-sel.c:392
+msgid "Tentative"
+msgstr "Экспериментальный"
+
+#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
+#: calendar/gui/e-meeting-model.c:719
+#, fuzzy
+msgid "Delegated"
+msgstr "Удаленное"
+
+#: calendar/gui/e-meeting-model.c:300 calendar/gui/e-meeting-model.c:323
+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:472
+#: calendar/gui/e-meeting-time-sel.c:1936
+msgid "%A, %B %d, %Y"
+msgstr "%A, %B %d, %Y"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:476
+#: calendar/gui/e-meeting-time-sel.c:1964 e-util/e-time-utils.c:186
+#: e-util/e-time-utils.c:345
+msgid "%a %m/%d/%Y"
+msgstr "%a %m/%d/%Y"
+
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:480 e-util/e-time-utils.c:221
+#: e-util/e-time-utils.c:276 widgets/misc/e-dateedit.c:1552
+msgid "%m/%d/%Y"
+msgstr "%m/%d/%Y"
+
+#: calendar/gui/e-meeting-time-sel.c:394
+msgid "Out of Office"
+msgstr "Вне офиса"
+
+#: calendar/gui/e-meeting-time-sel.c:395
+msgid "No Information"
+msgstr "Нет информации"
+
+#: calendar/gui/e-meeting-time-sel.c:411
+msgid "_Invite Others..."
+msgstr "Пригласить других..."
+
+#: calendar/gui/e-meeting-time-sel.c:431
+msgid "_Options"
+msgstr "Параметры"
+
+#: calendar/gui/e-meeting-time-sel.c:448
+msgid "Show _Only Working Hours"
+msgstr "Показывать только рабочие часы"
+
+#: calendar/gui/e-meeting-time-sel.c:461
+msgid "Show _Zoomed Out"
+msgstr "Показывать уменьшенные"
+
+#: calendar/gui/e-meeting-time-sel.c:479
+msgid "_Update Free/Busy"
+msgstr "Обновить Свободен/Занят"
+
+#: calendar/gui/e-meeting-time-sel.c:497
+msgid "_<<"
+msgstr "<<"
+
+#: calendar/gui/e-meeting-time-sel.c:514
+msgid "_Autopick"
+msgstr "Автовыбор"
+
+#: calendar/gui/e-meeting-time-sel.c:528
+msgid ">_>"
+msgstr ">>"
+
+#: calendar/gui/e-meeting-time-sel.c:545
+msgid "_All People and Resources"
+msgstr "Все люди и ресурсы"
+
+#: calendar/gui/e-meeting-time-sel.c:558
+msgid "All _People and One Resource"
+msgstr "Все люди и один ресурс"
+
+#: calendar/gui/e-meeting-time-sel.c:571
+msgid "_Required People"
+msgstr "Требуемые люди"
+
+#: calendar/gui/e-meeting-time-sel.c:584
+msgid "Required People and _One Resource"
+msgstr "Требуемые люди и один ресурс"
+
+#: calendar/gui/e-meeting-time-sel.c:607
+msgid "Meeting _start time:"
+msgstr "Время начала собрания:"
+
+#: calendar/gui/e-meeting-time-sel.c:626
+msgid "Meeting _end time:"
+msgstr "Время завершения собрания:"
+
#: calendar/gui/e-tasks.c:349
#, c-format
msgid "Could not load the tasks in `%s'"
@@ -4750,16 +5053,16 @@ msgstr "Невозможно загрузить задание в \"%s\""
msgid "The method required to load `%s' is not supported"
msgstr "Метод необходимый для загрузки \"%s\" не поддерживается"
-#: calendar/gui/e-week-view.c:3244 calendar/gui/e-week-view.c:3282
+#: calendar/gui/e-week-view.c:3268 calendar/gui/e-week-view.c:3306
msgid "New _Appointment..."
msgstr "Новая встреча..."
-#: calendar/gui/gnome-cal.c:1260
+#: calendar/gui/gnome-cal.c:1318
#, c-format
msgid "Could not open the folder in `%s'"
msgstr "Невозможно открыть папку \"%s\""
-#: calendar/gui/gnome-cal.c:1271
+#: calendar/gui/gnome-cal.c:1329
#, c-format
msgid "The method required to open `%s' is not supported"
msgstr "Метод необходимый для открытия \"%s\" не поддерживается"
@@ -4820,205 +5123,210 @@ msgstr "Октябрь"
msgid "September"
msgstr "Сентябрь"
-#: calendar/gui/itip-utils.c:253
+#: calendar/gui/itip-utils.c:274
msgid "An organizer must be set."
msgstr ""
-#: calendar/gui/print.c:422
+#: calendar/gui/main.c:92
+#, fuzzy
+msgid "Could not create the component editor factory"
+msgstr "Не удалось создать временный каталог: %s"
+
+#: calendar/gui/print.c:423
msgid "1st"
msgstr "1-ый"
-#: calendar/gui/print.c:422
+#: calendar/gui/print.c:423
msgid "2nd"
msgstr "2-ой"
-#: calendar/gui/print.c:422
+#: calendar/gui/print.c:423
msgid "3rd"
msgstr "3-ий"
-#: calendar/gui/print.c:422
+#: calendar/gui/print.c:423
msgid "4th"
msgstr "4-ый"
-#: calendar/gui/print.c:422
+#: calendar/gui/print.c:423
msgid "5th"
msgstr "5-ый"
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:424
msgid "6th"
msgstr "6-ой"
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:424
msgid "7th"
msgstr "7-ой"
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:424
msgid "8th"
msgstr "8-ой"
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:424
msgid "9th"
msgstr "9-ый"
-#: calendar/gui/print.c:423
+#: calendar/gui/print.c:424
msgid "10th"
msgstr "10-ый"
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:425
msgid "11th"
msgstr "11-ый"
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:425
msgid "12th"
msgstr "12-ый"
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:425
msgid "13th"
msgstr "13-ый"
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:425
msgid "14th"
msgstr "14-ый"
-#: calendar/gui/print.c:424
+#: calendar/gui/print.c:425
msgid "15th"
msgstr "15-ый"
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:426
msgid "16th"
msgstr "16-ый"
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:426
msgid "17th"
msgstr "17-ый"
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:426
msgid "18th"
msgstr "18-ый"
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:426
msgid "19th"
msgstr "19-ый"
-#: calendar/gui/print.c:425
+#: calendar/gui/print.c:426
msgid "20th"
msgstr "20-ый"
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:427
msgid "21st"
msgstr "21-ый"
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:427
msgid "22nd"
msgstr "22-ой"
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:427
msgid "23rd"
msgstr "23-ий"
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:427
msgid "24th"
msgstr "24-ый"
-#: calendar/gui/print.c:426
+#: calendar/gui/print.c:427
msgid "25th"
msgstr "25-ый"
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:428
msgid "26th"
msgstr "26-ой"
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:428
msgid "27th"
msgstr "27-ой"
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:428
msgid "28th"
msgstr "28-ой"
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:428
msgid "29th"
msgstr "29-ый"
-#: calendar/gui/print.c:427
+#: calendar/gui/print.c:428
msgid "30th"
msgstr "30-ый"
-#: calendar/gui/print.c:428
+#: calendar/gui/print.c:429
msgid "31st"
msgstr "31-ый"
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:496
msgid "Su"
msgstr "Вс"
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:496
msgid "Mo"
msgstr "Пн"
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:496
msgid "Tu"
msgstr "Вт"
-#: calendar/gui/print.c:490
+#: calendar/gui/print.c:496
msgid "We"
msgstr "Ср"
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:497
msgid "Th"
msgstr "Чт"
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:497
msgid "Fr"
msgstr "Пт"
-#: calendar/gui/print.c:491
+#: calendar/gui/print.c:497
msgid "Sa"
msgstr "Cб"
#. Day
-#: calendar/gui/print.c:1815
+#: calendar/gui/print.c:1827
msgid "Selected day (%a %b %d %Y)"
msgstr "Выбранный день (%a %b %d %Y)"
-#: calendar/gui/print.c:1834 calendar/gui/print.c:1838
+#: calendar/gui/print.c:1846 calendar/gui/print.c:1850
msgid "%a %b %d"
msgstr "%a %b %d"
-#: calendar/gui/print.c:1835
+#: calendar/gui/print.c:1847
msgid "%a %d %Y"
msgstr "%a %d %Y"
-#: calendar/gui/print.c:1846
+#: calendar/gui/print.c:1858
#, c-format
msgid "Selected week (%s - %s)"
msgstr "Выбранная неделя (%s - %s)"
#. Month
-#: calendar/gui/print.c:1854
+#: calendar/gui/print.c:1866
msgid "Selected month (%b %Y)"
msgstr "Выбранный месяц (%b %Y)"
#. Year
-#: calendar/gui/print.c:1861
+#: calendar/gui/print.c:1873
msgid "Selected year (%Y)"
msgstr "Выбранный год (%Y)"
-#: calendar/gui/print.c:2200
+#: calendar/gui/print.c:2214
msgid "Print Calendar"
msgstr "Напечатать календарь"
-#: calendar/gui/print.c:2288 calendar/gui/print.c:2380
-#: mail/mail-callbacks.c:1921 my-evolution/e-summary.c:511
+#: calendar/gui/print.c:2302 calendar/gui/print.c:2394
+#: mail/mail-callbacks.c:2071 my-evolution/e-summary.c:551
#: ui/evolution-addressbook.xml.h:17 ui/evolution-mail-message.xml.h:64
msgid "Print Preview"
msgstr "Просмотр печати"
-#: calendar/gui/print.c:2317
+#: calendar/gui/print.c:2331
msgid "Print Item"
msgstr "Печать элемента"
-#: calendar/gui/print.c:2398
+#: calendar/gui/print.c:2412
msgid "Print Setup"
msgstr "Настройка страницы"
@@ -5060,101 +5368,111 @@ msgstr ""
msgid "SMTWTFS"
msgstr "ПВСЧПСВ"
-#: calendar/pcs/query.c:218
+#: calendar/pcs/query.c:230
msgid "time-now expects 0 arguments"
msgstr ""
-#: calendar/pcs/query.c:242
+#: calendar/pcs/query.c:254
msgid "make-time expects 1 argument"
msgstr ""
-#: calendar/pcs/query.c:247
+#: calendar/pcs/query.c:259
msgid "make-time expects argument 1 to be a string"
msgstr ""
-#: calendar/pcs/query.c:255
+#: calendar/pcs/query.c:267
msgid "make-time argument 1 must be an ISO 8601 date/time string"
msgstr ""
-#: calendar/pcs/query.c:284
+#: calendar/pcs/query.c:296
msgid "time-add-day expects 2 arguments"
msgstr ""
-#: calendar/pcs/query.c:289
+#: calendar/pcs/query.c:301
msgid "time-add-day expects argument 1 to be a time_t"
msgstr ""
-#: calendar/pcs/query.c:296
+#: calendar/pcs/query.c:308
msgid "time-add-day expects argument 2 to be an integer"
msgstr ""
-#: calendar/pcs/query.c:323
+#: calendar/pcs/query.c:335
msgid "time-day-begin expects 1 argument"
msgstr ""
-#: calendar/pcs/query.c:328
+#: calendar/pcs/query.c:340
msgid "time-day-begin expects argument 1 to be a time_t"
msgstr ""
-#: calendar/pcs/query.c:355
+#: calendar/pcs/query.c:367
msgid "time-day-end expects 1 argument"
msgstr ""
-#: calendar/pcs/query.c:360
+#: calendar/pcs/query.c:372
msgid "time-day-end expects argument 1 to be a time_t"
msgstr ""
-#: calendar/pcs/query.c:396
+#: calendar/pcs/query.c:408
msgid "get-vtype expects 0 arguments"
msgstr ""
-#: calendar/pcs/query.c:492
+#: calendar/pcs/query.c:504
msgid "occur-in-time-range? expects 2 arguments"
msgstr ""
-#: calendar/pcs/query.c:497
+#: calendar/pcs/query.c:509
msgid "occur-in-time-range? expects argument 1 to be a time_t"
msgstr ""
-#: calendar/pcs/query.c:504
+#: calendar/pcs/query.c:516
msgid "occur-in-time-range? expects argument 2 to be a time_t"
msgstr ""
-#: calendar/pcs/query.c:634
+#: calendar/pcs/query.c:646
#, fuzzy
msgid "contains? expects 2 arguments"
msgstr "Синтаксическая ошибка в параметрах или аргументах"
-#: calendar/pcs/query.c:639
+#: calendar/pcs/query.c:651
msgid "contains? expects argument 1 to be a string"
msgstr ""
-#: calendar/pcs/query.c:646
+#: calendar/pcs/query.c:658
msgid "contains? expects argument 2 to be a string"
msgstr ""
-#: calendar/pcs/query.c:663
+#: calendar/pcs/query.c:675
msgid ""
"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
"\""
msgstr ""
-#: calendar/pcs/query.c:705
+#: calendar/pcs/query.c:717
msgid "has-categories? expects at least 1 argument"
msgstr ""
-#: calendar/pcs/query.c:717
+#: calendar/pcs/query.c:729
msgid ""
"has-categories? expects all arguments to be strings or one and only one "
"argument to be a boolean false (#f)"
msgstr ""
-#: calendar/pcs/query.c:805
+#: calendar/pcs/query.c:817
#, fuzzy
msgid "is-completed? expects 0 arguments"
msgstr "Синтаксическая ошибка в параметрах или аргументах"
-#: calendar/pcs/query.c:1008
+#: calendar/pcs/query.c:862
+#, fuzzy
+msgid "completed-before? expects 1 argument"
+msgstr "Синтаксическая ошибка в параметрах или аргументах"
+
+#: calendar/pcs/query.c:867
+#, fuzzy
+msgid "completed-before? expects argument 1 to be a time_t"
+msgstr "Синтаксическая ошибка в параметрах или аргументах"
+
+#: calendar/pcs/query.c:1155
msgid "Evaluation of the search expression did not yield a boolean value"
msgstr ""
@@ -5207,11 +5525,11 @@ msgstr ""
msgid "Syncing folders"
msgstr "Синхронизация папок"
-#: camel/camel-filter-driver.c:644
+#: camel/camel-filter-driver.c:643
msgid "Unable to open spool folder"
msgstr "Не удалось открыть папку спула"
-#: camel/camel-filter-driver.c:653
+#: camel/camel-filter-driver.c:652
msgid "Unable to process spool folder"
msgstr "Не удалось обработать папку спула"
@@ -5229,36 +5547,36 @@ msgstr "Сбой на сообщении %d"
msgid "Cannot open message"
msgstr "Невозможно открыть сообщение"
-#: camel/camel-filter-driver.c:695 camel/camel-filter-driver.c:810
+#: camel/camel-filter-driver.c:698 camel/camel-filter-driver.c:814
msgid "Syncing folder"
msgstr "Синхронизация папки"
-#: camel/camel-filter-driver.c:766
+#: camel/camel-filter-driver.c:770
#, c-format
msgid "Getting message %d of %d"
msgstr "Получение сообщения %d из %d"
-#: camel/camel-filter-driver.c:771 camel/camel-filter-driver.c:789
+#: camel/camel-filter-driver.c:775 camel/camel-filter-driver.c:793
#, c-format
msgid "Failed at message %d of %d"
msgstr "Сбой на сообщении %d из %d"
-#: camel/camel-filter-driver.c:892
+#: camel/camel-filter-driver.c:900
#, c-format
msgid "Error parsing filter: %s: %s"
msgstr "Ошибка анализа фильтра: %s: %s"
-#: camel/camel-filter-driver.c:898
+#: camel/camel-filter-driver.c:906
#, c-format
msgid "Error executing filter: %s: %s"
msgstr "Ошибка выполнения фильтра: %s: %s"
-#: camel/camel-filter-search.c:468 camel/camel-filter-search.c:475
+#: camel/camel-filter-search.c:479 camel/camel-filter-search.c:486
#, c-format
msgid "Error executing filter search: %s: %s"
msgstr "Ошибка выполнения поиска фильтра: %s: %s"
-#: camel/camel-folder-search.c:328
+#: camel/camel-folder-search.c:333
#, c-format
msgid ""
"Cannot parse search expression: %s:\n"
@@ -5267,7 +5585,7 @@ msgstr ""
"Ошибка в регулярном выражении \"%s\":\n"
"%s"
-#: camel/camel-folder-search.c:338
+#: camel/camel-folder-search.c:343
#, c-format
msgid ""
"Error executing search expression: %s:\n"
@@ -5276,16 +5594,16 @@ msgstr ""
"Ошибка при выполнении выражения поиска \"%s\":\n"
"%s"
-#: camel/camel-folder-search.c:485 camel/camel-folder-search.c:513
+#: camel/camel-folder-search.c:560 camel/camel-folder-search.c:588
msgid "(match-all) requires a single bool result"
msgstr "(совпадает все) требует единственного логического результата"
-#: camel/camel-folder-search.c:563
+#: camel/camel-folder-search.c:638
#, c-format
msgid "Performing query on unknown header: %s"
msgstr "Совершение запроса на неизвестном заголовке: %s"
-#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:716
+#: camel/camel-folder-search.c:747 camel/camel-folder-search.c:791
msgid "Invalid type in body-contains, expecting string"
msgstr "Недопустимый тип в тело-содержит, ожидается строка"
@@ -5322,12 +5640,12 @@ msgstr ""
"Превышение времени при попытке заблокировать файл %s. Попробуйте еще раз "
"позже."
-#: camel/camel-lock.c:201
+#: camel/camel-lock.c:205
#, c-format
msgid "Failed to get lock using fcntl(2): %s"
msgstr "Не удалось получить lock используя fcntl(2): %s"
-#: camel/camel-lock.c:255
+#: camel/camel-lock.c:267
#, c-format
msgid "Failed to get lock using flock(2): %s"
msgstr "Не удалось получить lock используя flock(2): %s"
@@ -5397,45 +5715,73 @@ msgid "Please enter your %s passphrase"
msgstr "Пожалуйста введите вашу %s парольную фразу."
#: camel/camel-pgp-context.c:518
-msgid "No plaintext to sign."
-msgstr "Нет текста для подписи."
+#, fuzzy
+msgid "Cannot sign this message: no plaintext to sign"
+msgstr "Невозможно отправить сообщение: не определены получатели."
#: camel/camel-pgp-context.c:525 camel/camel-pgp-context.c:700
-#: camel/camel-pgp-context.c:1080 camel/camel-pgp-context.c:1295
-msgid "No password provided."
-msgstr "Пароль не предоставлен."
+#, fuzzy
+msgid "Cannot sign this message: no password provided"
+msgstr "Невозможно отправить сообщение: неправильный адрес отправителя."
#: camel/camel-pgp-context.c:531 camel/camel-pgp-context.c:706
-#: camel/camel-pgp-context.c:892 camel/camel-pgp-context.c:1087
-#: camel/camel-pgp-context.c:1302
-#, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
+#, fuzzy, c-format
+msgid "Cannot sign this message: couldn't create pipe to GPG/PGP: %s"
msgstr "Не удалось создать канал к GPG/PGP: %s"
#: camel/camel-pgp-context.c:693
-msgid "No plaintext to clearsign."
-msgstr ""
+#, fuzzy
+msgid "Cannot sign this message: no plaintext to clearsign"
+msgstr "Невозможно отправить сообщение: не определены получатели."
#: camel/camel-pgp-context.c:886
-msgid "No plaintext to verify."
-msgstr "Нет текста для проверки."
+#, fuzzy
+msgid "Cannot verify this message: no plaintext to verify"
+msgstr "Невозможно отправить сообщение: не определены получатели."
+
+#: camel/camel-pgp-context.c:892
+#, fuzzy, c-format
+msgid "Cannot verify this message: couldn't create pipe to GPG/PGP: %s"
+msgstr "Не удалось создать канал к GPG/PGP: %s"
#: camel/camel-pgp-context.c:903
-#, c-format
-msgid "Couldn't create temp file: %s"
+#, fuzzy, c-format
+msgid "Cannot verify this message: couldn't create temp file: %s"
msgstr "Не удалось создать временный файл: %s"
-#: camel/camel-pgp-context.c:1070
-msgid "No plaintext to encrypt."
-msgstr "Нет текста для шифрования."
+#: camel/camel-pgp-context.c:1069
+#, fuzzy
+msgid "Cannot encrypt this message: no plaintext to encrypt"
+msgstr "Невозможно отправить сообщение: не определены получатели."
-#: camel/camel-pgp-context.c:1096
-msgid "No recipients specified"
-msgstr "Не указаны получатели"
+#: camel/camel-pgp-context.c:1079
+#, fuzzy
+msgid "Cannot encrypt this message: no password provided"
+msgstr "Невозможно отправить сообщение: неправильный адрес отправителя."
-#: camel/camel-pgp-context.c:1287
-msgid "No ciphertext to decrypt."
-msgstr "Нет шифра для дешифрации."
+#: camel/camel-pgp-context.c:1086
+#, fuzzy, c-format
+msgid "Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"
+msgstr "Не удалось создать канал к GPG/PGP: %s"
+
+#: camel/camel-pgp-context.c:1095
+#, fuzzy
+msgid "Cannot encrypt this message: no recipients specified"
+msgstr "Невозможно отправить сообщение: не определены получатели."
+
+#: camel/camel-pgp-context.c:1258
+#, fuzzy
+msgid "Cannot decrypt this message: no ciphertext to decrypt"
+msgstr "Невозможно отправить сообщение: не определены получатели."
+
+#: camel/camel-pgp-context.c:1266
+msgid "Cannot decrypt this message: no password provided"
+msgstr ""
+
+#: camel/camel-pgp-context.c:1273
+#, fuzzy, c-format
+msgid "Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"
+msgstr "Не удалось создать канал к GPG/PGP: %s"
#: camel/camel-provider.c:131
#, c-format
@@ -5453,38 +5799,39 @@ msgstr "Невозможно загрузить %s: %s"
msgid "Could not load %s: No initialization code in module."
msgstr "Невозможно загрузить %s: нет инициализационного кода в модуле."
-#: camel/camel-remote-store.c:191
+#: camel/camel-remote-store.c:203
#, c-format
msgid "%s server %s"
msgstr "%s сервер %s"
-#: camel/camel-remote-store.c:195
+#: camel/camel-remote-store.c:207
#, c-format
msgid "%s service for %s on %s"
msgstr "%s сервис для %s на %s"
-#: camel/camel-remote-store.c:252
+#: camel/camel-remote-store.c:264
msgid "Connection cancelled"
msgstr "Соединение отменено"
-#: camel/camel-remote-store.c:255
+#: camel/camel-remote-store.c:267
#: camel/providers/smtp/camel-smtp-transport.c:272
#, c-format
msgid "Could not connect to %s (port %d): %s"
msgstr "Не удалось подключиться к %s (порт %d): %s"
-#: camel/camel-remote-store.c:256
+#: camel/camel-remote-store.c:268
msgid "(unknown host)"
msgstr "(неизвестный хост)"
-#: camel/camel-remote-store.c:351 camel/camel-remote-store.c:413
-#: camel/camel-remote-store.c:484
+#: camel/camel-remote-store.c:361 camel/camel-remote-store.c:423
+#: camel/camel-remote-store.c:486
#: camel/providers/imap/camel-imap-command.c:386
msgid "Operation cancelled"
msgstr "Операция отменена"
#: camel/camel-remote-store.c:489
-msgid "Server unexpectedly disconnected"
+#, fuzzy, c-format
+msgid "Server unexpectedly disconnected: %s"
msgstr "Сервер неожиданно отключился"
#: camel/camel-sasl-anonymous.c:33
@@ -5595,7 +5942,7 @@ msgstr ""
"%s"
#: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:440
+#: camel/providers/imap/camel-imap-store.c:492
msgid "Bad authentication response from server."
msgstr "Отрицательный ответ идентификации от сервера."
@@ -5615,7 +5962,7 @@ msgstr "Неизвестное состоиние идентификации."
#: camel/camel-sasl-plain.c:32 camel/providers/imap/camel-imap-provider.c:80
#: camel/providers/nntp/camel-nntp-store.c:302
-#: camel/providers/pop3/camel-pop3-provider.c:67 mail/mail-config.glade.h:54
+#: camel/providers/pop3/camel-pop3-provider.c:68 mail/mail-config.glade.h:54
msgid "Password"
msgstr "Пароль"
@@ -5645,55 +5992,55 @@ msgstr ""
msgid "Regular expression compilation failed: %s: %s"
msgstr "Сбой компиляции регулярного выражения: %s: %s"
-#: camel/camel-service.c:155
+#: camel/camel-service.c:154
#, c-format
msgid "URL '%s' needs a username component"
msgstr "URL \"%s\" нуждается в компоненте имени пользователя"
-#: camel/camel-service.c:163
+#: camel/camel-service.c:162
#, c-format
msgid "URL '%s' needs a host component"
msgstr "URL \\\"%s\\\" нуждается в компоненте хоста"
-#: camel/camel-service.c:171
+#: camel/camel-service.c:170
#, c-format
msgid "URL '%s' needs a path component"
msgstr "URL \\\"%s\\\" нуждается в компоненте пути"
-#: camel/camel-service.c:549
+#: camel/camel-service.c:548
#, c-format
msgid "Resolving: %s"
msgstr "Распознавание: %s"
-#: camel/camel-service.c:576
+#: camel/camel-service.c:575
#, c-format
msgid "Failure in name lookup: %s"
msgstr "Ошибка в разрешении имени: %s"
-#: camel/camel-service.c:601
+#: camel/camel-service.c:600
#, c-format
msgid "Host lookup failed: %s: host not found"
msgstr "Сбой поиска хоста: %s: хост не найден"
-#: camel/camel-service.c:603
+#: camel/camel-service.c:602
#, c-format
msgid "Host lookup failed: %s: unknown reason"
msgstr "Сбой поиска хоста: %s: причина неизвестна"
-#: camel/camel-session.c:68
+#: camel/camel-session.c:76
msgid "Virtual folder email provider"
msgstr "Провайдер виртуальных папок электронной почты"
-#: camel/camel-session.c:70
+#: camel/camel-session.c:78
msgid "For reading mail as a query of another set of folders"
msgstr "Для чтения почты по запросу к другому набору папок"
-#: camel/camel-session.c:297 camel/camel-session.c:366
+#: camel/camel-session.c:322 camel/camel-session.c:391
#, c-format
msgid "No provider available for protocol `%s'"
msgstr "Провайдер для протокола \"%s\" не доступен"
-#: camel/camel-session.c:483
+#: camel/camel-session.c:508
#, c-format
msgid ""
"Could not create directory %s:\n"
@@ -5721,25 +6068,30 @@ msgstr "Этот файл не существует."
msgid "The encryption certificate for \"%s\" does not exist."
msgstr "Этот файл не существует."
-#: camel/camel-smime-context.c:408 camel/camel-smime-context.c:419
-#: camel/camel-smime-context.c:525 camel/camel-smime-context.c:535
+#: camel/camel-smime-context.c:419 camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
#, fuzzy, c-format
msgid "Failed to find certificate for \"%s\"."
msgstr "Сбой при отправке имени пользователя на сервер"
-#: camel/camel-smime-context.c:545
+#: camel/camel-smime-context.c:556
msgid "Failed to find a common bulk algorithm."
msgstr ""
-#: camel/camel-smime-context.c:799
+#: camel/camel-smime-context.c:810
#, fuzzy
msgid "Failed to decode message."
msgstr "Сбойное сообщение %d"
-#: camel/camel-smime-context.c:844
+#: camel/camel-smime-context.c:855
msgid "Failed to verify certificates."
msgstr ""
+#: camel/camel-store.c:273
+#, fuzzy
+msgid "Cannot create folder: Invalid operation on this store"
+msgstr "Не удалось получить папку: %s: %s"
+
#: camel/camel-tcp-stream-openssl.c:463
#, c-format
msgid ""
@@ -5748,7 +6100,7 @@ msgid ""
msgstr ""
#. construct our user prompt
-#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:364
+#: camel/camel-tcp-stream-openssl.c:468 camel/camel-tcp-stream-ssl.c:369
#, c-format
msgid ""
"Bad certificate from %s:\n"
@@ -5763,7 +6115,7 @@ msgstr ""
"\n"
"Всё равно принять?"
-#: camel/camel-tcp-stream-ssl.c:348
+#: camel/camel-tcp-stream-ssl.c:353
#, c-format
msgid ""
"EMail: %s\n"
@@ -5787,17 +6139,17 @@ msgstr ""
msgid "Could not parse URL `%s'"
msgstr "Невозможно проанализировать URL \"%s\""
-#: camel/camel-vee-folder.c:452
+#: camel/camel-vee-folder.c:546
#, c-format
msgid "No such message %s in %s"
msgstr "Нет сообщения %s в %s"
-#: camel/camel-vee-folder.c:547
+#: camel/camel-vee-folder.c:641
#, c-format
msgid "No such message: %s"
msgstr "Нет такого сообщения: %s"
-#: camel/camel-vtrash-folder.c:109
+#: camel/camel-vtrash-folder.c:106
msgid "You cannot copy messages from this trash folder."
msgstr "Вы не можете скопировать сообщения из этой папки для мусора."
@@ -5825,42 +6177,42 @@ msgstr "Ответ IMAP сервера не содержит информации об %s"
msgid "Unexpected OK response from IMAP server: %s"
msgstr "Неожиданный ответ \"OK\" от IMAP сервера: %s"
-#: camel/providers/imap/camel-imap-folder.c:190
+#: camel/providers/imap/camel-imap-folder.c:189
#, c-format
msgid "Could not create directory %s: %s"
msgstr "Невозможно создать каталог %s: %s"
-#: camel/providers/imap/camel-imap-folder.c:209
+#: camel/providers/imap/camel-imap-folder.c:208
#, c-format
msgid "Could not load summary for %s"
msgstr "Невозможно загрузить итог для %s"
-#: camel/providers/imap/camel-imap-folder.c:273
+#: camel/providers/imap/camel-imap-folder.c:272
msgid "Folder was destroyed and recreated on server."
msgstr ""
#. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:435
+#: camel/providers/imap/camel-imap-folder.c:434
#, fuzzy
msgid "Scanning for changed messages"
msgstr "Сохранение сообщений"
#: camel/providers/imap/camel-imap-folder.c:1491
-#: camel/providers/imap/camel-imap-folder.c:1915
+#: camel/providers/imap/camel-imap-folder.c:1890
msgid "This message is not currently available"
msgstr "Это сообщение в настоящий момент не доступно"
-#: camel/providers/imap/camel-imap-folder.c:1634
-#: camel/providers/imap/camel-imap-folder.c:1715
+#: camel/providers/imap/camel-imap-folder.c:1633
+#: camel/providers/imap/camel-imap-folder.c:1714
msgid "Fetching summary information for new messages"
msgstr ""
-#: camel/providers/imap/camel-imap-folder.c:1640
+#: camel/providers/imap/camel-imap-folder.c:1639
#, fuzzy
msgid "Scanning for new messages"
msgstr "Сохранение сообщений"
-#: camel/providers/imap/camel-imap-folder.c:1948
+#: camel/providers/imap/camel-imap-folder.c:1923
msgid "Could not find message body in FETCH response."
msgstr "Невозможно найти тело сообщения в ответе FETCH."
@@ -5869,6 +6221,14 @@ msgstr "Невозможно найти тело сообщения в ответе FETCH."
msgid "Could not open cache directory: %s"
msgstr "Невозможно открыть каталог кэш: %s"
+#: camel/providers/imap/camel-imap-message-cache.c:243
+#: camel/providers/imap/camel-imap-message-cache.c:299
+#: camel/providers/imap/camel-imap-message-cache.c:330
+#: camel/providers/imap/camel-imap-message-cache.c:362
+#, fuzzy, c-format
+msgid "Failed to cache message %s: %s"
+msgstr "Сбойное сообщение %d"
+
#: camel/providers/imap/camel-imap-provider.c:43 mail/mail-config.glade.h:14
msgid "Checking for new mail"
msgstr "Проверка новое почты"
@@ -5877,7 +6237,7 @@ msgstr "Проверка новое почты"
msgid "Check for new messages in all folders"
msgstr "Проверка новой почты во всех папках"
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:720
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:733
msgid "Folders"
msgstr "Папки"
@@ -5900,7 +6260,8 @@ msgstr ""
"этом сервере"
#: camel/providers/imap/camel-imap-provider.c:63
-msgid "IMAPv4"
+#, fuzzy
+msgid "IMAP"
msgstr "IMAPv4"
#: camel/providers/imap/camel-imap-provider.c:65
@@ -5913,28 +6274,28 @@ msgstr ""
"Подключение к IMAP серверу будет производиться с использованием "
"незашифрованного пароля."
-#: camel/providers/imap/camel-imap-store.c:463
+#: camel/providers/imap/camel-imap-store.c:515
#, c-format
msgid "IMAP server %s does not support requested authentication type %s"
msgstr "IMAP сервер %s не поддерживает затребованный тип идентификации %s"
-#: camel/providers/imap/camel-imap-store.c:473
+#: camel/providers/imap/camel-imap-store.c:525
#: camel/providers/smtp/camel-smtp-transport.c:388
#, c-format
msgid "No support for authentication type %s"
msgstr "Идентификация типа %s не поддерживается"
-#: camel/providers/imap/camel-imap-store.c:497
+#: camel/providers/imap/camel-imap-store.c:549
#, c-format
msgid "%sPlease enter the IMAP password for %s@%s"
msgstr "%sПожалуйста, введите пароль IMAP для %s@%s"
-#: camel/providers/imap/camel-imap-store.c:512
+#: camel/providers/imap/camel-imap-store.c:564
#: camel/providers/smtp/camel-smtp-transport.c:432
msgid "You didn't enter a password."
msgstr "Вы не ввели пароль."
-#: camel/providers/imap/camel-imap-store.c:538
+#: camel/providers/imap/camel-imap-store.c:590
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -5945,12 +6306,12 @@ msgstr ""
"%s\n"
"\n"
-#: camel/providers/imap/camel-imap-store.c:837
+#: camel/providers/imap/camel-imap-store.c:889
#, c-format
msgid "No such folder %s"
msgstr "Нет такой папки %s"
-#: camel/providers/imap/camel-imap-store.c:1038
+#: camel/providers/imap/camel-imap-store.c:1090
msgid "The parent folder is not allowed to contain subfolders"
msgstr ""
@@ -5959,37 +6320,48 @@ msgid "MH-format mail directories"
msgstr "Почтовые каталоги в формате UNIX MH"
#: camel/providers/local/camel-local-provider.c:41
-msgid "For storing local mail in MH-like mail directories"
+#, fuzzy
+msgid "For storing local mail in MH-like mail directories."
msgstr "Для хранения локальной почты в почтовых каталогах типа MH"
#: camel/providers/local/camel-local-provider.c:50
-msgid "Standard Unix mailbox file"
-msgstr "Стандартный файл Unix mailbox"
+#, fuzzy
+msgid "Local delivery"
+msgstr "Специальные папки"
#: camel/providers/local/camel-local-provider.c:51
-msgid "For storing local mail in standard mbox format"
+#, fuzzy
+msgid "For retrieving local mail from standard mbox formated spools."
msgstr "Для хранения локальной почты в почтовых каталогах формата mbox"
#: camel/providers/local/camel-local-provider.c:60
+#, fuzzy
+msgid "Apply filters to new messages in INBOX"
+msgstr ""
+"Применить фильтры ко всем новым сообщениям в папке \"Входящие\" (INBOX) на "
+"этом сервере"
+
+#: camel/providers/local/camel-local-provider.c:66
msgid "Qmail maildir-format mail files"
msgstr "Почтовые файлы в формате почтовых каталогов qmail"
-#: camel/providers/local/camel-local-provider.c:61
-msgid "For storing local mail in qmail maildir directories"
+#: camel/providers/local/camel-local-provider.c:67
+#, fuzzy
+msgid "For storing local mail in qmail maildir directories."
msgstr "Для хранения локальной почты в почтовых каталогах типа qmail"
-#: camel/providers/local/camel-local-provider.c:70
+#: camel/providers/local/camel-local-provider.c:77
#, fuzzy
-msgid "Unix mbox spool-format mail files"
-msgstr "Почтовые файлы в формате почтовых каталогов qmail"
+msgid "Standard Unix mbox spools"
+msgstr "Стандартный файл Unix mbox"
-#: camel/providers/local/camel-local-provider.c:71
+#: camel/providers/local/camel-local-provider.c:78
#, fuzzy
-msgid "For storing local mail in standard Unix spool directories"
+msgid "For reading and storing local mail in standard mbox spool files."
msgstr "Для хранения локальной почты в почтовых каталогах типа qmail"
#: camel/providers/local/camel-local-store.c:127
-#: camel/providers/local/camel-spool-store.c:111
+#: camel/providers/local/camel-spool-store.c:112
#, c-format
msgid "Store root %s is not an absolute path"
msgstr ""
@@ -6014,39 +6386,39 @@ msgstr ""
msgid "Local mail file %s"
msgstr "Локальный почтовый файл %s"
-#: camel/providers/local/camel-local-store.c:237
+#: camel/providers/local/camel-local-store.c:240
#, c-format
msgid "Could not rename folder %s to %s: %s"
msgstr "Не удалось переименовать папку %s в %s: %s"
-#: camel/providers/local/camel-local-store.c:279
+#: camel/providers/local/camel-local-store.c:282
#, c-format
msgid "Could not delete folder summary file `%s': %s"
msgstr "Не удалось удалить итоговый файл папки \"%s\": %s"
-#: camel/providers/local/camel-local-store.c:289
+#: camel/providers/local/camel-local-store.c:292
#, c-format
msgid "Could not delete folder index file `%s': %s"
msgstr "Не удалось удалить индексный файл папки \"%s\": %s"
-#: camel/providers/local/camel-local-summary.c:417
-#: camel/providers/local/camel-spool-summary.c:1153
+#: camel/providers/local/camel-local-summary.c:418
+#: camel/providers/local/camel-spool-summary.c:1158
msgid "Unable to add message to summary: unknown reason"
msgstr "Не удалось добавить сообщение к итогу: причина неизвестна"
-#: camel/providers/local/camel-maildir-folder.c:176
+#: camel/providers/local/camel-maildir-folder.c:181
#, c-format
msgid "Cannot append message to maildir folder: %s: %s"
msgstr "Невозможно добавить сообщение к папке почтового каталога: %s: %s"
-#: camel/providers/local/camel-maildir-folder.c:201
-#: camel/providers/local/camel-maildir-folder.c:213
-#: camel/providers/local/camel-maildir-folder.c:221
+#: camel/providers/local/camel-maildir-folder.c:206
+#: camel/providers/local/camel-maildir-folder.c:218
+#: camel/providers/local/camel-maildir-folder.c:226
#: camel/providers/local/camel-mbox-folder.c:328
#: camel/providers/local/camel-mh-folder.c:195
#: camel/providers/local/camel-mh-folder.c:204
#: camel/providers/local/camel-mh-folder.c:212
-#: camel/providers/local/camel-spool-folder.c:532
+#: camel/providers/local/camel-spool-folder.c:537
#, c-format
msgid ""
"Cannot get message: %s\n"
@@ -6055,19 +6427,19 @@ msgstr ""
"Невозможно получить сообщение: %s\n"
" %s"
-#: camel/providers/local/camel-maildir-folder.c:201
+#: camel/providers/local/camel-maildir-folder.c:206
#: camel/providers/local/camel-mbox-folder.c:328
#: camel/providers/local/camel-mh-folder.c:195
-#: camel/providers/local/camel-spool-folder.c:532
+#: camel/providers/local/camel-spool-folder.c:537
msgid "No such message"
msgstr "Нет такого сообщения"
-#: camel/providers/local/camel-maildir-folder.c:222
+#: camel/providers/local/camel-maildir-folder.c:227
#: camel/providers/local/camel-mh-folder.c:213
msgid "Invalid message contents"
msgstr "Неправильное содержимое сообщения"
-#: camel/providers/local/camel-maildir-store.c:103
+#: camel/providers/local/camel-maildir-store.c:106
#: camel/providers/local/camel-mh-store.c:90
#, c-format
msgid ""
@@ -6077,14 +6449,14 @@ msgstr ""
"Невозможно открыть папку \"%s\":\n"
"%s"
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:110
#: camel/providers/local/camel-mbox-store.c:101
#: camel/providers/local/camel-mh-store.c:97
#, c-format
msgid "Folder `%s' does not exist."
msgstr "Папка \"%s\" не существует."
-#: camel/providers/local/camel-maildir-store.c:114
+#: camel/providers/local/camel-maildir-store.c:117
#: camel/providers/local/camel-mh-store.c:103
#, c-format
msgid ""
@@ -6094,13 +6466,13 @@ msgstr ""
"Не удалось создать папку \"%s\":\n"
"%s"
-#: camel/providers/local/camel-maildir-store.c:129
+#: camel/providers/local/camel-maildir-store.c:132
#, c-format
msgid "`%s' is not a maildir directory."
msgstr "\"%s\" не является почтовым каталогом."
-#: camel/providers/local/camel-maildir-store.c:165
-#: camel/providers/local/camel-maildir-store.c:202
+#: camel/providers/local/camel-maildir-store.c:167
+#: camel/providers/local/camel-maildir-store.c:204
#: camel/providers/local/camel-mh-store.c:127
#, c-format
msgid "Could not delete folder `%s': %s"
@@ -6108,11 +6480,11 @@ msgstr ""
"Невозможно удалить папку \"%s\":\n"
"%s"
-#: camel/providers/local/camel-maildir-store.c:166
+#: camel/providers/local/camel-maildir-store.c:168
msgid "not a maildir directory"
msgstr "не является почтовым каталог"
-#: camel/providers/local/camel-maildir-store.c:276
+#: camel/providers/local/camel-maildir-store.c:331
#, fuzzy, c-format
msgid "Could not scan folder `%s': %s"
msgstr ""
@@ -6126,13 +6498,13 @@ msgid "Cannot open maildir directory path: %s: %s"
msgstr "Не удалось открыть почтовый ящик: %s: %s\n"
#: camel/providers/local/camel-mbox-folder.c:152
-#: camel/providers/local/camel-spool-folder.c:268
+#: camel/providers/local/camel-spool-folder.c:273
#, fuzzy, c-format
msgid "Cannot create folder lock on %s: %s"
msgstr "Не удалось получить папку: %s: %s"
#: camel/providers/local/camel-mbox-folder.c:209
-#: camel/providers/local/camel-spool-folder.c:409
+#: camel/providers/local/camel-spool-folder.c:414
#, c-format
msgid "Cannot open mailbox: %s: %s\n"
msgstr "Не удалось открыть почтовый ящик: %s: %s\n"
@@ -6145,9 +6517,9 @@ msgstr "Невозможно присоединить сообщение к файлу mbox: %s: %s"
#: camel/providers/local/camel-mbox-folder.c:344
#: camel/providers/local/camel-mbox-folder.c:376
#: camel/providers/local/camel-mbox-folder.c:389
-#: camel/providers/local/camel-spool-folder.c:548
-#: camel/providers/local/camel-spool-folder.c:580
-#: camel/providers/local/camel-spool-folder.c:593
+#: camel/providers/local/camel-spool-folder.c:553
+#: camel/providers/local/camel-spool-folder.c:585
+#: camel/providers/local/camel-spool-folder.c:598
#, c-format
msgid ""
"Cannot get message: %s from folder %s\n"
@@ -6157,12 +6529,12 @@ msgstr ""
" %s"
#: camel/providers/local/camel-mbox-folder.c:377
-#: camel/providers/local/camel-spool-folder.c:581
+#: camel/providers/local/camel-spool-folder.c:586
msgid "The folder appears to be irrecoverably corrupted."
msgstr "Видимо папка невостановимо испорчена."
#: camel/providers/local/camel-mbox-folder.c:390
-#: camel/providers/local/camel-spool-folder.c:594
+#: camel/providers/local/camel-spool-folder.c:599
msgid "Message construction failed: Corrupt mailbox?"
msgstr "Сбой в конструкции сообщения: почтовый ящик поврежден?"
@@ -6208,16 +6580,20 @@ msgstr "Папка \"%s\" не пуста. Не удалена."
#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
#. it should try and merge the summary info's. This is a bit tricky.
#: camel/providers/local/camel-mbox-summary.c:249
-#: camel/providers/local/camel-spool-summary.c:379
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703
+#: camel/providers/local/camel-spool-summary.c:644
+#: camel/providers/local/camel-spool-summary.c:936
#, fuzzy
-msgid "Summarizing folder"
-msgstr "Суммаризация папки"
+msgid "Storing folder"
+msgstr "Синхронизация папки"
#: camel/providers/local/camel-mbox-summary.c:254
-#: camel/providers/local/camel-spool-summary.c:384
#, fuzzy, c-format
-msgid "Could not open folder: %s: summarizing from position %ld: %s"
-msgstr "Не удалось открыть папку: %s: итог с позиции %ld: %s"
+msgid "Could not open folder: %s: %s"
+msgstr ""
+"Невозможно открыть папку \"%s\":\n"
+"%s"
#: camel/providers/local/camel-mbox-summary.c:296
#: camel/providers/local/camel-spool-summary.c:426
@@ -6227,22 +6603,17 @@ msgstr "Фатальная ошибка почтового анализатора возле позиции %ld в папке %s"
#: camel/providers/local/camel-mbox-summary.c:371
#, fuzzy, c-format
-msgid "Cannot summarize folder: %s: %s"
-msgstr "Не удалось суммировать папку: %s: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:502
-#: camel/providers/local/camel-mbox-summary.c:703
-#: camel/providers/local/camel-spool-summary.c:644
-#: camel/providers/local/camel-spool-summary.c:931
-#, fuzzy
-msgid "Synchronizing folder"
-msgstr "Синхронизация папки"
+msgid "Cannot check folder: %s: %s"
+msgstr "Не удалось получить папку: %s: %s"
#: camel/providers/local/camel-mbox-summary.c:507
#: camel/providers/local/camel-mbox-summary.c:708
+#: camel/providers/local/camel-spool-summary.c:649
#, fuzzy, c-format
-msgid "Could not open folder to summarize: %s: %s"
-msgstr "Не удалось открыть папку для суммаризации: %s: %s"
+msgid "Could not open file: %s: %s"
+msgstr ""
+"Невозможно открыть файл \"%s\":\n"
+"%s"
#: camel/providers/local/camel-mbox-summary.c:524
#: camel/providers/local/camel-spool-summary.c:673
@@ -6256,8 +6627,8 @@ msgstr "Не удалось открыть временный почтовый ящик: %s"
#: camel/providers/local/camel-mbox-summary.c:754
#: camel/providers/local/camel-spool-summary.c:698
#: camel/providers/local/camel-spool-summary.c:706
-#: camel/providers/local/camel-spool-summary.c:974
-#: camel/providers/local/camel-spool-summary.c:982
+#: camel/providers/local/camel-spool-summary.c:979
+#: camel/providers/local/camel-spool-summary.c:987
msgid "Summary and folder mismatch, even after a sync"
msgstr "Несовпадение папки и итога, даже после синхронизации"
@@ -6268,14 +6639,14 @@ msgid "Error writing to temp mailbox: %s"
msgstr "Ошибка записи во временный почтовый ящик: %s"
#: camel/providers/local/camel-mbox-summary.c:617
-#: camel/providers/local/camel-spool-summary.c:767
+#: camel/providers/local/camel-spool-summary.c:772
#, c-format
msgid "Writing to tmp mailbox failed: %s: %s"
msgstr "Сбой записи во временный почтовый ящик: %s: %s"
#: camel/providers/local/camel-mbox-summary.c:635
#: camel/providers/local/camel-mbox-summary.c:804
-#: camel/providers/local/camel-spool-summary.c:1032
+#: camel/providers/local/camel-spool-summary.c:1037
#, c-format
msgid "Could not close source folder %s: %s"
msgstr "Невозможно закрыть исходную папку %s: %s"
@@ -6292,7 +6663,7 @@ msgstr "Не удалось переименовать папку: %s"
#: camel/providers/local/camel-mbox-summary.c:878
#: camel/providers/local/camel-spool-summary.c:545
-#: camel/providers/local/camel-spool-summary.c:1106
+#: camel/providers/local/camel-spool-summary.c:1111
#, c-format
msgid "Unknown error: %s"
msgstr "Неизвестная ошибка: %s"
@@ -6312,12 +6683,12 @@ msgstr "\"%s\" не является каталогом."
msgid "Cannot open MH directory path: %s: %s"
msgstr "Не удалось открыть почтовый ящик: %s: %s\n"
-#: camel/providers/local/camel-spool-folder.c:465
+#: camel/providers/local/camel-spool-folder.c:470
#, fuzzy, c-format
msgid "Cannot append message to spool file: %s: %s"
msgstr "Невозможно присоединить сообщение к файлу mbox: %s: %s"
-#: camel/providers/local/camel-spool-store.c:132
+#: camel/providers/local/camel-spool-store.c:133
#, fuzzy, c-format
msgid "Spool `%s' does not exist or is not a regular file"
msgstr "%s не является обычным файлом."
@@ -6327,55 +6698,62 @@ msgstr "%s не является обычным файлом."
msgid "Folder `%s/%s' does not exist."
msgstr "Папка \"%s%s\" не существует."
-#: camel/providers/local/camel-spool-store.c:176
-msgid "Spool stores do not have an inbox"
-msgstr ""
-
-#: camel/providers/local/camel-spool-store.c:186
+#: camel/providers/local/camel-spool-store.c:181
#, fuzzy, c-format
msgid "Spool mail file %s"
msgstr "Локальный почтовый файл %s"
-#: camel/providers/local/camel-spool-store.c:222
+#: camel/providers/local/camel-spool-store.c:227
msgid "Spool folders cannot be renamed"
msgstr ""
-#: camel/providers/local/camel-spool-store.c:230
+#: camel/providers/local/camel-spool-store.c:235
msgid "Spool folders cannot be deleted"
msgstr ""
+#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
+#. it should try and merge the summary info's. This is a bit tricky.
+#: camel/providers/local/camel-spool-summary.c:379
+#, fuzzy
+msgid "Summarising folder"
+msgstr "Суммаризация папки"
+
+#: camel/providers/local/camel-spool-summary.c:384
+#, fuzzy, c-format
+msgid "Could not open folder: %s: summarising from position %ld: %s"
+msgstr "Не удалось открыть папку: %s: итог с позиции %ld: %s"
+
#: camel/providers/local/camel-spool-summary.c:498
#, c-format
msgid "Cannot summarise folder: %s: %s"
msgstr "Не удалось суммировать папку: %s: %s"
-#: camel/providers/local/camel-spool-summary.c:649
-#: camel/providers/local/camel-spool-summary.c:936
-#, c-format
-msgid "Could not open folder to summarise: %s: %s"
-msgstr "Не удалось открыть папку для суммаризации: %s: %s"
-
-#: camel/providers/local/camel-spool-summary.c:784
-#: camel/providers/local/camel-spool-summary.c:793
-#: camel/providers/local/camel-spool-summary.c:802
+#: camel/providers/local/camel-spool-summary.c:789
+#: camel/providers/local/camel-spool-summary.c:798
+#: camel/providers/local/camel-spool-summary.c:807
#, fuzzy, c-format
msgid "Could not sync temporary folder %s: %s"
msgstr "Невозможно открыть временный почтовый файл %s: %s"
-#: camel/providers/local/camel-spool-summary.c:817
+#: camel/providers/local/camel-spool-summary.c:822
#, fuzzy, c-format
msgid "Could not sync spool folder %s: %s"
msgstr "Невозможно закрыть исходную папку %s: %s"
-#: camel/providers/local/camel-spool-summary.c:847
-#: camel/providers/local/camel-spool-summary.c:865
-#: camel/providers/local/camel-spool-summary.c:877
+#: camel/providers/local/camel-spool-summary.c:852
+#: camel/providers/local/camel-spool-summary.c:870
+#: camel/providers/local/camel-spool-summary.c:882
#, c-format
msgid ""
"Could not sync spool folder %s: %s\n"
"Folder may be corrupt, copy saved in `%s'"
msgstr ""
+#: camel/providers/local/camel-spool-summary.c:941
+#, fuzzy, c-format
+msgid "Could not file: %s: %s"
+msgstr "Невозможно загрузить %s: %s"
+
#: camel/providers/nntp/camel-nntp-auth.c:45
#, c-format
msgid "Please enter the NNTP password for %s@%s"
@@ -6459,22 +6837,27 @@ msgstr "Не удалось проверить наличие новых сообщений на POP сервере: %s"
msgid "Could not open folder: message listing was incomplete."
msgstr "Не удалось открыть папку: список сообщений был неполон."
-#: camel/providers/pop3/camel-pop3-folder.c:328
+#: camel/providers/pop3/camel-pop3-folder.c:259
+#, fuzzy
+msgid "Expunging deleted messages"
+msgstr "Вырезать выбранные сообщения"
+
+#: camel/providers/pop3/camel-pop3-folder.c:335
#, c-format
msgid "Could not fetch message: %s"
msgstr "Не удалось получить сообщение: %s"
-#: camel/providers/pop3/camel-pop3-folder.c:344
+#: camel/providers/pop3/camel-pop3-folder.c:351
#, c-format
msgid "Could not retrieve message from POP server %s: %s"
msgstr "Не удалось получить сообщение с POP сервера %s: %s"
-#: camel/providers/pop3/camel-pop3-folder.c:367
+#: camel/providers/pop3/camel-pop3-folder.c:374
#, c-format
msgid "No message with uid %s"
msgstr "Нет сообщения с uid %s"
-#: camel/providers/pop3/camel-pop3-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:378
#, c-format
msgid "Retrieving POP message %d"
msgstr "Получение сообщения %d по POP"
@@ -6487,25 +6870,21 @@ msgstr "Хранилище сообщений"
msgid "Leave messages on server"
msgstr "Сохранять сообщения на сервере"
-#: camel/providers/pop3/camel-pop3-provider.c:41
+#: camel/providers/pop3/camel-pop3-provider.c:42
#, c-format
msgid "Delete after %s day(s)"
msgstr "Удалять через %s дней"
-#: camel/providers/pop3/camel-pop3-provider.c:48 mail/mail-config.glade.h:53
+#: camel/providers/pop3/camel-pop3-provider.c:51 mail/mail-config.glade.h:53
msgid "POP"
msgstr "POP"
-#: camel/providers/pop3/camel-pop3-provider.c:50
-msgid ""
-"For connecting to POP servers. The POP protocol can also be used to retrieve "
-"mail from certain web mail providers and proprietary email systems."
-msgstr ""
-"Для подключения к POP серверам. POP протокол может быть также использован "
-"для получения почты от обычных провайдеров Web-почты и специфических систем "
-"электронной почты."
+#: camel/providers/pop3/camel-pop3-provider.c:53
+#, fuzzy
+msgid "For connecting to and downloading mail from POP servers."
+msgstr "Для чтения и хранения почты на серверах IMAP."
-#: camel/providers/pop3/camel-pop3-provider.c:69
+#: camel/providers/pop3/camel-pop3-provider.c:70
msgid ""
"This option will connect to the POP server using a plaintext password. This "
"is the only option supported by many POP servers."
@@ -6514,7 +6893,7 @@ msgstr ""
"незашифрованного пароля. Большинством POP серверов поддерживается только "
"этот вариант."
-#: camel/providers/pop3/camel-pop3-provider.c:79
+#: camel/providers/pop3/camel-pop3-provider.c:80
msgid ""
"This option will connect to the POP server using an encrypted password via "
"the APOP protocol. This may not work for all users even on servers that "
@@ -6524,7 +6903,7 @@ msgstr ""
"пароля по протоколу APOP. Это может работать не для всех пользователей даже "
"на серверах, которые якобы поддерживают это."
-#: camel/providers/pop3/camel-pop3-provider.c:91
+#: camel/providers/pop3/camel-pop3-provider.c:92
msgid ""
"This will connect to the POP server and use Kerberos 4 to authenticate to it."
msgstr ""
@@ -6587,6 +6966,11 @@ msgstr ""
msgid "No such folder `%s'."
msgstr "Нет такой папки \"%s\""
+#: camel/providers/pop3/camel-pop3-store.c:567
+#, fuzzy, c-format
+msgid "Unexpected response from POP server: %s"
+msgstr "Неожиданный ответ от сервера IMAP: %s"
+
#: camel/providers/sendmail/camel-sendmail-provider.c:37
#: mail/mail-config.glade.h:72
msgid "Sendmail"
@@ -6796,7 +7180,7 @@ msgstr "Невозможно отправить сообщение: не определен адрес отправителя."
msgid "Cannot send message: sender address not valid."
msgstr "Невозможно отправить сообщение: неправильный адрес отправителя."
-#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:595
+#: camel/providers/smtp/camel-smtp-transport.c:595 mail/mail-ops.c:553
msgid "Sending message"
msgstr "Отправка сообщения"
@@ -6871,34 +7255,34 @@ msgstr "Превышено время ожидания ответа на DATA: %s: почта не отправлена"
msgid "DATA response error: %s: mail not sent"
msgstr "Ошибка ответа DATA: %s: почта не отправлена"
-#: camel/providers/smtp/camel-smtp-transport.c:1006
-#: camel/providers/smtp/camel-smtp-transport.c:1024
+#: camel/providers/smtp/camel-smtp-transport.c:1008
+#: camel/providers/smtp/camel-smtp-transport.c:1026
#, c-format
msgid "DATA send timed out: message termination: %s: mail not sent"
msgstr ""
"Превышено время отправки DATA: сообщение прервано: %s: почта не отправлена"
-#: camel/providers/smtp/camel-smtp-transport.c:1043
+#: camel/providers/smtp/camel-smtp-transport.c:1045
#, c-format
msgid "DATA response error: message termination: %s: mail not sent"
msgstr "Ошибка ответа DATA: сообщение прервано: %s: почта не отправлена"
-#: camel/providers/smtp/camel-smtp-transport.c:1067
+#: camel/providers/smtp/camel-smtp-transport.c:1069
#, c-format
msgid "RSET request timed out: %s"
msgstr "Превышено время ожидания ответа на RSET: %s"
-#: camel/providers/smtp/camel-smtp-transport.c:1086
+#: camel/providers/smtp/camel-smtp-transport.c:1088
#, c-format
msgid "RSET response error: %s"
msgstr "Ошибка ответа RSET: %s"
-#: camel/providers/smtp/camel-smtp-transport.c:1109
+#: camel/providers/smtp/camel-smtp-transport.c:1111
#, c-format
msgid "QUIT request timed out: %s: non-fatal"
msgstr "Превышено время ожидания ответа на QUIT: %s: не фатально"
-#: camel/providers/smtp/camel-smtp-transport.c:1128
+#: camel/providers/smtp/camel-smtp-transport.c:1130
#, c-format
msgid "QUIT response error: %s: non-fatal"
msgstr "Ошибка ответа QUIT: %s: не фатально"
@@ -6928,7 +7312,7 @@ msgid "%.1fG"
msgstr "%.1fG"
#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:133
+#: composer/e-msg-composer-attachment-bar.c:337 mail/mail-display.c:134
msgid "attachment"
msgstr "вложение"
@@ -6961,52 +7345,52 @@ msgstr "Тип MIME:"
msgid "Suggest automatic display of attachment"
msgstr ""
-#: composer/e-msg-composer-hdrs.c:327
+#: composer/e-msg-composer-hdrs.c:326
msgid "Click here for the address book"
msgstr "Щелкните здесь для адресной книги"
#.
#. * From:
#.
-#: composer/e-msg-composer-hdrs.c:358
+#: composer/e-msg-composer-hdrs.c:357
msgid "From:"
msgstr "От:"
#.
#. * Reply-To:
#.
-#: composer/e-msg-composer-hdrs.c:364
+#: composer/e-msg-composer-hdrs.c:363
msgid "Reply-To:"
msgstr "Ответить:"
#.
#. * Subject:
#.
-#: composer/e-msg-composer-hdrs.c:375
+#: composer/e-msg-composer-hdrs.c:374
msgid "Subject:"
msgstr "Тема:"
-#: composer/e-msg-composer-hdrs.c:389
+#: composer/e-msg-composer-hdrs.c:388
msgid "To:"
msgstr "Кому:"
-#: composer/e-msg-composer-hdrs.c:390
+#: composer/e-msg-composer-hdrs.c:389
msgid "Enter the recipients of the message"
msgstr "Введите получателей сообщения"
-#: composer/e-msg-composer-hdrs.c:393
+#: composer/e-msg-composer-hdrs.c:392
msgid "Cc:"
msgstr "Копия:"
-#: composer/e-msg-composer-hdrs.c:394
+#: composer/e-msg-composer-hdrs.c:393
msgid "Enter the addresses that will receive a carbon copy of the message"
msgstr "Введите адресатов, которые получат копию сообщения"
-#: composer/e-msg-composer-hdrs.c:397
+#: composer/e-msg-composer-hdrs.c:396
msgid "Bcc:"
msgstr "Скр.копия:"
-#: composer/e-msg-composer-hdrs.c:398
+#: composer/e-msg-composer-hdrs.c:397
msgid ""
"Enter the addresses that will receive a carbon copy of the message without "
"appearing in the recipient list of the message."
@@ -7019,16 +7403,7 @@ msgstr ""
msgid "Attach a file"
msgstr "Присоединить файл"
-#: composer/e-msg-composer.c:670
-#, c-format
-msgid ""
-"Could not open file %s:\n"
-"%s"
-msgstr ""
-"Невозможно открыть файл \"%s\":\n"
-"%s"
-
-#: composer/e-msg-composer.c:683
+#: composer/e-msg-composer.c:676
#, c-format
msgid ""
"Error while reading file %s:\n"
@@ -7037,29 +7412,29 @@ msgstr ""
"Ошибка при чтении файла %s:\n"
"%s"
-#: composer/e-msg-composer.c:865
+#: composer/e-msg-composer.c:858
msgid "Save as..."
msgstr "Сохранить как..."
-#: composer/e-msg-composer.c:874
+#: composer/e-msg-composer.c:867
msgid "Warning!"
msgstr "Предупреждение!"
-#: composer/e-msg-composer.c:878
+#: composer/e-msg-composer.c:871
msgid "File exists, overwrite?"
msgstr "Файл существует, переписать?"
-#: composer/e-msg-composer.c:900
+#: composer/e-msg-composer.c:893
#, c-format
msgid "Error saving file: %s"
msgstr "Ошибка сохранения файла: %s"
-#: composer/e-msg-composer.c:919
+#: composer/e-msg-composer.c:912
#, c-format
msgid "Error loading file: %s"
msgstr "Ошибка при загрузке файла: %s"
-#: composer/e-msg-composer.c:990
+#: composer/e-msg-composer.c:983
msgid ""
"Unable to open the drafts folder for this account.\n"
"Would you like to use the default drafts folder?"
@@ -7067,17 +7442,17 @@ msgstr ""
"Не удалось открыть папку черновиков для этого счёта.\n"
"Хотите использовать папку черновиков по умолчанию?"
-#: composer/e-msg-composer.c:1043
+#: composer/e-msg-composer.c:1036
#, fuzzy, c-format
msgid "Error accessing file: %s"
msgstr "Ошибка сохранения файла: %s"
-#: composer/e-msg-composer.c:1051
+#: composer/e-msg-composer.c:1044
#, fuzzy
msgid "Unable to retrieve message from editor"
msgstr "Не удалось получить сообщение с POP сервера %s: %s"
-#: composer/e-msg-composer.c:1057
+#: composer/e-msg-composer.c:1050
#, fuzzy, c-format
msgid ""
"Unable to seek on file: %s\n"
@@ -7086,7 +7461,7 @@ msgstr ""
"Не удалось создать файл вывода: %s\n"
" %s"
-#: composer/e-msg-composer.c:1063
+#: composer/e-msg-composer.c:1056
#, fuzzy, c-format
msgid ""
"Unable to truncate file: %s\n"
@@ -7095,7 +7470,7 @@ msgstr ""
"Не удалось создать файл вывода: %s\n"
" %s"
-#: composer/e-msg-composer.c:1072
+#: composer/e-msg-composer.c:1065
#, fuzzy, c-format
msgid ""
"Error autosaving message: %s\n"
@@ -7104,16 +7479,16 @@ msgstr ""
"Ошибка сохранения сообщений в: %s:\n"
" %s"
-#: composer/e-msg-composer.c:1172
+#: composer/e-msg-composer.c:1165
#, fuzzy
msgid ""
-"Evolution has found unsaved files from a previous session.\n"
+"Ximian Evolution has found unsaved files from a previous session.\n"
"Would you like to try to recover them?"
msgstr ""
"Evolution нашла почтовые файлы Pine.\n"
"Хотите импортировать их в Evolution?"
-#: composer/e-msg-composer.c:1320
+#: composer/e-msg-composer.c:1313
msgid ""
"This message has not been sent.\n"
"\n"
@@ -7123,29 +7498,29 @@ msgstr ""
"\n"
"Вы хотите сохранить изменения?"
-#: composer/e-msg-composer.c:1327 data/evolution.desktop.in.h:1
-#: shell/e-shell-view-menu.c:217
-msgid "Evolution"
-msgstr "Evolution"
+#: composer/e-msg-composer.c:1320
+#, fuzzy
+msgid "Warning: Modified Message"
+msgstr "Пересланное сообщение"
-#: composer/e-msg-composer.c:1350
+#: composer/e-msg-composer.c:1343
msgid "Open file"
msgstr "Открыть файл"
-#: composer/e-msg-composer.c:1499
+#: composer/e-msg-composer.c:1492
#, fuzzy
msgid "Insert File"
msgstr "Вставить текстовый файл..."
-#: composer/e-msg-composer.c:1875 composer/e-msg-composer.c:2316
+#: composer/e-msg-composer.c:1868 composer/e-msg-composer.c:2314
msgid "Compose a message"
msgstr "Создать сообщение"
-#: composer/e-msg-composer.c:2406
+#: composer/e-msg-composer.c:2404
msgid "Could not create composer window."
msgstr "Невозможно создать окно редактора."
-#: composer/evolution-composer.c:359
+#: composer/evolution-composer.c:349
msgid ""
"Could not create composer window, because you have not yet\n"
"configured any identities in the mail component."
@@ -7153,10 +7528,14 @@ msgstr ""
"Не удалось создать окно редактора, потому что вы еще не настройли\n"
"ни одной личности в почтовом компоненте."
-#: composer/evolution-composer.c:374
+#: composer/evolution-composer.c:364
msgid "Cannot initialize Evolution's composer."
msgstr "Невозможно инициализировать редактор почты Evolution."
+#: data/evolution.desktop.in.h:1 shell/main.c:76
+msgid "Evolution"
+msgstr "Evolution"
+
#: data/evolution.desktop.in.h:2
msgid "The Evolution groupware suite"
msgstr "Набор приложений групповой работы Evolution"
@@ -7209,79 +7588,100 @@ msgstr "Имя содержит"
msgid "Subject does not contain"
msgstr "не содержит"
-#. strptime format for a date.
-#: e-util/e-time-utils.c:86 e-util/e-time-utils.c:128
-#: e-util/e-time-utils.c:240
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1531
-msgid "%m/%d/%Y"
+#. strptime format of a weekday, a date and a time,
+#. in 12-hour format, without seconds.
+#: e-util/e-time-utils.c:168 e-util/e-time-utils.c:359
+msgid "%a %m/%d/%Y %I:%M %p"
+msgstr "%a %m/%d/%Y %I:%M %p"
+
+#. strptime format of a weekday, a date and a time,
+#. in 24-hour format, without seconds.
+#: e-util/e-time-utils.c:173 e-util/e-time-utils.c:350
+msgid "%a %m/%d/%Y %H:%M"
+msgstr "%a %m/%d/%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:178
+#, fuzzy
+msgid "%a %m/%d/%Y %I %p"
+msgstr "%a %m/%d/%Y %I:%M %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:183
+#, fuzzy
+msgid "%a %m/%d/%Y %H"
+msgstr "%a %m/%d/%Y %H:%M"
+
+#. strptime format of a date and a time, in 12-hour format.
+#: e-util/e-time-utils.c:194
+#, fuzzy
+msgid "%m/%d/%Y %I:%M:%S %p"
+msgstr "%a %m/%d/%Y %I:%M:%S %p"
+
+#. strptime format of a date and a time, in 24-hour format.
+#: e-util/e-time-utils.c:198
+#, fuzzy
+msgid "%m/%d/%Y %H:%M:%S"
+msgstr "%a %m/%d/%Y %H:%M:%S"
+
+#. strptime format of a date and a time, in 12-hour format,
+#. without seconds.
+#: e-util/e-time-utils.c:203
+#, fuzzy
+msgid "%m/%d/%Y %I:%M %p"
+msgstr "%a %m/%d/%Y %I:%M %p"
+
+#. strptime format of a date and a time, in 24-hour format,
+#. without seconds.
+#: e-util/e-time-utils.c:208
+#, fuzzy
+msgid "%m/%d/%Y %H:%M"
+msgstr "%a %m/%d/%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:213
+#, fuzzy
+msgid "%m/%d/%Y %I %p"
+msgstr "%a %m/%d/%Y %I:%M %p"
+
+#. strptime format of a date and a time, in 24-hour format,
+#. without minutes or seconds.
+#: e-util/e-time-utils.c:218
+#, fuzzy
+msgid "%m/%d/%Y %H"
msgstr "%m/%d/%Y"
#. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:99 e-util/e-time-utils.c:274
-#: e-util/e-time-utils.c:362
+#: e-util/e-time-utils.c:300 e-util/e-time-utils.c:399
msgid "%I:%M:%S %p"
msgstr "%I:%M:%S %p"
#. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:102 e-util/e-time-utils.c:277
-#: e-util/e-time-utils.c:354
+#: e-util/e-time-utils.c:304 e-util/e-time-utils.c:391
msgid "%H:%M:%S"
msgstr "%H:%M:%S"
-#. strptime format for time of day, without seconds, 12-hour format.
-#: e-util/e-time-utils.c:105 e-util/e-time-utils.c:281
-#: e-util/e-time-utils.c:359 widgets/misc/e-dateedit.c:1339
-#: widgets/misc/e-dateedit.c:1566
+#. strptime format for time of day, without seconds,
+#. in 12-hour format.
+#: e-util/e-time-utils.c:309 e-util/e-time-utils.c:396
+#: widgets/misc/e-dateedit.c:1360 widgets/misc/e-dateedit.c:1587
msgid "%I:%M %p"
msgstr "%I:%M %p"
#. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:108 e-util/e-time-utils.c:284
-#: e-util/e-time-utils.c:351 widgets/misc/e-dateedit.c:1336
-#: widgets/misc/e-dateedit.c:1563
+#: e-util/e-time-utils.c:313 e-util/e-time-utils.c:388
+#: widgets/misc/e-dateedit.c:1357 widgets/misc/e-dateedit.c:1584
msgid "%H:%M"
msgstr "%H:%M"
-#. This is the second-choice date format for the locale, which we use
-#. if previous attempts to parse the date string failed.
-#: e-util/e-time-utils.c:244
+#. strptime format for hour and AM/PM, 12-hour format.
+#: e-util/e-time-utils.c:317
#, fuzzy
-msgid "%d/%m/%Y"
-msgstr "%m/%d/%Y"
-
-#. This is the third-choice date format for the locale, which we use
-#. if previous attempts to parse the date string failed.
-#: e-util/e-time-utils.c:248
-#, fuzzy
-msgid "%Y/%m/%d"
-msgstr "%a %m/%d/%Y"
-
-#. This is the final-choice date format for the locale, which we use
-#. if previous attempts to parse the date string failed.
-#: e-util/e-time-utils.c:252
-#, fuzzy, c-format
-msgid "%x"
-msgstr "x"
-
-#. strftime format of a weekday and a date.
-#: e-util/e-time-utils.c:308
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
-msgid "%a %m/%d/%Y"
-msgstr "%a %m/%d/%Y"
-
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:313
-msgid "%a %m/%d/%Y %H:%M"
-msgstr "%a %m/%d/%Y %H:%M"
-
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:322
-msgid "%a %m/%d/%Y %I:%M %p"
-msgstr "%a %m/%d/%Y %I:%M %p"
+msgid "%I %p"
+msgstr "%I:%M %p"
#: filter/filter-datespec.c:80
msgid "year"
@@ -7372,6 +7772,12 @@ msgstr "указанное вами время"
msgid "a time relative to the current time"
msgstr "время относительно текущего"
+#. The dialog
+#: filter/filter-datespec.c:394
+#, fuzzy
+msgid "Select a time to compare against"
+msgstr "Выбрать часовой пояс"
+
#. The label
#: filter/filter-datespec.c:428
msgid "Compare against"
@@ -7389,7 +7795,7 @@ msgstr " назад"
msgid "ago"
msgstr "назад"
-#: filter/filter-datespec.c:711 mail/message-list.c:936
+#: filter/filter-datespec.c:711 mail/message-list.c:940
msgid "%b %d %l:%M %p"
msgstr "%b %d %l:%M %p"
@@ -7402,11 +7808,11 @@ msgid "Filter Rules"
msgstr "Правила фильтра"
#. and now for the action area
-#: filter/filter-filter.c:452
+#: filter/filter-filter.c:487
msgid "Then"
msgstr "Тогда"
-#: filter/filter-filter.c:466
+#: filter/filter-filter.c:501
msgid "Add action"
msgstr "Добавить действие"
@@ -7418,8 +7824,8 @@ msgstr ""
"Оп-ля... Вы забыли выбрать папку.\n"
"Пожалуйста, вернитесь и укажите правильную папку для доставки почты."
-#: filter/filter-folder.c:232 filter/vfolder-rule.c:319
-#: mail/mail-account-gui.c:809
+#: filter/filter-folder.c:232 filter/vfolder-rule.c:351
+#: mail/mail-account-gui.c:820
msgid "Select Folder"
msgstr "Выбрать папку"
@@ -7444,39 +7850,39 @@ msgstr ""
msgid "Test"
msgstr "Проверка"
-#: filter/filter-rule.c:626
+#: filter/filter-rule.c:696
msgid "Rule name: "
msgstr "Название фильтра: "
-#: filter/filter-rule.c:630
+#: filter/filter-rule.c:700
msgid "Untitled"
msgstr "Неозаглавленное"
-#: filter/filter-rule.c:647
+#: filter/filter-rule.c:717
msgid "If"
msgstr "Если"
-#: filter/filter-rule.c:665
+#: filter/filter-rule.c:735
msgid "Execute actions"
msgstr "Выполнить действия"
-#: filter/filter-rule.c:669
+#: filter/filter-rule.c:739
msgid "if all criteria are met"
msgstr "если удовлетворяет всем критериям"
-#: filter/filter-rule.c:674
+#: filter/filter-rule.c:744
msgid "if any criteria are met"
msgstr "если удовлетворяет любому из критериев"
-#: filter/filter-rule.c:685
+#: filter/filter-rule.c:755
msgid "Add criterion"
msgstr "Добавить критерий"
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:840
msgid "incoming"
msgstr "входящие"
-#: filter/filter-rule.c:770
+#: filter/filter-rule.c:840
msgid "outgoing"
msgstr "исходящие"
@@ -7520,195 +7926,194 @@ msgstr "со всеми локальными и активными удалёнными папками"
msgid "with all local folders"
msgstr "со всеми локальными папками"
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
+#: filter/libfilter-i18n.h:3
#, fuzzy
msgid "Assign Color"
msgstr "Связать цвет"
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
msgid "Assign Score"
msgstr "Связать подсчет"
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
msgid "Attachments"
msgstr "Вложения"
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "содержит"
+
+#: filter/libfilter-i18n.h:8
msgid "Copy to Folder"
msgstr "Скопировать в папку"
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:9
msgid "Date received"
msgstr "Дата получения"
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:10
msgid "Date sent"
msgstr "Дата отправки"
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:12
msgid "Deleted"
msgstr "Удаленное"
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:13
+msgid "does not contain"
+msgstr "не содержит"
+
+#: filter/libfilter-i18n.h:14
+msgid "does not end with"
+msgstr "не заканчивается на"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not exist"
+msgstr "не существует."
+
+#: filter/libfilter-i18n.h:16
+msgid "does not sound like"
+msgstr "звучит не как"
+
+#: filter/libfilter-i18n.h:17
+msgid "does not start with"
+msgstr "не начинается с"
+
+#: filter/libfilter-i18n.h:18
msgid "Do Not Exist"
msgstr "Не существует"
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:19
msgid "Draft"
msgstr "Черновик"
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:20
+msgid "ends with"
+msgstr "заканчивается на"
+
+#: filter/libfilter-i18n.h:21
msgid "Exist"
msgstr "Существует"
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:22
+msgid "exists"
+msgstr "cуществуют"
+
+#: filter/libfilter-i18n.h:23
msgid "Expression"
msgstr "Выражение"
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:24
msgid "Important"
msgstr "Важное"
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:25
+msgid "is"
+msgstr "является"
+
+#: filter/libfilter-i18n.h:26
+msgid "is greater than"
+msgstr "больше чем"
+
+#: filter/libfilter-i18n.h:27
+msgid "is less than"
+msgstr "меньше чем"
+
+#: filter/libfilter-i18n.h:28
+msgid "is not"
+msgstr "не является"
+
+#: filter/libfilter-i18n.h:29
msgid "Mailing list"
msgstr "Список рассылки"
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:30
msgid "Message Body"
msgstr "Тело сообщения"
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:31
msgid "Message Header"
msgstr "Заголовок сообщения"
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:32
msgid "Message was received"
msgstr "Сообщение было получено"
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:33
msgid "Message was sent"
msgstr "Сообщение было отправлено"
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:34
msgid "Move to Folder"
msgstr "Переместить в папку"
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:35
+msgid "on or after"
+msgstr "на или после"
+
+#: filter/libfilter-i18n.h:36
+msgid "on or before"
+msgstr "на или до"
+
+#: filter/libfilter-i18n.h:37
msgid "Read"
msgstr "Прочитанное"
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:38
msgid "Recipients"
msgstr "Получатели"
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:39
msgid "Regex Match"
msgstr "Совпадение рег.выражения"
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:40
msgid "Replied to"
msgstr "Ответить"
-#: filter/libfilter-i18n.h:25 filter/score-rule.c:204 filter/score-rule.c:206
+#: filter/libfilter-i18n.h:41 filter/score-rule.c:204 filter/score-rule.c:206
#: mail/message-list.etspec.h:5
msgid "Score"
msgstr "Подсчет"
-#: filter/libfilter-i18n.h:26 mail/mail-callbacks.c:1075
+#: filter/libfilter-i18n.h:42 mail/mail-callbacks.c:1242
msgid "Sender"
msgstr "Отправитель"
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:43
msgid "Set Status"
msgstr "Установить состояние"
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:44
#, fuzzy
msgid "Size (kB)"
msgstr "Размер"
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:45
+msgid "sounds like"
+msgstr "звучит как"
+
+#: filter/libfilter-i18n.h:46
msgid "Source Account"
msgstr "Исходный счет"
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:47
msgid "Specific header"
msgstr "Специфический заголовок"
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:48
+msgid "starts with"
+msgstr "начинается с"
+
+#: filter/libfilter-i18n.h:50
msgid "Stop Processing"
msgstr "Остановить обработку"
-#: filter/libfilter-i18n.h:33 mail/mail-format.c:889
+#: filter/libfilter-i18n.h:51 mail/mail-format.c:893
#: mail/message-list.etspec.h:9
msgid "Subject"
msgstr "Тема"
-#: filter/libfilter-i18n.h:36
-msgid "contains"
-msgstr "содержит"
-
-#: filter/libfilter-i18n.h:37
-msgid "does not contain"
-msgstr "не содержит"
-
-#: filter/libfilter-i18n.h:38
-msgid "does not end with"
-msgstr "не заканчивается на"
-
-#: filter/libfilter-i18n.h:39
-msgid "does not exist"
-msgstr "не существует."
-
-#: filter/libfilter-i18n.h:40
-msgid "does not sound like"
-msgstr "звучит не как"
-
-#: filter/libfilter-i18n.h:41
-msgid "does not start with"
-msgstr "не начинается с"
-
-#: filter/libfilter-i18n.h:42
-msgid "ends with"
-msgstr "заканчивается на"
-
-#: filter/libfilter-i18n.h:43
-msgid "exists"
-msgstr "cуществуют"
-
-#: filter/libfilter-i18n.h:44
-msgid "is greater than"
-msgstr "больше чем"
-
-#: filter/libfilter-i18n.h:45
-msgid "is less than"
-msgstr "меньше чем"
-
-#: filter/libfilter-i18n.h:46
-msgid "is not"
-msgstr "не является"
-
-#: filter/libfilter-i18n.h:47
-msgid "is"
-msgstr "является"
-
-#: filter/libfilter-i18n.h:48
-msgid "on or after"
-msgstr "на или после"
-
-#: filter/libfilter-i18n.h:49
-msgid "on or before"
-msgstr "на или до"
-
-#: filter/libfilter-i18n.h:50
-msgid "sounds like"
-msgstr "звучит как"
-
-#: filter/libfilter-i18n.h:51
-msgid "starts with"
-msgstr "начинается с"
-
#: filter/libfilter-i18n.h:52
msgid "was after"
msgstr "было после"
@@ -7725,7 +8130,7 @@ msgstr "Правила"
msgid "Add Rule"
msgstr "Добавить правило"
-#: filter/rule-editor.c:299
+#: filter/rule-editor.c:301
msgid "Edit Rule"
msgstr "Правка правила"
@@ -7733,22 +8138,47 @@ msgstr "Правка правила"
msgid "Score Rules"
msgstr "Правила подсчета"
-#: filter/vfolder-rule.c:198
+#: filter/vfolder-rule.c:203
msgid "Oops. You need to to specify at least one folder as a source."
msgstr "Вам надо указать хотя бы одну папку в качестве источника."
-#: importers/elm-importer.c:470 importers/evolution-gnomecard-importer.c:228
-#: importers/netscape-importer.c:816 importers/pine-importer.c:627
-#: shell/e-shell-importer.c:685 shell/importer/intelligent.c:194
-msgid "Import"
-msgstr "Импортировать"
+#: importers/elm-importer.c:96
+#, fuzzy
+msgid "Evolution is importing your old Elm mail"
+msgstr "Компонент Evolution для обработки почты."
+
+#: importers/elm-importer.c:97 importers/netscape-importer.c:108
+#: importers/pine-importer.c:102
+#, fuzzy
+msgid "Importing..."
+msgstr "Импортирование"
+
+#: importers/elm-importer.c:99 importers/netscape-importer.c:110
+#: importers/pine-importer.c:104
+#, fuzzy
+msgid "Please wait"
+msgstr "заканчивается на"
+
+#: importers/elm-importer.c:171 importers/netscape-importer.c:701
+#: importers/pine-importer.c:369
+#, fuzzy, c-format
+msgid "Importing %s as %s"
+msgstr ""
+"Импортирование %s.\n"
+"Начато %s"
-#: importers/elm-importer.c:475 importers/netscape-importer.c:821
-#: importers/pine-importer.c:632 mail/component-factory.c:96
+#: importers/elm-importer.c:377 importers/netscape-importer.c:794
+#: importers/pine-importer.c:506
+#, fuzzy, c-format
+msgid "Scanning %s"
+msgstr "Отправка \"%s\""
+
+#: importers/elm-importer.c:528 importers/netscape-importer.c:967
+#: importers/pine-importer.c:669 mail/component-factory.c:96
msgid "Mail"
msgstr "Почта"
-#: importers/elm-importer.c:498
+#: importers/elm-importer.c:548
msgid ""
"Evolution has found Elm mail files\n"
"Would you like to import them into Evolution?"
@@ -7756,15 +8186,20 @@ msgstr ""
"Evolution нашла почтовые файлы Elm.\n"
"Хотите импортировать их в Evolution?"
-#: importers/elm-importer.c:527
-msgid "Elm mail"
-msgstr "Почта Elm"
+#: importers/elm-importer.c:577
+msgid "Elm"
+msgstr ""
+
+#: importers/evolution-gnomecard-importer.c:230
+#, fuzzy
+msgid "GnomeCard:"
+msgstr "Карточка: "
-#: importers/evolution-gnomecard-importer.c:233 importers/pine-importer.c:637
+#: importers/evolution-gnomecard-importer.c:231 importers/pine-importer.c:674
msgid "Addressbook"
msgstr "Адресная книга"
-#: importers/evolution-gnomecard-importer.c:253
+#: importers/evolution-gnomecard-importer.c:250
msgid ""
"Evolution has found GnomeCard files.\n"
"Would you like them to be imported into Evolution?"
@@ -7772,11 +8207,23 @@ msgstr ""
"Evolution нашла файлы GnomeCard.\n"
"Хотите импортировать их в Evolution?"
-#: importers/netscape-importer.c:826
+#: importers/netscape-importer.c:107
+msgid "Evolution is importing your old Netscape data"
+msgstr ""
+
+#: importers/netscape-importer.c:897 importers/pine-importer.c:602
+msgid "Scanning directory"
+msgstr ""
+
+#: importers/netscape-importer.c:906
+msgid "Starting import"
+msgstr ""
+
+#: importers/netscape-importer.c:972
msgid "Settings"
msgstr "Установки"
-#: importers/netscape-importer.c:851
+#: importers/netscape-importer.c:993
msgid ""
"Evolution has found Netscape mail files.\n"
"Would you like them to be imported into Evolution?"
@@ -7784,7 +8231,11 @@ msgstr ""
"Evolution нашла почтовые файлы Netscape.\n"
"Хотите импортировать их в Evolution?"
-#: importers/pine-importer.c:663
+#: importers/pine-importer.c:101
+msgid "Evolution is importing your old Pine data"
+msgstr ""
+
+#: importers/pine-importer.c:695
msgid ""
"Evolution has found Pine mail files.\n"
"Would you like to import them into Evolution?"
@@ -7792,9 +8243,10 @@ msgstr ""
"Evolution нашла почтовые файлы Pine.\n"
"Хотите импортировать их в Evolution?"
-#: importers/pine-importer.c:691
-msgid "Pine mail"
-msgstr "Почта Pine"
+#: importers/pine-importer.c:723
+#, fuzzy
+msgid "Pine"
+msgstr "Печать"
#: mail/GNOME_Evolution_Mail.oaf.in.h:1
msgid "Evolution component for handling mail."
@@ -7821,14 +8273,10 @@ msgid "Factory for the Evolution composer."
msgstr "Фабрика для редактора почты Evolution."
#: mail/GNOME_Evolution_Mail.oaf.in.h:7
-msgid "Factory for the Evolution mail component."
-msgstr "Фабрика для почтового компонента Evolution."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
msgid "Factory for the Mail Summary component."
msgstr ""
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#: mail/GNOME_Evolution_Mail.oaf.in.h:8
#, fuzzy
msgid "Mail configuration interface"
msgstr "Настройка почты"
@@ -7838,33 +8286,47 @@ msgstr "Настройка почты"
msgid "Folder containing mail"
msgstr "Вирт.папка по списку рассылки"
+#: mail/component-factory.c:97
+msgid "Mail storage folder (internal)"
+msgstr ""
+
+#: mail/component-factory.c:98
+#, fuzzy
+msgid "Virtual Trash"
+msgstr "Виртуальные папки"
+
+#: mail/component-factory.c:98
+#, fuzzy
+msgid "Virtual Trash folder"
+msgstr "Виртуальные папки"
+
#: mail/component-factory.c:114
msgid "This folder cannot contain messages."
msgstr "Эта папка не может содержать сообщения."
-#: mail/component-factory.c:341
+#: mail/component-factory.c:356
msgid "Properties..."
msgstr "Свойства..."
-#: mail/component-factory.c:341
+#: mail/component-factory.c:356
msgid "Change this folder's properties"
msgstr "Изменить свойства этой папки"
-#: mail/component-factory.c:757
+#: mail/component-factory.c:790
#, fuzzy
msgid "New Mail Message"
msgstr "Почтовое сообщение"
-#: mail/component-factory.c:757
+#: mail/component-factory.c:790
#, fuzzy
msgid "New _Mail Message"
msgstr "Почтовое сообщение"
-#: mail/component-factory.c:789
+#: mail/component-factory.c:821
msgid "Cannot initialize Evolution's mail component."
msgstr "Невозможно инициализировать почтовый компонент \"Эволюции\"."
-#: mail/component-factory.c:928
+#: mail/component-factory.c:1007
msgid "Cannot register storage with shell"
msgstr "Не удалось зарегистрировать хранилище с помощью оболочки"
@@ -7877,130 +8339,160 @@ msgstr "Свойства для \"%s\""
msgid "Properties"
msgstr "Свойства"
-#: mail/folder-browser.c:236 mail/mail-display.c:281
+#: mail/folder-browser.c:239 mail/mail-display.c:275
#, c-format
msgid "Could not create temporary directory: %s"
msgstr "Не удалось создать временный каталог: %s"
-#: mail/folder-browser.c:909
+#: mail/folder-browser.c:708
+#, c-format
+msgid "%d new"
+msgstr "Новых %d"
+
+#: mail/folder-browser.c:711 mail/folder-browser.c:716
+#: mail/folder-browser.c:720
+msgid ", "
+msgstr ", "
+
+#: mail/folder-browser.c:712
+#, c-format
+msgid "%d hidden"
+msgstr "Скрытых %d"
+
+#: mail/folder-browser.c:717
+#, fuzzy, c-format
+msgid "%d selected"
+msgstr "Удаленное"
+
+#: mail/folder-browser.c:722
+#, c-format
+msgid "%d unsent"
+msgstr "Неотправленных %d"
+
+#: mail/folder-browser.c:724
+#, c-format
+msgid "%d total"
+msgstr "Всего %d"
+
+#: mail/folder-browser.c:958
msgid "Create vFolder from Search"
msgstr "Создать вирт.папку по поиску"
-#: mail/folder-browser.c:1254
+#: mail/folder-browser.c:1303
msgid "VFolder on _Subject"
msgstr "Вирт.папка по теме"
-#: mail/folder-browser.c:1257
+#: mail/folder-browser.c:1306
msgid "VFolder on Se_nder"
msgstr "Вирт.папка по отправителю"
-#: mail/folder-browser.c:1260
+#: mail/folder-browser.c:1309
msgid "VFolder on _Recipients"
msgstr "Вирт.папка по получателю"
-#: mail/folder-browser.c:1263
+#: mail/folder-browser.c:1312
msgid "VFolder on Mailing _List"
msgstr "Вирт.папка по списку рассылки"
-#: mail/folder-browser.c:1269
+#: mail/folder-browser.c:1318
msgid "Filter on Sub_ject"
msgstr "Фильтр по теме"
-#: mail/folder-browser.c:1272
+#: mail/folder-browser.c:1321
msgid "Filter on Sen_der"
msgstr "Фильтр по отправителю"
-#: mail/folder-browser.c:1275
+#: mail/folder-browser.c:1324
msgid "Filter on Re_cipients"
msgstr "Фильтр по получателям"
-#: mail/folder-browser.c:1278
+#: mail/folder-browser.c:1327
msgid "Filter on _Mailing List"
msgstr "Фильтр по списку рассылки"
-#: mail/folder-browser.c:1289 ui/evolution-mail-message.xml.h:89
+#: mail/folder-browser.c:1338 ui/evolution-mail-message.xml.h:89
#, fuzzy
msgid "_Edit as New Message..."
msgstr "Печать сообщения..."
-#: mail/folder-browser.c:1291 ui/evolution-mail-message.xml.h:97
+#: mail/folder-browser.c:1340 ui/evolution-mail-message.xml.h:97
msgid "_Save As..."
msgstr "Сохранить как..."
-#: mail/folder-browser.c:1293
+#: mail/folder-browser.c:1342
msgid "_Print"
msgstr "Печать"
-#: mail/folder-browser.c:1298 ui/evolution-mail-message.xml.h:96
+#: mail/folder-browser.c:1347 ui/evolution-mail-message.xml.h:96
msgid "_Reply to Sender"
msgstr "Ответить отправителю"
-#: mail/folder-browser.c:1300 ui/evolution-mail-message.xml.h:69
+#: mail/folder-browser.c:1349 ui/evolution-mail-message.xml.h:69
msgid "Reply to _List"
msgstr "Ответить в список"
-#: mail/folder-browser.c:1302 ui/evolution-mail-message.xml.h:68
+#: mail/folder-browser.c:1351 ui/evolution-mail-message.xml.h:68
msgid "Reply to _All"
msgstr "Ответить всем"
-#: mail/folder-browser.c:1304
+#: mail/folder-browser.c:1353
msgid "_Forward"
msgstr "Переслать"
-#: mail/folder-browser.c:1307 ui/evolution-mail-message.xml.h:40
+#: mail/folder-browser.c:1356 ui/evolution-mail-message.xml.h:40
msgid "Mar_k as Read"
msgstr "Пометить как прочитанное"
-#: mail/folder-browser.c:1309 ui/evolution-mail-message.xml.h:42
+#: mail/folder-browser.c:1358 ui/evolution-mail-message.xml.h:42
msgid "Mark as U_nread"
msgstr "Пометить как непрочтенное"
-#: mail/folder-browser.c:1311
+#: mail/folder-browser.c:1360
msgid "Mark as _Important"
msgstr "Пометить как важное"
-#: mail/folder-browser.c:1313
+#: mail/folder-browser.c:1362
msgid "Mark as Unim_portant"
msgstr "Пометить как неважное"
-#: mail/folder-browser.c:1318
+#: mail/folder-browser.c:1367
msgid "_Move to Folder..."
msgstr "Переместить в папку..."
-#: mail/folder-browser.c:1320
+#: mail/folder-browser.c:1369
msgid "_Copy to Folder..."
msgstr "Скопировать в папку..."
-#: mail/folder-browser.c:1324 ui/evolution-mail-message.xml.h:99
+#: mail/folder-browser.c:1373 ui/evolution-mail-message.xml.h:99
msgid "_Undelete"
msgstr "Восстановить"
-#: mail/folder-browser.c:1329
+#: mail/folder-browser.c:1378
msgid "Add Sender to Address Book"
msgstr "Добавить отправителя в адресную книгу"
-#: mail/folder-browser.c:1334
+#: mail/folder-browser.c:1383
msgid "Apply Filters"
msgstr "Применить фильтры"
-#: mail/folder-browser.c:1338
+#: mail/folder-browser.c:1387
msgid "Create Ru_le From Message"
msgstr "Создать правило из сообщения"
-#: mail/folder-browser.c:1496
+#: mail/folder-browser.c:1538
msgid "Filter on Mailing List"
msgstr "Фильтр по списку рассылки"
-#: mail/folder-browser.c:1497
+#: mail/folder-browser.c:1539
msgid "VFolder on Mailing List"
msgstr "Вирт.папка по списку рассылки"
-#: mail/folder-browser.c:1499
+#: mail/folder-browser.c:1541
#, c-format
msgid "Filter on Mailing List (%s)"
msgstr "Фильтр по списку рассылки (%s)"
-#: mail/folder-browser.c:1500
+#: mail/folder-browser.c:1542
#, c-format
msgid "VFolder on Mailing List (%s)"
msgstr "Вирт.папка по списку рассылки (%s)"
@@ -8074,11 +8566,16 @@ msgstr "Редактор новостей Evolution"
msgid "Evolution Account Editor"
msgstr "Редактор счетов Evolution"
-#: mail/mail-account-gui.c:999
+#: mail/mail-account-gui.c:945
+#, fuzzy
+msgid "Could not save signature file."
+msgstr "Не удалось подключиться к POP серверу на %s."
+
+#: mail/mail-account-gui.c:1022
msgid "Save signature"
msgstr "Сохранить подпись"
-#: mail/mail-account-gui.c:1005
+#: mail/mail-account-gui.c:1028
msgid ""
"This signature has been changed, but hasn't been saved.\n"
"\n"
@@ -8088,40 +8585,40 @@ msgstr ""
"\n"
"Вы хотите сохранить изменения?"
-#: mail/mail-account-gui.c:1585
+#: mail/mail-account-gui.c:1611
msgid "You may not create two accounts with the same name."
msgstr ""
-#: mail/mail-accounts.c:145
+#: mail/mail-accounts.c:144
msgid " (default)"
msgstr "(Исх.значения)"
-#: mail/mail-accounts.c:190
+#: mail/mail-accounts.c:189
msgid "Disable"
msgstr "Отключить"
-#: mail/mail-accounts.c:192
+#: mail/mail-accounts.c:191
msgid "Enable"
msgstr "Включить"
-#: mail/mail-accounts.c:280
+#: mail/mail-accounts.c:278
msgid "Are you sure you want to delete this account?"
msgstr "Вы уверены что хотите удалить этот счет?"
-#: mail/mail-accounts.c:284
+#: mail/mail-accounts.c:282
msgid "Don't delete"
msgstr "Не удалять"
-#: mail/mail-accounts.c:287
+#: mail/mail-accounts.c:285
msgid "Really delete account?"
msgstr "Действительно удалить счёт?"
-#: mail/mail-accounts.c:513 mail/mail-accounts.c:517
+#: mail/mail-accounts.c:511 mail/mail-accounts.c:515
msgid "Are you sure you want to delete this news account?"
msgstr "Вы уверены что хотите удалить этот новый счет?"
#. give our dialog an Close button and title
-#: mail/mail-accounts.c:759 mail/mail-config.glade.h:42
+#: mail/mail-accounts.c:757 mail/mail-config.glade.h:42
#, fuzzy
msgid "Mail Settings"
msgstr "Установки почты..."
@@ -8182,7 +8679,19 @@ msgstr ""
msgid "You have not set a mail transport method"
msgstr "Вы не установили метод транспортировки почты"
-#: mail/mail-callbacks.c:218
+#. FIXME: this wording sucks
+#: mail/mail-callbacks.c:216
+msgid ""
+"You are sending an HTML-formatted message, but the following recipients do "
+"not want HTML-formatted mail:\n"
+msgstr ""
+
+#: mail/mail-callbacks.c:231
+#, fuzzy
+msgid "Send anyway?"
+msgstr "Отправить почту"
+
+#: mail/mail-callbacks.c:273
msgid ""
"This message has no subject.\n"
"Really send?"
@@ -8190,44 +8699,59 @@ msgstr ""
"Это сообщение не имеет темы.\n"
"Послать его?"
-#: mail/mail-callbacks.c:253
+#: mail/mail-callbacks.c:317
+msgid ""
+"Since the contact list you are sending to is configured to hide the list's "
+"addresses, this message will contain only Bcc recipients."
+msgstr ""
+
+#: mail/mail-callbacks.c:321
+#, fuzzy
+msgid "This message contains only Bcc recipients."
+msgstr "Невозможно отправить сообщение: не определены получатели."
+
+#: mail/mail-callbacks.c:325
msgid ""
-"This message contains only Bcc recipients.\n"
"It is possible that the mail server may reveal the recipients by adding an "
"Apparently-To header.\n"
"Send anyway?"
msgstr ""
-#: mail/mail-callbacks.c:339
+#: mail/mail-callbacks.c:419
+msgid "This message contains invalid recipients:"
+msgstr ""
+
+#: mail/mail-callbacks.c:453
msgid "You must specify recipients in order to send this message."
msgstr "Вы должны указать получателей, чтобы отправить это сообщение."
-#: mail/mail-callbacks.c:390
+#: mail/mail-callbacks.c:549
msgid "You must configure an account before you can send this email."
msgstr "Вы должны настроить счет до того как вы сможете послать почту."
-#: mail/mail-callbacks.c:632
+#: mail/mail-callbacks.c:779
+#, fuzzy
+msgid "an unknown sender"
+msgstr "Неизвестная ошибка"
+
+#: mail/mail-callbacks.c:784
msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
msgstr ""
-#: mail/mail-callbacks.c:895
-msgid "Forwarded message:\n"
-msgstr "Пересланное сообщение:\n"
-
-#: mail/mail-callbacks.c:995
+#: mail/mail-callbacks.c:1162
msgid "Move message(s) to"
msgstr "Переместить сообщение в"
-#: mail/mail-callbacks.c:997
+#: mail/mail-callbacks.c:1164
msgid "Copy message(s) to"
msgstr "Скопировать сообщения в"
-#: mail/mail-callbacks.c:1366
+#: mail/mail-callbacks.c:1538
#, c-format
msgid "Are you sure you want to edit all %d messages?"
msgstr "Вы уверены что вы хотите править все %d сообщений?"
-#: mail/mail-callbacks.c:1388
+#: mail/mail-callbacks.c:1560
msgid ""
"You may only edit messages saved\n"
"in the Drafts folder."
@@ -8235,7 +8759,7 @@ msgstr ""
"Вы можете править только сообщения\n"
"сохраненные в папке \"Черновики\"."
-#: mail/mail-callbacks.c:1422
+#: mail/mail-callbacks.c:1594
msgid ""
"You may only resend messages\n"
"in the Sent folder."
@@ -8243,28 +8767,28 @@ msgstr ""
"Вы можете только перепослать сообщения\n"
"из папки \"Отправленные\"."
-#: mail/mail-callbacks.c:1434
+#: mail/mail-callbacks.c:1606
#, fuzzy, c-format
msgid "Are you sure you want to resend all %d messages?"
msgstr "Вы уверены что вы хотите править все %d сообщений?"
-#: mail/mail-callbacks.c:1455
+#: mail/mail-callbacks.c:1627
msgid "No Message Selected"
msgstr "Сообщение не выбрано"
-#: mail/mail-callbacks.c:1540
+#: mail/mail-callbacks.c:1712
msgid "Save Message As..."
msgstr "Сохранить сообщение как..."
-#: mail/mail-callbacks.c:1542
+#: mail/mail-callbacks.c:1714
msgid "Save Messages As..."
msgstr "Сохранить сообщения как..."
-#: mail/mail-callbacks.c:1709 widgets/misc/e-messagebox.c:159
+#: mail/mail-callbacks.c:1859 widgets/misc/e-messagebox.c:159
msgid "Warning"
msgstr "Предупреждение"
-#: mail/mail-callbacks.c:1714
+#: mail/mail-callbacks.c:1864
msgid ""
"This operation will permanently erase all messages marked as deleted. If you "
"continue, you will not be able to recover these messages.\n"
@@ -8272,12 +8796,12 @@ msgid ""
"Really erase these messages?"
msgstr ""
-#: mail/mail-callbacks.c:1721
+#: mail/mail-callbacks.c:1871
#, fuzzy
msgid "Do not ask me again."
msgstr "Не спрашивать снова"
-#: mail/mail-callbacks.c:1826
+#: mail/mail-callbacks.c:1976
#, c-format
msgid ""
"Error loading filter information:\n"
@@ -8286,19 +8810,19 @@ msgstr ""
"Ошибка при загрузке информации фильтра:\n"
"%s"
-#: mail/mail-callbacks.c:1836
+#: mail/mail-callbacks.c:1986
msgid "Filters"
msgstr "Фильтры"
-#: mail/mail-callbacks.c:1882
+#: mail/mail-callbacks.c:2032
msgid "Print Message"
msgstr "Печать сообщения"
-#: mail/mail-callbacks.c:1928
+#: mail/mail-callbacks.c:2078
msgid "Printing of message failed"
msgstr "Сбой печати сообщения"
-#: mail/mail-callbacks.c:2012
+#: mail/mail-callbacks.c:2162
#, c-format
msgid "Are you sure you want to open all %d messages in separate windows?"
msgstr "Вы уверены что хотите открыть все %d сообщений в отдельных окнах?"
@@ -8358,26 +8882,31 @@ msgstr ""
"отображения."
#. set window title
-#: mail/mail-config-druid.c:558
+#: mail/mail-config-druid.c:570
#, fuzzy
msgid "Evolution Account Assistant"
msgstr "Помощник по счетам Evolution"
+#: mail/mail-config.c:1486
+#, fuzzy
+msgid "Evolution Shortcuts"
+msgstr "Установка Evolution"
+
#. right now, the URL always works basically as a matter of luck...
#. * both IMAP and mbox spool stores have INBOX as their inbox folder
#. * name. I don't think this will work with maildir. How can we figure out
#. * what shortcut to insert?
#.
-#: mail/mail-config.c:1579
+#: mail/mail-config.c:1618
#, fuzzy, c-format
msgid "%s: Inbox"
msgstr "Входящие"
-#: mail/mail-config.c:1809
+#: mail/mail-config.c:1851
msgid "Checking Service"
msgstr ""
-#: mail/mail-config.c:1880 mail/mail-config.c:1883
+#: mail/mail-config.c:1922 mail/mail-config.c:1925
msgid "Connecting to server..."
msgstr "Подключение к серверу..."
@@ -8397,7 +8926,7 @@ msgstr "Счет"
msgid "Account Information"
msgstr "Информация о счете"
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:5 shell/glade/evolution-startup-wizard.glade.h:1
msgid "Account Management"
msgstr "Управление счетами"
@@ -8473,11 +9002,11 @@ msgstr ""
msgid "Display"
msgstr "Отобразить"
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:27 shell/glade/evolution-startup-wizard.glade.h:2
msgid "Done"
msgstr "Сделано"
-#: mail/mail-config.glade.h:28 shell/e-local-storage.c:176
+#: mail/mail-config.glade.h:28 shell/e-local-storage.c:174
msgid "Drafts"
msgstr "Черновики"
@@ -8515,7 +9044,7 @@ msgstr "HTML-файл подписи:"
msgid "IMAPv4 "
msgstr "IMAPv4"
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:37 shell/glade/evolution-startup-wizard.glade.h:4
msgid "Identity"
msgstr "Именование"
@@ -8593,7 +9122,7 @@ msgstr "Почтовый каталог Qmail "
msgid "Quoted"
msgstr "Процитированное"
-#: mail/mail-config.glade.h:61
+#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:6
msgid "Receiving Email"
msgstr "Получение эл.почты"
@@ -8625,7 +9154,7 @@ msgstr "Выбрать файл журнала для фильтров..."
msgid "Select PGP binary"
msgstr "Выбрать программу PGP"
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:70 shell/glade/evolution-startup-wizard.glade.h:7
msgid "Sending Email"
msgstr "Отправка эл.почты"
@@ -8634,7 +9163,7 @@ msgid "Sending Mail"
msgstr "Отправка эл.почты"
#: mail/mail-config.glade.h:73 mail/message-list.etspec.h:6
-#: shell/e-local-storage.c:179
+#: shell/e-local-storage.c:177
msgid "Sent"
msgstr "Отправленное"
@@ -8785,15 +9314,20 @@ msgstr "Файл подписи:"
msgid "_Username:"
msgstr "Имя пользователя:"
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:115
+#, fuzzy
+msgid "description"
+msgstr "Описание:"
+
+#: mail/mail-config.glade.h:117
msgid "newswindow1"
msgstr "newswindow1"
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:118
msgid "placeholder"
msgstr ""
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:119
msgid "seconds."
msgstr "секунд."
@@ -8841,214 +9375,196 @@ msgstr "Невозможно создать окно редактора."
msgid "Could not create a S/MIME decode context."
msgstr "Невозможно создать окно редактора."
-#: mail/mail-display.c:222
+#: mail/mail-display.c:223
msgid "Save Attachment"
msgstr "Сохранить вложение"
-#: mail/mail-display.c:341
+#: mail/mail-display.c:327
msgid "Save to Disk..."
msgstr "Сохранить на диске..."
-#: mail/mail-display.c:343
+#: mail/mail-display.c:329
msgid "View Inline"
msgstr "Встроенный просмотр"
-#: mail/mail-display.c:345
+#: mail/mail-display.c:331
#, c-format
msgid "Open in %s..."
msgstr "Открыть в %s..."
-#: mail/mail-display.c:406
+#: mail/mail-display.c:392
#, c-format
msgid "View Inline (via %s)"
msgstr "Встроенный просмотр (через %s)"
-#: mail/mail-display.c:410
+#: mail/mail-display.c:396
msgid "Hide"
msgstr "Скрыть"
-#: mail/mail-display.c:431
+#: mail/mail-display.c:417
msgid "External Viewer"
msgstr "Внешняя программа просмотра"
-#: mail/mail-display.c:1055
+#: mail/mail-display.c:1053
msgid "Loading message content"
msgstr "Загрузка содержимого сообщения"
-#: mail/mail-display.c:1411
+#: mail/mail-display.c:1515
msgid "Open Link in Browser"
msgstr "Открыть ссылку в браузере"
-#: mail/mail-display.c:1413
+#: mail/mail-display.c:1517
msgid "Copy Link Location"
msgstr "Скопировать ссылку"
-#: mail/mail-display.c:1415
+#: mail/mail-display.c:1519
msgid "Save Link as (FIXME)"
msgstr "Сохранить ссылку как"
-#: mail/mail-display.c:1417
+#: mail/mail-display.c:1521
msgid "Save Image as..."
msgstr "Сохранить изображение как..."
-#: mail/mail-folder-cache.c:147
-#, c-format
-msgid "%d new"
-msgstr "Новых %d"
-
-#: mail/mail-folder-cache.c:153 mail/mail-folder-cache.c:160
-#: mail/mail-folder-cache.c:167
-msgid ", "
-msgstr ", "
-
-#: mail/mail-folder-cache.c:154
-#, c-format
-msgid "%d hidden"
-msgstr "Скрытых %d"
-
-#: mail/mail-folder-cache.c:161
-#, fuzzy, c-format
-msgid "%d selected"
-msgstr "Удаленное"
-
-#: mail/mail-folder-cache.c:170
-#, c-format
-msgid "%d unsent"
-msgstr "Неотправленных %d"
-
-#: mail/mail-folder-cache.c:172
-#, c-format
-msgid "%d total"
-msgstr "Всего %d"
-
-#: mail/mail-format.c:623
+#: mail/mail-format.c:627
#, c-format
msgid "%s attachment"
msgstr "%s вложение"
-#: mail/mail-format.c:676
+#: mail/mail-format.c:680
msgid "Could not parse MIME message. Displaying as source."
msgstr "Не удалось разобрать сообщение MIME. Отображается как есть."
-#: mail/mail-format.c:760
+#: mail/mail-format.c:764
msgid "Date"
msgstr "Дата"
-#: mail/mail-format.c:856
+#: mail/mail-format.c:860
msgid "Bad Address"
msgstr "Неправильный эл.адрес"
-#: mail/mail-format.c:878 mail/message-list.etspec.h:3
+#: mail/mail-format.c:882 mail/message-list.etspec.h:3
msgid "From"
msgstr "От"
-#: mail/mail-format.c:881
+#: mail/mail-format.c:885
msgid "Reply-To"
msgstr "Ответить"
-#: mail/mail-format.c:884 mail/message-list.etspec.h:10
+#: mail/mail-format.c:888 mail/message-list.etspec.h:10
msgid "To"
msgstr "Кому"
-#: mail/mail-format.c:887
+#: mail/mail-format.c:891
msgid "Cc"
msgstr "Копия"
-#: mail/mail-format.c:1306
+#: mail/mail-format.c:1311
msgid "No GPG/PGP program configured."
msgstr "Программа GPG/PGP не настроена."
-#: mail/mail-format.c:1322
+#: mail/mail-format.c:1327
msgid "Encrypted message not displayed"
msgstr "Зашифрованное сообщение не отображается"
-#: mail/mail-format.c:1333
+#: mail/mail-format.c:1338
msgid "Encrypted message"
msgstr "Зашифрованное сообщение"
-#: mail/mail-format.c:1334
+#: mail/mail-format.c:1339
msgid "Click icon to decrypt."
msgstr "Щелкните на пиктограмме для дешифрации."
-#: mail/mail-format.c:1392
+#: mail/mail-format.c:1394
msgid "This message is digitally signed and has been found to be authentic."
msgstr ""
"Это сообщение с цифровой подписью, которая прошла проверку идентичности."
-#: mail/mail-format.c:1403
+#: mail/mail-format.c:1405
msgid "This message is digitally signed but can not be proven to be authentic."
msgstr ""
"Это сообщение с цифровой подписью, которая не может быть проверена на "
"идентичность."
-#: mail/mail-format.c:2061
+#: mail/mail-format.c:2083
#, c-format
msgid "Pointer to FTP site (%s)"
msgstr "Указатель на FTP сайт (%s)"
-#: mail/mail-format.c:2075
+#: mail/mail-format.c:2097
#, c-format
msgid "Pointer to local file (%s) valid at site \"%s\""
msgstr ""
-#: mail/mail-format.c:2080
+#: mail/mail-format.c:2102
#, c-format
msgid "Pointer to local file (%s)"
msgstr "Указатель на локальный файл (%s)"
-#: mail/mail-format.c:2109
+#: mail/mail-format.c:2131
#, fuzzy, c-format
msgid "Pointer to remote data (%s)"
msgstr "Указатель на FTP сайт (%s)"
-#: mail/mail-format.c:2117
+#: mail/mail-format.c:2139
#, c-format
msgid "Pointer to unknown external data (\"%s\" type)"
msgstr "Указатель на неизвестные внешние данные (типа \"%s\")"
-#: mail/mail-format.c:2122
+#: mail/mail-format.c:2144
msgid "Malformed external-body part."
msgstr ""
-#: mail/mail-local.c:330
+#: mail/mail-local.c:547
+#, fuzzy
+msgid "Reconfiguring folder"
+msgstr "Обновление папки"
+
+#: mail/mail-local.c:620
+#, c-format
+msgid ""
+"Cannot save folder metainfo; you'll probably find you can't\n"
+"open this folder anymore: %s: %s"
+msgstr ""
+
+#: mail/mail-local.c:676
#, fuzzy, c-format
-msgid "No such folder /%s"
-msgstr "Нет такой папки %s"
+msgid "Cannot save folder metainfo to %s: %s"
+msgstr "Не удалось получить папку: %s: %s"
-#: mail/mail-local.c:460
+#: mail/mail-local.c:722
#, fuzzy, c-format
-msgid "Registering '%s'"
-msgstr "Открытие \"%s\""
+msgid "Cannot delete folder metadata %s: %s"
+msgstr ""
+"Невозможно удалить папку \"%s\":\n"
+"%s"
-#: mail/mail-local.c:748
+#: mail/mail-local.c:1052
#, c-format
msgid "Changing folder \"%s\" to \"%s\" format"
msgstr "Изменение папки \"%s\" в формат \"%s\""
-#: mail/mail-local.c:869
+#: mail/mail-local.c:1067
#, c-format
-msgid ""
-"Cannot save folder metainfo; you'll probably find you can't\n"
-"open this folder anymore: %s"
+msgid "%s may not be reconfigured because it is not a local folder"
msgstr ""
-#: mail/mail-local.c:909
+#: mail/mail-local.c:1089
msgid ""
"If you can no longer open this mailbox, then\n"
"you may need to repair it manually."
msgstr ""
-#: mail/mail-local.c:1002
+#: mail/mail-local.c:1180
#, fuzzy
msgid "You cannot change the format of a non-local folder."
msgstr "Вы не можете скопировать сообщения из этой папки для мусора."
-#: mail/mail-local.c:1013
+#: mail/mail-local.c:1190
#, c-format
msgid "Reconfigure %s"
msgstr "Перенастроить %s"
-#: mail/mail-mt.c:187
+#: mail/mail-mt.c:188
#, c-format
msgid ""
"Error while '%s':\n"
@@ -9057,7 +9573,7 @@ msgstr ""
"Ошибка при \"%s\":\n"
"%s"
-#: mail/mail-mt.c:190
+#: mail/mail-mt.c:191
#, c-format
msgid ""
"Error while performing operation:\n"
@@ -9067,126 +9583,135 @@ msgstr ""
"%s"
#. Remember the password?
-#: mail/mail-mt.c:439
+#: mail/mail-mt.c:454
msgid "Remember this password"
msgstr "Запомнить этот пароль"
-#: mail/mail-mt.c:796
+#: mail/mail-mt.c:511
+#, fuzzy, c-format
+msgid "Enter Password for %s"
+msgstr "Пожалуйста введите вашу парольную фразу для %s"
+
+#: mail/mail-mt.c:514
+#, fuzzy
+msgid "Enter Password"
+msgstr "Пароль"
+
+#: mail/mail-mt.c:824
msgid "Working"
msgstr "Обработка"
-#: mail/mail-ops.c:84
+#: mail/mail-ops.c:86
msgid "Filtering Folder"
msgstr "Фильтрация папки"
-#: mail/mail-ops.c:227
+#: mail/mail-ops.c:229
msgid "Fetching Mail"
msgstr "Получение эл.почты"
-#: mail/mail-ops.c:591
+#: mail/mail-ops.c:482 mail/mail-ops.c:512
+msgid "However, the message was successfully sent."
+msgstr ""
+
+#: mail/mail-ops.c:549
#, c-format
msgid "Sending \"%s\""
msgstr "Отправка \"%s\""
-#: mail/mail-ops.c:709
+#: mail/mail-ops.c:668
#, c-format
msgid "Sending message %d of %d"
msgstr "Отправка сообщения %d из %d"
-#: mail/mail-ops.c:728
+#: mail/mail-ops.c:687
#, c-format
msgid "Failed on message %d of %d"
msgstr "Сбой на сообщении %d из %d"
-#: mail/mail-ops.c:730 mail/mail-send-recv.c:498
+#: mail/mail-ops.c:689 mail/mail-send-recv.c:522
msgid "Complete."
msgstr "Выполнено."
-#: mail/mail-ops.c:823
+#: mail/mail-ops.c:782
msgid "Saving message to folder"
msgstr "Сохранение сообщения в папке"
-#: mail/mail-ops.c:902
+#: mail/mail-ops.c:861
#, c-format
msgid "Moving messages to %s"
msgstr "Перемещение сообщений в %s"
-#: mail/mail-ops.c:902
+#: mail/mail-ops.c:861
#, c-format
msgid "Copying messages to %s"
msgstr "Копирование сообщений в %s"
-#: mail/mail-ops.c:919
+#: mail/mail-ops.c:878
msgid "Moving"
msgstr "Перемещение"
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:881
msgid "Copying"
msgstr "Копирование"
-#: mail/mail-ops.c:1034
+#: mail/mail-ops.c:993
#, c-format
msgid "Scanning folders in \"%s\""
msgstr "Считывание папок в \"%s\""
#. Fill in the new fields
-#: mail/mail-ops.c:1074 mail/mail-ops.c:1075 shell/e-local-storage.c:181
+#: mail/mail-ops.c:1040 shell/e-local-storage.c:179
msgid "Trash"
msgstr "Мусорная корзина"
-#: mail/mail-ops.c:1211
+#: mail/mail-ops.c:1173
msgid "Forwarded messages"
msgstr "Пересланные сообщения"
-#: mail/mail-ops.c:1253
+#: mail/mail-ops.c:1215
#, c-format
msgid "Opening folder %s"
msgstr "Открытие папки \"%s\""
-#: mail/mail-ops.c:1322
+#: mail/mail-ops.c:1284
#, c-format
msgid "Opening store %s"
msgstr "Открытие хранилища %s"
-#: mail/mail-ops.c:1395
-#, fuzzy, c-format
-msgid "Creating folder %s"
-msgstr "Открытие папки \"%s\""
-
-#: mail/mail-ops.c:1465
+#: mail/mail-ops.c:1353
#, c-format
msgid "Removing folder %s"
msgstr "Удаление папки \"%s\""
-#: mail/mail-ops.c:1552
+#: mail/mail-ops.c:1445
#, fuzzy, c-format
-msgid "Synchronizing '%s'"
-msgstr "Синхронизация папки"
+msgid "Storing folder '%s'"
+msgstr "Открытие папки \"%s\""
-#: mail/mail-ops.c:1603
+#: mail/mail-ops.c:1496
msgid "Refreshing folder"
msgstr "Обновление папки"
-#: mail/mail-ops.c:1639
+#: mail/mail-ops.c:1532
msgid "Expunging folder"
msgstr "Вычеркивание папки"
-#: mail/mail-ops.c:1688
+#: mail/mail-ops.c:1581
#, c-format
msgid "Retrieving message %s"
msgstr "Получение сообщения %s"
-#: mail/mail-ops.c:1755
+#: mail/mail-ops.c:1648
#, fuzzy, c-format
msgid "Retrieving %d message(s)"
msgstr "Получение сообщений"
-#: mail/mail-ops.c:1841
+#: mail/mail-ops.c:1734
#, c-format
msgid "Saving %d messsage(s)"
msgstr "Сохранение %d сообщений"
-#: mail/mail-ops.c:1921
+#: mail/mail-ops.c:1846
#, c-format
msgid ""
"Unable to create output file: %s\n"
@@ -9195,7 +9720,7 @@ msgstr ""
"Не удалось создать файл вывода: %s\n"
" %s"
-#: mail/mail-ops.c:1947
+#: mail/mail-ops.c:1874
#, c-format
msgid ""
"Error saving messages to: %s:\n"
@@ -9204,11 +9729,11 @@ msgstr ""
"Ошибка сохранения сообщений в: %s:\n"
" %s"
-#: mail/mail-ops.c:2021
+#: mail/mail-ops.c:1948
msgid "Saving attachment"
msgstr "Сохранение вложения"
-#: mail/mail-ops.c:2037
+#: mail/mail-ops.c:1964
#, c-format
msgid ""
"Cannot create output file: %s:\n"
@@ -9217,12 +9742,12 @@ msgstr ""
"Не удалось создать файл вывода: %s\n"
" %s"
-#: mail/mail-ops.c:2068
+#: mail/mail-ops.c:1995
#, c-format
msgid "Could not write data: %s"
msgstr "Невозможно записать данные: %s"
-#: mail/mail-ops.c:2137
+#: mail/mail-ops.c:2064
#, c-format
msgid "Disconnecting from %s"
msgstr ""
@@ -9235,55 +9760,76 @@ msgstr "Поиск"
msgid "(Untitled Message)"
msgstr "(Неозаглавленное сообщение)"
-#: mail/mail-search.c:237
+#: mail/mail-search.c:241
msgid "Untitled Message"
msgstr "Неозаглавленное сообщение"
-#: mail/mail-search.c:241
+#: mail/mail-search.c:245
msgid "Empty Message"
msgstr "Пустое сообщение"
-#: mail/mail-search.c:288
+#: mail/mail-search.c:292
msgid "Find in Message"
msgstr "Поиск в сообщении"
-#: mail/mail-search.c:318
+#: mail/mail-search.c:322
msgid "Case Sensitive"
msgstr "Учитывать регистр"
-#: mail/mail-search.c:320
+#: mail/mail-search.c:324
msgid "Search Forward"
msgstr "Поиск вперёд"
-#: mail/mail-search.c:340
+#: mail/mail-search.c:344
msgid "Find:"
msgstr "Поиск:"
-#: mail/mail-search.c:343
+#: mail/mail-search.c:347
msgid "Matches:"
msgstr "Совпадения:"
-#: mail/mail-send-recv.c:138
+#: mail/mail-send-recv.c:139
msgid "Cancelling..."
msgstr "Отмена..."
-#: mail/mail-send-recv.c:257
-msgid "Send & Receive mail"
+#: mail/mail-send-recv.c:243
+#, fuzzy, c-format
+msgid "Server: %s, Type: %s"
+msgstr "Тип сервера:"
+
+#: mail/mail-send-recv.c:245
+#, c-format
+msgid "Path: %s, Type: %s"
+msgstr ""
+
+#: mail/mail-send-recv.c:247
+#, fuzzy, c-format
+msgid "Type: %s"
+msgstr "Тип:"
+
+#: mail/mail-send-recv.c:282
+#, fuzzy
+msgid "Send & Receive Mail"
msgstr "Получение и отправка почты"
-#: mail/mail-send-recv.c:311
+#: mail/mail-send-recv.c:283
+#, fuzzy
+msgid "Cancel All"
+msgstr "Отмена"
+
+#: mail/mail-send-recv.c:333
msgid "Updating..."
msgstr "Обновление..."
-#: mail/mail-send-recv.c:311 mail/mail-send-recv.c:364
+#: mail/mail-send-recv.c:334 mail/mail-send-recv.c:387
msgid "Waiting..."
msgstr "Ожидание..."
-#: mail/mail-send-recv.c:494
+#: mail/mail-send-recv.c:518
msgid "Cancelled."
msgstr "Отменено."
-#: mail/mail-session.c:182
+#: mail/mail-session.c:183
msgid "User canceled operation."
msgstr ""
@@ -9292,93 +9838,98 @@ msgstr ""
msgid "Couldn't create temporary mbox `%s': %s"
msgstr "Не удалось создать временный mbox \"%s\": %s"
-#: mail/mail-tools.c:241
+#: mail/mail-tools.c:299
#, c-format
msgid "Forwarded message - %s"
msgstr "Пересланное сообщение - %s"
-#: mail/mail-tools.c:245
+#: mail/mail-tools.c:303
msgid "Forwarded message"
msgstr "Пересланные сообщения"
-#: mail/mail-tools.c:471
+#: mail/mail-tools.c:439
msgid "Forwarded Message"
msgstr "Пересланное сообщение"
-#: mail/mail-vfolder.c:278
+#: mail/mail-vfolder.c:161
+#, fuzzy, c-format
+msgid "Setting up vfolder: %s"
+msgstr "Открытие папки \"%s\""
+
+#: mail/mail-vfolder.c:435
msgid "VFolders"
msgstr "Вирт.папки"
-#: mail/mail-vfolder.c:498
+#: mail/mail-vfolder.c:541
msgid "New VFolder"
msgstr "Новая вирт.папка"
-#: mail/message-browser.c:125
+#: mail/message-browser.c:121
msgid "(No subject)"
msgstr "(Без темы)"
-#: mail/message-browser.c:127
+#: mail/message-browser.c:123
#, c-format
msgid "%s - Message"
msgstr "%s - Сообщение"
-#: mail/message-list.c:636
+#: mail/message-list.c:640
msgid "Unseen"
msgstr "Непрочитанное"
-#: mail/message-list.c:637
+#: mail/message-list.c:641
msgid "Seen"
msgstr "Прочитанное"
-#: mail/message-list.c:638
+#: mail/message-list.c:642
msgid "Answered"
msgstr "Отвечено"
-#: mail/message-list.c:639
+#: mail/message-list.c:643
msgid "Multiple Unseen Messages"
msgstr "Множество непросмотренных сообщений"
-#: mail/message-list.c:640
+#: mail/message-list.c:644
msgid "Multiple Messages"
msgstr "Множество сообщений"
-#: mail/message-list.c:644
+#: mail/message-list.c:648
msgid "Lowest"
msgstr "Самый низкий"
-#: mail/message-list.c:645
+#: mail/message-list.c:649
msgid "Lower"
msgstr "Низкий"
-#: mail/message-list.c:649
+#: mail/message-list.c:653
msgid "Higher"
msgstr "Высокий"
-#: mail/message-list.c:650
+#: mail/message-list.c:654
msgid "Highest"
msgstr "Самый высокий"
-#: mail/message-list.c:900
+#: mail/message-list.c:904
msgid "?"
msgstr "?"
-#: mail/message-list.c:907
+#: mail/message-list.c:911
msgid "Today %l:%M %p"
msgstr "Сегодня %I:%M %p"
-#: mail/message-list.c:916
+#: mail/message-list.c:920
msgid "Yesterday %l:%M %p"
msgstr "Вчера %l:%M %p"
-#: mail/message-list.c:928
+#: mail/message-list.c:932
msgid "%a %l:%M %p"
msgstr "%a %l:%M %p"
-#: mail/message-list.c:938
+#: mail/message-list.c:942
msgid "%b %d %Y"
msgstr "%b %d %Y"
-#: mail/message-list.c:2312
+#: mail/message-list.c:2331
msgid "Generating message list"
msgstr "Создание списка сообщений"
@@ -9396,37 +9947,37 @@ msgstr "Дата получения"
msgid "Size"
msgstr "Размер:"
-#: mail/subscribe-dialog.c:174
+#: mail/subscribe-dialog.c:219
#, fuzzy, c-format
msgid "Scanning folders under %s on \"%s\""
msgstr "Считывание папок в \"%s\""
-#: mail/subscribe-dialog.c:176
+#: mail/subscribe-dialog.c:221
#, fuzzy, c-format
msgid "Scanning root-level folders on \"%s\""
msgstr "Считывание папок в \"%s\""
-#: mail/subscribe-dialog.c:275
+#: mail/subscribe-dialog.c:320
#, c-format
msgid "Subscribing to folder \"%s\""
msgstr "Подписывание на папку \"%s\""
-#: mail/subscribe-dialog.c:277
+#: mail/subscribe-dialog.c:322
#, c-format
msgid "Unsubscribing to folder \"%s\""
msgstr "Отписывание от папки \"%s\""
-#: mail/subscribe-dialog.c:1248 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1280 mail/subscribe-dialog.etspec.h:1
#: shell/e-storage-set-view.etspec.h:1
msgid "Folder"
msgstr "Папка"
-#: mail/subscribe-dialog.c:1490
+#: mail/subscribe-dialog.c:1521
#, fuzzy
msgid "No server has been selected"
msgstr "Сообщение не выбрано"
-#: mail/subscribe-dialog.c:1547
+#: mail/subscribe-dialog.c:1582
#, fuzzy
msgid "Please select a server."
msgstr "Выбрать сервис"
@@ -9473,36 +10024,34 @@ msgstr "Отказаться"
msgid "Evolution component for the executive summary."
msgstr "Компонент Evolution для Executive Summary."
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr "Фабрика для компонента Executive Summary программы Evolution."
-
#: my-evolution/component-factory.c:30
msgid "Folder containing the Evolution Summary"
msgstr ""
-#: my-evolution/component-factory.c:141
+#: my-evolution/component-factory.c:139
msgid "Cannot initialize Evolution's Executive Summary component."
msgstr ""
"Невозможно инициализировать компонент Executive Summary программы Evolution."
-#: my-evolution/e-summary-calendar.c:182 my-evolution/e-summary-calendar.c:200
+#: my-evolution/e-summary-calendar.c:248 my-evolution/e-summary-calendar.c:266
msgid "Appointments"
msgstr "Встречи"
-#: my-evolution/e-summary-calendar.c:183
+#: my-evolution/e-summary-calendar.c:249
msgid "No appointments"
msgstr "Нет встреч"
-#: my-evolution/e-summary-calendar.c:236
-msgid "%l:%M%p"
-msgstr "%k:%M"
+#: my-evolution/e-summary-calendar.c:286
+#, fuzzy
+msgid "%k%M %d %B"
+msgstr "%A %d %B"
-#: my-evolution/e-summary-calendar.c:238
-msgid "%a %l:%M%p"
-msgstr "%a %k:%M"
+#: my-evolution/e-summary-calendar.c:288
+#, fuzzy
+msgid "%l:%M %d %B"
+msgstr "%A %d %B"
-#: my-evolution/e-summary-mail.c:111
+#: my-evolution/e-summary-mail.c:115
#, fuzzy
msgid "Mail summary"
msgstr "Итог почты"
@@ -9512,84 +10061,85 @@ msgstr "Итог почты"
#. stations and their codes in Evolution sources
#. (evolution/my-evolution/Locations)
#: my-evolution/e-summary-preferences.c:65
-#: my-evolution/e-summary-weather.c:603
+#: my-evolution/e-summary-weather.c:615
msgid "KBOS:ZSAM:EGAA"
msgstr ""
-#: my-evolution/e-summary-preferences.c:428
+#: my-evolution/e-summary-preferences.c:427
msgid "Dictionary.com Word of the Day"
msgstr ""
-#: my-evolution/e-summary-preferences.c:450
+#: my-evolution/e-summary-preferences.c:449
msgid "Quotes of the Day"
msgstr "Цитата дня"
-#: my-evolution/e-summary-preferences.c:877
+#: my-evolution/e-summary-preferences.c:890
msgid "Add a news feed"
msgstr ""
-#: my-evolution/e-summary-preferences.c:885
+#: my-evolution/e-summary-preferences.c:898
msgid "Enter the URL of the news feed you wish to add"
msgstr ""
-#: my-evolution/e-summary-preferences.c:889
+#: my-evolution/e-summary-preferences.c:902
msgid "Name:"
msgstr "Имя:"
-#: my-evolution/e-summary-preferences.c:1421
+#: my-evolution/e-summary-preferences.c:1438
#, fuzzy
msgid "Summary Settings"
msgstr "Итог содержит"
-#: my-evolution/e-summary-rdf.c:281
+#: my-evolution/e-summary-rdf.c:277 my-evolution/e-summary-rdf.c:362
+#: my-evolution/e-summary-rdf.c:395
#, fuzzy
-msgid "There was an error downloading news feed"
-msgstr "При загрузке файла календаря возникла ошибка."
-
-#: my-evolution/e-summary-rdf.c:364 my-evolution/e-summary-rdf.c:390
-#, fuzzy
-msgid "<b>Error downloading RDF</b>"
+msgid "Error downloading RDF"
msgstr "<b>Ошибка при загрузке календаря</b>"
-#: my-evolution/e-summary-rdf.c:479
+#: my-evolution/e-summary-rdf.c:487
#, fuzzy
msgid "News Feed"
msgstr "Новая папка"
-#: my-evolution/e-summary-tasks.c:213
+#: my-evolution/e-summary-tasks.c:216
#, fuzzy
msgid "No tasks"
msgstr "Показать задания"
+#: my-evolution/e-summary-tasks.c:255
+#, fuzzy
+msgid "(No Description)"
+msgstr "Описание:"
+
#: my-evolution/e-summary-weather.c:57
msgid "My Weather"
msgstr ""
-#: my-evolution/e-summary-weather.c:324
+#: my-evolution/e-summary-weather.c:334
msgid "<dd><b>The weather server could not be contacted</b></dd>"
msgstr ""
-#: my-evolution/e-summary-weather.c:512
+#: my-evolution/e-summary-weather.c:524
#, fuzzy
msgid "Weather"
msgstr "Погода"
-#: my-evolution/e-summary-weather.c:664
+#: my-evolution/e-summary-weather.c:676
#, fuzzy
msgid "Regions"
msgstr "Разделы:"
-#: my-evolution/e-summary.c:145
+#: my-evolution/e-summary.c:162
#, fuzzy
msgid "%A, %B %e %Y"
msgstr "%A, %B %d, %Y"
-#: my-evolution/e-summary.c:472 ui/my-evolution.xml.h:3
+#: my-evolution/e-summary.c:512 ui/my-evolution.xml.h:3
#, fuzzy
msgid "Print Summary"
msgstr "Первый"
-#: my-evolution/e-summary.c:518
+#: my-evolution/e-summary.c:558
#, fuzzy
msgid "Printing of Summary failed"
msgstr "Сбой печати сообщения"
@@ -10848,76 +11398,76 @@ msgid "One w_eek"
msgstr "Одна неделя"
#: my-evolution/my-evolution.glade.h:12
-msgid "Refresh _time (seconds):"
+msgid "R_efresh time (seconds):"
msgstr ""
#: my-evolution/my-evolution.glade.h:13
+msgid "Refresh _time (seconds):"
+msgstr ""
+
+#: my-evolution/my-evolution.glade.h:14
+#, fuzzy
+msgid "S_how full path for folders"
+msgstr "со всеми активными удалёнными папками"
+
+#: my-evolution/my-evolution.glade.h:15
msgid "Show _all tasks"
msgstr "Показать все задания"
-#: my-evolution/my-evolution.glade.h:14
+#: my-evolution/my-evolution.glade.h:16
msgid "Show _today's tasks"
msgstr "Показать задания на сегодня"
-#: my-evolution/my-evolution.glade.h:15
+#: my-evolution/my-evolution.glade.h:17
msgid "Tasks "
msgstr "Задания "
-#: my-evolution/my-evolution.glade.h:16
+#: my-evolution/my-evolution.glade.h:18
msgid "Units: "
msgstr "Единицы: "
-#: my-evolution/my-evolution.glade.h:17
+#: my-evolution/my-evolution.glade.h:19
#, fuzzy
msgid "Weather settings"
msgstr "Очистить выделение"
-#: my-evolution/my-evolution.glade.h:19
+#: my-evolution/my-evolution.glade.h:21
msgid "_Display folders:"
msgstr "Показать папки:"
-#: my-evolution/my-evolution.glade.h:20
+#: my-evolution/my-evolution.glade.h:22
msgid "_Display stations:"
msgstr "Показать станции:"
-#: my-evolution/my-evolution.glade.h:21
+#: my-evolution/my-evolution.glade.h:23
#, fuzzy
msgid "_Displayed feeds:"
msgstr "Отобразить"
-#: my-evolution/my-evolution.glade.h:22
+#: my-evolution/my-evolution.glade.h:24
msgid "_Five days"
msgstr "Пять дней"
-#: my-evolution/my-evolution.glade.h:23
+#: my-evolution/my-evolution.glade.h:25
msgid "_Mail"
msgstr "Почта"
-#: my-evolution/my-evolution.glade.h:24
+#: my-evolution/my-evolution.glade.h:26
#, fuzzy
msgid "_News Feeds"
msgstr "Новая папка"
-#: my-evolution/my-evolution.glade.h:25
+#: my-evolution/my-evolution.glade.h:27
msgid "_One day"
msgstr "Один день"
-#: my-evolution/my-evolution.glade.h:26
-msgid "_Refresh time (seconds):"
-msgstr ""
-
-#: my-evolution/my-evolution.glade.h:27
+#: my-evolution/my-evolution.glade.h:28
#, fuzzy
msgid "_Schedule"
msgstr ""
"Вставить встречу\n"
"в расписание"
-#: my-evolution/my-evolution.glade.h:28
-#, fuzzy
-msgid "_Show full path for folders"
-msgstr "со всеми активными удалёнными папками"
-
#: my-evolution/my-evolution.glade.h:29
msgid "_Weather"
msgstr "Погода"
@@ -10935,29 +11485,29 @@ msgstr ""
msgid "The Evolution shell."
msgstr "Оболочка Evolution."
-#: shell/e-activity-handler.c:198
+#: shell/e-activity-handler.c:200
msgid "Show Details"
msgstr "Показать подробности"
-#: shell/e-activity-handler.c:200
+#: shell/e-activity-handler.c:202
msgid "Cancel Operation"
msgstr "Отменить операцию"
-#: shell/e-local-storage.c:177 shell/e-shortcuts.c:1045
+#: shell/e-local-storage.c:175 shell/e-shortcuts.c:1053
msgid "Inbox"
msgstr "Входящие"
-#: shell/e-local-storage.c:178
+#: shell/e-local-storage.c:176
#, fuzzy
msgid "Outbox"
msgstr "mbox"
-#: shell/e-local-storage.c:593
+#: shell/e-local-storage.c:624
#, fuzzy
msgid "Local Folders"
msgstr "Специальные папки"
-#: shell/e-setup.c:125 shell/e-setup.c:196
+#: shell/e-setup.c:125
msgid "Evolution installation"
msgstr "Установка Evolution"
@@ -10978,17 +11528,7 @@ msgstr ""
msgid "Could not update files correctly"
msgstr "Невозможно обновить файлы корректно"
-#: shell/e-setup.c:200
-msgid "This seems to be the first time you are running Evolution."
-msgstr "Похоже вы запустили Evolution в первый раз."
-
-#: shell/e-setup.c:201
-msgid "Please click \"OK\" to install the Evolution user files under"
-msgstr ""
-"Пожалуйста нажмите \"Ок\", чтобы установить пользовательские файлы Evolution "
-"в"
-
-#: shell/e-setup.c:220
+#: shell/e-setup.c:193
#, c-format
msgid ""
"Cannot create the directory\n"
@@ -10999,14 +11539,14 @@ msgstr ""
"%s\n"
"Ошибка: %s"
-#: shell/e-setup.c:235
+#: shell/e-setup.c:208
#, fuzzy, c-format
msgid ""
"An error occurred in copying files into\n"
"`%s'."
msgstr "При чтении файла возникла ошибка."
-#: shell/e-setup.c:309
+#: shell/e-setup.c:282
#, c-format
msgid ""
"The file `%s' is not a directory.\n"
@@ -11017,7 +11557,7 @@ msgstr ""
"Пожалуйста, переместите его, чтобы позволить\n"
"установить файлы пользователя Evolution."
-#: shell/e-setup.c:323
+#: shell/e-setup.c:296
msgid ""
"Evolution has detected an old\n"
"Executive-Summary directory.\n"
@@ -11026,7 +11566,7 @@ msgid ""
"Do you want me to remove this directory?"
msgstr ""
-#: shell/e-setup.c:348
+#: shell/e-setup.c:321
#, c-format
msgid ""
"The directory `%s' exists but is not the\n"
@@ -11053,25 +11593,25 @@ msgstr ""
msgid "Cannot move a folder into one of its descendants."
msgstr ""
-#: shell/e-shell-folder-commands.c:285
+#: shell/e-shell-folder-commands.c:294
#, c-format
msgid "Specify a folder to copy folder \"%s\" into:"
msgstr ""
-#: shell/e-shell-folder-commands.c:290
+#: shell/e-shell-folder-commands.c:299
msgid "Copy folder"
msgstr "Скопировать папку"
-#: shell/e-shell-folder-commands.c:328
+#: shell/e-shell-folder-commands.c:337
#, c-format
msgid "Specify a folder to move folder \"%s\" into:"
msgstr ""
-#: shell/e-shell-folder-commands.c:333
+#: shell/e-shell-folder-commands.c:342
msgid "Move folder"
msgstr "Переместить папку"
-#: shell/e-shell-folder-commands.c:358
+#: shell/e-shell-folder-commands.c:367
#, fuzzy, c-format
msgid ""
"Cannot delete folder:\n"
@@ -11080,30 +11620,30 @@ msgstr ""
"Невозможно удалить папку \"%s\":\n"
"%s"
-#: shell/e-shell-folder-commands.c:374
+#: shell/e-shell-folder-commands.c:383
#, c-format
msgid "Delete folder '%s'"
msgstr "Удалить папку \"%s\""
#. "Are you sure..." label
-#: shell/e-shell-folder-commands.c:384
+#: shell/e-shell-folder-commands.c:393
#, c-format
msgid "Are you sure you want to remove the '%s' folder?"
msgstr "Вы уверены в том, что хотите удалить папку \"%s\"?"
#. Popup a dialog asking what the user would like to rename
#. the folder to
-#: shell/e-shell-folder-commands.c:459
+#: shell/e-shell-folder-commands.c:468
#, c-format
msgid "Rename folder '%s'"
msgstr "Переименовать папку \"%s\""
-#: shell/e-shell-folder-commands.c:463 shell/e-shortcuts-view.c:383
+#: shell/e-shell-folder-commands.c:472
msgid "Rename"
msgstr "Переименовать"
#. Make, pack the label
-#: shell/e-shell-folder-commands.c:471
+#: shell/e-shell-folder-commands.c:480
#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
msgid "Folder name:"
msgstr "Название папки:"
@@ -11117,11 +11657,30 @@ msgstr ""
"Невозможно создать указанную папку:\n"
"%s"
-#: shell/e-shell-folder-creation-dialog.c:168
-msgid "The specified folder name is not valid."
+#: shell/e-shell-folder-creation-dialog.c:126
+#, fuzzy
+msgid "No folder name specified."
+msgstr "Не указаны получатели"
+
+#: shell/e-shell-folder-creation-dialog.c:132
+msgid "Folder name cannot contain the Return character."
+msgstr ""
+
+#: shell/e-shell-folder-creation-dialog.c:137
+#, fuzzy
+msgid "Folder cannot contain the directory separator."
+msgstr "Невозможно открыть каталог кэш: %s"
+
+#: shell/e-shell-folder-creation-dialog.c:142
+msgid "'.' and '..' are reserved folder names."
+msgstr ""
+
+#: shell/e-shell-folder-creation-dialog.c:180
+#, fuzzy, c-format
+msgid "The specified folder name is not valid: %s"
msgstr "Указанное имя папки не допустимо."
-#: shell/e-shell-folder-creation-dialog.c:288
+#: shell/e-shell-folder-creation-dialog.c:300
msgid "Evolution - Create new folder"
msgstr "Эволюция - Создать новую папку"
@@ -11137,11 +11696,11 @@ msgstr ""
msgid "New..."
msgstr "Новая..."
-#: shell/e-shell-folder-title-bar.c:582 shell/e-shell-folder-title-bar.c:583
+#: shell/e-shell-folder-title-bar.c:585 shell/e-shell-folder-title-bar.c:586
msgid "(Untitled)"
msgstr "(Без заголовка)"
-#: shell/e-shell-importer.c:97
+#: shell/e-shell-importer.c:102
msgid ""
"Choose the file that you want to import into Evolution, and select what type "
"of file it is from the list.\n"
@@ -11157,7 +11716,7 @@ msgstr ""
#. Importer isn't ready yet.
#. Wait 5 seconds and try again.
-#: shell/e-shell-importer.c:192
+#: shell/e-shell-importer.c:197
#, c-format
msgid ""
"Importing %s\n"
@@ -11168,7 +11727,7 @@ msgstr ""
"Импортер не готов.\n"
"5 секунд ожидания перед повтором."
-#: shell/e-shell-importer.c:212 shell/e-shell-importer.c:243
+#: shell/e-shell-importer.c:217 shell/e-shell-importer.c:248
#, c-format
msgid ""
"Importing %s\n"
@@ -11177,7 +11736,16 @@ msgstr ""
"Импортирование %s\n"
"Импортирование элемента %d."
-#: shell/e-shell-importer.c:350
+#: shell/e-shell-importer.c:351
+#, fuzzy, c-format
+msgid "File %s does not exist"
+msgstr "Папка \"%s\" не существует."
+
+#: shell/e-shell-importer.c:363
+msgid "You may only import to local folders"
+msgstr ""
+
+#: shell/e-shell-importer.c:378
#, c-format
msgid ""
"There is no importer that is able to handle\n"
@@ -11186,11 +11754,11 @@ msgstr ""
"Нет импортера, который способен обработать\n"
"%s"
-#: shell/e-shell-importer.c:362
+#: shell/e-shell-importer.c:388
msgid "Importing"
msgstr "Импортирование"
-#: shell/e-shell-importer.c:370
+#: shell/e-shell-importer.c:396
#, c-format
msgid ""
"Importing %s.\n"
@@ -11199,17 +11767,17 @@ msgstr ""
"Импортирование %s.\n"
"Начато %s"
-#: shell/e-shell-importer.c:383
+#: shell/e-shell-importer.c:409
#, c-format
msgid "Error starting %s"
msgstr "Ошибка при загрузке %s"
-#: shell/e-shell-importer.c:402
+#: shell/e-shell-importer.c:428
#, c-format
msgid "Error loading %s"
msgstr "Ошибка при загрузке %s"
-#: shell/e-shell-importer.c:417
+#: shell/e-shell-importer.c:445
#, c-format
msgid ""
"Importing %s\n"
@@ -11218,56 +11786,71 @@ msgstr ""
"Импортирование %s\n"
"Импортирование элемента 1."
-#: shell/e-shell-importer.c:488
+#: shell/e-shell-importer.c:515
msgid "Automatic"
msgstr "Автоматическое"
-#: shell/e-shell-importer.c:538
+#: shell/e-shell-importer.c:566
msgid "Filename:"
msgstr "Имя файла:"
-#: shell/e-shell-importer.c:543
+#: shell/e-shell-importer.c:571
msgid "Select a file"
msgstr "Выбрать файл"
-#: shell/e-shell-importer.c:553
+#: shell/e-shell-importer.c:581
msgid "File type:"
msgstr "Тип файла:"
-#: shell/e-shell-importer.c:623
+#: shell/e-shell-importer.c:645
msgid "Select folder"
msgstr "Выбрать папку"
-#: shell/e-shell-importer.c:624
+#: shell/e-shell-importer.c:646
msgid "Select a destination folder for importing this data"
msgstr ""
-#: shell/e-shell-offline-handler.c:564
+#: shell/e-shell-importer.c:689 shell/importer/intelligent.c:194
+msgid "Import"
+msgstr "Импортировать"
+
+#: shell/e-shell-offline-handler.c:562
msgid "Closing connections..."
msgstr "Закрытие соединений..."
-#: shell/e-shell-startup-wizard.c:144
+#: shell/e-shell-startup-wizard.c:159
#, c-format
msgid ""
"Could not start the Evolution Mailer Wizard interface\n"
"%s"
msgstr ""
-#: shell/e-shell-startup-wizard.c:153
+#: shell/e-shell-startup-wizard.c:168
#, fuzzy
msgid "Cannot initialize the Evolution Mailer Wizard interface"
msgstr "Невозможно инициализировать оболочку Evolution: %s"
-#: shell/e-shell-startup-wizard.c:558
+#: shell/e-shell-startup-wizard.c:582
msgid ""
"Please wait...\n"
"Scanning for existing setups"
msgstr ""
-#: shell/e-shell-startup-wizard.c:561
+#: shell/e-shell-startup-wizard.c:585
msgid "Starting Intelligent Importers"
msgstr ""
+#: shell/e-shell-startup-wizard.c:703
+#, fuzzy, c-format
+msgid "From %s:"
+msgstr "От:"
+
+#: shell/e-shell-startup-wizard.c:745
+msgid ""
+"Please select the information\n"
+"that you would like to import"
+msgstr ""
+
#: shell/e-shell-view-menu.c:183
msgid "Bug buddy was not found in your $PATH."
msgstr "Bug-buddy не был найден в вашем $PATH."
@@ -11276,13 +11859,19 @@ msgstr "Bug-buddy не был найден в вашем $PATH."
msgid "Bug buddy could not be run."
msgstr "Bug-buddy не может быть запущен."
+#: shell/e-shell-view-menu.c:217
+#, fuzzy
+msgid "Ximian Evolution"
+msgstr "Evolution"
+
#: shell/e-shell-view-menu.c:219
msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
msgstr "Copyright (C) 1999-2001 Ximian, Inc."
#: shell/e-shell-view-menu.c:221
+#, fuzzy
msgid ""
-"Evolution is a suite of groupware applications\n"
+"Ximian Evolution is a suite of groupware applications\n"
"for mail, calendaring, and contact management\n"
"within the GNOME desktop environment."
msgstr ""
@@ -11290,64 +11879,76 @@ msgstr ""
"ведения календарей и контактной информации для\n"
"групповой работы в среде GNOME."
-#: shell/e-shell-view-menu.c:423
+#: shell/e-shell-view-menu.c:424
msgid "Go to folder..."
msgstr "Перейти к папке..."
-#: shell/e-shell-view-menu.c:424
+#: shell/e-shell-view-menu.c:425
msgid "Select the folder that you want to open"
msgstr "Выберите папку, которую вы хотите открыть"
-#: shell/e-shell-view-menu.c:569
+#: shell/e-shell-view-menu.c:570
#, fuzzy
msgid "Create a new shortcut"
msgstr "Создать новую группу закладок"
-#: shell/e-shell-view-menu.c:570
+#: shell/e-shell-view-menu.c:571
msgid "Select the folder you want the shortcut to point to:"
msgstr ""
-#: shell/e-shell-view-menu.c:684
+#: shell/e-shell-view-menu.c:685
msgid "Work Online"
msgstr "Работать в сети"
-#: shell/e-shell-view-menu.c:697 shell/e-shell-view-menu.c:710
-#: ui/evolution.xml.h:31
+#: shell/e-shell-view-menu.c:698 shell/e-shell-view-menu.c:711
+#: ui/evolution.xml.h:30
msgid "Work Offline"
msgstr "Работать вне сети"
-#: shell/e-shell-view.c:184
+#: shell/e-shell-view.c:214
msgid "(No folder displayed)"
msgstr "(Папки не показаны)"
-#: shell/e-shell-view.c:1459
+#: shell/e-shell-view.c:1478
#, c-format
-msgid "%s - Evolution %s"
+msgid "%s (%d)"
+msgstr ""
+
+#: shell/e-shell-view.c:1480
+#, fuzzy
+msgid "(None)"
+msgstr "(нет)"
+
+#: shell/e-shell-view.c:1485
+#, fuzzy, c-format
+msgid "%s - Ximian Evolution %s"
msgstr "%s - Evolution %s"
-#: shell/e-shell-view.c:1461
-#, c-format
-msgid "%s - Evolution %s [%s]"
+#: shell/e-shell-view.c:1487
+#, fuzzy, c-format
+msgid "%s - Ximian Evolution %s [%s]"
msgstr "%s - Evolution %s [%s]"
-#: shell/e-shell-view.c:1499
-msgid "Evolution is currently online. Click on this button to work offline."
+#: shell/e-shell-view.c:1527
+msgid ""
+"Ximian Evolution is currently online. Click on this button to work offline."
msgstr ""
-#: shell/e-shell-view.c:1506
-msgid "Evolution is in the process of going offline."
+#: shell/e-shell-view.c:1534
+msgid "Ximian Evolution is in the process of going offline."
msgstr ""
-#: shell/e-shell-view.c:1512
-msgid "Evolution is currently offline. Click on this button to work online."
+#: shell/e-shell-view.c:1540
+msgid ""
+"Ximian Evolution is currently offline. Click on this button to work online."
msgstr ""
-#: shell/e-shell.c:509
+#: shell/e-shell.c:560
#, c-format
msgid "Cannot set up local storage -- %s"
msgstr "Невозможно установить локальное хранилище -- %s"
-#: shell/e-shell.c:1438
+#: shell/e-shell.c:1496
#, fuzzy, c-format
msgid ""
"Ooops! The views for `%s' have died unexpectedly. :-(\n"
@@ -11356,36 +11957,36 @@ msgstr ""
"Оп-ля! Окно для \"%s\" неожиданно умерло. :-(\n"
"Возможно это означает, что компонент %s рухнул."
-#: shell/e-shell.c:1642 widgets/misc/e-cell-date-edit.c:248
+#: shell/e-shell.c:1700 widgets/misc/e-cell-date-edit.c:248
msgid "OK"
msgstr "Ок"
-#: shell/e-shell.c:1644
+#: shell/e-shell.c:1702
msgid "Invalid arguments"
msgstr "Недопустимые аргументы"
-#: shell/e-shell.c:1646
+#: shell/e-shell.c:1704
#, fuzzy
msgid "Cannot register on OAF"
msgstr "Не удалось зарегистрировать хранилище с помощью оболочки"
-#: shell/e-shell.c:1648
+#: shell/e-shell.c:1706
msgid "Configuration Database not found"
msgstr ""
-#: shell/e-shell.c:1650 shell/e-storage.c:491
+#: shell/e-shell.c:1708 shell/e-storage.c:491
msgid "Generic error"
msgstr "Обычная ошибка"
-#: shell/e-shortcuts-view.c:72
+#: shell/e-shortcuts-view.c:75
msgid "Create new shortcut group"
msgstr "Создать новую группу закладок"
-#: shell/e-shortcuts-view.c:73
+#: shell/e-shortcuts-view.c:76
msgid "Group name:"
msgstr "Название группы:"
-#: shell/e-shortcuts-view.c:171
+#: shell/e-shortcuts-view.c:176
#, c-format
msgid ""
"Do you really want to remove group\n"
@@ -11394,98 +11995,108 @@ msgstr ""
"Вы действительно хотите удалить группу\n"
"\"%s\" из панели закладок?"
-#: shell/e-shortcuts-view.c:176
+#: shell/e-shortcuts-view.c:181
msgid "Don't remove"
msgstr "Не удалять"
-#: shell/e-shortcuts-view.c:204
+#: shell/e-shortcuts-view.c:210
#, fuzzy
msgid "Rename Shortcut Group"
msgstr "Удалить эту группу закладок"
-#: shell/e-shortcuts-view.c:205
+#: shell/e-shortcuts-view.c:211
#, fuzzy
msgid "Rename selected shortcut group to:"
msgstr "Удалить эту группу закладок"
-#: shell/e-shortcuts-view.c:218
+#: shell/e-shortcuts-view.c:225
msgid "_Small Icons"
msgstr "Маленькие пиктограммы"
-#: shell/e-shortcuts-view.c:219
+#: shell/e-shortcuts-view.c:226
msgid "Show the shortcuts as small icons"
msgstr "Показать закладки как маленькие пиктограммы"
-#: shell/e-shortcuts-view.c:221
+#: shell/e-shortcuts-view.c:228
msgid "_Large Icons"
msgstr "Большие пиктограммы"
-#: shell/e-shortcuts-view.c:222
+#: shell/e-shortcuts-view.c:229
msgid "Show the shortcuts as large icons"
msgstr "Показать закладки как большие пиктограммы"
-#: shell/e-shortcuts-view.c:233
+#: shell/e-shortcuts-view.c:240
msgid "_New Group..."
msgstr "Новая группа..."
-#: shell/e-shortcuts-view.c:234
+#: shell/e-shortcuts-view.c:241
msgid "Create a new shortcut group"
msgstr "Создать новую группу закладок"
-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:243
msgid "_Remove this Group..."
msgstr "Удалить эту группу..."
-#: shell/e-shortcuts-view.c:237
+#: shell/e-shortcuts-view.c:244
msgid "Remove this shortcut group"
msgstr "Удалить эту группу закладок"
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:246
msgid "Re_name this Group..."
msgstr "Переименовать эту группу..."
-#: shell/e-shortcuts-view.c:240
+#: shell/e-shortcuts-view.c:247
#, fuzzy
msgid "Rename this shortcut group"
msgstr "Удалить эту группу закладок"
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:252
msgid "_Hide the Shortcut Bar"
msgstr "Скрыть строку закладок"
-#: shell/e-shortcuts-view.c:246
+#: shell/e-shortcuts-view.c:253
msgid "Hide the shortcut bar"
msgstr "Скрыть строку закладок"
-#: shell/e-shortcuts-view.c:365
+#: shell/e-shortcuts-view.c:372
#, fuzzy
msgid "Rename shortcut"
msgstr "Удалить эту группу закладок"
-#: shell/e-shortcuts-view.c:366
+#: shell/e-shortcuts-view.c:373
#, fuzzy
msgid "Rename selected shortcut to:"
msgstr "Удалить эту группу закладок"
-#: shell/e-shortcuts-view.c:378
+#: shell/e-shortcuts-view.c:385
msgid "Open the folder linked to this shortcut"
msgstr ""
-#: shell/e-shortcuts-view.c:380 ui/evolution.xml.h:19
-msgid "Open in New Window"
+#: shell/e-shortcuts-view.c:387 ui/evolution.xml.h:19
+msgid "Open in New _Window"
msgstr "Открыть в новом окне"
-#: shell/e-shortcuts-view.c:380
+#: shell/e-shortcuts-view.c:387
#, fuzzy
msgid "Open the folder linked to this shortcut in a new window"
msgstr "Отправить текущее сообщение в новом окне"
-#: shell/e-shortcuts-view.c:383
+#: shell/e-shortcuts-view.c:390
+#, fuzzy
+msgid "_Rename"
+msgstr "Переименовать"
+
+#: shell/e-shortcuts-view.c:390
#, fuzzy
msgid "Rename this shortcut"
msgstr "Удалить эту группу закладок"
-#: shell/e-shortcuts-view.c:385
+#: shell/e-shortcuts-view.c:392
+#, fuzzy
+msgid "Re_move"
+msgstr "Удалить"
+
+#: shell/e-shortcuts-view.c:392
msgid "Remove this shortcut from the shortcut bar"
msgstr "Удалить эту закладку из строки закладок"
@@ -11493,7 +12104,7 @@ msgstr "Удалить эту закладку из строки закладок"
msgid "Error saving shortcuts."
msgstr "Ошибка сохранения закладок."
-#: shell/e-shortcuts.c:1040
+#: shell/e-shortcuts.c:1044
#, fuzzy
msgid "Shortcuts"
msgstr "Строка закладок"
@@ -11547,12 +12158,12 @@ msgstr "Указанная папка не найдена"
msgid "Cannot make a folder a child of one of its descendants"
msgstr ""
-#: shell/e-task-widget.c:170
+#: shell/e-task-widget.c:192
#, c-format
msgid "%s (...)"
msgstr ""
-#: shell/e-task-widget.c:175
+#: shell/e-task-widget.c:197
#, fuzzy, c-format
msgid "%s (%d%% complete)"
msgstr "% Выполнения:"
@@ -11581,6 +12192,37 @@ msgstr "Тип папки:"
msgid "Specify where to create the folder:"
msgstr "Указать где создать папку:"
+#: shell/glade/evolution-startup-wizard.glade.h:3
+msgid "First Run Setup Assistant"
+msgstr ""
+
+#: shell/glade/evolution-startup-wizard.glade.h:5
+#, fuzzy
+msgid "Importing Data"
+msgstr "Импортирование"
+
+#: shell/glade/evolution-startup-wizard.glade.h:8
+#, fuzzy
+msgid "Setup Assistant"
+msgstr "Помощник"
+
+#: shell/glade/evolution-startup-wizard.glade.h:9
+#, fuzzy
+msgid "Timezone "
+msgstr "Часовой пояс: "
+
+#: shell/glade/evolution-startup-wizard.glade.h:10
+msgid ""
+"Welcome to the Evolution first run setup assistant\n"
+"\n"
+"This assistant will help you get started"
+msgstr ""
+
+#: shell/glade/evolution-startup-wizard.glade.h:13
+#, fuzzy
+msgid "Your configuration is complete."
+msgstr "Настройка почты"
+
#: shell/importer/import.glade.h:1
msgid "Click \"Import\" to begin importing the file into Evolution. "
msgstr ""
@@ -11634,13 +12276,18 @@ msgstr "Не спрашивать снова"
msgid "Evolution can import data from the following files:"
msgstr "Evolution нашла следующие источники данных:"
-#: shell/main.c:95
+#: shell/main.c:82
+#, fuzzy
+msgid "Evolution is now exiting ..."
+msgstr "Установки почты..."
+
+#: shell/main.c:153
#, fuzzy, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this preview release\n"
-"of the Evolution groupware suite.\n"
+"of the Ximian Evolution groupware suite.\n"
"\n"
-"Evolution is not yet complete. It's getting close, but there are\n"
+"Ximian Evolution is not yet complete. It's getting close, but there are\n"
"places where features are either missing or only half working. \n"
"\n"
"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
@@ -11668,32 +12315,34 @@ msgstr ""
"Мы надеемся, что вам понравятся результаты нашей упорной работы и мы\n"
"рассчитываем на ваше участие!\n"
-#: shell/main.c:116
+#: shell/main.c:174
+#, fuzzy
msgid ""
"Thanks\n"
-"The Evolution Team\n"
+"The Ximian Evolution Team\n"
msgstr ""
"С благодарностью\n"
"Команда Evolution\n"
-#: shell/main.c:173
-msgid "Cannot access the Evolution shell."
+#: shell/main.c:231
+#, fuzzy
+msgid "Cannot access the Ximian Evolution shell."
msgstr "Невозможно инициализировать оболочку Evolution."
-#: shell/main.c:184
-#, c-format
-msgid "Cannot initialize the Evolution shell: %s"
+#: shell/main.c:242
+#, fuzzy, c-format
+msgid "Cannot initialize the Ximian Evolution shell: %s"
msgstr "Невозможно инициализировать оболочку Evolution: %s"
-#: shell/main.c:228
+#: shell/main.c:286
msgid "Disable splash screen"
msgstr "Отключить заставку"
-#: shell/main.c:229
+#: shell/main.c:287
msgid "Send the debugging output of all components to a file."
msgstr "Записывать отладочный вывод всех компонентов в файл."
-#: shell/main.c:271
+#: shell/main.c:329
msgid "Cannot initialize the Bonobo component system."
msgstr "Не удалось инициализировать компонентную систему Bonobo."
@@ -11809,33 +12458,33 @@ msgstr "Контакты"
msgid "_Contact List"
msgstr "Список контакты"
-#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:35 ui/evolution-contact-editor.xml.h:13
#, fuzzy
msgid "_Forward Contact..."
msgstr "Контакты..."
-#: ui/evolution-addressbook.xml.h:36 ui/evolution-calendar.xml.h:40
+#: ui/evolution-addressbook.xml.h:37 ui/evolution-calendar.xml.h:41
#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:95
#: ui/my-evolution.xml.h:7
msgid "_Print..."
msgstr "Печать..."
-#: ui/evolution-addressbook.xml.h:37
+#: ui/evolution-addressbook.xml.h:38
msgid "_Save as VCard"
msgstr "Сохранить как VCard"
-#: ui/evolution-addressbook.xml.h:38
+#: ui/evolution-addressbook.xml.h:39
#, fuzzy
msgid "_Search for Contacts"
msgstr "Поиск контактов"
-#: ui/evolution-addressbook.xml.h:39
+#: ui/evolution-addressbook.xml.h:40
msgid "_Select All"
msgstr "Выбрать все"
-#: ui/evolution-addressbook.xml.h:40 ui/evolution-calendar.xml.h:43
+#: ui/evolution-addressbook.xml.h:41 ui/evolution-calendar.xml.h:44
#: ui/evolution-mail-global.xml.h:25 ui/evolution-mail-message.xml.h:98
-#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:18
+#: ui/evolution-mail-messagedisplay.xml.h:8 ui/evolution-tasks.xml.h:19
#: ui/my-evolution.xml.h:9
msgid "_Tools"
msgstr "Инструменты"
@@ -11961,12 +12610,12 @@ msgstr "Встреча..."
msgid "_Calendar Settings..."
msgstr "Установки календаря..."
-#: ui/evolution-calendar.xml.h:41
+#: ui/evolution-calendar.xml.h:42
#, fuzzy
msgid "_Publish Free/Busy Information"
msgstr "Необходимая информация"
-#: ui/evolution-calendar.xml.h:42
+#: ui/evolution-calendar.xml.h:43
#, fuzzy
msgid "_Task..."
msgstr "Задание"
@@ -11989,7 +12638,7 @@ msgid "Delete this item"
msgstr "Удалить этот элемент"
#: ui/evolution-comp-editor.xml.h:6 ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:16
msgid "Main toolbar"
msgstr "Главная панель инструментов"
@@ -12005,14 +12654,13 @@ msgstr "Печать этого элемента"
msgid "Print..."
msgstr "Печать..."
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:7
-#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-list-editor.xml.h:5
#: ui/evolution-message-composer.xml.h:19
#: ui/evolution-signature-editor.xml.h:3 widgets/misc/e-filter-bar.c:245
msgid "Save"
msgstr "Сохранить"
-#: ui/evolution-comp-editor.xml.h:14
+#: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
msgid "Save and Close"
msgstr "Сохранить и закрыть"
@@ -12031,7 +12679,7 @@ msgstr "Изменить вид на %s"
#: ui/evolution-mail-messagedisplay.xml.h:7
#: ui/evolution-message-composer.xml.h:49
#: ui/evolution-signature-editor.xml.h:8 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:36
msgid "_File"
msgstr "Файл"
@@ -12039,7 +12687,7 @@ msgstr "Файл"
msgid "Print En_velope..."
msgstr "Печать конверта..."
-#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:7
#: ui/evolution-contact-list-editor.xml.h:6
#: ui/evolution-message-composer.xml.h:21
msgid "Save _As..."
@@ -12305,23 +12953,23 @@ msgstr "Временно скрыть выбранные сообщения"
msgid "Threaded Message list"
msgstr "Список подшитых сообщений"
-#: ui/evolution-mail-list.xml.h:25
+#: ui/evolution-mail-list.xml.h:26
msgid "_Expunge"
msgstr "Вычеркнуть"
-#: ui/evolution-mail-list.xml.h:26 ui/evolution.xml.h:38
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:37
msgid "_Folder"
msgstr "Папка"
-#: ui/evolution-mail-list.xml.h:27 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
msgid "_Invert Selection"
msgstr "Обратить выделение"
-#: ui/evolution-mail-list.xml.h:29
+#: ui/evolution-mail-list.xml.h:30
msgid "_Properties..."
msgstr "Свойства..."
-#: ui/evolution-mail-list.xml.h:30
+#: ui/evolution-mail-list.xml.h:31
#, fuzzy
msgid "_Threaded Message List"
msgstr "Список подшитых сообщений"
@@ -12578,7 +13226,8 @@ msgid "Reply to All"
msgstr "Ответить всем"
#: ui/evolution-mail-message.xml.h:70
-msgid "S_earch Message"
+#, fuzzy
+msgid "S_earch Message..."
msgstr "Поиск сообщения"
#: ui/evolution-mail-message.xml.h:71
@@ -12680,7 +13329,7 @@ msgid "_Close"
msgstr "Закрыть"
#: ui/evolution-mail-messagedisplay.xml.h:9
-#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:49
+#: ui/evolution-message-composer.xml.h:56 ui/evolution.xml.h:48
msgid "_View"
msgstr "Просмотр"
@@ -12872,7 +13521,7 @@ msgstr "Поле \"Ответ\""
msgid "_Security"
msgstr "Безопасность"
-#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:41
+#: ui/evolution-signature-editor.xml.h:9 ui/evolution.xml.h:40
msgid "_Help"
msgstr "Справка"
@@ -12956,12 +13605,13 @@ msgstr "Вставить выделение из буфера обмена"
msgid "Tasks Settings..."
msgstr "Установки заданий"
-#: ui/evolution-tasks.xml.h:17
+#: ui/evolution-tasks.xml.h:18
msgid "_Task"
msgstr "Задание"
#: ui/evolution.xml.h:1
-msgid "About Evolution..."
+#, fuzzy
+msgid "About Ximian Evolution..."
msgstr "О программе..."
#: ui/evolution.xml.h:2
@@ -13001,115 +13651,118 @@ msgid "E_xit"
msgstr "Выход"
#: ui/evolution.xml.h:13
-msgid "Evolution _FAQ"
-msgstr "ЧАВО Evolution"
-
-#: ui/evolution.xml.h:14
msgid "Evolution _Window"
msgstr "Окно Evolution"
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:14
msgid "Exit the program"
msgstr "Выйти из программы"
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:15
msgid "Import an external file format"
msgstr "Импортировать во внешний формат файла"
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:17
msgid "Move this folder to another place"
msgstr "Переместить эту папку в другое место"
-#: ui/evolution.xml.h:20
-msgid "Open in New _Window"
+#: ui/evolution.xml.h:18
+msgid "Open in New Window"
msgstr "Открыть в новом окне"
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:20
msgid "Open this folder in an other window"
msgstr "Открыть эту папку в новом окне"
-#: ui/evolution.xml.h:22
-msgid "Show information about Evolution"
+#: ui/evolution.xml.h:21
+#, fuzzy
+msgid "Show information about Ximian Evolution"
msgstr "Показать информацию о программе Evolution"
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:22
msgid "Submit Bug Report"
msgstr "Отправить сообщение об ошибке"
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:23
msgid "Submit _Bug Report"
msgstr "Отправить сообщение об ошибке"
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:24
msgid "Submit a bug report using Bug Buddy"
msgstr "Отправить сообщение об ошибке используя Bug Buddy"
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:25
msgid "Toggle"
msgstr "Переключить"
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:26
msgid "Toggle whether to show the folder bar"
msgstr "Переключить отображение строки папок"
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:27
msgid "Toggle whether to show the shortcut bar"
msgstr "Переключить отображение строки закладок"
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:28
msgid "Toggle whether we are working offline."
msgstr "Переключить работу в/вне сети."
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:29
msgid "View the selected folder"
msgstr "Просмотр выбранной папки"
+#: ui/evolution.xml.h:31
+#, fuzzy
+msgid "Ximian Evolution _FAQ"
+msgstr "ЧАВО Evolution"
+
#: ui/evolution.xml.h:32
-msgid "_About Evolution..."
+#, fuzzy
+msgid "_About Ximian Evolution..."
msgstr "О программе..."
#: ui/evolution.xml.h:34
msgid "_Copy..."
msgstr "Скопировать..."
-#: ui/evolution.xml.h:39
+#: ui/evolution.xml.h:38
msgid "_Folder Bar"
msgstr "Строка папки"
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:39
msgid "_Go to Folder..."
msgstr "Перейти к папке..."
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:41
#, fuzzy
msgid "_Import File..."
msgstr "Импортировать файл..."
-#: ui/evolution.xml.h:43
+#: ui/evolution.xml.h:42
msgid "_Move..."
msgstr "Переместить..."
-#: ui/evolution.xml.h:44
+#: ui/evolution.xml.h:43
msgid "_New"
msgstr "Новый"
-#: ui/evolution.xml.h:45
+#: ui/evolution.xml.h:44
msgid "_New Folder"
msgstr "Новая папка"
-#: ui/evolution.xml.h:46
+#: ui/evolution.xml.h:45
msgid "_Rename..."
msgstr "Переименовать..."
-#: ui/evolution.xml.h:47
+#: ui/evolution.xml.h:46
msgid "_Shortcut"
msgstr "Закладка"
-#: ui/evolution.xml.h:48
+#: ui/evolution.xml.h:47
msgid "_Shortcut Bar"
msgstr "Строка закладок"
-#: ui/evolution.xml.h:50
+#: ui/evolution.xml.h:49
msgid "_Work Offline"
msgstr "Работать вне сети"
@@ -13188,81 +13841,6 @@ msgid ""
" Use the right mouse button to zoom out."
msgstr ""
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
-msgid "%A, %B %d, %Y"
-msgstr "%A, %B %d, %Y"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:394
-msgid "Out of Office"
-msgstr "Вне офиса"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:395
-msgid "No Information"
-msgstr "Нет информации"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:411
-msgid "_Invite Others..."
-msgstr "Пригласить других..."
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:431
-msgid "_Options"
-msgstr "Параметры"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:448
-msgid "Show _Only Working Hours"
-msgstr "Показывать только рабочие часы"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:461
-msgid "Show _Zoomed Out"
-msgstr "Показывать уменьшенные"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:479
-msgid "_Update Free/Busy"
-msgstr "Обновить Свободен/Занят"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:497
-msgid "_<<"
-msgstr "<<"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:514
-msgid "_Autopick"
-msgstr "Автовыбор"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:528
-msgid ">_>"
-msgstr ">>"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:545
-msgid "_All People and Resources"
-msgstr "Все люди и ресурсы"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:558
-msgid "All _People and One Resource"
-msgstr "Все люди и один ресурс"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:571
-msgid "_Required People"
-msgstr "Требуемые люди"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:584
-msgid "Required People and _One Resource"
-msgstr "Требуемые люди и один ресурс"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:607
-msgid "Meeting _start time:"
-msgstr "Время начала собрания:"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:631
-msgid "Meeting _end time:"
-msgstr "Время завершения собрания:"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:744
-msgid "All Attendees"
-msgstr "Все сопровождение"
-
#: widgets/menus/gal-view-menus.c:218
msgid "_Current View"
msgstr "Текущий просмотр"
@@ -13430,19 +14008,239 @@ msgstr "Сервер персональных адресных книг"
msgid "The Personal Calendar Server; calendar factory"
msgstr "Персональный календарный сервер; фабрика календаря"
-#: wombat/wombat.c:173
+#: wombat/wombat.c:175
msgid "setup_vfs(): could not initialize GNOME-VFS"
msgstr "setup_vfs(): Не удалось инициализировать GNOME-VFS"
-#: wombat/wombat.c:185
+#: wombat/wombat.c:187
msgid "init_corba(): could not initialize GNOME"
msgstr "init_corba(): Не удалось инициализировать GNOME"
-#: wombat/wombat.c:198
+#: wombat/wombat.c:200
msgid "init_bonobo(): could not initialize Bonobo"
msgstr "init_bonobo(): Не удалось инициализировать Bonobo"
#, fuzzy
+#~ msgid "Cannot open folder: %s: No such folder"
+#~ msgstr "Не удалось получить папку: %s: %s"
+
+#~ msgid "Factory for the Evolution addressbook component."
+#~ msgstr "Фабрика компонента адресной книги Evolution."
+
+#~ msgid "123"
+#~ msgstr "123"
+
+#~ msgid "a"
+#~ msgstr "a"
+
+#~ msgid "b"
+#~ msgstr "b"
+
+#~ msgid "c"
+#~ msgstr "c"
+
+#~ msgid "d"
+#~ msgstr "d"
+
+#~ msgid "e"
+#~ msgstr "e"
+
+#~ msgid "f"
+#~ msgstr "f"
+
+#~ msgid "g"
+#~ msgstr "g"
+
+#~ msgid "h"
+#~ msgstr "h"
+
+#~ msgid "i"
+#~ msgstr "i"
+
+#~ msgid "j"
+#~ msgstr "j"
+
+#~ msgid "k"
+#~ msgstr "k"
+
+#~ msgid "l"
+#~ msgstr "l"
+
+#~ msgid "m"
+#~ msgstr "m"
+
+#~ msgid "n"
+#~ msgstr "n"
+
+#~ msgid "o"
+#~ msgstr "o"
+
+#~ msgid "p"
+#~ msgstr "p"
+
+#~ msgid "q"
+#~ msgstr "q"
+
+#~ msgid "r"
+#~ msgstr "r"
+
+#~ msgid "s"
+#~ msgstr "s"
+
+#~ msgid "t"
+#~ msgstr "t"
+
+#~ msgid "u"
+#~ msgstr "u"
+
+#~ msgid "v"
+#~ msgstr "v"
+
+#~ msgid "w"
+#~ msgstr "w"
+
+#~ msgid "x"
+#~ msgstr "x"
+
+#~ msgid "y"
+#~ msgstr "y"
+
+#~ msgid "z"
+#~ msgstr "z"
+
+#~ msgid "Done."
+#~ msgstr "Сделано"
+
+#~ msgid "Factory for the Evolution calendar component."
+#~ msgstr "Фабрика компонента календаря Evolution."
+
+#~ msgid "Reminder of your appointment at "
+#~ msgstr "Напоминать обо всех встречах"
+
+#~ msgid "Snooze"
+#~ msgstr "Короткий сон"
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
+#~ msgid ""
+#~ "It is %s. The Unix time is %ld right now. We just thought you may like "
+#~ "to know."
+#~ msgstr "Это %s. Сейчас %ld. Мы просто подумали, что вы хотите это знать."
+
+#~ msgid "%d"
+#~ msgstr "%d"
+
+#~ msgid "I couldn't update your calendar file!\n"
+#~ msgstr "Не удалось обновить ваш файл календаря!\n"
+
+#~ msgid "No plaintext to sign."
+#~ msgstr "Нет текста для подписи."
+
+#~ msgid "No password provided."
+#~ msgstr "Пароль не предоставлен."
+
+#~ msgid "No plaintext to verify."
+#~ msgstr "Нет текста для проверки."
+
+#~ msgid "No plaintext to encrypt."
+#~ msgstr "Нет текста для шифрования."
+
+#~ msgid "No ciphertext to decrypt."
+#~ msgstr "Нет шифра для дешифрации."
+
+#~ msgid "Standard Unix mailbox file"
+#~ msgstr "Стандартный файл Unix mailbox"
+
+#, fuzzy
+#~ msgid "Unix mbox spool-format mail files"
+#~ msgstr "Почтовые файлы в формате почтовых каталогов qmail"
+
+#, fuzzy
+#~ msgid "Cannot summarize folder: %s: %s"
+#~ msgstr "Не удалось суммировать папку: %s: %s"
+
+#, fuzzy
+#~ msgid "Synchronizing folder"
+#~ msgstr "Синхронизация папки"
+
+#, fuzzy
+#~ msgid "Could not open folder to summarize: %s: %s"
+#~ msgstr "Не удалось открыть папку для суммаризации: %s: %s"
+
+#~ msgid "Could not open folder to summarise: %s: %s"
+#~ msgstr "Не удалось открыть папку для суммаризации: %s: %s"
+
+#~ msgid ""
+#~ "For connecting to POP servers. The POP protocol can also be used to "
+#~ "retrieve mail from certain web mail providers and proprietary email "
+#~ "systems."
+#~ msgstr ""
+#~ "Для подключения к POP серверам. POP протокол может быть также использован "
+#~ "для получения почты от обычных провайдеров Web-почты и специфических "
+#~ "систем электронной почты."
+
+#, fuzzy
+#~ msgid "%d/%m/%Y"
+#~ msgstr "%m/%d/%Y"
+
+#, fuzzy
+#~ msgid "%Y/%m/%d"
+#~ msgstr "%a %m/%d/%Y"
+
+#, fuzzy
+#~ msgid "%x"
+#~ msgstr "x"
+
+#~ msgid "Elm mail"
+#~ msgstr "Почта Elm"
+
+#~ msgid "Pine mail"
+#~ msgstr "Почта Pine"
+
+#~ msgid "Factory for the Evolution mail component."
+#~ msgstr "Фабрика для почтового компонента Evolution."
+
+#~ msgid "Forwarded message:\n"
+#~ msgstr "Пересланное сообщение:\n"
+
+#, fuzzy
+#~ msgid "No such folder /%s"
+#~ msgstr "Нет такой папки %s"
+
+#, fuzzy
+#~ msgid "Registering '%s'"
+#~ msgstr "Открытие \"%s\""
+
+#, fuzzy
+#~ msgid "Synchronizing '%s'"
+#~ msgstr "Синхронизация папки"
+
+#~ msgid "Factory for the Evolution executive summary component."
+#~ msgstr "Фабрика для компонента Executive Summary программы Evolution."
+
+#~ msgid "%l:%M%p"
+#~ msgstr "%k:%M"
+
+#~ msgid "%a %l:%M%p"
+#~ msgstr "%a %k:%M"
+
+#, fuzzy
+#~ msgid "There was an error downloading news feed"
+#~ msgstr "При загрузке файла календаря возникла ошибка."
+
+#~ msgid "This seems to be the first time you are running Evolution."
+#~ msgstr "Похоже вы запустили Evolution в первый раз."
+
+#~ msgid "Please click \"OK\" to install the Evolution user files under"
+#~ msgstr ""
+#~ "Пожалуйста нажмите \"Ок\", чтобы установить пользовательские файлы "
+#~ "Evolution в"
+
+#~ msgid "All Attendees"
+#~ msgstr "Все сопровождение"
+
+#, fuzzy
#~ msgid "RDF Summary"
#~ msgstr "Итог:"
@@ -13492,10 +14290,6 @@ msgstr "init_bonobo(): Не удалось инициализировать Bonobo"
#~ msgid "The message is not understandable."
#~ msgstr "Это сообщение в настоящий момент не доступно"
-#, fuzzy
-#~ msgid "The message does not appear to be properly formed"
-#~ msgstr "Видимо папка невостановимо испорчена."
-
#~ msgid "Add"
#~ msgstr "Добавить"
@@ -13515,10 +14309,6 @@ msgstr "init_bonobo(): Не удалось инициализировать Bonobo"
#~ msgstr "Обновление списка сообщений"
#, fuzzy
-#~ msgid "My Evolution Settings"
-#~ msgstr "Установка Evolution"
-
-#, fuzzy
#~ msgid "%A, %d %B %Y"
#~ msgstr "%A, %e %B %Y"
@@ -13603,7 +14393,3 @@ msgstr "init_bonobo(): Не удалось инициализировать Bonobo"
#~ msgid "_Index"
#~ msgstr "Индекс"
-
-#, fuzzy
-#~ msgid "_My Evolution Settings..."
-#~ msgstr "Установки почты..."