Updated Norwegian (bokmål) translation.

2001-01-09  Kjartan Maraas  <kmaraas@gnome.org>

	* no.po: Updated Norwegian (bokmål) translation.

svn path=/trunk/; revision=7317

1 files changed, 1760 insertions, 1232 deletions

diff --git a/po/uk.po b/po/uk.po
index 2735b5cc6b..62311c17dc 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.1\n"
-"POT-Creation-Date: 2001-01-03 09:29+0200\n"
+"POT-Creation-Date: 2001-01-06 00:11+0100\n"
 "PO-Revision-Date: 2000-04-04 15:25+0200\n"
 "Last-Translator: Yuri Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -430,27 +430,10 @@ msgid "Could not read pilot's Address application block"
 msgstr ""
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: addressbook/contact-editor/categories-strings.h:7
-msgid "categories"
-msgstr "ËÁÔÅÇÏÒ¦§"
-
-#: addressbook/contact-editor/categories-strings.h:8
-msgid "Item(s) belong to these categories:"
-msgstr ""
-
-#: addressbook/contact-editor/categories-strings.h:9
-msgid "Available Categories:"
-msgstr "äÏÓÔÕÐΦ ËÁÔÅÇÏÒ¦§:"
-
-#.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/e-contact-editor-confirm-delete.glade.h:6
+#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:6
 msgid "Delete Contact?"
 msgstr "óÔÅÒÔÉ ËÏÎÔÁËÔ?"
 
@@ -464,7 +447,7 @@ msgid "_Add"
 msgstr "äÏÄÁÔÉ"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:53
+#: ui/evolution-event-editor.xml.h:108 ui/evolution-mail.xml.h:53
 msgid "_Delete"
 msgstr "óÔÅÒÔÉ"
 
@@ -478,12 +461,13 @@ msgid "New phone type"
 msgstr "îÏ×ÉÊ ÔÉÐ ÔÅÌÅÆÏÎÁ"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: po/tmp/event-editor-dialog.glade.h:7 po/tmp/filter.glade.h:6
-#: po/tmp/mail-config.glade.h:6
+#: addressbook/gui/component/addressbook-config.glade.h:6
+#: calendar/gui/event-editor-dialog.glade.h:7 filter/filter.glade.h:6
+#: mail/mail-config-druid.glade.h:10 mail/mail-config.glade.h:6
 msgid "Add"
 msgstr "äÏÄÁÔÉ"
 
@@ -524,7 +508,7 @@ msgid "_Mobile"
 msgstr "íϦÌØÎÉÊ ÔÅÌÅÆÏÎ"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1328
+#: addressbook/contact-editor/e-contact-editor.c:1336
 msgid "Primary Email"
 msgstr "ðÅÒ×ÉÎÎÁ Å-ÐÏÛÔÁ"
 
@@ -541,7 +525,7 @@ msgid "C_ontacts..."
 msgstr "ú×'ÑÚËÉ..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: po/tmp/task-editor-dialog.glade.h:8
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
 msgid "Ca_tegories..."
 msgstr "ëÁÔÅÇÏÒ¦§..."
 
@@ -558,7 +542,8 @@ msgid "_Address..."
 msgstr "áÄÒÅÓÁ..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: po/tmp/event-editor-dialog.glade.h:15
+#: calendar/gui/event-editor-dialog.glade.h:15
+#: mail/mail-config-druid.glade.h:33
 msgid "General"
 msgstr "úÁÇÁÌØÎÅ"
 
@@ -603,143 +588,143 @@ msgid "No_tes:"
 msgstr "îÏÔÁÔËÉ:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: po/tmp/task-editor-dialog.glade.h:13
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
 msgid "Details"
 msgstr "ðÏÄÒÏÂÉæ"
 
-#: addressbook/contact-editor/e-contact-editor.c:1266
+#: addressbook/contact-editor/e-contact-editor.c:1274
 msgid "Assistant"
 msgstr "ðÏͦÞÎÉË"
 
-#: addressbook/contact-editor/e-contact-editor.c:1267
-#: addressbook/contact-editor/e-contact-editor.c:1371
+#: addressbook/contact-editor/e-contact-editor.c:1275
+#: addressbook/contact-editor/e-contact-editor.c:1379
 msgid "Business"
 msgstr "òÏÂÏÞÁ"
 
-#: addressbook/contact-editor/e-contact-editor.c:1268
+#: addressbook/contact-editor/e-contact-editor.c:1276
 msgid "Business 2"
 msgstr "òÏÂÏÞÁ 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1269
+#: addressbook/contact-editor/e-contact-editor.c:1277
 msgid "Business Fax"
 msgstr "òÏÂÏÞÉÊ ÆÁËÓ"
 
-#: addressbook/contact-editor/e-contact-editor.c:1270
+#: addressbook/contact-editor/e-contact-editor.c:1278
 msgid "Callback"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1271
+#: addressbook/contact-editor/e-contact-editor.c:1279
 msgid "Car"
 msgstr "á×ÔÏ"
 
-#: addressbook/contact-editor/e-contact-editor.c:1272
+#: addressbook/contact-editor/e-contact-editor.c:1280
 msgid "Company"
 msgstr "ëÏÍÐÁΦÑ"
 
-#: addressbook/contact-editor/e-contact-editor.c:1273
-#: addressbook/contact-editor/e-contact-editor.c:1372
+#: addressbook/contact-editor/e-contact-editor.c:1281
+#: addressbook/contact-editor/e-contact-editor.c:1380
 msgid "Home"
 msgstr "äÏÍÁÛÎÑ"
 
-#: addressbook/contact-editor/e-contact-editor.c:1274
+#: addressbook/contact-editor/e-contact-editor.c:1282
 msgid "Home 2"
 msgstr "äÏÍÁÛÎÑ 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1275
+#: addressbook/contact-editor/e-contact-editor.c:1283
 msgid "Home Fax"
 msgstr "äÏÍÁÛÎ¦Ê ÆÁËÓ"
 
-#: addressbook/contact-editor/e-contact-editor.c:1276
+#: addressbook/contact-editor/e-contact-editor.c:1284
 msgid "ISDN"
 msgstr "ISDN"
 
-#: addressbook/contact-editor/e-contact-editor.c:1277
+#: addressbook/contact-editor/e-contact-editor.c:1285
 msgid "Mobile"
 msgstr "íϦÌØÎÉÊ"
 
-#: addressbook/contact-editor/e-contact-editor.c:1278
-#: addressbook/contact-editor/e-contact-editor.c:1373
-#: po/tmp/mail-config.glade.h:17
+#: addressbook/contact-editor/e-contact-editor.c:1286
+#: addressbook/contact-editor/e-contact-editor.c:1381
+#: mail/mail-config.glade.h:17
 msgid "Other"
 msgstr "¶ÎÛÁ"
 
-#: addressbook/contact-editor/e-contact-editor.c:1279
+#: addressbook/contact-editor/e-contact-editor.c:1287
 msgid "Other Fax"
 msgstr "¶ÎÛÉÊ ÆÁËÓ"
 
-#: addressbook/contact-editor/e-contact-editor.c:1280
+#: addressbook/contact-editor/e-contact-editor.c:1288
 msgid "Pager"
 msgstr "ðÅÊÄÖÅÒ"
 
-#: addressbook/contact-editor/e-contact-editor.c:1281
+#: addressbook/contact-editor/e-contact-editor.c:1289
 msgid "Primary"
 msgstr "ðÅÒ×ÉÎÎÉÊ"
 
-#: addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/contact-editor/e-contact-editor.c:1290
 msgid "Radio"
 msgstr "òÁĦÏ"
 
-#: addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/contact-editor/e-contact-editor.c:1291
 msgid "Telex"
 msgstr "ôÅÌÅËÓ"
 
-#: addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/contact-editor/e-contact-editor.c:1292
 msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1329
+#: addressbook/contact-editor/e-contact-editor.c:1337
 msgid "Email 2"
 msgstr "å-ÐÏÛÔÁ 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1330
+#: addressbook/contact-editor/e-contact-editor.c:1338
 msgid "Email 3"
 msgstr "å-ÐÏÛÔÁ 3"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/fulladdr.glade.h:6
+#: addressbook/contact-editor/fulladdr.glade.h:6
 msgid "Address _2:"
 msgstr "áÄÒÅÓÁ _2:"
 
-#: po/tmp/fulladdr.glade.h:7
+#: addressbook/contact-editor/fulladdr.glade.h:7
 msgid "Canada"
 msgstr "ëÁÎÁÄÁ"
 
-#: po/tmp/fulladdr.glade.h:8
+#: addressbook/contact-editor/fulladdr.glade.h:8
 msgid "Check Address"
 msgstr "ðÅÒÅצÒËÁ ÁÄÒÅÓÉ"
 
-#: po/tmp/fulladdr.glade.h:9
+#: addressbook/contact-editor/fulladdr.glade.h:9
 msgid "Countr_y:"
 msgstr "ëÒÁ§ÎÁ:"
 
-#: po/tmp/fulladdr.glade.h:10
+#: addressbook/contact-editor/fulladdr.glade.h:10
 msgid "Finland"
 msgstr "æ¦ÎÌÑÎĦÑ"
 
-#: po/tmp/fulladdr.glade.h:11
+#: addressbook/contact-editor/fulladdr.glade.h:11
 msgid "USA"
 msgstr "óûá"
 
-#: po/tmp/fulladdr.glade.h:12
+#: addressbook/contact-editor/fulladdr.glade.h:12
 msgid "_Address:"
 msgstr "áÄÒÅÓÁ:"
 
-#: po/tmp/fulladdr.glade.h:13
+#: addressbook/contact-editor/fulladdr.glade.h:13
 msgid "_City:"
 msgstr "í¦ÓÔÏ:"
 
-#: po/tmp/fulladdr.glade.h:14
+#: addressbook/contact-editor/fulladdr.glade.h:14
 msgid "_PO Box:"
 msgstr "á/ó:"
 
-#: po/tmp/fulladdr.glade.h:15
+#: addressbook/contact-editor/fulladdr.glade.h:15
 msgid "_State/Province:"
 msgstr "ûÔÁÔ/ÏÂÌÁÓÔØ:"
 
-#: po/tmp/fulladdr.glade.h:16
+#: addressbook/contact-editor/fulladdr.glade.h:16
 msgid "_ZIP Code:"
 msgstr "¶ÎÄÅËÓ:"
 
@@ -798,24 +783,29 @@ msgstr "ðÒ¦Ú×ÉÝÅ:"
 msgid "_Suffix:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:230
+#: addressbook/gui/component/addressbook.c:231
 msgid "As _Minicards"
 msgstr "ñË _Minicards"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/addressbook.c:236
-#: po/tmp/evolution-addressbook.xml.h:6
+#: addressbook/gui/component/addressbook.c:237
+#: ui/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:347
+#: addressbook/gui/component/addressbook.c:374
+#, fuzzy, c-format
+msgid "Enter password for %s"
+msgstr "÷×ÅĦÔØ ÐÁÒÏÌØ NNTP ÄÌÑ %s@%s"
+
+#: addressbook/gui/component/addressbook.c:402
 msgid "Unable to open addressbook"
 msgstr "îÅ ×ÄÁÌÏÓÑ ×¦ÄËÒÉÔÉ ÁÄÒÅÓÎÕ ËÎÉÇÕ"
 
-#: addressbook/gui/component/addressbook.c:352
+#: addressbook/gui/component/addressbook.c:407
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -827,48 +817,212 @@ msgid ""
 "OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:473 mail/folder-browser.c:136
+#: addressbook/gui/component/addressbook.c:528 mail/folder-browser.c:219
 msgid "Show All"
 msgstr "ðÏËÁÚÁÔÉ ×ÓÅ"
 
-#: addressbook/gui/component/addressbook.c:475 mail/folder-browser.c:138
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 msgid "Advanced..."
 msgstr "äÏÄÁÔËÏ×Ï..."
 
-#: addressbook/gui/component/addressbook.c:505
+#: addressbook/gui/component/addressbook.c:560
 msgid "Any field contains"
 msgstr "âÕÄØ-ÑËÅ ÐÏÌŠͦÓÔÉÔØ"
 
-#: addressbook/gui/component/addressbook.c:506
+#: addressbook/gui/component/addressbook.c:561
 msgid "Name contains"
 msgstr "¶Í'Ñ Í¦ÓÔÉÔØ"
 
-#: addressbook/gui/component/addressbook.c:507
+#: addressbook/gui/component/addressbook.c:562
 msgid "Email contains"
 msgstr "åÌÅËÔÒÏÎÎÁ ÁÄÒÅÓÁ ͦÓÔÉÔØ"
 
-#: addressbook/gui/component/addressbook.c:593
+#: addressbook/gui/component/addressbook.c:648
 msgid "The URI that the Folder Browser will display"
 msgstr "URI ÔÅËÉ, ÝÏ ÂÕÄŠצÄÏÂÒÁÖÅÎÏ ÐÅÒÅÇÌÑÄÁÞÅÍ"
 
+#: addressbook/gui/component/addressbook-storage.c:95
+#, fuzzy
+msgid "Other Contacts"
+msgstr "óÔÅÒÔÉ ËÏÎÔÁËÔ?"
+
+#: addressbook/gui/component/addressbook-config.c:139
+#, fuzzy
+msgid "LDAP Server"
+msgstr "óÅÒ×ÅÒ:"
+
+#: addressbook/gui/component/addressbook-config.c:141
+#, fuzzy
+msgid "File"
+msgstr "æÁÊÌ"
+
+#: addressbook/gui/component/addressbook-config.c:144
+#, fuzzy
+msgid "Unknown addressbook type"
+msgstr "îÅ ×ÄÁÌÏÓÑ ×¦ÄËÒÉÔÉ ÁÄÒÅÓÎÕ ËÎÉÇÕ"
+
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "None (anonymous mode)"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:155
+#: camel/providers/imap/camel-imap-store.c:246
+#: camel/providers/nntp/camel-nntp-store.c:293
+#: camel/providers/pop3/camel-pop3-store.c:148
+msgid "Password"
+msgstr "ðÁÒÏÌØ"
+
+#: addressbook/gui/component/addressbook-config.c:157
+msgid "SASL"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:160
+#, fuzzy
+msgid "Unknown auth type"
+msgstr "îÅצÄÏÍÁ ÐÏÍÉÌËÁ"
+
+#: addressbook/gui/component/addressbook-config.c:169
+#, fuzzy
+msgid "Base"
+msgstr "÷ÓÔÁ×ÉÔÉ"
+
+#: addressbook/gui/component/addressbook-config.c:171
+msgid "One"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:173
+#, fuzzy
+msgid "Subtree"
+msgstr "äÖÅÒÅÌÏ"
+
+#: addressbook/gui/component/addressbook-config.c:176
+msgid "Unknown scope type"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:309
+msgid "Bind DN:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:311
+#: mail/mail-config-gui.c:968
+msgid "Remember this password"
+msgstr "úÁÐÁÍ'ÑÔÁÔÉ ÃÅÊ ÐÁÒÏÌØ"
+
+#: addressbook/gui/component/addressbook-config.c:360
+#: mail/mail-config-druid.glade.h:34
+#, fuzzy
+msgid "Host:"
+msgstr "çÏÄÉÎÉ"
+
+#: addressbook/gui/component/addressbook-config.c:361
+#, fuzzy
+msgid "Port:"
+msgstr "ðÒ¦ÏÒÉÔÅÔ:"
+
+#: addressbook/gui/component/addressbook-config.c:364
+msgid "Root DN:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:384
+#, fuzzy
+msgid "Search Scope:"
+msgstr "ðÏÛÕË"
+
+#: addressbook/gui/component/addressbook-config.c:438
+#: mail/mail-config-druid.glade.h:14 mail/mail-config-gui.c:943
+msgid "Authentication:"
+msgstr "áÕÔÅÎƦËÁæÑ:"
+
+#: addressbook/gui/component/addressbook-config.c:455
+#: mail/mail-config-druid.glade.h:52 mail/mail-config-gui.c:934
+msgid "Path:"
+msgstr "ûÌÑÈ:"
+
+#: addressbook/gui/component/addressbook-config.c:460
+#, fuzzy
+msgid "Create path if it doesn't exist."
+msgstr "ãØÏÇÏ ÆÁÊÌÕ ÎÅ ¦ÓÎÕ¤."
+
+#: addressbook/gui/component/addressbook-config.c:593
+#, fuzzy
+msgid "Edit Addressbook"
+msgstr "úÂÅÒÅÇÔÉ Õ ÁÄÒÅÓÎ¦Ê ËÎÉÚ¦"
+
+#: addressbook/gui/component/addressbook-config.c:595
+#, fuzzy
+msgid "Add Addressbook"
+msgstr "úÂÅÒÅÇÔÉ Õ ÁÄÒÅÓÎ¦Ê ËÎÉÚ¦"
+
+#: addressbook/gui/component/addressbook-config.c:611
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:616
+#: mail/mail-config-druid.glade.h:45
+#, fuzzy
+msgid "Name:"
+msgstr ""
+"\n"
+"¶Í'Ñ: "
+
+#: addressbook/gui/component/addressbook-config.c:617
+#: composer/e-msg-composer-attachment.glade.h:7
+msgid "Description:"
+msgstr "ïÐÉÓ:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:7
+#, fuzzy
+msgid "Addressbook Sources"
+msgstr "äÏÄÁÔÉ ÄÖÅÒÅÌÏ"
+
+#: addressbook/gui/component/addressbook-config.glade.h:8
+#: calendar/gui/e-calendar-table.c:342
+#: calendar/gui/event-editor-dialog.glade.h:12 filter/filter.glade.h:7
+#: filter/libfilter-i18n.h:10 mail/folder-browser.c:685
+#: mail/mail-config-druid.glade.h:25 mail/mail-config.glade.h:8
+#: mail/mail-view.c:150 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-event-editor.xml.h:19 ui/evolution-mail.xml.h:11
+msgid "Delete"
+msgstr "óÔÅÒÔÉ"
+
+#: addressbook/gui/component/addressbook-config.glade.h:9
+#: filter/filter.glade.h:8 mail/folder-browser.c:671
+#: mail/mail-config-druid.glade.h:29 mail/mail-config.glade.h:9
+msgid "Edit"
+msgstr "÷ÉÐÒÁ×ÉÔÉ"
+
+#: addressbook/gui/component/addressbook-config.glade.h:10
+#, fuzzy
+msgid "Name"
+msgstr ""
+"\n"
+"¶Í'Ñ: "
+
+#: addressbook/gui/component/addressbook-config.glade.h:11
+msgid "URI"
+msgstr ""
+
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/select-names.glade.h:6
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "Find..."
 msgstr "ûÕËÁÔÉ..."
 
-#: po/tmp/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "Message Recipients"
 msgstr "áÄÒÅÓÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ"
 
-#: po/tmp/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "Select Names"
 msgstr "÷ÉÂÒÁÔÉ ÎÁÚ×É"
 
-#: po/tmp/select-names.glade.h:9
-msgid "Select name from List:"
+#: addressbook/gui/component/select-names/select-names.glade.h:9
+#, fuzzy
+msgid "Select name from:"
 msgstr "÷ÉÂÅÒ¦ÔØ ÎÁÚ×Õ Ú ÓÐÉÓËÕ:"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:147
@@ -877,119 +1031,119 @@ msgid "Search"
 msgstr "ðÏÛÕË"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/alphabet.glade.h:6
+#: addressbook/gui/widgets/alphabet.glade.h:6
 msgid "123"
 msgstr "123"
 
-#: po/tmp/alphabet.glade.h:7
+#: addressbook/gui/widgets/alphabet.glade.h:7
 msgid "a"
 msgstr ""
 
-#: po/tmp/alphabet.glade.h:8
+#: addressbook/gui/widgets/alphabet.glade.h:8
 msgid "b"
 msgstr ""
 
-#: po/tmp/alphabet.glade.h:9
+#: addressbook/gui/widgets/alphabet.glade.h:9
 msgid "c"
 msgstr ""
 
-#: po/tmp/alphabet.glade.h:10
+#: addressbook/gui/widgets/alphabet.glade.h:10
 msgid "d"
 msgstr ""
 
-#: po/tmp/alphabet.glade.h:11
+#: addressbook/gui/widgets/alphabet.glade.h:11
 msgid "e"
 msgstr ""
 
-#: po/tmp/alphabet.glade.h:12
+#: addressbook/gui/widgets/alphabet.glade.h:12
 msgid "f"
 msgstr ""
 
-#: po/tmp/alphabet.glade.h:13
+#: addressbook/gui/widgets/alphabet.glade.h:13
 msgid "g"
 msgstr ""
 
-#: po/tmp/alphabet.glade.h:14
+#: addressbook/gui/widgets/alphabet.glade.h:14
 msgid "h"
 msgstr ""
 
-#: po/tmp/alphabet.glade.h:15
+#: addressbook/gui/widgets/alphabet.glade.h:15
 msgid "i"
 msgstr ""
 
-#: po/tmp/alphabet.glade.h:16
+#: addressbook/gui/widgets/alphabet.glade.h:16
 msgid "j"
 msgstr ""
 
-#: po/tmp/alphabet.glade.h:17
+#: addressbook/gui/widgets/alphabet.glade.h:17
 msgid "k"
 msgstr ""
 
-#: po/tmp/alphabet.glade.h:18
+#: addressbook/gui/widgets/alphabet.glade.h:18
 msgid "l"
 msgstr ""
 
-#: po/tmp/alphabet.glade.h:19
+#: addressbook/gui/widgets/alphabet.glade.h:19
 msgid "m"
 msgstr ""
 
-#: po/tmp/alphabet.glade.h:20
+#: addressbook/gui/widgets/alphabet.glade.h:20
 msgid "n"
 msgstr ""
 
-#: po/tmp/alphabet.glade.h:21
+#: addressbook/gui/widgets/alphabet.glade.h:21
 msgid "o"
 msgstr ""
 
-#: po/tmp/alphabet.glade.h:22
+#: addressbook/gui/widgets/alphabet.glade.h:22
 msgid "p"
 msgstr ""
 
-#: po/tmp/alphabet.glade.h:23
+#: addressbook/gui/widgets/alphabet.glade.h:23
 msgid "q"
 msgstr ""
 
-#: po/tmp/alphabet.glade.h:24
+#: addressbook/gui/widgets/alphabet.glade.h:24
 msgid "r"
 msgstr ""
 
-#: po/tmp/alphabet.glade.h:25
+#: addressbook/gui/widgets/alphabet.glade.h:25
 msgid "s"
 msgstr ""
 
-#: po/tmp/alphabet.glade.h:26
+#: addressbook/gui/widgets/alphabet.glade.h:26
 msgid "t"
 msgstr ""
 
-#: po/tmp/alphabet.glade.h:27
+#: addressbook/gui/widgets/alphabet.glade.h:27
 msgid "u"
 msgstr ""
 
-#: po/tmp/alphabet.glade.h:28
+#: addressbook/gui/widgets/alphabet.glade.h:28
 msgid "v"
 msgstr ""
 
-#: po/tmp/alphabet.glade.h:29
+#: addressbook/gui/widgets/alphabet.glade.h:29
 msgid "w"
 msgstr ""
 
-#: po/tmp/alphabet.glade.h:30
+#: addressbook/gui/widgets/alphabet.glade.h:30
 msgid "x"
 msgstr ""
 
-#: po/tmp/alphabet.glade.h:31
+#: addressbook/gui/widgets/alphabet.glade.h:31
 msgid "y"
 msgstr ""
 
-#: po/tmp/alphabet.glade.h:32
+#: addressbook/gui/widgets/alphabet.glade.h:32
 msgid "z"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.c:451
-#: addressbook/gui/widgets/e-minicard.c:339
+#: addressbook/gui/widgets/e-minicard.c:374
 msgid "Save as VCard"
 msgstr "úÂÅÒÅÇÔÉ ÑË VCard"
 
@@ -1007,174 +1161,175 @@ msgid ""
 msgstr ""
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/e-contact-print.glade.h:6
+#: addressbook/printing/e-contact-print.glade.h:6
 msgid "10 pt. Tahoma"
 msgstr "Tahoma 10 ÐÔ"
 
-#: po/tmp/e-contact-print.glade.h:7
+#: addressbook/printing/e-contact-print.glade.h:7
 msgid "8 pt. Tahoma"
 msgstr "Tahoma 8 ÐÔ"
 
-#: po/tmp/e-contact-print.glade.h:8
+#: addressbook/printing/e-contact-print.glade.h:8
 msgid "Blank forms at end:"
 msgstr ""
 
-#: po/tmp/e-contact-print.glade.h:9
+#: addressbook/printing/e-contact-print.glade.h:9
 msgid "Body"
 msgstr "ô¦ÌÏ"
 
-#: po/tmp/e-contact-print.glade.h:10
+#: addressbook/printing/e-contact-print.glade.h:10
 msgid "Bottom:"
 msgstr "÷ÎÉÚÕ:"
 
-#: po/tmp/e-contact-print.glade.h:11
+#: addressbook/printing/e-contact-print.glade.h:11
 msgid "Dimensions:"
 msgstr "òÏÚͦÒÉ:"
 
-#: po/tmp/e-contact-print.glade.h:12
+#: addressbook/printing/e-contact-print.glade.h:12
 msgid "Font..."
 msgstr "ûÒÉÆÔ..."
 
-#: po/tmp/e-contact-print.glade.h:13
+#: addressbook/printing/e-contact-print.glade.h:13
 msgid "Fonts"
 msgstr "ûÒÉÆÔÉ"
 
-#: po/tmp/e-contact-print.glade.h:14
+#: addressbook/printing/e-contact-print.glade.h:14
 msgid "Footer:"
 msgstr "îÉÖÎ¦Ê ËÏÌÏÎÔÉÔÕÌ:"
 
-#: po/tmp/e-contact-print.glade.h:15
+#: addressbook/printing/e-contact-print.glade.h:15
 msgid "Format"
 msgstr "æÏÒÍÁÔ"
 
-#: po/tmp/e-contact-print.glade.h:16
+#: addressbook/printing/e-contact-print.glade.h:16
 msgid "Header"
 msgstr "÷ÅÒÈÎ¦Ê ËÏÌÏÎÔÉÔÕÌ"
 
-#: po/tmp/e-contact-print.glade.h:17
+#: addressbook/printing/e-contact-print.glade.h:17
 msgid "Header/Footer"
 msgstr "ëÏÌÏÎÔÉÔÕÌÉ"
 
