aboutsummaryrefslogtreecommitdiffstats
path: root/po/ru.po
diff options
context:
space:
mode:
authorValek Frob <frob@src.gnome.org>2000-11-28 23:26:48 +0800
committerValek Frob <frob@src.gnome.org>2000-11-28 23:26:48 +0800
commit10ddfac529eda2aa822ddff3ac9c7893f1f97574 (patch)
tree883865f3aa934ca84b6b9564b9fef8e898d1c50c /po/ru.po
parent3998a03ae925f47cd1ffcf31fca0a4701f8c75da (diff)
downloadgsoc2013-evolution-10ddfac529eda2aa822ddff3ac9c7893f1f97574.tar.gz
gsoc2013-evolution-10ddfac529eda2aa822ddff3ac9c7893f1f97574.tar.zst
gsoc2013-evolution-10ddfac529eda2aa822ddff3ac9c7893f1f97574.zip
Updated russian translation.
svn path=/trunk/; revision=6694
Diffstat (limited to 'po/ru.po')
-rw-r--r--po/ru.po1004
1 files changed, 357 insertions, 647 deletions
diff --git a/po/ru.po b/po/ru.po
index 3832330f53..72280c70cf 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-11-17 17:32+0300\n"
-"PO-Revision-Date: 2000-11-17 17:36+03:00\n"
+"POT-Creation-Date: 2000-11-28 18:21+0300\n"
+"PO-Revision-Date: 2000-11-28 18:24+03:00\n"
"Last-Translator: Valek Filippov <frob@df.ru>\n"
"Language-Team: Russian <ru@li.org>\n"
"MIME-Version: 1.0\n"
@@ -284,10 +284,10 @@ msgstr ""
#: addressbook/backend/ebook/load-pine-addressbook.c:17
#: addressbook/backend/ebook/test-client-list.c:18
#: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1012
+#: addressbook/conduit/address-conduit.c:1026
#: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1092
-#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
+#: calendar/conduits/calendar/calendar-conduit.c:1087
+#: calendar/conduits/todo/todo-conduit.c:961 calendar/gui/main.c:54
msgid "Could not initialize Bonobo"
msgstr "�� ������� ���������������� Bonobo"
@@ -410,28 +410,28 @@ msgstr ""
"��� ������� �������� ������ �������\n"
"�� ������ gnome-pilot �������� ������"
-#: addressbook/conduit/address-conduit.c:207
+#: addressbook/conduit/address-conduit.c:196
msgid "Cursor could not be loaded\n"
msgstr "������ �� ����� ���� ��������\n"
-#: addressbook/conduit/address-conduit.c:220
+#: addressbook/conduit/address-conduit.c:209
msgid "EBook not loaded\n"
msgstr "EBook �� ���������\n"
-#: addressbook/conduit/address-conduit.c:579
+#: addressbook/conduit/address-conduit.c:599
#: calendar/conduits/calendar/calendar-conduit.c:651
#: calendar/conduits/todo/todo-conduit.c:524
msgid "Could not start wombat server"
msgstr "�� ������� ��������� ������ wombat"
-#: addressbook/conduit/address-conduit.c:580
+#: addressbook/conduit/address-conduit.c:600
#: calendar/conduits/calendar/calendar-conduit.c:652
#: calendar/conduits/todo/todo-conduit.c:525
msgid "Could not start wombat"
msgstr "�� ������� ��������� wombat"
-#: addressbook/conduit/address-conduit.c:613
-#: addressbook/conduit/address-conduit.c:616
+#: addressbook/conduit/address-conduit.c:632
+#: addressbook/conduit/address-conduit.c:635
msgid "Could not read pilot's Address application block"
msgstr "���������� �������� ���� ���������� ������� ������"
@@ -584,7 +584,7 @@ msgstr "����� ��� ��������"
#.
#: addressbook/contact-editor/e-contact-editor-strings.h:11
#: calendar/gui/event-editor-dialog.glade.h:53 filter/filter.glade.h:7
-#: mail/mail-config-druid.glade.h:10 mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:7
msgid "Add"
msgstr "��������"
@@ -880,7 +880,6 @@ msgid "LDAP Server:"
msgstr "������ LDAP:"
#: addressbook/gui/component/ldap-server-dialog.glade.h:9
-#: mail/mail-config-druid.glade.h:37
msgid "Name:"
msgstr "���:"
@@ -1116,7 +1115,6 @@ msgid "Top:"
msgstr "������:"
#: addressbook/printing/e-contact-print.glade.h:46
-#: mail/mail-config-druid.glade.h:66
msgid "Type:"
msgstr "���:"
@@ -1128,11 +1126,15 @@ msgstr "������:"
msgid "label26"
msgstr "�����26"
-#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:605
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:538
+#: calendar/gui/print.c:605
msgid "am"
msgstr "�.�."
-#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:604
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:541
+#: calendar/gui/print.c:604
msgid "pm"
msgstr "�.�."
@@ -1211,15 +1213,15 @@ msgstr "�������, ������� ������ ���� ��������� �������:"
msgid "To-Do item that is overdue:"
msgstr "������������ �������:"
-#: calendar/gui/calendar-commands.c:382
+#: calendar/gui/calendar-commands.c:354
msgid "File not found"
msgstr "���� �� ������"
-#: calendar/gui/calendar-commands.c:406
+#: calendar/gui/calendar-commands.c:378
msgid "Open calendar"
msgstr "������� ���������"
-#: calendar/gui/calendar-commands.c:445
+#: calendar/gui/calendar-commands.c:417
msgid "Save calendar"
msgstr "��������� ���������"
@@ -1232,13 +1234,13 @@ msgstr "%a %m/%d/%Y"
#. strftime format of a weekday, a date and a time,
#. in 24-hour format.
-#: calendar/gui/calendar-model.c:286 calendar/gui/calendar-model.c:726
+#: calendar/gui/calendar-model.c:286 calendar/gui/calendar-model.c:736
msgid "%a %m/%d/%Y %H:%M:%S"
msgstr "%a %m/%d/%Y %H:%M:%S"
#. strftime format of a weekday, a date and a time,
#. in 12-hour format.
-#: calendar/gui/calendar-model.c:290 calendar/gui/calendar-model.c:729
+#: calendar/gui/calendar-model.c:290 calendar/gui/calendar-model.c:739
msgid "%a %m/%d/%Y %I:%M:%S %p"
msgstr "%a %m/%d/%Y %I:%M:%S %p"
@@ -1282,7 +1284,7 @@ msgstr "����������"
msgid "Opaque"
msgstr "������������"
-#: calendar/gui/calendar-model.c:734
+#: calendar/gui/calendar-model.c:744
#, c-format
msgid ""
"The date must be entered in the format: \n"
@@ -1294,36 +1296,35 @@ msgstr ""
"%s"
#. strptime format for a date.
-#: calendar/gui/calendar-model.c:835 calendar/gui/calendar-model.c:883
+#: calendar/gui/calendar-model.c:845 calendar/gui/calendar-model.c:893
#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:228 widgets/misc/e-dateedit.c:514
-#: widgets/misc/e-dateedit.c:545 widgets/misc/e-dateedit.c:701
+#: widgets/misc/e-dateedit.c:1274 widgets/misc/e-dateedit.c:1455
msgid "%m/%d/%Y"
msgstr "%m/%d/%Y"
#. strptime format for a time of day, in 12-hour format.
#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:853
+#: calendar/gui/calendar-model.c:863
msgid "%I:%M:%S %p%n"
msgstr "%I:%M:%S %p%n"
#. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:856
+#: calendar/gui/calendar-model.c:866
msgid "%H:%M:%S%n"
msgstr "%H:%M:%S%n"
#. strptime format for time of day, without seconds, 12-hour format.
#. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:860
+#: calendar/gui/calendar-model.c:870
msgid "%I:%M %p%n"
msgstr "%I:%M %p%n"
#. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:863
+#: calendar/gui/calendar-model.c:873
msgid "%H:%M%n"
msgstr "%H:%M%n"
-#: calendar/gui/calendar-model.c:983
+#: calendar/gui/calendar-model.c:993
msgid ""
"The geographical position must be entered in the format: \n"
"\n"
@@ -1333,11 +1334,11 @@ msgstr ""
"\n"
"45.436845,125.862501"
-#: calendar/gui/calendar-model.c:1023
+#: calendar/gui/calendar-model.c:1033
msgid "The percent value must be between 0 and 100, inclusive"
msgstr "�������� �������� ������ ���� ����� 0 � 100, ������������"
-#: calendar/gui/calendar-model.c:1063
+#: calendar/gui/calendar-model.c:1073
msgid "The priority must be between 1 and 9, inclusive"
msgstr "��������� ������ ���� ����� 1 � 9, ������������"
@@ -1413,7 +1414,7 @@ msgstr "���������"
msgid "Calendar Preferences"
msgstr "��������� ���������"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14 calendar/gui/prop.c:528
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
msgid "Colors"
msgstr "�����"
@@ -1425,8 +1426,7 @@ msgstr "����� �������� ���"
msgid "Date navigator options"
msgstr "��������� ���������� ���"
-#. populate default frame/box
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17 calendar/gui/prop.c:842
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
msgid "Defaults"
msgstr "���.��������"
@@ -1434,7 +1434,7 @@ msgstr "���.��������"
msgid "Display options"
msgstr "���������� ���������"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19 calendar/gui/prop.c:610
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
msgid "Due Date"
msgstr "����������� ����"
@@ -1492,8 +1492,7 @@ msgstr "������������ �������:"
msgid "Pick a color"
msgstr "������� ����"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33 calendar/gui/prop.c:611
-#: filter/libfilter-i18n.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33 filter/libfilter-i18n.h:19
msgid "Priority"
msgstr "���������"
@@ -1541,7 +1540,7 @@ msgstr "������ �������"
msgid "Thu"
msgstr "���"
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 calendar/gui/prop.c:612
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
msgid "Time Until Due"
msgstr "����� �� ������������"
@@ -1579,25 +1578,25 @@ msgstr "����� �� ������������ �������."
msgid "seconds."
msgstr "������."
-#: calendar/gui/dialogs/task-editor.c:655
+#: calendar/gui/dialogs/task-editor.c:656
msgid "Edit Task"
msgstr "������ �������"
-#: calendar/gui/dialogs/task-editor.c:661 calendar/gui/event-editor.c:316
+#: calendar/gui/dialogs/task-editor.c:662 calendar/gui/event-editor.c:319
msgid "No summary"
msgstr "��� �����"
-#: calendar/gui/dialogs/task-editor.c:667 calendar/gui/event-editor.c:322
+#: calendar/gui/dialogs/task-editor.c:668 calendar/gui/event-editor.c:325
#, c-format
msgid "Appointment - %s"
msgstr "������� - %s"
-#: calendar/gui/dialogs/task-editor.c:670 calendar/gui/event-editor.c:325
+#: calendar/gui/dialogs/task-editor.c:671 calendar/gui/event-editor.c:328
#, c-format
msgid "Task - %s"
msgstr "������� - %s"
-#: calendar/gui/dialogs/task-editor.c:673 calendar/gui/event-editor.c:328
+#: calendar/gui/dialogs/task-editor.c:674 calendar/gui/event-editor.c:331
#, c-format
msgid "Journal entry - %s"
msgstr "���������� ������ - %s"
@@ -1655,86 +1654,86 @@ msgstr "���������:"
msgid "task-editor-dialog"
msgstr "������ ��������� �������"
-#: calendar/gui/e-calendar-table.c:294
+#: calendar/gui/e-calendar-table.c:296
msgid "Open..."
msgstr "�������..."
-#: calendar/gui/e-calendar-table.c:295
+#: calendar/gui/e-calendar-table.c:297
msgid "Open the task"
msgstr "������� �������"
-#: calendar/gui/e-calendar-table.c:297
+#: calendar/gui/e-calendar-table.c:299
msgid "Mark Complete"
msgstr "�������� ��� �����������"
-#: calendar/gui/e-calendar-table.c:298
+#: calendar/gui/e-calendar-table.c:300
msgid "Mark the task complete"
msgstr "�������� ������� ��� �����������"
-#: calendar/gui/e-calendar-table.c:300
+#: calendar/gui/e-calendar-table.c:302
#: calendar/gui/event-editor-dialog.glade.h:55 filter/filter.glade.h:8
-#: filter/libfilter-i18n.h:8 mail/folder-browser.c:476
-#: mail/mail-config-druid.glade.h:23 mail/mail-config.glade.h:9
-#: mail/mail-view.c:165 ui/evolution-addressbook.xml.h:9
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-mail.xml.h:12
+#: filter/libfilter-i18n.h:8 mail/folder-browser.c:492
+#: mail/mail-config.glade.h:9 mail/mail-view.c:165
+#: ui/evolution-addressbook.xml.h:9 ui/evolution-event-editor.xml.h:20
+#: ui/evolution-mail.xml.h:12
msgid "Delete"
msgstr "�������"
-#: calendar/gui/e-calendar-table.c:301
+#: calendar/gui/e-calendar-table.c:303
msgid "Delete the task"
msgstr "������� �������"
-#: calendar/gui/e-day-view-time-item.c:406
+#: calendar/gui/e-day-view-time-item.c:437
#, c-format
msgid "%02i minute divisions"
msgstr ""
#. strftime format %A = full weekday name, %d = day of month,
#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1173
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1196
#: calendar/gui/e-week-view-main-item.c:325
msgid "%A %d %B"
msgstr "%A %d %B"
#. strftime format %a = abbreviated weekday name, %d = day of month,
#. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1187
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1210
#: calendar/gui/e-week-view-main-item.c:334
msgid "%a %d %b"
msgstr "%a %d %b"
#. strftime format %d = day of month, %b = abbreviated month name.
#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1200
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1223
#: calendar/gui/e-week-view-main-item.c:348
msgid "%d %b"
msgstr "%d %b"
-#: calendar/gui/e-day-view.c:2631 calendar/gui/e-day-view.c:2638
-#: calendar/gui/e-day-view.c:2647 calendar/gui/e-week-view.c:2930
-#: calendar/gui/e-week-view.c:2937 calendar/gui/e-week-view.c:2946
+#: calendar/gui/e-day-view.c:2946 calendar/gui/e-day-view.c:2953
+#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3095
+#: calendar/gui/e-week-view.c:3102 calendar/gui/e-week-view.c:3111
msgid "New appointment..."
msgstr "����� �������..."
-#: calendar/gui/e-day-view.c:2635 calendar/gui/e-day-view.c:2642
-#: calendar/gui/e-week-view.c:2934 calendar/gui/e-week-view.c:2941
+#: calendar/gui/e-day-view.c:2950 calendar/gui/e-day-view.c:2957
+#: calendar/gui/e-week-view.c:3099 calendar/gui/e-week-view.c:3106
msgid "Edit this appointment..."
msgstr "������ ���� �������..."
-#: calendar/gui/e-day-view.c:2636 calendar/gui/e-week-view.c:2935
+#: calendar/gui/e-day-view.c:2951 calendar/gui/e-week-view.c:3100
#: ui/evolution-event-editor.xml.h:21
msgid "Delete this appointment"
msgstr "������� ��� �������"
-#: calendar/gui/e-day-view.c:2643 calendar/gui/e-week-view.c:2942
+#: calendar/gui/e-day-view.c:2958 calendar/gui/e-week-view.c:3107
msgid "Make this appointment movable"
msgstr "������� ��� ������� ������������"
-#: calendar/gui/e-day-view.c:2644 calendar/gui/e-week-view.c:2943
+#: calendar/gui/e-day-view.c:2959 calendar/gui/e-week-view.c:3108
msgid "Delete this occurrence"
msgstr "������� ���� ������"
-#: calendar/gui/e-day-view.c:2645 calendar/gui/e-week-view.c:2944
+#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3109
msgid "Delete all occurrences"
msgstr "������� ��� ������"
@@ -1745,66 +1744,66 @@ msgstr "������� ��� ������"
msgid "%d %B"
msgstr "%d %B"
-#: calendar/gui/event-editor.c:310
+#: calendar/gui/event-editor.c:313
msgid "Edit Appointment"
msgstr "������ �������"
-#: calendar/gui/event-editor.c:365
+#: calendar/gui/event-editor.c:368
msgid "on"
msgstr "�"
-#: calendar/gui/event-editor.c:389 calendar/gui/getdate.y:424
+#: calendar/gui/event-editor.c:392 calendar/gui/getdate.y:424
#: filter/filter-datespec.c:65
msgid "day"
msgstr "����"
-#: calendar/gui/event-editor.c:390 calendar/gui/prop.c:354
+#: calendar/gui/event-editor.c:393
msgid "Monday"
msgstr "�����������"
-#: calendar/gui/event-editor.c:391
+#: calendar/gui/event-editor.c:394
msgid "Tuesday"
msgstr "�������"
-#: calendar/gui/event-editor.c:392
+#: calendar/gui/event-editor.c:395
msgid "Wednesday"
msgstr "�����"
-#: calendar/gui/event-editor.c:393
+#: calendar/gui/event-editor.c:396
msgid "Thursday"
msgstr "�������"
-#: calendar/gui/event-editor.c:394
+#: calendar/gui/event-editor.c:397
msgid "Friday"
msgstr "�������"
-#: calendar/gui/event-editor.c:395
+#: calendar/gui/event-editor.c:398
msgid "Saturday"
msgstr "�������"
-#: calendar/gui/event-editor.c:396 calendar/gui/prop.c:353
+#: calendar/gui/event-editor.c:399
msgid "Sunday"
msgstr "�����������"
-#: calendar/gui/event-editor.c:514
+#: calendar/gui/event-editor.c:517
msgid "on the"
msgstr ""
-#: calendar/gui/event-editor.c:521
+#: calendar/gui/event-editor.c:524
msgid "th"
msgstr "��"
-#: calendar/gui/event-editor.c:675
+#: calendar/gui/event-editor.c:678
msgid "occurrences"
msgstr "������"
-#: calendar/gui/event-editor.c:792
+#: calendar/gui/event-editor.c:795
msgid "This appointment contains recurrences that Evolution cannot edit."
msgstr ""
"��� ������� ����� ������� ����������, ������� �� ����� ���� ��������������� "
"� Evolution."
-#: calendar/gui/event-editor.c:2820 calendar/gui/print.c:1085
+#: calendar/gui/event-editor.c:2875 calendar/gui/print.c:1085
#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
msgid "%a %b %d %Y"
msgstr "%a %b %d %Y"
@@ -2202,30 +2201,6 @@ msgstr "�����������"
msgid "ago"
msgstr "�����"
-#: calendar/gui/gncal-todo.c:139
-msgid "Create to-do item"
-msgstr "������� �������"
-
-#: calendar/gui/gncal-todo.c:139
-msgid "Edit to-do item"
-msgstr "������ �������"
-
-#: calendar/gui/gncal-todo.c:175
-msgid "Summary:"
-msgstr "����:"
-
-#: calendar/gui/gncal-todo.c:186
-msgid "Due Date:"
-msgstr "����������� ����:"
-
-#: calendar/gui/gncal-todo.c:201
-msgid "Priority:"
-msgstr "���������:"
-
-#: calendar/gui/gncal-todo.c:219
-msgid "Item Comments:"
-msgstr "����������� ��������:"
-
#: calendar/gui/gnome-cal.c:718 calendar/gui/gnome-cal.c:1474
#: calendar/gui/gnome-cal.c:1530
msgid "Reminder of your appointment at "
@@ -2467,114 +2442,6 @@ msgstr "���������� ���������"
msgid "Print Preview"
msgstr "�������� ������"
-#: calendar/gui/prop.c:336
-msgid "Time display"
-msgstr "������������ �����"
-
-#. Time format
-#: calendar/gui/prop.c:340
-msgid "Time format"
-msgstr "������ �������"
-
-#: calendar/gui/prop.c:341
-msgid "12-hour (AM/PM)"
-msgstr "12-������� (��/��)"
-
-#: calendar/gui/prop.c:342
-msgid "24-hour"
-msgstr "24-�������"
-
-#. Weeks start on
-#: calendar/gui/prop.c:352
-msgid "Weeks start on"
-msgstr "������ ���������� �"
-
-#. Day range
-#: calendar/gui/prop.c:364
-msgid "Day range"
-msgstr "�������� ���"
-
-#: calendar/gui/prop.c:375
-msgid ""
-"Please select the start and end hours you want\n"
-"to be displayed in the day view and week view.\n"
-"Times outside this range will not be displayed\n"
-"by default."
-msgstr ""
-"�������� ��������� � �������� ����, ������� ��\n"
-"������ ������ � ������ ��������� ���� � ������.\n"
-"����� ��� ����� ��������� �� ��������� �� �����\n"
-"������������."
-
-#: calendar/gui/prop.c:391
-msgid "Day start:"
-msgstr "������ ���:"
-
-#: calendar/gui/prop.c:402
-msgid "Day end:"
-msgstr "����� ���:"
-
-#: calendar/gui/prop.c:525
-msgid "Colors for display"
-msgstr "����� ��� ������"
-
-#: calendar/gui/prop.c:605
-msgid "Show on TODO List:"
-msgstr "�������� � ������ �������:"
-
-#: calendar/gui/prop.c:643
-msgid "To Do List style options:"
-msgstr "��������� ����� ������ \"���������\":"
-
-#: calendar/gui/prop.c:648
-msgid "Highlight overdue items"
-msgstr "��������� ������������ ���������"
-
-#: calendar/gui/prop.c:651
-msgid "Highlight not yet due items"
-msgstr "��������� ��� �� ����������� ���������"
-
-#: calendar/gui/prop.c:654
-msgid "Highlight items due today"
-msgstr "��������� ��������� ����������� �� �������"
-
-#: calendar/gui/prop.c:684
-msgid "To Do List Properties"
-msgstr "�������� ������ \"���������\""
-
-#: calendar/gui/prop.c:687
-msgid "To Do List"
-msgstr "������ \"���������\""
-
-#: calendar/gui/prop.c:718
-msgid "Preferences"
-msgstr "���������"
-
-#: calendar/gui/prop.c:786
-msgid "Alarms"
-msgstr "�������"
-
-#. build miscellaneous box
-#: calendar/gui/prop.c:789
-msgid "Alarm Properties"
-msgstr "�������� ��������"
-
-#: calendar/gui/prop.c:799
-msgid "Beep on display alarms"
-msgstr "����� ��� ����������� ��������"
-
-#: calendar/gui/prop.c:809
-msgid "Audio alarms timeout after"
-msgstr "�������� ������������ ��"
-
-#: calendar/gui/prop.c:820 calendar/gui/prop.c:837
-msgid " seconds"
-msgstr " ������"
-
-#: calendar/gui/prop.c:826
-msgid "Enable snoozing for "
-msgstr "��������� ������� ��� ��� "
-
#. Translators: These are the first characters of each day of the
#. week, 'M' for 'Monday', 'T' for Tuesday etc.
#: calendar/gui/weekday-picker.c:345 widgets/misc/e-calendar-item.c:416
@@ -2585,69 +2452,69 @@ msgstr "�������"
msgid "SMTWTFS"
msgstr "�������"
-#: camel/camel-movemail.c:97
+#: camel/camel-movemail.c:99
#, c-format
msgid "Could not check mail file %s: %s"
msgstr "�� ������� ��������� �������� ���� %s: %s"
-#: camel/camel-movemail.c:134 camel/camel-movemail.c:181
+#: camel/camel-movemail.c:136 camel/camel-movemail.c:183
#, c-format
msgid "Could not create lock file for %s: %s"
msgstr "�� ������� ������� ���� ���������� ��� %s: %s"
-#: camel/camel-movemail.c:144
+#: camel/camel-movemail.c:146
#, c-format
msgid "Could not open mail file %s: %s"
msgstr "���������� ������� �������� ���� %s: %s"
-#: camel/camel-movemail.c:154
+#: camel/camel-movemail.c:156
#, c-format
msgid "Could not open temporary mail file %s: %s"
msgstr "���������� ������� ��������� �������� ���� %s: %s"
-#: camel/camel-movemail.c:195
+#: camel/camel-movemail.c:197
#, c-format
msgid "Could not test lock file for %s: %s"
msgstr "���������� ��������� ���� ���������� ��� %s: %s"
-#: camel/camel-movemail.c:215
+#: camel/camel-movemail.c:217
#, c-format
msgid "Timed out trying to get lock file on %s. Try again later."
msgstr ""
"���������� ������� ��� ������� ������������� ���� %s. ���������� ��� ��� "
"�����."
-#: camel/camel-movemail.c:241
+#: camel/camel-movemail.c:243
#, c-format
msgid "Error reading mail file: %s"
msgstr "������ ��� ������ ��������� �����: %s"
-#: camel/camel-movemail.c:252
+#: camel/camel-movemail.c:254
#, c-format
msgid "Error writing mail temp file: %s"
msgstr "������ ���������� ���������� ��������� �����: %s"
-#: camel/camel-movemail.c:270
+#: camel/camel-movemail.c:272
#, c-format
msgid "Failed to store mail in temp file %s: %s"
msgstr "���� ��� ���������� ����� �� ��������� ����� %s: %s"
-#: camel/camel-movemail.c:302
+#: camel/camel-movemail.c:304
#, c-format
msgid "Could not create pipe: %s"
msgstr "�� ������� ������� �����: %s"
-#: camel/camel-movemail.c:314
+#: camel/camel-movemail.c:316
#, c-format
msgid "Could not fork: %s"
msgstr "�� ������� ����������: %s"
-#: camel/camel-movemail.c:352
+#: camel/camel-movemail.c:354
#, c-format
msgid "Movemail program failed: %s"
msgstr "���� ��������� ����������� �����: %s"
-#: camel/camel-movemail.c:353
+#: camel/camel-movemail.c:355
msgid "(Unknown error)"
msgstr "(����������� ������)"
@@ -2748,12 +2615,16 @@ msgstr "���� ������� IMAP: %s"
msgid "Unknown error"
msgstr "����������� ������"
-#: camel/providers/imap/camel-imap-command.c:366
+#: camel/providers/imap/camel-imap-command.c:271
+msgid "Server response ended too soon."
+msgstr "����� ������� ���������� ������� ����."
+
+#: camel/providers/imap/camel-imap-command.c:407
#, c-format
msgid "IMAP server response did not contain %s information"
msgstr "����� IMAP ������� �� �������� ���������� �� %s"
-#: camel/providers/imap/camel-imap-command.c:402
+#: camel/providers/imap/camel-imap-command.c:443
#, c-format
msgid "Unexpected OK response from IMAP server: %s"
msgstr "����������� ����� \"OK\" �� IMAP �������: %s"
@@ -3225,29 +3096,29 @@ msgid "%.1fG"
msgstr "%.1fG"
#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:301 mail/mail-display.c:117
+#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:118
msgid "attachment"
msgstr "��������"
-#: composer/e-msg-composer-attachment-bar.c:397
+#: composer/e-msg-composer-attachment-bar.c:417
#: ui/evolution-message-composer.xml.h:8
msgid "Attach a file"
msgstr "������������ ����"
-#: composer/e-msg-composer-attachment-bar.c:444 filter/filter.glade.h:13
+#: composer/e-msg-composer-attachment-bar.c:464 filter/filter.glade.h:13
#: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
msgid "Remove"
msgstr "�������"
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:465
msgid "Remove selected items from the attachment list"
msgstr "������� ��������� �������� �� ������ ��������"
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:496
msgid "Add attachment..."
msgstr "�������� ��������..."
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:497
msgid "Attach a file to the message"
msgstr "������������ ���� � ���������"
@@ -3269,7 +3140,7 @@ msgid "MIME type:"
msgstr "��� MIME:"
#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:290
-#: mail/mail-format.c:599
+#: mail/mail-format.c:622
msgid "From:"
msgstr "��:"
@@ -3281,7 +3152,7 @@ msgstr "�������� ����� ��� �������� �����"
msgid "Enter the identity you wish to send this message from"
msgstr "������� ����������, �� �������� �� ������ ��������� ��� ���������"
-#: composer/e-msg-composer-hdrs.c:295 mail/mail-format.c:603
+#: composer/e-msg-composer-hdrs.c:295 mail/mail-format.c:626
msgid "To:"
msgstr "����:"
@@ -3289,7 +3160,7 @@ msgstr "����:"
msgid "Enter the recipients of the message"
msgstr "������� ����������� ���������"
-#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:605
+#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:628
msgid "Cc:"
msgstr "�����:"
@@ -3309,7 +3180,7 @@ msgstr ""
"������� ���������, ������� ������� ����� ��������� �� ����� � ������ "
"�����������."
-#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:607
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:630
msgid "Subject:"
msgstr "����:"
@@ -3353,7 +3224,7 @@ msgstr "��������� ��������� � ���������..."
msgid "Error saving composition to 'Drafts': %s"
msgstr "������ ���������� ��������� � \"����������\": %s"
-#: composer/e-msg-composer.c:735 shell/e-shell-view-menu.c:167
+#: composer/e-msg-composer.c:735 shell/e-shell-view-menu.c:170
msgid "Evolution"
msgstr "��������"
@@ -3543,7 +3414,7 @@ msgstr "������ URI �����"
msgid "<click here to select a folder>"
msgstr "<�������� ����� ��� ������ �����>"
-#: filter/filter-input.c:188
+#: filter/filter-input.c:184
#, c-format
msgid ""
"Error in regular expression '%s':\n"
@@ -3552,7 +3423,7 @@ msgstr ""
"������ � ���������� ��������� \"%s\":\n"
"%s"
-#: filter/filter-part.c:458
+#: filter/filter-part.c:456
msgid "Test"
msgstr "��������"
@@ -3588,8 +3459,8 @@ msgstr "�������� ��������"
msgid "Remove criterion"
msgstr "������� ��������"
-#: filter/filter.glade.h:9 mail/folder-browser.c:463
-#: mail/mail-config-druid.glade.h:26 mail/mail-config.glade.h:10
+#: filter/filter.glade.h:9 mail/folder-browser.c:479
+#: mail/mail-config.glade.h:10
msgid "Edit"
msgstr "������"
@@ -3610,7 +3481,7 @@ msgid "vFolder Sources"
msgstr "��������� ����.�����"
#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2 mail/message-list.c:515
+#: filter/libfilter-i18n.h:2 mail/message-list.c:549
msgid "Answered"
msgstr "��������"
@@ -3659,113 +3530,113 @@ msgid "Message Body"
msgstr "���� ���������"
#: filter/libfilter-i18n.h:15
+msgid "Message Header"
+msgstr "��������� ���������"
+
+#: filter/libfilter-i18n.h:16
msgid "Message was received"
msgstr "��������� ���� ��������"
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:17
msgid "Message was sent"
msgstr "��������� ���� ����������"
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:18
msgid "Move to Folder"
msgstr "����������� � �����"
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:20
msgid "Recipients"
msgstr "����������"
-#: filter/libfilter-i18n.h:20 mail/message-list.c:512
+#: filter/libfilter-i18n.h:21
+msgid "Regex Match"
+msgstr ""
+
+#: filter/libfilter-i18n.h:22 mail/message-list.c:546
msgid "Seen"
msgstr "�����������"
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:23
msgid "Sender"
msgstr "�����������"
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:24
msgid "Set Flag"
msgstr "���������� ����"
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:25
msgid "Source"
msgstr "��������"
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:26
msgid "Specific header"
msgstr "������������� ���������"
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:27
msgid "Stop Processing"
msgstr "���������� ���������"
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:28
msgid "Subject"
msgstr "����"
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:29
msgid "after"
msgstr "�����"
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:30
msgid "before"
msgstr "��"
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:31
msgid "contains"
msgstr "��������"
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:32
msgid "does not contain"
msgstr "�� ��������"
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:33
msgid "does not end with"
msgstr "�� ������������� ��"
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:34
msgid "does not exist"
msgstr "�� ����������."
-#: filter/libfilter-i18n.h:33
-msgid "does not match regex"
-msgstr "�� ��������� � ���.����������"
-
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:35
msgid "does not sound like"
msgstr "������ �� ���"
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:36
msgid "does not start with"
msgstr "�� ���������� �"
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:37
msgid "ends with"
msgstr "������������� ��"
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:38
msgid "exists"
msgstr "c���������"
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:39
msgid "is greater than"
msgstr "������ ���"
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:40
msgid "is less than"
msgstr "������ ���"
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:41
msgid "is not"
msgstr "�� ��������"
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:42
msgid "is"
msgstr "��������"
-#: filter/libfilter-i18n.h:42
-msgid "matches regex"
-msgstr "��������� � ���.����������"
-
#: filter/libfilter-i18n.h:43
msgid "on or after"
msgstr "�� ��� �����"
@@ -3810,19 +3681,19 @@ msgstr "�������� ������� ����.�����"
msgid "Edit VFolder Rule"
msgstr "������ ������� ����.�����"
-#: mail/component-factory.c:230
+#: mail/component-factory.c:233
msgid "Cannot initialize Evolution's mail component."
msgstr "���������� ���������������� �������� ��������� \"��������\"."
-#: mail/component-factory.c:236
+#: mail/component-factory.c:239
msgid "Cannot initialize Evolution's mail summary component."
msgstr "���������� ���������������� �������� ��������� Evolution."
-#: mail/component-factory.c:241
+#: mail/component-factory.c:244
msgid "Cannot initialize Evolution's mail storage hash."
msgstr "���������� ���������������� ��� ��������� ��������� Evolution."
-#: mail/component-factory.c:279
+#: mail/component-factory.c:282
msgid "Cannot register storage with shell"
msgstr ""
@@ -3851,95 +3722,91 @@ msgstr "���� �� ��������"
msgid "Subject does not contain"
msgstr "���� �� ��������"
-#: mail/folder-browser.c:451
+#: mail/folder-browser.c:467
msgid "VFolder on Subject"
msgstr "����.����� �� ����"
-#: mail/folder-browser.c:452
+#: mail/folder-browser.c:468
msgid "VFolder on Sender"
msgstr "����.����� �� �����������"
-#: mail/folder-browser.c:453
+#: mail/folder-browser.c:469
msgid "VFolder on Recipients"
msgstr "����.����� �� ����������"
-#: mail/folder-browser.c:455
+#: mail/folder-browser.c:471
msgid "Filter on Subject"
msgstr "������ �� ����"
-#: mail/folder-browser.c:456
+#: mail/folder-browser.c:472
msgid "Filter on Sender"
msgstr "������ �� �����������"
-#: mail/folder-browser.c:457
+#: mail/folder-browser.c:473
msgid "Filter on Recipients"
msgstr "������ �� ����������"
-#: mail/folder-browser.c:458 mail/folder-browser.c:543
+#: mail/folder-browser.c:474 mail/folder-browser.c:557
msgid "Filter on Mailing List"
msgstr "������ �� ������ ��������"
-#: mail/folder-browser.c:462 ui/evolution-message-composer.xml.h:16
+#: mail/folder-browser.c:478 ui/evolution-message-composer.xml.h:16
msgid "Open"
msgstr "�������"
-#: mail/folder-browser.c:464 mail/mail-view.c:163
+#: mail/folder-browser.c:480 mail/mail-view.c:163
#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:24
#: ui/evolution-mail.xml.h:29
msgid "Print"
msgstr "������"
-#: mail/folder-browser.c:466
+#: mail/folder-browser.c:482
msgid "Reply to Sender"
msgstr "�������� �����������"
-#: mail/folder-browser.c:467 mail/mail-view.c:156 ui/evolution-mail.xml.h:35
+#: mail/folder-browser.c:483 mail/mail-view.c:156 ui/evolution-mail.xml.h:35
msgid "Reply to All"
msgstr "�������� ����"
-#: mail/folder-browser.c:468 mail/mail-view.c:159 ui/evolution-mail.xml.h:18
+#: mail/folder-browser.c:484 mail/mail-view.c:159 ui/evolution-mail.xml.h:18
msgid "Forward"
msgstr "���������"
-#: mail/folder-browser.c:469 ui/evolution-mail.xml.h:19
+#: mail/folder-browser.c:485 ui/evolution-mail.xml.h:19
msgid "Forward as Attachment"
msgstr "��������� ��� ��������"
-#: mail/folder-browser.c:471
+#: mail/folder-browser.c:487
msgid "Mark as Read"
msgstr "�������� ��� �����������"
-#: mail/folder-browser.c:472
+#: mail/folder-browser.c:488
msgid "Mark as Unread"
msgstr "�������� ��� ������������"
-#: mail/folder-browser.c:474
+#: mail/folder-browser.c:490
msgid "Move to Folder..."
msgstr "����������� � �����..."
-#: mail/folder-browser.c:475
+#: mail/folder-browser.c:491
msgid "Copy to Folder..."
msgstr "����������� � �����..."
-#: mail/folder-browser.c:477
+#: mail/folder-browser.c:493
msgid "Undelete"
msgstr "������������"
#. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender), NULL, 0 },
#. { "", NULL, GTK_SIGNAL_FUNC (NULL), NULL, 0 },
-#: mail/folder-browser.c:481
+#: mail/folder-browser.c:497
msgid "Apply Filters"
msgstr "��������� �������"
-#: mail/folder-browser.c:483 ui/evolution-mail.xml.h:11
+#: mail/folder-browser.c:499 ui/evolution-mail.xml.h:11
msgid "Create Rule From Message"
msgstr "������� ������� �� ���������"
-#: mail/folder-browser.c:485 ui/evolution-mail.xml.h:45
-msgid "View Message Source"
-msgstr "�������� ��������� ���������"
-
-#: mail/folder-browser.c:545
+#: mail/folder-browser.c:559
#, c-format
msgid "Filter on Mailing List (%s)"
msgstr "������ �� ������ �������� (%s)"
@@ -4067,11 +3934,11 @@ msgstr "������ ���:"
msgid "Email address:"
msgstr "��.�����:"
-#: mail/mail-config-druid.glade.h:41 mail/mail-config-gui.c:484
+#: mail/mail-config-gui.c:484
msgid "Organization:"
msgstr "�����������:"
-#: mail/mail-config-druid.glade.h:63 mail/mail-config-gui.c:495
+#: mail/mail-config-gui.c:495
msgid "Signature file:"
msgstr "���� �������:"
@@ -4079,19 +3946,19 @@ msgstr "���� �������:"
msgid "Signature File"
msgstr "���� �������"
-#: mail/mail-config-druid.glade.h:62 mail/mail-config-gui.c:906
+#: mail/mail-config-gui.c:906
msgid "Server:"
msgstr "������:"
-#: mail/mail-config-druid.glade.h:67 mail/mail-config-gui.c:912
+#: mail/mail-config-gui.c:912
msgid "Username:"
msgstr "��� ������������:"
-#: mail/mail-config-druid.glade.h:43 mail/mail-config-gui.c:918
+#: mail/mail-config-gui.c:918
msgid "Path:"
msgstr "����:"
-#: mail/mail-config-druid.glade.h:14 mail/mail-config-gui.c:927
+#: mail/mail-config-gui.c:927
msgid "Authentication:"
msgstr "�������������:"
@@ -4099,11 +3966,11 @@ msgstr "�������������:"
msgid "Detect supported types..."
msgstr "���������� �������������� ����..."
-#: mail/mail-config-druid.glade.h:24 mail/mail-config-gui.c:967
+#: mail/mail-config-gui.c:967
msgid "Don't delete messages from server"
msgstr "�� ������� ��������� � �������"
-#: mail/mail-config-druid.glade.h:65 mail/mail-config-gui.c:979
+#: mail/mail-config-gui.c:979
msgid "Test Settings"
msgstr "��������� �����"
@@ -4171,219 +4038,67 @@ msgstr "�������� ������ ��������"
msgid "Edit News Server"
msgstr "������ ������� ��������"
-#: mail/mail-config-gui.c:2232
+#: mail/mail-config-gui.c:2229
#, c-format
msgid "Testing \"%s\""
msgstr "�������� \"%s\""
-#: mail/mail-config-gui.c:2234
+#: mail/mail-config-gui.c:2231
#, c-format
msgid "Test connection to \"%s\""
msgstr "�������� ���������� � \"%s\""
-#: mail/mail-config-gui.c:2275
+#: mail/mail-config-gui.c:2272
msgid "The connection was successful!"
msgstr "���������� ���� ��������!"
-#: mail/mail-config-gui.c:2325
+#: mail/mail-config-gui.c:2322
#, c-format
msgid "Querying authorization capabilities of \"%s\""
msgstr "������ ������������ ����������� �� \"%s\""
-#: mail/mail-config-gui.c:2327
+#: mail/mail-config-gui.c:2324
#, c-format
msgid "Query authorization at \"%s\""
msgstr "������ ����������� �� \"%s\""
#.
-#. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
+#. * 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
-msgid "Account Information"
-msgstr "������� ����������"
-
-#: mail/mail-config-druid.glade.h:8
-msgid "Account Management"
-msgstr "���������� ������"
-
-#: mail/mail-config-druid.glade.h:9
-msgid "Accounts"
-msgstr "�����"
-
-#: mail/mail-config-druid.glade.h:11
-msgid "Add Optional Fields..."
-msgstr "�������� �������������� ����..."
-
-#: mail/mail-config-druid.glade.h:12
-msgid "Additional Identity Fields"
-msgstr "�������������� ���� ��������"
-
-#: mail/mail-config-druid.glade.h:13
-msgid "Authentication"
-msgstr "�������������"
-
-#: mail/mail-config-druid.glade.h:15
-msgid "Browse..."
-msgstr "��������..."
-
+#: mail/mail-config-druid.glade.h:7 mail/mail-config-druid.glade.h:8
#: mail/mail-config-druid.glade.h:16
-msgid "Congratulations, your mail configuration is complete."
-msgstr "�����������, ��������� ����� ����� ���������."
-
-#: mail/mail-config-druid.glade.h:22
-msgid "Default"
-msgstr "���.��������"
-
-#: mail/mail-config-druid.glade.h:25
-msgid "Done"
-msgstr "�������"
-
-#: mail/mail-config-druid.glade.h:27
-msgid "Edit Mail Configuration Settings"
-msgstr "������ �������� �����"
-
-#: mail/mail-config-druid.glade.h:28
-msgid "Email Address:"
-msgstr "��.�����:"
-
-#: mail/mail-config-druid.glade.h:29
-msgid "Evolution Mail Configuration"
-msgstr "��������� ����� Evolution"
-
-#: mail/mail-config-druid.glade.h:30
-msgid "Full Name:"
-msgstr "������ ���:"
-
-#: mail/mail-config-druid.glade.h:31
-msgid "IMAP"
-msgstr "IMAP"
-
-#: mail/mail-config-druid.glade.h:32
-msgid "Identity"
-msgstr "����������"
-
-#: mail/mail-config-druid.glade.h:33
-msgid "Mail"
-msgstr "�����"
-
-#: mail/mail-config-druid.glade.h:34
msgid "Mail Configuration"
msgstr "��������� �����"
-#: mail/mail-config-druid.glade.h:35
-msgid "Mail Configuration Druid"
-msgstr "������ ��������� �����"
-
-#: mail/mail-config-druid.glade.h:36
-msgid "Make this my default account"
-msgstr "������� ������ �� ���������"
-
-#: mail/mail-config-druid.glade.h:38
-msgid "News"
-msgstr "�����"
-
-#: mail/mail-config-druid.glade.h:39
-msgid "Optional"
-msgstr "��������������"
-
-#: mail/mail-config-druid.glade.h:40
-msgid "Optional Information"
-msgstr "�������������� ����������"
-
-#: mail/mail-config-druid.glade.h:42
-msgid "Password:"
-msgstr "������:"
-
-#: mail/mail-config-druid.glade.h:44
-msgid ""
-"Please enter information about your incoming mail server below. If you don't "
-"know what"
-msgstr ""
-"����������, ������� ���� ���������� � ����� ������� �������� �����. ���� �� "
-"�� ������ ���"
-
-#: mail/mail-config-druid.glade.h:46
+#: mail/mail-config-druid.glade.h:9
msgid ""
-"Please enter information about your outgoing mail protocol below. If you "
-"don't know "
+"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 ""
-"����������, ������� ���� ���������� � ��������� �������� �����. ���� �� �� "
-"������ "
-
-#: mail/mail-config-druid.glade.h:48
-msgid ""
-"Please enter your name and email address below. The &quot;optional&quot; "
-"fields below do not "
-msgstr "����������� ������� ���� ���� ��� � ��.�����. &quot;��������������&quot; ���� ���� �� "
-
-#: mail/mail-config-druid.glade.h:50
-msgid "Preferred type: "
-msgstr "���������������� ���:"
-
-#: mail/mail-config-druid.glade.h:51
-msgid "Receiving Email"
-msgstr "��������� ��.�����"
-
-#: mail/mail-config-druid.glade.h:52
-msgid "Receiving Mail"
-msgstr "��������� �����"
-#: mail/mail-config-druid.glade.h:53
-msgid "Remember my password"
-msgstr "��������� ������"
-
-#: mail/mail-config-druid.glade.h:54
-msgid "Reply-to:"
-msgstr "��������:"
-
-#: mail/mail-config-druid.glade.h:55
-msgid "Required"
-msgstr "���������"
-
-#: mail/mail-config-druid.glade.h:56
-msgid "SMTP"
-msgstr "SMTP"
-
-#: mail/mail-config-druid.glade.h:57
-msgid "SMTP server requires authentication"
-msgstr "SMTP ������ ������� �������������"
-
-#: mail/mail-config-druid.glade.h:58
-msgid "Sending Email"
-msgstr "�������� ��.�����"
-
-#: mail/mail-config-druid.glade.h:59
-msgid "Sending Mail"
-msgstr "�������� �����"
-
-#: mail/mail-config-druid.glade.h:60
-msgid "Server Configuration"
-msgstr "��������� �������"
-
-#: mail/mail-config-druid.glade.h:61
-msgid "Server Type: "
-msgstr "��� �������:"
+#: mail/mail-config-druid.glade.h:13
+msgid "Identity"
+msgstr "����������"
-#: mail/mail-config-druid.glade.h:64 mail/mail-config.glade.h:21
-msgid "Sources"
-msgstr "���������"
+#: mail/mail-config-druid.glade.h:14
+msgid "Mail Source"
+msgstr "�������� �����"
-#: mail/mail-config-druid.glade.h:68
-msgid "Welcome to the Evolution Mail Configuration Druid! "
-msgstr "����� ���������� � ������� ��������� ����� Evolution!"
+#: mail/mail-config-druid.glade.h:15 mail/mail-config.glade.h:13
+msgid "Mail Transport"
+msgstr "�������� �����"
-#: mail/mail-config-druid.glade.h:74
+#: mail/mail-config-druid.glade.h:17
msgid ""
-"You are almost done with the mail configuration process. The identity, "
-"incoming"
-msgstr "�� ����� ��������� ������� ��������� �����. ��������, ��������"
-
-#: mail/mail-config-druid.glade.h:78
-msgid "Your mail server supports the following types of authentication. Please"
+"Your email configuration is now complete.\n"
+"Click \"Finish\" to save your new settings"
msgstr ""
-"��� �������� ������ ������������ ��������� ���� �������������. ����������,"
+"���� �������� ��������� ���������.\n"
+"������� \"���������\" ��� ���������� ����� ����� ���������"
#: mail/mail-config.glade.h:8
msgid "Address"
@@ -4397,10 +4112,6 @@ msgstr "����������"
msgid "Mail Sources"
msgstr "��������� �����"
-#: mail/mail-config.glade.h:13
-msgid "Mail Transport"
-msgstr "�������� �����"
-
#: mail/mail-config.glade.h:14
msgid "Mark message as seen [ms]: "
msgstr "�������� ��������� ��� ������������� [��]:"
@@ -4421,6 +4132,10 @@ msgstr "�����������"
msgid "Send messages in HTML format"
msgstr "��������� ����� � ������� HTML"
+#: mail/mail-config.glade.h:21
+msgid "Sources"
+msgstr "���������"
+
#: mail/mail-crypto.c:136
#, c-format
msgid "Couldn't create pipe to %s: %s"
@@ -4453,11 +4168,11 @@ msgstr "�� ������� ������� ����� � GPG/PGP: %s"
msgid "No GPG/PGP program available."
msgstr "���������� ��������� GPG/PGP."
-#: mail/mail-display.c:67
+#: mail/mail-display.c:68
msgid "Overwrite file?"
msgstr "���������� ����?"
-#: mail/mail-display.c:71
+#: mail/mail-display.c:72
msgid ""
"A file by that name already exists.\n"
"Overwrite it?"
@@ -4465,7 +4180,7 @@ msgstr ""
"���� � ����� ��������� ��� ����������.\n"
"���������� ���?"
-#: mail/mail-display.c:85
+#: mail/mail-display.c:86
#, c-format
msgid ""
"Could not open file %s:\n"
@@ -4474,95 +4189,100 @@ msgstr ""
"���������� ������� ���� %s:\n"
"%s"
-#: mail/mail-display.c:97
+#: mail/mail-display.c:98
#, c-format
msgid "Could not write data: %s"
msgstr "���������� �������� ������: %s"
-#: mail/mail-display.c:193
+#: mail/mail-display.c:194
msgid "Save Attachment"
msgstr "��������� ��������"
-#: mail/mail-display.c:233
+#: mail/mail-display.c:234
#, c-format
msgid "Could not create temporary directory: %s"
msgstr "�� ������� ������� ��������� �������: %s"
-#: mail/mail-display.c:275
+#: mail/mail-display.c:276
msgid "Save to Disk..."
msgstr "��������� �� �����..."
-#: mail/mail-display.c:277
+#: mail/mail-display.c:278
#, c-format
msgid "Open in %s..."
msgstr "������� � %s..."
-#: mail/mail-display.c:279
+#: mail/mail-display.c:280
msgid "View Inline"
msgstr "���������� ��������"
-#: mail/mail-display.c:303
+#: mail/mail-display.c:304
msgid "External Viewer"
msgstr "������� ��������� ���������"
-#: mail/mail-display.c:326
+#: mail/mail-display.c:327
#, c-format
msgid "View Inline (via %s)"
msgstr "���������� �������� (����� %s)"
-#: mail/mail-display.c:330
+#: mail/mail-display.c:331
msgid "Hide"
msgstr "������"
-#: mail/mail-format.c:478
+#: mail/mail-format.c:501
#, c-format
msgid "%s attachment"
msgstr "%s ��������"
-#: mail/mail-format.c:601
+#: mail/mail-format.c:624
msgid "Reply-To:"
msgstr "��������:"
-#: mail/mail-format.c:823
+#: mail/mail-format.c:846
msgid "No GPG/PGP support available in this copy of Evolution."
msgstr "��������� GPG/PGP ���������� � ���� ����� Evolution."
-#: mail/mail-format.c:835
+#: mail/mail-format.c:858
msgid "Encrypted message not displayed"
msgstr "������������� ��������� �� ������������"
-#: mail/mail-format.c:841
+#: mail/mail-format.c:864
msgid "Encrypted message"
msgstr "������������� ���������"
-#: mail/mail-format.c:842
+#: mail/mail-format.c:865
msgid "Click icon to decrypt."
msgstr "�������� �� ����������� ��� ����������."
-#: mail/mail-format.c:1444
+#: mail/mail-format.c:1467
#, c-format
msgid "Pointer to FTP site (%s)"
msgstr "��������� �� FTP ���� (%s)"
-#: mail/mail-format.c:1456
+#: mail/mail-format.c:1479
#, c-format
msgid "Pointer to local file (%s) valid at site \"%s\""
msgstr ""
-#: mail/mail-format.c:1460
+#: mail/mail-format.c:1483
#, c-format
msgid "Pointer to local file (%s)"
msgstr "��������� �� ��������� ���� (%s)"
-#: mail/mail-format.c:1494
+#: mail/mail-format.c:1517
#, c-format
msgid "Pointer to unknown external data (\"%s\" type)"
msgstr "��������� �� ����������� ������� ������ (���� \"%s\")"
-#: mail/mail-format.c:1499
+#: mail/mail-format.c:1522
msgid "Malformed external-body part."
msgstr ""
+#: mail/mail-format.c:1692
+#, c-format
+msgid "On %s, %s wrote:\n"
+msgstr "%s, %s �������:\n"
+
#: mail/mail-local.c:194
#, c-format
msgid "Changing folder \"%s\" to \"%s\" format"
@@ -4602,287 +4322,281 @@ msgid ""
"you may need to repair it manually."
msgstr ""
-#: mail/mail-local.c:659
+#: mail/mail-local.c:669
msgid "Registering local folder"
msgstr "����������� ��������� �����"
-#: mail/mail-local.c:661
+#: mail/mail-local.c:671
msgid "Register local folder"
msgstr "���������������� ��������� �����"
-#: mail/mail-ops.c:70
+#: mail/mail-ops.c:78
#, c-format
msgid "Fetching email from %s"
msgstr "��������� ����� c %s"
-#: mail/mail-ops.c:72
+#: mail/mail-ops.c:80
#, c-format
msgid "Fetch email from %s"
msgstr "�������� ����� c %s"
-#: mail/mail-ops.c:312
+#: mail/mail-ops.c:333
#, c-format
msgid "There is no new mail at %s."
msgstr "��� ����� ����� �� %s."
-#: mail/mail-ops.c:367
+#: mail/mail-ops.c:407
msgid "Filtering email on demand"
msgstr "���������� ����� �� �������"
-#: mail/mail-ops.c:369
+#: mail/mail-ops.c:409
msgid "Filter email on demand"
msgstr "������ ����� �� �������"
-#: mail/mail-ops.c:504
+#: mail/mail-ops.c:544
#, c-format
msgid "Sending \"%s\""
msgstr "�������� \"%s\""
-#: mail/mail-ops.c:509
+#: mail/mail-ops.c:549
msgid "Sending a message without a subject"
msgstr "�������� ��������� ��� ����"
-#: mail/mail-ops.c:512
+#: mail/mail-ops.c:552
#, c-format
msgid "Send \"%s\""
msgstr "������� \"%s\""
-#: mail/mail-ops.c:515
+#: mail/mail-ops.c:555
msgid "Send a message without a subject"
msgstr "������� ��������� ��� ����"
-#: mail/mail-ops.c:686
+#: mail/mail-ops.c:726
msgid "Sending queue"
msgstr "�������� �������"
-#: mail/mail-ops.c:688
+#: mail/mail-ops.c:728
msgid "Send queue"
msgstr "��������� �������"
-#: mail/mail-ops.c:824 mail/mail-ops.c:831
+#: mail/mail-ops.c:864 mail/mail-ops.c:871
#, c-format
msgid "Appending \"%s\""
msgstr "������������� \"%s\""
-#: mail/mail-ops.c:828 mail/mail-ops.c:834
+#: mail/mail-ops.c:868 mail/mail-ops.c:874
msgid "Appending a message without a subject"
msgstr "������������� ��������� ��� ����"
-#: mail/mail-ops.c:906
+#: mail/mail-ops.c:946
#, c-format
msgid "Expunging \"%s\""
msgstr "������������ \"%s\""
-#: mail/mail-ops.c:908
+#: mail/mail-ops.c:948
#, c-format
msgid "Expunge \"%s\""
msgstr "���������� \"%s\""
-#: mail/mail-ops.c:967
+#: mail/mail-ops.c:1007
#, c-format
msgid "Moving messages from \"%s\" into \"%s\""
msgstr "����������� ��������� �� \"%s\" � \"%s\""
-#: mail/mail-ops.c:969
+#: mail/mail-ops.c:1009
#, c-format
msgid "Copying messages from \"%s\" into \"%s\""
msgstr "����������� ��������� �� \"%s\" � \"%s\""
-#: mail/mail-ops.c:972
+#: mail/mail-ops.c:1012
#, c-format
msgid "Move messages from \"%s\" into \"%s\""
msgstr "����������� ��������� �� \"%s\" � \"%s\""
-#: mail/mail-ops.c:974
+#: mail/mail-ops.c:1014
#, c-format
msgid "Copy messages from \"%s\" into \"%s\""
msgstr "����������� ��������� �� \"%s\" � \"%s\""
-#: mail/mail-ops.c:1005
+#: mail/mail-ops.c:1045
msgid "Moving"
msgstr "�����������"
-#: mail/mail-ops.c:1008
+#: mail/mail-ops.c:1048
msgid "Copying"
msgstr "�����������"
-#: mail/mail-ops.c:1028
+#: mail/mail-ops.c:1068
#, c-format
msgid "%s message %d of %d (uid \"%s\")"
msgstr "%s ��������� %d �� %d (uid \"%s\")"
-#: mail/mail-ops.c:1107
+#: mail/mail-ops.c:1147
#, c-format
msgid "Marking messages in folder \"%s\""
msgstr "��������� ��������� � ����� \"%s\""
-#: mail/mail-ops.c:1110
+#: mail/mail-ops.c:1150
#, c-format
msgid "Mark messages in folder \"%s\""
msgstr "�������� ��������� � ����� \"%s\""
-#: mail/mail-ops.c:1141
+#: mail/mail-ops.c:1181
#, c-format
msgid "Marking message %d of %d"
msgstr "��������� ��������� � ����� %d �� %d"
-#: mail/mail-ops.c:1264
+#: mail/mail-ops.c:1304
#, c-format
msgid "Scanning folders in \"%s\""
msgstr "���������� ����� � \"%s\""
-#: mail/mail-ops.c:1266
+#: mail/mail-ops.c:1306
#, c-format
msgid "Scan folders in \"%s\""
msgstr "������� ����� � \"%s\""
-#: mail/mail-ops.c:1335 mail/subscribe-dialog.c:339
+#: mail/mail-ops.c:1375 mail/subscribe-dialog.c:339
msgid "(No description)"
msgstr "(��� ��������)"
-#: mail/mail-ops.c:1396
+#: mail/mail-ops.c:1436
#, c-format
msgid "Attaching messages from folder \"%s\""
msgstr "������������� ��������� �� ����� \"%s\""
-#: mail/mail-ops.c:1399
+#: mail/mail-ops.c:1439
#, c-format
msgid "Attach messages from \"%s\""
msgstr "������������ ��������� �� \"%s\""
-#: mail/mail-ops.c:1499
+#: mail/mail-ops.c:1539
#, c-format
msgid "Forwarding messages \"%s\""
msgstr "��������� ��������� \"%s\""
-#: mail/mail-ops.c:1503
+#: mail/mail-ops.c:1543
msgid "Forwarding a message without a subject"
msgstr "��������� ��������� ��� ����"
-#: mail/mail-ops.c:1506
+#: mail/mail-ops.c:1546
#, c-format
msgid "Forward message \"%s\""
msgstr "��������� ��������� \"%s\""
-#: mail/mail-ops.c:1510
+#: mail/mail-ops.c:1550
msgid "Forward a message without a subject"
msgstr "��������� ��������� ��� ����"
-#: mail/mail-ops.c:1557
+#: mail/mail-ops.c:1597
#, c-format
msgid "Retrieving message number %d of %d (uid \"%s\")"
msgstr "����������� ��������� ����� %d �� %d (uid \"%s\")"
-#: mail/mail-ops.c:1573
+#: mail/mail-ops.c:1613
msgid ""
"Failed to generate mime part from message while generating forwarded message."
msgstr ""
"�� ������� ������� mime-����� �� ��������� ��� �������� ������������� "
"���������."
-#: mail/mail-ops.c:1736
+#: mail/mail-ops.c:1657
+msgid "Forwarded message:\n"
+msgstr "����������� ���������:\n"
+
+#: mail/mail-ops.c:1726
#, c-format
msgid "Loading \"%s\""
msgstr "�������� \"%s\""
-#: mail/mail-ops.c:1738
+#: mail/mail-ops.c:1728
#, c-format
msgid "Load \"%s\""
msgstr "��������� \"%s\""
-#: mail/mail-ops.c:1840
+#: mail/mail-ops.c:1830
#, c-format
msgid "Creating \"%s\""
msgstr "�������� \"%s\""
-#: mail/mail-ops.c:1842
+#: mail/mail-ops.c:1832
#, c-format
msgid "Create \"%s\""
msgstr "������� \"%s\""
-#: mail/mail-ops.c:1890
+#: mail/mail-ops.c:1880
msgid "Exception while reporting result to shell component listener."
msgstr ""
-#: mail/mail-ops.c:1936
+#: mail/mail-ops.c:1926
#, c-format
msgid "Synchronizing \"%s\""
msgstr "������������� \"%s\""
-#: mail/mail-ops.c:1938
+#: mail/mail-ops.c:1928
#, c-format
msgid "Synchronize \"%s\""
msgstr "�������������� \"%s\""
-#: mail/mail-ops.c:2002
+#: mail/mail-ops.c:1992
#, c-format
msgid "Displaying message UID \"%s\""
msgstr "�������� UID ��������� \"%s\""
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:1995
msgid "Clearing message display"
msgstr "������� ����������� ���������"
-#: mail/mail-ops.c:2008
+#: mail/mail-ops.c:1998
#, c-format
msgid "Display message UID \"%s\""
msgstr "�������� UID ��������� \"%s\""
-#: mail/mail-ops.c:2011
+#: mail/mail-ops.c:2001
msgid "Clear message display"
msgstr "�������� ����������� ���������"
-#: mail/mail-ops.c:2124
+#: mail/mail-ops.c:2114
#, c-format
msgid "Opening messages from folder \"%s\""
msgstr "�������� ��������� �� ����� \"%s\""
-#: mail/mail-ops.c:2127
+#: mail/mail-ops.c:2117
#, c-format
msgid "Open messages from \"%s\""
msgstr "������� ��������� �� \"%s\""
-#: mail/mail-ops.c:2231
+#: mail/mail-ops.c:2221
#, c-format
msgid "Loading %s Folder"
msgstr "�������� ����� %s"
-#: mail/mail-ops.c:2233
+#: mail/mail-ops.c:2223
#, c-format
msgid "Load %s Folder"
msgstr "��������� ����� %s"
-#: mail/mail-ops.c:2300
+#: mail/mail-ops.c:2290
#, c-format
msgid "Viewing messages from folder \"%s\""
msgstr "�������� ��������� �� ����� \"%s\""
-#: mail/mail-ops.c:2303
+#: mail/mail-ops.c:2293
#, c-format
msgid "View messages from \"%s\""
msgstr "����������� ��������� �� \"%s\""
-#: mail/mail-ops.c:2329 mail/mail-ops.c:2447 mail/mail-ops.c:2577
+#: mail/mail-ops.c:2319 mail/mail-ops.c:2436
#, c-format
msgid "Retrieving message %d of %d (uid \"%s\")"
msgstr "����������� ��������� %d �� %d (uid \"%s\")"
-#: mail/mail-ops.c:2419
-#, c-format
-msgid "Viewing message sources from folder \"%s\""
-msgstr "�������� ���������� ��������� �� ����� \"%s\""
-
-#: mail/mail-ops.c:2422
-#, c-format
-msgid "View message sources from \"%s\""
-msgstr "����������� ��������� ��������� �� \"%s\""
-
-#: mail/mail-ops.c:2550
+#: mail/mail-ops.c:2409
#, c-format
msgid "Saving messages from folder \"%s\""
msgstr "���������� ��������� �� ����� \"%s\""
-#: mail/mail-ops.c:2553
+#: mail/mail-ops.c:2412
#, c-format
msgid "Saving messages from \"%s\""
msgstr "���������� ��������� �� \"%s\""
@@ -4891,14 +4605,10 @@ msgstr "���������� ��������� �� \"%s\""
msgid "Cancel"
msgstr "������"
-#: mail/mail-summary.c:95 mail/mail-threads.c:703
+#: mail/mail-summary.c:104 mail/mail-threads.c:703
msgid "Incomplete message written on pipe!"
msgstr "�������� ��������� �������� � �����!"
-#: mail/mail-summary.c:368
-msgid "Mailbox summary"
-msgstr "���� �� ��������� �����"
-
#: mail/mail-threads.c:301
#, c-format
msgid ""
@@ -4933,18 +4643,18 @@ msgstr "���������� ������� ���� �������."
msgid "User cancelled query."
msgstr "������������ ������� ������."
-#: mail/mail-tools.c:187
+#: mail/mail-tools.c:189
#, c-format
msgid "Couldn't create temporary mbox `%s': %s"
msgstr "�� ������� ������� ��������� mbox \"%s\": %s"
#. Get all uids of source
-#: mail/mail-tools.c:237
+#: mail/mail-tools.c:239
#, c-format
msgid "Examining %s"
msgstr "�������� %s"
-#: mail/mail-tools.c:267
+#: mail/mail-tools.c:269
#, c-format
msgid ""
"Could not read UID cache file \"%s\". You may receive duplicate messages."
@@ -4953,41 +4663,41 @@ msgstr ""
"���������."
#. Info
-#: mail/mail-tools.c:288
+#: mail/mail-tools.c:290
#, c-format
msgid "Retrieving message %d of %d"
msgstr "��������� ��������� %d �� %d"
#. Append it to dest
-#: mail/mail-tools.c:301
+#: mail/mail-tools.c:303
#, c-format
msgid "Writing message %d of %d"
msgstr "������ ��������� %d �� %d"
-#: mail/mail-tools.c:330
+#: mail/mail-tools.c:332
#, c-format
msgid "Saving changes to %s"
msgstr "���������� ��������� � %s"
-#: mail/mail-tools.c:367
+#: mail/mail-tools.c:369
#, c-format
msgid "[%s] (forwarded message)"
msgstr "[%s] (����������� ���������)"
-#: mail/mail-tools.c:377
+#: mail/mail-tools.c:379
msgid "Fwd: (no subject)"
msgstr "������.: (��� ����)"
-#: mail/mail-tools.c:416
+#: mail/mail-tools.c:418
#, c-format
msgid "Forwarded message - %s"
msgstr "����������� ��������� - %s"
-#: mail/mail-tools.c:418
+#: mail/mail-tools.c:420
msgid "Forwarded message (no subject)"
msgstr "����������� ��������� (��� ����)"
-#: mail/mail-tools.c:521
+#: mail/mail-tools.c:523
#, c-format
msgid ""
"Cannot open location `%s':\n"
@@ -5000,7 +4710,7 @@ msgstr ""
msgid "VFolders"
msgstr "����.�����"
-#: mail/mail-vfolder.c:292
+#: mail/mail-vfolder.c:296
msgid "New VFolder"
msgstr "����� ����.�����"
@@ -5030,26 +4740,18 @@ msgstr "����������� ���������� ���������"
msgid "Delete this message"
msgstr "������� ��� ���������"
-#: mail/message-list.c:509
+#: mail/message-list.c:543
msgid "Unseen"
msgstr "�������������"
-#: mail/message-list.c:2054
+#: mail/message-list.c:2100
msgid "Rebuilding message view"
msgstr "������������ ���� ���������"
-#: mail/message-list.c:2056
+#: mail/message-list.c:2102
msgid "Rebuild message view"
msgstr "����������� ���� ���������"
-#: mail/message-thread.c:583
-msgid "Threading message list"
-msgstr "������ �������� ���������"
-
-#: mail/message-thread.c:585
-msgid "Thread message list"
-msgstr "������ ������ ���������"
-
#: mail/subscribe-dialog.c:139
msgid "Display folders starting with:"
msgstr "�������� ����� ������������ �:"
@@ -5084,11 +4786,11 @@ msgstr "��������� �� ����� \"%s\""
msgid "Unsubscribe from folder \"%s\""
msgstr "���������� �� ����� \"%s\""
-#: shell/e-setup.c:110 shell/e-setup.c:179
+#: shell/e-setup.c:112 shell/e-setup.c:183
msgid "Evolution installation"
msgstr "��������� Evolution"
-#: shell/e-setup.c:114
+#: shell/e-setup.c:116
msgid ""
"This new version of Evolution needs to install additional files\n"
"into your personal Evolution directory"
@@ -5096,30 +4798,30 @@ msgstr ""
"���� ����� ������ Evolution ��������� ���������� �������������� �����\n"
"� ��� ������ ������� Evolution"
-#: shell/e-setup.c:115
+#: shell/e-setup.c:117
msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
msgstr ""
"���������� ������� \"��\", ����� ���������� ����� ��� \"������\" ��� ������."
-#: shell/e-setup.c:156
+#: shell/e-setup.c:155
msgid "Could not update files correctly"
msgstr "���������� �������� ����� ���������"
-#: shell/e-setup.c:160 shell/e-setup.c:220
+#: shell/e-setup.c:158 shell/e-setup.c:224
msgid "Evolution files successfully installed."
msgstr "����� Evolution ������� �����������."
-#: shell/e-setup.c:183
+#: shell/e-setup.c:187
msgid "This seems to be the first time you run Evolution."
msgstr "������ �� ��������� \"��������\" � ������."
-#: shell/e-setup.c:184
+#: shell/e-setup.c:188
msgid "Please click \"OK\" to install the Evolution user files under"
msgstr ""
"���������� ������� \"��\", ����� ���������� ���������������� ����� "
"\"��������\" �"
-#: shell/e-setup.c:201
+#: shell/e-setup.c:205
#, c-format
msgid ""
"Cannot create the directory\n"
@@ -5130,7 +4832,7 @@ msgstr ""
"%s\n"
"������: %s"
-#: shell/e-setup.c:216
+#: shell/e-setup.c:220
#, c-format
msgid ""
"Cannot copy files into\n"
@@ -5139,7 +4841,7 @@ msgstr ""
"���������� ����������� ����� �\n"
"\"%s\"."
-#: shell/e-setup.c:241
+#: shell/e-setup.c:245
#, c-format
msgid ""
"The file `%s' is not a directory.\n"
@@ -5150,7 +4852,7 @@ msgstr ""
"����������, ����������� ���, ����� ���������\n"
"���������� ����� ������������ Evolution."
-#: shell/e-setup.c:253
+#: shell/e-setup.c:257
#, c-format
msgid ""
"The directory `%s' exists but is not the\n"
@@ -5206,11 +4908,11 @@ msgstr "Bug-buddy �� ��� ������ � ����� $PATH."
msgid "Bug buddy could not be run."
msgstr "Bug-buddy �� ����� ���� �������."
-#: shell/e-shell-view-menu.c:169
+#: shell/e-shell-view-menu.c:172
msgid "Copyright 1999, 2000 Helix Code, Inc."
msgstr "Copyright 1999, 2000 Helix Code, Inc."
-#: shell/e-shell-view-menu.c:171
+#: shell/e-shell-view-menu.c:174
msgid ""
"Evolution is a suite of groupware applications\n"
"for mail, calendaring, and contact management\n"
@@ -5220,7 +4922,7 @@ msgstr ""
"������� ���������� � ���������� ���������� ���\n"
"��������� ������ � ����� GNOME."
-#: shell/e-shell-view-menu.c:332
+#: shell/e-shell-view-menu.c:335
msgid "Go to folder..."
msgstr "������� � �����..."
@@ -5232,8 +4934,10 @@ msgstr "(����� �� ��������)"
msgid "Folders"
msgstr "�����"
-#: shell/e-shell-view.c:1018 widgets/misc/e-dateedit.c:212
-#: widgets/misc/e-dateedit.c:371 widgets/misc/e-dateedit.c:1171
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
+#: shell/e-shell-view.c:1018 widgets/misc/e-dateedit.c:422
+#: widgets/misc/e-dateedit.c:1331 widgets/misc/e-dateedit.c:1446
msgid "None"
msgstr "���"
@@ -5247,7 +4951,7 @@ msgstr "�������� - %s"
msgid "Cannot set up local storage -- %s"
msgstr "���������� ���������� ��������� ��������� -- %s"
-#: shell/e-shell.c:1157
+#: shell/e-shell.c:1160
#, c-format
msgid ""
"Ooops! The view for `%s' have died unexpectedly. :-(\n"
@@ -5606,7 +5310,7 @@ msgstr "�������� 1 ������"
msgid "Show the working week"
msgstr "�������� ������� ������"
-#: ui/evolution-calendar.xml.h:31 widgets/misc/e-dateedit.c:365
+#: ui/evolution-calendar.xml.h:31 widgets/misc/e-dateedit.c:414
msgid "Today"
msgstr "�������"
@@ -6230,6 +5934,10 @@ msgstr "����.����� �� �����������"
msgid "VFolder on _Recipients"
msgstr "����.����� �� ����������"
+#: ui/evolution-mail.xml.h:45
+msgid "View Raw Message Source"
+msgstr "�������� ��������� ������ ���������"
+
#: ui/evolution-mail.xml.h:46
msgid "_Apply Filters"
msgstr "��������� �������"
@@ -6283,18 +5991,22 @@ msgid "_Print Message"
msgstr "������ ���������"
#: ui/evolution-mail.xml.h:60
+msgid "_Source"
+msgstr "��������"
+
+#: ui/evolution-mail.xml.h:61
msgid "_Threaded"
msgstr "��������"
-#: ui/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:62
msgid "_Undelete"
msgstr "������������"
-#: ui/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:63
msgid "_VFolder on Subject"
msgstr "����.����� �� ����"
-#: ui/evolution-mail.xml.h:63
+#: ui/evolution-mail.xml.h:64
msgid "_Virtual Folder Editor..."
msgstr "�������� ����������� �����..."
@@ -6633,24 +6345,22 @@ msgstr "%B %Y"
msgid "..."
msgstr "..."
+#: widgets/misc/e-dateedit.c:408
+msgid "Now"
+msgstr "������"
+
#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:234 widgets/misc/e-dateedit.c:673
-#: widgets/misc/e-dateedit.c:766 widgets/misc/e-dateedit.c:811
-#: widgets/misc/e-dateedit.c:1127
+#: widgets/misc/e-dateedit.c:1249 widgets/misc/e-dateedit.c:1308
+#: widgets/misc/e-dateedit.c:1487
msgid "%H:%M"
msgstr "%H:%M"
#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:237 widgets/misc/e-dateedit.c:676
-#: widgets/misc/e-dateedit.c:769 widgets/misc/e-dateedit.c:814
-#: widgets/misc/e-dateedit.c:1130
+#: widgets/misc/e-dateedit.c:1252 widgets/misc/e-dateedit.c:1311
+#: widgets/misc/e-dateedit.c:1490
msgid "%I:%M %p"
msgstr "%I:%M %p"
-#: widgets/misc/e-dateedit.c:359
-msgid "Now"
-msgstr "������"
-
#: widgets/shortcut-bar/e-group-bar.c:632
#, c-format
msgid "Group %i"