aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorValek Frob <frob@src.gnome.org>2000-09-20 22:32:21 +0800
committerValek Frob <frob@src.gnome.org>2000-09-20 22:32:21 +0800
commit4862de22573032d0b6f3356aa9af9167681530af (patch)
tree12e828f944a92d4b876f70e45a51dfbfe6fb3260
parenta365b1dba2e5961798e15febf6eb0bb41f87c1ec (diff)
downloadgsoc2013-evolution-4862de22573032d0b6f3356aa9af9167681530af.tar
gsoc2013-evolution-4862de22573032d0b6f3356aa9af9167681530af.tar.gz
gsoc2013-evolution-4862de22573032d0b6f3356aa9af9167681530af.tar.bz2
gsoc2013-evolution-4862de22573032d0b6f3356aa9af9167681530af.tar.lz
gsoc2013-evolution-4862de22573032d0b6f3356aa9af9167681530af.tar.xz
gsoc2013-evolution-4862de22573032d0b6f3356aa9af9167681530af.tar.zst
gsoc2013-evolution-4862de22573032d0b6f3356aa9af9167681530af.zip
Updated russian translation.
svn path=/trunk/; revision=5522
-rw-r--r--po/ChangeLog4
-rw-r--r--po/ru.po1908
2 files changed, 825 insertions, 1087 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index f5a5f863ba..7321e7816f 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2000-09-20 Valek Filippov <frob@df.ru>
+
+ * ru.po: updated russian translation.
+
2000-09-19 Kjartan Maraas <kmaraas@gnome.org>
* no.po: Updated Norwegian translation.
diff --git a/po/ru.po b/po/ru.po
index 49e643dce7..8a906b320e 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4,8 +4,8 @@
msgid ""
msgstr ""
"Project-Id-Version: E-volution\n"
-"POT-Creation-Date: 2000-09-12 15:18+0400\n"
-"PO-Revision-Date: 2000-09-12 15:19+04:00\n"
+"POT-Creation-Date: 2000-09-20 16:31+0400\n"
+"PO-Revision-Date: 2000-09-20 18:31+04:00\n"
"Last-Translator: Valek Filippov <frob@df.ru>\n"
"Language-Team: Russian <ru@li.org>\n"
"MIME-Version: 1.0\n"
@@ -17,10 +17,9 @@ msgstr ""
#: addressbook/backend/ebook/test-client-list.c:18
#: addressbook/backend/ebook/test-client.c:29
#: addressbook/conduit/address-conduit.c:1215
-#: addressbook/gui/component/addressbook-factory.c:37
-#: addressbook/gui/minicard/test-minicard-view.c:45
+#: addressbook/gui/component/addressbook-factory.c:38
#: calendar/conduits/calendar/calendar-conduit.c:1673
-#: calendar/conduits/todo/todo-conduit.c:1129 calendar/gui/main.c:55
+#: calendar/conduits/todo/todo-conduit.c:1172 calendar/gui/main.c:55
msgid "Could not initialize Bonobo"
msgstr "Не удалось инициализировать Bonobo"
@@ -30,43 +29,43 @@ msgstr "Не удалось инициализировать Bonobo"
#.
#: addressbook/conduit/address-conduit-control-applet.c:54
#: calendar/conduits/calendar/calendar-conduit-control-applet.c:55
-#: calendar/conduits/todo/todo-conduit-control-applet.c:51
+#: calendar/conduits/todo/todo-conduit-control-applet.c:70
msgid "Disabled"
msgstr "Отключено"
#: addressbook/conduit/address-conduit-control-applet.c:55
#: calendar/conduits/calendar/calendar-conduit-control-applet.c:56
-#: calendar/conduits/todo/todo-conduit-control-applet.c:52
+#: calendar/conduits/todo/todo-conduit-control-applet.c:71
msgid "Synchronize"
msgstr "Синхронизовать"
#: addressbook/conduit/address-conduit-control-applet.c:56
#: calendar/conduits/calendar/calendar-conduit-control-applet.c:57
-#: calendar/conduits/todo/todo-conduit-control-applet.c:53
+#: calendar/conduits/todo/todo-conduit-control-applet.c:72
msgid "Copy From Pilot"
msgstr "Скопировать из Пилота"
#: addressbook/conduit/address-conduit-control-applet.c:57
#: calendar/conduits/calendar/calendar-conduit-control-applet.c:58
-#: calendar/conduits/todo/todo-conduit-control-applet.c:54
+#: calendar/conduits/todo/todo-conduit-control-applet.c:73
msgid "Copy To Pilot"
msgstr "Скопировать в Пилот"
#: addressbook/conduit/address-conduit-control-applet.c:58
#: calendar/conduits/calendar/calendar-conduit-control-applet.c:59
-#: calendar/conduits/todo/todo-conduit-control-applet.c:55
+#: calendar/conduits/todo/todo-conduit-control-applet.c:74
msgid "Merge From Pilot"
msgstr "Объединить из Пилота"
#: addressbook/conduit/address-conduit-control-applet.c:59
#: calendar/conduits/calendar/calendar-conduit-control-applet.c:60
-#: calendar/conduits/todo/todo-conduit-control-applet.c:56
+#: calendar/conduits/todo/todo-conduit-control-applet.c:75
msgid "Merge To Pilot"
msgstr "Объединить в Пилоте"
#: addressbook/conduit/address-conduit-control-applet.c:143
#: calendar/conduits/calendar/calendar-conduit-control-applet.c:144
-#: calendar/conduits/todo/todo-conduit-control-applet.c:94
+#: calendar/conduits/todo/todo-conduit-control-applet.c:116
msgid "Eskil Heyn Olsen <deity@eskil.dk>"
msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
@@ -76,7 +75,6 @@ msgstr "Кондуит адресов Gpilotd"
#: addressbook/conduit/address-conduit-control-applet.c:146
#: calendar/conduits/calendar/calendar-conduit-control-applet.c:147
-#: calendar/conduits/todo/todo-conduit-control-applet.c:97
msgid "(C) 1998 the Free Software Foundation"
msgstr "(C) 1998 the Free Software Foundation"
@@ -86,19 +84,19 @@ msgstr "Средство настройки для кондуита адресов.\n"
#: addressbook/conduit/address-conduit-control-applet.c:149
#: calendar/conduits/calendar/calendar-conduit-control-applet.c:150
-#: calendar/conduits/todo/todo-conduit-control-applet.c:100
+#: calendar/conduits/todo/todo-conduit-control-applet.c:124
msgid "gnome-unknown.xpm"
msgstr "gnome-unknown.xpm"
#: addressbook/conduit/address-conduit-control-applet.c:190
#: calendar/conduits/calendar/calendar-conduit-control-applet.c:191
-#: calendar/conduits/todo/todo-conduit-control-applet.c:131
+#: calendar/conduits/todo/todo-conduit-control-applet.c:155
msgid "Synchronize Action"
msgstr "Синхронизовать действия"
#: addressbook/conduit/address-conduit-control-applet.c:261
#: calendar/conduits/calendar/calendar-conduit-control-applet.c:262
-#: calendar/conduits/todo/todo-conduit-control-applet.c:190
+#: calendar/conduits/todo/todo-conduit-control-applet.c:214
msgid "Conduit state"
msgstr "Состояние кондуита"
@@ -106,8 +104,8 @@ msgstr "Состояние кондуита"
#: addressbook/conduit/address-conduit-control-applet.c:328
#: calendar/conduits/calendar/calendar-conduit-control-applet.c:316
#: calendar/conduits/calendar/calendar-conduit-control-applet.c:329
-#: calendar/conduits/todo/todo-conduit-control-applet.c:242
-#: calendar/conduits/todo/todo-conduit-control-applet.c:255
+#: calendar/conduits/todo/todo-conduit-control-applet.c:266
+#: calendar/conduits/todo/todo-conduit-control-applet.c:279
msgid ""
"No pilot configured, please choose the\n"
"'Pilot Link Properties' capplet first."
@@ -117,13 +115,13 @@ msgstr ""
#: addressbook/conduit/address-conduit-control-applet.c:334
#: calendar/conduits/calendar/calendar-conduit-control-applet.c:335
-#: calendar/conduits/todo/todo-conduit-control-applet.c:261
+#: calendar/conduits/todo/todo-conduit-control-applet.c:285
msgid "Not connected to the gnome-pilot daemon"
msgstr "Не подключен к демону gnome-pilot"
#: addressbook/conduit/address-conduit-control-applet.c:339
#: calendar/conduits/calendar/calendar-conduit-control-applet.c:340
-#: calendar/conduits/todo/todo-conduit-control-applet.c:266
+#: calendar/conduits/todo/todo-conduit-control-applet.c:290
msgid ""
"An error occured when trying to fetch\n"
"pilot list from the gnome-pilot daemon"
@@ -172,471 +170,468 @@ msgstr "Элементы принадлежащие этим категориям:"
msgid "Available Categories:"
msgstr "Доступные категории:"
-#: addressbook/contact-editor/e-contact-editor.c:705
-#: calendar/gui/dialogs/task-editor.c:411 calendar/gui/event-editor.c:1155
+#: addressbook/contact-editor/e-contact-editor.c:706
+#: calendar/gui/dialogs/task-editor.c:431 calendar/gui/event-editor.c:1155
msgid "FIXME: _Appointment"
msgstr "FIXME: Встреча"
-#: addressbook/contact-editor/e-contact-editor.c:706
-#: calendar/gui/dialogs/task-editor.c:412 calendar/gui/event-editor.c:1156
+#: addressbook/contact-editor/e-contact-editor.c:707
+#: calendar/gui/dialogs/task-editor.c:432 calendar/gui/event-editor.c:1156
msgid "FIXME: Meeting Re_quest"
msgstr "FIXME: Запрос встречи"
-#: addressbook/contact-editor/e-contact-editor.c:708
-#: calendar/gui/dialogs/task-editor.c:410 calendar/gui/event-editor.c:1158
+#: addressbook/contact-editor/e-contact-editor.c:709
+#: calendar/gui/dialogs/task-editor.c:430 calendar/gui/event-editor.c:1158
msgid "FIXME: _Mail Message"
msgstr "FIXME: Почтовое сообщение"
-#: addressbook/contact-editor/e-contact-editor.c:709
-#: calendar/gui/dialogs/task-editor.c:413 calendar/gui/event-editor.c:1159
+#: addressbook/contact-editor/e-contact-editor.c:710
+#: calendar/gui/dialogs/task-editor.c:433 calendar/gui/event-editor.c:1159
msgid "FIXME: _Contact"
msgstr "FIXME: Контакт"
-#: addressbook/contact-editor/e-contact-editor.c:710
-#: calendar/gui/dialogs/task-editor.c:407
-#: calendar/gui/dialogs/task-editor.c:414 calendar/gui/event-editor.c:1160
+#: addressbook/contact-editor/e-contact-editor.c:711
+#: calendar/gui/dialogs/task-editor.c:427
+#: calendar/gui/dialogs/task-editor.c:434 calendar/gui/event-editor.c:1160
msgid "FIXME: _Task"
msgstr "FIXME: Задание"
-#: addressbook/contact-editor/e-contact-editor.c:711
-#: calendar/gui/dialogs/task-editor.c:408
-#: calendar/gui/dialogs/task-editor.c:415 calendar/gui/event-editor.c:1161
+#: addressbook/contact-editor/e-contact-editor.c:712
+#: calendar/gui/dialogs/task-editor.c:428
+#: calendar/gui/dialogs/task-editor.c:435 calendar/gui/event-editor.c:1161
msgid "FIXME: Task _Request"
msgstr "FIXME: Запрос задания"
-#: addressbook/contact-editor/e-contact-editor.c:712
-#: calendar/gui/dialogs/task-editor.c:416 calendar/gui/event-editor.c:1162
+#: addressbook/contact-editor/e-contact-editor.c:713
+#: calendar/gui/dialogs/task-editor.c:436 calendar/gui/event-editor.c:1162
msgid "FIXME: _Journal Entry"
msgstr "FIXME: Журнальная запись"
-#: addressbook/contact-editor/e-contact-editor.c:713
-#: calendar/gui/dialogs/task-editor.c:417 calendar/gui/event-editor.c:1163
+#: addressbook/contact-editor/e-contact-editor.c:714
+#: calendar/gui/dialogs/task-editor.c:437 calendar/gui/event-editor.c:1163
msgid "FIXME: _Note"
msgstr "FIXME: Заметка"
-#: addressbook/contact-editor/e-contact-editor.c:715
-#: addressbook/contact-editor/e-contact-editor.c:820
-#: calendar/gui/dialogs/task-editor.c:419
-#: calendar/gui/dialogs/task-editor.c:527 calendar/gui/event-editor.c:1165
+#: addressbook/contact-editor/e-contact-editor.c:716
+#: addressbook/contact-editor/e-contact-editor.c:821
+#: calendar/gui/dialogs/task-editor.c:439
+#: calendar/gui/dialogs/task-editor.c:547 calendar/gui/event-editor.c:1165
#: calendar/gui/event-editor.c:1273
msgid "FIXME: Ch_oose Form..."
msgstr "FIXME: Выбрать из..."
-#: addressbook/contact-editor/e-contact-editor.c:720
-#: calendar/gui/dialogs/task-editor.c:424 calendar/gui/event-editor.c:1170
+#: addressbook/contact-editor/e-contact-editor.c:721
+#: calendar/gui/dialogs/task-editor.c:444 calendar/gui/event-editor.c:1170
msgid "FIXME: _Memo Style"
msgstr "FIXME: Стиль памятки"
-#: addressbook/contact-editor/e-contact-editor.c:722
-#: calendar/gui/dialogs/task-editor.c:426 calendar/gui/event-editor.c:1172
+#: addressbook/contact-editor/e-contact-editor.c:723
+#: calendar/gui/dialogs/task-editor.c:446 calendar/gui/event-editor.c:1172
msgid "FIXME: Define Print _Styles..."
msgstr "FIXME: Определить стили печати..."
-#: addressbook/contact-editor/e-contact-editor.c:729
-#: calendar/gui/dialogs/task-editor.c:433 calendar/gui/event-editor.c:1179
+#: addressbook/contact-editor/e-contact-editor.c:730
+#: calendar/gui/dialogs/task-editor.c:453 calendar/gui/event-editor.c:1179
msgid "FIXME: S_end"
msgstr "FIXME: Отправить"
-#: addressbook/contact-editor/e-contact-editor.c:733
-#: calendar/gui/dialogs/task-editor.c:437 calendar/gui/event-editor.c:1183
+#: addressbook/contact-editor/e-contact-editor.c:734
+#: calendar/gui/dialogs/task-editor.c:457 calendar/gui/event-editor.c:1183
msgid "FIXME: Save Attac_hments..."
msgstr "FIXME: Сохранить вложения..."
#: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: addressbook/contact-editor/e-contact-editor.c:735
-#: calendar/gui/dialogs/task-editor.c:439 calendar/gui/event-editor.c:1185
+#: addressbook/contact-editor/e-contact-editor.c:736
+#: calendar/gui/dialogs/task-editor.c:459 calendar/gui/event-editor.c:1185
msgid "_Delete"
msgstr "Удалить"
-#: addressbook/contact-editor/e-contact-editor.c:736
-#: calendar/gui/dialogs/task-editor.c:441 calendar/gui/event-editor.c:1187
+#: addressbook/contact-editor/e-contact-editor.c:737
+#: calendar/gui/dialogs/task-editor.c:461 calendar/gui/event-editor.c:1187
msgid "FIXME: _Move to Folder..."
msgstr "FIXME: Переместить в папку..."
-#: addressbook/contact-editor/e-contact-editor.c:737
-#: calendar/gui/dialogs/task-editor.c:442 calendar/gui/event-editor.c:1188
+#: addressbook/contact-editor/e-contact-editor.c:738
+#: calendar/gui/dialogs/task-editor.c:462 calendar/gui/event-editor.c:1188
msgid "FIXME: Cop_y to Folder..."
msgstr "FIXME: Скопировать в папку..."
-#: addressbook/contact-editor/e-contact-editor.c:739
-#: calendar/gui/dialogs/task-editor.c:444 calendar/gui/event-editor.c:1190
+#: addressbook/contact-editor/e-contact-editor.c:740
+#: calendar/gui/dialogs/task-editor.c:464 calendar/gui/event-editor.c:1190
msgid "Page Set_up"
msgstr "Настройка страницы:"
-#: addressbook/contact-editor/e-contact-editor.c:740
-#: calendar/gui/dialogs/task-editor.c:445 calendar/gui/event-editor.c:1191
+#: addressbook/contact-editor/e-contact-editor.c:741
+#: calendar/gui/dialogs/task-editor.c:465 calendar/gui/event-editor.c:1191
msgid "FIXME: Print Pre_view"
msgstr "FIXME: Просмотр печати"
-#: addressbook/contact-editor/e-contact-editor.c:761
-#: calendar/gui/dialogs/task-editor.c:466 calendar/gui/event-editor.c:1212
+#: addressbook/contact-editor/e-contact-editor.c:762
+#: calendar/gui/dialogs/task-editor.c:486 calendar/gui/event-editor.c:1212
msgid "FIXME: Paste _Special..."
msgstr "FIXME: Специальная вставка..."
-#: addressbook/contact-editor/e-contact-editor.c:766
-#: calendar/gui/dialogs/task-editor.c:471 calendar/gui/event-editor.c:1217
+#: addressbook/contact-editor/e-contact-editor.c:767
+#: calendar/gui/dialogs/task-editor.c:491 calendar/gui/event-editor.c:1217
msgid "FIXME: Mark as U_nread"
msgstr "FIXME: Пометить как непрочтенное"
-#: addressbook/contact-editor/e-contact-editor.c:770
-#: calendar/gui/dialogs/task-editor.c:475 calendar/gui/event-editor.c:1221
+#: addressbook/contact-editor/e-contact-editor.c:771
+#: calendar/gui/dialogs/task-editor.c:495 calendar/gui/event-editor.c:1221
msgid "_Object"
msgstr "Объект"
-#: addressbook/contact-editor/e-contact-editor.c:775
-#: addressbook/contact-editor/e-contact-editor.c:782
-#: calendar/gui/dialogs/task-editor.c:480
-#: calendar/gui/dialogs/task-editor.c:488 calendar/gui/event-editor.c:1226
+#: addressbook/contact-editor/e-contact-editor.c:776
+#: addressbook/contact-editor/e-contact-editor.c:783
+#: calendar/gui/dialogs/task-editor.c:500
+#: calendar/gui/dialogs/task-editor.c:508 calendar/gui/event-editor.c:1226
#: calendar/gui/event-editor.c:1233
msgid "FIXME: _Item"
msgstr "FIXME: Элемент"
-#: addressbook/contact-editor/e-contact-editor.c:776
-#: addressbook/contact-editor/e-contact-editor.c:783
-#: calendar/gui/dialogs/task-editor.c:481
-#: calendar/gui/dialogs/task-editor.c:489 calendar/gui/event-editor.c:1227
+#: addressbook/contact-editor/e-contact-editor.c:777
+#: addressbook/contact-editor/e-contact-editor.c:784
+#: calendar/gui/dialogs/task-editor.c:501
+#: calendar/gui/dialogs/task-editor.c:509 calendar/gui/event-editor.c:1227
#: calendar/gui/event-editor.c:1234
msgid "FIXME: _Unread Item"
msgstr "FIXME: Непрочтенный элемент"
-#: addressbook/contact-editor/e-contact-editor.c:777
-#: calendar/gui/dialogs/task-editor.c:483 calendar/gui/event-editor.c:1228
+#: addressbook/contact-editor/e-contact-editor.c:778
+#: calendar/gui/dialogs/task-editor.c:503 calendar/gui/event-editor.c:1228
msgid "FIXME: Fi_rst Item in Folder"
msgstr "FIXME: Первый элемент в папке"
-#: addressbook/contact-editor/e-contact-editor.c:784
-#: calendar/gui/dialogs/task-editor.c:491 calendar/gui/event-editor.c:1235
+#: addressbook/contact-editor/e-contact-editor.c:785
+#: calendar/gui/dialogs/task-editor.c:511 calendar/gui/event-editor.c:1235
msgid "FIXME: _Last Item in Folder"
msgstr "FIXME: Последний элемент в папке"
-#: addressbook/contact-editor/e-contact-editor.c:789
-#: calendar/gui/dialogs/task-editor.c:496 calendar/gui/event-editor.c:1240
+#: addressbook/contact-editor/e-contact-editor.c:790
+#: calendar/gui/dialogs/task-editor.c:516 calendar/gui/event-editor.c:1240
msgid "FIXME: _Standard"
msgstr "FIXME: Стандарт"
-#: addressbook/contact-editor/e-contact-editor.c:791
-#: calendar/gui/dialogs/task-editor.c:498 calendar/gui/event-editor.c:1242
+#: addressbook/contact-editor/e-contact-editor.c:792
+#: calendar/gui/dialogs/task-editor.c:518 calendar/gui/event-editor.c:1242
msgid "FIXME: __Formatting"
msgstr "FIXME: Форматирование"
-#: addressbook/contact-editor/e-contact-editor.c:794
-#: calendar/gui/dialogs/task-editor.c:501 calendar/gui/event-editor.c:1245
+#: addressbook/contact-editor/e-contact-editor.c:795
+#: calendar/gui/dialogs/task-editor.c:521 calendar/gui/event-editor.c:1245
msgid "FIXME: _Customize..."
msgstr "FIXME: Настройка..."
-#: addressbook/contact-editor/e-contact-editor.c:799
-#: calendar/gui/dialogs/task-editor.c:506 calendar/gui/event-editor.c:1250
+#: addressbook/contact-editor/e-contact-editor.c:800
+#: calendar/gui/dialogs/task-editor.c:526 calendar/gui/event-editor.c:1250
msgid "Pre_vious"
msgstr "Пред."
-#: addressbook/contact-editor/e-contact-editor.c:800
-#: calendar/gui/dialogs/task-editor.c:507 calendar/gui/event-editor.c:1251
+#: addressbook/contact-editor/e-contact-editor.c:801
+#: calendar/gui/dialogs/task-editor.c:527 calendar/gui/event-editor.c:1251
msgid "Ne_xt"
msgstr "След."
-#: addressbook/contact-editor/e-contact-editor.c:802
-#: calendar/gui/dialogs/task-editor.c:509 calendar/gui/event-editor.c:1255
+#: addressbook/contact-editor/e-contact-editor.c:803
+#: calendar/gui/dialogs/task-editor.c:529 calendar/gui/event-editor.c:1255
msgid "_Toolbars"
msgstr "Панели инструментов"
-#: addressbook/contact-editor/e-contact-editor.c:807
-#: calendar/gui/dialogs/task-editor.c:514 calendar/gui/event-editor.c:1260
+#: addressbook/contact-editor/e-contact-editor.c:808
+#: calendar/gui/dialogs/task-editor.c:534 calendar/gui/event-editor.c:1260
msgid "FIXME: _File..."
msgstr "FIXME: Файл..."
-#: addressbook/contact-editor/e-contact-editor.c:808
-#: calendar/gui/dialogs/task-editor.c:515 calendar/gui/event-editor.c:1261
+#: addressbook/contact-editor/e-contact-editor.c:809
+#: calendar/gui/dialogs/task-editor.c:535 calendar/gui/event-editor.c:1261
msgid "FIXME: It_em..."
msgstr "FIXME: Элемент..."
-#: addressbook/contact-editor/e-contact-editor.c:809
-#: calendar/gui/dialogs/task-editor.c:516 calendar/gui/event-editor.c:1262
+#: addressbook/contact-editor/e-contact-editor.c:810
+#: calendar/gui/dialogs/task-editor.c:536 calendar/gui/event-editor.c:1262
msgid "FIXME: _Object..."
msgstr "FIXME: Объект..."
-#: addressbook/contact-editor/e-contact-editor.c:814
-#: calendar/gui/dialogs/task-editor.c:521 calendar/gui/event-editor.c:1267
+#: addressbook/contact-editor/e-contact-editor.c:815
+#: calendar/gui/dialogs/task-editor.c:541 calendar/gui/event-editor.c:1267
msgid "FIXME: _Font..."
msgstr "FIXME: Шрифт..."
-#: addressbook/contact-editor/e-contact-editor.c:815
-#: calendar/gui/dialogs/task-editor.c:522 calendar/gui/event-editor.c:1268
+#: addressbook/contact-editor/e-contact-editor.c:816
+#: calendar/gui/dialogs/task-editor.c:542 calendar/gui/event-editor.c:1268
msgid "FIXME: _Paragraph..."
msgstr "FIXME: Параграф..."
-#: addressbook/contact-editor/e-contact-editor.c:822
-#: calendar/gui/dialogs/task-editor.c:529 calendar/gui/event-editor.c:1275
+#: addressbook/contact-editor/e-contact-editor.c:823
+#: calendar/gui/dialogs/task-editor.c:549 calendar/gui/event-editor.c:1275
msgid "FIXME: Desi_gn This Form"
msgstr "FIXME: Конструкция этой формы"
-#: addressbook/contact-editor/e-contact-editor.c:823
-#: calendar/gui/dialogs/task-editor.c:530 calendar/gui/event-editor.c:1276
+#: addressbook/contact-editor/e-contact-editor.c:824
+#: calendar/gui/dialogs/task-editor.c:550 calendar/gui/event-editor.c:1276
msgid "FIXME: D_esign a Form..."
msgstr "FIXME: Создать форму..."
-#: addressbook/contact-editor/e-contact-editor.c:825
-#: calendar/gui/dialogs/task-editor.c:532 calendar/gui/event-editor.c:1278
+#: addressbook/contact-editor/e-contact-editor.c:826
+#: calendar/gui/dialogs/task-editor.c:552 calendar/gui/event-editor.c:1278
msgid "FIXME: Publish _Form..."
msgstr "FIXME: Опубликовать форму..."
-#: addressbook/contact-editor/e-contact-editor.c:826
-#: calendar/gui/dialogs/task-editor.c:533 calendar/gui/event-editor.c:1279
+#: addressbook/contact-editor/e-contact-editor.c:827
+#: calendar/gui/dialogs/task-editor.c:553 calendar/gui/event-editor.c:1279
msgid "FIXME: Pu_blish Form As..."
msgstr "FIXME: Опубликовать форму как..."
-#: addressbook/contact-editor/e-contact-editor.c:828
-#: calendar/gui/dialogs/task-editor.c:535 calendar/gui/event-editor.c:1281
+#: addressbook/contact-editor/e-contact-editor.c:829
+#: calendar/gui/dialogs/task-editor.c:555 calendar/gui/event-editor.c:1281
msgid "FIXME: Script _Debugger"
msgstr "FIXME: Отладчик скрипта"
-#: addressbook/contact-editor/e-contact-editor.c:833
-#: calendar/gui/dialogs/task-editor.c:540 calendar/gui/event-editor.c:1286
+#: addressbook/contact-editor/e-contact-editor.c:834
+#: calendar/gui/dialogs/task-editor.c:560 calendar/gui/event-editor.c:1286
msgid "FIXME: _Spelling..."
msgstr "FIXME: Проверка правописания..."
-#: addressbook/contact-editor/e-contact-editor.c:835
-#: calendar/gui/dialogs/task-editor.c:545 calendar/gui/event-editor.c:1291
+#: addressbook/contact-editor/e-contact-editor.c:836
+#: calendar/gui/dialogs/task-editor.c:565 calendar/gui/event-editor.c:1291
msgid "_Forms"
msgstr "Формы"
-#: addressbook/contact-editor/e-contact-editor.c:840
+#: addressbook/contact-editor/e-contact-editor.c:841
msgid "FIXME: _New Contact"
msgstr "FIXME: Новый контакт"
-#: addressbook/contact-editor/e-contact-editor.c:841
+#: addressbook/contact-editor/e-contact-editor.c:842
msgid "FIXME: New _Contact from Same Company"
msgstr "FIXME: Новый контакт в той же компании"
-#: addressbook/contact-editor/e-contact-editor.c:843
+#: addressbook/contact-editor/e-contact-editor.c:844
msgid "FIXME: New _Letter to Contact"
msgstr "FIXME: Новое письмо для контакта"
-#: addressbook/contact-editor/e-contact-editor.c:844
+#: addressbook/contact-editor/e-contact-editor.c:845
msgid "FIXME: New _Message to Contact"
msgstr "FIXME: Новое сообщение для контакта"
-#: addressbook/contact-editor/e-contact-editor.c:845
+#: addressbook/contact-editor/e-contact-editor.c:846
msgid "FIXME: New Meetin_g with Contact"
msgstr "FIXME: Новая встреча с контактом"
-#: addressbook/contact-editor/e-contact-editor.c:846
+#: addressbook/contact-editor/e-contact-editor.c:847
msgid "FIXME: _Plan a Meeting..."
msgstr "FIXME: План встречи..."
-#: addressbook/contact-editor/e-contact-editor.c:847
+#: addressbook/contact-editor/e-contact-editor.c:848
msgid "FIXME: New _Task for Contact"
msgstr "FIXME: Новая задача для контакта"
-#: addressbook/contact-editor/e-contact-editor.c:848
+#: addressbook/contact-editor/e-contact-editor.c:849
msgid "FIXME: New _Journal Entry for Contact"
msgstr "FIXME: Новая журнальная запись для контакта"
-#: addressbook/contact-editor/e-contact-editor.c:850
+#: addressbook/contact-editor/e-contact-editor.c:851
msgid "FIXME: _Flag for Follow Up..."
msgstr ""
-#: addressbook/contact-editor/e-contact-editor.c:851
+#: addressbook/contact-editor/e-contact-editor.c:852
msgid "FIXME: _Display Map of Address"
msgstr "FIXME: Отобразить карту адресов"
-#: addressbook/contact-editor/e-contact-editor.c:852
+#: addressbook/contact-editor/e-contact-editor.c:853
msgid "FIXME: _Open Web Page"
msgstr "FIXME: Открыть Web-страницу"
-#: addressbook/contact-editor/e-contact-editor.c:854
+#: addressbook/contact-editor/e-contact-editor.c:855
msgid "FIXME: Forward as _vCard"
msgstr "FIXME: Переслать как vCard"
-#: addressbook/contact-editor/e-contact-editor.c:855
-#: calendar/gui/dialogs/task-editor.c:562 calendar/gui/event-editor.c:1304
+#: addressbook/contact-editor/e-contact-editor.c:856
+#: calendar/gui/dialogs/task-editor.c:582 calendar/gui/event-editor.c:1304
msgid "FIXME: For_ward"
msgstr "FIXME: Переслать"
-#: addressbook/contact-editor/e-contact-editor.c:867
-#: calendar/gui/dialogs/task-editor.c:575 calendar/gui/event-editor.c:1317
+#: addressbook/contact-editor/e-contact-editor.c:868
+#: calendar/gui/dialogs/task-editor.c:595 calendar/gui/event-editor.c:1317
msgid "_Insert"
msgstr "Вставить"
-#: addressbook/contact-editor/e-contact-editor.c:868
-#: calendar/gui/dialogs/task-editor.c:576 calendar/gui/event-editor.c:1318
-#: composer/e-msg-composer.c:1020
+#: addressbook/contact-editor/e-contact-editor.c:869
+#: calendar/gui/dialogs/task-editor.c:596 calendar/gui/event-editor.c:1318
+#: composer/e-msg-composer.c:1005
msgid "F_ormat"
msgstr "Формат"
-#: addressbook/contact-editor/e-contact-editor.c:869
-#: addressbook/gui/component/addressbook.c:545
-#: calendar/gui/dialogs/task-editor.c:577 calendar/gui/event-editor.c:1319
+#: addressbook/contact-editor/e-contact-editor.c:870
+#: calendar/gui/dialogs/task-editor.c:597 calendar/gui/event-editor.c:1319
msgid "_Tools"
msgstr "Инструменты"
-#: addressbook/contact-editor/e-contact-editor.c:870
-#: calendar/gui/dialogs/task-editor.c:578 calendar/gui/event-editor.c:1320
+#: addressbook/contact-editor/e-contact-editor.c:871
+#: calendar/gui/dialogs/task-editor.c:598 calendar/gui/event-editor.c:1320
msgid "Actio_ns"
msgstr "Действия"
-#: addressbook/contact-editor/e-contact-editor.c:901
-#: calendar/gui/dialogs/task-editor.c:604 calendar/gui/event-editor.c:1345
+#: addressbook/contact-editor/e-contact-editor.c:902
+#: calendar/gui/dialogs/task-editor.c:624 calendar/gui/event-editor.c:1345
msgid "Save and Close"
msgstr "Сохранить и закрыть"
-#: addressbook/contact-editor/e-contact-editor.c:902
+#: addressbook/contact-editor/e-contact-editor.c:903
msgid "Save the appointment and close the dialog box"
msgstr "Сохранить встречу и закрыть окно диалога"
-#: addressbook/contact-editor/e-contact-editor.c:906
-#: calendar/gui/calendar-commands.c:633
+#: addressbook/contact-editor/e-contact-editor.c:907
msgid "Print..."
msgstr "Печать..."
-#: addressbook/contact-editor/e-contact-editor.c:907
-#: calendar/gui/dialogs/task-editor.c:610 calendar/gui/event-editor.c:1363
+#: addressbook/contact-editor/e-contact-editor.c:908
+#: calendar/gui/dialogs/task-editor.c:630 calendar/gui/event-editor.c:1363
msgid "Print this item"
msgstr "Печать этого элемента"
-#: addressbook/contact-editor/e-contact-editor.c:910
-#: calendar/gui/dialogs/task-editor.c:613 calendar/gui/event-editor.c:1368
+#: addressbook/contact-editor/e-contact-editor.c:911
+#: calendar/gui/dialogs/task-editor.c:633 calendar/gui/event-editor.c:1368
msgid "FIXME: Insert File..."
msgstr "FIXME: Вставить файл..."
-#: addressbook/contact-editor/e-contact-editor.c:911
-#: calendar/gui/dialogs/task-editor.c:614 calendar/gui/event-editor.c:1369
+#: addressbook/contact-editor/e-contact-editor.c:912
+#: calendar/gui/dialogs/task-editor.c:634 calendar/gui/event-editor.c:1369
msgid "Insert a file as an attachment"
msgstr "Вставить файл как вложение"
-#: addressbook/contact-editor/e-contact-editor.c:914
-#: addressbook/gui/component/addressbook.c:443
-#: calendar/gui/dialogs/task-editor.c:624 calendar/gui/e-calendar-table.c:324
+#: addressbook/contact-editor/e-contact-editor.c:915
+#: calendar/gui/dialogs/task-editor.c:644 calendar/gui/e-calendar-table.c:324
#: calendar/gui/event-editor-dialog.glade.h:92
-#: calendar/gui/event-editor.c:1350 mail/folder-browser-factory.c:51
-#: mail/mail-config.glade.h:13 mail/mail-config.glade.h:18
-#: mail/mail-config.glade.h:24 mail/mail-view.c:160
+#: calendar/gui/event-editor.c:1350 mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:18 mail/mail-config.glade.h:24
+#: mail/mail-view.c:163
msgid "Delete"
msgstr "Удалить"
-#: addressbook/contact-editor/e-contact-editor.c:915
+#: addressbook/contact-editor/e-contact-editor.c:916
msgid "Delete this item"
msgstr "Удалить этот элемент"
-#: addressbook/contact-editor/e-contact-editor.c:919
-#: calendar/gui/dialogs/task-editor.c:629 calendar/gui/event-editor.c:1379
+#: addressbook/contact-editor/e-contact-editor.c:920
+#: calendar/gui/dialogs/task-editor.c:649 calendar/gui/event-editor.c:1379
msgid "FIXME: Previous"
msgstr "FIXME: Пред."
-#: addressbook/contact-editor/e-contact-editor.c:920
-#: calendar/gui/dialogs/task-editor.c:630 calendar/gui/event-editor.c:1380
+#: addressbook/contact-editor/e-contact-editor.c:921
+#: calendar/gui/dialogs/task-editor.c:650 calendar/gui/event-editor.c:1380
msgid "Go to the previous item"
msgstr "Перейти к предыдущему элементу"
-#: addressbook/contact-editor/e-contact-editor.c:922
-#: calendar/gui/dialogs/task-editor.c:633 calendar/gui/event-editor.c:1382
+#: addressbook/contact-editor/e-contact-editor.c:923
+#: calendar/gui/dialogs/task-editor.c:653 calendar/gui/event-editor.c:1382
msgid "FIXME: Next"
msgstr "FIXME: След."
-#: addressbook/contact-editor/e-contact-editor.c:923
-#: calendar/gui/dialogs/task-editor.c:634 calendar/gui/event-editor.c:1383
+#: addressbook/contact-editor/e-contact-editor.c:924
+#: calendar/gui/dialogs/task-editor.c:654 calendar/gui/event-editor.c:1383
msgid "Go to the next item"
msgstr "Перейти к следующему элементу"
-#: addressbook/contact-editor/e-contact-editor.c:926
-#: calendar/gui/dialogs/task-editor.c:637 calendar/gui/event-editor.c:1385
+#: addressbook/contact-editor/e-contact-editor.c:927
+#: calendar/gui/dialogs/task-editor.c:657 calendar/gui/event-editor.c:1385
msgid "FIXME: Help"
msgstr "FIXME: Справка"
-#: addressbook/contact-editor/e-contact-editor.c:927
-#: calendar/gui/dialogs/task-editor.c:638 calendar/gui/event-editor.c:1386
+#: addressbook/contact-editor/e-contact-editor.c:928
+#: calendar/gui/dialogs/task-editor.c:658 calendar/gui/event-editor.c:1386
msgid "See online help"
msgstr "Просмотр справки в сети"
-#: addressbook/contact-editor/e-contact-editor.c:1391
+#: addressbook/contact-editor/e-contact-editor.c:1419
msgid "Assistant"
msgstr "Помощник"
-#: addressbook/contact-editor/e-contact-editor.c:1392
-#: addressbook/contact-editor/e-contact-editor.c:1496
+#: addressbook/contact-editor/e-contact-editor.c:1420
+#: addressbook/contact-editor/e-contact-editor.c:1524
msgid "Business"
msgstr "Рабочий"
-#: addressbook/contact-editor/e-contact-editor.c:1393
+#: addressbook/contact-editor/e-contact-editor.c:1421
msgid "Business 2"
msgstr "Рабочий 2"
-#: addressbook/contact-editor/e-contact-editor.c:1394
+#: addressbook/contact-editor/e-contact-editor.c:1422
msgid "Business Fax"
msgstr "Рабочий факс"
-#: addressbook/contact-editor/e-contact-editor.c:1395
+#: addressbook/contact-editor/e-contact-editor.c:1423
msgid "Callback"
msgstr ""
-#: addressbook/contact-editor/e-contact-editor.c:1396
+#: addressbook/contact-editor/e-contact-editor.c:1424
msgid "Car"
msgstr "Машина"
-#: addressbook/contact-editor/e-contact-editor.c:1397
+#: addressbook/contact-editor/e-contact-editor.c:1425
msgid "Company"
msgstr "Компания"
-#: addressbook/contact-editor/e-contact-editor.c:1398
-#: addressbook/contact-editor/e-contact-editor.c:1497
+#: addressbook/contact-editor/e-contact-editor.c:1426
+#: addressbook/contact-editor/e-contact-editor.c:1525
msgid "Home"
msgstr "Домашний"
-#: addressbook/contact-editor/e-contact-editor.c:1399
+#: addressbook/contact-editor/e-contact-editor.c:1427
msgid "Home 2"
msgstr "Домашний 2"
-#: addressbook/contact-editor/e-contact-editor.c:1400
+#: addressbook/contact-editor/e-contact-editor.c:1428
msgid "Home Fax"
msgstr "Домашний Факс"
-#: addressbook/contact-editor/e-contact-editor.c:1401
+#: addressbook/contact-editor/e-contact-editor.c:1429
msgid "ISDN"
msgstr "ISDN"
-#: addressbook/contact-editor/e-contact-editor.c:1402
+#: addressbook/contact-editor/e-contact-editor.c:1430
msgid "Mobile"
msgstr "Мобильный"
-#: addressbook/contact-editor/e-contact-editor.c:1403
-#: addressbook/contact-editor/e-contact-editor.c:1498
+#: addressbook/contact-editor/e-contact-editor.c:1431
+#: addressbook/contact-editor/e-contact-editor.c:1526
#: mail/mail-config.glade.h:28
msgid "Other"
msgstr "Другой"
-#: addressbook/contact-editor/e-contact-editor.c:1404
+#: addressbook/contact-editor/e-contact-editor.c:1432
msgid "Other Fax"
msgstr "Другой факс"
-#: addressbook/contact-editor/e-contact-editor.c:1405
+#: addressbook/contact-editor/e-contact-editor.c:1433
msgid "Pager"
msgstr "Пэйджер"
-#: addressbook/contact-editor/e-contact-editor.c:1406
+#: addressbook/contact-editor/e-contact-editor.c:1434
msgid "Primary"
msgstr "Первый"
-#: addressbook/contact-editor/e-contact-editor.c:1407
+#: addressbook/contact-editor/e-contact-editor.c:1435
msgid "Radio"
msgstr "Радио"
-#: addressbook/contact-editor/e-contact-editor.c:1408
+#: addressbook/contact-editor/e-contact-editor.c:1436
msgid "Telex"
msgstr "Телекс"
-#: addressbook/contact-editor/e-contact-editor.c:1409
+#: addressbook/contact-editor/e-contact-editor.c:1437
msgid "TTY/TDD"
msgstr "TTY/TDD"
#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1453
+#: addressbook/contact-editor/e-contact-editor.c:1481
msgid "Primary Email"
msgstr "Первый эл.адрес"
-#: addressbook/contact-editor/e-contact-editor.c:1454
+#: addressbook/contact-editor/e-contact-editor.c:1482
msgid "Email 2"
msgstr "Эл.адрес 2"
-#: addressbook/contact-editor/e-contact-editor.c:1455
+#: addressbook/contact-editor/e-contact-editor.c:1483
msgid "Email 3"
msgstr "Эл.адрес 3"
@@ -801,6 +796,53 @@ msgstr "Детали"
#. * Add this file to your project's POTFILES.in.
#. * DO NOT compile it as part of your application.
#.
+#: addressbook/contact-editor/fulladdr.glade.h:7
+msgid "Check Address"
+msgstr "Проверить адрес"
+
+#: addressbook/contact-editor/fulladdr.glade.h:8
+msgid "_Street Address:"
+msgstr "Улица:"
+
+#: addressbook/contact-editor/fulladdr.glade.h:9
+msgid "City:"
+msgstr "Город:"
+
+#: addressbook/contact-editor/fulladdr.glade.h:10
+msgid "State/Province:"
+msgstr "Область/Район (Штат/Провинция):"
+
+#: addressbook/contact-editor/fulladdr.glade.h:11
+msgid "Country:"
+msgstr "Страна:"
+
+#: addressbook/contact-editor/fulladdr.glade.h:12
+msgid "ZIP/Postal Code:"
+msgstr "Почтовый индекс:"
+
+#: addressbook/contact-editor/fulladdr.glade.h:13
+msgid "E_xt:"
+msgstr "Расш.:"
+
+#: addressbook/contact-editor/fulladdr.glade.h:14
+msgid ""
+"USA\n"
+"Canada\n"
+"Finland\n"
+msgstr ""
+"США\n"
+"Канада\n"
+"Финляндия\n"
+
+#: addressbook/contact-editor/fulladdr.glade.h:18
+msgid "PO Box:"
+msgstr "Аб.ящик:"
+
+#.
+#. * Translatable strings file generated by Glade.
+#. * Add this file to your project's POTFILES.in.
+#. * DO NOT compile it as part of your application.
+#.
#: addressbook/contact-editor/fullname-strings.h:7
msgid "Check Full Name"
msgstr "Проверить полное имя"
@@ -855,63 +897,15 @@ msgstr "Фамилия:"
msgid "_Suffix:"
msgstr "Суффикс:"
-#: addressbook/gui/component/addressbook.c:437
-#: calendar/gui/calendar-commands.c:506 notes/component-factory.c:27
-msgid "New"
-msgstr "Новый"
-
-#: addressbook/gui/component/addressbook.c:437
-msgid "Create a new contact"
-msgstr "Создать новый контакт"
-
-#: addressbook/gui/component/addressbook.c:441
-msgid "Find"
-msgstr "Найти"
-
-#: addressbook/gui/component/addressbook.c:441
-msgid "Find a contact"
-msgstr "Найти контакт"
-
-#: addressbook/gui/component/addressbook.c:442
-#: calendar/gui/calendar-commands.c:511 mail/folder-browser-factory.c:49
-#: mail/mail-view.c:158
-msgid "Print"
-msgstr "Печать"
-
-#: addressbook/gui/component/addressbook.c:442
-msgid "Print contacts"
-msgstr "Напечатать контакт"
-
-#: addressbook/gui/component/addressbook.c:443
-msgid "Delete a contact"
-msgstr "Удалить контакт"
-
-#: addressbook/gui/component/addressbook.c:512
-msgid "_Print Contacts..."
-msgstr "Напечатать контакты..."
-
-#: addressbook/gui/component/addressbook.c:522
-#: addressbook/gui/component/addressbook.c:1053
-msgid "As _Table"
-msgstr "Как таблица"
-
-#: addressbook/gui/component/addressbook.c:529
-msgid "_New Contact"
-msgstr "Новый контакт"
-
-#: addressbook/gui/component/addressbook.c:537
+#: addressbook/gui/component/addressbook.c:345
msgid "N_ew Directory Server"
msgstr "Новый сервер каталогов"
-#: addressbook/gui/component/addressbook.c:551
-msgid "_Search for contacts"
-msgstr "Поиск для контактов"
-
-#: addressbook/gui/component/addressbook.c:633
+#: addressbook/gui/component/addressbook.c:425
msgid "Unable to open addressbook"
msgstr "Не удалось открыть адресную книгу"
-#: addressbook/gui/component/addressbook.c:638
+#: addressbook/gui/component/addressbook.c:430
msgid ""
"We were unable to open this addressbook. This either\n"
"means you have entered an incorrect URI, or have tried\n"
@@ -931,225 +925,217 @@ msgstr ""
"использовать LDAP, вам надо скачать и установить \n"
"OpenLDAP и перекомпилировать и установить evolution.\n"
-#: addressbook/gui/component/addressbook.c:921
-#: addressbook/gui/minicard/e-minicard.c:334
+#: addressbook/gui/component/addressbook.c:547
+msgid "As _Minicards"
+msgstr "Как миникарточки"
+
+#: addressbook/gui/component/addressbook.c:552
+msgid "As _Table"
+msgstr "Как таблица"
+
+#: addressbook/gui/component/addressbook.c:592
+msgid "The URI that the Folder Browser will display"
+msgstr "URI, который будет показывать программа просмотра папок"
+
+#: addressbook/gui/component/e-ldap-storage.c:88
+msgid "External Directories"
+msgstr "Внешние каталоги"
+
+#.
+#. * Translatable strings file generated by Glade.
+#. * Add this file to your project's POTFILES.in.
+#. * DO NOT compile it as part of your application.
+#.
+#: addressbook/gui/component/ldap-server-dialog.glade.h:7
+#: composer/e-msg-composer-attachment.glade.h:9
+msgid "Description:"
+msgstr "Описание:"
+
+#: addressbook/gui/component/ldap-server-dialog.glade.h:8
+msgid "LDAP Server:"
+msgstr "Сервер LDAP:"
+
+#: addressbook/gui/component/ldap-server-dialog.glade.h:9
+msgid "Port Number:"
+msgstr "Номер порта:"
+
+#: addressbook/gui/component/ldap-server-dialog.glade.h:10
+msgid "Root DN:"
+msgstr ""
+
+#: addressbook/gui/component/ldap-server-dialog.glade.h:11
+#: composer/e-msg-composer-address-dialog.glade.h:8
+msgid "Name:"
+msgstr "Имя:"
+
+#.
+#. * Translatable strings file generated by Glade.
+#. * Add this file to your project's POTFILES.in.
+#. * DO NOT compile it as part of your application.
+#.
+#: addressbook/gui/component/select-names/select-names.glade.h:7
+msgid "Select Names"
+msgstr "Выбрать имена"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+msgid "Find..."
+msgstr "Найти..."
+
+#: addressbook/gui/component/select-names/select-names.glade.h:9
+msgid "Select name from List:"
+msgstr "Выбрать имена из списка:"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:10
+msgid "Message Recipients"
+msgstr "Получатели сообщения"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:416
+#: addressbook/gui/widgets/e-minicard.c:334
msgid "Save as VCard"
msgstr "Сохранить как VCard"
-#: addressbook/gui/component/addressbook.c:1023
+#: addressbook/gui/widgets/e-addressbook-view.c:541
msgid "* Click here to add a contact *"
msgstr "* Щелкните здесь чтобы добавить контакт *"
-#: addressbook/gui/component/addressbook.c:1060
-msgid "As _Minicards"
-msgstr "Как миникарточки"
+#: addressbook/gui/widgets/e-minicard-control.c:278
+msgid "Save in addressbook"
+msgstr "Сохранить в адресной книге"
-#: addressbook/gui/component/addressbook.c:1111
-msgid "The URI that the Folder Browser will display"
-msgstr "URI, который будет показывать программа просмотра папок"
+#: addressbook/gui/widgets/e-minicard-view.c:110
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view\n"
+"\n"
+"Double-click here to create a new Contact."
+msgstr ""
+"\n"
+"\n"
+"Нет элементов для отображения в этом окне\n"
+"\n"
+"Дважды щелкните здесь для создания нового контакта."
#.
#. * Translatable strings file generated by Glade.
#. * Add this file to your project's POTFILES.in.
#. * DO NOT compile it as part of your application.
#.
-#: addressbook/gui/component/alphabet.glade.h:7
+#: addressbook/gui/widgets/alphabet.glade.h:7
msgid "window2"
msgstr "окно2"
-#: addressbook/gui/component/alphabet.glade.h:8
+#: addressbook/gui/widgets/alphabet.glade.h:8
msgid "123"
msgstr "123"
-#: addressbook/gui/component/alphabet.glade.h:9
+#: addressbook/gui/widgets/alphabet.glade.h:9
msgid "a"
msgstr "a"
-#: addressbook/gui/component/alphabet.glade.h:10
+#: addressbook/gui/widgets/alphabet.glade.h:10
msgid "b"
msgstr "b"
-#: addressbook/gui/component/alphabet.glade.h:11
+#: addressbook/gui/widgets/alphabet.glade.h:11
msgid "c"
msgstr "c"
-#: addressbook/gui/component/alphabet.glade.h:12
+#: addressbook/gui/widgets/alphabet.glade.h:12
msgid "d"
msgstr "d"
-#: addressbook/gui/component/alphabet.glade.h:13
+#: addressbook/gui/widgets/alphabet.glade.h:13
msgid "e"
msgstr "e"
-#: addressbook/gui/component/alphabet.glade.h:14
+#: addressbook/gui/widgets/alphabet.glade.h:14
msgid "f"
msgstr "f"
-#: addressbook/gui/component/alphabet.glade.h:15
+#: addressbook/gui/widgets/alphabet.glade.h:15
msgid "g"
msgstr "g"
-#: addressbook/gui/component/alphabet.glade.h:16
+#: addressbook/gui/widgets/alphabet.glade.h:16
#: calendar/cal-util/timeutil.c:100
msgid "h"
msgstr "h"
-#: addressbook/gui/component/alphabet.glade.h:17
+#: addressbook/gui/widgets/alphabet.glade.h:17
msgid "i"
msgstr "i"
-#: addressbook/gui/component/alphabet.glade.h:18
+#: addressbook/gui/widgets/alphabet.glade.h:18
msgid "j"
msgstr "j"
-#: addressbook/gui/component/alphabet.glade.h:19
+#: addressbook/gui/widgets/alphabet.glade.h:19
msgid "k"
msgstr "к"
-#: addressbook/gui/component/alphabet.glade.h:20
+#: addressbook/gui/widgets/alphabet.glade.h:20
msgid "l"
msgstr "l"
-#: addressbook/gui/component/alphabet.glade.h:21
+#: addressbook/gui/widgets/alphabet.glade.h:21
msgid "m"
msgstr "m"
-#: addressbook/gui/component/alphabet.glade.h:22
+#: addressbook/gui/widgets/alphabet.glade.h:22
msgid "n"
msgstr "n"
-#: addressbook/gui/component/alphabet.glade.h:23
+#: addressbook/gui/widgets/alphabet.glade.h:23
msgid "o"
msgstr "o"
-#: addressbook/gui/component/alphabet.glade.h:24
+#: addressbook/gui/widgets/alphabet.glade.h:24
msgid "p"
msgstr "p"
-#: addressbook/gui/component/alphabet.glade.h:25
+#: addressbook/gui/widgets/alphabet.glade.h:25
msgid "q"
msgstr "q"
-#: addressbook/gui/component/alphabet.glade.h:26
+#: addressbook/gui/widgets/alphabet.glade.h:26
msgid "r"
msgstr "r"
-#: addressbook/gui/component/alphabet.glade.h:27
+#: addressbook/gui/widgets/alphabet.glade.h:27
msgid "s"
msgstr "s"
-#: addressbook/gui/component/alphabet.glade.h:28
+#: addressbook/gui/widgets/alphabet.glade.h:28
msgid "t"
msgstr "t"
-#: addressbook/gui/component/alphabet.glade.h:29
+#: addressbook/gui/widgets/alphabet.glade.h:29
msgid "u"
msgstr "u"
-#: addressbook/gui/component/alphabet.glade.h:30
+#: addressbook/gui/widgets/alphabet.glade.h:30
msgid "v"
msgstr "v"
-#: addressbook/gui/component/alphabet.glade.h:31
+#: addressbook/gui/widgets/alphabet.glade.h:31
msgid "w"
msgstr "w"
-#: addressbook/gui/component/alphabet.glade.h:32
+#: addressbook/gui/widgets/alphabet.glade.h:32
msgid "x"
msgstr "x"
-#: addressbook/gui/component/alphabet.glade.h:33
+#: addressbook/gui/widgets/alphabet.glade.h:33
msgid "y"
msgstr "y"
-#: addressbook/gui/component/alphabet.glade.h:34
+#: addressbook/gui/widgets/alphabet.glade.h:34
msgid "z"
msgstr "z"
-#: addressbook/gui/component/e-ldap-storage.c:88
-msgid "External Directories"
-msgstr "Внешние каталоги"
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/gui/component/ldap-server-dialog.glade.h:7
-#: composer/e-msg-composer-attachment.glade.h:9
-msgid "Description:"
-msgstr "Описание:"
-
-#: addressbook/gui/component/ldap-server-dialog.glade.h:8
-msgid "LDAP Server:"
-msgstr "Сервер LDAP:"
-
-#: addressbook/gui/component/ldap-server-dialog.glade.h:9
-msgid "Port Number:"
-msgstr "Номер порта:"
-
-#: addressbook/gui/component/ldap-server-dialog.glade.h:10
-msgid "Root DN:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-server-dialog.glade.h:11
-#: composer/e-msg-composer-address-dialog.glade.h:8
-msgid "Name:"
-msgstr "Имя:"
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/gui/component/select-names/select-names.glade.h:7
-msgid "Select Names"
-msgstr "Выбрать имена"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:8
-msgid "Find..."
-msgstr "Найти..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:9
-msgid "Select name from List:"
-msgstr "Выбрать имена из списка:"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:10
-msgid "Message Recipients"
-msgstr "Получатели сообщения"
-
-#: addressbook/gui/minicard/e-minicard-control.c:278
-msgid "Save in addressbook"
-msgstr "Сохранить в адресной книге"
-
-#: addressbook/gui/minicard/e-minicard-view.c:110
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-"\n"
-"\n"
-"Нет элементов для отображения в этом окне\n"
-"\n"
-"Дважды щелкните здесь для создания нового контакта."
-
-#: addressbook/gui/minicard/test-minicard-view.c:100
-msgid "Reflow Test"
-msgstr "Перезапустить тест"
-
-#: addressbook/gui/minicard/test-minicard-view.c:101
-msgid "Copyright (C) 2000, Helix Code, Inc."
-msgstr "Copyright (C) 2000 Helix Code, Inc."
-
-#: addressbook/gui/minicard/test-minicard-view.c:103
-msgid "This should test the reflow canvas item"
-msgstr ""
-
#. gtk_signal_connect(fb->search_entry, "changed", search_activate, fb);
-#: addressbook/gui/search/e-addressbook-search-dialog.c:150
+#: addressbook/gui/search/e-addressbook-search-dialog.c:151
#: mail/folder-browser.c:404
msgid "Search"
msgstr "Поиск"
@@ -1354,15 +1340,12 @@ msgstr "Средство настройки для кондуита календаря.\n"
#: calendar/conduits/calendar/calendar-conduit.c:398
#: calendar/conduits/calendar/calendar-conduit.c:1111
-#: calendar/conduits/todo/todo-conduit.c:357
-#: calendar/conduits/todo/todo-conduit.c:855
+#: calendar/conduits/todo/todo-conduit.c:559
msgid "Error while communicating with calendar server"
msgstr "Ошибка при подключении к серверу календаря"
#: calendar/conduits/calendar/calendar-conduit.c:778
#: calendar/conduits/calendar/calendar-conduit.c:780
-#: calendar/conduits/todo/todo-conduit.c:556
-#: calendar/conduits/todo/todo-conduit.c:558
msgid "Could not start gnomecal server"
msgstr "Не удалось запустить сервер gnomecal"
@@ -1371,16 +1354,36 @@ msgstr "Не удалось запустить сервер gnomecal"
msgid "Could not read pilot's DateBook application block"
msgstr "Невозможно прочесть блок приложения книги данных Пилота"
-#: calendar/conduits/todo/todo-conduit-control-applet.c:96
-msgid "Gpilotd todo conduit"
-msgstr "Кондуит заданий Gpilotd"
+#: calendar/conduits/todo/todo-conduit-control-applet.c:114
+msgid "JP Rosevear <jpr@helixcode.com>"
+msgstr "JP Rosevear <jpr@helixcode.com>"
+
+#: calendar/conduits/todo/todo-conduit-control-applet.c:115
+msgid "Original Author:"
+msgstr "Первоначальный автор:"
+
+#: calendar/conduits/todo/todo-conduit-control-applet.c:120
+msgid "Evolution ToDo Conduit"
+msgstr "Кондуит заданий Evolution"
+
+#: calendar/conduits/todo/todo-conduit-control-applet.c:121
+msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
+msgstr "(C) 1998-2000 the Free Software Foundation и Helix Code"
+
+#: calendar/conduits/todo/todo-conduit-control-applet.c:123
+msgid "Configuration utility for the evolution todo conduit.\n"
+msgstr "Средство настройки для кондуита заданий Evolution.\n"
-#: calendar/conduits/todo/todo-conduit-control-applet.c:99
-msgid "Configuration utility for the todo conduit.\n"
-msgstr "Средство настройки для кондуита заданий.\n"
+#: calendar/conduits/todo/todo-conduit.c:604
+msgid "Could not start wombat server"
+msgstr "Не удалось запустить сервер wombat"
-#: calendar/conduits/todo/todo-conduit.c:581
-#: calendar/conduits/todo/todo-conduit.c:584
+#: calendar/conduits/todo/todo-conduit.c:605
+msgid "Could not start wombat"
+msgstr "Не удалось запустить wombat"
+
+#: calendar/conduits/todo/todo-conduit.c:660
+#: calendar/conduits/todo/todo-conduit.c:663
msgid "Could not read pilot's ToDo application block"
msgstr "Невозможно прочесть блок приложения заданий Пилота"
@@ -1432,7 +1435,7 @@ msgstr "Календарь Gnome"
msgid "The GNOME personal calendar and schedule manager."
msgstr "Личный календарь и диспетчер расписания Gnome."
-#: calendar/gui/calendar-commands.c:392 tests/ui-tests/message-browser.c:676
+#: calendar/gui/calendar-commands.c:392
msgid "File not found"
msgstr "Файл не найден"
@@ -1444,119 +1447,46 @@ msgstr "Открыть календарь"
msgid "Save calendar"
msgstr "Сохранить календарь"
-#: calendar/gui/calendar-commands.c:484
+#: calendar/gui/calendar-commands.c:486
msgid "Day"
msgstr "День"
-#: calendar/gui/calendar-commands.c:484
+#: calendar/gui/calendar-commands.c:486
msgid "Show 1 day"
msgstr "Показать 1 день"
-#: calendar/gui/calendar-commands.c:487
+#: calendar/gui/calendar-commands.c:489
msgid "5 Days"
msgstr "5 дней"
-#: calendar/gui/calendar-commands.c:487
+#: calendar/gui/calendar-commands.c:489
msgid "Show the working week"
msgstr "Показать рабочую неделю"
-#: calendar/gui/calendar-commands.c:490
+#: calendar/gui/calendar-commands.c:492
msgid "Week"
msgstr "Неделя"
-#: calendar/gui/calendar-commands.c:490
+#: calendar/gui/calendar-commands.c:492
msgid "Show 1 week"
msgstr "Показать 1 неделю"
-#: calendar/gui/calendar-commands.c:493
+#: calendar/gui/calendar-commands.c:495
msgid "Month"
msgstr "Месяц"
-#: calendar/gui/calendar-commands.c:493
+#: calendar/gui/calendar-commands.c:495
msgid "Show 1 month"
msgstr "Показать 1 месяц"
-#: calendar/gui/calendar-commands.c:497
+#: calendar/gui/calendar-commands.c:499
msgid "Year"
msgstr "Год"
-#: calendar/gui/calendar-commands.c:497
+#: calendar/gui/calendar-commands.c:499
msgid "Show 1 year"
msgstr "Показать 1 год"
-#: calendar/gui/calendar-commands.c:506 calendar/gui/calendar-commands.c:642
-msgid "Create a new appointment"
-msgstr "Создать новую встречу"
-
-#: calendar/gui/calendar-commands.c:511 calendar/gui/calendar-commands.c:634
-msgid "Print this calendar"
-msgstr "Напечатать этот календарь"
-
-#: calendar/gui/calendar-commands.c:515
-msgid "Prev"
-msgstr "Пред."
-
-#: calendar/gui/calendar-commands.c:515
-msgid "Go back in time"
-msgstr "Перейти в прошлое"
-
-#: calendar/gui/calendar-commands.c:516
-msgid "Today"
-msgstr "Сегодня"
-
-#: calendar/gui/calendar-commands.c:516
-msgid "Go to present time"
-msgstr "Перейти к настоящему"
-
-#: calendar/gui/calendar-commands.c:517
-msgid "Next"
-msgstr "След."
-
-#: calendar/gui/calendar-commands.c:517
-msgid "Go forward in time"
-msgstr "Перейти в будущее"
-
-#: calendar/gui/calendar-commands.c:521
-msgid "Go to"
-msgstr "Перейти"
-
-#: calendar/gui/calendar-commands.c:521
-msgid "Go to a specific date"
-msgstr "Перейти к указанной дате"
-
-#. file menu
-#: calendar/gui/calendar-commands.c:619
-msgid "New Ca_lendar"
-msgstr "Новый календарь"
-
-#: calendar/gui/calendar-commands.c:620
-msgid "Create a new calendar"
-msgstr "Создать новый календарь"
-
-#: calendar/gui/calendar-commands.c:623
-msgid "Open Ca_lendar"
-msgstr "Открыть календарь"
-
-#: calendar/gui/calendar-commands.c:624
-msgid "Open a calendar"
-msgstr "Открыть календарь"
-
-#: calendar/gui/calendar-commands.c:628 calendar/gui/calendar-commands.c:629
-msgid "Save Calendar As"
-msgstr "Сохранить календарь как"
-
-#: calendar/gui/calendar-commands.c:642
-msgid "_New appointment..."
-msgstr "Новая встреча..."
-
-#: calendar/gui/calendar-commands.c:650 calendar/gui/prop.c:718
-msgid "Preferences"
-msgstr "Настройки"
-
-#: calendar/gui/calendar-commands.c:657 calendar/gui/calendar-commands.c:658
-msgid "About Calendar"
-msgstr "О программе \"Календарь\""
-
#: calendar/gui/calendar-model.c:330
msgid "Public"
msgstr "Общее"
@@ -1664,90 +1594,90 @@ msgstr "Правка встречи"
msgid "Snooze time (minutes)"
msgstr "Время дремания (минут)"
-#: calendar/gui/dialogs/task-editor.c:482
-#: calendar/gui/dialogs/task-editor.c:490
+#: calendar/gui/dialogs/task-editor.c:502
+#: calendar/gui/dialogs/task-editor.c:510
msgid "FIXME: In_complete Task"
msgstr "FIXME: Невыполненное Задание"
-#: calendar/gui/dialogs/task-editor.c:542 calendar/gui/event-editor.c:1288
+#: calendar/gui/dialogs/task-editor.c:562 calendar/gui/event-editor.c:1288
msgid "FIXME: Chec_k Names"
msgstr "FIXME: Проверка имен"
-#: calendar/gui/dialogs/task-editor.c:543 calendar/gui/event-editor.c:1289
+#: calendar/gui/dialogs/task-editor.c:563 calendar/gui/event-editor.c:1289
msgid "FIXME: Address _Book..."
msgstr "FIXME: Адресная книга..."
-#: calendar/gui/dialogs/task-editor.c:550
+#: calendar/gui/dialogs/task-editor.c:570
msgid "FIXME: _New Task"
msgstr "FIXME: Новое Задание"
-#: calendar/gui/dialogs/task-editor.c:552
+#: calendar/gui/dialogs/task-editor.c:572
msgid "FIXME: S_end Status Report"
msgstr "FIXME: Отправить отчет о состоянии"
-#: calendar/gui/dialogs/task-editor.c:553
+#: calendar/gui/dialogs/task-editor.c:573
msgid "FIXME: _Mark Complete"
msgstr "FIXME: Пометить как выполненное"
-#: calendar/gui/dialogs/task-editor.c:555 calendar/gui/event-editor.c:1298
+#: calendar/gui/dialogs/task-editor.c:575 calendar/gui/event-editor.c:1298
msgid "FIXME: Rec_urrence..."
msgstr "FIXME: Повторение..."
-#: calendar/gui/dialogs/task-editor.c:556
+#: calendar/gui/dialogs/task-editor.c:576
msgid "FIXME: S_kip Occurrence"
msgstr "FIXME: Пропустить случай"
-#: calendar/gui/dialogs/task-editor.c:558
+#: calendar/gui/dialogs/task-editor.c:578
msgid "FIXME: Assig_n Task"
msgstr "FIXME: Назначить Задание"
-#: calendar/gui/dialogs/task-editor.c:560
+#: calendar/gui/dialogs/task-editor.c:580
msgid "FIXME: _Reply"
msgstr "FIXME: Ответить"
-#: calendar/gui/dialogs/task-editor.c:561
+#: calendar/gui/dialogs/task-editor.c:581
msgid "FIXME: Reply to A_ll"
msgstr "FIXME: Ответить всем"
-#: calendar/gui/dialogs/task-editor.c:605
+#: calendar/gui/dialogs/task-editor.c:625
msgid "Save the task and close the dialog box"
msgstr "Сохранить задание и закрыть окно диалога"
-#: calendar/gui/dialogs/task-editor.c:609 calendar/gui/event-editor.c:1362
+#: calendar/gui/dialogs/task-editor.c:629 calendar/gui/event-editor.c:1362
msgid "FIXME: Print..."
msgstr "FIXME: Печать..."
-#: calendar/gui/dialogs/task-editor.c:619
+#: calendar/gui/dialogs/task-editor.c:639
msgid "FIXME: Assign Task..."
msgstr "FIXME: Назначить задание..."
-#: calendar/gui/dialogs/task-editor.c:620
+#: calendar/gui/dialogs/task-editor.c:640
msgid "Assign the task to someone"
msgstr "Назначить задание кому-либо"
-#: calendar/gui/dialogs/task-editor.c:625
+#: calendar/gui/dialogs/task-editor.c:645
msgid "Delete this task"
msgstr "Удалить это задание"
-#: calendar/gui/dialogs/task-editor.c:891
+#: calendar/gui/dialogs/task-editor.c:913
msgid "Edit Task"
msgstr "Правка задания"
-#: calendar/gui/dialogs/task-editor.c:897 calendar/gui/event-editor.c:284
+#: calendar/gui/dialogs/task-editor.c:919 calendar/gui/event-editor.c:284
msgid "No summary"
msgstr "Нет итога"
-#: calendar/gui/dialogs/task-editor.c:903 calendar/gui/event-editor.c:290
+#: calendar/gui/dialogs/task-editor.c:925 calendar/gui/event-editor.c:290
#, c-format
msgid "Appointment - %s"
msgstr "Встреча - %s"
-#: calendar/gui/dialogs/task-editor.c:906 calendar/gui/event-editor.c:293
+#: calendar/gui/dialogs/task-editor.c:928 calendar/gui/event-editor.c:293
#, c-format
msgid "Task - %s"
msgstr "Задание - %s"
-#: calendar/gui/dialogs/task-editor.c:909 calendar/gui/event-editor.c:296
+#: calendar/gui/dialogs/task-editor.c:931 calendar/gui/event-editor.c:296
#, c-format
msgid "Journal entry - %s"
msgstr "Журнальная запись - %s"
@@ -1874,7 +1804,6 @@ msgid "Percent complete"
msgstr "Процент выполненного"
#: calendar/gui/e-calendar-table.c:204 calendar/gui/prop.c:611
-#: mail/message-list.c:659
msgid "Priority"
msgstr "Приоритет"
@@ -1987,7 +1916,7 @@ msgstr ""
msgid "Invite attendees to a meeting"
msgstr "Пригласить посетителей на встречу"
-#: calendar/gui/event-editor.c:1926
+#: calendar/gui/event-editor.c:1930
msgid "%a %b %d %Y"
msgstr "%a %b %d %Y"
@@ -2092,7 +2021,9 @@ msgstr "Напоминание"
msgid "Recurrence rule"
msgstr "Правило повторения"
-#: calendar/gui/event-editor-dialog.glade.h:42 shell/e-shell-view.c:938
+#: calendar/gui/event-editor-dialog.glade.h:42 shell/e-shell-view.c:977
+#: widgets/misc/e-calendar.c:166 widgets/misc/e-dateedit.c:329
+#: widgets/misc/e-dateedit.c:670 widgets/misc/e-dateedit.c:951
msgid "None"
msgstr "Нет"
@@ -2852,6 +2783,10 @@ msgstr "Свойства списка \"Исполнить\""
msgid "To Do List"
msgstr "Список \"Исполнить\""
+#: calendar/gui/prop.c:718
+msgid "Preferences"
+msgstr "Настройки"
+
#. build miscellaneous box
#: calendar/gui/prop.c:789
msgid "Alarm Properties"
@@ -2887,7 +2822,6 @@ msgid "Cut selected item into clipboard"
msgstr "Вырезает выделенный элемент в буфер обмена"
#: composer/e-msg-composer-address-dialog.c:190
-#: mail/folder-browser-factory.c:47
msgid "Copy"
msgstr "Скопировать"
@@ -2963,47 +2897,47 @@ msgstr "метка7"
msgid "label8"
msgstr "метка8"
-#: composer/e-msg-composer-attachment-bar.c:76
+#: composer/e-msg-composer-attachment-bar.c:77
msgid "1 byte"
msgstr "1 байт"
-#: composer/e-msg-composer-attachment-bar.c:78
+#: composer/e-msg-composer-attachment-bar.c:79
#, c-format
msgid "%u bytes"
msgstr "%u байт"
-#: composer/e-msg-composer-attachment-bar.c:85
+#: composer/e-msg-composer-attachment-bar.c:86
#, c-format
msgid "%.1fK"
msgstr "%.1fК"
-#: composer/e-msg-composer-attachment-bar.c:89
+#: composer/e-msg-composer-attachment-bar.c:90
#, c-format
msgid "%.1fM"
msgstr "%.1fM"
-#: composer/e-msg-composer-attachment-bar.c:93
+#: composer/e-msg-composer-attachment-bar.c:94
#, c-format
msgid "%.1fG"
msgstr "%.1fG"
-#: composer/e-msg-composer-attachment-bar.c:299
+#: composer/e-msg-composer-attachment-bar.c:303
msgid "Add attachment"
msgstr "Добавить вложение"
-#: composer/e-msg-composer-attachment-bar.c:362 shell/e-shortcuts-view.c:333
+#: composer/e-msg-composer-attachment-bar.c:366 shell/e-shortcuts-view.c:333
msgid "Remove"
msgstr "Удалить"
-#: composer/e-msg-composer-attachment-bar.c:363
+#: composer/e-msg-composer-attachment-bar.c:367
msgid "Remove selected items from the attachment list"
msgstr "Удалить выбранные элементы из списка вложений"
-#: composer/e-msg-composer-attachment-bar.c:394
+#: composer/e-msg-composer-attachment-bar.c:398
msgid "Add attachment..."
msgstr "Добавить вложение..."
-#: composer/e-msg-composer-attachment-bar.c:395
+#: composer/e-msg-composer-attachment-bar.c:399
msgid "Attach a file to the message"
msgstr "Присоединить файл к сообщению"
@@ -3072,33 +3006,33 @@ msgstr "Тема:"
msgid "Enter the subject of the mail"
msgstr "Введите тему письма"
-#: composer/e-msg-composer.c:466
+#: composer/e-msg-composer.c:451
msgid "Save as..."
msgstr "Сохранить как..."
-#: composer/e-msg-composer.c:477
+#: composer/e-msg-composer.c:462
#, c-format
msgid "Error saving file: %s"
msgstr "Ошибка сохранения файла: %s"
-#: composer/e-msg-composer.c:497
+#: composer/e-msg-composer.c:482
#, c-format
msgid "Error loading file: %s"
msgstr "Ошибка при загрузке файла: %s"
-#: composer/e-msg-composer.c:519
+#: composer/e-msg-composer.c:504
msgid "Saving changes to message..."
msgstr "Сохранить изменения в сообщении..."
-#: composer/e-msg-composer.c:521
+#: composer/e-msg-composer.c:506
msgid "About to save changes to message..."
msgstr "О сохранении изменений в сообщении..."
-#: composer/e-msg-composer.c:606 shell/e-shell-view-menu.c:165
+#: composer/e-msg-composer.c:591 shell/e-shell-view-menu.c:166
msgid "Evolution"
msgstr "Эволюция"
-#: composer/e-msg-composer.c:612
+#: composer/e-msg-composer.c:597
msgid ""
"This message has not been sent.\n"
"\n"
@@ -3108,27 +3042,27 @@ msgstr ""
"\n"
"Вы хотите сохранить изменения?"
-#: composer/e-msg-composer.c:634
+#: composer/e-msg-composer.c:619
msgid "Open file"
msgstr "Открыть файл"
-#: composer/e-msg-composer.c:753
+#: composer/e-msg-composer.c:738
msgid "That file does not exist."
msgstr "Этот файл не существует."
-#: composer/e-msg-composer.c:763
+#: composer/e-msg-composer.c:748
msgid "That is not a regular file."
msgstr "Это не обычный файл."
-#: composer/e-msg-composer.c:773
+#: composer/e-msg-composer.c:758
msgid "That file exists but is not readable."
msgstr "Этот файл существует, но не читается."
-#: composer/e-msg-composer.c:783
+#: composer/e-msg-composer.c:768
msgid "That file appeared accesible but open(2) failed."
msgstr "Файл выглядит доступным, но произошел сбой open(2)."
-#: composer/e-msg-composer.c:805
+#: composer/e-msg-composer.c:790
msgid ""
"The file is very large (more than 100K).\n"
"Are you sure you wish to insert it?"
@@ -3136,123 +3070,126 @@ msgstr ""
"Файл очень большой (больше 100К).\n"
"Вы уверены, что хотите вставить его?"
-#: composer/e-msg-composer.c:826
+#: composer/e-msg-composer.c:811
msgid "An error occurred while reading the file."
msgstr "При чтении файла возникла ошибка."
-#: composer/e-msg-composer.c:922 shell/e-shell-view-menu.c:434
+#: composer/e-msg-composer.c:907
msgid "_File"
msgstr "Файл"
-#: composer/e-msg-composer.c:928
+#: composer/e-msg-composer.c:913
msgid "_Open..."
msgstr "Открыть..."
-#: composer/e-msg-composer.c:929
+#: composer/e-msg-composer.c:914
msgid "Load a previously saved message"
msgstr "Загрузить ранее сохраненное сообщение"
-#: composer/e-msg-composer.c:937
+#: composer/e-msg-composer.c:922
msgid "_Save..."
msgstr "Cохранить..."
-#: composer/e-msg-composer.c:938
+#: composer/e-msg-composer.c:923
msgid "Save message"
msgstr "Сохранить сообщение"
-#: composer/e-msg-composer.c:946
+#: composer/e-msg-composer.c:931
msgid "_Save as..."
msgstr "Сохранить как..."
-#: composer/e-msg-composer.c:947
+#: composer/e-msg-composer.c:932
msgid "Save message with a different name"
msgstr "Сохранить сообщение c другим названием"
-#: composer/e-msg-composer.c:955
+#: composer/e-msg-composer.c:940
msgid "Save in _folder..."
msgstr "Сохранить в папке..."
-#: composer/e-msg-composer.c:956
+#: composer/e-msg-composer.c:941
msgid "Save the message in a specified folder"
msgstr "Сохранить сообщение в указанной папке"
-#: composer/e-msg-composer.c:965
+#: composer/e-msg-composer.c:950
msgid "_Insert text file... (FIXME)"
msgstr "Вставить текстовый файл... (FIXME)"
-#: composer/e-msg-composer.c:966
+#: composer/e-msg-composer.c:951
msgid "Insert a file as text into the message"
msgstr "Вставить файл в сообщение как текст"
-#: composer/e-msg-composer.c:975
+#: composer/e-msg-composer.c:960
msgid "Send _Now"
msgstr "Отправить сейчас"
-#: composer/e-msg-composer.c:976
+#: composer/e-msg-composer.c:961
msgid "Send the message now"
msgstr "Отправить это сообщение сейчас"
-#: composer/e-msg-composer.c:984
+#: composer/e-msg-composer.c:969
msgid "Send _Later"
msgstr "Отправить позже"
-#: composer/e-msg-composer.c:985
+#: composer/e-msg-composer.c:970
msgid "Send the message later"
msgstr "Отправить это сообщение позже"
-#: composer/e-msg-composer.c:995
+#: composer/e-msg-composer.c:980
msgid "_Close..."
msgstr "Закрыть..."
-#: composer/e-msg-composer.c:996
+#: composer/e-msg-composer.c:981
msgid "Quit the message composer"
msgstr "Выйти из редактора сообщений"
-#: composer/e-msg-composer.c:1009 shell/e-shell-view-menu.c:478
+#: composer/e-msg-composer.c:994
msgid "_Edit"
msgstr "Правка"
-#: composer/e-msg-composer.c:1026
+#: composer/e-msg-composer.c:1011
msgid "HTML"
msgstr "HTML"
-#: composer/e-msg-composer.c:1027
+#: composer/e-msg-composer.c:1012
msgid "Send the mail in HTML format"
msgstr "Отправить почту в формате HTML"
-#: composer/e-msg-composer.c:1040 shell/e-shell-view-menu.c:383
-#: shell/e-shell-view-menu.c:489 shell/e-storage-set-view.c:223
+#: composer/e-msg-composer.c:1025 shell/e-storage-set-view.c:223
msgid "_View"
msgstr "Просмотр"
-#: composer/e-msg-composer.c:1046
+#: composer/e-msg-composer.c:1031
msgid "Show _attachments"
msgstr "Показать вложения"
-#: composer/e-msg-composer.c:1047
+#: composer/e-msg-composer.c:1032
msgid "Show/hide attachments"
msgstr "Показать/скрыть вложения"
-#: composer/e-msg-composer.c:1080
+#: composer/e-msg-composer.c:1065
msgid "Send"
msgstr "Отправить"
-#: composer/e-msg-composer.c:1081
+#: composer/e-msg-composer.c:1066
msgid "Send this message"
msgstr "Отправить это сообщение"
-#: composer/e-msg-composer.c:1090
+#: composer/e-msg-composer.c:1075
msgid "Attach"
msgstr "Присоединить"
-#: composer/e-msg-composer.c:1091
+#: composer/e-msg-composer.c:1076
msgid "Attach a file"
msgstr "Присоединить файл"
-#: composer/e-msg-composer.c:1278
+#: composer/e-msg-composer.c:1263
msgid "Compose a message"
msgstr "Создать сообщение"
+#: composer/e-msg-composer.c:1334
+msgid "Could not create composer window."
+msgstr "Невозможно создать окно редактора."
+
#: filter/filter-datespec.c:61
msgid "years"
msgstr "годы"
@@ -3331,22 +3268,27 @@ msgstr "Сравнивать с"
msgid "<click here to select a date>"
msgstr "<щелкните здесь для выбора даты>"
-#: filter/filter-editor.c:157 filter/score-editor.c:127
+#: filter/filter-editor.c:158 filter/score-editor.c:127
#: filter/vfolder-editor.c:153
msgid "Add Rule"
msgstr "Добавить правило"
-#: filter/filter-editor.c:191
+#: filter/filter-editor.c:199
msgid "Edit Rule"
msgstr "Правка правила"
-#: filter/filter-filter.c:401 filter/filter-rule.c:539
-msgid "Less"
-msgstr "Меньше"
+#. and now for the action area
+#: filter/filter-filter.c:396
+msgid "Then"
+msgstr "Тогда"
+
+#: filter/filter-filter.c:409
+msgid "Add action"
+msgstr "Добавить действие"
-#: filter/filter-filter.c:404 filter/filter-rule.c:542
-msgid "More"
-msgstr "Больше"
+#: filter/filter-filter.c:415
+msgid "Remove action"
+msgstr "Удалить действие"
#: filter/filter-folder.c:186 filter/vfolder-rule.c:271
msgid "Select Folder"
@@ -3364,202 +3306,95 @@ msgstr "<щелкните здесь для выбора папки>"
msgid "Test"
msgstr "Проверка"
-#: filter/score-editor.c:165
-msgid "Edit Score Rule"
-msgstr "Правка правила подсчета"
-
-#: filter/vfolder-editor.c:192
-msgid "Edit VFolder Rule"
-msgstr "Правка правила вирт.папки"
-
-#: mail/component-factory.c:198
-msgid "Cannot initialize Evolution's mail component."
-msgstr "Невозможно инициализировать почтовый компонент \"Эволюции\"."
-
-#: mail/folder-browser-factory.c:33
-msgid "Get Mail"
-msgstr "Получить почту"
+#: filter/filter-rule.c:504
+msgid "Rule name: "
+msgstr "Название фильтра: "
-#: mail/folder-browser-factory.c:33
-msgid "Send queued mail and retrieve new mail"
-msgstr "Послать почту из очереди и получить новую почту"
+#: filter/filter-rule.c:508
+msgid "untitled"
+msgstr "Без заголовка"
-#: mail/folder-browser-factory.c:35
-msgid "Compose"
-msgstr "Создать"
+#: filter/filter-rule.c:519
+msgid "If"
+msgstr "Если"
-#: mail/folder-browser-factory.c:35
-msgid "Compose a new message"
-msgstr "Создать новое сообщение"
+#: filter/filter-rule.c:536
+msgid "Execute actions"
+msgstr "Выполнить действия"
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/folder-browser-factory.c:39 mail/mail-view.c:148
-msgid "Reply"
-msgstr "Ответить"
-
-#: mail/folder-browser-factory.c:39 mail/mail-view.c:148
-msgid "Reply to the sender of this message"
-msgstr "Ответить отправителю этого сообщения"
-
-#: mail/folder-browser-factory.c:40 mail/mail-view.c:151
-msgid "Reply to All"
-msgstr "Ответить всем"
+#: filter/filter-rule.c:540
+msgid "if all criteria are met"
+msgstr "если удовлетворяет всем критериям"
-#: mail/folder-browser-factory.c:40 mail/mail-view.c:151
-msgid "Reply to all recipients of this message"
-msgstr "Ответить всем получателям этого сообщения"
-
-#: mail/folder-browser-factory.c:42 mail/mail-view.c:154
-msgid "Forward"
-msgstr "Переслать"
+#: filter/filter-rule.c:547
+msgid "if any criteria are met"
+msgstr "если удовлетворяет любому из критериев"
-#: mail/folder-browser-factory.c:42 mail/mail-view.c:154
-msgid "Forward this message"
-msgstr "Переслать это сообщение"
+#: filter/filter-rule.c:561
+msgid "Add criterion"
+msgstr "Добавить критерий"
-#: mail/folder-browser-factory.c:46
-msgid "Move"
-msgstr "Перенести"
+#: filter/filter-rule.c:567
+msgid "Remove criterion"
+msgstr "Удалить критерий"
-#: mail/folder-browser-factory.c:46
-msgid "Move message to a new folder"
-msgstr "Переместить сообщение в новую папку"
+#: filter/score-editor.c:165
+msgid "Edit Score Rule"
+msgstr "Правка правила подсчета"
-#: mail/folder-browser-factory.c:47
-msgid "Copy message to a new folder"
-msgstr "Скопировать сообщение в новую папку"
+#: filter/score-rule.c:192 filter/score-rule.c:194
+msgid "Score"
+msgstr "Подсчет"
-#: mail/folder-browser-factory.c:49 mail/mail-view.c:158
-msgid "Print the selected message"
-msgstr "Распечатать выделенное сообщение"
+#: filter/vfolder-editor.c:192
+msgid "Edit VFolder Rule"
+msgstr "Правка правила вирт.папки"
-#: mail/folder-browser-factory.c:51 mail/mail-view.c:160
-msgid "Delete this message"
-msgstr "Удалить это сообщение"
+#: mail/component-factory.c:198
+msgid "Cannot initialize Evolution's mail component."
+msgstr "Невозможно инициализировать почтовый компонент \"Эволюции\"."
-#: mail/folder-browser-factory.c:72
+#: mail/folder-browser-factory.c:50
#, c-format
msgid "Run filter \"%s\""
msgstr "Применить фильтр \"%s\""
-#: mail/folder-browser-factory.c:130 mail/folder-browser-factory.c:189
-msgid "_Print Message"
-msgstr "Печать сообщения"
-
-#: mail/folder-browser-factory.c:140
-msgid "_Threaded Message List"
-msgstr "Список подшитых сообщений"
-
-#: mail/folder-browser-factory.c:151
-msgid "Mail _Filters..."
-msgstr "Почтовые фильтры ..."
-
-#: mail/folder-browser-factory.c:156
-msgid "_Virtual Folder Editor..."
-msgstr "Редактор виртуальных папок ..."
-
-#: mail/folder-browser-factory.c:161
-msgid "_Mail Configuration..."
-msgstr "Настройка почты ..."
-
-#: mail/folder-browser-factory.c:166
-msgid "Forget _Passwords"
-msgstr "Забыть пароли"
-
-#: mail/folder-browser-factory.c:174
-msgid "_Message"
-msgstr "Сообщение"
-
-#: mail/folder-browser-factory.c:178
-msgid "_Open in New Window"
-msgstr "Открыть в новом окне"
-
-#: mail/folder-browser-factory.c:184
-msgid "_Edit Message"
-msgstr "Правка сообщения"
-
-#: mail/folder-browser-factory.c:196
-msgid "Reply to _Sender"
-msgstr "Ответить отправителю"
-
-#: mail/folder-browser-factory.c:201
-msgid "Reply to _All"
-msgstr "Ответить всем"
-
-#: mail/folder-browser-factory.c:206
-msgid "_Forward"
-msgstr "Переслать"
-
-#: mail/folder-browser-factory.c:213
-msgid "_Delete Message"
-msgstr "Удалить сообщение"
-
-#: mail/folder-browser-factory.c:218
-msgid "_Move Message"
-msgstr "Переместить сообщение"
-
-#: mail/folder-browser-factory.c:223
-msgid "_Copy Message"
-msgstr "Скопировать сообщение"
-
-#: mail/folder-browser-factory.c:230
-msgid "_VFolder on Subject"
-msgstr "Вирт.папка по теме"
-
-#: mail/folder-browser-factory.c:235
-msgid "VFolder on Se_nder"
-msgstr "Вирт.папка по отправителю"
-
-#: mail/folder-browser-factory.c:240
-msgid "VFolder on _Recipients"
-msgstr "Вирт.папка по получателю"
-
-#: mail/folder-browser-factory.c:247
-msgid "_Filter on Subject"
-msgstr "Фильтр по теме"
-
-#: mail/folder-browser-factory.c:252
-msgid "Fi_lter on Sender"
-msgstr "Фильтр по отправителю"
-
-#: mail/folder-browser-factory.c:257
-msgid "Filter on Rec_ipients"
-msgstr "Фильтр по получателю"
-
-#: mail/folder-browser-factory.c:264
-msgid "F_older"
-msgstr "Папка"
-
-#: mail/folder-browser-factory.c:268
-msgid "_Mark all as Read"
-msgstr "Пометить все как прочтенное"
+#: mail/folder-browser.c:407
+msgid "Save"
+msgstr "Сохранить"
-#: mail/folder-browser-factory.c:273
-msgid "_Delete all"
-msgstr "Удалить все"
+#: mail/mail-autofilter.c:75
+#, c-format
+msgid "Mail to %s"
+msgstr "Почта для %s"
-#: mail/folder-browser-factory.c:278
-msgid "_Expunge"
-msgstr "Вычеркнуть"
+#: mail/mail-autofilter.c:229
+#, c-format
+msgid "Mail from %s"
+msgstr "Почта от %s"
-#: mail/folder-browser-factory.c:283
-msgid "_Configure Folder"
-msgstr "Настроить папку"
+#: mail/mail-autofilter.c:283 mail/mail-autofilter.c:332
+msgid "Add Filter Rule"
+msgstr "Добавить правило фильтра"
-#: mail/folder-browser.c:407
-msgid "Save"
-msgstr "Сохранить"
+#: mail/mail-autofilter.c:328
+#, c-format
+msgid "%s mailing list"
+msgstr "%s список рассылки"
-#: mail/mail-callbacks.c:84
+#: mail/mail-callbacks.c:70
msgid ""
-"You need to configure the mail client\n"
-"before you can compose mail."
+"You have not configured the mail client.\n"
+"You need to do this before you can send,\n"
+"receive or compose mail.\n"
+"Would you like to configure it now?"
msgstr ""
-"Вы должны настроить почтовую программу\n"
-"до того как вы сможете писать письма."
+"Вы не настроили почтовый клиент.\n"
+"Вам надо сделать это до того как вы сможете\n"
+"отправлять, принимать или редактировать почту.\n"
+"Вы хотите настроить это сейчас?"
-#: mail/mail-callbacks.c:97
+#: mail/mail-callbacks.c:110
msgid ""
"You need to configure an identity\n"
"before you can compose mail."
@@ -3567,7 +3402,7 @@ msgstr ""
"Вы должны настроить пользователя\n"
"до того как вы сможете послать почту."
-#: mail/mail-callbacks.c:111
+#: mail/mail-callbacks.c:124
msgid ""
"You need to configure a mail transport\n"
"before you can compose mail."
@@ -3575,7 +3410,7 @@ msgstr ""
"Вы должны настроить передачу почты\n"
"до того как вы сможете послать почту."
-#: mail/mail-callbacks.c:231
+#: mail/mail-callbacks.c:239
msgid ""
"This message has no subject.\n"
"Really send?"
@@ -3583,15 +3418,15 @@ msgstr ""
"Это сообщение не имеет темы.\n"
"Послать его?"
-#: mail/mail-callbacks.c:477
+#: mail/mail-callbacks.c:492
msgid "Move message(s) to"
msgstr "Переместить сообщение в"
-#: mail/mail-callbacks.c:479
+#: mail/mail-callbacks.c:494
msgid "Copy message(s) to"
msgstr "Скопировать сообщения в"
-#: mail/mail-callbacks.c:548
+#: mail/mail-callbacks.c:563
msgid ""
"You may only edit messages saved\n"
"in the Drafts folder."
@@ -3599,7 +3434,7 @@ msgstr ""
"Вы можете править только сообщения\n"
"сохраненные в папке \"Черновики\"."
-#: mail/mail-callbacks.c:639
+#: mail/mail-callbacks.c:654
#, c-format
msgid ""
"Error loading filter information:\n"
@@ -3749,6 +3584,48 @@ msgstr "Запрос авторизации от \"%s\""
#. * Add this file to your project's POTFILES.in.
#. * DO NOT compile it as part of your application.
#.
+#: mail/mail-config-druid.glade.h:7 mail/mail-config-druid.glade.h:8
+#: mail/mail-config-druid.glade.h:16
+msgid "Mail Configuration"
+msgstr "Настройка почты"
+
+#: mail/mail-config-druid.glade.h:9
+msgid ""
+"Welcome to the Evolution Mail configuration wizard!\n"
+"By filling in some information about your email\n"
+"settings, you can start sending and receiving email\n"
+"right away. Click Next to continue."
+msgstr ""
+"Добро пожаловать к помощнику по настройке почты в Evolution!\n"
+"Введя некоторую информацию о ваших почтовых настройках\n"
+"вы сможете начать посылать и принимать почту.\n"
+"Для продолжения нажмите \"След.\"."
+
+#: mail/mail-config-druid.glade.h:13
+msgid "Identity"
+msgstr "Именование"
+
+#: mail/mail-config-druid.glade.h:14
+msgid "Mail Source"
+msgstr "Источник почты"
+
+#: mail/mail-config-druid.glade.h:15 mail/mail-config.glade.h:20
+msgid "Mail Transport"
+msgstr "Передача почты"
+
+#: mail/mail-config-druid.glade.h:17
+msgid ""
+"Your email configuration is now complete.\n"
+"Click \"Finish\" to save your new settings"
+msgstr ""
+"Настройка вашей почты завершена.\n"
+"Нажмите \"Завершить\", чтобы сохранить новые установки."
+
+#.
+#. * Translatable strings file generated by Glade.
+#. * Add this file to your project's POTFILES.in.
+#. * DO NOT compile it as part of your application.
+#.
#: mail/mail-config.glade.h:7 mail/mail-config.glade.h:14
msgid "Identities"
msgstr "Именования"
@@ -3770,10 +3647,6 @@ msgstr "Источники"
msgid "Mail Sources"
msgstr "Источники почты"
-#: mail/mail-config-druid.glade.h:15 mail/mail-config.glade.h:20
-msgid "Mail Transport"
-msgstr "Передача почты"
-
#: mail/mail-config.glade.h:21
msgid "News Servers"
msgstr "Серверы новостей"
@@ -3790,44 +3663,6 @@ msgstr "Отправить почту в формате HTML"
msgid "Mark message as seen [ms]: "
msgstr "Отметить сообщение как просмотренное [мс]:"
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: mail/mail-config-druid.glade.h:7 mail/mail-config-druid.glade.h:8
-#: mail/mail-config-druid.glade.h:16
-msgid "Mail Configuration"
-msgstr "Настройка почты"
-
-#: mail/mail-config-druid.glade.h:9
-msgid ""
-"Welcome to the Evolution Mail configuration wizard!\n"
-"By filling in some information about your email\n"
-"settings, you can start sending and receiving email\n"
-"right away. Click Next to continue."
-msgstr ""
-"Добро пожаловать к помощнику по настройке почты в Evolution!\n"
-"Введя некоторую информацию о ваших почтовых настройках\n"
-"вы сможете начать посылать и принимать почту.\n"
-"Для продолжения нажмите \"След.\"."
-
-#: mail/mail-config-druid.glade.h:13
-msgid "Identity"
-msgstr "Именование"
-
-#: mail/mail-config-druid.glade.h:14
-msgid "Mail Source"
-msgstr "Источник почты"
-
-#: mail/mail-config-druid.glade.h:17
-msgid ""
-"Your email configuration is now complete.\n"
-"Click \"Finish\" to save your new settings"
-msgstr ""
-"Настройка вашей почты завершена.\n"
-"Нажмите \"Завершить\", чтобы сохранить новые установки."
-
#: mail/mail-crypto.c:345 mail/mail-crypto.c:441 mail/mail-crypto.c:604
msgid "Please enter your PGP/GPG passphrase."
msgstr "Пожалуйста введите вашу парольную фразу PGP/GPG."
@@ -3845,6 +3680,44 @@ msgstr "Не удалось создать канал к GPG/PGP: %s"
msgid "No GPG/PGP program available."
msgstr "Не доступна программа GPG/PGP."
+#: mail/mail-display.c:54
+msgid "Overwrite file?"
+msgstr "Переписать файл?"
+
+#: mail/mail-display.c:58
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Файл с таким названием уже существует.\n"
+"Переписать его?"
+
+#: mail/mail-display.c:260
+msgid "Save to Disk..."
+msgstr "Сохранить на диске..."
+
+#: mail/mail-display.c:262
+#, c-format
+msgid "Open in %s..."
+msgstr "Открыть в %s..."
+
+#: mail/mail-display.c:264
+msgid "View Inline"
+msgstr "Встроенный просмотр"
+
+#: mail/mail-display.c:285
+msgid "External Viewer"
+msgstr "Внешняя программа просмотра"
+
+#: mail/mail-display.c:308
+#, c-format
+msgid "View Inline (via %s)"
+msgstr "Встроенный просмотр (через %s)"
+
+#: mail/mail-display.c:312
+msgid "Hide"
+msgstr "Скрыть"
+
#: mail/mail-local.c:257
#, c-format
msgid "Changing folder \"%s\" to \"%s\" format"
@@ -3855,6 +3728,12 @@ msgstr "Изменение папки \"%s\" в формат \"%s\""
msgid "Change folder \"%s\" to \"%s\" format"
msgstr "Изменить папку \"%s\" в формат \"%s\""
+#. This is how we could do to display extra information about the
+#. folder.
+#: mail/mail-local-storage.c:97
+msgid " (XXX unread)"
+msgstr " (XXX непрочитано)"
+
#: mail/mail-ops.c:75
#, c-format
msgid "Fetching email from %s"
@@ -3874,46 +3753,46 @@ msgstr ""
msgid "Bad folder passed to fetch_mail"
msgstr "Неправильная папка передана в fetch_mail"
-#: mail/mail-ops.c:267
+#: mail/mail-ops.c:266
#, c-format
msgid "There is no new mail at %s."
msgstr "Нет новой почты на %s."
-#: mail/mail-ops.c:331
+#: mail/mail-ops.c:330
msgid "Filtering email on demand"
msgstr "Фильтрация почты по запросу"
-#: mail/mail-ops.c:333
+#: mail/mail-ops.c:332
msgid "Filter email on demand"
msgstr "Фильтр почты по запросу"
-#: mail/mail-ops.c:344
+#: mail/mail-ops.c:343
msgid "Bad filter context specified"
msgstr "Указан плохой контекст фильтра"
-#: mail/mail-ops.c:353
+#: mail/mail-ops.c:352
msgid "Bad input source defined for filtering"
msgstr "Для фильтрации определен плохой входной источник"
-#: mail/mail-ops.c:362
+#: mail/mail-ops.c:361
msgid "Bad default destination folder"
msgstr "Плохая папка назначения по умолчанию"
-#: mail/mail-ops.c:515
+#: mail/mail-ops.c:514
#, c-format
msgid "Sending \"%s\""
msgstr "Отправка \"%s\""
-#: mail/mail-ops.c:520
+#: mail/mail-ops.c:519
msgid "Sending a message without a subject"
msgstr "Отправка сообщения без темы"
-#: mail/mail-ops.c:523
+#: mail/mail-ops.c:522
#, c-format
msgid "Send \"%s\""
msgstr "Послать \"%s\""
-#: mail/mail-ops.c:526
+#: mail/mail-ops.c:525
msgid "Send a message without a subject"
msgstr "Послать сообщение без темы"
@@ -3934,201 +3813,201 @@ msgstr "Присоединение \"%s\""
msgid "Appending a message without a subject"
msgstr "Присоединение сообщения без темы"
-#: mail/mail-ops.c:968
+#: mail/mail-ops.c:962
#, c-format
msgid "Expunging \"%s\""
msgstr "Вычеркивание \"%s\""
-#: mail/mail-ops.c:970
+#: mail/mail-ops.c:964
#, c-format
msgid "Expunge \"%s\""
msgstr "Вычеркнуть \"%s\""
-#: mail/mail-ops.c:1042
+#: mail/mail-ops.c:1036
#, c-format
msgid "Moving messages from \"%s\" into \"%s\""
msgstr "Перемещение сообщений из \"%s\" в \"%s\""
-#: mail/mail-ops.c:1044
+#: mail/mail-ops.c:1038
#, c-format
msgid "Copying messages from \"%s\" into \"%s\""
msgstr "Копирование сообщений из \"%s\" в \"%s\""
-#: mail/mail-ops.c:1047
+#: mail/mail-ops.c:1041
#, c-format
msgid "Move messages from \"%s\" into \"%s\""
msgstr "Переместить сообщения из \"%s\" в \"%s\""
-#: mail/mail-ops.c:1049
+#: mail/mail-ops.c:1043
#, c-format
msgid "Copy messages from \"%s\" into \"%s\""
msgstr "Скопировать сообщения из \"%s\" в \"%s\""
-#: mail/mail-ops.c:1107
+#: mail/mail-ops.c:1101
msgid "Moving"
msgstr "Перемещение"
-#: mail/mail-ops.c:1110
+#: mail/mail-ops.c:1104
msgid "Copying"
msgstr "Копирование"
-#: mail/mail-ops.c:1122
+#: mail/mail-ops.c:1116
#, c-format
msgid "%s message %d of %d (uid \"%s\")"
msgstr "%s сообщения %d из %d (uid \"%s\")"
-#: mail/mail-ops.c:1203
+#: mail/mail-ops.c:1197
#, c-format
msgid "Marking messages in folder \"%s\""
msgstr "Помечание сообщений в папке \"%s\""
-#: mail/mail-ops.c:1206
+#: mail/mail-ops.c:1200
#, c-format
msgid "Mark messages in folder \"%s\""
msgstr "Пометить сообщения в папке \"%s\""
-#: mail/mail-ops.c:1365
+#: mail/mail-ops.c:1359
#, c-format
msgid "Scanning folders in \"%s\""
msgstr "Считывание папок в \"%s\""
-#: mail/mail-ops.c:1368
+#: mail/mail-ops.c:1362
#, c-format
msgid "Scan folders in \"%s\""
msgstr "Считать папки в \"%s\""
-#: mail/mail-ops.c:1423
+#: mail/mail-ops.c:1419
#, c-format
msgid "Found subfolder \"%s\""
msgstr "Найдена вложенная папка \"%s\""
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1453
msgid "(No description)"
msgstr "(Нет описания)"
-#: mail/mail-ops.c:1520
+#: mail/mail-ops.c:1516
#, c-format
msgid "Attaching messages from folder \"%s\""
msgstr "Присоединение сообщений из папки \"%s\""
-#: mail/mail-ops.c:1523
+#: mail/mail-ops.c:1519
#, c-format
msgid "Attach messages from \"%s\""
msgstr "Присоединить сообщения из \"%s\""
-#: mail/mail-ops.c:1649
+#: mail/mail-ops.c:1645
#, c-format
msgid "Forwarding messages \"%s\""
msgstr "Пересылка сообщений \"%s\""
-#: mail/mail-ops.c:1654
+#: mail/mail-ops.c:1650
msgid "Forwarding a message without a subject"
msgstr "Пересылка сообщения без темы"
-#: mail/mail-ops.c:1657
+#: mail/mail-ops.c:1653
#, c-format
msgid "Forward message \"%s\""
msgstr "Переслать сообщение \"%s\""
-#: mail/mail-ops.c:1662
+#: mail/mail-ops.c:1658
msgid "Forward a message without a subject"
msgstr "Переслать сообщение без темы"
-#: mail/mail-ops.c:1716
+#: mail/mail-ops.c:1712
#, c-format
msgid "Retrieving message number %d of %d (uid \"%s\")"
msgstr "Перемещение сообщения номер %d из %d (uid \"%s\")"
-#: mail/mail-ops.c:1729
+#: mail/mail-ops.c:1725
msgid ""
"Failed to generate mime part from message while generating forwarded message."
msgstr ""
"Не удалось создать mime-часть из сообщения при создании пересылаемого "
"сообщения."
-#: mail/mail-ops.c:1818
+#: mail/mail-ops.c:1814
#, c-format
msgid "Loading \"%s\""
msgstr "Загрузка \"%s\""
-#: mail/mail-ops.c:1820
+#: mail/mail-ops.c:1816
#, c-format
msgid "Load \"%s\""
msgstr "Загрузить \"%s\""
-#: mail/mail-ops.c:1940
+#: mail/mail-ops.c:1936
#, c-format
msgid "Creating \"%s\""
msgstr "Создание \"%s\""
-#: mail/mail-ops.c:1942
+#: mail/mail-ops.c:1938
#, c-format
msgid "Create \"%s\""
msgstr "Создать \"%s\""
-#: mail/mail-ops.c:2013
+#: mail/mail-ops.c:2009
msgid "Exception while reporting result to shell component listener."
msgstr ""
-#: mail/mail-ops.c:2066
+#: mail/mail-ops.c:2062
#, c-format
msgid "Synchronizing \"%s\""
msgstr "Синхронизация \"%s\""
-#: mail/mail-ops.c:2068
+#: mail/mail-ops.c:2064
#, c-format
msgid "Synchronize \"%s\""
msgstr "Синхронизовать \"%s\""
-#: mail/mail-ops.c:2144
+#: mail/mail-ops.c:2140
#, c-format
msgid "Displaying message UID \"%s\""
msgstr "Показать UID сообщения \"%s\""
-#: mail/mail-ops.c:2147
+#: mail/mail-ops.c:2143
msgid "Clearing message display"
msgstr "Очистка отображения сообщения"
-#: mail/mail-ops.c:2150
+#: mail/mail-ops.c:2146
#, c-format
msgid "Display message UID \"%s\""
msgstr "Показать UID сообщения \"%s\""
-#: mail/mail-ops.c:2153
+#: mail/mail-ops.c:2149
msgid "Clear message display"
msgstr "Очистить отображение сообщения"
-#: mail/mail-ops.c:2280
+#: mail/mail-ops.c:2276
#, c-format
msgid "Opening messages from folder \"%s\""
msgstr "Открытие сообщений из папки \"%s\""
-#: mail/mail-ops.c:2283
+#: mail/mail-ops.c:2279
#, c-format
msgid "Open messages from \"%s\""
msgstr "Открыть сообщения из \"%s\""
-#: mail/mail-ops.c:2404
+#: mail/mail-ops.c:2401
#, c-format
msgid "Loading %s Folder"
msgstr "Загрузка папки %s"
-#: mail/mail-ops.c:2406
+#: mail/mail-ops.c:2403
#, c-format
msgid "Load %s Folder"
msgstr "Загрузить папку %s"
-#: mail/mail-ops.c:2481
+#: mail/mail-ops.c:2478
#, c-format
msgid "Viewing messages from folder \"%s\""
msgstr "Просмотр сообщений из папки \"%s\""
-#: mail/mail-ops.c:2484
+#: mail/mail-ops.c:2481
#, c-format
msgid "View messages from \"%s\""
msgstr "Просмотреть сообщения из \"%s\""
-#: mail/mail-ops.c:2530
+#: mail/mail-ops.c:2527
#, c-format
msgid "Retrieving message %d of %d (uid \"%s\")"
msgstr "Перемещение сообщения %d из %d (uid \"%s\")"
@@ -4225,49 +4104,136 @@ msgstr ""
msgid "New VFolder"
msgstr "Новая вирт.папка"
-#: mail/message-list.c:641
-msgid "Online Status"
-msgstr "Подключенное состояние"
+#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
+#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
+#: mail/mail-view.c:151
+msgid "Reply"
+msgstr "Ответить"
+
+#: mail/mail-view.c:151
+msgid "Reply to the sender of this message"
+msgstr "Ответить отправителю этого сообщения"
+
+#: mail/mail-view.c:154 mail/message-list.c:1281
+msgid "Reply to All"
+msgstr "Ответить всем"
+
+#: mail/mail-view.c:154
+msgid "Reply to all recipients of this message"
+msgstr "Ответить всем получателям этого сообщения"
+
+#: mail/mail-view.c:157
+msgid "Forward"
+msgstr "Переслать"
+
+#: mail/mail-view.c:157
+msgid "Forward this message"
+msgstr "Переслать это сообщение"
+
+#: mail/mail-view.c:161
+msgid "Print"
+msgstr "Печать"
+
+#: mail/mail-view.c:161
+msgid "Print the selected message"
+msgstr "Распечатать выделенное сообщение"
+
+#: mail/mail-view.c:163
+msgid "Delete this message"
+msgstr "Удалить это сообщение"
-#: mail/message-list.c:677
+#: mail/message-list.c:722
msgid "From"
msgstr "От"
-#: mail/message-list.c:684
+#: mail/message-list.c:729
msgid "Subject"
msgstr "Тема"
-#: mail/message-list.c:691
+#: mail/message-list.c:736
msgid "Date"
msgstr "Дата"
-#: mail/message-list.c:698
+#: mail/message-list.c:743
msgid "Received"
msgstr "Получено"
-#: mail/message-list.c:705
+#: mail/message-list.c:750
msgid "To"
msgstr "Кому"
-#: mail/message-list.c:712
+#: mail/message-list.c:757
msgid "Size"
msgstr "Размер"
-#: notes/component-factory.c:27
-msgid "Create a new note"
-msgstr "Создать новую запись"
+#: mail/message-list.c:1276
+msgid "Open in New Window"
+msgstr "Открыть в новом окне"
+
+#: mail/message-list.c:1277
+msgid "Edit Message"
+msgstr "Правка сообщения"
+
+#: mail/message-list.c:1278
+msgid "Print Message"
+msgstr "Печать сообщения"
+
+#: mail/message-list.c:1280
+msgid "Reply to Sender"
+msgstr "Ответить отправителю"
-#: notes/component-factory.c:148
-msgid "Cannot initialize Evolution's notes component."
-msgstr "Невозможно инициализировать компонент \"Блокнот\" Evolution."
+#: mail/message-list.c:1282
+msgid "Forward Message"
+msgstr "Переслать сообщение"
-#: notes/main.c:30
-msgid "Notes Component: Could not initialize bonobo"
-msgstr "Компонент \"Блокнот\": Не удалось инициализировать Bonobo"
+#: mail/message-list.c:1284
+msgid "Delete Message"
+msgstr "Удалить сообщение"
+
+#: mail/message-list.c:1285
+msgid "Move Message"
+msgstr "Переместить сообщение"
+
+#: mail/message-list.c:1286
+msgid "Copy Message"
+msgstr "Скопировать сообщение"
+
+#: mail/message-list.c:1288
+msgid "VFolder on Subject"
+msgstr "Вирт.папка по теме"
+
+#: mail/message-list.c:1289
+msgid "VFolder on Sender"
+msgstr "Вирт.папка по отправителю"
+
+#: mail/message-list.c:1290
+msgid "VFolder on Recipients"
+msgstr "Вирт.папка по получателю"
+
+#: mail/message-list.c:1292
+msgid "Filter on Subject"
+msgstr "Фильтр по теме"
+
+#: mail/message-list.c:1293
+msgid "Filter on Sender"
+msgstr "Фильтр по отправителю"
+
+#: mail/message-list.c:1294
+msgid "Filter on Recipients"
+msgstr "Фильтр по получателю"
+
+#: mail/message-list.c:1295 mail/message-list.c:1318
+msgid "Filter on Mailing List"
+msgstr "Фильтр по списку рассылки"
+
+#: mail/message-list.c:1320
+#, c-format
+msgid "Filter on Mailing List (%s)"
+msgstr "Фильтр по списку рассылки (%s)"
#: shell/e-setup.c:47
msgid "Evolution installation"
-msgstr "Установка \"Эволюции\""
+msgstr "Установка Evolution"
#: shell/e-setup.c:51
msgid "This seems to be the first time you run Evolution."
@@ -4354,27 +4320,27 @@ msgstr ""
msgid "New..."
msgstr "Новая..."
-#: shell/e-shell-folder-title-bar.c:452 shell/e-shell-folder-title-bar.c:453
+#: shell/e-shell-folder-title-bar.c:448 shell/e-shell-folder-title-bar.c:449
msgid "(Untitled)"
msgstr "(Без заголовка)"
#. you might have to call gnome_dialog_run() on the
#. * dialog returned here, I don't remember...
#.
-#: shell/e-shell-view-menu.c:113
+#: shell/e-shell-view-menu.c:114
msgid "Bug buddy was not found in your $PATH."
msgstr "Bug-buddy не был найден в вашем $PATH."
#. same as above
-#: shell/e-shell-view-menu.c:119
+#: shell/e-shell-view-menu.c:120
msgid "Bug buddy could not be run."
msgstr "Bug-buddy не может быть запущен."
-#: shell/e-shell-view-menu.c:167
+#: shell/e-shell-view-menu.c:168
msgid "Copyright 1999, 2000 Helix Code, Inc."
msgstr "Copyright 1999, 2000 Helix Code, Inc."
-#: shell/e-shell-view-menu.c:169
+#: shell/e-shell-view-menu.c:170
msgid ""
"Evolution is a suite of groupware applications\n"
"for mail, calendaring, and contact management\n"
@@ -4384,127 +4350,19 @@ msgstr ""
"ведения календарей и контактной информации для\n"
"групповой работы в среде GNOME."
-#: shell/e-shell-view-menu.c:319
+#: shell/e-shell-view-menu.c:325
msgid "Go to folder..."
msgstr "Перейти к папке..."
-#: shell/e-shell-view-menu.c:377
-msgid "_New"
-msgstr "Новое"
-
-#: shell/e-shell-view-menu.c:389
-msgid "_Folder"
-msgstr "Папка"
-
-#: shell/e-shell-view-menu.c:395
-msgid "Evolution bar _shortcut"
-msgstr "Строка ярлыков Evolution"
-
-#: shell/e-shell-view-menu.c:404
-msgid "_Mail message (FIXME)"
-msgstr "Почтовое сообщение (FIXME)"
-
-#: shell/e-shell-view-menu.c:410
-msgid "_Appointment (FIXME)"
-msgstr "Встреча (FIXME)"
-
-#: shell/e-shell-view-menu.c:416
-msgid "_Contact (FIXME)"
-msgstr "Контакт (FIXME)"
-
-#: shell/e-shell-view-menu.c:422
-msgid "_Task (FIXME)"
-msgstr "Задание (FIXME)"
-
-#: shell/e-shell-view-menu.c:444
-msgid "_Go to Folder..."
-msgstr "Перейти к папке..."
-
-#: shell/e-shell-view-menu.c:445
-msgid "Display a different folder"
-msgstr "Показать другую папку"
-
-#: shell/e-shell-view-menu.c:452
-msgid "_Create New Folder..."
-msgstr "Создать новую папку..."
-
-#: shell/e-shell-view-menu.c:453 shell/e-shell-view-menu.c:465
-msgid "Create a new folder"
-msgstr "Создать новую папку"
-
-#: shell/e-shell-view-menu.c:464
-msgid "E_xit..."
-msgstr "Выход..."
-
-#: shell/e-shell-view-menu.c:495
-msgid "Show _Shortcut Bar"
-msgstr "Показать строку закладок"
-
-#: shell/e-shell-view-menu.c:496
-msgid "Show the shortcut bar"
-msgstr "Показать строку закладок"
-
-#: shell/e-shell-view-menu.c:501
-msgid "Show _Folder Bar"
-msgstr "Показать строку папок"
-
-#: shell/e-shell-view-menu.c:502
-msgid "Show the folder bar"
-msgstr "Показать строку папок"
-
-#: shell/e-shell-view-menu.c:513
-msgid "_Settings"
-msgstr "Установки"
-
-#: shell/e-shell-view-menu.c:524
-msgid "_Help"
-msgstr "Справка"
-
-#: shell/e-shell-view-menu.c:530
-msgid "Help _Index"
-msgstr "Индекс справки"
-
-#: shell/e-shell-view-menu.c:537
-msgid "Getting _Started"
-msgstr "Введение"
-
-#: shell/e-shell-view-menu.c:544
-msgid "Using the _Mailer"
-msgstr "Использование почтовой программы"
-
-#: shell/e-shell-view-menu.c:551
-msgid "Using the _Calendar"
-msgstr "Использование календаря"
-
-#: shell/e-shell-view-menu.c:558
-msgid "Using the C_ontact Manager"
-msgstr "Использование диспетчера контактов"
-
-#: shell/e-shell-view-menu.c:568
-msgid "_Submit Bug Report"
-msgstr "Отправить сообщение об ошибке"
-
-#: shell/e-shell-view-menu.c:569
-msgid "Submit bug report using Bug Buddy"
-msgstr "Оправить сообщение об ошибке через bug-buddy"
-
-#: shell/e-shell-view-menu.c:578
-msgid "_About Evolution..."
-msgstr "О программе Evolution..."
-
-#: shell/e-shell-view-menu.c:579
-msgid "Show information about Evolution"
-msgstr "Показать информацию о программе Evolution"
-
-#: shell/e-shell-view.c:128
+#: shell/e-shell-view.c:127
msgid "(No folder displayed)"
msgstr "(Папки не показаны)"
-#: shell/e-shell-view.c:396
+#: shell/e-shell-view.c:406
msgid "Folders"
msgstr "Папки"
-#: shell/e-shell-view.c:942
+#: shell/e-shell-view.c:981
#, c-format
msgid "Evolution - %s"
msgstr "Эволюция - %s"
@@ -4660,139 +4518,6 @@ msgstr "Невозможно инициализировать оболочку \"Эволюции\"."
msgid "Cannot initialize the Bonobo component system."
msgstr "Не удалось инициализировать компонентную систему Bonobo."
-#: tests/ui-tests/message-browser.c:360
-msgid "The component now claims that it doesn't support PersistStream!"
-msgstr "Компонент заявляет, что не поддерживает PersistStream!"
-
-#: tests/ui-tests/message-browser.c:378
-msgid ""
-"An exception occured while trying to load data into the component with "
-"PersistStream"
-msgstr ""
-"При попытке загрузить данные в компонент через PersistStream возникло "
-"исключение"
-
-#: tests/ui-tests/message-browser.c:471
-#, c-format
-msgid "The %s component doesn't support PersistStream!\n"
-msgstr "Компонент %s не поддерживает PersistStream!\n"
-
-#: tests/ui-tests/message-browser.c:710
-msgid "Open Mime Message"
-msgstr "Открыть Mime-сообщение"
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: widgets/e-table/e-table-config.glade.h:7
-msgid "Fields"
-msgstr "Поля"
-
-#: widgets/e-table/e-table-config.glade.h:8
-msgid "Grouping"
-msgstr "Группирование"
-
-#: widgets/e-table/e-table-config.glade.h:9
-msgid "Sort"
-msgstr "Сортировать"
-
-#: widgets/e-table/e-table-config.glade.h:10
-msgid "Filter"
-msgstr "Фильтр"
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: widgets/e-table/e-table-field-chooser.glade.h:7
-#: widgets/e-table/e-table-header-item.c:1164
-msgid "Field Chooser"
-msgstr "Выбор поля"
-
-#: widgets/e-table/e-table-field-chooser.glade.h:8
-msgid ""
-"To add a column to your table, drag it into\n"
-"the location in which you want it to appear."
-msgstr ""
-"Чтобы добавить столбец к вашей таблице, перетащите\n"
-"его в то место где он должен находиться."
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: widgets/e-table/e-table-group.glade.h:7
-msgid "window1"
-msgstr "окно1"
-
-#: widgets/e-table/e-table-group.glade.h:8
-msgid "Available fields"
-msgstr "Доступные поля"
-
-#: widgets/e-table/e-table-group.glade.h:9
-msgid "label1"
-msgstr "метка1"
-
-#: widgets/e-table/e-table-group.glade.h:10
-msgid "Show in this order"
-msgstr "Показать в таком порядке"
-
-#: widgets/e-table/e-table-group.glade.h:11
-msgid "label2"
-msgstr "метка2"
-
-#: widgets/e-table/e-table-group.glade.h:12
-msgid "Add >>"
-msgstr "Добавить >>"
-
-#: widgets/e-table/e-table-group.glade.h:13
-msgid "<< Remove"
-msgstr "<< Удалить"
-
-#: widgets/e-table/e-table-header-item.c:1156
-msgid "Sort Ascending"
-msgstr "Сортировка по возрастанию"
-
-#: widgets/e-table/e-table-header-item.c:1157
-msgid "Sort Descending"
-msgstr "Сортировка по убыванию"
-
-#: widgets/e-table/e-table-header-item.c:1158
-msgid "Unsort"
-msgstr "Без сортировки"
-
-#: widgets/e-table/e-table-header-item.c:1160
-msgid "Group By This Field"
-msgstr "Группировать по этому полю"
-
-#: widgets/e-table/e-table-header-item.c:1161
-msgid "Group By Box"
-msgstr "Группировать по ящику"
-
-#: widgets/e-table/e-table-header-item.c:1163
-msgid "Remove This Column"
-msgstr "Удалить этот столбец"
-
-#: widgets/e-table/e-table-header-item.c:1166
-msgid "Alignment"
-msgstr "Выравнивание"
-
-#: widgets/e-table/e-table-header-item.c:1167
-msgid "Best Fit"
-msgstr "Лучшее заполнение"
-
-#: widgets/e-table/e-table-header-item.c:1168
-msgid "Format Columns..."
-msgstr "Форматирование столбцов..."
-
-#: widgets/e-table/e-table-header-item.c:1170
-msgid "Customize Current View..."
-msgstr "Настройка текущего просмотра..."
-
#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
msgid "Tentative"
msgstr "Экспериментальный"
@@ -4869,6 +4594,11 @@ msgstr "Время завершения собрания:"
msgid "All Attendees"
msgstr "Все сопровождение"
+#. Create the 'Today' and 'None' buttons but don't show them.
+#: widgets/misc/e-calendar.c:158 widgets/misc/e-dateedit.c:323
+msgid "Today"
+msgstr "Сегодня"
+
#. Translators: These are the first characters of each day of the
#. week, 'M' for 'Monday', 'T' for Tuesday etc.
#: widgets/misc/e-calendar-item.c:422
@@ -4879,6 +4609,10 @@ msgstr "ПВСЧПСВ"
msgid "..."
msgstr "..."
+#: widgets/misc/e-dateedit.c:317
+msgid "Now"
+msgstr "Сейчас"
+
#: widgets/shortcut-bar/e-group-bar.c:632
#, c-format
msgid "Group %i"