-#: po/tmp/e-contact-print.glade.h:18
+#: addressbook/printing/e-contact-print.glade.h:18
 msgid "Headings"
 msgstr "÷ÅÒÈΦ ËÏÌÏÎÔÉÔÕÌÉ"
 
-#: po/tmp/e-contact-print.glade.h:19
+#: addressbook/printing/e-contact-print.glade.h:19
 msgid "Headings for each letter"
 msgstr "÷ÅÒÈΦ ËÏÌÏÎÔÉÔÕÌÉ ÄÌÑ ËÏÖÎÏÇÏ ÌÉÓÔÁ"
 
-#: po/tmp/e-contact-print.glade.h:20
+#: addressbook/printing/e-contact-print.glade.h:20
 msgid "Height:"
 msgstr "÷ÉÓÏÔÁ:"
 
-#: po/tmp/e-contact-print.glade.h:21
+#: addressbook/printing/e-contact-print.glade.h:21
 msgid "Immediately follow each other"
 msgstr "ïÄÉÎ ÚÁ ÄÒÕÇÉÍ"
 
-#: po/tmp/e-contact-print.glade.h:22
+#: addressbook/printing/e-contact-print.glade.h:22
 msgid "Include:"
 msgstr "÷ËÌÀÞÉÔÉ:"
 
-#: po/tmp/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23
 msgid "Landscape"
 msgstr "áÌØÂÏÍÎÁ"
 
-#: po/tmp/e-contact-print.glade.h:24
+#: addressbook/printing/e-contact-print.glade.h:24
 msgid "Left:"
 msgstr "ì¦×ÏÒÕÞ:"
 
-#: po/tmp/e-contact-print.glade.h:25
+#: addressbook/printing/e-contact-print.glade.h:25
 msgid "Letter tabs on side"
 msgstr "úÁËÌÁÄËÉ Ì¦ÔÅÒ ÚÂÏËÕ"
 
-#: po/tmp/e-contact-print.glade.h:26
+#: addressbook/printing/e-contact-print.glade.h:26
 msgid "Margins"
 msgstr "ðÏÌÑ"
 
-#: po/tmp/e-contact-print.glade.h:27
+#: addressbook/printing/e-contact-print.glade.h:27
 msgid "Number of columns:"
 msgstr "ë¦ÌØ˦ÓÔØ ÓÔÏ×ÐÞÉ˦×:"
 
-#: po/tmp/e-contact-print.glade.h:28
+#: addressbook/printing/e-contact-print.glade.h:28
 msgid "Options"
 msgstr "ðÁÒÁÍÅÔÒÉ"
 
-#: po/tmp/e-contact-print.glade.h:29
+#: addressbook/printing/e-contact-print.glade.h:29
 msgid "Orientation"
 msgstr "ïÒ¦¤ÎÔÁæÑ"
 
-#: po/tmp/e-contact-print.glade.h:30
+#: addressbook/printing/e-contact-print.glade.h:30
 msgid "Page"
 msgstr "óÔÏÒ¦ÎËÁ"
 
-#: po/tmp/e-contact-print.glade.h:31
+#: addressbook/printing/e-contact-print.glade.h:31
 msgid "Page Setup:"
 msgstr "ðÁÒÁÍÅÔÒÉ ÓÔÏÒ¦ÎËÉ:"
 
-#: po/tmp/e-contact-print.glade.h:32
+#: addressbook/printing/e-contact-print.glade.h:32
 msgid "Paper"
 msgstr "ðÁЦÒ"
 
-#: po/tmp/e-contact-print.glade.h:33
+#: addressbook/printing/e-contact-print.glade.h:33
 msgid "Paper source:"
 msgstr "äÖÅÒÅÌÏ ÐÁÐÅÒÕ:"
 
-#: po/tmp/e-contact-print.glade.h:34
+#: addressbook/printing/e-contact-print.glade.h:34
 msgid "Portrait"
 msgstr "ëÎÉÖÎÁ"
 
-#: po/tmp/e-contact-print.glade.h:35
+#: addressbook/printing/e-contact-print.glade.h:35
 msgid "Preview:"
 msgstr "ðÅÒÅÇÌÑÄ:"
 
-#: po/tmp/e-contact-print.glade.h:36
+#: addressbook/printing/e-contact-print.glade.h:36
 msgid "Print using gray shading"
 msgstr "äÒÕË Ú ×ÉËÏÒÉÓÔÁÎÎÑÍ ÎÁЦ×ÔÏΦ×"
 
-#: po/tmp/e-contact-print.glade.h:37
+#: addressbook/printing/e-contact-print.glade.h:37
 msgid "Reverse on even pages"
 msgstr "ïÂÅÒÔÁÔÉ ÎÁ ÐÁÒÎÉÈ ÓÔÏÒ¦ÎËÁÈ"
 
-#: po/tmp/e-contact-print.glade.h:38
+#: addressbook/printing/e-contact-print.glade.h:38
 msgid "Right:"
 msgstr "ðÒÁ×ÏÒÕÞ:"
 
-#: po/tmp/e-contact-print.glade.h:39
+#: addressbook/printing/e-contact-print.glade.h:39
 msgid "Sections:"
 msgstr "òÏÚĦÌÉ:"
 
-#: po/tmp/e-contact-print.glade.h:40
+#: addressbook/printing/e-contact-print.glade.h:40
 msgid "Shading"
 msgstr "ð¦×ÔÏÎÉ"
 
-#: po/tmp/e-contact-print.glade.h:41
+#: addressbook/printing/e-contact-print.glade.h:41
 msgid "Size:"
 msgstr "òÏÚͦÒ:"
 
-#: po/tmp/e-contact-print.glade.h:42
+#: addressbook/printing/e-contact-print.glade.h:42
 msgid "Start on a new page"
 msgstr "ðÏÞÉÎÁÔÉ Ú ÎÏ×ϧ ÓÔÏÒ¦ÎËÉ"
 
-#: po/tmp/e-contact-print.glade.h:43
+#: addressbook/printing/e-contact-print.glade.h:43
 msgid "Style name:"
 msgstr "îÁÚ×Á ÓÔÉÌÀ:"
 
-#: po/tmp/e-contact-print.glade.h:44
+#: addressbook/printing/e-contact-print.glade.h:44
 msgid "Top:"
 msgstr "÷ÇÏÒ¦:"
 
-#: po/tmp/e-contact-print.glade.h:45
+#: addressbook/printing/e-contact-print.glade.h:45
+#: mail/mail-config-druid.glade.h:75
 msgid "Type:"
 msgstr "ôÉÐ:"
 
-#: po/tmp/e-contact-print.glade.h:46
+#: addressbook/printing/e-contact-print.glade.h:46
 msgid "Width:"
 msgstr "ûÉÒÉÎÁ:"
 
-#: po/tmp/e-contact-print.glade.h:47
+#: addressbook/printing/e-contact-print.glade.h:47
 msgid "label26"
 msgstr "label26"
 
@@ -1209,60 +1364,95 @@ msgstr ""
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:60
-msgid "Outline:"
+#.
+#. * Translatable strings file generated by xml-i18n-extract.
+#. * DO NOT compile this file as part of your application.
+#.
+#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:6
+msgid "A sample Bonobo control which displays an calendar."
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:61
-msgid "Headings:"
-msgstr "÷ÅÒÈΦ ËÏÌÏÎÔÉÔÕÌÉ:"
+#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:7
+msgid "Factory for the sample Calendar control"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:62
-msgid "Empty days:"
+#.
+#. * Translatable strings file generated by xml-i18n-extract.
+#. * DO NOT compile this file as part of your application.
+#.
+#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:6
+msgid "Calendar Repository"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:63
-msgid "Appointments:"
-msgstr "úÕÓÔÒ¦Þ¦:"
+#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:7
+#, fuzzy
+msgid "Calendar Server"
+msgstr "ëÁÌÅÎÄÁÒ"
 
-#: calendar/gui/calendar-commands.c:64
-msgid "Highlighted day:"
+#.
+#. * Translatable strings file generated by xml-i18n-extract.
+#. * DO NOT compile this file as part of your application.
+#.
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+msgid "Evolution calendar executive summary component."
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:65
-msgid "Day numbers:"
-msgstr "þÉÓÌÁ ÄΦ×:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "ëÁÎÁÌ ËÁÌÅÎÄÁÒÑ Evolution"
 
-#: calendar/gui/calendar-commands.c:66
-msgid "Current day's number:"
-msgstr "þÉÓÌÏ ÐÏÔÏÞÎÏÇÏ ÄÎÑ:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Evolution component for handling the calendar."
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:67
-msgid "To-Do item that is not yet due:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+msgid "Factory for the Calendar Summary component."
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:68
-msgid "To-Do item that is due today:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#, fuzzy
+msgid "Factory for the Evolution calendar component."
+msgstr "îÅ ×ÄÁÌÏÓÑ ¦Î¦Ã¦Á̦ÚÕ×ÁÔÉ ÐÏÛÔÏ×ÉÊ ËÏÍÐÏÎÅÎÔ Evolutuion."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+msgid "Factory for the calendar iTip view control"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:69
-msgid "To-Do item that is overdue:"
+#: calendar/gui/alarm-notify.c:585 calendar/gui/alarm-notify.c:884
+#: calendar/gui/alarm-notify.c:940
+msgid "Reminder of your appointment at "
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:354
+#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:8
+msgid "Snooze"
+msgstr "óÏÎ"
+
+#. Idea: we need Snooze option :-)
+#: calendar/gui/alarm-notify.c:889 calendar/gui/alarm-notify.c:944
+#: mail/mail-search-dialogue.c:104
+msgid "Ok"
+msgstr "çÁÒÁÚÄ"
+
+#: calendar/gui/calendar-commands.c:229
 msgid "File not found"
 msgstr "æÁÊÌÕ ÎÅ ÚÎÁÊÄÅÎÏ"
 
-#: calendar/gui/calendar-commands.c:378
+#: calendar/gui/calendar-commands.c:253
 msgid "Open calendar"
 msgstr "÷¦ÄËÒÉÔÉ ËÁÌÅÎÄÁÒ"
 
-#: calendar/gui/calendar-commands.c:417
+#: calendar/gui/calendar-commands.c:295
 msgid "Save calendar"
 msgstr "úÂÅÒÅÇÔÉ ËÁÌÅÎÄÁÒ"
 
+#: calendar/gui/calendar-commands.c:432
+msgid ""
+"Could not create the calendar view.  Please check your ORBit and OAF setup."
+msgstr ""
+
 #. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:283
+#: calendar/gui/calendar-model.c:284
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
@@ -1270,57 +1460,60 @@ msgstr ""
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:287 calendar/gui/calendar-model.c:737
+#: calendar/gui/calendar-model.c:288 calendar/gui/calendar-model.c:738
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr ""
 
 #. strftime format of a weekday, a date and a time,
 #. in 12-hour format.
-#: calendar/gui/calendar-model.c:291 calendar/gui/calendar-model.c:740
+#: calendar/gui/calendar-model.c:292 calendar/gui/calendar-model.c:741
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:345 po/tmp/task-editor-dialog.glade.h:21
+#: calendar/gui/calendar-model.c:346
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:348 po/tmp/task-editor-dialog.glade.h:20
+#: calendar/gui/calendar-model.c:349
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
 msgid "Private"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:351 po/tmp/task-editor-dialog.glade.h:11
+#: calendar/gui/calendar-model.c:352
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:354 calendar/gui/calendar-model.c:522
+#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:523
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:442
+#: calendar/gui/calendar-model.c:443
 msgid "N"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:442
+#: calendar/gui/calendar-model.c:443
 msgid "S"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:444
+#: calendar/gui/calendar-model.c:445
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:444
+#: calendar/gui/calendar-model.c:445
 msgid "W"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:516
+#: calendar/gui/calendar-model.c:517
 msgid "Transparent"
 msgstr "ðÒÏÚÏÒÉÊ"
 
-#: calendar/gui/calendar-model.c:519
+#: calendar/gui/calendar-model.c:520
 msgid "Opaque"
 msgstr "îÅÐÒÏÚÏÒÉÊ"
 
-#: calendar/gui/calendar-model.c:745
+#: calendar/gui/calendar-model.c:746
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1332,7 +1525,7 @@ msgstr ""
 "%s"
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:846 calendar/gui/calendar-model.c:894
+#: calendar/gui/calendar-model.c:847 calendar/gui/calendar-model.c:895
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
 #: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
@@ -1340,27 +1533,27 @@ msgstr "%d/%m/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:864
+#: calendar/gui/calendar-model.c:865
 msgid "%I:%M:%S %p%n"
 msgstr "%I:%M:%S %p%n"
 
 #. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:867
+#: calendar/gui/calendar-model.c:868
 msgid "%H:%M:%S%n"
 msgstr "%H:%M:%S%n"
 
 #. strptime format for time of day, without seconds, 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:871
+#: calendar/gui/calendar-model.c:872
 msgid "%I:%M %p%n"
 msgstr "%I:%M %p%n"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:874
+#: calendar/gui/calendar-model.c:875
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
-#: calendar/gui/calendar-model.c:994
+#: calendar/gui/calendar-model.c:995
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1370,14 +1563,37 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1034
+#: calendar/gui/calendar-model.c:1035
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "úÎÁÞÅÎÎÑ ×¦ÄÓÏÔËÁ ÍÁ¤ ÂÕÔÉ Í¦Ö 0 ÔÁ 100, ×ËÌÀÞÎÏ"
 
-#: calendar/gui/calendar-model.c:1074
+#: calendar/gui/calendar-model.c:1075
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "úÎÁÞÅÎÎÑ ÐÒ¦ÏÒÉÔÅÔÕ ÍÁ¤ ÂÕÔÉ Í¦Ö 1 ÔÁ 9, ×ËÌÀÞÎÏ"
 
+#: calendar/gui/calendar-summary.c:81
+#, fuzzy
+msgid "%A, %e %B %Y"
+msgstr "%A, %d %B %Y"
+
+#: calendar/gui/calendar-summary.c:224
+#, fuzzy
+msgid "<b>Error loading calendar</b>"
+msgstr "ðÏÍÉÌËÁ ÚÁ×ÁÎÔÁÖÅÎÎÑ ÆÁÊÌÕ: %s"
+
+#: calendar/gui/calendar-summary.c:229
+msgid "<b>Error loading calendar:<br>Calendar in use."
+msgstr ""
+
+#: calendar/gui/calendar-summary.c:235
+msgid "<b>Error loading calendar:<br>Method not supported"
+msgstr ""
+
+#: calendar/gui/calendar-summary.c:293
+#, fuzzy
+msgid "Loading Calendar"
+msgstr "îÁÄÒÕËÕ×ÁÔÉ ËÁÌÅÎÄÁÒ"
+
 #: calendar/gui/control-factory.c:125
 msgid "The URI that the calendar will display"
 msgstr "URI, ÑËÉÊ ×¦ÄÏÂÒÁÚÉÔØ ËÁÌÅÎÄÁÒ"
@@ -1395,362 +1611,390 @@ msgid "No summary available."
 msgstr ""
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/alarm-notify.glade.h:6 po/tmp/evolution-contact-editor.xml.h:6
-#: po/tmp/evolution-event-editor.xml.h:13
-#: po/tmp/evolution-message-composer.xml.h:8
-#: po/tmp/evolution-subscribe.xml.h:7
+#: calendar/gui/dialogs/alarm-notify.glade.h:6
+#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:13
+#: ui/evolution-message-composer.xml.h:8 ui/evolution-subscribe.xml.h:7
 msgid "Close"
 msgstr "úÁËÒÉÔÉ"
 
-#: po/tmp/alarm-notify.glade.h:7
+#: calendar/gui/dialogs/alarm-notify.glade.h:7
 msgid "Edit appointment"
 msgstr "÷ÉÐÒÁ×ÉÔÉ ÚÕÓÔÒ¦Þ"
 
-#: calendar/gui/gnome-cal.c:1333 po/tmp/alarm-notify.glade.h:8
-msgid "Snooze"
-msgstr "óÏÎ"
-
-#: po/tmp/alarm-notify.glade.h:9
+#: calendar/gui/dialogs/alarm-notify.glade.h:9
 msgid "Snooze time (minutes)"
 msgstr "þÁÓ ÓÎÕ (× È×ÉÌÉÎÁÈ)"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/cal-prefs-dialog.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
 msgid "05 minutes"
 msgstr "05 È×ÉÌÉÎ"
 
-#: po/tmp/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "10 minutes"
 msgstr "10 È×ÉÌÉÎ"
 
-#: po/tmp/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "12 hour (am/pm)"
 msgstr "12 ÇÏÄÉÎ (ÄÐ/ÐÐ)"
 
-#: po/tmp/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "15 minutes"
 msgstr "15 È×ÉÌÉÎ"
 
-#: po/tmp/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "24 hour"
 msgstr "24 ÇÏÄÉÎÉ"
 
-#: po/tmp/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "30 minutes"
 msgstr "30 È×ÉÌÉÎ"
 
-#: po/tmp/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "60 minutes"
 msgstr "60 È×ÉÌÉÎ"
 
-#: po/tmp/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Alarms timeout after"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Audio Alarms"
 msgstr "ú×ÕËÏצ ÓÉ­ÎÁÌÉ"
 
-#: po/tmp/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Beep when alarm windows appear."
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Calendar"
 msgstr "ëÁÌÅÎÄÁÒ"
 
-#: po/tmp/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Calendar Preferences"
 msgstr "ðÁÒÁÍÅÔÒÉ ËÁÌÅÎÄÁÒÑ"
 
-#: po/tmp/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Colors"
 msgstr "ëÏÌØÏÒÉ"
 
-#: po/tmp/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Compress weekends"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Date navigator options"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Defaults"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Display options"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Due Date"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "Enable snoozing for"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "End of day:"
 msgstr "ë¦ÎÅÃØ ÄÎÑ:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:26
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "First day of week:"
 msgstr "ðÅÒÛÉÊ ÄÅÎØ ÔÉÖÎÑ:"
 
-#: calendar/gui/gnome-month-item.c:741 po/tmp/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/gnome-month-item.c:741
 msgid "Fri"
 msgstr "ðÔÎ"
 
-#: calendar/gui/event-editor.c:437 po/tmp/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/event-editor.c:433
 msgid "Friday"
 msgstr "ð'ÑÔÎÉÃÑ"
 
-#: po/tmp/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Highlight"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "Items Due Today"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "Items Due Today:"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Items Not Yet Due"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Items Not Yet Due:"
 msgstr ""
 
-#: calendar/gui/gnome-month-item.c:737 po/tmp/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/gnome-month-item.c:737
 msgid "Mon"
 msgstr "ðÎÄ"
 
-#: calendar/gui/event-editor.c:433 po/tmp/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/event-editor.c:429
 msgid "Monday"
 msgstr "ðÏÎÅĦÌÏË"
 
-#: po/tmp/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "Overdue Items"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Overdue Items:"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Pick a color"
 msgstr "÷ÉÂ¦Ò ËÏÌØÏÒÕ"
 
-#: filter/libfilter-i18n.h:15 po/tmp/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39 filter/libfilter-i18n.h:31
 msgid "Priority"
 msgstr "ðÒ¦ÏÒÉÔÅÔ"
 
-#: po/tmp/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Remind me of all appointments"
 msgstr "îÁÇÁÄÕ×ÁÔÉ ÐÒÏ ×Ó¦ ÚÕÓÔÒ¦Þ¦"
 
-#: po/tmp/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Reminders"
 msgstr "îÁÇÁÄÕ×ÁÎÎÑ"
 
-#: calendar/gui/gnome-month-item.c:742 po/tmp/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/gnome-month-item.c:742
 msgid "Sat"
 msgstr "óÂÔ"
 
-#: calendar/gui/event-editor.c:438 po/tmp/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/event-editor.c:434
 msgid "Saturday"
 msgstr "óÕÂÏÔÁ"
 
-#: po/tmp/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Show"
 msgstr "ðÏËÁÚÁÔÉ"
 
-#: po/tmp/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "Show appointment end times"
 msgstr "ðÏËÁÚÁÔÉ ÞÁÓ ÚÁ×ÅÒÛÅÎÎÑ ÚÕÓÔÒ¦ÞÅÊ"
 
-#: po/tmp/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Show week numbers"
 msgstr "ðÏËÁÚÁÔÉ ÎÏÍÅÒÁ ÔÉÖΦ×"
 
-#: po/tmp/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "Start of day:"
 msgstr "ðÏÞÁÔÏË ÄÎÑ:"
 
 #. Initialize by default to three-letter day names
-#: calendar/gui/gnome-month-item.c:736 po/tmp/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/gnome-month-item.c:736
 msgid "Sun"
 msgstr "îÄÌ"
 
-#: calendar/gui/event-editor.c:439 po/tmp/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/event-editor.c:435
 msgid "Sunday"
 msgstr "îÅĦÌÑ"
 
-#: po/tmp/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "TaskPad"
 msgstr "ðÁÎÅÌØ ÚÁ×ÄÁÎØ"
 
-#: calendar/gui/gnome-month-item.c:740 po/tmp/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/gnome-month-item.c:740
 msgid "Thu"
 msgstr "þÔ×"
 
-#: calendar/gui/event-editor.c:436 po/tmp/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/event-editor.c:432
 msgid "Thursday"
 msgstr "þÅÔ×ÅÒ"
 
-#: po/tmp/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "Time Until Due"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "Time divisions:"
 msgstr "òÏÚĦÌÀ×ÁÞ¦ ÞÁÓÕ:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:55
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "Time format:"
 msgstr "æÏÒÍÁÔ ÞÁÓÕ:"
 
-#: calendar/gui/gnome-month-item.c:738 po/tmp/cal-prefs-dialog.glade.h:56
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: calendar/gui/gnome-month-item.c:738
 msgid "Tue"
 msgstr "÷ÔÒ"
 
-#: calendar/gui/event-editor.c:434 po/tmp/cal-prefs-dialog.glade.h:57
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: calendar/gui/event-editor.c:430
 msgid "Tuesday"
 msgstr "÷¦×ÔÏÒÏË"
 
-#: po/tmp/cal-prefs-dialog.glade.h:58
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "Visual Alarms"
 msgstr ""
 
-#: calendar/gui/gnome-month-item.c:739 po/tmp/cal-prefs-dialog.glade.h:59
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: calendar/gui/gnome-month-item.c:739
 msgid "Wed"
 msgstr "óÒÄ"
 
-#: calendar/gui/event-editor.c:435 po/tmp/cal-prefs-dialog.glade.h:60
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: calendar/gui/event-editor.c:431
 msgid "Wednesday"
 msgstr "óÅÒÅÄÁ"
 
-#: po/tmp/cal-prefs-dialog.glade.h:61
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "Work week"
 msgstr "òÏÂÏÞÉÊ ÔÉÖÄÅÎØ"
 
-#: po/tmp/cal-prefs-dialog.glade.h:62
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "minutes before they occur."
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:63
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "seconds."
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:57
-msgid "Are you sure you want to delete the appointment"
+#: calendar/gui/dialogs/delete-comp.c:62
+#, fuzzy, c-format
+msgid "Are you sure you want to delete the appointment `%s'?"
+msgstr "÷É ×ÐÅ×ÎÅΦ, ÝÏ ÈÏÞÅÔÅ ÓÔÅÒÔÉ ÚÕÓÔÒ¦Þ"
+
+#: calendar/gui/dialogs/delete-comp.c:65
+#, fuzzy
+msgid "Are you sure you want to delete this untitled appointment?"
 msgstr "÷É ×ÐÅ×ÎÅΦ, ÝÏ ÈÏÞÅÔÅ ÓÔÅÒÔÉ ÚÕÓÔÒ¦Þ"
 
-#: calendar/gui/dialogs/delete-comp.c:61
-msgid "Are you sure you want to delete the task"
+#: calendar/gui/dialogs/delete-comp.c:71
+#, fuzzy, c-format
+msgid "Are you sure you want to delete the task `%s'?"
+msgstr "÷É ×ÐÅ×ÎÅΦ, ÝÏ ÈÏÞÅÔÅ ÓÔÅÒÔÉ ÚÁ×ÄÁÎÎÑ"
+
+#: calendar/gui/dialogs/delete-comp.c:74
+#, fuzzy
+msgid "Are you sure you want to delete this untitled task?"
 msgstr "÷É ×ÐÅ×ÎÅΦ, ÝÏ ÈÏÞÅÔÅ ÓÔÅÒÔÉ ÚÁ×ÄÁÎÎÑ"
 
-#: calendar/gui/dialogs/delete-comp.c:65
-msgid "Are you sure you want to delete the journal entry"
+#: calendar/gui/dialogs/delete-comp.c:80
+#, fuzzy, c-format
+msgid "Are you sure you want to delete the journal entry `%s'?"
+msgstr "÷É ×ÐÅ×ÎÅΦ, ÝÏ ÈÏÞÅÔÅ ÓÔÅÒÔÉ ÚÁÐÉÓ × ÖÕÒÎÁ̦"
+
+#: calendar/gui/dialogs/delete-comp.c:83
+#, fuzzy
+msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "÷É ×ÐÅ×ÎÅΦ, ÝÏ ÈÏÞÅÔÅ ÓÔÅÒÔÉ ÚÁÐÉÓ × ÖÕÒÎÁ̦"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/task-editor-dialog.glade.h:6
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
 msgid "% Comp_lete:"
 msgstr "% ÚÁ×ÅÒÛÅÎÎÑ:"
 
-#: po/tmp/task-editor-dialog.glade.h:7
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
 msgid "C_lassification:"
 msgstr "ëÌÁÓÉƦËÁæÑ:"
 
-#: po/tmp/task-editor-dialog.glade.h:9
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
 msgid "Cancelled"
 msgstr "÷¦ÄͦÎÅÎÏ"
 
-#: po/tmp/task-editor-dialog.glade.h:10
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
 msgid "Completed"
 msgstr "úÁ×ÅÒÛÅÎÏ"
 
-#: po/tmp/task-editor-dialog.glade.h:12
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
 msgid "Date Completed:"
 msgstr "äÁÔÁ ×ÉËÏÎÁÎÎÑ:"
 
-#: po/tmp/task-editor-dialog.glade.h:14
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
 msgid "High"
 msgstr "÷ÉÓÏËÉÊ"
 
-#: po/tmp/task-editor-dialog.glade.h:15
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
 msgid "In Progress"
 msgstr "÷ÉËÏÎÕ¤ÔØÓÑ"
 
