aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--po/ChangeLog6
-rw-r--r--po/POTFILES.in23
-rw-r--r--po/ru.po360
3 files changed, 254 insertions, 135 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index 8862422613..16823b22a9 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,9 @@
+2000-08-12 Valek Filippov <frob@df.ru>
+
+ * ru.po: updated russian translation.
+ * POTFILES.in: Added missing files that are in the build. Sorted in alphabet order
+
+
2000-08-11 Valek Filippov <frob@df.ru>
* ru.po: updated russian translation.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index cae8359286..96dd8623ac 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,19 +1,32 @@
addressbook/backend/ebook/load-gnomecard-addressbook.c
addressbook/backend/ebook/load-pine-addressbook.c
+addressbook/backend/ebook/test-client-list.c
+addressbook/backend/ebook/test-client.c
+addressbook/conduit/address-conduit-control-applet.c
+addressbook/conduit/address-conduit.c
addressbook/contact-editor/categories-strings.h
addressbook/contact-editor/e-contact-editor.c
addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h
addressbook/contact-editor/e-contact-editor-strings.h
addressbook/contact-editor/fullname-strings.h
+addressbook/demo/addressbook-factory.c
+addressbook/demo/addressbook.c
addressbook/gui/component/addressbook-factory.c
addressbook/gui/component/addressbook.c
addressbook/gui/component/alphabet.glade.h
addressbook/gui/component/e-ldap-storage.c
addressbook/gui/component/ldap-server-dialog.glade.h
+addressbook/gui/component/select-names/select-names.glade.h
+addressbook/gui/minicard/e-minicard-control.c
addressbook/gui/minicard/e-minicard-view.c
addressbook/gui/minicard/e-minicard.c
+addressbook/gui/minicard/test-minicard-view.c
addressbook/printing/e-contact-print.glade.h
calendar/cal-util/timeutil.c
+calendar/conduits/calendar/calendar-conduit-control-applet.c
+calendar/conduits/calendar/calendar-conduit.c
+calendar/conduits/todo/todo-conduit-control-applet.c
+calendar/conduits/todo/todo-conduit.c
calendar/gui/calendar-commands.c
calendar/gui/calendar-model.c
calendar/gui/control-factory.c
@@ -50,14 +63,20 @@ libversit/vobject.c
mail/component-factory.c
mail/folder-browser-factory.c
mail/folder-browser.c
+mail/mail-callbacks.c
+mail/mail-config-gui.c
mail/mail-config.c
mail/mail-config.glade.h
mail/mail-config-druid.glade.h
mail/mail-crypto.c
+mail/mail-local.c
mail/mail-ops.c
mail/mail-threads.c
+mail/mail-view.c
mail/main.c
mail/message-list.c
+notes/component-factory.c
+notes/main.c
shell/e-setup.c
shell/e-shell-folder-creation-dialog.c
shell/e-shell-folder-selection-dialog.c
@@ -70,10 +89,12 @@ shell/e-shortcuts.c
shell/e-storage.c
shell/e-storage-set-view.c
shell/main.c
+tests/ui-tests/message-browser.c
widgets/e-table/e-table-config.glade.h
widgets/e-table/e-table-field-chooser.glade.h
widgets/e-table/e-table-group.glade.h
+widgets/e-table/e-table-header-item.c
widgets/meeting-time-sel/e-meeting-time-sel.c
widgets/misc/e-calendar-item.c
widgets/misc/e-clipped-label.c
-widgets/shortcut-bar/e-group-bar.c
+widgets/shortcut-bar/e-group-bar.c \ No newline at end of file
diff --git a/po/ru.po b/po/ru.po
index ca19363325..4b788c7d45 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-08-11 15:28+0000\n"
-"PO-Revision-Date: 2000-08-11 15:40+00:00\n"
+"POT-Creation-Date: 2000-08-12 17:06+0000\n"
+"PO-Revision-Date: 2000-08-12 17:17+00:00\n"
"Last-Translator: Valek Filippov <frob@df.ru>\n"
"Language-Team: Russian <ru@li.org>\n"
"MIME-Version: 1.0\n"
@@ -19,7 +19,8 @@ msgstr ""
#: addressbook/demo/addressbook-factory.c:32
#: addressbook/gui/component/addressbook-factory.c:59
#: addressbook/gui/minicard/test-minicard-view.c:45
-#: calendar/conduits/todo/todo-conduit.c:1203 calendar/gui/main.c:68
+#: calendar/conduits/calendar/calendar-conduit.c:1669
+#: calendar/conduits/todo/todo-conduit.c:1298 calendar/gui/main.c:68
msgid "Could not initialize Bonobo"
msgstr "�� ������� ���������������� Bonobo"
@@ -135,62 +136,62 @@ msgstr ""
msgid "BLARG\n"
msgstr "BLARG\n"
-#: addressbook/conduit/address-conduit.c:446
+#: addressbook/conduit/address-conduit.c:456
#, c-format
msgid "Address holds %ld address entries"
msgstr "����� ������ %ld ������� �������"
-#: addressbook/conduit/address-conduit.c:472
-#: addressbook/conduit/address-conduit.c:474
+#: addressbook/conduit/address-conduit.c:482
+#: addressbook/conduit/address-conduit.c:484
msgid "Could not start addressbook server"
msgstr "���������� ��������� ������ �������� �����"
-#: addressbook/conduit/address-conduit.c:487
-#: addressbook/conduit/address-conduit.c:490
+#: addressbook/conduit/address-conduit.c:497
+#: addressbook/conduit/address-conduit.c:500
msgid "Could not read pilot's Address application block"
msgstr "���������� �������� ���� ���������� ������� ������"
-#: addressbook/conduit/address-conduit.c:828
+#: addressbook/conduit/address-conduit.c:838
msgid "Error while communicating with address server"
msgstr "������ ��� ����������� � ������� �������"
#: addressbook/demo/addressbook.c:78
-#: addressbook/gui/component/addressbook.c:421
+#: addressbook/gui/component/addressbook.c:418
#: calendar/gui/calendar-commands.c:511 notes/component-factory.c:27
msgid "New"
msgstr "�����"
#: addressbook/demo/addressbook.c:78
-#: addressbook/gui/component/addressbook.c:421
+#: addressbook/gui/component/addressbook.c:418
msgid "Create a new contact"
msgstr "������� ����� �������"
#: addressbook/demo/addressbook.c:82
-#: addressbook/gui/component/addressbook.c:425
+#: addressbook/gui/component/addressbook.c:422
msgid "Find"
msgstr "�����"
#: addressbook/demo/addressbook.c:82
-#: addressbook/gui/component/addressbook.c:425
+#: addressbook/gui/component/addressbook.c:422
msgid "Find a contact"
msgstr "����� �������"
#: addressbook/demo/addressbook.c:83
-#: addressbook/gui/component/addressbook.c:426
+#: addressbook/gui/component/addressbook.c:423
#: calendar/gui/calendar-commands.c:516 mail/folder-browser-factory.c:38
#: mail/mail-view.c:145
msgid "Print"
msgstr "������"
#: addressbook/demo/addressbook.c:83
-#: addressbook/gui/component/addressbook.c:426
+#: addressbook/gui/component/addressbook.c:423
msgid "Print contacts"
msgstr "���������� �������"
#. Delete
#: addressbook/contact-editor/e-contact-editor.c:852
#: addressbook/demo/addressbook.c:84
-#: addressbook/gui/component/addressbook.c:427
+#: addressbook/gui/component/addressbook.c:424
#: calendar/gui/e-calendar-table.c:375
#: calendar/gui/event-editor-dialog.glade.h:93 calendar/gui/gncal-todo.c:508
#: mail/folder-browser-factory.c:40 mail/mail-config.glade.h:13
@@ -200,12 +201,12 @@ msgid "Delete"
msgstr "�������"
#: addressbook/demo/addressbook.c:84
-#: addressbook/gui/component/addressbook.c:427
+#: addressbook/gui/component/addressbook.c:424
msgid "Delete a contact"
msgstr "������� �������"
#: addressbook/demo/addressbook.c:103
-#: addressbook/gui/component/addressbook.c:512
+#: addressbook/gui/component/addressbook.c:509
msgid "_New Contact"
msgstr "����� �������"
@@ -230,6 +231,10 @@ msgstr "������� ����� �� ������:"
msgid "Message Recipients"
msgstr "���������� ���������"
+#: addressbook/gui/minicard/e-minicard-control.c:276
+msgid "Save in addressbook"
+msgstr "��������� � �������� �����"
+
#: addressbook/gui/minicard/test-minicard-view.c:100
msgid "Reflow Test"
msgstr "������������� ����"
@@ -250,29 +255,25 @@ msgstr "������� ��������� Gpilotd"
msgid "Configuration utility for the calendar conduit.\n"
msgstr "�������� ��������� ��� �������� ���������.\n"
-#: calendar/conduits/calendar/calendar-conduit.c:583
-#, c-format
-msgid "Calendar holds %d entries"
-msgstr "��������� ������ %d �������"
+#: calendar/conduits/calendar/calendar-conduit.c:399
+#: calendar/conduits/calendar/calendar-conduit.c:1109
+#: calendar/conduits/todo/todo-conduit.c:443
+#: calendar/conduits/todo/todo-conduit.c:1025
+msgid "Error while communicating with calendar server"
+msgstr "������ ��� ����������� � ������� ���������"
-#: calendar/conduits/calendar/calendar-conduit.c:618
-#: calendar/conduits/calendar/calendar-conduit.c:620
-#: calendar/conduits/todo/todo-conduit.c:643
-#: calendar/conduits/todo/todo-conduit.c:645
+#: calendar/conduits/calendar/calendar-conduit.c:776
+#: calendar/conduits/calendar/calendar-conduit.c:778
+#: calendar/conduits/todo/todo-conduit.c:707
+#: calendar/conduits/todo/todo-conduit.c:709
msgid "Could not start gnomecal server"
msgstr "�� ������� ��������� ������ gnomecal"
-#: calendar/conduits/calendar/calendar-conduit.c:648
-#: calendar/conduits/calendar/calendar-conduit.c:651
+#: calendar/conduits/calendar/calendar-conduit.c:806
+#: calendar/conduits/calendar/calendar-conduit.c:809
msgid "Could not read pilot's DateBook application block"
msgstr "���������� �������� ���� ���������� ����� ������ ������"
-#: calendar/conduits/calendar/calendar-conduit.c:906
-#: calendar/conduits/todo/todo-conduit.c:428
-#: calendar/conduits/todo/todo-conduit.c:959
-msgid "Error while communicating with calendar server"
-msgstr "������ ��� ����������� � ������� ���������"
-
#: calendar/conduits/todo/todo-conduit-control-applet.c:146
msgid "Gpilotd todo conduit"
msgstr "������� ������� Gpilotd"
@@ -281,17 +282,57 @@ msgstr "������� ������� Gpilotd"
msgid "Configuration utility for the todo conduit.\n"
msgstr "�������� ��������� ��� �������� �������.\n"
-#: calendar/conduits/todo/todo-conduit.c:605
-#, c-format
-msgid "Calendar holds %ld todo entries"
-msgstr "��������� ������ %ld ������� �������"
-
-#: calendar/conduits/todo/todo-conduit.c:673
-#: calendar/conduits/todo/todo-conduit.c:676
+#: calendar/conduits/todo/todo-conduit.c:737
+#: calendar/conduits/todo/todo-conduit.c:740
msgid "Could not read pilot's ToDo application block"
msgstr "���������� �������� ���� ���������� ������� ������"
-#: mail/mail-config-gui.c:425
+#: mail/mail-callbacks.c:134
+msgid ""
+"This message has no subject.\n"
+"Really send?"
+msgstr ""
+"��� ��������� �� ����� ����.\n"
+"������� ���?"
+
+#: mail/mail-callbacks.c:166
+msgid ""
+"You need to configure an identity\n"
+"before you can send mail."
+msgstr ""
+"�� ������ ��������� �������������\n"
+"�� ���� ��� �� ������� ������� �����."
+
+#: mail/mail-callbacks.c:182
+msgid ""
+"You need to configure a mail transport\n"
+"before you can send mail."
+msgstr ""
+"�� ������ ��������� �������� �����\n"
+"�� ���� ��� �� ������� ������� �����."
+
+#: mail/mail-callbacks.c:388
+msgid "Move message(s) to"
+msgstr "����������� ��������� �"
+
+#: mail/mail-callbacks.c:430
+msgid ""
+"You may only edit messages saved\n"
+"in the Drafts folder."
+msgstr ""
+"�� ������ ������� ������ ���������\n"
+"����������� � ����� \"���������\"."
+
+#: mail/mail-callbacks.c:505
+#, c-format
+msgid ""
+"Error loading filter information:\n"
+"%s"
+msgstr ""
+"������ ��� �������� ���������� �������:\n"
+"%s"
+
+#: mail/mail-config-gui.c:430
msgid ""
"Enter your name and email address to be used in outgoing mail. You may also, "
"optionally, enter the name of your organization, and the name of a file to "
@@ -301,55 +342,55 @@ msgstr ""
"�����. �� ������ �����, �������������, ������ �������� ����� ����������� � "
"�������� �����, � ������� �������� ���� �������."
-#: mail/mail-config-gui.c:438
+#: mail/mail-config-gui.c:443
msgid "Full name:"
msgstr "������ ���:"
-#: mail/mail-config-gui.c:462
+#: mail/mail-config-gui.c:467
msgid "Email address:"
msgstr "��.�����:"
-#: mail/mail-config-gui.c:477
+#: mail/mail-config-gui.c:482
msgid "Organization:"
msgstr "�����������:"
-#: mail/mail-config-gui.c:488
+#: mail/mail-config-gui.c:493
msgid "Signature file:"
msgstr "���� �������:"
-#: mail/mail-config-gui.c:493 mail/mail-config.glade.h:10
+#: mail/mail-config-gui.c:498 mail/mail-config.glade.h:10
msgid "Signature File"
msgstr "���� �������"
-#: mail/mail-config-gui.c:919
+#: mail/mail-config-gui.c:897
msgid "Server:"
msgstr "������:"
-#: mail/mail-config-gui.c:925
+#: mail/mail-config-gui.c:903
msgid "Username:"
msgstr "��� ������������:"
-#: mail/mail-config-gui.c:931
+#: mail/mail-config-gui.c:909
msgid "Path:"
msgstr "����:"
-#: mail/mail-config-gui.c:939
+#: mail/mail-config-gui.c:917
msgid "Authentication:"
msgstr "�������������:"
-#: mail/mail-config-gui.c:951
+#: mail/mail-config-gui.c:929
msgid "Detect supported types..."
msgstr "���������� �������������� ����..."
-#: mail/mail-config-gui.c:974
+#: mail/mail-config-gui.c:952
msgid "Don't delete messages from server"
msgstr "�� ������� ��������� � �������"
-#: mail/mail-config-gui.c:986
+#: mail/mail-config-gui.c:964
msgid "Test Settings"
msgstr "��������� �����"
-#: mail/mail-config-gui.c:1116 mail/mail-config-gui.c:1164
+#: mail/mail-config-gui.c:1094 mail/mail-config-gui.c:1142
msgid ""
"Select the kind of mail server you have, and enter the relevant information "
"about it.\n"
@@ -357,11 +398,13 @@ msgid ""
"If the server requires authentication, you can click the \"Detect supported "
"types...\" button after entering the other information."
msgstr ""
-"�������� ��� ������������� ���� ��������� ������� � ������� ��������������� ���������� � ���.\n"
+"�������� ��� ������������� ���� ��������� ������� � ������� ��������������� "
+"���������� � ���.\n"
"\n"
-"���� ������ ������� �������������, �� �������� �� ������ \"���������� �������������� ����...\" ����� ����� ��������� ����������."
+"���� ������ ������� �������������, �� �������� �� ������ \"���������� "
+"�������������� ����...\" ����� ����� ��������� ����������."
-#: mail/mail-config-gui.c:1140
+#: mail/mail-config-gui.c:1118
msgid ""
"Select the kind of news server you have, and enter the relevant information "
"about it.\n"
@@ -369,34 +412,50 @@ msgid ""
"If the server requires authentication, you can click the \"Detect supported "
"types...\" button after entering the other information."
msgstr ""
-"�������� ������������ ���� ������ �������� � ������� ��������������� ���������� � ���.\n"
+"�������� ������������ ���� ������ �������� � ������� ��������������� "
+"���������� � ���.\n"
"\n"
-"���� ������ ������� �������������, �� ������ �������� �� ������ \"���������� �������������� ����...\" ����� ����� ��������� ����������."
+"���� ������ ������� �������������, �� ������ �������� �� ������ \"���������� "
+"�������������� ����...\" ����� ����� ��������� ����������."
-#: mail/mail-config-gui.c:1214
+#: mail/mail-config-gui.c:1192
msgid "Edit Identity"
msgstr "������ ����������"
-#: mail/mail-config-gui.c:1216
+#: mail/mail-config-gui.c:1194
msgid "Add Identity"
msgstr "�������� ����������"
-#: mail/mail-config-gui.c:1310
+#: mail/mail-config-gui.c:1288
msgid "Edit Source"
msgstr "������ ���������"
-#: mail/mail-config-gui.c:1312
+#: mail/mail-config-gui.c:1290
msgid "Add Source"
msgstr "�������� ��������"
-#: mail/mail-config-gui.c:1409
+#: mail/mail-config-gui.c:1387
msgid "Edit News Server"
msgstr "������ ������� ��������"
-#: mail/mail-config-gui.c:1411
+#: mail/mail-config-gui.c:1389
msgid "Add News Server"
msgstr "�������� ������ ��������"
+#: mail/mail-config-gui.c:2217
+msgid "The connection was successful!"
+msgstr "���������� ���� ��������!"
+
+#: mail/mail-local.c:256
+#, c-format
+msgid "Changing folder \"%s\" to \"%s\" format"
+msgstr "��������� ����� \"%s\" � ������ \"%s\""
+
+#: mail/mail-local.c:260
+#, c-format
+msgid "Change folder \"%s\" to \"%s\" format"
+msgstr "�������� ����� \"%s\" � ������ \"%s\""
+
#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
#: mail/folder-browser-factory.c:29 mail/mail-view.c:135
@@ -1208,24 +1267,24 @@ msgstr ""
"III\n"
"Esq.\n"
-#: addressbook/gui/component/addressbook.c:495
+#: addressbook/gui/component/addressbook.c:492
msgid "_Print Contacts..."
msgstr "���������� ��������..."
-#: addressbook/gui/component/addressbook.c:505
-#: addressbook/gui/component/addressbook.c:1044
+#: addressbook/gui/component/addressbook.c:502
+#: addressbook/gui/component/addressbook.c:972
msgid "As _Table"
msgstr "��� �������"
-#: addressbook/gui/component/addressbook.c:520
+#: addressbook/gui/component/addressbook.c:517
msgid "N_ew Directory Server"
msgstr "����� ������ ���������"
-#: addressbook/gui/component/addressbook.c:603
+#: addressbook/gui/component/addressbook.c:600
msgid "Unable to open addressbook"
msgstr "�� ������� ������� �������� �����"
-#: addressbook/gui/component/addressbook.c:608
+#: addressbook/gui/component/addressbook.c:605
msgid ""
"We were unable to open this addressbook. This either\n"
"means you have entered an incorrect URI, or have tried\n"
@@ -1245,20 +1304,20 @@ msgstr ""
"������������ LDAP, ��� ���� ������� � ���������� \n"
"OpenLDAP � ����������������� � ���������� evolution.\n"
-#: addressbook/gui/component/addressbook.c:948
+#: addressbook/gui/component/addressbook.c:876
#: addressbook/gui/minicard/e-minicard.c:330
msgid "Save as VCard"
msgstr "��������� ��� VCard"
-#: addressbook/gui/component/addressbook.c:1015
+#: addressbook/gui/component/addressbook.c:943
msgid "* Click here to add a contact *"
msgstr "* �������� ����� ����� �������� ������� *"
-#: addressbook/gui/component/addressbook.c:1051
+#: addressbook/gui/component/addressbook.c:979
msgid "As _Minicards"
msgstr "��� ������������"
-#: addressbook/gui/component/addressbook.c:1102
+#: addressbook/gui/component/addressbook.c:1030
msgid "The URI that the Folder Browser will display"
msgstr "URI, ������� ����� ���������� ��������� ��������� �����"
@@ -1797,7 +1856,48 @@ msgstr "%s%s"
msgid "'s calendar"
msgstr "' ���������"
-#: calendar/gui/calendar-model.c:452
+#: calendar/gui/calendar-model.c:323
+msgid "Public"
+msgstr "�����"
+
+#: calendar/gui/calendar-model.c:326
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
+msgid "Private"
+msgstr "������"
+
+#: calendar/gui/calendar-model.c:329
+msgid "Confidential"
+msgstr "����������������"
+
+#: calendar/gui/calendar-model.c:332 calendar/gui/calendar-model.c:499
+msgid "Unknown"
+msgstr "�����������"
+
+#: calendar/gui/calendar-model.c:419
+msgid "N"
+msgstr "�"
+
+#: calendar/gui/calendar-model.c:419
+msgid "S"
+msgstr "�"
+
+#: calendar/gui/calendar-model.c:421
+msgid "E"
+msgstr "�"
+
+#: calendar/gui/calendar-model.c:421
+msgid "W"
+msgstr "�"
+
+#: calendar/gui/calendar-model.c:493
+msgid "Transparent"
+msgstr "����������"
+
+#: calendar/gui/calendar-model.c:496
+msgid "Opaque"
+msgstr "������������"
+
+#: calendar/gui/calendar-model.c:750
#, c-format
msgid ""
"The date must be entered in the format: \n"
@@ -1808,7 +1908,7 @@ msgstr ""
"\n"
"%s"
-#: calendar/gui/calendar-model.c:525
+#: calendar/gui/calendar-model.c:823
msgid ""
"The geographical position must be entered in the format: \n"
"\n"
@@ -1818,15 +1918,15 @@ msgstr ""
"\n"
"45.436845,125.862501"
-#: calendar/gui/calendar-model.c:570
+#: calendar/gui/calendar-model.c:868
msgid "The percent value must be between 0 and 100"
msgstr "�������� �������� ������ ���� ����� 0 � 100"
-#: calendar/gui/calendar-model.c:603
+#: calendar/gui/calendar-model.c:901
msgid "The priority must be between 0 and 10"
msgstr "��������� ������ ���� ����� 0 � 10"
-#: calendar/gui/control-factory.c:136
+#: calendar/gui/control-factory.c:132
msgid "The URI that the calendar will display"
msgstr "URI, ������� ����� ���������� ���������"
@@ -2011,10 +2111,6 @@ msgstr "% ����������:"
msgid "_Contacts..."
msgstr "��������..."
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-msgid "Private"
-msgstr "������"
-
#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
msgid "Task"
msgstr "�������"
@@ -2084,7 +2180,7 @@ msgid "% Complete"
msgstr "% ���������"
#: calendar/gui/e-calendar-table.c:249 calendar/gui/gncal-todo.c:436
-#: calendar/gui/prop.c:609 mail/message-list.c:503
+#: calendar/gui/prop.c:609 mail/message-list.c:507
msgid "Priority"
msgstr "���������"
@@ -3566,39 +3662,39 @@ msgstr "������ �������� ���������"
msgid "_Print message"
msgstr "������ ���������"
-#: mail/folder-browser-factory.c:81
-msgid "_Mark all messages seen"
-msgstr "�������� ��� ��������� ��� �������������"
-
-#: mail/folder-browser-factory.c:86
+#: mail/folder-browser-factory.c:80
msgid "E_dit Message"
msgstr "������ ���������"
-#: mail/folder-browser-factory.c:92
+#: mail/folder-browser-factory.c:87
msgid "_View Message"
msgstr "�������� ���������"
-#: mail/folder-browser-factory.c:98
+#: mail/folder-browser-factory.c:96
+msgid "_Mark all messages seen"
+msgstr "�������� ��� ��������� ��� �������������"
+
+#: mail/folder-browser-factory.c:100
msgid "_Expunge"
msgstr "����������"
-#: mail/folder-browser-factory.c:104
+#: mail/folder-browser-factory.c:106
msgid "Mail _Filters ..."
msgstr "�������� ������� ..."
-#: mail/folder-browser-factory.c:110
+#: mail/folder-browser-factory.c:112
msgid "_vFolder Editor ..."
msgstr "�������� ����������� ����� ..."
-#: mail/folder-browser-factory.c:116
+#: mail/folder-browser-factory.c:118
msgid "_Mail Configuration ..."
msgstr "��������� ����� ..."
-#: mail/folder-browser-factory.c:122
+#: mail/folder-browser-factory.c:124
msgid "Forget _Passwords"
msgstr "������ ������"
-#: mail/folder-browser-factory.c:129
+#: mail/folder-browser-factory.c:131
msgid "_Configure Folder"
msgstr "��������� �����"
@@ -3682,72 +3778,76 @@ msgstr ""
"��������� ����� ����� ���������.\n"
"������� \"���������\", ����� ��������� ����� ���������."
-#: mail/mail-crypto.c:342 mail/mail-crypto.c:420
-msgid "No GPG/PGP program available."
-msgstr "�� �������� ���������� GPG/PGP."
+#: mail/mail-crypto.c:338 mail/mail-crypto.c:418
+msgid "Please enter your PGP/GPG passphrase."
+msgstr "���������� ������� ���� ��������� ����� PGP/GPG."
-#: mail/mail-crypto.c:348 mail/mail-crypto.c:426
+#: mail/mail-crypto.c:342 mail/mail-crypto.c:422
+msgid "No password provided."
+msgstr "������ �� ������������."
+
+#: mail/mail-crypto.c:348 mail/mail-crypto.c:428
#, c-format
msgid "Couldn't create pipe to GPG/PGP: %s"
msgstr "�� ������� ������� ����� � GPG/PGP: %s"
-#: mail/mail-threads.c:619
+#: mail/mail-threads.c:646
msgid "Currently pending operations:"
msgstr ""
-#: mail/mail-threads.c:820
+#: mail/mail-threads.c:847
msgid "Incomplete message written on pipe!"
msgstr "�������� ��������� �������� � �����!"
-#: mail/mail-threads.c:824
+#: mail/mail-threads.c:851
msgid "Error reading commands from dispatching thread."
msgstr "������ ������ ������ �� ����������� ����."
-#: mail/mail-threads.c:938
+#: mail/mail-threads.c:973
msgid "Corrupted message from dispatching thread?"
msgstr "������������ ��������� �� ����������� ����?"
-#: mail/mail-threads.c:1005
+#: mail/mail-threads.c:1040
msgid "Waiting for user to close error dialog"
msgstr "�������� ���� ������������ ������� ���� ������"
-#: mail/mail-threads.c:1068
+#: mail/mail-threads.c:1108
msgid "Waiting for user to enter data"
msgstr "�������� ���� ������������ ������ ������"
-#: mail/mail-threads.c:1076
+#: mail/mail-threads.c:1116
msgid "Could not create dialog box."
msgstr "���������� ������� ���� �������."
-#: mail/mail-threads.c:1124
+#: mail/mail-threads.c:1169
msgid "User cancelled query."
msgstr "������������ ������� ������."
-#: mail/message-list.c:485
+#: mail/message-list.c:489
msgid "Online Status"
msgstr "������������ ���������"
-#: mail/message-list.c:521
+#: mail/message-list.c:525
msgid "From"
msgstr "��"
-#: mail/message-list.c:528
+#: mail/message-list.c:532
msgid "Subject"
msgstr "����"
-#: mail/message-list.c:535
+#: mail/message-list.c:539
msgid "Date"
msgstr "����"
-#: mail/message-list.c:542
+#: mail/message-list.c:546
msgid "Received"
msgstr "��������"
-#: mail/message-list.c:549
+#: mail/message-list.c:553
msgid "To"
msgstr "����"
-#: mail/message-list.c:556
+#: mail/message-list.c:560
msgid "Size"
msgstr "������"
@@ -4299,6 +4399,15 @@ msgstr "..."
msgid "Group %i"
msgstr "������ %i"
+#~ msgid "Calendar holds %d entries"
+#~ msgstr "��������� ������ %d �������"
+
+#~ msgid "Calendar holds %ld todo entries"
+#~ msgstr "��������� ������ %ld ������� �������"
+
+#~ msgid "No GPG/PGP program available."
+#~ msgstr "�� �������� ���������� GPG/PGP."
+
#~ msgid "Evolution can not create its local folders"
#~ msgstr "Evolution �� ������� ������� ��������� �����"
@@ -4310,20 +4419,3 @@ msgstr "������ %i"
#~ msgid "Fetching mail"
#~ msgstr "��������� �����"
-
-#~ msgid ""
-#~ "This message has no subject.\n"
-#~ "Really send?"
-#~ msgstr ""
-#~ "��� ��������� �� ����� ����.\n"
-#~ "������� ���?"
-
-#~ msgid ""
-#~ "You need to configure an identity\n"
-#~ "before you can send mail."
-#~ msgstr ""
-#~ "�� ������ ��������� �������������\n"
-#~ "�� ���� ��� �� ������� ������� �����."
-
-#~ msgid "Move message(s) to"
-#~ msgstr "����������� ��������� �"