aboutsummaryrefslogtreecommitdiffstats
path: root/po
diff options
context:
space:
mode:
authorValek Frob <frob@src.gnome.org>2001-05-08 17:18:45 +0800
committerValek Frob <frob@src.gnome.org>2001-05-08 17:18:45 +0800
commit15ec84558afc27acd6b43c1d5911a92cc710e265 (patch)
tree66c4e0220bf4c155353deb13ff5ec1474d2a49a9 /po
parent25db7ba9d8ff81e519d3c2cd43b47b9497217382 (diff)
downloadgsoc2013-evolution-15ec84558afc27acd6b43c1d5911a92cc710e265.tar
gsoc2013-evolution-15ec84558afc27acd6b43c1d5911a92cc710e265.tar.gz
gsoc2013-evolution-15ec84558afc27acd6b43c1d5911a92cc710e265.tar.bz2
gsoc2013-evolution-15ec84558afc27acd6b43c1d5911a92cc710e265.tar.lz
gsoc2013-evolution-15ec84558afc27acd6b43c1d5911a92cc710e265.tar.xz
gsoc2013-evolution-15ec84558afc27acd6b43c1d5911a92cc710e265.tar.zst
gsoc2013-evolution-15ec84558afc27acd6b43c1d5911a92cc710e265.zip
Updated russian translation.
svn path=/trunk/; revision=9716
Diffstat (limited to 'po')
-rw-r--r--po/ChangeLog4
-rw-r--r--po/ru.po2783
2 files changed, 1497 insertions, 1290 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index d05ca3891e..f6bbeacd2b 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-08 Valek Filippov <frob@df.ru>
+
+ * ru.po: updated russian translation.
+
2001-05-08 Jarkko Ranta <jjranta@cc.joensuu.fi>
* fi.po: Updated Finnish translation.
diff --git a/po/ru.po b/po/ru.po
index afc38e7fc5..378b4a4d25 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4,19 +4,19 @@
msgid ""
msgstr ""
"Project-Id-Version: E-volution\n"
-"POT-Creation-Date: 2001-04-24 15:26+0400\n"
-"PO-Revision-Date: 2001-04-24 15:45+04:00\n"
+"POT-Creation-Date: 2001-05-08 12:41+0400\n"
+"PO-Revision-Date: 2001-05-08 13:15+04:00\n"
"Last-Translator: Valek Filippov <frob@df.ru>\n"
"Language-Team: Russian <ru@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=koi8-r\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: addressbook/backend/ebook/e-card.c:3209
+#: addressbook/backend/ebook/e-card.c:3278
msgid "Card: "
msgstr "��������: "
-#: addressbook/backend/ebook/e-card.c:3211
+#: addressbook/backend/ebook/e-card.c:3280
msgid ""
"\n"
"Name: "
@@ -24,7 +24,7 @@ msgstr ""
"\n"
"���: "
-#: addressbook/backend/ebook/e-card.c:3212
+#: addressbook/backend/ebook/e-card.c:3281
msgid ""
"\n"
" Prefix: "
@@ -32,7 +32,7 @@ msgstr ""
"\n"
" �������: "
-#: addressbook/backend/ebook/e-card.c:3213
+#: addressbook/backend/ebook/e-card.c:3282
msgid ""
"\n"
" Given: "
@@ -40,7 +40,7 @@ msgstr ""
"\n"
" ���: "
-#: addressbook/backend/ebook/e-card.c:3214
+#: addressbook/backend/ebook/e-card.c:3283
msgid ""
"\n"
" Additional: "
@@ -48,7 +48,7 @@ msgstr ""
"\n"
" ����������: "
-#: addressbook/backend/ebook/e-card.c:3215
+#: addressbook/backend/ebook/e-card.c:3284
msgid ""
"\n"
" Family: "
@@ -56,7 +56,7 @@ msgstr ""
"\n"
" �������: "
-#: addressbook/backend/ebook/e-card.c:3216
+#: addressbook/backend/ebook/e-card.c:3285
msgid ""
"\n"
" Suffix: "
@@ -64,7 +64,7 @@ msgstr ""
"\n"
" �������: "
-#: addressbook/backend/ebook/e-card.c:3230
+#: addressbook/backend/ebook/e-card.c:3299
msgid ""
"\n"
"Birth Date: "
@@ -72,7 +72,7 @@ msgstr ""
"\n"
"���� ��������: "
-#: addressbook/backend/ebook/e-card.c:3241
+#: addressbook/backend/ebook/e-card.c:3310
msgid ""
"\n"
"Address:"
@@ -80,7 +80,7 @@ msgstr ""
"\n"
"�����:"
-#: addressbook/backend/ebook/e-card.c:3243
+#: addressbook/backend/ebook/e-card.c:3312
msgid ""
"\n"
" Postal Box: "
@@ -88,7 +88,7 @@ msgstr ""
"\n"
"�������� ����: "
-#: addressbook/backend/ebook/e-card.c:3244
+#: addressbook/backend/ebook/e-card.c:3313
msgid ""
"\n"
" Ext: "
@@ -96,7 +96,7 @@ msgstr ""
"\n"
" ����.: "
-#: addressbook/backend/ebook/e-card.c:3245
+#: addressbook/backend/ebook/e-card.c:3314
msgid ""
"\n"
" Street: "
@@ -104,7 +104,7 @@ msgstr ""
"\n"
" �����: "
-#: addressbook/backend/ebook/e-card.c:3246
+#: addressbook/backend/ebook/e-card.c:3315
msgid ""
"\n"
" City: "
@@ -112,7 +112,7 @@ msgstr ""
"\n"
" �����: "
-#: addressbook/backend/ebook/e-card.c:3247
+#: addressbook/backend/ebook/e-card.c:3316
msgid ""
"\n"
" Region: "
@@ -120,7 +120,7 @@ msgstr ""
"\n"
" �������: "
-#: addressbook/backend/ebook/e-card.c:3248
+#: addressbook/backend/ebook/e-card.c:3317
msgid ""
"\n"
" Postal Code: "
@@ -128,7 +128,7 @@ msgstr ""
"\n"
" �������� ���: "
-#: addressbook/backend/ebook/e-card.c:3249
+#: addressbook/backend/ebook/e-card.c:3318
msgid ""
"\n"
" Country: "
@@ -136,7 +136,7 @@ msgstr ""
"\n"
" ������: "
-#: addressbook/backend/ebook/e-card.c:3262
+#: addressbook/backend/ebook/e-card.c:3331
msgid ""
"\n"
"Delivery Label: "
@@ -144,7 +144,7 @@ msgstr ""
"\n"
"����� ��� ��������:"
-#: addressbook/backend/ebook/e-card.c:3274
+#: addressbook/backend/ebook/e-card.c:3343
msgid ""
"\n"
"Telephones:\n"
@@ -152,7 +152,7 @@ msgstr ""
"\n"
"��������:\n"
-#: addressbook/backend/ebook/e-card.c:3277
+#: addressbook/backend/ebook/e-card.c:3346
msgid ""
"\n"
"Telephone:"
@@ -160,7 +160,7 @@ msgstr ""
"\n"
"�������:"
-#: addressbook/backend/ebook/e-card.c:3301
+#: addressbook/backend/ebook/e-card.c:3370
msgid ""
"\n"
"E-mail:\n"
@@ -168,7 +168,7 @@ msgstr ""
"\n"
"��.�����:\n"
-#: addressbook/backend/ebook/e-card.c:3304
+#: addressbook/backend/ebook/e-card.c:3373
msgid ""
"\n"
"E-mail:"
@@ -176,7 +176,7 @@ msgstr ""
"\n"
"��.�����:"
-#: addressbook/backend/ebook/e-card.c:3323
+#: addressbook/backend/ebook/e-card.c:3392
msgid ""
"\n"
"Mailer: "
@@ -184,7 +184,7 @@ msgstr ""
"\n"
"�������� ������: "
-#: addressbook/backend/ebook/e-card.c:3329
+#: addressbook/backend/ebook/e-card.c:3398
msgid ""
"\n"
"Time Zone: "
@@ -192,7 +192,7 @@ msgstr ""
"\n"
"������� ����: "
-#: addressbook/backend/ebook/e-card.c:3337
+#: addressbook/backend/ebook/e-card.c:3406
msgid ""
"\n"
"Geo Location: "
@@ -200,7 +200,7 @@ msgstr ""
"\n"
"�����.���������: "
-#: addressbook/backend/ebook/e-card.c:3341
+#: addressbook/backend/ebook/e-card.c:3410
msgid ""
"\n"
"Business Role: "
@@ -208,7 +208,7 @@ msgstr ""
"\n"
"���������: "
-#: addressbook/backend/ebook/e-card.c:3353
+#: addressbook/backend/ebook/e-card.c:3422
msgid ""
"\n"
"Org: "
@@ -216,7 +216,7 @@ msgstr ""
"\n"
"���.:"
-#: addressbook/backend/ebook/e-card.c:3354
+#: addressbook/backend/ebook/e-card.c:3423
msgid ""
"\n"
" Name: "
@@ -224,7 +224,7 @@ msgstr ""
"\n"
" ���: "
-#: addressbook/backend/ebook/e-card.c:3355
+#: addressbook/backend/ebook/e-card.c:3424
msgid ""
"\n"
" Unit: "
@@ -232,7 +232,7 @@ msgstr ""
"\n"
"�������: "
-#: addressbook/backend/ebook/e-card.c:3356
+#: addressbook/backend/ebook/e-card.c:3425
msgid ""
"\n"
" Unit2: "
@@ -240,7 +240,7 @@ msgstr ""
"\n"
"�������2: "
-#: addressbook/backend/ebook/e-card.c:3357
+#: addressbook/backend/ebook/e-card.c:3426
msgid ""
"\n"
" Unit3: "
@@ -248,7 +248,7 @@ msgstr ""
"\n"
"�������3: "
-#: addressbook/backend/ebook/e-card.c:3358
+#: addressbook/backend/ebook/e-card.c:3427
msgid ""
"\n"
" Unit4: "
@@ -256,7 +256,7 @@ msgstr ""
"\n"
"�������4: "
-#: addressbook/backend/ebook/e-card.c:3362
+#: addressbook/backend/ebook/e-card.c:3431
msgid ""
"\n"
"Categories: "
@@ -264,7 +264,7 @@ msgstr ""
"\n"
"���������: "
-#: addressbook/backend/ebook/e-card.c:3363
+#: addressbook/backend/ebook/e-card.c:3432
msgid ""
"\n"
"Comment: "
@@ -282,7 +282,7 @@ msgstr ""
#.
#. add_SoundType (string, crd->sound.type);
#. }
-#: addressbook/backend/ebook/e-card.c:3376
+#: addressbook/backend/ebook/e-card.c:3445
msgid ""
"\n"
"Unique String: "
@@ -290,7 +290,7 @@ msgstr ""
"\n"
"���������� ������: "
-#: addressbook/backend/ebook/e-card.c:3379
+#: addressbook/backend/ebook/e-card.c:3448
msgid ""
"\n"
"Public Key: "
@@ -298,6 +298,19 @@ msgstr ""
"\n"
"��������� ����: "
+#: addressbook/backend/ebook/e-card.c:3709
+msgid "Multiple VCards"
+msgstr "��������� VCards"
+
+#: addressbook/backend/ebook/e-card.c:3717
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard ��� %s"
+
+#: addressbook/backend/ebook/e-destination.c:232
+msgid "???"
+msgstr "???"
+
#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_GnomeCard_Importer.oaf.in.h:1
msgid "Factory to import GnomeCard files into Evolution."
msgstr "������� ��� ������� ������ GnomeCard � Evolution."
@@ -311,10 +324,10 @@ msgstr "����������� ����� GnomeCard � Evolution."
#: addressbook/backend/ebook/test-client-list.c:23
#: addressbook/backend/ebook/test-client.c:33
#: addressbook/conduit/address-conduit.c:1092
-#: addressbook/gui/component/addressbook-factory.c:43
+#: addressbook/gui/component/addressbook-factory.c:42
#: calendar/conduits/calendar/calendar-conduit.c:1151
#: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/alarm-notify/notify-main.c:99 calendar/gui/main.c:57
+#: calendar/gui/alarm-notify/notify-main.c:98 calendar/gui/main.c:57
msgid "Could not initialize Bonobo"
msgstr "�� ������� ���������������� Bonobo"
@@ -442,8 +455,9 @@ msgid "_Company:"
msgstr "��������:"
#: addressbook/contact-editor/contact-editor.glade.h:23
-#: mail/mail-config.glade.h:75 ui/evolution-event-editor.xml.h:57
-#: ui/evolution-mail.xml.h:93 ui/evolution-task-editor-dialog.xml.h:69
+#: mail/folder-browser.c:640 mail/mail-config.glade.h:75
+#: ui/evolution-event-editor.xml.h:57 ui/evolution-mail.xml.h:98
+#: ui/evolution-task-editor-dialog.xml.h:69
msgid "_Delete"
msgstr "�������"
@@ -491,10 +505,6 @@ msgstr "������(�):"
msgid "_This is the mailing address"
msgstr "��� �������� �����"
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid "Delete Contact?"
-msgstr "������� �������?"
-
#: addressbook/contact-editor/e-contact-editor.c:603
msgid "This contact belongs to these categories:"
msgstr "���� ������� ����������� ��������� ����������:"
@@ -555,7 +565,7 @@ msgstr "���������"
#: addressbook/contact-editor/e-contact-editor.c:1254
#: addressbook/contact-editor/e-contact-editor.c:1312
-#: calendar/gui/e-meeting-dialog.glade.h:14 mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:40
msgid "Other"
msgstr "������"
@@ -597,6 +607,10 @@ msgstr "��.����� 2"
msgid "Email 3"
msgstr "��.����� 3"
+#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+msgid "Delete Contact?"
+msgstr "������� �������?"
+
#: addressbook/contact-editor/e-contact-quick-add.c:233
msgid "Contact Quick-Add"
msgstr "������� ���������� ��������"
@@ -726,72 +740,70 @@ msgstr "�������:"
msgid "_Title:"
msgstr "���������:"
-#: addressbook/gui/component/addressbook.c:241
+#: addressbook/gui/component/addressbook.c:242
msgid "As _Minicards"
msgstr "��� ������������"
-#: addressbook/gui/component/addressbook.c:247
+#: addressbook/gui/component/addressbook.c:248
#: ui/evolution-addressbook.xml.h:1
msgid "As _Table"
msgstr "��� �������"
-#: addressbook/gui/component/addressbook.c:399
+#: addressbook/gui/component/addressbook.c:408
#, c-format
msgid "Enter password for %s"
msgstr "������� ������ ��� %s"
-#: addressbook/gui/component/addressbook.c:427
+#: addressbook/gui/component/addressbook.c:436
msgid "Unable to open addressbook"
msgstr "�� ������� ������� �������� �����"
-#: addressbook/gui/component/addressbook.c:432
+#: addressbook/gui/component/addressbook.c:443
msgid ""
"We were unable to open this addressbook. This either\n"
-"means you have entered an incorrect URI, or have tried\n"
-"to access an LDAP server and don't have LDAP support\n"
-"compiled in. If you've entered a URI, check the URI for\n"
-"correctness and reenter. If not, you probably have\n"
-"attempted to access an LDAP server. If you wish to be\n"
-"able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install Evolution.\n"
+"means you have entered an incorrect URI, or the LDAP server\n"
+"is down"
msgstr ""
"�� ������� ������� ��� �������� �����. ��� ������,\n"
-"��� ���� �� ����� ������������ URI, ���� ��������\n"
-"���������� � LDAP ������� � �� ������ ����������\n"
-"��������� LDAP. ���� �� ������� URI, ��������� ���\n"
-"������������ � �����������. ���� ���, �� ��������\n"
-"�������� ���������� � LDAP �������. ���� �� ������\n"
-"������������ LDAP, ��� ���� ������� � ���������� \n"
-"OpenLDAP � ����������������� � ���������� evolution.\n"
-
-#: addressbook/gui/component/addressbook.c:555
-msgid "Show All"
-msgstr "�������� ���"
+"��� ���� �� ����� ������������ URI, ���� LDAP\n"
+"������ �� ��������"
-#: addressbook/gui/component/addressbook.c:557
-msgid "Advanced..."
-msgstr "�����������..."
+#: addressbook/gui/component/addressbook.c:448
+msgid ""
+"This version of Evolution does not have LDAP support\n"
+"compiled in to it. If you want to use LDAP in Evolution\n"
+"you must compile the program from the CVS sources after\n"
+"retrieving OpenLDAP from the link below.\n"
+msgstr ""
+"��� ������ Evolution �� ����� ���������� ��������� LDAP.\n"
+"���� �� ������ ������������ LDAP � Evolution, �� ������\n"
+"����������������� ��������� �� �������� ������� � CVS �����\n"
+"��������� OpenLDAP ����������� �� �����ģ���� ���� ������.\n"
-#: addressbook/gui/component/addressbook.c:587 calendar/gui/gnome-cal.c:236
+#: addressbook/gui/component/addressbook.c:456
+msgid ""
+"We were unable to open this addressbook. Please check that the\n"
+"path exists and that you have permission to access it."
+msgstr ""
+"�� ������� ������� ��� �������� �����. ���������, ��� ���� ����������\n"
+"� ��� � ��� ���� ����������� ����� �������."
+
+#: addressbook/gui/component/addressbook.c:607 calendar/gui/gnome-cal.c:233
msgid "Any field contains"
msgstr "����� ���� ��������"
-#: addressbook/gui/component/addressbook.c:588
+#: addressbook/gui/component/addressbook.c:608
msgid "Name contains"
msgstr "��� ��������"
-#: addressbook/gui/component/addressbook.c:589
+#: addressbook/gui/component/addressbook.c:609
msgid "Email contains"
msgstr "��.����� ��������"
-#: addressbook/gui/component/addressbook.c:732
+#: addressbook/gui/component/addressbook.c:752
msgid "The URI that the Folder Browser will display"
msgstr "URI, ������� ����� ���������� ��������� ��������� �����"
-#: addressbook/gui/component/addressbook-storage.c:99
-msgid "Other Contacts"
-msgstr "������ ��������"
-
#: addressbook/gui/component/addressbook-config.c:148
msgid "LDAP Server"
msgstr "������ LDAP"
@@ -938,13 +950,12 @@ msgstr "��������� �������� ����"
#: addressbook/gui/component/addressbook-config.glade.h:3
#: addressbook/gui/widgets/e-addressbook-view.c:578
-#: addressbook/gui/widgets/e-minicard.c:673
#: calendar/gui/e-meeting-dialog.glade.h:8
#: calendar/gui/event-editor-dialog.glade.h:9 filter/filter.glade.h:2
-#: filter/libfilter-i18n.h:11 mail/folder-browser.c:616
-#: mail/mail-config.glade.h:19 mail/message-browser.c:190
-#: ui/evolution-addressbook.xml.h:3 ui/evolution-event-editor.xml.h:17
-#: ui/evolution-mail.xml.h:11 ui/evolution-task-editor-dialog.xml.h:18
+#: filter/libfilter-i18n.h:11 mail/mail-config.glade.h:19
+#: mail/message-browser.c:203 ui/evolution-addressbook.xml.h:3
+#: ui/evolution-event-editor.xml.h:17 ui/evolution-mail.xml.h:11
+#: ui/evolution-task-editor-dialog.xml.h:18
msgid "Delete"
msgstr "�������"
@@ -962,6 +973,10 @@ msgstr "���"
msgid "URI"
msgstr "URI"
+#: addressbook/gui/component/addressbook-storage.c:99
+msgid "Other Contacts"
+msgstr "������ ��������"
+
#: addressbook/gui/component/e-address-widget.c:365
msgid "Disable Queries"
msgstr "��������� �������"
@@ -1026,14 +1041,6 @@ msgstr "������� ���������� �������� ����� Evolution."
msgid "Factory for the sample Addressbook control"
msgstr "�������� ����� ��� �������� �����"
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-msgid "Evolution's addressbook name selection interface."
-msgstr "��������� ������ ����� � �������� ����� Evolution."
-
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
-msgid "Factory for the Addressbook's name selection interface"
-msgstr ""
-
#: addressbook/gui/component/select-names/e-select-names-popup.c:131
#: composer/e-msg-composer-attachment-bar.c:468 filter/filter-filter.c:401
#: filter/filter-rule.c:549 filter/filter.glade.h:9
@@ -1045,6 +1052,14 @@ msgstr "�������"
msgid "Remove All"
msgstr "������� ���"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+msgid "Evolution's addressbook name selection interface."
+msgstr "��������� ������ ����� � �������� ����� Evolution."
+
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+msgid "Factory for the Addressbook's name selection interface"
+msgstr ""
+
#: addressbook/gui/component/select-names/select-names.glade.h:1
msgid "Find..."
msgstr "�����..."
@@ -1062,6 +1077,7 @@ msgid "Select name from:"
msgstr "������� ����� ��:"
#: addressbook/gui/search/e-addressbook-search-dialog.c:158
+#: mail/mail-search.c:148
msgid "Search"
msgstr "�����"
@@ -1175,31 +1191,24 @@ msgstr "z"
#: addressbook/gui/widgets/e-addressbook-view.c:513
#: addressbook/gui/widgets/e-addressbook-view.c:573
-#: addressbook/gui/widgets/e-minicard.c:466
-#: addressbook/gui/widgets/e-minicard.c:668
msgid "Save as VCard"
msgstr "��������� ��� VCard"
#: addressbook/gui/widgets/e-addressbook-view.c:574
-#: addressbook/gui/widgets/e-minicard.c:669
msgid "Send contact to other"
msgstr "������� ������� �������"
#: addressbook/gui/widgets/e-addressbook-view.c:575
-#: addressbook/gui/widgets/e-minicard.c:670
msgid "Send message to contact"
msgstr "������� ��������� � ��������"
-#: addressbook/gui/widgets/e-addressbook-view.c:576
-#: addressbook/gui/widgets/e-minicard.c:671 mail/folder-browser.c:591
-#: mail/message-browser.c:187 ui/evolution-addressbook.xml.h:9
-#: ui/evolution-calendar.xml.h:23 ui/evolution-mail.xml.h:51
-#: ui/evolution-tasks.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-view.c:576 mail/message-browser.c:200
+#: ui/evolution-addressbook.xml.h:9 ui/evolution-calendar.xml.h:23
+#: ui/evolution-mail.xml.h:55 ui/evolution-tasks.xml.h:4
msgid "Print"
msgstr "������"
#: addressbook/gui/widgets/e-addressbook-view.c:577
-#: addressbook/gui/widgets/e-minicard.c:672
msgid "Print Envelope"
msgstr "������ ��������"
@@ -1323,7 +1332,7 @@ msgstr ""
msgid "Save in addressbook"
msgstr "��������� � �������� �����"
-#: addressbook/gui/widgets/e-minicard-view.c:166
+#: addressbook/gui/widgets/e-minicard-view.c:469
msgid ""
"\n"
"\n"
@@ -1525,6 +1534,48 @@ msgstr "���������� �������� ���� ���������� ��������� ������"
msgid "Could not read pilot's ToDo application block"
msgstr "���������� �������� ���� ���������� ������� ������"
+#: calendar/gui/alarm-notify/alarm-queue.c:586
+#: calendar/gui/alarm-notify/alarm-queue.c:885
+#: calendar/gui/alarm-notify/alarm-queue.c:941
+msgid "Reminder of your appointment at "
+msgstr "���������� ��� ���� ��������"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/dialogs/alarm-notify.glade.h:3
+msgid "Snooze"
+msgstr "�������� ���"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify/alarm-queue.c:890
+#: calendar/gui/alarm-notify/alarm-queue.c:945
+msgid "Ok"
+msgstr "Ok"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+msgid "Alarm notification service"
+msgstr ""
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+#, fuzzy
+msgid "Factory for the alarm notification service"
+msgstr "���������� ���������������� �������� ����� Evolution."
+
+#: calendar/gui/alarm-notify/notify-main.c:56
+#, c-format
+msgid ""
+"It is %s. The Unix time is %ld right now. We just thought you may like to "
+"know."
+msgstr "��� %s. ������ %ld. �� ������ ��������, ��� �� ������ ��� �����."
+
+#: calendar/gui/alarm-notify/notify-main.c:93 calendar/gui/main.c:52
+msgid "Could not initialize GNOME"
+msgstr "�� ������� ���������������� GNOME"
+
+#: calendar/gui/alarm-notify/notify-main.c:108
+#, fuzzy
+msgid "Could not create the alarm notify service factory"
+msgstr "�� ������� ������� ��������� �������: %s"
+
#: calendar/gui/calendar-commands.c:266
msgid "File not found"
msgstr "���� �� ������"
@@ -1544,24 +1595,24 @@ msgstr ""
"�� ������� ������� ���� ���������. ���������� ��������� ���� ��������� ORBit "
"� OAF."
-#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:895
+#: calendar/gui/calendar-model.c:360 calendar/gui/calendar-model.c:898
#: calendar/gui/e-calendar-table.c:330
msgid "Public"
msgstr "�����"
-#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:897
+#: calendar/gui/calendar-model.c:363 calendar/gui/calendar-model.c:900
#: calendar/gui/e-calendar-table.c:331
msgid "Private"
msgstr "������"
-#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:899
+#: calendar/gui/calendar-model.c:366 calendar/gui/calendar-model.c:902
#: calendar/gui/e-calendar-table.c:332
msgid "Confidential"
msgstr "����������������"
-#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1606
-#: calendar/gui/event-editor.c:1633
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: calendar/gui/calendar-model.c:369 calendar/gui/event-editor.c:1601
+#: calendar/gui/event-editor.c:1628
+#: camel/providers/smtp/camel-smtp-transport.c:221
msgid "Unknown"
msgstr "�����������"
@@ -1581,71 +1632,71 @@ msgstr "�"
msgid "W"
msgstr "�"
-#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1063
+#: calendar/gui/calendar-model.c:497 calendar/gui/calendar-model.c:1066
#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:690
+#: calendar/gui/e-calendar-table.c:352 mail/message-list.c:694
msgid "High"
msgstr "�������"
-#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1065
-#: calendar/gui/calendar-model.c:1569
+#: calendar/gui/calendar-model.c:499 calendar/gui/calendar-model.c:1068
+#: calendar/gui/calendar-model.c:1574
#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:689
+#: calendar/gui/e-calendar-table.c:353 mail/message-list.c:693
msgid "Normal"
msgstr "����������"
-#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1067
+#: calendar/gui/calendar-model.c:501 calendar/gui/calendar-model.c:1070
#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:688
+#: calendar/gui/e-calendar-table.c:354 mail/message-list.c:692
msgid "Low"
msgstr "������"
-#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1119
+#: calendar/gui/calendar-model.c:537 calendar/gui/calendar-model.c:1122
#: calendar/gui/e-calendar-table.c:406
msgid "Transparent"
msgstr "����������"
-#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1121
+#: calendar/gui/calendar-model.c:540 calendar/gui/calendar-model.c:1124
#: calendar/gui/e-calendar-table.c:405
msgid "Opaque"
msgstr "������������"
-#: calendar/gui/calendar-model.c:635 calendar/gui/calendar-model.c:1173
+#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1176
#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
#: calendar/gui/e-calendar-table.c:426
msgid "Not Started"
msgstr "�� ������"
-#: calendar/gui/calendar-model.c:638 calendar/gui/calendar-model.c:1175
+#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1178
#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
#: calendar/gui/e-calendar-table.c:427
msgid "In Progress"
msgstr "� ��������"
-#: calendar/gui/calendar-model.c:641 calendar/gui/calendar-model.c:1177
+#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1180
#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
#: calendar/gui/e-calendar-table.c:428
msgid "Completed"
msgstr "���������"
-#: calendar/gui/calendar-model.c:644 calendar/gui/calendar-model.c:1179
+#: calendar/gui/calendar-model.c:647 calendar/gui/calendar-model.c:1182
#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
-#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:550
-#: camel/camel-service.c:586
+#: calendar/gui/e-calendar-table.c:429 camel/camel-service.c:544
+#: camel/camel-service.c:580
msgid "Cancelled"
msgstr "��������"
#. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/calendar-model.c:791 e-util/e-time-utils.c:278
+#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:278
msgid "%a %m/%d/%Y %H:%M:%S"
msgstr "%a %m/%d/%Y %H:%M:%S"
#. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/calendar-model.c:794 e-util/e-time-utils.c:287
+#: calendar/gui/calendar-model.c:797 e-util/e-time-utils.c:287
msgid "%a %m/%d/%Y %I:%M:%S %p"
msgstr "%a %m/%d/%Y %I:%M:%S %p"
-#: calendar/gui/calendar-model.c:799
+#: calendar/gui/calendar-model.c:802
#, c-format
msgid ""
"The date must be entered in the format: \n"
@@ -1656,7 +1707,7 @@ msgstr ""
"\n"
"%s"
-#: calendar/gui/calendar-model.c:879
+#: calendar/gui/calendar-model.c:882
msgid ""
"The classification must be 'Public', 'Private', 'Confidential' or 'None'"
msgstr ""
@@ -1664,17 +1715,17 @@ msgstr ""
"��� \"�������\""
#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:893 calendar/gui/calendar-model.c:1117
-#: calendar/gui/calendar-model.c:1171 calendar/gui/e-calendar-table.c:329
+#: calendar/gui/calendar-model.c:896 calendar/gui/calendar-model.c:1120
+#: calendar/gui/calendar-model.c:1174 calendar/gui/e-calendar-table.c:329
#: calendar/gui/e-calendar-table.c:404 mail/mail-account-gui.c:973
#: mail/mail-accounts.c:120 mail/mail-accounts.c:164
-#: mail/mail-config.glade.h:37 shell/e-shell-view.c:1179
-#: widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:430
-#: widgets/misc/e-dateedit.c:1339 widgets/misc/e-dateedit.c:1454
+#: mail/mail-config.glade.h:37 shell/e-shell-view.c:1198
+#: widgets/misc/e-cell-date-edit.c:237 widgets/misc/e-dateedit.c:432
+#: widgets/misc/e-dateedit.c:1341 widgets/misc/e-dateedit.c:1456
msgid "None"
msgstr "���"
-#: calendar/gui/calendar-model.c:967
+#: calendar/gui/calendar-model.c:970
msgid ""
"The geographical position must be entered in the format: \n"
"\n"
@@ -1684,41 +1735,41 @@ msgstr ""
"\n"
"45.436845,125.862501"
-#: calendar/gui/calendar-model.c:1007
+#: calendar/gui/calendar-model.c:1010
msgid "The percent value must be between 0 and 100, inclusive"
msgstr "�������� �������� ������ ���� ����� 0 � 100, ������������"
-#: calendar/gui/calendar-model.c:1048
+#: calendar/gui/calendar-model.c:1051
msgid "The priority must be 'High', 'Normal', 'Low' or 'Undefined'."
msgstr ""
"��������� ������ ���� \"�������\", \"����������\", \"������\" ��� "
"\"��������������\"."
#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1061
+#: calendar/gui/calendar-model.c:1064
#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
#: calendar/gui/e-calendar-table.c:355
msgid "Undefined"
msgstr "��������������"
-#: calendar/gui/calendar-model.c:1102
+#: calendar/gui/calendar-model.c:1105
msgid "The transparency must be 'Transparent', 'Opaque', or 'None'."
msgstr ""
"������������ ������ ���� \"����������\", \"������������\" ��� \"�������\"."
-#: calendar/gui/calendar-model.c:1571
+#: calendar/gui/calendar-model.c:1576
msgid "Recurring"
msgstr "����������"
-#: calendar/gui/calendar-model.c:1573
+#: calendar/gui/calendar-model.c:1578
msgid "Assigned"
msgstr "���������"
-#: calendar/gui/calendar-model.c:1579
+#: calendar/gui/calendar-model.c:1584
msgid "Yes"
msgstr "��"
-#: calendar/gui/calendar-model.c:1579
+#: calendar/gui/calendar-model.c:1584
msgid "No"
msgstr "���"
@@ -1761,7 +1812,7 @@ msgstr "�������� �������"
#: calendar/gui/calendar-summary.c:690
msgid "Things to do"
-msgstr ""
+msgstr "�������"
#: calendar/gui/calendar-summary.c:721 calendar/gui/e-itip-control.glade.h:7
msgid "Loading Calendar"
@@ -1771,48 +1822,6 @@ msgstr "�������� ���������"
msgid "The URI that the calendar will display"
msgstr "URI, ������� ����� ���������� ���������"
-#: calendar/gui/alarm-notify/alarm-queue.c:586
-#: calendar/gui/alarm-notify/alarm-queue.c:885
-#: calendar/gui/alarm-notify/alarm-queue.c:941
-msgid "Reminder of your appointment at "
-msgstr "���������� ��� ���� ��������"
-
-#: calendar/gui/alarm-notify/alarm-queue.c:877
-#: calendar/gui/dialogs/alarm-notify.glade.h:3
-msgid "Snooze"
-msgstr "�������� ���"
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/alarm-notify/alarm-queue.c:890
-#: calendar/gui/alarm-notify/alarm-queue.c:945
-msgid "Ok"
-msgstr "Ok"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
-msgid "Alarm notification service"
-msgstr ""
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
-#, fuzzy
-msgid "Factory for the alarm notification service"
-msgstr "���������� ���������������� �������� ����� Evolution."
-
-#: calendar/gui/alarm-notify/notify-main.c:56
-#, c-format
-msgid ""
-"It is %s. The Unix time is %ld right now. We just thought you may like to "
-"know."
-msgstr ""
-
-#: calendar/gui/alarm-notify/notify-main.c:94 calendar/gui/main.c:52
-msgid "Could not initialize GNOME"
-msgstr "�� ������� ���������������� GNOME"
-
-#: calendar/gui/alarm-notify/notify-main.c:109
-#, fuzzy
-msgid "Could not create the alarm notify service factory"
-msgstr "�� ������� ������� ��������� �������: %s"
-
#: calendar/gui/dialogs/alarm-notify-dialog.c:189
msgid "Alarm on %A %b %d %Y %H:%M"
msgstr "������ �� %A %b %d %Y %H:%M"
@@ -1931,7 +1940,7 @@ msgid "Fri"
msgstr "���"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:484
+#: calendar/gui/event-editor.c:479
msgid "Friday"
msgstr "�������"
@@ -1960,7 +1969,7 @@ msgid "Mon"
msgstr "���"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/event-editor.c:480
+#: calendar/gui/event-editor.c:475
msgid "Monday"
msgstr "�����������"
@@ -1996,7 +2005,7 @@ msgid "Sat"
msgstr "���"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/event-editor.c:485
+#: calendar/gui/event-editor.c:480
msgid "Saturday"
msgstr "�������"
@@ -2021,7 +2030,7 @@ msgid "Sun"
msgstr "���"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/event-editor.c:486
+#: calendar/gui/event-editor.c:481
msgid "Sunday"
msgstr "�����������"
@@ -2034,7 +2043,7 @@ msgid "Thu"
msgstr "���"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/event-editor.c:483
+#: calendar/gui/event-editor.c:478
msgid "Thursday"
msgstr "�������"
@@ -2055,7 +2064,7 @@ msgid "Tue"
msgstr "���"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/event-editor.c:481
+#: calendar/gui/event-editor.c:476
msgid "Tuesday"
msgstr "�������"
@@ -2068,7 +2077,7 @@ msgid "Wed"
msgstr "���"
#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/event-editor.c:482
+#: calendar/gui/event-editor.c:477
msgid "Wednesday"
msgstr "�����"
@@ -2116,6 +2125,29 @@ msgstr "�� ������� ��� ������ ������� ��� ��������������� ���������� ������?"
msgid "Do you want to save changes?"
msgstr "������ ��������� ���������?"
+#: calendar/gui/dialogs/task-editor.c:709
+msgid "Edit Task"
+msgstr "������ �������"
+
+#: calendar/gui/dialogs/task-editor.c:714 calendar/gui/event-editor.c:382
+#, c-format
+msgid "Appointment - %s"
+msgstr "������� - %s"
+
+#: calendar/gui/dialogs/task-editor.c:717 calendar/gui/event-editor.c:385
+#, c-format
+msgid "Task - %s"
+msgstr "������� - %s"
+
+#: calendar/gui/dialogs/task-editor.c:720 calendar/gui/event-editor.c:388
+#, c-format
+msgid "Journal entry - %s"
+msgstr "���������� ������ - %s"
+
+#: calendar/gui/dialogs/task-editor.c:734 calendar/gui/event-editor.c:402
+msgid "No summary"
+msgstr "��� �����"
+
#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
#, no-c-format
msgid "% Comp_lete:"
@@ -2189,29 +2221,6 @@ msgstr "���������:"
msgid "_Status:"
msgstr "���������:"
-#: calendar/gui/dialogs/task-editor.c:707
-msgid "Edit Task"
-msgstr "������ �������"
-
-#: calendar/gui/dialogs/task-editor.c:713 calendar/gui/event-editor.c:382
-msgid "No summary"
-msgstr "��� �����"
-
-#: calendar/gui/dialogs/task-editor.c:719 calendar/gui/event-editor.c:388
-#, c-format
-msgid "Appointment - %s"
-msgstr "������� - %s"
-
-#: calendar/gui/dialogs/task-editor.c:722 calendar/gui/event-editor.c:391
-#, c-format
-msgid "Task - %s"
-msgstr "������� - %s"
-
-#: calendar/gui/dialogs/task-editor.c:725 calendar/gui/event-editor.c:394
-#, c-format
-msgid "Journal entry - %s"
-msgstr "���������� ������ - %s"
-
#: calendar/gui/e-calendar-table.c:157
msgid "Categories"
msgstr "���������"
@@ -2336,10 +2345,17 @@ msgstr "������� ��� �������"
msgid "Delete the task"
msgstr "������� �������"
-#: calendar/gui/e-day-view-time-item.c:519
-#, c-format
-msgid "%02i minute divisions"
-msgstr ""
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
+#: calendar/gui/print.c:617
+msgid "am"
+msgstr "�.�."
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
+#: calendar/gui/print.c:616
+msgid "pm"
+msgstr "�.�."
#. strftime format %A = full weekday name, %d = day of month,
#. %B = full month name. Don't use any other specifiers.
@@ -2362,18 +2378,6 @@ msgstr "%a %d %b"
msgid "%d %b"
msgstr "%d %b"
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:570 calendar/gui/e-week-view.c:300
-#: calendar/gui/print.c:617
-msgid "am"
-msgstr "�.�."
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:573 calendar/gui/e-week-view.c:303
-#: calendar/gui/print.c:616
-msgid "pm"
-msgstr "�.�."
-
#: calendar/gui/e-day-view.c:3146 ui/evolution-calendar.xml.h:16
msgid "New Appointment"
msgstr "����� �������"
@@ -2391,8 +2395,7 @@ msgid "Go to Date..."
msgstr "������� � ����..."
#: calendar/gui/e-day-view.c:3162 calendar/gui/e-week-view.c:3293
-#: mail/folder-browser.c:585 ui/evolution-calendar.xml.h:19
-#: ui/evolution-message-composer.xml.h:10
+#: ui/evolution-calendar.xml.h:19 ui/evolution-message-composer.xml.h:10
msgid "Open"
msgstr "�������"
@@ -2417,6 +2420,11 @@ msgstr "������� ��� ���������"
msgid "Delete all Occurrences"
msgstr "������� ��� ���������"
+#: calendar/gui/e-day-view-time-item.c:519
+#, c-format
+msgid "%02i minute divisions"
+msgstr ""
+
#: calendar/gui/e-itip-control.c:161
msgid "I couldn't update your calendar file!\n"
msgstr "�� ������� �������� ��� ���� ���������!\n"
@@ -2567,17 +2575,17 @@ msgstr "�������������� ���������"
msgid "Organizer: "
msgstr "�����������:"
-#: calendar/gui/e-meeting-dialog.glade.h:15
+#: calendar/gui/e-meeting-dialog.glade.h:14
msgid ""
"Publish\n"
"Event"
msgstr ""
-#: calendar/gui/e-meeting-dialog.glade.h:17
+#: calendar/gui/e-meeting-dialog.glade.h:16
msgid "RSVP"
msgstr ""
-#: calendar/gui/e-meeting-dialog.glade.h:18
+#: calendar/gui/e-meeting-dialog.glade.h:17
msgid ""
"Request\n"
"Meeting"
@@ -2585,15 +2593,15 @@ msgstr ""
"���������\n"
"�������"
-#: calendar/gui/e-meeting-dialog.glade.h:20
+#: calendar/gui/e-meeting-dialog.glade.h:19
msgid "Required Participant"
msgstr "��������� ���������"
-#: calendar/gui/e-meeting-dialog.glade.h:21
+#: calendar/gui/e-meeting-dialog.glade.h:20
msgid "Role"
msgstr "����"
-#: calendar/gui/e-meeting-dialog.glade.h:22
+#: calendar/gui/e-meeting-dialog.glade.h:21
msgid ""
"Schedule\n"
"Time"
@@ -2601,8 +2609,8 @@ msgstr ""
"�������� �������\n"
"� ����������"
-#: calendar/gui/e-meeting-dialog.glade.h:24 filter/libfilter-i18n.h:49
-#: mail/message-list.c:1082
+#: calendar/gui/e-meeting-dialog.glade.h:23 filter/libfilter-i18n.h:49
+#: mail/message-list.c:1086
msgid "Status"
msgstr "���������"
@@ -2625,20 +2633,121 @@ msgstr "���������� ��������� ������� � \"%s\""
msgid "The method required to load `%s' is not supported"
msgstr "����� ����������� ��� �������� \"%s\" �� ��������������"
-#. strftime format %d = day of month, %B = full
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:342
-msgid "%d %B"
-msgstr "%d %B"
+#: calendar/gui/event-editor.c:377
+msgid "Edit Appointment"
+msgstr "������ �������"
-#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
-msgid "New Appointment..."
-msgstr "����� �������..."
+#: calendar/gui/event-editor.c:449
+msgid "on"
+msgstr "�"
-#: calendar/gui/e-week-view.c:3314
-msgid "Delete All Occurrences"
-msgstr "������� ��� ���������"
+#: calendar/gui/event-editor.c:474 filter/filter-datespec.c:81
+msgid "day"
+msgstr "����"
+
+#: calendar/gui/event-editor.c:601
+msgid "on the"
+msgstr ""
+
+#: calendar/gui/event-editor.c:608
+msgid "th"
+msgstr "��"
+
+#: calendar/gui/event-editor.c:754
+msgid "occurrences"
+msgstr "������"
+
+#: calendar/gui/event-editor.c:871
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr ""
+"��� ������� ����� ������� ����������, ������� �� ����� ���� ��������������� "
+"� Evolution."
+
+#: calendar/gui/event-editor.c:1543
+#, c-format
+msgid " %d days"
+msgstr "%d ����"
+
+#: calendar/gui/event-editor.c:1545
+msgid " 1 day"
+msgstr " 1 ����"
+
+#: calendar/gui/event-editor.c:1548
+#, c-format
+msgid " %d weeks"
+msgstr " %d ������"
+
+#: calendar/gui/event-editor.c:1550
+msgid " 1 week"
+msgstr " 1 ������"
+
+#: calendar/gui/event-editor.c:1553
+#, c-format
+msgid " %d hours"
+msgstr " %d �����"
+
+#: calendar/gui/event-editor.c:1555
+msgid " 1 hour"
+msgstr " 1 ���"
+
+#: calendar/gui/event-editor.c:1558
+#, c-format
+msgid " %d minutes"
+msgstr " %d �����"
+
+#: calendar/gui/event-editor.c:1560
+msgid " 1 minute"
+msgstr " 1 ������"
+
+#: calendar/gui/event-editor.c:1563
+#, c-format
+msgid " %d seconds"
+msgstr " %d ������"
+
+#: calendar/gui/event-editor.c:1565
+msgid " 1 second"
+msgstr " 1 �������"
+
+#: calendar/gui/event-editor-dialog.glade.h:14
+#: calendar/gui/event-editor.c:1588
+msgid "Play a sound"
+msgstr "������������� ����"
+
+#: calendar/gui/event-editor-dialog.glade.h:25
+#: calendar/gui/event-editor.c:1591
+msgid "Show a dialog"
+msgstr "�������� ������"
+
+#: calendar/gui/event-editor-dialog.glade.h:23
+#: calendar/gui/event-editor.c:1594
+msgid "Send an email"
+msgstr "��������� �����"
+
+#: calendar/gui/event-editor-dialog.glade.h:22
+#: calendar/gui/event-editor.c:1597
+msgid "Run a program"
+msgstr "��������� ���������"
+
+#: calendar/gui/event-editor.c:1612
+msgid " before start of appointment"
+msgstr " �� ������ �������"
+
+#: calendar/gui/event-editor.c:1614
+msgid " after start of appointment"
+msgstr " ����� ������ �������"
+
+#: calendar/gui/event-editor.c:1622
+msgid " before end of appointment"
+msgstr " ����� ���������� �������"
+
+#: calendar/gui/event-editor.c:1624
+msgid " after end of appointment"
+msgstr " ����� ��������� �������"
+
+#: calendar/gui/event-editor.c:3132 calendar/gui/print.c:1097
+#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
+msgid "%a %b %d %Y"
+msgstr "%a %b %d %Y"
#: calendar/gui/event-editor-dialog.glade.h:1
msgid "A_ll day event"
@@ -2672,11 +2781,6 @@ msgstr "��������"
msgid "No recurrence"
msgstr "��� ����������"
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor.c:1593
-msgid "Play a sound"
-msgstr "������������� ����"
-
#: calendar/gui/event-editor-dialog.glade.h:15
msgid "Preview"
msgstr "��������"
@@ -2693,25 +2797,10 @@ msgstr "������� ����������"
msgid "Reminder"
msgstr "�����������"
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor.c:1602
-msgid "Run a program"
-msgstr "��������� ���������"
-
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor.c:1599
-msgid "Send an email"
-msgstr "��������� �����"
-
#: calendar/gui/event-editor-dialog.glade.h:24 ui/evolution-calendar.xml.h:29
msgid "Settings..."
msgstr "���������..."
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor.c:1596
-msgid "Show a dialog"
-msgstr "�������� ������"
-
#: calendar/gui/event-editor-dialog.glade.h:26
msgid "Simple recurrence"
msgstr "������� ����������"
@@ -2789,101 +2878,46 @@ msgstr "������"
msgid "year(s)"
msgstr "���"
-#: calendar/gui/event-editor.c:376
-msgid "Edit Appointment"
-msgstr "������ �������"
-
-#: calendar/gui/event-editor.c:454
-msgid "on"
-msgstr "�"
-
-#: calendar/gui/event-editor.c:479 filter/filter-datespec.c:81
-msgid "day"
-msgstr "����"
-
-#: calendar/gui/event-editor.c:606
-msgid "on the"
-msgstr ""
-
-#: calendar/gui/event-editor.c:613
-msgid "th"
-msgstr "��"
-
-#: calendar/gui/event-editor.c:759
-msgid "occurrences"
-msgstr "������"
-
-#: calendar/gui/event-editor.c:876
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr ""
-"��� ������� ����� ������� ����������, ������� �� ����� ���� ��������������� "
-"� Evolution."
+#: calendar/gui/e-week-view.c:3278 calendar/gui/e-week-view.c:3301
+msgid "New Appointment..."
+msgstr "����� �������..."
-#: calendar/gui/event-editor.c:1548
-#, c-format
-msgid " %d days"
-msgstr "%d ����"
+#: calendar/gui/e-week-view.c:3314
+msgid "Delete All Occurrences"
+msgstr "������� ��� ���������"
-#: calendar/gui/event-editor.c:1550
-msgid " 1 day"
-msgstr " 1 ����"
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/e-week-view-main-item.c:342
+msgid "%d %B"
+msgstr "%d %B"
-#: calendar/gui/event-editor.c:1553
-#, c-format
-msgid " %d weeks"
-msgstr " %d ������"
+#: calendar/gui/gnome-cal.c:234
+msgid "Summary contains"
+msgstr "���� ��������"
-#: calendar/gui/event-editor.c:1555
-msgid " 1 week"
-msgstr " 1 ������"
+#: calendar/gui/gnome-cal.c:235
+msgid "Description contains"
+msgstr "�������� ��������"
-#: calendar/gui/event-editor.c:1558
-#, c-format
-msgid " %d hours"
-msgstr " %d �����"
+#: calendar/gui/gnome-cal.c:236
+msgid "Comment contains"
+msgstr "���������� ��������"
-#: calendar/gui/event-editor.c:1560
-msgid " 1 hour"
-msgstr " 1 ���"
+#: calendar/gui/gnome-cal.c:237
+msgid "Has category"
+msgstr "����� ���������"
-#: calendar/gui/event-editor.c:1563
+#: calendar/gui/gnome-cal.c:840
#, c-format
-msgid " %d minutes"
-msgstr " %d �����"
-
-#: calendar/gui/event-editor.c:1565
-msgid " 1 minute"
-msgstr " 1 ������"
+msgid "Could not open the folder in `%s'"
+msgstr "���������� ������� ����� \"%s\""
-#: calendar/gui/event-editor.c:1568
+#: calendar/gui/gnome-cal.c:851
#, c-format
-msgid " %d seconds"
-msgstr " %d ������"
-
-#: calendar/gui/event-editor.c:1570
-msgid " 1 second"
-msgstr " 1 �������"
-
-#: calendar/gui/event-editor.c:1617
-msgid " before start of appointment"
-msgstr " �� ������ �������"
-
-#: calendar/gui/event-editor.c:1619
-msgid " after start of appointment"
-msgstr " ����� ������ �������"
-
-#: calendar/gui/event-editor.c:1627
-msgid " before end of appointment"
-msgstr " ����� ���������� �������"
-
-#: calendar/gui/event-editor.c:1629
-msgid " after end of appointment"
-msgstr " ����� ��������� �������"
-
-#: calendar/gui/event-editor.c:3137 calendar/gui/print.c:1097
-#: calendar/gui/print.c:1099 calendar/gui/print.c:1100
-msgid "%a %b %d %Y"
-msgstr "%a %b %d %Y"
+msgid "The method required to open `%s' is not supported"
+msgstr "����� ����������� ��� �������� \"%s\" �� ��������������"
#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
msgid "A sample Bonobo control which displays an calendar."
@@ -2917,36 +2951,6 @@ msgstr ""
msgid "Factory for the sample Calendar control"
msgstr ""
-#: calendar/gui/gnome-cal.c:223
-msgid "Show all "
-msgstr "�������� ��� "
-
-#: calendar/gui/gnome-cal.c:237
-msgid "Summary contains"
-msgstr "���� ��������"
-
-#: calendar/gui/gnome-cal.c:238
-msgid "Description contains"
-msgstr "�������� ��������"
-
-#: calendar/gui/gnome-cal.c:239
-msgid "Comment contains"
-msgstr "���������� ��������"
-
-#: calendar/gui/gnome-cal.c:240
-msgid "Has category"
-msgstr "����� ���������"
-
-#: calendar/gui/gnome-cal.c:843
-#, c-format
-msgid "Could not open the folder in `%s'"
-msgstr "���������� ������� ����� \"%s\""
-
-#: calendar/gui/gnome-cal.c:854
-#, c-format
-msgid "The method required to open `%s' is not supported"
-msgstr "����� ����������� ��� �������� \"%s\" �� ��������������"
-
#: calendar/gui/goto-dialog.glade.h:1
msgid "April"
msgstr "������"
@@ -3187,9 +3191,9 @@ msgstr "������� ��� (%Y)"
msgid "Print Calendar"
msgstr "���������� ���������"
-#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1467
+#: calendar/gui/print.c:1321 mail/mail-callbacks.c:1524
#: ui/evolution-addressbook.xml.h:10 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:53
+#: ui/evolution-mail.xml.h:57
msgid "Print Preview"
msgstr "�������� ������"
@@ -3424,54 +3428,54 @@ msgstr "(����������� ������)"
msgid "Error copying mail temp file: %s"
msgstr "������ ����������� ���������� ��������� �����: %s"
-#: camel/camel-pgp-context.c:190
+#: camel/camel-pgp-context.c:188
#, c-format
msgid "Please enter your %s passphrase for %s"
msgstr "���������� ������� ���� %s ��������� ����� ��� %s"
-#: camel/camel-pgp-context.c:193
+#: camel/camel-pgp-context.c:191
#, c-format
msgid "Please enter your %s passphrase"
msgstr "���������� ������� ���� %s ��������� �����."
-#: camel/camel-pgp-context.c:513
+#: camel/camel-pgp-context.c:509
msgid "No plaintext to sign."
msgstr "��� ������ ��� �������."
-#: camel/camel-pgp-context.c:520 camel/camel-pgp-context.c:692
-#: camel/camel-pgp-context.c:1060 camel/camel-pgp-context.c:1272
+#: camel/camel-pgp-context.c:516 camel/camel-pgp-context.c:688
+#: camel/camel-pgp-context.c:1055 camel/camel-pgp-context.c:1267
msgid "No password provided."
msgstr "������ �� ������������."
-#: camel/camel-pgp-context.c:526 camel/camel-pgp-context.c:698
-#: camel/camel-pgp-context.c:881 camel/camel-pgp-context.c:1067
-#: camel/camel-pgp-context.c:1279
+#: camel/camel-pgp-context.c:522 camel/camel-pgp-context.c:694
+#: camel/camel-pgp-context.c:877 camel/camel-pgp-context.c:1062
+#: camel/camel-pgp-context.c:1274
#, c-format
msgid "Couldn't create pipe to GPG/PGP: %s"
msgstr "�� ������� ������� ����� � GPG/PGP: %s"
-#: camel/camel-pgp-context.c:685
+#: camel/camel-pgp-context.c:681
msgid "No plaintext to clearsign."
msgstr ""
-#: camel/camel-pgp-context.c:875
+#: camel/camel-pgp-context.c:871
msgid "No plaintext to verify."
msgstr "��� ������ ��� ��������."
-#: camel/camel-pgp-context.c:892
+#: camel/camel-pgp-context.c:888
#, c-format
msgid "Couldn't create temp file: %s"
msgstr "�� ������� ������� ��������� ����: %s"
-#: camel/camel-pgp-context.c:1050
+#: camel/camel-pgp-context.c:1045
msgid "No plaintext to encrypt."
msgstr "��� ������ ��� ����������."
-#: camel/camel-pgp-context.c:1076
+#: camel/camel-pgp-context.c:1071
msgid "No recipients specified"
msgstr "�� ������� ����������"
-#: camel/camel-pgp-context.c:1264
+#: camel/camel-pgp-context.c:1259
msgid "No ciphertext to decrypt."
msgstr "��� ����� ��� ����������."
@@ -3491,37 +3495,37 @@ msgstr "���������� ��������� %s: %s"
msgid "Could not load %s: No initialization code in module."
msgstr "���������� ��������� %s: ��� ������������������ ���� � ������."
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:191
#, c-format
msgid "%s server %s"
msgstr "%s ������ %s"
-#: camel/camel-remote-store.c:190
+#: camel/camel-remote-store.c:195
#, c-format
msgid "%s service for %s on %s"
msgstr "%s ������ ��� %s �� %s"
-#: camel/camel-remote-store.c:240
+#: camel/camel-remote-store.c:252
msgid "Connection cancelled"
msgstr "���������� ��������"
-#: camel/camel-remote-store.c:243
-#: camel/providers/smtp/camel-smtp-transport.c:261
+#: camel/camel-remote-store.c:255
+#: camel/providers/smtp/camel-smtp-transport.c:269
#, c-format
msgid "Could not connect to %s (port %d): %s"
msgstr "�� ������� ������������ � %s (���� %d): %s"
-#: camel/camel-remote-store.c:244
+#: camel/camel-remote-store.c:256
msgid "(unknown host)"
msgstr "(����������� ����)"
-#: camel/camel-remote-store.c:325 camel/camel-remote-store.c:387
-#: camel/camel-remote-store.c:458
-#: camel/providers/imap/camel-imap-command.c:264
+#: camel/camel-remote-store.c:337 camel/camel-remote-store.c:399
+#: camel/camel-remote-store.c:470
+#: camel/providers/imap/camel-imap-command.c:287
msgid "Operation cancelled"
msgstr "�������� ��������"
-#: camel/camel-remote-store.c:464
+#: camel/camel-remote-store.c:476
msgid "Server unexpectedly disconnected"
msgstr "������ ���������� ����������"
@@ -3590,15 +3594,15 @@ msgstr ""
#: camel/camel-sasl-digest-md5.c:810
msgid "Server challenge too long (>2048 octets)\n"
-msgstr ""
+msgstr "����� ������� ������� ������� (>2048 �������)\n"
#: camel/camel-sasl-digest-md5.c:819
msgid "Server challenge invalid\n"
-msgstr ""
+msgstr "������������ ����� �������\n"
#: camel/camel-sasl-digest-md5.c:825
msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
-msgstr ""
+msgstr "����� ������� �������� ������������ ����� \"�������� ������\"\n"
#: camel/camel-sasl-digest-md5.c:847
msgid "Server response did not contain authorization data\n"
@@ -3633,68 +3637,78 @@ msgstr ""
"%s"
#: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:420
+#: camel/providers/imap/camel-imap-store.c:431
msgid "Bad authentication response from server."
msgstr "������������� ����� ������������� �� �������."
-#: camel/camel-sasl-plain.c:34
+#: camel/camel-sasl-login.c:32
+msgid "NT Login"
+msgstr ""
+
+#: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
msgid "This option will connect to the server using a simple password."
-msgstr "����������� � ������� ����� ������������� � �������������� ���������������� ������."
+msgstr ""
+"����������� � ������� ����� ������������� � �������������� ���������������� "
+"������."
+
+#: camel/camel-sasl-login.c:127
+msgid "Unknown authentication state."
+msgstr "����������� ��������� �������������."
-#: camel/camel-search-private.c:110
+#: camel/camel-search-private.c:111
#, c-format
msgid "Regular expression compilation failed: %s: %s"
msgstr "���� ���������� ����������� ���������: %s: %s"
-#: camel/camel-service.c:152
+#: camel/camel-service.c:154
#, c-format
msgid "URL '%s' needs a username component"
msgstr "URL \"%s\" ��������� � ���������� ����� ������������"
-#: camel/camel-service.c:160
+#: camel/camel-service.c:162
#, c-format
msgid "URL '%s' needs a host component"
msgstr "URL \\\"%s\\\" ��������� � ���������� �����"
-#: camel/camel-service.c:168
+#: camel/camel-service.c:170
#, c-format
msgid "URL '%s' needs a path component"
msgstr "URL \\\"%s\\\" ��������� � ���������� ����"
-#: camel/camel-service.c:554
+#: camel/camel-service.c:548
#, c-format
msgid "Resolving: %s"
-msgstr ""
+msgstr "�������������: %s"
-#: camel/camel-service.c:581
+#: camel/camel-service.c:575
#, c-format
msgid "Failure in name lookup: %s"
msgstr "������ � ���������� �����: %s"
-#: camel/camel-service.c:606
+#: camel/camel-service.c:600
#, c-format
msgid "Host lookup failed: %s: host not found"
msgstr "���� ������ �����: %s: ���� �� ������"
-#: camel/camel-service.c:608
+#: camel/camel-service.c:602
#, c-format
msgid "Host lookup failed: %s: unknown reason"
msgstr "���� ������ �����: %s: ������� ����������"
-#: camel/camel-session.c:56
+#: camel/camel-session.c:68
msgid "Virtual folder email provider"
msgstr "��������� ����������� ����� ����������� �����"
-#: camel/camel-session.c:58
+#: camel/camel-session.c:70
msgid "For reading mail as a query of another set of folders"
msgstr "��� ������ ����� �� ������� � ������� ������ �����"
-#: camel/camel-session.c:273 camel/camel-session.c:363
+#: camel/camel-session.c:294 camel/camel-session.c:363
#, c-format
msgid "No provider available for protocol `%s'"
msgstr "��������� ��� ��������� \"%s\" �� ��������"
-#: camel/camel-session.c:462
+#: camel/camel-session.c:478
#, c-format
msgid ""
"Could not create directory %s:\n"
@@ -3704,11 +3718,46 @@ msgstr ""
"%s"
#. Fill in the new fields
-#: camel/camel-store.c:380 mail/mail-ops.c:1007 mail/mail-ops.c:1014
+#: camel/camel-store.c:378 mail/mail-ops.c:1007 mail/mail-ops.c:1014
#: mail/mail-ops.c:1032 mail/mail-ops.c:1033
msgid "Trash"
msgstr "�������� �������"
+#: camel/camel-tcp-stream-ssl.c:348
+#, c-format
+msgid ""
+"EMail: %s\n"
+"Common Name: %s\n"
+"Organization Unit: %s\n"
+"Organization: %s\n"
+"Locality: %s\n"
+"State: %s\n"
+"Country: %s"
+msgstr ""
+"��.�����: %s\n"
+"���: %s\n"
+"�������������: %s\n"
+"�����������: %s\n"
+"������������: %s\n"
+"�������: %s\n"
+"������: %s"
+
+#. construct our user prompt
+#: camel/camel-tcp-stream-ssl.c:364
+#, c-format
+msgid ""
+"Bad certificate from %s:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you wish to accept anyway?"
+msgstr ""
+"������ ���������� �� %s:\n"
+"\n"
+"%s\n"
+"\n"
+"�ӣ ����� �������?"
+
#: camel/camel-url.c:289
#, c-format
msgid "Could not parse URL `%s'"
@@ -3719,55 +3768,69 @@ msgstr "���������� ���������������� URL \"%s\""
msgid "No such message %s in %s"
msgstr "��� ��������� %s � %s"
-#: camel/camel-vee-folder.c:545
+#: camel/camel-vee-folder.c:546
#, c-format
msgid "No such message: %s"
msgstr "��� ������ ���������: %s"
-#: camel/providers/imap/camel-imap-command.c:209
+#: camel/camel-vtrash-folder.c:109
+msgid "You cannot copy messages from this trash folder."
+msgstr "�� �� ������ ����������� ��������� �� ���� ����� ��� ������."
+
+#: camel/providers/imap/camel-imap-message-cache.c:150
+#, c-format
+msgid "Could not open cache directory: %s"
+msgstr "���������� ������� ������� ���: %s"
+
+#: camel/providers/imap/camel-imap-command.c:232
#, c-format
msgid "Unexpected response from IMAP server: %s"
msgstr "����������� ����� �� ������� IMAP: %s"
-#: camel/providers/imap/camel-imap-command.c:217
+#: camel/providers/imap/camel-imap-command.c:240
#, c-format
msgid "IMAP command failed: %s"
msgstr "���� ������� IMAP: %s"
-#: camel/providers/imap/camel-imap-command.c:218 shell/e-storage.c:481
+#: camel/providers/imap/camel-imap-command.c:241 shell/e-storage.c:481
msgid "Unknown error"
msgstr "����������� ������"
-#: camel/providers/imap/camel-imap-command.c:272
+#: camel/providers/imap/camel-imap-command.c:295
msgid "Server response ended too soon."
msgstr "����� ������� ���������� ������� ����."
-#: camel/providers/imap/camel-imap-command.c:456
+#: camel/providers/imap/camel-imap-command.c:487
#, c-format
msgid "IMAP server response did not contain %s information"
msgstr "����� IMAP ������� �� �������� ���������� �� %s"
-#: camel/providers/imap/camel-imap-command.c:490
+#: camel/providers/imap/camel-imap-command.c:524
#, c-format
msgid "Unexpected OK response from IMAP server: %s"
msgstr "����������� ����� \"OK\" �� IMAP �������: %s"
#: camel/providers/imap/camel-imap-folder.c:170
#, c-format
+msgid "Could not create directory %s: %s"
+msgstr "���������� ������� ������� %s: %s"
+
+#: camel/providers/imap/camel-imap-folder.c:189
+#, c-format
msgid "Could not load summary for %s"
msgstr "���������� ��������� ���� ��� %s"
-#: camel/providers/imap/camel-imap-folder.c:349
+#: camel/providers/imap/camel-imap-folder.c:362
msgid "Scanning IMAP folder"
msgstr "������������ ����� IMAP"
-#: camel/providers/imap/camel-imap-folder.c:984
-#: camel/providers/imap/camel-imap-folder.c:1195
+#: camel/providers/imap/camel-imap-folder.c:1043
+#: camel/providers/imap/camel-imap-folder.c:1265
msgid "This message is not currently available"
msgstr "��� ��������� � ��������� ������ �� ��������"
-#: camel/providers/imap/camel-imap-folder.c:1014
-#: camel/providers/imap/camel-imap-folder.c:1229
+#: camel/providers/imap/camel-imap-folder.c:1071
+#: camel/providers/imap/camel-imap-folder.c:1298
msgid "Could not find message body in FETCH response."
msgstr "���������� ����� ���� ��������� � ������ FETCH."
@@ -3779,14 +3842,13 @@ msgstr "�������� ����� �����"
msgid "Check for new messages in all folders"
msgstr "�������� ����� ����� �� ���� ������"
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:534
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:551
msgid "Folders"
msgstr "�����"
#: camel/providers/imap/camel-imap-provider.c:50
-#, fuzzy
msgid "Show only subscribed folders"
-msgstr "�������� ����� � ������ ������ ����� ��������"
+msgstr "���������� ������ ����������� �����"
#: camel/providers/imap/camel-imap-provider.c:52
msgid "Override server-supplied folder namespace"
@@ -3816,28 +3878,28 @@ msgstr ""
"����������� � IMAP ������� ����� ������������� � �������������� "
"���������������� ������."
-#: camel/providers/imap/camel-imap-store.c:443
+#: camel/providers/imap/camel-imap-store.c:454
#, c-format
msgid "IMAP server %s does not support requested authentication type %s"
msgstr "IMAP ������ %s �� ������������ ������������� ��� ������������� %s"
-#: camel/providers/imap/camel-imap-store.c:453
-#: camel/providers/smtp/camel-smtp-transport.c:358
+#: camel/providers/imap/camel-imap-store.c:464
+#: camel/providers/smtp/camel-smtp-transport.c:366
#, c-format
msgid "No support for authentication type %s"
msgstr "������������� ���� %s �� ��������������"
-#: camel/providers/imap/camel-imap-store.c:478
+#: camel/providers/imap/camel-imap-store.c:488
#, c-format
msgid "%sPlease enter the IMAP password for %s@%s"
msgstr "%s����������, ������� ������ IMAP ��� %s@%s"
-#: camel/providers/imap/camel-imap-store.c:493
-#: camel/providers/smtp/camel-smtp-transport.c:403
+#: camel/providers/imap/camel-imap-store.c:503
+#: camel/providers/smtp/camel-smtp-transport.c:410
msgid "You didn't enter a password."
msgstr "�� �� ����� ������."
-#: camel/providers/imap/camel-imap-store.c:521
+#: camel/providers/imap/camel-imap-store.c:529
#, c-format
msgid ""
"Unable to authenticate to IMAP server.\n"
@@ -3848,19 +3910,10 @@ msgstr ""
"%s\n"
"\n"
-#: camel/providers/imap/camel-imap-store.c:868
-#, fuzzy, c-format
-msgid "%s is not a selectable folder"
-msgstr "�������� ��������� �����"
-
-#: camel/providers/imap/camel-imap-store.c:882
+#: camel/providers/imap/camel-imap-store.c:788 mail/mail-local.c:337
#, c-format
-msgid "Could not create directory %s: %s"
-msgstr "���������� ������� ������� %s: %s"
-
-#: camel/providers/imap/camel-imap-store.c:1385
-msgid "You must be working online to complete this operation"
-msgstr "�� ������ ���� � ���� ��� ���������� ���� ��������"
+msgid "No such folder %s"
+msgstr "��� ����� ����� %s"
#: camel/providers/local/camel-local-provider.c:39
msgid "MH-format mail directories"
@@ -3886,46 +3939,50 @@ msgstr "�������� ����� � ������� �������� ��������� qmail"
msgid "For storing local mail in qmail maildir directories"
msgstr "��� �������� ��������� ����� � �������� ��������� ���� qmail"
-#: camel/providers/local/camel-local-store.c:129
+#: camel/providers/local/camel-local-store.c:127
#, c-format
msgid "Store root %s is not an absolute path"
msgstr ""
-#: camel/providers/local/camel-local-store.c:136
+#: camel/providers/local/camel-local-store.c:134
#, c-format
msgid "Store root %s is not a regular directory"
msgstr ""
-#: camel/providers/local/camel-local-store.c:144
-#: camel/providers/local/camel-local-store.c:160
+#: camel/providers/local/camel-local-store.c:142
+#: camel/providers/local/camel-local-store.c:158
#, c-format
msgid "Cannot get folder: %s: %s"
msgstr "�� ������� �������� �����: %s: %s"
-#: camel/providers/local/camel-local-store.c:175
+#: camel/providers/local/camel-local-store.c:173
msgid "Local stores do not have an inbox"
msgstr ""
-#: camel/providers/local/camel-local-store.c:185
+#: camel/providers/local/camel-local-store.c:183
#, c-format
msgid "Local mail file %s"
msgstr "��������� �������� ���� %s"
-#: camel/providers/local/camel-local-store.c:241
+#: camel/providers/local/camel-local-store.c:237
#, c-format
msgid "Could not rename folder %s to %s: %s"
msgstr "�� ������� ������������� ����� %s � %s: %s"
-#: camel/providers/local/camel-local-store.c:283
+#: camel/providers/local/camel-local-store.c:279
#, c-format
msgid "Could not delete folder summary file `%s': %s"
msgstr "�� ������� ������� �������� ���� ����� \"%s\": %s"
-#: camel/providers/local/camel-local-store.c:293
+#: camel/providers/local/camel-local-store.c:289
#, c-format
msgid "Could not delete folder index file `%s': %s"
msgstr "�� ������� ������� ��������� ���� ����� \"%s\": %s"
+#: camel/providers/local/camel-local-summary.c:404
+msgid "Unable to add message to summary: unknown reason"
+msgstr "�� ������� �������� ��������� � �����: ������� ����������"
+
#: camel/providers/local/camel-maildir-folder.c:150
#: camel/providers/local/camel-maildir-folder.c:158
#: camel/providers/local/camel-maildir-folder.c:169
@@ -4004,6 +4061,12 @@ msgstr ""
msgid "not a maildir directory"
msgstr "�� �������� �������� �������"
+#: camel/providers/local/camel-maildir-summary.c:405
+#: camel/providers/local/camel-maildir-summary.c:526
+#, fuzzy, c-format
+msgid "Cannot open maildir directory path: %s: %s"
+msgstr "�� ������� ������� �������� ����: %s: %s\n"
+
#: camel/providers/local/camel-mbox-folder.c:152
#, fuzzy, c-format
msgid "Cannot create folder lock on %s: %s"
@@ -4079,75 +4142,75 @@ msgstr "����� \"%s\" �� �����. �� �������."
#. FIXME: If there is a failure, it shouldn't clear the summary and restart,
#. it should try and merge the summary info's. This is a bit tricky.
-#: camel/providers/local/camel-mbox-summary.c:248
+#: camel/providers/local/camel-mbox-summary.c:249
msgid "Summarising folder"
msgstr "������������ �����"
-#: camel/providers/local/camel-mbox-summary.c:253
+#: camel/providers/local/camel-mbox-summary.c:254
#, c-format
msgid "Could not open folder: %s: summarising from position %ld: %s"
msgstr "�� ������� ������� �����: %s: ���� � ������� %ld: %s"
-#: camel/providers/local/camel-mbox-summary.c:295
+#: camel/providers/local/camel-mbox-summary.c:296
#, c-format
msgid "Fatal mail parser error near position %ld in folder %s"
msgstr "��������� ������ ��������� ����������� ����� ������� %ld � ����� %s"
-#: camel/providers/local/camel-mbox-summary.c:370
+#: camel/providers/local/camel-mbox-summary.c:371
#, c-format
msgid "Cannot summarise folder: %s: %s"
msgstr "�� ������� ����������� �����: %s: %s"
-#: camel/providers/local/camel-mbox-summary.c:501
-#: camel/providers/local/camel-mbox-summary.c:702 mail/mail-ops.c:1395
+#: camel/providers/local/camel-mbox-summary.c:502
+#: camel/providers/local/camel-mbox-summary.c:703 mail/mail-ops.c:1397
msgid "Synchronising folder"
msgstr "������������� �����"
-#: camel/providers/local/camel-mbox-summary.c:506
-#: camel/providers/local/camel-mbox-summary.c:707
+#: camel/providers/local/camel-mbox-summary.c:507
+#: camel/providers/local/camel-mbox-summary.c:708
#, c-format
msgid "Could not open folder to summarise: %s: %s"
msgstr "�� ������� ������� ����� ��� ������������: %s: %s"
-#: camel/providers/local/camel-mbox-summary.c:523
+#: camel/providers/local/camel-mbox-summary.c:524
#, c-format
msgid "Cannot open temporary mailbox: %s"
msgstr "�� ������� ������� ��������� �������� ����: %s"
-#: camel/providers/local/camel-mbox-summary.c:548
-#: camel/providers/local/camel-mbox-summary.c:556
-#: camel/providers/local/camel-mbox-summary.c:745
-#: camel/providers/local/camel-mbox-summary.c:753
+#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:557
+#: camel/providers/local/camel-mbox-summary.c:746
+#: camel/providers/local/camel-mbox-summary.c:754
msgid "Summary and folder mismatch, even after a sync"
msgstr "������������ ����� � �����, ���� ����� �������������"
-#: camel/providers/local/camel-mbox-summary.c:599
+#: camel/providers/local/camel-mbox-summary.c:600
#, c-format
msgid "Error writing to temp mailbox: %s"
msgstr "������ ������ �� ��������� �������� ����: %s"
-#: camel/providers/local/camel-mbox-summary.c:616
+#: camel/providers/local/camel-mbox-summary.c:617
#, c-format
msgid "Writing to tmp mailbox failed: %s: %s"
msgstr "���� ������ �� ��������� �������� ����: %s: %s"
-#: camel/providers/local/camel-mbox-summary.c:634
-#: camel/providers/local/camel-mbox-summary.c:803
+#: camel/providers/local/camel-mbox-summary.c:635
+#: camel/providers/local/camel-mbox-summary.c:804
#, c-format
msgid "Could not close source folder %s: %s"
msgstr "���������� ������� �������� ����� %s: %s"
-#: camel/providers/local/camel-mbox-summary.c:643
+#: camel/providers/local/camel-mbox-summary.c:644
#, c-format
msgid "Could not close temp folder: %s"
msgstr "���������� ������� ��������� �����: %s"
-#: camel/providers/local/camel-mbox-summary.c:654
+#: camel/providers/local/camel-mbox-summary.c:655
#, c-format
msgid "Could not rename folder: %s"
msgstr "�� ������� ������������� �����: %s"
-#: camel/providers/local/camel-mbox-summary.c:878
+#: camel/providers/local/camel-mbox-summary.c:879
#, c-format
msgid "Unknown error: %s"
msgstr "����������� ������: %s"
@@ -4163,6 +4226,11 @@ msgstr "���������� �������� ��������� � ����� mh: %s: %s"
msgid "`%s' is not a directory."
msgstr "\"%s\" �� �������� ���������."
+#: camel/providers/local/camel-mh-summary.c:218
+#, fuzzy, c-format
+msgid "Cannot open MH directory path: %s: %s"
+msgstr "�� ������� ������� �������� ����: %s: %s\n"
+
#: camel/providers/nntp/camel-nntp-auth.c:45
#, c-format
msgid "Please enter the NNTP password for %s@%s"
@@ -4318,27 +4386,27 @@ msgstr ""
"����������� � POP ������� ����� ������������� � �������������� Kerberos 4 "
"��� �������������."
-#: camel/providers/pop3/camel-pop3-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:199
#, c-format
msgid "Could not authenticate to KPOP server: %s"
msgstr "�� ������� ������������������ �� KPOP �������: %s"
-#: camel/providers/pop3/camel-pop3-store.c:225
+#: camel/providers/pop3/camel-pop3-store.c:215
#, c-format
msgid "Could not connect to server: %s"
msgstr "�� ������� ������������ � �������: %s"
-#: camel/providers/pop3/camel-pop3-store.c:329
+#: camel/providers/pop3/camel-pop3-store.c:322
#, c-format
msgid "Could not connect to POP server on %s."
msgstr "�� ������� ������������ � POP ������� �� %s."
-#: camel/providers/pop3/camel-pop3-store.c:368
+#: camel/providers/pop3/camel-pop3-store.c:361
#, c-format
msgid "%sPlease enter the POP3 password for %s@%s"
msgstr "%s����������, ������� POP3 ������ ��� %s@%s"
-#: camel/providers/pop3/camel-pop3-store.c:387
+#: camel/providers/pop3/camel-pop3-store.c:379
#, c-format
msgid ""
"Unable to connect to POP server.\n"
@@ -4347,12 +4415,12 @@ msgstr ""
"�� ������� ������������ � POP �������.\n"
"������ �������� ����� ������������: %s"
-#: camel/providers/pop3/camel-pop3-store.c:390
-#: camel/providers/pop3/camel-pop3-store.c:427
+#: camel/providers/pop3/camel-pop3-store.c:382
+#: camel/providers/pop3/camel-pop3-store.c:419
msgid "(Unknown)"
msgstr "(�����������)"
-#: camel/providers/pop3/camel-pop3-store.c:417
+#: camel/providers/pop3/camel-pop3-store.c:409
msgid ""
"Unable to connect to POP server.\n"
"No support for requested authentication mechanism."
@@ -4360,7 +4428,7 @@ msgstr ""
"�� ������� ������������ � POP �������.\n"
"�� �������������� ������������� �������� �������������."
-#: camel/providers/pop3/camel-pop3-store.c:425
+#: camel/providers/pop3/camel-pop3-store.c:417
#, c-format
msgid ""
"Unable to connect to POP server.\n"
@@ -4369,7 +4437,7 @@ msgstr ""
"�� ������� ������������ � POP �������.\n"
"������ �������� ������: %s"
-#: camel/providers/pop3/camel-pop3-store.c:493
+#: camel/providers/pop3/camel-pop3-store.c:484
#, c-format
msgid "No such folder `%s'."
msgstr "��� ����� ����� \"%s\""
@@ -4438,123 +4506,123 @@ msgstr ""
"��� �������� ����� � ������� ����������� � ���������� ��������� ���� �� "
"��������� SMTP.\n"
-#: camel/providers/smtp/camel-smtp-transport.c:165
+#: camel/providers/smtp/camel-smtp-transport.c:168
msgid "Syntax error, command unrecognized"
msgstr "�������������� ������, ������� �� ����������"
-#: camel/providers/smtp/camel-smtp-transport.c:167
+#: camel/providers/smtp/camel-smtp-transport.c:170
msgid "Syntax error in parameters or arguments"
msgstr "�������������� ������ � ���������� ��� ����������"
-#: camel/providers/smtp/camel-smtp-transport.c:169
+#: camel/providers/smtp/camel-smtp-transport.c:172
msgid "Command not implemented"
msgstr "������� �� �����������"
-#: camel/providers/smtp/camel-smtp-transport.c:171
+#: camel/providers/smtp/camel-smtp-transport.c:174
msgid "Command parameter not implemented"
msgstr "�������� ������� �� ����������"
-#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:176
msgid "System status, or system help reply"
msgstr "��������� ������� ��� ����� ������� �������"
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:178
msgid "Help message"
msgstr "���������� ���������"
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:180
msgid "Service ready"
msgstr "������ �����"
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:182
msgid "Service closing transmission channel"
msgstr "������ ��������� ����� ��������"
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:184
msgid "Service not available, closing transmission channel"
msgstr "������ �� ��������, �������� ������ ��������"
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:186
msgid "Requested mail action okay, completed"
msgstr "����������� �������� �������� ���������"
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:188
msgid "User not local; will forward to <forward-path>"
msgstr "�� ��������� ������������; ����� ���������� � <����-��������>"
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:190
msgid "Requested mail action not taken: mailbox unavailable"
msgstr "����������� �������� � ������ �� ���������: �������� ���� �� ��������"
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:192
msgid "Requested action not taken: mailbox unavailable"
msgstr "����������� �������� �� ���������: �������� ���� �� ��������"
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:194
msgid "Requested action aborted: error in processing"
msgstr "����������� �������� ��������: ������ ��� ���������"
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:196
msgid "User not local; please try <forward-path>"
msgstr "������������ �� ���������; ���������� ���������� <����-���������>"
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:198
msgid "Requested action not taken: insufficient system storage"
msgstr "����������� �������� �� ���������: ������������ ���������� ���������"
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:200
msgid "Requested mail action aborted: exceeded storage allocation"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:202
msgid "Requested action not taken: mailbox name not allowed"
msgstr ""
"����������� �������� �� ���������: �������� ��������� ����� �����������"
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:204
msgid "Start mail input; end with <CRLF>.<CRLF>"
msgstr "������ ����� �����; ��������� ����� <CRLF>.<CRLF>"
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:206
msgid "Transaction failed"
msgstr "���� ����������"
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:210
msgid "A password transition is needed"
msgstr "���������� �������� ������"
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:212
msgid "Authentication mechanism is too weak"
msgstr "������� ������ �������� �������������"
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:214
msgid "Encryption required for requested authentication mechanism"
msgstr "��� ������������ ��������� ������������� ��������� ����������"
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:216
msgid "Temporary authentication failure"
msgstr "��������� ���� �������������"
-#: camel/providers/smtp/camel-smtp-transport.c:215
+#: camel/providers/smtp/camel-smtp-transport.c:218
msgid "Authentication required"
msgstr "������������� ���������"
-#: camel/providers/smtp/camel-smtp-transport.c:305
+#: camel/providers/smtp/camel-smtp-transport.c:313
#, c-format
msgid "Welcome response error: %s: possibly non-fatal"
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:348
+#: camel/providers/smtp/camel-smtp-transport.c:356
#, c-format
msgid "SMTP server %s does not support requested authentication type %s"
msgstr "SMTP ������ %s �� ������������ ������������� ��� ������������� %s"
-#: camel/providers/smtp/camel-smtp-transport.c:388
+#: camel/providers/smtp/camel-smtp-transport.c:395
#, c-format
msgid "%sPlease enter the SMTP password for %s@%s"
msgstr "%s����������, ������� ������ SMTP ��� %s@%s"
-#: camel/providers/smtp/camel-smtp-transport.c:411
+#: camel/providers/smtp/camel-smtp-transport.c:418
#, c-format
msgid ""
"Unable to authenticate to SMTP server.\n"
@@ -4565,110 +4633,110 @@ msgstr ""
"%s\n"
"\n"
-#: camel/providers/smtp/camel-smtp-transport.c:527
+#: camel/providers/smtp/camel-smtp-transport.c:534
#, c-format
msgid "SMTP server %s"
msgstr "SMTP ������ %s"
-#: camel/providers/smtp/camel-smtp-transport.c:529
+#: camel/providers/smtp/camel-smtp-transport.c:536
#, c-format
msgid "SMTP mail delivery via %s"
msgstr "�������� SMTP ����� ����� %s"
-#: camel/providers/smtp/camel-smtp-transport.c:554
+#: camel/providers/smtp/camel-smtp-transport.c:561
msgid "Cannot send message: sender address not defined."
msgstr "���������� ��������� ���������: �� ��������� ����� �����������."
-#: camel/providers/smtp/camel-smtp-transport.c:561
+#: camel/providers/smtp/camel-smtp-transport.c:568
msgid "Cannot send message: sender address not valid."
msgstr "���������� ��������� ���������: ������������ ����� �����������."
-#: camel/providers/smtp/camel-smtp-transport.c:575
+#: camel/providers/smtp/camel-smtp-transport.c:582
msgid "Cannot send message: no recipients defined."
msgstr "���������� ��������� ���������: �� ���������� ����������."
-#: camel/providers/smtp/camel-smtp-transport.c:669
+#: camel/providers/smtp/camel-smtp-transport.c:676
#, c-format
msgid "HELO request timed out: %s: non-fatal"
msgstr "��������� ����� �������� ������ �� HELO: %s: �� ��������"
-#: camel/providers/smtp/camel-smtp-transport.c:688
+#: camel/providers/smtp/camel-smtp-transport.c:695
#, c-format
msgid "HELO response error: %s: non-fatal"
msgstr "������ ������ HELO: %s: �� ��������"
-#: camel/providers/smtp/camel-smtp-transport.c:721
+#: camel/providers/smtp/camel-smtp-transport.c:728
msgid "Error creating SASL authentication object."
msgstr ""
-#: camel/providers/smtp/camel-smtp-transport.c:736
-#: camel/providers/smtp/camel-smtp-transport.c:748
+#: camel/providers/smtp/camel-smtp-transport.c:743
+#: camel/providers/smtp/camel-smtp-transport.c:755
#, c-format
msgid "AUTH request timed out: %s"
msgstr "��������� ����� �������� ������ �� ������ AUTH: %s"
-#: camel/providers/smtp/camel-smtp-transport.c:798
+#: camel/providers/smtp/camel-smtp-transport.c:805
msgid "Bad authentication response from server.\n"
msgstr "������������� ����� ������������� �� �������.\n"
-#: camel/providers/smtp/camel-smtp-transport.c:824
+#: camel/providers/smtp/camel-smtp-transport.c:831
#, c-format
msgid "MAIL FROM request timed out: %s: mail not sent"
msgstr "��������� ����� �������� ������ �� MAIL FROM: %s: ����� �� ����������"
-#: camel/providers/smtp/camel-smtp-transport.c:843
+#: camel/providers/smtp/camel-smtp-transport.c:850
#, c-format
msgid "MAIL FROM response error: %s: mail not sent"
msgstr "������ ������ MAIL FROM: %s: ����� �� ����������"
-#: camel/providers/smtp/camel-smtp-transport.c:868
+#: camel/providers/smtp/camel-smtp-transport.c:875
#, c-format
msgid "RCPT TO request timed out: %s: mail not sent"
msgstr "��������� ����� �������� ������ �� RCPT TO: %s: ����� �� ����������"
-#: camel/providers/smtp/camel-smtp-transport.c:887
+#: camel/providers/smtp/camel-smtp-transport.c:894
#, c-format
msgid "RCPT TO response error: %s: mail not sent"
msgstr "������ ������ RCPT TO: %s: ����� �� ����������."
-#: camel/providers/smtp/camel-smtp-transport.c:918
+#: camel/providers/smtp/camel-smtp-transport.c:925
#, c-format
msgid "DATA request timed out: %s: mail not sent"
msgstr "��������� ����� �������� ������ �� DATA: %s: ����� �� ����������"
-#: camel/providers/smtp/camel-smtp-transport.c:937
+#: camel/providers/smtp/camel-smtp-transport.c:944
#, c-format
msgid "DATA response error: %s: mail not sent"
msgstr "������ ������ DATA: %s: ����� �� ����������"
-#: camel/providers/smtp/camel-smtp-transport.c:952
-#: camel/providers/smtp/camel-smtp-transport.c:970
+#: camel/providers/smtp/camel-smtp-transport.c:959
+#: camel/providers/smtp/camel-smtp-transport.c:977
#, c-format
msgid "DATA send timed out: message termination: %s: mail not sent"
msgstr ""
"��������� ����� �������� DATA: ��������� ��������: %s: ����� �� ����������"
-#: camel/providers/smtp/camel-smtp-transport.c:989
+#: camel/providers/smtp/camel-smtp-transport.c:996
#, c-format
msgid "DATA response error: message termination: %s: mail not sent"
msgstr "������ ������ DATA: ��������� ��������: %s: ����� �� ����������"
-#: camel/providers/smtp/camel-smtp-transport.c:1013
+#: camel/providers/smtp/camel-smtp-transport.c:1020
#, c-format
msgid "RSET request timed out: %s"
msgstr "��������� ����� �������� ������ �� RSET: %s"
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1039
#, c-format
msgid "RSET response error: %s"
msgstr "������ ������ RSET: %s"
-#: camel/providers/smtp/camel-smtp-transport.c:1055
+#: camel/providers/smtp/camel-smtp-transport.c:1062
#, c-format
msgid "QUIT request timed out: %s: non-fatal"
msgstr "��������� ����� �������� ������ �� QUIT: %s: �� ��������"
-#: camel/providers/smtp/camel-smtp-transport.c:1074
+#: camel/providers/smtp/camel-smtp-transport.c:1081
#, c-format
msgid "QUIT response error: %s: non-fatal"
msgstr "������ ������ QUIT: %s: �� ��������"
@@ -4719,7 +4787,7 @@ msgstr "�������� ��������..."
msgid "Attach a file to the message"
msgstr "������������ ���� � ���������"
-#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1082
+#: composer/e-msg-composer-attachment.glade.h:1 mail/message-list.c:1086
msgid "Attachment"
msgstr "��������"
@@ -4743,59 +4811,6 @@ msgstr "��� MIME:"
msgid "Send as:"
msgstr "��������� ���:"
-#: composer/e-msg-composer-hdrs.c:321
-msgid "Click here for the address book"
-msgstr "�������� ����� ��� �������� �����"
-
-#.
-#. * From:
-#.
-#: composer/e-msg-composer-hdrs.c:352 mail/mail-format.c:745
-msgid "From:"
-msgstr "��:"
-
-#.
-#. * Reply-To:
-#.
-#: composer/e-msg-composer-hdrs.c:358 mail/mail-format.c:747
-msgid "Reply-To:"
-msgstr "��������:"
-
-#.
-#. * Subject:
-#.
-#: composer/e-msg-composer-hdrs.c:369 mail/mail-format.c:643
-msgid "Subject:"
-msgstr "����:"
-
-#: composer/e-msg-composer-hdrs.c:383 mail/mail-format.c:749
-msgid "To:"
-msgstr "����:"
-
-#: composer/e-msg-composer-hdrs.c:384
-msgid "Enter the recipients of the message"
-msgstr "������� ����������� ���������"
-
-#: composer/e-msg-composer-hdrs.c:387 mail/mail-format.c:751
-msgid "Cc:"
-msgstr "�����:"
-
-#: composer/e-msg-composer-hdrs.c:388
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "������� ���������, ������� ������� ����� ���������"
-
-#: composer/e-msg-composer-hdrs.c:391
-msgid "Bcc:"
-msgstr "���.�����:"
-
-#: composer/e-msg-composer-hdrs.c:392
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"������� ���������, ������� ������� ����� ��������� �� ����� � ������ "
-"�����������."
-
#: composer/e-msg-composer.c:529
#, c-format
msgid ""
@@ -4805,21 +4820,21 @@ msgstr ""
"���������� ������� ���� ������� %s:\n"
"%s"
-#: composer/e-msg-composer.c:717
+#: composer/e-msg-composer.c:702
msgid "Save as..."
msgstr "��������� ���..."
-#: composer/e-msg-composer.c:728
+#: composer/e-msg-composer.c:713
#, c-format
msgid "Error saving file: %s"
msgstr "������ ���������� �����: %s"
-#: composer/e-msg-composer.c:748
+#: composer/e-msg-composer.c:733
#, c-format
msgid "Error loading file: %s"
msgstr "������ ��� �������� �����: %s"
-#: composer/e-msg-composer.c:820
+#: composer/e-msg-composer.c:805
msgid ""
"Unable to open the drafts folder for this account.\n"
"Would you like to use the default drafts folder?"
@@ -4827,12 +4842,12 @@ msgstr ""
"�� ������� ������� ����� ���������� ��� ����� �ޣ��.\n"
"������ ������������ ����� ���������� �� ���������?"
-#: composer/e-msg-composer.c:878 data/evolution.desktop.in.h:1
+#: composer/e-msg-composer.c:863 data/evolution.desktop.in.h:1
#: shell/e-shell-view-menu.c:206
msgid "Evolution"
msgstr "Evolution"
-#: composer/e-msg-composer.c:884
+#: composer/e-msg-composer.c:869
msgid ""
"This message has not been sent.\n"
"\n"
@@ -4842,27 +4857,27 @@ msgstr ""
"\n"
"�� ������ ��������� ���������?"
-#: composer/e-msg-composer.c:909
+#: composer/e-msg-composer.c:894
msgid "Open file"
msgstr "������� ����"
-#: composer/e-msg-composer.c:1035
+#: composer/e-msg-composer.c:1020
msgid "That file does not exist."
msgstr "���� ���� �� ����������."
-#: composer/e-msg-composer.c:1045
+#: composer/e-msg-composer.c:1030
msgid "That is not a regular file."
msgstr "��� �� ������� ����."
-#: composer/e-msg-composer.c:1055
+#: composer/e-msg-composer.c:1040
msgid "That file exists but is not readable."
msgstr "���� ���� ����������, �� �� ��������."
-#: composer/e-msg-composer.c:1065
+#: composer/e-msg-composer.c:1050
msgid "That file appeared accesible but open(2) failed."
msgstr "���� �������� ���������, �� ��������� ���� open(2)."
-#: composer/e-msg-composer.c:1087
+#: composer/e-msg-composer.c:1072
msgid ""
"The file is very large (more than 100K).\n"
"Are you sure you wish to insert it?"
@@ -4870,18 +4885,71 @@ msgstr ""
"���� ����� ������� (������ 100�).\n"
"�� �������, ��� ������ �������� ���?"
-#: composer/e-msg-composer.c:1108
+#: composer/e-msg-composer.c:1093
msgid "An error occurred while reading the file."
msgstr "��� ������ ����� �������� ������."
-#: composer/e-msg-composer.c:1409 composer/e-msg-composer.c:1741
+#: composer/e-msg-composer.c:1394 composer/e-msg-composer.c:1737
msgid "Compose a message"
msgstr "������� ���������"
-#: composer/e-msg-composer.c:1830
+#: composer/e-msg-composer.c:1828
msgid "Could not create composer window."
msgstr "���������� ������� ���� ���������."
+#: composer/e-msg-composer-hdrs.c:323
+msgid "Click here for the address book"
+msgstr "�������� ����� ��� �������� �����"
+
+#.
+#. * From:
+#.
+#: composer/e-msg-composer-hdrs.c:354 mail/mail-format.c:744
+msgid "From:"
+msgstr "��:"
+
+#.
+#. * Reply-To:
+#.
+#: composer/e-msg-composer-hdrs.c:360 mail/mail-format.c:746
+msgid "Reply-To:"
+msgstr "��������:"
+
+#.
+#. * Subject:
+#.
+#: composer/e-msg-composer-hdrs.c:371 mail/mail-format.c:643
+msgid "Subject:"
+msgstr "����:"
+
+#: composer/e-msg-composer-hdrs.c:385 mail/mail-format.c:748
+msgid "To:"
+msgstr "����:"
+
+#: composer/e-msg-composer-hdrs.c:386
+msgid "Enter the recipients of the message"
+msgstr "������� ����������� ���������"
+
+#: composer/e-msg-composer-hdrs.c:389 mail/mail-format.c:750
+msgid "Cc:"
+msgstr "�����:"
+
+#: composer/e-msg-composer-hdrs.c:390
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "������� ���������, ������� ������� ����� ���������"
+
+#: composer/e-msg-composer-hdrs.c:393
+msgid "Bcc:"
+msgstr "���.�����:"
+
+#: composer/e-msg-composer-hdrs.c:394
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
+msgstr ""
+"������� ���������, ������� ������� ����� ��������� �� ����� � ������ "
+"�����������."
+
#: composer/evolution-composer.c:355
msgid ""
"Could not create composer window, because you have not yet\n"
@@ -4909,7 +4977,7 @@ msgstr "���������� ���������"
#. strptime format for a date.
#: e-util/e-time-utils.c:69 e-util/e-time-utils.c:117
#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-#: widgets/misc/e-dateedit.c:1282 widgets/misc/e-dateedit.c:1463
+#: widgets/misc/e-dateedit.c:1284 widgets/misc/e-dateedit.c:1465
msgid "%m/%d/%Y"
msgstr "%m/%d/%Y"
@@ -4938,7 +5006,7 @@ msgstr "%H:%M%n"
#. strftime format of a weekday and a date.
#: e-util/e-time-utils.c:269
#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2503
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2505
msgid "%a %m/%d/%Y"
msgstr "%a %m/%d/%Y"
@@ -4956,8 +5024,8 @@ msgstr "%a %m/%d/%Y %I:%M %p"
#. strftime format of a time in 24-hour format,
#. without seconds.
-#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1257
-#: widgets/misc/e-dateedit.c:1316 widgets/misc/e-dateedit.c:1495
+#: e-util/e-time-utils.c:312 widgets/misc/e-dateedit.c:1259
+#: widgets/misc/e-dateedit.c:1318 widgets/misc/e-dateedit.c:1497
msgid "%H:%M"
msgstr "%H:%M"
@@ -4968,8 +5036,8 @@ msgstr "%H:%M:%S"
#. strftime format of a time in 12-hour format,
#. without seconds.
-#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1260
-#: widgets/misc/e-dateedit.c:1319 widgets/misc/e-dateedit.c:1498
+#: e-util/e-time-utils.c:320 widgets/misc/e-dateedit.c:1262
+#: widgets/misc/e-dateedit.c:1321 widgets/misc/e-dateedit.c:1500
msgid "%I:%M %p"
msgstr "%I:%M %p"
@@ -4978,19 +5046,37 @@ msgstr "%I:%M %p"
msgid "%I:%M:%S %p"
msgstr "%I:%M:%S %p"
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
-msgid "Evolution component for the executive summary."
-msgstr "��������� Evolution ��� Executive Summary."
-
-#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
-msgid "Factory for the Evolution executive summary component."
-msgstr "������� ��� ���������� Executive Summary ��������� Evolution."
-
#: executive-summary/component/component-factory.c:152
msgid "Cannot initialize Evolution's Executive Summary component."
msgstr ""
"���������� ���������������� ��������� Executive Summary ��������� Evolution."
+#: executive-summary/component/e-summary.c:926
+#, c-format
+msgid ""
+"Cannot open the HTML file:\n"
+"%s"
+msgstr ""
+"���������� ������� HTML ����:\n"
+"%s"
+
+#: executive-summary/component/e-summary.c:940
+#, c-format
+msgid ""
+"Error reading data:\n"
+"%s"
+msgstr ""
+"������ ��� ������ ������:\n"
+"%s"
+
+#: executive-summary/component/e-summary.c:958
+msgid "File does not have a place for the services.\n"
+msgstr ""
+
+#: executive-summary/component/e-summary-callbacks.c:126
+msgid "Select a service"
+msgstr "������� ������"
+
#: executive-summary/component/e-summary-callbacks.c:290
msgid ""
"You can select a different HTML page for the background of the Executive "
@@ -5056,28 +5142,6 @@ msgstr "����������� %s � ��������� ������"
msgid "Configure %s"
msgstr "��������� %s"
-#: executive-summary/component/e-summary.c:924
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"���������� ������� HTML ����:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:938
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"������ ��� ������ ������:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:956
-msgid "File does not have a place for the services.\n"
-msgstr ""
-
#: executive-summary/component/executive-summary-config.glade.h:1
msgid "Appearance"
msgstr "������� ���"
@@ -5093,6 +5157,14 @@ msgid ""
"you compiled Bonobo against GOAD instead of OAF."
msgstr ""
+#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:1
+msgid "Evolution component for the executive summary."
+msgstr "��������� Evolution ��� Executive Summary."
+
+#: executive-summary/GNOME_Evolution_Summary.oaf.in.h:2
+msgid "Factory for the Evolution executive summary component."
+msgstr "������� ��� ���������� Executive Summary ��������� Evolution."
+
#: executive-summary/test-service/GNOME_Evolution_Summary_rdf.oaf.in.h:1
msgid "Factory for the RDF summary."
msgstr "������� ��� ����� RDF."
@@ -5285,6 +5357,46 @@ msgstr "������ URI �����"
msgid "<click here to select a folder>"
msgstr "<�������� ����� ��� ������ �����>"
+#: filter/filter.glade.h:4
+msgid "Edit Filters"
+msgstr "������ ��������"
+
+#: filter/filter.glade.h:5
+msgid "Edit VFolders"
+msgstr "������ ����.�����"
+
+#: filter/filter.glade.h:7
+msgid "Incoming"
+msgstr "��������"
+
+#: filter/filter.glade.h:8
+msgid "Outgoing"
+msgstr "���������"
+
+#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
+msgid "Virtual Folders"
+msgstr "����������� �����"
+
+#: filter/filter.glade.h:11
+msgid "specific folders only"
+msgstr "������ ��������� �����"
+
+#: filter/filter.glade.h:12
+msgid "vFolder Sources"
+msgstr "��������� ����.�����"
+
+#: filter/filter.glade.h:13
+msgid "with all active remote folders"
+msgstr "�� ����� ��������� ���̣����� �������"
+
+#: filter/filter.glade.h:14
+msgid "with all local and active remote folders"
+msgstr "�� ����� ���������� � ��������� ���̣����� �������"
+
+#: filter/filter.glade.h:15
+msgid "with all local folders"
+msgstr "�� ����� ���������� �������"
+
#: filter/filter-input.c:193
#, c-format
msgid ""
@@ -5294,7 +5406,7 @@ msgstr ""
"������ � ���������� ��������� \"%s\":\n"
"%s"
-#: filter/filter-part.c:474
+#: filter/filter-part.c:488
msgid "Test"
msgstr "��������"
@@ -5334,46 +5446,6 @@ msgstr "��������"
msgid "outgoing"
msgstr "���������"
-#: filter/filter.glade.h:4
-msgid "Edit Filters"
-msgstr "������ ��������"
-
-#: filter/filter.glade.h:5
-msgid "Edit VFolders"
-msgstr "������ ����.�����"
-
-#: filter/filter.glade.h:7
-msgid "Incoming"
-msgstr "��������"
-
-#: filter/filter.glade.h:8
-msgid "Outgoing"
-msgstr "���������"
-
-#: filter/filter.glade.h:10 filter/vfolder-editor.c:130
-msgid "Virtual Folders"
-msgstr "����������� �����"
-
-#: filter/filter.glade.h:11
-msgid "specific folders only"
-msgstr "������ ��������� �����"
-
-#: filter/filter.glade.h:12
-msgid "vFolder Sources"
-msgstr "��������� ����.�����"
-
-#: filter/filter.glade.h:13
-msgid "with all active remote folders"
-msgstr "�� ����� ��������� ���̣����� �������"
-
-#: filter/filter.glade.h:14
-msgid "with all local and active remote folders"
-msgstr "�� ����� ���������� � ��������� ���̣����� �������"
-
-#: filter/filter.glade.h:15
-msgid "with all local folders"
-msgstr "�� ����� ���������� �������"
-
#: filter/libfilter-i18n.h:3
msgid "Assign Colour"
msgstr "������� ����"
@@ -5523,7 +5595,7 @@ msgid "Replied to"
msgstr "��������"
#: filter/libfilter-i18n.h:42 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.c:1082
+#: mail/message-list.c:1086
msgid "Score"
msgstr "�������"
@@ -5555,7 +5627,7 @@ msgstr "���������� �"
msgid "Stop Processing"
msgstr "���������� ���������"
-#: filter/libfilter-i18n.h:51 mail/message-list.c:1083
+#: filter/libfilter-i18n.h:51 mail/message-list.c:1087
msgid "Subject"
msgstr "����"
@@ -5567,6 +5639,18 @@ msgstr "���� �����"
msgid "was before"
msgstr "���� ��"
+#: filter/rule-editor.c:147
+msgid "Rules"
+msgstr "�������"
+
+#: filter/rule-editor.c:240
+msgid "Add Rule"
+msgstr "�������� �������"
+
+#: filter/rule-editor.c:299
+msgid "Edit Rule"
+msgstr "������ �������"
+
#: filter/score-editor.c:130
msgid "Score Rules"
msgstr "������� ��������"
@@ -5579,120 +5663,136 @@ msgstr "���������� ���������������� �������� ��������� \"��������\"."
msgid "Cannot register storage with shell"
msgstr "�� ������� ���������������� ��������� � ������� ��������"
-#: mail/folder-browser-factory.c:211
-#, c-format
-msgid "Properties for \"%s\""
-msgstr "�������� ��� \"%s\""
-
-#: mail/folder-browser-factory.c:213 ui/evolution-event-editor.xml.h:39
-#: ui/evolution-task-editor-dialog.xml.h:42
-msgid "Properties"
-msgstr "��������"
-
-#: mail/folder-browser.c:244
+#: mail/folder-browser.c:268
msgid "Store search as vFolder"
msgstr "��������� ���������� ������ � ����������� �����"
-#: mail/folder-browser.c:552
-msgid "VFolder on Subject"
+#: mail/folder-browser.c:576 ui/evolution-mail.xml.h:91
+msgid "VFolder on _Subject"
msgstr "����.����� �� ����"
-#: mail/folder-browser.c:555
-msgid "VFolder on Sender"
+#: mail/folder-browser.c:579 ui/evolution-mail.xml.h:89
+msgid "VFolder on Se_nder"
msgstr "����.����� �� �����������"
-#: mail/folder-browser.c:558
-msgid "VFolder on Recipients"
+#: mail/folder-browser.c:582 ui/evolution-mail.xml.h:90
+msgid "VFolder on _Recipients"
msgstr "����.����� �� ����������"
-#: mail/folder-browser.c:561 mail/folder-browser.c:752
-msgid "VFolder on Mailing List"
+#: mail/folder-browser.c:585 ui/evolution-mail.xml.h:88
+msgid "VFolder on Mailing _List"
msgstr "����.����� �� ������ ��������"
-#: mail/folder-browser.c:567
-msgid "Filter on Subject"
+#: mail/folder-browser.c:591
+msgid "Filter on Sub_ject"
msgstr "������ �� ����"
-#: mail/folder-browser.c:570
-msgid "Filter on Sender"
+#: mail/folder-browser.c:594
+msgid "Filter on Sen_der"
msgstr "������ �� �����������"
-#: mail/folder-browser.c:573
-msgid "Filter on Recipients"
-msgstr "������ �� ����������"
+#: mail/folder-browser.c:597
+msgid "Filter on Re_cipients"
+msgstr "������ �� �����������"
-#: mail/folder-browser.c:576 mail/folder-browser.c:751
-msgid "Filter on Mailing List"
+#: mail/folder-browser.c:600
+msgid "Filter on _Mailing List"
msgstr "������ �� ������ ��������"
-#: mail/folder-browser.c:587
+#: mail/folder-browser.c:609
+msgid "_Open"
+msgstr "�������"
+
+#: mail/folder-browser.c:611
msgid "Resend"
msgstr "�����������"
-#: mail/folder-browser.c:589
-msgid "Save As..."
+#: mail/folder-browser.c:613 ui/evolution-calendar.xml.h:43
+#: ui/evolution-mail.xml.h:113 ui/evolution-tasks.xml.h:8
+msgid "_Save As..."
msgstr "��������� ���..."
-#: mail/folder-browser.c:596
-msgid "Reply to Sender"
+#: mail/folder-browser.c:615 ui/evolution-event-editor.xml.h:69
+#: ui/evolution-task-editor-dialog.xml.h:82 ui/evolution-tasks.xml.h:7
+msgid "_Print"
+msgstr "������"
+
+#: mail/folder-browser.c:620
+msgid "_Reply to Sender"
msgstr "�������� �����������"
-#: mail/folder-browser.c:598 mail/message-browser.c:179
-#: ui/evolution-mail.xml.h:61
-msgid "Reply to All"
+#: mail/folder-browser.c:622 ui/evolution-mail.xml.h:66
+msgid "Reply to _All"
msgstr "�������� ����"
-#: mail/folder-browser.c:600 mail/message-browser.c:182
-#: ui/evolution-mail.xml.h:25
-msgid "Forward"
+#: mail/folder-browser.c:624 ui/evolution-mail.xml.h:102
+msgid "_Forward"
msgstr "���������"
-#: mail/folder-browser.c:602 ui/evolution-mail.xml.h:27
-msgid "Forward inline"
+#: mail/folder-browser.c:626
+msgid "Forward _inline"
msgstr "��������� ����������"
-#: mail/folder-browser.c:605
-msgid "Mark as Read"
+#: mail/folder-browser.c:629 ui/evolution-mail.xml.h:40
+msgid "Mar_k as Read"
msgstr "�������� ��� �����������"
-#: mail/folder-browser.c:607
-msgid "Mark as Unread"
+#: mail/folder-browser.c:631 ui/evolution-mail.xml.h:44
+msgid "Mark as U_nread"
msgstr "�������� ��� ������������"
-#: mail/folder-browser.c:612
-msgid "Move to Folder..."
+#: mail/folder-browser.c:636 ui/evolution-mail.xml.h:107
+msgid "_Move to Folder..."
msgstr "����������� � �����..."
-#: mail/folder-browser.c:614
-msgid "Copy to Folder..."
+#: mail/folder-browser.c:638 ui/evolution-mail.xml.h:96
+msgid "_Copy to Folder..."
msgstr "����������� � �����..."
-#: mail/folder-browser.c:618 ui/evolution-mail.xml.h:82
-msgid "Undelete"
+#: mail/folder-browser.c:642 ui/evolution-mail.xml.h:118
+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:628 ui/evolution-mail.xml.h:1
+#: mail/folder-browser.c:652 ui/evolution-mail.xml.h:1
msgid "Apply Filters"
msgstr "��������� �������"
-#: mail/folder-browser.c:632
-msgid "Create Rule From Message"
+#: mail/folder-browser.c:656
+msgid "Create Ru_le From Message"
msgstr "������� ������� �� ���������"
-#: mail/folder-browser.c:754
+#: mail/folder-browser.c:795
+msgid "Filter on Mailing List"
+msgstr "������ �� ������ ��������"
+
+#: mail/folder-browser.c:796
+msgid "VFolder on Mailing List"
+msgstr "����.����� �� ������ ��������"
+
+#: mail/folder-browser.c:798
#, c-format
msgid "Filter on Mailing List (%s)"
msgstr "������ �� ������ �������� (%s)"
-#: mail/folder-browser.c:755
+#: mail/folder-browser.c:799
#, c-format
msgid "VFolder on Mailing List (%s)"
msgstr "����.����� �� ������ �������� (%s)"
+#: mail/folder-browser-factory.c:213
+#, c-format
+msgid "Properties for \"%s\""
+msgstr "�������� ��� \"%s\""
+
+#: mail/folder-browser-factory.c:215 ui/evolution-event-editor.xml.h:39
+#: ui/evolution-task-editor-dialog.xml.h:42
+msgid "Properties"
+msgstr "��������"
+
#: mail/GNOME_Evolution_Mail.oaf.in.h:1
msgid "Evolution component for handling mail."
msgstr "��������� Evolution ��� ��������� �����."
@@ -5725,6 +5825,54 @@ msgstr "������� ��� ��������� ���������� Evolution."
msgid "Factory for the Mail Summary component."
msgstr ""
+#: mail/importers/elm-importer.c:420
+msgid ""
+"Evolution has found Elm mail files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution ����� �������� ����� Elm.\n"
+"������ ������������� �� � Evolution?"
+
+#: mail/importers/elm-importer.c:430
+msgid "Elm mail"
+msgstr "����� Elm"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
+msgid "Factory to import mbox into Evolution"
+msgstr "������� ��� ������� ������ mbox � Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
+msgid "Imports mbox files into Evolution"
+msgstr "����������� ����� mbox � Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
+msgid "Factory to import Outlook Express 4 mails into Evolution"
+msgstr "������� ��� ������� ������ Outlook Express 4 � Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
+msgid "Imports Outlook Express 4 files into Evolution"
+msgstr "����������� ����� Outlook Express 4 � Evolution"
+
+#: mail/importers/netscape-importer.c:440
+msgid ""
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
+msgstr ""
+"Evolution ����� �������� ����� Netscape.\n"
+"������ ������������� �� � Evolution?"
+
+#: mail/importers/pine-importer.c:385
+msgid ""
+"Evolution has found Pine mail files.\n"
+"Would you like to import them into Evolution?"
+msgstr ""
+"Evolution ����� �������� ����� Pine.\n"
+"������ ������������� �� � Evolution?"
+
+#: mail/importers/pine-importer.c:395
+msgid "Pine mail"
+msgstr "����� Pine"
+
#: mail/local-config.glade.h:1
msgid "Current store format:"
msgstr "������� ������ ��������:"
@@ -5759,6 +5907,15 @@ msgstr "mbox"
msgid "mh"
msgstr "mh"
+#: mail/mail-account-editor.c:105
+msgid "You have not filled in all of the required information."
+msgstr "�� �� ����� ��� ����������� ����������."
+
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:173
+msgid "Evolution Account Editor"
+msgstr "�������� ������ Evolution"
+
#: mail/mail-accounts.c:121 mail/mail-accounts.c:165
msgid " (default)"
msgstr "(���.��������)"
@@ -5784,15 +5941,6 @@ msgstr "�� ������� ��� ������ ������� ���� ����� ����?"
msgid "Evolution Account Manager"
msgstr "��������� ������ Evolution"
-#: mail/mail-account-editor.c:105
-msgid "You have not filled in all of the required information."
-msgstr "�� �� ����� ��� ����������� ����������."
-
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:173
-msgid "Evolution Account Editor"
-msgstr "�������� ������ Evolution"
-
#: mail/mail-autofilter.c:70
#, c-format
msgid "Mail to %s"
@@ -5817,7 +5965,7 @@ msgstr "%s ������ ��������"
msgid "Add Filter Rule"
msgstr "�������� ������� �������"
-#: mail/mail-callbacks.c:95
+#: mail/mail-callbacks.c:96
msgid ""
"You have not configured the mail client.\n"
"You need to do this before you can send,\n"
@@ -5829,7 +5977,7 @@ msgstr ""
"����������, ��������� ��� ������������� �����.\n"
"�� ������ ��������� ��� ������?"
-#: mail/mail-callbacks.c:148
+#: mail/mail-callbacks.c:149
msgid ""
"You need to configure an identity\n"
"before you can compose mail."
@@ -5837,7 +5985,7 @@ msgstr ""
"�� ������ ��������� ������������\n"
"�� ���� ��� �� ������� ������� �����."
-#: mail/mail-callbacks.c:160
+#: mail/mail-callbacks.c:161
msgid ""
"You need to configure a mail transport\n"
"before you can compose mail."
@@ -5845,11 +5993,11 @@ msgstr ""
"�� ������ ��������� �������� �����\n"
"�� ���� ��� �� ������� ������� �����."
-#: mail/mail-callbacks.c:204
+#: mail/mail-callbacks.c:205
msgid "You have not set a mail transport method"
msgstr "�� �� ���������� ����� ��������������� �����"
-#: mail/mail-callbacks.c:237
+#: mail/mail-callbacks.c:238
msgid ""
"This message has no subject.\n"
"Really send?"
@@ -5857,32 +6005,37 @@ msgstr ""
"��� ��������� �� ����� ����.\n"
"������� ���?"
-#: mail/mail-callbacks.c:310
+#: mail/mail-callbacks.c:311
msgid "You must specify recipients in order to send this message."
msgstr "�� ������ ������� �����������, ����� ��������� ��� ���������."
-#: mail/mail-callbacks.c:353
+#: mail/mail-callbacks.c:354
msgid "You must configure an account before you can send this email."
msgstr "�� ������ ��������� ���� �� ���� ��� �� ������� ������� �����."
#: mail/mail-callbacks.c:593
#, c-format
-msgid "On %s, %s wrote:\n"
-msgstr "%s, %s �������:\n"
+msgid "On %s, %s wrote:"
+msgstr "%s, %s �������:"
-#: mail/mail-callbacks.c:775
+#: mail/mail-callbacks.c:774
msgid "Forwarded message:\n"
msgstr "����������� ���������:\n"
-#: mail/mail-callbacks.c:878
+#: mail/mail-callbacks.c:877
msgid "Move message(s) to"
msgstr "����������� ��������� �"
-#: mail/mail-callbacks.c:880
+#: mail/mail-callbacks.c:879
msgid "Copy message(s) to"
msgstr "����������� ��������� �"
-#: mail/mail-callbacks.c:1148
+#: mail/mail-callbacks.c:1156
+#, c-format
+msgid "Are you sure you want to edit all %d messages?"
+msgstr "�� ������� ��� �� ������ ������� ��� %d ���������?"
+
+#: mail/mail-callbacks.c:1170
msgid ""
"You may only edit messages saved\n"
"in the Drafts folder."
@@ -5890,7 +6043,7 @@ msgstr ""
"�� ������ ������� ������ ���������\n"
"����������� � ����� \"���������\"."
-#: mail/mail-callbacks.c:1180
+#: mail/mail-callbacks.c:1202
msgid ""
"You may only resend messages\n"
"in the Sent folder."
@@ -5898,11 +6051,15 @@ msgstr ""
"�� ������ ������ ����������� ���������\n"
"�� ����� \"������������\"."
-#: mail/mail-callbacks.c:1213 mail/mail-display.c:90
+#: mail/mail-callbacks.c:1224
+msgid "No Message Selected"
+msgstr "��������� �� �������"
+
+#: mail/mail-callbacks.c:1250 mail/mail-display.c:90
msgid "Overwrite file?"
msgstr "���������� ����?"
-#: mail/mail-callbacks.c:1217 mail/mail-display.c:94
+#: mail/mail-callbacks.c:1254 mail/mail-display.c:94
msgid ""
"A file by that name already exists.\n"
"Overwrite it?"
@@ -5910,15 +6067,15 @@ msgstr ""
"���� � ����� ��������� ��� ����������.\n"
"���������� ���?"
-#: mail/mail-callbacks.c:1261
+#: mail/mail-callbacks.c:1298
msgid "Save Message As..."
msgstr "��������� ��������� ���..."
-#: mail/mail-callbacks.c:1263
+#: mail/mail-callbacks.c:1300
msgid "Save Messages As..."
msgstr "��������� ��������� ���..."
-#: mail/mail-callbacks.c:1378
+#: mail/mail-callbacks.c:1435
#, c-format
msgid ""
"Error loading filter information:\n"
@@ -5927,18 +6084,72 @@ msgstr ""
"������ ��� �������� ���������� �������:\n"
"%s"
-#: mail/mail-callbacks.c:1427 ui/evolution-mail.xml.h:52
+#: mail/mail-callbacks.c:1484 ui/evolution-mail.xml.h:56
msgid "Print Message"
msgstr "������ ���������"
-#: mail/mail-callbacks.c:1474
+#: mail/mail-callbacks.c:1531
msgid "Printing of message failed"
msgstr "���� ������ ���������"
+#: mail/mail-callbacks.c:1609
+#, c-format
+msgid "Are you sure you want to open all %d messages in separate windows?"
+msgstr "�� ������� ��� ������ ������� ��� %d ��������� � ��������� �����?"
+
#: mail/mail-config.c:1121 mail/mail-config.c:1124
msgid "Connecting to server..."
msgstr "����������� � �������..."
+#: mail/mail-config-druid.c:99
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+"����������, ������� ���� ��� � ��.����� ����. \"��������������\" ���� �� "
+"����������� ��� ����������, ���� ������ �� �� ������ �������� ��� ���������� "
+"� ������������ ���� �����."
+
+#: mail/mail-config-druid.c:101
+msgid ""
+"Please enter information about your incoming mail server below. If you don't "
+"know what kind of server you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+"����������, ������� ���� ���������� � ����� ������� �������� �����. ���� �� "
+"�� ������ ������ ���� ������ �� �����������, ��������� � ����� ��������� "
+"��������������� ��� ����������� ����� ��������."
+
+#: mail/mail-config-druid.c:105
+msgid ""
+"Please enter information about your outgoing mail protocol below. If you "
+"don't know which protocol you use, contact your system administrator or "
+"Internet Service Provider."
+msgstr ""
+"����������, ������� ���� ���������� � ����� ������� ��������� �����. ���� �� "
+"�� ������ ����� �������� �� �����������, ��������� � ����� ��������� "
+"��������������� ��� ����������� ����� ��������."
+
+#: mail/mail-config-druid.c:107
+msgid ""
+"You are almost done with the mail configuration process. The identity, "
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
+msgstr ""
+"�� ����� ��������� ������� ��������� �����. ������������, ������ �������� "
+"����� � ����� �������� ��������� �����, ������� �� ������������ ����� "
+"���������� ��� �������� ��������� �ޣ�� Evolution. ����������, ������� "
+"�������� ��� ����� �ޣ�� � ������ ����. ��� �������� ������������ ������ ��� "
+"�����������."
+
+#. set window title
+#: mail/mail-config-druid.c:445
+msgid "Evolution Account Wizard"
+msgstr "�������� �� ������ Evolution"
+
#: mail/mail-config.glade.h:1
msgid " Check for supported types "
msgstr " �������� �������������� ����� "
@@ -6159,45 +6370,10 @@ msgstr ""
#: mail/mail-config.glade.h:76 ui/evolution-event-editor.xml.h:58
#: ui/evolution-message-composer.xml.h:43 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:30
+#: ui/evolution-task-editor-dialog.xml.h:70 ui/evolution.xml.h:32
msgid "_Edit"
msgstr "������"
-#: mail/mail-config-druid.c:99
-msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
-msgstr "����������, ������� ���� ��� � ��.����� ����. \"��������������\" ���� �� ����������� ��� ����������, ���� ������ �� �� ������ �������� ��� ���������� � ������������ ���� �����."
-
-#: mail/mail-config-druid.c:101
-msgid ""
-"Please enter information about your incoming mail server below. If you don't "
-"know what kind of server you use, contact your system administrator or "
-"Internet Service Provider."
-msgstr "����������, ������� ���� ���������� � ����� ������� �������� �����. ���� �� �� ������ ������ ���� ������ �� �����������, ��������� � ����� ��������� ��������������� ��� ����������� ����� ��������."
-
-#: mail/mail-config-druid.c:105
-msgid ""
-"Please enter information about your outgoing mail protocol below. If you "
-"don't know which protocol you use, contact your system administrator or "
-"Internet Service Provider."
-msgstr "����������, ������� ���� ���������� � ����� ������� ��������� �����. ���� �� �� ������ ����� �������� �� �����������, ��������� � ����� ��������� ��������������� ��� ����������� ����� ��������."
-
-#: mail/mail-config-druid.c:107
-msgid ""
-"You are almost done with the mail configuration process. The identity, "
-"incoming mail server and outgoing mail transport method which you provided "
-"will be grouped together to make an Evolution mail account. Please enter a "
-"name for this account in the space below. This name will be used for display "
-"purposes only."
-msgstr "�� ����� ��������� ������� ��������� �����. ������������, ������ �������� ����� � ����� �������� ��������� �����, ������� �� ������������ ����� ���������� ��� �������� ��������� �ޣ�� Evolution. ����������, ������� �������� ��� ����� �ޣ�� � ������ ����. ��� �������� ������������ ������ ��� �����������."
-
-#. set window title
-#: mail/mail-config-druid.c:445
-msgid "Evolution Account Wizard"
-msgstr "�������� �� ������ Evolution"
-
#: mail/mail-display.c:194
msgid "Save Attachment"
msgstr "��������� ��������"
@@ -6254,66 +6430,61 @@ msgstr "%s ��������"
msgid "Could not parse MIME message. Displaying as source."
msgstr "�� ������� ��������� ��������� MIME. ������������ ��� ����."
-#: mail/mail-format.c:772
+#: mail/mail-format.c:771
msgid "Loading message content"
msgstr "�������� ����������� ���������"
-#: mail/mail-format.c:1066
+#: mail/mail-format.c:1080
msgid "No GPG/PGP program configured."
msgstr "��������� GPG/PGP �� ���������."
-#: mail/mail-format.c:1081
+#: mail/mail-format.c:1095
msgid "Encrypted message not displayed"
msgstr "������������� ��������� �� ������������"
-#: mail/mail-format.c:1087
+#: mail/mail-format.c:1101
msgid "Encrypted message"
msgstr "������������� ���������"
-#: mail/mail-format.c:1088
+#: mail/mail-format.c:1102
msgid "Click icon to decrypt."
msgstr "�������� �� ����������� ��� ����������."
-#: mail/mail-format.c:1178 mail/mail-format.c:1566
+#: mail/mail-format.c:1192 mail/mail-format.c:1580
msgid "This message is digitally signed and has been found to be authentic."
msgstr ""
"��� ��������� � �������� ��������, ������� ������ �������� ������������."
-#: mail/mail-format.c:1186 mail/mail-format.c:1574
+#: mail/mail-format.c:1200 mail/mail-format.c:1588
msgid "This message is digitally signed but can not be proven to be authentic."
msgstr ""
"��� ��������� � �������� ��������, ������� �� ����� ���� ��������� �� "
"������������."
-#: mail/mail-format.c:1787
+#: mail/mail-format.c:1801
#, c-format
msgid "Pointer to FTP site (%s)"
msgstr "��������� �� FTP ���� (%s)"
-#: mail/mail-format.c:1799
+#: mail/mail-format.c:1813
#, c-format
msgid "Pointer to local file (%s) valid at site \"%s\""
msgstr ""
-#: mail/mail-format.c:1803
+#: mail/mail-format.c:1817
#, c-format
msgid "Pointer to local file (%s)"
msgstr "��������� �� ��������� ���� (%s)"
-#: mail/mail-format.c:1837
+#: mail/mail-format.c:1851
#, c-format
msgid "Pointer to unknown external data (\"%s\" type)"
msgstr "��������� �� ����������� ������� ������ (���� \"%s\")"
-#: mail/mail-format.c:1842
+#: mail/mail-format.c:1856
msgid "Malformed external-body part."
msgstr ""
-#: mail/mail-local.c:337
-#, c-format
-msgid "No such folder %s"
-msgstr "��� ����� ����� %s"
-
#: mail/mail-local.c:509
#, c-format
msgid "Opening '%s'"
@@ -6381,15 +6552,11 @@ msgstr ""
"������ ��� ���������� ��������:\n"
"%s"
-#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:892
+#: mail/mail-mt.c:516 mail/mail-mt.c:545 mail/mail-mt.c:880
msgid "Working"
msgstr "���������"
-#: mail/mail-mt.c:680 mail/session.c:98
-msgid "Do you accept?"
-msgstr "�� ��������?"
-
-#: mail/mail-mt.c:874
+#: mail/mail-mt.c:862
msgid "Evolution progress"
msgstr "����������� Evolution"
@@ -6443,43 +6610,43 @@ msgstr "�����������"
msgid "Scanning folders in \"%s\""
msgstr "���������� ����� � \"%s\""
-#: mail/mail-ops.c:1152
+#: mail/mail-ops.c:1154
msgid "Forwarded messages"
msgstr "����������� ���������"
-#: mail/mail-ops.c:1193 mail/mail-ops.c:1331
+#: mail/mail-ops.c:1195 mail/mail-ops.c:1333
#, c-format
msgid "Opening folder %s"
msgstr "�������� ����� \"%s\""
-#: mail/mail-ops.c:1260
+#: mail/mail-ops.c:1262
#, c-format
msgid "Opening store %s"
msgstr "�������� ��������� %s"
-#: mail/mail-ops.c:1447
+#: mail/mail-ops.c:1449
msgid "Expunging folder"
msgstr "������������ �����"
-#: mail/mail-ops.c:1496
+#: mail/mail-ops.c:1498
#, c-format
msgid "Retrieving message %s"
msgstr "��������� ��������� %s"
-#: mail/mail-ops.c:1563
+#: mail/mail-ops.c:1565
msgid "Retrieving messages"
msgstr "��������� ���������"
-#: mail/mail-ops.c:1573
+#: mail/mail-ops.c:1575
#, c-format
msgid "Retrieving message number %d of %d (uid \"%s\")"
msgstr "����������� ��������� ����� %d �� %d (uid \"%s\")"
-#: mail/mail-ops.c:1647
+#: mail/mail-ops.c:1649
msgid "Saving messages"
msgstr "���������� ���������"
-#: mail/mail-ops.c:1726
+#: mail/mail-ops.c:1728
#, c-format
msgid ""
"Unable to create output file: %s\n"
@@ -6488,12 +6655,12 @@ msgstr ""
"�� ������� ������� ���� ������: %s\n"
" %s"
-#: mail/mail-ops.c:1739
+#: mail/mail-ops.c:1741
#, c-format
msgid "Saving message %d of %d (uid \"%s\")"
msgstr "���������� ��������� %d �� %d (uid \"%s\")"
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1755
#, c-format
msgid ""
"Error saving messages to: %s:\n"
@@ -6502,11 +6669,11 @@ msgstr ""
"������ ���������� ��������� �: %s:\n"
" %s"
-#: mail/mail-ops.c:1827
+#: mail/mail-ops.c:1829
msgid "Saving attachment"
msgstr "���������� ��������"
-#: mail/mail-ops.c:1842
+#: mail/mail-ops.c:1844
#, c-format
msgid ""
"Cannot create output file: %s:\n"
@@ -6515,7 +6682,7 @@ msgstr ""
"�� ������� ������� ���� ������: %s\n"
" %s"
-#: mail/mail-ops.c:1870
+#: mail/mail-ops.c:1872
#, c-format
msgid "Could not write data: %s"
msgstr "���������� �������� ������: %s"
@@ -6524,8 +6691,29 @@ msgstr "���������� �������� ������: %s"
msgid "_Search"
msgstr "�����"
+#: mail/mail-search.c:167
+#, c-format
+msgid "Search \"%s\""
+msgstr "����� \"%s\""
+
+#: mail/mail-search.c:169
+msgid "Search Untitled Message"
+msgstr "����� ���������������� ���������"
+
+#: mail/mail-search.c:184
+msgid "Case Sensitive"
+msgstr "��������� �������"
+
+#: mail/mail-search.c:185
+msgid "Search Forward"
+msgstr "����� ���ң�"
+
+#: mail/mail-search.c:192
+msgid "Find:"
+msgstr "�����:"
+
#: mail/mail-send-recv.c:138
-msgid "Cancelling ..."
+msgid "Cancelling..."
msgstr "������..."
#: mail/mail-send-recv.c:233
@@ -6537,11 +6725,11 @@ msgid "Receiving"
msgstr "���������"
#: mail/mail-send-recv.c:285
-msgid "Updating ..."
+msgid "Updating..."
msgstr "����������..."
#: mail/mail-send-recv.c:287 mail/mail-send-recv.c:333
-msgid "Waiting ..."
+msgid "Waiting..."
msgstr "��������..."
#: mail/mail-send-recv.c:306
@@ -6583,7 +6771,7 @@ msgstr "����������� ��������� - %s"
msgid "Forwarded message (no subject)"
msgstr "����������� ��������� (��� ����)"
-#: mail/mail-tools.c:414
+#: mail/mail-tools.c:415
#, c-format
msgid ""
"-----Forwarded Message-----<br><b>From:</b> %s<br><b>To:</b> "
@@ -6602,133 +6790,146 @@ msgstr "����� ����.�����"
#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/message-browser.c:176 ui/evolution-mail.xml.h:60
+#: mail/message-browser.c:189 ui/evolution-mail.xml.h:64
msgid "Reply"
msgstr "��������"
-#: mail/message-browser.c:176 ui/evolution-mail.xml.h:66
+#: mail/message-browser.c:189 ui/evolution-mail.xml.h:70
msgid "Reply to the sender of this message"
msgstr "�������� ����������� ����� ���������"
-#: mail/message-browser.c:179 ui/evolution-mail.xml.h:64
+#: mail/message-browser.c:192 ui/evolution-mail.xml.h:65
+msgid "Reply to All"
+msgstr "�������� ����"
+
+#: mail/message-browser.c:192 ui/evolution-mail.xml.h:68
msgid "Reply to all recipients of this message"
msgstr "�������� ���� ����������� ����� ���������"
-#: mail/message-browser.c:182 ui/evolution-mail.xml.h:29
+#: mail/message-browser.c:195 ui/evolution-mail.xml.h:25
+msgid "Forward"
+msgstr "���������"
+
+#: mail/message-browser.c:195 ui/evolution-mail.xml.h:29
msgid "Forward this message"
msgstr "��������� ��� ���������"
-#: mail/message-browser.c:187 ui/evolution-mail.xml.h:57
+#: mail/message-browser.c:200 ui/evolution-mail.xml.h:61
msgid "Print the selected message"
msgstr "����������� ���������� ���������"
-#: mail/message-browser.c:190 ui/evolution-mail.xml.h:13
+#: mail/message-browser.c:203 ui/evolution-mail.xml.h:13
msgid "Delete this message"
msgstr "������� ��� ���������"
-#: mail/message-browser.c:195 ui/evolution-event-editor.xml.h:33
-#: ui/evolution-task-editor-dialog.xml.h:36
+#: mail/message-browser.c:208 ui/evolution-event-editor.xml.h:33
+#: ui/evolution-mail.xml.h:54 ui/evolution-task-editor-dialog.xml.h:36
msgid "Previous"
msgstr "����."
-#: mail/message-browser.c:195
+#: mail/message-browser.c:208
msgid "Previous message"
msgstr "���������� ���������"
-#: mail/message-browser.c:198 ui/evolution-calendar.xml.h:18
-#: ui/evolution-event-editor.xml.h:29 ui/evolution-task-editor-dialog.xml.h:32
+#: mail/message-browser.c:211 ui/evolution-calendar.xml.h:18
+#: ui/evolution-event-editor.xml.h:29 ui/evolution-mail.xml.h:50
+#: ui/evolution-task-editor-dialog.xml.h:32
msgid "Next"
msgstr "����."
-#: mail/message-browser.c:198
+#: mail/message-browser.c:211
msgid "Next message"
msgstr "��������� ���������"
-#: mail/message-list.c:678
+#: mail/message-list.c:682
msgid "Unseen"
msgstr "�������������"
-#: mail/message-list.c:679
+#: mail/message-list.c:683
msgid "Seen"
msgstr "�����������"
-#: mail/message-list.c:680
+#: mail/message-list.c:684
msgid "Answered"
msgstr "��������"
-#: mail/message-list.c:681
+#: mail/message-list.c:685
msgid "Multiple Unseen Messages"
msgstr "��������� ��������������� ���������"
-#: mail/message-list.c:682
+#: mail/message-list.c:686
msgid "Multiple Messages"
msgstr "��������� ���������"
-#: mail/message-list.c:686
+#: mail/message-list.c:690
msgid "Lowest"
msgstr "����� ������"
-#: mail/message-list.c:687
+#: mail/message-list.c:691
msgid "Lower"
msgstr "������"
-#: mail/message-list.c:691
+#: mail/message-list.c:695
msgid "Higher"
msgstr "�������"
-#: mail/message-list.c:692
+#: mail/message-list.c:696
msgid "Highest"
msgstr "����� �������"
-#: mail/message-list.c:942
+#: mail/message-list.c:946
msgid "?"
msgstr "?"
-#: mail/message-list.c:949
+#: mail/message-list.c:953
msgid "Today %l:%M %p"
msgstr "������� %I:%M %p"
-#: mail/message-list.c:958
+#: mail/message-list.c:962
msgid "Yesterday %l:%M %p"
msgstr "����� %l:%M %p"
-#: mail/message-list.c:970
+#: mail/message-list.c:974
msgid "%a %l:%M %p"
msgstr "%a %l:%M %p"
-#: mail/message-list.c:978
+#: mail/message-list.c:982
msgid "%b %d %l:%M %p"
msgstr "%b %d %l:%M %p"
-#: mail/message-list.c:980
+#: mail/message-list.c:984
msgid "%b %d %Y"
msgstr "%b %d %Y"
-#: mail/message-list.c:1082
+#: mail/message-list.c:1086
msgid "Flagged"
msgstr "����������"
-#: mail/message-list.c:1083
+#: mail/message-list.c:1087
msgid "From"
msgstr "��"
-#: mail/message-list.c:1083
+#: mail/message-list.c:1087
msgid "Date"
msgstr "����"
-#: mail/message-list.c:1083
+#: mail/message-list.c:1087
msgid "Received"
msgstr "���������"
-#: mail/message-list.c:1084
+#: mail/message-list.c:1088
msgid "To"
msgstr "����"
-#: mail/message-list.c:1084
+#: mail/message-list.c:1088
msgid "Size"
msgstr "������"
-#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:46
+#: mail/mail-session.c:161
+msgid "User canceled operation."
+msgstr ""
+
+#: mail/subscribe-dialog.c:76 shell/e-storage-set-view.c:47
msgid "Folder"
msgstr "�����"
@@ -6760,138 +6961,6 @@ msgstr "����������� �� ����� \"%s\""
msgid "Manage Subscriptions"
msgstr "���������� ����������"
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
-msgid "Folder name:"
-msgstr "�������� �����:"
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder type:"
-msgstr "��� �����:"
-
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Specify where to create the folder:"
-msgstr "������� ��� ������� �����:"
-
-#: shell/importer/importer.c:87
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
-"�������� ����, ������� �� ������ ������������� � Evolution � �������� ��� "
-"����� �� ������.\n"
-"\n"
-"�� ������ ������� \"��������������\" ���� �� �� ������ � Evolution "
-"���������� �������� ���."
-
-#. Importer isn't ready yet.
-#. Wait 5 seconds and try again.
-#: shell/importer/importer.c:182
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importer not ready.\n"
-"Waiting 5 seconds to retry."
-msgstr ""
-"�������������� %s\n"
-"�������� �� �����.\n"
-"5 ������ �������� ����� ��������."
-
-#: shell/importer/importer.c:202 shell/importer/importer.c:233
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
-msgstr ""
-"�������������� %s\n"
-"�������������� �������� %d."
-
-#: shell/importer/importer.c:341
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
-msgstr ""
-"��� ���������, ������� �������� ����������\n"
-"%s"
-
-#: shell/importer/importer.c:351
-msgid "Importing"
-msgstr "��������������"
-
-#: shell/importer/importer.c:359
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
-msgstr ""
-"�������������� %s.\n"
-"������ %s"
-
-#: shell/importer/importer.c:372
-#, c-format
-msgid "Error starting %s"
-msgstr "������ ��� �������� %s"
-
-#: shell/importer/importer.c:387
-#, c-format
-msgid "Error loading %s"
-msgstr "������ ��� �������� %s"
-
-#: shell/importer/importer.c:402
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
-msgstr ""
-"�������������� %s\n"
-"�������������� �������� 1."
-
-#: shell/importer/importer.c:473
-msgid "Automatic"
-msgstr "��������������"
-
-#: shell/importer/importer.c:523
-msgid "Filename:"
-msgstr "��� �����:"
-
-#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
-msgid "Select a file"
-msgstr "������� ����"
-
-#: shell/importer/importer.c:538
-msgid "File type:"
-msgstr "��� �����:"
-
-#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
-msgid "Import"
-msgstr "�������������"
-
-#: shell/importer/import.glade.h:1
-msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr ""
-"������� \"�������������\" ��� ������ �������������� ������ � Evolution."
-
-#: shell/importer/import.glade.h:2
-msgid "Evolution Import Utility"
-msgstr "�������� �������������� Evolution"
-
-#: shell/importer/import.glade.h:3
-msgid "Evolution Importer Utility"
-msgstr "�������� �������������� Evolution"
-
-#: shell/importer/import.glade.h:6
-msgid ""
-"Welcome to the Evolution Import Utility.\n"
-"With this wizard you will be guided through the process of\n"
-"importing external files into Evolution."
-msgstr ""
-"�������� �������������� Evolution.\n"
-"���� �������� �������� ��� ����� ������� �������\n"
-"������� ������ � Evolution."
-
#: shell/e-setup.c:118 shell/e-setup.c:191
msgid "Evolution installation"
msgstr "��������� Evolution"
@@ -6969,6 +7038,20 @@ msgstr ""
"����������, ������� ���, ����� ���������\n"
"���������� ����� ������������ Evolution."
+#: shell/e-shell.c:388
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "���������� ���������� ��������� ��������� -- %s"
+
+#: shell/e-shell.c:1273
+#, c-format
+msgid ""
+"Ooops! The view for `%s' have died unexpectedly. :-(\n"
+"This probably means that the %s component has crashed."
+msgstr ""
+"��-��! ���� ��� \"%s\" ���������� ������. :-(\n"
+"�������� ��� ��������, ��� ��������� %s ������."
+
#: shell/e-shell-folder-creation-dialog.c:99
#, c-format
msgid ""
@@ -7002,6 +7085,20 @@ msgstr "�����..."
msgid "(Untitled)"
msgstr "(��� ���������)"
+#: shell/e-shell-view.c:148
+msgid "(No folder displayed)"
+msgstr "(����� �� ��������)"
+
+#: shell/e-shell-view.c:1203
+#, c-format
+msgid "%s - Evolution %s"
+msgstr "%s - Evolution %s"
+
+#: shell/e-shell-view.c:1205
+#, c-format
+msgid "%s - Evolution %s [%s]"
+msgstr "%s - Evolution %s [%s]"
+
#: shell/e-shell-view-menu.c:173
msgid "Bug buddy was not found in your $PATH."
msgstr "Bug-buddy �� ��� ������ � ����� $PATH."
@@ -7028,33 +7125,17 @@ msgstr ""
msgid "Go to folder..."
msgstr "������� � �����..."
-#: shell/e-shell-view.c:148
-msgid "(No folder displayed)"
-msgstr "(����� �� ��������)"
-
-#: shell/e-shell-view.c:1184
-#, c-format
-msgid "%s - Evolution %s"
-msgstr "%s - Evolution %s"
-
-#: shell/e-shell-view.c:1186
-#, c-format
-msgid "%s - Evolution %s [%s]"
-msgstr "%s - Evolution %s [%s]"
+#: shell/e-shell-view-menu.c:562
+msgid "Work online"
+msgstr "�������� � ����"
-#: shell/e-shell.c:378
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "���������� ���������� ��������� ��������� -- %s"
+#: shell/e-shell-view-menu.c:574 shell/e-shell-view-menu.c:586
+msgid "Work offline"
+msgstr "�������� ��� ����"
-#: shell/e-shell.c:1248
-#, c-format
-msgid ""
-"Ooops! The view for `%s' have died unexpectedly. :-(\n"
-"This probably means that the %s component has crashed."
-msgstr ""
-"��-��! ���� ��� \"%s\" ���������� ������. :-(\n"
-"�������� ��� ��������, ��� ��������� %s ������."
+#: shell/e-shortcuts.c:381
+msgid "Error saving shortcuts."
+msgstr "������ ���������� ��������."
#: shell/e-shortcuts-view.c:134
msgid "Create new shortcut group"
@@ -7129,20 +7210,6 @@ msgstr "������������ ��� ��������"
msgid "Remove this shortcut from the shortcut bar"
msgstr "������� ��� �������� �� ������ ��������"
-#: shell/e-shortcuts.c:379
-msgid "Error saving shortcuts."
-msgstr "������ ���������� ��������."
-
-#: shell/e-storage-set-view.c:649 ui/evolution-event-editor.xml.h:76
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:44
-msgid "_View"
-msgstr "��������"
-
-#: shell/e-storage-set-view.c:649
-msgid "View the selected folder"
-msgstr "�������� ��������� �����"
-
#: shell/e-storage.c:178
msgid "(No name)"
msgstr "(��� �����)"
@@ -7191,11 +7258,157 @@ msgstr "�������� �� ��������������"
msgid "The specified type is not supported in this storage"
msgstr "��������� ��� �� �������������� ��� ����� ��������"
+#: shell/e-storage-set-view.c:650 ui/evolution-event-editor.xml.h:76
+#: ui/evolution-message-composer.xml.h:53
+#: ui/evolution-task-editor-dialog.xml.h:90 ui/evolution.xml.h:46
+msgid "_View"
+msgstr "��������"
+
+#: shell/e-storage-set-view.c:650
+msgid "View the selected folder"
+msgstr "�������� ��������� �����"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "Folder name:"
+msgstr "�������� �����:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder type:"
+msgstr "��� �����:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Specify where to create the folder:"
+msgstr "������� ��� ������� �����:"
+
#: shell/GNOME_Evolution_Shell.oaf.in.h:1
msgid "The Evolution shell."
msgstr "�������� Evolution."
-#: shell/main.c:83
+#: shell/importer/importer.c:87
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+"�������� ����, ������� �� ������ ������������� � Evolution � �������� ��� "
+"����� �� ������.\n"
+"\n"
+"�� ������ ������� \"��������������\" ���� �� �� ������ � Evolution "
+"���������� �������� ���."
+
+#. Importer isn't ready yet.
+#. Wait 5 seconds and try again.
+#: shell/importer/importer.c:182
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importer not ready.\n"
+"Waiting 5 seconds to retry."
+msgstr ""
+"�������������� %s\n"
+"�������� �� �����.\n"
+"5 ������ �������� ����� ��������."
+
+#: shell/importer/importer.c:202 shell/importer/importer.c:233
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+"�������������� %s\n"
+"�������������� �������� %d."
+
+#: shell/importer/importer.c:341
+#, c-format
+msgid ""
+"There is no importer that is able to handle\n"
+"%s"
+msgstr ""
+"��� ���������, ������� �������� ����������\n"
+"%s"
+
+#: shell/importer/importer.c:351
+msgid "Importing"
+msgstr "��������������"
+
+#: shell/importer/importer.c:359
+#, c-format
+msgid ""
+"Importing %s.\n"
+"Starting %s"
+msgstr ""
+"�������������� %s.\n"
+"������ %s"
+
+#: shell/importer/importer.c:372
+#, c-format
+msgid "Error starting %s"
+msgstr "������ ��� �������� %s"
+
+#: shell/importer/importer.c:387
+#, c-format
+msgid "Error loading %s"
+msgstr "������ ��� �������� %s"
+
+#: shell/importer/importer.c:402
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+"�������������� %s\n"
+"�������������� �������� 1."
+
+#: shell/importer/importer.c:473
+msgid "Automatic"
+msgstr "��������������"
+
+#: shell/importer/importer.c:523
+msgid "Filename:"
+msgstr "��� �����:"
+
+#: shell/importer/import.glade.h:5 shell/importer/importer.c:528
+msgid "Select a file"
+msgstr "������� ����"
+
+#: shell/importer/importer.c:538
+msgid "File type:"
+msgstr "��� �����:"
+
+#: shell/importer/import.glade.h:4 shell/importer/importer.c:619
+msgid "Import"
+msgstr "�������������"
+
+#: shell/importer/import.glade.h:1
+msgid "Click \"Import\" to begin importing the file into Evolution. "
+msgstr ""
+"������� \"�������������\" ��� ������ �������������� ������ � Evolution."
+
+#: shell/importer/import.glade.h:2
+msgid "Evolution Import Utility"
+msgstr "�������� �������������� Evolution"
+
+#: shell/importer/import.glade.h:3
+msgid "Evolution Importer Utility"
+msgstr "�������� �������������� Evolution"
+
+#: shell/importer/import.glade.h:6
+msgid ""
+"Welcome to the Evolution Import Utility.\n"
+"With this wizard you will be guided through the process of\n"
+"importing external files into Evolution."
+msgstr ""
+"�������� �������������� Evolution.\n"
+"���� �������� �������� ��� ����� ������� �������\n"
+"������� ������ � Evolution."
+
+#: shell/importer/intelligent.c:143
+msgid "Don't ask me again"
+msgstr "�� ���������� �����"
+
+#: shell/main.c:82
#, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this PREVIEW RELEASE\n"
@@ -7233,7 +7446,7 @@ msgstr ""
"�� ��������, ��� ��� ���������� ���������� ����� ������� ������ � ��\n"
"������������ �� ���� �������!\n"
-#: shell/main.c:108
+#: shell/main.c:107
msgid ""
"Thanks\n"
"The Evolution Team\n"
@@ -7241,19 +7454,19 @@ msgstr ""
"� ��������������\n"
"������� Evolution\n"
-#: shell/main.c:139
+#: shell/main.c:138
msgid "Cannot initialize the Evolution shell."
msgstr "���������� ���������������� �������� \"��������\"."
-#: shell/main.c:185
+#: shell/main.c:184
msgid "Disable splash screen"
msgstr "��������� ��������"
-#: shell/main.c:186
+#: shell/main.c:185
msgid "Send the debugging output of all components to a file."
msgstr "���������� ���������� ����� ���� ����������� � ����."
-#: shell/main.c:219
+#: shell/main.c:217
msgid "Cannot initialize the Bonobo component system."
msgstr "�� ������� ���������������� ������������ ������� Bonobo."
@@ -7277,7 +7490,7 @@ msgstr "����� ��������"
msgid "New contact"
msgstr "����� �������"
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:50
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-mail.xml.h:53
msgid "Previews the message to be printed"
msgstr "�������� ���������� ���������"
@@ -7285,7 +7498,7 @@ msgstr "�������� ���������� ���������"
msgid "Print contacts"
msgstr "������ ���������"
-#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:79
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-mail.xml.h:84
msgid "Stop"
msgstr "����"
@@ -7319,8 +7532,8 @@ msgid "_Search for contacts"
msgstr "����� ���������"
#: ui/evolution-addressbook.xml.h:20 ui/evolution-calendar.xml.h:44
-#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:112
-#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:43
+#: ui/evolution-event-editor.xml.h:74 ui/evolution-mail.xml.h:117
+#: ui/evolution-task-editor-dialog.xml.h:88 ui/evolution.xml.h:45
msgid "_Tools"
msgstr "�����������"
@@ -7428,8 +7641,8 @@ msgstr "�������� 1 ������"
msgid "Show the working week"
msgstr "�������� ������� ������"
-#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:226
-#: widgets/misc/e-dateedit.c:422
+#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:229
+#: widgets/misc/e-dateedit.c:424
msgid "Today"
msgstr "�������"
@@ -7454,7 +7667,7 @@ msgid "_Month"
msgstr "�����"
#: ui/evolution-calendar.xml.h:40 ui/evolution-event-editor.xml.h:66
-#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:39
+#: ui/evolution-task-editor-dialog.xml.h:79 ui/evolution.xml.h:41
msgid "_New"
msgstr "�����"
@@ -7462,11 +7675,6 @@ msgstr "�����"
msgid "_Open Calendar"
msgstr "������� ���������"
-#: ui/evolution-calendar.xml.h:43 ui/evolution-mail.xml.h:108
-#: ui/evolution-tasks.xml.h:8
-msgid "_Save As..."
-msgstr "��������� ���..."
-
#: ui/evolution-calendar.xml.h:45
msgid "_Week"
msgstr "������"
@@ -7493,7 +7701,7 @@ msgid "Print this item"
msgstr "������ ����� ��������"
#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:38
-#: ui/evolution-mail.xml.h:58 ui/evolution-task-editor-dialog.xml.h:41
+#: ui/evolution-mail.xml.h:62 ui/evolution-task-editor-dialog.xml.h:41
msgid "Print..."
msgstr "������..."
@@ -7526,7 +7734,7 @@ msgstr "������� ��������� � ��������..."
#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:59
#: ui/evolution-message-composer.xml.h:44 ui/evolution-subscribe.xml.h:11
-#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:31
+#: ui/evolution-task-editor-dialog.xml.h:71 ui/evolution.xml.h:33
msgid "_File"
msgstr "����"
@@ -7666,7 +7874,7 @@ msgid "Print Setup"
msgstr "��������� ��������"
#: ui/evolution-event-editor.xml.h:40 ui/evolution-message-composer.xml.h:14
-#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:239
+#: ui/evolution-task-editor-dialog.xml.h:50 widgets/misc/e-filter-bar.c:241
msgid "Save"
msgstr "���������"
@@ -7687,7 +7895,7 @@ msgstr "�������� ������� � ����������"
msgid "Schedule some sort of a meeting"
msgstr "�������� � ���������� ������� ���������� ����"
-#: ui/evolution-event-editor.xml.h:48 ui/evolution-mail.xml.h:69
+#: ui/evolution-event-editor.xml.h:48 ui/evolution-mail.xml.h:74
#: ui/evolution-task-editor-dialog.xml.h:57
msgid "Select All"
msgstr "������� ���"
@@ -7710,12 +7918,12 @@ msgid "_About..."
msgstr "� ���������..."
#: ui/evolution-event-editor.xml.h:53 ui/evolution-message-composer.xml.h:41
-#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:28
+#: ui/evolution-task-editor-dialog.xml.h:65 ui/evolution.xml.h:30
msgid "_Close"
msgstr "�������"
#: ui/evolution-event-editor.xml.h:54 ui/evolution-task-editor-dialog.xml.h:66
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
msgid "_Contact (FIXME)"
msgstr "������� (FIXME)"
@@ -7729,7 +7937,7 @@ msgid "_Debug"
msgstr "�������"
#: ui/evolution-event-editor.xml.h:60 ui/evolution-message-composer.xml.h:46
-#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:35
+#: ui/evolution-task-editor-dialog.xml.h:72 ui/evolution.xml.h:37
msgid "_Help"
msgstr "�������"
@@ -7761,12 +7969,7 @@ msgstr "������� (FIXME)"
msgid "_Paste"
msgstr "��������"
-#: ui/evolution-event-editor.xml.h:69 ui/evolution-task-editor-dialog.xml.h:82
-#: ui/evolution-tasks.xml.h:7
-msgid "_Print"
-msgstr "������"
-
-#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:104
+#: ui/evolution-event-editor.xml.h:70 ui/evolution-mail.xml.h:109
#: ui/evolution-task-editor-dialog.xml.h:83
msgid "_Properties..."
msgstr "��������..."
@@ -7776,7 +7979,7 @@ msgid "_Select All"
msgstr "������� ���"
#: ui/evolution-event-editor.xml.h:73 ui/evolution-task-editor-dialog.xml.h:87
-#: ui/evolution.xml.h:42
+#: ui/evolution.xml.h:44
msgid "_Task (FIXME)"
msgstr "������� (FIXME)"
@@ -7888,6 +8091,10 @@ msgstr "������ ������"
msgid "Forward As"
msgstr "��������� ���"
+#: ui/evolution-mail.xml.h:27
+msgid "Forward inline"
+msgstr "��������� ����������"
+
#: ui/evolution-mail.xml.h:28
msgid "Forward the selected mail to someone"
msgstr "��������� ��������� ����� ����-��"
@@ -7902,134 +8109,134 @@ msgid "Full _Headers"
msgstr "������ ���������"
#: ui/evolution-mail.xml.h:32
+msgid "Go to the next message"
+msgstr "������� � ���������� ���������"
+
+#: ui/evolution-mail.xml.h:33
+msgid "Go to the previous message"
+msgstr "������� � ����������� ���������"
+
+#: ui/evolution-mail.xml.h:34
msgid "Hide Deleted Messages"
msgstr "������ ��������� ���������"
-#: ui/evolution-mail.xml.h:33
+#: ui/evolution-mail.xml.h:35
msgid "Hide S_elected Messages"
msgstr "������ ���������� ���������"
-#: ui/evolution-mail.xml.h:34
+#: ui/evolution-mail.xml.h:36
msgid "Hide _Deleted Messages"
msgstr "������ ��������� ���������"
-#: ui/evolution-mail.xml.h:35
+#: ui/evolution-mail.xml.h:37
msgid "Hide _Read messages"
msgstr "������ ����������� ���������"
-#: ui/evolution-mail.xml.h:36
+#: ui/evolution-mail.xml.h:38
msgid "Invert Selection"
msgstr "�������� ���������"
-#: ui/evolution-mail.xml.h:37
+#: ui/evolution-mail.xml.h:39
msgid "Manage _Subscriptions..."
msgstr "���������� ����������..."
-#: ui/evolution-mail.xml.h:38
-msgid "Mar_k as Read"
-msgstr "�������� ��� �����������"
-
-#: ui/evolution-mail.xml.h:39
+#: ui/evolution-mail.xml.h:41
msgid "Mark All as R_ead"
msgstr "�������� ��� ��� �����������"
-#: ui/evolution-mail.xml.h:40
+#: ui/evolution-mail.xml.h:42
msgid "Mark As Read"
msgstr "�������� ��� �����������"
-#: ui/evolution-mail.xml.h:41
+#: ui/evolution-mail.xml.h:43
msgid "Mark As U_nread"
msgstr "�������� ��� �������������"
-#: ui/evolution-mail.xml.h:42
-msgid "Mark as U_nread"
-msgstr "�������� ��� ������������"
-
-#: ui/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:45
msgid "Mark the selected messages as having been read"
msgstr "�������� ��������� ��������� ��� ��� �����������"
-#: ui/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:46
msgid "Mark the selected messages as not having been read"
msgstr "�������� ��������� ��������� ��� �ݣ �� �����������"
-#: ui/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:47
msgid "Move"
msgstr "�����������"
-#: ui/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:48
msgid "Move message to a new folder"
msgstr "����������� ��������� � ����� �����"
-#: ui/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:49
msgid "Move selected messages to another folder"
msgstr "����������� ��������� ��������� � ������ �����"
-#: ui/evolution-mail.xml.h:48
+#: ui/evolution-mail.xml.h:51
msgid "Open in New Window"
msgstr "������� � ����� ����"
-#: ui/evolution-mail.xml.h:49
+#: ui/evolution-mail.xml.h:52
msgid "Open the current message in a new window"
msgstr "��������� ������� ��������� � ����� ����"
-#: ui/evolution-mail.xml.h:54
+#: ui/evolution-mail.xml.h:58
msgid "Print Preview of message..."
msgstr "�������� ������ ���������..."
-#: ui/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:59
msgid "Print message to the printer"
msgstr "����������� ��������� �� ��������"
-#: ui/evolution-mail.xml.h:56
+#: ui/evolution-mail.xml.h:60
msgid "Print message..."
msgstr "������ ���������..."
-#: ui/evolution-mail.xml.h:59
+#: ui/evolution-mail.xml.h:63
msgid "Redirect (FIXME: implement me)"
msgstr "������������� (FIXME: �� �����������)"
-#: ui/evolution-mail.xml.h:62
-msgid "Reply to _All"
-msgstr "�������� ����"
-
-#: ui/evolution-mail.xml.h:63
+#: ui/evolution-mail.xml.h:67
msgid "Reply to all"
msgstr "�������� ����"
-#: ui/evolution-mail.xml.h:65
+#: ui/evolution-mail.xml.h:69
msgid "Reply to sender"
msgstr "�������� �����������"
-#: ui/evolution-mail.xml.h:67
+#: ui/evolution-mail.xml.h:71
+msgid "S_earch Message"
+msgstr "����� ���������"
+
+#: ui/evolution-mail.xml.h:72
msgid "S_ource"
msgstr "��������"
-#: ui/evolution-mail.xml.h:68
+#: ui/evolution-mail.xml.h:73
msgid "Save the message into a new file"
msgstr "��������� ��������� � ����� �����"
-#: ui/evolution-mail.xml.h:70 ui/evolution-subscribe.xml.h:7
+#: ui/evolution-mail.xml.h:75 ui/evolution-subscribe.xml.h:7
msgid "Select _All"
msgstr "������� ���"
-#: ui/evolution-mail.xml.h:71
+#: ui/evolution-mail.xml.h:76
msgid "Select _Thread"
msgstr "������� ��������"
-#: ui/evolution-mail.xml.h:72
+#: ui/evolution-mail.xml.h:77
msgid "Send / Receive"
msgstr "��������� � ��������"
-#: ui/evolution-mail.xml.h:73
+#: ui/evolution-mail.xml.h:78
msgid "Send a reply to the person who sent you this mail"
msgstr "������� ����� ���� ��� ������� ��� ���������"
-#: ui/evolution-mail.xml.h:74
+#: ui/evolution-mail.xml.h:79
msgid "Send a single mail in reply to all the selected mail"
msgstr "������� ���� ������ � ����� �� ��� ��������� ���������"
-#: ui/evolution-mail.xml.h:75
+#: ui/evolution-mail.xml.h:80
msgid ""
"Send queued mail\n"
" and retrieve new mail"
@@ -8037,130 +8244,102 @@ msgstr ""
"��������� ����� �� �������\n"
" � �������� ����� �����"
-#: ui/evolution-mail.xml.h:77
+#: ui/evolution-mail.xml.h:82
msgid "Send queued mail and retrieve new mail"
msgstr "��������� ����� �� ������� � �������� ����� �����"
-#: ui/evolution-mail.xml.h:78
+#: ui/evolution-mail.xml.h:83
msgid "Show _All"
msgstr "�������� ���"
-#: ui/evolution-mail.xml.h:80
+#: ui/evolution-mail.xml.h:85
msgid "Threaded Message list"
msgstr "������ �������� ���������"
-#: ui/evolution-mail.xml.h:81
+#: ui/evolution-mail.xml.h:86
msgid "Un-delete the selected messages"
msgstr "������� ���̣���� ���������� ���������"
-#: ui/evolution-mail.xml.h:83
-msgid "VFolder on Mailing _List"
-msgstr "����.����� �� ������ ��������"
-
-#: ui/evolution-mail.xml.h:84
-msgid "VFolder on Se_nder"
-msgstr "����.����� �� �����������"
-
-#: ui/evolution-mail.xml.h:85
-msgid "VFolder on _Recipients"
-msgstr "����.����� �� ����������"
-
-#: ui/evolution-mail.xml.h:86
-msgid "VFolder on _Subject"
-msgstr "����.����� �� ����"
-
#: ui/evolution-mail.xml.h:87
+msgid "Undelete"
+msgstr "������������"
+
+#: ui/evolution-mail.xml.h:92
msgid "View Raw Message Source"
msgstr "�������� ��������� ������ ���������"
-#: ui/evolution-mail.xml.h:88
+#: ui/evolution-mail.xml.h:93
msgid "Virtual Folder _Editor..."
msgstr "�������� ����������� �����..."
-#: ui/evolution-mail.xml.h:89
+#: ui/evolution-mail.xml.h:94
msgid "_Apply Filters"
msgstr "��������� �������"
-#: ui/evolution-mail.xml.h:90
+#: ui/evolution-mail.xml.h:95
msgid "_Attachment"
msgstr "��������"
-#: ui/evolution-mail.xml.h:91
-msgid "_Copy to Folder..."
-msgstr "����������� � �����..."
-
-#: ui/evolution-mail.xml.h:92
+#: ui/evolution-mail.xml.h:97
msgid "_Create Filter From Message"
msgstr "������� ������ �� ���������"
-#: ui/evolution-mail.xml.h:94
+#: ui/evolution-mail.xml.h:99
msgid "_Expunge"
msgstr "����������"
-#: ui/evolution-mail.xml.h:95
+#: ui/evolution-mail.xml.h:100
msgid "_Filters..."
msgstr "�������..."
-#: ui/evolution-mail.xml.h:96 ui/evolution.xml.h:32
+#: ui/evolution-mail.xml.h:101 ui/evolution.xml.h:34
msgid "_Folder"
msgstr "�����"
-#: ui/evolution-mail.xml.h:97
-msgid "_Forward"
-msgstr "���������"
-
-#: ui/evolution-mail.xml.h:98
+#: ui/evolution-mail.xml.h:103
msgid "_Inline"
msgstr "����������"
-#: ui/evolution-mail.xml.h:99 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:104 ui/evolution-subscribe.xml.h:12
msgid "_Invert Selection"
msgstr "�������� ���������"
-#: ui/evolution-mail.xml.h:100
+#: ui/evolution-mail.xml.h:105
msgid "_Mail Message"
msgstr "�������� ���������"
-#: ui/evolution-mail.xml.h:101
+#: ui/evolution-mail.xml.h:106
msgid "_Mail Settings..."
msgstr "��������� �����..."
-#: ui/evolution-mail.xml.h:102
-msgid "_Move to Folder..."
-msgstr "����������� � �����..."
-
-#: ui/evolution-mail.xml.h:103
+#: ui/evolution-mail.xml.h:108
msgid "_Open Selected Items"
msgstr "������� ���������� ��������"
-#: ui/evolution-mail.xml.h:105
+#: ui/evolution-mail.xml.h:110
msgid "_Quoted"
msgstr "���������������"
-#: ui/evolution-mail.xml.h:106
+#: ui/evolution-mail.xml.h:111
msgid "_Reply"
msgstr "��������"
-#: ui/evolution-mail.xml.h:107
+#: ui/evolution-mail.xml.h:112
msgid "_Resend Messages"
msgstr "����������� ���������"
-#: ui/evolution-mail.xml.h:109
+#: ui/evolution-mail.xml.h:114
msgid "_Save Message As..."
msgstr "��������� ��������� ���..."
-#: ui/evolution-mail.xml.h:110
+#: ui/evolution-mail.xml.h:115
msgid "_Send / Receive"
msgstr "�������� � ���������"
-#: ui/evolution-mail.xml.h:111
+#: ui/evolution-mail.xml.h:116
msgid "_Threaded"
msgstr "��������"
-#: ui/evolution-mail.xml.h:113
-msgid "_Undelete"
-msgstr "������������"
-
#: ui/evolution-message-composer.xml.h:1
msgid "Attach"
msgstr "������������"
@@ -8402,7 +8581,7 @@ msgstr "�����"
msgid "Undo the last action"
msgstr "�������� ��������� ��������"
-#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:27
+#: ui/evolution-task-editor-dialog.xml.h:64 ui/evolution.xml.h:29
msgid "_Appointment (FIXME)"
msgstr "������� (FIXME)"
@@ -8503,195 +8682,251 @@ msgid "Submit bug report using Bug Buddy."
msgstr "��������� ��������� �� ������ ��������� Bug Buddy."
#: ui/evolution.xml.h:19
+msgid "Toggle"
+msgstr "�����������"
+
+#: ui/evolution.xml.h:20
msgid "Toggle whether to show the folder bar"
msgstr "����������� ����������� ������ �����"
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
msgid "Toggle whether to show the shortcut bar"
msgstr "����������� ����������� ������ ��������"
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
+msgid "Toggle whether we are working offline."
+msgstr "����������� ������ �/��� ����."
+
+#: ui/evolution.xml.h:23
msgid "Using the C_ontact Manager"
msgstr "������������� ���������� ���������"
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:24
msgid "Using the _Calendar"
msgstr "������������� ���������"
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:25
msgid "Using the _Mailer"
msgstr "������������� �����"
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:26
msgid "Work Offline"
msgstr "�������� ��� ����"
-#: ui/evolution.xml.h:25
+#: ui/evolution.xml.h:27
msgid "_About Evolution..."
msgstr "� ���������..."
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
msgid "_Actions"
msgstr "��������"
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:35
msgid "_Folder Bar"
msgstr "������ �����"
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:36
msgid "_Go to Folder..."
msgstr "������� � �����..."
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
msgid "_Import file..."
msgstr "������������� ����..."
-#: ui/evolution.xml.h:37
+#: ui/evolution.xml.h:39
msgid "_Index"
msgstr "������"
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:40
msgid "_Mail message"
msgstr "�������� ���������"
-#: ui/evolution.xml.h:40
+#: ui/evolution.xml.h:42
msgid "_New Folder"
msgstr "����� �����"
-#: ui/evolution.xml.h:41
+#: ui/evolution.xml.h:43
msgid "_Shortcut Bar"
msgstr "������ ��������"
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2475
-msgid "%A, %B %d, %Y"
-msgstr "%A, %B %d, %Y"
+#: ui/evolution.xml.h:47
+msgid "_Work Offline"
+msgstr "�������� ��� ����"
+
+#: views/addressbook/galview.xml.h:1
+msgid "Adress Cards"
+msgstr "�������� ��������"
+
+#: views/addressbook/galview.xml.h:2
+msgid "By Company"
+msgstr "�� ��������"
+
+#: views/addressbook/galview.xml.h:3
+msgid "Phone List"
+msgstr "������ ���������"
+
+#: views/mail/galview.xml.h:1
+msgid "By Sender"
+msgstr "�� �����������"
+
+#: views/mail/galview.xml.h:2
+msgid "By Status"
+msgstr "�� ���������"
+
+#: views/mail/galview.xml.h:3
+msgid "By Subject"
+msgstr "�� ����"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:390
+#: views/mail/galview.xml.h:4
+msgid "Messages"
+msgstr "���������"
+
+#: views/tasks/galview.xml.h:2
+msgid "With Category"
+msgstr "C ����������:"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
msgid "Tentative"
msgstr "�����������������"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:391
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
msgid "Busy"
msgstr "�����"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:392
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:394
msgid "Out of Office"
msgstr "��� �����"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:393
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:395
msgid "No Information"
msgstr "��� ����������"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:409
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:411
msgid "_Invite Others..."
msgstr "���������� ������..."
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:429
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:431
msgid "_Options"
msgstr "���������"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:446
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:448
msgid "Show _Only Working Hours"
msgstr "���������� ������ ������� ����"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:459
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:461
msgid "Show _Zoomed Out"
msgstr "���������� �����������"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:477
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:479
msgid "_Update Free/Busy"
msgstr "�������� ��������/�����"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:495
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:497
msgid "_<<"
msgstr "<<"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:512
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:514
msgid "_Autopick"
msgstr "���������"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:526
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:528
msgid ">_>"
msgstr ">>"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:543
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:545
msgid "_All People and Resources"
msgstr "��� ���� � �������"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:556
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:558
msgid "All _People and One Resource"
msgstr "��� ���� � ���� ������"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:569
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:571
msgid "_Required People"
msgstr "��������� ����"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:582
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:584
msgid "Required People and _One Resource"
msgstr "��������� ���� � ���� ������"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:605
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:607
msgid "Meeting _start time:"
msgstr "����� ������ ��������:"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:629
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:631
msgid "Meeting _end time:"
msgstr "����� ���������� ��������:"
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:742
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:744
msgid "All Attendees"
msgstr "��� �������������"
-#: widgets/menus/gal-view-menus.c:177
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2477
+msgid "%A, %B %d, %Y"
+msgstr "%A, %B %d, %Y"
+
+#: widgets/menus/gal-view-menus.c:176
msgid "_Current View"
msgstr "������� ��������"
-#: widgets/menus/gal-view-menus.c:196
+#: widgets/menus/gal-view-menus.c:202
msgid "Define Views"
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:421
+#: widgets/misc/e-calendar-item.c:422
msgid "MTWTFSS"
msgstr "�������"
#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1060 widgets/misc/e-calendar-item.c:2755
+#: widgets/misc/e-calendar-item.c:1061 widgets/misc/e-calendar-item.c:2756
msgid "%B %Y"
msgstr "%B %Y"
-#: widgets/misc/e-cell-date-edit.c:218 widgets/misc/e-dateedit.c:416
+#: widgets/misc/e-cell-date-edit.c:221 widgets/misc/e-dateedit.c:418
msgid "Now"
msgstr "������"
-#: widgets/misc/e-cell-date-edit.c:242
+#: widgets/misc/e-cell-date-edit.c:245
msgid "OK"
msgstr "��"
-#: widgets/misc/e-cell-date-edit.c:723
+#: widgets/misc/e-cell-date-edit.c:726
#, c-format
msgid "The time must be in the format: %s"
msgstr "����� ������ ���� � �������: %s"
-#: widgets/misc/e-clipped-label.c:107
+#: widgets/misc/e-clipped-label.c:112
msgid "..."
msgstr "..."
-#: widgets/misc/e-filter-bar.c:166
+#: widgets/misc/e-filter-bar.c:168
msgid "Save Search"
msgstr "��������� ���������� ������"
-#: widgets/misc/e-filter-bar.c:237
+#: widgets/misc/e-filter-bar.c:239
msgid "Advanced Search"
msgstr "����������� �����"
-#: widgets/misc/e-filter-bar.c:317
-msgid "Advanced ..."
-msgstr "�����������..."
+#: widgets/misc/e-filter-bar.h:101
+msgid "Save As..."
+msgstr "��������� ���..."
+
+#: widgets/misc/e-filter-bar.h:102
+msgid "Show All"
+msgstr "�������� ���"
+
+#: widgets/misc/e-filter-bar.h:103
+msgid "Edit..."
+msgstr "������..."
+
+#: widgets/misc/e-filter-bar.h:104
+msgid "Advanced..."
+msgstr "�����������..."
#: widgets/misc/e-messagebox.c:152
msgid "Information"
@@ -8714,42 +8949,10 @@ msgstr "���������"
msgid "Don't show this message again."
msgstr "�� ���������� ��� ��������� �����."
-#: widgets/misc/e-search-bar.c:148
+#: widgets/misc/e-search-bar.c:155
msgid "Sear_ch"
msgstr "�����"
-#: views/addressbook/galview.xml.h:1
-msgid "Adress Cards"
-msgstr "�������� ��������"
-
-#: views/addressbook/galview.xml.h:2
-msgid "By Company"
-msgstr "�� ��������"
-
-#: views/addressbook/galview.xml.h:3
-msgid "Phone List"
-msgstr "������ ���������"
-
-#: views/mail/galview.xml.h:1
-msgid "By Sender"
-msgstr "�� �����������"
-
-#: views/mail/galview.xml.h:2
-msgid "By Status"
-msgstr "�� ���������"
-
-#: views/mail/galview.xml.h:3
-msgid "By Subject"
-msgstr "�� ����"
-
-#: views/mail/galview.xml.h:4
-msgid "Messages"
-msgstr "���������"
-
-#: views/tasks/galview.xml.h:2
-msgid "With Category"
-msgstr "C ����������:"
-
#: wombat/GNOME_Evolution_Wombat.oaf.in.h:1
msgid "The Personal Addressbook Server"
msgstr "������ ������������ �������� ����"