-#: po/tmp/task-editor-dialog.glade.h:16
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
 msgid "Low"
 msgstr "îÉÚØËÉÊ"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: po/tmp/task-editor-dialog.glade.h:17 shell/e-shell-view.c:1073
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
+#: mail/mail-config-druid.glade.h:47 shell/e-shell-view.c:1073
 #: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
 #: widgets/misc/e-dateedit.c:1445
 msgid "None"
 msgstr "îÅÍÁ¤"
 
-#: po/tmp/task-editor-dialog.glade.h:18
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
 msgid "Normal"
 msgstr "ú×ÉÞÁÊÎÉÊ"
 
-#: po/tmp/task-editor-dialog.glade.h:19
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
 msgid "Not Started"
 msgstr "îÅ ÒÏÚÐÏÞÁÔÏ"
 
-#: po/tmp/task-editor-dialog.glade.h:22
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
 msgid "S_ummary"
 msgstr ""
 
-#: po/tmp/task-editor-dialog.glade.h:23
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
 msgid "Sta_rt Date:"
 msgstr ""
 
-#: po/tmp/task-editor-dialog.glade.h:24
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
 msgid "Task"
 msgstr "úÁ×ÄÁÎÎÑ"
 
-#: po/tmp/task-editor-dialog.glade.h:25
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
 msgid "URL:"
 msgstr "URL:"
 
-#: po/tmp/task-editor-dialog.glade.h:26
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
 msgid "_Contacts..."
 msgstr "ëÏÎÔÁËÔÉ..."
 
-#: po/tmp/task-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
 msgid "_Due Date:"
 msgstr ""
 
-#: po/tmp/task-editor-dialog.glade.h:28
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
 msgid "_Priority:"
 msgstr "ðÒ¦ÏÒÉÔÅÔ:"
 
-#: po/tmp/task-editor-dialog.glade.h:29
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
 msgid "_Status:"
 msgstr "óÔÁÎ:"
 
-#: po/tmp/task-editor-dialog.glade.h:30
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
 msgid "task-editor-dialog"
 msgstr ""
 
@@ -1758,26 +2002,26 @@ msgstr ""
 msgid "Edit Task"
 msgstr "÷ÉÐÒÁ×ÉÔÉ ÚÁ×ÄÁÎÎÑ"
 
-#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:335
+#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:331
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:341
+#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:337
 #, c-format
 msgid "Appointment - %s"
 msgstr "úÕÓÔÒ¦Þ - %s"
 
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:344
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:340
 #, c-format
 msgid "Task - %s"
 msgstr "úÁ×ÄÁÎÎÑ - %s"
 
-#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:347
+#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:343
 #, c-format
 msgid "Journal entry - %s"
 msgstr "öÕÒÎÁÌØÎÉÊ ÚÁÐÉÓ - %s"
 
-#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3254
+#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3250
 msgid "Do you want to save changes?"
 msgstr "÷É ÈÏÞÅÔÅ ÚͦÎÉÔÉ ÚͦÎÉ?"
 
@@ -1797,14 +2041,6 @@ msgstr "ðÏÚÎÁÞÉÔÉ ÑË ×ÉËÏÎÁÎÅ"
 msgid "Mark the task complete"
 msgstr "ðÏÚÎÁÞÉÔÉ ÚÁ×ÄÁÎÎÑ ÑË ×ÉËÏÎÁÎÅ"
 
-#: calendar/gui/e-calendar-table.c:342 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:608 mail/mail-view.c:160
-#: po/tmp/event-editor-dialog.glade.h:12 po/tmp/evolution-addressbook.xml.h:8
-#: po/tmp/evolution-event-editor.xml.h:19 po/tmp/evolution-mail.xml.h:11
-#: po/tmp/filter.glade.h:7 po/tmp/mail-config.glade.h:8
-msgid "Delete"
-msgstr "óÔÅÒÔÉ"
-
 #: calendar/gui/e-calendar-table.c:343
 msgid "Delete the task"
 msgstr "óÔÅÒÔÉ ÚÁ×ÄÁÎÎÑ"
@@ -1837,13 +2073,13 @@ msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:551 calendar/gui/e-week-view.c:288
-#: calendar/gui/print.c:605
+#: calendar/gui/print.c:610
 msgid "am"
 msgstr "ÄÐ"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: calendar/gui/e-day-view.c:554 calendar/gui/e-week-view.c:291
-#: calendar/gui/print.c:604
+#: calendar/gui/print.c:609
 msgid "pm"
 msgstr "ÐÐ"
 
@@ -1859,7 +2095,7 @@ msgid "Edit this appointment..."
 msgstr "÷ÉÐÒÁ×ÉÔÉ ÚÕÓÔÒ¦Þ..."
 
 #: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3174
-#: po/tmp/evolution-event-editor.xml.h:20
+#: ui/evolution-event-editor.xml.h:20
 msgid "Delete this appointment"
 msgstr "óÔÅÒÔÉ ÃÀ ÚÕÓÔÒ¦Þ"
 
@@ -1883,420 +2119,474 @@ msgid "%d %B"
 msgstr "%d %B"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/event-editor-dialog.glade.h:6
+#: calendar/gui/event-editor-dialog.glade.h:6
 msgid "A_ll day event"
 msgstr ""
 
-#: po/tmp/event-editor-dialog.glade.h:8
+#: calendar/gui/event-editor-dialog.glade.h:8
 msgid "Appointment Basics"
 msgstr "ð¦ÄÓÔÁ×É ÚÕÓÔÒ¦Þ¦"
 
-#: po/tmp/event-editor-dialog.glade.h:9
+#: calendar/gui/event-editor-dialog.glade.h:9
 msgid "Classification"
 msgstr "ëÌÁÓÉƦËÁæÑ"
 
-#: po/tmp/event-editor-dialog.glade.h:10
+#: calendar/gui/event-editor-dialog.glade.h:10
 msgid "Custom recurrence"
 msgstr ""
 
-#: po/tmp/event-editor-dialog.glade.h:11
+#: calendar/gui/event-editor-dialog.glade.h:11
 msgid "Days"
 msgstr "äΦ"
 
-#: po/tmp/event-editor-dialog.glade.h:13
+#: calendar/gui/event-editor-dialog.glade.h:13
 msgid "Every"
 msgstr "ëÏÖÅÎ"
 
-#: po/tmp/event-editor-dialog.glade.h:14
+#: calendar/gui/event-editor-dialog.glade.h:14
 msgid "Exceptions"
 msgstr "÷ÉËÌÀÞÅÎÎÑ"
 
-#: po/tmp/event-editor-dialog.glade.h:16
+#: calendar/gui/event-editor-dialog.glade.h:16
 msgid "Hours"
 msgstr "çÏÄÉÎÉ"
 
-#: po/tmp/event-editor-dialog.glade.h:17
+#: calendar/gui/event-editor-dialog.glade.h:17
 msgid "Mail _to:"
 msgstr "ìÉÓÔ ÄÏ:"
 
-#: po/tmp/event-editor-dialog.glade.h:18
+#: calendar/gui/event-editor-dialog.glade.h:18
 msgid "Minutes"
 msgstr "è×ÉÌÉÎÉ"
 
-#: po/tmp/event-editor-dialog.glade.h:19
+#: calendar/gui/event-editor-dialog.glade.h:19
 msgid "Modify"
 msgstr "úͦÎÉÔÉ"
 
-#: po/tmp/event-editor-dialog.glade.h:20
+#: calendar/gui/event-editor-dialog.glade.h:20
 msgid "No recurrence"
 msgstr "âÅÚ ÐÏ×ÔÏÒÅÎÎÑ"
 
-#: po/tmp/event-editor-dialog.glade.h:21
+#: calendar/gui/event-editor-dialog.glade.h:21
 msgid "Preview"
 msgstr "ðÅÒÅÇÌÑÄ"
 
-#: po/tmp/event-editor-dialog.glade.h:22
+#: calendar/gui/event-editor-dialog.glade.h:22
 msgid "Pri_vate"
 msgstr "ïÓÏÂÉÓÔÅ"
 
-#: po/tmp/event-editor-dialog.glade.h:23
+#: calendar/gui/event-editor-dialog.glade.h:23
 msgid "Pu_blic"
 msgstr "ðÕÂ̦ÞÎÅ"
 
-#: po/tmp/event-editor-dialog.glade.h:24
+#: calendar/gui/event-editor-dialog.glade.h:24
 msgid "Recurrence"
 msgstr "ðÏ×ÔÏÒÅÎÎÑ"
 
-#: po/tmp/event-editor-dialog.glade.h:25
+#: calendar/gui/event-editor-dialog.glade.h:25
 msgid "Recurrence Rule"
 msgstr "ðÒÁ×ÉÌÏ ÐÏ×ÔÏÒÅÎÎÑ"
 
-#: po/tmp/event-editor-dialog.glade.h:26
+#: calendar/gui/event-editor-dialog.glade.h:26
 msgid "Reminder"
 msgstr "îÁÇÁÄÕ×ÁÎÎÑ"
 
-#: po/tmp/event-editor-dialog.glade.h:27
+#: calendar/gui/event-editor-dialog.glade.h:27
 msgid "Simple recurrence"
 msgstr "ðÒÏÓÔÅ ÐÏ×ÔÏÒÅÎÎÑ"
 
-#: po/tmp/event-editor-dialog.glade.h:28
+#: calendar/gui/event-editor-dialog.glade.h:28
 msgid "Su_mmary:"
 msgstr ""
 
-#: po/tmp/event-editor-dialog.glade.h:29
+#: calendar/gui/event-editor-dialog.glade.h:29
 msgid "Time"
 msgstr "þÁÓ"
 
-#: po/tmp/event-editor-dialog.glade.h:30
+#: calendar/gui/event-editor-dialog.glade.h:30
 msgid "_Audio"
 msgstr "áÕĦÏ"
 
-#: po/tmp/event-editor-dialog.glade.h:31
+#: calendar/gui/event-editor-dialog.glade.h:31
 msgid "_Confidential"
 msgstr ""
 
-#: po/tmp/event-editor-dialog.glade.h:32
+#: calendar/gui/event-editor-dialog.glade.h:32
 msgid "_Display"
 msgstr ""
 
-#: po/tmp/event-editor-dialog.glade.h:33
+#: calendar/gui/event-editor-dialog.glade.h:33
 msgid "_End time:"
 msgstr "þÁÓ ÚÁ×ÅÒÛÅÎÎÑ:"
 
-#: po/tmp/event-editor-dialog.glade.h:34
+#: calendar/gui/event-editor-dialog.glade.h:34
 msgid "_Mail"
 msgstr "ðÏÛÔÁ"
 
-#: po/tmp/event-editor-dialog.glade.h:35
+#: calendar/gui/event-editor-dialog.glade.h:35
 msgid "_Program"
 msgstr "ðÒÏÇÒÁÍÁ"
 
-#: po/tmp/event-editor-dialog.glade.h:36
+#: calendar/gui/event-editor-dialog.glade.h:36
 msgid "_Run program:"
 msgstr "úÁÐÕÓÔÉÔÉ ÐÒÏÇÒÁÍÕ:"
 
-#: po/tmp/event-editor-dialog.glade.h:37
+#: calendar/gui/event-editor-dialog.glade.h:37
 msgid "_Start time:"
 msgstr "þÁÓ ÐÏÞÁÔËÕ:"
 
-#: po/tmp/event-editor-dialog.glade.h:38
+#: calendar/gui/event-editor-dialog.glade.h:38
 msgid "_Starting date:"
 msgstr "äÁÔÁ ÐÏÞÁÔËÕ:"
 
-#: po/tmp/event-editor-dialog.glade.h:39
+#: calendar/gui/event-editor-dialog.glade.h:39
 msgid "day(s)"
 msgstr ""
 
-#: po/tmp/event-editor-dialog.glade.h:40
+#: calendar/gui/event-editor-dialog.glade.h:40
 msgid "event-editor-dialog"
 msgstr "ĦÁÌÏÇ ÒÅÄÁËÔÏÒÁ ÐÏÍÉÌÏË"
 
-#: po/tmp/event-editor-dialog.glade.h:41
+#: calendar/gui/event-editor-dialog.glade.h:41
 msgid "for"
 msgstr "×"
 
-#: po/tmp/event-editor-dialog.glade.h:42
+#: calendar/gui/event-editor-dialog.glade.h:42
 msgid "forever"
 msgstr "ÚÁ×ÖÄÉ"
 
-#: po/tmp/event-editor-dialog.glade.h:43
+#: calendar/gui/event-editor-dialog.glade.h:43
 msgid "label21"
 msgstr "label26"
 
-#: po/tmp/event-editor-dialog.glade.h:44
+#: calendar/gui/event-editor-dialog.glade.h:44
 msgid "month(s)"
 msgstr "ͦÓÑÃØ"
 
-#: po/tmp/event-editor-dialog.glade.h:45
+#: calendar/gui/event-editor-dialog.glade.h:45
 msgid "until"
 msgstr ""
 
-#: po/tmp/event-editor-dialog.glade.h:46
+#: calendar/gui/event-editor-dialog.glade.h:46
 msgid "week(s)"
 msgstr ""
 
-#: po/tmp/event-editor-dialog.glade.h:47
+#: calendar/gui/event-editor-dialog.glade.h:47
 msgid "year(s)"
 msgstr "Ò¦Ë"
 
-#: calendar/gui/event-editor.c:329
+#: calendar/gui/event-editor.c:325
 msgid "Edit Appointment"
 msgstr "÷ÉÐÒÁ×ÉÔÉ ÚÕÓÔÒ¦Þ"
 
-#: calendar/gui/event-editor.c:407
+#: calendar/gui/event-editor.c:403
 #, fuzzy
 msgid "on"
 msgstr "ðÎÄ"
 
-#: calendar/gui/event-editor.c:432 filter/filter-datespec.c:65
+#: calendar/gui/event-editor.c:428 filter/filter-datespec.c:65
 msgid "day"
 msgstr "ÄÅÎØ"
 
-#: calendar/gui/event-editor.c:559
+#: calendar/gui/event-editor.c:555
 #, fuzzy
 msgid "on the"
 msgstr "ͦÓÑÃØ"
 
-#: calendar/gui/event-editor.c:566
+#: calendar/gui/event-editor.c:562
 msgid "th"
 msgstr " "
 
-#: calendar/gui/event-editor.c:720
+#: calendar/gui/event-editor.c:716
 #, fuzzy
 msgid "occurrences"
 msgstr "äÖÅÒÅÌÁ"
 
-#: calendar/gui/event-editor.c:837
+#: calendar/gui/event-editor.c:833
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor.c:3077 calendar/gui/print.c:1085
-#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
+#: calendar/gui/event-editor.c:3073 calendar/gui/print.c:1090
+#: calendar/gui/print.c:1092 calendar/gui/print.c:1093
 msgid "%a %b %d %Y"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:752 calendar/gui/gnome-cal.c:1341
-#: calendar/gui/gnome-cal.c:1397
-msgid "Reminder of your appointment at "
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:1022
+#: calendar/gui/gnome-cal.c:676
 #, c-format
 msgid "Could not load the calendar in `%s'"
 msgstr "îÅ ×ÄÁÌÏÓÑ ÚÁ×ÁÎÔÁÖÉÔÉ ËÁÌÅÎÄÁÒ × \"%s\""
 
-#: calendar/gui/gnome-cal.c:1033
+#: calendar/gui/gnome-cal.c:687
 #, c-format
 msgid "Could not create a calendar in `%s'"
 msgstr "îÅ ×ÄÁÌÏÓÑ ÓÔ×ÏÒÉÔÉ ËÁÌÅÎÄÁÒ × \"%s\""
 
-#: calendar/gui/gnome-cal.c:1044
+#: calendar/gui/gnome-cal.c:698
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "íÅÔÏÄ, ÎÅÏÂȦÄÎÉÊ ÄÌÑ ÚÁ×ÁÎÔÁÖÅÎÎÑ \"%s\", ΊЦÄÔÒÉÍÕ¤ÔØÓÑ"
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1346 calendar/gui/gnome-cal.c:1401
-#: mail/mail-search-dialogue.c:104
-msgid "Ok"
-msgstr "çÁÒÁÚÄ"
+#.
+#. * Translatable strings file generated by xml-i18n-extract.
+#. * DO NOT compile this file as part of your application.
+#.
+#: calendar/gui/goto-dialog.glade.h:6
+msgid "April"
+msgstr ""
+
+#: calendar/gui/goto-dialog.glade.h:7
+msgid "August"
+msgstr ""
+
+#: calendar/gui/goto-dialog.glade.h:8
+msgid "December"
+msgstr ""
+
+#: calendar/gui/goto-dialog.glade.h:9
+msgid "February"
+msgstr ""
+
+#: calendar/gui/goto-dialog.glade.h:10
+#, fuzzy
+msgid "Go To Date"
+msgstr "ë¦ÎÃÅ×Á ÄÁÔÁ"
+
+#: calendar/gui/goto-dialog.glade.h:11
+#, fuzzy
+msgid "Go To Today"
+msgstr "ÓØÏÇÏÄΦ"
+
+#: calendar/gui/goto-dialog.glade.h:12
+msgid "January"
+msgstr ""
+
+#: calendar/gui/goto-dialog.glade.h:13
+msgid "July"
+msgstr ""
+
+#: calendar/gui/goto-dialog.glade.h:14
+msgid "June"
+msgstr ""
+
+#: calendar/gui/goto-dialog.glade.h:15
+#, fuzzy
+msgid "March"
+msgstr "ðÏÛÕË"
+
+#: calendar/gui/goto-dialog.glade.h:16
+#, fuzzy
+msgid "May"
+msgstr "ðÏÎÅĦÌÏË"
+
+#: calendar/gui/goto-dialog.glade.h:17
+msgid "November"
+msgstr ""
+
+#: calendar/gui/goto-dialog.glade.h:18
+#, fuzzy
+msgid "October"
+msgstr "¶ÎÛÁ"
+
+#: calendar/gui/goto-dialog.glade.h:19
+msgid "September"
+msgstr ""
 
 #: calendar/gui/main.c:49
 msgid "Could not initialize GNOME"
 msgstr "îÅ ×ÄÁÌÏÓØ ¦Î¦Ã¦Á̦ÚÕ×ÁÔÉ GNOME"
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:299
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Su"
 msgstr "îÄÌ"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Mo"
 msgstr "ðÎÄ"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Tu"
 msgstr "÷ÔÒ"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "We"
 msgstr "óÒÄ"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Th"
 msgstr "þÔ×"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Fr"
 msgstr "ðÔÎ"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Sa"
 msgstr "óÂÔ"
 
-#: calendar/gui/print.c:936
+#: calendar/gui/print.c:941
 msgid "Tasks"
 msgstr "úÁ×ÄÁÎÎÑ"
 
 #. Day
-#: calendar/gui/print.c:1066
+#: calendar/gui/print.c:1071
 msgid "Current day (%a %b %d %Y)"
 msgstr "ðÏÔÏÞÎÉÊ ÄÅÎØ (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1080 calendar/gui/print.c:1084
+#: calendar/gui/print.c:1085 calendar/gui/print.c:1089
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1081
+#: calendar/gui/print.c:1086
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1092
+#: calendar/gui/print.c:1097
 #, c-format
 msgid "Current week (%s - %s)"
 msgstr "ðÏÔÏÞÎÉÊ ÔÉÖÄÅÎØ (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1100
+#: calendar/gui/print.c:1105
 msgid "Current month (%b %Y)"
 msgstr "ðÏÔÏÞÎÉÊ Í¦ÓÑÃØ (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1107
+#: calendar/gui/print.c:1112
 msgid "Current year (%Y)"
 msgstr "ðÏÔÏÞÎÉÊ Ò¦Ë (%Y)"
 
-#: calendar/gui/print.c:1144
+#: calendar/gui/print.c:1149
 msgid "Print Calendar"
 msgstr "îÁÄÒÕËÕ×ÁÔÉ ËÁÌÅÎÄÁÒ"
 
-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:914
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1001
 msgid "Print Preview"
 msgstr "ðÅÒÅÇÌÑÄ ÄÒÕËÕ"
 
@@ -2508,12 +2798,12 @@ msgstr ""
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "îÅÏÞ¦ËÕ×ÁÎÁ צÄÐÏצÄØ OK ×¦Ä ÓÅÒ×ÅÒÁ IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:198
+#: camel/providers/imap/camel-imap-folder.c:196
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:542
+#: camel/providers/imap/camel-imap-folder.c:532
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -2525,12 +2815,6 @@ msgstr "IMAP4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "äÌÑ ÚÞÉÔÕ×ÁÎÎÑ ÔÁ ÚÂÅÒÅÖÅÎÎÑ ÐÌÛÔÉ ÎÁ ÓÅÒ×ÅÒÁÈ IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:246
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:148
-msgid "Password"
-msgstr "ðÁÒÏÌØ"
-
 #: camel/providers/imap/camel-imap-store.c:248
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
@@ -3014,6 +3298,7 @@ msgid "No such folder `%s'."
 msgstr "îÅצÒÎÁ ÔÅËÁ \"%s\"."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
+#: mail/mail-config-druid.glade.h:63
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -3061,8 +3346,13 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "äÏÓÔÁÞÁÎÎÑ ÐÏÛÔÉ ÞÅÒÅÚ ÐÒÏÇÒÁÍÕ sendmail"
 
+#: camel/providers/smtp/camel-smtp-provider.c:34
+#: mail/mail-config-druid.glade.h:59
+msgid "SMTP"
+msgstr ""
+
 #: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP."
+msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:187
@@ -3082,6 +3372,7 @@ msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:292
 #: camel/providers/smtp/camel-smtp-transport.c:297
+#: mail/mail-config-druid.glade.h:16
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
@@ -3216,87 +3507,83 @@ msgid "%.1fG"
 msgstr "%.1fç"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:326 mail/mail-display.c:155
+#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:155
 msgid "attachment"
 msgstr "ÄÏÌÕÞÅÎÎÑ"
 
-#: composer/e-msg-composer-attachment-bar.c:412
-#: po/tmp/evolution-message-composer.xml.h:7
+#: composer/e-msg-composer-attachment-bar.c:413
+#: ui/evolution-message-composer.xml.h:7
 msgid "Attach a file"
 msgstr "äÏÌÕÞÉÔÉ ÆÁÊÌ"
 
-#: composer/e-msg-composer-attachment-bar.c:459 po/tmp/filter.glade.h:14
+#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:14
 #: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
 msgid "Remove"
 msgstr "÷ÉÄÁÌÉÔÉ"
 
-#: composer/e-msg-composer-attachment-bar.c:460
+#: composer/e-msg-composer-attachment-bar.c:461
 msgid "Remove selected items from the attachment list"
 msgstr "÷ÉÄÁÌÉÔÉ ×ÉÂÒÁΦ ÅÌÅÍÅÎÔÉ Ú ÓÐÉÓËÕ ÄÏÌÕÞÅÎÎÑ"
 
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:492
 msgid "Add attachment..."
 msgstr "äÏÌÕÞÉÔÉ..."
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:493
 msgid "Attach a file to the message"
 msgstr "äÏÌÕÞÉÔÉ ÆÁÊÌ ÄÏ ÐÏצÄÏÍÌÅÎÎÑ"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/e-msg-composer-attachment.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:6
 msgid "Attachment properties"
 msgstr "÷ÌÁÓÔÉ×ÏÓÔ¦ ÄÏÌÕÞÅÎÎÑ"
 
-#: po/tmp/e-msg-composer-attachment.glade.h:7
-msgid "Description:"
-msgstr "ïÐÉÓ:"
-
-#: po/tmp/e-msg-composer-attachment.glade.h:8
+#: composer/e-msg-composer-attachment.glade.h:8
 msgid "File name:"
 msgstr "îÁÚ×Á ÆÁÊÌÕ:"
 
-#: po/tmp/e-msg-composer-attachment.glade.h:9
+#: composer/e-msg-composer-attachment.glade.h:9
 msgid "MIME type:"
 msgstr "ôÉÐ MIME:"
 
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:291
-#: mail/mail-format.c:624
+#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:303
+#: mail/mail-format.c:626
 msgid "From:"
 msgstr "÷¦Ä:"
 
-#: composer/e-msg-composer-hdrs.c:238
+#: composer/e-msg-composer-hdrs.c:247
 msgid "Click here for the address book"
 msgstr "ëÌÁÃΦÔØ ÔÕÔ ÝÏ ×ÉËÌÉËÁÔÉ ÁÄÒÅÓÎÕ ËÎÉÇÕ"
 
-#: composer/e-msg-composer-hdrs.c:292
+#: composer/e-msg-composer-hdrs.c:304
 #, fuzzy
 msgid "Enter the identity you wish to send this message from"
 msgstr "÷×ÅĦÔØ ÁÄÒÅÓÁÔ¦× ÐÏצÄÏÍÌÅÎÎÑ"
 
-#: composer/e-msg-composer-hdrs.c:296 mail/mail-format.c:628
+#: composer/e-msg-composer-hdrs.c:308 mail/mail-format.c:630
 msgid "To:"
 msgstr "äÏ:"
 
-#: composer/e-msg-composer-hdrs.c:297
+#: composer/e-msg-composer-hdrs.c:309
 msgid "Enter the recipients of the message"
 msgstr "÷×ÅĦÔØ ÁÄÒÅÓÁÔ¦× ÐÏצÄÏÍÌÅÎÎÑ"
 
-#: composer/e-msg-composer-hdrs.c:301 mail/mail-format.c:630
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:632
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:302
+#: composer/e-msg-composer-hdrs.c:314
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "÷×ÅĦÔØ ÁÄÒÅÓÁÔ¦×, ÝÏ ÏÔÒÉÍÁÀÔØ ËÏЦÀ ÐÏצÄÏÍÌÅÎÎÑ"
 
-#: composer/e-msg-composer-hdrs.c:307
+#: composer/e-msg-composer-hdrs.c:319
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:308
+#: composer/e-msg-composer-hdrs.c:320
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -3304,11 +3591,11 @@ msgstr ""
 "÷×ÅĦÔØ ÁÄÒÅÓÁÔ¦×, ÝÏ ÏÔÒÉÍÁÀÔØ ËÏЦÀ ÐÏצÄÏÍÌÅÎÎÑ ÎÅ ÐÏÐÁ×ÛÉ × ÓÐÉÓÏË "
 "ÏÔÒÉÍÕ×ÁÞ¦×."
 
-#: composer/e-msg-composer-hdrs.c:314 mail/mail-format.c:632
+#: composer/e-msg-composer-hdrs.c:326 mail/mail-format.c:634
 msgid "Subject:"
 msgstr "ôÅÍÁ:"
 
-#: composer/e-msg-composer-hdrs.c:315
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Enter the subject of the mail"
 msgstr "÷×ÅĦÔØ ÔÅÍÕ ÐÏÓÌÁÎÎÑ"
 
@@ -3348,52 +3635,52 @@ msgstr "úÂÅÒÅÇÔÉ ÚͦÎÉ × ÐÏצÄÏÍÌÅÎΦ..."
 msgid "Error saving composition to 'Drafts': %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:740 shell/e-shell-view-menu.c:167
+#: composer/e-msg-composer.c:741 shell/e-shell-view-menu.c:167
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:746
+#: composer/e-msg-composer.c:747
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:768
+#: composer/e-msg-composer.c:772
 msgid "Open file"
 msgstr "÷¦ÄËÒÉÔÉ ÆÁÊÌ"
 
-#: composer/e-msg-composer.c:894
+#: composer/e-msg-composer.c:898
 msgid "That file does not exist."
 msgstr "ãØÏÇÏ ÆÁÊÌÕ ÎÅ ¦ÓÎÕ¤."
 
-#: composer/e-msg-composer.c:904
+#: composer/e-msg-composer.c:908
 msgid "That is not a regular file."
 msgstr "ãÅ ÎÅ Ú×ÉÞÁÊÎÉÊ ÆÁÊÌ."
 
-#: composer/e-msg-composer.c:914
+#: composer/e-msg-composer.c:918
 msgid "That file exists but is not readable."
 msgstr ""
 
-#: composer/e-msg-composer.c:924
+#: composer/e-msg-composer.c:928
 msgid "That file appeared accesible but open(2) failed."
 msgstr ""
 
-#: composer/e-msg-composer.c:946
+#: composer/e-msg-composer.c:950
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
 msgstr ""
 
-#: composer/e-msg-composer.c:967
+#: composer/e-msg-composer.c:971
 msgid "An error occurred while reading the file."
 msgstr "óÔÁÌÁÓÑ ÐÏÍÉÌËÁ Ð¦Ä ÞÁÓ ÚÞÉÔÕ×ÁÎÎÑ ÆÁÊÌÕ."
 
-#: composer/e-msg-composer.c:1346
+#: composer/e-msg-composer.c:1350
 msgid "Compose a message"
 msgstr "ð¦ÄÇÏÔÕ×ÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ"
 
-#: composer/e-msg-composer.c:1423
+#: composer/e-msg-composer.c:1427
 msgid "Could not create composer window."
 msgstr "îÅ ×ÄÁÌÏÓØ ÓÔ×ÏÒÉÔÉ ×¦ËÎÏ ËÏÎÓÔÒÕËÔÏÒÁ."
 
@@ -3537,7 +3824,7 @@ msgstr ""
 msgid "outgoing"
 msgstr ""
 
-#: filter/filter-editor.c:456 po/tmp/filter.glade.h:9
+#: filter/filter-editor.c:456 filter/filter.glade.h:9
 msgid "Edit Filters"
 msgstr "òÅÄÁÇÕ×ÁÎÎÑ ×¦ÌØÔÒ¦×"
 
@@ -3572,7 +3859,7 @@ msgstr "÷×ÅĦÔØ URI ÔÅËÉ"
 msgid "<click here to select a folder>"
 msgstr "<ËÌÁÃΦÔØ ÔÕÔ ÄÌÑ ×ÉÂÏÒÕ ÔÅËÉ>"
 
-#: filter/filter-input.c:184
+#: filter/filter-input.c:185
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -3586,39 +3873,39 @@ msgstr ""
 msgid "Failed to perform regex search on message header: %s"
 msgstr ""
 
-#: filter/filter-part.c:456
+#: filter/filter-part.c:467
 msgid "Test"
 msgstr "ôÅÓÔ"
 
-#: filter/filter-rule.c:522
+#: filter/filter-rule.c:530
 msgid "Rule name: "
 msgstr "îÁÚ×Á ÐÒÁ×ÉÌÁ: "
 
-#: filter/filter-rule.c:526
+#: filter/filter-rule.c:534
 msgid "Untitled"
 msgstr ""
 
-#: filter/filter-rule.c:542
+#: filter/filter-rule.c:550
 msgid "If"
 msgstr "ñËÝÏ"
 
-#: filter/filter-rule.c:559
+#: filter/filter-rule.c:567
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:563
+#: filter/filter-rule.c:571
 msgid "if all criteria are met"
 msgstr "ÑËÝÏ ×Ó¦ צÄÐÏצÄϤ ×Ó¦Í ËÒÉÔÅÒ¦ÑÍ"
 
-#: filter/filter-rule.c:568
+#: filter/filter-rule.c:576
 msgid "if any criteria are met"
 msgstr "ÑËÝÏ ×¦ÄÐÏצÄÁ¤ ÂÕÄØ-ÑËÏÍÕ ËÒÉÔÅÒ¦À"
 
-#: filter/filter-rule.c:579
+#: filter/filter-rule.c:587
 msgid "Add criterion"
 msgstr "äÏÄÁÔÉ ËÒÉÔÅÒ¦Ê"
 
-#: filter/filter-rule.c:585
+#: filter/filter-rule.c:593
 msgid "Remove criterion"
 msgstr "÷ÉÄÁÌÉÔÉ ËÒÉÔÅÒ¦Ê"
 
@@ -3627,14 +3914,8 @@ msgstr "÷ÉÄÁÌÉÔÉ ËÒÉÔÅÒ¦Ê"
 msgid "Replied to"
 msgstr "÷¦ÄÐÏצÓÔÉ ×Ó¦Í"
 
-#: filter/filter-system-flag.c:64
-msgid "Deleted"
-msgstr "óÔÅÒÔÏ"
-
-#: filter/filter-system-flag.c:65
-msgid "Draft"
-msgstr "þÏÒÎÏ×ÉË"
-
+#. { _("Deleted"), "Deleted" },
+#. { _("Draft"), "Draft" },
 #: filter/filter-system-flag.c:66
 msgid "Important"
 msgstr "÷ÁÖÌÉ×Ï"
@@ -3643,195 +3924,190 @@ msgstr "÷ÁÖÌÉ×Ï"
 msgid "Read"
 msgstr "ðÒÏÞÉÔÁÎÏ"
 
-#: mail/folder-browser.c:594 po/tmp/filter.glade.h:8
-#: po/tmp/mail-config.glade.h:9
-msgid "Edit"
-msgstr "÷ÉÐÒÁ×ÉÔÉ"
-
-#: po/tmp/filter.glade.h:10
+#: filter/filter.glade.h:10
 msgid "Edit VFolders"
 msgstr "÷ÉÐÒÁ×ÌÅÎÎÑ ×¦ÒÔÕÁÌØÎÉÈ ÔÅË"
 
-#: po/tmp/filter.glade.h:11
+#: filter/filter.glade.h:11
 msgid "Filter Rules"
 msgstr "ðÒÁ×ÉÌÁ ƦÌØÔÒÕ×ÁÎÎÑ"
 
-#: po/tmp/filter.glade.h:12
+#: filter/filter.glade.h:12
 msgid "Incoming"
 msgstr ""
 
-#: po/tmp/filter.glade.h:13
+#: filter/filter.glade.h:13
 msgid "Outgoing"
 msgstr ""
 
-#: po/tmp/filter.glade.h:15
+#: filter/filter.glade.h:15
 msgid "Virtual Folders"
 msgstr "÷¦ÒÔÕÁÌØΦ ÔÅËÉ"
 
-#: po/tmp/filter.glade.h:16
+#: filter/filter.glade.h:16
 #, fuzzy
 msgid "vFolder Sources"
 msgstr "ôÅËÉ"
 
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
+msgid "after"
+msgstr "ЦÓÌÑ"
+
+#: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr ""
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
+msgid "before"
+msgstr "ÐÅÒÅÄ"
+
+#: filter/libfilter-i18n.h:6
+msgid "contains"
+msgstr "ͦÓÔÉÔØ"
+
+#: filter/libfilter-i18n.h:7
 msgid "Copy to Folder"
 msgstr "óËÏЦÀ×ÁÔÉ Õ ÔÅËÕ"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "äÁÔÁ ÏÔÒÉÍÁÎÎÑ"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "äÁÔÁ צÄÓÉÌÁÎÎÑ"
 
-#: filter/libfilter-i18n.h:8
-msgid "Expression"
-msgstr "÷ÉÒÁÚ"
-
-#: filter/libfilter-i18n.h:9
-msgid "Forward to Address"
-msgstr "ðÅÒÅÓÌÁÔÉ ÎÁ ÁÄÒÅÓÕ"
-
-#: filter/libfilter-i18n.h:10
-msgid "Message Body"
-msgstr "ô¦ÌÏ ÐÏצÄÏÍÌÅÎÎÑ"
-
 #: filter/libfilter-i18n.h:11
-msgid "Message Header"
-msgstr "úÁÇÏÌÏ×ÏË ÐÏצÄÏÍÌÅÎÎÑ"
+msgid "does not contain"
+msgstr "ΊͦÓÔÉÔØ"
 
 #: filter/libfilter-i18n.h:12
-msgid "Message was received"
-msgstr "ðÏצÄÏÍÌÅÎÎÑ ÂÕÌÏ ÏÔÒÉÍÁÎÏ"
+msgid "does not end with"
+msgstr "ÎÅ ÚÁ˦ÎÞÕ¤ÔØÔÓÑ ÎÁ"
 
 #: filter/libfilter-i18n.h:13
-msgid "Message was sent"
-msgstr "ðÏצÄÏÍÌÅÎÎÑ ÂÕÌÏ ×¦Ä¦ÓÌÁÎÏ"
+msgid "does not exist"
+msgstr "ÎÅ ¦ÓÎÕ¤"
 
 #: filter/libfilter-i18n.h:14
-msgid "Move to Folder"
-msgstr "ðÅÒÅÎÅÓÔÉ × ÔÅËÕ"
+msgid "does not sound like"
+msgstr "ÎÅ ÓÈÏÖÅ ÎÁ"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not start with"
+msgstr "ÎÅ ÐÏÞÉÎÁ¤ÔØÓÑ Ú"
 
 #: filter/libfilter-i18n.h:16
-msgid "Recipients"
-msgstr "áÄÒÅÓÁÔÉ"
+msgid "ends with"
+msgstr "ÚÁ˦ÎÞÕ¤ÔØÓÑ ÎÁ"
 
 #: filter/libfilter-i18n.h:17
-msgid "Regex Match"
-msgstr ""
+msgid "exists"
+msgstr "¦ÓÎÕ¤"
 
 #: filter/libfilter-i18n.h:18
-msgid "Sender"
-msgstr "÷¦ÄÐÒÁ×ÎÉË"
+msgid "Expression"
+msgstr "÷ÉÒÁÚ"
 
 #: filter/libfilter-i18n.h:19
-#, fuzzy
-msgid "Set Status"
-msgstr "óÔÁÎ:"
+msgid "Forward to Address"
+msgstr "ðÅÒÅÓÌÁÔÉ ÎÁ ÁÄÒÅÓÕ"
 
 #: filter/libfilter-i18n.h:20
-msgid "Source"
-msgstr "äÖÅÒÅÌÏ"
+msgid "is"
+msgstr ""
 
 #: filter/libfilter-i18n.h:21
-msgid "Specific header"
-msgstr ""
+msgid "is greater than"
+msgstr "¦ÌØÛÅ"
 
 #: filter/libfilter-i18n.h:22
-#, fuzzy
-msgid "Status"
-msgstr "óÔÁÎ:"
+msgid "is less than"
+msgstr "ÍÅÎÛÅ"
 
 #: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
+msgid "is not"
 msgstr ""
 
 #: filter/libfilter-i18n.h:24
-msgid "Subject"
-msgstr "ôÅÍÁ"
+msgid "Message Body"
+msgstr "ô¦ÌÏ ÐÏצÄÏÍÌÅÎÎÑ"
 
 #: filter/libfilter-i18n.h:25
-msgid "after"
-msgstr "ЦÓÌÑ"
+msgid "Message Header"
+msgstr "úÁÇÏÌÏ×ÏË ÐÏצÄÏÍÌÅÎÎÑ"
 
 #: filter/libfilter-i18n.h:26
-msgid "before"
-msgstr "ÐÅÒÅÄ"
+msgid "Message was received"
+msgstr "ðÏצÄÏÍÌÅÎÎÑ ÂÕÌÏ ÏÔÒÉÍÁÎÏ"
 
 #: filter/libfilter-i18n.h:27
-msgid "contains"
-msgstr "ͦÓÔÉÔØ"
+msgid "Message was sent"
+msgstr "ðÏצÄÏÍÌÅÎÎÑ ÂÕÌÏ ×¦Ä¦ÓÌÁÎÏ"
 
 #: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr "ΊͦÓÔÉÔØ"
+msgid "Move to Folder"
+msgstr "ðÅÒÅÎÅÓÔÉ × ÔÅËÕ"
 
 #: filter/libfilter-i18n.h:29
-msgid "does not end with"
-msgstr "ÎÅ ÚÁ˦ÎÞÕ¤ÔØÔÓÑ ÎÁ"
+#, fuzzy
+msgid "on or after"
+msgstr "ë¦ÎÃÅ×Á ÄÁÔÁ"
 
 #: filter/libfilter-i18n.h:30
-msgid "does not exist"
-msgstr "ÎÅ ¦ÓÎÕ¤"
-
-#: filter/libfilter-i18n.h:31
-msgid "does not sound like"
-msgstr "ÎÅ ÓÈÏÖÅ ÎÁ"
+msgid "on or before"
+msgstr ""
 
 #: filter/libfilter-i18n.h:32
-msgid "does not start with"
-msgstr "ÎÅ ÐÏÞÉÎÁ¤ÔØÓÑ Ú"
+msgid "Recipients"
+msgstr "áÄÒÅÓÁÔÉ"
 
 #: filter/libfilter-i18n.h:33
-msgid "ends with"
-msgstr "ÚÁ˦ÎÞÕ¤ÔØÓÑ ÎÁ"
+msgid "Regex Match"
+msgstr ""
 
 #: filter/libfilter-i18n.h:34
-msgid "exists"
-msgstr "¦ÓÎÕ¤"
+msgid "Sender"
+msgstr "÷¦ÄÐÒÁ×ÎÉË"
 
 #: filter/libfilter-i18n.h:35
-msgid "is greater than"
-msgstr "¦ÌØÛÅ"
+#, fuzzy
+msgid "Set Status"
+msgstr "óÔÁÎ:"
 
 #: filter/libfilter-i18n.h:36
-msgid "is less than"
-msgstr "ÍÅÎÛÅ"
+msgid "sounds like"
+msgstr "ÓÈÏÖÅ ÎÁ"
 
 #: filter/libfilter-i18n.h:37
-msgid "is not"
-msgstr ""
+msgid "Source"
+msgstr "äÖÅÒÅÌÏ"
 
 #: filter/libfilter-i18n.h:38
-msgid "is"
+msgid "Specific header"
 msgstr ""
 
 #: filter/libfilter-i18n.h:39
-#, fuzzy
-msgid "on or after"
-msgstr "ë¦ÎÃÅ×Á ÄÁÔÁ"
+msgid "starts with"
+msgstr "ÐÏÞÉÎÁ¤ÔØÓÑ ÎÁ"
 
 #: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr ""
+#, fuzzy
+msgid "Status"
+msgstr "óÔÁÎ:"
 
 #: filter/libfilter-i18n.h:41
-msgid "sounds like"
-msgstr "ÓÈÏÖÅ ÎÁ"
+msgid "Stop Processing"
+msgstr ""
 
 #: filter/libfilter-i18n.h:42
-msgid "starts with"
-msgstr "ÐÏÞÉÎÁ¤ÔØÓÑ ÎÁ"
+msgid "Subject"
+msgstr "ôÅÍÁ"
 
 #: filter/libfilter-i18n.h:43
 msgid "was after"
@@ -3862,179 +4138,215 @@ msgstr "äÏÄÁÔÉ ÐÒÁ×ÉÌÏ ×¦ÒÔÕÁÌØÎϧ ÔÅËÉ"
 msgid "Edit VFolder Rule"
 msgstr "÷ÉÐÒÁ×ÉÔÉ ÐÒÁ×ÉÌÏ ×¦ÒÔÕÁÌØÎϧ ÔÅËÉ"
 
-#: mail/component-factory.c:229
+#: mail/component-factory.c:277
 msgid "Cannot initialize Evolution's mail component."
 msgstr "îÅ ×ÄÁÌÏÓÑ ¦Î¦Ã¦Á̦ÚÕ×ÁÔÉ ÐÏÛÔÏ×ÉÊ ËÏÍÐÏÎÅÎÔ Evolutuion."
 
-#: mail/component-factory.c:268
+#: mail/component-factory.c:316
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser.c:140 po/tmp/evolution-event-editor.xml.h:88
-#: po/tmp/evolution-message-composer.xml.h:19
+#: mail/folder-browser.c:223 ui/evolution-event-editor.xml.h:88
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "úÂÅÒÅÇÔÉ"
 
-#: mail/folder-browser.c:153
+#: mail/folder-browser.c:236
 msgid "Body or subject contains"
 msgstr "ô¦ÌÏ ÞÉ ÔÅÍÁ ͦÓÔÉÔØ"
 
-#: mail/folder-browser.c:154
+#: mail/folder-browser.c:237
 msgid "Body contains"
 msgstr "ô¦ÌÏ Í¦ÓÔÉÔØ"
 
-#: mail/folder-browser.c:155
+#: mail/folder-browser.c:238
 msgid "Subject contains"
 msgstr "ôÅÍÁ ͦÓÔÉÔØ"
 
-#: mail/folder-browser.c:156
+#: mail/folder-browser.c:239
 msgid "Body does not contain"
 msgstr "ô¦ÌÏ ÎŠͦÓÔÉÔØ"
 
-#: mail/folder-browser.c:157
+#: mail/folder-browser.c:240
 msgid "Subject does not contain"
 msgstr "ôÅÍÁ ΊͦÓÔÉÔØ"
 
-#: mail/folder-browser.c:566
+#: mail/folder-browser.c:643
 msgid "VFolder on Subject"
 msgstr "÷¦ÒÔÕÁÌØÎÁ ÔÅËÁ ÔÅÍÉ"
 
-#: mail/folder-browser.c:567
+#: mail/folder-browser.c:644
 msgid "VFolder on Sender"
 msgstr "÷¦ÒÔÕÁÌØÎÁ ÔÅËÁ צÄÐÒÁ×ÎÉËÁ"
 
-#: mail/folder-browser.c:568
+#: mail/folder-browser.c:645
 msgid "VFolder on Recipients"
 msgstr "÷¦ÒÔÕÁÌØÎÁ ÔÅËÁ ÏÔÒÉÍÕ×ÁÞ¦×"
 
-#: mail/folder-browser.c:570
+#: mail/folder-browser.c:647
 msgid "Filter on Subject"
 msgstr "æ¦ÌØÔÒ ÔÅÍÉ"
 
-#: mail/folder-browser.c:571
+#: mail/folder-browser.c:648
 msgid "Filter on Sender"
 msgstr "æ¦ÌØÔÒ ÔÅÍÉ"
 
-#: mail/folder-browser.c:572
+#: mail/folder-browser.c:649
 msgid "Filter on Recipients"
 msgstr "æ¦ÌØÔÒ ÏÔÒÉÍÕ×ÁÞ¦×"
 
-#: mail/folder-browser.c:573 mail/folder-browser.c:692
+#: mail/folder-browser.c:650 mail/folder-browser.c:779
 msgid "Filter on Mailing List"
 msgstr "æ¦ÌØÔÒ ÓÐÉÓËÕ ÒÏÚÓÉÌËÉ"
 
-#: mail/folder-browser.c:578
+#: mail/folder-browser.c:655
 #, fuzzy
 msgid "Show all hidden"
 msgstr "ðÏËÁÚÁÔÉ ×ÓÅ"
 
-#: mail/folder-browser.c:580
+#: mail/folder-browser.c:657
 msgid "Hide selected"
 msgstr ""
 
 #. could use another mask, but not enough api do to it
-#: mail/folder-browser.c:583
+#: mail/folder-browser.c:660
 #, fuzzy
 msgid "Hide read"
 msgstr "ðÒÉÂÒÁÔÉ"
 
-#: mail/folder-browser.c:584
+#: mail/folder-browser.c:661
 #, fuzzy
 msgid "Hide deleted"
 msgstr "÷¦ÄÎÏ×ÉÔÉ"
 
-#: mail/folder-browser.c:586 mail/folder-browser.c:703
+#: mail/folder-browser.c:663 mail/folder-browser.c:790
 msgid "Hide Subject"
 msgstr "ðÒÉÂÒÁÔÉ ÔÅÍÕ"
 
-#: mail/folder-browser.c:588 mail/folder-browser.c:709
+#: mail/folder-browser.c:665 mail/folder-browser.c:796
 #, fuzzy
 msgid "Hide from Sender"
 msgstr "æ¦ÌØÔÒ ÔÅÍÉ"
 
-#: mail/folder-browser.c:593 po/tmp/evolution-message-composer.xml.h:15
+#: mail/folder-browser.c:670 ui/evolution-message-composer.xml.h:15
 msgid "Open"
 msgstr "÷¦ÄËÒÉÔÉ"
 
-#: mail/folder-browser.c:595
+#: mail/folder-browser.c:672
 msgid "Save As..."
 msgstr "úÂÅÒÅÇÔÉ ÑË..."
 
-#: mail/folder-browser.c:596 mail/mail-view.c:158
-#: po/tmp/evolution-addressbook.xml.h:13 po/tmp/evolution-calendar.xml.h:23
-#: po/tmp/evolution-mail.xml.h:32
+#: mail/folder-browser.c:673 mail/mail-view.c:148
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:23
+#: ui/evolution-mail.xml.h:32
 msgid "Print"
 msgstr "äÒÕËÕ×ÁÔÉ"
 
-#: mail/folder-browser.c:598
+#: mail/folder-browser.c:675
 msgid "Reply to Sender"
 msgstr "÷¦ÄÐÏצÓÔÉ ×¦ÄÐÒÁ×ÎÉËÕ"
 
-#: mail/folder-browser.c:599 mail/mail-view.c:151
-#: po/tmp/evolution-mail.xml.h:38
+#: mail/folder-browser.c:676 mail/mail-view.c:141 ui/evolution-mail.xml.h:38
 msgid "Reply to All"
 msgstr "÷¦ÄÐÏצÓÔÉ ×Ó¦Í"
 
-#: mail/folder-browser.c:600 mail/mail-view.c:154
-#: po/tmp/evolution-mail.xml.h:17
+#: mail/folder-browser.c:677 mail/mail-view.c:144 ui/evolution-mail.xml.h:17
 msgid "Forward"
 msgstr "ðÅÒÅÓÌÁÔÉ"
 
-#: mail/folder-browser.c:601 po/tmp/evolution-mail.xml.h:18
+#: mail/folder-browser.c:678 ui/evolution-mail.xml.h:18
 #, fuzzy
 msgid "Forward inline"
 msgstr "ðÅÒÅÓÌÁÔÉ"
 
-#: mail/folder-browser.c:603
+#: mail/folder-browser.c:680
 msgid "Mark as Read"
 msgstr "ðÏÚÎÁÞÉÔÉ ÑË ÐÒÏÞÉÔÁÎÅ"
 
-#: mail/folder-browser.c:604
+#: mail/folder-browser.c:681
 msgid "Mark as Unread"
 msgstr "ðÏÚÎÁÞÉÔÉ ÑË ÎÅÐÒÏÞÉÔÁÎÅ"
 
-#: mail/folder-browser.c:606
+#: mail/folder-browser.c:683
 msgid "Move to Folder..."
 msgstr "ðÅÒÅÎÅÓÔÉ × ÔÅËÕ..."
 
-#: mail/folder-browser.c:607
+#: mail/folder-browser.c:684
 msgid "Copy to Folder..."
 msgstr "óËÏЦÀ×ÁÔÉ Õ ÔÅËÕ..."
 
-#: mail/folder-browser.c:609
+#: mail/folder-browser.c:686
 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:613
+#: mail/folder-browser.c:690
 msgid "Apply Filters"
 msgstr "úÁÓÔÏÓÕ×ÁÔÉ Æ¦ÌØÔÒÉ"
 
-#: mail/folder-browser.c:615 po/tmp/evolution-mail.xml.h:10
+#: mail/folder-browser.c:692 ui/evolution-mail.xml.h:10
 msgid "Create Rule From Message"
 msgstr "óÔ×ÏÒÉÔÉ ÐÒÁ×ÉÌÏ Ú ÐÏצÄÏÍÌÅÎÎÑ"
 
-#: mail/folder-browser.c:616 po/tmp/evolution-mail.xml.h:21
+#: mail/folder-browser.c:693 ui/evolution-mail.xml.h:21
 #, fuzzy
 msgid "Hide Messages"
 msgstr "îÁÄÒÕËÕ×ÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ"
 
-#: mail/folder-browser.c:694
+#: mail/folder-browser.c:781
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "æ¦ÌØÔÒ ÓÐÉÓËÕ ÒÏÚÓÉÌËÉ (%s)"
 
-#: mail/folder-browser.c:700
+#: mail/folder-browser.c:787
 #, fuzzy, c-format
 msgid "Hide Subject \"%s\""
 msgstr "ôÅÍÁ - %s"
 
-#: mail/folder-browser.c:706
+#: mail/folder-browser.c:793
 #, c-format
 msgid "Hide from Sender <%s>"
 msgstr ""
 
+#.
+#. * Translatable strings file generated by xml-i18n-extract.
+#. * DO NOT compile this file as part of your application.
+#.
+#: mail/local-config.glade.h:6
+#, fuzzy
+msgid "Current store format:"
+msgstr "îÅ ×ÄÁÌÏÓØ ÚÁÐÕÓÔÉÔÉ Wombat"
+
+#: mail/local-config.glade.h:7
+#, fuzzy
+msgid "Mailbox Format"
+msgstr "æÏÒÍÁÔ"
+
+#: mail/local-config.glade.h:8
+#, fuzzy
+msgid "New store format:"
+msgstr "îÏ×ÉÊ ÔÉÐ ÔÅÌÅÆÏÎÁ"
+
+#: mail/local-config.glade.h:9
+msgid ""
+"Note: When converting between mailbox formats, a failure (such as lack of "
+"disk space) may not be automatically recoverable.  Please use this feature "
+"with care."
+msgstr ""
+
+#: mail/local-config.glade.h:10
+msgid "maildir"
+msgstr ""
+
+#: mail/local-config.glade.h:11
+msgid "mbox"
+msgstr ""
+
+#: mail/local-config.glade.h:12
+msgid "mh"
+msgstr ""
+
 #: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
@@ -4087,37 +4399,41 @@ msgstr ""
 msgid "You have no Outbox configured"
 msgstr ""
 
-#: mail/mail-callbacks.c:246
+#: mail/mail-callbacks.c:244
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:291
+#: mail/mail-callbacks.c:312
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:552
+#: mail/mail-callbacks.c:530
+msgid "Forwarded message:\n"
+msgstr "ðÅÒÅÓÌÁÎÅ ÐÏצÄÏÍÌÅÎÎÑ:\n"
+
+#: mail/mail-callbacks.c:611
 #, fuzzy
 msgid "Move message(s) to"
 msgstr "÷¦Ä¦ÓÌÁΦ ÐÏצÄÏÍÌÅÎÎÑ"
 
-#: mail/mail-callbacks.c:554
+#: mail/mail-callbacks.c:613
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "÷¦Ä¦ÓÌÁΦ ÐÏצÄÏÍÌÅÎÎÑ"
 
-#: mail/mail-callbacks.c:669
+#: mail/mail-callbacks.c:748
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:703 mail/mail-display.c:79
+#: mail/mail-callbacks.c:781 mail/mail-display.c:79
 msgid "Overwrite file?"
 msgstr "ðÅÒÅÐÉÓÁÔÉ ÆÁÊÌ?"
 
-#: mail/mail-callbacks.c:707 mail/mail-display.c:83
+#: mail/mail-callbacks.c:785 mail/mail-display.c:83
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -4125,59 +4441,293 @@ msgstr ""
 "æÁÊÌ Ú Ã¦¤À ÎÁÚ×ÏÀ ×ÖÅ ¦ÓÎÕ¤.\n"
 "ðÅÒÅÐÉÓÁÔÉ ÊÏÇÏ?"
 
-#: mail/mail-callbacks.c:752
+#: mail/mail-callbacks.c:830
 msgid "Save Message As..."
 msgstr "úÂÅÒÅÇÔÉ ÐÏצÄÏÍÌÅÎÎÑ ÑË..."
 
-#: mail/mail-callbacks.c:754
+#: mail/mail-callbacks.c:832
 msgid "Save Messages As..."
 msgstr "úÂÅÒÅÇÔÉ ÐÏצÄÏÍÌÅÎÎÑ ÑË..."
 
-#: mail/mail-callbacks.c:829
+#: mail/mail-callbacks.c:916
 #, fuzzy, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr "ðÏÍÉÌËÁ ÚÁ×ÁÎÔÁÖÅÎÎÑ ÆÁÊÌÕ: %s"
 
-#: mail/mail-callbacks.c:874
+#: mail/mail-callbacks.c:961
 msgid "Print Message"
 msgstr "îÁÄÒÕËÕ×ÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ"
 
-#: mail/mail-callbacks.c:921
+#: mail/mail-callbacks.c:1008
 msgid "Printing of message failed"
 msgstr "îÅ ×ÄÁÌÏÓÑ ÎÁÄÒÕËÕ×ÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/mail-config-druid.glade.h:6
+#: mail/mail-config-druid.glade.h:6
+msgid "Account"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:7
+#, fuzzy
+msgid "Account Information"
+msgstr "îÅÍÁ¤ ¦ÎÆÏÒÍÁæ§"
+
+#: mail/mail-config-druid.glade.h:8
+msgid "Account Management"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:9
+#, fuzzy
+msgid "Account Properties"
+msgstr "÷ÌÁÓÔÉ×ÏÓÔ¦ ÄÏÌÕÞÅÎÎÑ"
+
+#: mail/mail-config-druid.glade.h:11
+#, fuzzy
+msgid "Advanced"
+msgstr "äÏÄÁÔËÏ×Ï..."
+
+#: mail/mail-config-druid.glade.h:12
+#, fuzzy
+msgid "Authentication"
+msgstr "áÕÔÅÎƦËÁæÑ:"
+
+#: mail/mail-config-druid.glade.h:13
+#, fuzzy
+msgid "Authentication Type:"
+msgstr "áÕÔÅÎƦËÁæÑ:"
+
+#: mail/mail-config-druid.glade.h:15
+msgid "Automatically check mail every "
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:17
+msgid "Congratulations, your mail configuration is complete.\n"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:23
+msgid "DIGEST-MD5"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:24
+#, fuzzy
+msgid "Default"
+msgstr "óÔÅÒÔÉ"
+
+#: mail/mail-config-druid.glade.h:26
+#, fuzzy
+msgid "Delete mail from server"
+msgstr "îÅ ×ÉÄÁÌÑÔÉ ÐÏצÄÏÍÌÅÎÎÑ Ú ÓÅÒ×ÅÒÁ"
+
+#: mail/mail-config-druid.glade.h:27
+#, fuzzy
+msgid "Done"
+msgstr "îÅÍÁ¤"
+
+#: mail/mail-config-druid.glade.h:28
+#, fuzzy
+msgid "E-Mail Address:"
+msgstr "åÌÅËÔÒÏÎÎÁ ÁÄÒÅÓÁ:"
+
+#: mail/mail-config-druid.glade.h:30
+#, fuzzy
+msgid "Email Address:"
+msgstr "åÌÅËÔÒÏÎÎÁ ÁÄÒÅÓÁ:"
+
+#: mail/mail-config-druid.glade.h:31
+#, fuzzy
+msgid "Evolution Mail Configuration"
+msgstr "ëÏÎƦ­ÕÒÁÃ¦Ñ ÐÏÛÔÉ"
+
+#: mail/mail-config-druid.glade.h:32
+#, fuzzy
+msgid "Full Name:"
+msgstr "ðÏ×ÎÁ ÎÁÚ×Á:"
+
+#: mail/mail-config-druid.glade.h:35
+#, fuzzy
+msgid "Hostname:"
+msgstr "îÁÚ×Á ËÏÒÉÓÔÕ×ÁÞÁ:"
+
+#: mail/mail-config-druid.glade.h:36
+#, fuzzy
+msgid "IMAP"
+msgstr "IMAP4"
+
+#: mail/mail-config-druid.glade.h:37
 msgid "Identity"
 msgstr ""
 
-#: po/tmp/mail-config-druid.glade.h:7
+#: mail/mail-config-druid.glade.h:38
+msgid "Incoming Mail Server"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:39
+#, fuzzy
+msgid "Kerberos"
+msgstr "Kerberos 4"
+
+#: mail/mail-config-druid.glade.h:40
+#, fuzzy
+msgid "Mail"
+msgstr "ðÏÛÔÁ"
+
+#: mail/mail-config-druid.glade.h:41
+#, fuzzy
+msgid "Mail Account"
+msgstr "åÌÅËÔÒÏÎÎÁ ÁÄÒÅÓÁ ͦÓÔÉÔØ"
+
+#: mail/mail-config-druid.glade.h:42
 msgid "Mail Configuration"
 msgstr "ëÏÎƦ­ÕÒÁÃ¦Ñ ÐÏÛÔÉ"
 
-#: po/tmp/mail-config-druid.glade.h:8
-msgid "Mail Source"
-msgstr "äÖÅÒÅÌÏ ÐÏÛÔÉ"
+#: mail/mail-config-druid.glade.h:43
+#, fuzzy
+msgid "Mail Configuration Druid"
+msgstr "ëÏÎƦ­ÕÒÁÃ¦Ñ ÐÏÛÔÉ"
 
-#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
-msgid "Mail Transport"
+#: mail/mail-config-druid.glade.h:44
+msgid "Make this my default account"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:46
+#, fuzzy
+msgid "News"
+msgstr "îÏ×ÉÊ"
+
+#: mail/mail-config-druid.glade.h:48
+#, fuzzy
+msgid "Optional"
+msgstr "ðÁÒÁÍÅÔÒÉ"
+
+#: mail/mail-config-druid.glade.h:49 mail/mail-config-gui.c:485
+msgid "Organization:"
+msgstr "ïÒ¦¤ÎÔÁæÑ:"
+
+#: mail/mail-config-druid.glade.h:50
+msgid "Outgoing Mail Server"
 msgstr ""
 
-#: po/tmp/mail-config-druid.glade.h:10
-msgid "Welcome to the Evolution Mail configuration wizard!\n"
+#: mail/mail-config-druid.glade.h:51
+#, fuzzy
+msgid "Password:"
+msgstr "ðÁÒÏÌØ"
+
+#: mail/mail-config-druid.glade.h:53
+msgid "Plain Text"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:54
+msgid "Receiving Email"
 msgstr ""
 
-#: po/tmp/mail-config-druid.glade.h:14
+#: mail/mail-config-druid.glade.h:55
+#, fuzzy
+msgid "Remember my password"
+msgstr "úÁÐÁÍ'ÑÔÁÔÉ ÃÅÊ ÐÁÒÏÌØ"
+
+#: mail/mail-config-druid.glade.h:56 mail/mail-format.c:628
+msgid "Reply-To:"
+msgstr "÷¦ÄÐÏצÄÁÔÉ ÎÁ:"
+
+#: mail/mail-config-druid.glade.h:57
+#, fuzzy
+msgid "Reply-to:"
+msgstr "÷¦ÄÐÏצÄÁÔÉ ÎÁ:"
+
+#: mail/mail-config-druid.glade.h:58
+#, fuzzy
+msgid "Required"
+msgstr "ðÏÔÒ¦ÂΦ ÌÀÄÉ"
+
+#: mail/mail-config-druid.glade.h:60
+#, fuzzy
+msgid "Save password"
+msgstr "úÂÅÒÅÇÔÉ ÑË VCard"
+
+#: mail/mail-config-druid.glade.h:61
+#, fuzzy
+msgid "Select signature file"
+msgstr "æÁÊÌ Ð¦ÄÐÉÓÕ:"
+
+#: mail/mail-config-druid.glade.h:62
+#, fuzzy
+msgid "Sending Email"
+msgstr "Sendmail"
+
+#: mail/mail-config-druid.glade.h:64
+#, fuzzy
+msgid "Server Configuration"
+msgstr "ëÏÎƦ­ÕÒÁÃ¦Ñ ÐÏÛÔÉ"
+
+#: mail/mail-config-druid.glade.h:65
+msgid "Server Timeouts"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:66
+#, fuzzy
+msgid "Server Type: "
+msgstr "óÅÒ×ÅÒ:"
+
+#: mail/mail-config-druid.glade.h:67
+msgid "Server requires authentication"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:68
+#, fuzzy
+msgid "Servers"
+msgstr "óÅÒ×ÅÒ:"
+
+#: mail/mail-config-druid.glade.h:69 mail/mail-config-gui.c:496
+msgid "Signature file:"
+msgstr "æÁÊÌ Ð¦ÄÐÉÓÕ:"
+
+#: mail/mail-config-druid.glade.h:70
+#, fuzzy
+msgid "Signature:"
+msgstr "æÁÊÌ Ð¦ÄÐÉÓÕ:"
+
+#: mail/mail-config-druid.glade.h:71 mail/mail-config.glade.h:20
+msgid "Sources"
+msgstr "äÖÅÒÅÌÁ"
+
+#: mail/mail-config-druid.glade.h:72
+msgid "This server requires a secure connection (SSL)"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:73
+#, fuzzy
+msgid "Type"
+msgstr "ôÉÐ:"
+
+#: mail/mail-config-druid.glade.h:74
 msgid ""
-"Your email configuration is now complete.\n"
-"Click \"Finish\" to save your new settings"
+"Type the name by which you would like to refer to these servers. For "
+"example: \"Work\" or \"Home\"."
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:76
+#, fuzzy
+msgid "User Information"
+msgstr "îÅÍÁ¤ ¦ÎÆÏÒÍÁæ§"
+
+#: mail/mail-config-druid.glade.h:77 mail/mail-config-gui.c:928
+msgid "Username:"
+msgstr "îÁÚ×Á ËÏÒÉÓÔÕ×ÁÞÁ:"
+
+#: mail/mail-config-druid.glade.h:78
+msgid "Welcome to the Evolution Mail Configuration Druid.\n"
 msgstr ""
 
+#: mail/mail-config-druid.glade.h:81
+#, fuzzy
+msgid "minute(s)"
+msgstr "È×ÉÌÉÎÁ"
+
 #: mail/mail-config-gui.c:433
 msgid ""
 "Enter your name and email address to be used in outgoing mail. You may also, "
@@ -4193,15 +4743,7 @@ msgstr "ðÏ×ÎÁ ÎÁÚ×Á:"
 msgid "Email address:"
 msgstr "åÌÅËÔÒÏÎÎÁ ÁÄÒÅÓÁ:"
 
-#: mail/mail-config-gui.c:485
-msgid "Organization:"
-msgstr "ïÒ¦¤ÎÔÁæÑ:"
-
-#: mail/mail-config-gui.c:496
-msgid "Signature file:"
-msgstr "æÁÊÌ Ð¦ÄÐÉÓÕ:"
-
-#: mail/mail-config-gui.c:501 po/tmp/mail-config.glade.h:19
+#: mail/mail-config-gui.c:501 mail/mail-config.glade.h:19
 msgid "Signature File"
 msgstr "æÁÊÌ Ð¦ÄÐÉÓÕ"
 
@@ -4209,26 +4751,10 @@ msgstr "æÁÊÌ Ð¦ÄÐÉÓÕ"
 msgid "Server:"
 msgstr "óÅÒ×ÅÒ:"
 
-#: mail/mail-config-gui.c:928
-msgid "Username:"
-msgstr "îÁÚ×Á ËÏÒÉÓÔÕ×ÁÞÁ:"
-
-#: mail/mail-config-gui.c:934
-msgid "Path:"
-msgstr "ûÌÑÈ:"
-
-#: mail/mail-config-gui.c:943
-msgid "Authentication:"
-msgstr "áÕÔÅÎƦËÁæÑ:"
-
 #: mail/mail-config-gui.c:956
 msgid "Detect supported types..."
 msgstr "÷ÉÚÎÁÞÉÔÉ ÔÉÐÉ, ÝÏ Ð¦ÄÔÒÉÍÕÀÔØÓÑ..."
 
-#: mail/mail-config-gui.c:968
-msgid "Remember this password"
-msgstr "úÁÐÁÍ'ÑÔÁÔÉ ÃÅÊ ÐÁÒÏÌØ"
-
 #: mail/mail-config-gui.c:991
 msgid "Don't delete messages from server"
 msgstr "îÅ ×ÉÄÁÌÑÔÉ ÐÏצÄÏÍÌÅÎÎÑ Ú ÓÅÒ×ÅÒÁ"
@@ -4241,7 +4767,7 @@ msgstr ""
 msgid "Mail source type:"
 msgstr "ôÉÐ ÄÖÅÒÅÌÁ ÐÏÛÔÉ:"
 
-#: mail/mail-config-gui.c:1135 mail/mail-config-gui.c:1183
+#: mail/mail-config-gui.c:1135
 msgid ""
 "Select the kind of mail server you have, and enter the relevant information "
 "about it.\n"
@@ -4268,6 +4794,14 @@ msgstr ""
 msgid "Mail transport type:"
 msgstr ""
 
+#: mail/mail-config-gui.c:1183
+msgid ""
+"Select the kind of mail server you have, and enter the relevant information "
+"about it.\n"
+"If the server requires authentication, you can click the \"Detect supported "
+"types...\" button after entering the other information."
+msgstr ""
+
 #: mail/mail-config-gui.c:1233
 msgid "Add Identity"
 msgstr ""
@@ -4316,43 +4850,43 @@ msgstr ""
 msgid "Query authorization at \"%s\""
 msgstr ""
 
-#: po/tmp/mail-config.glade.h:7
+#: mail/mail-config.glade.h:7
 msgid "Address"
 msgstr "áÄÒÅÓÁ"
 
-#: po/tmp/mail-config.glade.h:10
+#: mail/mail-config.glade.h:10
 msgid "Identities"
 msgstr ""
 
-#: po/tmp/mail-config.glade.h:11
+#: mail/mail-config.glade.h:11
 msgid "Mail Sources"
 msgstr "ðÏÛÔÏצ ÄÖÅÒÅÌÁ"
 
-#: po/tmp/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
+msgid "Mail Transport"
+msgstr ""
+
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Mark message as seen [ms]: "
 msgstr "úÂÅÒÅÇÔÉ ÐÏצÄÏÍÌÅÎÎÑ Õ ×ËÁÚÁÎ¦Ê ÔÅæ"
 
-#: po/tmp/mail-config.glade.h:14
+#: mail/mail-config.glade.h:14
 msgid "News Servers"
 msgstr "óÅÒ×ÅÒÉ ÎÏ×ÉÎ"
 
-#: po/tmp/mail-config.glade.h:15
+#: mail/mail-config.glade.h:15
 msgid "News Sources"
 msgstr "äÖÅÒÅÌÁ ÎÏ×ÉÎ"
 
-#: po/tmp/mail-config.glade.h:16
+#: mail/mail-config.glade.h:16
 msgid "Organization"
 msgstr "ïÒÇÁΦÚÁæÑ"
 
-#: po/tmp/mail-config.glade.h:18
+#: mail/mail-config.glade.h:18
 msgid "Send messages in HTML format"
 msgstr "÷¦Ä¦ÓÌÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ Õ ÆÏÒÍÁÔ¦ HTML"
 
-#: po/tmp/mail-config.glade.h:20
-msgid "Sources"
-msgstr "äÖÅÒÅÌÁ"
-
 #: mail/mail-crypto.c:353 mail/mail-crypto.c:458 mail/mail-crypto.c:635
 #: mail/mail-crypto.c:781
 msgid "Please enter your PGP/GPG passphrase."
@@ -4432,392 +4966,293 @@ msgstr "ðÒÉÂÒÁÔÉ"
 msgid "%s attachment"
 msgstr "ÄÏÌÕÞÅÎÎÑ"
 
-#: mail/mail-format.c:626
-msgid "Reply-To:"
-msgstr "÷¦ÄÐÏצÄÁÔÉ ÎÁ:"
-
-#: mail/mail-format.c:849
+#: mail/mail-format.c:851
 msgid "No GPG/PGP support available in this copy of Evolution."
 msgstr ""
 
-#: mail/mail-format.c:861
+#: mail/mail-format.c:863
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:869
 msgid "Encrypted message"
 msgstr "úÁÛÉÆÒÏ×ÁÎÅ ÐÏצÄÏÍÌÅÎÎÑ"
 
-#: mail/mail-format.c:868
+#: mail/mail-format.c:870
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1448
+#: mail/mail-format.c:1450
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1460
+#: mail/mail-format.c:1462
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1464
+#: mail/mail-format.c:1466
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1498
+#: mail/mail-format.c:1500
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1503
+#: mail/mail-format.c:1505
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-format.c:1673
+#: mail/mail-format.c:1675
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr ""
 
-#: mail/mail-local.c:203
+#: mail/mail-local.c:204
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:207
+#: mail/mail-local.c:208
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:262
+#: mail/mail-local.c:251
+#, fuzzy
+msgid "Reconfiguring folder"
+msgstr "ëÏÎƦ­ÕÒÕ×ÁÔÉ ÔÅËÕ"
+
+#: mail/mail-local.c:269
 msgid "Closing current folder"
 msgstr "úÁËÒÉ×ÁÎÎÑ ÐÏÔÏÞÎϧ ÔÅËÉ"
 
-#: mail/mail-local.c:294
+#: mail/mail-local.c:295
 msgid "Renaming old folder and opening"
 msgstr "ðÅÒÅÊÍÅÎÕ×ÁÎÎÑ ÓÔÁÒϧ ÔÅËÉ ÔÁ צÄËÒÉ×ÁÎÎÑ"
 
-#: mail/mail-local.c:315
+#: mail/mail-local.c:313
 msgid "Creating new folder"
 msgstr "óÔ×ÏÒÅÎÎÑ ÎÏ×ϧ ÔÅËÉ"
 
-#: mail/mail-local.c:330
+#: mail/mail-local.c:327
 msgid "Copying messages"
 msgstr "ëÏЦÀ×ÁÎÎÑ ÐÏצÄÏÍÌÅÎØ"
 
-#: mail/mail-local.c:342
+#: mail/mail-local.c:348
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
 "open this folder anymore: %s"
 msgstr ""
 
-#: mail/mail-local.c:373
+#: mail/mail-local.c:379
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:782
+#: mail/mail-local.c:787
 #, fuzzy
 msgid "Registering local folder"
 msgstr "óÔ×ÏÒÅÎÎÑ ÎÏ×ϧ ÔÅËÉ"
 
-#: mail/mail-local.c:784
+#: mail/mail-local.c:789
 #, fuzzy
 msgid "Register local folder"
 msgstr "óÔ×ÏÒÉÔÉ ÎÏ×Õ ÔÅËÕ"
 
-#: mail/mail-ops.c:84
+#: mail/mail-local.c:894
+#, fuzzy, c-format
+msgid ""
+"Unable to register folder '%s':\n"
+"%s"
+msgstr "îÅ ×ÄÁÌÏÓÑ ÚÂÅÒÅÇÔÉ ÓÐÉÓÏË ÇÒÕÐ ÄÌÑ %s: %s"
+
+#: mail/mail-mt.c:85
+#, fuzzy, c-format
+msgid ""
+"Error while '%s':\n"
+"%s"
+msgstr ""
+"ðÏÍÉÌËÁ Ð¦Ä ÞÁÓ \"%s\":\n"
+"%s"
+
+#: mail/mail-mt.c:87
+#, fuzzy, c-format
+msgid ""
+"Error while performing operation:\n"
+"%s"
+msgstr "ðÏÍÉÌËÁ ÚÁ×ÁÎÔÁÖÅÎÎÑ ÆÁÊÌÕ: %s"
+
+#: mail/mail-mt.c:356 mail/mail-mt.c:385
+#, fuzzy
+msgid "Working"
+msgstr "ðÅÒÅÎÅÓÅÎÎÑ"
+
+#: mail/mail-ops.c:88
 #, c-format
 msgid "Fetching email from %s"
 msgstr "ïÔÒÉÍÁÎÎÑ ÐÏÛÔÉ Ú %s"
 
-#: mail/mail-ops.c:86
+#: mail/mail-ops.c:90
 #, c-format
 msgid "Fetch email from %s"
 msgstr "ïÔÒÉÍÁÔÉ ÐÏÛÔÕ Ú %s"
 
-#: mail/mail-ops.c:331
+#: mail/mail-ops.c:335
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "îÅÍÁ¤ ÎÏ×ϧ ËÏÒÅÓÐÏÎÄÅÎæ§ ÎÁ %s."
 
-#: mail/mail-ops.c:401
+#: mail/mail-ops.c:405
 msgid "Filtering email on demand"
 msgstr ""
 
-#: mail/mail-ops.c:403
+#: mail/mail-ops.c:407
 msgid "Filter email on demand"
 msgstr ""
 
-#: mail/mail-ops.c:540
+#: mail/mail-ops.c:551
 #, c-format
 msgid "Sending \"%s\""
 msgstr "÷¦ÄÓÉÌÁÎÎÑ \"%s\""
 
-#: mail/mail-ops.c:545
-msgid "Sending a message without a subject"
-msgstr "÷¦ÄÓÉÌÁÎÎÑ ÐÏצÄÏÍÌÅÎÎÑ ÂÅÚ ÔÅÍÉ"
-
-#: mail/mail-ops.c:548
-#, c-format
-msgid "Send \"%s\""
-msgstr "÷¦Ä¦ÓÌÁÔÉ \"%s\""
-
-#: mail/mail-ops.c:551
-msgid "Send a message without a subject"
-msgstr "÷¦Ä¦ÓÌÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ ÂÅÚ ÔÅÍÉ"
+#: mail/mail-ops.c:553
+#, fuzzy
+msgid "Sending message"
+msgstr "óÔÅÒÔÉ ÃÅ ÐÏצÄÏÍÌÅÎÎÑ ÎÅÇÁÊÎÏ"
 
-#: mail/mail-ops.c:721
+#: mail/mail-ops.c:669
 msgid "Sending queue"
 msgstr "÷¦ÄÓÉÌÁÎÎÑ ÞÅÒÇÉ"
 
-#: mail/mail-ops.c:723
+#: mail/mail-ops.c:671
 msgid "Send queue"
 msgstr "÷¦Ä¦ÓÌÁÔÉ ÞÅÒÇÕ"
 
-#: mail/mail-ops.c:859 mail/mail-ops.c:866
+#: mail/mail-ops.c:804 mail/mail-ops.c:811
 #, c-format
 msgid "Appending \"%s\""
 msgstr "äÏÄÁ×ÁÎÎÑ \"%s\""
 
-#: mail/mail-ops.c:863 mail/mail-ops.c:869
+#: mail/mail-ops.c:808 mail/mail-ops.c:814
 msgid "Appending a message without a subject"
 msgstr "äÏÄÁ×ÁÎÎÑ ÐÏצÄÏÍÌÅÎÎÑ ÂÅÚ ÔÅÍÉ"
 
-#: mail/mail-ops.c:941
-#, c-format
-msgid "Expunging \"%s\""
-msgstr "÷ÉËÒÅÓÌÅÎÎÑ \"%s\""
-
-#: mail/mail-ops.c:943
-#, c-format
-msgid "Expunge \"%s\""
-msgstr "÷ÉËÒÅÓÌÉÔÉ \"%s\""
-
-#: mail/mail-ops.c:1002
+#: mail/mail-ops.c:897
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "ðÅÒÅÎÅÓÅÎÎÑ ÐÏצÄÏÍÌÅÎØ Ú \"%s\" × \"%s\""
 
-#: mail/mail-ops.c:1004
+#: mail/mail-ops.c:899
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "ëÏЦÀ×ÁÎÎÑ ÐÏצÄÏÍÌÅÎØ Ú \"%s\" × \"%s\""
 
-#: mail/mail-ops.c:1007
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "ðÅÒÅÎÅÓÔÉ ÐÏצÄÏÍÌÅÎÎÑ Ú \"%s\" × \"%s\""
 
-#: mail/mail-ops.c:1009
+#: mail/mail-ops.c:904
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "óËÏЦÀ×ÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ Ú \"%s\" × \"%s\""
 
-#: mail/mail-ops.c:1040
+#: mail/mail-ops.c:935
 msgid "Moving"
 msgstr "ðÅÒÅÎÅÓÅÎÎÑ"
 
-#: mail/mail-ops.c:1043
+#: mail/mail-ops.c:938
 msgid "Copying"
 msgstr "ëÏЦÀ×ÁÎÎÑ"
 
-#: mail/mail-ops.c:1063
+#: mail/mail-ops.c:958
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1142
-#, fuzzy, c-format
-msgid "Marking messages in folder \"%s\""
-msgstr "úÂÅÒÅÇÔÉ ÐÏצÄÏÍÌÅÎÎÑ Õ ×ËÁÚÁÎ¦Ê ÔÅæ"
-
-#: mail/mail-ops.c:1145
-#, fuzzy, c-format
-msgid "Mark messages in folder \"%s\""
-msgstr "úÂÅÒÅÇÔÉ ÐÏצÄÏÍÌÅÎÎÑ Õ ×ËÁÚÁÎ¦Ê ÔÅæ"
-
-#: mail/mail-ops.c:1176
-#, fuzzy, c-format
-msgid "Marking message %d of %d"
-msgstr "úÂÅÒÅÇÔÉ ÐÏצÄÏÍÌÅÎÎÑ Õ ×ËÁÚÁÎ¦Ê ÔÅæ"
-
-#: mail/mail-ops.c:1297
+#: mail/mail-ops.c:1033
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "óËÁÎÕ×ÁÎÎÑ ÔÅË × \"%s\""
 
-#: mail/mail-ops.c:1299
-#, c-format
-msgid "Scan folders in \"%s\""
-msgstr "óËÁÎÕ×ÁÔÉ ÔÅËÉ × \"%s\""
-
-#: mail/mail-ops.c:1368 mail/subscribe-dialog.c:341
+#: mail/mail-ops.c:1099 mail/subscribe-dialog.c:341
 msgid "(No description)"
 msgstr "(îÅÍÁ¤ ÏÐÉÓÕ)"
 
-#: mail/mail-ops.c:1434
-#, c-format
-msgid "Attaching messages from folder \"%s\""
-msgstr "äÏÌÕÞÅÎÎÑ ÐÏצÄÏÍÌÅÎØ Ú ÔÅËÉ \"%s\""
-
-#: mail/mail-ops.c:1437
-#, c-format
-msgid "Attach messages from \"%s\""
-msgstr "äÏÌÕÞÉÔÉ ÐÏצÄÏÍÌÅÎÎÑ Ú \"%s\""
-
-#: mail/mail-ops.c:1537
-#, c-format
-msgid "Forwarding messages \"%s\""
-msgstr "ðÅÒÅÓÉÌÁÎÎÑ ÐÏצÄÏÍÌÅÎØ \"%s\""
-
-#: mail/mail-ops.c:1541
-msgid "Forwarding a message without a subject"
-msgstr "ðÅÒÅÓÉÌÁÎÎÑ ÐÏצÄÏÍÌÅÎÎÑ ÂÅÚ ÔÅÍÉ"
-
-#: mail/mail-ops.c:1544
-#, c-format
-msgid "Forward message \"%s\""
-msgstr "ðÅÒÅÓÌÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ \"%s\""
-
-#: mail/mail-ops.c:1548
-msgid "Forward a message without a subject"
-msgstr "ðÅÒÅÓÌÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ ÂÅÚ ÔÅÍÉ"
-
-#: mail/mail-ops.c:1595
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "ïÔÒÉÍÁÎÎÑ ÐÏצÄÏÍÌÅÎÎÑ %d Ú %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1612
-msgid ""
-"Failed to generate mime part from message while generating forwarded message."
-msgstr ""
-
-#: mail/mail-ops.c:1667
+#: mail/mail-ops.c:1164
 msgid "Forwarded messages"
 msgstr "ðÅÒÅÓÌÁΦ ÐÏצÄÏÍÌÅÎÎÑ"
 
-#: mail/mail-ops.c:1681
-msgid "Forwarded message:\n"
-msgstr "ðÅÒÅÓÌÁÎÅ ÐÏצÄÏÍÌÅÎÎÑ:\n"
-
-#: mail/mail-ops.c:1750
-#, c-format
-msgid "Loading \"%s\""
-msgstr "úÁ×ÁÎÔÁÖÅÎÎÑ \"%s\""
-
-#: mail/mail-ops.c:1752
-#, c-format
-msgid "Load \"%s\""
-msgstr "úÁ×ÁÎÔÁÖÉÔÉ \"%s\""
-
-#: mail/mail-ops.c:1855
-#, c-format
-msgid "Creating \"%s\""
-msgstr "óÔ×ÏÒÅÎÎÑ \"%s\""
-
-#: mail/mail-ops.c:1857
-#, c-format
-msgid "Create \"%s\""
-msgstr "óÔ×ÏÒÉÔÉ \"%s\""
-
-#: mail/mail-ops.c:1905
-msgid "Exception while reporting result to shell component listener."
-msgstr ""
+#: mail/mail-ops.c:1205 mail/mail-ops.c:1274
+#, fuzzy, c-format
+msgid "Opening folder %s"
+msgstr "óËÁÎÕ×ÁÎÎÑ ÔÅË × \"%s\""
 
-#: mail/mail-ops.c:1952
-#, c-format
-msgid "Synchronizing \"%s\""
+#: mail/mail-ops.c:1336
+#, fuzzy
+msgid "Synchronising folder"
 msgstr "óÉÎÈÒÏΦÚÁÃ¦Ñ \"%s\""
 
-#: mail/mail-ops.c:1954
-#, c-format
-msgid "Synchronize \"%s\""
-msgstr "óÉÎÈÒÏΦÚÕ×ÁÔÉ \"%s\""
-
-#: mail/mail-ops.c:2018
-#, c-format
-msgid "Displaying message UID \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:2021
-msgid "Clearing message display"
-msgstr ""
-
-#: mail/mail-ops.c:2024
-#, c-format
-msgid "Display message UID \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:2027
-msgid "Clear message display"
-msgstr ""
-
-#: mail/mail-ops.c:2218
-#, c-format
-msgid "Opening messages from folder \"%s\""
-msgstr "÷¦ÄËÒÉ×ÁÎÎÑ ÐÏצÄÏÍÌÅÎØ Ú ÔÅËÉ \"%s\""
+#: mail/mail-ops.c:1386
+#, fuzzy
+msgid "Expunging folder"
+msgstr "÷ÉËÒÅÓÌÅÎÎÑ \"%s\""
 
-#: mail/mail-ops.c:2221
-#, c-format
-msgid "Open messages from \"%s\""
-msgstr "÷¦ÄËÒÉÔÉ ÐÏצÄÏÍÌÅÎÎÑ Ú \"%s\""
+#: mail/mail-ops.c:1434
+#, fuzzy, c-format
+msgid "Retrieving message %s"
+msgstr "ïÔÒÉÍÁÎÎÑ ÐÏצÄÏÍÌÅÎÎÑ %d Ú %d"
 
-#: mail/mail-ops.c:2325
-#, c-format
-msgid "Loading %s Folder"
-msgstr "úÁ×ÁÎÔÁÖÅÎÎÑ ÔÅËÉ %s"
+#: mail/mail-ops.c:1497
+#, fuzzy
+msgid "Retrieving messages"
+msgstr "ïÔÒÉÍÁÎÎÑ ÐÏצÄÏÍÌÅÎÎÑ %d Ú %d"
 
-#: mail/mail-ops.c:2327
+#: mail/mail-ops.c:1507
 #, c-format
-msgid "Load %s Folder"
-msgstr "úÁ×ÁÎÔÁÖÉÔÉ ÔÅËÕ %s"
+msgid "Retrieving message number %d of %d (uid \"%s\")"
+msgstr "ïÔÒÉÍÁÎÎÑ ÐÏצÄÏÍÌÅÎÎÑ %d Ú %d (uid \"%s\")"
 
-#: mail/mail-ops.c:2386
+#: mail/mail-ops.c:1655
 #, fuzzy, c-format
 msgid "Loading %s Folder for %s"
 msgstr "úÁ×ÁÎÔÁÖÅÎÎÑ ÔÅËÉ %s"
 
-#: mail/mail-ops.c:2388
+#: mail/mail-ops.c:1657
 #, fuzzy, c-format
 msgid "Load %s Folder for %s"
 msgstr "úÁ×ÁÎÔÁÖÉÔÉ ÔÅËÕ %s"
 
-#: mail/mail-ops.c:2560
-#, c-format
-msgid "Viewing messages from folder \"%s\""
-msgstr "÷¦ÄÏÂÒÁÖÅÎÎÑ ÐÏצÄÏÍÌÅÎØ Ú ÔÅËÉ \"%s\""
-
-#: mail/mail-ops.c:2563
-#, c-format
-msgid "View messages from \"%s\""
-msgstr "ðÏËÁÚÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ Ú \"%s\""
-
-#: mail/mail-ops.c:2596
-#, c-format
-msgid "Retrieving message %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:2687
-#, c-format
-msgid "Saving messages from folder \"%s\""
-msgstr "úÂÅÒÅÖÅÎÎÑ ÐÏצÄÏÍÌÅÎØ Ú ÔÅËÉ \"%s\""
+#: mail/mail-ops.c:1823
+#, fuzzy
+msgid "Saving messages"
+msgstr "ëÏЦÀ×ÁÎÎÑ ÐÏצÄÏÍÌÅÎØ"
 
-#: mail/mail-ops.c:2690
-#, c-format
-msgid "Save messages from folder \"%s\""
-msgstr "úÂÅÒÅÇÔÉ ÐÏצÄÏÍÌÅÎÎÑ Ú ÔÁËÉ \"%s\""
+#: mail/mail-ops.c:1902
+#, fuzzy, c-format
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
+msgstr "îÅ ×ÄÁÌÏÓÑ ÚÂÅÒÅÇÔÉ ÓÐÉÓÏË ÇÒÕÐ ÄÌÑ %s: %s"
 
-#: mail/mail-ops.c:2733
+#: mail/mail-ops.c:1915
 #, fuzzy, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "úÂÅÒÅÇÔÉ ÐÏצÄÏÍÌÅÎÎÑ Õ ×ËÁÚÁÎ¦Ê ÔÅæ"
 
+#: mail/mail-ops.c:1929
+#, fuzzy, c-format
+msgid ""
+"Error saving messages to: %s:\n"
+" %s"
+msgstr "ðÏÍÉÌËÁ ÚÂÅÒÅÖÅÎÎÑ ÆÁÊÌÕ: %s"
+
 #: mail/mail-search-dialogue.c:104
 msgid "Cancel"
 msgstr "÷¦ÄͦÎÉÔÉ"
@@ -4864,52 +5299,52 @@ msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "îÅ ×ÄÁÌÏÓÑ ÓÔ×ÏÒÉÔÉ ÔÉÍÞÁÓÏ×Õ ÐÏÛÔÏ×Õ ÓËÒÉÎØËÕ \"%s\": %s"
 
 #. Get all uids of source
-#: mail/mail-tools.c:240
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Examining %s"
 msgstr "ðÅÒÅצÒËÁ %s"
 
-#: mail/mail-tools.c:270
+#: mail/mail-tools.c:271
 #, c-format
 msgid ""
 "Could not read UID cache file \"%s\". You may receive duplicate messages."
 msgstr ""
 
-#: mail/mail-tools.c:299
+#: mail/mail-tools.c:300
 #, c-format
 msgid "Retrieving message %d of %d"
 msgstr "ïÔÒÉÍÁÎÎÑ ÐÏצÄÏÍÌÅÎÎÑ %d Ú %d"
 
 #. Append it to dest
-#: mail/mail-tools.c:314
+#: mail/mail-tools.c:315
 #, c-format
 msgid "Writing message %d of %d"
 msgstr "úÁÐÉÓ ÐÏצÄÏÍÌÅÎÎÑ %d Ú %d"
 
-#: mail/mail-tools.c:346
+#: mail/mail-tools.c:347
 #, c-format
 msgid "Saving changes to %s"
 msgstr "úÂÅÒÅÖÅÎÎÑ ÚÍ¦Î Õ %s"
 
-#: mail/mail-tools.c:383
+#: mail/mail-tools.c:381
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (ÐÅÒÅÓÌÁÎÅ ÐÏצÄÏÍÌÅÎÎÑ)"
 
-#: mail/mail-tools.c:393
+#: mail/mail-tools.c:391
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (ÂÅÚ ÔÅÍÉ)"
 
-#: mail/mail-tools.c:432
+#: mail/mail-tools.c:427
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "ðÅÒÅÓÌÁÎÅ ÐÏצÄÏÍÌÅÎÎÑ %s"
 
-#: mail/mail-tools.c:434
+#: mail/mail-tools.c:429
 msgid "Forwarded message (no subject)"
 msgstr "ðÅÒÅÓÌÁÎÅ ÐÏצÄÏÍÌÅÎÎÑ (ÂÅÚ ÔÅÍÉ)"
 
-#: mail/mail-tools.c:537
+#: mail/mail-tools.c:530
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
@@ -4926,27 +5361,27 @@ msgstr "îÏ×Á צÒÔÕÁÌØÎÁ ÔÅËÁ"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:148 po/tmp/evolution-mail.xml.h:37
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:37
 msgid "Reply"
 msgstr "÷¦ÄÐÏצÓÔÉ"
 
-#: mail/mail-view.c:148 po/tmp/evolution-mail.xml.h:42
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
 msgid "Reply to the sender of this message"
 msgstr "÷¦ÄÐÏצÓÔÉ ×¦ÄÐÒÁ×ÎÉËÕ ÃØÏÇÏ ÐÏצÄÏÍÌÅÎÎÑ"
 
-#: mail/mail-view.c:151 po/tmp/evolution-mail.xml.h:41
+#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
 msgid "Reply to all recipients of this message"
 msgstr "÷¦ÄÐÏצÓÔÉ ×Ó¦Í ÏÔÒÉÍÕ×ÁÞÁÍ ÃØÏÇÏ ÐÏצÄÏÍÌÅÎÎÑ"
 
-#: mail/mail-view.c:154 po/tmp/evolution-mail.xml.h:19
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:19
 msgid "Forward this message"
 msgstr "ðÅÒÅÓÌÁÔÉ ÃÅ ÐÏצÄÏÍÌÅÎÎÑ"
 
-#: mail/mail-view.c:158 po/tmp/evolution-mail.xml.h:36
+#: mail/mail-view.c:148 ui/evolution-mail.xml.h:36
 msgid "Print the selected message"
 msgstr "îÁÄÒÕËÕ×ÁÔÉ ×ÉÂÒÁÎÅ ÐÏצÄÏÍÌÅÎÎÑ"
 
-#: mail/mail-view.c:160 po/tmp/evolution-mail.xml.h:12
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:12
 msgid "Delete this message"
 msgstr "óÔÅÒÔÉ ÃÅ ÐÏצÄÏÍÌÅÎÎÑ"
 
@@ -5006,14 +5441,6 @@ msgstr "%I:%M %p"
 msgid "%b %d %Y"
 msgstr "%a %d %Y"
 
-#: mail/message-list.c:2347
-msgid "Rebuilding message view"
-msgstr "ðÅÒÅÂÕÄÕ×ÁÎÎÑ ×¦ÄÏÂÒÁÖÅÎÎÑ ÐÏצÄÏÍÌÅÎØ"
-
-#: mail/message-list.c:2349
-msgid "Rebuild message view"
-msgstr "ðÅÒÅÂÕÄÕ×ÁÔÉ ×¦ÄÏÂÒÁÖÅÎÎÑ ÐÏצÄÏÍÌÅÎØ"
-
 #: mail/subscribe-dialog.c:139
 msgid "Display folders starting with:"
 msgstr ""
@@ -5261,9 +5688,8 @@ msgstr ""
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:125
-#: po/tmp/evolution-message-composer.xml.h:48 po/tmp/evolution.xml.h:34
-#: shell/e-storage-set-view.c:235
+#: shell/e-storage-set-view.c:235 ui/evolution-event-editor.xml.h:125
+#: ui/evolution-message-composer.xml.h:48 ui/evolution.xml.h:34
 msgid "_View"
 msgstr "÷ÉÄ"
 
@@ -5359,1131 +5785,1116 @@ msgstr ""
 msgid "Cannot initialize the Bonobo component system."
 msgstr "îÅ ×ÄÁÌÏÓÑ ¦Î¦Ã¦Á̦ÚÕ×ÁÔÉ ËÏÍÐÏÎÅÎÔÎÕ ÓÉÓÔÅÍÕ Bonobo."
 
-#: po/tmp/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:7
 msgid "Create a new contact"
 msgstr "óÔ×ÏÒÉÔÉ ÎÏ×ÉÊ ËÏÎÔÁËÔ"
 
-#: po/tmp/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete a contact"
 msgstr "óÔÅÒÔÉ ËÏÎÔÁËÔ"
 
-#: po/tmp/evolution-addressbook.xml.h:10
-#: po/tmp/evolution-event-editor.xml.h:67
+#: ui/evolution-addressbook.xml.h:10 ui/evolution-event-editor.xml.h:67
 msgid "Find"
 msgstr "úÎÁÊÔÉ"
 
-#: po/tmp/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:11
 msgid "Find a contact"
 msgstr "úÎÁÊÔÉ ËÏÎÔÁËÔ"
 
-#: po/tmp/evolution-addressbook.xml.h:12 po/tmp/evolution-calendar.xml.h:19
+#: ui/evolution-addressbook.xml.h:12 ui/evolution-calendar.xml.h:19
 msgid "New"
 msgstr "îÏ×ÉÊ"
 
-#: po/tmp/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:14
 msgid "Print contacts"
 msgstr "îÁÄÒÕËÕ×ÁÔÉ ËÏÎÔÁËÔÉ"
 
-#: po/tmp/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:15
 msgid "Stop"
 msgstr "úÕÐÉÎÉÔÉ"
 
-#: po/tmp/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:16
 msgid "Stop Loading"
 msgstr "úÕÐÉÎÉÔÉ ÚÁ×ÁÎÔÁÖÅÎÎÑ"
 
-#: po/tmp/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:17
 msgid "View All"
 msgstr "ðÏËÁÚÁÔÉ ×ÓÅ"
 
-#: po/tmp/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:18
 msgid "View all contacts"
 msgstr "ðÏËÁÚÁÔÉ ×Ó¦ ËÏÎÔÁËÔÉ"
 
-#: po/tmp/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:19
 msgid "_Addressbook Configuration..."
 msgstr "ëÏÎƦ­ÕÒÁÃ¦Ñ ÁÄÒÅÓÎϧ ËÎÉÇÉ..."
 
-#: po/tmp/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:20
 msgid "_Print Contacts..."
 msgstr "îÁÄÒÕËÕ×ÁÔÉ ËÏÎÔÁËÔÉ..."
 
-#: po/tmp/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:21
 msgid "_Search for contacts"
 msgstr "ðÏÛÕË ËÏÎÔÁËÔ¦×"
 
-#: po/tmp/evolution-addressbook.xml.h:22
-#: po/tmp/evolution-event-editor.xml.h:123
+#: ui/evolution-addressbook.xml.h:22 ui/evolution-event-editor.xml.h:123
 msgid "_Tools"
 msgstr "¶ÎÓÔÒÕÍÅÎÔÉ"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:6
 msgid "5 Days"
 msgstr "5 äΦ×"
 
-#: po/tmp/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:7
 msgid "Alter preferences"
 msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:8
 msgid "Ca_lendar"
 msgstr "ëÁÌÅÎÄÁÒ"
 
-#: po/tmp/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:9
 msgid "Calendar Preferences..."
 msgstr "ðÁÒÁÍÅÔÒÉ ËÁÌÅÎÄÁÒÑ..."
 
-#: po/tmp/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:10
 msgid "Create a new appointment"
 msgstr "óÔ×ÏÒÉÔÉ ÎÏ×Õ ÚÕÓÔÒ¦Þ"
 
-#: po/tmp/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:11
 msgid "Create a new calendar"
 msgstr "óÔ×ÏÒÉÔÉ ÎÏ×ÉÊ ËÁÌÅÎÄÁÒ"
 
-#: po/tmp/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:12
 msgid "Day"
 msgstr "äÅÎØ"
 
-#: po/tmp/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:13
 msgid "Go back in time"
 msgstr "ðÅÒÅÊÔÉ ÎÁÚÁÄ × ÞÁÓ¦"
 
-#: po/tmp/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:14
 msgid "Go forward in time"
 msgstr "ðÅÒÅÊÔÉ ×ÐÅÒÅÄ × ÞÁÓ¦"
 
-#: po/tmp/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to"
 msgstr "ðÅÒÅÊÔÉ"
 
-#: po/tmp/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to a specific date"
 msgstr "ðÅÒÅÊÔÉ ÄÏ ×ËÁÚÁÎϧ ÄÁÔÉ"
 
-#: po/tmp/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:17
 msgid "Go to present time"
 msgstr "ðÏÐÅÒÅÊÔÉ × ÔÏÞÎÉÊ ÞÁÓ"
 
-#: po/tmp/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "í¦ÓÑÃØ"
 
-#: po/tmp/evolution-calendar.xml.h:20 po/tmp/evolution-event-editor.xml.h:74
+#: ui/evolution-calendar.xml.h:20 ui/evolution-event-editor.xml.h:74
 msgid "Next"
 msgstr "äÁ̦"
 
-#: po/tmp/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:21
 msgid "Open a calendar"
 msgstr "÷¦ÄËÒÉÔÉ ËÁÌÅÎÄÁÒ"
 
-#: po/tmp/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:22
 msgid "Prev"
 msgstr "ðÏ×ÅÒÎÕÔÉÓØ"
 
-#: po/tmp/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:24
 msgid "Print this calendar"
 msgstr "îÁÄÒÕËÕ×ÁÔÉ ÃÅÊ ËÁÌÅÎÄÁÒ"
 
-#: po/tmp/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:25
 msgid "Save calendar as something else"
 msgstr "úÂÅÒÅÇÔÉ ËÁÌÅÎÄÁÒ ÑË ÝÏÓØ ¦ÎÛÅ"
 
-#: po/tmp/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 day"
 msgstr "ðÏËÁÚÁÔÉ 1 ÄÅÎØ"
 
-#: po/tmp/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:27
 msgid "Show 1 month"
 msgstr "ðÏËÁÚÁÔÉ 1 ͦÓÑÃØ"
 
-#: po/tmp/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:28
 msgid "Show 1 week"
 msgstr "ðÏËÁÚÁÔÉ 1 ÔÉÖÄÅÎØ"
 
-#: po/tmp/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr "ðÏËÁÚÁÔÉ ÒÏÂÏÞÉÊ ÔÉÖÄÅÎØ"
 
-#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:413
+#: ui/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:413
 msgid "Today"
 msgstr "ÓØÏÇÏÄΦ"
 
-#: po/tmp/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:31
 msgid "Week"
 msgstr "ôÉÖÄÅÎØ"
 
-#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:31
+#: ui/evolution-calendar.xml.h:32 ui/evolution.xml.h:31
 msgid "_New"
 msgstr "îÏ×ÉÊ"
 
-#: po/tmp/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:33
 msgid "_Open Calendar"
 msgstr "÷¦ÄËÒÉÔÉ ËÁÌÅÎÄÁÒ"
 
-#: po/tmp/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:34
 msgid "_Print this calendar"
 msgstr "îÁÄÒÕËÕ×ÁÔÉ ÃÅÊ ËÁÌÅÎÄÁÒ"
 
-#: po/tmp/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:35
 msgid "_Save As..."
 msgstr "úÂÅÒÅÇÔÉ ÑË..."
 
-#: po/tmp/evolution-contact-editor.xml.h:7
+#: ui/evolution-contact-editor.xml.h:7
 msgid "Delete this item"
 msgstr "óÔÅÒÔÉ ÃÅÊ ÅÌÅÍÅÎÔ"
 
-#: po/tmp/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:8
 msgid "Delete..."
 msgstr "óÔÅÒÔÉ..."
 
-#: po/tmp/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Help"
 msgstr "äÏצÄËÁ"
 
-#: po/tmp/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:10
 msgid "Print En_velope..."
 msgstr "îÁÄÒÕËÕ×ÁÔÉ ËÏÎ×ÅÒÔ..."
 
-#: po/tmp/evolution-contact-editor.xml.h:11
-#: po/tmp/evolution-event-editor.xml.h:81
+#: ui/evolution-contact-editor.xml.h:11 ui/evolution-event-editor.xml.h:81
 msgid "Print this item"
 msgstr "îÁÄÒÕËÕ×ÁÔÉ ÃÅÊ ÅÌÅÍÅÎÔ"
 
-#: po/tmp/evolution-contact-editor.xml.h:12
-#: po/tmp/evolution-event-editor.xml.h:82
+#: ui/evolution-contact-editor.xml.h:12 ui/evolution-event-editor.xml.h:82
 msgid "Print..."
 msgstr "äÒÕËÕ×ÁÔÉ..."
 
-#: po/tmp/evolution-contact-editor.xml.h:13
-#: po/tmp/evolution-event-editor.xml.h:89
-#: po/tmp/evolution-message-composer.xml.h:21
+#: ui/evolution-contact-editor.xml.h:13 ui/evolution-event-editor.xml.h:89
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "úÂÅÒÅÇÔÉ ÑË..."
 
-#: po/tmp/evolution-contact-editor.xml.h:14
-#: po/tmp/evolution-event-editor.xml.h:90
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:90
 msgid "Save and Close"
 msgstr "úÂÅÒÅÇÔÉ ÔÁ ÚÁËÒÉÔÉ"
 
-#: po/tmp/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-editor.xml.h:15
 msgid "Save the contact and close the dialog box"
 msgstr "úÂÅÒÅÇÔÉ ËÏÎÔÁËÔ ¦ ÚÁËÒÉÔÉ Ä¦ÁÌÏÇ"
 
-#: po/tmp/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-editor.xml.h:16
 msgid "Se_nd contact to other..."
 msgstr "÷¦Ä¦ÓÌÁÔÉ ËÏÎÔÁËÔ ¦ÎÛÏÍÕ..."
 
-#: po/tmp/evolution-contact-editor.xml.h:17
-#: po/tmp/evolution-event-editor.xml.h:98
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-event-editor.xml.h:98
 msgid "See online help"
 msgstr ""
 
-#: po/tmp/evolution-contact-editor.xml.h:18
+#: ui/evolution-contact-editor.xml.h:18
 msgid "Send _message to contact..."
 msgstr "÷¦Ä¦ÓÌÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ ÚÁ ËÏÎÔÁËÔÏÍ..."
 
-#: po/tmp/evolution-contact-editor.xml.h:19
-#: po/tmp/evolution-event-editor.xml.h:110
-#: po/tmp/evolution-message-composer.xml.h:42
-#: po/tmp/evolution-subscribe.xml.h:16 po/tmp/evolution.xml.h:25
+#: ui/evolution-contact-editor.xml.h:19 ui/evolution-event-editor.xml.h:110
+#: ui/evolution-message-composer.xml.h:42 ui/evolution-subscribe.xml.h:16
+#: ui/evolution.xml.h:25
 msgid "_File"
 msgstr "æÁÊÌ"
 
-#: po/tmp/evolution-contact-editor.xml.h:20
+#: ui/evolution-contact-editor.xml.h:20
 msgid "_Print..."
 msgstr "äÒÕËÕ×ÁÔÉ..."
 
-#: po/tmp/evolution-contact-editor.xml.h:21
-#: po/tmp/evolution-event-editor.xml.h:121
-#: po/tmp/evolution-message-composer.xml.h:46
+#: ui/evolution-contact-editor.xml.h:21 ui/evolution-event-editor.xml.h:121
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Save"
 msgstr "úÂÅÒÅÇÔÉ"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/evolution-event-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:6
 msgid "About this application"
 msgstr "ðÒÏ ÃÀ ÐÒÏÇÒÁÍÕ"
 
-#: po/tmp/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:7
 msgid "About..."
 msgstr "ðÒÏ..."
 
-#: po/tmp/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:8
 msgid "Actio_ns"
 msgstr "䦧"
 
-#: po/tmp/evolution-event-editor.xml.h:9
+#: ui/evolution-event-editor.xml.h:9
 msgid "C_lear"
 msgstr "ïÞÉÓÔÉÔÉ"
 
-#: po/tmp/evolution-event-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:10
 msgid "C_ut"
 msgstr "÷ÉÒ¦ÚÁÔÉ"
 
-#: po/tmp/evolution-event-editor.xml.h:11
+#: ui/evolution-event-editor.xml.h:11
 msgid "Clear"
 msgstr "ïÞÉÓÔÉÔÉ"
 
-#: po/tmp/evolution-event-editor.xml.h:12
+#: ui/evolution-event-editor.xml.h:12
 msgid "Clear the selection"
 msgstr "ïÞÉÓÔÉÔÉ ×ÉÂÒÁÎÅ"
 
-#: po/tmp/evolution-event-editor.xml.h:14
+#: ui/evolution-event-editor.xml.h:14
 msgid "Close this appointment"
 msgstr "úÁËÒÉÔÉ ÃÀ ÚÕÓÔÒ¦Þ"
 
-#: po/tmp/evolution-event-editor.xml.h:15 po/tmp/evolution-mail.xml.h:8
+#: ui/evolution-event-editor.xml.h:15 ui/evolution-mail.xml.h:8
 msgid "Copy"
 msgstr "óËÏЦÀ×ÁÔÉ"
 
-#: po/tmp/evolution-event-editor.xml.h:16
+#: ui/evolution-event-editor.xml.h:16
 msgid "Copy the selection"
 msgstr "óËÏЦÀ×ÁÔÉ ×ÉÂÒÁÎÅ"
 
-#: po/tmp/evolution-event-editor.xml.h:17
+#: ui/evolution-event-editor.xml.h:17
 msgid "Cut"
 msgstr "÷ÉÒ¦ÚÁÔÉ"
 
-#: po/tmp/evolution-event-editor.xml.h:18
+#: ui/evolution-event-editor.xml.h:18
 msgid "Cut the selection"
 msgstr "÷ÉÒ¦ÚÁÔÉ ×ÉÂÒÁÎÅ"
 
-#: po/tmp/evolution-event-editor.xml.h:21
+#: ui/evolution-event-editor.xml.h:21
 msgid "Dump XML"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:22
+#: ui/evolution-event-editor.xml.h:22
 msgid "Dump the UI Xml description"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:23
+#: ui/evolution-event-editor.xml.h:23
 msgid "FIXME: Address _Book..."
 msgstr "áÄÒÅÓÎÁ ËÎÉÇÁ..."
 
-#: po/tmp/evolution-event-editor.xml.h:24
+#: ui/evolution-event-editor.xml.h:24
 msgid "FIXME: Ch_oose Form..."
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:25
+#: ui/evolution-event-editor.xml.h:25
 msgid "FIXME: Chec_k Names"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:26
+#: ui/evolution-event-editor.xml.h:26
 msgid "FIXME: Cop_y to Folder..."
 msgstr "óËÏЦÀ×ÁÔÉ Õ ÔÅËÕ..."
 
-#: po/tmp/evolution-event-editor.xml.h:27
+#: ui/evolution-event-editor.xml.h:27
 msgid "FIXME: D_esign a Form..."
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:28
+#: ui/evolution-event-editor.xml.h:28
 msgid "FIXME: Define Print _Styles"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:29
+#: ui/evolution-event-editor.xml.h:29
 msgid "FIXME: Desi_gn This Form"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:30
+#: ui/evolution-event-editor.xml.h:30
 msgid "FIXME: Fi_rst Item in Folder"
 msgstr "ðÅÒÛÉÊ ÅÌÅÍÅÎÔ Õ ÔÅæ"
 
-#: po/tmp/evolution-event-editor.xml.h:31
+#: ui/evolution-event-editor.xml.h:31
 msgid "FIXME: For_ward"
 msgstr "ðÅÒÅÓÌÁÔÉ"
 
-#: po/tmp/evolution-event-editor.xml.h:32
+#: ui/evolution-event-editor.xml.h:32
 msgid "FIXME: Forward as v_Calendar"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:33
+#: ui/evolution-event-editor.xml.h:33
 msgid "FIXME: Help"
 msgstr "äÏצÄËÁ"
 
-#: po/tmp/evolution-event-editor.xml.h:34
+#: ui/evolution-event-editor.xml.h:34
 msgid "FIXME: In_complete Task"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:35
+#: ui/evolution-event-editor.xml.h:35
 msgid "FIXME: Insert File"
 msgstr "÷ÓÔÁ×ÉÔÉ ÆÁÊÌ"
 
-#: po/tmp/evolution-event-editor.xml.h:36
+#: ui/evolution-event-editor.xml.h:36
 msgid "FIXME: It_em..."
 msgstr "åÌÅÍÅÎÔ..."
 
-#: po/tmp/evolution-event-editor.xml.h:37
+#: ui/evolution-event-editor.xml.h:37
 msgid "FIXME: Paste _Special... "
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:38
+#: ui/evolution-event-editor.xml.h:38
 msgid "FIXME: Print Pre_view"
 msgstr "ðÅÒÅÇÌÑÄ ÄÒÕËÕ"
 
-#: po/tmp/evolution-event-editor.xml.h:39
+#: ui/evolution-event-editor.xml.h:39
 msgid "FIXME: Pu_blish Form As..."
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:40
+#: ui/evolution-event-editor.xml.h:40
 msgid "FIXME: Publish _Form..."
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:41
+#: ui/evolution-event-editor.xml.h:41
 msgid "FIXME: Rec_urrence..."
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:42
+#: ui/evolution-event-editor.xml.h:42
 msgid "FIXME: S_end"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:43
+#: ui/evolution-event-editor.xml.h:43
 msgid "FIXME: Save Attac_hments..."
 msgstr "úÂÅÒÅÇÔÉ ÄÏÌÕÞÅÎÎÑ..."
 
-#: po/tmp/evolution-event-editor.xml.h:44
+#: ui/evolution-event-editor.xml.h:44
 msgid "FIXME: Script _Debugger"
 msgstr "îÁÌÁÇÏÄÖÅÎÎÑ ÓËÒÉÐÔ¦×"
 
-#: po/tmp/evolution-event-editor.xml.h:45
+#: ui/evolution-event-editor.xml.h:45
 msgid "FIXME: Task _Request"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:46
+#: ui/evolution-event-editor.xml.h:46
 msgid "FIXME: _Contact"
 msgstr "ëÏÎÔÁËÔ"
 
-#: po/tmp/evolution-event-editor.xml.h:47
+#: ui/evolution-event-editor.xml.h:47
 msgid "FIXME: _Customize..."
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:48
+#: ui/evolution-event-editor.xml.h:48
 msgid "FIXME: _File..."
 msgstr "æÁÊÌ..."
 
-#: po/tmp/evolution-event-editor.xml.h:49
+#: ui/evolution-event-editor.xml.h:49
 msgid "FIXME: _Font..."
 msgstr "ûÒÉÆÔ..."
 
-#: po/tmp/evolution-event-editor.xml.h:50
+#: ui/evolution-event-editor.xml.h:50
 msgid "FIXME: _Formatting"
 msgstr "æÏÒÍÁÔÕ×ÁÎÎÑ"
 
-#: po/tmp/evolution-event-editor.xml.h:51
+#: ui/evolution-event-editor.xml.h:51
 msgid "FIXME: _Item"
 msgstr "åÌÅÍÅÎÔ"
 
-#: po/tmp/evolution-event-editor.xml.h:52
+#: ui/evolution-event-editor.xml.h:52
 msgid "FIXME: _Journal Entry"
 msgstr "öÕÒÎÁÌØÎÉÊ ÚÁÐÉÓ"
 
-#: po/tmp/evolution-event-editor.xml.h:53
+#: ui/evolution-event-editor.xml.h:53
 msgid "FIXME: _Last Item in Folder"
 msgstr "ïÓÔÁÎÎ¦Ê ÅÌÅÍÅÎÔ Õ ÔÅæ"
 
-#: po/tmp/evolution-event-editor.xml.h:54
+#: ui/evolution-event-editor.xml.h:54
 #, fuzzy
 msgid "FIXME: _Mail Message"
 msgstr "÷ÉÐÒÁ×ÉÔÉ ÐÏצÄÏÍÌÅÎÎÑ"
 
-#: po/tmp/evolution-event-editor.xml.h:55
+#: ui/evolution-event-editor.xml.h:55
 msgid "FIXME: _Memo Style"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:56
+#: ui/evolution-event-editor.xml.h:56
 #, fuzzy
 msgid "FIXME: _Move to Folder..."
 msgstr "ðÅÒÅÎÅÓÔÉ × ÔÅËÕ"
 
-#: po/tmp/evolution-event-editor.xml.h:57
+#: ui/evolution-event-editor.xml.h:57
 #, fuzzy
 msgid "FIXME: _New Appointment"
 msgstr "îÏ×Á ÚÕÓÔÒ¦Þ..."
 
-#: po/tmp/evolution-event-editor.xml.h:58
+#: ui/evolution-event-editor.xml.h:58
 msgid "FIXME: _Note"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:59
+#: ui/evolution-event-editor.xml.h:59
 msgid "FIXME: _Object..."
 msgstr "ïÂ'¤ËÔ..."
 
-#: po/tmp/evolution-event-editor.xml.h:60
+#: ui/evolution-event-editor.xml.h:60
 msgid "FIXME: _Paragraph..."
 msgstr "áÂÚÁÃ..."
 
-#: po/tmp/evolution-event-editor.xml.h:61
+#: ui/evolution-event-editor.xml.h:61
 msgid "FIXME: _Spelling..."
 msgstr "çÒÁÍÁÔÉËÁ..."
 
-#: po/tmp/evolution-event-editor.xml.h:62
+#: ui/evolution-event-editor.xml.h:62
 msgid "FIXME: _Standard"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:63
+#: ui/evolution-event-editor.xml.h:63
 msgid "FIXME: _Task"
 msgstr "úÁ×ÄÁÎÎÑ"
 
-#: po/tmp/evolution-event-editor.xml.h:64
+#: ui/evolution-event-editor.xml.h:64
 msgid "FIXME: _Unread Item"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:65
+#: ui/evolution-event-editor.xml.h:65
 msgid "FIXME: what goes here?"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:66
-#: po/tmp/evolution-message-composer.xml.h:11
+#: ui/evolution-event-editor.xml.h:66 ui/evolution-message-composer.xml.h:11
 msgid "F_ormat"
 msgstr "æÏÒÍÁÔ"
 
-#: po/tmp/evolution-event-editor.xml.h:68
+#: ui/evolution-event-editor.xml.h:68
 msgid "Find Again"
 msgstr "ûÕËÁÔÉ ÄÁ̦"
 
-#: po/tmp/evolution-event-editor.xml.h:69
+#: ui/evolution-event-editor.xml.h:69
 msgid "Find _Again"
 msgstr "ûÕËÁÔÉ ÄÁ̦"
 
-#: po/tmp/evolution-event-editor.xml.h:70
+#: ui/evolution-event-editor.xml.h:70
 msgid "Go to the next item"
 msgstr "ðÅÒÅÊÔÉ ÄÏ ÎÁÓÔÕÐÎÏÇÏ ÅÌÅÍÅÎÔÕ"
 
-#: po/tmp/evolution-event-editor.xml.h:71
+#: ui/evolution-event-editor.xml.h:71
 msgid "Go to the previous item"
 msgstr "ðÅÒÅÊÔÉ ÄÏ ÐÏÐÅÒÅÄÎØÏÇÏ ÅÌÅÍÅÎÔÕ"
 
-#: po/tmp/evolution-event-editor.xml.h:72
+#: ui/evolution-event-editor.xml.h:72
 msgid "Modify the file's properties"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:73
+#: ui/evolution-event-editor.xml.h:73
 msgid "N_ext"
 msgstr "îÁÓÔÕÐÎÉÊ"
 
-#: po/tmp/evolution-event-editor.xml.h:75
+#: ui/evolution-event-editor.xml.h:75
 msgid "Paste"
 msgstr "÷ÓÔÁ×ÉÔÉ"
 
-#: po/tmp/evolution-event-editor.xml.h:76
+#: ui/evolution-event-editor.xml.h:76
 msgid "Paste the clipboard"
 msgstr "÷ÓÔÁ×ÉÔÉ ÂÕÆÅÒ ÏÂͦÎÕ"
 
-#: po/tmp/evolution-event-editor.xml.h:77
+#: ui/evolution-event-editor.xml.h:77
 msgid "Pre_vious"
 msgstr "ðÏÐÅÒÅÄΦÊ"
 
-#: po/tmp/evolution-event-editor.xml.h:78
+#: ui/evolution-event-editor.xml.h:78
 msgid "Previous"
 msgstr "ðÏÐÅÒÅÄΦÊ"
 
-#: po/tmp/evolution-event-editor.xml.h:79
+#: ui/evolution-event-editor.xml.h:79
 msgid "Print S_etup..."
 msgstr "ðÁÒÁÍÅÔÒÉ ÄÒÕËÕ..."
 
-#: po/tmp/evolution-event-editor.xml.h:80
+#: ui/evolution-event-editor.xml.h:80
 msgid "Print Setup"
 msgstr "ðÁÒÁÍÅÔÒÉ ÄÒÕËÕ"
 
-#: po/tmp/evolution-event-editor.xml.h:83
+#: ui/evolution-event-editor.xml.h:83
 msgid "Properties"
 msgstr "÷ÌÁÓÔÉ×ÏÓÔ¦"
 
-#: po/tmp/evolution-event-editor.xml.h:84
+#: ui/evolution-event-editor.xml.h:84
 msgid "Redo"
 msgstr "ðÏ×ÔÏÒÉÔÉ"
 
-#: po/tmp/evolution-event-editor.xml.h:85
+#: ui/evolution-event-editor.xml.h:85
 msgid "Redo the undone action"
 msgstr "ðÏ×ÔÏÒÉÔÉ ×¦ÄͦÎÅÎÕ Ä¦À"
 
-#: po/tmp/evolution-event-editor.xml.h:86
+#: ui/evolution-event-editor.xml.h:86
 msgid "Replace"
 msgstr "úÁͦÎÉÔÉ"
 
-#: po/tmp/evolution-event-editor.xml.h:87
+#: ui/evolution-event-editor.xml.h:87
 msgid "Replace a string"
 msgstr "úÁͦÎÉÔÉ ÒÑÄÏË"
 
-#: po/tmp/evolution-event-editor.xml.h:91
+#: ui/evolution-event-editor.xml.h:91
 msgid "Save the appointment and close the dialog box"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:92
-#: po/tmp/evolution-message-composer.xml.h:24
+#: ui/evolution-event-editor.xml.h:92 ui/evolution-message-composer.xml.h:24
 msgid "Save the current file"
 msgstr "úÂÅÒÅÇÔÉ ÐÏÔÏÞÎÉÊ ÆÁÊÌ"
 
-#: po/tmp/evolution-event-editor.xml.h:93
+#: ui/evolution-event-editor.xml.h:93
 msgid "Schedule Meeting"
 msgstr "ðÌÁÎÕ×ÁÎÎÑ ÚÕÓÔÒ¦Þ¦"
 
-#: po/tmp/evolution-event-editor.xml.h:94
+#: ui/evolution-event-editor.xml.h:94
 msgid "Schedule _Meeting"
 msgstr "ðÌÁÎÕ×ÁÔÉ ÚÕÓÔÒ¦Þ"
 
-#: po/tmp/evolution-event-editor.xml.h:95
+#: ui/evolution-event-editor.xml.h:95
 msgid "Schedule some sort of a meeting"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:96
+#: ui/evolution-event-editor.xml.h:96
 msgid "Search again for the same string"
 msgstr "ûÕËÁÔÉ ÚÎÏ×ÕÊ ÔÏÊ ÖÅ ÒÑÄÏË"
 
-#: po/tmp/evolution-event-editor.xml.h:97
+#: ui/evolution-event-editor.xml.h:97
 msgid "Search for a string"
 msgstr "ðÏÛÕË ÒÑÄËÁ"
 
-#: po/tmp/evolution-event-editor.xml.h:99
+#: ui/evolution-event-editor.xml.h:99
 msgid "Select All"
 msgstr "÷ÉÂÒÁÔÉ ×ÓÅ"
 
-#: po/tmp/evolution-event-editor.xml.h:100
+#: ui/evolution-event-editor.xml.h:100
 #, fuzzy
 msgid "Select everything"
 msgstr "÷ÉÂÒÁÔÉ ÎÁÚ×É"
 
-#: po/tmp/evolution-event-editor.xml.h:101
+#: ui/evolution-event-editor.xml.h:101
 msgid "Setup the page settings for your current printer"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:102
+#: ui/evolution-event-editor.xml.h:102
 msgid "Undo"
 msgstr "÷¦ÄͦÎÉÔÉ"
 
-#: po/tmp/evolution-event-editor.xml.h:103
+#: ui/evolution-event-editor.xml.h:103
 msgid "Undo the last action"
 msgstr "÷¦ÄͦÎÉÔÉ ÏÓÔÁÎÎÀ ÏÐÅÒÁæÀ"
 
-#: po/tmp/evolution-event-editor.xml.h:104
-#: po/tmp/evolution-message-composer.xml.h:38
+#: ui/evolution-event-editor.xml.h:104 ui/evolution-message-composer.xml.h:38
 msgid "_About..."
 msgstr "ðÒÏ..."
 
-#: po/tmp/evolution-event-editor.xml.h:105
-#: po/tmp/evolution-message-composer.xml.h:39
+#: ui/evolution-event-editor.xml.h:105 ui/evolution-message-composer.xml.h:39
 msgid "_Close"
 msgstr "úÁËÒÉÔÉ"
 
-#: po/tmp/evolution-event-editor.xml.h:106
+#: ui/evolution-event-editor.xml.h:106
 msgid "_Copy"
 msgstr "óËÏЦÀ×ÁÔÉ"
 
-#: po/tmp/evolution-event-editor.xml.h:107
-#: po/tmp/evolution-message-composer.xml.h:40
+#: ui/evolution-event-editor.xml.h:107 ui/evolution-message-composer.xml.h:40
 msgid "_Debug"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:109
-#: po/tmp/evolution-message-composer.xml.h:41
-#: po/tmp/evolution-subscribe.xml.h:15 po/tmp/evolution.xml.h:24
+#: ui/evolution-event-editor.xml.h:109 ui/evolution-message-composer.xml.h:41
+#: ui/evolution-subscribe.xml.h:15 ui/evolution.xml.h:24
 msgid "_Edit"
 msgstr "òÅÄÁÇÕ×ÁÎÎÑ"
 
-#: po/tmp/evolution-event-editor.xml.h:111
+#: ui/evolution-event-editor.xml.h:111
 msgid "_Find..."
 msgstr "úÎÁÊÔÉ..."
 
-#: po/tmp/evolution-event-editor.xml.h:112
+#: ui/evolution-event-editor.xml.h:112
 msgid "_Forms"
 msgstr "æÏÒÍÉ"
 
-#: po/tmp/evolution-event-editor.xml.h:113
-#: po/tmp/evolution-message-composer.xml.h:43 po/tmp/evolution.xml.h:28
+#: ui/evolution-event-editor.xml.h:113 ui/evolution-message-composer.xml.h:43
+#: ui/evolution.xml.h:28
 msgid "_Help"
 msgstr "äÏצÄËÁ"
 
-#: po/tmp/evolution-event-editor.xml.h:114
+#: ui/evolution-event-editor.xml.h:114
 msgid "_Insert"
 msgstr "÷ÓÔÁ×ÉÔÉ"
 
-#: po/tmp/evolution-event-editor.xml.h:115
+#: ui/evolution-event-editor.xml.h:115
 msgid "_Object"
 msgstr "ïÂ'¤ËÔ"
 
-#: po/tmp/evolution-event-editor.xml.h:116
+#: ui/evolution-event-editor.xml.h:116
 msgid "_Paste"
 msgstr "÷ÓÔÁ×ÉÔÉ"
 
-#: po/tmp/evolution-event-editor.xml.h:117
+#: ui/evolution-event-editor.xml.h:117
 msgid "_Print"
 msgstr "äÒÕËÕ×ÁÔÉ"
 
-#: po/tmp/evolution-event-editor.xml.h:118
+#: ui/evolution-event-editor.xml.h:118
 msgid "_Properties..."
 msgstr "÷ÌÁÓÔÉ×ÏÓÔ¦..."
 
-#: po/tmp/evolution-event-editor.xml.h:119
+#: ui/evolution-event-editor.xml.h:119
 msgid "_Redo"
 msgstr "ðÏ×ÔÏÒÉÔÉ"
 
-#: po/tmp/evolution-event-editor.xml.h:120
+#: ui/evolution-event-editor.xml.h:120
 msgid "_Replace..."
 msgstr "úÁͦÎÉÔÉ..."
 
-#: po/tmp/evolution-event-editor.xml.h:122
+#: ui/evolution-event-editor.xml.h:122
 msgid "_Toolbars"
 msgstr "ÐÁÎÅϦ ¦ÎÓÔÒÕÍÅΦ×"
 
-#: po/tmp/evolution-event-editor.xml.h:124
+#: ui/evolution-event-editor.xml.h:124
 msgid "_Undo"
 msgstr "÷¦ÄͦÎÉÔÉ"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/evolution-mail.xml.h:6
+#: ui/evolution-mail.xml.h:6
 msgid "Compose"
 msgstr "ð¦ÄÇÏÔÕ×ÁÔÉ"
 
-#: po/tmp/evolution-mail.xml.h:7
+#: ui/evolution-mail.xml.h:7
 msgid "Compose a new message"
 msgstr "óËÌÁÓÔÉ ÎÏ×Å ÐÏצÄÏÍÌÅÎÎÑ"
 
-#: po/tmp/evolution-mail.xml.h:9
+#: ui/evolution-mail.xml.h:9
 msgid "Copy message to a new folder"
 msgstr "óËÏЦÀ×ÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ Õ ÎÏ×Õ ÔÅËÕ"
 
-#: po/tmp/evolution-mail.xml.h:13 po/tmp/evolution-subscribe.xml.h:8
+#: ui/evolution-mail.xml.h:13 ui/evolution-subscribe.xml.h:8
 msgid "F_older"
 msgstr "ôÅËÁ"
 
-#: po/tmp/evolution-mail.xml.h:14
+#: ui/evolution-mail.xml.h:14
 msgid "Fi_lter on Sender"
 msgstr "æ¦ÌØÔÒ ×¦ÄÐÒÁ×ÎÉËÁ"
 
-#: po/tmp/evolution-mail.xml.h:15
+#: ui/evolution-mail.xml.h:15
 msgid "Filter on Rec_ipients"
 msgstr "æ¦ÌØÔÒ ÏÔÒÉÍÕ×ÁÞ¦×"
 
-#: po/tmp/evolution-mail.xml.h:16
+#: ui/evolution-mail.xml.h:16
 msgid "Forget _Passwords"
 msgstr "úÁÂÕÔÉ ÐÁÒÏ̦"
 
-#: po/tmp/evolution-mail.xml.h:20
+#: ui/evolution-mail.xml.h:20
 msgid "Get Mail"
 msgstr "ïÔÒÉÍÁÔÉ ÐÏÛÔÕ"
 
-#: po/tmp/evolution-mail.xml.h:22
+#: ui/evolution-mail.xml.h:22
 msgid "Hide _Deleted messages"
 msgstr "ðÒÉÂÒÁÔÉ ÓÔÅÒÔ¦ ÐÏצÄÏÍÌÅÎÎÑ"
 
-#: po/tmp/evolution-mail.xml.h:23
+#: ui/evolution-mail.xml.h:23
 msgid "Hide _Read messages"
 msgstr "ðÒÉÂÒÁÔÉ ÐÒÏÞÉÔÁΦ ÐÏצÄÏÍÌÅÎÎÑ"
 
-#: po/tmp/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:24
 msgid "Hide _Selected messages"
 msgstr "ðÒÉÂÒÁÔÉ ×ÉÂÒÁΦ ÐÏצÄÏÍÌÅÎÎÑ"
 
-#: po/tmp/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:25
 msgid "Mail _Filters..."
 msgstr "ðÏÛÔÏצ ƦÌØÔÒÉ..."
 
-#: po/tmp/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:26
 #, fuzzy
 msgid "Manage Subscriptions..."
 msgstr "ïÐÉÓ:"
 
-#: po/tmp/evolution-mail.xml.h:27
+#: ui/evolution-mail.xml.h:27
 msgid "Mar_k As Read"
 msgstr "ðÏÚÎÁÞÉÔÉ ÑË ÐÒÏÞÉÔÁÎÅ"
 
-#: po/tmp/evolution-mail.xml.h:28
+#: ui/evolution-mail.xml.h:28
 msgid "Mark As U_nread"
 msgstr "ðÏÚÎÁÞÉÔÉ ÑË ÎÅÐÒÏÞÉÔÁÎÅ"
 
-#: po/tmp/evolution-mail.xml.h:29
+#: ui/evolution-mail.xml.h:29
 msgid "Move"
 msgstr "ðÅÒÅÎÅÓÔÉ"
 
-#: po/tmp/evolution-mail.xml.h:30
+#: ui/evolution-mail.xml.h:30
 msgid "Move message to a new folder"
 msgstr "ðÅÒÅÎÅÓÔÉ ÐÏצÄÏÍÌÅÎÎÑ Õ ÎÏ×Õ ÔÅËÕ"
 
-#: po/tmp/evolution-mail.xml.h:31
+#: ui/evolution-mail.xml.h:31
 msgid "Previews the message to be printed"
 msgstr "ðÅÒÅÇÌÑÎÕÔÉ ÐÏצÄÏÍÌÅÎÎÑ, ÝÏ ÂÕÄÅ ÎÁÄÒÕËÕ×ÁÎÏ"
 
-#: po/tmp/evolution-mail.xml.h:33
+#: ui/evolution-mail.xml.h:33
 msgid "Print Preview of message..."
 msgstr "ðÅÒÅÇÌÑÄ ÄÒÕËÕ ÐÏצÄÏÍÌÅÎÎÑ..."
 
-#: po/tmp/evolution-mail.xml.h:34
+#: ui/evolution-mail.xml.h:34
 msgid "Print message to the printer"
 msgstr "îÁÄÒÕËÕ×ÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ ÎÁ ÐÒÉÎÔÅÒ¦"
 
-#: po/tmp/evolution-mail.xml.h:35
+#: ui/evolution-mail.xml.h:35
 msgid "Print message..."
 msgstr "îÁÄÒÕËÕ×ÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ..."
 
-#: po/tmp/evolution-mail.xml.h:39
+#: ui/evolution-mail.xml.h:39
 msgid "Reply to _All"
 msgstr "÷¦ÄÐÏצÓÔÉ ×Ó¦Í"
 
-#: po/tmp/evolution-mail.xml.h:40
+#: ui/evolution-mail.xml.h:40
 msgid "Reply to _Sender"
 msgstr "÷¦ÄÐÏצÓÔÉ ×¦ÄÐÒÁ×ÎÉËÕ"
 
-#: po/tmp/evolution-mail.xml.h:43 po/tmp/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:43 ui/evolution-subscribe.xml.h:12
 msgid "Select _All"
 msgstr "÷ÉÂÒÁÔÉ ×ÓÅ"
 
-#: po/tmp/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:44
 msgid "Send queued mail and retrieve new mail"
 msgstr "÷¦Ä¦ÓÌÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ Ú ÞÅÒÇÉ ÔÁ ÏÔÒÉÍÁÔÉ ÎÏצ"
 
-#: po/tmp/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:45
 msgid "Show _All messages"
 msgstr "ðÏËÁÚÁÔÉ ×Ó¦ ÐÏצÄÏÍÌÅÎÎÑ"
 
-#: po/tmp/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:46
 #, fuzzy
 msgid "Threaded Message list"
 msgstr "ðÅÒÅÓÌÁÔÉ ÃÅ ÐÏצÄÏÍÌÅÎÎÑ"
 
-#: po/tmp/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:47
 msgid "VFolder on Se_nder"
 msgstr "÷¦ÒÔÕÁÌØÎÁ ÔÅËÁ צÄÐÒÁ×ÎÉËÁ"
 
-#: po/tmp/evolution-mail.xml.h:48
+#: ui/evolution-mail.xml.h:48
 msgid "VFolder on _Recipients"
 msgstr "÷¦ÒÔÕÁÌØÎÁ ÔÅËÁ ÏÔÒÉÍÕ×ÁÞ¦×"
 
-#: po/tmp/evolution-mail.xml.h:49
+#: ui/evolution-mail.xml.h:49
 msgid "View Raw Message Source"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:50
 msgid "_Apply Filters"
 msgstr "úÁÓÔÏÓÕ×ÁÔÉ Æ¦ÌØÔÒÉ"
 
-#: po/tmp/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:51
 msgid "_Configure Folder"
 msgstr "ëÏÎƦ­ÕÒÕ×ÁÔÉ ÔÅËÕ"
 
-#: po/tmp/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:52
 msgid "_Copy to Folder..."
 msgstr "óËÏЦÀ×ÁÔÉ × ÔÅËÕ..."
 
-#: po/tmp/evolution-mail.xml.h:54
+#: ui/evolution-mail.xml.h:54
 msgid "_Edit Message"
 msgstr "÷ÉÐÒÁ×ÉÔÉ ÐÏצÄÏÍÌÅÎÎÑ"
 
-#: po/tmp/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:55
 msgid "_Expunge"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:56
+#: ui/evolution-mail.xml.h:56
 msgid "_Filter on Subject"
 msgstr "æ¦ÌØÔÒ ÔÅÍÉ"
 
-#: po/tmp/evolution-mail.xml.h:57
+#: ui/evolution-mail.xml.h:57
 msgid "_Forward"
 msgstr "ðÅÒÅÓÌÁÔÉ"
 
-#: po/tmp/evolution-mail.xml.h:58 po/tmp/evolution-subscribe.xml.h:17
+#: ui/evolution-mail.xml.h:58 ui/evolution-subscribe.xml.h:17
 msgid "_Invert Selection"
 msgstr "¶Î×ÅÒÔÕ×ÁÔÉ ×ɦÒ"
 
-#: po/tmp/evolution-mail.xml.h:59
+#: ui/evolution-mail.xml.h:59
 #, fuzzy
 msgid "_Mail Configuration..."
 msgstr "ëÏÎƦ­ÕÒÁÃ¦Ñ ÐÏÛÔÉ"
 
-#: po/tmp/evolution-mail.xml.h:60
+#: ui/evolution-mail.xml.h:60
 msgid "_Message"
 msgstr "ðÏצÄÏÍÌÅÎÎÑ"
 
-#: po/tmp/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:61
 msgid "_Move to Folder..."
 msgstr "ðÅÒÅÎÅÓÔÉ × ÔÅËÕ..."
 
-#: po/tmp/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:62
 msgid "_Open in New Window"
 msgstr "÷¦ÄËÒÉÔÉ Õ ÎÏ×ÏÍÕ ×¦ËΦ"
 
-#: po/tmp/evolution-mail.xml.h:63
+#: ui/evolution-mail.xml.h:63
 msgid "_Print Message"
 msgstr "îÁÄÒÕËÕ×ÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ"
 
-#: po/tmp/evolution-mail.xml.h:64
+#: ui/evolution-mail.xml.h:64
 msgid "_Save Message As..."
 msgstr "úÂÅÒÅÇÔÉ ÐÏצÄÏÍÌÅÎÎÑ ÑË..."
 
-#: po/tmp/evolution-mail.xml.h:65
+#: ui/evolution-mail.xml.h:65
 msgid "_Source"
 msgstr "äÖÅÒÅÌÏ"
 
-#: po/tmp/evolution-mail.xml.h:66
+#: ui/evolution-mail.xml.h:66
 msgid "_Threaded"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:67
+#: ui/evolution-mail.xml.h:67
 msgid "_Undelete"
 msgstr "÷¦ÄÎÏ×ÉÔÉ"
 
-#: po/tmp/evolution-mail.xml.h:68
+#: ui/evolution-mail.xml.h:68
 msgid "_VFolder on Subject"
 msgstr "÷¦ÒÔÕÁÌØÎÁ ÔÅËÁ ÔÅÍÉ"
 
-#: po/tmp/evolution-mail.xml.h:69
+#: ui/evolution-mail.xml.h:69
 #, fuzzy
 msgid "_Virtual Folder Editor..."
 msgstr "òÅÄÁËÔÏÒ ×¦ÒÔÕÁÌØÎÉÈ ÔÅË"
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/evolution-message-composer.xml.h:6
+#: ui/evolution-message-composer.xml.h:6
 msgid "Attach"
 msgstr "äÏÌÕÞÉÔÉ"
 
-#: po/tmp/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:9
 msgid "Close the current file"
 msgstr "úÁËÒÉÔÉ ÐÏÔÏÞÎÉÊ ÆÁÊÌ"
 
-#: po/tmp/evolution-message-composer.xml.h:10
+#: ui/evolution-message-composer.xml.h:10
 msgid "Encrypt this message with PGP"
 msgstr "úÁÛÉÆÒÕ×ÁÔÉ ÃÅ ÐÏצÄÏÍÌÅÎÎÑ PGP"
 
-#: po/tmp/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:12
 msgid "HTML"
 msgstr "HTML"
 
-#: po/tmp/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:13
 msgid "Insert a file as text into the message"
 msgstr "÷ÓÔÁ×ÉÔÉ ÆÁÊÌ ÑË ÔÅËÓÔ Õ ÐÏצÄÏÍÌÅÎÎÑ"
 
-#: po/tmp/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:14
 msgid "Insert text file..."
 msgstr "÷ÓÔÁ×ÉÔÉ ÔÅËÓÔÏ×ÉÊ ÆÁÊÌ..."
 
-#: po/tmp/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:16
 msgid "Open a file"
 msgstr "÷¦ÄËÒÉÔÉ ÆÁÊÌ"
 
-#: po/tmp/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:17
 msgid "PGP Encrypt"
 msgstr "ûÉÆÒÕ×ÁÎÎÑ PGP"
 
-#: po/tmp/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:18
 msgid "PGP Sign"
 msgstr "ð¦ÄÐÉÓ PGP"
 
-#: po/tmp/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save As"
 msgstr "úÂÅÒÅÇÔÉ ÑË"
 
-#: po/tmp/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save in _folder... (FIXME)"
 msgstr "úÂÅÒÅÇÔÉ × ÔÅæ..."
 
-#: po/tmp/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "úÂÅÒÅÇÔÉ × ÔÅæ..."
 
-#: po/tmp/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr "úÂÅÒÅÇÔÉ ÐÏÔÏÞÎÉÊ ÆÁÊÌ Ú ¦ÎÛÏÀ ÎÁÚ×ÏÀ"
 
-#: po/tmp/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "úÂÅÒÅÇÔÉ ÐÏצÄÏÍÌÅÎÎÑ Õ ×ËÁÚÁÎ¦Ê ÔÅæ"
 
-#: po/tmp/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "÷¦ÄÐÒÁ×ÉÔÉ"
 
-#: po/tmp/evolution-message-composer.xml.h:28
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr "÷¦ÄÐÒÁ×ÉÔÉ Ð¦ÚΦÛÅ"
 
-#: po/tmp/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr "÷¦ÄÐÒÁ×ÉÔÉ Ð¦ÚΦÛÅ"
 
-#: po/tmp/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr "÷¦Ä¦ÓÌÁÔÉ ÐÏÛÔÕ × ÆÏÒÍÁÔ¦ HTML"
 
-#: po/tmp/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send the message later"
 msgstr "÷¦Ä¦ÓÌÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ Ð¦ÚΦÛÅ"
 
-#: po/tmp/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:32
 msgid "Send the message now"
 msgstr "÷¦Ä¦ÓÌÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ ÎÅÇÁÊÎÏ"
 
-#: po/tmp/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:33
 msgid "Send this message now"
 msgstr "óÔÅÒÔÉ ÃÅ ÐÏצÄÏÍÌÅÎÎÑ ÎÅÇÁÊÎÏ"
 
-#: po/tmp/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show / hide attachments"
 msgstr "ðÏËÁÚÁÔÉ / ÐÒÉÂÒÁÔÉ ÄÏÌÕÞÅÎÎÑ"
 
-#: po/tmp/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show _attachments"
 msgstr "ðÏËÁÚÁÔÉ ÄÏÌÕÞÅÎÎÑ"
 
-#: po/tmp/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:36
 msgid "Show attachments"
 msgstr "ðÏËÁÚÁÔÉ ÄÏÌÕÞÅÎÎÑ"
 
-#: po/tmp/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:37
 msgid "Sign this message with your PGP key"
 msgstr "ð¦ÄÐÉÓÁÔÉ ÃÅ ÐÏצÄÏÍÌÅÎÎÑ ×ÁÛÉÍ ËÌÀÞÅÍ PGP"
 
-#: po/tmp/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Insert text file... (FIXME)"
 msgstr "÷ÓÔÁ×ÉÔÉ ÔÅËÓÔÏ×ÉÊ ÆÁÊÌ..."
 
-#: po/tmp/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Open..."
 msgstr "÷¦ÄËÒÉÔÉ..."
 
-#: po/tmp/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:47
 msgid "_Security"
 msgstr ""
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:6
 msgid "Add folder to your list of subscribed folders"
 msgstr ""
 
-#: po/tmp/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:9
 msgid "Refresh List"
 msgstr "ïÎÏ×ÉÔÉ ÓÐÉÓÏË"
 
-#: po/tmp/evolution-subscribe.xml.h:10
+#: ui/evolution-subscribe.xml.h:10
 msgid "Refresh List of Folders"
 msgstr "ïÎÏ×ÉÔÉ ÓÐÉÓÏË ÔÅË"
 
-#: po/tmp/evolution-subscribe.xml.h:11
+#: ui/evolution-subscribe.xml.h:11
 msgid "Remove folder from your list of subscribed folders"
 msgstr ""
 
-#: po/tmp/evolution-subscribe.xml.h:13
+#: ui/evolution-subscribe.xml.h:13
 msgid "Subscribe"
 msgstr ""
 
-#: po/tmp/evolution-subscribe.xml.h:14
+#: ui/evolution-subscribe.xml.h:14
 msgid "Unsubscribe"
 msgstr ""
 
 #.
-#. * Translatable strings file generated by extract-ui.
+#. * Translatable strings file generated by xml-i18n-extract.
 #. * DO NOT compile this file as part of your application.
 #.
-#: po/tmp/evolution.xml.h:6
+#: ui/evolution.xml.h:6
 msgid "Display a different folder"
 msgstr "÷¦ÄÏÂÒÁÚÉÔÉ ¦ÎÛÕ ÔÅËÕ"
 
-#: po/tmp/evolution.xml.h:7
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "÷ÉÊÔÉ"
 
-#: po/tmp/evolution.xml.h:8
+#: ui/evolution.xml.h:8
 #, fuzzy
 msgid "Evolution bar _shortcut"
 msgstr "Evolution - %s"
 
-#: po/tmp/evolution.xml.h:9
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "÷ÉÊÔÉ Ú ÐÒÏÇÒÁÍÉ"
 
-#: po/tmp/evolution.xml.h:10
+#: ui/evolution.xml.h:10
 #, fuzzy
 msgid "Getting _Started"
 msgstr "þÁÓ ÐÏÞÁÔËÕ ÚÕÓÔÒ¦Þ¦:"
 
-#: po/tmp/evolution.xml.h:11
+#: ui/evolution.xml.h:11
 msgid "Show information about Evolution"
 msgstr "ðÏËÁÚÁÔÉ ¦ÎÆÏÒÍÁæÀ ÐÒÏ Evolution"
 
-#: po/tmp/evolution.xml.h:12
+#: ui/evolution.xml.h:12
 msgid "Show the _Folder Bar"
 msgstr "ðÏËÁÚÁÔÉ ÐÁÎÅÌØ ÔÅË"
 
-#: po/tmp/evolution.xml.h:13
+#: ui/evolution.xml.h:13
 #, fuzzy
 msgid "Show the _Shortcut Bar"
 msgstr "ðÏËÁÚÕ×ÁÔÉ ÑÒÌÉ˦ ÑË ×ÅÌÉ˦ ЦËÔÏÇÒÁÍÉ"
 
-#: po/tmp/evolution.xml.h:14
+#: ui/evolution.xml.h:14
 msgid "Submit _Bug Report"
 msgstr "÷¦Ä¦ÓÌÁÔÉ Ú×¦Ô ÐÒÏ ÐÏÍÉÌËÕ"
 
-#: po/tmp/evolution.xml.h:15
+#: ui/evolution.xml.h:15
 msgid "Submit bug report using Bug Buddy."
 msgstr "÷¦Ä¦ÓÌÁÔÉ Ú×¦Ô ÐÒÏ ÐÏÍÉÌËÕ ×ÉËÏÒÉÓÔÏ×ÕÀÞÉ Bug Buddy"
 
-#: po/tmp/evolution.xml.h:16
+#: ui/evolution.xml.h:16
 msgid "Toggle whether to show the folder bar"
 msgstr "ðÅÒÅÍÉËÎÕÔÉ ÓÔÁÎ ÐÏËÁÚÕ ÐÁÎÅ̦ ÔÅË"
 
-#: po/tmp/evolution.xml.h:17
+#: ui/evolution.xml.h:17
 msgid "Toggle whether to show the shortcut bar"
 msgstr ""
 
-#: po/tmp/evolution.xml.h:18
+#: ui/evolution.xml.h:18
 msgid "Using the C_ontact Manager"
 msgstr ""
 
-#: po/tmp/evolution.xml.h:19
+#: ui/evolution.xml.h:19
 msgid "Using the _Calendar"
 msgstr "÷ÉËÏÒÉÓÔÁÎÎÑ ËÁÌÅÎÄÁÒÑ"
 
-#: po/tmp/evolution.xml.h:20
+#: ui/evolution.xml.h:20
 msgid "Using the _Mailer"
 msgstr "÷ÉËÏÒÉÓÔÁÎÎÑ ÐÏÛÔÏ×ϧ ÐÒÏÇÒÁÍÉ"
 
-#: po/tmp/evolution.xml.h:21
+#: ui/evolution.xml.h:21
 msgid "_About Evolution..."
 msgstr "ðÒÏ Evolution..."
 
-#: po/tmp/evolution.xml.h:22
+#: ui/evolution.xml.h:22
 msgid "_Appointment (FIXME)"
 msgstr "úÕÓÔÒ¦Þ"
 
-#: po/tmp/evolution.xml.h:23
+#: ui/evolution.xml.h:23
 msgid "_Contact (FIXME)"
 msgstr "ëÏÎÔÁËÔ"
 
-#: po/tmp/evolution.xml.h:26
+#: ui/evolution.xml.h:26
 msgid "_Folder"
 msgstr "ôÅËÁ"
 
-#: po/tmp/evolution.xml.h:27
+#: ui/evolution.xml.h:27
 msgid "_Go to Folder..."
 msgstr "ðÅÒÅÊÔÉ ÎÁ ÔÅËÕ..."
 
-#: po/tmp/evolution.xml.h:29
+#: ui/evolution.xml.h:29
 msgid "_Index"
 msgstr "ðÏËÁÖÞÉË"
 
-#: po/tmp/evolution.xml.h:30
+#: ui/evolution.xml.h:30
 msgid "_Mail message (FIXME)"
 msgstr ""
 
-#: po/tmp/evolution.xml.h:32
+#: ui/evolution.xml.h:32
 msgid "_Settings"
 msgstr "õÓÔÁÎÏ×ËÉ"
 
-#: po/tmp/evolution.xml.h:33
+#: ui/evolution.xml.h:33
 msgid "_Task (FIXME)"
 msgstr "úÁ×ÄÁÎÎÑ"
 
@@ -6581,7 +6992,7 @@ msgstr "ð÷óþðóî"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-clipped-label.c:107
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
@@ -6605,3 +7016,120 @@ msgstr "%I:%M %p"
 #, c-format
 msgid "Group %i"
 msgstr "çÒÕÐÁ %i"
+
+#~ msgid "categories"
+#~ msgstr "ËÁÔÅÇÏÒ¦§"
+
+#~ msgid "Available Categories:"
+#~ msgstr "äÏÓÔÕÐΦ ËÁÔÅÇÏÒ¦§:"
+
+#~ msgid "Headings:"
+#~ msgstr "÷ÅÒÈΦ ËÏÌÏÎÔÉÔÕÌÉ:"
+
+#~ msgid "Appointments:"
+#~ msgstr "úÕÓÔÒ¦Þ¦:"
+
+#~ msgid "Day numbers:"
+#~ msgstr "þÉÓÌÁ ÄΦ×:"
+
+#~ msgid "Current day's number:"
+#~ msgstr "þÉÓÌÏ ÐÏÔÏÞÎÏÇÏ ÄÎÑ:"
+
+#~ msgid "Deleted"
+#~ msgstr "óÔÅÒÔÏ"
+
+#~ msgid "Draft"
+#~ msgstr "þÏÒÎÏ×ÉË"
+
+#~ msgid "Mail Source"
+#~ msgstr "äÖÅÒÅÌÏ ÐÏÛÔÉ"
+
+#~ msgid "Sending a message without a subject"
+#~ msgstr "÷¦ÄÓÉÌÁÎÎÑ ÐÏצÄÏÍÌÅÎÎÑ ÂÅÚ ÔÅÍÉ"
+
+#~ msgid "Send \"%s\""
+#~ msgstr "÷¦Ä¦ÓÌÁÔÉ \"%s\""
+
+#~ msgid "Send a message without a subject"
+#~ msgstr "÷¦Ä¦ÓÌÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ ÂÅÚ ÔÅÍÉ"
+
+#~ msgid "Expunge \"%s\""
+#~ msgstr "÷ÉËÒÅÓÌÉÔÉ \"%s\""
+
+#, fuzzy
+#~ msgid "Marking messages in folder \"%s\""
+#~ msgstr "úÂÅÒÅÇÔÉ ÐÏצÄÏÍÌÅÎÎÑ Õ ×ËÁÚÁÎ¦Ê ÔÅæ"
+
+#, fuzzy
+#~ msgid "Mark messages in folder \"%s\""
+#~ msgstr "úÂÅÒÅÇÔÉ ÐÏצÄÏÍÌÅÎÎÑ Õ ×ËÁÚÁÎ¦Ê ÔÅæ"
+
+#, fuzzy
+#~ msgid "Marking message %d of %d"
+#~ msgstr "úÂÅÒÅÇÔÉ ÐÏצÄÏÍÌÅÎÎÑ Õ ×ËÁÚÁÎ¦Ê ÔÅæ"
+
+#~ msgid "Scan folders in \"%s\""
+#~ msgstr "óËÁÎÕ×ÁÔÉ ÔÅËÉ × \"%s\""
+
+#~ msgid "Attaching messages from folder \"%s\""
+#~ msgstr "äÏÌÕÞÅÎÎÑ ÐÏצÄÏÍÌÅÎØ Ú ÔÅËÉ \"%s\""
+
+#~ msgid "Attach messages from \"%s\""
+#~ msgstr "äÏÌÕÞÉÔÉ ÐÏצÄÏÍÌÅÎÎÑ Ú \"%s\""
+
+#~ msgid "Forwarding messages \"%s\""
+#~ msgstr "ðÅÒÅÓÉÌÁÎÎÑ ÐÏצÄÏÍÌÅÎØ \"%s\""
+
+#~ msgid "Forwarding a message without a subject"
+#~ msgstr "ðÅÒÅÓÉÌÁÎÎÑ ÐÏצÄÏÍÌÅÎÎÑ ÂÅÚ ÔÅÍÉ"
+
+#~ msgid "Forward message \"%s\""
+#~ msgstr "ðÅÒÅÓÌÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ \"%s\""
+
+#~ msgid "Forward a message without a subject"
+#~ msgstr "ðÅÒÅÓÌÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ ÂÅÚ ÔÅÍÉ"
+
+#~ msgid "Loading \"%s\""
+#~ msgstr "úÁ×ÁÎÔÁÖÅÎÎÑ \"%s\""
+
+#~ msgid "Load \"%s\""
+#~ msgstr "úÁ×ÁÎÔÁÖÉÔÉ \"%s\""
+
+#~ msgid "Creating \"%s\""
+#~ msgstr "óÔ×ÏÒÅÎÎÑ \"%s\""
+
+#~ msgid "Create \"%s\""
+#~ msgstr "óÔ×ÏÒÉÔÉ \"%s\""
+
+#~ msgid "Synchronize \"%s\""
+#~ msgstr "óÉÎÈÒÏΦÚÕ×ÁÔÉ \"%s\""
+
+#~ msgid "Opening messages from folder \"%s\""
+#~ msgstr "÷¦ÄËÒÉ×ÁÎÎÑ ÐÏצÄÏÍÌÅÎØ Ú ÔÅËÉ \"%s\""
+
+#~ msgid "Open messages from \"%s\""
+#~ msgstr "÷¦ÄËÒÉÔÉ ÐÏצÄÏÍÌÅÎÎÑ Ú \"%s\""
+
+#~ msgid "Loading %s Folder"
+#~ msgstr "úÁ×ÁÎÔÁÖÅÎÎÑ ÔÅËÉ %s"
+
+#~ msgid "Load %s Folder"
+#~ msgstr "úÁ×ÁÎÔÁÖÉÔÉ ÔÅËÕ %s"
+
+#~ msgid "Viewing messages from folder \"%s\""
+#~ msgstr "÷¦ÄÏÂÒÁÖÅÎÎÑ ÐÏצÄÏÍÌÅÎØ Ú ÔÅËÉ \"%s\""
+
+#~ msgid "View messages from \"%s\""
+#~ msgstr "ðÏËÁÚÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ Ú \"%s\""
+
+#~ msgid "Saving messages from folder \"%s\""
+#~ msgstr "úÂÅÒÅÖÅÎÎÑ ÐÏצÄÏÍÌÅÎØ Ú ÔÅËÉ \"%s\""
+
+#~ msgid "Save messages from folder \"%s\""
+#~ msgstr "úÂÅÒÅÇÔÉ ÐÏצÄÏÍÌÅÎÎÑ Ú ÔÁËÉ \"%s\""
+
+#~ msgid "Rebuilding message view"
+#~ msgstr "ðÅÒÅÂÕÄÕ×ÁÎÎÑ ×¦ÄÏÂÒÁÖÅÎÎÑ ÐÏצÄÏÍÌÅÎØ"
+
+#~ msgid "Rebuild message view"
+#~ msgstr "ðÅÒÅÂÕÄÕ×ÁÔÉ ×¦ÄÏÂÒÁÖÅÎÎÑ ÐÏצÄÏÍÌÅÎØ"