22 files changed, 42827 insertions, 31164 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 2f5e2794f5..7e2df9985f 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2001-01-09  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* no.po: Updated Norwegian (bokmЕl) translation.
+	
 2001-01-07  Benedikt Roth  <Benedikt.Roth@gmx.net>
 
 	* de.po: Updated German translation
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3f32e262a3..24a58b9493 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -29,8 +29,13 @@ calendar/conduits/calendar/calendar-conduit-control-applet.c
 calendar/conduits/calendar/calendar-conduit.c
 calendar/conduits/todo/todo-conduit-control-applet.c
 calendar/conduits/todo/todo-conduit.c
+calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in
+calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in
+calendar/gui/GNOME_Evolution_Calendar.oaf.in
+calendar/gui/alarm-notify.c
 calendar/gui/calendar-commands.c
 calendar/gui/calendar-model.c
+calendar/gui/calendar-summary.c
 calendar/gui/control-factory.c
 calendar/gui/dialogs/alarm-notify-dialog.c
 calendar/gui/dialogs/alarm-notify.glade
@@ -42,6 +47,8 @@ calendar/gui/e-calendar-table.c
 calendar/gui/e-day-view-time-item.c
 calendar/gui/e-day-view-top-item.c
 calendar/gui/e-day-view.c
+calendar/gui/e-itip-control.c
+calendar/gui/e-tasks.c
 calendar/gui/e-week-view-main-item.c
 calendar/gui/e-week-view.c
 calendar/gui/event-editor-dialog.glade
@@ -49,9 +56,11 @@ calendar/gui/event-editor.c
 calendar/gui/gnome-cal.c
 calendar/gui/gnome-month-item.c
 calendar/gui/goto.c
+calendar/gui/goto-dialog.glade
 calendar/gui/main.c
 calendar/gui/popup-menu.c
 calendar/gui/print.c
+calendar/gui/tasks-control.c
 calendar/gui/weekday-picker.c
 camel/camel-folder-thread.c
 camel/camel-lock.c
@@ -114,6 +123,7 @@ filter/vfolder-rule.c
 mail/component-factory.c
 mail/folder-browser-factory.c
 mail/folder-browser.c
+mail/local-config.glade
 mail/mail-autofilter.c
 mail/mail-callbacks.c
 mail/mail-config-druid.glade
@@ -123,6 +133,7 @@ mail/mail-crypto.c
 mail/mail-display.c
 mail/mail-format.c
 mail/mail-local.c
+mail/mail-mt.c
 mail/mail-ops.c
 mail/mail-search-dialogue.c
 mail/mail-summary.c
diff --git a/po/ca.po b/po/ca.po
index 0f8057c889..a015466789 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -4,10 +4,11 @@
 #
 # TraducciС per SoftcatalЮ <linux@softcatala.org>
 # Traductor original: VМctor Nieto <vnie2025@alu-etsetb.upc.es>
+#: camel/providers/smtp/camel-smtp-transport.c:287
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.0.6\n"
-"POT-Creation-Date: 2000-12-13 16:26-0600\n"
+"POT-Creation-Date: 2001-01-06 00:11+0100\n"
 "PO-Revision-Date: 2000-11-01 00:40+0100\n"
 "Last-Translator: Quico Llach <tradgnome@softcatala.org>\n"
 "Language-Team: Catalan <linux@softcatala.org>\n"
@@ -250,10 +251,10 @@ msgstr "PЗblic"
 #: addressbook/backend/ebook/load-pine-addressbook.c:17
 #: addressbook/backend/ebook/test-client-list.c:18
 #: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:991
+#: addressbook/conduit/address-conduit.c:1083
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1136
-#: calendar/conduits/todo/todo-conduit.c:945 calendar/gui/main.c:54
+#: calendar/conduits/calendar/calendar-conduit.c:1151
+#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
@@ -378,53 +379,36 @@ msgstr ""
 "S'ha produОt un error en intentar recollir\n"
 "la llista del Pilot del dimoni gnome-pilot"
 
-#: addressbook/conduit/address-conduit.c:197
+#: addressbook/conduit/address-conduit.c:195
 msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:210
+#: addressbook/conduit/address-conduit.c:208
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:583
-#: calendar/conduits/calendar/calendar-conduit.c:715
-#: calendar/conduits/todo/todo-conduit.c:523
+#: addressbook/conduit/address-conduit.c:646
+#: calendar/conduits/calendar/calendar-conduit.c:730
+#: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat server"
 msgstr "No s'ha pogut iniciar el servidor wombat"
 
-#: addressbook/conduit/address-conduit.c:584
-#: calendar/conduits/calendar/calendar-conduit.c:716
-#: calendar/conduits/todo/todo-conduit.c:524
+#: addressbook/conduit/address-conduit.c:647
+#: calendar/conduits/calendar/calendar-conduit.c:731
+#: calendar/conduits/todo/todo-conduit.c:546
 msgid "Could not start wombat"
 msgstr "No s'ha pogut iniciar el wombat"
 
-#: addressbook/conduit/address-conduit.c:616
-#: addressbook/conduit/address-conduit.c:619
+#: addressbook/conduit/address-conduit.c:679
+#: addressbook/conduit/address-conduit.c:682
 msgid "Could not read pilot's Address application block"
 msgstr "No s'ha pogut llegir el bloc d'aplicaciС d'adreГa del Pilot"
 
 #.
-#. * 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 "categories"
-
-#: addressbook/contact-editor/categories-strings.h:8
-msgid "Item(s) belong to these categories:"
-msgstr "El(s) element(s) pertanyen a aquestes categories:"
-
-#: addressbook/contact-editor/categories-strings.h:9
-msgid "Available Categories:"
-msgstr "Categories disponibles:"
-
-#.
-#. * 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 "Voleu suprimir el contacte?"
 
@@ -438,7 +422,7 @@ msgid "_Add"
 msgstr "_Afegeix"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:48
+#: ui/evolution-event-editor.xml.h:108 ui/evolution-mail.xml.h:53
 msgid "_Delete"
 msgstr "_Suprimeix"
 
@@ -452,12 +436,13 @@ msgid "New phone type"
 msgstr "Nou tipus de telХfon"
 
 #.
-#. * 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 "Afegeix"
 
@@ -498,7 +483,7 @@ msgid "_Mobile"
 msgstr "_MРbil"
 
 #: 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 "AdreГa electrРnica principal"
 
@@ -515,7 +500,7 @@ msgid "C_ontacts..."
 msgstr "C_ontactes..."
 
 #: 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 "Ca_tegories..."
 
@@ -532,7 +517,8 @@ msgid "_Address..."
 msgstr "_AdreГa..."
 
 #: 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 "General"
 
@@ -577,143 +563,143 @@ msgid "No_tes:"
 msgstr "No_tes:"
 
 #: 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 "Detalls"
 
-#: addressbook/contact-editor/e-contact-editor.c:1266
+#: addressbook/contact-editor/e-contact-editor.c:1274
 msgid "Assistant"
 msgstr "Assistent"
 
-#: 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 "Feina"
 
-#: addressbook/contact-editor/e-contact-editor.c:1268
+#: addressbook/contact-editor/e-contact-editor.c:1276
 msgid "Business 2"
 msgstr "Feina 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1269
+#: addressbook/contact-editor/e-contact-editor.c:1277
 msgid "Business Fax"
 msgstr "Fax de la feina"
 
-#: addressbook/contact-editor/e-contact-editor.c:1270
+#: addressbook/contact-editor/e-contact-editor.c:1278
 msgid "Callback"
 msgstr "Crida de retorn"
 
-#: addressbook/contact-editor/e-contact-editor.c:1271
+#: addressbook/contact-editor/e-contact-editor.c:1279
 msgid "Car"
 msgstr "Cotxe"
 
-#: addressbook/contact-editor/e-contact-editor.c:1272
+#: addressbook/contact-editor/e-contact-editor.c:1280
 msgid "Company"
 msgstr "Empresa"
 
-#: 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 "Particular"
 
-#: addressbook/contact-editor/e-contact-editor.c:1274
+#: addressbook/contact-editor/e-contact-editor.c:1282
 msgid "Home 2"
 msgstr "Particular 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1275
+#: addressbook/contact-editor/e-contact-editor.c:1283
 msgid "Home Fax"
 msgstr "Fax particular"
 
-#: addressbook/contact-editor/e-contact-editor.c:1276
+#: addressbook/contact-editor/e-contact-editor.c:1284
 msgid "ISDN"
 msgstr "XDSI"
 
-#: addressbook/contact-editor/e-contact-editor.c:1277
+#: addressbook/contact-editor/e-contact-editor.c:1285
 msgid "Mobile"
 msgstr "MРbil"
 
-#: 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 "Altres"
 
-#: addressbook/contact-editor/e-contact-editor.c:1279
+#: addressbook/contact-editor/e-contact-editor.c:1287
 msgid "Other Fax"
 msgstr "Un altre fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1280
+#: addressbook/contact-editor/e-contact-editor.c:1288
 msgid "Pager"
 msgstr "Busca"
 
-#: addressbook/contact-editor/e-contact-editor.c:1281
+#: addressbook/contact-editor/e-contact-editor.c:1289
 msgid "Primary"
 msgstr "Primari"
 
-#: addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/contact-editor/e-contact-editor.c:1290
 msgid "Radio"
 msgstr "RЮdio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/contact-editor/e-contact-editor.c:1291
 msgid "Telex"
 msgstr "TХlex"
 
-#: 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 "AdreГa electrРnica 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1330
+#: addressbook/contact-editor/e-contact-editor.c:1338
 msgid "Email 3"
 msgstr "AdreГa electrРnica 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 "AdreГa _2:"
 
-#: po/tmp/fulladdr.glade.h:7
+#: addressbook/contact-editor/fulladdr.glade.h:7
 msgid "Canada"
 msgstr "CanadЮ"
 
-#: po/tmp/fulladdr.glade.h:8
+#: addressbook/contact-editor/fulladdr.glade.h:8
 msgid "Check Address"
 msgstr "Comprova l'adreГa"
 
-#: po/tmp/fulladdr.glade.h:9
+#: addressbook/contact-editor/fulladdr.glade.h:9
 msgid "Countr_y:"
 msgstr "PaМ_s:"
 
-#: po/tmp/fulladdr.glade.h:10
+#: addressbook/contact-editor/fulladdr.glade.h:10
 msgid "Finland"
 msgstr "FinlЮndia"
 
-#: po/tmp/fulladdr.glade.h:11
+#: addressbook/contact-editor/fulladdr.glade.h:11
 msgid "USA"
 msgstr "EUA"
 
-#: po/tmp/fulladdr.glade.h:12
+#: addressbook/contact-editor/fulladdr.glade.h:12
 msgid "_Address:"
 msgstr "_AdreГa:"
 
-#: po/tmp/fulladdr.glade.h:13
+#: addressbook/contact-editor/fulladdr.glade.h:13
 msgid "_City:"
 msgstr "_PoblaciС:"
 
-#: po/tmp/fulladdr.glade.h:14
+#: addressbook/contact-editor/fulladdr.glade.h:14
 msgid "_PO Box:"
 msgstr "_Apartat de correus:"
 
-#: po/tmp/fulladdr.glade.h:15
+#: addressbook/contact-editor/fulladdr.glade.h:15
 msgid "_State/Province:"
 msgstr "_Comarca:"
 
-#: po/tmp/fulladdr.glade.h:16
+#: addressbook/contact-editor/fulladdr.glade.h:16
 msgid "_ZIP Code:"
 msgstr "_Codi postal:"
 
@@ -727,10 +713,13 @@ msgid "Check Full Name"
 msgstr "Comprova el nom complet"
 
 #: addressbook/contact-editor/fullname-strings.h:8
+#, fuzzy
 msgid ""
 "\n"
 "Mr.\n"
 "Mrs.\n"
+"Ms.\n"
+"Miss\n"
 "Dr.\n"
 msgstr ""
 "\n"
@@ -738,7 +727,7 @@ msgstr ""
 "Sra.\n"
 "Dr.\n"
 
-#: addressbook/contact-editor/fullname-strings.h:13
+#: addressbook/contact-editor/fullname-strings.h:15
 msgid ""
 "\n"
 "Sr.\n"
@@ -756,44 +745,49 @@ msgstr ""
 "III\n"
 "Esq.\n"
 
-#: addressbook/contact-editor/fullname-strings.h:21
+#: addressbook/contact-editor/fullname-strings.h:23
 msgid "_First:"
 msgstr "_Primer:"
 
-#: addressbook/contact-editor/fullname-strings.h:22
+#: addressbook/contact-editor/fullname-strings.h:24
 msgid "_Title:"
 msgstr "_TМtol:"
 
-#: addressbook/contact-editor/fullname-strings.h:23
+#: addressbook/contact-editor/fullname-strings.h:25
 msgid "_Middle:"
 msgstr "_Mig:"
 
-#: addressbook/contact-editor/fullname-strings.h:24
+#: addressbook/contact-editor/fullname-strings.h:26
 msgid "_Last:"
 msgstr "_зltim:"
 
-#: addressbook/contact-editor/fullname-strings.h:25
+#: addressbook/contact-editor/fullname-strings.h:27
 msgid "_Suffix:"
 msgstr "_Sufix:"
 
-#: addressbook/gui/component/addressbook.c:263
+#: addressbook/gui/component/addressbook.c:231
 msgid "As _Minicards"
 msgstr "Com a _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:269
-#: po/tmp/evolution-addressbook.xml.h:6
+#: addressbook/gui/component/addressbook.c:237
+#: ui/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr "Com a _taula"
 
-#: addressbook/gui/component/addressbook.c:386
+#: addressbook/gui/component/addressbook.c:374
+#, fuzzy, c-format
+msgid "Enter password for %s"
+msgstr "Si us plau, introduОu la contrasenya NNTP per a %s@%s"
+
+#: addressbook/gui/component/addressbook.c:402
 msgid "Unable to open addressbook"
 msgstr "No es pot obrir la llibreta d'adreces"
 
-#: addressbook/gui/component/addressbook.c:391
+#: addressbook/gui/component/addressbook.c:407
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -814,82 +808,211 @@ msgstr ""
 "voleu poder utilitzar LDAP, necessitareu descarregar i instal╥lar\n"
 "l'OpenLDAP i recompilar i instal╥lar l'Evolution.\n"
 
-#: addressbook/gui/component/addressbook.c:501 mail/folder-browser.c:136
+#: addressbook/gui/component/addressbook.c:528 mail/folder-browser.c:219
 #, fuzzy
 msgid "Show All"
 msgstr "Mostra"
 
-#: addressbook/gui/component/addressbook.c:503 mail/folder-browser.c:138
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 #, fuzzy
 msgid "Advanced..."
 msgstr "Afegeix..."
 
-#: addressbook/gui/component/addressbook.c:533
+#: addressbook/gui/component/addressbook.c:560
 #, fuzzy
 msgid "Any field contains"
 msgstr "El cos contИ"
 
-#: addressbook/gui/component/addressbook.c:534
+#: addressbook/gui/component/addressbook.c:561
 #, fuzzy
 msgid "Name contains"
 msgstr "contИ"
 
-#: addressbook/gui/component/addressbook.c:535
+#: addressbook/gui/component/addressbook.c:562
 #, fuzzy
 msgid "Email contains"
 msgstr "contИ"
 
-#: addressbook/gui/component/addressbook.c:621
+#: addressbook/gui/component/addressbook.c:648
 msgid "The URI that the Folder Browser will display"
 msgstr "L'URI que mostrarЮ el navegador de carpetes"
 
-#: addressbook/gui/component/e-ldap-storage.c:88
-msgid "External Directories"
-msgstr "Directoris externs"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/e-msg-composer-attachment.glade.h:7
-#: po/tmp/ldap-server-dialog.glade.h:6
-msgid "Description:"
-msgstr "DescripciС:"
+#: addressbook/gui/component/addressbook-storage.c:95
+#, fuzzy
+msgid "Other Contacts"
+msgstr "Contacte _nou"
 
-#: po/tmp/ldap-server-dialog.glade.h:7
-msgid "LDAP Server:"
+#: addressbook/gui/component/addressbook-config.c:139
+#, fuzzy
+msgid "LDAP Server"
 msgstr "Servidor LDAP:"
 
-#: po/tmp/ldap-server-dialog.glade.h:8
-msgid "Name:"
-msgstr "Nom:"
+#: addressbook/gui/component/addressbook-config.c:141
+#, fuzzy
+msgid "File"
+msgstr "_Fitxer"
 
-#: po/tmp/ldap-server-dialog.glade.h:9
-msgid "Port Number:"
-msgstr "NЗmero de port:"
+#: addressbook/gui/component/addressbook-config.c:144
+#, fuzzy
+msgid "Unknown addressbook type"
+msgstr "No es pot obrir la llibreta d'adreces"
+
+#: 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 "Contrasenya"
+
+#: addressbook/gui/component/addressbook-config.c:157
+msgid "SASL"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:160
+#, fuzzy
+msgid "Unknown auth type"
+msgstr "Error desconegut"
+
+#: addressbook/gui/component/addressbook-config.c:169
+#, fuzzy
+msgid "Base"
+msgstr "Enganxa"
+
+#: addressbook/gui/component/addressbook-config.c:171
+msgid "One"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:173
+#, fuzzy
+msgid "Subtree"
+msgstr "Subscriu-me"
 
-#: po/tmp/ldap-server-dialog.glade.h:10
+#: 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 "Hores"
+
+#: addressbook/gui/component/addressbook-config.c:361
+#, fuzzy
+msgid "Port:"
+msgstr "Prioritat:"
+
+#: addressbook/gui/component/addressbook-config.c:364
 msgid "Root DN:"
 msgstr "DN arrel:"
 
+#: addressbook/gui/component/addressbook-config.c:384
+#, fuzzy
+msgid "Search Scope:"
+msgstr "Cerca"
+
+#: addressbook/gui/component/addressbook-config.c:438
+#: mail/mail-config-druid.glade.h:14 mail/mail-config-gui.c:943
+msgid "Authentication:"
+msgstr "AutenticaciС:"
+
+#: addressbook/gui/component/addressbook-config.c:455
+#: mail/mail-config-druid.glade.h:52 mail/mail-config-gui.c:934
+msgid "Path:"
+msgstr "CamМ:"
+
+#: addressbook/gui/component/addressbook-config.c:460
+#, fuzzy
+msgid "Create path if it doesn't exist."
+msgstr "Aquest fitxer no existeix."
+
+#: addressbook/gui/component/addressbook-config.c:593
+#, fuzzy
+msgid "Edit Addressbook"
+msgstr "Desa a la llibreta d'adreces"
+
+#: addressbook/gui/component/addressbook-config.c:595
+#, fuzzy
+msgid "Add Addressbook"
+msgstr "Desa a la llibreta d'adreces"
+
+#: 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
+msgid "Name:"
+msgstr "Nom:"
+
+#: addressbook/gui/component/addressbook-config.c:617
+#: composer/e-msg-composer-attachment.glade.h:7
+msgid "Description:"
+msgstr "DescripciС:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:7
+#, fuzzy
+msgid "Addressbook Sources"
+msgstr "Afegeix una font"
+
+#: 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 "Suprimeix"
+
+#: 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 "Edita"
+
+#: addressbook/gui/component/addressbook-config.glade.h:10
+msgid "Name"
+msgstr "Nom"
+
+#: 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 "Cerca..."
 
-#: po/tmp/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "Message Recipients"
 msgstr "Destinataris del missatge"
 
-#: po/tmp/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "Select Names"
 msgstr "Seleccioneu els noms"
 
-#: 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 "Seleccioneu un nom de la llista:"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:147
@@ -898,119 +1021,119 @@ msgid "Search"
 msgstr "Cerca"
 
 #.
-#. * 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 "a"
 
-#: po/tmp/alphabet.glade.h:8
+#: addressbook/gui/widgets/alphabet.glade.h:8
 msgid "b"
 msgstr "b"
 
-#: po/tmp/alphabet.glade.h:9
+#: addressbook/gui/widgets/alphabet.glade.h:9
 msgid "c"
 msgstr "c"
 
-#: po/tmp/alphabet.glade.h:10
+#: addressbook/gui/widgets/alphabet.glade.h:10
 msgid "d"
 msgstr "d"
 
-#: po/tmp/alphabet.glade.h:11
+#: addressbook/gui/widgets/alphabet.glade.h:11
 msgid "e"
 msgstr "e"
 
-#: po/tmp/alphabet.glade.h:12
+#: addressbook/gui/widgets/alphabet.glade.h:12
 msgid "f"
 msgstr "f"
 
-#: po/tmp/alphabet.glade.h:13
+#: addressbook/gui/widgets/alphabet.glade.h:13
 msgid "g"
 msgstr "g"
 
-#: calendar/cal-util/timeutil.c:100 po/tmp/alphabet.glade.h:14
+#: addressbook/gui/widgets/alphabet.glade.h:14
 msgid "h"
 msgstr "h"
 
-#: po/tmp/alphabet.glade.h:15
+#: addressbook/gui/widgets/alphabet.glade.h:15
 msgid "i"
 msgstr "i"
 
-#: po/tmp/alphabet.glade.h:16
+#: addressbook/gui/widgets/alphabet.glade.h:16
 msgid "j"
 msgstr "j"
 
-#: po/tmp/alphabet.glade.h:17
+#: addressbook/gui/widgets/alphabet.glade.h:17
 msgid "k"
 msgstr "k"
 
-#: po/tmp/alphabet.glade.h:18
+#: addressbook/gui/widgets/alphabet.glade.h:18
 msgid "l"
 msgstr "l"
 
-#: po/tmp/alphabet.glade.h:19
+#: addressbook/gui/widgets/alphabet.glade.h:19
 msgid "m"
 msgstr "m"
 
-#: po/tmp/alphabet.glade.h:20
+#: addressbook/gui/widgets/alphabet.glade.h:20
 msgid "n"
 msgstr "n"
 
-#: po/tmp/alphabet.glade.h:21
+#: addressbook/gui/widgets/alphabet.glade.h:21
 msgid "o"
 msgstr "o"
 
-#: po/tmp/alphabet.glade.h:22
+#: addressbook/gui/widgets/alphabet.glade.h:22
 msgid "p"
 msgstr "p"
 
-#: po/tmp/alphabet.glade.h:23
+#: addressbook/gui/widgets/alphabet.glade.h:23
 msgid "q"
 msgstr "q"
 
-#: po/tmp/alphabet.glade.h:24
+#: addressbook/gui/widgets/alphabet.glade.h:24
 msgid "r"
 msgstr "r"
 
-#: po/tmp/alphabet.glade.h:25
+#: addressbook/gui/widgets/alphabet.glade.h:25
 msgid "s"
 msgstr "s"
 
-#: po/tmp/alphabet.glade.h:26
+#: addressbook/gui/widgets/alphabet.glade.h:26
 msgid "t"
 msgstr "t"
 
-#: po/tmp/alphabet.glade.h:27
+#: addressbook/gui/widgets/alphabet.glade.h:27
 msgid "u"
 msgstr "u"
 
-#: po/tmp/alphabet.glade.h:28
+#: addressbook/gui/widgets/alphabet.glade.h:28
 msgid "v"
 msgstr "v"
 
-#: po/tmp/alphabet.glade.h:29
+#: addressbook/gui/widgets/alphabet.glade.h:29
 msgid "w"
 msgstr "w"
 
-#: po/tmp/alphabet.glade.h:30
+#: addressbook/gui/widgets/alphabet.glade.h:30
 msgid "x"
 msgstr "x"
 
-#: po/tmp/alphabet.glade.h:31
+#: addressbook/gui/widgets/alphabet.glade.h:31
 msgid "y"
 msgstr "y"
 
-#: po/tmp/alphabet.glade.h:32
+#: addressbook/gui/widgets/alphabet.glade.h:32
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:417
-#: addressbook/gui/widgets/e-minicard.c:338
+#: addressbook/gui/widgets/e-addressbook-view.c:451
+#: addressbook/gui/widgets/e-minicard.c:374
 msgid "Save as VCard"
 msgstr "Desa com a VCard"
 
@@ -1033,189 +1156,178 @@ msgstr ""
 "Feu doble clic aquМ per crear un nou contacte."
 
 #.
-#. * 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 "10 pt. Tahoma"
 
-#: po/tmp/e-contact-print.glade.h:7
+#: addressbook/printing/e-contact-print.glade.h:7
 msgid "8 pt. Tahoma"
 msgstr "8 pt. Tahoma"
 
-#: po/tmp/e-contact-print.glade.h:8
+#: addressbook/printing/e-contact-print.glade.h:8
 msgid "Blank forms at end:"
 msgstr "Formularis en blanc al final:"
 
-#: po/tmp/e-contact-print.glade.h:9
+#: addressbook/printing/e-contact-print.glade.h:9
 msgid "Body"
 msgstr "Cos"
 
-#: po/tmp/e-contact-print.glade.h:10
+#: addressbook/printing/e-contact-print.glade.h:10
 msgid "Bottom:"
 msgstr "Inferior:"
 
-#: po/tmp/e-contact-print.glade.h:11
+#: addressbook/printing/e-contact-print.glade.h:11
 msgid "Dimensions:"
 msgstr "Dimensions:"
 
-#: po/tmp/e-contact-print.glade.h:12
+#: addressbook/printing/e-contact-print.glade.h:12
 msgid "Font..."
 msgstr "Lletra..."
 
-#: po/tmp/e-contact-print.glade.h:13
+#: addressbook/printing/e-contact-print.glade.h:13
 msgid "Fonts"
 msgstr "Lletres"
 
-#: po/tmp/e-contact-print.glade.h:14
+#: addressbook/printing/e-contact-print.glade.h:14
 msgid "Footer:"
 msgstr "Peu de pЮgina:"
 
-#: po/tmp/e-contact-print.glade.h:15
+#: addressbook/printing/e-contact-print.glade.h:15
 msgid "Format"
 msgstr "Format"
 
-#: po/tmp/e-contact-print.glade.h:16
+#: addressbook/printing/e-contact-print.glade.h:16
 msgid "Header"
 msgstr "CapГalera"
 
-#: po/tmp/e-contact-print.glade.h:17
+#: addressbook/printing/e-contact-print.glade.h:17
 msgid "Header/Footer"
 msgstr "CapГalera/Peu de pЮgina"
 
-#: po/tmp/e-contact-print.glade.h:18
+#: addressbook/printing/e-contact-print.glade.h:18
 msgid "Headings"
 msgstr "EncapГalaments"
 
-#: po/tmp/e-contact-print.glade.h:19
+#: addressbook/printing/e-contact-print.glade.h:19
 msgid "Headings for each letter"
 msgstr "EncapГalaments per a cada carta"
 
-#: po/tmp/e-contact-print.glade.h:20
+#: addressbook/printing/e-contact-print.glade.h:20
 msgid "Height:"
 msgstr "AlГada:"
 
-#: po/tmp/e-contact-print.glade.h:21
+#: addressbook/printing/e-contact-print.glade.h:21
 msgid "Immediately follow each other"
 msgstr "Un segueix immediatament l'altre"
 
-#: po/tmp/e-contact-print.glade.h:22
+#: addressbook/printing/e-contact-print.glade.h:22
 msgid "Include:"
 msgstr "Inclou:"
 
-#: po/tmp/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23
 msgid "Landscape"
 msgstr "Horitzontal"
 
-#: po/tmp/e-contact-print.glade.h:24
+#: addressbook/printing/e-contact-print.glade.h:24
 msgid "Left:"
 msgstr "Esquerra:"
 
-#: po/tmp/e-contact-print.glade.h:25
+#: addressbook/printing/e-contact-print.glade.h:25
 msgid "Letter tabs on side"
 msgstr "Tabuladors de carta al costat"
 
-#: po/tmp/e-contact-print.glade.h:26
+#: addressbook/printing/e-contact-print.glade.h:26
 msgid "Margins"
 msgstr "Marges"
 
-#: po/tmp/e-contact-print.glade.h:27
+#: addressbook/printing/e-contact-print.glade.h:27
 msgid "Number of columns:"
 msgstr "Nombre de columnes:"
 
-#: po/tmp/e-contact-print.glade.h:28
+#: addressbook/printing/e-contact-print.glade.h:28
 msgid "Options"
 msgstr "Opcions"
 
-#: po/tmp/e-contact-print.glade.h:29
+#: addressbook/printing/e-contact-print.glade.h:29
 msgid "Orientation"
 msgstr "OrientaciС"
 
-#: po/tmp/e-contact-print.glade.h:30
+#: addressbook/printing/e-contact-print.glade.h:30
 msgid "Page"
 msgstr "PЮgina"
 
-#: po/tmp/e-contact-print.glade.h:31
+#: addressbook/printing/e-contact-print.glade.h:31
 msgid "Page Setup:"
 msgstr "ConfiguraciС de la pЮgina:"
 
-#: po/tmp/e-contact-print.glade.h:32
+#: addressbook/printing/e-contact-print.glade.h:32
 msgid "Paper"
 msgstr "Paper"
 
-#: po/tmp/e-contact-print.glade.h:33
+#: addressbook/printing/e-contact-print.glade.h:33
 msgid "Paper source:"
 msgstr "Font del paper:"
 
-#: po/tmp/e-contact-print.glade.h:34
+#: addressbook/printing/e-contact-print.glade.h:34
 msgid "Portrait"
 msgstr "Vertical"
 
-#: po/tmp/e-contact-print.glade.h:35
+#: addressbook/printing/e-contact-print.glade.h:35
 msgid "Preview:"
 msgstr "PrevisualitzaciС:"
 
-#: po/tmp/e-contact-print.glade.h:36
+#: addressbook/printing/e-contact-print.glade.h:36
 msgid "Print using gray shading"
 msgstr "Imprimeix usant ombrejat de grisos"
 
-#: po/tmp/e-contact-print.glade.h:37
+#: addressbook/printing/e-contact-print.glade.h:37
 msgid "Reverse on even pages"
 msgstr "Inverteix-ho per a les pЮgines senars"
 
-#: po/tmp/e-contact-print.glade.h:38
+#: addressbook/printing/e-contact-print.glade.h:38
 msgid "Right:"
 msgstr "Dreta:"
 
-#: po/tmp/e-contact-print.glade.h:39
+#: addressbook/printing/e-contact-print.glade.h:39
 msgid "Sections:"
 msgstr "Seccions:"
 
-#: po/tmp/e-contact-print.glade.h:40
+#: addressbook/printing/e-contact-print.glade.h:40
 msgid "Shading"
 msgstr "Ombrejat"
 
-#: po/tmp/e-contact-print.glade.h:41
+#: addressbook/printing/e-contact-print.glade.h:41
 msgid "Size:"
 msgstr "Mida:"
 
-#: po/tmp/e-contact-print.glade.h:42
+#: addressbook/printing/e-contact-print.glade.h:42
 msgid "Start on a new page"
 msgstr "ComenГa en una nova pЮgina"
 
-#: po/tmp/e-contact-print.glade.h:43
+#: addressbook/printing/e-contact-print.glade.h:43
 msgid "Style name:"
 msgstr "Nom de l'estil:"
 
-#: po/tmp/e-contact-print.glade.h:44
+#: addressbook/printing/e-contact-print.glade.h:44
 msgid "Top:"
 msgstr "Superior:"
 
-#: 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 "Tipus:"
 
-#: po/tmp/e-contact-print.glade.h:46
+#: addressbook/printing/e-contact-print.glade.h:46
 msgid "Width:"
 msgstr "Amplada:"
 
-#: po/tmp/e-contact-print.glade.h:47
+#: addressbook/printing/e-contact-print.glade.h:47
 msgid "label26"
 msgstr "etiqueta26"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:550
-#: calendar/gui/e-week-view.c:288 calendar/gui/print.c:605
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:553
-#: calendar/gui/e-week-view.c:291 calendar/gui/print.c:604
-msgid "pm"
-msgstr "pm"
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 msgid "Evolution Calendar Conduit"
 msgstr "Conducte de l'agenda de l'Evolution"
@@ -1224,13 +1336,13 @@ msgstr "Conducte de l'agenda de l'Evolution"
 msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr "Utilitat de configuraciС per al conducte de l'agenda de l'Evolution.\n"
 
-#: calendar/conduits/calendar/calendar-conduit.c:671
-#: calendar/conduits/todo/todo-conduit.c:479
+#: calendar/conduits/calendar/calendar-conduit.c:686
+#: calendar/conduits/todo/todo-conduit.c:501
 msgid "Error while communicating with calendar server"
 msgstr "Error en comunicar-se amb el servidor d'agenda"
 
-#: calendar/conduits/calendar/calendar-conduit.c:770
-#: calendar/conduits/calendar/calendar-conduit.c:773
+#: calendar/conduits/calendar/calendar-conduit.c:785
+#: calendar/conduits/calendar/calendar-conduit.c:788
 msgid "Could not read pilot's Calendar application block"
 msgstr "No s'ha pogut llegir el bloc d'aplicaciС d'agenda del Pilot"
 
@@ -1244,123 +1356,163 @@ msgstr ""
 "Utilitat de configuraciС per al conducte de les coses per fer de "
 "l'Evolution.\n"
 
-#: calendar/conduits/todo/todo-conduit.c:578
-#: calendar/conduits/todo/todo-conduit.c:581
+#: calendar/conduits/todo/todo-conduit.c:600
+#: calendar/conduits/todo/todo-conduit.c:603
 msgid "Could not read pilot's ToDo application block"
 msgstr "No s'ha pogut llegir el bloc d'aplicaciС de coses per fer del Pilot"
 
-#: calendar/gui/calendar-commands.c:60
-msgid "Outline:"
-msgstr "Contorn:"
+#.
+#. * 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 "EncapГalaments:"
+#: 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:"
-msgstr "Dies buits:"
+#.
+#. * 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 "Cites:"
+#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:7
+#, fuzzy
+msgid "Calendar Server"
+msgstr "Agenda"
 
-#: calendar/gui/calendar-commands.c:64
-msgid "Highlighted day:"
-msgstr "Dia ressaltat:"
+#.
+#. * 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
+#, fuzzy
+msgid "Evolution calendar executive summary component."
+msgstr ""
+"No es pot inicialitzar el component de resum del correu de l'Evolution."
 
-#: calendar/gui/calendar-commands.c:65
-msgid "Day numbers:"
-msgstr "NЗmeros de dia:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Conducte de l'agenda de l'Evolution"
 
-#: calendar/gui/calendar-commands.c:66
-msgid "Current day's number:"
-msgstr "NЗmero del dia d'avui:"
+#: 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:"
-msgstr "Element per fer que encara no ha venГut:"
+#: 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:"
-msgstr "Element per fer que venГ avui:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#, fuzzy
+msgid "Factory for the Evolution calendar component."
+msgstr "Utilitat de configuraciС per al conducte de l'agenda de l'Evolution.\n"
 
-#: calendar/gui/calendar-commands.c:69
-msgid "To-Do item that is overdue:"
-msgstr "Element endarrerit encara per fer:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+msgid "Factory for the calendar iTip view control"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:354
+#: 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 "Recordatori de la vostra cita a "
+
+#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:8
+msgid "Snooze"
+msgstr "'Snooze'"
+
+#. 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 "D'acord"
+
+#: calendar/gui/calendar-commands.c:229
 msgid "File not found"
 msgstr "No s'ha trobat el fitxer"
 
-#: calendar/gui/calendar-commands.c:378
+#: calendar/gui/calendar-commands.c:253
 msgid "Open calendar"
 msgstr "Obre l'agenda"
 
-#: calendar/gui/calendar-commands.c:417
+#: calendar/gui/calendar-commands.c:295
 msgid "Save calendar"
 msgstr "Desa l'agenda"
 
+#: 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:282
+#: 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:2498
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:286 calendar/gui/calendar-model.c:736
+#: calendar/gui/calendar-model.c:288 calendar/gui/calendar-model.c:738
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time,
 #. in 12-hour format.
-#: calendar/gui/calendar-model.c:290 calendar/gui/calendar-model.c:739
+#: calendar/gui/calendar-model.c:292 calendar/gui/calendar-model.c:741
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:344 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 "PЗblic"
 
-#: calendar/gui/calendar-model.c:347 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 "Privat"
 
-#: calendar/gui/calendar-model.c:350 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 "Confidencial"
 
-#: calendar/gui/calendar-model.c:353 calendar/gui/calendar-model.c:521
+#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:523
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: calendar/gui/calendar-model.c:441
+#: calendar/gui/calendar-model.c:443
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:441
+#: calendar/gui/calendar-model.c:443
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:445
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:445
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:515
+#: calendar/gui/calendar-model.c:517
 msgid "Transparent"
 msgstr "Transparent"
 
-#: calendar/gui/calendar-model.c:518
+#: calendar/gui/calendar-model.c:520
 msgid "Opaque"
 msgstr "Opac"
 
-#: calendar/gui/calendar-model.c:744
+#: calendar/gui/calendar-model.c:746
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1372,35 +1524,35 @@ msgstr ""
 "%s"
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:845 calendar/gui/calendar-model.c:893
+#: 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:1274 widgets/misc/e-dateedit.c:1455
+#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
 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:863
+#: 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:866
+#: 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:870
+#: 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:873
+#: calendar/gui/calendar-model.c:875
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
-#: calendar/gui/calendar-model.c:993
+#: calendar/gui/calendar-model.c:995
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1410,14 +1562,37 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1033
+#: calendar/gui/calendar-model.c:1035
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "El valor de percentatge ha d'estar entre 0 i 100, ambdСs inclosos"
 
-#: calendar/gui/calendar-model.c:1073
+#: calendar/gui/calendar-model.c:1075
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "La prioritat ha d'estar entre 1 i 9, ambdСs inclosos"
 
+#: calendar/gui/calendar-summary.c:81
+#, fuzzy
+msgid "%A, %e %B %Y"
+msgstr "%A, %d de %B de %Y"
+
+#: calendar/gui/calendar-summary.c:224
+#, fuzzy
+msgid "<b>Error loading calendar</b>"
+msgstr "Error en carregar el fitxer: %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 "Imprimeix l'agenda"
+
 #: calendar/gui/control-factory.c:125
 msgid "The URI that the calendar will display"
 msgstr "La URI que mostrarЮ l'agenda"
@@ -1435,350 +1610,402 @@ msgid "No summary available."
 msgstr "No hi ha cap resum disponible."
 
 #.
-#. * 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 "Tanca"
 
-#: po/tmp/alarm-notify.glade.h:7
+#: calendar/gui/dialogs/alarm-notify.glade.h:7
 msgid "Edit appointment"
 msgstr "Edita una cita"
 
-#: calendar/gui/gnome-cal.c:1466 po/tmp/alarm-notify.glade.h:8
-msgid "Snooze"
-msgstr "'Snooze'"
-
-#: po/tmp/alarm-notify.glade.h:9
+#: calendar/gui/dialogs/alarm-notify.glade.h:9
 msgid "Snooze time (minutes)"
 msgstr "Durada de l'snooze (minuts)"
 
 #.
-#. * 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 minuts"
 
-#: po/tmp/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "10 minutes"
 msgstr "10 minuts"
 
-#: po/tmp/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "12 hour (am/pm)"
 msgstr "12 hores (am/pm)"
 
-#: po/tmp/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "15 minutes"
 msgstr "15 minuts"
 
-#: po/tmp/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "24 hour"
 msgstr "24 hores"
 
-#: po/tmp/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "30 minutes"
 msgstr "30 minuts"
 
-#: po/tmp/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "60 minutes"
 msgstr "60 minuts"
 
-#: po/tmp/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Alarms timeout after"
 msgstr "Les alarmes es desactiven desprИs de"
 
-#: po/tmp/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Audio Alarms"
 msgstr "Alarmes acЗstiques"
 
-#: po/tmp/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Beep when alarm windows appear."
 msgstr "Fes un so quan aparegui una finestra d'alarma."
 
-#: po/tmp/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Calendar"
 msgstr "Agenda"
 
-#: po/tmp/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Calendar Preferences"
 msgstr "PreferХncies de l'agenda"
 
-#: po/tmp/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Colors"
 msgstr "Colors"
 
-#: po/tmp/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Compress weekends"
 msgstr "Comprimeix els caps de setmana"
 
-#: po/tmp/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Date navigator options"
 msgstr "Opcions del navegador de dates"
 
-#: po/tmp/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Defaults"
 msgstr "Valors predeterminats"
 
-#: po/tmp/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Display options"
 msgstr "Opcions de visualitzaciС"
 
-#: po/tmp/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Due Date"
 msgstr "Data de venciment"
 
-#: po/tmp/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "Enable snoozing for"
 msgstr "Habilita l'snoozing per a"
 
-#: po/tmp/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "End of day:"
 msgstr "Final del dia:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:26
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "First day of week:"
 msgstr "primer dia de la setmana:"
 
-#: 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 "dv."
 
-#: 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 "Divendres"
 
-#: po/tmp/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Highlight"
 msgstr "Ressalta"
 
-#: po/tmp/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "Items Due Today"
 msgstr "Elemts que vencen avui"
 
-#: po/tmp/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "Items Due Today:"
 msgstr "Elements que vencen avui:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Items Not Yet Due"
 msgstr "Elements que encara no han venГut"
 
-#: po/tmp/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Items Not Yet Due:"
 msgstr "Elements que encara no han venГut:"
 
-#: 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 "dl."
 
-#: 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 "Dilluns"
 
-#: po/tmp/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "Overdue Items"
 msgstr "Elements venГuts"
 
-#: po/tmp/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Overdue Items:"
 msgstr "Elements que ja han venГut:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Pick a color"
 msgstr "Agafa un color"
 
-#: 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 "Prioritat"
 
-#: po/tmp/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Remind me of all appointments"
 msgstr "Recorda'm totes les cites"
 
-#: po/tmp/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Reminders"
 msgstr "Recordatoris"
 
-#: 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 "ds."
 
-#: 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 "Dissabte"
 
-#: po/tmp/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Show"
 msgstr "Mostra"
 
-#: po/tmp/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "Show appointment end times"
 msgstr "Mostra les hores d'acabament de les cites"
 
-#: po/tmp/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Show week numbers"
 msgstr "Mostra els nЗmeros de les setmanes"
 
-#: po/tmp/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "Start of day:"
 msgstr "Inici del dia:"
 
 #. 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 "dg."
 
-#: 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 "Diumenge"
 
-#: po/tmp/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "TaskPad"
 msgstr "TaskPad"
 
-#: 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 "dj."
 
-#: 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 "Dijous"
 
-#: po/tmp/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "Time Until Due"
 msgstr "Temps fins al venciment"
 
-#: po/tmp/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "Time divisions:"
 msgstr "Divisions de temps:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:55
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "Time format:"
 msgstr "Format de l'hora:"
 
-#: 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 "dm."
 
-#: 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 "Dimarts"
 
-#: po/tmp/cal-prefs-dialog.glade.h:58
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "Visual Alarms"
 msgstr "Alarmes visuals"
 
-#: 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 "dc."
 
-#: 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 "Dimecres"
 
-#: po/tmp/cal-prefs-dialog.glade.h:61
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "Work week"
 msgstr "Setmana de treball"
 
-#: po/tmp/cal-prefs-dialog.glade.h:62
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "minutes before they occur."
 msgstr "minuts abans que es produeixin."
 
-#: po/tmp/cal-prefs-dialog.glade.h:63
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "seconds."
 msgstr "segons."
 
+#: calendar/gui/dialogs/delete-comp.c:62
+#, fuzzy, c-format
+msgid "Are you sure you want to delete the appointment `%s'?"
+msgstr ""
+"Esteu segur que voleu\n"
+"suprimir aquest contacte?"
+
+#: calendar/gui/dialogs/delete-comp.c:65
+#, fuzzy
+msgid "Are you sure you want to delete this untitled appointment?"
+msgstr ""
+"Esteu segur que voleu\n"
+"suprimir aquest contacte?"
+
+#: calendar/gui/dialogs/delete-comp.c:71
+#, fuzzy, c-format
+msgid "Are you sure you want to delete the task `%s'?"
+msgstr ""
+"Esteu segur que voleu\n"
+"suprimir aquest contacte?"
+
+#: calendar/gui/dialogs/delete-comp.c:74
+#, fuzzy
+msgid "Are you sure you want to delete this untitled task?"
+msgstr ""
+"Esteu segur que voleu\n"
+"suprimir aquest contacte?"
+
+#: calendar/gui/dialogs/delete-comp.c:80
+#, fuzzy, c-format
+msgid "Are you sure you want to delete the journal entry `%s'?"
+msgstr ""
+"Esteu segur que voleu\n"
+"suprimir aquest contacte?"
+
+#: calendar/gui/dialogs/delete-comp.c:83
+#, fuzzy
+msgid "Are you sure want to delete this untitled journal entry?"
+msgstr ""
+"Esteu segur que voleu\n"
+"suprimir aquest contacte?"
+
 #.
-#. * 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 "% comp_let:"
 
-#: po/tmp/task-editor-dialog.glade.h:7
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
 msgid "C_lassification:"
 msgstr "C_lassificaciС:"
 
-#: po/tmp/task-editor-dialog.glade.h:9
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
 msgid "Cancelled"
 msgstr "Cancel╥lat"
 
-#: po/tmp/task-editor-dialog.glade.h:10
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
 msgid "Completed"
 msgstr "Completat"
 
-#: po/tmp/task-editor-dialog.glade.h:12
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
 msgid "Date Completed:"
 msgstr "Data completa:"
 
-#: po/tmp/task-editor-dialog.glade.h:14
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
 msgid "High"
 msgstr "Alta"
 
-#: po/tmp/task-editor-dialog.glade.h:15
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
 msgid "In Progress"
 msgstr "En procИs"
 
-#: po/tmp/task-editor-dialog.glade.h:16
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
 msgid "Low"
 msgstr "Baixa"
 
 #. 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
-#: widgets/misc/e-dateedit.c:422 widgets/misc/e-dateedit.c:1331
-#: widgets/misc/e-dateedit.c:1446
+#: 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 "Cap"
 
-#: po/tmp/task-editor-dialog.glade.h:18
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
 msgid "Normal"
 msgstr "Normal"
 
-#: po/tmp/task-editor-dialog.glade.h:19
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
 msgid "Not Started"
 msgstr "No iniciat"
 
-#: po/tmp/task-editor-dialog.glade.h:22
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
 msgid "S_ummary"
 msgstr "R_esum"
 
-#: po/tmp/task-editor-dialog.glade.h:23
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
 msgid "Sta_rt Date:"
 msgstr "Data d'ini_ci:"
 
-#: po/tmp/task-editor-dialog.glade.h:24
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
 msgid "Task"
 msgstr "Tasca"
 
-#: 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 "_Contactes..."
 
-#: po/tmp/task-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
 msgid "_Due Date:"
 msgstr "_Data de venciment:"
 
-#: po/tmp/task-editor-dialog.glade.h:28
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
 msgid "_Priority:"
 msgstr "_Prioritat:"
 
-#: po/tmp/task-editor-dialog.glade.h:29
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
 msgid "_Status:"
 msgstr "_Estat:"
 
-#: po/tmp/task-editor-dialog.glade.h:30
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
 msgid "task-editor-dialog"
 msgstr "task-editor-dialog"
 
@@ -1786,26 +2013,26 @@ msgstr "task-editor-dialog"
 msgid "Edit Task"
 msgstr "Edita la tasca"
 
-#: 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 "Sense resum"
 
-#: 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 "Cita - %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 "Tasca - %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 "Entrada al diari - %s"
 
-#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3277
+#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3250
 msgid "Do you want to save changes?"
 msgstr ""
 
@@ -1825,14 +2052,6 @@ msgstr "Marca com a completa"
 msgid "Mark the task complete"
 msgstr "Marca la tasca com a completa"
 
-#: calendar/gui/e-calendar-table.c:342 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:479 mail/mail-view.c:165
-#: 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 "Suprimeix"
-
 #: calendar/gui/e-calendar-table.c:343
 msgid "Delete the task"
 msgstr "Suprimeix la tasca"
@@ -1844,50 +2063,62 @@ msgstr "%02i divisions de minut"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1208
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1211
 #: calendar/gui/e-week-view-main-item.c:325
 msgid "%A %d %B"
 msgstr "%A, %d de %B"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1222
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1225
 #: calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1235
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1238
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view.c:2941 calendar/gui/e-day-view.c:2948
-#: calendar/gui/e-day-view.c:2957 calendar/gui/e-week-view.c:3165
-#: calendar/gui/e-week-view.c:3172 calendar/gui/e-week-view.c:3181
+#. 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:610
+msgid "am"
+msgstr "am"
+
+#. 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:609
+msgid "pm"
+msgstr "pm"
+
+#: calendar/gui/e-day-view.c:2948 calendar/gui/e-day-view.c:2955
+#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3169
+#: calendar/gui/e-week-view.c:3176 calendar/gui/e-week-view.c:3185
 msgid "New appointment..."
 msgstr "Nova cita..."
 
-#: calendar/gui/e-day-view.c:2945 calendar/gui/e-day-view.c:2952
-#: calendar/gui/e-week-view.c:3169 calendar/gui/e-week-view.c:3176
+#: calendar/gui/e-day-view.c:2952 calendar/gui/e-day-view.c:2959
+#: calendar/gui/e-week-view.c:3173 calendar/gui/e-week-view.c:3180
 msgid "Edit this appointment..."
 msgstr "Edita aquesta cita..."
 
-#: calendar/gui/e-day-view.c:2946 calendar/gui/e-week-view.c:3170
-#: po/tmp/evolution-event-editor.xml.h:20
+#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3174
+#: ui/evolution-event-editor.xml.h:20
 msgid "Delete this appointment"
 msgstr "Suprimeix aquesta cita"
 
-#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3177
+#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3181
 msgid "Make this appointment movable"
 msgstr "Fes aquesta cita movible"
 
-#: calendar/gui/e-day-view.c:2954 calendar/gui/e-week-view.c:3178
+#: calendar/gui/e-day-view.c:2961 calendar/gui/e-week-view.c:3182
 msgid "Delete this occurrence"
 msgstr "Suprimeix-ne aquesta apariciС"
 
-#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3179
+#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3183
 msgid "Delete all occurrences"
 msgstr "Suprimeix-ne totes les aparicions"
 
@@ -1899,661 +2130,489 @@ 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 "Esdeveniment per a _tot el dia"
 
-#: po/tmp/event-editor-dialog.glade.h:8
+#: calendar/gui/event-editor-dialog.glade.h:8
 msgid "Appointment Basics"
 msgstr "Temes fonamentals sobre les cites"
 
-#: po/tmp/event-editor-dialog.glade.h:9
+#: calendar/gui/event-editor-dialog.glade.h:9
 msgid "Classification"
 msgstr "ClassificaciС"
 
-#: po/tmp/event-editor-dialog.glade.h:10
+#: calendar/gui/event-editor-dialog.glade.h:10
 msgid "Custom recurrence"
 msgstr "RecurrХncia personalitzada"
 
-#: po/tmp/event-editor-dialog.glade.h:11
+#: calendar/gui/event-editor-dialog.glade.h:11
 msgid "Days"
 msgstr "Dies"
 
-#: po/tmp/event-editor-dialog.glade.h:13
+#: calendar/gui/event-editor-dialog.glade.h:13
 msgid "Every"
 msgstr "Cada"
 
-#: po/tmp/event-editor-dialog.glade.h:14
+#: calendar/gui/event-editor-dialog.glade.h:14
 msgid "Exceptions"
 msgstr "Excepcions"
 
-#: po/tmp/event-editor-dialog.glade.h:16
+#: calendar/gui/event-editor-dialog.glade.h:16
 msgid "Hours"
 msgstr "Hores"
 
-#: po/tmp/event-editor-dialog.glade.h:17
+#: calendar/gui/event-editor-dialog.glade.h:17
 msgid "Mail _to:"
 msgstr "Envia per correu _a:"
 
-#: po/tmp/event-editor-dialog.glade.h:18
+#: calendar/gui/event-editor-dialog.glade.h:18
 msgid "Minutes"
 msgstr "Minuts"
 
-#: po/tmp/event-editor-dialog.glade.h:19
+#: calendar/gui/event-editor-dialog.glade.h:19
 msgid "Modify"
 msgstr "Modifica"
 
-#: po/tmp/event-editor-dialog.glade.h:20
+#: calendar/gui/event-editor-dialog.glade.h:20
 msgid "No recurrence"
 msgstr "Sense recurrХncia"
 
-#: po/tmp/event-editor-dialog.glade.h:21
+#: calendar/gui/event-editor-dialog.glade.h:21
 #, fuzzy
 msgid "Preview"
 msgstr "PrevisualitzaciС:"
 
-#: po/tmp/event-editor-dialog.glade.h:22
+#: calendar/gui/event-editor-dialog.glade.h:22
 msgid "Pri_vate"
 msgstr "Pri_vat"
 
-#: po/tmp/event-editor-dialog.glade.h:23
+#: calendar/gui/event-editor-dialog.glade.h:23
 msgid "Pu_blic"
 msgstr "PЗ_blic"
 
-#: po/tmp/event-editor-dialog.glade.h:24
+#: calendar/gui/event-editor-dialog.glade.h:24
 msgid "Recurrence"
 msgstr "RecurrХncia"
 
-#: po/tmp/event-editor-dialog.glade.h:25
+#: calendar/gui/event-editor-dialog.glade.h:25
 msgid "Recurrence Rule"
 msgstr "Regla de recurrХncia"
 
-#: po/tmp/event-editor-dialog.glade.h:26
+#: calendar/gui/event-editor-dialog.glade.h:26
 msgid "Reminder"
 msgstr "Recordatori"
 
-#: po/tmp/event-editor-dialog.glade.h:27
+#: calendar/gui/event-editor-dialog.glade.h:27
 msgid "Simple recurrence"
 msgstr "RecurrХncia simple"
 
-#: po/tmp/event-editor-dialog.glade.h:28
+#: calendar/gui/event-editor-dialog.glade.h:28
 msgid "Su_mmary:"
 msgstr "Resu_m:"
 
-#: po/tmp/event-editor-dialog.glade.h:29
+#: calendar/gui/event-editor-dialog.glade.h:29
 msgid "Time"
 msgstr "Temps"
 
-#: po/tmp/event-editor-dialog.glade.h:30
+#: calendar/gui/event-editor-dialog.glade.h:30
 msgid "_Audio"
 msgstr "_юudio"
 
-#: po/tmp/event-editor-dialog.glade.h:31
+#: calendar/gui/event-editor-dialog.glade.h:31
 msgid "_Confidential"
 msgstr "_Confidencial"
 
-#: po/tmp/event-editor-dialog.glade.h:32
+#: calendar/gui/event-editor-dialog.glade.h:32
 msgid "_Display"
 msgstr "_VisualitzaciС"
 
-#: po/tmp/event-editor-dialog.glade.h:33
+#: calendar/gui/event-editor-dialog.glade.h:33
 msgid "_End time:"
 msgstr "Hora de _finalitzaciС:"
 
-#: po/tmp/event-editor-dialog.glade.h:34
+#: calendar/gui/event-editor-dialog.glade.h:34
 msgid "_Mail"
 msgstr "_Correu"
 
-#: po/tmp/event-editor-dialog.glade.h:35
+#: calendar/gui/event-editor-dialog.glade.h:35
 msgid "_Program"
 msgstr "_Programa"
 
-#: po/tmp/event-editor-dialog.glade.h:36
+#: calendar/gui/event-editor-dialog.glade.h:36
 msgid "_Run program:"
 msgstr "_Executa el programa:"
 
-#: po/tmp/event-editor-dialog.glade.h:37
+#: calendar/gui/event-editor-dialog.glade.h:37
 msgid "_Start time:"
 msgstr "Hora d'_inici:"
 
-#: po/tmp/event-editor-dialog.glade.h:38
+#: calendar/gui/event-editor-dialog.glade.h:38
 msgid "_Starting date:"
 msgstr "Data d'_inici:"
 
-#: po/tmp/event-editor-dialog.glade.h:39
+#: calendar/gui/event-editor-dialog.glade.h:39
 msgid "day(s)"
 msgstr "dia(es)"
 
-#: po/tmp/event-editor-dialog.glade.h:40
+#: calendar/gui/event-editor-dialog.glade.h:40
 msgid "event-editor-dialog"
 msgstr "event-editor-dialog"
 
-#: po/tmp/event-editor-dialog.glade.h:41
+#: calendar/gui/event-editor-dialog.glade.h:41
 msgid "for"
 msgstr "per a"
 
-#: po/tmp/event-editor-dialog.glade.h:42
+#: calendar/gui/event-editor-dialog.glade.h:42
 msgid "forever"
 msgstr "per sempre"
 
-#: po/tmp/event-editor-dialog.glade.h:43
+#: calendar/gui/event-editor-dialog.glade.h:43
 msgid "label21"
 msgstr "etiqueta21"
 
-#: po/tmp/event-editor-dialog.glade.h:44
+#: calendar/gui/event-editor-dialog.glade.h:44
 msgid "month(s)"
 msgstr "mes(os)"
 
-#: po/tmp/event-editor-dialog.glade.h:45
+#: calendar/gui/event-editor-dialog.glade.h:45
 msgid "until"
 msgstr "fins a"
 
-#: po/tmp/event-editor-dialog.glade.h:46
+#: calendar/gui/event-editor-dialog.glade.h:46
 msgid "week(s)"
 msgstr "setmana(es)"
 
-#: po/tmp/event-editor-dialog.glade.h:47
+#: calendar/gui/event-editor-dialog.glade.h:47
 msgid "year(s)"
 msgstr "any(s)"
 
-#: calendar/gui/event-editor.c:329
+#: calendar/gui/event-editor.c:325
 msgid "Edit Appointment"
 msgstr "Edita una cita"
 
-#: calendar/gui/event-editor.c:407
+#: calendar/gui/event-editor.c:403
 msgid "on"
 msgstr "el"
 
-#: calendar/gui/event-editor.c:432 calendar/gui/getdate.y:424
-#: filter/filter-datespec.c:65
+#: calendar/gui/event-editor.c:428 filter/filter-datespec.c:65
 msgid "day"
 msgstr "dia"
 
-#: calendar/gui/event-editor.c:559
+#: calendar/gui/event-editor.c:555
 #, fuzzy
 msgid "on the"
 msgstr "mes"
 
-#: calendar/gui/event-editor.c:566
+#: calendar/gui/event-editor.c:562
 #, fuzzy
 msgid "th"
 msgstr "4"
 
-#: calendar/gui/event-editor.c:722
+#: calendar/gui/event-editor.c:716
 #, fuzzy
 msgid "occurrences"
 msgstr "aparicions"
 
-#: calendar/gui/event-editor.c:839
+#: calendar/gui/event-editor.c:833
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor.c:3079 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 "%a, %d de %b de %Y"
 
-#: calendar/gui/getdate.y:391
-msgid "january"
-msgstr "gener"
+#: calendar/gui/gnome-cal.c:676
+#, c-format
+msgid "Could not load the calendar in `%s'"
+msgstr "No s'ha pogut carregar l'agenda en `%s'"
 
-#: calendar/gui/getdate.y:392
-msgid "february"
-msgstr "febrer"
+#: calendar/gui/gnome-cal.c:687
+#, c-format
+msgid "Could not create a calendar in `%s'"
+msgstr "No s'ha pogut crear una agenda a `%s'"
 
-#: calendar/gui/getdate.y:393
-msgid "march"
-msgstr "marГ"
+#: calendar/gui/gnome-cal.c:698
+#, c-format
+msgid "The method required to load `%s' is not supported"
+msgstr "El mХtode necessari per carregar `%s' no estЮ suportat"
 
-#: calendar/gui/getdate.y:394
-msgid "april"
+#.
+#. * 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
+#, fuzzy
+msgid "April"
 msgstr "abril"
 
-#: calendar/gui/getdate.y:395
-msgid "may"
-msgstr "maig"
-
-#: calendar/gui/getdate.y:396
-msgid "june"
-msgstr "juny"
-
-#: calendar/gui/getdate.y:397
-msgid "july"
-msgstr "juliol"
-
-#: calendar/gui/getdate.y:398
-msgid "august"
+#: calendar/gui/goto-dialog.glade.h:7
+#, fuzzy
+msgid "August"
 msgstr "agost"
 
-#: calendar/gui/getdate.y:399
-msgid "september"
-msgstr "setembre"
-
-#: calendar/gui/getdate.y:400
-msgid "sept"
-msgstr "set"
-
-#: calendar/gui/getdate.y:401
-msgid "october"
-msgstr "octubre"
-
-#: calendar/gui/getdate.y:402
-msgid "november"
-msgstr "novembre"
-
-#: calendar/gui/getdate.y:403
-msgid "december"
+#: calendar/gui/goto-dialog.glade.h:8
+#, fuzzy
+msgid "December"
 msgstr "desembre"
 
-#: calendar/gui/getdate.y:404
-msgid "sunday"
-msgstr "diumenge"
-
-#: calendar/gui/getdate.y:405
-msgid "monday"
-msgstr "dilluns"
-
-#: calendar/gui/getdate.y:406
-msgid "tuesday"
-msgstr "dimarts"
-
-#: calendar/gui/getdate.y:407
-msgid "tues"
-msgstr "dm."
-
-#: calendar/gui/getdate.y:408
-msgid "wednesday"
-msgstr "dimecres"
-
-#: calendar/gui/getdate.y:409
-msgid "wednes"
-msgstr "dc."
-
-#: calendar/gui/getdate.y:410
-msgid "thursday"
-msgstr "dijous"
-
-#: calendar/gui/getdate.y:411
-msgid "thur"
-msgstr "dj."
-
-#: calendar/gui/getdate.y:412
-msgid "thurs"
-msgstr "dj."
-
-#: calendar/gui/getdate.y:413
-msgid "friday"
-msgstr "divendres"
-
-#: calendar/gui/getdate.y:414
-msgid "saturday"
-msgstr "dissabte"
-
-#: calendar/gui/getdate.y:420 filter/filter-datespec.c:62
-msgid "year"
-msgstr "any"
-
-#: calendar/gui/getdate.y:421 filter/filter-datespec.c:63
-msgid "month"
-msgstr "mes"
-
-#: calendar/gui/getdate.y:422
-msgid "fortnight"
-msgstr "quinzena"
-
-#: calendar/gui/getdate.y:423 filter/filter-datespec.c:64
-msgid "week"
-msgstr "setmana"
-
-#: calendar/gui/getdate.y:425 filter/filter-datespec.c:66
-msgid "hour"
-msgstr "hora"
-
-#: calendar/gui/getdate.y:426 filter/filter-datespec.c:67
-msgid "minute"
-msgstr "minut"
-
-#: calendar/gui/getdate.y:427
-msgid "min"
-msgstr "min."
-
-#: calendar/gui/getdate.y:428 filter/filter-datespec.c:68
-msgid "second"
-msgstr "segon"
-
-#: calendar/gui/getdate.y:429
-msgid "sec"
-msgstr "s"
-
-#: calendar/gui/getdate.y:435
-msgid "tomorrow"
-msgstr "demЮ"
-
-#: calendar/gui/getdate.y:436
-msgid "yesterday"
-msgstr "ahir"
-
-#: calendar/gui/getdate.y:437
-msgid "today"
-msgstr "avui"
-
-#: calendar/gui/getdate.y:438 filter/filter-datespec.c:533
-#: filter/filter-datespec.c:693
-msgid "now"
-msgstr "ara"
-
-#: calendar/gui/getdate.y:439
-msgid "last"
-msgstr "Зltim"
-
-#: calendar/gui/getdate.y:440
-msgid "this"
-msgstr "aquest"
-
-#: calendar/gui/getdate.y:441
-msgid "next"
-msgstr "segЭent"
-
-#: calendar/gui/getdate.y:442
-msgid "first"
-msgstr "primer"
-
-#. { N_("second"),		tUNUMBER,	2 },
-#: calendar/gui/getdate.y:444
-msgid "third"
-msgstr "tercer"
-
-#: calendar/gui/getdate.y:445
-msgid "fourth"
-msgstr "quart"
-
-#: calendar/gui/getdate.y:446
-msgid "fifth"
-msgstr "cinquХ"
-
-#: calendar/gui/getdate.y:447
-msgid "sixth"
-msgstr "sisХ"
-
-#: calendar/gui/getdate.y:448
-msgid "seventh"
-msgstr "setХ"
-
-#: calendar/gui/getdate.y:449
-msgid "eighth"
-msgstr "vuitХ"
-
-#: calendar/gui/getdate.y:450
-msgid "ninth"
-msgstr "novХ"
-
-#: calendar/gui/getdate.y:451
-msgid "tenth"
-msgstr "desХ"
-
-#: calendar/gui/getdate.y:452
-msgid "eleventh"
-msgstr "onzХ"
+#: calendar/gui/goto-dialog.glade.h:9
+#, fuzzy
+msgid "February"
+msgstr "febrer"
 
-#: calendar/gui/getdate.y:453
-msgid "twelfth"
-msgstr "dotzХ"
+#: calendar/gui/goto-dialog.glade.h:10
+#, fuzzy
+msgid "Go To Date"
+msgstr "VИs a una data"
 
-#: calendar/gui/getdate.y:454
-msgid "ago"
-msgstr "fa"
+#: calendar/gui/goto-dialog.glade.h:11
+#, fuzzy
+msgid "Go To Today"
+msgstr "VИs a avui"
 
-#: calendar/gui/gnome-cal.c:718 calendar/gui/gnome-cal.c:1474
-#: calendar/gui/gnome-cal.c:1530
-msgid "Reminder of your appointment at "
-msgstr "Recordatori de la vostra cita a "
+#: calendar/gui/goto-dialog.glade.h:12
+#, fuzzy
+msgid "January"
+msgstr "gener"
 
-#: calendar/gui/gnome-cal.c:1152
-#, c-format
-msgid "Could not load the calendar in `%s'"
-msgstr "No s'ha pogut carregar l'agenda en `%s'"
+#: calendar/gui/goto-dialog.glade.h:13
+#, fuzzy
+msgid "July"
+msgstr "juliol"
 
-#: calendar/gui/gnome-cal.c:1163
-#, c-format
-msgid "Could not create a calendar in `%s'"
-msgstr "No s'ha pogut crear una agenda a `%s'"
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "June"
+msgstr "juny"
 
-#: calendar/gui/gnome-cal.c:1174
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr "El mХtode necessari per carregar `%s' no estЮ suportat"
+#: calendar/gui/goto-dialog.glade.h:15
+#, fuzzy
+msgid "March"
+msgstr "marГ"
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1479 calendar/gui/gnome-cal.c:1534
-#: mail/mail-search-dialogue.c:104
-msgid "Ok"
-msgstr "D'acord"
+#: calendar/gui/goto-dialog.glade.h:16
+#, fuzzy
+msgid "May"
+msgstr "Dilluns"
 
-#: calendar/gui/goto.c:82
-msgid "Year:"
-msgstr "Any:"
+#: calendar/gui/goto-dialog.glade.h:17
+#, fuzzy
+msgid "November"
+msgstr "novembre"
 
-#: calendar/gui/goto.c:270
-msgid "Go to date"
-msgstr "VИs a una data"
+#: calendar/gui/goto-dialog.glade.h:18
+#, fuzzy
+msgid "October"
+msgstr "octubre"
 
-#. Instructions
-#: calendar/gui/goto.c:281
-msgid ""
-"Please select the date you want to go to.\n"
-"When you click on a day, you will be taken\n"
-"to that date."
-msgstr ""
-"Si us plau, seleccioneu la data a quХ voleu anar.\n"
-"Quan feu clic sobre un dia, anireu a parar\n"
-"a aquella data."
+#: calendar/gui/goto-dialog.glade.h:19
+#, fuzzy
+msgid "September"
+msgstr "setembre"
 
-#: calendar/gui/goto.c:318
-msgid "Go to today"
-msgstr "VИs a avui"
+#: calendar/gui/main.c:49
+#, fuzzy
+msgid "Could not initialize GNOME"
+msgstr "No s'ha pogut inicialitzar el Bonobo"
 
-#: 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 "Dg"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Mo"
 msgstr "Dl"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Tu"
 msgstr "Dm"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "We"
 msgstr "Dc"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Th"
 msgstr "Dj"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Fr"
 msgstr "Dv"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Sa"
 msgstr "Ds"
 
-#: calendar/gui/print.c:936
+#: calendar/gui/print.c:941
 msgid "Tasks"
 msgstr "Tasques"
 
 #. Day
-#: calendar/gui/print.c:1066
+#: calendar/gui/print.c:1071
 msgid "Current day (%a %b %d %Y)"
 msgstr "Avui (%a, %d de %b de %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, %d de %b"
 
-#: 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 "Aquesta setmana (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1100
+#: calendar/gui/print.c:1105
 msgid "Current month (%b %Y)"
 msgstr "Aquest mes (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1107
+#: calendar/gui/print.c:1112
 msgid "Current year (%Y)"
 msgstr "Enguany (%Y)"
 
-#: calendar/gui/print.c:1144
+#: calendar/gui/print.c:1149
 msgid "Print Calendar"
 msgstr "Imprimeix l'agenda"
 
-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:962
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1001
 msgid "Print Preview"
 msgstr "PrevisualitzaciС d'impressiС"
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: calendar/gui/weekday-picker.c:351 widgets/misc/e-calendar-item.c:416
-msgid "MTWTFSS"
-msgstr "DDDDDDD"
-
-#: calendar/gui/weekday-picker.c:353 calendar/gui/weekday-picker.c:443
+#: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
 #, fuzzy
 msgid "SMTWTFS"
 msgstr "DDDDDDD"
@@ -2647,60 +2706,61 @@ msgid "Could not load %s: No initialization code in module."
 msgstr ""
 "No s'ha pogut carregar %s: el mРdul no contИ cap codi d'inicialitzaciС."
 
-#: camel/camel-remote-store.c:182
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr "Servidor %s %s"
 
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "Servei %s per a %s en %s"
 
-#: camel/camel-remote-store.c:227
+#: camel/camel-remote-store.c:243
+#: camel/providers/smtp/camel-smtp-transport.c:162
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "No s'ha pogut connectar a %s (port %d): %s"
 
-#: camel/camel-remote-store.c:228
+#: camel/camel-remote-store.c:244
 msgid "(unknown host)"
 msgstr "(ordinador central desconegut)"
 
-#: camel/camel-remote-store.c:452
+#: camel/camel-remote-store.c:483
 msgid "Server disconnected."
 msgstr ""
 
-#: camel/camel-service.c:120
+#: camel/camel-service.c:138
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "L'URL '%s' necessita un component de nom d'usuari"
 
-#: camel/camel-service.c:129
+#: camel/camel-service.c:147
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "L'URL '%s' necessita un component d'ordinador central"
 
-#: camel/camel-service.c:138
+#: camel/camel-service.c:156
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "L'URL '%s' necessita un component de camМ"
 
-#: camel/camel-service.c:488
+#: camel/camel-service.c:526
 #, c-format
 msgid "No such host %s."
 msgstr "L'ordinador central %s no existeix."
 
-#: camel/camel-service.c:491
+#: camel/camel-service.c:529
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr "Temporalment no es pot cercar el nom d'ordinador central %s."
 
-#: camel/camel-session.c:272
+#: camel/camel-session.c:297
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "No hi ha cap proveОdor disponible per al protocol `%s'"
 
-#: camel/camel-session.c:360
+#: camel/camel-session.c:388
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2724,53 +2784,53 @@ msgstr "La cadena d'URL `%s' contИ un protocol incorrecte"
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "El nЗmero de port de l'URL `%s' no Иs numХric"
 
-#: camel/providers/imap/camel-imap-auth.c:127
+#: camel/providers/imap/camel-imap-auth.c:133
 #, fuzzy, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
 "%s"
 msgstr "No s'ha pogut crear el conducte: %s"
 
-#: camel/providers/imap/camel-imap-auth.c:198
+#: camel/providers/imap/camel-imap-auth.c:205
 #, fuzzy
 msgid "Bad authentication response from server."
 msgstr "Resposta inesperada del servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:216
+#: camel/providers/imap/camel-imap-command.c:231
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Resposta inesperada del servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:224
+#: camel/providers/imap/camel-imap-command.c:239
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "L'ordre IMAP ha fallat: %s"
 
-#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:240 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "Error desconegut"
 
-#: camel/providers/imap/camel-imap-command.c:271
+#: camel/providers/imap/camel-imap-command.c:286
 #, fuzzy
 msgid "Server response ended too soon."
 msgstr "La resposta del servidor IMAP no contenia la informaciС %s"
 
-#: camel/providers/imap/camel-imap-command.c:407
+#: camel/providers/imap/camel-imap-command.c:422
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "La resposta del servidor IMAP no contenia la informaciС %s"
 
-#: camel/providers/imap/camel-imap-command.c:443
+#: camel/providers/imap/camel-imap-command.c:458
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Resposta D'acord inesperada del servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:216
+#: camel/providers/imap/camel-imap-folder.c:196
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "No s'ha pogut carregar el resum per a %s"
 
-#: camel/providers/imap/camel-imap-folder.c:586
+#: camel/providers/imap/camel-imap-folder.c:532
 msgid "Could not find message body in FETCH response."
 msgstr "No s'ha pogut trobar el cos del missatge en la resposta al FETCH."
 
@@ -2782,23 +2842,17 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Per llegir i emmagatzemar correu en servidors IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:234
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:148
-msgid "Password"
-msgstr "Contrasenya"
-
-#: camel/providers/imap/camel-imap-store.c:236
+#: camel/providers/imap/camel-imap-store.c:248
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Aquesta opciС es connectarЮ al servidor IMAP mitjanГant una contrasenya de "
 "text net."
 
-#: camel/providers/imap/camel-imap-store.c:245
+#: camel/providers/imap/camel-imap-store.c:257
 msgid "Kerberos 4"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:247
+#: camel/providers/imap/camel-imap-store.c:259
 #, fuzzy
 msgid ""
 "This option will connect to the IMAP server using Kerberos 4 authentication."
@@ -2806,12 +2860,12 @@ msgstr ""
 "AixР us connectarЮ al servidor POP i utilitzarЮ el Kerberos 4 per "
 "autenticar-vos-hi."
 
-#: camel/providers/imap/camel-imap-store.c:333
+#: camel/providers/imap/camel-imap-store.c:345
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sSi us plau, introduОu la contrasenya IMAP per a %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:359
+#: camel/providers/imap/camel-imap-store.c:373
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2822,7 +2876,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:539
+#: camel/providers/imap/camel-imap-store.c:564
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "No s'ha pogut crear el directori %s: %s"
@@ -2912,12 +2966,12 @@ msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "No es pot afegir cap missatge a la carpeta mh: %s"
 
 #: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:204
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-maildir-folder.c:207
+#: camel/providers/local/camel-maildir-folder.c:215
+#: camel/providers/local/camel-mbox-folder.c:317
 #: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:189
-#: camel/providers/local/camel-mh-folder.c:197
+#: camel/providers/local/camel-mh-folder.c:192
+#: camel/providers/local/camel-mh-folder.c:200
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -2927,14 +2981,14 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-mbox-folder.c:317
 #: camel/providers/local/camel-mh-folder.c:183
 #, fuzzy
 msgid "No such message"
 msgstr "L'ordinador central %s no existeix."
 
-#: camel/providers/local/camel-maildir-folder.c:213
-#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-maildir-folder.c:216
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "Invalid message contents"
 msgstr ""
 
@@ -2982,19 +3036,19 @@ msgstr "No s'ha pogut suprimir la carpeta `%s': %s"
 msgid "not a maildir directory"
 msgstr "Directori de correu local %s"
 
-#: camel/providers/local/camel-mbox-folder.c:195
+#: camel/providers/local/camel-mbox-folder.c:201
 #, fuzzy, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "No es pot obrir la bЗstia de correu temporal: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:251
+#: camel/providers/local/camel-mbox-folder.c:257
 #, fuzzy, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "No es pot afegir el missatge al fitxer mbox: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:327
-#: camel/providers/local/camel-mbox-folder.c:357
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:333
+#: camel/providers/local/camel-mbox-folder.c:365
+#: camel/providers/local/camel-mbox-folder.c:378
 #, fuzzy, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -3003,11 +3057,11 @@ msgstr ""
 "No es pot recuperar el missatge: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:358
+#: camel/providers/local/camel-mbox-folder.c:366
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:369
+#: camel/providers/local/camel-mbox-folder.c:379
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -3060,59 +3114,59 @@ msgstr "No s'ha pogut obrir la carpeta: la llista de missatges era incompleta."
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:341
+#: camel/providers/local/camel-mbox-summary.c:343
 #, fuzzy, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "No es pot bifurcar %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:475
-#: camel/providers/local/camel-mbox-summary.c:661
+#: camel/providers/local/camel-mbox-summary.c:477
+#: camel/providers/local/camel-mbox-summary.c:668
 #, fuzzy, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
 "No s'ha pogut obrir la carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:491
+#: camel/providers/local/camel-mbox-summary.c:493
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "No es pot obrir la bЗstia de correu temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:512
-#: camel/providers/local/camel-mbox-summary.c:520
-#: camel/providers/local/camel-mbox-summary.c:691
-#: camel/providers/local/camel-mbox-summary.c:699
+#: camel/providers/local/camel-mbox-summary.c:514
+#: camel/providers/local/camel-mbox-summary.c:522
+#: camel/providers/local/camel-mbox-summary.c:701
+#: camel/providers/local/camel-mbox-summary.c:709
 #, fuzzy
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "IncongruХncia del resum, s'estЮ interrompent la sincronitzaciС"
 
-#: camel/providers/local/camel-mbox-summary.c:562
+#: camel/providers/local/camel-mbox-summary.c:565
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Error en escriure a la bЗstia de correu temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:579
+#: camel/providers/local/camel-mbox-summary.c:582
 #, fuzzy, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Error en escriure a la bЗstia de correu temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:595
-#: camel/providers/local/camel-mbox-summary.c:748
+#: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-mbox-summary.c:759
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "No s'ha pogut tancar la carpeta font %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:604
+#: camel/providers/local/camel-mbox-summary.c:609
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "No es pot tancar la carpeta temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:615
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "No s'ha pogut canviar el nom de la carpeta: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:817
+#: camel/providers/local/camel-mbox-summary.c:830
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Error desconegut: %s"
@@ -3145,7 +3199,7 @@ msgstr "No s'ha pogut enviar el nom d'usuari al servidor"
 msgid "Server rejected username/password"
 msgstr "El servidor ha rebutjat el nom d'usuari/la contrasenya"
 
-#: camel/providers/nntp/camel-nntp-folder.c:144
+#: camel/providers/nntp/camel-nntp-folder.c:115
 #, c-format
 msgid "Message %s not found."
 msgstr "No s'ha trobat el missatge %s."
@@ -3197,16 +3251,16 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "No es pot obrir o crear el fitxer .newsrc per a %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:179
+#: camel/providers/pop3/camel-pop3-folder.c:180
 msgid "Could not open folder: message listing was incomplete."
 msgstr "No s'ha pogut obrir la carpeta: la llista de missatges era incompleta."
 
-#: camel/providers/pop3/camel-pop3-folder.c:273
+#: camel/providers/pop3/camel-pop3-folder.c:274
 #, c-format
 msgid "No message with uid %s"
 msgstr "No hi ha cap missatge amb l'uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:288
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "No s'ha pogut recuperar el missatge %s del servidor POP: %s"
@@ -3254,17 +3308,17 @@ msgstr ""
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "No se us ha pogut autenticar al servidor KPOP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:335
+#: camel/providers/pop3/camel-pop3-store.c:337
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "No s'ha pogut connectar al servidor POP en %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:389
+#: camel/providers/pop3/camel-pop3-store.c:391
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sSi us plau, introduОu la contrasenya POP3 per a %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:408
+#: camel/providers/pop3/camel-pop3-store.c:410
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3273,12 +3327,12 @@ msgstr ""
 "No es pot connectar al servidor POP.\n"
 "Error en enviar el nom d'usuari: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:411
-#: camel/providers/pop3/camel-pop3-store.c:448
+#: camel/providers/pop3/camel-pop3-store.c:413
+#: camel/providers/pop3/camel-pop3-store.c:450
 msgid "(Unknown)"
 msgstr "(Desconegut)"
 
-#: camel/providers/pop3/camel-pop3-store.c:438
+#: camel/providers/pop3/camel-pop3-store.c:440
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -3286,7 +3340,7 @@ msgstr ""
 "No es pot connectar al servidor POP.\n"
 "No hi ha suport per al mecanisme d'autenticaciС sol╥licitat."
 
-#: camel/providers/pop3/camel-pop3-store.c:446
+#: camel/providers/pop3/camel-pop3-store.c:448
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3295,12 +3349,13 @@ msgstr ""
 "No es pot connectar al servidor POP.\n"
 "Error en enviar la contrasenya: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:555
+#: camel/providers/pop3/camel-pop3-store.c:557
 #, c-format
 msgid "No such folder `%s'."
 msgstr "La carpeta `%s' no existeix."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
+#: mail/mail-config-druid.glade.h:63
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -3351,12 +3406,145 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Lliurament de correu mitjanГant el programa 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."
+#, fuzzy
+msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 "Per al lliurament de correu mitjanГant la connexiС a un concentrador de "
 "correu utilitzant SMTP."
 
+#: camel/providers/smtp/camel-smtp-transport.c:187
+#, c-format
+msgid "Welcome response error: %s: possibly non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:281
+#, fuzzy
+msgid "No authentication required"
+msgstr "AutenticaciС:"
+
+#: camel/providers/smtp/camel-smtp-transport.c:283
+#, fuzzy
+msgid ""
+"This option will connect to the SMTP server without using any kind of "
+"authentication. This should be fine for connecting to most SMTP servers."
+msgstr ""
+"Aquesta opciС us connectarЮ al sevidor POP mitjanГant una contrasenya en "
+"text net. иs l'Зnica suportada per molts servidors POP."
+
+#: 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 ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:294
+#, fuzzy
+msgid ""
+"This option will connect to the SMTP server using CRAM-MD5 authentication."
+msgstr ""
+"AixР us connectarЮ al servidor POP i utilitzarЮ el Kerberos 4 per "
+"autenticar-vos-hi."
+
+#: camel/providers/smtp/camel-smtp-transport.c:332
+#, fuzzy, c-format
+msgid "SMTP server %s"
+msgstr "Servidor %s %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:334
+#, fuzzy, c-format
+msgid "SMTP mail delivery via %s"
+msgstr "Lliurament de correu mitjanГant el programa sendmail"
+
+#: camel/providers/smtp/camel-smtp-transport.c:359
+msgid "Cannot send message: sender address not defined."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:366
+msgid "Cannot send message: sender address not valid."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:380
+msgid "Cannot send message: no recipients defined."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:474
+#, c-format
+msgid "HELO request timed out: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:490
+#, c-format
+msgid "HELO response error: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:529
+#, c-format
+msgid "MAIL FROM request timed out: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:545
+#, c-format
+msgid "MAIL FROM response error: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:570
+#, fuzzy, c-format
+msgid "RCPT TO request timed out: %s: mail not sent"
+msgstr ""
+"No s'ha pogut crear el conducte al sendmail: %s: no s'ha enviat el correu"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
+#, fuzzy, c-format
+msgid "RCPT TO response error: %s: mail not sent"
+msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
+
+#: camel/providers/smtp/camel-smtp-transport.c:617
+#, fuzzy, c-format
+msgid "DATA request timed out: %s: mail not sent"
+msgstr "No s'ha pogut executar %s: no s'ha enviat el correu."
+
+#: camel/providers/smtp/camel-smtp-transport.c:633
+#, fuzzy, c-format
+msgid "DATA response error: %s: mail not sent"
+msgstr "No s'ha pogut bifurcar el sendmail: %s: no s'ha enviat el correu"
+
+#: camel/providers/smtp/camel-smtp-transport.c:648
+#: camel/providers/smtp/camel-smtp-transport.c:666
+#, fuzzy, c-format
+msgid "DATA send timed out: message termination: %s: mail not sent"
+msgstr "El sendmail ha acabat amb el senyal %s: no s'ha enviat el correu."
+
+#: camel/providers/smtp/camel-smtp-transport.c:682
+#, c-format
+msgid "DATA response error: message termination: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:706
+#, c-format
+msgid "RSET request timed out: %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:722
+#, fuzzy, c-format
+msgid "RSET response error: %s"
+msgstr "Error desconegut: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:745
+#, c-format
+msgid "QUIT request timed out: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#, c-format
+msgid "QUIT response error: %s: non-fatal"
+msgstr ""
+
 #: camel/providers/vee/camel-vee-provider.c:30
 msgid "Virtual folder email provider"
 msgstr "ProveОdor de correu de la carpeta virtual"
@@ -3390,82 +3578,82 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:144
+#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:155
 msgid "attachment"
 msgstr "adjunciС"
 
-#: composer/e-msg-composer-attachment-bar.c:417
-#: 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 "Adjunta un fitxer"
 
-#: composer/e-msg-composer-attachment-bar.c:464 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 "Elimina"
 
-#: composer/e-msg-composer-attachment-bar.c:465
+#: composer/e-msg-composer-attachment-bar.c:461
 msgid "Remove selected items from the attachment list"
 msgstr "Elimina els elements seleccionats de la llista d'adjuncions"
 
-#: composer/e-msg-composer-attachment-bar.c:496
+#: composer/e-msg-composer-attachment-bar.c:492
 msgid "Add attachment..."
 msgstr "Afegeix una adjunciС..."
 
-#: composer/e-msg-composer-attachment-bar.c:497
+#: composer/e-msg-composer-attachment-bar.c:493
 msgid "Attach a file to the message"
 msgstr "Adjunta un fitxer al missatge"
 
 #.
-#. * 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 "Propietats de l'adjunciС"
 
-#: po/tmp/e-msg-composer-attachment.glade.h:8
+#: composer/e-msg-composer-attachment.glade.h:8
 msgid "File name:"
 msgstr "Nom del fitxer:"
 
-#: po/tmp/e-msg-composer-attachment.glade.h:9
+#: composer/e-msg-composer-attachment.glade.h:9
 msgid "MIME type:"
 msgstr "Tipus de MIME:"
 
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:290
-#: mail/mail-format.c:621
+#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:303
+#: mail/mail-format.c:626
 msgid "From:"
 msgstr "De:"
 
-#: composer/e-msg-composer-hdrs.c:238
+#: composer/e-msg-composer-hdrs.c:247
 msgid "Click here for the address book"
 msgstr "Feu clic aquМ per a la llibreta d'adreces"
 
-#: composer/e-msg-composer-hdrs.c:291
+#: composer/e-msg-composer-hdrs.c:304
 msgid "Enter the identity you wish to send this message from"
 msgstr "IntroduОu la identitat amb la qual voleu enviar aquest missatge"
 
-#: composer/e-msg-composer-hdrs.c:295 mail/mail-format.c:625
+#: composer/e-msg-composer-hdrs.c:308 mail/mail-format.c:630
 msgid "To:"
 msgstr "Per a:"
 
-#: composer/e-msg-composer-hdrs.c:296
+#: composer/e-msg-composer-hdrs.c:309
 msgid "Enter the recipients of the message"
 msgstr "IntroduОu els destinataris del missatge"
 
-#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:627
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:632
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:301
+#: composer/e-msg-composer-hdrs.c:314
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "нntroduОu les adreces que rebran una cРpia del missatge"
 
-#: composer/e-msg-composer-hdrs.c:306
+#: composer/e-msg-composer-hdrs.c:319
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:307
+#: 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."
@@ -3473,15 +3661,15 @@ msgstr ""
 "introduОu les adreces que rebran una cРpia del missatge sense aparХixer a la "
 "llista de destinataris del missatge."
 
-#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:629
+#: composer/e-msg-composer-hdrs.c:326 mail/mail-format.c:634
 msgid "Subject:"
 msgstr "Assumpte:"
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Enter the subject of the mail"
 msgstr "IntroduОu l'assumpte del correu"
 
-#: composer/e-msg-composer.c:429
+#: composer/e-msg-composer.c:430
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -3490,38 +3678,38 @@ msgstr ""
 "No s'ha pogut obrir el fitxer de signatura %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:599
+#: composer/e-msg-composer.c:600
 msgid "Save as..."
 msgstr "Anomena i desa..."
 
-#: composer/e-msg-composer.c:610
+#: composer/e-msg-composer.c:611
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: composer/e-msg-composer.c:630
+#: composer/e-msg-composer.c:631
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error en carregar el fitxer: %s"
 
-#: composer/e-msg-composer.c:652
+#: composer/e-msg-composer.c:653
 msgid "Saving changes to message..."
 msgstr "S'estan desant els canvis al missatge..."
 
-#: composer/e-msg-composer.c:654
+#: composer/e-msg-composer.c:655
 msgid "Save changes to message..."
 msgstr "Desa els canvis al missatge..."
 
-#: composer/e-msg-composer.c:695
+#: composer/e-msg-composer.c:696
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr "Error en desar la redacciС a 'Esborranys': %s"
 
-#: composer/e-msg-composer.c:739 shell/e-shell-view-menu.c:170
+#: composer/e-msg-composer.c:741 shell/e-shell-view-menu.c:167
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:745
+#: composer/e-msg-composer.c:747
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3531,27 +3719,27 @@ msgstr ""
 "\n"
 "Voleu desar-ne els canvis?"
 
-#: composer/e-msg-composer.c:767
+#: composer/e-msg-composer.c:772
 msgid "Open file"
 msgstr "Obre un fitxer"
 
-#: composer/e-msg-composer.c:893
+#: composer/e-msg-composer.c:898
 msgid "That file does not exist."
 msgstr "Aquest fitxer no existeix."
 
-#: composer/e-msg-composer.c:903
+#: composer/e-msg-composer.c:908
 msgid "That is not a regular file."
 msgstr "Aquest fitxer no Иs habitual."
 
-#: composer/e-msg-composer.c:913
+#: composer/e-msg-composer.c:918
 msgid "That file exists but is not readable."
 msgstr "Aquest fitxer existeix perР no es pot llegir."
 
-#: composer/e-msg-composer.c:923
+#: composer/e-msg-composer.c:928
 msgid "That file appeared accesible but open(2) failed."
 msgstr "Aquest fitxer sembla accessible perР n'ha fallat l'obertura(2)."
 
-#: composer/e-msg-composer.c:945
+#: composer/e-msg-composer.c:950
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3559,15 +3747,15 @@ msgstr ""
 "El fitxer Иs molt gran (mИs de 100 kB).\n"
 "Segur que voleu inserir-lo?"
 
-#: composer/e-msg-composer.c:966
+#: composer/e-msg-composer.c:971
 msgid "An error occurred while reading the file."
 msgstr "S'ha produОt un error en llegir el fitxer."
 
-#: composer/e-msg-composer.c:1343
+#: composer/e-msg-composer.c:1350
 msgid "Compose a message"
 msgstr "Redacta un missatge"
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1427
 msgid "Could not create composer window."
 msgstr "No s'ha pogut crear la finestra del redactor."
 
@@ -3582,14 +3770,26 @@ msgid "Sear_ch"
 msgstr "Cerca"
 
 #: filter/filter-datespec.c:62
+msgid "year"
+msgstr "any"
+
+#: filter/filter-datespec.c:62
 msgid "years"
 msgstr "anys"
 
 #: filter/filter-datespec.c:63
+msgid "month"
+msgstr "mes"
+
+#: filter/filter-datespec.c:63
 msgid "months"
 msgstr "mesos"
 
 #: filter/filter-datespec.c:64
+msgid "week"
+msgstr "setmana"
+
+#: filter/filter-datespec.c:64
 msgid "weeks"
 msgstr "setmanes"
 
@@ -3598,14 +3798,26 @@ msgid "days"
 msgstr "dies"
 
 #: filter/filter-datespec.c:66
+msgid "hour"
+msgstr "hora"
+
+#: filter/filter-datespec.c:66
 msgid "hours"
 msgstr "hores"
 
 #: filter/filter-datespec.c:67
+msgid "minute"
+msgstr "minut"
+
+#: filter/filter-datespec.c:67
 msgid "minutes"
 msgstr "minuts"
 
 #: filter/filter-datespec.c:68
+msgid "second"
+msgstr "segon"
+
+#: filter/filter-datespec.c:68
 msgid "seconds"
 msgstr "segons"
 
@@ -3663,6 +3875,10 @@ msgstr "una hora relativa a l'actual"
 msgid "Compare against"
 msgstr "Compara-la amb"
 
+#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
+msgid "now"
+msgstr "ara"
+
 #: filter/filter-datespec.c:690
 msgid "<click here to select a date>"
 msgstr "<feu clic aquМ per seleccionar una data>"
@@ -3686,7 +3902,7 @@ msgstr ""
 msgid "outgoing"
 msgstr "Agrupament"
 
-#: 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 "Filtres d'ediciС"
 
@@ -3721,7 +3937,7 @@ msgstr "IntroduОu l'URI de la carpeta"
 msgid "<click here to select a folder>"
 msgstr "<feu clic aquМ per seleccionar una carpeta>"
 
-#: filter/filter-input.c:184
+#: filter/filter-input.c:185
 #, fuzzy, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -3730,240 +3946,251 @@ msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: filter/filter-message-search.c:379 filter/filter-message-search.c:447
+#: filter/filter-message-search.c:380 filter/filter-message-search.c:448
 #, c-format
 msgid "Failed to perform regex search on message header: %s"
 msgstr ""
 
-#: filter/filter-part.c:456
+#: filter/filter-part.c:467
 msgid "Test"
 msgstr "Comprova"
 
-#: filter/filter-rule.c:520
+#: filter/filter-rule.c:530
 msgid "Rule name: "
 msgstr "Nom de la regla: "
 
-#: filter/filter-rule.c:524
+#: filter/filter-rule.c:534
 msgid "Untitled"
 msgstr "Sense tМtol"
 
-#: filter/filter-rule.c:540
+#: filter/filter-rule.c:550
 msgid "If"
 msgstr "Si"
 
-#: filter/filter-rule.c:557
+#: filter/filter-rule.c:567
 msgid "Execute actions"
 msgstr "Executa les accions"
 
-#: filter/filter-rule.c:561
+#: filter/filter-rule.c:571
 msgid "if all criteria are met"
 msgstr "si es compleixen tots els criteris"
 
-#: filter/filter-rule.c:566
+#: filter/filter-rule.c:576
 msgid "if any criteria are met"
 msgstr "si es compleix qualsevol criteri"
 
-#: filter/filter-rule.c:577
+#: filter/filter-rule.c:587
 msgid "Add criterion"
 msgstr "Afegeix un criteri"
 
-#: filter/filter-rule.c:583
+#: filter/filter-rule.c:593
 msgid "Remove criterion"
 msgstr "Elimina un criteri"
 
-#: mail/folder-browser.c:465 po/tmp/filter.glade.h:8
-#: po/tmp/mail-config.glade.h:9
-msgid "Edit"
-msgstr "Edita"
+#: filter/filter-system-flag.c:63
+#, fuzzy
+msgid "Replied to"
+msgstr "Respon a tots"
+
+#. { _("Deleted"), "Deleted" },
+#. { _("Draft"), "Draft" },
+#: filter/filter-system-flag.c:66
+msgid "Important"
+msgstr ""
 
-#: po/tmp/filter.glade.h:10
+#: filter/filter-system-flag.c:67
+#, fuzzy
+msgid "Read"
+msgstr "RЮdio"
+
+#: filter/filter.glade.h:10
 msgid "Edit VFolders"
 msgstr "Edita les VFolders"
 
-#: po/tmp/filter.glade.h:11
+#: filter/filter.glade.h:11
 msgid "Filter Rules"
 msgstr "Regles del filtre"
 
-#: po/tmp/filter.glade.h:12
+#: filter/filter.glade.h:12
 #, fuzzy
 msgid "Incoming"
 msgstr ""
 "Entrant\n"
 "Sortint\n"
 
-#: po/tmp/filter.glade.h:13
+#: filter/filter.glade.h:13
 #, fuzzy
 msgid "Outgoing"
 msgstr "Contorn:"
 
-#: po/tmp/filter.glade.h:15
+#: filter/filter.glade.h:15
 msgid "Virtual Folders"
 msgstr "Carpetes virtuals"
 
-#: po/tmp/filter.glade.h:16
+#: filter/filter.glade.h:16
 msgid "vFolder Sources"
 msgstr "Fonts de la vFolder"
 
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
+msgid "after"
+msgstr "desprИs de"
+
+#: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr "Assigna un color"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Assigna una puntuaciС"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
+msgid "before"
+msgstr "abans de"
+
+#: filter/libfilter-i18n.h:6
+msgid "contains"
+msgstr "contИ"
+
+#: filter/libfilter-i18n.h:7
 msgid "Copy to Folder"
 msgstr "Copia a la carpeta"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "Data de recepciС"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "Data d'enviament"
 
-#: filter/libfilter-i18n.h:8
-msgid "Expression"
-msgstr "ExpressiС"
-
-#: filter/libfilter-i18n.h:9
-msgid "Forward to Address"
-msgstr "Reenvia-ho a l'adreГa"
-
-#: filter/libfilter-i18n.h:10
-msgid "Message Body"
-msgstr "Cos del missatge"
-
 #: filter/libfilter-i18n.h:11
-#, fuzzy
-msgid "Message Header"
-msgstr "Cos del missatge"
+msgid "does not contain"
+msgstr "no contИ"
 
 #: filter/libfilter-i18n.h:12
-msgid "Message was received"
-msgstr "S'ha rebut el missatge"
+msgid "does not end with"
+msgstr "no acaba amb "
 
 #: filter/libfilter-i18n.h:13
-msgid "Message was sent"
-msgstr "S'ha enviat el missatge"
+msgid "does not exist"
+msgstr "no existeix"
 
 #: filter/libfilter-i18n.h:14
-msgid "Move to Folder"
-msgstr "Mou a la carpeta"
+#, fuzzy
+msgid "does not sound like"
+msgstr "no acaba amb "
+
+#: filter/libfilter-i18n.h:15
+msgid "does not start with"
+msgstr "no comenГa per"
 
 #: filter/libfilter-i18n.h:16
-msgid "Recipients"
-msgstr "Destinataris"
+msgid "ends with"
+msgstr "acaba amb"
 
 #: filter/libfilter-i18n.h:17
-msgid "Regex Match"
-msgstr ""
+msgid "exists"
+msgstr "existeix"
 
 #: filter/libfilter-i18n.h:18
-msgid "Sender"
-msgstr "Remitent"
+msgid "Expression"
+msgstr "ExpressiС"
 
 #: filter/libfilter-i18n.h:19
-#, fuzzy
-msgid "Set Status"
-msgstr "Estat de la connexiС"
+msgid "Forward to Address"
+msgstr "Reenvia-ho a l'adreГa"
 
 #: filter/libfilter-i18n.h:20
-msgid "Source"
-msgstr "Font"
+msgid "is"
+msgstr "Иs"
 
 #: filter/libfilter-i18n.h:21
-msgid "Specific header"
-msgstr "Especifiqueu la capГalera"
+msgid "is greater than"
+msgstr "Иs mИs gran que"
 
 #: filter/libfilter-i18n.h:22
-#, fuzzy
-msgid "Status"
-msgstr "_Estat:"
+msgid "is less than"
+msgstr "Иs mИs petit que"
 
 #: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
-msgstr "Atura el processament"
+msgid "is not"
+msgstr "no Иs"
 
 #: filter/libfilter-i18n.h:24
-msgid "Subject"
-msgstr "Assumpte"
+msgid "Message Body"
+msgstr "Cos del missatge"
 
 #: filter/libfilter-i18n.h:25
-msgid "after"
-msgstr "desprИs de"
+#, fuzzy
+msgid "Message Header"
+msgstr "Cos del missatge"
 
 #: filter/libfilter-i18n.h:26
-msgid "before"
-msgstr "abans de"
+msgid "Message was received"
+msgstr "S'ha rebut el missatge"
 
 #: filter/libfilter-i18n.h:27
-msgid "contains"
-msgstr "contИ"
+msgid "Message was sent"
+msgstr "S'ha enviat el missatge"
 
 #: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr "no contИ"
+msgid "Move to Folder"
+msgstr "Mou a la carpeta"
 
 #: filter/libfilter-i18n.h:29
-msgid "does not end with"
-msgstr "no acaba amb "
+msgid "on or after"
+msgstr "el o desprИs del"
 
 #: filter/libfilter-i18n.h:30
-msgid "does not exist"
-msgstr "no existeix"
-
-#: filter/libfilter-i18n.h:31
-#, fuzzy
-msgid "does not sound like"
-msgstr "no acaba amb "
+msgid "on or before"
+msgstr "el o abans del"
 
 #: filter/libfilter-i18n.h:32
-msgid "does not start with"
-msgstr "no comenГa per"
+msgid "Recipients"
+msgstr "Destinataris"
 
 #: filter/libfilter-i18n.h:33
-msgid "ends with"
-msgstr "acaba amb"
+msgid "Regex Match"
+msgstr ""
 
 #: filter/libfilter-i18n.h:34
-msgid "exists"
-msgstr "existeix"
+msgid "Sender"
+msgstr "Remitent"
 
 #: filter/libfilter-i18n.h:35
-msgid "is greater than"
-msgstr "Иs mИs gran que"
+#, fuzzy
+msgid "Set Status"
+msgstr "Estat de la connexiС"
 
 #: filter/libfilter-i18n.h:36
-msgid "is less than"
-msgstr "Иs mИs petit que"
+msgid "sounds like"
+msgstr ""
 
 #: filter/libfilter-i18n.h:37
-msgid "is not"
-msgstr "no Иs"
+msgid "Source"
+msgstr "Font"
 
 #: filter/libfilter-i18n.h:38
-msgid "is"
-msgstr "Иs"
+msgid "Specific header"
+msgstr "Especifiqueu la capГalera"
 
 #: filter/libfilter-i18n.h:39
-msgid "on or after"
-msgstr "el o desprИs del"
+msgid "starts with"
+msgstr "comenГa per"
 
 #: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr "el o abans del"
+#, fuzzy
+msgid "Status"
+msgstr "_Estat:"
 
 #: filter/libfilter-i18n.h:41
-msgid "sounds like"
-msgstr ""
+msgid "Stop Processing"
+msgstr "Atura el processament"
 
 #: filter/libfilter-i18n.h:42
-msgid "starts with"
-msgstr "comenГa per"
+msgid "Subject"
+msgstr "Assumpte"
 
 #: filter/libfilter-i18n.h:43
 msgid "was after"
@@ -3993,143 +4220,225 @@ msgstr "Afegeix una regla de la VFolder"
 msgid "Edit VFolder Rule"
 msgstr "Edita una regla de la VFolder"
 
-#: mail/component-factory.c:227
+#: mail/component-factory.c:277
 msgid "Cannot initialize Evolution's mail component."
 msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
-#: mail/component-factory.c:266
+#: mail/component-factory.c:316
 msgid "Cannot register storage with shell"
 msgstr "No es pot registrar l'emmagatzemament amb l'intХrpret d'ordres"
 
-#: mail/folder-browser.c:140 po/tmp/evolution-event-editor.xml.h:88
-#: po/tmp/evolution-message-composer.xml.h:16
+#: mail/folder-browser.c:223 ui/evolution-event-editor.xml.h:88
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "Desa"
 
-#: mail/folder-browser.c:153
+#: mail/folder-browser.c:236
 msgid "Body or subject contains"
 msgstr "El cos o l'assumpte contenen"
 
-#: mail/folder-browser.c:154
+#: mail/folder-browser.c:237
 msgid "Body contains"
 msgstr "El cos contИ"
 
-#: mail/folder-browser.c:155
+#: mail/folder-browser.c:238
 msgid "Subject contains"
 msgstr "L'assumpte contИ"
 
-#: mail/folder-browser.c:156
+#: mail/folder-browser.c:239
 msgid "Body does not contain"
 msgstr "El cos no contИ"
 
-#: mail/folder-browser.c:157
+#: mail/folder-browser.c:240
 msgid "Subject does not contain"
 msgstr "L'assumpte no contИ"
 
-#: mail/folder-browser.c:453
+#: mail/folder-browser.c:643
 msgid "VFolder on Subject"
 msgstr "VFolder sobre l'assumpte"
 
-#: mail/folder-browser.c:454
+#: mail/folder-browser.c:644
 msgid "VFolder on Sender"
 msgstr "VFolder sobre el remitent"
 
-#: mail/folder-browser.c:455
+#: mail/folder-browser.c:645
 msgid "VFolder on Recipients"
 msgstr "VFolder sobre els destinataris"
 
-#: mail/folder-browser.c:457
+#: mail/folder-browser.c:647
 msgid "Filter on Subject"
 msgstr "Filtre sobre l'assumpte"
 
-#: mail/folder-browser.c:458
+#: mail/folder-browser.c:648
 msgid "Filter on Sender"
 msgstr "Filtre sobre el remitent"
 
-#: mail/folder-browser.c:459
+#: mail/folder-browser.c:649
 msgid "Filter on Recipients"
 msgstr "Filtre sobre els destinataris"
 
-#: mail/folder-browser.c:460 mail/folder-browser.c:544
+#: mail/folder-browser.c:650 mail/folder-browser.c:779
 msgid "Filter on Mailing List"
 msgstr "Filtre sobre la llista de correu"
 
-#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:14
+#: mail/folder-browser.c:655
+#, fuzzy
+msgid "Show all hidden"
+msgstr "Mostra"
+
+#: mail/folder-browser.c:657
+msgid "Hide selected"
+msgstr ""
+
+#. could use another mask, but not enough api do to it
+#: mail/folder-browser.c:660
+#, fuzzy
+msgid "Hide read"
+msgstr "Amaga"
+
+#: mail/folder-browser.c:661
+#, fuzzy
+msgid "Hide deleted"
+msgstr "Suprimeix"
+
+#: mail/folder-browser.c:663 mail/folder-browser.c:790
+#, fuzzy
+msgid "Hide Subject"
+msgstr "Assumpte"
+
+#: mail/folder-browser.c:665 mail/folder-browser.c:796
+#, fuzzy
+msgid "Hide from Sender"
+msgstr "Filtre sobre el remitent"
+
+#: mail/folder-browser.c:670 ui/evolution-message-composer.xml.h:15
 #, fuzzy
 msgid "Open"
 msgstr "_Obre"
 
-#: mail/folder-browser.c:466
+#: mail/folder-browser.c:672
 #, fuzzy
 msgid "Save As..."
 msgstr "Anomena i desa..."
 
-#: mail/folder-browser.c:467 mail/mail-view.c:163
-#: po/tmp/evolution-addressbook.xml.h:13 po/tmp/evolution-calendar.xml.h:23
-#: po/tmp/evolution-mail.xml.h:28
+#: 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 "Imprimeix"
 
-#: mail/folder-browser.c:469
+#: mail/folder-browser.c:675
 msgid "Reply to Sender"
 msgstr "Respon al remitent"
 
-#: mail/folder-browser.c:470 mail/mail-view.c:156
-#: po/tmp/evolution-mail.xml.h:34
+#: mail/folder-browser.c:676 mail/mail-view.c:141 ui/evolution-mail.xml.h:38
 msgid "Reply to All"
 msgstr "Respon a tots"
 
-#: mail/folder-browser.c:471 mail/mail-view.c:159
-#: 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 "Reenvia"
 
-#: mail/folder-browser.c:472 po/tmp/evolution-mail.xml.h:18
+#: mail/folder-browser.c:678 ui/evolution-mail.xml.h:18
 #, fuzzy
 msgid "Forward inline"
 msgstr "VИs endavant en el temps"
 
-#: mail/folder-browser.c:474
+#: mail/folder-browser.c:680
 #, fuzzy
 msgid "Mark as Read"
 msgstr "Mar_ca'l com a llegit"
 
-#: mail/folder-browser.c:475
+#: mail/folder-browser.c:681
 #, fuzzy
 msgid "Mark as Unread"
 msgstr "Marca'l com a per _llegir"
 
-#: mail/folder-browser.c:477
+#: mail/folder-browser.c:683
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "Mou a la carpeta"
 
-#: mail/folder-browser.c:478
+#: mail/folder-browser.c:684
 #, fuzzy
 msgid "Copy to Folder..."
 msgstr "Copia a la carpeta"
 
-#: mail/folder-browser.c:480
+#: mail/folder-browser.c:686
 #, fuzzy
 msgid "Undelete"
 msgstr "Suprimeix"
 
 #. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
 #. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:484
+#: mail/folder-browser.c:690
 #, fuzzy
 msgid "Apply Filters"
 msgstr "_Aplica els filtres"
 
-#: mail/folder-browser.c:486 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:546
+#: mail/folder-browser.c:693 ui/evolution-mail.xml.h:21
+#, fuzzy
+msgid "Hide Messages"
+msgstr "Mou el missatge"
+
+#: mail/folder-browser.c:781
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
 
+#: mail/folder-browser.c:787
+#, fuzzy, c-format
+msgid "Hide Subject \"%s\""
+msgstr "Assumpte"
+
+#: 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 "No s'ha pogut iniciar el wombat"
+
+#: mail/local-config.glade.h:7
+#, fuzzy
+msgid "Mailbox Format"
+msgstr "Format"
+
+#: mail/local-config.glade.h:8
+#, fuzzy
+msgid "New store format:"
+msgstr "Tipus de font de notМcies:"
+
+#: 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
+#, fuzzy
+msgid "mh"
+msgstr "h"
+
 #: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
@@ -4190,7 +4499,7 @@ msgstr "No heu definit cap mХtode de transport de correu"
 msgid "You have no Outbox configured"
 msgstr "No teniu configurada cap bЗstia de sortida"
 
-#: mail/mail-callbacks.c:246
+#: mail/mail-callbacks.c:244
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -4198,19 +4507,24 @@ msgstr ""
 "Aquest missatge no tИ cap assumpte.\n"
 "Voleu que l'enviО igualment?"
 
-#: mail/mail-callbacks.c:291
+#: mail/mail-callbacks.c:312
 msgid "You must specify recipients in order to send this message."
 msgstr "Cal que indiqueu els destinataris per poder enviar aquest missatge."
 
-#: mail/mail-callbacks.c:552
+#: mail/mail-callbacks.c:530
+#, fuzzy
+msgid "Forwarded message:\n"
+msgstr "Missatge reenviat - %s"
+
+#: mail/mail-callbacks.c:611
 msgid "Move message(s) to"
 msgstr "Mou el(s) missatge(s) cap a"
 
-#: mail/mail-callbacks.c:554
+#: mail/mail-callbacks.c:613
 msgid "Copy message(s) to"
 msgstr "Copia el(s) missatge(s) a"
 
-#: mail/mail-callbacks.c:665
+#: mail/mail-callbacks.c:748
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4218,11 +4532,11 @@ msgstr ""
 "NomИs podeu editar els missatges que s'hagin desat\n"
 "a la carpeta Esborranys."
 
-#: mail/mail-callbacks.c:699 mail/mail-display.c:72
+#: mail/mail-callbacks.c:781 mail/mail-display.c:79
 msgid "Overwrite file?"
 msgstr "Voleu sobreescriure el fitxer?"
 
-#: mail/mail-callbacks.c:703 mail/mail-display.c:76
+#: mail/mail-callbacks.c:785 mail/mail-display.c:83
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -4230,17 +4544,17 @@ msgstr ""
 "Ja existeix una fitxer amb aquest nom.\n"
 "El voleu sobreescriure?"
 
-#: mail/mail-callbacks.c:748
+#: mail/mail-callbacks.c:830
 #, fuzzy
 msgid "Save Message As..."
 msgstr "Anomena i desa..."
 
-#: mail/mail-callbacks.c:750
+#: mail/mail-callbacks.c:832
 #, fuzzy
 msgid "Save Messages As..."
 msgstr "Anomena i desa..."
 
-#: mail/mail-callbacks.c:877
+#: mail/mail-callbacks.c:916
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4249,45 +4563,276 @@ msgstr ""
 "Error en carregar la informaciС del filtre:\n"
 "%s"
 
-#: mail/mail-callbacks.c:922
+#: mail/mail-callbacks.c:961
 msgid "Print Message"
 msgstr "Imprimeix el missatge"
 
-#: mail/mail-callbacks.c:969
+#: mail/mail-callbacks.c:1008
 msgid "Printing of message failed"
 msgstr "Ha fallat la impressiС del missatge"
 
 #.
-#. * 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 "Cap informaciС"
+
+#: mail/mail-config-druid.glade.h:8
+msgid "Account Management"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:9
+#, fuzzy
+msgid "Account Properties"
+msgstr "Propietats de l'adjunciС"
+
+#: mail/mail-config-druid.glade.h:11
+#, fuzzy
+msgid "Advanced"
+msgstr "Afegeix..."
+
+#: mail/mail-config-druid.glade.h:12
+#, fuzzy
+msgid "Authentication"
+msgstr "AutenticaciС:"
+
+#: mail/mail-config-druid.glade.h:13
+#, fuzzy
+msgid "Authentication Type:"
+msgstr "AutenticaciС:"
+
+#: 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 "Valors predeterminats"
+
+#: mail/mail-config-druid.glade.h:26
+#, fuzzy
+msgid "Delete mail from server"
+msgstr "No suprimeixis els missatges del servidor"
+
+#: mail/mail-config-druid.glade.h:27
+#, fuzzy
+msgid "Done"
+msgstr "Cap"
+
+#: mail/mail-config-druid.glade.h:28
+#, fuzzy
+msgid "E-Mail Address:"
+msgstr "AdreГa electrРnica:"
+
+#: mail/mail-config-druid.glade.h:30
+#, fuzzy
+msgid "Email Address:"
+msgstr "AdreГa electrРnica:"
+
+#: mail/mail-config-druid.glade.h:31
+#, fuzzy
+msgid "Evolution Mail Configuration"
+msgstr "ConfiguraciС del correu"
+
+#: mail/mail-config-druid.glade.h:32
+#, fuzzy
+msgid "Full Name:"
+msgstr "Nom complet:"
+
+#: mail/mail-config-druid.glade.h:35
+#, fuzzy
+msgid "Hostname:"
+msgstr "Nom d'usuari:"
+
+#: mail/mail-config-druid.glade.h:36
+#, fuzzy
+msgid "IMAP"
+msgstr "IMAPv4"
+
+#: mail/mail-config-druid.glade.h:37
 msgid "Identity"
 msgstr "Identitat"
 
-#: 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
+msgid "Kerberos"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:40
+#, fuzzy
+msgid "Mail"
+msgstr "_Correu"
+
+#: mail/mail-config-druid.glade.h:41
+#, fuzzy
+msgid "Mail Account"
+msgstr "contИ"
+
+#: mail/mail-config-druid.glade.h:42
 msgid "Mail Configuration"
 msgstr "ConfiguraciС del correu"
 
-#: po/tmp/mail-config-druid.glade.h:8
-msgid "Mail Source"
-msgstr "Font del correu"
+#: mail/mail-config-druid.glade.h:43
+#, fuzzy
+msgid "Mail Configuration Druid"
+msgstr "ConfiguraciС del correu"
+
+#: mail/mail-config-druid.glade.h:44
+msgid "Make this my default account"
+msgstr ""
 
-#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
-msgid "Mail Transport"
-msgstr "Transport de correu"
+#: mail/mail-config-druid.glade.h:46
+#, fuzzy
+msgid "News"
+msgstr "Nou"
+
+#: mail/mail-config-druid.glade.h:48
+#, fuzzy
+msgid "Optional"
+msgstr "Opcions"
+
+#: mail/mail-config-druid.glade.h:49 mail/mail-config-gui.c:485
+msgid "Organization:"
+msgstr "OrganitzaciС:"
+
+#: mail/mail-config-druid.glade.h:50
+msgid "Outgoing Mail Server"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:51
+#, fuzzy
+msgid "Password:"
+msgstr "Contrasenya"
+
+#: mail/mail-config-druid.glade.h:53
+msgid "Plain Text"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:54
+msgid "Receiving Email"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:55
+msgid "Remember my password"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:56 mail/mail-format.c:628
+#, fuzzy
+msgid "Reply-To:"
+msgstr "Respon"
+
+#: mail/mail-config-druid.glade.h:57
+#, fuzzy
+msgid "Reply-to:"
+msgstr "Respon"
+
+#: mail/mail-config-druid.glade.h:58
+#, fuzzy
+msgid "Required"
+msgstr "Persones _requerides"
+
+#: mail/mail-config-druid.glade.h:60
+#, fuzzy
+msgid "Save password"
+msgstr "Desa com a VCard"
+
+#: mail/mail-config-druid.glade.h:61
+#, fuzzy
+msgid "Select signature file"
+msgstr "Fitxer de signatura:"
+
+#: mail/mail-config-druid.glade.h:62
+#, fuzzy
+msgid "Sending Email"
+msgstr "Sendmail"
 
-#: po/tmp/mail-config-druid.glade.h:10
-msgid "Welcome to the Evolution Mail configuration wizard!\n"
+#: mail/mail-config-druid.glade.h:64
+#, fuzzy
+msgid "Server Configuration"
+msgstr "ConfiguraciС del correu"
+
+#: mail/mail-config-druid.glade.h:65
+msgid "Server Timeouts"
 msgstr ""
 
-#: po/tmp/mail-config-druid.glade.h:14
+#: mail/mail-config-druid.glade.h:66
+#, fuzzy
+msgid "Server Type: "
+msgstr "Servidor:"
+
+#: mail/mail-config-druid.glade.h:67
+msgid "Server requires authentication"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:68
+#, fuzzy
+msgid "Servers"
+msgstr "Servidor:"
+
+#: mail/mail-config-druid.glade.h:69 mail/mail-config-gui.c:496
+msgid "Signature file:"
+msgstr "Fitxer de signatura:"
+
+#: mail/mail-config-druid.glade.h:70
+#, fuzzy
+msgid "Signature:"
+msgstr "Fitxer de signatura:"
+
+#: mail/mail-config-druid.glade.h:71 mail/mail-config.glade.h:20
+msgid "Sources"
+msgstr "Fonts"
+
+#: 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 "Tipus:"
+
+#: 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 "Cap informaciС"
+
+#: mail/mail-config-druid.glade.h:77 mail/mail-config-gui.c:928
+msgid "Username:"
+msgstr "Nom d'usuari:"
+
+#: mail/mail-config-druid.glade.h:78
+msgid "Welcome to the Evolution Mail Configuration Druid.\n"
 msgstr ""
-"Ja teniu enllestida la configuraciС del correu.\n"
-"Feu clic a \"Finalitza\" per desar els nous parЮmetres"
+
+#: mail/mail-config-druid.glade.h:81
+#, fuzzy
+msgid "minute(s)"
+msgstr "minuts"
 
 #: mail/mail-config-gui.c:433
 msgid ""
@@ -4307,15 +4852,7 @@ msgstr "Nom complet:"
 msgid "Email address:"
 msgstr "AdreГa electrРnica:"
 
-#: mail/mail-config-gui.c:485
-msgid "Organization:"
-msgstr "OrganitzaciС:"
-
-#: mail/mail-config-gui.c:496
-msgid "Signature file:"
-msgstr "Fitxer de signatura:"
-
-#: 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 "Fitxer de signatura"
 
@@ -4323,26 +4860,10 @@ msgstr "Fitxer de signatura"
 msgid "Server:"
 msgstr "Servidor:"
 
-#: mail/mail-config-gui.c:928
-msgid "Username:"
-msgstr "Nom d'usuari:"
-
-#: mail/mail-config-gui.c:934
-msgid "Path:"
-msgstr "CamМ:"
-
-#: mail/mail-config-gui.c:943
-msgid "Authentication:"
-msgstr "AutenticaciС:"
-
 #: mail/mail-config-gui.c:956
 msgid "Detect supported types..."
 msgstr "Detecta els tipus suportats..."
 
-#: 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 "No suprimeixis els missatges del servidor"
@@ -4355,7 +4876,7 @@ msgstr "ParЮmetres de prova"
 msgid "Mail source type:"
 msgstr "Tipus de font del correu:"
 
-#: 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"
@@ -4390,6 +4911,20 @@ msgstr ""
 msgid "Mail transport type:"
 msgstr "Tipus de transport de correu:"
 
+#: mail/mail-config-gui.c:1183
+#, fuzzy
+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 ""
+"Seleccioneu el tipus de servidor de correu que teniu, i introduОu-ne la "
+"informaciС corresponent.\n"
+"\n"
+"Si el servidor demana autenticaciС, podeu fer clic al botС \"Detecta els "
+"tipus suportats...\" desprИs d'introduir l'altra informaciС."
+
 #: mail/mail-config-gui.c:1233
 msgid "Add Identity"
 msgstr "Afegeix una identitat"
@@ -4438,60 +4973,68 @@ msgstr "Possibilitats d'autoritzaciС de consultes de \"%s\""
 msgid "Query authorization at \"%s\""
 msgstr "AutoritzaciС de consultes a \"%s\""
 
-#: po/tmp/mail-config.glade.h:7
+#: mail/mail-config.glade.h:7
 msgid "Address"
 msgstr "AdreГa"
 
-#: po/tmp/mail-config.glade.h:10
+#: mail/mail-config.glade.h:10
 msgid "Identities"
 msgstr "Identitats"
 
-#: po/tmp/mail-config.glade.h:11
+#: mail/mail-config.glade.h:11
 msgid "Mail Sources"
 msgstr "Fonts del correu"
 
-#: po/tmp/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
+msgid "Mail Transport"
+msgstr "Transport de correu"
+
+#: mail/mail-config.glade.h:13
 msgid "Mark message as seen [ms]: "
 msgstr "Marca el missatge com a vist [ms]: "
 
-#: po/tmp/mail-config.glade.h:14
+#: mail/mail-config.glade.h:14
 msgid "News Servers"
 msgstr "Servidors de notМcies"
 
-#: po/tmp/mail-config.glade.h:15
+#: mail/mail-config.glade.h:15
 msgid "News Sources"
 msgstr "Fonts de notМcies"
 
-#: po/tmp/mail-config.glade.h:16
+#: mail/mail-config.glade.h:16
 msgid "Organization"
 msgstr "OrganitzaciС"
 
-#: po/tmp/mail-config.glade.h:18
+#: mail/mail-config.glade.h:18
 msgid "Send messages in HTML format"
 msgstr "Envia els missatges en format HTML"
 
-#: po/tmp/mail-config.glade.h:20
-msgid "Sources"
-msgstr "Fonts"
-
-#: mail/mail-crypto.c:350 mail/mail-crypto.c:452 mail/mail-crypto.c:629
+#: 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."
 msgstr "Si us plau, introduОu la vostra contrasenya PGP/GPG."
 
-#: mail/mail-crypto.c:354 mail/mail-crypto.c:456 mail/mail-crypto.c:634
+#: mail/mail-crypto.c:357 mail/mail-crypto.c:462 mail/mail-crypto.c:640
+#: mail/mail-crypto.c:785
 msgid "No password provided."
 msgstr "No s'ha indicat cap contrasenya."
 
-#: mail/mail-crypto.c:360 mail/mail-crypto.c:463 mail/mail-crypto.c:640
+#: mail/mail-crypto.c:363 mail/mail-crypto.c:469 mail/mail-crypto.c:646
+#: mail/mail-crypto.c:792 mail/mail-crypto.c:942
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "No s'ha pogut crear cap conducte a GPG/PGP: %s"
 
-#: mail/mail-crypto.c:625
+#: mail/mail-crypto.c:631 mail/mail-crypto.c:777 mail/mail-crypto.c:936
 msgid "No GPG/PGP program available."
 msgstr "No hi ha cap programa GPG/PGP disponible."
 
-#: mail/mail-display.c:90
+#: mail/mail-crypto.c:953
+#, fuzzy, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "No s'ha pogut crear el conducte: %s"
+
+#: mail/mail-display.c:98
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -4500,130 +5043,130 @@ msgstr ""
 "No s'ha pogut obrir el fitxer %s:\n"
 "%s"
 
-#: mail/mail-display.c:113
+#: mail/mail-display.c:131
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No s'han pogut escriure les dades: %s"
 
-#: mail/mail-display.c:218
+#: mail/mail-display.c:229
 msgid "Save Attachment"
 msgstr "Desa l'adjunciС"
 
-#: mail/mail-display.c:258
+#: mail/mail-display.c:269
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "No s'ha pogut crear el directori temporal: %s"
 
-#: mail/mail-display.c:300
+#: mail/mail-display.c:311
 msgid "Save to Disk..."
 msgstr "Desa al disc..."
 
-#: mail/mail-display.c:302
+#: mail/mail-display.c:313
 #, c-format
 msgid "Open in %s..."
 msgstr "Obre a %s..."
 
-#: mail/mail-display.c:304
+#: mail/mail-display.c:315
 msgid "View Inline"
 msgstr "Visualitza en lМnia"
 
-#: mail/mail-display.c:328
+#: mail/mail-display.c:339
 msgid "External Viewer"
 msgstr "Visualitzador extern"
 
-#: mail/mail-display.c:351
+#: mail/mail-display.c:362
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Visualitza en lМnia (mitjanГant %s)"
 
-#: mail/mail-display.c:355
+#: mail/mail-display.c:366
 msgid "Hide"
 msgstr "Amaga"
 
-#: mail/mail-format.c:500
+#: mail/mail-format.c:503
 #, fuzzy, c-format
 msgid "%s attachment"
 msgstr "adjunciС"
 
-#: mail/mail-format.c:623
-#, fuzzy
-msgid "Reply-To:"
-msgstr "Respon"
-
-#: mail/mail-format.c:845
+#: mail/mail-format.c:851
 msgid "No GPG/PGP support available in this copy of Evolution."
 msgstr ""
 
-#: mail/mail-format.c:857
+#: mail/mail-format.c:863
 #, fuzzy
 msgid "Encrypted message not displayed"
 msgstr "Esborra la visualitzaciС del missatge"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:869
 #, fuzzy
 msgid "Encrypted message"
 msgstr "Edita el missatge"
 
-#: mail/mail-format.c:864
+#: mail/mail-format.c:870
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1470
+#: mail/mail-format.c:1450
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1482
+#: mail/mail-format.c:1462
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1486
+#: mail/mail-format.c:1466
 #, fuzzy, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Filtre sobre la llista de correu (%s)"
 
-#: mail/mail-format.c:1520
+#: mail/mail-format.c:1500
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1525
+#: mail/mail-format.c:1505
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-format.c:1695
+#: mail/mail-format.c:1675
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr ""
 
-#: mail/mail-local.c:202
+#: mail/mail-local.c:204
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "S'estЮ convertint la carpeta \"%s\" al format \"%s\""
 
-#: mail/mail-local.c:206
+#: mail/mail-local.c:208
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Canvia la carpeta \"%s\" al format \"%s\""
 
-#: mail/mail-local.c:261
+#: mail/mail-local.c:251
+#, fuzzy
+msgid "Reconfiguring folder"
+msgstr "_Configura la carpeta"
+
+#: mail/mail-local.c:269
 msgid "Closing current folder"
 msgstr "S'estЮ tancant la carpeta actual"
 
-#: mail/mail-local.c:293
+#: mail/mail-local.c:295
 msgid "Renaming old folder and opening"
 msgstr "S'estЮ canviant el nom de la carpeta antiga i obrint-la"
 
-#: mail/mail-local.c:314
+#: mail/mail-local.c:313
 msgid "Creating new folder"
 msgstr "CreaciС d'una nova carpeta"
 
-#: mail/mail-local.c:329
+#: mail/mail-local.c:327
 msgid "Copying messages"
 msgstr "CРpia de missatges"
 
-#: mail/mail-local.c:341
+#: mail/mail-local.c:348
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -4632,7 +5175,7 @@ msgstr ""
 "No es pot desar la informaciС meta de la carpeta; probablement\n"
 "no la podreu tornar a obrir: %s"
 
-#: mail/mail-local.c:372
+#: mail/mail-local.c:379
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -4640,310 +5183,217 @@ msgstr ""
 "Si ja no podeu obrir aquesta bЗstia de correu\n"
 "potser us caldrЮ reparar-la manualment."
 
-#: mail/mail-local.c:781
+#: mail/mail-local.c:787
 #, fuzzy
 msgid "Registering local folder"
 msgstr "CreaciС d'una nova carpeta"
 
-#: mail/mail-local.c:783
+#: mail/mail-local.c:789
 #, fuzzy
 msgid "Register local folder"
 msgstr "Crea una carpeta nova"
 
-#: mail/mail-ops.c:79
+#: mail/mail-local.c:894
+#, fuzzy, c-format
+msgid ""
+"Unable to register folder '%s':\n"
+"%s"
+msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
+
+#: mail/mail-mt.c:85
+#, fuzzy, c-format
+msgid ""
+"Error while '%s':\n"
+"%s"
+msgstr ""
+"Error en `%s':\n"
+"%s"
+
+#: mail/mail-mt.c:87
+#, fuzzy, c-format
+msgid ""
+"Error while performing operation:\n"
+"%s"
+msgstr ""
+"Error en preparar-se per a %s:\n"
+"%s"
+
+#: mail/mail-mt.c:356 mail/mail-mt.c:385
+#, fuzzy
+msgid "Working"
+msgstr "S'estЮ movent"
+
+#: mail/mail-ops.c:88
 #, c-format
 msgid "Fetching email from %s"
 msgstr "S'estЮ recollint el correu des de %s"
 
-#: mail/mail-ops.c:81
+#: mail/mail-ops.c:90
 #, c-format
 msgid "Fetch email from %s"
 msgstr "Recull el correu des de %s"
 
-#: mail/mail-ops.c:331
+#: mail/mail-ops.c:335
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "No hi ha nou correu a %s."
 
-#: mail/mail-ops.c:401
+#: mail/mail-ops.c:405
 msgid "Filtering email on demand"
 msgstr "S'estЮ filtrant el correu sota demanda"
 
-#: mail/mail-ops.c:403
+#: mail/mail-ops.c:407
 msgid "Filter email on demand"
 msgstr "Filtra el correu sota demanda"
 
-#: mail/mail-ops.c:538
+#: mail/mail-ops.c:551
 #, c-format
 msgid "Sending \"%s\""
 msgstr "S'estЮ enviant \"%s\""
 
-#: mail/mail-ops.c:543
-msgid "Sending a message without a subject"
-msgstr "S'estЮ enviant el missatge sense cap asuumpte"
-
-#: mail/mail-ops.c:546
-#, c-format
-msgid "Send \"%s\""
-msgstr "Envia \"%s\""
-
-#: mail/mail-ops.c:549
-msgid "Send a message without a subject"
-msgstr "Envia un missatge sense assumpte"
+#: mail/mail-ops.c:553
+#, fuzzy
+msgid "Sending message"
+msgstr "Envia aquest missatge"
 
-#: mail/mail-ops.c:720
+#: mail/mail-ops.c:669
 msgid "Sending queue"
 msgstr "S'estЮ enviant la cua"
 
-#: mail/mail-ops.c:722
+#: mail/mail-ops.c:671
 msgid "Send queue"
 msgstr "Envia la cua"
 
-#: mail/mail-ops.c:858 mail/mail-ops.c:865
+#: mail/mail-ops.c:804 mail/mail-ops.c:811
 #, c-format
 msgid "Appending \"%s\""
 msgstr "S'estЮ afegint \"%s\""
 
-#: mail/mail-ops.c:862 mail/mail-ops.c:868
+#: mail/mail-ops.c:808 mail/mail-ops.c:814
 msgid "Appending a message without a subject"
 msgstr "S'estЮ afegint un missatge sense cap assumpte"
 
-#: mail/mail-ops.c:940
-#, c-format
-msgid "Expunging \"%s\""
-msgstr "S'estЮ esborrant \"%s\""
-
-#: mail/mail-ops.c:942
-#, c-format
-msgid "Expunge \"%s\""
-msgstr "Esborra \"%s\""
-
-#: mail/mail-ops.c:1001
+#: mail/mail-ops.c:897
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "S'estan movent els missatges des de \"%s\" cap a \"%s\""
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:899
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "S'estan copiant els missatges des de \"%s\" cap a \"%s\""
 
-#: mail/mail-ops.c:1006
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Mou els missatges des de \"%s\" cap a \"%s\""
 
-#: mail/mail-ops.c:1008
+#: mail/mail-ops.c:904
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Copia els missatges des de \"%s\" cap a \"%s\""
 
-#: mail/mail-ops.c:1039
+#: mail/mail-ops.c:935
 msgid "Moving"
 msgstr "S'estЮ movent"
 
-#: mail/mail-ops.c:1042
+#: mail/mail-ops.c:938
 msgid "Copying"
 msgstr "S'estЮ copiant"
 
-#: mail/mail-ops.c:1062
+#: mail/mail-ops.c:958
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s missatge %d de %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1141
-#, c-format
-msgid "Marking messages in folder \"%s\""
-msgstr "S'estan marcant els missatges de la carpeta \"%s\""
-
-#: mail/mail-ops.c:1144
-#, c-format
-msgid "Mark messages in folder \"%s\""
-msgstr "Marca els missatges de la carpeta \"%s\""
-
-#: mail/mail-ops.c:1175
-#, c-format
-msgid "Marking message %d of %d"
-msgstr "S'estЮ marcant el missatge %d de %d"
-
-#: mail/mail-ops.c:1295
+#: mail/mail-ops.c:1033
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1297
-#, c-format
-msgid "Scan folders in \"%s\""
-msgstr "Escaneja les carpetes de \"%s\""
-
-#: mail/mail-ops.c:1366 mail/subscribe-dialog.c:339
+#: mail/mail-ops.c:1099 mail/subscribe-dialog.c:341
 msgid "(No description)"
 msgstr "(Sense descripciС)"
 
-#: mail/mail-ops.c:1432
-#, c-format
-msgid "Attaching messages from folder \"%s\""
-msgstr "S'estan adjuntant els missatges de la carpeta \"%s\""
-
-#: mail/mail-ops.c:1435
-#, c-format
-msgid "Attach messages from \"%s\""
-msgstr "Adjunta els missatges des de \"%s\""
-
-#: mail/mail-ops.c:1535
-#, c-format
-msgid "Forwarding messages \"%s\""
-msgstr "S'estan reenviant els missatges \"%s\""
-
-#: mail/mail-ops.c:1539
-msgid "Forwarding a message without a subject"
-msgstr "S'estЮ reenviant un missatge sense cap assumpte"
-
-#: mail/mail-ops.c:1542
-#, c-format
-msgid "Forward message \"%s\""
-msgstr "Reenvia el missatge \"%s\""
-
-#: mail/mail-ops.c:1546
-msgid "Forward a message without a subject"
-msgstr "Reenvia un missatge sense cap assumpte"
-
-#: mail/mail-ops.c:1593
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "S'estЮ recuperant el missatge nЗmero %d de %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1610
-msgid ""
-"Failed to generate mime part from message while generating forwarded message."
-msgstr ""
-"No s'ha pogut generar la part mime del missatge en generar el missatge "
-"reenviat."
-
-#: mail/mail-ops.c:1665
+#: mail/mail-ops.c:1164
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-ops.c:1679
-#, fuzzy
-msgid "Forwarded message:\n"
-msgstr "Missatge reenviat - %s"
-
-#: mail/mail-ops.c:1748
-#, c-format
-msgid "Loading \"%s\""
-msgstr "S'estЮ carregant \"%s\""
-
-#: mail/mail-ops.c:1750
-#, c-format
-msgid "Load \"%s\""
-msgstr "Carrega \"%s\""
-
-#: mail/mail-ops.c:1853
-#, c-format
-msgid "Creating \"%s\""
-msgstr "S'estЮ creant \"%s\""
-
-#: mail/mail-ops.c:1855
-#, c-format
-msgid "Create \"%s\""
-msgstr "Crea \"%s\""
-
-#: mail/mail-ops.c:1903
-msgid "Exception while reporting result to shell component listener."
-msgstr ""
-"ExcepciС en informar del resultat a l'escoltador de components de "
-"l'intХrpret d'ordres."
+#: mail/mail-ops.c:1205 mail/mail-ops.c:1274
+#, fuzzy, c-format
+msgid "Opening folder %s"
+msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1949
-#, c-format
-msgid "Synchronizing \"%s\""
+#: mail/mail-ops.c:1336
+#, fuzzy
+msgid "Synchronising folder"
 msgstr "S'estЮ sincronitzant \"%s\""
 
-#: mail/mail-ops.c:1951
-#, c-format
-msgid "Synchronize \"%s\""
-msgstr "Sincronitza \"%s\""
-
-#: mail/mail-ops.c:2015
-#, c-format
-msgid "Displaying message UID \"%s\""
-msgstr "S'estЮ visualitzant l'UID del missatge \"%s\""
-
-#: mail/mail-ops.c:2018
-msgid "Clearing message display"
-msgstr "S'estЮ esborrant la visualitzaciС del missatge"
-
-#: mail/mail-ops.c:2021
-#, c-format
-msgid "Display message UID \"%s\""
-msgstr "Visualitza l'UID del missatge \"%s\""
+#: mail/mail-ops.c:1386
+#, fuzzy
+msgid "Expunging folder"
+msgstr "S'estЮ esborrant \"%s\""
 
-#: mail/mail-ops.c:2024
-msgid "Clear message display"
-msgstr "Esborra la visualitzaciС del missatge"
+#: mail/mail-ops.c:1434
+#, fuzzy, c-format
+msgid "Retrieving message %s"
+msgstr "S'estan recuperant els missatges : %s"
 
-#: mail/mail-ops.c:2137
-#, c-format
-msgid "Opening messages from folder \"%s\""
-msgstr "S'estan obrint els missatges des de la carpeta \"%s\""
+#: mail/mail-ops.c:1497
+#, fuzzy
+msgid "Retrieving messages"
+msgstr "S'estan recuperant els missatges : %s"
 
-#: mail/mail-ops.c:2140
+#: mail/mail-ops.c:1507
 #, c-format
-msgid "Open messages from \"%s\""
-msgstr "Obre els missatges des de \"%s\""
+msgid "Retrieving message number %d of %d (uid \"%s\")"
+msgstr "S'estЮ recuperant el missatge nЗmero %d de %d (uid \"%s\")"
 
-#: mail/mail-ops.c:2244
-#, c-format
-msgid "Loading %s Folder"
+#: mail/mail-ops.c:1655
+#, fuzzy, c-format
+msgid "Loading %s Folder for %s"
 msgstr "S'estЮ carregant la carpeta %s"
 
-#: mail/mail-ops.c:2246
-#, c-format
-msgid "Load %s Folder"
+#: mail/mail-ops.c:1657
+#, fuzzy, c-format
+msgid "Load %s Folder for %s"
 msgstr "Carrega la carpeta %s"
 
-#: mail/mail-ops.c:2310
-#, c-format
-msgid "Viewing messages from folder \"%s\""
-msgstr "S'estan visualitzant els missatges des de la carpeta \"%s\""
-
-#: mail/mail-ops.c:2313
-#, c-format
-msgid "View messages from \"%s\""
-msgstr "Visualitza els missatges des de \"%s\""
-
-#: mail/mail-ops.c:2339
-#, c-format
-msgid "Retrieving message %d of %d (uid \"%s\")"
-msgstr "S'estЮ recuperant el missatge %d de %d (uid \"%s\")"
-
-#: mail/mail-ops.c:2428
-#, fuzzy, c-format
-msgid "Saving messages from folder \"%s\""
-msgstr "S'estan adjuntant els missatges de la carpeta \"%s\""
+#: mail/mail-ops.c:1823
+#, fuzzy
+msgid "Saving messages"
+msgstr "CРpia de missatges"
 
-#: mail/mail-ops.c:2431
+#: mail/mail-ops.c:1902
 #, fuzzy, c-format
-msgid "Save messages from folder \"%s\""
-msgstr "S'estan obrint els missatges des de la carpeta \"%s\""
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
+msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
-#: mail/mail-ops.c:2474
+#: mail/mail-ops.c:1915
 #, fuzzy, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "S'estЮ recuperant el missatge %d de %d (uid \"%s\")"
 
+#: mail/mail-ops.c:1929
+#, fuzzy, c-format
+msgid ""
+"Error saving messages to: %s:\n"
+" %s"
+msgstr "Error en desar el fitxer: %s"
+
 #: mail/mail-search-dialogue.c:104
 #, fuzzy
 msgid "Cancel"
 msgstr "Cancel╥lat"
 
-#: mail/mail-summary.c:105 mail/mail-threads.c:728
+#: mail/mail-summary.c:110 mail/mail-threads.c:729
 msgid "Incomplete message written on pipe!"
 msgstr "S'ha escrit un missatge incomplet al conducte!"
 
-#: mail/mail-threads.c:301
+#: mail/mail-threads.c:302
 #, c-format
 msgid ""
 "Error while preparing to %s:\n"
@@ -4952,7 +5402,7 @@ msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: mail/mail-threads.c:675
+#: mail/mail-threads.c:676
 #, c-format
 msgid ""
 "Error while `%s':\n"
@@ -4961,19 +5411,19 @@ msgstr ""
 "Error en `%s':\n"
 "%s"
 
-#: mail/mail-threads.c:732
+#: mail/mail-threads.c:733
 msgid "Error reading commands from dispatching thread."
 msgstr "S'ha produОt un error en llegir les ordres de la cadena cursada."
 
-#: mail/mail-threads.c:797
+#: mail/mail-threads.c:798
 msgid "Corrupted message from dispatching thread?"
 msgstr "Missatge malmИs de la cadena cursada?"
 
-#: mail/mail-threads.c:916
+#: mail/mail-threads.c:917
 msgid "Could not create dialog box."
 msgstr "No s'ha pogut crear el quadre de diЮleg."
 
-#: mail/mail-threads.c:927
+#: mail/mail-threads.c:928
 msgid "User cancelled query."
 msgstr "Consulta cancel╥lada per l'usuari."
 
@@ -4983,12 +5433,12 @@ msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "No s'ha pogut crear la mbox temporal `%s': %s"
 
 #. Get all uids of source
-#: mail/mail-tools.c:239
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Examining %s"
 msgstr "S'estЮ examinant %s"
 
-#: mail/mail-tools.c:269
+#: mail/mail-tools.c:271
 #, c-format
 msgid ""
 "Could not read UID cache file \"%s\". You may receive duplicate messages."
@@ -4996,42 +5446,41 @@ msgstr ""
 "No s'ha pogut llegir el fitxer de la memРria cau UID \"%s\". иs possible que "
 "rebeu missatges duplicats."
 
-#. Info
-#: mail/mail-tools.c:290
+#: mail/mail-tools.c:300
 #, c-format
 msgid "Retrieving message %d of %d"
 msgstr "S'estЮ recuperant el missatge %d de %d"
 
 #. Append it to dest
-#: mail/mail-tools.c:303
+#: mail/mail-tools.c:315
 #, c-format
 msgid "Writing message %d of %d"
 msgstr "S'estЮ escrivint el missatge %d de %d"
 
-#: mail/mail-tools.c:332
+#: mail/mail-tools.c:347
 #, c-format
 msgid "Saving changes to %s"
 msgstr "S'estan desant els canvis a %s"
 
-#: mail/mail-tools.c:369
+#: mail/mail-tools.c:381
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (missatge reenviat)"
 
-#: mail/mail-tools.c:379
+#: mail/mail-tools.c:391
 msgid "Fwd: (no subject)"
 msgstr "Re: (sense assumpte)"
 
-#: mail/mail-tools.c:418
+#: mail/mail-tools.c:427
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-tools.c:420
+#: mail/mail-tools.c:429
 msgid "Forwarded message (no subject)"
 msgstr "Missatge reenviat (sense assumpte)"
 
-#: mail/mail-tools.c:523
+#: mail/mail-tools.c:530
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
@@ -5040,75 +5489,95 @@ msgstr ""
 "No es pot obrir la ubicaciС `%s':\n"
 "%s"
 
-#: mail/mail-vfolder.c:147
+#: mail/mail-vfolder.c:149
 msgid "VFolders"
 msgstr "VFolders"
 
-#: mail/mail-vfolder.c:296
+#: mail/mail-vfolder.c:298
 msgid "New VFolder"
 msgstr "Nova VFolder"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:33
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:37
 msgid "Reply"
 msgstr "Respon"
 
-#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:38
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
 msgid "Reply to the sender of this message"
 msgstr "Respon al remitent d'aquest missatge"
 
-#: mail/mail-view.c:156 po/tmp/evolution-mail.xml.h:37
+#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
 msgid "Reply to all recipients of this message"
 msgstr "Respon a tots els destinataris d'aquest missatge"
 
-#: mail/mail-view.c:159 po/tmp/evolution-mail.xml.h:19
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:19
 msgid "Forward this message"
 msgstr "Reenvia aquest missatge"
 
-#: mail/mail-view.c:163 po/tmp/evolution-mail.xml.h:32
+#: mail/mail-view.c:148 ui/evolution-mail.xml.h:36
 msgid "Print the selected message"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: mail/mail-view.c:165 po/tmp/evolution-mail.xml.h:12
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:12
 msgid "Delete this message"
 msgstr "Suprimeix aquest missatge"
 
-#: mail/message-list.c:572
+#: mail/message-list.c:590
 msgid "Unseen"
 msgstr "No vist"
 
-#: mail/message-list.c:575
+#: mail/message-list.c:593
 msgid "Seen"
 msgstr "Vist"
 
-#: mail/message-list.c:578
+#: mail/message-list.c:596
 msgid "Answered"
 msgstr "Respost"
 
-#: mail/message-list.c:846
+#: mail/message-list.c:881
 #, c-format
 msgid "[ %s ]"
 msgstr ""
 
 #. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:858 mail/message-list.c:873
+#: mail/message-list.c:893 mail/message-list.c:909
 #, c-format
 msgid "%s, et al."
 msgstr ""
 
-#: mail/message-list.c:860 mail/message-list.c:875
+#: mail/message-list.c:896 mail/message-list.c:912
 #, fuzzy
 msgid "<unknown>"
 msgstr "Desconegut"
 
-#: mail/message-list.c:2068
-msgid "Rebuilding message view"
-msgstr "S'estЮ reconstruint la visualitzaciС del missatge"
+#: mail/message-list.c:965
+msgid "?"
+msgstr "?"
 
-#: mail/message-list.c:2070
-msgid "Rebuild message view"
-msgstr "Reconstrueix la visualitzaciС del missatge"
+#: mail/message-list.c:972
+#, fuzzy
+msgid "Today %l:%M %p"
+msgstr "%I:%M %p"
+
+#: mail/message-list.c:981
+msgid "Yesterday %l:%M %p"
+msgstr ""
+
+#: mail/message-list.c:993
+#, fuzzy
+msgid "%a %l:%M %p"
+msgstr "%I:%M %p"
+
+#: mail/message-list.c:1001
+#, fuzzy
+msgid "%b %d %l:%M %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#: mail/message-list.c:1003
+#, fuzzy
+msgid "%b %d %Y"
+msgstr "%a %d %Y"
 
 #: mail/subscribe-dialog.c:139
 #, fuzzy
@@ -5125,27 +5594,27 @@ msgstr ""
 msgid "Get store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:282
+#: mail/subscribe-dialog.c:283
 #, fuzzy, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/subscribe-dialog.c:286
+#: mail/subscribe-dialog.c:287
 #, fuzzy, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "S'estan obrint els missatges des de la carpeta \"%s\""
 
-#: mail/subscribe-dialog.c:290
+#: mail/subscribe-dialog.c:291
 #, fuzzy, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr "Escaneja les carpetes de \"%s\""
 
-#: mail/subscribe-dialog.c:293
+#: mail/subscribe-dialog.c:294
 #, fuzzy, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr "S'estan obrint els missatges des de la carpeta \"%s\""
 
-#: shell/e-setup.c:112 shell/e-setup.c:183
+#: shell/e-setup.c:112 shell/e-setup.c:185
 msgid "Evolution installation"
 msgstr "Instal╥laciС de l'Evolution"
 
@@ -5163,25 +5632,25 @@ msgstr ""
 "Si us plau, feu clic a \"D'acord\" per instal╥lar els fitxers, o a "
 "\"Cancel╥la\" per sortir."
 
-#: shell/e-setup.c:155
+#: shell/e-setup.c:157
 msgid "Could not update files correctly"
 msgstr "No s'han pogut actualitzar correctament els fitxers"
 
-#: shell/e-setup.c:158 shell/e-setup.c:224
+#: shell/e-setup.c:160 shell/e-setup.c:228
 msgid "Evolution files successfully installed."
 msgstr "Els fitxers de l'Evolution s'han instal╥lat amb Хxit."
 
-#: shell/e-setup.c:187
+#: shell/e-setup.c:189
 msgid "This seems to be the first time you run Evolution."
 msgstr "Sembla que aquesta Иs la primera vegada que executeu l'Evolution."
 
-#: shell/e-setup.c:188
+#: shell/e-setup.c:190
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 "Si us plau, feu clic a \"D'acord\" per instal╥lar els fitxers d'usuari\n"
 "de l''Evolution a"
 
-#: shell/e-setup.c:205
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -5192,7 +5661,7 @@ msgstr ""
 "%s\n"
 "Error: %s"
 
-#: shell/e-setup.c:220
+#: shell/e-setup.c:224
 #, c-format
 msgid ""
 "Cannot copy files into\n"
@@ -5201,7 +5670,7 @@ msgstr ""
 "No es poden copiar els fitxers a\n"
 "`%s'."
 
-#: shell/e-setup.c:245
+#: shell/e-setup.c:249
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -5212,7 +5681,7 @@ msgstr ""
 "Si us plau, moveu-lo per permetre la instal╥laciС\n"
 "dels fitxers d'usuari de l'Evolution."
 
-#: shell/e-setup.c:257
+#: shell/e-setup.c:261
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -5248,7 +5717,7 @@ msgstr ""
 "El tipus de la carpeta seleccionada no Иs vЮlid per a\n"
 "l'operaciС sol╥licitada."
 
-#: shell/e-shell-folder-selection-dialog.c:291
+#: shell/e-shell-folder-selection-dialog.c:297
 msgid "New..."
 msgstr "Nou..."
 
@@ -5256,23 +5725,19 @@ msgstr "Nou..."
 msgid "(Untitled)"
 msgstr "(Sense tМtol)"
 
-#. you might have to call gnome_dialog_run() on the
-#. * dialog returned here, I don't remember...
-#.
-#: shell/e-shell-view-menu.c:114
+#: shell/e-shell-view-menu.c:111
 msgid "Bug buddy was not found in your $PATH."
 msgstr "No s'ha trobat el Bug Buddy en el vostre $PATH."
 
-#. same as above
-#: shell/e-shell-view-menu.c:120
+#: shell/e-shell-view-menu.c:117
 msgid "Bug buddy could not be run."
 msgstr "No es pot executar el Bug Buddy."
 
-#: shell/e-shell-view-menu.c:172
+#: shell/e-shell-view-menu.c:169
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:174
+#: shell/e-shell-view-menu.c:171
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -5282,7 +5747,7 @@ msgstr ""
 "per a correu, agenda i gestiС de contactes\n"
 "dins de l'entorn d'escriptori GNOME."
 
-#: shell/e-shell-view-menu.c:335
+#: shell/e-shell-view-menu.c:332
 msgid "Go to folder..."
 msgstr "VИs a la carpeta..."
 
@@ -5382,9 +5847,8 @@ msgstr "Elimina aquesta drecera de la barra de dreceres"
 msgid "Error saving shortcuts."
 msgstr "Error en desar les dreceres."
 
-#: po/tmp/evolution-event-editor.xml.h:125
-#: po/tmp/evolution-message-composer.xml.h:43 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 "_Visualitza"
 
@@ -5441,12 +5905,13 @@ msgid "The specified type is not supported in this storage"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
 #: shell/main.c:74
+#, fuzzy
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
-"Over the last month and a half, our focus has been on making\n"
-"Evolution usable. Many of the Evolution developers are now using\n"
+"Over the time since the past release, our focus has been on making\n"
+"Evolution usable.  Many of the Evolution developers are now using\n"
 "Evolution to read their mail full time. You could too. (Just\n"
 "be sure to keep a backup.)\n"
 "\n"
@@ -5504,1175 +5969,1195 @@ msgstr "Inhabilitat"
 msgid "Cannot initialize the Bonobo component system."
 msgstr "No es pot inicialitzar el sistema de components del Bonobo."
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-addressbook-ldap.xml.h:6
-msgid "N_ew Directory Server"
-msgstr "N_ou servidor de directori"
-
-#: po/tmp/evolution-addressbook-ldap.xml.h:7
-msgid "_Actions"
-msgstr "_Accions"
-
-#: po/tmp/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:7
 msgid "Create a new contact"
 msgstr "Crea un nou contacte"
 
-#: po/tmp/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete a contact"
 msgstr "Suprimeix un contacte"
 
-#: 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 "Cerca"
 
-#: po/tmp/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:11
 msgid "Find a contact"
 msgstr "Cerca un contacte"
 
-#: 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 "Nou"
 
-#: po/tmp/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:14
 msgid "Print contacts"
 msgstr "Imprimeix els contactes"
 
-#: po/tmp/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:15
 msgid "Stop"
 msgstr "Atura"
 
-#: po/tmp/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:16
 msgid "Stop Loading"
 msgstr "Atura la cЮrrega"
 
-#: po/tmp/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:17
 msgid "View All"
 msgstr "Visualitza'ls tots"
 
-#: po/tmp/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:18
 msgid "View all contacts"
 msgstr "Visualitza tots els contactes"
 
-#: po/tmp/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "_Addressbook Configuration..."
+msgstr "ConfiguraciС del _correu..."
+
+#: ui/evolution-addressbook.xml.h:20
 msgid "_Print Contacts..."
 msgstr "_Imprimeix els contactes..."
 
-#: po/tmp/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:21
 msgid "_Search for contacts"
 msgstr "_Cerca contactes"
 
-#: po/tmp/evolution-addressbook.xml.h:21
-#: po/tmp/evolution-event-editor.xml.h:123
+#: ui/evolution-addressbook.xml.h:22 ui/evolution-event-editor.xml.h:123
 msgid "_Tools"
 msgstr "_Eines"
 
 #.
-#. * 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 dies"
 
-#: po/tmp/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:7
 msgid "Alter preferences"
 msgstr "Modifica les preferХncies"
 
-#: po/tmp/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:8
 #, fuzzy
 msgid "Ca_lendar"
 msgstr "Agenda"
 
-#: po/tmp/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:9
 msgid "Calendar Preferences..."
 msgstr "PreferХncies de l'agenda..."
 
-#: po/tmp/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:10
 msgid "Create a new appointment"
 msgstr "Crea una nova cita"
 
-#: po/tmp/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:11
 msgid "Create a new calendar"
 msgstr "Crea una nova agenda"
 
-#: po/tmp/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:12
 msgid "Day"
 msgstr "Dia"
 
-#: po/tmp/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:13
 msgid "Go back in time"
 msgstr "VИs enrera en el temps"
 
-#: po/tmp/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:14
 msgid "Go forward in time"
 msgstr "VИs endavant en el temps"
 
-#: po/tmp/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to"
 msgstr "VИs a"
 
-#: po/tmp/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to a specific date"
 msgstr "VИs a una data concreta"
 
-#: po/tmp/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:17
 msgid "Go to present time"
 msgstr "VИs al present"
 
-#: po/tmp/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Mes"
 
-#: 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 "SegЭent"
 
-#: po/tmp/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:21
 msgid "Open a calendar"
 msgstr "Obre una agenda"
 
-#: po/tmp/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:22
 msgid "Prev"
 msgstr "Anterior"
 
-#: po/tmp/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:24
 msgid "Print this calendar"
 msgstr "Imprimeix aquest agenda"
 
-#: po/tmp/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:25
 #, fuzzy
 msgid "Save calendar as something else"
 msgstr "Deixa l'agenda com a alguna altra cosa"
 
-#: po/tmp/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 day"
 msgstr "Mostra 1 dia"
 
-#: po/tmp/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:27
 msgid "Show 1 month"
 msgstr "Mostra 1 mes"
 
-#: po/tmp/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:28
 msgid "Show 1 week"
 msgstr "Mostra 1 setmana"
 
-#: po/tmp/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr "Mostra la setmana de treball"
 
-#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:414
+#: ui/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:413
 msgid "Today"
 msgstr "Avui"
 
-#: po/tmp/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:31
 msgid "Week"
 msgstr "Setmana"
 
-#: 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 "_Nou"
 
-#: po/tmp/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:33
 msgid "_Open Calendar"
 msgstr "_Obre una agenda"
 
-#: po/tmp/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:34
 msgid "_Print this calendar"
 msgstr "_Imprimeix aquest agenda"
 
-#: po/tmp/evolution-calendar.xml.h:35
-msgid "_Save Calendar As"
-msgstr "_Anomena i desa l'agenda"
+#: ui/evolution-calendar.xml.h:35
+#, fuzzy
+msgid "_Save As..."
+msgstr "Anomena i desa..."
 
-#: po/tmp/evolution-contact-editor.xml.h:7
+#: ui/evolution-contact-editor.xml.h:7
 msgid "Delete this item"
 msgstr "Suprimeix aquest element"
 
-#: po/tmp/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:8
 #, fuzzy
 msgid "Delete..."
 msgstr "Suprimeix"
 
-#: po/tmp/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-editor.xml.h:9
 #, fuzzy
 msgid "Help"
 msgstr "_Ajuda"
 
-#: po/tmp/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:10
 #, fuzzy
 msgid "Print En_velope..."
 msgstr "Imprimeix el missatge..."
 
-#: 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 "Imprimeix aquest element"
 
-#: 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 "Imprimeix..."
 
-#: po/tmp/evolution-contact-editor.xml.h:13
-#: po/tmp/evolution-event-editor.xml.h:89
-#: po/tmp/evolution-message-composer.xml.h:18
+#: ui/evolution-contact-editor.xml.h:13 ui/evolution-event-editor.xml.h:89
+#: ui/evolution-message-composer.xml.h:21
 #, fuzzy
 msgid "Save _As..."
 msgstr "Anomena i desa..."
 
-#: 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 "Desa i tanca"
 
-#: 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 "Desa el contacte i tanca el quadre de diЮleg"
 
-#: 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 "Consulta l'ajuda en lМnia"
 
-#: po/tmp/evolution-contact-editor.xml.h:18
+#: ui/evolution-contact-editor.xml.h:18
 #, fuzzy
 msgid "Send _message to contact..."
 msgstr "FIXME: Nou _missatge per contactar"
 
-#: po/tmp/evolution-contact-editor.xml.h:19
-#: po/tmp/evolution-event-editor.xml.h:110
-#: po/tmp/evolution-message-composer.xml.h:38
-#: 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 "_Fitxer"
 
-#: po/tmp/evolution-contact-editor.xml.h:20
+#: ui/evolution-contact-editor.xml.h:20
 #, fuzzy
 msgid "_Print..."
 msgstr "Imprimeix..."
 
-#: po/tmp/evolution-contact-editor.xml.h:21
-#: po/tmp/evolution-event-editor.xml.h:121
-#: po/tmp/evolution-message-composer.xml.h:42
+#: ui/evolution-contact-editor.xml.h:21 ui/evolution-event-editor.xml.h:121
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Save"
 msgstr "_Desa"
 
 #.
-#. * 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
 #, fuzzy
 msgid "About..."
 msgstr "Lletra..."
 
-#: po/tmp/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:8
 #, fuzzy
 msgid "Actio_ns"
 msgstr "_Accions"
 
-#: po/tmp/evolution-event-editor.xml.h:9
+#: ui/evolution-event-editor.xml.h:9
 #, fuzzy
 msgid "C_lear"
 msgstr "Agenda"
 
-#: po/tmp/evolution-event-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:10
 #, fuzzy
 msgid "C_ut"
 msgstr "Personalitzat"
 
-#: po/tmp/evolution-event-editor.xml.h:11
+#: ui/evolution-event-editor.xml.h:11
 #, fuzzy
 msgid "Clear"
 msgstr "Agenda"
 
-#: po/tmp/evolution-event-editor.xml.h:12
+#: ui/evolution-event-editor.xml.h:12
 #, fuzzy
 msgid "Clear the selection"
 msgstr "_Inverteix la selecciС"
 
-#: po/tmp/evolution-event-editor.xml.h:14
+#: ui/evolution-event-editor.xml.h:14
 #, fuzzy
 msgid "Close this appointment"
 msgstr "Suprimeix aquesta cita"
 
-#: 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 "Copia"
 
-#: 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
 #, fuzzy
 msgid "Cut"
 msgstr "Personalitzat"
 
-#: 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 "FIXME: _Llibreta d'adreces..."
 
-#: po/tmp/evolution-event-editor.xml.h:24
+#: ui/evolution-event-editor.xml.h:24
 msgid "FIXME: Ch_oose Form..."
 msgstr "FIXME: Tr_ia el formulari..."
 
-#: po/tmp/evolution-event-editor.xml.h:25
+#: ui/evolution-event-editor.xml.h:25
 msgid "FIXME: Chec_k Names"
 msgstr "FIXME: Comp_rova els noms"
 
-#: po/tmp/evolution-event-editor.xml.h:26
+#: ui/evolution-event-editor.xml.h:26
 #, fuzzy
 msgid "FIXME: Cop_y to Folder..."
 msgstr "FIXME: Tr_ia el formulari..."
 
-#: po/tmp/evolution-event-editor.xml.h:27
+#: ui/evolution-event-editor.xml.h:27
 msgid "FIXME: D_esign a Form..."
 msgstr "FIXME: D_issenya un formulari..."
 
-#: po/tmp/evolution-event-editor.xml.h:28
+#: ui/evolution-event-editor.xml.h:28
 #, fuzzy
 msgid "FIXME: Define Print _Styles"
 msgstr "FIXME: Defineix els e_stils d'impressiС..."
 
-#: po/tmp/evolution-event-editor.xml.h:29
+#: ui/evolution-event-editor.xml.h:29
 msgid "FIXME: Desi_gn This Form"
 msgstr "FIXME: Diss_enya aquest formulari"
 
-#: po/tmp/evolution-event-editor.xml.h:30
+#: ui/evolution-event-editor.xml.h:30
 msgid "FIXME: Fi_rst Item in Folder"
 msgstr "FIXME: Pr_imer element de la carpeta"
 
-#: po/tmp/evolution-event-editor.xml.h:31
+#: ui/evolution-event-editor.xml.h:31
 msgid "FIXME: For_ward"
 msgstr "FIXME: Reen_via"
 
-#: po/tmp/evolution-event-editor.xml.h:32
+#: ui/evolution-event-editor.xml.h:32
 msgid "FIXME: Forward as v_Calendar"
 msgstr "FIXME: Reenvia com a v_Calendar"
 
-#: po/tmp/evolution-event-editor.xml.h:33
+#: ui/evolution-event-editor.xml.h:33
 msgid "FIXME: Help"
 msgstr "FIXME: Ajuda"
 
-#: po/tmp/evolution-event-editor.xml.h:34
+#: ui/evolution-event-editor.xml.h:34
 #, fuzzy
 msgid "FIXME: In_complete Task"
 msgstr "FIXME: _Tasca"
 
-#: po/tmp/evolution-event-editor.xml.h:35
+#: ui/evolution-event-editor.xml.h:35
 #, fuzzy
 msgid "FIXME: Insert File"
 msgstr "FIXME: Insereix el fitxer..."
 
-#: po/tmp/evolution-event-editor.xml.h:36
+#: ui/evolution-event-editor.xml.h:36
 msgid "FIXME: It_em..."
 msgstr "FIXME: El_ement..."
 
-#: po/tmp/evolution-event-editor.xml.h:37
+#: ui/evolution-event-editor.xml.h:37
 #, fuzzy
 msgid "FIXME: Paste _Special... "
 msgstr "FIXME: Enganxa e_special..."
 
-#: po/tmp/evolution-event-editor.xml.h:38
+#: ui/evolution-event-editor.xml.h:38
 msgid "FIXME: Print Pre_view"
 msgstr "FIXME: Pre_visualitzaciС de la impressiС"
 
-#: po/tmp/evolution-event-editor.xml.h:39
+#: ui/evolution-event-editor.xml.h:39
 msgid "FIXME: Pu_blish Form As..."
 msgstr "FIXME: Pu_blica el formulari com a..."
 
-#: po/tmp/evolution-event-editor.xml.h:40
+#: ui/evolution-event-editor.xml.h:40
 msgid "FIXME: Publish _Form..."
 msgstr "FIXME: Publica el _formulari..."
 
-#: po/tmp/evolution-event-editor.xml.h:41
+#: ui/evolution-event-editor.xml.h:41
 msgid "FIXME: Rec_urrence..."
 msgstr "FIXME: Rec_urrХncia..."
 
-#: po/tmp/evolution-event-editor.xml.h:42
+#: ui/evolution-event-editor.xml.h:42
 msgid "FIXME: S_end"
 msgstr "FIXME: E_nvia"
 
-#: po/tmp/evolution-event-editor.xml.h:43
+#: ui/evolution-event-editor.xml.h:43
 #, fuzzy
 msgid "FIXME: Save Attac_hments..."
 msgstr "FIXME: Invita els assistents..."
 
-#: po/tmp/evolution-event-editor.xml.h:44
+#: ui/evolution-event-editor.xml.h:44
 msgid "FIXME: Script _Debugger"
 msgstr "FIXME: _Depurador de seqЭХncies"
 
-#: po/tmp/evolution-event-editor.xml.h:45
+#: ui/evolution-event-editor.xml.h:45
 msgid "FIXME: Task _Request"
 msgstr "FIXME: _PeticiС de tasca"
 
-#: po/tmp/evolution-event-editor.xml.h:46
+#: ui/evolution-event-editor.xml.h:46
 msgid "FIXME: _Contact"
 msgstr "FIXME: _Contacte"
 
-#: po/tmp/evolution-event-editor.xml.h:47
+#: ui/evolution-event-editor.xml.h:47
 msgid "FIXME: _Customize..."
 msgstr "FIXME: _Personalitza..."
 
-#: po/tmp/evolution-event-editor.xml.h:48
+#: ui/evolution-event-editor.xml.h:48
 msgid "FIXME: _File..."
 msgstr "FIXME: _Fitxer..."
 
-#: po/tmp/evolution-event-editor.xml.h:49
+#: ui/evolution-event-editor.xml.h:49
 msgid "FIXME: _Font..."
 msgstr "FIXME: _Lletra..."
 
-#: po/tmp/evolution-event-editor.xml.h:50
+#: ui/evolution-event-editor.xml.h:50
 #, fuzzy
 msgid "FIXME: _Formatting"
 msgstr "FIXME: S'estЮ __formatant"
 
-#: po/tmp/evolution-event-editor.xml.h:51
+#: ui/evolution-event-editor.xml.h:51
 msgid "FIXME: _Item"
 msgstr "FIXME: _Element"
 
-#: po/tmp/evolution-event-editor.xml.h:52
+#: ui/evolution-event-editor.xml.h:52
 msgid "FIXME: _Journal Entry"
 msgstr "FIXME: Entrada al _diari"
 
-#: po/tmp/evolution-event-editor.xml.h:53
+#: ui/evolution-event-editor.xml.h:53
 msgid "FIXME: _Last Item in Folder"
 msgstr "FIXME: _зltim element de la carpeta"
 
-#: po/tmp/evolution-event-editor.xml.h:54
+#: ui/evolution-event-editor.xml.h:54
 msgid "FIXME: _Mail Message"
 msgstr "FIXME: Missatge de _correu"
 
-#: po/tmp/evolution-event-editor.xml.h:55
+#: ui/evolution-event-editor.xml.h:55
 msgid "FIXME: _Memo Style"
 msgstr "FIXME: Estil _memo"
 
-#: po/tmp/evolution-event-editor.xml.h:56
+#: ui/evolution-event-editor.xml.h:56
 #, fuzzy
 msgid "FIXME: _Move to Folder..."
 msgstr "_Mou a la carpeta"
 
-#: po/tmp/evolution-event-editor.xml.h:57
+#: ui/evolution-event-editor.xml.h:57
 msgid "FIXME: _New Appointment"
 msgstr "FIXME: _Nova cita"
 
-#: po/tmp/evolution-event-editor.xml.h:58
+#: ui/evolution-event-editor.xml.h:58
 msgid "FIXME: _Note"
 msgstr "FIXME: _Nota"
 
-#: po/tmp/evolution-event-editor.xml.h:59
+#: ui/evolution-event-editor.xml.h:59
 msgid "FIXME: _Object..."
 msgstr "FIXME: _Objecte..."
 
-#: po/tmp/evolution-event-editor.xml.h:60
+#: ui/evolution-event-editor.xml.h:60
 msgid "FIXME: _Paragraph..."
 msgstr "FIXME: _ParЮgraf..."
 
-#: po/tmp/evolution-event-editor.xml.h:61
+#: ui/evolution-event-editor.xml.h:61
 msgid "FIXME: _Spelling..."
 msgstr "FIXME: _Ortografia..."
 
-#: po/tmp/evolution-event-editor.xml.h:62
+#: ui/evolution-event-editor.xml.h:62
 msgid "FIXME: _Standard"
 msgstr "FIXME: E_stЮndard"
 
-#: po/tmp/evolution-event-editor.xml.h:63
+#: ui/evolution-event-editor.xml.h:63
 msgid "FIXME: _Task"
 msgstr "FIXME: _Tasca"
 
-#: po/tmp/evolution-event-editor.xml.h:64
+#: ui/evolution-event-editor.xml.h:64
 msgid "FIXME: _Unread Item"
 msgstr "FIXME: Element per _llegir"
 
-#: 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:10
+#: ui/evolution-event-editor.xml.h:66 ui/evolution-message-composer.xml.h:11
 msgid "F_ormat"
 msgstr "F_ormat"
 
-#: 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 "VИs a l'element segЭent"
 
-#: po/tmp/evolution-event-editor.xml.h:71
+#: ui/evolution-event-editor.xml.h:71
 msgid "Go to the previous item"
 msgstr "VИs a l'element anterior"
 
-#: po/tmp/evolution-event-editor.xml.h:72
+#: ui/evolution-event-editor.xml.h:72
 #, fuzzy
 msgid "Modify the file's properties"
 msgstr "Propietats de la llista de coses per fer"
 
-#: po/tmp/evolution-event-editor.xml.h:73
+#: ui/evolution-event-editor.xml.h:73
 #, fuzzy
 msgid "N_ext"
 msgstr "SegЭent"
 
-#: po/tmp/evolution-event-editor.xml.h:75
+#: ui/evolution-event-editor.xml.h:75
 msgid "Paste"
 msgstr "Enganxa"
 
-#: po/tmp/evolution-event-editor.xml.h:76
+#: ui/evolution-event-editor.xml.h:76
 #, fuzzy
 msgid "Paste the clipboard"
 msgstr "Enganxa l'element del porta-retalls"
 
-#: po/tmp/evolution-event-editor.xml.h:77
+#: ui/evolution-event-editor.xml.h:77
 msgid "Pre_vious"
 msgstr "Ant_erior"
 
-#: po/tmp/evolution-event-editor.xml.h:78
+#: ui/evolution-event-editor.xml.h:78
 #, fuzzy
 msgid "Previous"
 msgstr "Ant_erior"
 
-#: po/tmp/evolution-event-editor.xml.h:79
+#: ui/evolution-event-editor.xml.h:79
 #, fuzzy
 msgid "Print S_etup..."
 msgstr "Imprimeix..."
 
-#: po/tmp/evolution-event-editor.xml.h:80
+#: ui/evolution-event-editor.xml.h:80
 #, fuzzy
 msgid "Print Setup"
 msgstr "ConfiguraciС de la pЮgina:"
 
-#: po/tmp/evolution-event-editor.xml.h:83
+#: ui/evolution-event-editor.xml.h:83
 #, fuzzy
 msgid "Properties"
 msgstr "Propietats..."
 
-#: po/tmp/evolution-event-editor.xml.h:84
+#: ui/evolution-event-editor.xml.h:84
 #, fuzzy
 msgid "Redo"
 msgstr "RЮdio"
 
-#: po/tmp/evolution-event-editor.xml.h:85
+#: ui/evolution-event-editor.xml.h:85
 #, fuzzy
 msgid "Redo the undone action"
 msgstr "Elimina una acciС"
 
-#: po/tmp/evolution-event-editor.xml.h:86
+#: ui/evolution-event-editor.xml.h:86
 #, fuzzy
 msgid "Replace"
 msgstr "Respon"
 
-#: 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
 #, fuzzy
 msgid "Save the appointment and close the dialog box"
 msgstr "Desa el contacte i tanca el quadre de diЮleg"
 
-#: po/tmp/evolution-event-editor.xml.h:92
-#: po/tmp/evolution-message-composer.xml.h:21
+#: ui/evolution-event-editor.xml.h:92 ui/evolution-message-composer.xml.h:24
 #, fuzzy
 msgid "Save the current file"
 msgstr "l'hora actual"
 
-#: 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
 #, fuzzy
 msgid "Search for a string"
 msgstr "_Cerca contactes"
 
-#: po/tmp/evolution-event-editor.xml.h:99
+#: ui/evolution-event-editor.xml.h:99
 #, fuzzy
 msgid "Select All"
 msgstr "Selecciona'ls _tots"
 
-#: po/tmp/evolution-event-editor.xml.h:100
+#: ui/evolution-event-editor.xml.h:100
 #, fuzzy
 msgid "Select everything"
 msgstr "Seleccioneu una carpeta"
 
-#: 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:34
+#: ui/evolution-event-editor.xml.h:104 ui/evolution-message-composer.xml.h:38
 #, fuzzy
 msgid "_About..."
 msgstr "_Quant a l'Evolution..."
 
-#: po/tmp/evolution-event-editor.xml.h:105
-#: po/tmp/evolution-message-composer.xml.h:35
+#: ui/evolution-event-editor.xml.h:105 ui/evolution-message-composer.xml.h:39
 #, fuzzy
 msgid "_Close"
 msgstr "Tanca"
 
-#: po/tmp/evolution-event-editor.xml.h:106
+#: ui/evolution-event-editor.xml.h:106
 #, fuzzy
 msgid "_Copy"
 msgstr "Copia"
 
-#: po/tmp/evolution-event-editor.xml.h:107
-#: po/tmp/evolution-message-composer.xml.h:36
+#: 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:37
-#: 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 "_Edita"
 
-#: po/tmp/evolution-event-editor.xml.h:111
+#: ui/evolution-event-editor.xml.h:111
 #, fuzzy
 msgid "_Find..."
 msgstr "Cerca..."
 
-#: po/tmp/evolution-event-editor.xml.h:112
+#: ui/evolution-event-editor.xml.h:112
 msgid "_Forms"
 msgstr "_Formularis"
 
-#: po/tmp/evolution-event-editor.xml.h:113
-#: po/tmp/evolution-message-composer.xml.h:39 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 "_Ajuda"
 
-#: po/tmp/evolution-event-editor.xml.h:114
+#: ui/evolution-event-editor.xml.h:114
 #, fuzzy
 msgid "_Insert"
 msgstr "_мndex"
 
-#: po/tmp/evolution-event-editor.xml.h:115
+#: ui/evolution-event-editor.xml.h:115
 msgid "_Object"
 msgstr "_Objecte"
 
-#: po/tmp/evolution-event-editor.xml.h:116
+#: ui/evolution-event-editor.xml.h:116
 #, fuzzy
 msgid "_Paste"
 msgstr "Enganxa"
 
-#: po/tmp/evolution-event-editor.xml.h:117
+#: ui/evolution-event-editor.xml.h:117
 msgid "_Print"
 msgstr "_Imprimeix"
 
-#: po/tmp/evolution-event-editor.xml.h:118
+#: ui/evolution-event-editor.xml.h:118
 #, fuzzy
 msgid "_Properties..."
 msgstr "Propietats..."
 
-#: po/tmp/evolution-event-editor.xml.h:119
+#: ui/evolution-event-editor.xml.h:119
 #, fuzzy
 msgid "_Redo"
 msgstr "RЮdio"
 
-#: po/tmp/evolution-event-editor.xml.h:120
+#: ui/evolution-event-editor.xml.h:120
 #, fuzzy
 msgid "_Replace..."
 msgstr "_Tanca..."
 
-#: po/tmp/evolution-event-editor.xml.h:122
+#: ui/evolution-event-editor.xml.h:122
 msgid "_Toolbars"
 msgstr "_Barres d'eines"
 
-#: po/tmp/evolution-event-editor.xml.h:124
+#: ui/evolution-event-editor.xml.h:124
 #, fuzzy
 msgid "_Undo"
 msgstr "_Envia"
 
 #.
-#. * 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 "Redacta"
 
-#: po/tmp/evolution-mail.xml.h:7
+#: ui/evolution-mail.xml.h:7
 msgid "Compose a new message"
 msgstr "Redacta un nou missatge"
 
-#: po/tmp/evolution-mail.xml.h:9
+#: ui/evolution-mail.xml.h:9
 msgid "Copy message to a new folder"
 msgstr "Copia el missatge a una nova carpeta"
 
-#: 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 "C_arpeta"
 
-#: po/tmp/evolution-mail.xml.h:14
+#: ui/evolution-mail.xml.h:14
 msgid "Fi_lter on Sender"
 msgstr "Fi_ltre sobre el remitent"
 
-#: po/tmp/evolution-mail.xml.h:15
+#: ui/evolution-mail.xml.h:15
 msgid "Filter on Rec_ipients"
 msgstr "Filtre sobre els dest_inataris"
 
-#: po/tmp/evolution-mail.xml.h:16
+#: ui/evolution-mail.xml.h:16
 msgid "Forget _Passwords"
 msgstr "Oblida les _contrasenyes"
 
-#: po/tmp/evolution-mail.xml.h:20
+#: ui/evolution-mail.xml.h:20
 msgid "Get Mail"
 msgstr "Recupera el correu"
 
-#: po/tmp/evolution-mail.xml.h:21
+#: ui/evolution-mail.xml.h:22
 #, fuzzy
-msgid "Mail _Filters"
+msgid "Hide _Deleted messages"
+msgstr "Suprimeix el missatge"
+
+#: ui/evolution-mail.xml.h:23
+#, fuzzy
+msgid "Hide _Read messages"
+msgstr "Missatge reenviat - %s"
+
+#: ui/evolution-mail.xml.h:24
+#, fuzzy
+msgid "Hide _Selected messages"
+msgstr "Imprimeix el missatge seleccionat"
+
+#: ui/evolution-mail.xml.h:25
+#, fuzzy
+msgid "Mail _Filters..."
 msgstr "_Filtres de correu ..."
 
-#: po/tmp/evolution-mail.xml.h:22
+#: ui/evolution-mail.xml.h:26
 #, fuzzy
-msgid "Manage Subscriptions"
+msgid "Manage Subscriptions..."
 msgstr "Gestiona les subscripcions..."
 
-#: po/tmp/evolution-mail.xml.h:23
+#: ui/evolution-mail.xml.h:27
 msgid "Mar_k As Read"
 msgstr "Mar_ca'l com a llegit"
 
-#: po/tmp/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:28
 msgid "Mark As U_nread"
 msgstr "Marca'l com a per _llegir"
 
-#: po/tmp/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:29
 msgid "Move"
 msgstr "Mou"
 
-#: po/tmp/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:30
 msgid "Move message to a new folder"
 msgstr "Mou un missatge a una nova carpeta"
 
-#: po/tmp/evolution-mail.xml.h:27
+#: ui/evolution-mail.xml.h:31
 msgid "Previews the message to be printed"
 msgstr "Previsualitza el missatge que s'ha d'imprimir"
 
-#: po/tmp/evolution-mail.xml.h:29
+#: ui/evolution-mail.xml.h:33
 msgid "Print Preview of message..."
 msgstr "PrevisualitzaciС d'impressiС del missatge..."
 
-#: po/tmp/evolution-mail.xml.h:30
+#: ui/evolution-mail.xml.h:34
 msgid "Print message to the printer"
 msgstr "Imprimeix el missatge a la impressora"
 
-#: po/tmp/evolution-mail.xml.h:31
+#: ui/evolution-mail.xml.h:35
 msgid "Print message..."
 msgstr "Imprimeix el missatge..."
 
-#: po/tmp/evolution-mail.xml.h:35
+#: ui/evolution-mail.xml.h:39
 msgid "Reply to _All"
 msgstr "Respon a _tots"
 
-#: po/tmp/evolution-mail.xml.h:36
+#: ui/evolution-mail.xml.h:40
 msgid "Reply to _Sender"
 msgstr "Respon al _remitent"
 
-#: po/tmp/evolution-mail.xml.h:39 po/tmp/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:43 ui/evolution-subscribe.xml.h:12
 msgid "Select _All"
 msgstr "Selecciona'ls _tots"
 
-#: po/tmp/evolution-mail.xml.h:40
+#: ui/evolution-mail.xml.h:44
 msgid "Send queued mail and retrieve new mail"
 msgstr "Envia el correu de la cua i recupera'n el nou"
 
-#: po/tmp/evolution-mail.xml.h:41
+#: ui/evolution-mail.xml.h:45
+#, fuzzy
+msgid "Show _All messages"
+msgstr "Mostra"
+
+#: ui/evolution-mail.xml.h:46
 msgid "Threaded Message list"
 msgstr "Llista de missatges en cadena"
 
-#: po/tmp/evolution-mail.xml.h:42
+#: ui/evolution-mail.xml.h:47
 msgid "VFolder on Se_nder"
 msgstr "VFolder sobre el remite_nt"
 
-#: po/tmp/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:48
 msgid "VFolder on _Recipients"
 msgstr "VFolder sobre els destinata_ris"
 
-#: po/tmp/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:49
 msgid "View Raw Message Source"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:50
 msgid "_Apply Filters"
 msgstr "_Aplica els filtres"
 
-#: po/tmp/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:51
 msgid "_Configure Folder"
 msgstr "_Configura la carpeta"
 
-#: po/tmp/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:52
 #, fuzzy
 msgid "_Copy to Folder..."
 msgstr "_Copia a la carpeta"
 
-#: po/tmp/evolution-mail.xml.h:49
+#: ui/evolution-mail.xml.h:54
 msgid "_Edit Message"
 msgstr "_Edita el missatge"
 
-#: po/tmp/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:55
 msgid "_Expunge"
 msgstr "_Esborra"
 
-#: po/tmp/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:56
 msgid "_Filter on Subject"
 msgstr "_Filtre sobre l'assumpte"
 
-#: po/tmp/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:57
 msgid "_Forward"
 msgstr "_Reenvia"
 
-#: po/tmp/evolution-mail.xml.h:53 po/tmp/evolution-subscribe.xml.h:17
+#: ui/evolution-mail.xml.h:58 ui/evolution-subscribe.xml.h:17
 msgid "_Invert Selection"
 msgstr "_Inverteix la selecciС"
 
-#: po/tmp/evolution-mail.xml.h:54
-#, fuzzy
-msgid "_Mail Configuration"
-msgstr "ConfiguraciС del correu"
+#: ui/evolution-mail.xml.h:59
+msgid "_Mail Configuration..."
+msgstr "ConfiguraciС del _correu..."
 
-#: po/tmp/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:60
 msgid "_Message"
 msgstr "_Missatge"
 
-#: po/tmp/evolution-mail.xml.h:56
+#: ui/evolution-mail.xml.h:61
 #, fuzzy
 msgid "_Move to Folder..."
 msgstr "_Mou a la carpeta"
 
-#: po/tmp/evolution-mail.xml.h:57
+#: ui/evolution-mail.xml.h:62
 msgid "_Open in New Window"
 msgstr "_Obre'l en una nova finestra"
 
-#: po/tmp/evolution-mail.xml.h:58
+#: ui/evolution-mail.xml.h:63
 msgid "_Print Message"
 msgstr "_Imprimeix el missatge"
 
-#: po/tmp/evolution-mail.xml.h:59
+#: ui/evolution-mail.xml.h:64
 #, fuzzy
 msgid "_Save Message As..."
 msgstr "_Anomena i desa..."
 
-#: po/tmp/evolution-mail.xml.h:60
+#: ui/evolution-mail.xml.h:65
 #, fuzzy
 msgid "_Source"
 msgstr "Font"
 
-#: po/tmp/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:66
 msgid "_Threaded"
 msgstr "_En cadena"
 
-#: po/tmp/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:67
 #, fuzzy
 msgid "_Undelete"
 msgstr "_Suprimeix"
 
-#: po/tmp/evolution-mail.xml.h:63
+#: ui/evolution-mail.xml.h:68
 msgid "_VFolder on Subject"
 msgstr "_VFolder sobre l'assumpte"
 
-#: po/tmp/evolution-mail.xml.h:64
+#: ui/evolution-mail.xml.h:69
 #, fuzzy
-msgid "_Virtual Folder Editor"
+msgid "_Virtual Folder Editor..."
 msgstr "Editor de carpetes _virtuals..."
 
 #.
-#. * 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 "Adjunta"
 
-#: po/tmp/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:9
 #, fuzzy
 msgid "Close the current file"
 msgstr "l'hora actual"
 
-#: po/tmp/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Encrypt this message with PGP"
+msgstr "Edita el missatge"
+
+#: ui/evolution-message-composer.xml.h:12
 msgid "HTML"
 msgstr "HTML"
 
-#: po/tmp/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:13
 msgid "Insert a file as text into the message"
 msgstr "Insereix un fitxer com a text dins del missatge"
 
-#: po/tmp/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:14
 #, fuzzy
 msgid "Insert text file..."
 msgstr "_Insereix el fitxer de text... (FIXME)"
 
-#: po/tmp/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:16
 #, fuzzy
 msgid "Open a file"
 msgstr "Obre un fitxer"
 
-#: po/tmp/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:17
+msgid "PGP Encrypt"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:18
+msgid "PGP Sign"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:20
 #, fuzzy
 msgid "Save As"
 msgstr "_Anomena i desa"
 
-#: po/tmp/evolution-message-composer.xml.h:19
+#: ui/evolution-message-composer.xml.h:22
 #, fuzzy
 msgid "Save in _folder... (FIXME)"
 msgstr "Desa a la _carpeta..."
 
-#: po/tmp/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:23
 #, fuzzy
 msgid "Save in folder..."
 msgstr "Desa a la _carpeta..."
 
-#: po/tmp/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "Desa el missatge a una carpeta determinada"
 
-#: po/tmp/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:27
 #, fuzzy
 msgid "Send"
 msgstr "_Envia"
 
-#: po/tmp/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:28
 #, fuzzy
 msgid "Send _Later"
 msgstr "Remitent"
 
-#: po/tmp/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:29
 #, fuzzy
 msgid "Send _later"
 msgstr "Remitent"
 
-#: po/tmp/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:30
 #, fuzzy
 msgid "Send the mail in HTML format"
 msgstr "Envia els missatges en format HTML"
 
-#: po/tmp/evolution-message-composer.xml.h:28
+#: ui/evolution-message-composer.xml.h:31
 #, fuzzy
 msgid "Send the message later"
 msgstr "Envia aquest missatge"
 
-#: po/tmp/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:32
 #, fuzzy
 msgid "Send the message now"
 msgstr "Envia aquest missatge"
 
-#: po/tmp/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:33
 #, fuzzy
 msgid "Send this message now"
 msgstr "Envia aquest missatge"
 
-#: po/tmp/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:34
 #, fuzzy
 msgid "Show / hide attachments"
 msgstr "Mostra/amaga les adjuncions"
 
-#: po/tmp/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show _attachments"
 msgstr "Mostra les _adjuncions"
 
-#: po/tmp/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:36
 #, fuzzy
 msgid "Show attachments"
 msgstr "Mostra les _adjuncions"
 
-#: po/tmp/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Sign this message with your PGP key"
+msgstr "S'estЮ enviant el missatge sense cap asuumpte"
+
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Insert text file... (FIXME)"
 msgstr "_Insereix el fitxer de text... (FIXME)"
 
-#: po/tmp/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:45
 #, fuzzy
 msgid "_Open..."
 msgstr "_Obre..."
 
+#: 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 "Afegeix una carpeta a la llista de carpetes a quХ estic subscrit"
 
-#: po/tmp/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:9
 msgid "Refresh List"
 msgstr "Refresca la llista"
 
-#: po/tmp/evolution-subscribe.xml.h:10
+#: ui/evolution-subscribe.xml.h:10
 msgid "Refresh List of Folders"
 msgstr "Refresca la llista de carpetes"
 
-#: po/tmp/evolution-subscribe.xml.h:11
+#: ui/evolution-subscribe.xml.h:11
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Elimina la carpeta de la llista de carpetes a quХ estic subscrit"
 
-#: po/tmp/evolution-subscribe.xml.h:13
+#: ui/evolution-subscribe.xml.h:13
 msgid "Subscribe"
 msgstr "Subscriu-me"
 
-#: po/tmp/evolution-subscribe.xml.h:14
+#: ui/evolution-subscribe.xml.h:14
 msgid "Unsubscribe"
 msgstr "Cancel╥la la subscripciС"
 
 #.
-#. * 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 "Mostra una altra carpeta"
 
-#: po/tmp/evolution.xml.h:7
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "S_urt"
 
-#: po/tmp/evolution.xml.h:8
+#: ui/evolution.xml.h:8
 msgid "Evolution bar _shortcut"
 msgstr "Barra de _dreceres de l'Evolution"
 
-#: po/tmp/evolution.xml.h:9
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Surt del programa"
 
-#: po/tmp/evolution.xml.h:10
+#: ui/evolution.xml.h:10
 msgid "Getting _Started"
 msgstr "Per _comenГar"
 
-#: po/tmp/evolution.xml.h:11
+#: ui/evolution.xml.h:11
 msgid "Show information about Evolution"
 msgstr "Mostra informaciС referent a l'Evolution"
 
-#: po/tmp/evolution.xml.h:12
+#: ui/evolution.xml.h:12
 msgid "Show the _Folder Bar"
 msgstr "Mostra la barra de _carpetes"
 
-#: po/tmp/evolution.xml.h:13
+#: ui/evolution.xml.h:13
 msgid "Show the _Shortcut Bar"
 msgstr "Mostra la barra de _dreceres"
 
-#: po/tmp/evolution.xml.h:14
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "Submit _Bug Report"
 msgstr "_Envia un informe d'error"
 
-#: po/tmp/evolution.xml.h:15
+#: ui/evolution.xml.h:15
 #, fuzzy
 msgid "Submit bug report using Bug Buddy."
 msgstr "Envia un informe d'error mitjanГant el Bug Buddy"
 
-#: po/tmp/evolution.xml.h:16
+#: ui/evolution.xml.h:16
 msgid "Toggle whether to show the folder bar"
 msgstr "Commuta la visualitzaciС o no de la barra de carpetes"
 
-#: po/tmp/evolution.xml.h:17
+#: ui/evolution.xml.h:17
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Commuta la visualitzaciС o no de la barra de dreceres"
 
-#: po/tmp/evolution.xml.h:18
+#: ui/evolution.xml.h:18
 msgid "Using the C_ontact Manager"
 msgstr "UtilitzaciС del gestor de c_ontactes"
 
-#: po/tmp/evolution.xml.h:19
+#: ui/evolution.xml.h:19
 msgid "Using the _Calendar"
 msgstr "UtilitzaciС de l'_agenda"
 
-#: po/tmp/evolution.xml.h:20
+#: ui/evolution.xml.h:20
 msgid "Using the _Mailer"
 msgstr "UtilitzaciС del _gestor de correu"
 
-#: po/tmp/evolution.xml.h:21
+#: ui/evolution.xml.h:21
 msgid "_About Evolution..."
 msgstr "_Quant a l'Evolution..."
 
-#: po/tmp/evolution.xml.h:22
+#: ui/evolution.xml.h:22
 msgid "_Appointment (FIXME)"
 msgstr "_Cita (FIXME)"
 
-#: po/tmp/evolution.xml.h:23
+#: ui/evolution.xml.h:23
 msgid "_Contact (FIXME)"
 msgstr "_Contacte (FIXME)"
 
-#: po/tmp/evolution.xml.h:26
+#: ui/evolution.xml.h:26
 msgid "_Folder"
 msgstr "_Carpeta"
 
-#: po/tmp/evolution.xml.h:27
+#: ui/evolution.xml.h:27
 msgid "_Go to Folder..."
 msgstr "_VИs a la carpeta..."
 
-#: po/tmp/evolution.xml.h:29
+#: ui/evolution.xml.h:29
 msgid "_Index"
 msgstr "_мndex"
 
-#: po/tmp/evolution.xml.h:30
+#: ui/evolution.xml.h:30
 msgid "_Mail message (FIXME)"
 msgstr "Missatge de _correu (FIXME)"
 
-#: po/tmp/evolution.xml.h:32
+#: ui/evolution.xml.h:32
 msgid "_Settings"
 msgstr "_ParЮmetres"
 
-#: po/tmp/evolution.xml.h:33
+#: ui/evolution.xml.h:33
 msgid "_Task (FIXME)"
 msgstr "_Tasca (FIXME)"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2470
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
@@ -6752,28 +7237,34 @@ msgstr "Hora de _finalitzaciС de la reuniС:"
 msgid "All Attendees"
 msgstr "Tots els assistents"
 
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: widgets/misc/e-calendar-item.c:421
+msgid "MTWTFSS"
+msgstr "DDDDDDD"
+
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
+#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-clipped-label.c:107
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-dateedit.c:408
+#: widgets/misc/e-dateedit.c:407
 msgid "Now"
 msgstr "Ara"
 
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1249 widgets/misc/e-dateedit.c:1308
-#: widgets/misc/e-dateedit.c:1487
+#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
+#: widgets/misc/e-dateedit.c:1486
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1252 widgets/misc/e-dateedit.c:1311
-#: widgets/misc/e-dateedit.c:1490
+#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
+#: widgets/misc/e-dateedit.c:1489
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
@@ -6782,15 +7273,296 @@ msgstr "%I:%M %p"
 msgid "Group %i"
 msgstr "Grup %i"
 
-#~ msgid "BLARG\n"
-#~ msgstr "BLARG\n"
+#~ msgid "categories"
+#~ msgstr "categories"
+
+#~ msgid "Item(s) belong to these categories:"
+#~ msgstr "El(s) element(s) pertanyen a aquestes categories:"
+
+#~ msgid "Available Categories:"
+#~ msgstr "Categories disponibles:"
+
+#~ msgid "External Directories"
+#~ msgstr "Directoris externs"
+
+#~ msgid "Port Number:"
+#~ msgstr "NЗmero de port:"
+
+#~ msgid "Outline:"
+#~ msgstr "Contorn:"
+
+#~ msgid "Headings:"
+#~ msgstr "EncapГalaments:"
+
+#~ msgid "Empty days:"
+#~ msgstr "Dies buits:"
+
+#~ msgid "Appointments:"
+#~ msgstr "Cites:"
+
+#~ msgid "Highlighted day:"
+#~ msgstr "Dia ressaltat:"
+
+#~ msgid "Day numbers:"
+#~ msgstr "NЗmeros de dia:"
+
+#~ msgid "Current day's number:"
+#~ msgstr "NЗmero del dia d'avui:"
+
+#~ msgid "To-Do item that is not yet due:"
+#~ msgstr "Element per fer que encara no ha venГut:"
+
+#~ msgid "To-Do item that is due today:"
+#~ msgstr "Element per fer que venГ avui:"
+
+#~ msgid "To-Do item that is overdue:"
+#~ msgstr "Element endarrerit encara per fer:"
+
+#~ msgid "may"
+#~ msgstr "maig"
+
+#~ msgid "sept"
+#~ msgstr "set"
+
+#~ msgid "sunday"
+#~ msgstr "diumenge"
+
+#~ msgid "monday"
+#~ msgstr "dilluns"
+
+#~ msgid "tuesday"
+#~ msgstr "dimarts"
+
+#~ msgid "tues"
+#~ msgstr "dm."
+
+#~ msgid "wednesday"
+#~ msgstr "dimecres"
+
+#~ msgid "wednes"
+#~ msgstr "dc."
+
+#~ msgid "thursday"
+#~ msgstr "dijous"
+
+#~ msgid "thur"
+#~ msgstr "dj."
+
+#~ msgid "thurs"
+#~ msgstr "dj."
+
+#~ msgid "friday"
+#~ msgstr "divendres"
+
+#~ msgid "saturday"
+#~ msgstr "dissabte"
+
+#~ msgid "fortnight"
+#~ msgstr "quinzena"
+
+#~ msgid "min"
+#~ msgstr "min."
+
+#~ msgid "sec"
+#~ msgstr "s"
+
+#~ msgid "tomorrow"
+#~ msgstr "demЮ"
+
+#~ msgid "yesterday"
+#~ msgstr "ahir"
+
+#~ msgid "today"
+#~ msgstr "avui"
+
+#~ msgid "last"
+#~ msgstr "Зltim"
+
+#~ msgid "this"
+#~ msgstr "aquest"
+
+#~ msgid "next"
+#~ msgstr "segЭent"
+
+#~ msgid "first"
+#~ msgstr "primer"
+
+#~ msgid "third"
+#~ msgstr "tercer"
+
+#~ msgid "fourth"
+#~ msgstr "quart"
+
+#~ msgid "fifth"
+#~ msgstr "cinquХ"
+
+#~ msgid "sixth"
+#~ msgstr "sisХ"
+
+#~ msgid "seventh"
+#~ msgstr "setХ"
+
+#~ msgid "eighth"
+#~ msgstr "vuitХ"
+
+#~ msgid "ninth"
+#~ msgstr "novХ"
+
+#~ msgid "tenth"
+#~ msgstr "desХ"
+
+#~ msgid "eleventh"
+#~ msgstr "onzХ"
+
+#~ msgid "twelfth"
+#~ msgstr "dotzХ"
+
+#~ msgid "ago"
+#~ msgstr "fa"
+
+#~ msgid "Year:"
+#~ msgstr "Any:"
 
 #~ msgid ""
-#~ "Are you sure you want\n"
-#~ "to delete this contact?"
+#~ "Please select the date you want to go to.\n"
+#~ "When you click on a day, you will be taken\n"
+#~ "to that date."
+#~ msgstr ""
+#~ "Si us plau, seleccioneu la data a quХ voleu anar.\n"
+#~ "Quan feu clic sobre un dia, anireu a parar\n"
+#~ "a aquella data."
+
+#~ msgid "Mail Source"
+#~ msgstr "Font del correu"
+
+#~ msgid ""
+#~ "Your email configuration is now complete.\n"
+#~ "Click \"Finish\" to save your new settings"
+#~ msgstr ""
+#~ "Ja teniu enllestida la configuraciС del correu.\n"
+#~ "Feu clic a \"Finalitza\" per desar els nous parЮmetres"
+
+#~ msgid "Send \"%s\""
+#~ msgstr "Envia \"%s\""
+
+#~ msgid "Send a message without a subject"
+#~ msgstr "Envia un missatge sense assumpte"
+
+#~ msgid "Expunge \"%s\""
+#~ msgstr "Esborra \"%s\""
+
+#~ msgid "Marking messages in folder \"%s\""
+#~ msgstr "S'estan marcant els missatges de la carpeta \"%s\""
+
+#~ msgid "Mark messages in folder \"%s\""
+#~ msgstr "Marca els missatges de la carpeta \"%s\""
+
+#~ msgid "Marking message %d of %d"
+#~ msgstr "S'estЮ marcant el missatge %d de %d"
+
+#~ msgid "Scan folders in \"%s\""
+#~ msgstr "Escaneja les carpetes de \"%s\""
+
+#~ msgid "Attaching messages from folder \"%s\""
+#~ msgstr "S'estan adjuntant els missatges de la carpeta \"%s\""
+
+#~ msgid "Attach messages from \"%s\""
+#~ msgstr "Adjunta els missatges des de \"%s\""
+
+#~ msgid "Forwarding messages \"%s\""
+#~ msgstr "S'estan reenviant els missatges \"%s\""
+
+#~ msgid "Forwarding a message without a subject"
+#~ msgstr "S'estЮ reenviant un missatge sense cap assumpte"
+
+#~ msgid "Forward message \"%s\""
+#~ msgstr "Reenvia el missatge \"%s\""
+
+#~ msgid "Forward a message without a subject"
+#~ msgstr "Reenvia un missatge sense cap assumpte"
+
+#~ msgid ""
+#~ "Failed to generate mime part from message while generating forwarded message."
+#~ msgstr ""
+#~ "No s'ha pogut generar la part mime del missatge en generar el missatge "
+#~ "reenviat."
+
+#~ msgid "Loading \"%s\""
+#~ msgstr "S'estЮ carregant \"%s\""
+
+#~ msgid "Load \"%s\""
+#~ msgstr "Carrega \"%s\""
+
+#~ msgid "Creating \"%s\""
+#~ msgstr "S'estЮ creant \"%s\""
+
+#~ msgid "Create \"%s\""
+#~ msgstr "Crea \"%s\""
+
+#~ msgid "Exception while reporting result to shell component listener."
 #~ msgstr ""
-#~ "Esteu segur que voleu\n"
-#~ "suprimir aquest contacte?"
+#~ "ExcepciС en informar del resultat a l'escoltador de components de "
+#~ "l'intХrpret d'ordres."
+
+#~ msgid "Synchronize \"%s\""
+#~ msgstr "Sincronitza \"%s\""
+
+#~ msgid "Displaying message UID \"%s\""
+#~ msgstr "S'estЮ visualitzant l'UID del missatge \"%s\""
+
+#~ msgid "Clearing message display"
+#~ msgstr "S'estЮ esborrant la visualitzaciС del missatge"
+
+#~ msgid "Display message UID \"%s\""
+#~ msgstr "Visualitza l'UID del missatge \"%s\""
+
+#~ msgid "Clear message display"
+#~ msgstr "Esborra la visualitzaciС del missatge"
+
+#~ msgid "Opening messages from folder \"%s\""
+#~ msgstr "S'estan obrint els missatges des de la carpeta \"%s\""
+
+#~ msgid "Open messages from \"%s\""
+#~ msgstr "Obre els missatges des de \"%s\""
+
+#~ msgid "Viewing messages from folder \"%s\""
+#~ msgstr "S'estan visualitzant els missatges des de la carpeta \"%s\""
+
+#~ msgid "View messages from \"%s\""
+#~ msgstr "Visualitza els missatges des de \"%s\""
+
+#~ msgid "Retrieving message %d of %d (uid \"%s\")"
+#~ msgstr "S'estЮ recuperant el missatge %d de %d (uid \"%s\")"
+
+#, fuzzy
+#~ msgid "Saving messages from folder \"%s\""
+#~ msgstr "S'estan adjuntant els missatges de la carpeta \"%s\""
+
+#, fuzzy
+#~ msgid "Save messages from folder \"%s\""
+#~ msgstr "S'estan obrint els missatges des de la carpeta \"%s\""
+
+#~ msgid "Rebuilding message view"
+#~ msgstr "S'estЮ reconstruint la visualitzaciС del missatge"
+
+#~ msgid "Rebuild message view"
+#~ msgstr "Reconstrueix la visualitzaciС del missatge"
+
+#~ msgid "N_ew Directory Server"
+#~ msgstr "N_ou servidor de directori"
+
+#~ msgid "_Actions"
+#~ msgstr "_Accions"
+
+#~ msgid "_Save Calendar As"
+#~ msgstr "_Anomena i desa l'agenda"
+
+#, fuzzy
+#~ msgid "_Mail Configuration"
+#~ msgstr "ConfiguraciС del correu"
+
+#~ msgid "BLARG\n"
+#~ msgstr "BLARG\n"
 
 #~ msgid "window2"
 #~ msgstr "finestra2"
@@ -6826,9 +7598,6 @@ msgstr "Grup %i"
 #~ msgid "Due Date:"
 #~ msgstr "Data de venciment:"
 
-#~ msgid "Priority:"
-#~ msgstr "Prioritat:"
-
 #~ msgid "Time display"
 #~ msgstr "VisualitzaciС de l'hora"
 
@@ -6951,10 +7720,6 @@ msgstr "Grup %i"
 #~ msgid "matches regex"
 #~ msgstr "coincideix amb la regex"
 
-#~ msgid "Cannot initialize Evolution's mail summary component."
-#~ msgstr ""
-#~ "No es pot inicialitzar el component de resum del correu de l'Evolution."
-
 #~ msgid "Cannot initialize Evolution's mail storage hash."
 #~ msgstr ""
 #~ "No es pot inicialitzar el hash d'emmagatzematge de correu de l'Evolution."
@@ -6988,9 +7753,6 @@ msgstr "Grup %i"
 #~ msgid " (XXX unread)"
 #~ msgstr " (XXX no llegits)"
 
-#~ msgid "Retrieving messages : %s"
-#~ msgstr "S'estan recuperant els missatges : %s"
-
 #~ msgid "Don't know protocol to open URI `%s'"
 #~ msgstr "No es coneix cap protocol per obrir l'URI '%s'"
 
@@ -7000,27 +7762,15 @@ msgstr "Grup %i"
 #~ msgid "Forward Message"
 #~ msgstr "Reenvia el missatge"
 
-#~ msgid "Delete Message"
-#~ msgstr "Suprimeix el missatge"
-
-#~ msgid "Move Message"
-#~ msgstr "Mou el missatge"
-
 #~ msgid "Copy Message"
 #~ msgstr "Copia el missatge"
 
-#~ msgid "_New Contact"
-#~ msgstr "Contacte _nou"
-
 #~ msgid "New Ca_lendar"
 #~ msgstr "Nova a_genda"
 
 #~ msgid "_New appointment..."
 #~ msgstr "_Nova cita..."
 
-#~ msgid "_Mail Configuration..."
-#~ msgstr "ConfiguraciС del _correu..."
-
 #~ msgid "_Create New Folder..."
 #~ msgstr "_Crea una carpeta nova..."
 
@@ -7105,9 +7855,6 @@ msgstr "Grup %i"
 #~ msgid "'s calendar"
 #~ msgstr "seva agenda"
 
-#~ msgid "?"
-#~ msgstr "?"
-
 #~ msgid "FIXME: _Delete"
 #~ msgstr "FIXME: _Suprimeix"
 
@@ -7180,9 +7927,6 @@ msgstr "Grup %i"
 #~ msgid "Select recipients' addresses"
 #~ msgstr "Selecciona les adreces dels destinataris"
 
-#~ msgid "Name"
-#~ msgstr "Nom"
-
 #~ msgid "To: >>"
 #~ msgstr "Per a: >>"
 
diff --git a/po/el.po b/po/el.po
index cde8b7b91e..ed816c73e0 100644
--- a/po/el.po
+++ b/po/el.po
@@ -2,10 +2,11 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Spiros Papadimitriou <spapadim+@cs.cmu.edu>, 2000.
 #
+#: camel/providers/smtp/camel-smtp-transport.c:287
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.1\n"
-"POT-Creation-Date: 2000-12-13 16:26-0600\n"
+"POT-Creation-Date: 2001-01-06 00:11+0100\n"
 "PO-Revision-Date: 2000-04-04 19:42-0500\n"
 "Last-Translator: Spiros Papadimitriou <spapadim+@cs.cmu.edu>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -235,10 +236,10 @@ msgstr ""
 #: addressbook/backend/ebook/load-pine-addressbook.c:17
 #: addressbook/backend/ebook/test-client-list.c:18
 #: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:991
+#: addressbook/conduit/address-conduit.c:1083
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1136
-#: calendar/conduits/todo/todo-conduit.c:945 calendar/gui/main.c:54
+#: calendar/conduits/calendar/calendar-conduit.c:1151
+#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
 #, fuzzy
 msgid "Could not initialize Bonobo"
 msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
@@ -361,54 +362,37 @@ msgstr ""
 "пЯОщЙУЬЕ ЕНАъЯЕСГ ЙАТэ ТГМ АПЭПЕИЯА АМэЦМЫСГР ДЕДОЛщМЫМ ЛЕ PersistStream АПЭ "
 "ТГ ЛОМэДА"
 
-#: addressbook/conduit/address-conduit.c:197
+#: addressbook/conduit/address-conduit.c:195
 msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:210
+#: addressbook/conduit/address-conduit.c:208
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:583
-#: calendar/conduits/calendar/calendar-conduit.c:715
-#: calendar/conduits/todo/todo-conduit.c:523
+#: addressbook/conduit/address-conduit.c:646
+#: calendar/conduits/calendar/calendar-conduit.c:730
+#: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat server"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:584
-#: calendar/conduits/calendar/calendar-conduit.c:716
-#: calendar/conduits/todo/todo-conduit.c:524
+#: addressbook/conduit/address-conduit.c:647
+#: calendar/conduits/calendar/calendar-conduit.c:731
+#: calendar/conduits/todo/todo-conduit.c:546
 #, fuzzy
 msgid "Could not start wombat"
 msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
 
-#: addressbook/conduit/address-conduit.c:616
-#: addressbook/conduit/address-conduit.c:619
+#: addressbook/conduit/address-conduit.c:679
+#: addressbook/conduit/address-conduit.c:682
 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
 #, fuzzy
 msgid "Delete Contact?"
 msgstr "еПИКщНТЕ ЕПИСЩМАЬГ"
@@ -423,7 +407,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:48
+#: ui/evolution-event-editor.xml.h:108 ui/evolution-mail.xml.h:53
 msgid "_Delete"
 msgstr ""
 
@@ -437,12 +421,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 ""
 
@@ -486,7 +471,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 ""
 
@@ -504,7 +489,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 ""
 
@@ -523,7 +508,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 ""
 
@@ -569,150 +555,150 @@ 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 ""
 
-#: 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Home"
 msgstr "сГЛЕъЫ_ЛА"
 
-#: addressbook/contact-editor/e-contact-editor.c:1274
+#: addressbook/contact-editor/e-contact-editor.c:1282
 #, fuzzy
 msgid "Home 2"
 msgstr "сГЛЕъЫ_ЛА"
 
-#: addressbook/contact-editor/e-contact-editor.c:1275
+#: addressbook/contact-editor/e-contact-editor.c:1283
 #, fuzzy
 msgid "Home Fax"
 msgstr "сГЛЕъЫ_ЛА"
 
-#: addressbook/contact-editor/e-contact-editor.c:1276
+#: addressbook/contact-editor/e-contact-editor.c:1284
 msgid "ISDN"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1277
+#: addressbook/contact-editor/e-contact-editor.c:1285
 #, fuzzy
 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
 #, fuzzy
 msgid "Pager"
 msgstr "еПИЙЭККГСГ"
 
-#: addressbook/contact-editor/e-contact-editor.c:1281
+#: addressbook/contact-editor/e-contact-editor.c:1289
 #, fuzzy
 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 ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1329
+#: addressbook/contact-editor/e-contact-editor.c:1337
 msgid "Email 2"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1330
+#: addressbook/contact-editor/e-contact-editor.c:1338
 msgid "Email 3"
 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/fulladdr.glade.h:6
+#: addressbook/contact-editor/fulladdr.glade.h:6
 msgid "Address _2:"
 msgstr ""
 
-#: 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 ""
 
@@ -730,10 +716,12 @@ msgid ""
 "\n"
 "Mr.\n"
 "Mrs.\n"
+"Ms.\n"
+"Miss\n"
 "Dr.\n"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:13
+#: addressbook/contact-editor/fullname-strings.h:15
 msgid ""
 "\n"
 "Sr.\n"
@@ -744,46 +732,51 @@ msgid ""
 "Esq.\n"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:21
+#: addressbook/contact-editor/fullname-strings.h:23
 msgid "_First:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:22
+#: addressbook/contact-editor/fullname-strings.h:24
 msgid "_Title:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:23
+#: addressbook/contact-editor/fullname-strings.h:25
 #, fuzzy
 msgid "_Middle:"
 msgstr "_лчМУЛА"
 
-#: addressbook/contact-editor/fullname-strings.h:24
+#: addressbook/contact-editor/fullname-strings.h:26
 msgid "_Last:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:25
+#: addressbook/contact-editor/fullname-strings.h:27
 msgid "_Suffix:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:263
+#: addressbook/gui/component/addressbook.c:231
 msgid "As _Minicards"
 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/gui/component/addressbook.c:269
-#: 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:386
+#: addressbook/gui/component/addressbook.c:374
+#, c-format
+msgid "Enter password for %s"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:402
 #, fuzzy
 msgid "Unable to open addressbook"
 msgstr "йКъЙ ЕДЧ ЦИА ТО ДИЕУХУМСИОКЭЦИО"
 
-#: addressbook/gui/component/addressbook.c:391
+#: 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"
@@ -795,84 +788,210 @@ msgid ""
 "OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:501 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:503 mail/folder-browser.c:138
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 #, fuzzy
 msgid "Advanced..."
 msgstr "аМАФчТГСГ ЦИА пЯОВЫЯГЛщМОУР"
 
-#: addressbook/gui/component/addressbook.c:533
+#: addressbook/gui/component/addressbook.c:560
 #, fuzzy
 msgid "Any field contains"
 msgstr "жэЙЕКОР ПОУ ПЕЯИщВЕИ ЕЙЙЯЕЛЭТГТЕР"
 
-#: addressbook/gui/component/addressbook.c:534
+#: addressbook/gui/component/addressbook.c:561
 msgid "Name contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:535
+#: addressbook/gui/component/addressbook.c:562
 #, fuzzy
 msgid "Email contains"
 msgstr "лИЙЯэ еИЙОМъДИА"
 
-#: addressbook/gui/component/addressbook.c:621
+#: addressbook/gui/component/addressbook.c:648
 msgid "The URI that the Folder Browser will display"
 msgstr "тО URI ПОУ ХА ЕЛЖАМъСЕИ О еНЕЯЕУМГТчР жАЙщККЫМ"
 
-#: addressbook/gui/component/e-ldap-storage.c:88
-msgid "External Directories"
+#: 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 ""
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/e-msg-composer-attachment.glade.h:7
-#: po/tmp/ldap-server-dialog.glade.h:6
-msgid "Description:"
+#: 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 ""
 
-#: po/tmp/ldap-server-dialog.glade.h:7
-msgid "LDAP Server:"
+#: addressbook/gui/component/addressbook-config.c:157
+msgid "SASL"
 msgstr ""
 
-#: po/tmp/ldap-server-dialog.glade.h:8
-msgid "Name:"
+#: addressbook/gui/component/addressbook-config.c:160
+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 ""
 
-#: po/tmp/ldap-server-dialog.glade.h:9
-msgid "Port Number:"
+#: addressbook/gui/component/addressbook-config.c:173
+#, fuzzy
+msgid "Subtree"
+msgstr "мщА сУМТЭЛЕУСГ"
+
+#: addressbook/gui/component/addressbook-config.c:176
+msgid "Unknown scope type"
 msgstr ""
 
-#: po/tmp/ldap-server-dialog.glade.h:10
+#: 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
+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
+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
+#, fuzzy
+msgid "Path:"
+msgstr "еПИЙЭККГСГ"
+
+#: addressbook/gui/component/addressbook-config.c:460
+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
+msgid "Name:"
+msgstr ""
+
+#: 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
+msgid "Name"
+msgstr ""
+
+#: 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
 #, fuzzy
 msgid "Find..."
 msgstr "пЯОТЕЯАИЭТГТА"
 
-#: po/tmp/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 #, fuzzy
 msgid "Message Recipients"
 msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
 
-#: po/tmp/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 #, fuzzy
 msgid "Select Names"
 msgstr "еПИКЕ_ЦЛщМА аМТИЙЕъЛЕМА"
 
-#: po/tmp/select-names.glade.h:9
-msgid "Select name from List:"
-msgstr ""
+#: 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
 #: mail/mail-search-dialogue.c:104
@@ -880,120 +999,120 @@ 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 ""
 
-#: 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 ""
 
-#: calendar/cal-util/timeutil.c:100 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
 #, fuzzy
 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:417
-#: addressbook/gui/widgets/e-minicard.c:338
+#: addressbook/gui/widgets/e-addressbook-view.c:451
+#: addressbook/gui/widgets/e-minicard.c:374
 msgid "Save as VCard"
 msgstr ""
 
@@ -1012,199 +1131,188 @@ 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 ""
 
-#: po/tmp/e-contact-print.glade.h:7
+#: addressbook/printing/e-contact-print.glade.h:7
 msgid "8 pt. Tahoma"
 msgstr ""
 
-#: 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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 ""
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:550
-#: calendar/gui/e-week-view.c:288 calendar/gui/print.c:605
-msgid "am"
-msgstr ""
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:553
-#: calendar/gui/e-week-view.c:291 calendar/gui/print.c:604
-msgid "pm"
-msgstr ""
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 #, fuzzy
 msgid "Evolution Calendar Conduit"
@@ -1214,13 +1322,13 @@ msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
 msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:671
-#: calendar/conduits/todo/todo-conduit.c:479
+#: calendar/conduits/calendar/calendar-conduit.c:686
+#: calendar/conduits/todo/todo-conduit.c:501
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:770
-#: calendar/conduits/calendar/calendar-conduit.c:773
+#: calendar/conduits/calendar/calendar-conduit.c:785
+#: calendar/conduits/calendar/calendar-conduit.c:788
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
@@ -1233,127 +1341,165 @@ msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:578
-#: calendar/conduits/todo/todo-conduit.c:581
+#: calendar/conduits/todo/todo-conduit.c:600
+#: calendar/conduits/todo/todo-conduit.c:603
 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:"
+#: 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
+#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:7
 #, fuzzy
-msgid "Appointments:"
-msgstr "я_АМТЕБОЩ"
+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:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Evolution component for handling the calendar."
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:66
-msgid "Current day's number:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+msgid "Factory for the Calendar Summary component."
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:67
-msgid "To-Do item that is not yet due:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#, fuzzy
+msgid "Factory for the Evolution calendar component."
+msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+msgid "Factory for the calendar iTip view control"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:68
-msgid "To-Do item that is due today:"
+#: 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:69
-msgid "To-Do item that is overdue:"
+#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:8
+#, fuzzy
+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:354
+#: calendar/gui/calendar-commands.c:229
 msgid "File not found"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:378
+#: calendar/gui/calendar-commands.c:253
 #, fuzzy
 msgid "Open calendar"
 msgstr "тО ГЛЕЯОКЭЦИЭ САР"
 
-#: calendar/gui/calendar-commands.c:417
+#: calendar/gui/calendar-commands.c:295
 #, fuzzy
 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:282
+#: 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:2498
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
 msgstr ""
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:286 calendar/gui/calendar-model.c:736
+#: 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:290 calendar/gui/calendar-model.c:739
+#: 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:344 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:347 po/tmp/task-editor-dialog.glade.h:20
+#: calendar/gui/calendar-model.c:349
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
 #, fuzzy
 msgid "Private"
 msgstr "еПИЙЭККГСГ"
 
-#: calendar/gui/calendar-model.c:350 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:353 calendar/gui/calendar-model.c:521
+#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:523
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:441
+#: calendar/gui/calendar-model.c:443
 msgid "N"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:441
+#: calendar/gui/calendar-model.c:443
 msgid "S"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:445
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:445
 msgid "W"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:515
+#: calendar/gui/calendar-model.c:517
 msgid "Transparent"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:518
+#: calendar/gui/calendar-model.c:520
 msgid "Opaque"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:744
+#: calendar/gui/calendar-model.c:746
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1362,49 +1508,70 @@ msgid ""
 msgstr ""
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:845 calendar/gui/calendar-model.c:893
+#: 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:1274 widgets/misc/e-dateedit.c:1455
+#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
 msgstr ""
 
 #. 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:863
+#: calendar/gui/calendar-model.c:865
 msgid "%I:%M:%S %p%n"
 msgstr ""
 
 #. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:866
+#: calendar/gui/calendar-model.c:868
 msgid "%H:%M:%S%n"
 msgstr ""
 
 #. 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:870
+#: calendar/gui/calendar-model.c:872
 msgid "%I:%M %p%n"
 msgstr ""
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:873
+#: calendar/gui/calendar-model.c:875
 msgid "%H:%M%n"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:993
+#: calendar/gui/calendar-model.c:995
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1033
+#: calendar/gui/calendar-model.c:1035
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1073
+#: calendar/gui/calendar-model.c:1075
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr ""
 
+#: calendar/gui/calendar-summary.c:81
+msgid "%A, %e %B %Y"
+msgstr ""
+
+#: calendar/gui/calendar-summary.c:224
+msgid "<b>Error loading calendar</b>"
+msgstr ""
+
+#: 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
 #, fuzzy
 msgid "The URI that the calendar will display"
@@ -1423,367 +1590,403 @@ 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
 #, fuzzy
 msgid "Edit appointment"
 msgstr "я_АМТЕБОЩ"
 
-#: calendar/gui/gnome-cal.c:1466 po/tmp/alarm-notify.glade.h:8
-#, fuzzy
-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 ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "10 minutes"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "12 hour (am/pm)"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "15 minutes"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "24 hour"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "30 minutes"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "60 minutes"
 msgstr ""
 
-#: 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Sunday"
 msgstr "аПОСТОКч"
 
-#: po/tmp/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "seconds."
 msgstr "аПОСТОКч"
 
+#: calendar/gui/dialogs/delete-comp.c:62
+#, c-format
+msgid "Are you sure you want to delete the appointment `%s'?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:65
+msgid "Are you sure you want to delete this untitled appointment?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:71
+#, c-format
+msgid "Are you sure you want to delete the task `%s'?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:74
+msgid "Are you sure you want to delete this untitled task?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:80
+#, c-format
+msgid "Are you sure you want to delete the journal entry `%s'?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:83
+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
-#: widgets/misc/e-dateedit.c:422 widgets/misc/e-dateedit.c:1331
-#: widgets/misc/e-dateedit.c:1446
+#: 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
 #, fuzzy
 msgid "None"
 msgstr "сГЛЕъЫ_ЛА"
 
-#: po/tmp/task-editor-dialog.glade.h:18
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
 #, fuzzy
 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
 #, fuzzy
 msgid "Task"
 msgstr "еЙЙЯЕЛЭ_ТГТА"
 
-#: po/tmp/task-editor-dialog.glade.h:25
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
 msgid "URL:"
 msgstr ""
 
-#: po/tmp/task-editor-dialog.glade.h:26
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
 #, fuzzy
 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
 #, fuzzy
 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 ""
 
@@ -1791,26 +1994,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
 #, fuzzy, c-format
 msgid "Appointment - %s"
 msgstr "я_АМТЕБОЩ"
 
-#: 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
 #, fuzzy, c-format
 msgid "Task - %s"
 msgstr "еЙЙЯЕЛЭТГТЕР"
 
-#: 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
 #, fuzzy, c-format
 msgid "Journal entry - %s"
 msgstr "йАТАВЧЯГСГ гЛЕЯО_КОЦъОУ"
 
-#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3277
+#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3250
 msgid "Do you want to save changes?"
 msgstr ""
 
@@ -1831,14 +2034,6 @@ msgstr ""
 msgid "Mark the task complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:342 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:479 mail/mail-view.c:165
-#: 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
 #, fuzzy
 msgid "Delete the task"
@@ -1851,53 +2046,65 @@ msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1208
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1211
 #: calendar/gui/e-week-view-main-item.c:325
 msgid "%A %d %B"
 msgstr ""
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1222
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1225
 #: calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr ""
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1235
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1238
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2941 calendar/gui/e-day-view.c:2948
-#: calendar/gui/e-day-view.c:2957 calendar/gui/e-week-view.c:3165
-#: calendar/gui/e-week-view.c:3172 calendar/gui/e-week-view.c:3181
+#. 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: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:609
+msgid "pm"
+msgstr ""
+
+#: calendar/gui/e-day-view.c:2948 calendar/gui/e-day-view.c:2955
+#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3169
+#: calendar/gui/e-week-view.c:3176 calendar/gui/e-week-view.c:3185
 #, fuzzy
 msgid "New appointment..."
 msgstr "я_АМТЕБОЩ"
 
-#: calendar/gui/e-day-view.c:2945 calendar/gui/e-day-view.c:2952
-#: calendar/gui/e-week-view.c:3169 calendar/gui/e-week-view.c:3176
+#: calendar/gui/e-day-view.c:2952 calendar/gui/e-day-view.c:2959
+#: calendar/gui/e-week-view.c:3173 calendar/gui/e-week-view.c:3180
 msgid "Edit this appointment..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2946 calendar/gui/e-week-view.c:3170
-#: po/tmp/evolution-event-editor.xml.h:20
+#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3174
+#: ui/evolution-event-editor.xml.h:20
 #, fuzzy
 msgid "Delete this appointment"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3177
+#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3181
 msgid "Make this appointment movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2954 calendar/gui/e-week-view.c:3178
+#: calendar/gui/e-day-view.c:2961 calendar/gui/e-week-view.c:3182
 #, fuzzy
 msgid "Delete this occurrence"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3179
+#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3183
 msgid "Delete all occurrences"
 msgstr ""
 
@@ -1909,679 +2116,490 @@ msgid "%d %B"
 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/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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "_End time:"
 msgstr "аъ_ТГСГ сУМэМТГСГР"
 
-#: po/tmp/event-editor-dialog.glade.h:34
+#: calendar/gui/event-editor-dialog.glade.h:34
 #, fuzzy
 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
 #, fuzzy
 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 ""
 
-#: po/tmp/event-editor-dialog.glade.h:44
+#: calendar/gui/event-editor-dialog.glade.h:44
 #, fuzzy
 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
 #, fuzzy
 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 calendar/gui/getdate.y:424
-#: 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:722
+#: calendar/gui/event-editor.c:716
 #, fuzzy
 msgid "occurrences"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: calendar/gui/event-editor.c:839
+#: calendar/gui/event-editor.c:833
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor.c:3079 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/getdate.y:391
-msgid "january"
+#: calendar/gui/gnome-cal.c:676
+#, c-format
+msgid "Could not load the calendar in `%s'"
 msgstr ""
 
-#: calendar/gui/getdate.y:392
-msgid "february"
+#: calendar/gui/gnome-cal.c:687
+#, c-format
+msgid "Could not create a calendar in `%s'"
 msgstr ""
 
-#: calendar/gui/getdate.y:393
-msgid "march"
+#: calendar/gui/gnome-cal.c:698
+#, c-format
+msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/getdate.y:394
+#.
+#. * 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
 #, fuzzy
-msgid "april"
+msgid "April"
 msgstr "еПИЙЭККГСГ"
 
-#: calendar/gui/getdate.y:395
-msgid "may"
-msgstr ""
-
-#: calendar/gui/getdate.y:396
-msgid "june"
-msgstr ""
-
-#: calendar/gui/getdate.y:397
-msgid "july"
-msgstr ""
-
-#: calendar/gui/getdate.y:398
-msgid "august"
-msgstr ""
-
-#: calendar/gui/getdate.y:399
-msgid "september"
-msgstr ""
-
-#: calendar/gui/getdate.y:400
-msgid "sept"
-msgstr ""
-
-#: calendar/gui/getdate.y:401
-msgid "october"
+#: calendar/gui/goto-dialog.glade.h:7
+msgid "August"
 msgstr ""
 
-#: calendar/gui/getdate.y:402
-msgid "november"
+#: calendar/gui/goto-dialog.glade.h:8
+msgid "December"
 msgstr ""
 
-#: calendar/gui/getdate.y:403
-msgid "december"
+#: calendar/gui/goto-dialog.glade.h:9
+msgid "February"
 msgstr ""
 
-#: calendar/gui/getdate.y:404
-msgid "sunday"
+#: calendar/gui/goto-dialog.glade.h:10
+msgid "Go To Date"
 msgstr ""
 
-#: calendar/gui/getdate.y:405
+#: calendar/gui/goto-dialog.glade.h:11
 #, fuzzy
-msgid "monday"
+msgid "Go To Today"
 msgstr "счЛЕЯА"
 
-#: calendar/gui/getdate.y:406
-msgid "tuesday"
-msgstr ""
-
-#: calendar/gui/getdate.y:407
-#, fuzzy
-msgid "tues"
-msgstr "сГЛЕъЫ_ЛА"
-
-#: calendar/gui/getdate.y:408
-msgid "wednesday"
-msgstr ""
-
-#: calendar/gui/getdate.y:409
-msgid "wednes"
-msgstr ""
-
-#: calendar/gui/getdate.y:410
-msgid "thursday"
-msgstr ""
-
-#: calendar/gui/getdate.y:411
-msgid "thur"
-msgstr ""
-
-#: calendar/gui/getdate.y:412
-msgid "thurs"
-msgstr ""
-
-#: calendar/gui/getdate.y:413
-msgid "friday"
-msgstr ""
-
-#: calendar/gui/getdate.y:414
-msgid "saturday"
-msgstr ""
-
-#: calendar/gui/getdate.y:420 filter/filter-datespec.c:62
-msgid "year"
-msgstr ""
-
-#: calendar/gui/getdate.y:421 filter/filter-datespec.c:63
-#, fuzzy
-msgid "month"
-msgstr "цМЫЯИЛъЕР"
-
-#: calendar/gui/getdate.y:422
-msgid "fortnight"
-msgstr ""
-
-#: calendar/gui/getdate.y:423 filter/filter-datespec.c:64
-msgid "week"
-msgstr ""
-
-#: calendar/gui/getdate.y:425 filter/filter-datespec.c:66
-msgid "hour"
-msgstr ""
-
-#: calendar/gui/getdate.y:426 filter/filter-datespec.c:67
-msgid "minute"
-msgstr ""
-
-#: calendar/gui/getdate.y:427
-msgid "min"
+#: calendar/gui/goto-dialog.glade.h:12
+msgid "January"
 msgstr ""
 
-#: calendar/gui/getdate.y:428 filter/filter-datespec.c:68
-#, fuzzy
-msgid "second"
-msgstr "аПОСТОКч"
-
-#: calendar/gui/getdate.y:429
-msgid "sec"
+#: calendar/gui/goto-dialog.glade.h:13
+msgid "July"
 msgstr ""
 
-#: calendar/gui/getdate.y:435
-msgid "tomorrow"
+#: calendar/gui/goto-dialog.glade.h:14
+msgid "June"
 msgstr ""
 
-#: calendar/gui/getdate.y:436
-msgid "yesterday"
+#: calendar/gui/goto-dialog.glade.h:15
+msgid "March"
 msgstr ""
 
-#: calendar/gui/getdate.y:437
+#: calendar/gui/goto-dialog.glade.h:16
 #, fuzzy
-msgid "today"
+msgid "May"
 msgstr "счЛЕЯА"
 
-#: calendar/gui/getdate.y:438 filter/filter-datespec.c:533
-#: filter/filter-datespec.c:693
-msgid "now"
+#: calendar/gui/goto-dialog.glade.h:17
+msgid "November"
 msgstr ""
 
-#: calendar/gui/getdate.y:439
-#, fuzzy
-msgid "last"
-msgstr "еПИЙЭККГСГ"
-
-#: calendar/gui/getdate.y:440
-msgid "this"
-msgstr ""
-
-#: calendar/gui/getdate.y:441
-msgid "next"
-msgstr ""
-
-#: calendar/gui/getdate.y:442
-msgid "first"
-msgstr ""
-
-#. { N_("second"),		tUNUMBER,	2 },
-#: calendar/gui/getdate.y:444
-msgid "third"
+#: calendar/gui/goto-dialog.glade.h:18
+msgid "October"
 msgstr ""
 
-#: calendar/gui/getdate.y:445
-msgid "fourth"
+#: calendar/gui/goto-dialog.glade.h:19
+msgid "September"
 msgstr ""
 
-#: calendar/gui/getdate.y:446
-msgid "fifth"
-msgstr ""
-
-#: calendar/gui/getdate.y:447
-msgid "sixth"
-msgstr ""
-
-#: calendar/gui/getdate.y:448
-msgid "seventh"
-msgstr ""
-
-#: calendar/gui/getdate.y:449
-msgid "eighth"
-msgstr ""
-
-#: calendar/gui/getdate.y:450
-#, fuzzy
-msgid "ninth"
-msgstr "пЯОТЕЯАИЭТГТА"
-
-#: calendar/gui/getdate.y:451
+#: calendar/gui/main.c:49
 #, fuzzy
-msgid "tenth"
-msgstr "еСТэКГ"
-
-#: calendar/gui/getdate.y:452
-msgid "eleventh"
-msgstr ""
-
-#: calendar/gui/getdate.y:453
-msgid "twelfth"
-msgstr ""
-
-#: calendar/gui/getdate.y:454
-msgid "ago"
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:718 calendar/gui/gnome-cal.c:1474
-#: calendar/gui/gnome-cal.c:1530
-msgid "Reminder of your appointment at "
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:1152
-#, c-format
-msgid "Could not load the calendar in `%s'"
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:1163
-#, c-format
-msgid "Could not create a calendar in `%s'"
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:1174
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr ""
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1479 calendar/gui/gnome-cal.c:1534
-#: mail/mail-search-dialogue.c:104
-msgid "Ok"
-msgstr ""
-
-#: calendar/gui/goto.c:82
-msgid "Year:"
-msgstr ""
-
-#: calendar/gui/goto.c:270
-msgid "Go to date"
-msgstr ""
-
-#. Instructions
-#: calendar/gui/goto.c:281
-msgid ""
-"Please select the date you want to go to.\n"
-"When you click on a day, you will be taken\n"
-"to that date."
-msgstr ""
-
-#: calendar/gui/goto.c:318
-msgid "Go to today"
-msgstr ""
+msgid "Could not initialize GNOME"
+msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "1st"
 msgstr ""
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "2nd"
 msgstr ""
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "3rd"
 msgstr ""
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "4th"
 msgstr ""
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "5th"
 msgstr ""
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "6th"
 msgstr ""
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "7th"
 msgstr ""
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "8th"
 msgstr ""
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "9th"
 msgstr ""
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "10th"
 msgstr ""
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "11th"
 msgstr ""
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "12th"
 msgstr ""
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "13th"
 msgstr ""
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "14th"
 msgstr ""
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "15th"
 msgstr ""
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "16th"
 msgstr ""
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "17th"
 msgstr ""
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "18th"
 msgstr ""
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "19th"
 msgstr ""
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "20th"
 msgstr ""
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "21st"
 msgstr ""
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "22nd"
 msgstr ""
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "23rd"
 msgstr ""
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "24th"
 msgstr ""
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "25th"
 msgstr ""
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "26th"
 msgstr ""
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "27th"
 msgstr ""
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "28th"
 msgstr ""
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "29th"
 msgstr ""
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "30th"
 msgstr ""
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:299
 msgid "31st"
 msgstr ""
 
-#: 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Tasks"
 msgstr "еЙЙЯЕЛЭ_ТГТА"
 
 #. Day
-#: calendar/gui/print.c:1066
+#: calendar/gui/print.c:1071
 msgid "Current day (%a %b %d %Y)"
 msgstr ""
 
-#: 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 ""
 
-#: calendar/gui/print.c:1081
+#: calendar/gui/print.c:1086
 msgid "%a %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1092
+#: calendar/gui/print.c:1097
 #, c-format
 msgid "Current week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1100
+#: calendar/gui/print.c:1105
 msgid "Current month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1107
+#: calendar/gui/print.c:1112
 msgid "Current year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1144
+#: calendar/gui/print.c:1149
 #, fuzzy
 msgid "Print Calendar"
 msgstr "гЛЕЯОКЭЦИО"
 
-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:962
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1001
 msgid "Print Preview"
 msgstr ""
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: calendar/gui/weekday-picker.c:351 widgets/misc/e-calendar-item.c:416
-msgid "MTWTFSS"
-msgstr ""
-
-#: calendar/gui/weekday-picker.c:353 calendar/gui/weekday-picker.c:443
+#: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
 msgid "SMTWTFS"
 msgstr ""
 
@@ -2671,60 +2689,61 @@ msgstr ""
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:182
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:227
+#: camel/camel-remote-store.c:243
+#: camel/providers/smtp/camel-smtp-transport.c:162
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:228
+#: camel/camel-remote-store.c:244
 msgid "(unknown host)"
 msgstr ""
 
-#: camel/camel-remote-store.c:452
+#: camel/camel-remote-store.c:483
 msgid "Server disconnected."
 msgstr ""
 
-#: camel/camel-service.c:120
+#: camel/camel-service.c:138
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:129
+#: camel/camel-service.c:147
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:138
+#: camel/camel-service.c:156
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:488
+#: camel/camel-service.c:526
 #, c-format
 msgid "No such host %s."
 msgstr ""
 
-#: camel/camel-service.c:491
+#: camel/camel-service.c:529
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr ""
 
-#: camel/camel-session.c:272
+#: camel/camel-session.c:297
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:360
+#: camel/camel-session.c:388
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2746,51 +2765,51 @@ msgstr ""
 msgid "Port number in URL `%s' is non-numeric"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-auth.c:127
+#: camel/providers/imap/camel-imap-auth.c:133
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
 "%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-auth.c:198
+#: camel/providers/imap/camel-imap-auth.c:205
 msgid "Bad authentication response from server."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:216
+#: camel/providers/imap/camel-imap-command.c:231
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:224
+#: camel/providers/imap/camel-imap-command.c:239
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:240 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:271
+#: camel/providers/imap/camel-imap-command.c:286
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:407
+#: camel/providers/imap/camel-imap-command.c:422
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:443
+#: camel/providers/imap/camel-imap-command.c:458
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:216
+#: 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:586
+#: camel/providers/imap/camel-imap-folder.c:532
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -2802,31 +2821,25 @@ msgstr ""
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:234
-#: 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:236
+#: camel/providers/imap/camel-imap-store.c:248
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:245
+#: camel/providers/imap/camel-imap-store.c:257
 msgid "Kerberos 4"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:247
+#: camel/providers/imap/camel-imap-store.c:259
 msgid ""
 "This option will connect to the IMAP server using Kerberos 4 authentication."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:333
+#: camel/providers/imap/camel-imap-store.c:345
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:359
+#: camel/providers/imap/camel-imap-store.c:373
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2834,7 +2847,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:539
+#: camel/providers/imap/camel-imap-store.c:564
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
@@ -2919,12 +2932,12 @@ msgid "Cannot append message to maildir folder: %s: %s"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:204
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-maildir-folder.c:207
+#: camel/providers/local/camel-maildir-folder.c:215
+#: camel/providers/local/camel-mbox-folder.c:317
 #: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:189
-#: camel/providers/local/camel-mh-folder.c:197
+#: camel/providers/local/camel-mh-folder.c:192
+#: camel/providers/local/camel-mh-folder.c:200
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -2932,14 +2945,14 @@ msgid ""
 msgstr ""
 
 #: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-mbox-folder.c:317
 #: camel/providers/local/camel-mh-folder.c:183
 #, fuzzy
 msgid "No such message"
 msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
 
-#: camel/providers/local/camel-maildir-folder.c:213
-#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-maildir-folder.c:216
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "Invalid message contents"
 msgstr ""
 
@@ -2982,30 +2995,30 @@ msgstr ""
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:195
+#: camel/providers/local/camel-mbox-folder.c:201
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:251
+#: camel/providers/local/camel-mbox-folder.c:257
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:327
-#: camel/providers/local/camel-mbox-folder.c:357
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:333
+#: camel/providers/local/camel-mbox-folder.c:365
+#: camel/providers/local/camel-mbox-folder.c:378
 #, fuzzy, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: camel/providers/local/camel-mbox-folder.c:358
+#: camel/providers/local/camel-mbox-folder.c:366
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:369
+#: camel/providers/local/camel-mbox-folder.c:379
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -3052,56 +3065,56 @@ msgstr ""
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:341
+#: camel/providers/local/camel-mbox-summary.c:343
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:475
-#: camel/providers/local/camel-mbox-summary.c:661
+#: camel/providers/local/camel-mbox-summary.c:477
+#: camel/providers/local/camel-mbox-summary.c:668
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:491
+#: camel/providers/local/camel-mbox-summary.c:493
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:512
-#: camel/providers/local/camel-mbox-summary.c:520
-#: camel/providers/local/camel-mbox-summary.c:691
-#: camel/providers/local/camel-mbox-summary.c:699
+#: camel/providers/local/camel-mbox-summary.c:514
+#: camel/providers/local/camel-mbox-summary.c:522
+#: camel/providers/local/camel-mbox-summary.c:701
+#: camel/providers/local/camel-mbox-summary.c:709
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:562
+#: camel/providers/local/camel-mbox-summary.c:565
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:579
+#: camel/providers/local/camel-mbox-summary.c:582
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:595
-#: camel/providers/local/camel-mbox-summary.c:748
+#: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-mbox-summary.c:759
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:604
+#: camel/providers/local/camel-mbox-summary.c:609
 #, fuzzy, c-format
 msgid "Could not close temp folder: %s"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: camel/providers/local/camel-mbox-summary.c:615
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:817
+#: camel/providers/local/camel-mbox-summary.c:830
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
@@ -3134,7 +3147,7 @@ msgstr ""
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:144
+#: camel/providers/nntp/camel-nntp-folder.c:115
 #, fuzzy, c-format
 msgid "Message %s not found."
 msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
@@ -3184,16 +3197,16 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:179
+#: camel/providers/pop3/camel-pop3-folder.c:180
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:273
+#: camel/providers/pop3/camel-pop3-folder.c:274
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:288
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr ""
@@ -3231,47 +3244,48 @@ msgstr ""
 msgid "Could not authenticate to KPOP server: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:335
+#: camel/providers/pop3/camel-pop3-store.c:337
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:389
+#: camel/providers/pop3/camel-pop3-store.c:391
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:408
+#: camel/providers/pop3/camel-pop3-store.c:410
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending username: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:411
-#: camel/providers/pop3/camel-pop3-store.c:448
+#: camel/providers/pop3/camel-pop3-store.c:413
+#: camel/providers/pop3/camel-pop3-store.c:450
 msgid "(Unknown)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:438
+#: camel/providers/pop3/camel-pop3-store.c:440
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:446
+#: camel/providers/pop3/camel-pop3-store.c:448
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:555
+#: camel/providers/pop3/camel-pop3-store.c:557
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
+#: mail/mail-config-druid.glade.h:63
 #, fuzzy
 msgid "Sendmail"
 msgstr "аПОСТОКч"
@@ -3320,8 +3334,132 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
+#: 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
+#, c-format
+msgid "Welcome response error: %s: possibly non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:281
+msgid "No authentication required"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:283
+msgid ""
+"This option will connect to the SMTP server without using any kind of "
+"authentication. This should be fine for connecting to most SMTP servers."
+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 ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:294
+msgid ""
+"This option will connect to the SMTP server using CRAM-MD5 authentication."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:332
+#, c-format
+msgid "SMTP server %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:334
+#, c-format
+msgid "SMTP mail delivery via %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:359
+msgid "Cannot send message: sender address not defined."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:366
+msgid "Cannot send message: sender address not valid."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:380
+msgid "Cannot send message: no recipients defined."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:474
+#, c-format
+msgid "HELO request timed out: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:490
+#, c-format
+msgid "HELO response error: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:529
+#, c-format
+msgid "MAIL FROM request timed out: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:545
+#, c-format
+msgid "MAIL FROM response error: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:570
+#, c-format
+msgid "RCPT TO request timed out: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
+#, c-format
+msgid "RCPT TO response error: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:617
+#, c-format
+msgid "DATA request timed out: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:633
+#, c-format
+msgid "DATA response error: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:648
+#: camel/providers/smtp/camel-smtp-transport.c:666
+#, c-format
+msgid "DATA send timed out: message termination: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:682
+#, c-format
+msgid "DATA response error: message termination: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:706
+#, c-format
+msgid "RSET request timed out: %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:722
+#, c-format
+msgid "RSET response error: %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:745
+#, c-format
+msgid "QUIT request timed out: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#, c-format
+msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
 #: camel/providers/vee/camel-vee-provider.c:30
@@ -3357,86 +3495,86 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:144
+#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:155
 #, fuzzy
 msgid "attachment"
 msgstr "мЕА ЕПИСЩМАЬГ"
 
-#: composer/e-msg-composer-attachment-bar.c:417
-#: 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:464 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:465
+#: composer/e-msg-composer-attachment-bar.c:461
 msgid "Remove selected items from the attachment list"
 msgstr "дИАЦЯАЖч ЕПИКЕЦЛщМЫМ АМТИЙЕИЛщМЫМ АПЭ ТОМ ЙАТэКОЦО ЕПИСУМэЬЕЫМ"
 
-#: composer/e-msg-composer-attachment-bar.c:496
+#: composer/e-msg-composer-attachment-bar.c:492
 msgid "Add attachment..."
 msgstr "мщА ЕПИСЩМАЬГ..."
 
-#: composer/e-msg-composer-attachment-bar.c:497
+#: 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
 #, fuzzy
 msgid "Attachment properties"
 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 ""
 
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:290
-#: mail/mail-format.c:621
+#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:303
+#: mail/mail-format.c:626
 #, fuzzy
 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:291
+#: 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:295 mail/mail-format.c:625
+#: composer/e-msg-composer-hdrs.c:308 mail/mail-format.c:630
 msgid "To:"
 msgstr "пЯОР:"
 
-#: composer/e-msg-composer-hdrs.c:296
+#: composer/e-msg-composer-hdrs.c:309
 msgid "Enter the recipients of the message"
 msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:627
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:632
 msgid "Cc:"
 msgstr "аМТъЦЯАЖО:"
 
-#: composer/e-msg-composer-hdrs.c:301
+#: 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:306
+#: composer/e-msg-composer-hdrs.c:319
 msgid "Bcc:"
 msgstr "йЯУЖЭ АМТъЦЯАЖО:"
 
-#: composer/e-msg-composer-hdrs.c:307
+#: 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."
@@ -3444,98 +3582,98 @@ msgstr ""
 "еИСэЦЕТЕ ТИР ДИЕУХЩМСЕИР ЭПОУ ХА СТАКЕъ АМТъЦЯАЖО ТОУ ЛГМЩЛАТОР ВЫЯъР АУТщР "
 "МА ЕЛЖАМИСТОЩМ СТОМ ЙАТэКОЦО ПАЯАКГПТЧМ ТОУ ЛГМЩЛАТОР."
 
-#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:629
+#: composer/e-msg-composer-hdrs.c:326 mail/mail-format.c:634
 msgid "Subject:"
 msgstr "хщЛА:"
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Enter the subject of the mail"
 msgstr "еИСэЦЕТЕ ТО ХщЛА ТОУ ЛГМЩЛАТОР"
 
-#: composer/e-msg-composer.c:429
+#: composer/e-msg-composer.c:430
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:599
+#: composer/e-msg-composer.c:600
 msgid "Save as..."
 msgstr ""
 
-#: composer/e-msg-composer.c:610
+#: composer/e-msg-composer.c:611
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:630
+#: composer/e-msg-composer.c:631
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:652
+#: composer/e-msg-composer.c:653
 #, fuzzy
 msgid "Saving changes to message..."
 msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
 
-#: composer/e-msg-composer.c:654
+#: composer/e-msg-composer.c:655
 #, fuzzy
 msgid "Save changes to message..."
 msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
 
-#: composer/e-msg-composer.c:695
+#: composer/e-msg-composer.c:696
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:739 shell/e-shell-view-menu.c:170
+#: composer/e-msg-composer.c:741 shell/e-shell-view-menu.c:167
 msgid "Evolution"
 msgstr ""
 
-#: composer/e-msg-composer.c:745
+#: 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:767
+#: composer/e-msg-composer.c:772
 #, fuzzy
 msgid "Open file"
 msgstr "╤МОИЦЛА жАЙщККОУ"
 
-#: composer/e-msg-composer.c:893
+#: composer/e-msg-composer.c:898
 msgid "That file does not exist."
 msgstr ""
 
-#: composer/e-msg-composer.c:903
+#: composer/e-msg-composer.c:908
 msgid "That is not a regular file."
 msgstr ""
 
-#: composer/e-msg-composer.c:913
+#: composer/e-msg-composer.c:918
 msgid "That file exists but is not readable."
 msgstr ""
 
-#: composer/e-msg-composer.c:923
+#: composer/e-msg-composer.c:928
 msgid "That file appeared accesible but open(2) failed."
 msgstr ""
 
-#: composer/e-msg-composer.c:945
+#: 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:966
+#: composer/e-msg-composer.c:971
 msgid "An error occurred while reading the file."
 msgstr ""
 
-#: composer/e-msg-composer.c:1343
+#: composer/e-msg-composer.c:1350
 #, fuzzy
 msgid "Compose a message"
 msgstr "сУЦЦЯАЖч МщОУ ЛГМЩЛАТОР"
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1427
 msgid "Could not create composer window."
 msgstr ""
 
@@ -3549,15 +3687,28 @@ msgid "Sear_ch"
 msgstr ""
 
 #: filter/filter-datespec.c:62
+msgid "year"
+msgstr ""
+
+#: filter/filter-datespec.c:62
 msgid "years"
 msgstr ""
 
 #: filter/filter-datespec.c:63
 #, fuzzy
+msgid "month"
+msgstr "цМЫЯИЛъЕР"
+
+#: filter/filter-datespec.c:63
+#, fuzzy
 msgid "months"
 msgstr "цМЫЯИЛъЕР"
 
 #: filter/filter-datespec.c:64
+msgid "week"
+msgstr ""
+
+#: filter/filter-datespec.c:64
 msgid "weeks"
 msgstr ""
 
@@ -3567,15 +3718,28 @@ msgid "days"
 msgstr "пЯЭВЕИЯА"
 
 #: filter/filter-datespec.c:66
+msgid "hour"
+msgstr ""
+
+#: filter/filter-datespec.c:66
 msgid "hours"
 msgstr ""
 
 #: filter/filter-datespec.c:67
+msgid "minute"
+msgstr ""
+
+#: filter/filter-datespec.c:67
 msgid "minutes"
 msgstr ""
 
 #: filter/filter-datespec.c:68
 #, fuzzy
+msgid "second"
+msgstr "аПОСТОКч"
+
+#: filter/filter-datespec.c:68
+#, fuzzy
 msgid "seconds"
 msgstr "аПОСТОКч"
 
@@ -3625,6 +3789,10 @@ msgstr ""
 msgid "Compare against"
 msgstr ""
 
+#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
+msgid "now"
+msgstr ""
+
 #: filter/filter-datespec.c:690
 msgid "<click here to select a date>"
 msgstr ""
@@ -3649,7 +3817,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
 #, fuzzy
 msgid "Edit Filters"
 msgstr "_жэЙЕККОР"
@@ -3688,261 +3856,271 @@ msgstr ""
 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"
 "%s"
 msgstr ""
 
-#: filter/filter-message-search.c:379 filter/filter-message-search.c:447
+#: filter/filter-message-search.c:380 filter/filter-message-search.c:448
 #, c-format
 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:520
+#: filter/filter-rule.c:530
 #, fuzzy
 msgid "Rule name: "
 msgstr "лЕТОМОЛАСъА оЛэДАР"
 
-#: filter/filter-rule.c:524
+#: filter/filter-rule.c:534
 msgid "Untitled"
 msgstr ""
 
-#: filter/filter-rule.c:540
+#: filter/filter-rule.c:550
 msgid "If"
 msgstr ""
 
-#: filter/filter-rule.c:557
+#: filter/filter-rule.c:567
 #, fuzzy
 msgid "Execute actions"
 msgstr "е_МщЯЦЕИЕР"
 
-#: filter/filter-rule.c:561
+#: filter/filter-rule.c:571
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:566
+#: filter/filter-rule.c:576
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:577
+#: filter/filter-rule.c:587
 msgid "Add criterion"
 msgstr ""
 
-#: filter/filter-rule.c:583
+#: filter/filter-rule.c:593
 #, fuzzy
 msgid "Remove criterion"
 msgstr "дИАЦЯАЖч оЛэДАР"
 
-#: mail/folder-browser.c:465 po/tmp/filter.glade.h:8
-#: po/tmp/mail-config.glade.h:9
-msgid "Edit"
+#: filter/filter-system-flag.c:63
+msgid "Replied to"
+msgstr ""
+
+#. { _("Deleted"), "Deleted" },
+#. { _("Draft"), "Draft" },
+#: filter/filter-system-flag.c:66
+msgid "Important"
 msgstr ""
 
-#: po/tmp/filter.glade.h:10
+#: filter/filter-system-flag.c:67
+#, fuzzy
+msgid "Read"
+msgstr "дИАЦЯАЖч"
+
+#: filter/filter.glade.h:10
 #, fuzzy
 msgid "Edit VFolders"
 msgstr "_жэЙЕККОР"
 
-#: po/tmp/filter.glade.h:11
+#: filter/filter.glade.h:11
 #, fuzzy
 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
 #, fuzzy
 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
+#, fuzzy
+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
+#, fuzzy
+msgid "contains"
+msgstr "е_МщЯЦЕИЕР"
+
+#: filter/libfilter-i18n.h:7
 #, fuzzy
 msgid "Copy to Folder"
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:8
 #, fuzzy
 msgid "Date received"
 msgstr "еКчЖХГ"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:9
 #, fuzzy
 msgid "Date sent"
 msgstr "еПИЙЭККГСГ"
 
-#: filter/libfilter-i18n.h:8
-#, fuzzy
-msgid "Expression"
-msgstr "е_МщЯЦЕИЕР"
-
-#: filter/libfilter-i18n.h:9
-#, fuzzy
-msgid "Forward to Address"
-msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
-
-#: filter/libfilter-i18n.h:10
-#, fuzzy
-msgid "Message Body"
-msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
-
 #: filter/libfilter-i18n.h:11
-#, fuzzy
-msgid "Message Header"
-msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
+msgid "does not contain"
+msgstr ""
 
 #: filter/libfilter-i18n.h:12
-msgid "Message was received"
+msgid "does not end with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:13
-#, fuzzy
-msgid "Message was sent"
-msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
+msgid "does not exist"
+msgstr ""
 
 #: filter/libfilter-i18n.h:14
-#, fuzzy
-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"
+msgid "ends with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:17
-msgid "Regex Match"
+msgid "exists"
 msgstr ""
 
 #: filter/libfilter-i18n.h:18
 #, fuzzy
-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
-#, fuzzy
-msgid "Source"
-msgstr "мщА сУМТЭЛЕУСГ"
+msgid "is"
+msgstr ""
 
 #: filter/libfilter-i18n.h:21
-msgid "Specific header"
+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 "хщЛА"
+#, fuzzy
+msgid "Message Body"
+msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
 
 #: filter/libfilter-i18n.h:25
 #, fuzzy
-msgid "after"
-msgstr "еПИЙЭККГСГ"
+msgid "Message Header"
+msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
 
 #: filter/libfilter-i18n.h:26
-msgid "before"
+msgid "Message was received"
 msgstr ""
 
 #: filter/libfilter-i18n.h:27
 #, fuzzy
-msgid "contains"
-msgstr "е_МщЯЦЕИЕР"
+msgid "Message was sent"
+msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
 
 #: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr ""
+#, fuzzy
+msgid "Move to Folder"
+msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
 #: filter/libfilter-i18n.h:29
-msgid "does not end with"
+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"
+msgid "on or before"
 msgstr ""
 
 #: filter/libfilter-i18n.h:32
-msgid "does not start with"
+msgid "Recipients"
 msgstr ""
 
 #: filter/libfilter-i18n.h:33
-msgid "ends with"
+msgid "Regex Match"
 msgstr ""
 
 #: filter/libfilter-i18n.h:34
-msgid "exists"
-msgstr ""
+#, fuzzy
+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"
+msgid "sounds like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:37
-msgid "is not"
-msgstr ""
+#, fuzzy
+msgid "Source"
+msgstr "мщА сУМТЭЛЕУСГ"
 
 #: filter/libfilter-i18n.h:38
-msgid "is"
+msgid "Specific header"
 msgstr ""
 
 #: filter/libfilter-i18n.h:39
-msgid "on or after"
+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"
+msgid "Stop Processing"
 msgstr ""
 
 #: filter/libfilter-i18n.h:42
-msgid "starts with"
-msgstr ""
+msgid "Subject"
+msgstr "хщЛА"
 
 #: filter/libfilter-i18n.h:43
 msgid "was after"
@@ -3974,142 +4152,219 @@ msgstr ""
 msgid "Edit VFolder Rule"
 msgstr "_жэЙЕККОР"
 
-#: mail/component-factory.c:227
+#: mail/component-factory.c:277
 #, fuzzy
 msgid "Cannot initialize Evolution's mail component."
 msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
 
-#: mail/component-factory.c:266
+#: 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:16
+#: 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
 #, fuzzy
 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:453
+#: mail/folder-browser.c:643
 msgid "VFolder on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:454
+#: mail/folder-browser.c:644
 msgid "VFolder on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:455
+#: mail/folder-browser.c:645
 msgid "VFolder on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:457
+#: mail/folder-browser.c:647
 msgid "Filter on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:458
+#: mail/folder-browser.c:648
 msgid "Filter on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:459
+#: mail/folder-browser.c:649
 msgid "Filter on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:460 mail/folder-browser.c:544
+#: mail/folder-browser.c:650 mail/folder-browser.c:779
 msgid "Filter on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:14
+#: mail/folder-browser.c:655
+msgid "Show all hidden"
+msgstr ""
+
+#: mail/folder-browser.c:657
+msgid "Hide selected"
+msgstr ""
+
+#. could use another mask, but not enough api do to it
+#: mail/folder-browser.c:660
+msgid "Hide read"
+msgstr ""
+
+#: mail/folder-browser.c:661
+msgid "Hide deleted"
+msgstr ""
+
+#: mail/folder-browser.c:663 mail/folder-browser.c:790
+#, fuzzy
+msgid "Hide Subject"
+msgstr "хщЛА"
+
+#: mail/folder-browser.c:665 mail/folder-browser.c:796
+msgid "Hide from Sender"
+msgstr ""
+
+#: mail/folder-browser.c:670 ui/evolution-message-composer.xml.h:15
 #, fuzzy
 msgid "Open"
 msgstr "╤МОИ_ЦЛА"
 
-#: mail/folder-browser.c:466
+#: mail/folder-browser.c:672
 msgid "Save As..."
 msgstr ""
 
-#: mail/folder-browser.c:467 mail/mail-view.c:163
-#: po/tmp/evolution-addressbook.xml.h:13 po/tmp/evolution-calendar.xml.h:23
-#: po/tmp/evolution-mail.xml.h:28
+#: 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
 #, fuzzy
 msgid "Print"
 msgstr "пЯОТЕЯАИЭТГТА"
 
-#: mail/folder-browser.c:469
+#: mail/folder-browser.c:675
 msgid "Reply to Sender"
 msgstr ""
 
-#: mail/folder-browser.c:470 mail/mail-view.c:156
-#: po/tmp/evolution-mail.xml.h:34
+#: 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:471 mail/mail-view.c:159
-#: 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:472 po/tmp/evolution-mail.xml.h:18
+#: mail/folder-browser.c:678 ui/evolution-mail.xml.h:18
 msgid "Forward inline"
 msgstr ""
 
-#: mail/folder-browser.c:474
+#: mail/folder-browser.c:680
 msgid "Mark as Read"
 msgstr ""
 
-#: mail/folder-browser.c:475
+#: mail/folder-browser.c:681
 msgid "Mark as Unread"
 msgstr ""
 
-#: mail/folder-browser.c:477
+#: mail/folder-browser.c:683
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: mail/folder-browser.c:478
+#: mail/folder-browser.c:684
 #, fuzzy
 msgid "Copy to Folder..."
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: mail/folder-browser.c:480
+#: 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:484
+#: mail/folder-browser.c:690
 #, fuzzy
 msgid "Apply Filters"
 msgstr "_жэЙЕККОР"
 
-#: mail/folder-browser.c:486 po/tmp/evolution-mail.xml.h:10
+#: mail/folder-browser.c:692 ui/evolution-mail.xml.h:10
 #, fuzzy
 msgid "Create Rule From Message"
 msgstr "пЯЭВЕИЯА ЛГМЩЛАТА"
 
-#: mail/folder-browser.c:546
+#: mail/folder-browser.c:693 ui/evolution-mail.xml.h:21
+#, fuzzy
+msgid "Hide Messages"
+msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
+
+#: mail/folder-browser.c:781
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
+#: mail/folder-browser.c:787
+#, fuzzy, c-format
+msgid "Hide Subject \"%s\""
+msgstr "хщЛА"
+
+#: 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 "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
+
+#: mail/local-config.glade.h:7
+#, fuzzy
+msgid "Mailbox Format"
+msgstr "аПЭ"
+
+#: mail/local-config.glade.h:8
+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
+#, fuzzy
+msgid "mbox"
+msgstr "еИСЕЯВЭЛЕМА"
+
+#: mail/local-config.glade.h:12
+msgid "mh"
+msgstr ""
+
 #: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
@@ -4162,97 +4417,316 @@ 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
+#, fuzzy
+msgid "Forwarded message:\n"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#: 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:665
+#: mail/mail-callbacks.c:748
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:699 mail/mail-display.c:72
+#: mail/mail-callbacks.c:781 mail/mail-display.c:79
 msgid "Overwrite file?"
 msgstr ""
 
-#: mail/mail-callbacks.c:703 mail/mail-display.c:76
+#: mail/mail-callbacks.c:785 mail/mail-display.c:83
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: mail/mail-callbacks.c:748
+#: mail/mail-callbacks.c:830
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:750
+#: mail/mail-callbacks.c:832
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:877
+#: mail/mail-callbacks.c:916
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:922
+#: mail/mail-callbacks.c:961
 #, fuzzy
 msgid "Print Message"
 msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: mail/mail-callbacks.c:969
+#: 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
+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
+msgid "Authentication"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:13
+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
+msgid "Default"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:26
+msgid "Delete mail from server"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:27
+#, fuzzy
+msgid "Done"
+msgstr "сГЛЕъЫ_ЛА"
+
+#: mail/mail-config-druid.glade.h:28
+msgid "E-Mail Address:"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:30
+msgid "Email Address:"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:31
+#, fuzzy
+msgid "Evolution Mail Configuration"
+msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
+
+#: 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
+msgid "IMAP"
+msgstr ""
+
+#: 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
+msgid "Kerberos"
+msgstr ""
+
+#: 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
+#: mail/mail-config-druid.glade.h:43
+msgid "Mail Configuration Druid"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:44
+msgid "Make this my default account"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:46
 #, fuzzy
-msgid "Mail Source"
-msgstr "йУЯъЫР сУМТОЛЕЩСЕИР"
+msgid "News"
+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: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 ""
+
+#: mail/mail-config-druid.glade.h:51
+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:10
-msgid "Welcome to the Evolution Mail configuration wizard!\n"
+#: mail/mail-config-druid.glade.h:55
+msgid "Remember my password"
 msgstr ""
 
-#: po/tmp/mail-config-druid.glade.h:14
+#: mail/mail-config-druid.glade.h:56 mail/mail-format.c:628
+msgid "Reply-To:"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:57
+msgid "Reply-to:"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:58
+msgid "Required"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:60
+#, fuzzy
+msgid "Save password"
+msgstr "гЛЕЯОКЭЦИО"
+
+#: mail/mail-config-druid.glade.h:61
+msgid "Select signature file"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:62
+#, fuzzy
+msgid "Sending Email"
+msgstr "аПОСТОКч"
+
+#: mail/mail-config-druid.glade.h:64
+msgid "Server Configuration"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:65
+msgid "Server Timeouts"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:66
+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
+msgid "Signature:"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:71 mail/mail-config.glade.h:20
+#, fuzzy
+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
+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
+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, "
@@ -4268,15 +4742,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 ""
 
@@ -4284,27 +4750,10 @@ msgstr ""
 msgid "Server:"
 msgstr ""
 
-#: mail/mail-config-gui.c:928
-msgid "Username:"
-msgstr ""
-
-#: mail/mail-config-gui.c:934
-#, fuzzy
-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 ""
@@ -4318,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"
@@ -4344,6 +4793,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 ""
@@ -4394,530 +4851,442 @@ 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
 #, fuzzy
 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
 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
 #, fuzzy
 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 ""
 
-#: po/tmp/mail-config.glade.h:20
-#, fuzzy
-msgid "Sources"
-msgstr "мщА сУМТЭЛЕУСГ"
-
-#: mail/mail-crypto.c:350 mail/mail-crypto.c:452 mail/mail-crypto.c:629
+#: 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."
 msgstr ""
 
-#: mail/mail-crypto.c:354 mail/mail-crypto.c:456 mail/mail-crypto.c:634
+#: mail/mail-crypto.c:357 mail/mail-crypto.c:462 mail/mail-crypto.c:640
+#: mail/mail-crypto.c:785
 msgid "No password provided."
 msgstr ""
 
-#: mail/mail-crypto.c:360 mail/mail-crypto.c:463 mail/mail-crypto.c:640
+#: mail/mail-crypto.c:363 mail/mail-crypto.c:469 mail/mail-crypto.c:646
+#: mail/mail-crypto.c:792 mail/mail-crypto.c:942
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: mail/mail-crypto.c:625
+#: mail/mail-crypto.c:631 mail/mail-crypto.c:777 mail/mail-crypto.c:936
 msgid "No GPG/PGP program available."
 msgstr ""
 
-#: mail/mail-display.c:90
+#: mail/mail-crypto.c:953
+#, fuzzy, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+
+#: mail/mail-display.c:98
 #, c-format
 msgid ""
 "Could not open file %s:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-display.c:113
+#: mail/mail-display.c:131
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-display.c:218
+#: mail/mail-display.c:229
 #, fuzzy
 msgid "Save Attachment"
 msgstr "мщА ЕПИСЩМАЬГ..."
 
-#: mail/mail-display.c:258
+#: mail/mail-display.c:269
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/mail-display.c:300
+#: mail/mail-display.c:311
 msgid "Save to Disk..."
 msgstr ""
 
-#: mail/mail-display.c:302
+#: mail/mail-display.c:313
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/mail-display.c:304
+#: mail/mail-display.c:315
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:328
+#: mail/mail-display.c:339
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:351
+#: mail/mail-display.c:362
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:355
+#: mail/mail-display.c:366
 msgid "Hide"
 msgstr ""
 
-#: mail/mail-format.c:500
+#: mail/mail-format.c:503
 #, fuzzy, c-format
 msgid "%s attachment"
 msgstr "мЕА ЕПИСЩМАЬГ"
 
-#: mail/mail-format.c:623
-msgid "Reply-To:"
-msgstr ""
-
-#: mail/mail-format.c:845
+#: mail/mail-format.c:851
 msgid "No GPG/PGP support available in this copy of Evolution."
 msgstr ""
 
-#: mail/mail-format.c:857
+#: mail/mail-format.c:863
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:869
 #, fuzzy
 msgid "Encrypted message"
 msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
 
-#: mail/mail-format.c:864
+#: mail/mail-format.c:870
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1470
+#: mail/mail-format.c:1450
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1482
+#: mail/mail-format.c:1462
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1486
+#: mail/mail-format.c:1466
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1520
+#: mail/mail-format.c:1500
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1525
+#: mail/mail-format.c:1505
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-format.c:1695
+#: mail/mail-format.c:1675
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr ""
 
-#: mail/mail-local.c:202
+#: mail/mail-local.c:204
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:206
+#: mail/mail-local.c:208
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:261
+#: mail/mail-local.c:251
+#, fuzzy
+msgid "Reconfiguring folder"
+msgstr "_мщОР жэЙЕККОР"
+
+#: mail/mail-local.c:269
 msgid "Closing current folder"
 msgstr ""
 
-#: mail/mail-local.c:293
+#: mail/mail-local.c:295
 msgid "Renaming old folder and opening"
 msgstr ""
 
-#: mail/mail-local.c:314
+#: mail/mail-local.c:313
 #, fuzzy
 msgid "Creating new folder"
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: mail/mail-local.c:329
+#: mail/mail-local.c:327
 #, fuzzy
 msgid "Copying messages"
 msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: mail/mail-local.c:341
+#: 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:372
+#: 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:781
+#: mail/mail-local.c:787
 msgid "Registering local folder"
 msgstr ""
 
-#: mail/mail-local.c:783
+#: mail/mail-local.c:789
 msgid "Register local folder"
 msgstr ""
 
-#: mail/mail-ops.c:79
+#: mail/mail-local.c:894
+#, fuzzy, c-format
+msgid ""
+"Unable to register folder '%s':\n"
+"%s"
+msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+
+#: mail/mail-mt.c:85
+#, c-format
+msgid ""
+"Error while '%s':\n"
+"%s"
+msgstr ""
+
+#: mail/mail-mt.c:87
+#, c-format
+msgid ""
+"Error while performing operation:\n"
+"%s"
+msgstr ""
+
+#: mail/mail-mt.c:356 mail/mail-mt.c:385
+msgid "Working"
+msgstr ""
+
+#: mail/mail-ops.c:88
 #, c-format
 msgid "Fetching email from %s"
 msgstr ""
 
-#: mail/mail-ops.c:81
+#: mail/mail-ops.c:90
 #, c-format
 msgid "Fetch email from %s"
 msgstr ""
 
-#: mail/mail-ops.c:331
+#: mail/mail-ops.c:335
 #, c-format
 msgid "There is no new mail at %s."
 msgstr ""
 
-#: 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:538
+#: mail/mail-ops.c:551
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:543
-msgid "Sending a message without a subject"
-msgstr ""
-
-#: mail/mail-ops.c:546
-#, fuzzy, c-format
-msgid "Send \"%s\""
-msgstr "е_МщЯЦЕИЕР"
-
-#: mail/mail-ops.c:549
-msgid "Send a message without a subject"
-msgstr ""
+#: mail/mail-ops.c:553
+#, fuzzy
+msgid "Sending message"
+msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: mail/mail-ops.c:720
+#: mail/mail-ops.c:669
 msgid "Sending queue"
 msgstr ""
 
-#: mail/mail-ops.c:722
+#: mail/mail-ops.c:671
 msgid "Send queue"
 msgstr ""
 
-#: mail/mail-ops.c:858 mail/mail-ops.c:865
+#: mail/mail-ops.c:804 mail/mail-ops.c:811
 #, c-format
 msgid "Appending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:862 mail/mail-ops.c:868
+#: mail/mail-ops.c:808 mail/mail-ops.c:814
 msgid "Appending a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:940
-#, c-format
-msgid "Expunging \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:942
-#, c-format
-msgid "Expunge \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1001
+#: mail/mail-ops.c:897
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:899
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1006
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1008
+#: mail/mail-ops.c:904
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1039
+#: mail/mail-ops.c:935
 msgid "Moving"
 msgstr ""
 
-#: mail/mail-ops.c:1042
+#: mail/mail-ops.c:938
 #, fuzzy
 msgid "Copying"
 msgstr "аМТИЦЯАЖч"
 
-#: mail/mail-ops.c:1062
+#: mail/mail-ops.c:958
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1141
-#, fuzzy, c-format
-msgid "Marking messages in folder \"%s\""
-msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
-
-#: mail/mail-ops.c:1144
-#, fuzzy, c-format
-msgid "Mark messages in folder \"%s\""
-msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
-
-#: mail/mail-ops.c:1175
-#, c-format
-msgid "Marking message %d of %d"
-msgstr ""
-
-#: mail/mail-ops.c:1295
+#: mail/mail-ops.c:1033
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1297
-#, c-format
-msgid "Scan folders in \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1366 mail/subscribe-dialog.c:339
+#: mail/mail-ops.c:1099 mail/subscribe-dialog.c:341
 msgid "(No description)"
 msgstr ""
 
-#: mail/mail-ops.c:1432
-#, c-format
-msgid "Attaching messages from folder \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1435
-#, c-format
-msgid "Attach messages from \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1535
-#, fuzzy, c-format
-msgid "Forwarding messages \"%s\""
-msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
-
-#: mail/mail-ops.c:1539
-msgid "Forwarding a message without a subject"
-msgstr ""
-
-#: mail/mail-ops.c:1542
-#, fuzzy, c-format
-msgid "Forward message \"%s\""
-msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
-
-#: mail/mail-ops.c:1546
-msgid "Forward a message without a subject"
-msgstr ""
-
-#: mail/mail-ops.c:1593
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1610
-msgid ""
-"Failed to generate mime part from message while generating forwarded message."
-msgstr ""
-
-#: mail/mail-ops.c:1665
+#: mail/mail-ops.c:1164
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: mail/mail-ops.c:1679
-#, fuzzy
-msgid "Forwarded message:\n"
-msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
-
-#: mail/mail-ops.c:1748
-#, c-format
-msgid "Loading \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1750
-#, c-format
-msgid "Load \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1853
-#, c-format
-msgid "Creating \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1855
-#, c-format
-msgid "Create \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1903
-msgid "Exception while reporting result to shell component listener."
-msgstr ""
-
-#: mail/mail-ops.c:1949
-#, c-format
-msgid "Synchronizing \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1951
-#, c-format
-msgid "Synchronize \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:2015
-#, c-format
-msgid "Displaying message UID \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:2018
-msgid "Clearing message display"
-msgstr ""
+#: mail/mail-ops.c:1205 mail/mail-ops.c:1274
+#, fuzzy, c-format
+msgid "Opening folder %s"
+msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: mail/mail-ops.c:2021
-#, c-format
-msgid "Display message UID \"%s\""
+#: mail/mail-ops.c:1336
+msgid "Synchronising folder"
 msgstr ""
 
-#: mail/mail-ops.c:2024
-msgid "Clear message display"
+#: mail/mail-ops.c:1386
+msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:2137
-#, c-format
-msgid "Opening messages from folder \"%s\""
-msgstr ""
+#: mail/mail-ops.c:1434
+#, fuzzy, c-format
+msgid "Retrieving message %s"
+msgstr "мщА ЛГМЩЛАТА"
 
-#: mail/mail-ops.c:2140
-#, c-format
-msgid "Open messages from \"%s\""
-msgstr ""
+#: mail/mail-ops.c:1497
+#, fuzzy
+msgid "Retrieving messages"
+msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:1507
 #, c-format
-msgid "Loading %s Folder"
+msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:2246
+#: mail/mail-ops.c:1655
 #, c-format
-msgid "Load %s Folder"
+msgid "Loading %s Folder for %s"
 msgstr ""
 
-#: mail/mail-ops.c:2310
+#: mail/mail-ops.c:1657
 #, c-format
-msgid "Viewing messages from folder \"%s\""
+msgid "Load %s Folder for %s"
 msgstr ""
 
-#: mail/mail-ops.c:2313
-#, fuzzy, c-format
-msgid "View messages from \"%s\""
-msgstr "мщА ЛГМЩЛАТА"
-
-#: mail/mail-ops.c:2339
-#, c-format
-msgid "Retrieving message %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:2428
-#, fuzzy, c-format
-msgid "Saving messages from folder \"%s\""
-msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+#: mail/mail-ops.c:1823
+#, fuzzy
+msgid "Saving messages"
+msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: mail/mail-ops.c:2431
+#: mail/mail-ops.c:1902
 #, fuzzy, c-format
-msgid "Save messages from folder \"%s\""
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: mail/mail-ops.c:2474
+#: mail/mail-ops.c:1915
 #, 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 "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
 #: mail/mail-search-dialogue.c:104
 msgid "Cancel"
 msgstr ""
 
-#: mail/mail-summary.c:105 mail/mail-threads.c:728
+#: mail/mail-summary.c:110 mail/mail-threads.c:729
 msgid "Incomplete message written on pipe!"
 msgstr ""
 
-#: mail/mail-threads.c:301
+#: mail/mail-threads.c:302
 #, c-format
 msgid ""
 "Error while preparing to %s:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-threads.c:675
+#: mail/mail-threads.c:676
 #, c-format
 msgid ""
 "Error while `%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-threads.c:732
+#: mail/mail-threads.c:733
 msgid "Error reading commands from dispatching thread."
 msgstr ""
 
-#: mail/mail-threads.c:797
+#: mail/mail-threads.c:798
 msgid "Corrupted message from dispatching thread?"
 msgstr ""
 
-#: mail/mail-threads.c:916
+#: mail/mail-threads.c:917
 msgid "Could not create dialog box."
 msgstr ""
 
-#: mail/mail-threads.c:927
+#: mail/mail-threads.c:928
 msgid "User cancelled query."
 msgstr ""
 
@@ -4927,138 +5296,151 @@ msgid "Couldn't create temporary mbox `%s': %s"
 msgstr ""
 
 #. Get all uids of source
-#: mail/mail-tools.c:239
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Examining %s"
 msgstr ""
 
-#: mail/mail-tools.c:269
+#: mail/mail-tools.c:271
 #, c-format
 msgid ""
 "Could not read UID cache file \"%s\". You may receive duplicate messages."
 msgstr ""
 
-#. Info
-#: mail/mail-tools.c:290
+#: mail/mail-tools.c:300
 #, c-format
 msgid "Retrieving message %d of %d"
 msgstr ""
 
 #. Append it to dest
-#: mail/mail-tools.c:303
+#: mail/mail-tools.c:315
 #, c-format
 msgid "Writing message %d of %d"
 msgstr ""
 
-#: mail/mail-tools.c:332
+#: mail/mail-tools.c:347
 #, c-format
 msgid "Saving changes to %s"
 msgstr ""
 
-#: mail/mail-tools.c:369
+#: mail/mail-tools.c:381
 #, fuzzy, c-format
 msgid "[%s] (forwarded message)"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: mail/mail-tools.c:379
+#: mail/mail-tools.c:391
 msgid "Fwd: (no subject)"
 msgstr ""
 
-#: mail/mail-tools.c:418
+#: mail/mail-tools.c:427
 #, fuzzy, c-format
 msgid "Forwarded message - %s"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: mail/mail-tools.c:420
+#: mail/mail-tools.c:429
 #, fuzzy
 msgid "Forwarded message (no subject)"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: mail/mail-tools.c:523
+#: mail/mail-tools.c:530
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-vfolder.c:147
+#: mail/mail-vfolder.c:149
 #, fuzzy
 msgid "VFolders"
 msgstr "_жэЙЕККОР"
 
-#: mail/mail-vfolder.c:296
+#: mail/mail-vfolder.c:298
 #, fuzzy
 msgid "New VFolder"
 msgstr "_мщОР жэЙЕККОР"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:33
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:37
 msgid "Reply"
 msgstr ""
 
-#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:38
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
 #, fuzzy
 msgid "Reply to the sender of this message"
 msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: mail/mail-view.c:156 po/tmp/evolution-mail.xml.h:37
+#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
 #, fuzzy
 msgid "Reply to all recipients of this message"
 msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: mail/mail-view.c:159 po/tmp/evolution-mail.xml.h:19
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:19
 #, fuzzy
 msgid "Forward this message"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: mail/mail-view.c:163 po/tmp/evolution-mail.xml.h:32
+#: mail/mail-view.c:148 ui/evolution-mail.xml.h:36
 #, fuzzy
 msgid "Print the selected message"
 msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: mail/mail-view.c:165 po/tmp/evolution-mail.xml.h:12
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:12
 #, fuzzy
 msgid "Delete this message"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: mail/message-list.c:572
+#: mail/message-list.c:590
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:575
+#: mail/message-list.c:593
 #, fuzzy
 msgid "Seen"
 msgstr "аПОСТОКч"
 
-#: mail/message-list.c:578
+#: mail/message-list.c:596
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:846
+#: mail/message-list.c:881
 #, c-format
 msgid "[ %s ]"
 msgstr ""
 
 #. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:858 mail/message-list.c:873
+#: mail/message-list.c:893 mail/message-list.c:909
 #, c-format
 msgid "%s, et al."
 msgstr ""
 
-#: mail/message-list.c:860 mail/message-list.c:875
+#: mail/message-list.c:896 mail/message-list.c:912
 msgid "<unknown>"
 msgstr ""
 
-#: mail/message-list.c:2068
-#, fuzzy
-msgid "Rebuilding message view"
-msgstr "мщА ЛГМЩЛАТА"
+#: mail/message-list.c:965
+msgid "?"
+msgstr ""
 
-#: mail/message-list.c:2070
-#, fuzzy
-msgid "Rebuild message view"
-msgstr "мщА ЛГМЩЛАТА"
+#: mail/message-list.c:972
+msgid "Today %l:%M %p"
+msgstr ""
+
+#: mail/message-list.c:981
+msgid "Yesterday %l:%M %p"
+msgstr ""
+
+#: mail/message-list.c:993
+msgid "%a %l:%M %p"
+msgstr ""
+
+#: mail/message-list.c:1001
+msgid "%b %d %l:%M %p"
+msgstr ""
+
+#: mail/message-list.c:1003
+msgid "%b %d %Y"
+msgstr ""
 
 #: mail/subscribe-dialog.c:139
 msgid "Display folders starting with:"
@@ -5074,27 +5456,27 @@ msgstr ""
 msgid "Get store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:282
+#: mail/subscribe-dialog.c:283
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:286
+#: mail/subscribe-dialog.c:287
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:290
+#: mail/subscribe-dialog.c:291
 #, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:293
+#: mail/subscribe-dialog.c:294
 #, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr ""
 
-#: shell/e-setup.c:112 shell/e-setup.c:183
+#: shell/e-setup.c:112 shell/e-setup.c:185
 msgid "Evolution installation"
 msgstr ""
 
@@ -5108,23 +5490,23 @@ msgstr ""
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 
-#: shell/e-setup.c:155
+#: shell/e-setup.c:157
 msgid "Could not update files correctly"
 msgstr ""
 
-#: shell/e-setup.c:158 shell/e-setup.c:224
+#: shell/e-setup.c:160 shell/e-setup.c:228
 msgid "Evolution files successfully installed."
 msgstr ""
 
-#: shell/e-setup.c:187
+#: shell/e-setup.c:189
 msgid "This seems to be the first time you run Evolution."
 msgstr ""
 
-#: shell/e-setup.c:188
+#: shell/e-setup.c:190
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 
-#: shell/e-setup.c:205
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -5132,14 +5514,14 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: shell/e-setup.c:220
+#: shell/e-setup.c:224
 #, c-format
 msgid ""
 "Cannot copy files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:245
+#: shell/e-setup.c:249
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -5147,7 +5529,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:257
+#: shell/e-setup.c:261
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -5177,7 +5559,7 @@ msgid ""
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:291
+#: shell/e-shell-folder-selection-dialog.c:297
 #, fuzzy
 msgid "New..."
 msgstr "_мщО"
@@ -5186,30 +5568,26 @@ msgstr "_мщО"
 msgid "(Untitled)"
 msgstr ""
 
-#. you might have to call gnome_dialog_run() on the
-#. * dialog returned here, I don't remember...
-#.
-#: shell/e-shell-view-menu.c:114
+#: shell/e-shell-view-menu.c:111
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
-#. same as above
-#: shell/e-shell-view-menu.c:120
+#: shell/e-shell-view-menu.c:117
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:172
+#: shell/e-shell-view-menu.c:169
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:174
+#: shell/e-shell-view-menu.c:171
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
 "within the GNOME desktop environment."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:335
+#: shell/e-shell-view-menu.c:332
 #, fuzzy
 msgid "Go to folder..."
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
@@ -5313,9 +5691,8 @@ msgstr ""
 msgid "Error saving shortcuts."
 msgstr "йУЯъЫР сУМТОЛЕЩСЕИР"
 
-#: po/tmp/evolution-event-editor.xml.h:125
-#: po/tmp/evolution-message-composer.xml.h:43 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
 #, fuzzy
 msgid "_View"
 msgstr "_мщО"
@@ -5378,8 +5755,8 @@ msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
-"Over the last month and a half, our focus has been on making\n"
-"Evolution usable. Many of the Evolution developers are now using\n"
+"Over the time since the past release, our focus has been on making\n"
+"Evolution usable.  Many of the Evolution developers are now using\n"
 "Evolution to read their mail full time. You could too. (Just\n"
 "be sure to keep a backup.)\n"
 "\n"
@@ -5414,1188 +5791,1208 @@ msgstr ""
 msgid "Cannot initialize the Bonobo component system."
 msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-addressbook-ldap.xml.h:6
-msgid "N_ew Directory Server"
-msgstr ""
-
-#: po/tmp/evolution-addressbook-ldap.xml.h:7
-msgid "_Actions"
-msgstr "е_МщЯЦЕИЕР"
-
-#: 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
 #, fuzzy
 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
 #, fuzzy
 msgid "New"
 msgstr "_мщО"
 
-#: po/tmp/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:14
 #, fuzzy
 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
 #, fuzzy
 msgid "View all contacts"
 msgstr "еПИКщНТЕ ЕПИСЩМАЬГ"
 
-#: po/tmp/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:19
+msgid "_Addressbook Configuration..."
+msgstr ""
+
+#: ui/evolution-addressbook.xml.h:20
 #, fuzzy
 msgid "_Print Contacts..."
 msgstr "о ЙАТэКОЦОР ЦМЫЯИЛИЧМ САР"
 
-#: po/tmp/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:21
 msgid "_Search for contacts"
 msgstr ""
 
-#: po/tmp/evolution-addressbook.xml.h:21
-#: 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 ""
 
-#: 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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 ""
 
-#: po/tmp/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:27
 msgid "Show 1 month"
 msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:28
 msgid "Show 1 week"
 msgstr ""
 
-#: 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:414
+#: ui/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:413
 #, fuzzy
 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
 #, fuzzy
 msgid "_Open Calendar"
 msgstr "гЛЕЯОКЭЦИО"
 
-#: po/tmp/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:34
 #, fuzzy
 msgid "_Print this calendar"
 msgstr "тО ГЛЕЯОКЭЦИЭ САР"
 
-#: po/tmp/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:35
 #, fuzzy
-msgid "_Save Calendar As"
-msgstr "гЛЕЯОКЭЦИО"
+msgid "_Save As..."
+msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: po/tmp/evolution-contact-editor.xml.h:7
+#: ui/evolution-contact-editor.xml.h:7
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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:18
+#: ui/evolution-contact-editor.xml.h:13 ui/evolution-event-editor.xml.h:89
+#: ui/evolution-message-composer.xml.h:21
 #, fuzzy
 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:38
-#: 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
 #, fuzzy
 msgid "_File"
 msgstr "_жэЙЕККОР"
 
-#: po/tmp/evolution-contact-editor.xml.h:20
+#: ui/evolution-contact-editor.xml.h:20
 #, fuzzy
 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:42
+#: 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
 #, fuzzy
 msgid "Actio_ns"
 msgstr "е_МщЯЦЕИЕР"
 
-#: po/tmp/evolution-event-editor.xml.h:9
+#: ui/evolution-event-editor.xml.h:9
 #, fuzzy
 msgid "C_lear"
 msgstr "гЛЕЯОКЭЦИО"
 
-#: po/tmp/evolution-event-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:10
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "FIXME: Task _Request"
 msgstr "аъТГ_СГ еЙЙЯЕЛЭТГТАР"
 
-#: po/tmp/evolution-event-editor.xml.h:46
+#: ui/evolution-event-editor.xml.h:46
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 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
 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:10
+#: ui/evolution-event-editor.xml.h:66 ui/evolution-message-composer.xml.h:11
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Print S_etup..."
 msgstr "пЯОТЕЯАИЭТГТА"
 
-#: po/tmp/evolution-event-editor.xml.h:80
+#: ui/evolution-event-editor.xml.h:80
 #, fuzzy
 msgid "Print Setup"
 msgstr "пЯОТЕЯАИЭТГТА"
 
-#: po/tmp/evolution-event-editor.xml.h:83
+#: ui/evolution-event-editor.xml.h:83
 #, fuzzy
 msgid "Properties"
 msgstr "иДИЭТГТЕР"
 
-#: po/tmp/evolution-event-editor.xml.h:84
+#: ui/evolution-event-editor.xml.h:84
 #, fuzzy
 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
 #, fuzzy
 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:21
+#: 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
 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
 #, fuzzy
 msgid "Undo the last action"
 msgstr "аЙЩЯЫСГ ТЕКЕУТАъАР КЕИТОУЯЦъАР"
 
-#: po/tmp/evolution-event-editor.xml.h:104
-#: po/tmp/evolution-message-composer.xml.h:34
+#: 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:35
+#: 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
 #, fuzzy
 msgid "_Copy"
 msgstr "аМТИЦЯАЖч"
 
-#: po/tmp/evolution-event-editor.xml.h:107
-#: po/tmp/evolution-message-composer.xml.h:36
+#: 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:37
-#: 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
 #, fuzzy
 msgid "_Find..."
 msgstr "пЯОТЕЯАИЭТГТА"
 
-#: po/tmp/evolution-event-editor.xml.h:112
+#: ui/evolution-event-editor.xml.h:112
 #, fuzzy
 msgid "_Forms"
 msgstr "аПЭ"
 
-#: po/tmp/evolution-event-editor.xml.h:113
-#: po/tmp/evolution-message-composer.xml.h:39 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
 #, fuzzy
 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
 #, fuzzy
 msgid "_Object"
 msgstr "хщЛА"
 
-#: po/tmp/evolution-event-editor.xml.h:116
+#: ui/evolution-event-editor.xml.h:116
 #, fuzzy
 msgid "_Paste"
 msgstr "еПИЙЭККГСГ"
 
-#: po/tmp/evolution-event-editor.xml.h:117
+#: ui/evolution-event-editor.xml.h:117
 #, fuzzy
 msgid "_Print"
 msgstr "пЯОТЕЯАИЭТГТА"
 
-#: po/tmp/evolution-event-editor.xml.h:118
+#: ui/evolution-event-editor.xml.h:118
 #, fuzzy
 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
 #, fuzzy
 msgid "_Toolbars"
 msgstr "е_ЯЦАКЕъА"
 
-#: po/tmp/evolution-event-editor.xml.h:124
+#: ui/evolution-event-editor.xml.h:124
 #, fuzzy
 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
 #, fuzzy
 msgid "Compose a new message"
 msgstr "сУЦЦЯАЖч МщОУ ЛГМЩЛАТОР"
 
-#: po/tmp/evolution-mail.xml.h:9
+#: ui/evolution-mail.xml.h:9
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Get Mail"
 msgstr "_лчМУЛА"
 
-#: po/tmp/evolution-mail.xml.h:21
+#: ui/evolution-mail.xml.h:22
+#, fuzzy
+msgid "Hide _Deleted messages"
+msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
+
+#: ui/evolution-mail.xml.h:23
+#, fuzzy
+msgid "Hide _Read messages"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#: ui/evolution-mail.xml.h:24
+#, fuzzy
+msgid "Hide _Selected messages"
+msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
+
+#: ui/evolution-mail.xml.h:25
 #, fuzzy
-msgid "Mail _Filters"
+msgid "Mail _Filters..."
 msgstr "_жэЙЕККОР"
 
-#: po/tmp/evolution-mail.xml.h:22
-msgid "Manage Subscriptions"
+#: ui/evolution-mail.xml.h:26
+msgid "Manage Subscriptions..."
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:23
+#: ui/evolution-mail.xml.h:27
 msgid "Mar_k As Read"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:28
 msgid "Mark As U_nread"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:29
 #, fuzzy
 msgid "Move"
 msgstr "_лчМУЛА"
 
-#: po/tmp/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:30
 #, fuzzy
 msgid "Move message to a new folder"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: po/tmp/evolution-mail.xml.h:27
+#: ui/evolution-mail.xml.h:31
 msgid "Previews the message to be printed"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:29
+#: ui/evolution-mail.xml.h:33
 #, fuzzy
 msgid "Print Preview of message..."
 msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: po/tmp/evolution-mail.xml.h:30
+#: ui/evolution-mail.xml.h:34
 msgid "Print message to the printer"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:31
+#: ui/evolution-mail.xml.h:35
 #, fuzzy
 msgid "Print message..."
 msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: po/tmp/evolution-mail.xml.h:35
+#: ui/evolution-mail.xml.h:39
 msgid "Reply to _All"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:36
+#: ui/evolution-mail.xml.h:40
 msgid "Reply to _Sender"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:39 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:40
+#: ui/evolution-mail.xml.h:44
 msgid "Send queued mail and retrieve new mail"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:41
+#: ui/evolution-mail.xml.h:45
+#, fuzzy
+msgid "Show _All messages"
+msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
+
+#: ui/evolution-mail.xml.h:46
 msgid "Threaded Message list"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:42
+#: ui/evolution-mail.xml.h:47
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:48
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:49
 msgid "View Raw Message Source"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:50
 #, fuzzy
 msgid "_Apply Filters"
 msgstr "_жэЙЕККОР"
 
-#: po/tmp/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:51
 #, fuzzy
 msgid "_Configure Folder"
 msgstr "_мщОР жэЙЕККОР"
 
-#: po/tmp/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:52
 #, fuzzy
 msgid "_Copy to Folder..."
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: po/tmp/evolution-mail.xml.h:49
+#: ui/evolution-mail.xml.h:54
 #, fuzzy
 msgid "_Edit Message"
 msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
 
-#: po/tmp/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:55
 msgid "_Expunge"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:56
 msgid "_Filter on Subject"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:57
 msgid "_Forward"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:53 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:54
-msgid "_Mail Configuration"
+#: ui/evolution-mail.xml.h:59
+msgid "_Mail Configuration..."
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:60
 #, fuzzy
 msgid "_Message"
 msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
 
-#: po/tmp/evolution-mail.xml.h:56
+#: ui/evolution-mail.xml.h:61
 #, fuzzy
 msgid "_Move to Folder..."
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: po/tmp/evolution-mail.xml.h:57
+#: ui/evolution-mail.xml.h:62
 #, fuzzy
 msgid "_Open in New Window"
 msgstr "╤МОИЦЛА СЕ мщО пАЯэХУЯО"
 
-#: po/tmp/evolution-mail.xml.h:58
+#: ui/evolution-mail.xml.h:63
 #, fuzzy
 msgid "_Print Message"
 msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: po/tmp/evolution-mail.xml.h:59
+#: ui/evolution-mail.xml.h:64
 msgid "_Save Message As..."
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:60
+#: ui/evolution-mail.xml.h:65
 #, fuzzy
 msgid "_Source"
 msgstr "мщА сУМТЭЛЕУСГ"
 
-#: po/tmp/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:66
 msgid "_Threaded"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:67
 msgid "_Undelete"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:63
+#: ui/evolution-mail.xml.h:68
 msgid "_VFolder on Subject"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:64
-msgid "_Virtual Folder Editor"
-msgstr ""
+#: 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
 #, fuzzy
 msgid "Close the current file"
 msgstr "йКЕъСИЛО ЭКЫМ ТЫМ АМОИВТЧМ АМТИЙЕИЛщМЫМ"
 
-#: po/tmp/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Encrypt this message with PGP"
+msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
+
+#: ui/evolution-message-composer.xml.h:12
 msgid "HTML"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:13
 #, fuzzy
 msgid "Insert a file as text into the message"
 msgstr "еПИСЩМАЬГ АЯВЕъОУ СТО ЛчМУЛА"
 
-#: po/tmp/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:14
 msgid "Insert text file..."
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:16
 #, fuzzy
 msgid "Open a file"
 msgstr "╤МОИЦЛА жАЙщККОУ"
 
-#: po/tmp/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:17
+msgid "PGP Encrypt"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:18
+msgid "PGP Sign"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:20
 #, fuzzy
 msgid "Save As"
 msgstr "гЛЕЯОКЭЦИО"
 
-#: po/tmp/evolution-message-composer.xml.h:19
+#: ui/evolution-message-composer.xml.h:22
 #, fuzzy
 msgid "Save in _folder... (FIXME)"
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: po/tmp/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:23
 #, fuzzy
 msgid "Save in folder..."
 msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: po/tmp/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: po/tmp/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "аПОСТОКч"
 
-#: po/tmp/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:28
+#: ui/evolution-message-composer.xml.h:31
 #, fuzzy
 msgid "Send the message later"
 msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
 
-#: po/tmp/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:32
 #, fuzzy
 msgid "Send the message now"
 msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
 
-#: po/tmp/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:33
 #, fuzzy
 msgid "Send this message now"
 msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: po/tmp/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:34
 #, fuzzy
 msgid "Show / hide attachments"
 msgstr "еЛЖэМИСГ/АПЭЙЯУЬГ ЕПИСУМэЬЕЫМ"
 
-#: po/tmp/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:35
 #, fuzzy
 msgid "Show _attachments"
 msgstr "еЛЖэМИСГ ЕПИСУМэ_ЬЕЫМ"
 
-#: po/tmp/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:36
 #, fuzzy
 msgid "Show attachments"
 msgstr "еЛЖэМИСГ ЕПИСУМэ_ЬЕЫМ"
 
-#: po/tmp/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Sign this message with your PGP key"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Insert text file... (FIXME)"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:45
 #, fuzzy
 msgid "_Open..."
 msgstr "╤МОИ_ЦЛА"
 
+#: 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"
 
-#: 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
 msgid "Getting _Started"
 msgstr ""
 
-#: po/tmp/evolution.xml.h:11
+#: ui/evolution.xml.h:11
 msgid "Show information about Evolution"
 msgstr ""
 
-#: po/tmp/evolution.xml.h:12
+#: ui/evolution.xml.h:12
 #, fuzzy
 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 ""
 
-#: 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
 #, fuzzy
 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 ""
 
-#: po/tmp/evolution.xml.h:22
+#: ui/evolution.xml.h:22
 #, fuzzy
 msgid "_Appointment (FIXME)"
 msgstr "я_АМТЕБОЩ"
 
-#: po/tmp/evolution.xml.h:23
+#: ui/evolution.xml.h:23
 #, fuzzy
 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
 #, fuzzy
 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
 #, fuzzy
 msgid "_Mail message (FIXME)"
 msgstr "_лчМУЛА"
 
-#: po/tmp/evolution.xml.h:32
+#: ui/evolution.xml.h:32
 #, fuzzy
 msgid "_Settings"
 msgstr "е_МщЯЦЕИЕР"
 
-#: po/tmp/evolution.xml.h:33
+#: ui/evolution.xml.h:33
 msgid "_Task (FIXME)"
 msgstr ""
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2470
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
 msgid "%A, %B %d, %Y"
 msgstr ""
 
@@ -6678,29 +7075,35 @@ msgstr "аъ_ТГСГ сУМэМТГСГР"
 msgid "All Attendees"
 msgstr ""
 
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: widgets/misc/e-calendar-item.c:421
+msgid "MTWTFSS"
+msgstr ""
+
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
+#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
 msgid "%B %Y"
 msgstr ""
 
-#: widgets/misc/e-clipped-label.c:107
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr ""
 
-#: widgets/misc/e-dateedit.c:408
+#: widgets/misc/e-dateedit.c:407
 #, fuzzy
 msgid "Now"
 msgstr "_мщО"
 
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1249 widgets/misc/e-dateedit.c:1308
-#: widgets/misc/e-dateedit.c:1487
+#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
+#: widgets/misc/e-dateedit.c:1486
 msgid "%H:%M"
 msgstr ""
 
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1252 widgets/misc/e-dateedit.c:1311
-#: widgets/misc/e-dateedit.c:1490
+#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
+#: widgets/misc/e-dateedit.c:1489
 msgid "%I:%M %p"
 msgstr ""
 
@@ -6710,6 +7113,77 @@ msgid "Group %i"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Appointments:"
+#~ msgstr "я_АМТЕБОЩ"
+
+#, fuzzy
+#~ msgid "monday"
+#~ msgstr "счЛЕЯА"
+
+#, fuzzy
+#~ msgid "tues"
+#~ msgstr "сГЛЕъЫ_ЛА"
+
+#, fuzzy
+#~ msgid "today"
+#~ msgstr "счЛЕЯА"
+
+#, fuzzy
+#~ msgid "last"
+#~ msgstr "еПИЙЭККГСГ"
+
+#, fuzzy
+#~ msgid "ninth"
+#~ msgstr "пЯОТЕЯАИЭТГТА"
+
+#, fuzzy
+#~ msgid "tenth"
+#~ msgstr "еСТэКГ"
+
+#, fuzzy
+#~ msgid "Mail Source"
+#~ msgstr "йУЯъЫР сУМТОЛЕЩСЕИР"
+
+#, fuzzy
+#~ msgid "Send \"%s\""
+#~ msgstr "е_МщЯЦЕИЕР"
+
+#, fuzzy
+#~ msgid "Marking messages in folder \"%s\""
+#~ msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+
+#, fuzzy
+#~ msgid "Mark messages in folder \"%s\""
+#~ msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+
+#, fuzzy
+#~ msgid "Forward message \"%s\""
+#~ msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#, fuzzy
+#~ msgid "View messages from \"%s\""
+#~ msgstr "мщА ЛГМЩЛАТА"
+
+#, fuzzy
+#~ msgid "Saving messages from folder \"%s\""
+#~ msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+
+#, fuzzy
+#~ msgid "Save messages from folder \"%s\""
+#~ msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+
+#, fuzzy
+#~ msgid "Rebuild message view"
+#~ msgstr "мщА ЛГМЩЛАТА"
+
+#~ msgid "_Actions"
+#~ msgstr "е_МщЯЦЕИЕР"
+
+#, fuzzy
+#~ msgid "_Save Calendar As"
+#~ msgstr "гЛЕЯОКЭЦИО"
+
+#, fuzzy
 #~ msgid "FIXME: _Appointment"
 #~ msgstr "я_АМТЕБОЩ"
 
@@ -6884,18 +7358,9 @@ msgstr ""
 #~ msgid "Executive Summary"
 #~ msgstr "пЕЯъКГЬГ"
 
-#~ msgid "Inbox"
-#~ msgstr "еИСЕЯВЭЛЕМА"
-
-#~ msgid "Sent mail messages"
-#~ msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
-
 #~ msgid "Tasks list"
 #~ msgstr "йАТэКОЦОР ЕЙЙЯЕЛОТчТЫМ"
 
-#~ msgid "Other Shortcuts"
-#~ msgstr "кОИПщР сУМТОЛЕЩСЕИР"
-
 #~ msgid "Enables some debugging functions"
 #~ msgstr "еМЕЯЦОПОъГСГ ЛЕЯИЙЧМ КЕИТОУЯЦИЧМ АПОСЖАКЛэТЫСГР"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 02d17558a4..88da06ada7 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2,10 +2,11 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Robert Brady <rwb197@zepler.org> 2000
 #
+#: camel/providers/smtp/camel-smtp-transport.c:287
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.6\n"
-"POT-Creation-Date: 2000-12-13 16:26-0600\n"
+"POT-Creation-Date: 2001-01-06 00:11+0100\n"
 "PO-Revision-Date: 2000-10-22 16:19+0100\n"
 "Last-Translator: Robert Brady <rwb197@zepler.org>\n"
 "Language-Team: \n"
@@ -235,10 +236,10 @@ msgstr ""
 #: addressbook/backend/ebook/load-pine-addressbook.c:17
 #: addressbook/backend/ebook/test-client-list.c:18
 #: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:991
+#: addressbook/conduit/address-conduit.c:1083
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1136
-#: calendar/conduits/todo/todo-conduit.c:945 calendar/gui/main.c:54
+#: calendar/conduits/calendar/calendar-conduit.c:1151
+#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "Could not initialise Bonobo"
 
@@ -357,53 +358,36 @@ msgid ""
 "pilot list from the gnome-pilot daemon"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:197
+#: addressbook/conduit/address-conduit.c:195
 msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:210
+#: addressbook/conduit/address-conduit.c:208
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:583
-#: calendar/conduits/calendar/calendar-conduit.c:715
-#: calendar/conduits/todo/todo-conduit.c:523
+#: addressbook/conduit/address-conduit.c:646
+#: calendar/conduits/calendar/calendar-conduit.c:730
+#: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat server"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:584
-#: calendar/conduits/calendar/calendar-conduit.c:716
-#: calendar/conduits/todo/todo-conduit.c:524
+#: addressbook/conduit/address-conduit.c:647
+#: calendar/conduits/calendar/calendar-conduit.c:731
+#: calendar/conduits/todo/todo-conduit.c:546
 msgid "Could not start wombat"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:616
-#: addressbook/conduit/address-conduit.c:619
+#: addressbook/conduit/address-conduit.c:679
+#: addressbook/conduit/address-conduit.c:682
 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 ""
 
@@ -417,7 +401,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:48
+#: ui/evolution-event-editor.xml.h:108 ui/evolution-mail.xml.h:53
 msgid "_Delete"
 msgstr ""
 
@@ -431,12 +415,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 ""
 
@@ -477,7 +462,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 ""
 
@@ -494,7 +479,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 ""
 
@@ -511,7 +496,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 ""
 
@@ -556,143 +542,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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1329
+#: addressbook/contact-editor/e-contact-editor.c:1337
 msgid "Email 2"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1330
+#: addressbook/contact-editor/e-contact-editor.c:1338
 msgid "Email 3"
 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/fulladdr.glade.h:6
+#: addressbook/contact-editor/fulladdr.glade.h:6
 msgid "Address _2:"
 msgstr ""
 
-#: 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 "_Post Code:"
 
@@ -706,10 +692,13 @@ msgid "Check Full Name"
 msgstr ""
 
 #: addressbook/contact-editor/fullname-strings.h:8
+#, fuzzy
 msgid ""
 "\n"
 "Mr.\n"
 "Mrs.\n"
+"Ms.\n"
+"Miss\n"
 "Dr.\n"
 msgstr ""
 "\n"
@@ -721,7 +710,7 @@ msgstr ""
 "Prof\n"
 "Rev\n"
 
-#: addressbook/contact-editor/fullname-strings.h:13
+#: addressbook/contact-editor/fullname-strings.h:15
 msgid ""
 "\n"
 "Sr.\n"
@@ -732,44 +721,49 @@ msgid ""
 "Esq.\n"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:21
+#: addressbook/contact-editor/fullname-strings.h:23
 msgid "_First:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:22
+#: addressbook/contact-editor/fullname-strings.h:24
 msgid "_Title:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:23
+#: addressbook/contact-editor/fullname-strings.h:25
 msgid "_Middle:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:24
+#: addressbook/contact-editor/fullname-strings.h:26
 msgid "_Last:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:25
+#: addressbook/contact-editor/fullname-strings.h:27
 msgid "_Suffix:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:263
+#: addressbook/gui/component/addressbook.c:231
 msgid "As _Minicards"
 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/gui/component/addressbook.c:269
-#: 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:386
+#: addressbook/gui/component/addressbook.c:374
+#, c-format
+msgid "Enter password for %s"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:402
 msgid "Unable to open addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:391
+#: 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"
@@ -781,77 +775,191 @@ msgid ""
 "OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:501 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:503 mail/folder-browser.c:138
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 msgid "Advanced..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:533
+#: addressbook/gui/component/addressbook.c:560
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:534
+#: addressbook/gui/component/addressbook.c:561
 msgid "Name contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:535
+#: addressbook/gui/component/addressbook.c:562
 msgid "Email contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:621
+#: addressbook/gui/component/addressbook.c:648
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
-#: addressbook/gui/component/e-ldap-storage.c:88
-msgid "External Directories"
+#: addressbook/gui/component/addressbook-storage.c:95
+msgid "Other Contacts"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/e-msg-composer-attachment.glade.h:7
-#: po/tmp/ldap-server-dialog.glade.h:6
-msgid "Description:"
+#: addressbook/gui/component/addressbook-config.c:139
+msgid "LDAP Server"
 msgstr ""
 
-#: po/tmp/ldap-server-dialog.glade.h:7
-msgid "LDAP Server:"
+#: addressbook/gui/component/addressbook-config.c:141
+msgid "File"
 msgstr ""
 
-#: po/tmp/ldap-server-dialog.glade.h:8
-msgid "Name:"
+#: addressbook/gui/component/addressbook-config.c:144
+msgid "Unknown addressbook type"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "None (anonymous mode)"
 msgstr ""
 
-#: po/tmp/ldap-server-dialog.glade.h:9
-msgid "Port Number:"
+#: 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 ""
 
-#: po/tmp/ldap-server-dialog.glade.h:10
+#: addressbook/gui/component/addressbook-config.c:157
+msgid "SASL"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:160
+msgid "Unknown auth type"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:169
+msgid "Base"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:171
+msgid "One"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:173
+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
+msgid "Host:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:361
+msgid "Port:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:364
 msgid "Root DN:"
 msgstr ""
 
+#: addressbook/gui/component/addressbook-config.c:384
+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
+msgid "Create path if it doesn't exist."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:593
+msgid "Edit Addressbook"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:595
+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
+msgid "Name:"
+msgstr ""
+
+#: 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
+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
+msgid "Name"
+msgstr ""
+
+#: 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
+msgid "Select name from:"
 msgstr ""
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:147
@@ -860,119 +968,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 ""
 
-#: 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 ""
 
-#: calendar/cal-util/timeutil.c:100 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:417
-#: addressbook/gui/widgets/e-minicard.c:338
+#: addressbook/gui/widgets/e-addressbook-view.c:451
+#: addressbook/gui/widgets/e-minicard.c:374
 msgid "Save as VCard"
 msgstr ""
 
@@ -990,189 +1098,178 @@ 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 ""
 
-#: po/tmp/e-contact-print.glade.h:7
+#: addressbook/printing/e-contact-print.glade.h:7
 msgid "8 pt. Tahoma"
 msgstr ""
 
-#: 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 ""
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:550
-#: calendar/gui/e-week-view.c:288 calendar/gui/print.c:605
-msgid "am"
-msgstr ""
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:553
-#: calendar/gui/e-week-view.c:291 calendar/gui/print.c:604
-msgid "pm"
-msgstr ""
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 msgid "Evolution Calendar Conduit"
 msgstr ""
@@ -1181,13 +1278,13 @@ msgstr ""
 msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:671
-#: calendar/conduits/todo/todo-conduit.c:479
+#: calendar/conduits/calendar/calendar-conduit.c:686
+#: calendar/conduits/todo/todo-conduit.c:501
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:770
-#: calendar/conduits/calendar/calendar-conduit.c:773
+#: calendar/conduits/calendar/calendar-conduit.c:785
+#: calendar/conduits/calendar/calendar-conduit.c:788
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
@@ -1199,123 +1296,160 @@ msgstr ""
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:578
-#: calendar/conduits/todo/todo-conduit.c:581
+#: calendar/conduits/todo/todo-conduit.c:600
+#: calendar/conduits/todo/todo-conduit.c:603
 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:"
+#: 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:"
+#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:7
+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
+#, fuzzy
+msgid "Evolution calendar executive summary component."
+msgstr "Cannot initialise Evolution's mail summary component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Evolution component for handling the calendar."
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:65
-msgid "Day numbers:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+msgid "Factory for the Calendar Summary component."
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:66
-msgid "Current day's number:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#, fuzzy
+msgid "Factory for the Evolution calendar component."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+msgid "Factory for the calendar iTip view control"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:67
-msgid "To-Do item that is not yet due:"
+#: 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:68
-msgid "To-Do item that is due today:"
+#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:8
+msgid "Snooze"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:69
-msgid "To-Do item that is overdue:"
+#. 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:354
+#: 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:282
+#: 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:2498
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
 msgstr ""
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:286 calendar/gui/calendar-model.c:736
+#: 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:290 calendar/gui/calendar-model.c:739
+#: 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:344 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:347 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:350 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:353 calendar/gui/calendar-model.c:521
+#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:523
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:441
+#: calendar/gui/calendar-model.c:443
 msgid "N"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:441
+#: calendar/gui/calendar-model.c:443
 msgid "S"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:445
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:445
 msgid "W"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:515
+#: calendar/gui/calendar-model.c:517
 msgid "Transparent"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:518
+#: calendar/gui/calendar-model.c:520
 msgid "Opaque"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:744
+#: calendar/gui/calendar-model.c:746
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1324,49 +1458,69 @@ msgid ""
 msgstr ""
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:845 calendar/gui/calendar-model.c:893
+#: 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:1274 widgets/misc/e-dateedit.c:1455
+#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
 msgstr ""
 
 #. 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:863
+#: calendar/gui/calendar-model.c:865
 msgid "%I:%M:%S %p%n"
 msgstr ""
 
 #. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:866
+#: calendar/gui/calendar-model.c:868
 msgid "%H:%M:%S%n"
 msgstr ""
 
 #. 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:870
+#: calendar/gui/calendar-model.c:872
 msgid "%I:%M %p%n"
 msgstr ""
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:873
+#: calendar/gui/calendar-model.c:875
 msgid "%H:%M%n"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:993
+#: calendar/gui/calendar-model.c:995
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1033
+#: calendar/gui/calendar-model.c:1035
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1073
+#: calendar/gui/calendar-model.c:1075
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr ""
 
+#: calendar/gui/calendar-summary.c:81
+msgid "%A, %e %B %Y"
+msgstr ""
+
+#: calendar/gui/calendar-summary.c:224
+msgid "<b>Error loading calendar</b>"
+msgstr ""
+
+#: 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
+msgid "Loading Calendar"
+msgstr ""
+
 #: calendar/gui/control-factory.c:125
 msgid "The URI that the calendar will display"
 msgstr ""
@@ -1384,350 +1538,387 @@ 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:1466 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 ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "10 minutes"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "12 hour (am/pm)"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "15 minutes"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "24 hour"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "30 minutes"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "60 minutes"
 msgstr ""
 
-#: 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 "Colours"
 
-#: 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 "Pick a colour"
 
-#: 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:62
+#, c-format
+msgid "Are you sure you want to delete the appointment `%s'?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:65
+msgid "Are you sure you want to delete this untitled appointment?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:71
+#, c-format
+msgid "Are you sure you want to delete the task `%s'?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:74
+msgid "Are you sure you want to delete this untitled task?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:80
+#, c-format
+msgid "Are you sure you want to delete the journal entry `%s'?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:83
+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
-#: widgets/misc/e-dateedit.c:422 widgets/misc/e-dateedit.c:1331
-#: widgets/misc/e-dateedit.c:1446
+#: 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 ""
 
-#: 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 ""
 
@@ -1735,26 +1926,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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3277
+#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3250
 msgid "Do you want to save changes?"
 msgstr ""
 
@@ -1774,14 +1965,6 @@ msgstr ""
 msgid "Mark the task complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:342 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:479 mail/mail-view.c:165
-#: 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 ""
@@ -1793,50 +1976,62 @@ msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1208
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1211
 #: calendar/gui/e-week-view-main-item.c:325
 msgid "%A %d %B"
 msgstr ""
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1222
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1225
 #: calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr ""
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1235
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1238
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2941 calendar/gui/e-day-view.c:2948
-#: calendar/gui/e-day-view.c:2957 calendar/gui/e-week-view.c:3165
-#: calendar/gui/e-week-view.c:3172 calendar/gui/e-week-view.c:3181
+#. 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: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:609
+msgid "pm"
+msgstr ""
+
+#: calendar/gui/e-day-view.c:2948 calendar/gui/e-day-view.c:2955
+#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3169
+#: calendar/gui/e-week-view.c:3176 calendar/gui/e-week-view.c:3185
 msgid "New appointment..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2945 calendar/gui/e-day-view.c:2952
-#: calendar/gui/e-week-view.c:3169 calendar/gui/e-week-view.c:3176
+#: calendar/gui/e-day-view.c:2952 calendar/gui/e-day-view.c:2959
+#: calendar/gui/e-week-view.c:3173 calendar/gui/e-week-view.c:3180
 msgid "Edit this appointment..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2946 calendar/gui/e-week-view.c:3170
-#: po/tmp/evolution-event-editor.xml.h:20
+#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3174
+#: ui/evolution-event-editor.xml.h:20
 msgid "Delete this appointment"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3177
+#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3181
 msgid "Make this appointment movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2954 calendar/gui/e-week-view.c:3178
+#: calendar/gui/e-day-view.c:2961 calendar/gui/e-week-view.c:3182
 msgid "Delete this occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3179
+#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3183
 msgid "Delete all occurrences"
 msgstr ""
 
@@ -1848,654 +2043,471 @@ msgid "%d %B"
 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/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 ""
 
-#: 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
 msgid "on"
 msgstr ""
 
-#: calendar/gui/event-editor.c:432 calendar/gui/getdate.y:424
-#: 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
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/event-editor.c:566
+#: calendar/gui/event-editor.c:562
 msgid "th"
 msgstr ""
 
-#: calendar/gui/event-editor.c:722
+#: calendar/gui/event-editor.c:716
 msgid "occurrences"
 msgstr ""
 
-#: calendar/gui/event-editor.c:839
+#: calendar/gui/event-editor.c:833
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor.c:3079 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/getdate.y:391
-msgid "january"
-msgstr ""
-
-#: calendar/gui/getdate.y:392
-msgid "february"
-msgstr ""
-
-#: calendar/gui/getdate.y:393
-msgid "march"
-msgstr ""
-
-#: calendar/gui/getdate.y:394
-msgid "april"
-msgstr ""
-
-#: calendar/gui/getdate.y:395
-msgid "may"
-msgstr ""
-
-#: calendar/gui/getdate.y:396
-msgid "june"
-msgstr ""
-
-#: calendar/gui/getdate.y:397
-msgid "july"
-msgstr ""
-
-#: calendar/gui/getdate.y:398
-msgid "august"
-msgstr ""
-
-#: calendar/gui/getdate.y:399
-msgid "september"
-msgstr ""
-
-#: calendar/gui/getdate.y:400
-msgid "sept"
-msgstr ""
-
-#: calendar/gui/getdate.y:401
-msgid "october"
-msgstr ""
-
-#: calendar/gui/getdate.y:402
-msgid "november"
-msgstr ""
-
-#: calendar/gui/getdate.y:403
-msgid "december"
-msgstr ""
-
-#: calendar/gui/getdate.y:404
-msgid "sunday"
-msgstr ""
-
-#: calendar/gui/getdate.y:405
-msgid "monday"
-msgstr ""
-
-#: calendar/gui/getdate.y:406
-msgid "tuesday"
-msgstr ""
-
-#: calendar/gui/getdate.y:407
-msgid "tues"
-msgstr ""
-
-#: calendar/gui/getdate.y:408
-msgid "wednesday"
-msgstr ""
-
-#: calendar/gui/getdate.y:409
-msgid "wednes"
-msgstr ""
-
-#: calendar/gui/getdate.y:410
-msgid "thursday"
-msgstr ""
-
-#: calendar/gui/getdate.y:411
-msgid "thur"
-msgstr ""
-
-#: calendar/gui/getdate.y:412
-msgid "thurs"
-msgstr ""
-
-#: calendar/gui/getdate.y:413
-msgid "friday"
-msgstr ""
-
-#: calendar/gui/getdate.y:414
-msgid "saturday"
-msgstr ""
-
-#: calendar/gui/getdate.y:420 filter/filter-datespec.c:62
-msgid "year"
-msgstr ""
-
-#: calendar/gui/getdate.y:421 filter/filter-datespec.c:63
-msgid "month"
-msgstr ""
-
-#: calendar/gui/getdate.y:422
-msgid "fortnight"
-msgstr ""
-
-#: calendar/gui/getdate.y:423 filter/filter-datespec.c:64
-msgid "week"
-msgstr ""
-
-#: calendar/gui/getdate.y:425 filter/filter-datespec.c:66
-msgid "hour"
-msgstr ""
-
-#: calendar/gui/getdate.y:426 filter/filter-datespec.c:67
-msgid "minute"
-msgstr ""
-
-#: calendar/gui/getdate.y:427
-msgid "min"
-msgstr ""
-
-#: calendar/gui/getdate.y:428 filter/filter-datespec.c:68
-msgid "second"
-msgstr ""
-
-#: calendar/gui/getdate.y:429
-msgid "sec"
-msgstr ""
-
-#: calendar/gui/getdate.y:435
-msgid "tomorrow"
-msgstr ""
-
-#: calendar/gui/getdate.y:436
-msgid "yesterday"
-msgstr ""
-
-#: calendar/gui/getdate.y:437
-msgid "today"
-msgstr ""
-
-#: calendar/gui/getdate.y:438 filter/filter-datespec.c:533
-#: filter/filter-datespec.c:693
-msgid "now"
-msgstr ""
-
-#: calendar/gui/getdate.y:439
-msgid "last"
-msgstr ""
-
-#: calendar/gui/getdate.y:440
-msgid "this"
-msgstr ""
-
-#: calendar/gui/getdate.y:441
-msgid "next"
-msgstr ""
-
-#: calendar/gui/getdate.y:442
-msgid "first"
-msgstr ""
-
-#. { N_("second"),		tUNUMBER,	2 },
-#: calendar/gui/getdate.y:444
-msgid "third"
+#: calendar/gui/gnome-cal.c:676
+#, c-format
+msgid "Could not load the calendar in `%s'"
 msgstr ""
 
-#: calendar/gui/getdate.y:445
-msgid "fourth"
+#: calendar/gui/gnome-cal.c:687
+#, c-format
+msgid "Could not create a calendar in `%s'"
 msgstr ""
 
-#: calendar/gui/getdate.y:446
-msgid "fifth"
+#: calendar/gui/gnome-cal.c:698
+#, c-format
+msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/getdate.y:447
-msgid "sixth"
+#.
+#. * 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/getdate.y:448
-msgid "seventh"
+#: calendar/gui/goto-dialog.glade.h:7
+msgid "August"
 msgstr ""
 
-#: calendar/gui/getdate.y:449
-msgid "eighth"
+#: calendar/gui/goto-dialog.glade.h:8
+msgid "December"
 msgstr ""
 
-#: calendar/gui/getdate.y:450
-msgid "ninth"
+#: calendar/gui/goto-dialog.glade.h:9
+msgid "February"
 msgstr ""
 
-#: calendar/gui/getdate.y:451
-msgid "tenth"
+#: calendar/gui/goto-dialog.glade.h:10
+msgid "Go To Date"
 msgstr ""
 
-#: calendar/gui/getdate.y:452
-msgid "eleventh"
+#: calendar/gui/goto-dialog.glade.h:11
+msgid "Go To Today"
 msgstr ""
 
-#: calendar/gui/getdate.y:453
-msgid "twelfth"
+#: calendar/gui/goto-dialog.glade.h:12
+msgid "January"
 msgstr ""
 
-#: calendar/gui/getdate.y:454
-msgid "ago"
+#: calendar/gui/goto-dialog.glade.h:13
+msgid "July"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:718 calendar/gui/gnome-cal.c:1474
-#: calendar/gui/gnome-cal.c:1530
-msgid "Reminder of your appointment at "
+#: calendar/gui/goto-dialog.glade.h:14
+msgid "June"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1152
-#, c-format
-msgid "Could not load the calendar in `%s'"
+#: calendar/gui/goto-dialog.glade.h:15
+msgid "March"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1163
-#, c-format
-msgid "Could not create a calendar in `%s'"
+#: calendar/gui/goto-dialog.glade.h:16
+msgid "May"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1174
-#, c-format
-msgid "The method required to load `%s' is not supported"
+#: calendar/gui/goto-dialog.glade.h:17
+msgid "November"
 msgstr ""
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1479 calendar/gui/gnome-cal.c:1534
-#: mail/mail-search-dialogue.c:104
-msgid "Ok"
+#: calendar/gui/goto-dialog.glade.h:18
+msgid "October"
 msgstr ""
 
-#: calendar/gui/goto.c:82
-msgid "Year:"
+#: calendar/gui/goto-dialog.glade.h:19
+msgid "September"
 msgstr ""
 
-#: calendar/gui/goto.c:270
-msgid "Go to date"
-msgstr ""
-
-#. Instructions
-#: calendar/gui/goto.c:281
-msgid ""
-"Please select the date you want to go to.\n"
-"When you click on a day, you will be taken\n"
-"to that date."
-msgstr ""
-
-#: calendar/gui/goto.c:318
-msgid "Go to today"
-msgstr ""
+#: calendar/gui/main.c:49
+#, fuzzy
+msgid "Could not initialize GNOME"
+msgstr "Could not initialise Bonobo"
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "1st"
 msgstr ""
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "2nd"
 msgstr ""
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "3rd"
 msgstr ""
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "4th"
 msgstr ""
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "5th"
 msgstr ""
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "6th"
 msgstr ""
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "7th"
 msgstr ""
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "8th"
 msgstr ""
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "9th"
 msgstr ""
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "10th"
 msgstr ""
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "11th"
 msgstr ""
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "12th"
 msgstr ""
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "13th"
 msgstr ""
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "14th"
 msgstr ""
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "15th"
 msgstr ""
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "16th"
 msgstr ""
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "17th"
 msgstr ""
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "18th"
 msgstr ""
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "19th"
 msgstr ""
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "20th"
 msgstr ""
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "21st"
 msgstr ""
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "22nd"
 msgstr ""
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "23rd"
 msgstr ""
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "24th"
 msgstr ""
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "25th"
 msgstr ""
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "26th"
 msgstr ""
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "27th"
 msgstr ""
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "28th"
 msgstr ""
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "29th"
 msgstr ""
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "30th"
 msgstr ""
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:299
 msgid "31st"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: calendar/gui/print.c:1081
+#: calendar/gui/print.c:1086
 msgid "%a %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1092
+#: calendar/gui/print.c:1097
 #, c-format
 msgid "Current week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1100
+#: calendar/gui/print.c:1105
 msgid "Current month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1107
+#: calendar/gui/print.c:1112
 msgid "Current year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1144
+#: calendar/gui/print.c:1149
 msgid "Print Calendar"
 msgstr ""
 
-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:962
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1001
 msgid "Print Preview"
 msgstr ""
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: calendar/gui/weekday-picker.c:351 widgets/misc/e-calendar-item.c:416
-msgid "MTWTFSS"
-msgstr ""
-
-#: calendar/gui/weekday-picker.c:353 calendar/gui/weekday-picker.c:443
+#: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
 msgid "SMTWTFS"
 msgstr ""
 
@@ -2585,60 +2597,61 @@ msgstr ""
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:182
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:227
+#: camel/camel-remote-store.c:243
+#: camel/providers/smtp/camel-smtp-transport.c:162
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:228
+#: camel/camel-remote-store.c:244
 msgid "(unknown host)"
 msgstr ""
 
-#: camel/camel-remote-store.c:452
+#: camel/camel-remote-store.c:483
 msgid "Server disconnected."
 msgstr ""
 
-#: camel/camel-service.c:120
+#: camel/camel-service.c:138
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:129
+#: camel/camel-service.c:147
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:138
+#: camel/camel-service.c:156
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:488
+#: camel/camel-service.c:526
 #, c-format
 msgid "No such host %s."
 msgstr ""
 
-#: camel/camel-service.c:491
+#: camel/camel-service.c:529
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr ""
 
-#: camel/camel-session.c:272
+#: camel/camel-session.c:297
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:360
+#: camel/camel-session.c:388
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2660,51 +2673,51 @@ msgstr ""
 msgid "Port number in URL `%s' is non-numeric"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-auth.c:127
+#: camel/providers/imap/camel-imap-auth.c:133
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
 "%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-auth.c:198
+#: camel/providers/imap/camel-imap-auth.c:205
 msgid "Bad authentication response from server."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:216
+#: camel/providers/imap/camel-imap-command.c:231
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:224
+#: camel/providers/imap/camel-imap-command.c:239
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:240 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:271
+#: camel/providers/imap/camel-imap-command.c:286
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:407
+#: camel/providers/imap/camel-imap-command.c:422
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:443
+#: camel/providers/imap/camel-imap-command.c:458
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:216
+#: 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:586
+#: camel/providers/imap/camel-imap-folder.c:532
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -2716,31 +2729,25 @@ msgstr ""
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:234
-#: 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:236
+#: camel/providers/imap/camel-imap-store.c:248
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:245
+#: camel/providers/imap/camel-imap-store.c:257
 msgid "Kerberos 4"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:247
+#: camel/providers/imap/camel-imap-store.c:259
 msgid ""
 "This option will connect to the IMAP server using Kerberos 4 authentication."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:333
+#: camel/providers/imap/camel-imap-store.c:345
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:359
+#: camel/providers/imap/camel-imap-store.c:373
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2748,7 +2755,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:539
+#: camel/providers/imap/camel-imap-store.c:564
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
@@ -2833,12 +2840,12 @@ msgid "Cannot append message to maildir folder: %s: %s"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:204
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-maildir-folder.c:207
+#: camel/providers/local/camel-maildir-folder.c:215
+#: camel/providers/local/camel-mbox-folder.c:317
 #: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:189
-#: camel/providers/local/camel-mh-folder.c:197
+#: camel/providers/local/camel-mh-folder.c:192
+#: camel/providers/local/camel-mh-folder.c:200
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -2846,13 +2853,13 @@ msgid ""
 msgstr ""
 
 #: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-mbox-folder.c:317
 #: camel/providers/local/camel-mh-folder.c:183
 msgid "No such message"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:213
-#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-maildir-folder.c:216
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "Invalid message contents"
 msgstr ""
 
@@ -2895,30 +2902,30 @@ msgstr ""
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:195
+#: camel/providers/local/camel-mbox-folder.c:201
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:251
+#: camel/providers/local/camel-mbox-folder.c:257
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:327
-#: camel/providers/local/camel-mbox-folder.c:357
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:333
+#: camel/providers/local/camel-mbox-folder.c:365
+#: camel/providers/local/camel-mbox-folder.c:378
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:358
+#: camel/providers/local/camel-mbox-folder.c:366
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:369
+#: camel/providers/local/camel-mbox-folder.c:379
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -2965,56 +2972,56 @@ msgstr ""
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:341
+#: camel/providers/local/camel-mbox-summary.c:343
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:475
-#: camel/providers/local/camel-mbox-summary.c:661
+#: camel/providers/local/camel-mbox-summary.c:477
+#: camel/providers/local/camel-mbox-summary.c:668
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:491
+#: camel/providers/local/camel-mbox-summary.c:493
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:512
-#: camel/providers/local/camel-mbox-summary.c:520
-#: camel/providers/local/camel-mbox-summary.c:691
-#: camel/providers/local/camel-mbox-summary.c:699
+#: camel/providers/local/camel-mbox-summary.c:514
+#: camel/providers/local/camel-mbox-summary.c:522
+#: camel/providers/local/camel-mbox-summary.c:701
+#: camel/providers/local/camel-mbox-summary.c:709
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:562
+#: camel/providers/local/camel-mbox-summary.c:565
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:579
+#: camel/providers/local/camel-mbox-summary.c:582
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:595
-#: camel/providers/local/camel-mbox-summary.c:748
+#: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-mbox-summary.c:759
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:604
+#: camel/providers/local/camel-mbox-summary.c:609
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:615
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:817
+#: camel/providers/local/camel-mbox-summary.c:830
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
@@ -3047,7 +3054,7 @@ msgstr ""
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:144
+#: camel/providers/nntp/camel-nntp-folder.c:115
 #, c-format
 msgid "Message %s not found."
 msgstr ""
@@ -3097,16 +3104,16 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:179
+#: camel/providers/pop3/camel-pop3-folder.c:180
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:273
+#: camel/providers/pop3/camel-pop3-folder.c:274
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:288
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr ""
@@ -3144,47 +3151,48 @@ msgstr ""
 msgid "Could not authenticate to KPOP server: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:335
+#: camel/providers/pop3/camel-pop3-store.c:337
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:389
+#: camel/providers/pop3/camel-pop3-store.c:391
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:408
+#: camel/providers/pop3/camel-pop3-store.c:410
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending username: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:411
-#: camel/providers/pop3/camel-pop3-store.c:448
+#: camel/providers/pop3/camel-pop3-store.c:413
+#: camel/providers/pop3/camel-pop3-store.c:450
 msgid "(Unknown)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:438
+#: camel/providers/pop3/camel-pop3-store.c:440
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:446
+#: camel/providers/pop3/camel-pop3-store.c:448
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:555
+#: camel/providers/pop3/camel-pop3-store.c:557
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
+#: mail/mail-config-druid.glade.h:63
 msgid "Sendmail"
 msgstr ""
 
@@ -3232,8 +3240,132 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
+#: 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
+#, c-format
+msgid "Welcome response error: %s: possibly non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:281
+msgid "No authentication required"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:283
+msgid ""
+"This option will connect to the SMTP server without using any kind of "
+"authentication. This should be fine for connecting to most SMTP servers."
+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 ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:294
+msgid ""
+"This option will connect to the SMTP server using CRAM-MD5 authentication."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:332
+#, c-format
+msgid "SMTP server %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:334
+#, c-format
+msgid "SMTP mail delivery via %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:359
+msgid "Cannot send message: sender address not defined."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:366
+msgid "Cannot send message: sender address not valid."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:380
+msgid "Cannot send message: no recipients defined."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:474
+#, c-format
+msgid "HELO request timed out: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:490
+#, c-format
+msgid "HELO response error: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:529
+#, c-format
+msgid "MAIL FROM request timed out: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:545
+#, c-format
+msgid "MAIL FROM response error: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:570
+#, c-format
+msgid "RCPT TO request timed out: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
+#, c-format
+msgid "RCPT TO response error: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:617
+#, c-format
+msgid "DATA request timed out: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:633
+#, c-format
+msgid "DATA response error: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:648
+#: camel/providers/smtp/camel-smtp-transport.c:666
+#, c-format
+msgid "DATA send timed out: message termination: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:682
+#, c-format
+msgid "DATA response error: message termination: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:706
+#, c-format
+msgid "RSET request timed out: %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:722
+#, c-format
+msgid "RSET response error: %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:745
+#, c-format
+msgid "QUIT request timed out: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#, c-format
+msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
 #: camel/providers/vee/camel-vee-provider.c:30
@@ -3269,175 +3401,175 @@ msgid "%.1fG"
 msgstr ""
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:144
+#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:155
 msgid "attachment"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:417
-#: 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:464 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:465
+#: composer/e-msg-composer-attachment-bar.c:461
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:496
+#: composer/e-msg-composer-attachment-bar.c:492
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:497
+#: 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: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 ""
 
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:290
-#: mail/mail-format.c:621
+#: 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:291
+#: composer/e-msg-composer-hdrs.c:304
 msgid "Enter the identity you wish to send this message from"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:295 mail/mail-format.c:625
+#: composer/e-msg-composer-hdrs.c:308 mail/mail-format.c:630
 msgid "To:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:296
+#: composer/e-msg-composer-hdrs.c:309
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:627
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:632
 msgid "Cc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:301
+#: 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:306
+#: composer/e-msg-composer-hdrs.c:319
 msgid "Bcc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:307
+#: 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."
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:629
+#: composer/e-msg-composer-hdrs.c:326 mail/mail-format.c:634
 msgid "Subject:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Enter the subject of the mail"
 msgstr ""
 
-#: composer/e-msg-composer.c:429
+#: composer/e-msg-composer.c:430
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:599
+#: composer/e-msg-composer.c:600
 msgid "Save as..."
 msgstr ""
 
-#: composer/e-msg-composer.c:610
+#: composer/e-msg-composer.c:611
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:630
+#: composer/e-msg-composer.c:631
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:652
+#: composer/e-msg-composer.c:653
 msgid "Saving changes to message..."
 msgstr ""
 
-#: composer/e-msg-composer.c:654
+#: composer/e-msg-composer.c:655
 msgid "Save changes to message..."
 msgstr ""
 
-#: composer/e-msg-composer.c:695
+#: composer/e-msg-composer.c:696
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:739 shell/e-shell-view-menu.c:170
+#: composer/e-msg-composer.c:741 shell/e-shell-view-menu.c:167
 msgid "Evolution"
 msgstr ""
 
-#: composer/e-msg-composer.c:745
+#: 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:767
+#: composer/e-msg-composer.c:772
 msgid "Open file"
 msgstr ""
 
-#: composer/e-msg-composer.c:893
+#: composer/e-msg-composer.c:898
 msgid "That file does not exist."
 msgstr ""
 
-#: composer/e-msg-composer.c:903
+#: composer/e-msg-composer.c:908
 msgid "That is not a regular file."
 msgstr ""
 
-#: composer/e-msg-composer.c:913
+#: composer/e-msg-composer.c:918
 msgid "That file exists but is not readable."
 msgstr ""
 
-#: composer/e-msg-composer.c:923
+#: composer/e-msg-composer.c:928
 msgid "That file appeared accesible but open(2) failed."
 msgstr ""
 
-#: composer/e-msg-composer.c:945
+#: 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:966
+#: composer/e-msg-composer.c:971
 msgid "An error occurred while reading the file."
 msgstr ""
 
-#: composer/e-msg-composer.c:1343
+#: composer/e-msg-composer.c:1350
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1427
 msgid "Could not create composer window."
 msgstr ""
 
@@ -3451,14 +3583,26 @@ msgid "Sear_ch"
 msgstr ""
 
 #: filter/filter-datespec.c:62
+msgid "year"
+msgstr ""
+
+#: filter/filter-datespec.c:62
 msgid "years"
 msgstr ""
 
 #: filter/filter-datespec.c:63
+msgid "month"
+msgstr ""
+
+#: filter/filter-datespec.c:63
 msgid "months"
 msgstr ""
 
 #: filter/filter-datespec.c:64
+msgid "week"
+msgstr ""
+
+#: filter/filter-datespec.c:64
 msgid "weeks"
 msgstr ""
 
@@ -3467,14 +3611,26 @@ msgid "days"
 msgstr ""
 
 #: filter/filter-datespec.c:66
+msgid "hour"
+msgstr ""
+
+#: filter/filter-datespec.c:66
 msgid "hours"
 msgstr ""
 
 #: filter/filter-datespec.c:67
+msgid "minute"
+msgstr ""
+
+#: filter/filter-datespec.c:67
 msgid "minutes"
 msgstr ""
 
 #: filter/filter-datespec.c:68
+msgid "second"
+msgstr ""
+
+#: filter/filter-datespec.c:68
 msgid "seconds"
 msgstr ""
 
@@ -3524,6 +3680,10 @@ msgstr ""
 msgid "Compare against"
 msgstr ""
 
+#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
+msgid "now"
+msgstr ""
+
 #: filter/filter-datespec.c:690
 msgid "<click here to select a date>"
 msgstr ""
@@ -3546,7 +3706,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 ""
 
@@ -3581,238 +3741,247 @@ msgstr ""
 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"
 "%s"
 msgstr ""
 
-#: filter/filter-message-search.c:379 filter/filter-message-search.c:447
+#: filter/filter-message-search.c:380 filter/filter-message-search.c:448
 #, c-format
 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:520
+#: filter/filter-rule.c:530
 msgid "Rule name: "
 msgstr ""
 
-#: filter/filter-rule.c:524
+#: filter/filter-rule.c:534
 msgid "Untitled"
 msgstr ""
 
-#: filter/filter-rule.c:540
+#: filter/filter-rule.c:550
 msgid "If"
 msgstr ""
 
-#: filter/filter-rule.c:557
+#: filter/filter-rule.c:567
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:561
+#: filter/filter-rule.c:571
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:566
+#: filter/filter-rule.c:576
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:577
+#: filter/filter-rule.c:587
 msgid "Add criterion"
 msgstr ""
 
-#: filter/filter-rule.c:583
+#: filter/filter-rule.c:593
 msgid "Remove criterion"
 msgstr ""
 
-#: mail/folder-browser.c:465 po/tmp/filter.glade.h:8
-#: po/tmp/mail-config.glade.h:9
-msgid "Edit"
+#: filter/filter-system-flag.c:63
+msgid "Replied to"
+msgstr ""
+
+#. { _("Deleted"), "Deleted" },
+#. { _("Draft"), "Draft" },
+#: filter/filter-system-flag.c:66
+msgid "Important"
+msgstr ""
+
+#: filter/filter-system-flag.c:67
+msgid "Read"
 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
 msgid "vFolder Sources"
 msgstr ""
 
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
-msgid "Assign Colour"
+msgid "after"
 msgstr ""
 
 #: filter/libfilter-i18n.h:3
-msgid "Assign Score"
+msgid "Assign Colour"
 msgstr ""
 
 #: filter/libfilter-i18n.h:4
-msgid "Copy to Folder"
+msgid "Assign Score"
 msgstr ""
 
 #: filter/libfilter-i18n.h:5
-msgid "Date received"
+msgid "before"
 msgstr ""
 
 #: filter/libfilter-i18n.h:6
-msgid "Date sent"
+msgid "contains"
 msgstr ""
 
-#: filter/libfilter-i18n.h:8
-msgid "Expression"
+#: filter/libfilter-i18n.h:7
+msgid "Copy to Folder"
 msgstr ""
 
-#: filter/libfilter-i18n.h:9
-msgid "Forward to Address"
+#: filter/libfilter-i18n.h:8
+msgid "Date received"
 msgstr ""
 
-#: filter/libfilter-i18n.h:10
-msgid "Message Body"
+#: filter/libfilter-i18n.h:9
+msgid "Date sent"
 msgstr ""
 
 #: filter/libfilter-i18n.h:11
-msgid "Message Header"
+msgid "does not contain"
 msgstr ""
 
 #: filter/libfilter-i18n.h:12
-msgid "Message was received"
+msgid "does not end with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:13
-msgid "Message was sent"
+msgid "does not exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:14
-msgid "Move to Folder"
+msgid "does not sound like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:15
+msgid "does not start with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:16
-msgid "Recipients"
+msgid "ends with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:17
-msgid "Regex Match"
+msgid "exists"
 msgstr ""
 
 #: filter/libfilter-i18n.h:18
-msgid "Sender"
+msgid "Expression"
 msgstr ""
 
 #: filter/libfilter-i18n.h:19
-msgid "Set Status"
+msgid "Forward to Address"
 msgstr ""
 
 #: filter/libfilter-i18n.h:20
-msgid "Source"
+msgid "is"
 msgstr ""
 
 #: filter/libfilter-i18n.h:21
-msgid "Specific header"
+msgid "is greater than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:22
-msgid "Status"
+msgid "is less than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
+msgid "is not"
 msgstr ""
 
 #: filter/libfilter-i18n.h:24
-msgid "Subject"
+msgid "Message Body"
 msgstr ""
 
 #: filter/libfilter-i18n.h:25
-msgid "after"
+msgid "Message Header"
 msgstr ""
 
 #: filter/libfilter-i18n.h:26
-msgid "before"
+msgid "Message was received"
 msgstr ""
 
 #: filter/libfilter-i18n.h:27
-msgid "contains"
+msgid "Message was sent"
 msgstr ""
 
 #: filter/libfilter-i18n.h:28
-msgid "does not contain"
+msgid "Move to Folder"
 msgstr ""
 
 #: filter/libfilter-i18n.h:29
-msgid "does not end with"
+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"
+msgid "on or before"
 msgstr ""
 
 #: filter/libfilter-i18n.h:32
-msgid "does not start with"
+msgid "Recipients"
 msgstr ""
 
 #: filter/libfilter-i18n.h:33
-msgid "ends with"
+msgid "Regex Match"
 msgstr ""
 
 #: filter/libfilter-i18n.h:34
-msgid "exists"
+msgid "Sender"
 msgstr ""
 
 #: filter/libfilter-i18n.h:35
-msgid "is greater than"
+msgid "Set Status"
 msgstr ""
 
 #: filter/libfilter-i18n.h:36
-msgid "is less than"
+msgid "sounds like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:37
-msgid "is not"
+msgid "Source"
 msgstr ""
 
 #: filter/libfilter-i18n.h:38
-msgid "is"
+msgid "Specific header"
 msgstr ""
 
 #: filter/libfilter-i18n.h:39
-msgid "on or after"
+msgid "starts with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:40
-msgid "on or before"
+msgid "Status"
 msgstr ""
 
 #: filter/libfilter-i18n.h:41
-msgid "sounds like"
+msgid "Stop Processing"
 msgstr ""
 
 #: filter/libfilter-i18n.h:42
-msgid "starts with"
+msgid "Subject"
 msgstr ""
 
 #: filter/libfilter-i18n.h:43
@@ -3843,134 +4012,206 @@ msgstr ""
 msgid "Edit VFolder Rule"
 msgstr ""
 
-#: mail/component-factory.c:227
+#: mail/component-factory.c:277
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/component-factory.c:266
+#: 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:16
+#: 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:453
+#: mail/folder-browser.c:643
 msgid "VFolder on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:454
+#: mail/folder-browser.c:644
 msgid "VFolder on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:455
+#: mail/folder-browser.c:645
 msgid "VFolder on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:457
+#: mail/folder-browser.c:647
 msgid "Filter on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:458
+#: mail/folder-browser.c:648
 msgid "Filter on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:459
+#: mail/folder-browser.c:649
 msgid "Filter on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:460 mail/folder-browser.c:544
+#: mail/folder-browser.c:650 mail/folder-browser.c:779
 msgid "Filter on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:14
+#: mail/folder-browser.c:655
+msgid "Show all hidden"
+msgstr ""
+
+#: mail/folder-browser.c:657
+msgid "Hide selected"
+msgstr ""
+
+#. could use another mask, but not enough api do to it
+#: mail/folder-browser.c:660
+msgid "Hide read"
+msgstr ""
+
+#: mail/folder-browser.c:661
+msgid "Hide deleted"
+msgstr ""
+
+#: mail/folder-browser.c:663 mail/folder-browser.c:790
+msgid "Hide Subject"
+msgstr ""
+
+#: mail/folder-browser.c:665 mail/folder-browser.c:796
+msgid "Hide from Sender"
+msgstr ""
+
+#: mail/folder-browser.c:670 ui/evolution-message-composer.xml.h:15
 msgid "Open"
 msgstr ""
 
-#: mail/folder-browser.c:466
+#: mail/folder-browser.c:672
 msgid "Save As..."
 msgstr ""
 
-#: mail/folder-browser.c:467 mail/mail-view.c:163
-#: po/tmp/evolution-addressbook.xml.h:13 po/tmp/evolution-calendar.xml.h:23
-#: po/tmp/evolution-mail.xml.h:28
+#: 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:469
+#: mail/folder-browser.c:675
 msgid "Reply to Sender"
 msgstr ""
 
-#: mail/folder-browser.c:470 mail/mail-view.c:156
-#: po/tmp/evolution-mail.xml.h:34
+#: 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:471 mail/mail-view.c:159
-#: 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:472 po/tmp/evolution-mail.xml.h:18
+#: mail/folder-browser.c:678 ui/evolution-mail.xml.h:18
 msgid "Forward inline"
 msgstr ""
 
-#: mail/folder-browser.c:474
+#: mail/folder-browser.c:680
 msgid "Mark as Read"
 msgstr ""
 
-#: mail/folder-browser.c:475
+#: mail/folder-browser.c:681
 msgid "Mark as Unread"
 msgstr ""
 
-#: mail/folder-browser.c:477
+#: mail/folder-browser.c:683
 msgid "Move to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:478
+#: mail/folder-browser.c:684
 msgid "Copy to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:480
+#: 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:484
+#: mail/folder-browser.c:690
 msgid "Apply Filters"
 msgstr ""
 
-#: mail/folder-browser.c:486 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:546
+#: mail/folder-browser.c:693 ui/evolution-mail.xml.h:21
+msgid "Hide Messages"
+msgstr ""
+
+#: mail/folder-browser.c:781
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
+#: mail/folder-browser.c:787
+#, c-format
+msgid "Hide Subject \"%s\""
+msgstr ""
+
+#: 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
+msgid "Current store format:"
+msgstr ""
+
+#: mail/local-config.glade.h:7
+msgid "Mailbox Format"
+msgstr ""
+
+#: mail/local-config.glade.h:8
+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"
@@ -4023,91 +4264,295 @@ 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 ""
+
+#: mail/mail-callbacks.c:611
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:554
+#: mail/mail-callbacks.c:613
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:665
+#: mail/mail-callbacks.c:748
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:699 mail/mail-display.c:72
+#: mail/mail-callbacks.c:781 mail/mail-display.c:79
 msgid "Overwrite file?"
 msgstr ""
 
-#: mail/mail-callbacks.c:703 mail/mail-display.c:76
+#: mail/mail-callbacks.c:785 mail/mail-display.c:83
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: mail/mail-callbacks.c:748
+#: mail/mail-callbacks.c:830
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:750
+#: mail/mail-callbacks.c:832
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:877
+#: mail/mail-callbacks.c:916
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:922
+#: mail/mail-callbacks.c:961
 msgid "Print Message"
 msgstr ""
 
-#: mail/mail-callbacks.c:969
+#: 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
+msgid "Account Information"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:8
+msgid "Account Management"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:9
+msgid "Account Properties"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:11
+msgid "Advanced"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:12
+msgid "Authentication"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:13
+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
+msgid "Default"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:26
+msgid "Delete mail from server"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:27
+msgid "Done"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:28
+msgid "E-Mail Address:"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:30
+msgid "Email Address:"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:31
+msgid "Evolution Mail Configuration"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:32
+msgid "Full Name:"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:35
+msgid "Hostname:"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:36
+msgid "IMAP"
+msgstr ""
+
+#: 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
+msgid "Kerberos"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:40
+msgid "Mail"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:41
+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"
+#: mail/mail-config-druid.glade.h:43
+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
+msgid "News"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:48
+msgid "Optional"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:49 mail/mail-config-gui.c:485
+msgid "Organization:"
+msgstr "Organisation:"
+
+#: mail/mail-config-druid.glade.h:50
+msgid "Outgoing Mail Server"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:51
+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 ""
+
+#: mail/mail-config-druid.glade.h:55
+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
+msgid "Reply-to:"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:58
+msgid "Required"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:60
+msgid "Save password"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:61
+msgid "Select signature file"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:62
+msgid "Sending Email"
 msgstr ""
 
-#: po/tmp/mail-config-druid.glade.h:10
-msgid "Welcome to the Evolution Mail configuration wizard!\n"
+#: mail/mail-config-druid.glade.h:64
+msgid "Server Configuration"
 msgstr ""
 
-#: po/tmp/mail-config-druid.glade.h:14
+#: mail/mail-config-druid.glade.h:65
+msgid "Server Timeouts"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:66
+msgid "Server Type: "
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:67
+msgid "Server requires authentication"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:68
+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
+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
+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
+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
+msgid "minute(s)"
 msgstr ""
 
 #: mail/mail-config-gui.c:433
@@ -4128,15 +4573,7 @@ msgstr ""
 msgid "Email address:"
 msgstr ""
 
-#: mail/mail-config-gui.c:485
-msgid "Organization:"
-msgstr "Organisation:"
-
-#: 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 ""
 
@@ -4144,26 +4581,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 ""
@@ -4176,7 +4597,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"
@@ -4202,6 +4623,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 ""
@@ -4250,520 +4679,431 @@ msgstr "Querying authorisation capabilities of \"%s\""
 msgid "Query authorization at \"%s\""
 msgstr "Query authorisation at \"%s\""
 
-#: 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
 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 "Organisation"
 
-#: po/tmp/mail-config.glade.h:18
+#: mail/mail-config.glade.h:18
 msgid "Send messages in HTML format"
 msgstr ""
 
-#: po/tmp/mail-config.glade.h:20
-msgid "Sources"
-msgstr ""
-
-#: mail/mail-crypto.c:350 mail/mail-crypto.c:452 mail/mail-crypto.c:629
+#: 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."
 msgstr ""
 
-#: mail/mail-crypto.c:354 mail/mail-crypto.c:456 mail/mail-crypto.c:634
+#: mail/mail-crypto.c:357 mail/mail-crypto.c:462 mail/mail-crypto.c:640
+#: mail/mail-crypto.c:785
 msgid "No password provided."
 msgstr ""
 
-#: mail/mail-crypto.c:360 mail/mail-crypto.c:463 mail/mail-crypto.c:640
+#: mail/mail-crypto.c:363 mail/mail-crypto.c:469 mail/mail-crypto.c:646
+#: mail/mail-crypto.c:792 mail/mail-crypto.c:942
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: mail/mail-crypto.c:625
+#: mail/mail-crypto.c:631 mail/mail-crypto.c:777 mail/mail-crypto.c:936
 msgid "No GPG/PGP program available."
 msgstr ""
 
-#: mail/mail-display.c:90
+#: mail/mail-crypto.c:953
+#, c-format
+msgid "Couldn't create temp file: %s"
+msgstr ""
+
+#: mail/mail-display.c:98
 #, c-format
 msgid ""
 "Could not open file %s:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-display.c:113
+#: mail/mail-display.c:131
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-display.c:218
+#: mail/mail-display.c:229
 msgid "Save Attachment"
 msgstr ""
 
-#: mail/mail-display.c:258
+#: mail/mail-display.c:269
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/mail-display.c:300
+#: mail/mail-display.c:311
 msgid "Save to Disk..."
 msgstr ""
 
-#: mail/mail-display.c:302
+#: mail/mail-display.c:313
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/mail-display.c:304
+#: mail/mail-display.c:315
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:328
+#: mail/mail-display.c:339
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:351
+#: mail/mail-display.c:362
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:355
+#: mail/mail-display.c:366
 msgid "Hide"
 msgstr ""
 
-#: mail/mail-format.c:500
+#: mail/mail-format.c:503
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:623
-msgid "Reply-To:"
-msgstr ""
-
-#: mail/mail-format.c:845
+#: mail/mail-format.c:851
 msgid "No GPG/PGP support available in this copy of Evolution."
 msgstr ""
 
-#: mail/mail-format.c:857
+#: mail/mail-format.c:863
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:869
 msgid "Encrypted message"
 msgstr ""
 
-#: mail/mail-format.c:864
+#: mail/mail-format.c:870
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1470
+#: mail/mail-format.c:1450
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1482
+#: mail/mail-format.c:1462
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1486
+#: mail/mail-format.c:1466
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1520
+#: mail/mail-format.c:1500
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1525
+#: mail/mail-format.c:1505
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-format.c:1695
+#: mail/mail-format.c:1675
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr ""
 
-#: mail/mail-local.c:202
+#: mail/mail-local.c:204
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:206
+#: mail/mail-local.c:208
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:261
+#: mail/mail-local.c:251
+msgid "Reconfiguring folder"
+msgstr ""
+
+#: mail/mail-local.c:269
 msgid "Closing current folder"
 msgstr ""
 
-#: mail/mail-local.c:293
+#: mail/mail-local.c:295
 msgid "Renaming old folder and opening"
 msgstr ""
 
-#: mail/mail-local.c:314
+#: mail/mail-local.c:313
 msgid "Creating new folder"
 msgstr ""
 
-#: mail/mail-local.c:329
+#: mail/mail-local.c:327
 msgid "Copying messages"
 msgstr ""
 
-#: mail/mail-local.c:341
+#: 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:372
+#: 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:781
+#: mail/mail-local.c:787
 msgid "Registering local folder"
 msgstr ""
 
-#: mail/mail-local.c:783
+#: mail/mail-local.c:789
 msgid "Register local folder"
 msgstr ""
 
-#: mail/mail-ops.c:79
+#: mail/mail-local.c:894
+#, c-format
+msgid ""
+"Unable to register folder '%s':\n"
+"%s"
+msgstr ""
+
+#: mail/mail-mt.c:85
+#, c-format
+msgid ""
+"Error while '%s':\n"
+"%s"
+msgstr ""
+
+#: mail/mail-mt.c:87
+#, c-format
+msgid ""
+"Error while performing operation:\n"
+"%s"
+msgstr ""
+
+#: mail/mail-mt.c:356 mail/mail-mt.c:385
+msgid "Working"
+msgstr ""
+
+#: mail/mail-ops.c:88
 #, c-format
 msgid "Fetching email from %s"
 msgstr ""
 
-#: mail/mail-ops.c:81
+#: mail/mail-ops.c:90
 #, c-format
 msgid "Fetch email from %s"
 msgstr ""
 
-#: mail/mail-ops.c:331
+#: mail/mail-ops.c:335
 #, c-format
 msgid "There is no new mail at %s."
 msgstr ""
 
-#: 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:538
+#: mail/mail-ops.c:551
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:543
-msgid "Sending a message without a subject"
+#: mail/mail-ops.c:553
+msgid "Sending message"
 msgstr ""
 
-#: mail/mail-ops.c:546
-#, c-format
-msgid "Send \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:549
-msgid "Send a message without a subject"
-msgstr ""
-
-#: mail/mail-ops.c:720
+#: mail/mail-ops.c:669
 msgid "Sending queue"
 msgstr ""
 
-#: mail/mail-ops.c:722
+#: mail/mail-ops.c:671
 msgid "Send queue"
 msgstr ""
 
-#: mail/mail-ops.c:858 mail/mail-ops.c:865
+#: mail/mail-ops.c:804 mail/mail-ops.c:811
 #, c-format
 msgid "Appending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:862 mail/mail-ops.c:868
+#: mail/mail-ops.c:808 mail/mail-ops.c:814
 msgid "Appending a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:940
-#, c-format
-msgid "Expunging \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:942
-#, c-format
-msgid "Expunge \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1001
+#: mail/mail-ops.c:897
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:899
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1006
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1008
+#: mail/mail-ops.c:904
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1039
+#: mail/mail-ops.c:935
 msgid "Moving"
 msgstr ""
 
-#: mail/mail-ops.c:1042
+#: mail/mail-ops.c:938
 msgid "Copying"
 msgstr ""
 
-#: mail/mail-ops.c:1062
+#: mail/mail-ops.c:958
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1141
-#, c-format
-msgid "Marking messages in folder \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1144
-#, c-format
-msgid "Mark messages in folder \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1175
-#, c-format
-msgid "Marking message %d of %d"
-msgstr ""
-
-#: mail/mail-ops.c:1295
+#: mail/mail-ops.c:1033
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1297
-#, c-format
-msgid "Scan folders in \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1366 mail/subscribe-dialog.c:339
+#: mail/mail-ops.c:1099 mail/subscribe-dialog.c:341
 msgid "(No description)"
 msgstr ""
 
-#: mail/mail-ops.c:1432
-#, c-format
-msgid "Attaching messages from folder \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1435
-#, c-format
-msgid "Attach messages from \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1535
-#, c-format
-msgid "Forwarding messages \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1539
-msgid "Forwarding a message without a subject"
-msgstr ""
-
-#: mail/mail-ops.c:1542
-#, c-format
-msgid "Forward message \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1546
-msgid "Forward a message without a subject"
-msgstr ""
-
-#: mail/mail-ops.c:1593
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1610
-msgid ""
-"Failed to generate mime part from message while generating forwarded message."
-msgstr ""
-
-#: mail/mail-ops.c:1665
+#: mail/mail-ops.c:1164
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1679
-msgid "Forwarded message:\n"
-msgstr ""
-
-#: mail/mail-ops.c:1748
-#, c-format
-msgid "Loading \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1750
-#, c-format
-msgid "Load \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1853
+#: mail/mail-ops.c:1205 mail/mail-ops.c:1274
 #, c-format
-msgid "Creating \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1855
-#, c-format
-msgid "Create \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1903
-msgid "Exception while reporting result to shell component listener."
+msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1949
-#, c-format
-msgid "Synchronizing \"%s\""
+#: mail/mail-ops.c:1336
+#, fuzzy
+msgid "Synchronising folder"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:1951
-#, c-format
-msgid "Synchronize \"%s\""
-msgstr "Synchronise \"%s\""
-
-#: mail/mail-ops.c:2015
-#, c-format
-msgid "Displaying message UID \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:2018
-msgid "Clearing message display"
+#: mail/mail-ops.c:1386
+msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:2021
+#: mail/mail-ops.c:1434
 #, c-format
-msgid "Display message UID \"%s\""
+msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:2024
-msgid "Clear message display"
-msgstr ""
-
-#: mail/mail-ops.c:2137
-#, c-format
-msgid "Opening messages from folder \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:2140
-#, c-format
-msgid "Open messages from \"%s\""
+#: mail/mail-ops.c:1497
+msgid "Retrieving messages"
 msgstr ""
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:1507
 #, c-format
-msgid "Loading %s Folder"
+msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:2246
+#: mail/mail-ops.c:1655
 #, c-format
-msgid "Load %s Folder"
+msgid "Loading %s Folder for %s"
 msgstr ""
 
-#: mail/mail-ops.c:2310
+#: mail/mail-ops.c:1657
 #, c-format
-msgid "Viewing messages from folder \"%s\""
+msgid "Load %s Folder for %s"
 msgstr ""
 
-#: mail/mail-ops.c:2313
-#, c-format
-msgid "View messages from \"%s\""
+#: mail/mail-ops.c:1823
+msgid "Saving messages"
 msgstr ""
 
-#: mail/mail-ops.c:2339
+#: mail/mail-ops.c:1902
 #, c-format
-msgid "Retrieving message %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:2428
-#, c-format
-msgid "Saving messages from folder \"%s\""
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
 msgstr ""
 
-#: mail/mail-ops.c:2431
+#: mail/mail-ops.c:1915
 #, c-format
-msgid "Save messages from folder \"%s\""
+msgid "Saving message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:2474
+#: mail/mail-ops.c:1929
 #, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
+msgid ""
+"Error saving messages to: %s:\n"
+" %s"
 msgstr ""
 
 #: mail/mail-search-dialogue.c:104
 msgid "Cancel"
 msgstr ""
 
-#: mail/mail-summary.c:105 mail/mail-threads.c:728
+#: mail/mail-summary.c:110 mail/mail-threads.c:729
 msgid "Incomplete message written on pipe!"
 msgstr ""
 
-#: mail/mail-threads.c:301
+#: mail/mail-threads.c:302
 #, c-format
 msgid ""
 "Error while preparing to %s:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-threads.c:675
+#: mail/mail-threads.c:676
 #, c-format
 msgid ""
 "Error while `%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-threads.c:732
+#: mail/mail-threads.c:733
 msgid "Error reading commands from dispatching thread."
 msgstr ""
 
-#: mail/mail-threads.c:797
+#: mail/mail-threads.c:798
 msgid "Corrupted message from dispatching thread?"
 msgstr ""
 
-#: mail/mail-threads.c:916
+#: mail/mail-threads.c:917
 msgid "Could not create dialog box."
 msgstr ""
 
-#: mail/mail-threads.c:927
+#: mail/mail-threads.c:928
 msgid "User cancelled query."
 msgstr ""
 
@@ -4773,126 +5113,141 @@ msgid "Couldn't create temporary mbox `%s': %s"
 msgstr ""
 
 #. Get all uids of source
-#: mail/mail-tools.c:239
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Examining %s"
 msgstr ""
 
-#: mail/mail-tools.c:269
+#: mail/mail-tools.c:271
 #, c-format
 msgid ""
 "Could not read UID cache file \"%s\". You may receive duplicate messages."
 msgstr ""
 
-#. Info
-#: mail/mail-tools.c:290
+#: mail/mail-tools.c:300
 #, c-format
 msgid "Retrieving message %d of %d"
 msgstr ""
 
 #. Append it to dest
-#: mail/mail-tools.c:303
+#: mail/mail-tools.c:315
 #, c-format
 msgid "Writing message %d of %d"
 msgstr ""
 
-#: mail/mail-tools.c:332
+#: mail/mail-tools.c:347
 #, c-format
 msgid "Saving changes to %s"
 msgstr ""
 
-#: mail/mail-tools.c:369
+#: mail/mail-tools.c:381
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr ""
 
-#: mail/mail-tools.c:379
+#: mail/mail-tools.c:391
 msgid "Fwd: (no subject)"
 msgstr ""
 
-#: mail/mail-tools.c:418
+#: mail/mail-tools.c:427
 #, c-format
 msgid "Forwarded message - %s"
 msgstr ""
 
-#: mail/mail-tools.c:420
+#: mail/mail-tools.c:429
 msgid "Forwarded message (no subject)"
 msgstr ""
 
-#: mail/mail-tools.c:523
+#: mail/mail-tools.c:530
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-vfolder.c:147
+#: mail/mail-vfolder.c:149
 msgid "VFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:296
+#: mail/mail-vfolder.c:298
 msgid "New VFolder"
 msgstr ""
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:33
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:37
 msgid "Reply"
 msgstr ""
 
-#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:38
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
 msgid "Reply to the sender of this message"
 msgstr ""
 
-#: mail/mail-view.c:156 po/tmp/evolution-mail.xml.h:37
+#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
 msgid "Reply to all recipients of this message"
 msgstr ""
 
-#: mail/mail-view.c:159 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:163 po/tmp/evolution-mail.xml.h:32
+#: mail/mail-view.c:148 ui/evolution-mail.xml.h:36
 msgid "Print the selected message"
 msgstr ""
 
-#: mail/mail-view.c:165 po/tmp/evolution-mail.xml.h:12
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:12
 msgid "Delete this message"
 msgstr ""
 
-#: mail/message-list.c:572
+#: mail/message-list.c:590
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:575
+#: mail/message-list.c:593
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:578
+#: mail/message-list.c:596
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:846
+#: mail/message-list.c:881
 #, c-format
 msgid "[ %s ]"
 msgstr ""
 
 #. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:858 mail/message-list.c:873
+#: mail/message-list.c:893 mail/message-list.c:909
 #, c-format
 msgid "%s, et al."
 msgstr ""
 
-#: mail/message-list.c:860 mail/message-list.c:875
+#: mail/message-list.c:896 mail/message-list.c:912
 msgid "<unknown>"
 msgstr ""
 
-#: mail/message-list.c:2068
-msgid "Rebuilding message view"
+#: mail/message-list.c:965
+msgid "?"
+msgstr ""
+
+#: mail/message-list.c:972
+msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:2070
-msgid "Rebuild message view"
+#: mail/message-list.c:981
+msgid "Yesterday %l:%M %p"
+msgstr ""
+
+#: mail/message-list.c:993
+msgid "%a %l:%M %p"
+msgstr ""
+
+#: mail/message-list.c:1001
+msgid "%b %d %l:%M %p"
+msgstr ""
+
+#: mail/message-list.c:1003
+msgid "%b %d %Y"
 msgstr ""
 
 #: mail/subscribe-dialog.c:139
@@ -4909,27 +5264,27 @@ msgstr ""
 msgid "Get store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:282
+#: mail/subscribe-dialog.c:283
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:286
+#: mail/subscribe-dialog.c:287
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:290
+#: mail/subscribe-dialog.c:291
 #, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:293
+#: mail/subscribe-dialog.c:294
 #, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr ""
 
-#: shell/e-setup.c:112 shell/e-setup.c:183
+#: shell/e-setup.c:112 shell/e-setup.c:185
 msgid "Evolution installation"
 msgstr ""
 
@@ -4943,23 +5298,23 @@ msgstr ""
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 
-#: shell/e-setup.c:155
+#: shell/e-setup.c:157
 msgid "Could not update files correctly"
 msgstr ""
 
-#: shell/e-setup.c:158 shell/e-setup.c:224
+#: shell/e-setup.c:160 shell/e-setup.c:228
 msgid "Evolution files successfully installed."
 msgstr ""
 
-#: shell/e-setup.c:187
+#: shell/e-setup.c:189
 msgid "This seems to be the first time you run Evolution."
 msgstr ""
 
-#: shell/e-setup.c:188
+#: shell/e-setup.c:190
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 
-#: shell/e-setup.c:205
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -4967,14 +5322,14 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: shell/e-setup.c:220
+#: shell/e-setup.c:224
 #, c-format
 msgid ""
 "Cannot copy files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:245
+#: shell/e-setup.c:249
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -4982,7 +5337,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:257
+#: shell/e-setup.c:261
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -5011,7 +5366,7 @@ msgid ""
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:291
+#: shell/e-shell-folder-selection-dialog.c:297
 msgid "New..."
 msgstr ""
 
@@ -5019,30 +5374,26 @@ msgstr ""
 msgid "(Untitled)"
 msgstr ""
 
-#. you might have to call gnome_dialog_run() on the
-#. * dialog returned here, I don't remember...
-#.
-#: shell/e-shell-view-menu.c:114
+#: shell/e-shell-view-menu.c:111
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
-#. same as above
-#: shell/e-shell-view-menu.c:120
+#: shell/e-shell-view-menu.c:117
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:172
+#: shell/e-shell-view-menu.c:169
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:174
+#: shell/e-shell-view-menu.c:171
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
 "within the GNOME desktop environment."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:335
+#: shell/e-shell-view-menu.c:332
 msgid "Go to folder..."
 msgstr ""
 
@@ -5138,9 +5489,8 @@ msgstr ""
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:125
-#: po/tmp/evolution-message-composer.xml.h:43 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 ""
 
@@ -5201,8 +5551,8 @@ msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
-"Over the last month and a half, our focus has been on making\n"
-"Evolution usable. Many of the Evolution developers are now using\n"
+"Over the time since the past release, our focus has been on making\n"
+"Evolution usable.  Many of the Evolution developers are now using\n"
 "Evolution to read their mail full time. You could too. (Just\n"
 "be sure to keep a backup.)\n"
 "\n"
@@ -5236,1100 +5586,1113 @@ msgstr ""
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Cannot initialise the Bonobo component system."
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-addressbook-ldap.xml.h:6
-msgid "N_ew Directory Server"
-msgstr ""
-
-#: po/tmp/evolution-addressbook-ldap.xml.h:7
-msgid "_Actions"
-msgstr ""
-
-#: 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 ""
+
+#: ui/evolution-addressbook.xml.h:20
 msgid "_Print Contacts..."
 msgstr ""
 
-#: po/tmp/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:21
 msgid "_Search for contacts"
 msgstr ""
 
-#: po/tmp/evolution-addressbook.xml.h:21
-#: 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 ""
 
-#: 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 ""
 
-#: po/tmp/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:27
 msgid "Show 1 month"
 msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:28
 msgid "Show 1 week"
 msgstr ""
 
-#: 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:414
+#: 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
-msgid "_Save Calendar As"
+#: 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:18
+#: 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:38
-#: 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:42
+#: 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
 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
 msgid "FIXME: _Move to Folder..."
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:57
+#: ui/evolution-event-editor.xml.h:57
 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:10
+#: 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:21
+#: 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
 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:34
+#: 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:35
+#: ui/evolution-event-editor.xml.h:105 ui/evolution-message-composer.xml.h:39
 #, fuzzy
 msgid "_Close"
 msgstr "Colours"
 
-#: 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:36
+#: 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:37
-#: 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:39 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:21
-msgid "Mail _Filters"
+#: ui/evolution-mail.xml.h:22
+msgid "Hide _Deleted messages"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:23
+msgid "Hide _Read messages"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:24
+msgid "Hide _Selected messages"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:25
+msgid "Mail _Filters..."
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:22
-msgid "Manage Subscriptions"
+#: ui/evolution-mail.xml.h:26
+msgid "Manage Subscriptions..."
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:23
+#: ui/evolution-mail.xml.h:27
 msgid "Mar_k As Read"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:28
 msgid "Mark As U_nread"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:29
 msgid "Move"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:30
 msgid "Move message to a new folder"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:27
+#: ui/evolution-mail.xml.h:31
 msgid "Previews the message to be printed"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:29
+#: ui/evolution-mail.xml.h:33
 msgid "Print Preview of message..."
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:30
+#: ui/evolution-mail.xml.h:34
 msgid "Print message to the printer"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:31
+#: ui/evolution-mail.xml.h:35
 msgid "Print message..."
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:35
+#: ui/evolution-mail.xml.h:39
 msgid "Reply to _All"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:36
+#: ui/evolution-mail.xml.h:40
 msgid "Reply to _Sender"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:39 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:40
+#: ui/evolution-mail.xml.h:44
 msgid "Send queued mail and retrieve new mail"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:41
+#: ui/evolution-mail.xml.h:45
+msgid "Show _All messages"
+msgstr ""
+
+#: ui/evolution-mail.xml.h:46
 msgid "Threaded Message list"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:42
+#: ui/evolution-mail.xml.h:47
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:48
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:49
 msgid "View Raw Message Source"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:50
 msgid "_Apply Filters"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:51
 msgid "_Configure Folder"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:52
 msgid "_Copy to Folder..."
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:49
+#: ui/evolution-mail.xml.h:54
 msgid "_Edit Message"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:55
 msgid "_Expunge"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:56
 msgid "_Filter on Subject"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:57
 msgid "_Forward"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:53 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:54
-msgid "_Mail Configuration"
+#: ui/evolution-mail.xml.h:59
+msgid "_Mail Configuration..."
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:60
 msgid "_Message"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:56
+#: ui/evolution-mail.xml.h:61
 msgid "_Move to Folder..."
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:57
+#: ui/evolution-mail.xml.h:62
 msgid "_Open in New Window"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:58
+#: ui/evolution-mail.xml.h:63
 msgid "_Print Message"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:59
+#: ui/evolution-mail.xml.h:64
 msgid "_Save Message As..."
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:60
+#: ui/evolution-mail.xml.h:65
 msgid "_Source"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:66
 msgid "_Threaded"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:67
 msgid "_Undelete"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:63
+#: ui/evolution-mail.xml.h:68
 msgid "_VFolder on Subject"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:64
-msgid "_Virtual Folder Editor"
+#: ui/evolution-mail.xml.h:69
+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:11
+#: ui/evolution-message-composer.xml.h:10
+msgid "Encrypt this message with PGP"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:12
 msgid "HTML"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:13
 msgid "Insert a file as text into the message"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:14
 msgid "Insert text file..."
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:15
+#: 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 ""
+
+#: ui/evolution-message-composer.xml.h:18
+msgid "PGP Sign"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save As"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:19
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save in _folder... (FIXME)"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:28
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send the message later"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:32
 msgid "Send the message now"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:33
 msgid "Send this message now"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show / hide attachments"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show _attachments"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:36
 msgid "Show attachments"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:37
+msgid "Sign this message with your PGP key"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Insert text file... (FIXME)"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Open..."
 msgstr ""
 
+#: 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
 msgid "Evolution bar _shortcut"
 msgstr ""
 
-#: 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
 msgid "Getting _Started"
 msgstr ""
 
-#: po/tmp/evolution.xml.h:11
+#: ui/evolution.xml.h:11
 msgid "Show information about Evolution"
 msgstr ""
 
-#: 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
 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2470
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
 msgid "%A, %B %d, %Y"
 msgstr ""
 
@@ -6409,28 +6772,34 @@ msgstr ""
 msgid "All Attendees"
 msgstr ""
 
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: widgets/misc/e-calendar-item.c:421
+msgid "MTWTFSS"
+msgstr ""
+
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
+#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
 msgid "%B %Y"
 msgstr ""
 
-#: widgets/misc/e-clipped-label.c:107
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr ""
 
-#: widgets/misc/e-dateedit.c:408
+#: widgets/misc/e-dateedit.c:407
 msgid "Now"
 msgstr ""
 
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1249 widgets/misc/e-dateedit.c:1308
-#: widgets/misc/e-dateedit.c:1487
+#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
+#: widgets/misc/e-dateedit.c:1486
 msgid "%H:%M"
 msgstr ""
 
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1252 widgets/misc/e-dateedit.c:1311
-#: widgets/misc/e-dateedit.c:1490
+#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
+#: widgets/misc/e-dateedit.c:1489
 msgid "%I:%M %p"
 msgstr ""
 
@@ -6439,11 +6808,11 @@ msgstr ""
 msgid "Group %i"
 msgstr ""
 
+#~ msgid "Synchronize \"%s\""
+#~ msgstr "Synchronise \"%s\""
+
 #~ msgid "Colors for display"
 #~ msgstr "Colours for display"
 
-#~ msgid "Cannot initialize Evolution's mail summary component."
-#~ msgstr "Cannot initialise Evolution's mail summary component."
-
 #~ msgid "Cannot initialize Evolution's mail storage hash."
 #~ msgstr "Cannot initialise Evolution's mail storage hash."
diff --git a/po/es.po b/po/es.po
index f7593a9e14..186a8bf453 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.7.0\n"
-"POT-Creation-Date: 2001-01-03 11:04+0100\n"
+"POT-Creation-Date: 2001-01-06 00:11+0100\n"
 "PO-Revision-Date: 2000-09-26 16:58-04:00\n"
 "Last-Translator: HИctor GarcМa аlvarez <hector@scouts-es.org>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -457,27 +457,10 @@ msgid "Could not read pilot's Address application block"
 msgstr "No pude leer informaciСn de la aplicaciСn de direcciones del pilot"
 
 #.
-#. * 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 "categorМas"
-
-#: addressbook/contact-editor/categories-strings.h:8
-msgid "Item(s) belong to these categories:"
-msgstr "Elemento(s) pertenecientes a esas categorМas:"
-
-#: addressbook/contact-editor/categories-strings.h:9
-msgid "Available Categories:"
-msgstr "CategorМas disponibles:"
-
-#.
-#. * 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 "©Borrar contacto?"
 
@@ -491,7 +474,7 @@ msgid "_Add"
 msgstr "_AЯadir"
 
 #: 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 "_Borrar"
 
@@ -505,12 +488,13 @@ msgid "New phone type"
 msgstr "Nuevo tipo de telИfono"
 
 #.
-#. * 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/addressbook-config.glade.h:6 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 "AЯadir"
 
@@ -568,7 +552,7 @@ msgid "C_ontacts..."
 msgstr "C_ontactos..."
 
 #: 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 "Ca_tegorМas..."
 
@@ -585,7 +569,8 @@ msgid "_Address..."
 msgstr "_DirecciСn..."
 
 #: 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 "General"
 
@@ -630,7 +615,7 @@ msgid "No_tes:"
 msgstr "No_tas:"
 
 #: 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 "Detalles"
 
@@ -686,7 +671,7 @@ msgstr "MСvil"
 
 #: addressbook/contact-editor/e-contact-editor.c:1286
 #: addressbook/contact-editor/e-contact-editor.c:1381
-#: po/tmp/mail-config.glade.h:17
+#: mail/mail-config.glade.h:17
 msgid "Other"
 msgstr "Otro"
 
@@ -723,50 +708,50 @@ msgid "Email 3"
 msgstr "Correo electrСnico 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 "DirecciСn _2:"
 
-#: po/tmp/fulladdr.glade.h:7
+#: addressbook/contact-editor/fulladdr.glade.h:7
 msgid "Canada"
 msgstr "Canada"
 
-#: po/tmp/fulladdr.glade.h:8
+#: addressbook/contact-editor/fulladdr.glade.h:8
 msgid "Check Address"
 msgstr "Comprobar DirecciСn"
 
-#: po/tmp/fulladdr.glade.h:9
+#: addressbook/contact-editor/fulladdr.glade.h:9
 msgid "Countr_y:"
 msgstr "P_aМs:"
 
-#: po/tmp/fulladdr.glade.h:10
+#: addressbook/contact-editor/fulladdr.glade.h:10
 msgid "Finland"
 msgstr "Finlandia"
 
-#: po/tmp/fulladdr.glade.h:11
+#: addressbook/contact-editor/fulladdr.glade.h:11
 msgid "USA"
 msgstr "USA"
 
-#: po/tmp/fulladdr.glade.h:12
+#: addressbook/contact-editor/fulladdr.glade.h:12
 msgid "_Address:"
 msgstr "_DirecciСn:"
 
-#: po/tmp/fulladdr.glade.h:13
+#: addressbook/contact-editor/fulladdr.glade.h:13
 msgid "_City:"
 msgstr "_Ciudad:"
 
-#: po/tmp/fulladdr.glade.h:14
+#: addressbook/contact-editor/fulladdr.glade.h:14
 msgid "_PO Box:"
 msgstr "_DirecciСn:"
 
-#: po/tmp/fulladdr.glade.h:15
+#: addressbook/contact-editor/fulladdr.glade.h:15
 msgid "_State/Province:"
 msgstr "E_stado/Provincia:"
 
-#: po/tmp/fulladdr.glade.h:16
+#: addressbook/contact-editor/fulladdr.glade.h:16
 msgid "_ZIP Code:"
 msgstr "CСdigo _Postal"
 
@@ -834,24 +819,29 @@ msgstr "_Apellido:"
 msgid "_Suffix:"
 msgstr "_Sufijo:"
 
-#: addressbook/gui/component/addressbook.c:230
+#: addressbook/gui/component/addressbook.c:231
 msgid "As _Minicards"
 msgstr "Como _mini tarjetas"
 
 #.
-#. * 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 "Como _Tabla"
 
-#: addressbook/gui/component/addressbook.c:347
+#: addressbook/gui/component/addressbook.c:374
+#, fuzzy, c-format
+msgid "Enter password for %s"
+msgstr "Por favor introduzca la contraseЯa NNTP para %s@%s"
+
+#: addressbook/gui/component/addressbook.c:402
 msgid "Unable to open addressbook"
 msgstr "No es posible abrir la agenda de direcciones"
 
-#: 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"
@@ -871,27 +861,27 @@ msgstr ""
 "LDAP, necesitarА descargar e instalar OpenLDAP y recompilar\n"
 "e instalar evolution.\n"
 
-#: addressbook/gui/component/addressbook.c:473 mail/folder-browser.c:178
+#: addressbook/gui/component/addressbook.c:528 mail/folder-browser.c:219
 msgid "Show All"
 msgstr "Mostrar todo"
 
-#: addressbook/gui/component/addressbook.c:475 mail/folder-browser.c:180
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 msgid "Advanced..."
 msgstr "Avanzado..."
 
-#: addressbook/gui/component/addressbook.c:505
+#: addressbook/gui/component/addressbook.c:560
 msgid "Any field contains"
 msgstr "Cualquier campo contiene"
 
-#: addressbook/gui/component/addressbook.c:506
+#: addressbook/gui/component/addressbook.c:561
 msgid "Name contains"
 msgstr "El nombre contiene"
 
-#: addressbook/gui/component/addressbook.c:507
+#: addressbook/gui/component/addressbook.c:562
 msgid "Email contains"
 msgstr "El mensaje contiene"
 
-#: addressbook/gui/component/addressbook.c:593
+#: addressbook/gui/component/addressbook.c:648
 msgid "The URI that the Folder Browser will display"
 msgstr "La URI que mostrarА el visor de carpetas"
 
@@ -956,6 +946,7 @@ msgid "Remember this password"
 msgstr "Recuerda esta contraseЯa"
 
 #: addressbook/gui/component/addressbook-config.c:360
+#: mail/mail-config-druid.glade.h:34
 msgid "Host:"
 msgstr "Servidor:"
 
@@ -972,12 +963,12 @@ msgid "Search Scope:"
 msgstr "Rango de bЗsqueda:"
 
 #: addressbook/gui/component/addressbook-config.c:438
-#: mail/mail-config-gui.c:943
+#: mail/mail-config-druid.glade.h:14 mail/mail-config-gui.c:943
 msgid "Authentication:"
 msgstr "AutentificaciСn:"
 
 #: addressbook/gui/component/addressbook-config.c:455
-#: mail/mail-config-gui.c:934
+#: mail/mail-config-druid.glade.h:52 mail/mail-config-gui.c:934
 msgid "Path:"
 msgstr "Ruta:"
 
@@ -985,15 +976,15 @@ msgstr "Ruta:"
 msgid "Create path if it doesn't exist."
 msgstr "Crear camino si no existe."
 
-#: addressbook/gui/component/addressbook-config.c:589
+#: addressbook/gui/component/addressbook-config.c:593
 msgid "Edit Addressbook"
 msgstr "Editar agenda de direcciones"
 
-#: addressbook/gui/component/addressbook-config.c:591
+#: addressbook/gui/component/addressbook-config.c:595
 msgid "Add Addressbook"
 msgstr "AЯadir agenda de direcciones"
 
-#: addressbook/gui/component/addressbook-config.c:607
+#: addressbook/gui/component/addressbook-config.c:611
 msgid ""
 "Select the kind of addressbook you have, and enter the relevant information "
 "about it."
@@ -1001,59 +992,63 @@ msgstr ""
 "Seleccione el tipo de agenda de direcciones que tenga, y escriba la "
 "informaciСn relevante acerca de ella."
 
-#: addressbook/gui/component/addressbook-config.c:612
+#: addressbook/gui/component/addressbook-config.c:616
+#: mail/mail-config-druid.glade.h:45
 msgid "Name:"
 msgstr "Nombre:"
 
-#: addressbook/gui/component/addressbook-config.c:613
-#: po/tmp/e-msg-composer-attachment.glade.h:7
+#: addressbook/gui/component/addressbook-config.c:617
+#: composer/e-msg-composer-attachment.glade.h:7
 msgid "Description:"
 msgstr "DescripciСn:"
 
-#: po/tmp/addressbook-config.glade.h:7
+#: addressbook/gui/component/addressbook-config.glade.h:7
 msgid "Addressbook Sources"
 msgstr "Fuentes de la agenda de direcciones"
 
-#: calendar/gui/e-calendar-table.c:342 filter/libfilter-i18n.h:10
-#: mail/folder-browser.c:644 mail/mail-view.c:160
-#: po/tmp/addressbook-config.glade.h:8 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
+#: 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 "Borrar"
 
-#: mail/folder-browser.c:630 po/tmp/addressbook-config.glade.h:9
-#: po/tmp/filter.glade.h:8 po/tmp/mail-config.glade.h:9
+#: 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 "Editar"
 
-#: po/tmp/addressbook-config.glade.h:10
+#: addressbook/gui/component/addressbook-config.glade.h:10
 msgid "Name"
 msgstr "Nombre"
 
-#: po/tmp/addressbook-config.glade.h:11
+#: addressbook/gui/component/addressbook-config.glade.h:11
 msgid "URI"
 msgstr "URI"
 
 #.
-#. * 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 "Buscar..."
 
-#: po/tmp/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "Message Recipients"
 msgstr "Lista de destinatarios"
 
-#: po/tmp/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "Select Names"
 msgstr "_Seleccionar nombres"
 
-#: 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 "Seleccionar nombre de la lista:"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:147
@@ -1062,114 +1057,114 @@ msgid "Search"
 msgstr "Buscar"
 
 #.
-#. * 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 "a"
 
-#: po/tmp/alphabet.glade.h:8
+#: addressbook/gui/widgets/alphabet.glade.h:8
 msgid "b"
 msgstr "b"
 
-#: po/tmp/alphabet.glade.h:9
+#: addressbook/gui/widgets/alphabet.glade.h:9
 msgid "c"
 msgstr "c"
 
-#: po/tmp/alphabet.glade.h:10
+#: addressbook/gui/widgets/alphabet.glade.h:10
 msgid "d"
 msgstr "d"
 
-#: po/tmp/alphabet.glade.h:11
+#: addressbook/gui/widgets/alphabet.glade.h:11
 msgid "e"
 msgstr "e"
 
-#: po/tmp/alphabet.glade.h:12
+#: addressbook/gui/widgets/alphabet.glade.h:12
 msgid "f"
 msgstr "f"
 
-#: po/tmp/alphabet.glade.h:13
+#: addressbook/gui/widgets/alphabet.glade.h:13
 msgid "g"
 msgstr "g"
 
-#: po/tmp/alphabet.glade.h:14
+#: addressbook/gui/widgets/alphabet.glade.h:14
 msgid "h"
 msgstr "h"
 
-#: po/tmp/alphabet.glade.h:15
+#: addressbook/gui/widgets/alphabet.glade.h:15
 msgid "i"
 msgstr "i"
 
-#: po/tmp/alphabet.glade.h:16
+#: addressbook/gui/widgets/alphabet.glade.h:16
 msgid "j"
 msgstr "j"
 
-#: po/tmp/alphabet.glade.h:17
+#: addressbook/gui/widgets/alphabet.glade.h:17
 msgid "k"
 msgstr "k"
 
-#: po/tmp/alphabet.glade.h:18
+#: addressbook/gui/widgets/alphabet.glade.h:18
 msgid "l"
 msgstr "l"
 
-#: po/tmp/alphabet.glade.h:19
+#: addressbook/gui/widgets/alphabet.glade.h:19
 msgid "m"
 msgstr "m"
 
-#: po/tmp/alphabet.glade.h:20
+#: addressbook/gui/widgets/alphabet.glade.h:20
 msgid "n"
 msgstr "n"
 
-#: po/tmp/alphabet.glade.h:21
+#: addressbook/gui/widgets/alphabet.glade.h:21
 msgid "o"
 msgstr "o"
 
-#: po/tmp/alphabet.glade.h:22
+#: addressbook/gui/widgets/alphabet.glade.h:22
 msgid "p"
 msgstr "p"
 
-#: po/tmp/alphabet.glade.h:23
+#: addressbook/gui/widgets/alphabet.glade.h:23
 msgid "q"
 msgstr "q"
 
-#: po/tmp/alphabet.glade.h:24
+#: addressbook/gui/widgets/alphabet.glade.h:24
 msgid "r"
 msgstr "r"
 
-#: po/tmp/alphabet.glade.h:25
+#: addressbook/gui/widgets/alphabet.glade.h:25
 msgid "s"
 msgstr "s"
 
-#: po/tmp/alphabet.glade.h:26
+#: addressbook/gui/widgets/alphabet.glade.h:26
 msgid "t"
 msgstr "t"
 
-#: po/tmp/alphabet.glade.h:27
+#: addressbook/gui/widgets/alphabet.glade.h:27
 msgid "u"
 msgstr "u"
 
-#: po/tmp/alphabet.glade.h:28
+#: addressbook/gui/widgets/alphabet.glade.h:28
 msgid "v"
 msgstr "v"
 
-#: po/tmp/alphabet.glade.h:29
+#: addressbook/gui/widgets/alphabet.glade.h:29
 msgid "w"
 msgstr "w"
 
-#: po/tmp/alphabet.glade.h:30
+#: addressbook/gui/widgets/alphabet.glade.h:30
 msgid "x"
 msgstr "x"
 
-#: po/tmp/alphabet.glade.h:31
+#: addressbook/gui/widgets/alphabet.glade.h:31
 msgid "y"
 msgstr "y"
 
-#: po/tmp/alphabet.glade.h:32
+#: addressbook/gui/widgets/alphabet.glade.h:32
 msgid "z"
 msgstr "z"
 
@@ -1197,174 +1192,175 @@ msgstr ""
 "Pulse dos veces aquМ para crear un nuevo contacto."
 
 #.
-#. * 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 "10 pt. Tahoma"
 
-#: po/tmp/e-contact-print.glade.h:7
+#: addressbook/printing/e-contact-print.glade.h:7
 msgid "8 pt. Tahoma"
 msgstr "8 pt. Tahoma"
 
-#: po/tmp/e-contact-print.glade.h:8
+#: addressbook/printing/e-contact-print.glade.h:8
 msgid "Blank forms at end:"
 msgstr "Formularios vacМos al final:"
 
-#: po/tmp/e-contact-print.glade.h:9
+#: addressbook/printing/e-contact-print.glade.h:9
 msgid "Body"
 msgstr "Cuerpo"
 
-#: po/tmp/e-contact-print.glade.h:10
+#: addressbook/printing/e-contact-print.glade.h:10
 msgid "Bottom:"
 msgstr "Pie:"
 
-#: po/tmp/e-contact-print.glade.h:11
+#: addressbook/printing/e-contact-print.glade.h:11
 msgid "Dimensions:"
 msgstr "Dimensiones:"
 
-#: po/tmp/e-contact-print.glade.h:12
+#: addressbook/printing/e-contact-print.glade.h:12
 msgid "Font..."
 msgstr "Fuente..."
 
-#: po/tmp/e-contact-print.glade.h:13
+#: addressbook/printing/e-contact-print.glade.h:13
 msgid "Fonts"
 msgstr "Fuentes"
 
-#: po/tmp/e-contact-print.glade.h:14
+#: addressbook/printing/e-contact-print.glade.h:14
 msgid "Footer:"
 msgstr "Pie:"
 
-#: po/tmp/e-contact-print.glade.h:15
+#: addressbook/printing/e-contact-print.glade.h:15
 msgid "Format"
 msgstr "Formatear"
 
-#: po/tmp/e-contact-print.glade.h:16
+#: addressbook/printing/e-contact-print.glade.h:16
 msgid "Header"
 msgstr "Cabecera"
 
-#: po/tmp/e-contact-print.glade.h:17
+#: addressbook/printing/e-contact-print.glade.h:17
 msgid "Header/Footer"
 msgstr "Cabecera/Pie"
 
-#: po/tmp/e-contact-print.glade.h:18
+#: addressbook/printing/e-contact-print.glade.h:18
 msgid "Headings"
 msgstr "Cabecera"
 
-#: po/tmp/e-contact-print.glade.h:19
+#: addressbook/printing/e-contact-print.glade.h:19
 msgid "Headings for each letter"
 msgstr "Cabeceras para cada carta"
 
-#: po/tmp/e-contact-print.glade.h:20
+#: addressbook/printing/e-contact-print.glade.h:20
 msgid "Height:"
 msgstr "Alto:"
 
-#: po/tmp/e-contact-print.glade.h:21
+#: addressbook/printing/e-contact-print.glade.h:21
 msgid "Immediately follow each other"
 msgstr "Uno inmediatamente detrАs del otro"
 
-#: po/tmp/e-contact-print.glade.h:22
+#: addressbook/printing/e-contact-print.glade.h:22
 msgid "Include:"
 msgstr "Incluye:"
 
-#: po/tmp/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23
 msgid "Landscape"
 msgstr "Horizontal"
 
-#: po/tmp/e-contact-print.glade.h:24
+#: addressbook/printing/e-contact-print.glade.h:24
 msgid "Left:"
 msgstr "Izquierda:"
 
-#: po/tmp/e-contact-print.glade.h:25
+#: addressbook/printing/e-contact-print.glade.h:25
 msgid "Letter tabs on side"
 msgstr "Las pestaЯas con las letras a la derecha"
 
-#: po/tmp/e-contact-print.glade.h:26
+#: addressbook/printing/e-contact-print.glade.h:26
 msgid "Margins"
 msgstr "Margenes"
 
-#: po/tmp/e-contact-print.glade.h:27
+#: addressbook/printing/e-contact-print.glade.h:27
 msgid "Number of columns:"
 msgstr "NЗmero de columnas:"
 
-#: po/tmp/e-contact-print.glade.h:28
+#: addressbook/printing/e-contact-print.glade.h:28
 msgid "Options"
 msgstr "Opciones"
 
-#: po/tmp/e-contact-print.glade.h:29
+#: addressbook/printing/e-contact-print.glade.h:29
 msgid "Orientation"
 msgstr "OrientaciСn"
 
-#: po/tmp/e-contact-print.glade.h:30
+#: addressbook/printing/e-contact-print.glade.h:30
 msgid "Page"
 msgstr "Pagina"
 
-#: po/tmp/e-contact-print.glade.h:31
+#: addressbook/printing/e-contact-print.glade.h:31
 msgid "Page Setup:"
 msgstr "ConfiguraciСn de la pАgina:"
 
-#: po/tmp/e-contact-print.glade.h:32
+#: addressbook/printing/e-contact-print.glade.h:32
 msgid "Paper"
 msgstr "Papel"
 
-#: po/tmp/e-contact-print.glade.h:33
+#: addressbook/printing/e-contact-print.glade.h:33
 msgid "Paper source:"
 msgstr "Fuente del papel:"
 
-#: po/tmp/e-contact-print.glade.h:34
+#: addressbook/printing/e-contact-print.glade.h:34
 msgid "Portrait"
 msgstr "Vertical"
 
-#: po/tmp/e-contact-print.glade.h:35
+#: addressbook/printing/e-contact-print.glade.h:35
 msgid "Preview:"
 msgstr "Vista previa:"
 
-#: po/tmp/e-contact-print.glade.h:36
+#: addressbook/printing/e-contact-print.glade.h:36
 msgid "Print using gray shading"
 msgstr "Imprimir usando un oscurecimiento gris"
 
-#: po/tmp/e-contact-print.glade.h:37
+#: addressbook/printing/e-contact-print.glade.h:37
 msgid "Reverse on even pages"
 msgstr "Reverso en pАginas impares"
 
-#: po/tmp/e-contact-print.glade.h:38
+#: addressbook/printing/e-contact-print.glade.h:38
 msgid "Right:"
 msgstr "Derecha:"
 
-#: po/tmp/e-contact-print.glade.h:39
+#: addressbook/printing/e-contact-print.glade.h:39
 msgid "Sections:"
 msgstr "Secciones:"
 
-#: po/tmp/e-contact-print.glade.h:40
+#: addressbook/printing/e-contact-print.glade.h:40
 msgid "Shading"
 msgstr "Oscureciendo"
 
-#: po/tmp/e-contact-print.glade.h:41
+#: addressbook/printing/e-contact-print.glade.h:41
 msgid "Size:"
 msgstr "TamaЯo:"
 
-#: po/tmp/e-contact-print.glade.h:42
+#: addressbook/printing/e-contact-print.glade.h:42
 msgid "Start on a new page"
 msgstr "Comenzar en una nueva pАgina"
 
-#: po/tmp/e-contact-print.glade.h:43
+#: addressbook/printing/e-contact-print.glade.h:43
 msgid "Style name:"
 msgstr "Nombre del estilo:"
 
-#: po/tmp/e-contact-print.glade.h:44
+#: addressbook/printing/e-contact-print.glade.h:44
 msgid "Top:"
 msgstr "Encabezado:"
 
-#: 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 "Tipo:"
 
-#: po/tmp/e-contact-print.glade.h:46
+#: addressbook/printing/e-contact-print.glade.h:46
 msgid "Width:"
 msgstr "Ancho:"
 
-#: po/tmp/e-contact-print.glade.h:47
+#: addressbook/printing/e-contact-print.glade.h:47
 msgid "label26"
 msgstr "label26"
 
@@ -1400,6 +1396,77 @@ msgstr "Utilidad de configuraciСn para el enlace \"todo\" de evolution.\n"
 msgid "Could not read pilot's ToDo application block"
 msgstr "No pude leer los datos de la aplicaciСn ToDo de la pilot"
 
+#.
+#. * 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/GNOME_Evolution_Calendar_Control.oaf.in.h:7
+msgid "Factory for the sample Calendar control"
+msgstr ""
+
+#.
+#. * 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/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:7
+#, fuzzy
+msgid "Calendar Server"
+msgstr "Calendario"
+
+#.
+#. * 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/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Enlace con el Calendario de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Evolution component for handling the calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+msgid "Factory for the Calendar Summary component."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#, fuzzy
+msgid "Factory for the Evolution calendar component."
+msgstr ""
+"Utilidad de configuraciСn para el enlace <<calendario>> de evolution.\n"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+msgid "Factory for the calendar iTip view control"
+msgstr ""
+
+#: 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 "Recordatorio de su cita el "
+
+#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:8
+msgid "Snooze"
+msgstr "Pitido"
+
+#. 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 "OK"
+
 #: calendar/gui/calendar-commands.c:229
 msgid "File not found"
 msgstr "Archivo no encontrado"
@@ -1412,6 +1479,11 @@ msgstr "Abrir calendario"
 msgid "Save calendar"
 msgstr "Guardar calendario"
 
+#: 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:284
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
@@ -1431,15 +1503,18 @@ msgstr "%a %m/%d/%Y %H:%M:%S"
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:346 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 "PЗblico"
 
-#: calendar/gui/calendar-model.c:349 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 "Privado"
 
-#: calendar/gui/calendar-model.c:352 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 "Confidencial"
 
@@ -1529,6 +1604,29 @@ msgstr "El valor del porcentaje debe estar entre 0 y 100"
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "La prioridad debe estar entre 1 y 9"
 
+#: calendar/gui/calendar-summary.c:81
+#, fuzzy
+msgid "%A, %e %B %Y"
+msgstr "%A, %d de %B de %Y"
+
+#: calendar/gui/calendar-summary.c:224
+#, fuzzy
+msgid "<b>Error loading calendar</b>"
+msgstr "Error cargando el archivo: %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 "Imprimir calendario"
+
 #: calendar/gui/control-factory.c:125
 msgid "The URI that the calendar will display"
 msgstr "La URI que mostrarА el calendario"
@@ -1546,262 +1644,271 @@ msgid "No summary available."
 msgstr "No hay un sumario disponible."
 
 #.
-#. * 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 "Cerrar"
 
-#: po/tmp/alarm-notify.glade.h:7
+#: calendar/gui/dialogs/alarm-notify.glade.h:7
 msgid "Edit appointment"
 msgstr "Editas una cita"
 
-#: po/tmp/alarm-notify.glade.h:8
-msgid "Snooze"
-msgstr "Pitido"
-
-#: po/tmp/alarm-notify.glade.h:9
+#: calendar/gui/dialogs/alarm-notify.glade.h:9
 msgid "Snooze time (minutes)"
 msgstr "Tiempo de pitido (minutos)"
 
 #.
-#. * 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 minutos"
 
-#: po/tmp/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "10 minutes"
 msgstr "10 minutos"
 
-#: po/tmp/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "12 hour (am/pm)"
 msgstr "12 horas (am/pm)"
 
-#: po/tmp/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "15 minutes"
 msgstr "15 minutos"
 
-#: po/tmp/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "24 hour"
 msgstr "24 horas"
 
-#: po/tmp/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "30 minutes"
 msgstr "30 minutos"
 
-#: po/tmp/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "60 minutes"
 msgstr "60 minutos"
 
-#: po/tmp/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Alarms timeout after"
 msgstr "Las alarmas cesan tras"
 
-#: po/tmp/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Audio Alarms"
 msgstr "Alarmas auditivas"
 
-#: po/tmp/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Beep when alarm windows appear."
 msgstr "Pitar cuando aparezca la ventana de la alarma."
 
-#: po/tmp/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Calendar"
 msgstr "Calendario"
 
-#: po/tmp/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Calendar Preferences"
 msgstr "Preferencias del calendario"
 
-#: po/tmp/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Colors"
 msgstr "Colores"
 
-#: po/tmp/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Compress weekends"
 msgstr "Comprimir fines de semana"
 
-#: po/tmp/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Date navigator options"
 msgstr "Opciones de la fecha del navegador"
 
-#: po/tmp/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Defaults"
 msgstr "Valores predeterminados"
 
-#: po/tmp/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Display options"
 msgstr "Mostrar opciones"
 
-#: po/tmp/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Due Date"
 msgstr "Fecha de plazo"
 
-#: po/tmp/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "Enable snoozing for"
 msgstr "Habilitar pitido para"
 
-#: po/tmp/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "End of day:"
 msgstr "Fin del dМa:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:26
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "First day of week:"
 msgstr "Primer dМa de la semana:"
 
-#: 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 "Vier"
 
-#: calendar/gui/event-editor.c:433 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 "Viernes"
 
-#: po/tmp/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Highlight"
 msgstr "Marcar"
 
-#: po/tmp/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "Items Due Today"
 msgstr "Elementos de plazo hoy"
 
-#: po/tmp/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "Items Due Today:"
 msgstr "Elementos con plazo para hoy:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Items Not Yet Due"
 msgstr "Elementos dentro de plazo"
 
-#: po/tmp/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Items Not Yet Due:"
 msgstr "Elementos dentro del plazo:"
 
-#: 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 "Lun"
 
-#: calendar/gui/event-editor.c:429 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 "Lunes"
 
-#: po/tmp/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "Overdue Items"
 msgstr "Elementos fuera de plazo"
 
-#: po/tmp/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Overdue Items:"
 msgstr "Elementos fuera de plazo:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Pick a color"
 msgstr "Elije un color"
 
-#: filter/libfilter-i18n.h:31 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 "Prioridad"
 
-#: po/tmp/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Remind me of all appointments"
 msgstr "Recuerdame todas las citas"
 
-#: po/tmp/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Reminders"
 msgstr "Recordatorios"
 
-#: 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 "Sab"
 
-#: calendar/gui/event-editor.c:434 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 "SАbado"
 
-#: po/tmp/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Show"
 msgstr "Mostrar"
 
-#: po/tmp/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "Show appointment end times"
 msgstr "Mostrar la hora del final de las citas"
 
-#: po/tmp/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Show week numbers"
 msgstr "Mostrar los numeros de las semanas"
 
-#: po/tmp/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "Start of day:"
 msgstr "Comienzo del dМa:"
 
 #. 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 "Dom"
 
-#: calendar/gui/event-editor.c:435 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 "Domingo"
 
-#: po/tmp/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "TaskPad"
 msgstr "Tabla de tares"
 
-#: 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 "Jue"
 
-#: calendar/gui/event-editor.c:432 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 "Jueves"
 
-#: po/tmp/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "Time Until Due"
 msgstr "Tiempo hasta el plazo"
 
-#: po/tmp/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "Time divisions:"
 msgstr "Divisiones de tiempo:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:55
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "Time format:"
 msgstr "Formato del tiempo:"
 
-#: 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 "Mar"
 
-#: calendar/gui/event-editor.c:430 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 "Martes"
 
-#: po/tmp/cal-prefs-dialog.glade.h:58
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "Visual Alarms"
 msgstr "Alarmas visuales"
 
-#: 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 "Mier"
 
-#: calendar/gui/event-editor.c:431 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 "MiИrcoles"
 
-#: po/tmp/cal-prefs-dialog.glade.h:61
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "Work week"
 msgstr "Semana laboral"
 
-#: po/tmp/cal-prefs-dialog.glade.h:62
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "minutes before they occur."
 msgstr "minutos antes de que ocurra."
 
-#: po/tmp/cal-prefs-dialog.glade.h:63
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "seconds."
 msgstr "segundos."
 
@@ -1833,90 +1940,91 @@ msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "©Esta seguro que quiere borrar esta entrada del diario sin tМtulo?"
 
 #.
-#. * 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 "% Comp_leto:"
 
-#: po/tmp/task-editor-dialog.glade.h:7
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
 msgid "C_lassification:"
 msgstr "C_lasificaciСn:"
 
-#: po/tmp/task-editor-dialog.glade.h:9
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
 msgid "Cancelled"
 msgstr "Cancelar"
 
-#: po/tmp/task-editor-dialog.glade.h:10
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
 msgid "Completed"
 msgstr "Completado"
 
-#: po/tmp/task-editor-dialog.glade.h:12
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
 msgid "Date Completed:"
 msgstr "Fecha Completada:"
 
-#: po/tmp/task-editor-dialog.glade.h:14
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
 msgid "High"
 msgstr "Alta"
 
-#: po/tmp/task-editor-dialog.glade.h:15
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
 msgid "In Progress"
 msgstr "En proceso"
 
-#: po/tmp/task-editor-dialog.glade.h:16
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
 msgid "Low"
 msgstr "Baja"
 
 #. 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 "Ninguno"
 
-#: po/tmp/task-editor-dialog.glade.h:18
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
 msgid "Normal"
 msgstr "Normal"
 
-#: po/tmp/task-editor-dialog.glade.h:19
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
 msgid "Not Started"
 msgstr "Sin comenzando"
 
-#: po/tmp/task-editor-dialog.glade.h:22
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
 msgid "S_ummary"
 msgstr "Res_umen"
 
-#: po/tmp/task-editor-dialog.glade.h:23
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
 msgid "Sta_rt Date:"
 msgstr "Fecha de Ini_cio:"
 
-#: po/tmp/task-editor-dialog.glade.h:24
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
 msgid "Task"
 msgstr "Tarea"
 
-#: 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 "_Contactos..."
 
-#: po/tmp/task-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
 msgid "_Due Date:"
 msgstr "Fecha _de Fin:"
 
-#: po/tmp/task-editor-dialog.glade.h:28
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
 msgid "_Priority:"
 msgstr "_Prioridad:"
 
-#: po/tmp/task-editor-dialog.glade.h:29
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
 msgid "_Status:"
 msgstr "E_stado:"
 
-#: po/tmp/task-editor-dialog.glade.h:30
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
 msgid "task-editor-dialog"
 msgstr "dialogo del editor de tareas"
 
@@ -2017,7 +2125,7 @@ msgid "Edit this appointment..."
 msgstr "Editar esta cita..."
 
 #: 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 "Borrar esta cita"
 
@@ -2041,162 +2149,162 @@ msgid "%d %B"
 msgstr "%d de %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 "Evento para todo e_l dМa"
 
-#: po/tmp/event-editor-dialog.glade.h:8
+#: calendar/gui/event-editor-dialog.glade.h:8
 msgid "Appointment Basics"
 msgstr "Bases de la citas"
 
-#: po/tmp/event-editor-dialog.glade.h:9
+#: calendar/gui/event-editor-dialog.glade.h:9
 msgid "Classification"
 msgstr "ClasificaciСn"
 
-#: po/tmp/event-editor-dialog.glade.h:10
+#: calendar/gui/event-editor-dialog.glade.h:10
 msgid "Custom recurrence"
 msgstr "Recurrencia personalizada"
 
-#: po/tmp/event-editor-dialog.glade.h:11
+#: calendar/gui/event-editor-dialog.glade.h:11
 msgid "Days"
 msgstr "DМas"
 
-#: po/tmp/event-editor-dialog.glade.h:13
+#: calendar/gui/event-editor-dialog.glade.h:13
 msgid "Every"
 msgstr "Cada"
 
-#: po/tmp/event-editor-dialog.glade.h:14
+#: calendar/gui/event-editor-dialog.glade.h:14
 msgid "Exceptions"
 msgstr "Excepciones"
 
-#: po/tmp/event-editor-dialog.glade.h:16
+#: calendar/gui/event-editor-dialog.glade.h:16
 msgid "Hours"
 msgstr "Horas"
 
-#: po/tmp/event-editor-dialog.glade.h:17
+#: calendar/gui/event-editor-dialog.glade.h:17
 msgid "Mail _to:"
 msgstr "Enviar _a:"
 
-#: po/tmp/event-editor-dialog.glade.h:18
+#: calendar/gui/event-editor-dialog.glade.h:18
 msgid "Minutes"
 msgstr "Minutos"
 
-#: po/tmp/event-editor-dialog.glade.h:19
+#: calendar/gui/event-editor-dialog.glade.h:19
 msgid "Modify"
 msgstr "Modificar"
 
-#: po/tmp/event-editor-dialog.glade.h:20
+#: calendar/gui/event-editor-dialog.glade.h:20
 msgid "No recurrence"
 msgstr "Sin recurrencia"
 
-#: po/tmp/event-editor-dialog.glade.h:21
+#: calendar/gui/event-editor-dialog.glade.h:21
 msgid "Preview"
 msgstr "Vista previa"
 
-#: po/tmp/event-editor-dialog.glade.h:22
+#: calendar/gui/event-editor-dialog.glade.h:22
 msgid "Pri_vate"
 msgstr "Pri_vado"
 
-#: po/tmp/event-editor-dialog.glade.h:23
+#: calendar/gui/event-editor-dialog.glade.h:23
 msgid "Pu_blic"
 msgstr "PЗ_blico"
 
-#: po/tmp/event-editor-dialog.glade.h:24
+#: calendar/gui/event-editor-dialog.glade.h:24
 msgid "Recurrence"
 msgstr "Recurrencia"
 
-#: po/tmp/event-editor-dialog.glade.h:25
+#: calendar/gui/event-editor-dialog.glade.h:25
 msgid "Recurrence Rule"
 msgstr "Regla de recurrencia"
 
-#: po/tmp/event-editor-dialog.glade.h:26
+#: calendar/gui/event-editor-dialog.glade.h:26
 msgid "Reminder"
 msgstr "Recordatorio"
 
-#: po/tmp/event-editor-dialog.glade.h:27
+#: calendar/gui/event-editor-dialog.glade.h:27
 msgid "Simple recurrence"
 msgstr "Recurrencia simple"
 
-#: po/tmp/event-editor-dialog.glade.h:28
+#: calendar/gui/event-editor-dialog.glade.h:28
 msgid "Su_mmary:"
 msgstr "Resu_men:"
 
-#: po/tmp/event-editor-dialog.glade.h:29
+#: calendar/gui/event-editor-dialog.glade.h:29
 msgid "Time"
 msgstr "Hora"
 
-#: po/tmp/event-editor-dialog.glade.h:30
+#: calendar/gui/event-editor-dialog.glade.h:30
 msgid "_Audio"
 msgstr "_Audio"
 
-#: po/tmp/event-editor-dialog.glade.h:31
+#: calendar/gui/event-editor-dialog.glade.h:31
 msgid "_Confidential"
 msgstr "_Confidencial"
 
-#: po/tmp/event-editor-dialog.glade.h:32
+#: calendar/gui/event-editor-dialog.glade.h:32
 msgid "_Display"
 msgstr "_Mostrar"
 
-#: po/tmp/event-editor-dialog.glade.h:33
+#: calendar/gui/event-editor-dialog.glade.h:33
 msgid "_End time:"
 msgstr "Hora de _fin:"
 
-#: po/tmp/event-editor-dialog.glade.h:34
+#: calendar/gui/event-editor-dialog.glade.h:34
 msgid "_Mail"
 msgstr "_Correo"
 
-#: po/tmp/event-editor-dialog.glade.h:35
+#: calendar/gui/event-editor-dialog.glade.h:35
 msgid "_Program"
 msgstr "_Programa"
 
-#: po/tmp/event-editor-dialog.glade.h:36
+#: calendar/gui/event-editor-dialog.glade.h:36
 msgid "_Run program:"
 msgstr "Ejecuta_r programa:"
 
-#: po/tmp/event-editor-dialog.glade.h:37
+#: calendar/gui/event-editor-dialog.glade.h:37
 msgid "_Start time:"
 msgstr "Hora de _inicio:"
 
-#: po/tmp/event-editor-dialog.glade.h:38
+#: calendar/gui/event-editor-dialog.glade.h:38
 msgid "_Starting date:"
 msgstr "Fecha de Ini_cio:"
 
-#: po/tmp/event-editor-dialog.glade.h:39
+#: calendar/gui/event-editor-dialog.glade.h:39
 msgid "day(s)"
 msgstr "dМa(s)"
 
-#: po/tmp/event-editor-dialog.glade.h:40
+#: calendar/gui/event-editor-dialog.glade.h:40
 msgid "event-editor-dialog"
 msgstr "event-editor-dialog"
 
-#: po/tmp/event-editor-dialog.glade.h:41
+#: calendar/gui/event-editor-dialog.glade.h:41
 msgid "for"
 msgstr "para"
 
-#: po/tmp/event-editor-dialog.glade.h:42
+#: calendar/gui/event-editor-dialog.glade.h:42
 msgid "forever"
 msgstr "siempre"
 
-#: po/tmp/event-editor-dialog.glade.h:43
+#: calendar/gui/event-editor-dialog.glade.h:43
 msgid "label21"
 msgstr "label21"
 
-#: po/tmp/event-editor-dialog.glade.h:44
+#: calendar/gui/event-editor-dialog.glade.h:44
 msgid "month(s)"
 msgstr "mes(es)"
 
-#: po/tmp/event-editor-dialog.glade.h:45
+#: calendar/gui/event-editor-dialog.glade.h:45
 msgid "until"
 msgstr "hasta"
 
-#: po/tmp/event-editor-dialog.glade.h:46
+#: calendar/gui/event-editor-dialog.glade.h:46
 msgid "week(s)"
 msgstr "semana(s)"
 
-#: po/tmp/event-editor-dialog.glade.h:47
+#: calendar/gui/event-editor-dialog.glade.h:47
 msgid "year(s)"
 msgstr "aЯo(s)"
 
@@ -2248,6 +2356,71 @@ msgstr "No puedo crear un calendario en `%s'"
 msgid "The method required to load `%s' is not supported"
 msgstr "El mИtodo necesario para cargar `%s' no esta soportado"
 
+#.
+#. * 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 "en С despuИs de"
+
+#: calendar/gui/goto-dialog.glade.h:11
+#, fuzzy
+msgid "Go To Today"
+msgstr "Hoy"
+
+#: 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 "Buscar"
+
+#: calendar/gui/goto-dialog.glade.h:16
+#, fuzzy
+msgid "May"
+msgstr "Lunes"
+
+#: calendar/gui/goto-dialog.glade.h:17
+msgid "November"
+msgstr ""
+
+#: calendar/gui/goto-dialog.glade.h:18
+#, fuzzy
+msgid "October"
+msgstr "Otro"
+
+#: calendar/gui/goto-dialog.glade.h:19
+msgid "September"
+msgstr ""
+
 #: calendar/gui/main.c:49
 msgid "Could not initialize GNOME"
 msgstr "No pude inicializar GNOME"
@@ -2440,7 +2613,7 @@ msgstr "AЯo actual (%Y)"
 msgid "Print Calendar"
 msgstr "Imprimir calendario"
 
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:940
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1001
 msgid "Print Preview"
 msgstr "Vista previa"
 
@@ -2658,7 +2831,7 @@ msgstr "El servidor IMAP inesperadamente a respondido OK: %s"
 msgid "Could not load summary for %s"
 msgstr "No puedo cargar el resumen de %s"
 
-#: camel/providers/imap/camel-imap-folder.c:533
+#: camel/providers/imap/camel-imap-folder.c:532
 msgid "Could not find message body in FETCH response."
 msgstr "No pude encontrar el cuerpo del mensaje en la respuesta de FETCH"
 
@@ -3168,6 +3341,7 @@ msgid "No such folder `%s'."
 msgstr "No existe la carpeta `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
+#: mail/mail-config-druid.glade.h:63
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -3216,8 +3390,14 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Envio de correo via el programa 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."
+#, fuzzy
+msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "Para enviar correo contectandose a un servidor de correo usando SMTP."
 
 #: camel/providers/smtp/camel-smtp-transport.c:187
@@ -3239,6 +3419,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"
 
@@ -3382,11 +3563,11 @@ msgid "attachment"
 msgstr "adjunto"
 
 #: composer/e-msg-composer-attachment-bar.c:413
-#: po/tmp/evolution-message-composer.xml.h:7
+#: ui/evolution-message-composer.xml.h:7
 msgid "Attach a file"
 msgstr "Adjuntar un fichero"
 
-#: composer/e-msg-composer-attachment-bar.c:460 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 "Quitar"
@@ -3404,55 +3585,55 @@ msgid "Attach a file to the message"
 msgstr "Adjuntar un fichero al mensaje"
 
 #.
-#. * 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 "Propiedades del adjunto"
 
-#: po/tmp/e-msg-composer-attachment.glade.h:8
+#: composer/e-msg-composer-attachment.glade.h:8
 msgid "File name:"
 msgstr "Nombre del fichero:"
 
-#: po/tmp/e-msg-composer-attachment.glade.h:9
+#: composer/e-msg-composer-attachment.glade.h:9
 msgid "MIME type:"
 msgstr "Tipo MIME:"
 
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:293
-#: 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 "De:"
 
-#: composer/e-msg-composer-hdrs.c:240
+#: composer/e-msg-composer-hdrs.c:247
 msgid "Click here for the address book"
 msgstr "Presione aquМ para acceder a la agenda"
 
-#: composer/e-msg-composer-hdrs.c:294
+#: composer/e-msg-composer-hdrs.c:304
 msgid "Enter the identity you wish to send this message from"
 msgstr "Elija la identidad desde la que quiere enviar el mensaje"
 
-#: composer/e-msg-composer-hdrs.c:298 mail/mail-format.c:628
+#: composer/e-msg-composer-hdrs.c:308 mail/mail-format.c:630
 msgid "To:"
 msgstr "A:"
 
-#: composer/e-msg-composer-hdrs.c:299
+#: composer/e-msg-composer-hdrs.c:309
 msgid "Enter the recipients of the message"
 msgstr "Escriba los destinatarios del mensaje"
 
-#: composer/e-msg-composer-hdrs.c:303 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:304
+#: composer/e-msg-composer-hdrs.c:314
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Escriba las direcciones que recibirАn una copia del mensaje"
 
-#: composer/e-msg-composer-hdrs.c:309
+#: composer/e-msg-composer-hdrs.c:319
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:310
+#: 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."
@@ -3460,11 +3641,11 @@ msgstr ""
 "Escriba las direcciones que recibirАn una copia del mensaje sin aparecer en "
 "la lista de destinatarios del mensaje."
 
-#: composer/e-msg-composer-hdrs.c:316 mail/mail-format.c:632
+#: composer/e-msg-composer-hdrs.c:326 mail/mail-format.c:634
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: composer/e-msg-composer-hdrs.c:317
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Enter the subject of the mail"
 msgstr "Escriba el asunto del mensaje"
 
@@ -3504,11 +3685,11 @@ msgstr "Guardar cambios en el mensaje..."
 msgid "Error saving composition to 'Drafts': %s"
 msgstr "Error guardando el mensaje en 'Drafts': %s"
 
-#: 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"
@@ -3518,27 +3699,27 @@ msgstr ""
 "\n"
 "©Quiere guardar los cambios?"
 
-#: composer/e-msg-composer.c:768
+#: composer/e-msg-composer.c:772
 msgid "Open file"
 msgstr "Abrir archivo"
 
-#: composer/e-msg-composer.c:894
+#: composer/e-msg-composer.c:898
 msgid "That file does not exist."
 msgstr "Ese archivo no existe."
 
-#: composer/e-msg-composer.c:904
+#: composer/e-msg-composer.c:908
 msgid "That is not a regular file."
 msgstr "Ese no es un archivo normal."
 
-#: composer/e-msg-composer.c:914
+#: composer/e-msg-composer.c:918
 msgid "That file exists but is not readable."
 msgstr "Ese archivo no es legible."
 
-#: composer/e-msg-composer.c:924
+#: composer/e-msg-composer.c:928
 msgid "That file appeared accesible but open(2) failed."
 msgstr "Ese archivo parece accesible pero open(2) ha fallado."
 
-#: 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?"
@@ -3546,15 +3727,15 @@ msgstr ""
 "El archivo es muy largo (mАs de 100K).\n"
 "©Esta seguro que quiere aЯadirlo?"
 
-#: composer/e-msg-composer.c:967
+#: composer/e-msg-composer.c:971
 msgid "An error occurred while reading the file."
 msgstr "Ha ocurrido un error mientras se leМa el archivo."
 
-#: composer/e-msg-composer.c:1346
+#: composer/e-msg-composer.c:1350
 msgid "Compose a message"
 msgstr "Nuevo mensaje"
 
-#: composer/e-msg-composer.c:1423
+#: composer/e-msg-composer.c:1427
 msgid "Could not create composer window."
 msgstr "No pude crear una ventana para escribir el mensaje"
 
@@ -3698,7 +3879,7 @@ msgstr "entrante"
 msgid "outgoing"
 msgstr "saliente"
 
-#: 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 "Editar filtros"
 
@@ -3791,14 +3972,8 @@ msgstr "Quitar criterio"
 msgid "Replied to"
 msgstr "Respondido a"
 
-#: filter/filter-system-flag.c:64
-msgid "Deleted"
-msgstr "Borrado"
-
-#: filter/filter-system-flag.c:65
-msgid "Draft"
-msgstr "Borrador"
-
+#. { _("Deleted"), "Deleted" },
+#. { _("Draft"), "Draft" },
 #: filter/filter-system-flag.c:66
 msgid "Important"
 msgstr "Importante"
@@ -3807,27 +3982,27 @@ msgstr "Importante"
 msgid "Read"
 msgstr "LeМdo"
 
-#: po/tmp/filter.glade.h:10
+#: filter/filter.glade.h:10
 msgid "Edit VFolders"
 msgstr "Editar carpeta virtual"
 
-#: po/tmp/filter.glade.h:11
+#: filter/filter.glade.h:11
 msgid "Filter Rules"
 msgstr "Reglas para los filtro"
 
-#: po/tmp/filter.glade.h:12
+#: filter/filter.glade.h:12
 msgid "Incoming"
 msgstr "Entrando"
 
-#: po/tmp/filter.glade.h:13
+#: filter/filter.glade.h:13
 msgid "Outgoing"
 msgstr "Saliente"
 
-#: po/tmp/filter.glade.h:15
+#: filter/filter.glade.h:15
 msgid "Virtual Folders"
 msgstr "Carpetas virtuales"
 
-#: po/tmp/filter.glade.h:16
+#: filter/filter.glade.h:16
 msgid "vFolder Sources"
 msgstr "Fuentes de la carpeta virtual"
 
@@ -4016,173 +4191,210 @@ msgstr "AЯadir regla para carpeta virtual"
 msgid "Edit VFolder Rule"
 msgstr "Editar regla de VFolder"
 
-#: mail/component-factory.c:239
+#: mail/component-factory.c:277
 msgid "Cannot initialize Evolution's mail component."
 msgstr "No puedo inicializar el componente de correo de Evolution."
 
-#: mail/component-factory.c:278
+#: mail/component-factory.c:316
 msgid "Cannot register storage with shell"
 msgstr "No puedo registrar un sistema de guardado con la shell"
 
-#: mail/folder-browser.c:182 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 "Guardar"
 
-#: mail/folder-browser.c:195
+#: mail/folder-browser.c:236
 msgid "Body or subject contains"
 msgstr "El cuerpo y el asunto contienen"
 
-#: mail/folder-browser.c:196
+#: mail/folder-browser.c:237
 msgid "Body contains"
 msgstr "El cuerpo contiene"
 
-#: mail/folder-browser.c:197
+#: mail/folder-browser.c:238
 msgid "Subject contains"
 msgstr "El asunto contiene"
 
-#: mail/folder-browser.c:198
+#: mail/folder-browser.c:239
 msgid "Body does not contain"
 msgstr "El cuerpo no contiene"
 
-#: mail/folder-browser.c:199
+#: mail/folder-browser.c:240
 msgid "Subject does not contain"
 msgstr "El asunto no contiene"
 
-#: mail/folder-browser.c:602
+#: mail/folder-browser.c:643
 msgid "VFolder on Subject"
 msgstr "VFolder segЗn el asunto"
 
-#: mail/folder-browser.c:603
+#: mail/folder-browser.c:644
 msgid "VFolder on Sender"
 msgstr "VFolder segЗn el remitente"
 
-#: mail/folder-browser.c:604
+#: mail/folder-browser.c:645
 msgid "VFolder on Recipients"
 msgstr "VFolder segЗn los destinatarios"
 
-#: mail/folder-browser.c:606
+#: mail/folder-browser.c:647
 msgid "Filter on Subject"
 msgstr "Filtrar segЗn el asunto"
 
-#: mail/folder-browser.c:607
+#: mail/folder-browser.c:648
 msgid "Filter on Sender"
 msgstr "Filtrar segЗn el remitente"
 
-#: mail/folder-browser.c:608
+#: mail/folder-browser.c:649
 msgid "Filter on Recipients"
 msgstr "Filtrar segЗn los destinatarios"
 
-#: mail/folder-browser.c:609 mail/folder-browser.c:738
+#: mail/folder-browser.c:650 mail/folder-browser.c:779
 msgid "Filter on Mailing List"
 msgstr "Filtrar segЗn la lista de correo"
 
-#: mail/folder-browser.c:614
+#: mail/folder-browser.c:655
 msgid "Show all hidden"
 msgstr "Mostrar todo lo oculto"
 
-#: mail/folder-browser.c:616
+#: mail/folder-browser.c:657
 msgid "Hide selected"
 msgstr "Ocultar la selecciСn"
 
 #. could use another mask, but not enough api do to it
-#: mail/folder-browser.c:619
+#: mail/folder-browser.c:660
 msgid "Hide read"
 msgstr "Ocultar lo leМdo"
 
-#: mail/folder-browser.c:620
+#: mail/folder-browser.c:661
 msgid "Hide deleted"
 msgstr "Ocultar lo borrado"
 
-#: mail/folder-browser.c:622 mail/folder-browser.c:749
+#: mail/folder-browser.c:663 mail/folder-browser.c:790
 msgid "Hide Subject"
 msgstr "Ocultar el asunto"
 
-#: mail/folder-browser.c:624 mail/folder-browser.c:755
+#: mail/folder-browser.c:665 mail/folder-browser.c:796
 msgid "Hide from Sender"
 msgstr "Ocultar el remitente"
 
-#: mail/folder-browser.c:629 po/tmp/evolution-message-composer.xml.h:15
+#: mail/folder-browser.c:670 ui/evolution-message-composer.xml.h:15
 msgid "Open"
 msgstr "Abrir"
 
-#: mail/folder-browser.c:631
+#: mail/folder-browser.c:672
 msgid "Save As..."
 msgstr "Guardar como..."
 
-#: mail/folder-browser.c:632 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 "Imprimir"
 
-#: mail/folder-browser.c:634
+#: mail/folder-browser.c:675
 msgid "Reply to Sender"
 msgstr "Resp. Remitente"
 
-#: mail/folder-browser.c:635 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 "Re: Todos"
 
-#: mail/folder-browser.c:636 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 "Reenviar"
 
-#: mail/folder-browser.c:637 po/tmp/evolution-mail.xml.h:18
+#: mail/folder-browser.c:678 ui/evolution-mail.xml.h:18
 msgid "Forward inline"
 msgstr "Reenviar dentro del mensaje"
 
-#: mail/folder-browser.c:639
+#: mail/folder-browser.c:680
 msgid "Mark as Read"
 msgstr "Marcar como leМdo"
 
-#: mail/folder-browser.c:640
+#: mail/folder-browser.c:681
 msgid "Mark as Unread"
 msgstr "Marcar como no leМdo"
 
-#: mail/folder-browser.c:642
+#: mail/folder-browser.c:683
 msgid "Move to Folder..."
 msgstr "Mover a la carpeta..."
 
-#: mail/folder-browser.c:643
+#: mail/folder-browser.c:684
 msgid "Copy to Folder..."
 msgstr "Copiar a la carpeta..."
 
-#: mail/folder-browser.c:645
+#: mail/folder-browser.c:686
 msgid "Undelete"
 msgstr "Recuperar"
 
 #. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
 #. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:649
+#: mail/folder-browser.c:690
 msgid "Apply Filters"
 msgstr "Aplicar filtro"
 
-#: mail/folder-browser.c:651 po/tmp/evolution-mail.xml.h:10
+#: mail/folder-browser.c:692 ui/evolution-mail.xml.h:10
 msgid "Create Rule From Message"
 msgstr "Crear una regla con el mensaje"
 
-#: mail/folder-browser.c:652 po/tmp/evolution-mail.xml.h:21
+#: mail/folder-browser.c:693 ui/evolution-mail.xml.h:21
 msgid "Hide Messages"
 msgstr "Ocultar mensajes"
 
-#: mail/folder-browser.c:740
+#: mail/folder-browser.c:781
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtrar segЗn la lista de correo (%s)"
 
-#: mail/folder-browser.c:746
+#: mail/folder-browser.c:787
 #, c-format
 msgid "Hide Subject \"%s\""
 msgstr "Ocultar asunto \"%s\""
 
-#: mail/folder-browser.c:752
+#: mail/folder-browser.c:793
 #, c-format
 msgid "Hide from Sender <%s>"
 msgstr "Ocultar del remitente <%s>"
 
+#.
+#. * 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 "Obtiene sitio para \"%s\""
+
+#: mail/local-config.glade.h:7
+#, fuzzy
+msgid "Mailbox Format"
+msgstr "Formatear"
+
+#: mail/local-config.glade.h:8
+#, fuzzy
+msgid "New store format:"
+msgstr "Tipo de fuente de noticias:"
+
+#: 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
+#, fuzzy
+msgid "mh"
+msgstr "h"
+
 #: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
@@ -4251,19 +4463,23 @@ msgstr ""
 "Este mensaje no tiene asunto.\n"
 "©Quiere enviarlo?"
 
-#: mail/mail-callbacks.c:289
+#: mail/mail-callbacks.c:312
 msgid "You must specify recipients in order to send this message."
 msgstr "Debes especificar destinatarios para poder enviar el mensaje."
 
-#: mail/mail-callbacks.c:550
+#: mail/mail-callbacks.c:530
+msgid "Forwarded message:\n"
+msgstr "Mensaje reenviado:\n"
+
+#: mail/mail-callbacks.c:611
 msgid "Move message(s) to"
 msgstr "Mover Mensaje(s) a"
 
-#: mail/mail-callbacks.c:552
+#: mail/mail-callbacks.c:613
 msgid "Copy message(s) to"
 msgstr "Copiar mensaje(s) a"
 
-#: mail/mail-callbacks.c:687
+#: mail/mail-callbacks.c:748
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4271,11 +4487,11 @@ msgstr ""
 "Solo puede editar mensajes guardados\n"
 "en la carpeta Drafts."
 
-#: mail/mail-callbacks.c:720 mail/mail-display.c:79
+#: mail/mail-callbacks.c:781 mail/mail-display.c:79
 msgid "Overwrite file?"
 msgstr "©Sobreescribir archivo?"
 
-#: mail/mail-callbacks.c:724 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?"
@@ -4283,15 +4499,15 @@ msgstr ""
 "Ya existe una archivo con ese nombre.\n"
 "©Sobreescribirlo?"
 
-#: mail/mail-callbacks.c:769
+#: mail/mail-callbacks.c:830
 msgid "Save Message As..."
 msgstr "Guardar mensaje como..."
 
-#: mail/mail-callbacks.c:771
+#: mail/mail-callbacks.c:832
 msgid "Save Messages As..."
 msgstr "Guardar mensajes como..."
 
-#: mail/mail-callbacks.c:855
+#: mail/mail-callbacks.c:916
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4300,57 +4516,278 @@ msgstr ""
 "Error cargando la informaciСn del filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:900
+#: mail/mail-callbacks.c:961
 msgid "Print Message"
 msgstr "Imprimir mensaje"
 
-#: mail/mail-callbacks.c:947
+#: mail/mail-callbacks.c:1008
 msgid "Printing of message failed"
 msgstr "Ha fallado la impresiСn del mensaje"
 
 #.
-#. * 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 "Sin informaciСn"
+
+#: mail/mail-config-druid.glade.h:8
+msgid "Account Management"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:9
+#, fuzzy
+msgid "Account Properties"
+msgstr "Propiedades del adjunto"
+
+#: mail/mail-config-druid.glade.h:11
+#, fuzzy
+msgid "Advanced"
+msgstr "Avanzado..."
+
+#: mail/mail-config-druid.glade.h:12
+#, fuzzy
+msgid "Authentication"
+msgstr "AutentificaciСn:"
+
+#: mail/mail-config-druid.glade.h:13
+#, fuzzy
+msgid "Authentication Type:"
+msgstr "AutentificaciСn:"
+
+#: 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 "Valores predeterminados"
+
+#: mail/mail-config-druid.glade.h:26
+#, fuzzy
+msgid "Delete mail from server"
+msgstr "No borrar los mensajes del servidor"
+
+#: mail/mail-config-druid.glade.h:27
+#, fuzzy
+msgid "Done"
+msgstr "Ninguno"
+
+#: mail/mail-config-druid.glade.h:28
+#, fuzzy
+msgid "E-Mail Address:"
+msgstr "DirecciСn de correo:"
+
+#: mail/mail-config-druid.glade.h:30
+#, fuzzy
+msgid "Email Address:"
+msgstr "DirecciСn de correo:"
+
+#: mail/mail-config-druid.glade.h:31
+#, fuzzy
+msgid "Evolution Mail Configuration"
+msgstr "ConfiguraciСn del correo"
+
+#: mail/mail-config-druid.glade.h:32
+#, fuzzy
+msgid "Full Name:"
+msgstr "Nombre completo:"
+
+#: mail/mail-config-druid.glade.h:35
+#, fuzzy
+msgid "Hostname:"
+msgstr "Servidor:"
+
+#: mail/mail-config-druid.glade.h:36
+#, fuzzy
+msgid "IMAP"
+msgstr "IMAPv4"
+
+#: mail/mail-config-druid.glade.h:37
 msgid "Identity"
 msgstr "Identidad"
 
-#: 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 "_Correo"
+
+#: mail/mail-config-druid.glade.h:41
+#, fuzzy
+msgid "Mail Account"
+msgstr "El mensaje contiene"
+
+#: mail/mail-config-druid.glade.h:42
 msgid "Mail Configuration"
 msgstr "ConfiguraciСn del correo"
 
-#: po/tmp/mail-config-druid.glade.h:8
-msgid "Mail Source"
-msgstr "Fuente del correo"
+#: mail/mail-config-druid.glade.h:43
+#, fuzzy
+msgid "Mail Configuration Druid"
+msgstr "ConfiguraciСn del correo"
 
-#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
-msgid "Mail Transport"
-msgstr "Transporte del correo"
+#: mail/mail-config-druid.glade.h:44
+msgid "Make this my default account"
+msgstr ""
 
-#: po/tmp/mail-config-druid.glade.h:10
-msgid "Welcome to the Evolution Mail configuration wizard!\n"
-msgstr "║Bienvenido al ayudante de configuraciСn de correo de Evolution!\n"
+#: mail/mail-config-druid.glade.h:46
+#, fuzzy
+msgid "News"
+msgstr "Nuevo"
+
+#: mail/mail-config-druid.glade.h:48
+#, fuzzy
+msgid "Optional"
+msgstr "Opciones"
+
+#: mail/mail-config-druid.glade.h:49 mail/mail-config-gui.c:485
+msgid "Organization:"
+msgstr "OrganizaciСn:"
+
+#: mail/mail-config-druid.glade.h:50
+msgid "Outgoing Mail Server"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:51
+#, fuzzy
+msgid "Password:"
+msgstr "Clave"
+
+#: mail/mail-config-druid.glade.h:53
+msgid "Plain Text"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:54
+msgid "Receiving Email"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:55
+#, fuzzy
+msgid "Remember my password"
+msgstr "Recuerda esta contraseЯa"
+
+#: mail/mail-config-druid.glade.h:56 mail/mail-format.c:628
+msgid "Reply-To:"
+msgstr "Responder a:"
+
+#: mail/mail-config-druid.glade.h:57
+#, fuzzy
+msgid "Reply-to:"
+msgstr "Responder a:"
+
+#: mail/mail-config-druid.glade.h:58
+#, fuzzy
+msgid "Required"
+msgstr "Personas _requeridas"
+
+#: mail/mail-config-druid.glade.h:60
+#, fuzzy
+msgid "Save password"
+msgstr "Guardar como vCard"
+
+#: mail/mail-config-druid.glade.h:61
+#, fuzzy
+msgid "Select signature file"
+msgstr "Archivo de firma:"
+
+#: 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 "ConfiguraciСn del correo"
+
+#: mail/mail-config-druid.glade.h:65
+msgid "Server Timeouts"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:66
+#, fuzzy
+msgid "Server Type: "
+msgstr "Servidor:"
+
+#: mail/mail-config-druid.glade.h:67
+msgid "Server requires authentication"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:68
+#, fuzzy
+msgid "Servers"
+msgstr "Servidor:"
+
+#: mail/mail-config-druid.glade.h:69 mail/mail-config-gui.c:496
+msgid "Signature file:"
+msgstr "Archivo de firma:"
 
-#: po/tmp/mail-config-druid.glade.h:11
-msgid "By filling in some information about your email\n"
-msgstr "Dando alguna informaciСn sobre su correo electrСnico\n"
+#: mail/mail-config-druid.glade.h:70
+#, fuzzy
+msgid "Signature:"
+msgstr "Archivo de firma:"
 
-#: po/tmp/mail-config-druid.glade.h:12
-msgid "settings, you can start sending and receiving email\n"
-msgstr ", puede empezar a enviar y recivor correos\n"
+#: mail/mail-config-druid.glade.h:71 mail/mail-config.glade.h:20
+msgid "Sources"
+msgstr "Fuentes"
+
+#: mail/mail-config-druid.glade.h:72
+msgid "This server requires a secure connection (SSL)"
+msgstr ""
 
-#: po/tmp/mail-config-druid.glade.h:13
-msgid "right away. Click Next to continue."
-msgstr "en este momento. Presione Siguiente para continuar."
+#: mail/mail-config-druid.glade.h:73
+#, fuzzy
+msgid "Type"
+msgstr "Tipo:"
 
-#: po/tmp/mail-config-druid.glade.h:14
+#: 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 ""
-"La configuraciСn de tu correo esta completa.\n"
-"Pulsa \"Fin\" para guardar la nueva configuraciСn"
+
+#: mail/mail-config-druid.glade.h:76
+#, fuzzy
+msgid "User Information"
+msgstr "Sin informaciСn"
+
+#: mail/mail-config-druid.glade.h:77 mail/mail-config-gui.c:928
+msgid "Username:"
+msgstr "Nombre:"
+
+#: mail/mail-config-druid.glade.h:78
+#, fuzzy
+msgid "Welcome to the Evolution Mail Configuration Druid.\n"
+msgstr "║Bienvenido al ayudante de configuraciСn de correo de Evolution!\n"
+
+#: mail/mail-config-druid.glade.h:81
+#, fuzzy
+msgid "minute(s)"
+msgstr "minutos"
 
 #: mail/mail-config-gui.c:433
 msgid ""
@@ -4370,15 +4807,7 @@ msgstr "Nombre completo:"
 msgid "Email address:"
 msgstr "DirecciСn de correo:"
 
-#: mail/mail-config-gui.c:485
-msgid "Organization:"
-msgstr "OrganizaciСn:"
-
-#: mail/mail-config-gui.c:496
-msgid "Signature file:"
-msgstr "Archivo de firma:"
-
-#: 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 "Archivo de firma"
 
@@ -4386,10 +4815,6 @@ msgstr "Archivo de firma"
 msgid "Server:"
 msgstr "Servidor:"
 
-#: mail/mail-config-gui.c:928
-msgid "Username:"
-msgstr "Nombre:"
-
 #: mail/mail-config-gui.c:956
 msgid "Detect supported types..."
 msgstr "Detectar tipos soportados..."
@@ -4406,7 +4831,7 @@ msgstr "Probar configuraciСn"
 msgid "Mail source type:"
 msgstr "Tipo de fuente de correo:"
 
-#: 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"
@@ -4442,6 +4867,20 @@ msgstr ""
 msgid "Mail transport type:"
 msgstr "Tipo de transporte de correo:"
 
+#: mail/mail-config-gui.c:1183
+#, fuzzy
+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 ""
+"Seleccione el tipo de servidor de correo que usa, y escriba la informaciСn "
+"oportuna acerca del mismo.\n"
+"\n"
+"Si el servidor necesita autentificaciСn, puede presionar el botСn \"Detectar "
+"tipos soportados...\" despuИs de facilitar el resto de la informaciСn."
+
 #: mail/mail-config-gui.c:1233
 msgid "Add Identity"
 msgstr "AЯadir identidad"
@@ -4490,42 +4929,42 @@ msgstr "Averiguando las posibilidades de autentificaciСn de \"%s\""
 msgid "Query authorization at \"%s\""
 msgstr "Probando la autentificaciСn de \"%s\""
 
-#: po/tmp/mail-config.glade.h:7
+#: mail/mail-config.glade.h:7
 msgid "Address"
 msgstr "DirecciСn"
 
-#: po/tmp/mail-config.glade.h:10
+#: mail/mail-config.glade.h:10
 msgid "Identities"
 msgstr "Identidades"
 
-#: po/tmp/mail-config.glade.h:11
+#: mail/mail-config.glade.h:11
 msgid "Mail Sources"
 msgstr "Fuentes del correo"
 
-#: po/tmp/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
+msgid "Mail Transport"
+msgstr "Transporte del correo"
+
+#: mail/mail-config.glade.h:13
 msgid "Mark message as seen [ms]: "
 msgstr "Marcar como leМdo [ms]: "
 
-#: po/tmp/mail-config.glade.h:14
+#: mail/mail-config.glade.h:14
 msgid "News Servers"
 msgstr "Servidores de noticias"
 
-#: po/tmp/mail-config.glade.h:15
+#: mail/mail-config.glade.h:15
 msgid "News Sources"
 msgstr "Fuentes de noticias"
 
-#: po/tmp/mail-config.glade.h:16
+#: mail/mail-config.glade.h:16
 msgid "Organization"
 msgstr "OrganizaciСn"
 
-#: po/tmp/mail-config.glade.h:18
+#: mail/mail-config.glade.h:18
 msgid "Send messages in HTML format"
 msgstr "Enviar el mensaje en formato HTML"
 
-#: po/tmp/mail-config.glade.h:20
-msgid "Sources"
-msgstr "Fuentes"
-
 #: 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."
@@ -4605,51 +5044,47 @@ msgstr "Ocultar"
 msgid "%s attachment"
 msgstr "%s adjunto"
 
-#: mail/mail-format.c:626
-msgid "Reply-To:"
-msgstr "Responder a:"
-
-#: mail/mail-format.c:849
+#: mail/mail-format.c:851
 msgid "No GPG/PGP support available in this copy of Evolution."
 msgstr "Esta copia de Evolution no tiene soporte GPG/PGP."
 
-#: mail/mail-format.c:861
+#: mail/mail-format.c:863
 msgid "Encrypted message not displayed"
 msgstr "Mensaje encriptado no mostrado"
 
-#: mail/mail-format.c:867
+#: mail/mail-format.c:869
 msgid "Encrypted message"
 msgstr "Mensaje encriptado"
 
-#: mail/mail-format.c:868
+#: mail/mail-format.c:870
 msgid "Click icon to decrypt."
 msgstr "Pulse el icono para desencriptar."
 
-#: mail/mail-format.c:1448
+#: mail/mail-format.c:1450
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntero a sitio FTP (%s)"
 
-#: mail/mail-format.c:1460
+#: mail/mail-format.c:1462
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Puntero a archivo local (%s) valido en \"%s\""
 
-#: mail/mail-format.c:1464
+#: mail/mail-format.c:1466
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntero a archivo local (%s)"
 
-#: mail/mail-format.c:1498
+#: mail/mail-format.c:1500
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Puntero a datos externos desconocidos (tipo \"%s\")"
 
-#: mail/mail-format.c:1503
+#: mail/mail-format.c:1505
 msgid "Malformed external-body part."
 msgstr "Parte externa al cuerpo del mensaje mal escrita."
 
-#: mail/mail-format.c:1673
+#: mail/mail-format.c:1675
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr "El %s, %s escribiС:\n"
@@ -4718,6 +5153,29 @@ msgstr ""
 "No pude registrar la carpeta '%s':\n"
 "%s"
 
+#: mail/mail-mt.c:85
+#, fuzzy, c-format
+msgid ""
+"Error while '%s':\n"
+"%s"
+msgstr ""
+"Error mientras `%s':\n"
+"%s"
+
+#: mail/mail-mt.c:87
+#, fuzzy, c-format
+msgid ""
+"Error while performing operation:\n"
+"%s"
+msgstr ""
+"Error mientras me preparaba para %s:\n"
+"%s"
+
+#: mail/mail-mt.c:356 mail/mail-mt.c:385
+#, fuzzy
+msgid "Working"
+msgstr "Moviendo"
+
 #: mail/mail-ops.c:88
 #, c-format
 msgid "Fetching email from %s"
@@ -4741,207 +5199,141 @@ msgstr "Filtrando correo bajo demanda"
 msgid "Filter email on demand"
 msgstr "Filtrar correo bajo demanda"
 
-#: mail/mail-ops.c:544
+#: mail/mail-ops.c:551
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Enviando \"%s\""
 
-#: mail/mail-ops.c:549
-msgid "Sending a message without a subject"
-msgstr "Enviando un mensaje sin asunto"
-
-#: mail/mail-ops.c:552
-#, c-format
-msgid "Send \"%s\""
-msgstr "Enviado \"%s\""
-
-#
-#: mail/mail-ops.c:555
-msgid "Send a message without a subject"
-msgstr "Enviar un mensaje sin asunto"
+#: mail/mail-ops.c:553
+#, fuzzy
+msgid "Sending message"
+msgstr "Enviar este mensaje ahora"
 
-#: mail/mail-ops.c:725
+#: mail/mail-ops.c:669
 msgid "Sending queue"
 msgstr "Enviando cola de correo"
 
-#: mail/mail-ops.c:727
+#: mail/mail-ops.c:671
 msgid "Send queue"
 msgstr "Enviar cola"
 
-#: mail/mail-ops.c:860 mail/mail-ops.c:867
+#: mail/mail-ops.c:804 mail/mail-ops.c:811
 #, c-format
 msgid "Appending \"%s\""
 msgstr "AЯadiendo \"%s\""
 
-#: mail/mail-ops.c:864 mail/mail-ops.c:870
+#: mail/mail-ops.c:808 mail/mail-ops.c:814
 msgid "Appending a message without a subject"
 msgstr "AЯadiendo un mensaje sin asunto"
 
-#: mail/mail-ops.c:953
+#: mail/mail-ops.c:897
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Moviendo mensajes de \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:955
+#: mail/mail-ops.c:899
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Copiando mensajes de \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:958
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Mover mensajes de \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:960
+#: mail/mail-ops.c:904
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Copiar mensajes de \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:991
+#: mail/mail-ops.c:935
 msgid "Moving"
 msgstr "Moviendo"
 
-#: mail/mail-ops.c:994
+#: mail/mail-ops.c:938
 msgid "Copying"
 msgstr "Copiando"
 
-#: mail/mail-ops.c:1014
+#: mail/mail-ops.c:958
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s mensaje %d de %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1093
-#, c-format
-msgid "Marking messages in folder \"%s\""
-msgstr "Marcando mensajes en la carpeta \"%s\""
-
-#: mail/mail-ops.c:1096
-#, c-format
-msgid "Mark messages in folder \"%s\""
-msgstr "Marcar mensajes en la carpeta \"%s\""
-
-#: mail/mail-ops.c:1127
-#, c-format
-msgid "Marking message %d of %d"
-msgstr "Marcando mensajes %d of %d"
-
-#: mail/mail-ops.c:1250
+#: mail/mail-ops.c:1033
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Escaneando carpetas en \"%s\""
 
-#: mail/mail-ops.c:1252
-#, c-format
-msgid "Scan folders in \"%s\""
-msgstr "Escanear carpetas en \"%s\""
-
-#: mail/mail-ops.c:1321 mail/subscribe-dialog.c:341
+#: mail/mail-ops.c:1099 mail/subscribe-dialog.c:341
 msgid "(No description)"
 msgstr "(Sin descripciСn)"
 
-#: mail/mail-ops.c:1399
-#, c-format
-msgid "Attaching messages from folder \"%s\""
-msgstr "Adjuntando mensajes desde la carpeta \"%s\""
-
-#: mail/mail-ops.c:1402
-#, c-format
-msgid "Attach messages from \"%s\""
-msgstr "Adjuntar mensajes desde \"%s\""
-
-#: mail/mail-ops.c:1504
-#, c-format
-msgid "Forwarding messages \"%s\""
-msgstr "Reenviando mensajes \"%s\""
-
-#: mail/mail-ops.c:1508
-msgid "Forwarding a message without a subject"
-msgstr "Reenviando mensajes sin asunto"
-
-#: mail/mail-ops.c:1511
-#, c-format
-msgid "Forward message \"%s\""
-msgstr "Reenviar mensaje \"%s\""
-
-#: mail/mail-ops.c:1515
-msgid "Forward a message without a subject"
-msgstr "Reenviar mensaje sin asunto"
-
-#: mail/mail-ops.c:1562 mail/mail-ops.c:2049
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Recogiendo mensaje nЗmero %d de %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1579
-msgid ""
-"Failed to generate mime part from message while generating forwarded message."
-msgstr ""
-"No pude generar un mime del mensaje cuando generaba el mensaje a reenviar."
-
-#: mail/mail-ops.c:1634
+#: mail/mail-ops.c:1164
 msgid "Forwarded messages"
 msgstr "Mensaje reenviados"
 
-#: mail/mail-ops.c:1648
-msgid "Forwarded message:\n"
-msgstr "Mensaje reenviado:\n"
-
-#: mail/mail-ops.c:1717
+#: mail/mail-ops.c:1205 mail/mail-ops.c:1274
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abriendo carpetas %s"
 
-#: mail/mail-ops.c:1788
-#, c-format
-msgid "Creating \"%s\""
-msgstr "Creando \"%s\""
-
-#: mail/mail-ops.c:1790
-#, c-format
-msgid "Create \"%s\""
-msgstr "Crear \"%s\""
+#: mail/mail-ops.c:1336
+#, fuzzy
+msgid "Synchronising folder"
+msgstr "Reconfigurar la carpeta"
 
-#: mail/mail-ops.c:1838
-msgid "Exception while reporting result to shell component listener."
-msgstr "ExcepciСn mientras devolvМa los resultados al componente de shell."
+#: mail/mail-ops.c:1386
+#, fuzzy
+msgid "Expunging folder"
+msgstr "Abriendo carpetas %s"
 
-#: mail/mail-ops.c:1976
+#: mail/mail-ops.c:1434
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Recogiendo mensaje %s"
 
-#: mail/mail-ops.c:2039
+#: mail/mail-ops.c:1497
 msgid "Retrieving messages"
 msgstr "Recogiendo mensajes"
 
-#: mail/mail-ops.c:2197
+#: mail/mail-ops.c:1507
+#, c-format
+msgid "Retrieving message number %d of %d (uid \"%s\")"
+msgstr "Recogiendo mensaje nЗmero %d de %d (uid \"%s\")"
+
+#: mail/mail-ops.c:1655
 #, c-format
 msgid "Loading %s Folder for %s"
 msgstr "Cargando carpeta %s para %s"
 
-#: mail/mail-ops.c:2199
+#: mail/mail-ops.c:1657
 #, c-format
 msgid "Load %s Folder for %s"
 msgstr "Cargar carpeta %s para %s"
 
-#: mail/mail-ops.c:2368
-#, c-format
-msgid "Saving messages from folder \"%s\""
-msgstr "Guardando mensajes de la carpeta \"%s\""
+#: mail/mail-ops.c:1823
+#, fuzzy
+msgid "Saving messages"
+msgstr "Copiando mensajes"
 
-#: mail/mail-ops.c:2371
-#, c-format
-msgid "Save messages from folder \"%s\""
-msgstr "Guardando mensajes de la carpeta \"%s\""
+#: mail/mail-ops.c:1902
+#, fuzzy, c-format
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
+msgstr "No pude guardar el archivo de listas de grupos para %s: %s"
 
-#: mail/mail-ops.c:2414
+#: mail/mail-ops.c:1915
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Guardando mensaje %d de %d (uid \"%s\")"
 
-#: mail/mail-search-dialogue.c:104
-msgid "Ok"
-msgstr "OK"
+#: mail/mail-ops.c:1929
+#, fuzzy, c-format
+msgid ""
+"Error saving messages to: %s:\n"
+" %s"
+msgstr "Error guardando el archivo: %s"
 
 #: mail/mail-search-dialogue.c:104
 msgid "Cancel"
@@ -5019,25 +5411,25 @@ msgstr "Escribiendo mensaje %d de %d"
 msgid "Saving changes to %s"
 msgstr "Guardando cambios en %s"
 
-#: mail/mail-tools.c:385
+#: mail/mail-tools.c:381
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (mensaje reenviado)"
 
-#: mail/mail-tools.c:395
+#: mail/mail-tools.c:391
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (sin asunto)"
 
-#: mail/mail-tools.c:433
+#: mail/mail-tools.c:427
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Reenviado mensaje - %s"
 
-#: mail/mail-tools.c:435
+#: mail/mail-tools.c:429
 msgid "Forwarded message (no subject)"
 msgstr "Mensaje reenviado (sin asunto)"
 
-#: mail/mail-tools.c:535
+#: mail/mail-tools.c:530
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
@@ -5056,27 +5448,27 @@ msgstr "Nueva carpeta virtual"
 
 #. 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 "Responder"
 
-#: 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 "Responder al remitente de este mensaje"
 
-#: 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 "Responder a todos los destinatarios de este mensaje"
 
-#: 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 "Reenviar este mensaje"
 
-#: 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 "Imprimir el mensaje seleccionado"
 
-#: 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 "Borrar este mensaje"
 
@@ -5131,14 +5523,6 @@ msgstr "%b %d %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2347
-msgid "Rebuilding message view"
-msgstr "Reconstruyendo la vista del mensaje"
-
-#: mail/message-list.c:2349
-msgid "Rebuild message view"
-msgstr "Reconstruir la vista del mensaje"
-
 #: mail/subscribe-dialog.c:139
 msgid "Display folders starting with:"
 msgstr "Mostrar carpetas que comiencen por:"
@@ -5406,9 +5790,8 @@ msgstr "Quitar este atajo de la lista de atajos"
 msgid "Error saving shortcuts."
 msgstr "Error guardando atajos."
 
-#: 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 "_Ver"
 
@@ -5526,1121 +5909,1106 @@ msgstr "Deshabilitado."
 msgid "Cannot initialize the Bonobo component system."
 msgstr "No puedo inicializar el sistema de componentes Bonobo."
 
-#: po/tmp/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:7
 msgid "Create a new contact"
 msgstr "Crear un nuevo contacto"
 
-#: po/tmp/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete a contact"
 msgstr "Borrar un contacto"
 
-#: 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 "Buscar"
 
-#: po/tmp/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:11
 msgid "Find a contact"
 msgstr "Buscar un contacto"
 
-#: 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 "Nuevo"
 
-#: po/tmp/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:14
 msgid "Print contacts"
 msgstr "Imprimir contactos"
 
-#: po/tmp/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:15
 msgid "Stop"
 msgstr "Parar"
 
-#: po/tmp/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:16
 msgid "Stop Loading"
 msgstr "Parar la carga"
 
-#: po/tmp/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:17
 msgid "View All"
 msgstr "Ver todo"
 
-#: po/tmp/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:18
 msgid "View all contacts"
 msgstr "Ver todos los contactos"
 
-#: po/tmp/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:19
 msgid "_Addressbook Configuration..."
 msgstr "ConfiguraciСn de la _agenda..."
 
-#: po/tmp/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:20
 msgid "_Print Contacts..."
 msgstr "Im_primir contactos..."
 
-#: po/tmp/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:21
 msgid "_Search for contacts"
 msgstr "Bu_scar contactos"
 
-#: 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 "_Herramientas"
 
 #.
-#. * 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 DМas"
 
-#: po/tmp/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:7
 msgid "Alter preferences"
 msgstr "Alterar preferencias"
 
-#: po/tmp/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:8
 msgid "Ca_lendar"
 msgstr "Ca_lendario"
 
-#: po/tmp/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:9
 msgid "Calendar Preferences..."
 msgstr "Preferencias del calendario..."
 
-#: po/tmp/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:10
 msgid "Create a new appointment"
 msgstr "Crear una nueva cita"
 
-#: po/tmp/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:11
 msgid "Create a new calendar"
 msgstr "Creando un nuevo calendario"
 
-#: po/tmp/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:12
 msgid "Day"
 msgstr "DМa"
 
-#: po/tmp/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:13
 msgid "Go back in time"
 msgstr "Volver en el tiempo"
 
-#: po/tmp/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:14
 msgid "Go forward in time"
 msgstr "Avanzar en el tiempo"
 
-#: po/tmp/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to"
 msgstr "Ir a"
 
-#: po/tmp/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to a specific date"
 msgstr "Ir a una fecha especМfica"
 
-#: po/tmp/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:17
 msgid "Go to present time"
 msgstr "Ir al momento actual"
 
-#: po/tmp/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Mes"
 
-#: 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 "Siguiente"
 
-#: po/tmp/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:21
 msgid "Open a calendar"
 msgstr "Abrir un calendario"
 
-#: po/tmp/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:22
 msgid "Prev"
 msgstr "Previo"
 
-#: po/tmp/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:24
 msgid "Print this calendar"
 msgstr "Imprimir este calendario"
 
-#: po/tmp/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:25
 msgid "Save calendar as something else"
 msgstr "Guardar el calendario como otra cosa"
 
-#: po/tmp/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 day"
 msgstr "Mostrar 1 dМa"
 
-#: po/tmp/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:27
 msgid "Show 1 month"
 msgstr "Mostrar un mes"
 
-#: po/tmp/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:28
 msgid "Show 1 week"
 msgstr "Mostrar 1 semana"
 
-#: po/tmp/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr "Mostrar un semana laboral"
 
-#: 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 "Hoy"
 
-#: po/tmp/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:31
 msgid "Week"
 msgstr "Semana"
 
-#: 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 "_Nuevo"
 
-#: po/tmp/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:33
 msgid "_Open Calendar"
 msgstr "_Abrir calendario"
 
-#: po/tmp/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:34
 msgid "_Print this calendar"
 msgstr "Im_primir este calendario"
 
-#: po/tmp/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:35
 msgid "_Save As..."
 msgstr "_Guardar como..."
 
-#: po/tmp/evolution-contact-editor.xml.h:7
+#: ui/evolution-contact-editor.xml.h:7
 msgid "Delete this item"
 msgstr "Borrar este elemento"
 
-#: po/tmp/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:8
 msgid "Delete..."
 msgstr "Borrar..."
 
-#: po/tmp/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Help"
 msgstr "Ayuda"
 
-#: po/tmp/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:10
 msgid "Print En_velope..."
 msgstr "Imprimir ca_becera..."
 
-#: 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 "Imprimir esre elemento"
 
-#: 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 "Imprimir..."
 
-#: 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 "Guardar _como..."
 
-#: 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 "Guardar y cerrar"
 
-#: 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 "Guardar el contacto y cerar la ventana de diАlogo"
 
-#: po/tmp/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-editor.xml.h:16
 msgid "Se_nd contact to other..."
 msgstr "E_nviar el contacto a otro..."
 
-#: 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 "Ver la ayuda en lМnea"
 
 #
-#: po/tmp/evolution-contact-editor.xml.h:18
+#: ui/evolution-contact-editor.xml.h:18
 msgid "Send _message to contact..."
 msgstr "Enviar un _mensaje al contacto..."
 
-#: 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 "_Archivo"
 
-#: po/tmp/evolution-contact-editor.xml.h:20
+#: ui/evolution-contact-editor.xml.h:20
 msgid "_Print..."
 msgstr "Im_primir..."
 
-#: 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 "_Guardar"
 
 #.
-#. * 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 "Acerca de esta aplicaciСn"
 
-#: po/tmp/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:7
 msgid "About..."
 msgstr "Acerca de..."
 
-#: po/tmp/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:8
 msgid "Actio_ns"
 msgstr "Accio_nes"
 
-#: po/tmp/evolution-event-editor.xml.h:9
+#: ui/evolution-event-editor.xml.h:9
 msgid "C_lear"
 msgstr "_Limpiar"
 
-#: po/tmp/evolution-event-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:10
 msgid "C_ut"
 msgstr "C_ortar"
 
-#: po/tmp/evolution-event-editor.xml.h:11
+#: ui/evolution-event-editor.xml.h:11
 msgid "Clear"
 msgstr "Limpiar"
 
-#: po/tmp/evolution-event-editor.xml.h:12
+#: ui/evolution-event-editor.xml.h:12
 msgid "Clear the selection"
 msgstr "Quitar la seleccionada"
 
-#: po/tmp/evolution-event-editor.xml.h:14
+#: ui/evolution-event-editor.xml.h:14
 msgid "Close this appointment"
 msgstr "Cerrar esta cita"
 
-#: 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 "Copiar"
 
-#: po/tmp/evolution-event-editor.xml.h:16
+#: ui/evolution-event-editor.xml.h:16
 msgid "Copy the selection"
 msgstr "Copiar la selecciСn"
 
-#: po/tmp/evolution-event-editor.xml.h:17
+#: ui/evolution-event-editor.xml.h:17
 msgid "Cut"
 msgstr "Cortar"
 
-#: po/tmp/evolution-event-editor.xml.h:18
+#: ui/evolution-event-editor.xml.h:18
 msgid "Cut the selection"
 msgstr "Cortar la selecciСn"
 
-#: po/tmp/evolution-event-editor.xml.h:21
+#: ui/evolution-event-editor.xml.h:21
 msgid "Dump XML"
 msgstr "Volcar XML"
 
-#: po/tmp/evolution-event-editor.xml.h:22
+#: ui/evolution-event-editor.xml.h:22
 msgid "Dump the UI Xml description"
 msgstr "Volcar la descripciСn XML de la IU"
 
-#: po/tmp/evolution-event-editor.xml.h:23
+#: ui/evolution-event-editor.xml.h:23
 msgid "FIXME: Address _Book..."
 msgstr "FIXME: Address _Book..."
 
-#: po/tmp/evolution-event-editor.xml.h:24
+#: ui/evolution-event-editor.xml.h:24
 msgid "FIXME: Ch_oose Form..."
 msgstr "FIXME: Ch_oose Form..."
 
-#: po/tmp/evolution-event-editor.xml.h:25
+#: ui/evolution-event-editor.xml.h:25
 msgid "FIXME: Chec_k Names"
 msgstr "FIXME: Chec_k Names"
 
-#: po/tmp/evolution-event-editor.xml.h:26
+#: ui/evolution-event-editor.xml.h:26
 msgid "FIXME: Cop_y to Folder..."
 msgstr "FIXME: Cop_y to Folder.."
 
-#: po/tmp/evolution-event-editor.xml.h:27
+#: ui/evolution-event-editor.xml.h:27
 msgid "FIXME: D_esign a Form..."
 msgstr "FIXME: D_esign a Form..."
 
-#: po/tmp/evolution-event-editor.xml.h:28
+#: ui/evolution-event-editor.xml.h:28
 msgid "FIXME: Define Print _Styles"
 msgstr "FIXME: Define Print _Styles"
 
-#: po/tmp/evolution-event-editor.xml.h:29
+#: ui/evolution-event-editor.xml.h:29
 msgid "FIXME: Desi_gn This Form"
 msgstr "FIXME: Desi_gn This Form"
 
-#: po/tmp/evolution-event-editor.xml.h:30
+#: ui/evolution-event-editor.xml.h:30
 msgid "FIXME: Fi_rst Item in Folder"
 msgstr "FIXME: Fi_rst Item in Folder"
 
-#: po/tmp/evolution-event-editor.xml.h:31
+#: ui/evolution-event-editor.xml.h:31
 msgid "FIXME: For_ward"
 msgstr "FIXME: For_ward"
 
-#: po/tmp/evolution-event-editor.xml.h:32
+#: ui/evolution-event-editor.xml.h:32
 msgid "FIXME: Forward as v_Calendar"
 msgstr "FIXME: Forward as v_Calendar"
 
-#: po/tmp/evolution-event-editor.xml.h:33
+#: ui/evolution-event-editor.xml.h:33
 msgid "FIXME: Help"
 msgstr "FIXME: Help"
 
-#: po/tmp/evolution-event-editor.xml.h:34
+#: ui/evolution-event-editor.xml.h:34
 msgid "FIXME: In_complete Task"
 msgstr "FIXME: In_complete Task"
 
-#: po/tmp/evolution-event-editor.xml.h:35
+#: ui/evolution-event-editor.xml.h:35
 msgid "FIXME: Insert File"
 msgstr "FIXME: Insert File"
 
-#: po/tmp/evolution-event-editor.xml.h:36
+#: ui/evolution-event-editor.xml.h:36
 msgid "FIXME: It_em..."
 msgstr "FIXME: It_em..."
 
-#: po/tmp/evolution-event-editor.xml.h:37
+#: ui/evolution-event-editor.xml.h:37
 msgid "FIXME: Paste _Special... "
 msgstr "FIXME: Paste _Special... "
 
-#: po/tmp/evolution-event-editor.xml.h:38
+#: ui/evolution-event-editor.xml.h:38
 msgid "FIXME: Print Pre_view"
 msgstr "FIXME: Print Pre_view"
 
-#: po/tmp/evolution-event-editor.xml.h:39
+#: ui/evolution-event-editor.xml.h:39
 msgid "FIXME: Pu_blish Form As..."
 msgstr "FIXME: Pu_blish Form As..."
 
-#: po/tmp/evolution-event-editor.xml.h:40
+#: ui/evolution-event-editor.xml.h:40
 msgid "FIXME: Publish _Form..."
 msgstr "FIXME: Publish _Form..."
 
-#: po/tmp/evolution-event-editor.xml.h:41
+#: ui/evolution-event-editor.xml.h:41
 msgid "FIXME: Rec_urrence..."
 msgstr "FIXME: Rec_urrence..."
 
-#: po/tmp/evolution-event-editor.xml.h:42
+#: ui/evolution-event-editor.xml.h:42
 msgid "FIXME: S_end"
 msgstr "FIXME: S_end"
 
-#: po/tmp/evolution-event-editor.xml.h:43
+#: ui/evolution-event-editor.xml.h:43
 msgid "FIXME: Save Attac_hments..."
 msgstr "FIXME: Save Attac_hments..."
 
-#: po/tmp/evolution-event-editor.xml.h:44
+#: ui/evolution-event-editor.xml.h:44
 msgid "FIXME: Script _Debugger"
 msgstr "FIXME: Script _Debugger"
 
-#: po/tmp/evolution-event-editor.xml.h:45
+#: ui/evolution-event-editor.xml.h:45
 msgid "FIXME: Task _Request"
 msgstr "FIXME: Task _Request"
 
-#: po/tmp/evolution-event-editor.xml.h:46
+#: ui/evolution-event-editor.xml.h:46
 msgid "FIXME: _Contact"
 msgstr "FIXME: _Contact"
 
-#: po/tmp/evolution-event-editor.xml.h:47
+#: ui/evolution-event-editor.xml.h:47
 msgid "FIXME: _Customize..."
 msgstr "FIXME: _Customize..."
 
-#: po/tmp/evolution-event-editor.xml.h:48
+#: ui/evolution-event-editor.xml.h:48
 msgid "FIXME: _File..."
 msgstr "FIXME: _File..."
 
-#: po/tmp/evolution-event-editor.xml.h:49
+#: ui/evolution-event-editor.xml.h:49
 msgid "FIXME: _Font..."
 msgstr "FIXME: _Font..."
 
-#: po/tmp/evolution-event-editor.xml.h:50
+#: ui/evolution-event-editor.xml.h:50
 msgid "FIXME: _Formatting"
 msgstr "FIXME: _Formatting"
 
-#: po/tmp/evolution-event-editor.xml.h:51
+#: ui/evolution-event-editor.xml.h:51
 msgid "FIXME: _Item"
 msgstr "FIXME: _Item"
 
-#: po/tmp/evolution-event-editor.xml.h:52
+#: ui/evolution-event-editor.xml.h:52
 msgid "FIXME: _Journal Entry"
 msgstr "FIXME: _Journal Entry"
 
-#: po/tmp/evolution-event-editor.xml.h:53
+#: ui/evolution-event-editor.xml.h:53
 msgid "FIXME: _Last Item in Folder"
 msgstr "FIXME: _Last Item in Folder"
 
-#: po/tmp/evolution-event-editor.xml.h:54
+#: ui/evolution-event-editor.xml.h:54
 msgid "FIXME: _Mail Message"
 msgstr "FIXME: _Mail Message"
 
-#: po/tmp/evolution-event-editor.xml.h:55
+#: ui/evolution-event-editor.xml.h:55
 msgid "FIXME: _Memo Style"
 msgstr "FIXME: _Memo Style"
 
-#: po/tmp/evolution-event-editor.xml.h:56
+#: ui/evolution-event-editor.xml.h:56
 msgid "FIXME: _Move to Folder..."
 msgstr "FIXME: _Move to Folder..."
 
-#: po/tmp/evolution-event-editor.xml.h:57
+#: ui/evolution-event-editor.xml.h:57
 msgid "FIXME: _New Appointment"
 msgstr "FIXME: _New Appointment"
 
-#: po/tmp/evolution-event-editor.xml.h:58
+#: ui/evolution-event-editor.xml.h:58
 msgid "FIXME: _Note"
 msgstr "FIXME: _Note"
 
-#: po/tmp/evolution-event-editor.xml.h:59
+#: ui/evolution-event-editor.xml.h:59
 msgid "FIXME: _Object..."
 msgstr "FIXME: _Object..."
 
-#: po/tmp/evolution-event-editor.xml.h:60
+#: ui/evolution-event-editor.xml.h:60
 msgid "FIXME: _Paragraph..."
 msgstr "FIXME: _Paragraph..."
 
-#: po/tmp/evolution-event-editor.xml.h:61
+#: ui/evolution-event-editor.xml.h:61
 msgid "FIXME: _Spelling..."
 msgstr "FIXME: _Spelling..."
 
-#: po/tmp/evolution-event-editor.xml.h:62
+#: ui/evolution-event-editor.xml.h:62
 msgid "FIXME: _Standard"
 msgstr "FIXME: _Standard"
 
-#: po/tmp/evolution-event-editor.xml.h:63
+#: ui/evolution-event-editor.xml.h:63
 msgid "FIXME: _Task"
 msgstr "FIXME: _Task"
 
-#: po/tmp/evolution-event-editor.xml.h:64
+#: ui/evolution-event-editor.xml.h:64
 msgid "FIXME: _Unread Item"
 msgstr "FIXME: _Unread Item"
 
-#: po/tmp/evolution-event-editor.xml.h:65
+#: ui/evolution-event-editor.xml.h:65
 msgid "FIXME: what goes here?"
 msgstr "FIXME: what goes here?"
 
-#: 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 "F_ormatear"
 
-#: po/tmp/evolution-event-editor.xml.h:68
+#: ui/evolution-event-editor.xml.h:68
 msgid "Find Again"
 msgstr "Buscar de nuevo"
 
-#: po/tmp/evolution-event-editor.xml.h:69
+#: ui/evolution-event-editor.xml.h:69
 msgid "Find _Again"
 msgstr "Buscar de _nuevo"
 
-#: po/tmp/evolution-event-editor.xml.h:70
+#: ui/evolution-event-editor.xml.h:70
 msgid "Go to the next item"
 msgstr "Ir al siguiente elemento"
 
-#: po/tmp/evolution-event-editor.xml.h:71
+#: ui/evolution-event-editor.xml.h:71
 msgid "Go to the previous item"
 msgstr "Ir al elemento anterior"
 
-#: po/tmp/evolution-event-editor.xml.h:72
+#: ui/evolution-event-editor.xml.h:72
 msgid "Modify the file's properties"
 msgstr "Propiedades las propiedades del archivo"
 
-#: po/tmp/evolution-event-editor.xml.h:73
+#: ui/evolution-event-editor.xml.h:73
 msgid "N_ext"
 msgstr "Sigui_ente"
 
-#: po/tmp/evolution-event-editor.xml.h:75
+#: ui/evolution-event-editor.xml.h:75
 msgid "Paste"
 msgstr "Pegar"
 
-#: po/tmp/evolution-event-editor.xml.h:76
+#: ui/evolution-event-editor.xml.h:76
 msgid "Paste the clipboard"
 msgstr "Pegar el contenido del portapapeles"
 
-#: po/tmp/evolution-event-editor.xml.h:77
+#: ui/evolution-event-editor.xml.h:77
 msgid "Pre_vious"
 msgstr "Pre_vio"
 
-#: po/tmp/evolution-event-editor.xml.h:78
+#: ui/evolution-event-editor.xml.h:78
 msgid "Previous"
 msgstr "Previo"
 
-#: po/tmp/evolution-event-editor.xml.h:79
+#: ui/evolution-event-editor.xml.h:79
 msgid "Print S_etup..."
 msgstr "Configurar impr_esiСn..."
 
-#: po/tmp/evolution-event-editor.xml.h:80
+#: ui/evolution-event-editor.xml.h:80
 msgid "Print Setup"
 msgstr "Configurar impresiСn"
 
-#: po/tmp/evolution-event-editor.xml.h:83
+#: ui/evolution-event-editor.xml.h:83
 msgid "Properties"
 msgstr "Propiedades"
 
-#: po/tmp/evolution-event-editor.xml.h:84
+#: ui/evolution-event-editor.xml.h:84
 msgid "Redo"
 msgstr "Rehacer"
 
-#: po/tmp/evolution-event-editor.xml.h:85
+#: ui/evolution-event-editor.xml.h:85
 msgid "Redo the undone action"
 msgstr "Rehacer la accciСn deshecha"
 
-#: po/tmp/evolution-event-editor.xml.h:86
+#: ui/evolution-event-editor.xml.h:86
 msgid "Replace"
 msgstr "Remplazar"
 
-#: po/tmp/evolution-event-editor.xml.h:87
+#: ui/evolution-event-editor.xml.h:87
 msgid "Replace a string"
 msgstr "Remplazar una cadena"
 
-#: 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 "Guardar la cita y cerrar la ventana de diАlogo"
 
-#: 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 "Guardar archivo actual"
 
-#: po/tmp/evolution-event-editor.xml.h:93
+#: ui/evolution-event-editor.xml.h:93
 msgid "Schedule Meeting"
 msgstr "Concertar encuentro"
 
-#: po/tmp/evolution-event-editor.xml.h:94
+#: ui/evolution-event-editor.xml.h:94
 msgid "Schedule _Meeting"
 msgstr "Concertar un _encuentro"
 
-#: po/tmp/evolution-event-editor.xml.h:95
+#: ui/evolution-event-editor.xml.h:95
 msgid "Schedule some sort of a meeting"
 msgstr "Programas algЗn tipo de encuentro"
 
-#: po/tmp/evolution-event-editor.xml.h:96
+#: ui/evolution-event-editor.xml.h:96
 msgid "Search again for the same string"
 msgstr "Buscar de nuevo la misma cadena"
 
-#: po/tmp/evolution-event-editor.xml.h:97
+#: ui/evolution-event-editor.xml.h:97
 msgid "Search for a string"
 msgstr "Buscar una cadena"
 
-#: po/tmp/evolution-event-editor.xml.h:99
+#: ui/evolution-event-editor.xml.h:99
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: po/tmp/evolution-event-editor.xml.h:100
+#: ui/evolution-event-editor.xml.h:100
 msgid "Select everything"
 msgstr "Seleccionar todo"
 
-#: 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 "Configurar los datos de la pАgina para la impresora actual"
 
-#: po/tmp/evolution-event-editor.xml.h:102
+#: ui/evolution-event-editor.xml.h:102
 msgid "Undo"
 msgstr "Deshacer"
 
-#: po/tmp/evolution-event-editor.xml.h:103
+#: ui/evolution-event-editor.xml.h:103
 msgid "Undo the last action"
 msgstr "Deshacer la Зltima acciСn"
 
-#: 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 "_Acerca de..."
 
-#: 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 "_Cerrar"
 
-#: po/tmp/evolution-event-editor.xml.h:106
+#: ui/evolution-event-editor.xml.h:106
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: 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 "_Depurar"
 
-#: 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 "_Editar"
 
-#: po/tmp/evolution-event-editor.xml.h:111
+#: ui/evolution-event-editor.xml.h:111
 msgid "_Find..."
 msgstr "_Buscar..."
 
-#: po/tmp/evolution-event-editor.xml.h:112
+#: ui/evolution-event-editor.xml.h:112
 msgid "_Forms"
 msgstr "_Formularios"
 
-#: 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 "_Ayuda"
 
-#: po/tmp/evolution-event-editor.xml.h:114
+#: ui/evolution-event-editor.xml.h:114
 msgid "_Insert"
 msgstr "_Insertar"
 
-#: po/tmp/evolution-event-editor.xml.h:115
+#: ui/evolution-event-editor.xml.h:115
 msgid "_Object"
 msgstr "_Objeto"
 
-#: po/tmp/evolution-event-editor.xml.h:116
+#: ui/evolution-event-editor.xml.h:116
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: po/tmp/evolution-event-editor.xml.h:117
+#: ui/evolution-event-editor.xml.h:117
 msgid "_Print"
 msgstr "Im_primir"
 
-#: po/tmp/evolution-event-editor.xml.h:118
+#: ui/evolution-event-editor.xml.h:118
 msgid "_Properties..."
 msgstr "_Propiedades..."
 
-#: po/tmp/evolution-event-editor.xml.h:119
+#: ui/evolution-event-editor.xml.h:119
 msgid "_Redo"
 msgstr "_Rehacer"
 
-#: po/tmp/evolution-event-editor.xml.h:120
+#: ui/evolution-event-editor.xml.h:120
 msgid "_Replace..."
 msgstr "_Remplazar..."
 
-#: po/tmp/evolution-event-editor.xml.h:122
+#: ui/evolution-event-editor.xml.h:122
 msgid "_Toolbars"
 msgstr "Barra de _herramientas"
 
-#: po/tmp/evolution-event-editor.xml.h:124
+#: ui/evolution-event-editor.xml.h:124
 msgid "_Undo"
 msgstr "_Deshacer"
 
 #.
-#. * 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 "Nuevo"
 
-#: po/tmp/evolution-mail.xml.h:7
+#: ui/evolution-mail.xml.h:7
 msgid "Compose a new message"
 msgstr "Escribir un nuevo mensaje"
 
-#: po/tmp/evolution-mail.xml.h:9
+#: ui/evolution-mail.xml.h:9
 msgid "Copy message to a new folder"
 msgstr "Copiar mensaje a una nueva carpeta"
 
-#: 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 "_Carpetas"
 
-#: po/tmp/evolution-mail.xml.h:14
+#: ui/evolution-mail.xml.h:14
 msgid "Fi_lter on Sender"
 msgstr "Fi_ltrar segЗn el remitente"
 
-#: po/tmp/evolution-mail.xml.h:15
+#: ui/evolution-mail.xml.h:15
 msgid "Filter on Rec_ipients"
 msgstr "Filtrar segЗn los dest_inatarios"
 
-#: po/tmp/evolution-mail.xml.h:16
+#: ui/evolution-mail.xml.h:16
 msgid "Forget _Passwords"
 msgstr "Olvidar _contraseЯa"
 
-#: po/tmp/evolution-mail.xml.h:20
+#: ui/evolution-mail.xml.h:20
 msgid "Get Mail"
 msgstr "Obtener"
 
-#: po/tmp/evolution-mail.xml.h:22
+#: ui/evolution-mail.xml.h:22
 msgid "Hide _Deleted messages"
 msgstr "Ocultar mensajes _borrados"
 
-#: po/tmp/evolution-mail.xml.h:23
+#: ui/evolution-mail.xml.h:23
 msgid "Hide _Read messages"
 msgstr "Ocultar mensajes _leidos"
 
-#: po/tmp/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:24
 msgid "Hide _Selected messages"
 msgstr "Ocultar los mensajes _seleccionados"
 
-#: po/tmp/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:25
 msgid "Mail _Filters..."
 msgstr "_Filtros de correo..."
 
-#: po/tmp/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:26
 msgid "Manage Subscriptions..."
 msgstr "Administrar suscripciones..."
 
-#: po/tmp/evolution-mail.xml.h:27
+#: ui/evolution-mail.xml.h:27
 msgid "Mar_k As Read"
 msgstr "Mar_car como leМdo"
 
-#: po/tmp/evolution-mail.xml.h:28
+#: ui/evolution-mail.xml.h:28
 msgid "Mark As U_nread"
 msgstr "Marcar como _no leМdo"
 
-#: po/tmp/evolution-mail.xml.h:29
+#: ui/evolution-mail.xml.h:29
 msgid "Move"
 msgstr "Mover"
 
-#: po/tmp/evolution-mail.xml.h:30
+#: ui/evolution-mail.xml.h:30
 msgid "Move message to a new folder"
 msgstr "Mover mensaje a una nueva carpeta"
 
-#: po/tmp/evolution-mail.xml.h:31
+#: ui/evolution-mail.xml.h:31
 msgid "Previews the message to be printed"
 msgstr "Ver el mensaje que va a ser impreso"
 
-#: po/tmp/evolution-mail.xml.h:33
+#: ui/evolution-mail.xml.h:33
 msgid "Print Preview of message..."
 msgstr "Vista previa del mensaje..."
 
-#: po/tmp/evolution-mail.xml.h:34
+#: ui/evolution-mail.xml.h:34
 msgid "Print message to the printer"
 msgstr "Imprimir el mensaje en la impresora"
 
-#: po/tmp/evolution-mail.xml.h:35
+#: ui/evolution-mail.xml.h:35
 msgid "Print message..."
 msgstr "Imprimir mensaje..."
 
-#: po/tmp/evolution-mail.xml.h:39
+#: ui/evolution-mail.xml.h:39
 msgid "Reply to _All"
 msgstr "Re: _Todos"
 
-#: po/tmp/evolution-mail.xml.h:40
+#: ui/evolution-mail.xml.h:40
 msgid "Reply to _Sender"
 msgstr "Resp. _Remitente"
 
-#: 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 "Seleccionar _todo"
 
-#: po/tmp/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:44
 msgid "Send queued mail and retrieve new mail"
 msgstr "Enviar el correo en la cola y obtener el nuevo"
 
-#: po/tmp/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:45
 msgid "Show _All messages"
 msgstr "Mostrar _todos los mensajes"
 
-#: po/tmp/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:46
 msgid "Threaded Message list"
 msgstr "Lista de mensajes encadenados"
 
-#: po/tmp/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:47
 msgid "VFolder on Se_nder"
 msgstr "VFolder segЗn el _remitente"
 
-#: po/tmp/evolution-mail.xml.h:48
+#: ui/evolution-mail.xml.h:48
 msgid "VFolder on _Recipients"
 msgstr "VFolder segЗn los _destinatarios"
 
-#: po/tmp/evolution-mail.xml.h:49
+#: ui/evolution-mail.xml.h:49
 msgid "View Raw Message Source"
 msgstr "Ver las fuentes del mensaje"
 
-#: po/tmp/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:50
 msgid "_Apply Filters"
 msgstr "_Aplicar filtro"
 
-#: po/tmp/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:51
 msgid "_Configure Folder"
 msgstr "_Configurar carpeta"
 
-#: po/tmp/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:52
 msgid "_Copy to Folder..."
 msgstr "_Copiar a la carpeta..."
 
-#: po/tmp/evolution-mail.xml.h:54
+#: ui/evolution-mail.xml.h:54
 msgid "_Edit Message"
 msgstr "_Editar mensaje"
 
-#: po/tmp/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:55
 msgid "_Expunge"
 msgstr "_Comprimir"
 
-#: po/tmp/evolution-mail.xml.h:56
+#: ui/evolution-mail.xml.h:56
 msgid "_Filter on Subject"
 msgstr "_Filtrar segЗn el asunto"
 
-#: po/tmp/evolution-mail.xml.h:57
+#: ui/evolution-mail.xml.h:57
 msgid "_Forward"
 msgstr "_Reenviar"
 
-#: 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 "_Invertir selecciСn"
 
-#: po/tmp/evolution-mail.xml.h:59
+#: ui/evolution-mail.xml.h:59
 msgid "_Mail Configuration..."
 msgstr "ConfiguraciСn del _correo..."
 
-#: po/tmp/evolution-mail.xml.h:60
+#: ui/evolution-mail.xml.h:60
 msgid "_Message"
 msgstr "_Mensaje"
 
-#: po/tmp/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:61
 msgid "_Move to Folder..."
 msgstr "_Mover a la carpeta..."
 
-#: po/tmp/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:62
 msgid "_Open in New Window"
 msgstr "_Abrir en una nueva ventana"
 
-#: po/tmp/evolution-mail.xml.h:63
+#: ui/evolution-mail.xml.h:63
 msgid "_Print Message"
 msgstr "Im_primir mensaje"
 
-#: po/tmp/evolution-mail.xml.h:64
+#: ui/evolution-mail.xml.h:64
 msgid "_Save Message As..."
 msgstr "_Guardar mensaje como..."
 
-#: po/tmp/evolution-mail.xml.h:65
+#: ui/evolution-mail.xml.h:65
 msgid "_Source"
 msgstr "_Fuente"
 
-#: po/tmp/evolution-mail.xml.h:66
+#: ui/evolution-mail.xml.h:66
 msgid "_Threaded"
 msgstr "_Encadenados"
 
-#: po/tmp/evolution-mail.xml.h:67
+#: ui/evolution-mail.xml.h:67
 msgid "_Undelete"
 msgstr "_Recuperar"
 
-#: po/tmp/evolution-mail.xml.h:68
+#: ui/evolution-mail.xml.h:68
 msgid "_VFolder on Subject"
 msgstr "_VFolder segЗn el asunto"
 
-#: po/tmp/evolution-mail.xml.h:69
+#: ui/evolution-mail.xml.h:69
 msgid "_Virtual Folder Editor..."
 msgstr "Editor de carpetas _virtuales..."
 
 #.
-#. * 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 "Adjuntar"
 
-#: po/tmp/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:9
 msgid "Close the current file"
 msgstr "Cerrar el archivo actual"
 
-#: po/tmp/evolution-message-composer.xml.h:10
+#: ui/evolution-message-composer.xml.h:10
 msgid "Encrypt this message with PGP"
 msgstr "Encriptar este mensaje con 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 "Insertar un archivo como textp en el mensaje"
 
-#: po/tmp/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:14
 msgid "Insert text file..."
 msgstr "Insertar un archivo de texto..."
 
-#: po/tmp/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:16
 msgid "Open a file"
 msgstr "Abrir un archivo"
 
-#: po/tmp/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:17
 msgid "PGP Encrypt"
 msgstr "Encriptar con PGP"
 
-#: po/tmp/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:18
 msgid "PGP Sign"
 msgstr "Firmar con PGP"
 
-#: po/tmp/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save As"
 msgstr "Guardar como"
 
-#: po/tmp/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save in _folder... (FIXME)"
 msgstr "Save in _folder... (FIXME)"
 
-#: po/tmp/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "Guardar en carpeta..."
 
-#: 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 "Guardar el archivo actual con un nombre diferente"
 
-#: po/tmp/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "Guardara el mensaje a una carpeta especМfica"
 
-#: po/tmp/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "Enviar"
 
-#: po/tmp/evolution-message-composer.xml.h:28
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr "Enviar _mas tarde"
 
-#: po/tmp/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr "Enviar _mas tarde"
 
-#: po/tmp/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr "Enviar el mensaje en formato HTML"
 
-#: po/tmp/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send the message later"
 msgstr "Enviar el mensaje mАs tarde"
 
-#: po/tmp/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:32
 msgid "Send the message now"
 msgstr "Enviar el mensaje ahora"
 
-#: po/tmp/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:33
 msgid "Send this message now"
 msgstr "Enviar este mensaje ahora"
 
-#: po/tmp/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show / hide attachments"
 msgstr "Mostrar / ocultar adjuntos"
 
-#: po/tmp/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show _attachments"
 msgstr "Mostar _adjuntos"
 
-#: po/tmp/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:36
 msgid "Show attachments"
 msgstr "Mostar adjuntos"
 
-#: po/tmp/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:37
 msgid "Sign this message with your PGP key"
 msgstr "Firmar este mensaje con tu clave PGP"
 
-#: po/tmp/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Insert text file... (FIXME)"
 msgstr "_Insert text file... (FIXME)"
 
-#: po/tmp/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Open..."
 msgstr "_Abrir..."
 
-#: po/tmp/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:47
 msgid "_Security"
 msgstr "_Seguridad"
 
 #.
-#. * 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 "AЯadir carpeta a tu lista de carpeta suscritas"
 
-#: po/tmp/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:9
 msgid "Refresh List"
 msgstr "Regenerar la lista"
 
-#: po/tmp/evolution-subscribe.xml.h:10
+#: ui/evolution-subscribe.xml.h:10
 msgid "Refresh List of Folders"
 msgstr "Regenerar la lista de carpetas"
 
-#: po/tmp/evolution-subscribe.xml.h:11
+#: ui/evolution-subscribe.xml.h:11
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Quitar carpetas de tu lista de carpetas suscritas"
 
-#: po/tmp/evolution-subscribe.xml.h:13
+#: ui/evolution-subscribe.xml.h:13
 msgid "Subscribe"
 msgstr "Suscribir"
 
-#: po/tmp/evolution-subscribe.xml.h:14
+#: ui/evolution-subscribe.xml.h:14
 msgid "Unsubscribe"
 msgstr "Dessucribir"
 
 #.
-#. * 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 "Mostrar una carpeta distinta"
 
-#: po/tmp/evolution.xml.h:7
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "_Salir"
 
-#: po/tmp/evolution.xml.h:8
+#: ui/evolution.xml.h:8
 msgid "Evolution bar _shortcut"
 msgstr "Barra de _atajos de Evolution"
 
-#: po/tmp/evolution.xml.h:9
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Salir del programa"
 
-#: po/tmp/evolution.xml.h:10
+#: ui/evolution.xml.h:10
 msgid "Getting _Started"
 msgstr "Comenzando"
 
-#: po/tmp/evolution.xml.h:11
+#: ui/evolution.xml.h:11
 msgid "Show information about Evolution"
 msgstr "Mostrar informaciСn acerca de Evolution"
 
-#: po/tmp/evolution.xml.h:12
+#: ui/evolution.xml.h:12
 msgid "Show the _Folder Bar"
 msgstr "Mostrar la barra de _carpetas"
 
-#: po/tmp/evolution.xml.h:13
+#: ui/evolution.xml.h:13
 msgid "Show the _Shortcut Bar"
 msgstr "Mostrar la barra de _atajos"
 
-#: po/tmp/evolution.xml.h:14
+#: ui/evolution.xml.h:14
 msgid "Submit _Bug Report"
 msgstr "Enviar reporte de _fallo"
 
-#: po/tmp/evolution.xml.h:15
+#: ui/evolution.xml.h:15
 msgid "Submit bug report using Bug Buddy."
 msgstr "Enviar un reporte de fallo usando Bug Buddy."
 
-#: po/tmp/evolution.xml.h:16
+#: ui/evolution.xml.h:16
 msgid "Toggle whether to show the folder bar"
 msgstr "Activar si se muestra la barra de carpetas"
 
-#: po/tmp/evolution.xml.h:17
+#: ui/evolution.xml.h:17
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Activar si se muestra la barra de atajos"
 
-#: po/tmp/evolution.xml.h:18
+#: ui/evolution.xml.h:18
 msgid "Using the C_ontact Manager"
 msgstr "Usando el administrador de c_ontactos"
 
-#: po/tmp/evolution.xml.h:19
+#: ui/evolution.xml.h:19
 msgid "Using the _Calendar"
 msgstr "Usando el _calendario"
 
-#: po/tmp/evolution.xml.h:20
+#: ui/evolution.xml.h:20
 msgid "Using the _Mailer"
 msgstr "Usando el _correo"
 
-#: po/tmp/evolution.xml.h:21
+#: ui/evolution.xml.h:21
 msgid "_About Evolution..."
 msgstr "_Acerca de Evolution..."
 
-#: po/tmp/evolution.xml.h:22
+#: ui/evolution.xml.h:22
 msgid "_Appointment (FIXME)"
 msgstr "_Appointment (FIXME)"
 
-#: po/tmp/evolution.xml.h:23
+#: ui/evolution.xml.h:23
 msgid "_Contact (FIXME)"
 msgstr "_Contact (FIXME)"
 
-#: po/tmp/evolution.xml.h:26
+#: ui/evolution.xml.h:26
 msgid "_Folder"
 msgstr "_Carpeta"
 
-#: po/tmp/evolution.xml.h:27
+#: ui/evolution.xml.h:27
 msgid "_Go to Folder..."
 msgstr "_Ir a la carpeta..."
 
-#: po/tmp/evolution.xml.h:29
+#: ui/evolution.xml.h:29
 msgid "_Index"
 msgstr "_Indexar"
 
-#: po/tmp/evolution.xml.h:30
+#: ui/evolution.xml.h:30
 msgid "_Mail message (FIXME)"
 msgstr "_Mail message (FIXME)"
 
-#: po/tmp/evolution.xml.h:32
+#: ui/evolution.xml.h:32
 msgid "_Settings"
 msgstr "_ConfiguraciСn"
 
-#: po/tmp/evolution.xml.h:33
+#: ui/evolution.xml.h:33
 msgid "_Task (FIXME)"
 msgstr "_Task (FIXME)"
 
@@ -6738,7 +7106,7 @@ msgstr "LMMJVSD"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-clipped-label.c:107
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
@@ -6763,6 +7131,106 @@ msgstr "%I:%M %p"
 msgid "Group %i"
 msgstr "Grupo %i"
 
+#~ msgid "categories"
+#~ msgstr "categorМas"
+
+#~ msgid "Item(s) belong to these categories:"
+#~ msgstr "Elemento(s) pertenecientes a esas categorМas:"
+
+#~ msgid "Available Categories:"
+#~ msgstr "CategorМas disponibles:"
+
+#~ msgid "Deleted"
+#~ msgstr "Borrado"
+
+#~ msgid "Draft"
+#~ msgstr "Borrador"
+
+#~ msgid "Mail Source"
+#~ msgstr "Fuente del correo"
+
+#~ msgid "By filling in some information about your email\n"
+#~ msgstr "Dando alguna informaciСn sobre su correo electrСnico\n"
+
+#~ msgid "settings, you can start sending and receiving email\n"
+#~ msgstr ", puede empezar a enviar y recivor correos\n"
+
+#~ msgid "right away. Click Next to continue."
+#~ msgstr "en este momento. Presione Siguiente para continuar."
+
+#~ msgid ""
+#~ "Your email configuration is now complete.\n"
+#~ "Click \"Finish\" to save your new settings"
+#~ msgstr ""
+#~ "La configuraciСn de tu correo esta completa.\n"
+#~ "Pulsa \"Fin\" para guardar la nueva configuraciСn"
+
+#~ msgid "Sending a message without a subject"
+#~ msgstr "Enviando un mensaje sin asunto"
+
+#~ msgid "Send \"%s\""
+#~ msgstr "Enviado \"%s\""
+
+#
+#~ msgid "Send a message without a subject"
+#~ msgstr "Enviar un mensaje sin asunto"
+
+#~ msgid "Marking messages in folder \"%s\""
+#~ msgstr "Marcando mensajes en la carpeta \"%s\""
+
+#~ msgid "Mark messages in folder \"%s\""
+#~ msgstr "Marcar mensajes en la carpeta \"%s\""
+
+#~ msgid "Marking message %d of %d"
+#~ msgstr "Marcando mensajes %d of %d"
+
+#~ msgid "Scan folders in \"%s\""
+#~ msgstr "Escanear carpetas en \"%s\""
+
+#~ msgid "Attaching messages from folder \"%s\""
+#~ msgstr "Adjuntando mensajes desde la carpeta \"%s\""
+
+#~ msgid "Attach messages from \"%s\""
+#~ msgstr "Adjuntar mensajes desde \"%s\""
+
+#~ msgid "Forwarding messages \"%s\""
+#~ msgstr "Reenviando mensajes \"%s\""
+
+#~ msgid "Forwarding a message without a subject"
+#~ msgstr "Reenviando mensajes sin asunto"
+
+#~ msgid "Forward message \"%s\""
+#~ msgstr "Reenviar mensaje \"%s\""
+
+#~ msgid "Forward a message without a subject"
+#~ msgstr "Reenviar mensaje sin asunto"
+
+#~ msgid ""
+#~ "Failed to generate mime part from message while generating forwarded message."
+#~ msgstr ""
+#~ "No pude generar un mime del mensaje cuando generaba el mensaje a reenviar."
+
+#~ msgid "Creating \"%s\""
+#~ msgstr "Creando \"%s\""
+
+#~ msgid "Create \"%s\""
+#~ msgstr "Crear \"%s\""
+
+#~ msgid "Exception while reporting result to shell component listener."
+#~ msgstr "ExcepciСn mientras devolvМa los resultados al componente de shell."
+
+#~ msgid "Saving messages from folder \"%s\""
+#~ msgstr "Guardando mensajes de la carpeta \"%s\""
+
+#~ msgid "Save messages from folder \"%s\""
+#~ msgstr "Guardando mensajes de la carpeta \"%s\""
+
+#~ msgid "Rebuilding message view"
+#~ msgstr "Reconstruyendo la vista del mensaje"
+
+#~ msgid "Rebuild message view"
+#~ msgstr "Reconstruir la vista del mensaje"
+
 #~ msgid "Expunging \"%s\""
 #~ msgstr "Comprimiendo \"%s\""
 
@@ -6844,9 +7312,6 @@ msgstr "Grupo %i"
 #~ msgid "To-Do item that is overdue:"
 #~ msgstr "Cosas por hacer que se han pasado:"
 
-#~ msgid "Reminder of your appointment at "
-#~ msgstr "Recordatorio de su cita el "
-
 #~ msgid "External Directories"
 #~ msgstr "Directorios externos"
 
diff --git a/po/ga.po b/po/ga.po
index dad0f3b3d6..eb4be72493 100755
--- a/po/ga.po
+++ b/po/ga.po
@@ -2,11 +2,12 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Alastair McKinstry, <mckinstry@computer.org>, 2000.
 #
+#: camel/providers/smtp/camel-smtp-transport.c:287
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution CVS\n"
-"POT-Creation-Date: 2000-12-13 16:26-0600\n"
+"POT-Creation-Date: 2001-01-06 00:11+0100\n"
 "PO-Revision-Date: 2000-08-02 13:00:00-0000\n"
 "Last-Translator: Alastair McKinstry, <mckinstry@computer.org>\n"
 "Language-Team: Irish <ga@li.org>\n"
@@ -236,10 +237,10 @@ msgstr ""
 #: addressbook/backend/ebook/load-pine-addressbook.c:17
 #: addressbook/backend/ebook/test-client-list.c:18
 #: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:991
+#: addressbook/conduit/address-conduit.c:1083
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1136
-#: calendar/conduits/todo/todo-conduit.c:945 calendar/gui/main.c:54
+#: calendar/conduits/calendar/calendar-conduit.c:1151
+#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr ""
 
@@ -358,53 +359,36 @@ msgid ""
 "pilot list from the gnome-pilot daemon"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:197
+#: addressbook/conduit/address-conduit.c:195
 msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:210
+#: addressbook/conduit/address-conduit.c:208
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:583
-#: calendar/conduits/calendar/calendar-conduit.c:715
-#: calendar/conduits/todo/todo-conduit.c:523
+#: addressbook/conduit/address-conduit.c:646
+#: calendar/conduits/calendar/calendar-conduit.c:730
+#: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat server"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:584
-#: calendar/conduits/calendar/calendar-conduit.c:716
-#: calendar/conduits/todo/todo-conduit.c:524
+#: addressbook/conduit/address-conduit.c:647
+#: calendar/conduits/calendar/calendar-conduit.c:731
+#: calendar/conduits/todo/todo-conduit.c:546
 msgid "Could not start wombat"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:616
-#: addressbook/conduit/address-conduit.c:619
+#: addressbook/conduit/address-conduit.c:679
+#: addressbook/conduit/address-conduit.c:682
 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 ""
 
@@ -418,7 +402,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:48
+#: ui/evolution-event-editor.xml.h:108 ui/evolution-mail.xml.h:53
 #, fuzzy
 msgid "_Delete"
 msgstr "ScrМos"
@@ -433,12 +417,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 ""
 
@@ -480,7 +465,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 ""
 
@@ -497,7 +482,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 ""
 
@@ -515,7 +500,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 ""
 
@@ -561,145 +547,145 @@ msgid "No_tes:"
 msgstr "_Nota"
 
 #: 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 ""
 
-#: 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
 #, fuzzy
 msgid "Company"
 msgstr "Greamaigh"
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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
 #, fuzzy
 msgid "Primary"
 msgstr "TosaМocht"
 
-#: 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 ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1329
+#: addressbook/contact-editor/e-contact-editor.c:1337
 msgid "Email 2"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1330
+#: addressbook/contact-editor/e-contact-editor.c:1338
 msgid "Email 3"
 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/fulladdr.glade.h:6
+#: addressbook/contact-editor/fulladdr.glade.h:6
 msgid "Address _2:"
 msgstr ""
 
-#: 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 ""
 
@@ -717,10 +703,12 @@ msgid ""
 "\n"
 "Mr.\n"
 "Mrs.\n"
+"Ms.\n"
+"Miss\n"
 "Dr.\n"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:13
+#: addressbook/contact-editor/fullname-strings.h:15
 msgid ""
 "\n"
 "Sr.\n"
@@ -731,44 +719,49 @@ msgid ""
 "Esq.\n"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:21
+#: addressbook/contact-editor/fullname-strings.h:23
 msgid "_First:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:22
+#: addressbook/contact-editor/fullname-strings.h:24
 msgid "_Title:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:23
+#: addressbook/contact-editor/fullname-strings.h:25
 msgid "_Middle:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:24
+#: addressbook/contact-editor/fullname-strings.h:26
 msgid "_Last:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:25
+#: addressbook/contact-editor/fullname-strings.h:27
 msgid "_Suffix:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:263
+#: addressbook/gui/component/addressbook.c:231
 msgid "As _Minicards"
 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/gui/component/addressbook.c:269
-#: 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:386
+#: addressbook/gui/component/addressbook.c:374
+#, c-format
+msgid "Enter password for %s"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:402
 msgid "Unable to open addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:391
+#: 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"
@@ -780,78 +773,195 @@ msgid ""
 "OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:501 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:503 mail/folder-browser.c:138
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 msgid "Advanced..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:533
+#: addressbook/gui/component/addressbook.c:560
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:534
+#: addressbook/gui/component/addressbook.c:561
 msgid "Name contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:535
+#: addressbook/gui/component/addressbook.c:562
 msgid "Email contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:621
+#: addressbook/gui/component/addressbook.c:648
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
-#: addressbook/gui/component/e-ldap-storage.c:88
-msgid "External Directories"
+#: addressbook/gui/component/addressbook-storage.c:95
+msgid "Other Contacts"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/e-msg-composer-attachment.glade.h:7
-#: po/tmp/ldap-server-dialog.glade.h:6
-msgid "Description:"
+#: addressbook/gui/component/addressbook-config.c:139
+msgid "LDAP Server"
 msgstr ""
 
-#: po/tmp/ldap-server-dialog.glade.h:7
-msgid "LDAP Server:"
+#: addressbook/gui/component/addressbook-config.c:141
+#, fuzzy
+msgid "File"
+msgstr "_FillteАn"
+
+#: addressbook/gui/component/addressbook-config.c:144
+msgid "Unknown addressbook type"
 msgstr ""
 
-#: po/tmp/ldap-server-dialog.glade.h:8
-msgid "Name:"
+#: 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
+msgid "Unknown auth type"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:169
+msgid "Base"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:171
+msgid "One"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:173
+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 ""
 
-#: po/tmp/ldap-server-dialog.glade.h:9
-msgid "Port Number:"
+#: addressbook/gui/component/addressbook-config.c:360
+#: mail/mail-config-druid.glade.h:34
+msgid "Host:"
 msgstr ""
 
-#: po/tmp/ldap-server-dialog.glade.h:10
+#: addressbook/gui/component/addressbook-config.c:361
+#, fuzzy
+msgid "Port:"
+msgstr "TosaМocht"
+
+#: addressbook/gui/component/addressbook-config.c:364
 msgid "Root DN:"
 msgstr ""
 
+#: addressbook/gui/component/addressbook-config.c:384
+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
+msgid "Create path if it doesn't exist."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:593
+msgid "Edit Addressbook"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:595
+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
+msgid "Name:"
+msgstr ""
+
+#: 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
+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 "ScrМos"
+
+#: 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
+msgid "Name"
+msgstr ""
+
+#: 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:"
-msgstr ""
+#: addressbook/gui/component/select-names/select-names.glade.h:9
+#, fuzzy
+msgid "Select name from:"
+msgstr "FillteАn _Nua"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:147
 #: mail/mail-search-dialogue.c:104
@@ -859,120 +969,120 @@ 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 ""
 
-#: 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 ""
 
-#: calendar/cal-util/timeutil.c:100 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
 #, fuzzy
 msgid "o"
 msgstr "Do"
 
-#: 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:417
-#: addressbook/gui/widgets/e-minicard.c:338
+#: addressbook/gui/widgets/e-addressbook-view.c:451
+#: addressbook/gui/widgets/e-minicard.c:374
 msgid "Save as VCard"
 msgstr ""
 
@@ -990,193 +1100,182 @@ 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 ""
 
-#: po/tmp/e-contact-print.glade.h:7
+#: addressbook/printing/e-contact-print.glade.h:7
 msgid "8 pt. Tahoma"
 msgstr ""
 
-#: 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
 #, fuzzy
 msgid "Format"
 msgstr "Sheoladh Chuig duine"
 
-#: 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
 #, fuzzy
 msgid "Portrait"
 msgstr "TosaМocht"
 
-#: 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
 #, fuzzy
 msgid "Size:"
 msgstr "MИid"
 
-#: 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
 #, fuzzy
 msgid "Top:"
 msgstr "Do:"
 
-#: 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 ""
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:550
-#: calendar/gui/e-week-view.c:288 calendar/gui/print.c:605
-msgid "am"
-msgstr ""
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:553
-#: calendar/gui/e-week-view.c:291 calendar/gui/print.c:604
-msgid "pm"
-msgstr ""
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 msgid "Evolution Calendar Conduit"
 msgstr ""
@@ -1185,13 +1284,13 @@ msgstr ""
 msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:671
-#: calendar/conduits/todo/todo-conduit.c:479
+#: calendar/conduits/calendar/calendar-conduit.c:686
+#: calendar/conduits/todo/todo-conduit.c:501
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:770
-#: calendar/conduits/calendar/calendar-conduit.c:773
+#: calendar/conduits/calendar/calendar-conduit.c:785
+#: calendar/conduits/calendar/calendar-conduit.c:788
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
@@ -1203,125 +1302,160 @@ msgstr ""
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:578
-#: calendar/conduits/todo/todo-conduit.c:581
+#: calendar/conduits/todo/todo-conduit.c:600
+#: calendar/conduits/todo/todo-conduit.c:603
 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:"
+#: 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
-#, fuzzy
-msgid "Appointments:"
-msgstr "_Coinne"
+#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:7
+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/GNOME_Evolution_Calendar.oaf.in.h:7
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Evolution component for handling the calendar."
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:65
-msgid "Day numbers:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+msgid "Factory for the Calendar Summary component."
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:66
-msgid "Current day's number:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+msgid "Factory for the Evolution calendar component."
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:67
-msgid "To-Do item that is not yet due:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+msgid "Factory for the calendar iTip view control"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:68
-msgid "To-Do item that is due today:"
+#: 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:69
-msgid "To-Do item that is overdue:"
+#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:8
+#, fuzzy
+msgid "Snooze"
+msgstr "MИid"
+
+#. 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:354
+#: 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:282
+#: 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:2498
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
 msgstr ""
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:286 calendar/gui/calendar-model.c:736
+#: 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:290 calendar/gui/calendar-model.c:739
+#: 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:344 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:347 po/tmp/task-editor-dialog.glade.h:20
+#: calendar/gui/calendar-model.c:349
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
 #, fuzzy
 msgid "Private"
 msgstr "PriontАil"
 
-#: calendar/gui/calendar-model.c:350 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:353 calendar/gui/calendar-model.c:521
+#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:523
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:441
+#: calendar/gui/calendar-model.c:443
 msgid "N"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:441
+#: calendar/gui/calendar-model.c:443
 msgid "S"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:445
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:445
 msgid "W"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:515
+#: calendar/gui/calendar-model.c:517
 msgid "Transparent"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:518
+#: calendar/gui/calendar-model.c:520
 msgid "Opaque"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:744
+#: calendar/gui/calendar-model.c:746
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1330,49 +1464,69 @@ msgid ""
 msgstr ""
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:845 calendar/gui/calendar-model.c:893
+#: 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:1274 widgets/misc/e-dateedit.c:1455
+#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
 msgstr ""
 
 #. 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:863
+#: calendar/gui/calendar-model.c:865
 msgid "%I:%M:%S %p%n"
 msgstr ""
 
 #. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:866
+#: calendar/gui/calendar-model.c:868
 msgid "%H:%M:%S%n"
 msgstr ""
 
 #. 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:870
+#: calendar/gui/calendar-model.c:872
 msgid "%I:%M %p%n"
 msgstr ""
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:873
+#: calendar/gui/calendar-model.c:875
 msgid "%H:%M%n"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:993
+#: calendar/gui/calendar-model.c:995
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1033
+#: calendar/gui/calendar-model.c:1035
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1073
+#: calendar/gui/calendar-model.c:1075
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr ""
 
+#: calendar/gui/calendar-summary.c:81
+msgid "%A, %e %B %Y"
+msgstr ""
+
+#: calendar/gui/calendar-summary.c:224
+msgid "<b>Error loading calendar</b>"
+msgstr ""
+
+#: 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
+msgid "Loading Calendar"
+msgstr ""
+
 #: calendar/gui/control-factory.c:125
 msgid "The URI that the calendar will display"
 msgstr ""
@@ -1390,357 +1544,393 @@ 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
 #, fuzzy
 msgid "Edit appointment"
 msgstr "_Coinne"
 
-#: calendar/gui/gnome-cal.c:1466 po/tmp/alarm-notify.glade.h:8
-#, fuzzy
-msgid "Snooze"
-msgstr "MИid"
-
-#: 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 ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "10 minutes"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "12 hour (am/pm)"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "15 minutes"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "24 hour"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "30 minutes"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "60 minutes"
 msgstr ""
 
-#: 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 "TosaМocht"
 
-#: 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
 #, fuzzy
 msgid "Sunday"
 msgstr "Post"
 
-#: po/tmp/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 #, fuzzy
 msgid "TaskPad"
 msgstr "_Teacs"
 
-#: 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:62
+#, c-format
+msgid "Are you sure you want to delete the appointment `%s'?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:65
+msgid "Are you sure you want to delete this untitled appointment?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:71
+#, c-format
+msgid "Are you sure you want to delete the task `%s'?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:74
+msgid "Are you sure you want to delete this untitled task?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:80
+#, c-format
+msgid "Are you sure you want to delete the journal entry `%s'?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:83
+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
-#: widgets/misc/e-dateedit.c:422 widgets/misc/e-dateedit.c:1331
-#: widgets/misc/e-dateedit.c:1446
+#: 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
 #, fuzzy
 msgid "None"
 msgstr "_Nota"
 
-#: 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
 #, fuzzy
 msgid "Task"
 msgstr "_Teacs"
 
-#: po/tmp/task-editor-dialog.glade.h:25
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
 msgid "URL:"
 msgstr ""
 
-#: 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
 #, fuzzy
 msgid "_Priority:"
 msgstr "TosaМocht"
 
-#: 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 ""
 
@@ -1748,26 +1938,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
 #, fuzzy, c-format
 msgid "Appointment - %s"
 msgstr "_Coinne"
 
-#: 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 ""
 
-#: 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 ""
 
-#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3277
+#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3250
 msgid "Do you want to save changes?"
 msgstr ""
 
@@ -1788,14 +1978,6 @@ msgstr ""
 msgid "Mark the task complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:342 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:479 mail/mail-view.c:165
-#: 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 "ScrМos"
-
 #: calendar/gui/e-calendar-table.c:343
 #, fuzzy
 msgid "Delete the task"
@@ -1808,53 +1990,65 @@ msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1208
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1211
 #: calendar/gui/e-week-view-main-item.c:325
 msgid "%A %d %B"
 msgstr ""
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1222
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1225
 #: calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr ""
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1235
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1238
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2941 calendar/gui/e-day-view.c:2948
-#: calendar/gui/e-day-view.c:2957 calendar/gui/e-week-view.c:3165
-#: calendar/gui/e-week-view.c:3172 calendar/gui/e-week-view.c:3181
+#. 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: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:609
+msgid "pm"
+msgstr ""
+
+#: calendar/gui/e-day-view.c:2948 calendar/gui/e-day-view.c:2955
+#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3169
+#: calendar/gui/e-week-view.c:3176 calendar/gui/e-week-view.c:3185
 #, fuzzy
 msgid "New appointment..."
 msgstr "_Coinne"
 
-#: calendar/gui/e-day-view.c:2945 calendar/gui/e-day-view.c:2952
-#: calendar/gui/e-week-view.c:3169 calendar/gui/e-week-view.c:3176
+#: calendar/gui/e-day-view.c:2952 calendar/gui/e-day-view.c:2959
+#: calendar/gui/e-week-view.c:3173 calendar/gui/e-week-view.c:3180
 msgid "Edit this appointment..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2946 calendar/gui/e-week-view.c:3170
-#: po/tmp/evolution-event-editor.xml.h:20
+#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3174
+#: ui/evolution-event-editor.xml.h:20
 #, fuzzy
 msgid "Delete this appointment"
 msgstr "ScrМos an sceal seo"
 
-#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3177
+#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3181
 msgid "Make this appointment movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2954 calendar/gui/e-week-view.c:3178
+#: calendar/gui/e-day-view.c:2961 calendar/gui/e-week-view.c:3182
 #, fuzzy
 msgid "Delete this occurrence"
 msgstr "ScrМos an sceal seo"
 
-#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3179
+#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3183
 msgid "Delete all occurrences"
 msgstr ""
 
@@ -1866,661 +2060,475 @@ msgid "%d %B"
 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/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
 #, fuzzy
 msgid "Appointment Basics"
 msgstr "_Coinne"
 
-#: 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
 #, fuzzy
 msgid "Pri_vate"
 msgstr "PriontАil"
 
-#: 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 ""
 
-#: 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
 #, fuzzy
 msgid "Edit Appointment"
 msgstr "_Coinne"
 
-#: calendar/gui/event-editor.c:407
+#: calendar/gui/event-editor.c:403
 msgid "on"
 msgstr ""
 
-#: calendar/gui/event-editor.c:432 calendar/gui/getdate.y:424
-#: 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
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/event-editor.c:566
+#: calendar/gui/event-editor.c:562
 msgid "th"
 msgstr ""
 
-#: calendar/gui/event-editor.c:722
+#: calendar/gui/event-editor.c:716
 msgid "occurrences"
 msgstr ""
 
-#: calendar/gui/event-editor.c:839
+#: calendar/gui/event-editor.c:833
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor.c:3079 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/getdate.y:391
-msgid "january"
-msgstr ""
-
-#: calendar/gui/getdate.y:392
-msgid "february"
-msgstr ""
-
-#: calendar/gui/getdate.y:393
-msgid "march"
-msgstr ""
-
-#: calendar/gui/getdate.y:394
-msgid "april"
-msgstr ""
-
-#: calendar/gui/getdate.y:395
-msgid "may"
-msgstr ""
-
-#: calendar/gui/getdate.y:396
-msgid "june"
-msgstr ""
-
-#: calendar/gui/getdate.y:397
-msgid "july"
-msgstr ""
-
-#: calendar/gui/getdate.y:398
-msgid "august"
-msgstr ""
-
-#: calendar/gui/getdate.y:399
-msgid "september"
-msgstr ""
-
-#: calendar/gui/getdate.y:400
-msgid "sept"
-msgstr ""
-
-#: calendar/gui/getdate.y:401
-msgid "october"
-msgstr ""
-
-#: calendar/gui/getdate.y:402
-msgid "november"
-msgstr ""
-
-#: calendar/gui/getdate.y:403
-msgid "december"
-msgstr ""
-
-#: calendar/gui/getdate.y:404
-msgid "sunday"
-msgstr ""
-
-#: calendar/gui/getdate.y:405
-msgid "monday"
-msgstr ""
-
-#: calendar/gui/getdate.y:406
-msgid "tuesday"
-msgstr ""
-
-#: calendar/gui/getdate.y:407
-msgid "tues"
-msgstr ""
-
-#: calendar/gui/getdate.y:408
-msgid "wednesday"
-msgstr ""
-
-#: calendar/gui/getdate.y:409
-msgid "wednes"
-msgstr ""
-
-#: calendar/gui/getdate.y:410
-msgid "thursday"
-msgstr ""
-
-#: calendar/gui/getdate.y:411
-msgid "thur"
-msgstr ""
-
-#: calendar/gui/getdate.y:412
-msgid "thurs"
-msgstr ""
-
-#: calendar/gui/getdate.y:413
-msgid "friday"
-msgstr ""
-
-#: calendar/gui/getdate.y:414
-msgid "saturday"
-msgstr ""
-
-#: calendar/gui/getdate.y:420 filter/filter-datespec.c:62
-msgid "year"
-msgstr ""
-
-#: calendar/gui/getdate.y:421 filter/filter-datespec.c:63
-msgid "month"
-msgstr ""
-
-#: calendar/gui/getdate.y:422
-msgid "fortnight"
-msgstr ""
-
-#: calendar/gui/getdate.y:423 filter/filter-datespec.c:64
-msgid "week"
-msgstr ""
-
-#: calendar/gui/getdate.y:425 filter/filter-datespec.c:66
-msgid "hour"
-msgstr ""
-
-#: calendar/gui/getdate.y:426 filter/filter-datespec.c:67
-msgid "minute"
-msgstr ""
-
-#: calendar/gui/getdate.y:427
-msgid "min"
-msgstr ""
-
-#: calendar/gui/getdate.y:428 filter/filter-datespec.c:68
-#, fuzzy
-msgid "second"
-msgstr "Post"
-
-#: calendar/gui/getdate.y:429
-msgid "sec"
-msgstr ""
-
-#: calendar/gui/getdate.y:435
-msgid "tomorrow"
-msgstr ""
-
-#: calendar/gui/getdate.y:436
-msgid "yesterday"
-msgstr ""
-
-#: calendar/gui/getdate.y:437
-msgid "today"
-msgstr ""
-
-#: calendar/gui/getdate.y:438 filter/filter-datespec.c:533
-#: filter/filter-datespec.c:693
-msgid "now"
-msgstr ""
-
-#: calendar/gui/getdate.y:439
-msgid "last"
-msgstr ""
-
-#: calendar/gui/getdate.y:440
-msgid "this"
-msgstr ""
-
-#: calendar/gui/getdate.y:441
-msgid "next"
-msgstr ""
-
-#: calendar/gui/getdate.y:442
-msgid "first"
-msgstr ""
-
-#. { N_("second"),		tUNUMBER,	2 },
-#: calendar/gui/getdate.y:444
-msgid "third"
-msgstr ""
-
-#: calendar/gui/getdate.y:445
-msgid "fourth"
+#: calendar/gui/gnome-cal.c:676
+#, c-format
+msgid "Could not load the calendar in `%s'"
 msgstr ""
 
-#: calendar/gui/getdate.y:446
-msgid "fifth"
+#: calendar/gui/gnome-cal.c:687
+#, c-format
+msgid "Could not create a calendar in `%s'"
 msgstr ""
 
-#: calendar/gui/getdate.y:447
-msgid "sixth"
+#: calendar/gui/gnome-cal.c:698
+#, c-format
+msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/getdate.y:448
-msgid "seventh"
+#.
+#. * 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/getdate.y:449
-msgid "eighth"
+#: calendar/gui/goto-dialog.glade.h:7
+msgid "August"
 msgstr ""
 
-#: calendar/gui/getdate.y:450
-#, fuzzy
-msgid "ninth"
-msgstr "PriontАil"
-
-#: calendar/gui/getdate.y:451
-msgid "tenth"
+#: calendar/gui/goto-dialog.glade.h:8
+msgid "December"
 msgstr ""
 
-#: calendar/gui/getdate.y:452
-msgid "eleventh"
+#: calendar/gui/goto-dialog.glade.h:9
+msgid "February"
 msgstr ""
 
-#: calendar/gui/getdate.y:453
-msgid "twelfth"
+#: calendar/gui/goto-dialog.glade.h:10
+msgid "Go To Date"
 msgstr ""
 
-#: calendar/gui/getdate.y:454
-msgid "ago"
+#: calendar/gui/goto-dialog.glade.h:11
+msgid "Go To Today"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:718 calendar/gui/gnome-cal.c:1474
-#: calendar/gui/gnome-cal.c:1530
-msgid "Reminder of your appointment at "
+#: calendar/gui/goto-dialog.glade.h:12
+msgid "January"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1152
-#, c-format
-msgid "Could not load the calendar in `%s'"
+#: calendar/gui/goto-dialog.glade.h:13
+msgid "July"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1163
-#, c-format
-msgid "Could not create a calendar in `%s'"
+#: calendar/gui/goto-dialog.glade.h:14
+msgid "June"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1174
-#, c-format
-msgid "The method required to load `%s' is not supported"
+#: calendar/gui/goto-dialog.glade.h:15
+msgid "March"
 msgstr ""
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1479 calendar/gui/gnome-cal.c:1534
-#: mail/mail-search-dialogue.c:104
-msgid "Ok"
+#: calendar/gui/goto-dialog.glade.h:16
+msgid "May"
 msgstr ""
 
-#: calendar/gui/goto.c:82
-msgid "Year:"
+#: calendar/gui/goto-dialog.glade.h:17
+msgid "November"
 msgstr ""
 
-#: calendar/gui/goto.c:270
-msgid "Go to date"
+#: calendar/gui/goto-dialog.glade.h:18
+msgid "October"
 msgstr ""
 
-#. Instructions
-#: calendar/gui/goto.c:281
-msgid ""
-"Please select the date you want to go to.\n"
-"When you click on a day, you will be taken\n"
-"to that date."
+#: calendar/gui/goto-dialog.glade.h:19
+msgid "September"
 msgstr ""
 
-#: calendar/gui/goto.c:318
-msgid "Go to today"
+#: calendar/gui/main.c:49
+msgid "Could not initialize GNOME"
 msgstr ""
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "1st"
 msgstr ""
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "2nd"
 msgstr ""
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "3rd"
 msgstr ""
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "4th"
 msgstr ""
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "5th"
 msgstr ""
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "6th"
 msgstr ""
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "7th"
 msgstr ""
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "8th"
 msgstr ""
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "9th"
 msgstr ""
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "10th"
 msgstr ""
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "11th"
 msgstr ""
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "12th"
 msgstr ""
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "13th"
 msgstr ""
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "14th"
 msgstr ""
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "15th"
 msgstr ""
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "16th"
 msgstr ""
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "17th"
 msgstr ""
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "18th"
 msgstr ""
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "19th"
 msgstr ""
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "20th"
 msgstr ""
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "21st"
 msgstr ""
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "22nd"
 msgstr ""
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "23rd"
 msgstr ""
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "24th"
 msgstr ""
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "25th"
 msgstr ""
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "26th"
 msgstr ""
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "27th"
 msgstr ""
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "28th"
 msgstr ""
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "29th"
 msgstr ""
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "30th"
 msgstr ""
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:299
 msgid "31st"
 msgstr ""
 
-#: 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
 #, fuzzy
 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
 #, fuzzy
 msgid "Tasks"
 msgstr "_Teacs"
 
 #. Day
-#: calendar/gui/print.c:1066
+#: calendar/gui/print.c:1071
 msgid "Current day (%a %b %d %Y)"
 msgstr ""
 
-#: 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 ""
 
-#: calendar/gui/print.c:1081
+#: calendar/gui/print.c:1086
 msgid "%a %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1092
+#: calendar/gui/print.c:1097
 #, c-format
 msgid "Current week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1100
+#: calendar/gui/print.c:1105
 msgid "Current month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1107
+#: calendar/gui/print.c:1112
 msgid "Current year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1144
+#: calendar/gui/print.c:1149
 msgid "Print Calendar"
 msgstr ""
 
-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:962
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1001
 msgid "Print Preview"
 msgstr ""
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: calendar/gui/weekday-picker.c:351 widgets/misc/e-calendar-item.c:416
-msgid "MTWTFSS"
-msgstr ""
-
-#: calendar/gui/weekday-picker.c:353 calendar/gui/weekday-picker.c:443
+#: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
 msgid "SMTWTFS"
 msgstr ""
 
@@ -2610,60 +2618,61 @@ msgstr ""
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:182
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:227
+#: camel/camel-remote-store.c:243
+#: camel/providers/smtp/camel-smtp-transport.c:162
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:228
+#: camel/camel-remote-store.c:244
 msgid "(unknown host)"
 msgstr ""
 
-#: camel/camel-remote-store.c:452
+#: camel/camel-remote-store.c:483
 msgid "Server disconnected."
 msgstr ""
 
-#: camel/camel-service.c:120
+#: camel/camel-service.c:138
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:129
+#: camel/camel-service.c:147
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:138
+#: camel/camel-service.c:156
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:488
+#: camel/camel-service.c:526
 #, c-format
 msgid "No such host %s."
 msgstr ""
 
-#: camel/camel-service.c:491
+#: camel/camel-service.c:529
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr ""
 
-#: camel/camel-session.c:272
+#: camel/camel-session.c:297
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:360
+#: camel/camel-session.c:388
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2685,51 +2694,51 @@ msgstr ""
 msgid "Port number in URL `%s' is non-numeric"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-auth.c:127
+#: camel/providers/imap/camel-imap-auth.c:133
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
 "%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-auth.c:198
+#: camel/providers/imap/camel-imap-auth.c:205
 msgid "Bad authentication response from server."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:216
+#: camel/providers/imap/camel-imap-command.c:231
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:224
+#: camel/providers/imap/camel-imap-command.c:239
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:240 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:271
+#: camel/providers/imap/camel-imap-command.c:286
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:407
+#: camel/providers/imap/camel-imap-command.c:422
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:443
+#: camel/providers/imap/camel-imap-command.c:458
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:216
+#: 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:586
+#: camel/providers/imap/camel-imap-folder.c:532
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -2741,31 +2750,25 @@ msgstr ""
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:234
-#: 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:236
+#: camel/providers/imap/camel-imap-store.c:248
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:245
+#: camel/providers/imap/camel-imap-store.c:257
 msgid "Kerberos 4"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:247
+#: camel/providers/imap/camel-imap-store.c:259
 msgid ""
 "This option will connect to the IMAP server using Kerberos 4 authentication."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:333
+#: camel/providers/imap/camel-imap-store.c:345
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:359
+#: camel/providers/imap/camel-imap-store.c:373
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2773,7 +2776,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:539
+#: camel/providers/imap/camel-imap-store.c:564
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
@@ -2858,12 +2861,12 @@ msgid "Cannot append message to maildir folder: %s: %s"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:204
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-maildir-folder.c:207
+#: camel/providers/local/camel-maildir-folder.c:215
+#: camel/providers/local/camel-mbox-folder.c:317
 #: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:189
-#: camel/providers/local/camel-mh-folder.c:197
+#: camel/providers/local/camel-mh-folder.c:192
+#: camel/providers/local/camel-mh-folder.c:200
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -2871,14 +2874,14 @@ msgid ""
 msgstr ""
 
 #: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-mbox-folder.c:317
 #: camel/providers/local/camel-mh-folder.c:183
 #, fuzzy
 msgid "No such message"
 msgstr "Post an sceАl seo"
 
-#: camel/providers/local/camel-maildir-folder.c:213
-#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-maildir-folder.c:216
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "Invalid message contents"
 msgstr ""
 
@@ -2921,30 +2924,30 @@ msgstr ""
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:195
+#: camel/providers/local/camel-mbox-folder.c:201
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:251
+#: camel/providers/local/camel-mbox-folder.c:257
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:327
-#: camel/providers/local/camel-mbox-folder.c:357
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:333
+#: camel/providers/local/camel-mbox-folder.c:365
+#: camel/providers/local/camel-mbox-folder.c:378
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:358
+#: camel/providers/local/camel-mbox-folder.c:366
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:369
+#: camel/providers/local/camel-mbox-folder.c:379
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -2991,56 +2994,56 @@ msgstr ""
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:341
+#: camel/providers/local/camel-mbox-summary.c:343
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:475
-#: camel/providers/local/camel-mbox-summary.c:661
+#: camel/providers/local/camel-mbox-summary.c:477
+#: camel/providers/local/camel-mbox-summary.c:668
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:491
+#: camel/providers/local/camel-mbox-summary.c:493
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:512
-#: camel/providers/local/camel-mbox-summary.c:520
-#: camel/providers/local/camel-mbox-summary.c:691
-#: camel/providers/local/camel-mbox-summary.c:699
+#: camel/providers/local/camel-mbox-summary.c:514
+#: camel/providers/local/camel-mbox-summary.c:522
+#: camel/providers/local/camel-mbox-summary.c:701
+#: camel/providers/local/camel-mbox-summary.c:709
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:562
+#: camel/providers/local/camel-mbox-summary.c:565
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:579
+#: camel/providers/local/camel-mbox-summary.c:582
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:595
-#: camel/providers/local/camel-mbox-summary.c:748
+#: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-mbox-summary.c:759
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:604
+#: camel/providers/local/camel-mbox-summary.c:609
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:615
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:817
+#: camel/providers/local/camel-mbox-summary.c:830
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
@@ -3073,7 +3076,7 @@ msgstr ""
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:144
+#: camel/providers/nntp/camel-nntp-folder.c:115
 #, c-format
 msgid "Message %s not found."
 msgstr ""
@@ -3123,16 +3126,16 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:179
+#: camel/providers/pop3/camel-pop3-folder.c:180
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:273
+#: camel/providers/pop3/camel-pop3-folder.c:274
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:288
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr ""
@@ -3170,47 +3173,48 @@ msgstr ""
 msgid "Could not authenticate to KPOP server: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:335
+#: camel/providers/pop3/camel-pop3-store.c:337
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:389
+#: camel/providers/pop3/camel-pop3-store.c:391
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:408
+#: camel/providers/pop3/camel-pop3-store.c:410
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending username: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:411
-#: camel/providers/pop3/camel-pop3-store.c:448
+#: camel/providers/pop3/camel-pop3-store.c:413
+#: camel/providers/pop3/camel-pop3-store.c:450
 msgid "(Unknown)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:438
+#: camel/providers/pop3/camel-pop3-store.c:440
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:446
+#: camel/providers/pop3/camel-pop3-store.c:448
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:555
+#: camel/providers/pop3/camel-pop3-store.c:557
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
+#: mail/mail-config-druid.glade.h:63
 #, fuzzy
 msgid "Sendmail"
 msgstr "Post"
@@ -3259,8 +3263,132 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
+#: 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
+#, c-format
+msgid "Welcome response error: %s: possibly non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:281
+msgid "No authentication required"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:283
+msgid ""
+"This option will connect to the SMTP server without using any kind of "
+"authentication. This should be fine for connecting to most SMTP servers."
+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 ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:294
+msgid ""
+"This option will connect to the SMTP server using CRAM-MD5 authentication."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:332
+#, c-format
+msgid "SMTP server %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:334
+#, c-format
+msgid "SMTP mail delivery via %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:359
+msgid "Cannot send message: sender address not defined."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:366
+msgid "Cannot send message: sender address not valid."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:380
+msgid "Cannot send message: no recipients defined."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:474
+#, c-format
+msgid "HELO request timed out: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:490
+#, c-format
+msgid "HELO response error: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:529
+#, c-format
+msgid "MAIL FROM request timed out: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:545
+#, c-format
+msgid "MAIL FROM response error: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:570
+#, c-format
+msgid "RCPT TO request timed out: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
+#, c-format
+msgid "RCPT TO response error: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:617
+#, c-format
+msgid "DATA request timed out: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:633
+#, c-format
+msgid "DATA response error: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:648
+#: camel/providers/smtp/camel-smtp-transport.c:666
+#, c-format
+msgid "DATA send timed out: message termination: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:682
+#, c-format
+msgid "DATA response error: message termination: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:706
+#, c-format
+msgid "RSET request timed out: %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:722
+#, c-format
+msgid "RSET response error: %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:745
+#, c-format
+msgid "QUIT request timed out: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#, c-format
+msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
 #: camel/providers/vee/camel-vee-provider.c:30
@@ -3296,178 +3424,178 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:144
+#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:155
 msgid "attachment"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:417
-#: 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:464 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 "ScrМos"
 
-#: composer/e-msg-composer-attachment-bar.c:465
+#: composer/e-msg-composer-attachment-bar.c:461
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:496
+#: composer/e-msg-composer-attachment-bar.c:492
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:497
+#: 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: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 ""
 
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:290
-#: mail/mail-format.c:621
+#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:303
+#: mail/mail-format.c:626
 #, fuzzy
 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:291
+#: composer/e-msg-composer-hdrs.c:304
 msgid "Enter the identity you wish to send this message from"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:295 mail/mail-format.c:625
+#: composer/e-msg-composer-hdrs.c:308 mail/mail-format.c:630
 msgid "To:"
 msgstr "Do:"
 
-#: composer/e-msg-composer-hdrs.c:296
+#: composer/e-msg-composer-hdrs.c:309
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:627
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:632
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:301
+#: 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:306
+#: composer/e-msg-composer-hdrs.c:319
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:307
+#: 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."
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:629
+#: composer/e-msg-composer-hdrs.c:326 mail/mail-format.c:634
 msgid "Subject:"
 msgstr "Abair:"
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Enter the subject of the mail"
 msgstr ""
 
-#: composer/e-msg-composer.c:429
+#: composer/e-msg-composer.c:430
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:599
+#: composer/e-msg-composer.c:600
 msgid "Save as..."
 msgstr ""
 
-#: composer/e-msg-composer.c:610
+#: composer/e-msg-composer.c:611
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:630
+#: composer/e-msg-composer.c:631
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:652
+#: composer/e-msg-composer.c:653
 msgid "Saving changes to message..."
 msgstr ""
 
-#: composer/e-msg-composer.c:654
+#: composer/e-msg-composer.c:655
 #, fuzzy
 msgid "Save changes to message..."
 msgstr "Post an sceАl seo"
 
-#: composer/e-msg-composer.c:695
+#: composer/e-msg-composer.c:696
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:739 shell/e-shell-view-menu.c:170
+#: composer/e-msg-composer.c:741 shell/e-shell-view-menu.c:167
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:745
+#: 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:767
+#: composer/e-msg-composer.c:772
 msgid "Open file"
 msgstr ""
 
-#: composer/e-msg-composer.c:893
+#: composer/e-msg-composer.c:898
 msgid "That file does not exist."
 msgstr ""
 
-#: composer/e-msg-composer.c:903
+#: composer/e-msg-composer.c:908
 msgid "That is not a regular file."
 msgstr ""
 
-#: composer/e-msg-composer.c:913
+#: composer/e-msg-composer.c:918
 msgid "That file exists but is not readable."
 msgstr ""
 
-#: composer/e-msg-composer.c:923
+#: composer/e-msg-composer.c:928
 msgid "That file appeared accesible but open(2) failed."
 msgstr ""
 
-#: composer/e-msg-composer.c:945
+#: 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:966
+#: composer/e-msg-composer.c:971
 msgid "An error occurred while reading the file."
 msgstr ""
 
-#: composer/e-msg-composer.c:1343
+#: composer/e-msg-composer.c:1350
 #, fuzzy
 msgid "Compose a message"
 msgstr "Post an sceАl seo"
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1427
 msgid "Could not create composer window."
 msgstr ""
 
@@ -3480,14 +3608,26 @@ msgid "Sear_ch"
 msgstr ""
 
 #: filter/filter-datespec.c:62
+msgid "year"
+msgstr ""
+
+#: filter/filter-datespec.c:62
 msgid "years"
 msgstr ""
 
 #: filter/filter-datespec.c:63
+msgid "month"
+msgstr ""
+
+#: filter/filter-datespec.c:63
 msgid "months"
 msgstr ""
 
 #: filter/filter-datespec.c:64
+msgid "week"
+msgstr ""
+
+#: filter/filter-datespec.c:64
 msgid "weeks"
 msgstr ""
 
@@ -3496,14 +3636,27 @@ msgid "days"
 msgstr ""
 
 #: filter/filter-datespec.c:66
+msgid "hour"
+msgstr ""
+
+#: filter/filter-datespec.c:66
 msgid "hours"
 msgstr ""
 
 #: filter/filter-datespec.c:67
+msgid "minute"
+msgstr ""
+
+#: filter/filter-datespec.c:67
 msgid "minutes"
 msgstr ""
 
 #: filter/filter-datespec.c:68
+#, fuzzy
+msgid "second"
+msgstr "Post"
+
+#: filter/filter-datespec.c:68
 msgid "seconds"
 msgstr ""
 
@@ -3553,6 +3706,10 @@ msgstr ""
 msgid "Compare against"
 msgstr ""
 
+#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
+msgid "now"
+msgstr ""
+
 #: filter/filter-datespec.c:690
 msgid "<click here to select a date>"
 msgstr ""
@@ -3575,7 +3732,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 ""
 
@@ -3612,242 +3769,252 @@ msgstr ""
 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"
 "%s"
 msgstr ""
 
-#: filter/filter-message-search.c:379 filter/filter-message-search.c:447
+#: filter/filter-message-search.c:380 filter/filter-message-search.c:448
 #, c-format
 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:520
+#: filter/filter-rule.c:530
 msgid "Rule name: "
 msgstr ""
 
-#: filter/filter-rule.c:524
+#: filter/filter-rule.c:534
 msgid "Untitled"
 msgstr ""
 
-#: filter/filter-rule.c:540
+#: filter/filter-rule.c:550
 msgid "If"
 msgstr ""
 
-#: filter/filter-rule.c:557
+#: filter/filter-rule.c:567
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:561
+#: filter/filter-rule.c:571
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:566
+#: filter/filter-rule.c:576
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:577
+#: filter/filter-rule.c:587
 msgid "Add criterion"
 msgstr ""
 
-#: filter/filter-rule.c:583
+#: filter/filter-rule.c:593
 msgid "Remove criterion"
 msgstr ""
 
-#: mail/folder-browser.c:465 po/tmp/filter.glade.h:8
-#: po/tmp/mail-config.glade.h:9
-msgid "Edit"
+#: filter/filter-system-flag.c:63
+msgid "Replied to"
 msgstr ""
 
-#: po/tmp/filter.glade.h:10
+#. { _("Deleted"), "Deleted" },
+#. { _("Draft"), "Draft" },
+#: filter/filter-system-flag.c:66
+msgid "Important"
+msgstr ""
+
+#: filter/filter-system-flag.c:67
+#, fuzzy
+msgid "Read"
+msgstr "ScrМos"
+
+#: filter/filter.glade.h:10
 #, fuzzy
 msgid "Edit VFolders"
 msgstr "_FillteАn"
 
-#: 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
 msgid "vFolder Sources"
 msgstr ""
 
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
-msgid "Assign Colour"
+msgid "after"
 msgstr ""
 
 #: filter/libfilter-i18n.h:3
-msgid "Assign Score"
+msgid "Assign Colour"
 msgstr ""
 
 #: filter/libfilter-i18n.h:4
-msgid "Copy to Folder"
+msgid "Assign Score"
 msgstr ""
 
 #: filter/libfilter-i18n.h:5
-msgid "Date received"
+msgid "before"
 msgstr ""
 
 #: filter/libfilter-i18n.h:6
-msgid "Date sent"
+msgid "contains"
 msgstr ""
 
-#: filter/libfilter-i18n.h:8
-msgid "Expression"
+#: filter/libfilter-i18n.h:7
+msgid "Copy to Folder"
 msgstr ""
 
-#: filter/libfilter-i18n.h:9
-msgid "Forward to Address"
+#: filter/libfilter-i18n.h:8
+msgid "Date received"
 msgstr ""
 
-#: filter/libfilter-i18n.h:10
-msgid "Message Body"
+#: filter/libfilter-i18n.h:9
+msgid "Date sent"
 msgstr ""
 
 #: filter/libfilter-i18n.h:11
-msgid "Message Header"
+msgid "does not contain"
 msgstr ""
 
 #: filter/libfilter-i18n.h:12
-msgid "Message was received"
+msgid "does not end with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:13
-msgid "Message was sent"
+msgid "does not exist"
 msgstr ""
 
 #: filter/libfilter-i18n.h:14
-#, fuzzy
-msgid "Move to Folder"
-msgstr "FillteАn _Nua"
+msgid "does not sound like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:15
+msgid "does not start with"
+msgstr ""
 
 #: filter/libfilter-i18n.h:16
-msgid "Recipients"
+msgid "ends with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:17
-msgid "Regex Match"
+msgid "exists"
 msgstr ""
 
 #: filter/libfilter-i18n.h:18
-#, fuzzy
-msgid "Sender"
-msgstr "Post"
+msgid "Expression"
+msgstr ""
 
 #: filter/libfilter-i18n.h:19
-msgid "Set Status"
+msgid "Forward to Address"
 msgstr ""
 
 #: filter/libfilter-i18n.h:20
-msgid "Source"
+msgid "is"
 msgstr ""
 
 #: filter/libfilter-i18n.h:21
-msgid "Specific header"
+msgid "is greater than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:22
-msgid "Status"
+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 "Abair"
+msgid "Message Body"
+msgstr ""
 
 #: filter/libfilter-i18n.h:25
-msgid "after"
+msgid "Message Header"
 msgstr ""
 
 #: filter/libfilter-i18n.h:26
-msgid "before"
+msgid "Message was received"
 msgstr ""
 
 #: filter/libfilter-i18n.h:27
-msgid "contains"
+msgid "Message was sent"
 msgstr ""
 
 #: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr ""
+#, fuzzy
+msgid "Move to Folder"
+msgstr "FillteАn _Nua"
 
 #: filter/libfilter-i18n.h:29
-msgid "does not end with"
+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"
+msgid "on or before"
 msgstr ""
 
 #: filter/libfilter-i18n.h:32
-msgid "does not start with"
+msgid "Recipients"
 msgstr ""
 
 #: filter/libfilter-i18n.h:33
-msgid "ends with"
+msgid "Regex Match"
 msgstr ""
 
 #: filter/libfilter-i18n.h:34
-msgid "exists"
-msgstr ""
+#, fuzzy
+msgid "Sender"
+msgstr "Post"
 
 #: filter/libfilter-i18n.h:35
-msgid "is greater than"
+msgid "Set Status"
 msgstr ""
 
 #: filter/libfilter-i18n.h:36
-msgid "is less than"
+msgid "sounds like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:37
-msgid "is not"
+msgid "Source"
 msgstr ""
 
 #: filter/libfilter-i18n.h:38
-msgid "is"
+msgid "Specific header"
 msgstr ""
 
 #: filter/libfilter-i18n.h:39
-msgid "on or after"
+msgid "starts with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:40
-msgid "on or before"
+msgid "Status"
 msgstr ""
 
 #: filter/libfilter-i18n.h:41
-msgid "sounds like"
+msgid "Stop Processing"
 msgstr ""
 
 #: filter/libfilter-i18n.h:42
-msgid "starts with"
-msgstr ""
+msgid "Subject"
+msgstr "Abair"
 
 #: filter/libfilter-i18n.h:43
 msgid "was after"
@@ -3877,139 +4044,215 @@ msgstr ""
 msgid "Edit VFolder Rule"
 msgstr ""
 
-#: mail/component-factory.c:227
+#: mail/component-factory.c:277
 msgid "Cannot initialize Evolution's mail component."
 msgstr ""
 
-#: mail/component-factory.c:266
+#: 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:16
+#: 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
 #, fuzzy
 msgid "Subject contains"
 msgstr "Abair"
 
-#: 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:453
+#: mail/folder-browser.c:643
 msgid "VFolder on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:454
+#: mail/folder-browser.c:644
 msgid "VFolder on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:455
+#: mail/folder-browser.c:645
 msgid "VFolder on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:457
+#: mail/folder-browser.c:647
 msgid "Filter on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:458
+#: mail/folder-browser.c:648
 msgid "Filter on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:459
+#: mail/folder-browser.c:649
 msgid "Filter on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:460 mail/folder-browser.c:544
+#: mail/folder-browser.c:650 mail/folder-browser.c:779
 msgid "Filter on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:14
+#: mail/folder-browser.c:655
+msgid "Show all hidden"
+msgstr ""
+
+#: mail/folder-browser.c:657
+msgid "Hide selected"
+msgstr ""
+
+#. could use another mask, but not enough api do to it
+#: mail/folder-browser.c:660
+msgid "Hide read"
+msgstr ""
+
+#: mail/folder-browser.c:661
+#, fuzzy
+msgid "Hide deleted"
+msgstr "ScrМos"
+
+#: mail/folder-browser.c:663 mail/folder-browser.c:790
+#, fuzzy
+msgid "Hide Subject"
+msgstr "Abair"
+
+#: mail/folder-browser.c:665 mail/folder-browser.c:796
+msgid "Hide from Sender"
+msgstr ""
+
+#: mail/folder-browser.c:670 ui/evolution-message-composer.xml.h:15
 #, fuzzy
 msgid "Open"
 msgstr "_OscАil"
 
-#: mail/folder-browser.c:466
+#: mail/folder-browser.c:672
 msgid "Save As..."
 msgstr ""
 
-#: mail/folder-browser.c:467 mail/mail-view.c:163
-#: po/tmp/evolution-addressbook.xml.h:13 po/tmp/evolution-calendar.xml.h:23
-#: po/tmp/evolution-mail.xml.h:28
+#: 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 "PriontАil"
 
-#: mail/folder-browser.c:469
+#: mail/folder-browser.c:675
 msgid "Reply to Sender"
 msgstr ""
 
-#: mail/folder-browser.c:470 mail/mail-view.c:156
-#: po/tmp/evolution-mail.xml.h:34
+#: 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:471 mail/mail-view.c:159
-#: 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 "Sheoladh Chuig duine"
 
-#: mail/folder-browser.c:472 po/tmp/evolution-mail.xml.h:18
+#: mail/folder-browser.c:678 ui/evolution-mail.xml.h:18
 #, fuzzy
 msgid "Forward inline"
 msgstr "Sheoladh Chuig duine"
 
-#: mail/folder-browser.c:474
+#: mail/folder-browser.c:680
 msgid "Mark as Read"
 msgstr ""
 
-#: mail/folder-browser.c:475
+#: mail/folder-browser.c:681
 msgid "Mark as Unread"
 msgstr ""
 
-#: mail/folder-browser.c:477
+#: mail/folder-browser.c:683
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "SАbhАil 'san _fillteАn"
 
-#: mail/folder-browser.c:478
+#: mail/folder-browser.c:684
 msgid "Copy to Folder..."
 msgstr ""
 
-#: mail/folder-browser.c:480
+#: mail/folder-browser.c:686
 #, fuzzy
 msgid "Undelete"
 msgstr "ScrМos"
 
 #. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
 #. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:484
+#: mail/folder-browser.c:690
 msgid "Apply Filters"
 msgstr ""
 
-#: mail/folder-browser.c:486 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:546
+#: mail/folder-browser.c:693 ui/evolution-mail.xml.h:21
+#, fuzzy
+msgid "Hide Messages"
+msgstr "Post an sceАl seo"
+
+#: mail/folder-browser.c:781
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
+#: mail/folder-browser.c:787
+#, fuzzy, c-format
+msgid "Hide Subject \"%s\""
+msgstr "Abair"
+
+#: 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
+msgid "Current store format:"
+msgstr ""
+
+#: mail/local-config.glade.h:7
+#, fuzzy
+msgid "Mailbox Format"
+msgstr "Sheoladh Chuig duine"
+
+#: mail/local-config.glade.h:8
+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"
@@ -4062,92 +4305,304 @@ 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 ""
+
+#: mail/mail-callbacks.c:611
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:554
+#: mail/mail-callbacks.c:613
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:665
+#: mail/mail-callbacks.c:748
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:699 mail/mail-display.c:72
+#: mail/mail-callbacks.c:781 mail/mail-display.c:79
 msgid "Overwrite file?"
 msgstr ""
 
-#: mail/mail-callbacks.c:703 mail/mail-display.c:76
+#: mail/mail-callbacks.c:785 mail/mail-display.c:83
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: mail/mail-callbacks.c:748
+#: mail/mail-callbacks.c:830
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:750
+#: mail/mail-callbacks.c:832
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:877
+#: mail/mail-callbacks.c:916
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:922
+#: mail/mail-callbacks.c:961
 #, fuzzy
 msgid "Print Message"
 msgstr "Post an sceАl seo"
 
-#: mail/mail-callbacks.c:969
+#: 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
+msgid "Account Information"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:8
+msgid "Account Management"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:9
+msgid "Account Properties"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:11
+msgid "Advanced"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:12
+msgid "Authentication"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:13
+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 "ScrМos"
+
+#: mail/mail-config-druid.glade.h:26
+msgid "Delete mail from server"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:27
+#, fuzzy
+msgid "Done"
+msgstr "_Nota"
+
+#: mail/mail-config-druid.glade.h:28
+msgid "E-Mail Address:"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:30
+msgid "Email Address:"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:31
+msgid "Evolution Mail Configuration"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:32
+msgid "Full Name:"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:35
+msgid "Hostname:"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:36
+msgid "IMAP"
+msgstr ""
+
+#: 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
+msgid "Kerberos"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:40
+msgid "Mail"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:41
+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"
+#: mail/mail-config-druid.glade.h:43
+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 "_Nua"
+
+#: mail/mail-config-druid.glade.h:48
+#, fuzzy
+msgid "Optional"
+msgstr "_OscАil"
+
+#: 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 ""
+
+#: mail/mail-config-druid.glade.h:51
+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 ""
+
+#: mail/mail-config-druid.glade.h:55
+msgid "Remember my password"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:56 mail/mail-format.c:628
+#, fuzzy
+msgid "Reply-To:"
+msgstr "Freagrair"
+
+#: mail/mail-config-druid.glade.h:57
+#, fuzzy
+msgid "Reply-to:"
+msgstr "Freagrair"
+
+#: mail/mail-config-druid.glade.h:58
+msgid "Required"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:60
+msgid "Save password"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:61
+msgid "Select signature file"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:62
+#, fuzzy
+msgid "Sending Email"
+msgstr "Post"
+
+#: mail/mail-config-druid.glade.h:64
+msgid "Server Configuration"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:65
+msgid "Server Timeouts"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:66
+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 "Post"
+
+#: mail/mail-config-druid.glade.h:69 mail/mail-config-gui.c:496
+msgid "Signature file:"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:70
+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 ""
 
-#: po/tmp/mail-config-druid.glade.h:10
-msgid "Welcome to the Evolution Mail configuration wizard!\n"
+#: mail/mail-config-druid.glade.h:73
+msgid "Type"
 msgstr ""
 
-#: po/tmp/mail-config-druid.glade.h:14
+#: 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
+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
+msgid "minute(s)"
 msgstr ""
 
 #: mail/mail-config-gui.c:433
@@ -4165,15 +4620,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 ""
 
@@ -4181,26 +4628,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 ""
@@ -4213,7 +4644,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"
@@ -4239,6 +4670,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 ""
@@ -4287,524 +4726,437 @@ 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
 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 ""
 
-#: po/tmp/mail-config.glade.h:20
-msgid "Sources"
-msgstr ""
-
-#: mail/mail-crypto.c:350 mail/mail-crypto.c:452 mail/mail-crypto.c:629
+#: 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."
 msgstr ""
 
-#: mail/mail-crypto.c:354 mail/mail-crypto.c:456 mail/mail-crypto.c:634
+#: mail/mail-crypto.c:357 mail/mail-crypto.c:462 mail/mail-crypto.c:640
+#: mail/mail-crypto.c:785
 msgid "No password provided."
 msgstr ""
 
-#: mail/mail-crypto.c:360 mail/mail-crypto.c:463 mail/mail-crypto.c:640
+#: mail/mail-crypto.c:363 mail/mail-crypto.c:469 mail/mail-crypto.c:646
+#: mail/mail-crypto.c:792 mail/mail-crypto.c:942
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: mail/mail-crypto.c:625
+#: mail/mail-crypto.c:631 mail/mail-crypto.c:777 mail/mail-crypto.c:936
 msgid "No GPG/PGP program available."
 msgstr ""
 
-#: mail/mail-display.c:90
+#: mail/mail-crypto.c:953
+#, c-format
+msgid "Couldn't create temp file: %s"
+msgstr ""
+
+#: mail/mail-display.c:98
 #, c-format
 msgid ""
 "Could not open file %s:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-display.c:113
+#: mail/mail-display.c:131
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-display.c:218
+#: mail/mail-display.c:229
 msgid "Save Attachment"
 msgstr ""
 
-#: mail/mail-display.c:258
+#: mail/mail-display.c:269
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/mail-display.c:300
+#: mail/mail-display.c:311
 msgid "Save to Disk..."
 msgstr ""
 
-#: mail/mail-display.c:302
+#: mail/mail-display.c:313
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/mail-display.c:304
+#: mail/mail-display.c:315
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:328
+#: mail/mail-display.c:339
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:351
+#: mail/mail-display.c:362
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:355
+#: mail/mail-display.c:366
 msgid "Hide"
 msgstr ""
 
-#: mail/mail-format.c:500
+#: mail/mail-format.c:503
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:623
-#, fuzzy
-msgid "Reply-To:"
-msgstr "Freagrair"
-
-#: mail/mail-format.c:845
+#: mail/mail-format.c:851
 msgid "No GPG/PGP support available in this copy of Evolution."
 msgstr ""
 
-#: mail/mail-format.c:857
+#: mail/mail-format.c:863
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:869
 #, fuzzy
 msgid "Encrypted message"
 msgstr "Post an sceАl seo"
 
-#: mail/mail-format.c:864
+#: mail/mail-format.c:870
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1470
+#: mail/mail-format.c:1450
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1482
+#: mail/mail-format.c:1462
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1486
+#: mail/mail-format.c:1466
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1520
+#: mail/mail-format.c:1500
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1525
+#: mail/mail-format.c:1505
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-format.c:1695
+#: mail/mail-format.c:1675
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr ""
 
-#: mail/mail-local.c:202
+#: mail/mail-local.c:204
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:206
+#: mail/mail-local.c:208
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:261
+#: mail/mail-local.c:251
+#, fuzzy
+msgid "Reconfiguring folder"
+msgstr "FillteАn _Nua"
+
+#: mail/mail-local.c:269
 msgid "Closing current folder"
 msgstr ""
 
-#: mail/mail-local.c:293
+#: mail/mail-local.c:295
 msgid "Renaming old folder and opening"
 msgstr ""
 
-#: mail/mail-local.c:314
+#: mail/mail-local.c:313
 msgid "Creating new folder"
 msgstr ""
 
-#: mail/mail-local.c:329
+#: mail/mail-local.c:327
 #, fuzzy
 msgid "Copying messages"
 msgstr "_Post sceАl"
 
-#: mail/mail-local.c:341
+#: 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:372
+#: 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:781
+#: mail/mail-local.c:787
 msgid "Registering local folder"
 msgstr ""
 
-#: mail/mail-local.c:783
+#: mail/mail-local.c:789
 msgid "Register local folder"
 msgstr ""
 
-#: mail/mail-ops.c:79
+#: mail/mail-local.c:894
+#, c-format
+msgid ""
+"Unable to register folder '%s':\n"
+"%s"
+msgstr ""
+
+#: mail/mail-mt.c:85
+#, c-format
+msgid ""
+"Error while '%s':\n"
+"%s"
+msgstr ""
+
+#: mail/mail-mt.c:87
+#, c-format
+msgid ""
+"Error while performing operation:\n"
+"%s"
+msgstr ""
+
+#: mail/mail-mt.c:356 mail/mail-mt.c:385
+msgid "Working"
+msgstr ""
+
+#: mail/mail-ops.c:88
 #, c-format
 msgid "Fetching email from %s"
 msgstr ""
 
-#: mail/mail-ops.c:81
+#: mail/mail-ops.c:90
 #, c-format
 msgid "Fetch email from %s"
 msgstr ""
 
-#: mail/mail-ops.c:331
+#: mail/mail-ops.c:335
 #, c-format
 msgid "There is no new mail at %s."
 msgstr ""
 
-#: 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:538
+#: mail/mail-ops.c:551
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:543
-msgid "Sending a message without a subject"
-msgstr ""
-
-#: mail/mail-ops.c:546
-#, fuzzy, c-format
-msgid "Send \"%s\""
-msgstr "Post"
-
-#: mail/mail-ops.c:549
-msgid "Send a message without a subject"
-msgstr ""
+#: mail/mail-ops.c:553
+#, fuzzy
+msgid "Sending message"
+msgstr "Post an sceАl seo"
 
-#: mail/mail-ops.c:720
+#: mail/mail-ops.c:669
 msgid "Sending queue"
 msgstr ""
 
-#: mail/mail-ops.c:722
+#: mail/mail-ops.c:671
 msgid "Send queue"
 msgstr ""
 
-#: mail/mail-ops.c:858 mail/mail-ops.c:865
+#: mail/mail-ops.c:804 mail/mail-ops.c:811
 #, c-format
 msgid "Appending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:862 mail/mail-ops.c:868
+#: mail/mail-ops.c:808 mail/mail-ops.c:814
 msgid "Appending a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:940
-#, c-format
-msgid "Expunging \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:942
-#, c-format
-msgid "Expunge \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1001
+#: mail/mail-ops.c:897
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:899
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1006
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1008
+#: mail/mail-ops.c:904
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1039
+#: mail/mail-ops.c:935
 msgid "Moving"
 msgstr ""
 
-#: mail/mail-ops.c:1042
+#: mail/mail-ops.c:938
 #, fuzzy
 msgid "Copying"
 msgstr "Greamaigh"
 
-#: mail/mail-ops.c:1062
+#: mail/mail-ops.c:958
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1141
-#, c-format
-msgid "Marking messages in folder \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1144
-#, c-format
-msgid "Mark messages in folder \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1175
-#, c-format
-msgid "Marking message %d of %d"
-msgstr ""
-
-#: mail/mail-ops.c:1295
+#: mail/mail-ops.c:1033
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1297
-#, c-format
-msgid "Scan folders in \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1366 mail/subscribe-dialog.c:339
+#: mail/mail-ops.c:1099 mail/subscribe-dialog.c:341
 msgid "(No description)"
 msgstr ""
 
-#: mail/mail-ops.c:1432
-#, c-format
-msgid "Attaching messages from folder \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1435
-#, c-format
-msgid "Attach messages from \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1535
-#, c-format
-msgid "Forwarding messages \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1539
-msgid "Forwarding a message without a subject"
-msgstr ""
-
-#: mail/mail-ops.c:1542
-#, c-format
-msgid "Forward message \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1546
-msgid "Forward a message without a subject"
-msgstr ""
-
-#: mail/mail-ops.c:1593
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1610
-msgid ""
-"Failed to generate mime part from message while generating forwarded message."
-msgstr ""
-
-#: mail/mail-ops.c:1665
+#: mail/mail-ops.c:1164
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1679
-msgid "Forwarded message:\n"
-msgstr ""
-
-#: mail/mail-ops.c:1748
-#, c-format
-msgid "Loading \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1750
-#, c-format
-msgid "Load \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1853
-#, c-format
-msgid "Creating \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1855
-#, c-format
-msgid "Create \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1903
-msgid "Exception while reporting result to shell component listener."
-msgstr ""
-
-#: mail/mail-ops.c:1949
-#, c-format
-msgid "Synchronizing \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1951
-#, c-format
-msgid "Synchronize \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:2015
-#, c-format
-msgid "Displaying message UID \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:2018
-msgid "Clearing message display"
-msgstr ""
-
-#: mail/mail-ops.c:2021
+#: mail/mail-ops.c:1205 mail/mail-ops.c:1274
 #, c-format
-msgid "Display message UID \"%s\""
+msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:2024
-msgid "Clear message display"
+#: mail/mail-ops.c:1336
+msgid "Synchronising folder"
 msgstr ""
 
-#: mail/mail-ops.c:2137
-#, c-format
-msgid "Opening messages from folder \"%s\""
+#: mail/mail-ops.c:1386
+msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:2140
-#, c-format
-msgid "Open messages from \"%s\""
-msgstr ""
+#: mail/mail-ops.c:1434
+#, fuzzy, c-format
+msgid "Retrieving message %s"
+msgstr "_Post sceАl"
 
-#: mail/mail-ops.c:2244
-#, c-format
-msgid "Loading %s Folder"
-msgstr ""
+#: mail/mail-ops.c:1497
+#, fuzzy
+msgid "Retrieving messages"
+msgstr "_Post sceАl"
 
-#: mail/mail-ops.c:2246
+#: mail/mail-ops.c:1507
 #, c-format
-msgid "Load %s Folder"
+msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:2310
+#: mail/mail-ops.c:1655
 #, c-format
-msgid "Viewing messages from folder \"%s\""
+msgid "Loading %s Folder for %s"
 msgstr ""
 
-#: mail/mail-ops.c:2313
+#: mail/mail-ops.c:1657
 #, c-format
-msgid "View messages from \"%s\""
+msgid "Load %s Folder for %s"
 msgstr ""
 
-#: mail/mail-ops.c:2339
-#, c-format
-msgid "Retrieving message %d of %d (uid \"%s\")"
-msgstr ""
+#: mail/mail-ops.c:1823
+#, fuzzy
+msgid "Saving messages"
+msgstr "_Post sceАl"
 
-#: mail/mail-ops.c:2428
+#: mail/mail-ops.c:1902
 #, c-format
-msgid "Saving messages from folder \"%s\""
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
 msgstr ""
 
-#: mail/mail-ops.c:2431
+#: mail/mail-ops.c:1915
 #, c-format
-msgid "Save messages from folder \"%s\""
+msgid "Saving message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:2474
+#: mail/mail-ops.c:1929
 #, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
+msgid ""
+"Error saving messages to: %s:\n"
+" %s"
 msgstr ""
 
 #: mail/mail-search-dialogue.c:104
 msgid "Cancel"
 msgstr ""
 
-#: mail/mail-summary.c:105 mail/mail-threads.c:728
+#: mail/mail-summary.c:110 mail/mail-threads.c:729
 msgid "Incomplete message written on pipe!"
 msgstr ""
 
-#: mail/mail-threads.c:301
+#: mail/mail-threads.c:302
 #, c-format
 msgid ""
 "Error while preparing to %s:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-threads.c:675
+#: mail/mail-threads.c:676
 #, c-format
 msgid ""
 "Error while `%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-threads.c:732
+#: mail/mail-threads.c:733
 msgid "Error reading commands from dispatching thread."
 msgstr ""
 
-#: mail/mail-threads.c:797
+#: mail/mail-threads.c:798
 msgid "Corrupted message from dispatching thread?"
 msgstr ""
 
-#: mail/mail-threads.c:916
+#: mail/mail-threads.c:917
 msgid "Could not create dialog box."
 msgstr ""
 
-#: mail/mail-threads.c:927
+#: mail/mail-threads.c:928
 msgid "User cancelled query."
 msgstr ""
 
@@ -4814,131 +5166,145 @@ msgid "Couldn't create temporary mbox `%s': %s"
 msgstr ""
 
 #. Get all uids of source
-#: mail/mail-tools.c:239
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Examining %s"
 msgstr ""
 
-#: mail/mail-tools.c:269
+#: mail/mail-tools.c:271
 #, c-format
 msgid ""
 "Could not read UID cache file \"%s\". You may receive duplicate messages."
 msgstr ""
 
-#. Info
-#: mail/mail-tools.c:290
+#: mail/mail-tools.c:300
 #, c-format
 msgid "Retrieving message %d of %d"
 msgstr ""
 
 #. Append it to dest
-#: mail/mail-tools.c:303
+#: mail/mail-tools.c:315
 #, c-format
 msgid "Writing message %d of %d"
 msgstr ""
 
-#: mail/mail-tools.c:332
+#: mail/mail-tools.c:347
 #, c-format
 msgid "Saving changes to %s"
 msgstr ""
 
-#: mail/mail-tools.c:369
+#: mail/mail-tools.c:381
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr ""
 
-#: mail/mail-tools.c:379
+#: mail/mail-tools.c:391
 msgid "Fwd: (no subject)"
 msgstr ""
 
-#: mail/mail-tools.c:418
+#: mail/mail-tools.c:427
 #, c-format
 msgid "Forwarded message - %s"
 msgstr ""
 
-#: mail/mail-tools.c:420
+#: mail/mail-tools.c:429
 msgid "Forwarded message (no subject)"
 msgstr ""
 
-#: mail/mail-tools.c:523
+#: mail/mail-tools.c:530
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-vfolder.c:147
+#: mail/mail-vfolder.c:149
 #, fuzzy
 msgid "VFolders"
 msgstr "_FillteАn"
 
-#: mail/mail-vfolder.c:296
+#: mail/mail-vfolder.c:298
 #, fuzzy
 msgid "New VFolder"
 msgstr "FillteАn _Nua"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:33
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:37
 msgid "Reply"
 msgstr "Freagrair"
 
-#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:38
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
 msgid "Reply to the sender of this message"
 msgstr ""
 
-#: mail/mail-view.c:156 po/tmp/evolution-mail.xml.h:37
+#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
 msgid "Reply to all recipients of this message"
 msgstr ""
 
-#: mail/mail-view.c:159 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:163 po/tmp/evolution-mail.xml.h:32
+#: mail/mail-view.c:148 ui/evolution-mail.xml.h:36
 msgid "Print the selected message"
 msgstr ""
 
-#: mail/mail-view.c:165 po/tmp/evolution-mail.xml.h:12
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:12
 msgid "Delete this message"
 msgstr "ScrМos an sceal seo"
 
-#: mail/message-list.c:572
+#: mail/message-list.c:590
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:575
+#: mail/message-list.c:593
 #, fuzzy
 msgid "Seen"
 msgstr "Post"
 
-#: mail/message-list.c:578
+#: mail/message-list.c:596
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:846
+#: mail/message-list.c:881
 #, c-format
 msgid "[ %s ]"
 msgstr ""
 
 #. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:858 mail/message-list.c:873
+#: mail/message-list.c:893 mail/message-list.c:909
 #, c-format
 msgid "%s, et al."
 msgstr ""
 
-#: mail/message-list.c:860 mail/message-list.c:875
+#: mail/message-list.c:896 mail/message-list.c:912
 msgid "<unknown>"
 msgstr ""
 
-#: mail/message-list.c:2068
-msgid "Rebuilding message view"
+#: mail/message-list.c:965
+msgid "?"
 msgstr ""
 
-#: mail/message-list.c:2070
-#, fuzzy
-msgid "Rebuild message view"
-msgstr "_Post sceАl"
+#: mail/message-list.c:972
+msgid "Today %l:%M %p"
+msgstr ""
+
+#: mail/message-list.c:981
+msgid "Yesterday %l:%M %p"
+msgstr ""
+
+#: mail/message-list.c:993
+msgid "%a %l:%M %p"
+msgstr ""
+
+#: mail/message-list.c:1001
+msgid "%b %d %l:%M %p"
+msgstr ""
+
+#: mail/message-list.c:1003
+msgid "%b %d %Y"
+msgstr ""
 
 #: mail/subscribe-dialog.c:139
 msgid "Display folders starting with:"
@@ -4954,27 +5320,27 @@ msgstr ""
 msgid "Get store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:282
+#: mail/subscribe-dialog.c:283
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:286
+#: mail/subscribe-dialog.c:287
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:290
+#: mail/subscribe-dialog.c:291
 #, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:293
+#: mail/subscribe-dialog.c:294
 #, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr ""
 
-#: shell/e-setup.c:112 shell/e-setup.c:183
+#: shell/e-setup.c:112 shell/e-setup.c:185
 msgid "Evolution installation"
 msgstr ""
 
@@ -4988,23 +5354,23 @@ msgstr ""
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 
-#: shell/e-setup.c:155
+#: shell/e-setup.c:157
 msgid "Could not update files correctly"
 msgstr ""
 
-#: shell/e-setup.c:158 shell/e-setup.c:224
+#: shell/e-setup.c:160 shell/e-setup.c:228
 msgid "Evolution files successfully installed."
 msgstr ""
 
-#: shell/e-setup.c:187
+#: shell/e-setup.c:189
 msgid "This seems to be the first time you run Evolution."
 msgstr ""
 
-#: shell/e-setup.c:188
+#: shell/e-setup.c:190
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 
-#: shell/e-setup.c:205
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -5012,14 +5378,14 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: shell/e-setup.c:220
+#: shell/e-setup.c:224
 #, c-format
 msgid ""
 "Cannot copy files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:245
+#: shell/e-setup.c:249
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -5027,7 +5393,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:257
+#: shell/e-setup.c:261
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -5056,7 +5422,7 @@ msgid ""
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:291
+#: shell/e-shell-folder-selection-dialog.c:297
 #, fuzzy
 msgid "New..."
 msgstr "_Nua"
@@ -5065,30 +5431,26 @@ msgstr "_Nua"
 msgid "(Untitled)"
 msgstr ""
 
-#. you might have to call gnome_dialog_run() on the
-#. * dialog returned here, I don't remember...
-#.
-#: shell/e-shell-view-menu.c:114
+#: shell/e-shell-view-menu.c:111
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
-#. same as above
-#: shell/e-shell-view-menu.c:120
+#: shell/e-shell-view-menu.c:117
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:172
+#: shell/e-shell-view-menu.c:169
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:174
+#: shell/e-shell-view-menu.c:171
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
 "within the GNOME desktop environment."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:335
+#: shell/e-shell-view-menu.c:332
 #, fuzzy
 msgid "Go to folder..."
 msgstr "SАbhАil 'san _fillteАn"
@@ -5186,9 +5548,8 @@ msgstr ""
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:125
-#: po/tmp/evolution-message-composer.xml.h:43 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
 #, fuzzy
 msgid "_View"
 msgstr "_Nua"
@@ -5250,8 +5611,8 @@ msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
-"Over the last month and a half, our focus has been on making\n"
-"Evolution usable. Many of the Evolution developers are now using\n"
+"Over the time since the past release, our focus has been on making\n"
+"Evolution usable.  Many of the Evolution developers are now using\n"
 "Evolution to read their mail full time. You could too. (Just\n"
 "be sure to keep a backup.)\n"
 "\n"
@@ -5287,1140 +5648,1160 @@ msgstr ""
 msgid "Cannot initialize the Bonobo component system."
 msgstr ""
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-addressbook-ldap.xml.h:6
-msgid "N_ew Directory Server"
-msgstr ""
-
-#: po/tmp/evolution-addressbook-ldap.xml.h:7
-msgid "_Actions"
-msgstr ""
-
-#: 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
 #, fuzzy
 msgid "New"
 msgstr "_Nua"
 
-#: 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 ""
+
+#: ui/evolution-addressbook.xml.h:20
 msgid "_Print Contacts..."
 msgstr ""
 
-#: po/tmp/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:21
 msgid "_Search for contacts"
 msgstr ""
 
-#: po/tmp/evolution-addressbook.xml.h:21
-#: po/tmp/evolution-event-editor.xml.h:123
+#: ui/evolution-addressbook.xml.h:22 ui/evolution-event-editor.xml.h:123
 msgid "_Tools"
 msgstr "_UirlisМ"
 
 #.
-#. * 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 ""
 
-#: 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 ""
 
-#: po/tmp/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:27
 msgid "Show 1 month"
 msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:28
 msgid "Show 1 week"
 msgstr ""
 
-#: 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:414
+#: 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 "_Nua"
 
-#: 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
-msgid "_Save Calendar As"
-msgstr ""
+#: ui/evolution-calendar.xml.h:35
+#, fuzzy
+msgid "_Save As..."
+msgstr "SАbhАil 'san _fillteАn"
 
-#: po/tmp/evolution-contact-editor.xml.h:7
+#: ui/evolution-contact-editor.xml.h:7
 #, fuzzy
 msgid "Delete this item"
 msgstr "ScrМos an sceal seo"
 
-#: po/tmp/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:8
 #, fuzzy
 msgid "Delete..."
 msgstr "ScrМos"
 
-#: 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
 #, fuzzy
 msgid "Print..."
 msgstr "PriontАil"
 
-#: po/tmp/evolution-contact-editor.xml.h:13
-#: po/tmp/evolution-event-editor.xml.h:89
-#: po/tmp/evolution-message-composer.xml.h:18
+#: ui/evolution-contact-editor.xml.h:13 ui/evolution-event-editor.xml.h:89
+#: ui/evolution-message-composer.xml.h:21
 #, fuzzy
 msgid "Save _As..."
 msgstr "SАbhАil 'san _fillteАn"
 
-#: 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:38
-#: 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
 #, fuzzy
 msgid "_File"
 msgstr "_FillteАn"
 
-#: po/tmp/evolution-contact-editor.xml.h:20
+#: ui/evolution-contact-editor.xml.h:20
 #, fuzzy
 msgid "_Print..."
 msgstr "PriontАil"
 
-#: po/tmp/evolution-contact-editor.xml.h:21
-#: po/tmp/evolution-event-editor.xml.h:121
-#: po/tmp/evolution-message-composer.xml.h:42
+#: 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
 #, fuzzy
 msgid "C_lear"
 msgstr "_FillteАn"
 
-#: po/tmp/evolution-event-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:10
 #, fuzzy
 msgid "C_ut"
 msgstr "Gearr"
 
-#: 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 "Greamaigh"
 
-#: 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 "Gearr"
 
-#: 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
 #, fuzzy
 msgid "FIXME: For_ward"
 msgstr "Sheoladh Chuig duine"
 
-#: 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 "_Post sceАl"
 
-#: 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
 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 "_Coinne"
 
-#: 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:10
+#: 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
 #, fuzzy
 msgid "Print Setup"
 msgstr "PriontАil"
 
-#: 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
 #, fuzzy
 msgid "Redo"
 msgstr "ScrМos"
 
-#: 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
 #, fuzzy
 msgid "Replace"
 msgstr "Freagrair"
 
-#: 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:21
+#: 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
 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 "LeasЗ"
 
-#: 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:34
+#: 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:35
+#: 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
 #, fuzzy
 msgid "_Copy"
 msgstr "Greamaigh"
 
-#: po/tmp/evolution-event-editor.xml.h:107
-#: po/tmp/evolution-message-composer.xml.h:36
+#: 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:37
-#: 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
 #, fuzzy
 msgid "_Forms"
 msgstr "_FillteАn"
 
-#: po/tmp/evolution-event-editor.xml.h:113
-#: po/tmp/evolution-message-composer.xml.h:39 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
 #, fuzzy
 msgid "_Object"
 msgstr "Abair"
 
-#: 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
 #, fuzzy
 msgid "_Print"
 msgstr "PriontАil"
 
-#: 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
 #, fuzzy
 msgid "_Toolbars"
 msgstr "_UirlisМ"
 
-#: po/tmp/evolution-event-editor.xml.h:124
+#: ui/evolution-event-editor.xml.h:124
 #, fuzzy
 msgid "_Undo"
 msgstr "LeasЗ"
 
 #.
-#. * 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
 #, fuzzy
 msgid "F_older"
 msgstr "_FillteАn"
 
-#: 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:21
-msgid "Mail _Filters"
+#: ui/evolution-mail.xml.h:22
+#, fuzzy
+msgid "Hide _Deleted messages"
+msgstr "ScrМos an sceal seo"
+
+#: ui/evolution-mail.xml.h:23
+#, fuzzy
+msgid "Hide _Read messages"
+msgstr "Post an sceАl seo"
+
+#: ui/evolution-mail.xml.h:24
+#, fuzzy
+msgid "Hide _Selected messages"
+msgstr "ScrМos an sceal seo"
+
+#: ui/evolution-mail.xml.h:25
+msgid "Mail _Filters..."
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:22
-msgid "Manage Subscriptions"
+#: ui/evolution-mail.xml.h:26
+msgid "Manage Subscriptions..."
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:23
+#: ui/evolution-mail.xml.h:27
 msgid "Mar_k As Read"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:28
 msgid "Mark As U_nread"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:29
 #, fuzzy
 msgid "Move"
 msgstr "ScrМos"
 
-#: po/tmp/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:30
 msgid "Move message to a new folder"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:27
+#: ui/evolution-mail.xml.h:31
 msgid "Previews the message to be printed"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:29
+#: ui/evolution-mail.xml.h:33
 msgid "Print Preview of message..."
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:30
+#: ui/evolution-mail.xml.h:34
 msgid "Print message to the printer"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:31
+#: ui/evolution-mail.xml.h:35
 #, fuzzy
 msgid "Print message..."
 msgstr "Post an sceАl seo"
 
-#: po/tmp/evolution-mail.xml.h:35
+#: ui/evolution-mail.xml.h:39
 msgid "Reply to _All"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:36
+#: ui/evolution-mail.xml.h:40
 msgid "Reply to _Sender"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:39 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:40
+#: ui/evolution-mail.xml.h:44
 msgid "Send queued mail and retrieve new mail"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:41
+#: ui/evolution-mail.xml.h:45
+#, fuzzy
+msgid "Show _All messages"
+msgstr "Post an sceАl seo"
+
+#: ui/evolution-mail.xml.h:46
 msgid "Threaded Message list"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:42
+#: ui/evolution-mail.xml.h:47
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:48
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:49
 msgid "View Raw Message Source"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:50
 msgid "_Apply Filters"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:51
 #, fuzzy
 msgid "_Configure Folder"
 msgstr "FillteАn _Nua"
 
-#: po/tmp/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:52
 msgid "_Copy to Folder..."
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:49
+#: ui/evolution-mail.xml.h:54
 #, fuzzy
 msgid "_Edit Message"
 msgstr "_Post sceАl"
 
-#: po/tmp/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:55
 msgid "_Expunge"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:56
 msgid "_Filter on Subject"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:57
 #, fuzzy
 msgid "_Forward"
 msgstr "Sheoladh Chuig duine"
 
-#: po/tmp/evolution-mail.xml.h:53 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:54
-msgid "_Mail Configuration"
+#: ui/evolution-mail.xml.h:59
+msgid "_Mail Configuration..."
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:60
 #, fuzzy
 msgid "_Message"
 msgstr "_Post sceАl"
 
-#: po/tmp/evolution-mail.xml.h:56
+#: ui/evolution-mail.xml.h:61
 #, fuzzy
 msgid "_Move to Folder..."
 msgstr "SАbhАil 'san _fillteАn"
 
-#: po/tmp/evolution-mail.xml.h:57
+#: ui/evolution-mail.xml.h:62
 msgid "_Open in New Window"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:58
+#: ui/evolution-mail.xml.h:63
 #, fuzzy
 msgid "_Print Message"
 msgstr "_Post sceАl"
 
-#: po/tmp/evolution-mail.xml.h:59
+#: ui/evolution-mail.xml.h:64
 msgid "_Save Message As..."
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:60
+#: ui/evolution-mail.xml.h:65
 msgid "_Source"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:66
 msgid "_Threaded"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:67
 #, fuzzy
 msgid "_Undelete"
 msgstr "ScrМos"
 
-#: po/tmp/evolution-mail.xml.h:63
+#: ui/evolution-mail.xml.h:68
 msgid "_VFolder on Subject"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:64
-msgid "_Virtual Folder Editor"
+#: ui/evolution-mail.xml.h:69
+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:11
+#: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Encrypt this message with PGP"
+msgstr "Post an sceАl seo"
+
+#: ui/evolution-message-composer.xml.h:12
 msgid "HTML"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:13
 msgid "Insert a file as text into the message"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:14
 msgid "Insert text file..."
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:15
+#: 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 ""
+
+#: ui/evolution-message-composer.xml.h:18
+msgid "PGP Sign"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save As"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:19
+#: ui/evolution-message-composer.xml.h:22
 #, fuzzy
 msgid "Save in _folder... (FIXME)"
 msgstr "SАbhАil 'san _fillteАn"
 
-#: po/tmp/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:23
 #, fuzzy
 msgid "Save in folder..."
 msgstr "SАbhАil 'san _fillteАn"
 
-#: po/tmp/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "Post"
 
-#: po/tmp/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:28
+#: ui/evolution-message-composer.xml.h:31
 #, fuzzy
 msgid "Send the message later"
 msgstr "Post an sceАl seo"
 
-#: po/tmp/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:32
 #, fuzzy
 msgid "Send the message now"
 msgstr "Post an sceАl seo"
 
-#: po/tmp/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:33
 #, fuzzy
 msgid "Send this message now"
 msgstr "Post an sceАl seo"
 
-#: po/tmp/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show / hide attachments"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show _attachments"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:36
 msgid "Show attachments"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Sign this message with your PGP key"
+msgstr "Post an sceАl seo"
+
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Insert text file... (FIXME)"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:45
 #, fuzzy
 msgid "_Open..."
 msgstr "_OscАil"
 
+#: 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
 msgid "Evolution bar _shortcut"
 msgstr ""
 
-#: 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
 msgid "Getting _Started"
 msgstr ""
 
-#: po/tmp/evolution.xml.h:11
+#: ui/evolution.xml.h:11
 msgid "Show information about Evolution"
 msgstr ""
 
-#: 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
 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 ""
 
-#: 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
 #, fuzzy
 msgid "_About Evolution..."
 msgstr "Evolution"
 
-#: po/tmp/evolution.xml.h:22
+#: ui/evolution.xml.h:22
 #, fuzzy
 msgid "_Appointment (FIXME)"
 msgstr "_Coinne"
 
-#: 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 "_FillteАn"
 
-#: po/tmp/evolution.xml.h:27
+#: ui/evolution.xml.h:27
 #, fuzzy
 msgid "_Go to Folder..."
 msgstr "_FillteАn"
 
-#: 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
 #, fuzzy
 msgid "_Mail message (FIXME)"
 msgstr "_Post sceАl"
 
-#: 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 ""
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2470
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
 msgid "%A, %B %d, %Y"
 msgstr ""
 
@@ -6501,28 +6882,34 @@ msgstr ""
 msgid "All Attendees"
 msgstr ""
 
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: widgets/misc/e-calendar-item.c:421
+msgid "MTWTFSS"
+msgstr ""
+
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
+#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
 msgid "%B %Y"
 msgstr ""
 
-#: widgets/misc/e-clipped-label.c:107
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr ""
 
-#: widgets/misc/e-dateedit.c:408
+#: widgets/misc/e-dateedit.c:407
 msgid "Now"
 msgstr ""
 
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1249 widgets/misc/e-dateedit.c:1308
-#: widgets/misc/e-dateedit.c:1487
+#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
+#: widgets/misc/e-dateedit.c:1486
 msgid "%H:%M"
 msgstr ""
 
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1252 widgets/misc/e-dateedit.c:1311
-#: widgets/misc/e-dateedit.c:1490
+#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
+#: widgets/misc/e-dateedit.c:1489
 msgid "%I:%M %p"
 msgstr ""
 
@@ -6531,5 +6918,21 @@ msgstr ""
 msgid "Group %i"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Appointments:"
+#~ msgstr "_Coinne"
+
+#, fuzzy
+#~ msgid "ninth"
+#~ msgstr "PriontАil"
+
+#, fuzzy
+#~ msgid "Send \"%s\""
+#~ msgstr "Post"
+
+#, fuzzy
+#~ msgid "Rebuild message view"
+#~ msgstr "_Post sceАl"
+
 #~ msgid "Clos_e All Items"
 #~ msgstr "_DЗn gach rud"
diff --git a/po/gl.po b/po/gl.po
index 86061dc9f7..51e01dc792 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -7,10 +7,11 @@
 #
 # First Version: 2000-04-07 22:14+0200
 #
+#: camel/providers/smtp/camel-smtp-transport.c:287
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2000-12-13 16:26-0600\n"
+"POT-Creation-Date: 2001-01-06 00:11+0100\n"
 "PO-Revision-Date: 2000-08-26 00:59+0200\n"
 "Last-Translator: JesЗs Bravo аlvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -280,10 +281,10 @@ msgstr ""
 #: addressbook/backend/ebook/load-pine-addressbook.c:17
 #: addressbook/backend/ebook/test-client-list.c:18
 #: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:991
+#: addressbook/conduit/address-conduit.c:1083
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1136
-#: calendar/conduits/todo/todo-conduit.c:945 calendar/gui/main.c:54
+#: calendar/conduits/calendar/calendar-conduit.c:1151
+#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "Non foi posible inicializar Bonobo"
 
@@ -408,53 +409,36 @@ msgstr ""
 "Ocorreu un erro С obter a lista de\n"
 "pilots do demo gnome-pilot"
 
-#: addressbook/conduit/address-conduit.c:197
+#: addressbook/conduit/address-conduit.c:195
 msgid "Cursor could not be loaded\n"
 msgstr "Non foi posible cargar o cursor\n"
 
-#: addressbook/conduit/address-conduit.c:210
+#: addressbook/conduit/address-conduit.c:208
 msgid "EBook not loaded\n"
 msgstr "EBook non cargado\n"
 
-#: addressbook/conduit/address-conduit.c:583
-#: calendar/conduits/calendar/calendar-conduit.c:715
-#: calendar/conduits/todo/todo-conduit.c:523
+#: addressbook/conduit/address-conduit.c:646
+#: calendar/conduits/calendar/calendar-conduit.c:730
+#: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat server"
 msgstr "Non foi posible iniciar o servidor wombat"
 
-#: addressbook/conduit/address-conduit.c:584
-#: calendar/conduits/calendar/calendar-conduit.c:716
-#: calendar/conduits/todo/todo-conduit.c:524
+#: addressbook/conduit/address-conduit.c:647
+#: calendar/conduits/calendar/calendar-conduit.c:731
+#: calendar/conduits/todo/todo-conduit.c:546
 msgid "Could not start wombat"
 msgstr "Non foi posible iniciar wombat"
 
-#: addressbook/conduit/address-conduit.c:616
-#: addressbook/conduit/address-conduit.c:619
+#: addressbook/conduit/address-conduit.c:679
+#: addressbook/conduit/address-conduit.c:682
 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 "categorМas"
-
-#: addressbook/contact-editor/categories-strings.h:8
-msgid "Item(s) belong to these categories:"
-msgstr "Elemento(s) pertencentes a estas categorМas:"
-
-#: addressbook/contact-editor/categories-strings.h:9
-msgid "Available Categories:"
-msgstr "CategorМas DispoЯibles:"
-
-#.
-#. * 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 "©Borrar Contacto?"
 
@@ -468,7 +452,7 @@ msgid "_Add"
 msgstr "_Engadir"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:48
+#: ui/evolution-event-editor.xml.h:108 ui/evolution-mail.xml.h:53
 msgid "_Delete"
 msgstr "_Borrar"
 
@@ -482,12 +466,13 @@ msgid "New phone type"
 msgstr "Novo tipo de telИfono"
 
 #.
-#. * 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 "Engadir"
 
@@ -528,7 +513,7 @@ msgid "_Mobile"
 msgstr "_MСbil"
 
 #: 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 "Correo ElectrСnico Principal"
 
@@ -545,7 +530,7 @@ msgid "C_ontacts..."
 msgstr "C_ontactos..."
 
 #: 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 "Ca_tegorМas..."
 
@@ -562,7 +547,8 @@ msgid "_Address..."
 msgstr "_Enderezo..."
 
 #: 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 "Xeral"
 
@@ -607,143 +593,143 @@ msgid "No_tes:"
 msgstr "No_tas:"
 
 #: 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 "Detalles"
 
-#: addressbook/contact-editor/e-contact-editor.c:1266
+#: addressbook/contact-editor/e-contact-editor.c:1274
 msgid "Assistant"
 msgstr "Asistente"
 
-#: 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 "Traballo"
 
-#: addressbook/contact-editor/e-contact-editor.c:1268
+#: addressbook/contact-editor/e-contact-editor.c:1276
 msgid "Business 2"
 msgstr "Traballo 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1269
+#: addressbook/contact-editor/e-contact-editor.c:1277
 msgid "Business Fax"
 msgstr "Fax do Traballo"
 
-#: 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 "AutomСbil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1272
+#: addressbook/contact-editor/e-contact-editor.c:1280
 msgid "Company"
 msgstr "CompaЯМa"
 
-#: 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 "Particular"
 
-#: addressbook/contact-editor/e-contact-editor.c:1274
+#: addressbook/contact-editor/e-contact-editor.c:1282
 msgid "Home 2"
 msgstr "Particular 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1275
+#: addressbook/contact-editor/e-contact-editor.c:1283
 msgid "Home Fax"
 msgstr "Fax Particular"
 
-#: addressbook/contact-editor/e-contact-editor.c:1276
+#: addressbook/contact-editor/e-contact-editor.c:1284
 msgid "ISDN"
 msgstr "RDSI"
 
-#: addressbook/contact-editor/e-contact-editor.c:1277
+#: addressbook/contact-editor/e-contact-editor.c:1285
 msgid "Mobile"
 msgstr "MСbil"
 
-#: 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 "Outro"
 
-#: addressbook/contact-editor/e-contact-editor.c:1279
+#: addressbook/contact-editor/e-contact-editor.c:1287
 msgid "Other Fax"
 msgstr "Outro Fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1280
+#: addressbook/contact-editor/e-contact-editor.c:1288
 msgid "Pager"
 msgstr "Localizador (Pager)"
 
-#: 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 "Radio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/contact-editor/e-contact-editor.c:1291
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/contact-editor/e-contact-editor.c:1292
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1329
+#: addressbook/contact-editor/e-contact-editor.c:1337
 msgid "Email 2"
 msgstr "Correo ElectrСnico 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1330
+#: addressbook/contact-editor/e-contact-editor.c:1338
 msgid "Email 3"
 msgstr "Correo ElectrСnico 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 "Enderezo _2:"
 
-#: po/tmp/fulladdr.glade.h:7
+#: addressbook/contact-editor/fulladdr.glade.h:7
 msgid "Canada"
 msgstr "CanadА"
 
-#: 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 "_PaМs:"
 
-#: po/tmp/fulladdr.glade.h:10
+#: addressbook/contact-editor/fulladdr.glade.h:10
 msgid "Finland"
 msgstr "Finlandia"
 
-#: po/tmp/fulladdr.glade.h:11
+#: addressbook/contact-editor/fulladdr.glade.h:11
 msgid "USA"
 msgstr "Estados Unidos"
 
-#: po/tmp/fulladdr.glade.h:12
+#: addressbook/contact-editor/fulladdr.glade.h:12
 msgid "_Address:"
 msgstr "_Enderezo:"
 
-#: po/tmp/fulladdr.glade.h:13
+#: addressbook/contact-editor/fulladdr.glade.h:13
 msgid "_City:"
 msgstr "_Cidade:"
 
-#: po/tmp/fulladdr.glade.h:14
+#: addressbook/contact-editor/fulladdr.glade.h:14
 msgid "_PO Box:"
 msgstr "_Apdo. de Correos:"
 
-#: po/tmp/fulladdr.glade.h:15
+#: addressbook/contact-editor/fulladdr.glade.h:15
 msgid "_State/Province:"
 msgstr "E_stado/Provincia:"
 
-#: po/tmp/fulladdr.glade.h:16
+#: addressbook/contact-editor/fulladdr.glade.h:16
 msgid "_ZIP Code:"
 msgstr "CСdigo _Postal:"
 
@@ -757,10 +743,13 @@ msgid "Check Full Name"
 msgstr ""
 
 #: addressbook/contact-editor/fullname-strings.h:8
+#, fuzzy
 msgid ""
 "\n"
 "Mr.\n"
 "Mrs.\n"
+"Ms.\n"
+"Miss\n"
 "Dr.\n"
 msgstr ""
 "\n"
@@ -773,7 +762,7 @@ msgstr ""
 "Dra.\n"
 "Prof.\n"
 
-#: addressbook/contact-editor/fullname-strings.h:13
+#: addressbook/contact-editor/fullname-strings.h:15
 msgid ""
 "\n"
 "Sr.\n"
@@ -790,44 +779,49 @@ msgstr ""
 "II\n"
 "III\n"
 
-#: addressbook/contact-editor/fullname-strings.h:21
+#: addressbook/contact-editor/fullname-strings.h:23
 msgid "_First:"
 msgstr "_Nome:"
 
-#: addressbook/contact-editor/fullname-strings.h:22
+#: addressbook/contact-editor/fullname-strings.h:24
 msgid "_Title:"
 msgstr "_Tratamento:"
 
-#: addressbook/contact-editor/fullname-strings.h:23
+#: addressbook/contact-editor/fullname-strings.h:25
 msgid "_Middle:"
 msgstr "_Outros nomes:"
 
-#: addressbook/contact-editor/fullname-strings.h:24
+#: addressbook/contact-editor/fullname-strings.h:26
 msgid "_Last:"
 msgstr "_Apelidos:"
 
-#: addressbook/contact-editor/fullname-strings.h:25
+#: addressbook/contact-editor/fullname-strings.h:27
 msgid "_Suffix:"
 msgstr "_Sufixo:"
 
-#: addressbook/gui/component/addressbook.c:263
+#: addressbook/gui/component/addressbook.c:231
 msgid "As _Minicards"
 msgstr "Como _Minitarxetas"
 
 #.
-#. * 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:269
-#: po/tmp/evolution-addressbook.xml.h:6
+#: addressbook/gui/component/addressbook.c:237
+#: ui/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr "Como unha _TАboa"
 
-#: addressbook/gui/component/addressbook.c:386
+#: addressbook/gui/component/addressbook.c:374
+#, fuzzy, c-format
+msgid "Enter password for %s"
+msgstr "Introduza o contrasinal NNTP para %s@%s"
+
+#: addressbook/gui/component/addressbook.c:402
 msgid "Unable to open addressbook"
 msgstr "Non se pode abrir o libro de enderezos"
 
-#: addressbook/gui/component/addressbook.c:391
+#: 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"
@@ -839,81 +833,211 @@ msgid ""
 "OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:501 mail/folder-browser.c:136
+#: addressbook/gui/component/addressbook.c:528 mail/folder-browser.c:219
 #, fuzzy
 msgid "Show All"
 msgstr "Ver Todos"
 
-#: addressbook/gui/component/addressbook.c:503 mail/folder-browser.c:138
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 msgid "Advanced..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:533
+#: addressbook/gui/component/addressbook.c:560
 #, fuzzy
 msgid "Any field contains"
 msgstr "O corpo contИn"
 
-#: addressbook/gui/component/addressbook.c:534
+#: addressbook/gui/component/addressbook.c:561
 #, fuzzy
 msgid "Name contains"
 msgstr "contИn"
 
-#: addressbook/gui/component/addressbook.c:535
+#: addressbook/gui/component/addressbook.c:562
 #, fuzzy
 msgid "Email contains"
 msgstr "contИn"
 
-#: addressbook/gui/component/addressbook.c:621
+#: addressbook/gui/component/addressbook.c:648
 msgid "The URI that the Folder Browser will display"
 msgstr "O URI que amosarА o navegador de carpetas"
 
-#: addressbook/gui/component/e-ldap-storage.c:88
-msgid "External Directories"
-msgstr "Directorios Externos"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/e-msg-composer-attachment.glade.h:7
-#: po/tmp/ldap-server-dialog.glade.h:6
-msgid "Description:"
-msgstr "DescriciСn:"
+#: addressbook/gui/component/addressbook-storage.c:95
+#, fuzzy
+msgid "Other Contacts"
+msgstr "_Novo Contacto"
 
-#: po/tmp/ldap-server-dialog.glade.h:7
-msgid "LDAP Server:"
+#: addressbook/gui/component/addressbook-config.c:139
+#, fuzzy
+msgid "LDAP Server"
 msgstr "Servidor LDAP:"
 
-#: po/tmp/ldap-server-dialog.glade.h:8
-msgid "Name:"
-msgstr "Nome:"
+#: addressbook/gui/component/addressbook-config.c:141
+#, fuzzy
+msgid "File"
+msgstr "_Ficheiro"
 
-#: po/tmp/ldap-server-dialog.glade.h:9
-msgid "Port Number:"
-msgstr "NЗmero de Porto:"
+#: addressbook/gui/component/addressbook-config.c:144
+#, fuzzy
+msgid "Unknown addressbook type"
+msgstr "Non se pode abrir o libro de enderezos"
+
+#: 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 "Contrasinal"
+
+#: addressbook/gui/component/addressbook-config.c:157
+msgid "SASL"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:160
+#, fuzzy
+msgid "Unknown auth type"
+msgstr "Erro descoЯecido"
+
+#: addressbook/gui/component/addressbook-config.c:169
+#, fuzzy
+msgid "Base"
+msgstr "Pegar"
+
+#: addressbook/gui/component/addressbook-config.c:171
+msgid "One"
+msgstr ""
 
-#: po/tmp/ldap-server-dialog.glade.h:10
+#: addressbook/gui/component/addressbook-config.c:173
+#, fuzzy
+msgid "Subtree"
+msgstr "Subscribir"
+
+#: 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 "Horas"
+
+#: addressbook/gui/component/addressbook-config.c:361
+#, fuzzy
+msgid "Port:"
+msgstr "Prioridade:"
+
+#: addressbook/gui/component/addressbook-config.c:364
 msgid "Root DN:"
 msgstr "DN RaМz:"
 
+#: addressbook/gui/component/addressbook-config.c:384
+#, fuzzy
+msgid "Search Scope:"
+msgstr "Buscar"
+
+#: addressbook/gui/component/addressbook-config.c:438
+#: mail/mail-config-druid.glade.h:14 mail/mail-config-gui.c:943
+msgid "Authentication:"
+msgstr "AutenticaciСn:"
+
+#: addressbook/gui/component/addressbook-config.c:455
+#: mail/mail-config-druid.glade.h:52 mail/mail-config-gui.c:934
+msgid "Path:"
+msgstr "CamiЯo:"
+
+#: addressbook/gui/component/addressbook-config.c:460
+#, fuzzy
+msgid "Create path if it doesn't exist."
+msgstr "O ficheiro non existe."
+
+#: addressbook/gui/component/addressbook-config.c:593
+#, fuzzy
+msgid "Edit Addressbook"
+msgstr "Gardar no libro de enderezos"
+
+#: addressbook/gui/component/addressbook-config.c:595
+#, fuzzy
+msgid "Add Addressbook"
+msgstr "Gardar no libro de enderezos"
+
+#: 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
+msgid "Name:"
+msgstr "Nome:"
+
+#: addressbook/gui/component/addressbook-config.c:617
+#: composer/e-msg-composer-attachment.glade.h:7
+msgid "Description:"
+msgstr "DescriciСn:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:7
+#, fuzzy
+msgid "Addressbook Sources"
+msgstr "Engadir Fonte"
+
+#: 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 "Eliminar"
+
+#: 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 "Editar"
+
+#: addressbook/gui/component/addressbook-config.glade.h:10
+#, fuzzy
+msgid "Name"
+msgstr "Nome:"
+
+#: 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 "Buscar..."
 
-#: 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 "Seleccionar un nome da Lista:"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:147
@@ -922,119 +1046,119 @@ msgid "Search"
 msgstr "Buscar"
 
 #.
-#. * 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 "a"
 
-#: po/tmp/alphabet.glade.h:8
+#: addressbook/gui/widgets/alphabet.glade.h:8
 msgid "b"
 msgstr "b"
 
-#: po/tmp/alphabet.glade.h:9
+#: addressbook/gui/widgets/alphabet.glade.h:9
 msgid "c"
 msgstr "c"
 
-#: po/tmp/alphabet.glade.h:10
+#: addressbook/gui/widgets/alphabet.glade.h:10
 msgid "d"
 msgstr "d"
 
-#: po/tmp/alphabet.glade.h:11
+#: addressbook/gui/widgets/alphabet.glade.h:11
 msgid "e"
 msgstr "e"
 
-#: po/tmp/alphabet.glade.h:12
+#: addressbook/gui/widgets/alphabet.glade.h:12
 msgid "f"
 msgstr "f"
 
-#: po/tmp/alphabet.glade.h:13
+#: addressbook/gui/widgets/alphabet.glade.h:13
 msgid "g"
 msgstr "g"
 
-#: calendar/cal-util/timeutil.c:100 po/tmp/alphabet.glade.h:14
+#: addressbook/gui/widgets/alphabet.glade.h:14
 msgid "h"
 msgstr "h"
 
-#: po/tmp/alphabet.glade.h:15
+#: addressbook/gui/widgets/alphabet.glade.h:15
 msgid "i"
 msgstr "i"
 
-#: po/tmp/alphabet.glade.h:16
+#: addressbook/gui/widgets/alphabet.glade.h:16
 msgid "j"
 msgstr "j"
 
-#: po/tmp/alphabet.glade.h:17
+#: addressbook/gui/widgets/alphabet.glade.h:17
 msgid "k"
 msgstr "k"
 
-#: po/tmp/alphabet.glade.h:18
+#: addressbook/gui/widgets/alphabet.glade.h:18
 msgid "l"
 msgstr "l"
 
-#: po/tmp/alphabet.glade.h:19
+#: addressbook/gui/widgets/alphabet.glade.h:19
 msgid "m"
 msgstr "m"
 
-#: po/tmp/alphabet.glade.h:20
+#: addressbook/gui/widgets/alphabet.glade.h:20
 msgid "n"
 msgstr "n"
 
-#: po/tmp/alphabet.glade.h:21
+#: addressbook/gui/widgets/alphabet.glade.h:21
 msgid "o"
 msgstr "o"
 
-#: po/tmp/alphabet.glade.h:22
+#: addressbook/gui/widgets/alphabet.glade.h:22
 msgid "p"
 msgstr "p"
 
-#: po/tmp/alphabet.glade.h:23
+#: addressbook/gui/widgets/alphabet.glade.h:23
 msgid "q"
 msgstr "q"
 
-#: po/tmp/alphabet.glade.h:24
+#: addressbook/gui/widgets/alphabet.glade.h:24
 msgid "r"
 msgstr "r"
 
-#: po/tmp/alphabet.glade.h:25
+#: addressbook/gui/widgets/alphabet.glade.h:25
 msgid "s"
 msgstr "s"
 
-#: po/tmp/alphabet.glade.h:26
+#: addressbook/gui/widgets/alphabet.glade.h:26
 msgid "t"
 msgstr "t"
 
-#: po/tmp/alphabet.glade.h:27
+#: addressbook/gui/widgets/alphabet.glade.h:27
 msgid "u"
 msgstr "u"
 
-#: po/tmp/alphabet.glade.h:28
+#: addressbook/gui/widgets/alphabet.glade.h:28
 msgid "v"
 msgstr "v"
 
-#: po/tmp/alphabet.glade.h:29
+#: addressbook/gui/widgets/alphabet.glade.h:29
 msgid "w"
 msgstr "w"
 
-#: po/tmp/alphabet.glade.h:30
+#: addressbook/gui/widgets/alphabet.glade.h:30
 msgid "x"
 msgstr "x"
 
-#: po/tmp/alphabet.glade.h:31
+#: addressbook/gui/widgets/alphabet.glade.h:31
 msgid "y"
 msgstr "y"
 
-#: po/tmp/alphabet.glade.h:32
+#: addressbook/gui/widgets/alphabet.glade.h:32
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:417
-#: addressbook/gui/widgets/e-minicard.c:338
+#: addressbook/gui/widgets/e-addressbook-view.c:451
+#: addressbook/gui/widgets/e-minicard.c:374
 msgid "Save as VCard"
 msgstr "Gardar como VCard"
 
@@ -1057,189 +1181,178 @@ msgstr ""
 "Faga dobre clic aquМ para crear un novo Contacto."
 
 #.
-#. * 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 "10 ptos. Tahoma"
 
-#: po/tmp/e-contact-print.glade.h:7
+#: addressbook/printing/e-contact-print.glade.h:7
 msgid "8 pt. Tahoma"
 msgstr "8 ptos. Tahoma"
 
-#: 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 "Corpo"
 
-#: po/tmp/e-contact-print.glade.h:10
+#: addressbook/printing/e-contact-print.glade.h:10
 msgid "Bottom:"
 msgstr "Inferior:"
 
-#: po/tmp/e-contact-print.glade.h:11
+#: addressbook/printing/e-contact-print.glade.h:11
 msgid "Dimensions:"
 msgstr "DimensiСns:"
 
-#: po/tmp/e-contact-print.glade.h:12
+#: addressbook/printing/e-contact-print.glade.h:12
 msgid "Font..."
 msgstr "Fonte..."
 
-#: po/tmp/e-contact-print.glade.h:13
+#: addressbook/printing/e-contact-print.glade.h:13
 msgid "Fonts"
 msgstr "Fontes"
 
-#: 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 "Formato"
 
-#: 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 "Cabeceiras"
 
-#: 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 "Altura:"
 
-#: 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 "Horizontal"
 
-#: po/tmp/e-contact-print.glade.h:24
+#: addressbook/printing/e-contact-print.glade.h:24
 msgid "Left:"
 msgstr "Esquerda:"
 
-#: po/tmp/e-contact-print.glade.h:25
+#: addressbook/printing/e-contact-print.glade.h:25
 msgid "Letter tabs on side"
 msgstr "Pestanas coas letras no lateral"
 
-#: po/tmp/e-contact-print.glade.h:26
+#: addressbook/printing/e-contact-print.glade.h:26
 msgid "Margins"
 msgstr "Marxes"
 
-#: po/tmp/e-contact-print.glade.h:27
+#: addressbook/printing/e-contact-print.glade.h:27
 msgid "Number of columns:"
 msgstr "NЗmero de columnas:"
 
-#: po/tmp/e-contact-print.glade.h:28
+#: addressbook/printing/e-contact-print.glade.h:28
 msgid "Options"
 msgstr "OpciСns"
 
-#: po/tmp/e-contact-print.glade.h:29
+#: addressbook/printing/e-contact-print.glade.h:29
 msgid "Orientation"
 msgstr "OrientaciСn"
 
-#: po/tmp/e-contact-print.glade.h:30
+#: addressbook/printing/e-contact-print.glade.h:30
 msgid "Page"
 msgstr "PАxina"
 
-#: po/tmp/e-contact-print.glade.h:31
+#: addressbook/printing/e-contact-print.glade.h:31
 msgid "Page Setup:"
 msgstr "ConfiguraciСn da PАxina:"
 
-#: po/tmp/e-contact-print.glade.h:32
+#: addressbook/printing/e-contact-print.glade.h:32
 msgid "Paper"
 msgstr "Papel"
 
-#: po/tmp/e-contact-print.glade.h:33
+#: addressbook/printing/e-contact-print.glade.h:33
 msgid "Paper source:"
 msgstr "Orixe do papel:"
 
-#: po/tmp/e-contact-print.glade.h:34
+#: addressbook/printing/e-contact-print.glade.h:34
 msgid "Portrait"
 msgstr "Vertical"
 
-#: po/tmp/e-contact-print.glade.h:35
+#: addressbook/printing/e-contact-print.glade.h:35
 msgid "Preview:"
 msgstr "PrevisualizaciСn:"
 
-#: po/tmp/e-contact-print.glade.h:36
+#: addressbook/printing/e-contact-print.glade.h:36
 msgid "Print using gray shading"
 msgstr "Imprimir usando sombreado gris"
 
-#: po/tmp/e-contact-print.glade.h:37
+#: addressbook/printing/e-contact-print.glade.h:37
 msgid "Reverse on even pages"
 msgstr "Invertir nas pАxinas pares"
 
-#: po/tmp/e-contact-print.glade.h:38
+#: addressbook/printing/e-contact-print.glade.h:38
 msgid "Right:"
 msgstr "Dereita:"
 
-#: po/tmp/e-contact-print.glade.h:39
+#: addressbook/printing/e-contact-print.glade.h:39
 msgid "Sections:"
 msgstr "SecciСns:"
 
-#: po/tmp/e-contact-print.glade.h:40
+#: addressbook/printing/e-contact-print.glade.h:40
 msgid "Shading"
 msgstr "Sombreado"
 
-#: po/tmp/e-contact-print.glade.h:41
+#: addressbook/printing/e-contact-print.glade.h:41
 msgid "Size:"
 msgstr "TamaЯo:"
 
-#: po/tmp/e-contact-print.glade.h:42
+#: addressbook/printing/e-contact-print.glade.h:42
 msgid "Start on a new page"
 msgstr "Iniciar nunha nova pАxina"
 
-#: po/tmp/e-contact-print.glade.h:43
+#: addressbook/printing/e-contact-print.glade.h:43
 msgid "Style name:"
 msgstr "Nome do estilo:"
 
-#: po/tmp/e-contact-print.glade.h:44
+#: addressbook/printing/e-contact-print.glade.h:44
 msgid "Top:"
 msgstr "Superior:"
 
-#: 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 "Tipo:"
 
-#: po/tmp/e-contact-print.glade.h:46
+#: addressbook/printing/e-contact-print.glade.h:46
 msgid "Width:"
 msgstr "Largura:"
 
-#: po/tmp/e-contact-print.glade.h:47
+#: addressbook/printing/e-contact-print.glade.h:47
 msgid "label26"
 msgstr "label26"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:550
-#: calendar/gui/e-week-view.c:288 calendar/gui/print.c:605
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:553
-#: calendar/gui/e-week-view.c:291 calendar/gui/print.c:604
-msgid "pm"
-msgstr "pm"
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 msgid "Evolution Calendar Conduit"
 msgstr "Conducto de Axenda de Evolution"
@@ -1248,13 +1361,13 @@ msgstr "Conducto de Axenda de Evolution"
 msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr "Utilidade de configuraciСn para o conducto de axenda de evolution.\n"
 
-#: calendar/conduits/calendar/calendar-conduit.c:671
-#: calendar/conduits/todo/todo-conduit.c:479
+#: calendar/conduits/calendar/calendar-conduit.c:686
+#: calendar/conduits/todo/todo-conduit.c:501
 msgid "Error while communicating with calendar server"
 msgstr "Erro comunicando co servidor de axenda"
 
-#: calendar/conduits/calendar/calendar-conduit.c:770
-#: calendar/conduits/calendar/calendar-conduit.c:773
+#: calendar/conduits/calendar/calendar-conduit.c:785
+#: calendar/conduits/calendar/calendar-conduit.c:788
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
@@ -1266,123 +1379,161 @@ msgstr ""
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr "Utilidade de configuraciСn para o conducto a-facer de evolution.\n"
 
-#: calendar/conduits/todo/todo-conduit.c:578
-#: calendar/conduits/todo/todo-conduit.c:581
+#: calendar/conduits/todo/todo-conduit.c:600
+#: calendar/conduits/todo/todo-conduit.c:603
 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:"
+#: 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:"
-msgstr "DМas baleiros:"
+#.
+#. * 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 "Citas:"
+#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:7
+#, fuzzy
+msgid "Calendar Server"
+msgstr "Axenda"
 
-#: calendar/gui/calendar-commands.c:64
-msgid "Highlighted day:"
-msgstr "DМa salientado:"
+#.
+#. * 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 "NЗmeros dos dМas:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Conducto de Axenda de Evolution"
 
-#: calendar/gui/calendar-commands.c:66
-msgid "Current day's number:"
-msgstr "NЗmero do dМa actual:"
+#: 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 "Utilidade de configuraciСn para o conducto de axenda de evolution.\n"
+
+#: 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 "Adiar"
+
+#. 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 "Aceptar"
+
+#: calendar/gui/calendar-commands.c:229
 msgid "File not found"
 msgstr "Ficheiro non atopado"
 
-#: calendar/gui/calendar-commands.c:378
+#: calendar/gui/calendar-commands.c:253
 msgid "Open calendar"
 msgstr "Abrir axenda"
 
-#: calendar/gui/calendar-commands.c:417
+#: calendar/gui/calendar-commands.c:295
 msgid "Save calendar"
 msgstr "Gardar axenda"
 
+#: 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:282
+#: 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:2498
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:286 calendar/gui/calendar-model.c:736
+#: calendar/gui/calendar-model.c:288 calendar/gui/calendar-model.c:738
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time,
 #. in 12-hour format.
-#: calendar/gui/calendar-model.c:290 calendar/gui/calendar-model.c:739
+#: calendar/gui/calendar-model.c:292 calendar/gui/calendar-model.c:741
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:344 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 "PЗblico"
 
-#: calendar/gui/calendar-model.c:347 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 "Privado"
 
-#: calendar/gui/calendar-model.c:350 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 "Confidencial"
 
-#: calendar/gui/calendar-model.c:353 calendar/gui/calendar-model.c:521
+#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:523
 msgid "Unknown"
 msgstr "DescoЯecido"
 
-#: calendar/gui/calendar-model.c:441
+#: calendar/gui/calendar-model.c:443
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:441
+#: calendar/gui/calendar-model.c:443
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:445
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:445
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:515
+#: calendar/gui/calendar-model.c:517
 msgid "Transparent"
 msgstr "Transparente"
 
-#: calendar/gui/calendar-model.c:518
+#: calendar/gui/calendar-model.c:520
 msgid "Opaque"
 msgstr "Opaco"
 
-#: calendar/gui/calendar-model.c:744
+#: calendar/gui/calendar-model.c:746
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1394,35 +1545,35 @@ msgstr ""
 "%s"
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:845 calendar/gui/calendar-model.c:893
+#: 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:1274 widgets/misc/e-dateedit.c:1455
+#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
 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:863
+#: 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:866
+#: 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:870
+#: 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:873
+#: calendar/gui/calendar-model.c:875
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
-#: calendar/gui/calendar-model.c:993
+#: calendar/gui/calendar-model.c:995
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1432,14 +1583,37 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1033
+#: calendar/gui/calendar-model.c:1035
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "A porcentaxe ten que ser un valor entre 0 e 100, inclusive"
 
-#: calendar/gui/calendar-model.c:1073
+#: calendar/gui/calendar-model.c:1075
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "A prioridade ten que estar entre 1 e 9, inclusive"
 
+#: calendar/gui/calendar-summary.c:81
+#, fuzzy
+msgid "%A, %e %B %Y"
+msgstr "%A, %d de %B de %Y"
+
+#: calendar/gui/calendar-summary.c:224
+#, fuzzy
+msgid "<b>Error loading calendar</b>"
+msgstr "Erro cargando o ficheiro: %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 "Imprimir axenda"
+
 #: calendar/gui/control-factory.c:125
 msgid "The URI that the calendar will display"
 msgstr "O URI que amosarА a axenda"
@@ -1457,350 +1631,402 @@ 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 "Pechar"
 
-#: po/tmp/alarm-notify.glade.h:7
+#: calendar/gui/dialogs/alarm-notify.glade.h:7
 msgid "Edit appointment"
 msgstr "Editar cita"
 
-#: calendar/gui/gnome-cal.c:1466 po/tmp/alarm-notify.glade.h:8
-msgid "Snooze"
-msgstr "Adiar"
-
-#: po/tmp/alarm-notify.glade.h:9
+#: calendar/gui/dialogs/alarm-notify.glade.h:9
 msgid "Snooze time (minutes)"
 msgstr "Tempo de adiamento (minutos)"
 
 #.
-#. * 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 minutos"
 
-#: po/tmp/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "10 minutes"
 msgstr "10 minutos"
 
-#: po/tmp/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "12 hour (am/pm)"
 msgstr "12 horas (am/pm)"
 
-#: po/tmp/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "15 minutes"
 msgstr "15 minutos"
 
-#: po/tmp/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "24 hour"
 msgstr "24 horas"
 
-#: po/tmp/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "30 minutes"
 msgstr "30 minutos"
 
-#: po/tmp/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "60 minutes"
 msgstr "60 minutos"
 
-#: 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 "Alarmas Sonoras"
 
-#: 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 "Axenda"
 
-#: po/tmp/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Calendar Preferences"
 msgstr "Preferencias da Axenda"
 
-#: po/tmp/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Colors"
 msgstr "Cores"
 
-#: 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 "Final do dМa:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:26
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "First day of week:"
 msgstr "Primeiro dМa da semana:"
 
-#: 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 "Ven"
 
-#: 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 "Venres"
 
-#: 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 "Lun"
 
-#: 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 "Luns"
 
-#: 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 "Prioridade"
 
-#: 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 "SАb"
 
-#: 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 "SАbado"
 
-#: 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 "Amosar nЗmeros de semana"
 
-#: po/tmp/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "Start of day:"
 msgstr "Inicio do dМa:"
 
 #. 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 "Dom"
 
-#: 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 "Domingo"
 
-#: 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 "Xov"
 
-#: 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 "Xoves"
 
-#: 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 "Formato da hora:"
 
-#: 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 "Mar"
 
-#: 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 "Martes"
 
-#: po/tmp/cal-prefs-dialog.glade.h:58
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "Visual Alarms"
 msgstr "Alarmas Visuais"
 
-#: 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 "MИr"
 
-#: 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 "MИrcores"
 
-#: 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 "segundos."
 
+#: calendar/gui/dialogs/delete-comp.c:62
+#, fuzzy, c-format
+msgid "Are you sure you want to delete the appointment `%s'?"
+msgstr ""
+"©EstА seguro de que quere\n"
+"borrar este contacto?"
+
+#: calendar/gui/dialogs/delete-comp.c:65
+#, fuzzy
+msgid "Are you sure you want to delete this untitled appointment?"
+msgstr ""
+"©EstА seguro de que quere\n"
+"borrar este contacto?"
+
+#: calendar/gui/dialogs/delete-comp.c:71
+#, fuzzy, c-format
+msgid "Are you sure you want to delete the task `%s'?"
+msgstr ""
+"©EstА seguro de que quere\n"
+"borrar este contacto?"
+
+#: calendar/gui/dialogs/delete-comp.c:74
+#, fuzzy
+msgid "Are you sure you want to delete this untitled task?"
+msgstr ""
+"©EstА seguro de que quere\n"
+"borrar este contacto?"
+
+#: calendar/gui/dialogs/delete-comp.c:80
+#, fuzzy, c-format
+msgid "Are you sure you want to delete the journal entry `%s'?"
+msgstr ""
+"©EstА seguro de que quere\n"
+"borrar este contacto?"
+
+#: calendar/gui/dialogs/delete-comp.c:83
+#, fuzzy
+msgid "Are you sure want to delete this untitled journal entry?"
+msgstr ""
+"©EstА seguro de que quere\n"
+"borrar este contacto?"
+
 #.
-#. * 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 "% Comp_leta:"
 
-#: po/tmp/task-editor-dialog.glade.h:7
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
 msgid "C_lassification:"
 msgstr "C_lasificaciСn:"
 
-#: po/tmp/task-editor-dialog.glade.h:9
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
 msgid "Cancelled"
 msgstr "Cancelada"
 
-#: po/tmp/task-editor-dialog.glade.h:10
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
 msgid "Completed"
 msgstr "Completada"
 
-#: 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 "Alta"
 
-#: po/tmp/task-editor-dialog.glade.h:15
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
 msgid "In Progress"
 msgstr "En Progreso"
 
-#: po/tmp/task-editor-dialog.glade.h:16
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
 msgid "Low"
 msgstr "Baixa"
 
 #. 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
-#: widgets/misc/e-dateedit.c:422 widgets/misc/e-dateedit.c:1331
-#: widgets/misc/e-dateedit.c:1446
+#: 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 "Normal"
 
-#: po/tmp/task-editor-dialog.glade.h:19
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
 msgid "Not Started"
 msgstr "Non Iniciada"
 
-#: po/tmp/task-editor-dialog.glade.h:22
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
 msgid "S_ummary"
 msgstr "_Resume"
 
-#: po/tmp/task-editor-dialog.glade.h:23
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
 msgid "Sta_rt Date:"
 msgstr "Data de _Inicio:"
 
-#: po/tmp/task-editor-dialog.glade.h:24
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
 msgid "Task"
 msgstr "Tarefa"
 
-#: 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 "_Contactos..."
 
-#: 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 "_Prioridade:"
 
-#: po/tmp/task-editor-dialog.glade.h:29
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
 msgid "_Status:"
 msgstr "_Estado:"
 
-#: po/tmp/task-editor-dialog.glade.h:30
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
 msgid "task-editor-dialog"
 msgstr "diАlogo-editor-tarefas"
 
@@ -1808,26 +2034,26 @@ msgstr "diАlogo-editor-tarefas"
 msgid "Edit Task"
 msgstr "Editar Tarefa"
 
-#: 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 "Sen resume"
 
-#: 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 "Cita - %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 "Tarefa - %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 ""
 
-#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3277
+#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3250
 msgid "Do you want to save changes?"
 msgstr ""
 
@@ -1847,14 +2073,6 @@ msgstr "Marcar como Completa"
 msgid "Mark the task complete"
 msgstr "Marcar a tarefa como completa"
 
-#: calendar/gui/e-calendar-table.c:342 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:479 mail/mail-view.c:165
-#: 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 "Eliminar"
-
 #: calendar/gui/e-calendar-table.c:343
 msgid "Delete the task"
 msgstr "Borrar a tarefa"
@@ -1866,50 +2084,62 @@ msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1208
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1211
 #: calendar/gui/e-week-view-main-item.c:325
 msgid "%A %d %B"
 msgstr "%A, %d de %B"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1222
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1225
 #: calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr "%a %d de %b"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1235
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1238
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d de %b"
 
-#: calendar/gui/e-day-view.c:2941 calendar/gui/e-day-view.c:2948
-#: calendar/gui/e-day-view.c:2957 calendar/gui/e-week-view.c:3165
-#: calendar/gui/e-week-view.c:3172 calendar/gui/e-week-view.c:3181
+#. 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:610
+msgid "am"
+msgstr "am"
+
+#. 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:609
+msgid "pm"
+msgstr "pm"
+
+#: calendar/gui/e-day-view.c:2948 calendar/gui/e-day-view.c:2955
+#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3169
+#: calendar/gui/e-week-view.c:3176 calendar/gui/e-week-view.c:3185
 msgid "New appointment..."
 msgstr "Nova cita..."
 
-#: calendar/gui/e-day-view.c:2945 calendar/gui/e-day-view.c:2952
-#: calendar/gui/e-week-view.c:3169 calendar/gui/e-week-view.c:3176
+#: calendar/gui/e-day-view.c:2952 calendar/gui/e-day-view.c:2959
+#: calendar/gui/e-week-view.c:3173 calendar/gui/e-week-view.c:3180
 msgid "Edit this appointment..."
 msgstr "Editar esta cita..."
 
-#: calendar/gui/e-day-view.c:2946 calendar/gui/e-week-view.c:3170
-#: po/tmp/evolution-event-editor.xml.h:20
+#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3174
+#: ui/evolution-event-editor.xml.h:20
 msgid "Delete this appointment"
 msgstr "Borrar esta cita"
 
-#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3177
+#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3181
 msgid "Make this appointment movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2954 calendar/gui/e-week-view.c:3178
+#: calendar/gui/e-day-view.c:2961 calendar/gui/e-week-view.c:3182
 msgid "Delete this occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3179
+#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3183
 msgid "Delete all occurrences"
 msgstr ""
 
@@ -1921,661 +2151,490 @@ msgid "%d %B"
 msgstr "%d de %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 "Evento de dМa _completo"
 
-#: 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 "ClasificaciСn"
 
-#: 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 "DМas"
 
-#: po/tmp/event-editor-dialog.glade.h:13
+#: calendar/gui/event-editor-dialog.glade.h:13
 msgid "Every"
 msgstr "Cada"
 
-#: po/tmp/event-editor-dialog.glade.h:14
+#: calendar/gui/event-editor-dialog.glade.h:14
 msgid "Exceptions"
 msgstr "ExcepciСns"
 
-#: po/tmp/event-editor-dialog.glade.h:16
+#: calendar/gui/event-editor-dialog.glade.h:16
 msgid "Hours"
 msgstr "Horas"
 
-#: po/tmp/event-editor-dialog.glade.h:17
+#: calendar/gui/event-editor-dialog.glade.h:17
 msgid "Mail _to:"
 msgstr "Enviar _a:"
 
-#: po/tmp/event-editor-dialog.glade.h:18
+#: calendar/gui/event-editor-dialog.glade.h:18
 msgid "Minutes"
 msgstr "Minutos"
 
-#: 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
 #, fuzzy
 msgid "Preview"
 msgstr "PrevisualizaciСn:"
 
-#: po/tmp/event-editor-dialog.glade.h:22
+#: calendar/gui/event-editor-dialog.glade.h:22
 msgid "Pri_vate"
 msgstr "Pri_vado"
 
-#: po/tmp/event-editor-dialog.glade.h:23
+#: calendar/gui/event-editor-dialog.glade.h:23
 msgid "Pu_blic"
 msgstr "PЗ_blico"
 
-#: 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 "_Resume:"
 
-#: po/tmp/event-editor-dialog.glade.h:29
+#: calendar/gui/event-editor-dialog.glade.h:29
 msgid "Time"
 msgstr "Hora"
 
-#: po/tmp/event-editor-dialog.glade.h:30
+#: calendar/gui/event-editor-dialog.glade.h:30
 msgid "_Audio"
 msgstr "_Audio"
 
-#: po/tmp/event-editor-dialog.glade.h:31
+#: calendar/gui/event-editor-dialog.glade.h:31
 msgid "_Confidential"
 msgstr "_Confidencial"
 
-#: po/tmp/event-editor-dialog.glade.h:32
+#: calendar/gui/event-editor-dialog.glade.h:32
 msgid "_Display"
 msgstr "_Visualizar"
 
-#: po/tmp/event-editor-dialog.glade.h:33
+#: calendar/gui/event-editor-dialog.glade.h:33
 msgid "_End time:"
 msgstr "Hora de _finalizaciСn:"
 
-#: po/tmp/event-editor-dialog.glade.h:34
+#: calendar/gui/event-editor-dialog.glade.h:34
 msgid "_Mail"
 msgstr "_Correo"
 
-#: po/tmp/event-editor-dialog.glade.h:35
+#: calendar/gui/event-editor-dialog.glade.h:35
 msgid "_Program"
 msgstr "_Programa"
 
-#: po/tmp/event-editor-dialog.glade.h:36
+#: calendar/gui/event-editor-dialog.glade.h:36
 msgid "_Run program:"
 msgstr "_Executar programa:"
 
-#: po/tmp/event-editor-dialog.glade.h:37
+#: calendar/gui/event-editor-dialog.glade.h:37
 msgid "_Start time:"
 msgstr "Hora de _comezo:"
 
-#: po/tmp/event-editor-dialog.glade.h:38
+#: calendar/gui/event-editor-dialog.glade.h:38
 msgid "_Starting date:"
 msgstr "Data de _comezo:"
 
-#: po/tmp/event-editor-dialog.glade.h:39
+#: calendar/gui/event-editor-dialog.glade.h:39
 msgid "day(s)"
 msgstr "dМa(s)"
 
-#: po/tmp/event-editor-dialog.glade.h:40
+#: calendar/gui/event-editor-dialog.glade.h:40
 msgid "event-editor-dialog"
 msgstr "diАlogo-editor-eventos"
 
-#: 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 "label21"
 
-#: po/tmp/event-editor-dialog.glade.h:44
+#: calendar/gui/event-editor-dialog.glade.h:44
 msgid "month(s)"
 msgstr "mes(es)"
 
-#: 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 "semana(s)"
 
-#: po/tmp/event-editor-dialog.glade.h:47
+#: calendar/gui/event-editor-dialog.glade.h:47
 msgid "year(s)"
 msgstr "ano(s)"
 
-#: calendar/gui/event-editor.c:329
+#: calendar/gui/event-editor.c:325
 msgid "Edit Appointment"
 msgstr "Editar Cita"
 
-#: calendar/gui/event-editor.c:407
+#: calendar/gui/event-editor.c:403
 msgid "on"
 msgstr ""
 
-#: calendar/gui/event-editor.c:432 calendar/gui/getdate.y:424
-#: filter/filter-datespec.c:65
+#: calendar/gui/event-editor.c:428 filter/filter-datespec.c:65
 msgid "day"
 msgstr "dМa"
 
-#: calendar/gui/event-editor.c:559
+#: calendar/gui/event-editor.c:555
 #, fuzzy
 msgid "on the"
 msgstr "mes"
 
-#: calendar/gui/event-editor.c:566
+#: calendar/gui/event-editor.c:562
 #, fuzzy
 msgid "th"
 msgstr "4"
 
-#: calendar/gui/event-editor.c:722
+#: calendar/gui/event-editor.c:716
 #, fuzzy
 msgid "occurrences"
 msgstr "Fontes"
 
-#: calendar/gui/event-editor.c:839
+#: calendar/gui/event-editor.c:833
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor.c:3079 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 "%a, %d de %b de %Y"
 
-#: calendar/gui/getdate.y:391
-msgid "january"
-msgstr "xaneiro"
+#: calendar/gui/gnome-cal.c:676
+#, c-format
+msgid "Could not load the calendar in `%s'"
+msgstr "Non foi posible cargar a axenda en `%s'"
 
-#: calendar/gui/getdate.y:392
-msgid "february"
-msgstr "febreiro"
+#: calendar/gui/gnome-cal.c:687
+#, c-format
+msgid "Could not create a calendar in `%s'"
+msgstr "Non foi posible crear un calendario en `%s'"
 
-#: calendar/gui/getdate.y:393
-msgid "march"
-msgstr "marzo"
+#: calendar/gui/gnome-cal.c:698
+#, c-format
+msgid "The method required to load `%s' is not supported"
+msgstr "O mИtodo requirido para cargar `%s' non estА soportado"
 
-#: calendar/gui/getdate.y:394
-msgid "april"
+#.
+#. * 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
+#, fuzzy
+msgid "April"
 msgstr "abril"
 
-#: calendar/gui/getdate.y:395
-msgid "may"
-msgstr "maio"
-
-#: calendar/gui/getdate.y:396
-msgid "june"
-msgstr "xuЯo"
-
-#: calendar/gui/getdate.y:397
-msgid "july"
-msgstr "xullo"
-
-#: calendar/gui/getdate.y:398
-msgid "august"
+#: calendar/gui/goto-dialog.glade.h:7
+#, fuzzy
+msgid "August"
 msgstr "agosto"
 
-#: calendar/gui/getdate.y:399
-msgid "september"
-msgstr "setembro"
-
-#: calendar/gui/getdate.y:400
-msgid "sept"
-msgstr "setem"
-
-#: calendar/gui/getdate.y:401
-msgid "october"
-msgstr "outubro"
-
-#: calendar/gui/getdate.y:402
-msgid "november"
-msgstr "novembro"
-
-#: calendar/gui/getdate.y:403
-msgid "december"
+#: calendar/gui/goto-dialog.glade.h:8
+#, fuzzy
+msgid "December"
 msgstr "decembro"
 
-#: calendar/gui/getdate.y:404
-msgid "sunday"
-msgstr "domingo"
-
-#: calendar/gui/getdate.y:405
-msgid "monday"
-msgstr "luns"
-
-#: calendar/gui/getdate.y:406
-msgid "tuesday"
-msgstr "martes"
-
-#: calendar/gui/getdate.y:407
-msgid "tues"
-msgstr "mart"
-
-#: calendar/gui/getdate.y:408
-msgid "wednesday"
-msgstr "mИrcores"
-
-#: calendar/gui/getdate.y:409
-msgid "wednes"
-msgstr "mИrcor"
-
-#: calendar/gui/getdate.y:410
-msgid "thursday"
-msgstr "xoves"
-
-#: calendar/gui/getdate.y:411
-msgid "thur"
-msgstr "xov"
-
-#: calendar/gui/getdate.y:412
-msgid "thurs"
-msgstr "xoves"
-
-#: calendar/gui/getdate.y:413
-msgid "friday"
-msgstr "venres"
-
-#: calendar/gui/getdate.y:414
-msgid "saturday"
-msgstr "sАbado"
-
-#: calendar/gui/getdate.y:420 filter/filter-datespec.c:62
-msgid "year"
-msgstr "ano"
-
-#: calendar/gui/getdate.y:421 filter/filter-datespec.c:63
-msgid "month"
-msgstr "mes"
-
-#: calendar/gui/getdate.y:422
-msgid "fortnight"
-msgstr "quincena"
-
-#: calendar/gui/getdate.y:423 filter/filter-datespec.c:64
-msgid "week"
-msgstr "semana"
-
-#: calendar/gui/getdate.y:425 filter/filter-datespec.c:66
-msgid "hour"
-msgstr "hora"
-
-#: calendar/gui/getdate.y:426 filter/filter-datespec.c:67
-msgid "minute"
-msgstr "minuto"
-
-#: calendar/gui/getdate.y:427
-msgid "min"
-msgstr "min"
-
-#: calendar/gui/getdate.y:428 filter/filter-datespec.c:68
-msgid "second"
-msgstr "segundo"
-
-#: calendar/gui/getdate.y:429
-msgid "sec"
-msgstr "seg"
-
-#: calendar/gui/getdate.y:435
-msgid "tomorrow"
-msgstr "maЯА"
-
-#: calendar/gui/getdate.y:436
-msgid "yesterday"
-msgstr "onte"
-
-#: calendar/gui/getdate.y:437
-msgid "today"
-msgstr "hoxe"
-
-#: calendar/gui/getdate.y:438 filter/filter-datespec.c:533
-#: filter/filter-datespec.c:693
-msgid "now"
-msgstr "agora"
-
-#: calendar/gui/getdate.y:439
-msgid "last"
-msgstr ""
-
-#: calendar/gui/getdate.y:440
-msgid "this"
-msgstr ""
-
-#: calendar/gui/getdate.y:441
-msgid "next"
-msgstr ""
-
-#: calendar/gui/getdate.y:442
-msgid "first"
-msgstr "primeiro"
-
-#. { N_("second"),		tUNUMBER,	2 },
-#: calendar/gui/getdate.y:444
-msgid "third"
-msgstr "terceiro"
-
-#: calendar/gui/getdate.y:445
-msgid "fourth"
-msgstr "cuarto"
-
-#: calendar/gui/getdate.y:446
-msgid "fifth"
-msgstr "quinto"
-
-#: calendar/gui/getdate.y:447
-msgid "sixth"
-msgstr "sexto"
-
-#: calendar/gui/getdate.y:448
-msgid "seventh"
-msgstr "sИtimo"
-
-#: calendar/gui/getdate.y:449
-msgid "eighth"
-msgstr "oitavo"
-
-#: calendar/gui/getdate.y:450
-msgid "ninth"
-msgstr "noveno"
-
-#: calendar/gui/getdate.y:451
-msgid "tenth"
-msgstr "dИcimo"
-
-#: calendar/gui/getdate.y:452
-msgid "eleventh"
-msgstr "dИcimo primeiro"
+#: calendar/gui/goto-dialog.glade.h:9
+#, fuzzy
+msgid "February"
+msgstr "febreiro"
 
-#: calendar/gui/getdate.y:453
-msgid "twelfth"
-msgstr "dИcimo segundo"
+#: calendar/gui/goto-dialog.glade.h:10
+#, fuzzy
+msgid "Go To Date"
+msgstr "Ir А data"
 
-#: calendar/gui/getdate.y:454
-msgid "ago"
-msgstr ""
+#: calendar/gui/goto-dialog.glade.h:11
+#, fuzzy
+msgid "Go To Today"
+msgstr "Ir a hoxe"
 
-#: calendar/gui/gnome-cal.c:718 calendar/gui/gnome-cal.c:1474
-#: calendar/gui/gnome-cal.c:1530
-msgid "Reminder of your appointment at "
-msgstr ""
+#: calendar/gui/goto-dialog.glade.h:12
+#, fuzzy
+msgid "January"
+msgstr "xaneiro"
 
-#: calendar/gui/gnome-cal.c:1152
-#, c-format
-msgid "Could not load the calendar in `%s'"
-msgstr "Non foi posible cargar a axenda en `%s'"
+#: calendar/gui/goto-dialog.glade.h:13
+#, fuzzy
+msgid "July"
+msgstr "xullo"
 
-#: calendar/gui/gnome-cal.c:1163
-#, c-format
-msgid "Could not create a calendar in `%s'"
-msgstr "Non foi posible crear un calendario en `%s'"
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "June"
+msgstr "xuЯo"
 
-#: calendar/gui/gnome-cal.c:1174
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr "O mИtodo requirido para cargar `%s' non estА soportado"
+#: calendar/gui/goto-dialog.glade.h:15
+#, fuzzy
+msgid "March"
+msgstr "marzo"
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1479 calendar/gui/gnome-cal.c:1534
-#: mail/mail-search-dialogue.c:104
-msgid "Ok"
-msgstr "Aceptar"
+#: calendar/gui/goto-dialog.glade.h:16
+#, fuzzy
+msgid "May"
+msgstr "Luns"
 
-#: calendar/gui/goto.c:82
-msgid "Year:"
-msgstr "Ano:"
+#: calendar/gui/goto-dialog.glade.h:17
+#, fuzzy
+msgid "November"
+msgstr "novembro"
 
-#: calendar/gui/goto.c:270
-msgid "Go to date"
-msgstr "Ir А data"
+#: calendar/gui/goto-dialog.glade.h:18
+#, fuzzy
+msgid "October"
+msgstr "outubro"
 
-#. Instructions
-#: calendar/gui/goto.c:281
-msgid ""
-"Please select the date you want to go to.\n"
-"When you click on a day, you will be taken\n"
-"to that date."
-msgstr ""
-"Seleccione a data А que quere ir.\n"
-"Cando prema nun dМa, serА levado a esa data."
+#: calendar/gui/goto-dialog.glade.h:19
+#, fuzzy
+msgid "September"
+msgstr "setembro"
 
-#: calendar/gui/goto.c:318
-msgid "Go to today"
-msgstr "Ir a hoxe"
+#: calendar/gui/main.c:49
+#, fuzzy
+msgid "Could not initialize GNOME"
+msgstr "Non foi posible inicializar Bonobo"
 
-#: 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 "Do"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Mo"
 msgstr "Lu"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Tu"
 msgstr "Ma"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "We"
 msgstr "Me"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Th"
 msgstr "Xo"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Fr"
 msgstr "Ve"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Sa"
 msgstr "Sa"
 
-#: calendar/gui/print.c:936
+#: calendar/gui/print.c:941
 msgid "Tasks"
 msgstr "Tarefas"
 
 #. Day
-#: calendar/gui/print.c:1066
+#: calendar/gui/print.c:1071
 msgid "Current day (%a %b %d %Y)"
 msgstr "DМa actual (%a, %d de %b de %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, %d de %b"
 
-#: calendar/gui/print.c:1081
+#: calendar/gui/print.c:1086
 msgid "%a %d %Y"
 msgstr "%a %d de %Y"
 
-#: calendar/gui/print.c:1092
+#: calendar/gui/print.c:1097
 #, c-format
 msgid "Current week (%s - %s)"
 msgstr "Semana actual (%s - %s)"
 
 # Isto estА mal, o %a И o nome de semana
 #. Month
-#: calendar/gui/print.c:1100
+#: calendar/gui/print.c:1105
 msgid "Current month (%b %Y)"
 msgstr "Mes actual (%b de %Y)"
 
 #. Year
-#: calendar/gui/print.c:1107
+#: calendar/gui/print.c:1112
 msgid "Current year (%Y)"
 msgstr "Ano actual (%Y)"
 
-#: calendar/gui/print.c:1144
+#: calendar/gui/print.c:1149
 msgid "Print Calendar"
 msgstr "Imprimir axenda"
 
-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:962
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1001
 msgid "Print Preview"
 msgstr "Previsualizar da ImpresiСn"
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: calendar/gui/weekday-picker.c:351 widgets/misc/e-calendar-item.c:416
-msgid "MTWTFSS"
-msgstr "LMMXVSD"
-
-#: calendar/gui/weekday-picker.c:353 calendar/gui/weekday-picker.c:443
+#: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
 msgid "SMTWTFS"
 msgstr "DLMMXVS"
 
@@ -2665,60 +2724,61 @@ msgstr "Non foi posible cargar %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:182
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:227
+#: camel/camel-remote-store.c:243
+#: camel/providers/smtp/camel-smtp-transport.c:162
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Non foi posible conectarse a %s (porto %d): %s"
 
-#: camel/camel-remote-store.c:228
+#: camel/camel-remote-store.c:244
 msgid "(unknown host)"
 msgstr "(mАquina descoЯecida)"
 
-#: camel/camel-remote-store.c:452
+#: camel/camel-remote-store.c:483
 msgid "Server disconnected."
 msgstr ""
 
-#: camel/camel-service.c:120
+#: camel/camel-service.c:138
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "O URL '%s' necesita unha parte co nome do usuario"
 
-#: camel/camel-service.c:129
+#: camel/camel-service.c:147
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "O URL '%s' necesita unha parte co nome de mАquina"
 
-#: camel/camel-service.c:138
+#: camel/camel-service.c:156
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "O URL '%s' necesita unha parte co camiЯo"
 
-#: camel/camel-service.c:488
+#: camel/camel-service.c:526
 #, c-format
 msgid "No such host %s."
 msgstr ""
 
-#: camel/camel-service.c:491
+#: camel/camel-service.c:529
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr ""
 
-#: camel/camel-session.c:272
+#: camel/camel-session.c:297
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Non hai ningЗn fornecedor dispoЯible para o protocolo `%s'"
 
-#: camel/camel-session.c:360
+#: camel/camel-session.c:388
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2742,52 +2802,52 @@ msgstr "O URL `%s' contИn un protocolo non vАlido"
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "O nЗmero de porto no URL `%s' non И numИrico"
 
-#: camel/providers/imap/camel-imap-auth.c:127
+#: camel/providers/imap/camel-imap-auth.c:133
 #, fuzzy, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
 "%s"
 msgstr "Non foi posible crear unha canalizaciСn: %s"
 
-#: camel/providers/imap/camel-imap-auth.c:198
+#: camel/providers/imap/camel-imap-auth.c:205
 #, fuzzy
 msgid "Bad authentication response from server."
 msgstr "Resposta non agardada do servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:216
+#: camel/providers/imap/camel-imap-command.c:231
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Resposta non agardada do servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:224
+#: camel/providers/imap/camel-imap-command.c:239
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "O comando IMAP fallou: %s"
 
-#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:240 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "Erro descoЯecido"
 
-#: camel/providers/imap/camel-imap-command.c:271
+#: camel/providers/imap/camel-imap-command.c:286
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:407
+#: camel/providers/imap/camel-imap-command.c:422
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:443
+#: camel/providers/imap/camel-imap-command.c:458
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:216
+#: 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:586
+#: camel/providers/imap/camel-imap-folder.c:532
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -2799,33 +2859,27 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:234
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:148
-msgid "Password"
-msgstr "Contrasinal"
-
-#: camel/providers/imap/camel-imap-store.c:236
+#: camel/providers/imap/camel-imap-store.c:248
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Esta opciСn conectarase С servidor IMAP usando un contrasinal sen cifrar."
 
-#: camel/providers/imap/camel-imap-store.c:245
+#: camel/providers/imap/camel-imap-store.c:257
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/providers/imap/camel-imap-store.c:247
+#: camel/providers/imap/camel-imap-store.c:259
 msgid ""
 "This option will connect to the IMAP server using Kerberos 4 authentication."
 msgstr ""
 "Esta opciСn conectarase С servidor IMAP usando autenticaciСn Kerberos 4."
 
-#: camel/providers/imap/camel-imap-store.c:333
+#: camel/providers/imap/camel-imap-store.c:345
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sIntroduza o contrasinal IMAP para %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:359
+#: camel/providers/imap/camel-imap-store.c:373
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2836,7 +2890,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:539
+#: camel/providers/imap/camel-imap-store.c:564
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Non foi posible crear o directorio %s: %s"
@@ -2921,12 +2975,12 @@ msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Non И posible engadir a mensaxe А carpeta mh: %s"
 
 #: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:204
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-maildir-folder.c:207
+#: camel/providers/local/camel-maildir-folder.c:215
+#: camel/providers/local/camel-mbox-folder.c:317
 #: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:189
-#: camel/providers/local/camel-mh-folder.c:197
+#: camel/providers/local/camel-mh-folder.c:192
+#: camel/providers/local/camel-mh-folder.c:200
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -2936,14 +2990,14 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-mbox-folder.c:317
 #: camel/providers/local/camel-mh-folder.c:183
 #, fuzzy
 msgid "No such message"
 msgstr "Re-enviar esta mensaxe"
 
-#: camel/providers/local/camel-maildir-folder.c:213
-#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-maildir-folder.c:216
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "Invalid message contents"
 msgstr ""
 
@@ -2991,19 +3045,19 @@ msgstr "Non foi posible borrar a carpeta `%s': %s"
 msgid "not a maildir directory"
 msgstr "`%s' non И un directorio."
 
-#: camel/providers/local/camel-mbox-folder.c:195
+#: camel/providers/local/camel-mbox-folder.c:201
 #, fuzzy, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Non И posible abrir a caixa de correo temporal: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:251
+#: camel/providers/local/camel-mbox-folder.c:257
 #, fuzzy, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Non И posible engadir a mensaxe А carpeta mh: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:327
-#: camel/providers/local/camel-mbox-folder.c:357
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:333
+#: camel/providers/local/camel-mbox-folder.c:365
+#: camel/providers/local/camel-mbox-folder.c:378
 #, fuzzy, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -3012,11 +3066,11 @@ msgstr ""
 "Non И posible obter a mensaxe: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:358
+#: camel/providers/local/camel-mbox-folder.c:366
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:369
+#: camel/providers/local/camel-mbox-folder.c:379
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -3071,58 +3125,58 @@ msgstr ""
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:341
+#: camel/providers/local/camel-mbox-summary.c:343
 #, fuzzy, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "Non И posible facer un fork a %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:475
-#: camel/providers/local/camel-mbox-summary.c:661
+#: camel/providers/local/camel-mbox-summary.c:477
+#: camel/providers/local/camel-mbox-summary.c:668
 #, fuzzy, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
 "Non И posible abrir a carpeta `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:491
+#: camel/providers/local/camel-mbox-summary.c:493
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Non И posible abrir a caixa de correo temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:512
-#: camel/providers/local/camel-mbox-summary.c:520
-#: camel/providers/local/camel-mbox-summary.c:691
-#: camel/providers/local/camel-mbox-summary.c:699
+#: camel/providers/local/camel-mbox-summary.c:514
+#: camel/providers/local/camel-mbox-summary.c:522
+#: camel/providers/local/camel-mbox-summary.c:701
+#: camel/providers/local/camel-mbox-summary.c:709
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:562
+#: camel/providers/local/camel-mbox-summary.c:565
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Erro escribindo А caixa de correo temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:579
+#: camel/providers/local/camel-mbox-summary.c:582
 #, fuzzy, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Erro escribindo А caixa de correo temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:595
-#: camel/providers/local/camel-mbox-summary.c:748
+#: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-mbox-summary.c:759
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Non foi posible pechar a carpeta orixe %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:604
+#: camel/providers/local/camel-mbox-summary.c:609
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Non foi posible pechar a carpeta temporal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:615
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Non foi posible renomear a carpeta: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:817
+#: camel/providers/local/camel-mbox-summary.c:830
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Erro descoЯecido: %s"
@@ -3155,7 +3209,7 @@ msgstr ""
 msgid "Server rejected username/password"
 msgstr "O servidor rexeitou o nome de usuario/contrasinal"
 
-#: camel/providers/nntp/camel-nntp-folder.c:144
+#: camel/providers/nntp/camel-nntp-folder.c:115
 #, c-format
 msgid "Message %s not found."
 msgstr "Mensaxe %s non atopada."
@@ -3206,16 +3260,16 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Non foi posible abrir ou crear o ficheiro .newsrc para %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:179
+#: camel/providers/pop3/camel-pop3-folder.c:180
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:273
+#: camel/providers/pop3/camel-pop3-folder.c:274
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:288
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Non foi posible recibir a mensaxe do servidor POP %s: %s"
@@ -3262,17 +3316,17 @@ msgstr ""
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Non foi posible autenticarse co servidor KPOP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:335
+#: camel/providers/pop3/camel-pop3-store.c:337
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Non foi posible conectarse С servidor POP en %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:389
+#: camel/providers/pop3/camel-pop3-store.c:391
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sIntroduza o contrasinal POP3 para %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:408
+#: camel/providers/pop3/camel-pop3-store.c:410
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3281,12 +3335,12 @@ msgstr ""
 "Non foi posible conectarse С servidor POP.\n"
 "Erro enviando o nome de usuario: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:411
-#: camel/providers/pop3/camel-pop3-store.c:448
+#: camel/providers/pop3/camel-pop3-store.c:413
+#: camel/providers/pop3/camel-pop3-store.c:450
 msgid "(Unknown)"
 msgstr "(DescoЯecido)"
 
-#: camel/providers/pop3/camel-pop3-store.c:438
+#: camel/providers/pop3/camel-pop3-store.c:440
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -3294,7 +3348,7 @@ msgstr ""
 "Non foi posible conectarse С servidor POP.\n"
 "Non se soporta o mecanismo de autenticaciСn solicitado."
 
-#: camel/providers/pop3/camel-pop3-store.c:446
+#: camel/providers/pop3/camel-pop3-store.c:448
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3303,12 +3357,13 @@ msgstr ""
 "Non foi posible conectarse С servidor POP.\n"
 "Erro enviando o contrasinal: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:555
+#: camel/providers/pop3/camel-pop3-store.c:557
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Non existe a carpeta `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
+#: mail/mail-config-druid.glade.h:63
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -3359,8 +3414,140 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Entrega de correo a travИs do programa sendmail"
 
+#: camel/providers/smtp/camel-smtp-provider.c:34
+#: mail/mail-config-druid.glade.h:59
+msgid "SMTP"
+msgstr "SMTP"
+
 #: 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
+#, c-format
+msgid "Welcome response error: %s: possibly non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:281
+#, fuzzy
+msgid "No authentication required"
+msgstr "AutenticaciСn"
+
+#: camel/providers/smtp/camel-smtp-transport.c:283
+#, fuzzy
+msgid ""
+"This option will connect to the SMTP server without using any kind of "
+"authentication. This should be fine for connecting to most SMTP servers."
+msgstr ""
+"Esta opciСn conectarase С servidor POP usando un contrasinal sen cifrar. "
+"Esta И a Зnica opciСn que soportan moitos servidores POP."
+
+#: 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 ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:294
+#, fuzzy
+msgid ""
+"This option will connect to the SMTP server using CRAM-MD5 authentication."
+msgstr ""
+"Esta opciСn conectarase С servidor IMAP usando autenticaciСn Kerberos 4."
+
+#: camel/providers/smtp/camel-smtp-transport.c:332
+#, c-format
+msgid "SMTP server %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:334
+#, fuzzy, c-format
+msgid "SMTP mail delivery via %s"
+msgstr "Entrega de correo a travИs do programa sendmail"
+
+#: camel/providers/smtp/camel-smtp-transport.c:359
+msgid "Cannot send message: sender address not defined."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:366
+msgid "Cannot send message: sender address not valid."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:380
+msgid "Cannot send message: no recipients defined."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:474
+#, c-format
+msgid "HELO request timed out: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:490
+#, c-format
+msgid "HELO response error: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:529
+#, c-format
+msgid "MAIL FROM request timed out: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:545
+#, c-format
+msgid "MAIL FROM response error: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:570
+#, fuzzy, c-format
+msgid "RCPT TO request timed out: %s: mail not sent"
+msgstr ""
+"Non foi posible crear unha canalizaciСn para o sendmail: %s: correo non "
+"enviado"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
+#, fuzzy, c-format
+msgid "RCPT TO response error: %s: mail not sent"
+msgstr "Non foi posible executar %s: correo non enviado."
+
+#: camel/providers/smtp/camel-smtp-transport.c:617
+#, fuzzy, c-format
+msgid "DATA request timed out: %s: mail not sent"
+msgstr "Non foi posible executar %s: correo non enviado."
+
+#: camel/providers/smtp/camel-smtp-transport.c:633
+#, fuzzy, c-format
+msgid "DATA response error: %s: mail not sent"
+msgstr "Non foi posible facer fork para o sendmail: %s: correo non enviado"
+
+#: camel/providers/smtp/camel-smtp-transport.c:648
+#: camel/providers/smtp/camel-smtp-transport.c:666
+#, fuzzy, c-format
+msgid "DATA send timed out: message termination: %s: mail not sent"
+msgstr "o sendmail saМu co sinal %s: correo non enviado."
+
+#: camel/providers/smtp/camel-smtp-transport.c:682
+#, c-format
+msgid "DATA response error: message termination: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:706
+#, c-format
+msgid "RSET request timed out: %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:722
+#, fuzzy, c-format
+msgid "RSET response error: %s"
+msgstr "Erro descoЯecido: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:745
+#, c-format
+msgid "QUIT request timed out: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#, c-format
+msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
 #: camel/providers/vee/camel-vee-provider.c:30
@@ -3396,82 +3583,82 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:144
+#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:155
 msgid "attachment"
 msgstr "anexo"
 
-#: composer/e-msg-composer-attachment-bar.c:417
-#: 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 "IncluМr un ficheiro"
 
-#: composer/e-msg-composer-attachment-bar.c:464 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 "Quitar"
 
-#: composer/e-msg-composer-attachment-bar.c:465
+#: composer/e-msg-composer-attachment-bar.c:461
 msgid "Remove selected items from the attachment list"
 msgstr "Quitar os elementos seleccionados da lista de anexos"
 
-#: composer/e-msg-composer-attachment-bar.c:496
+#: composer/e-msg-composer-attachment-bar.c:492
 msgid "Add attachment..."
 msgstr "Engadir anexo..."
 
-#: composer/e-msg-composer-attachment-bar.c:497
+#: composer/e-msg-composer-attachment-bar.c:493
 msgid "Attach a file to the message"
 msgstr "IncluМr un ficheiro como anexo na mensaxe"
 
 #.
-#. * 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 "Propiedades do anexo"
 
-#: po/tmp/e-msg-composer-attachment.glade.h:8
+#: composer/e-msg-composer-attachment.glade.h:8
 msgid "File name:"
 msgstr "Nome de ficheiro:"
 
-#: po/tmp/e-msg-composer-attachment.glade.h:9
+#: composer/e-msg-composer-attachment.glade.h:9
 msgid "MIME type:"
 msgstr "Tipo MIME:"
 
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:290
-#: mail/mail-format.c:621
+#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:303
+#: mail/mail-format.c:626
 msgid "From:"
 msgstr "De:"
 
-#: composer/e-msg-composer-hdrs.c:238
+#: composer/e-msg-composer-hdrs.c:247
 msgid "Click here for the address book"
 msgstr "Prema aquМ para o libro de enderezos"
 
-#: composer/e-msg-composer-hdrs.c:291
+#: composer/e-msg-composer-hdrs.c:304
 msgid "Enter the identity you wish to send this message from"
 msgstr "Introduza a identidade coa que desexa enviar esta mensaxe"
 
-#: composer/e-msg-composer-hdrs.c:295 mail/mail-format.c:625
+#: composer/e-msg-composer-hdrs.c:308 mail/mail-format.c:630
 msgid "To:"
 msgstr "A:"
 
-#: composer/e-msg-composer-hdrs.c:296
+#: composer/e-msg-composer-hdrs.c:309
 msgid "Enter the recipients of the message"
 msgstr "Introduza os destinatarios da mensaxe"
 
-#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:627
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:632
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:301
+#: composer/e-msg-composer-hdrs.c:314
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Introduza os enderezos que recibirАn unha copia da mensaxe"
 
-#: composer/e-msg-composer-hdrs.c:306
+#: composer/e-msg-composer-hdrs.c:319
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:307
+#: 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."
@@ -3479,15 +3666,15 @@ msgstr ""
 "Introduza os enderezos que recibirАn unha copia da mensaxe sen apareceren na "
 "lista de destinatarios."
 
-#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:629
+#: composer/e-msg-composer-hdrs.c:326 mail/mail-format.c:634
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Enter the subject of the mail"
 msgstr "Introduza o asunto da mensaxe"
 
-#: composer/e-msg-composer.c:429
+#: composer/e-msg-composer.c:430
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -3496,38 +3683,38 @@ msgstr ""
 "Non foi posible abrir o ficheiro de sinatura %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:599
+#: composer/e-msg-composer.c:600
 msgid "Save as..."
 msgstr "Gardar como..."
 
-#: composer/e-msg-composer.c:610
+#: composer/e-msg-composer.c:611
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erro gardando o ficheiro: %s"
 
-#: composer/e-msg-composer.c:630
+#: composer/e-msg-composer.c:631
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erro cargando o ficheiro: %s"
 
-#: composer/e-msg-composer.c:652
+#: composer/e-msg-composer.c:653
 msgid "Saving changes to message..."
 msgstr "Gardando as modificaciСns da mensaxe..."
 
-#: composer/e-msg-composer.c:654
+#: composer/e-msg-composer.c:655
 msgid "Save changes to message..."
 msgstr "Gardar as modificaciСns da mensaxe..."
 
-#: composer/e-msg-composer.c:695
+#: composer/e-msg-composer.c:696
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:739 shell/e-shell-view-menu.c:170
+#: composer/e-msg-composer.c:741 shell/e-shell-view-menu.c:167
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:745
+#: composer/e-msg-composer.c:747
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3537,27 +3724,27 @@ msgstr ""
 "\n"
 "©Desexa gardar os cambios?"
 
-#: composer/e-msg-composer.c:767
+#: composer/e-msg-composer.c:772
 msgid "Open file"
 msgstr "Abrir ficheiro"
 
-#: composer/e-msg-composer.c:893
+#: composer/e-msg-composer.c:898
 msgid "That file does not exist."
 msgstr "O ficheiro non existe."
 
-#: composer/e-msg-composer.c:903
+#: composer/e-msg-composer.c:908
 msgid "That is not a regular file."
 msgstr "Non И un ficheiro normal."
 
-#: composer/e-msg-composer.c:913
+#: composer/e-msg-composer.c:918
 msgid "That file exists but is not readable."
 msgstr "O ficheiro existe pero non se pode ler."
 
-#: composer/e-msg-composer.c:923
+#: composer/e-msg-composer.c:928
 msgid "That file appeared accesible but open(2) failed."
 msgstr "O ficheiro parecМa accesible pero a chamada a open(2) fallou."
 
-#: composer/e-msg-composer.c:945
+#: composer/e-msg-composer.c:950
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3565,15 +3752,15 @@ msgstr ""
 "O ficheiro И moi longo (mАis de 100K).\n"
 "©EstА seguro de querer inserilo?"
 
-#: composer/e-msg-composer.c:966
+#: composer/e-msg-composer.c:971
 msgid "An error occurred while reading the file."
 msgstr "Ocorreu un erro lendo o ficheiro."
 
-#: composer/e-msg-composer.c:1343
+#: composer/e-msg-composer.c:1350
 msgid "Compose a message"
 msgstr "CompoЯer unha mensaxe"
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1427
 msgid "Could not create composer window."
 msgstr ""
 
@@ -3587,14 +3774,26 @@ msgid "Sear_ch"
 msgstr "Buscar"
 
 #: filter/filter-datespec.c:62
+msgid "year"
+msgstr "ano"
+
+#: filter/filter-datespec.c:62
 msgid "years"
 msgstr "anos"
 
 #: filter/filter-datespec.c:63
+msgid "month"
+msgstr "mes"
+
+#: filter/filter-datespec.c:63
 msgid "months"
 msgstr "meses"
 
 #: filter/filter-datespec.c:64
+msgid "week"
+msgstr "semana"
+
+#: filter/filter-datespec.c:64
 msgid "weeks"
 msgstr "semanas"
 
@@ -3603,14 +3802,26 @@ msgid "days"
 msgstr "dМas"
 
 #: filter/filter-datespec.c:66
+msgid "hour"
+msgstr "hora"
+
+#: filter/filter-datespec.c:66
 msgid "hours"
 msgstr "horas"
 
 #: filter/filter-datespec.c:67
+msgid "minute"
+msgstr "minuto"
+
+#: filter/filter-datespec.c:67
 msgid "minutes"
 msgstr "minutos"
 
 #: filter/filter-datespec.c:68
+msgid "second"
+msgstr "segundo"
+
+#: filter/filter-datespec.c:68
 msgid "seconds"
 msgstr "segundos"
 
@@ -3660,6 +3871,10 @@ msgstr "unha relativa С momento actual"
 msgid "Compare against"
 msgstr ""
 
+#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
+msgid "now"
+msgstr "agora"
+
 #: filter/filter-datespec.c:690
 msgid "<click here to select a date>"
 msgstr "<prema aquМ para seleccionar unha data>"
@@ -3685,7 +3900,7 @@ msgstr ""
 "Entrante\n"
 "SaМnte\n"
 
-#: 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 "Editar Filtros"
 
@@ -3720,7 +3935,7 @@ msgstr "Introduza o URI da carpeta"
 msgid "<click here to select a folder>"
 msgstr "<prema aquМ para seleccionar unha carpeta>"
 
-#: filter/filter-input.c:184
+#: filter/filter-input.c:185
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -3729,241 +3944,252 @@ msgstr ""
 "Erro na expresiСn regular '%s':\n"
 "%s"
 
-#: filter/filter-message-search.c:379 filter/filter-message-search.c:447
+#: filter/filter-message-search.c:380 filter/filter-message-search.c:448
 #, c-format
 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:520
+#: filter/filter-rule.c:530
 msgid "Rule name: "
 msgstr "Nome da regra: "
 
-#: filter/filter-rule.c:524
+#: filter/filter-rule.c:534
 msgid "Untitled"
 msgstr "Sen_tМtulo"
 
-#: filter/filter-rule.c:540
+#: filter/filter-rule.c:550
 msgid "If"
 msgstr "Se"
 
-#: filter/filter-rule.c:557
+#: filter/filter-rule.c:567
 msgid "Execute actions"
 msgstr "Executar acciСns"
 
-#: filter/filter-rule.c:561
+#: filter/filter-rule.c:571
 msgid "if all criteria are met"
 msgstr "se se cumpren tСdolos criterios"
 
-#: filter/filter-rule.c:566
+#: filter/filter-rule.c:576
 msgid "if any criteria are met"
 msgstr "se se cumpre algЗn criterio"
 
-#: filter/filter-rule.c:577
+#: filter/filter-rule.c:587
 msgid "Add criterion"
 msgstr "Engadir criterio"
 
-#: filter/filter-rule.c:583
+#: filter/filter-rule.c:593
 msgid "Remove criterion"
 msgstr "Eliminar criterio"
 
-#: mail/folder-browser.c:465 po/tmp/filter.glade.h:8
-#: po/tmp/mail-config.glade.h:9
-msgid "Edit"
-msgstr "Editar"
+#: filter/filter-system-flag.c:63
+#, fuzzy
+msgid "Replied to"
+msgstr "Responder a Todos"
 
-#: po/tmp/filter.glade.h:10
+#. { _("Deleted"), "Deleted" },
+#. { _("Draft"), "Draft" },
+#: filter/filter-system-flag.c:66
+msgid "Important"
+msgstr ""
+
+#: filter/filter-system-flag.c:67
+#, fuzzy
+msgid "Read"
+msgstr "Refacer"
+
+#: filter/filter.glade.h:10
 msgid "Edit VFolders"
 msgstr ""
 
-#: po/tmp/filter.glade.h:11
+#: filter/filter.glade.h:11
 msgid "Filter Rules"
 msgstr "Reglas de Filtrado"
 
-#: po/tmp/filter.glade.h:12
+#: filter/filter.glade.h:12
 #, fuzzy
 msgid "Incoming"
 msgstr ""
 "Entrante\n"
 "SaМnte\n"
 
-#: po/tmp/filter.glade.h:13
+#: filter/filter.glade.h:13
 #, fuzzy
 msgid "Outgoing"
 msgstr ""
 "Entrante\n"
 "SaМnte\n"
 
-#: po/tmp/filter.glade.h:15
+#: filter/filter.glade.h:15
 msgid "Virtual Folders"
 msgstr "Carpetas Virtuais"
 
-#: po/tmp/filter.glade.h:16
+#: filter/filter.glade.h:16
 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 "Asignar Cor"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Asignar PuntuaciСn"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
+msgid "before"
+msgstr ""
+
+#: filter/libfilter-i18n.h:6
+msgid "contains"
+msgstr "contИn"
+
+#: filter/libfilter-i18n.h:7
 msgid "Copy to Folder"
 msgstr "Copiar А Carpeta"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "Data de recepciСn"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "Data de envМo"
 
-#: filter/libfilter-i18n.h:8
-msgid "Expression"
-msgstr "ExpresiСn"
-
-#: filter/libfilter-i18n.h:9
-msgid "Forward to Address"
-msgstr "Reenviar С Enderezo"
-
-#: filter/libfilter-i18n.h:10
-msgid "Message Body"
-msgstr "Corpo da Mensaxe"
-
 #: filter/libfilter-i18n.h:11
-#, fuzzy
-msgid "Message Header"
-msgstr "Corpo da Mensaxe"
+msgid "does not contain"
+msgstr "non contИn"
 
 #: filter/libfilter-i18n.h:12
-msgid "Message was received"
-msgstr ""
+msgid "does not end with"
+msgstr "non termina en"
 
 #: filter/libfilter-i18n.h:13
-msgid "Message was sent"
-msgstr ""
+msgid "does not exist"
+msgstr "non existe"
 
 #: filter/libfilter-i18n.h:14
-msgid "Move to Folder"
-msgstr "Mover para a Carpeta"
+msgid "does not sound like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:15
+msgid "does not start with"
+msgstr "non empeza por"
 
 #: filter/libfilter-i18n.h:16
-msgid "Recipients"
-msgstr "Destinatarios"
+msgid "ends with"
+msgstr "termina en"
 
 #: filter/libfilter-i18n.h:17
-msgid "Regex Match"
-msgstr ""
+msgid "exists"
+msgstr "existe"
 
 #: filter/libfilter-i18n.h:18
-msgid "Sender"
-msgstr "Autor"
+msgid "Expression"
+msgstr "ExpresiСn"
 
 #: filter/libfilter-i18n.h:19
-#, fuzzy
-msgid "Set Status"
-msgstr "_Estado:"
+msgid "Forward to Address"
+msgstr "Reenviar С Enderezo"
 
 #: 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 "И maior que"
 
 #: filter/libfilter-i18n.h:22
-#, fuzzy
-msgid "Status"
-msgstr "_Estado:"
+msgid "is less than"
+msgstr "И menor que"
 
 #: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
-msgstr ""
+msgid "is not"
+msgstr "non И"
 
 #: filter/libfilter-i18n.h:24
-msgid "Subject"
-msgstr "Asunto"
+msgid "Message Body"
+msgstr "Corpo da Mensaxe"
 
 #: filter/libfilter-i18n.h:25
-msgid "after"
-msgstr ""
+#, fuzzy
+msgid "Message Header"
+msgstr "Corpo da Mensaxe"
 
 #: filter/libfilter-i18n.h:26
-msgid "before"
+msgid "Message was received"
 msgstr ""
 
 #: filter/libfilter-i18n.h:27
-msgid "contains"
-msgstr "contИn"
+msgid "Message was sent"
+msgstr ""
 
 #: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr "non contИn"
+msgid "Move to Folder"
+msgstr "Mover para a Carpeta"
 
 #: filter/libfilter-i18n.h:29
-msgid "does not end with"
-msgstr "non termina en"
+msgid "on or after"
+msgstr ""
 
 #: filter/libfilter-i18n.h:30
-msgid "does not exist"
-msgstr "non existe"
-
-#: filter/libfilter-i18n.h:31
-msgid "does not sound like"
+msgid "on or before"
 msgstr ""
 
 #: filter/libfilter-i18n.h:32
-msgid "does not start with"
-msgstr "non empeza por"
+msgid "Recipients"
+msgstr "Destinatarios"
 
 #: filter/libfilter-i18n.h:33
-msgid "ends with"
-msgstr "termina en"
+msgid "Regex Match"
+msgstr ""
 
 #: filter/libfilter-i18n.h:34
-msgid "exists"
-msgstr "existe"
+msgid "Sender"
+msgstr "Autor"
 
 #: filter/libfilter-i18n.h:35
-msgid "is greater than"
-msgstr "И maior que"
+#, fuzzy
+msgid "Set Status"
+msgstr "_Estado:"
 
 #: filter/libfilter-i18n.h:36
-msgid "is less than"
-msgstr "И menor que"
+msgid "sounds like"
+msgstr ""
 
 #: filter/libfilter-i18n.h:37
-msgid "is not"
-msgstr "non И"
+msgid "Source"
+msgstr ""
 
 #: filter/libfilter-i18n.h:38
-msgid "is"
-msgstr "И"
+msgid "Specific header"
+msgstr ""
 
 #: filter/libfilter-i18n.h:39
-msgid "on or after"
+msgid "starts with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr ""
+#, fuzzy
+msgid "Status"
+msgstr "_Estado:"
 
 #: filter/libfilter-i18n.h:41
-msgid "sounds like"
+msgid "Stop Processing"
 msgstr ""
 
 #: filter/libfilter-i18n.h:42
-msgid "starts with"
-msgstr ""
+msgid "Subject"
+msgstr "Asunto"
 
 #: filter/libfilter-i18n.h:43
 msgid "was after"
@@ -3993,140 +4219,222 @@ msgstr ""
 msgid "Edit VFolder Rule"
 msgstr ""
 
-#: mail/component-factory.c:227
+#: mail/component-factory.c:277
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Non se pode inicializar o compoЯente de correo de Evolution."
 
-#: mail/component-factory.c:266
+#: 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:16
+#: mail/folder-browser.c:223 ui/evolution-event-editor.xml.h:88
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "Gardar"
 
-#: mail/folder-browser.c:153
+#: mail/folder-browser.c:236
 msgid "Body or subject contains"
 msgstr "O corpo ou o asunto conteЯen"
 
-#: mail/folder-browser.c:154
+#: mail/folder-browser.c:237
 msgid "Body contains"
 msgstr "O corpo contИn"
 
-#: mail/folder-browser.c:155
+#: mail/folder-browser.c:238
 msgid "Subject contains"
 msgstr "O asunto contИn"
 
-#: mail/folder-browser.c:156
+#: mail/folder-browser.c:239
 msgid "Body does not contain"
 msgstr "O corpo non contИn"
 
-#: mail/folder-browser.c:157
+#: mail/folder-browser.c:240
 msgid "Subject does not contain"
 msgstr "O asunto non contИn"
 
-#: mail/folder-browser.c:453
+#: mail/folder-browser.c:643
 msgid "VFolder on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:454
+#: mail/folder-browser.c:644
 msgid "VFolder on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:455
+#: mail/folder-browser.c:645
 msgid "VFolder on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:457
+#: mail/folder-browser.c:647
 msgid "Filter on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:458
+#: mail/folder-browser.c:648
 msgid "Filter on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:459
+#: mail/folder-browser.c:649
 msgid "Filter on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:460 mail/folder-browser.c:544
+#: mail/folder-browser.c:650 mail/folder-browser.c:779
 msgid "Filter on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:14
+#: mail/folder-browser.c:655
+#, fuzzy
+msgid "Show all hidden"
+msgstr "Ver Todos"
+
+#: mail/folder-browser.c:657
+msgid "Hide selected"
+msgstr ""
+
+#. could use another mask, but not enough api do to it
+#: mail/folder-browser.c:660
+#, fuzzy
+msgid "Hide read"
+msgstr "Agochar"
+
+#: mail/folder-browser.c:661
+#, fuzzy
+msgid "Hide deleted"
+msgstr "Eliminar"
+
+#: mail/folder-browser.c:663 mail/folder-browser.c:790
+#, fuzzy
+msgid "Hide Subject"
+msgstr "Asunto"
+
+#: mail/folder-browser.c:665 mail/folder-browser.c:796
+#, fuzzy
+msgid "Hide from Sender"
+msgstr "Responder С Autor"
+
+#: mail/folder-browser.c:670 ui/evolution-message-composer.xml.h:15
 #, fuzzy
 msgid "Open"
 msgstr "_Abrir"
 
-#: mail/folder-browser.c:466
+#: mail/folder-browser.c:672
 #, fuzzy
 msgid "Save As..."
 msgstr "Gardar _Como..."
 
-#: mail/folder-browser.c:467 mail/mail-view.c:163
-#: po/tmp/evolution-addressbook.xml.h:13 po/tmp/evolution-calendar.xml.h:23
-#: po/tmp/evolution-mail.xml.h:28
+#: 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 "Imprimir"
 
-#: mail/folder-browser.c:469
+#: mail/folder-browser.c:675
 msgid "Reply to Sender"
 msgstr "Responder С Autor"
 
-#: mail/folder-browser.c:470 mail/mail-view.c:156
-#: po/tmp/evolution-mail.xml.h:34
+#: mail/folder-browser.c:676 mail/mail-view.c:141 ui/evolution-mail.xml.h:38
 msgid "Reply to All"
 msgstr "Responder a Todos"
 
-#: mail/folder-browser.c:471 mail/mail-view.c:159
-#: 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 "Re-enviar"
 
-#: mail/folder-browser.c:472 po/tmp/evolution-mail.xml.h:18
+#: mail/folder-browser.c:678 ui/evolution-mail.xml.h:18
 #, fuzzy
 msgid "Forward inline"
 msgstr "Ir para diante no tempo"
 
-#: mail/folder-browser.c:474
+#: mail/folder-browser.c:680
 msgid "Mark as Read"
 msgstr ""
 
-#: mail/folder-browser.c:475
+#: mail/folder-browser.c:681
 msgid "Mark as Unread"
 msgstr ""
 
-#: mail/folder-browser.c:477
+#: mail/folder-browser.c:683
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "Mover para a Carpeta"
 
-#: mail/folder-browser.c:478
+#: mail/folder-browser.c:684
 #, fuzzy
 msgid "Copy to Folder..."
 msgstr "Copiar А Carpeta"
 
-#: mail/folder-browser.c:480
+#: mail/folder-browser.c:686
 #, fuzzy
 msgid "Undelete"
 msgstr "Eliminar"
 
 #. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
 #. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:484
+#: mail/folder-browser.c:690
 msgid "Apply Filters"
 msgstr "Aplicar Filtros"
 
-#: mail/folder-browser.c:486 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:546
+#: mail/folder-browser.c:693 ui/evolution-mail.xml.h:21
+#, fuzzy
+msgid "Hide Messages"
+msgstr "Editar Mensaxe"
+
+#: mail/folder-browser.c:781
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
+#: mail/folder-browser.c:787
+#, fuzzy, c-format
+msgid "Hide Subject \"%s\""
+msgstr "O asunto И %s"
+
+#: 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 "Non foi posible iniciar wombat"
+
+#: mail/local-config.glade.h:7
+#, fuzzy
+msgid "Mailbox Format"
+msgstr "Formato"
+
+#: mail/local-config.glade.h:8
+#, fuzzy
+msgid "New store format:"
+msgstr "Tipo de fonte de Novas:"
+
+#: 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
+#, fuzzy
+msgid "mh"
+msgstr "h"
+
 #: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
@@ -4181,7 +4489,7 @@ msgstr "Non definiu ningЗn mИtodo de envМo de correo"
 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?"
@@ -4189,19 +4497,24 @@ msgstr ""
 "Esta mensaxe non ten asunto.\n"
 "©Enviar realmente?"
 
-#: mail/mail-callbacks.c:291
+#: mail/mail-callbacks.c:312
 msgid "You must specify recipients in order to send this message."
 msgstr "Ten que especificar destinatarios para poder enviar esta mensaxe."
 
-#: mail/mail-callbacks.c:552
+#: mail/mail-callbacks.c:530
+#, fuzzy
+msgid "Forwarded message:\n"
+msgstr "Mensaxe reenviada - %s"
+
+#: mail/mail-callbacks.c:611
 msgid "Move message(s) to"
 msgstr "Mover mensaxe(s) a"
 
-#: mail/mail-callbacks.c:554
+#: mail/mail-callbacks.c:613
 msgid "Copy message(s) to"
 msgstr "Copiar mensaxe(s) a"
 
-#: mail/mail-callbacks.c:665
+#: mail/mail-callbacks.c:748
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4209,11 +4522,11 @@ msgstr ""
 "SС pode editar mensaxes gardados\n"
 "na carpeta de Borrador."
 
-#: mail/mail-callbacks.c:699 mail/mail-display.c:72
+#: mail/mail-callbacks.c:781 mail/mail-display.c:79
 msgid "Overwrite file?"
 msgstr "©Sobrescribir ficheiro?"
 
-#: mail/mail-callbacks.c:703 mail/mail-display.c:76
+#: mail/mail-callbacks.c:785 mail/mail-display.c:83
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -4221,17 +4534,17 @@ msgstr ""
 "Xa existe un ficheiro con ese nome.\n"
 "©Sobrescribilo?"
 
-#: mail/mail-callbacks.c:748
+#: mail/mail-callbacks.c:830
 #, fuzzy
 msgid "Save Message As..."
 msgstr "Gardar como..."
 
-#: mail/mail-callbacks.c:750
+#: mail/mail-callbacks.c:832
 #, fuzzy
 msgid "Save Messages As..."
 msgstr "Gardar como..."
 
-#: mail/mail-callbacks.c:877
+#: mail/mail-callbacks.c:916
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4240,46 +4553,267 @@ msgstr ""
 "Erro cargando a informaciСn do filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:922
+#: mail/mail-callbacks.c:961
 msgid "Print Message"
 msgstr "Imprimir Mensaxe"
 
-#: mail/mail-callbacks.c:969
+#: mail/mail-callbacks.c:1008
 msgid "Printing of message failed"
 msgstr "A impresiСn da mensaxe fallou"
 
 #.
-#. * 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
+#, fuzzy
+msgid "Account"
+msgstr "Contas"
+
+#: mail/mail-config-druid.glade.h:7
+msgid "Account Information"
+msgstr "InformaciСn de Contas"
+
+#: mail/mail-config-druid.glade.h:8
+msgid "Account Management"
+msgstr "XestiСn e Contas"
+
+#: mail/mail-config-druid.glade.h:9
+#, fuzzy
+msgid "Account Properties"
+msgstr "Propiedades do anexo"
+
+#: mail/mail-config-druid.glade.h:11
+msgid "Advanced"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:12
+msgid "Authentication"
+msgstr "AutenticaciСn"
+
+#: mail/mail-config-druid.glade.h:13
+#, fuzzy
+msgid "Authentication Type:"
+msgstr "AutenticaciСn:"
+
+#: mail/mail-config-druid.glade.h:15
+msgid "Automatically check mail every "
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:17
+#, fuzzy
+msgid "Congratulations, your mail configuration is complete.\n"
+msgstr "Noraboa, a configuraciСn do correo estА completa."
+
+#: mail/mail-config-druid.glade.h:23
+msgid "DIGEST-MD5"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:24
+#, fuzzy
+msgid "Default"
+msgstr "Eliminar"
+
+#: mail/mail-config-druid.glade.h:26
+#, fuzzy
+msgid "Delete mail from server"
+msgstr "Non borrar as mensaxes do servidor"
+
+#: mail/mail-config-druid.glade.h:27
+#, fuzzy
+msgid "Done"
+msgstr "mes"
+
+#: mail/mail-config-druid.glade.h:28
+#, fuzzy
+msgid "E-Mail Address:"
+msgstr "Enderezo de Email:"
+
+#: mail/mail-config-druid.glade.h:30
+msgid "Email Address:"
+msgstr "Enderezo de Email:"
+
+#: mail/mail-config-druid.glade.h:31
+msgid "Evolution Mail Configuration"
+msgstr "ConfiguraciСn de Correo do Evolution"
+
+#: mail/mail-config-druid.glade.h:32
+msgid "Full Name:"
+msgstr "Nome Completo:"
+
+#: mail/mail-config-druid.glade.h:35
+#, fuzzy
+msgid "Hostname:"
+msgstr "Nome de usuario:"
+
+#: mail/mail-config-druid.glade.h:36
+msgid "IMAP"
+msgstr "IMAP"
+
+#: mail/mail-config-druid.glade.h:37
 msgid "Identity"
 msgstr "Identidade"
 
-#: 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
+msgid "Mail"
+msgstr "Correo"
+
+#: mail/mail-config-druid.glade.h:41
+#, fuzzy
+msgid "Mail Account"
+msgstr "Contas"
+
+#: mail/mail-config-druid.glade.h:42
 msgid "Mail Configuration"
 msgstr "ConfiguraciСn do Correo"
 
-#: po/tmp/mail-config-druid.glade.h:8
-msgid "Mail Source"
-msgstr "Fonte de Correo"
+#: mail/mail-config-druid.glade.h:43
+msgid "Mail Configuration Druid"
+msgstr "Axudante da ConfiguraciСn do Correo"
 
-#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
-msgid "Mail Transport"
-msgstr "Transporte do Correo"
+#: mail/mail-config-druid.glade.h:44
+msgid "Make this my default account"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:46
+msgid "News"
+msgstr "Novas"
+
+#: mail/mail-config-druid.glade.h:48
+msgid "Optional"
+msgstr "Opcional"
+
+#: mail/mail-config-druid.glade.h:49 mail/mail-config-gui.c:485
+msgid "Organization:"
+msgstr "OrganizaciСn:"
+
+#: mail/mail-config-druid.glade.h:50
+msgid "Outgoing Mail Server"
+msgstr ""
 
-#: po/tmp/mail-config-druid.glade.h:10
+#: mail/mail-config-druid.glade.h:51
+msgid "Password:"
+msgstr "Contrasinal:"
+
+#: mail/mail-config-druid.glade.h:53
+msgid "Plain Text"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:54
+msgid "Receiving Email"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:55
+msgid "Remember my password"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:56 mail/mail-format.c:628
+msgid "Reply-To:"
+msgstr "Responder-A:"
+
+#: mail/mail-config-druid.glade.h:57
+msgid "Reply-to:"
+msgstr "Responder-a:"
+
+#: mail/mail-config-druid.glade.h:58
 #, fuzzy
-msgid "Welcome to the Evolution Mail configuration wizard!\n"
-msgstr "║Benvido С axudante da ConfiguraciСn de Correo do Evolution!"
+msgid "Required"
+msgstr "Persoas _Requiridas"
+
+#: mail/mail-config-druid.glade.h:60
+#, fuzzy
+msgid "Save password"
+msgstr "Gardar como VCard"
+
+#: mail/mail-config-druid.glade.h:61
+#, fuzzy
+msgid "Select signature file"
+msgstr "Ficheiro de sinatura:"
+
+#: mail/mail-config-druid.glade.h:62
+#, fuzzy
+msgid "Sending Email"
+msgstr "Enviando Correo"
+
+#: mail/mail-config-druid.glade.h:64
+msgid "Server Configuration"
+msgstr "ConfiguraciСn do Servidor"
+
+#: mail/mail-config-druid.glade.h:65
+#, fuzzy
+msgid "Server Timeouts"
+msgstr "Tipo de Servidor: "
+
+#: mail/mail-config-druid.glade.h:66
+msgid "Server Type: "
+msgstr "Tipo de Servidor: "
+
+#: mail/mail-config-druid.glade.h:67
+#, fuzzy
+msgid "Server requires authentication"
+msgstr "O servidor SMTP require autenticaciСn"
+
+#: mail/mail-config-druid.glade.h:68
+#, fuzzy
+msgid "Servers"
+msgstr "Servidor:"
+
+#: mail/mail-config-druid.glade.h:69 mail/mail-config-gui.c:496
+msgid "Signature file:"
+msgstr "Ficheiro de sinatura:"
+
+#: mail/mail-config-druid.glade.h:70
+#, fuzzy
+msgid "Signature:"
+msgstr "Ficheiro de sinatura:"
+
+#: mail/mail-config-druid.glade.h:71 mail/mail-config.glade.h:20
+msgid "Sources"
+msgstr "Fontes"
+
+#: mail/mail-config-druid.glade.h:72
+#, fuzzy
+msgid "This server requires a secure connection (SSL)"
+msgstr "O servidor SMTP require autenticaciСn"
 
-#: po/tmp/mail-config-druid.glade.h:14
+#: mail/mail-config-druid.glade.h:73
+#, fuzzy
+msgid "Type"
+msgstr "Tipo:"
+
+#: 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 ""
-"A configuraciСn do correo electrСnico estА completa.\n"
-"Prema \"Finalizar\" para gardar a nova configuraciСn"
+
+#: mail/mail-config-druid.glade.h:76
+#, fuzzy
+msgid "User Information"
+msgstr "Sen InformaciСn"
+
+#: mail/mail-config-druid.glade.h:77 mail/mail-config-gui.c:928
+msgid "Username:"
+msgstr "Nome de usuario:"
+
+#: mail/mail-config-druid.glade.h:78
+#, fuzzy
+msgid "Welcome to the Evolution Mail Configuration Druid.\n"
+msgstr "║Benvido С axudante da ConfiguraciСn de Correo do Evolution!"
+
+#: mail/mail-config-druid.glade.h:81
+#, fuzzy
+msgid "minute(s)"
+msgstr "minutos"
 
 #: mail/mail-config-gui.c:433
 msgid ""
@@ -4296,15 +4830,7 @@ msgstr "Nome completo:"
 msgid "Email address:"
 msgstr "Enderezo de email:"
 
-#: mail/mail-config-gui.c:485
-msgid "Organization:"
-msgstr "OrganizaciСn:"
-
-#: mail/mail-config-gui.c:496
-msgid "Signature file:"
-msgstr "Ficheiro de sinatura:"
-
-#: 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 "Ficheiro de Sinatura"
 
@@ -4312,26 +4838,10 @@ msgstr "Ficheiro de Sinatura"
 msgid "Server:"
 msgstr "Servidor:"
 
-#: mail/mail-config-gui.c:928
-msgid "Username:"
-msgstr "Nome de usuario:"
-
-#: mail/mail-config-gui.c:934
-msgid "Path:"
-msgstr "CamiЯo:"
-
-#: mail/mail-config-gui.c:943
-msgid "Authentication:"
-msgstr "AutenticaciСn:"
-
 #: mail/mail-config-gui.c:956
 msgid "Detect supported types..."
 msgstr "Detectar tipos soportados..."
 
-#: 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 "Non borrar as mensaxes do servidor"
@@ -4344,7 +4854,7 @@ msgstr "Probar ConfiguraciСn"
 msgid "Mail source type:"
 msgstr "Tipo de fonte de correo:"
 
-#: 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"
@@ -4370,6 +4880,14 @@ msgstr ""
 msgid "Mail transport type:"
 msgstr "Tipo de transporte de correo:"
 
+#: 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 "Engadir Identidade"
@@ -4418,60 +4936,68 @@ msgstr ""
 msgid "Query authorization at \"%s\""
 msgstr ""
 
-#: po/tmp/mail-config.glade.h:7
+#: mail/mail-config.glade.h:7
 msgid "Address"
 msgstr "Enderezo"
 
-#: po/tmp/mail-config.glade.h:10
+#: mail/mail-config.glade.h:10
 msgid "Identities"
 msgstr "Identidades"
 
-#: po/tmp/mail-config.glade.h:11
+#: mail/mail-config.glade.h:11
 msgid "Mail Sources"
 msgstr "Fontes de Correo"
 
-#: po/tmp/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
+msgid "Mail Transport"
+msgstr "Transporte do Correo"
+
+#: mail/mail-config.glade.h:13
 msgid "Mark message as seen [ms]: "
 msgstr "Marcar mensaxe como lida [ms]: "
 
-#: po/tmp/mail-config.glade.h:14
+#: mail/mail-config.glade.h:14
 msgid "News Servers"
 msgstr "Servidores de News"
 
-#: po/tmp/mail-config.glade.h:15
+#: mail/mail-config.glade.h:15
 msgid "News Sources"
 msgstr "Fontes de Novas"
 
-#: po/tmp/mail-config.glade.h:16
+#: mail/mail-config.glade.h:16
 msgid "Organization"
 msgstr "OrganizaciСn"
 
-#: po/tmp/mail-config.glade.h:18
+#: mail/mail-config.glade.h:18
 msgid "Send messages in HTML format"
 msgstr "Enviar mensaxes en formato HTML"
 
-#: po/tmp/mail-config.glade.h:20
-msgid "Sources"
-msgstr "Fontes"
-
-#: mail/mail-crypto.c:350 mail/mail-crypto.c:452 mail/mail-crypto.c:629
+#: 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."
 msgstr "Introduza o seu contrasinal de PGP/GPG."
 
-#: mail/mail-crypto.c:354 mail/mail-crypto.c:456 mail/mail-crypto.c:634
+#: mail/mail-crypto.c:357 mail/mail-crypto.c:462 mail/mail-crypto.c:640
+#: mail/mail-crypto.c:785
 msgid "No password provided."
 msgstr "Non se indicou un contrasinal."
 
-#: mail/mail-crypto.c:360 mail/mail-crypto.c:463 mail/mail-crypto.c:640
+#: mail/mail-crypto.c:363 mail/mail-crypto.c:469 mail/mail-crypto.c:646
+#: mail/mail-crypto.c:792 mail/mail-crypto.c:942
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Non foi posible crear unha canalizaciСn co GPG/PGP: %s"
 
-#: mail/mail-crypto.c:625
+#: mail/mail-crypto.c:631 mail/mail-crypto.c:777 mail/mail-crypto.c:936
 msgid "No GPG/PGP program available."
 msgstr "O programa GPG/PGP non estА dispoЯible."
 
-#: mail/mail-display.c:90
+#: mail/mail-crypto.c:953
+#, fuzzy, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "Non foi posible crear unha canalizaciСn: %s"
+
+#: mail/mail-display.c:98
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -4480,464 +5006,377 @@ msgstr ""
 "Non foi posible abrir o ficheiro %s:\n"
 "%s"
 
-#: mail/mail-display.c:113
+#: mail/mail-display.c:131
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Non foi posible escribir os datos: %s"
 
-#: mail/mail-display.c:218
+#: mail/mail-display.c:229
 msgid "Save Attachment"
 msgstr "Gardar Anexo"
 
-#: mail/mail-display.c:258
+#: mail/mail-display.c:269
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Non foi posible crear o directorio temporal: %s"
 
-#: mail/mail-display.c:300
+#: mail/mail-display.c:311
 msgid "Save to Disk..."
 msgstr "Gardar С Disco..."
 
-#: mail/mail-display.c:302
+#: mail/mail-display.c:313
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
 
-#: mail/mail-display.c:304
+#: mail/mail-display.c:315
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:328
+#: mail/mail-display.c:339
 msgid "External Viewer"
 msgstr "Visualizador Externo"
 
-#: mail/mail-display.c:351
+#: mail/mail-display.c:362
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:355
+#: mail/mail-display.c:366
 msgid "Hide"
 msgstr "Agochar"
 
-#: mail/mail-format.c:500
+#: mail/mail-format.c:503
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:623
-msgid "Reply-To:"
-msgstr "Responder-A:"
-
-#: mail/mail-format.c:845
+#: mail/mail-format.c:851
 msgid "No GPG/PGP support available in this copy of Evolution."
 msgstr "Non hai soporte de GPG/PGP dispoЯible nesta copia do Evolution."
 
-#: mail/mail-format.c:857
+#: mail/mail-format.c:863
 msgid "Encrypted message not displayed"
 msgstr "Mensaxe cifrada non visualizada"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:869
 msgid "Encrypted message"
 msgstr "Mensaxe cifrada"
 
-#: mail/mail-format.c:864
+#: mail/mail-format.c:870
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1470
+#: mail/mail-format.c:1450
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1482
+#: mail/mail-format.c:1462
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1486
+#: mail/mail-format.c:1466
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1520
+#: mail/mail-format.c:1500
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1525
+#: mail/mail-format.c:1505
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-format.c:1695
+#: mail/mail-format.c:1675
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr ""
 
-#: mail/mail-local.c:202
+#: mail/mail-local.c:204
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Cambiando a carpeta \"%s\" С formato \"%s\""
 
-#: mail/mail-local.c:206
+#: mail/mail-local.c:208
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Cambiar carpeta \"%s\" С formato \"%s\""
 
-#: mail/mail-local.c:261
+#: mail/mail-local.c:251
+#, fuzzy
+msgid "Reconfiguring folder"
+msgstr "_Configurar Carpeta"
+
+#: mail/mail-local.c:269
 msgid "Closing current folder"
 msgstr "Pechando a carpeta actual"
 
-#: mail/mail-local.c:293
+#: mail/mail-local.c:295
 msgid "Renaming old folder and opening"
 msgstr "Renomeando a carpeta antiga e abrindo"
 
-#: mail/mail-local.c:314
+#: mail/mail-local.c:313
 msgid "Creating new folder"
 msgstr "Creando unha nova carpeta"
 
-#: mail/mail-local.c:329
+#: mail/mail-local.c:327
 msgid "Copying messages"
 msgstr "Copiando as mensaxes"
 
-#: mail/mail-local.c:341
+#: 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:372
+#: 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:781
+#: mail/mail-local.c:787
 #, fuzzy
 msgid "Registering local folder"
 msgstr "Creando unha nova carpeta"
 
-#: mail/mail-local.c:783
+#: mail/mail-local.c:789
 #, fuzzy
 msgid "Register local folder"
 msgstr "Crear unha nova carpeta"
 
-#: mail/mail-ops.c:79
+#: mail/mail-local.c:894
+#, fuzzy, c-format
+msgid ""
+"Unable to register folder '%s':\n"
+"%s"
+msgstr ""
+"Non foi posible crear a carpeta `%s':\n"
+"%s"
+
+#: mail/mail-mt.c:85
+#, fuzzy, c-format
+msgid ""
+"Error while '%s':\n"
+"%s"
+msgstr ""
+"Erro na expresiСn regular '%s':\n"
+"%s"
+
+#: mail/mail-mt.c:87
+#, fuzzy, c-format
+msgid ""
+"Error while performing operation:\n"
+"%s"
+msgstr ""
+"Erro cargando a informaciСn do filtro:\n"
+"%s"
+
+#: mail/mail-mt.c:356 mail/mail-mt.c:385
+#, fuzzy
+msgid "Working"
+msgstr "Movendo"
+
+#: mail/mail-ops.c:88
 #, c-format
 msgid "Fetching email from %s"
 msgstr "Recibindo correo de %s"
 
-#: mail/mail-ops.c:81
+#: mail/mail-ops.c:90
 #, c-format
 msgid "Fetch email from %s"
 msgstr "Recibir correo de %s"
 
-#: mail/mail-ops.c:331
+#: mail/mail-ops.c:335
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "Non hai novo correo en %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:538
+#: mail/mail-ops.c:551
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Enviando \"%s\""
 
-#: mail/mail-ops.c:543
-msgid "Sending a message without a subject"
-msgstr "Enviando unha mensaxe sen asunto"
-
-#: mail/mail-ops.c:546
-#, c-format
-msgid "Send \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:549
-msgid "Send a message without a subject"
-msgstr "Enviar unha mensaxe sen asunto"
+#: mail/mail-ops.c:553
+#, fuzzy
+msgid "Sending message"
+msgstr "Borrar esta mensaxe"
 
-#: mail/mail-ops.c:720
+#: mail/mail-ops.c:669
 msgid "Sending queue"
 msgstr ""
 
-#: mail/mail-ops.c:722
+#: mail/mail-ops.c:671
 msgid "Send queue"
 msgstr ""
 
-#: mail/mail-ops.c:858 mail/mail-ops.c:865
+#: mail/mail-ops.c:804 mail/mail-ops.c:811
 #, c-format
 msgid "Appending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:862 mail/mail-ops.c:868
+#: mail/mail-ops.c:808 mail/mail-ops.c:814
 msgid "Appending a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:940
-#, c-format
-msgid "Expunging \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:942
-#, c-format
-msgid "Expunge \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1001
+#: mail/mail-ops.c:897
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Movendo mensaxes de \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:899
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Copiando mensaxes de \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:1006
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Mover mensaxes de \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:1008
+#: mail/mail-ops.c:904
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Copiar mensaxes de \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:1039
+#: mail/mail-ops.c:935
 msgid "Moving"
 msgstr "Movendo"
 
-#: mail/mail-ops.c:1042
+#: mail/mail-ops.c:938
 msgid "Copying"
 msgstr "Copiando"
 
-#: mail/mail-ops.c:1062
+#: mail/mail-ops.c:958
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s mensaxe %d de %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1141
-#, c-format
-msgid "Marking messages in folder \"%s\""
-msgstr "Marcando mensaxes na carpeta \"%s\""
-
-#: mail/mail-ops.c:1144
-#, c-format
-msgid "Mark messages in folder \"%s\""
-msgstr "Marcar mensaxes na carpeta \"%s\""
-
-#: mail/mail-ops.c:1175
-#, c-format
-msgid "Marking message %d of %d"
-msgstr "Marcando a mensaxe %d de %d"
-
-#: mail/mail-ops.c:1295
+#: mail/mail-ops.c:1033
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Examinando as carpetas en \"%s\""
 
-#: mail/mail-ops.c:1297
-#, c-format
-msgid "Scan folders in \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1366 mail/subscribe-dialog.c:339
+#: mail/mail-ops.c:1099 mail/subscribe-dialog.c:341
 msgid "(No description)"
 msgstr "(Sen descriciСn)"
 
-#: mail/mail-ops.c:1432
-#, c-format
-msgid "Attaching messages from folder \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1435
-#, c-format
-msgid "Attach messages from \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1535
-#, c-format
-msgid "Forwarding messages \"%s\""
-msgstr "Reenviando mensaxes \"%s\""
-
-#: mail/mail-ops.c:1539
-msgid "Forwarding a message without a subject"
-msgstr "Reenviando unha mensaxe sen asunto"
-
-#: mail/mail-ops.c:1542
-#, c-format
-msgid "Forward message \"%s\""
-msgstr "Reenviar mensaxe \"%s\""
-
-#: mail/mail-ops.c:1546
-msgid "Forward a message without a subject"
-msgstr ""
-
-#: mail/mail-ops.c:1593
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Recibindo a mensaxe nЗmero %d de %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1610
-msgid ""
-"Failed to generate mime part from message while generating forwarded message."
-msgstr ""
-
-#: mail/mail-ops.c:1665
+#: mail/mail-ops.c:1164
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Mensaxe reenviada - %s"
 
-#: mail/mail-ops.c:1679
-#, fuzzy
-msgid "Forwarded message:\n"
-msgstr "Mensaxe reenviada - %s"
-
-#: mail/mail-ops.c:1748
-#, c-format
-msgid "Loading \"%s\""
-msgstr "Cargando \"%s\""
-
-#: mail/mail-ops.c:1750
-#, c-format
-msgid "Load \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1853
-#, c-format
-msgid "Creating \"%s\""
-msgstr "Creando \"%s\""
-
-#: mail/mail-ops.c:1855
-#, c-format
-msgid "Create \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1903
-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 "Examinando as carpetas en \"%s\""
 
-#: mail/mail-ops.c:1949
-#, c-format
-msgid "Synchronizing \"%s\""
+#: mail/mail-ops.c:1336
+#, fuzzy
+msgid "Synchronising folder"
 msgstr "Sincronizando \"%s\""
 
-#: mail/mail-ops.c:1951
-#, c-format
-msgid "Synchronize \"%s\""
+#: mail/mail-ops.c:1386
+msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:2015
-#, c-format
-msgid "Displaying message UID \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:2018
-msgid "Clearing message display"
-msgstr ""
-
-#: mail/mail-ops.c:2021
-#, c-format
-msgid "Display message UID \"%s\""
-msgstr "Amosar a mensaxe co UID \"%s\""
-
-#: mail/mail-ops.c:2024
-msgid "Clear message display"
-msgstr ""
+#: mail/mail-ops.c:1434
+#, fuzzy, c-format
+msgid "Retrieving message %s"
+msgstr "Recibindo a mensaxe %d de %d"
 
-#: mail/mail-ops.c:2137
-#, c-format
-msgid "Opening messages from folder \"%s\""
-msgstr "Abrindo as mensaxes da carpeta \"%s\""
+#: mail/mail-ops.c:1497
+#, fuzzy
+msgid "Retrieving messages"
+msgstr "Recibindo a mensaxe %d de %d"
 
-#: mail/mail-ops.c:2140
+#: mail/mail-ops.c:1507
 #, c-format
-msgid "Open messages from \"%s\""
-msgstr ""
+msgid "Retrieving message number %d of %d (uid \"%s\")"
+msgstr "Recibindo a mensaxe nЗmero %d de %d (uid \"%s\")"
 
-#: mail/mail-ops.c:2244
-#, c-format
-msgid "Loading %s Folder"
+#: mail/mail-ops.c:1655
+#, fuzzy, c-format
+msgid "Loading %s Folder for %s"
 msgstr "Cargando a Carpeta %s"
 
-#: mail/mail-ops.c:2246
-#, c-format
-msgid "Load %s Folder"
-msgstr ""
-
-#: mail/mail-ops.c:2310
-#, c-format
-msgid "Viewing messages from folder \"%s\""
-msgstr "Vendo as mensaxes da carpeta \"%s\""
-
-#: mail/mail-ops.c:2313
-#, c-format
-msgid "View messages from \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:2339
-#, c-format
-msgid "Retrieving message %d of %d (uid \"%s\")"
-msgstr "Recibindo a mensaxe %d de %d (uid \"%s\")"
-
-#: mail/mail-ops.c:2428
+#: mail/mail-ops.c:1657
 #, fuzzy, c-format
-msgid "Saving messages from folder \"%s\""
-msgstr "Abrindo as mensaxes da carpeta \"%s\""
+msgid "Load %s Folder for %s"
+msgstr "Cargando a Carpeta %s"
+
+#: mail/mail-ops.c:1823
+#, fuzzy
+msgid "Saving messages"
+msgstr "Copiando as mensaxes"
 
-#: mail/mail-ops.c:2431
+#: mail/mail-ops.c:1902
 #, fuzzy, c-format
-msgid "Save messages from folder \"%s\""
-msgstr "Abrindo as mensaxes da carpeta \"%s\""
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
+msgstr "Non foi posible abrir ou crear o ficheiro .newsrc para %s: %s"
 
-#: mail/mail-ops.c:2474
+#: mail/mail-ops.c:1915
 #, fuzzy, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Recibindo a mensaxe %d de %d (uid \"%s\")"
 
+#: mail/mail-ops.c:1929
+#, fuzzy, c-format
+msgid ""
+"Error saving messages to: %s:\n"
+" %s"
+msgstr "Erro gardando o ficheiro: %s"
+
 #: mail/mail-search-dialogue.c:104
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: mail/mail-summary.c:105 mail/mail-threads.c:728
+#: mail/mail-summary.c:110 mail/mail-threads.c:729
 msgid "Incomplete message written on pipe!"
 msgstr ""
 
-#: mail/mail-threads.c:301
+#: mail/mail-threads.c:302
 #, c-format
 msgid ""
 "Error while preparing to %s:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-threads.c:675
+#: mail/mail-threads.c:676
 #, c-format
 msgid ""
 "Error while `%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-threads.c:732
+#: mail/mail-threads.c:733
 msgid "Error reading commands from dispatching thread."
 msgstr ""
 
-#: mail/mail-threads.c:797
+#: mail/mail-threads.c:798
 msgid "Corrupted message from dispatching thread?"
 msgstr ""
 
-#: mail/mail-threads.c:916
+#: mail/mail-threads.c:917
 msgid "Could not create dialog box."
 msgstr "Non foi posible crear a caixa de diАlogo."
 
-#: mail/mail-threads.c:927
+#: mail/mail-threads.c:928
 msgid "User cancelled query."
 msgstr "O usuario cancelou a consulta."
 
@@ -4947,53 +5386,52 @@ msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Non foi posible crear a caixa de correo temporal `%s': %s"
 
 #. Get all uids of source
-#: mail/mail-tools.c:239
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Examining %s"
 msgstr "Examinando %s"
 
-#: mail/mail-tools.c:269
+#: mail/mail-tools.c:271
 #, c-format
 msgid ""
 "Could not read UID cache file \"%s\". You may receive duplicate messages."
 msgstr ""
 
-#. Info
-#: mail/mail-tools.c:290
+#: mail/mail-tools.c:300
 #, c-format
 msgid "Retrieving message %d of %d"
 msgstr "Recibindo a mensaxe %d de %d"
 
 #. Append it to dest
-#: mail/mail-tools.c:303
+#: mail/mail-tools.c:315
 #, c-format
 msgid "Writing message %d of %d"
 msgstr "Escribindo a mensaxe %d de %d"
 
-#: mail/mail-tools.c:332
+#: mail/mail-tools.c:347
 #, c-format
 msgid "Saving changes to %s"
 msgstr "Gardando as modificaciСns de %s"
 
-#: mail/mail-tools.c:369
+#: mail/mail-tools.c:381
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (mensaxe reenviada)"
 
-#: mail/mail-tools.c:379
+#: mail/mail-tools.c:391
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (sen asunto)"
 
-#: mail/mail-tools.c:418
+#: mail/mail-tools.c:427
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Mensaxe reenviada - %s"
 
-#: mail/mail-tools.c:420
+#: mail/mail-tools.c:429
 msgid "Forwarded message (no subject)"
 msgstr "Mensaxe reenviada (sen asunto)"
 
-#: mail/mail-tools.c:523
+#: mail/mail-tools.c:530
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
@@ -5002,76 +5440,96 @@ msgstr ""
 "Non se pode abrir a localizaiСn `%s':\n"
 "%s"
 
-#: mail/mail-vfolder.c:147
+#: mail/mail-vfolder.c:149
 msgid "VFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:296
+#: mail/mail-vfolder.c:298
 msgid "New VFolder"
 msgstr "Nova VFolder"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:33
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:37
 msgid "Reply"
 msgstr "Responder"
 
-#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:38
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
 msgid "Reply to the sender of this message"
 msgstr "Responder С autor desta mensaxe"
 
-#: mail/mail-view.c:156 po/tmp/evolution-mail.xml.h:37
+#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
 msgid "Reply to all recipients of this message"
 msgstr "Responder a tСdolos destinatarios desta mensaxe"
 
-#: mail/mail-view.c:159 po/tmp/evolution-mail.xml.h:19
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:19
 msgid "Forward this message"
 msgstr "Re-enviar esta mensaxe"
 
-#: mail/mail-view.c:163 po/tmp/evolution-mail.xml.h:32
+#: mail/mail-view.c:148 ui/evolution-mail.xml.h:36
 msgid "Print the selected message"
 msgstr "Imprimir a mensaxe seleccionada"
 
-#: mail/mail-view.c:165 po/tmp/evolution-mail.xml.h:12
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:12
 msgid "Delete this message"
 msgstr "Borrar esta mensaxe"
 
-#: mail/message-list.c:572
+#: mail/message-list.c:590
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:575
+#: mail/message-list.c:593
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:578
+#: mail/message-list.c:596
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:846
+#: mail/message-list.c:881
 #, c-format
 msgid "[ %s ]"
 msgstr ""
 
 #. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:858 mail/message-list.c:873
+#: mail/message-list.c:893 mail/message-list.c:909
 #, c-format
 msgid "%s, et al."
 msgstr ""
 
-#: mail/message-list.c:860 mail/message-list.c:875
+#: mail/message-list.c:896 mail/message-list.c:912
 #, fuzzy
 msgid "<unknown>"
 msgstr "DescoЯecido"
 
-#: mail/message-list.c:2068
-msgid "Rebuilding message view"
+#: mail/message-list.c:965
+msgid "?"
 msgstr ""
 
-#: mail/message-list.c:2070
-msgid "Rebuild message view"
+#: mail/message-list.c:972
+#, fuzzy
+msgid "Today %l:%M %p"
+msgstr "%I:%M %p"
+
+#: mail/message-list.c:981
+msgid "Yesterday %l:%M %p"
 msgstr ""
 
+#: mail/message-list.c:993
+#, fuzzy
+msgid "%a %l:%M %p"
+msgstr "%I:%M %p"
+
+#: mail/message-list.c:1001
+#, fuzzy
+msgid "%b %d %l:%M %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#: mail/message-list.c:1003
+#, fuzzy
+msgid "%b %d %Y"
+msgstr "%a %d de %Y"
+
 #: mail/subscribe-dialog.c:139
 msgid "Display folders starting with:"
 msgstr ""
@@ -5086,27 +5544,27 @@ msgstr ""
 msgid "Get store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:282
+#: mail/subscribe-dialog.c:283
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:286
+#: mail/subscribe-dialog.c:287
 #, fuzzy, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Abrindo as mensaxes da carpeta \"%s\""
 
-#: mail/subscribe-dialog.c:290
+#: mail/subscribe-dialog.c:291
 #, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:293
+#: mail/subscribe-dialog.c:294
 #, fuzzy, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr "Abrindo as mensaxes da carpeta \"%s\""
 
-#: shell/e-setup.c:112 shell/e-setup.c:183
+#: shell/e-setup.c:112 shell/e-setup.c:185
 msgid "Evolution installation"
 msgstr "InstalaciСn de Evolution"
 
@@ -5123,24 +5581,24 @@ msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Prema \"Aceptar\" para instalar os ficheiros, ou \"Cancelar\" para saМr."
 
-#: shell/e-setup.c:155
+#: shell/e-setup.c:157
 msgid "Could not update files correctly"
 msgstr "Non foi posible actualizar os ficheiros correctamente"
 
-#: shell/e-setup.c:158 shell/e-setup.c:224
+#: shell/e-setup.c:160 shell/e-setup.c:228
 msgid "Evolution files successfully installed."
 msgstr "Ficheiros de Evolution instalados con Иxito."
 
-#: shell/e-setup.c:187
+#: shell/e-setup.c:189
 msgid "This seems to be the first time you run Evolution."
 msgstr "Semella que И a primeira vez que executa Evolution."
 
-#: shell/e-setup.c:188
+#: shell/e-setup.c:190
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 "Prema \"Aceptar\" para instalar os ficheiros de usuario de Evolution en"
 
-#: shell/e-setup.c:205
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -5151,7 +5609,7 @@ msgstr ""
 "%s\n"
 "Erro: %s"
 
-#: shell/e-setup.c:220
+#: shell/e-setup.c:224
 #, c-format
 msgid ""
 "Cannot copy files into\n"
@@ -5160,7 +5618,7 @@ msgstr ""
 "Non se poden copiar os ficheiros a\n"
 "`%s'."
 
-#: shell/e-setup.c:245
+#: shell/e-setup.c:249
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -5171,7 +5629,7 @@ msgstr ""
 "MСvao para poder instalar os ficheiros de\n"
 "usuario de Evolution."
 
-#: shell/e-setup.c:257
+#: shell/e-setup.c:261
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -5207,7 +5665,7 @@ msgstr ""
 "O tipo da carpeta seleccionada non И vАlido para\n"
 "a operaciСn solicitada."
 
-#: shell/e-shell-folder-selection-dialog.c:291
+#: shell/e-shell-folder-selection-dialog.c:297
 msgid "New..."
 msgstr "Nova..."
 
@@ -5215,23 +5673,19 @@ msgstr "Nova..."
 msgid "(Untitled)"
 msgstr "(Sen_tМtulo)"
 
-#. you might have to call gnome_dialog_run() on the
-#. * dialog returned here, I don't remember...
-#.
-#: shell/e-shell-view-menu.c:114
+#: shell/e-shell-view-menu.c:111
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy non foi atopado no seu $PATH."
 
-#. same as above
-#: shell/e-shell-view-menu.c:120
+#: shell/e-shell-view-menu.c:117
 msgid "Bug buddy could not be run."
 msgstr "Non se puido executar Bug buddy."
 
-#: shell/e-shell-view-menu.c:172
+#: shell/e-shell-view-menu.c:169
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:174
+#: shell/e-shell-view-menu.c:171
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -5241,7 +5695,7 @@ msgstr ""
 "en grupo para xestiСn de correo, axenda e contactos\n"
 "dentro do ambiente de escritorio GNOME."
 
-#: shell/e-shell-view-menu.c:335
+#: shell/e-shell-view-menu.c:332
 msgid "Go to folder..."
 msgstr "Ir А carpeta..."
 
@@ -5341,9 +5795,8 @@ msgstr "Eliminar este atallo da barra de atallos"
 msgid "Error saving shortcuts."
 msgstr "Erro gardando atallos."
 
-#: po/tmp/evolution-event-editor.xml.h:125
-#: po/tmp/evolution-message-composer.xml.h:43 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 "_Vista"
 
@@ -5404,8 +5857,8 @@ msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
-"Over the last month and a half, our focus has been on making\n"
-"Evolution usable. Many of the Evolution developers are now using\n"
+"Over the time since the past release, our focus has been on making\n"
+"Evolution usable.  Many of the Evolution developers are now using\n"
 "Evolution to read their mail full time. You could too. (Just\n"
 "be sure to keep a backup.)\n"
 "\n"
@@ -5441,1136 +5894,1156 @@ msgstr "Desactivar."
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Non se pode inicializar o sistema de compoЯentes de Bonobo"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-addressbook-ldap.xml.h:6
-msgid "N_ew Directory Server"
-msgstr "Novo Servidor de _Directorio"
-
-#: po/tmp/evolution-addressbook-ldap.xml.h:7
-msgid "_Actions"
-msgstr "_AcciСns"
-
-#: po/tmp/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:7
 msgid "Create a new contact"
 msgstr "Crear un novo contacto"
 
-#: po/tmp/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete a contact"
 msgstr "Borrar un contacto"
 
-#: 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 "Buscar"
 
-#: po/tmp/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:11
 msgid "Find a contact"
 msgstr "Buscar un contacto"
 
-#: 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 "Novo"
 
-#: po/tmp/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:14
 msgid "Print contacts"
 msgstr "Imprimir contactos"
 
-#: po/tmp/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:15
 msgid "Stop"
 msgstr "Parar"
 
-#: po/tmp/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:16
 msgid "Stop Loading"
 msgstr "Parar a Carga"
 
-#: po/tmp/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:17
 msgid "View All"
 msgstr "Ver Todos"
 
-#: po/tmp/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:18
 msgid "View all contacts"
 msgstr "Ver tСdolos contactos"
 
-#: po/tmp/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "_Addressbook Configuration..."
+msgstr "ConfiguraciСn do _Correo..."
+
+#: ui/evolution-addressbook.xml.h:20
 msgid "_Print Contacts..."
 msgstr "_Imprimir Contactos..."
 
-#: po/tmp/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:21
 msgid "_Search for contacts"
 msgstr "_Buscar contactos"
 
-#: po/tmp/evolution-addressbook.xml.h:21
-#: po/tmp/evolution-event-editor.xml.h:123
+#: ui/evolution-addressbook.xml.h:22 ui/evolution-event-editor.xml.h:123
 msgid "_Tools"
 msgstr "_Ferramentas"
 
 #.
-#. * 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 DМas"
 
-#: 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
 #, fuzzy
 msgid "Ca_lendar"
 msgstr "Axenda"
 
-#: po/tmp/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:9
 msgid "Calendar Preferences..."
 msgstr "Preferencias da Axenda..."
 
-#: po/tmp/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:10
 msgid "Create a new appointment"
 msgstr "Crear unha nova cita"
 
-#: po/tmp/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:11
 msgid "Create a new calendar"
 msgstr "Crear unha nova axenda"
 
-#: po/tmp/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:12
 msgid "Day"
 msgstr "DМa"
 
-#: po/tmp/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:13
 msgid "Go back in time"
 msgstr "Ir para atrАs no tempo"
 
-#: po/tmp/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:14
 msgid "Go forward in time"
 msgstr "Ir para diante no tempo"
 
-#: po/tmp/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to"
 msgstr "Ir para"
 
-#: po/tmp/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to a specific date"
 msgstr "Ir para a data especificada"
 
-#: 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 "Mes"
 
-#: 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 "Seguinte"
 
-#: po/tmp/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:21
 msgid "Open a calendar"
 msgstr "Abrir unha axenda"
 
-#: 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 "Imprimir esta axenda"
 
-#: 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 "Amosar un dМa"
 
-#: po/tmp/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:27
 msgid "Show 1 month"
 msgstr "Amosar un mes"
 
-#: po/tmp/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:28
 msgid "Show 1 week"
 msgstr "Amosar unha semana"
 
-#: po/tmp/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr "Amosar a semana laboral"
 
-#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:414
+#: ui/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:413
 msgid "Today"
 msgstr "Hoxe"
 
-#: po/tmp/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:31
 msgid "Week"
 msgstr "Semana"
 
-#: 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 "_Novo"
 
-#: po/tmp/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:33
 msgid "_Open Calendar"
 msgstr "_Abrir axenda"
 
-#: po/tmp/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:34
 msgid "_Print this calendar"
 msgstr "_Imprimir esta axenda"
 
-#: po/tmp/evolution-calendar.xml.h:35
-msgid "_Save Calendar As"
-msgstr "_Gardar Axenda Como"
+#: ui/evolution-calendar.xml.h:35
+#, fuzzy
+msgid "_Save As..."
+msgstr "Gardar _Como..."
 
-#: po/tmp/evolution-contact-editor.xml.h:7
+#: ui/evolution-contact-editor.xml.h:7
 msgid "Delete this item"
 msgstr "Borrar este elemento"
 
-#: po/tmp/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:8
 #, fuzzy
 msgid "Delete..."
 msgstr "Eliminar"
 
-#: po/tmp/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Help"
 msgstr "Axuda"
 
-#: po/tmp/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:10
 #, fuzzy
 msgid "Print En_velope..."
 msgstr "_ConfiguraciСn da ImpresiСn..."
 
-#: 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 "Imprimir este elemento"
 
-#: 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 "Imprimir..."
 
-#: po/tmp/evolution-contact-editor.xml.h:13
-#: po/tmp/evolution-event-editor.xml.h:89
-#: po/tmp/evolution-message-composer.xml.h:18
+#: 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 "Gardar _Como..."
 
-#: 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 "Gardar e Pechar"
 
-#: 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 "Gardar o contacto e pechar a caixa de diАlogo"
 
-#: 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 "Ver a axuda online"
 
-#: po/tmp/evolution-contact-editor.xml.h:18
+#: ui/evolution-contact-editor.xml.h:18
 #, fuzzy
 msgid "Send _message to contact..."
 msgstr "Enviar unha mensaxe sen asunto"
 
-#: po/tmp/evolution-contact-editor.xml.h:19
-#: po/tmp/evolution-event-editor.xml.h:110
-#: po/tmp/evolution-message-composer.xml.h:38
-#: 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 "_Ficheiro"
 
-#: po/tmp/evolution-contact-editor.xml.h:20
+#: ui/evolution-contact-editor.xml.h:20
 #, fuzzy
 msgid "_Print..."
 msgstr "Imprimir..."
 
-#: po/tmp/evolution-contact-editor.xml.h:21
-#: po/tmp/evolution-event-editor.xml.h:121
-#: po/tmp/evolution-message-composer.xml.h:42
+#: ui/evolution-contact-editor.xml.h:21 ui/evolution-event-editor.xml.h:121
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Save"
 msgstr "_Gardar"
 
 #.
-#. * 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 "Acerca desta aplicaciСn"
 
-#: po/tmp/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:7
 msgid "About..."
 msgstr "Acerca de..."
 
-#: po/tmp/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:8
 msgid "Actio_ns"
 msgstr "AcciС_ns"
 
-#: po/tmp/evolution-event-editor.xml.h:9
+#: ui/evolution-event-editor.xml.h:9
 msgid "C_lear"
 msgstr "_Limpar"
 
-#: po/tmp/evolution-event-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:10
 msgid "C_ut"
 msgstr "Co_rtar"
 
-#: po/tmp/evolution-event-editor.xml.h:11
+#: ui/evolution-event-editor.xml.h:11
 msgid "Clear"
 msgstr "Limpar"
 
-#: po/tmp/evolution-event-editor.xml.h:12
+#: ui/evolution-event-editor.xml.h:12
 msgid "Clear the selection"
 msgstr "Limpar a selecciСn"
 
-#: po/tmp/evolution-event-editor.xml.h:14
+#: ui/evolution-event-editor.xml.h:14
 msgid "Close this appointment"
 msgstr "Pechar esta cita"
 
-#: 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 "Copiar"
 
-#: po/tmp/evolution-event-editor.xml.h:16
+#: ui/evolution-event-editor.xml.h:16
 msgid "Copy the selection"
 msgstr "Copiar a selecciСn"
 
-#: po/tmp/evolution-event-editor.xml.h:17
+#: ui/evolution-event-editor.xml.h:17
 msgid "Cut"
 msgstr "Cortar"
 
-#: po/tmp/evolution-event-editor.xml.h:18
+#: ui/evolution-event-editor.xml.h:18
 msgid "Cut the selection"
 msgstr "Cortar a selecciСn"
 
-#: po/tmp/evolution-event-editor.xml.h:21
+#: ui/evolution-event-editor.xml.h:21
 msgid "Dump XML"
 msgstr "Envorcar XML"
 
-#: po/tmp/evolution-event-editor.xml.h:22
+#: ui/evolution-event-editor.xml.h:22
 msgid "Dump the UI Xml description"
 msgstr "Envorcar a descriciСn Xml da Interface"
 
-#: po/tmp/evolution-event-editor.xml.h:23
+#: ui/evolution-event-editor.xml.h:23
 msgid "FIXME: Address _Book..."
 msgstr "FIXME: _Libro de enderezos..."
 
-#: po/tmp/evolution-event-editor.xml.h:24
+#: ui/evolution-event-editor.xml.h:24
 msgid "FIXME: Ch_oose Form..."
 msgstr "FIXME: Es_colla un Formulario..."
 
-#: po/tmp/evolution-event-editor.xml.h:25
+#: ui/evolution-event-editor.xml.h:25
 msgid "FIXME: Chec_k Names"
 msgstr "FIXME: Veri_ficar Nomes"
 
-#: po/tmp/evolution-event-editor.xml.h:26
+#: ui/evolution-event-editor.xml.h:26
 msgid "FIXME: Cop_y to Folder..."
 msgstr "FIXME: Cop_iar А Carpeta..."
 
-#: po/tmp/evolution-event-editor.xml.h:27
+#: ui/evolution-event-editor.xml.h:27
 msgid "FIXME: D_esign a Form..."
 msgstr "FIXME: _DeseЯar un Formulario..."
 
-#: po/tmp/evolution-event-editor.xml.h:28
+#: ui/evolution-event-editor.xml.h:28
 msgid "FIXME: Define Print _Styles"
 msgstr "FIXME: Definir E_stilos de ImpresiСn"
 
-#: po/tmp/evolution-event-editor.xml.h:29
+#: ui/evolution-event-editor.xml.h:29
 msgid "FIXME: Desi_gn This Form"
 msgstr "FIXME: DeseЯar este _Formulario"
 
-#: po/tmp/evolution-event-editor.xml.h:30
+#: ui/evolution-event-editor.xml.h:30
 msgid "FIXME: Fi_rst Item in Folder"
 msgstr "FIXME: Pri_meiro elemento na Carpeta"
 
-#: po/tmp/evolution-event-editor.xml.h:31
+#: ui/evolution-event-editor.xml.h:31
 msgid "FIXME: For_ward"
 msgstr "FIXME: _Reenviar"
 
-#: po/tmp/evolution-event-editor.xml.h:32
+#: ui/evolution-event-editor.xml.h:32
 msgid "FIXME: Forward as v_Calendar"
 msgstr "FIXME: Reenviar como v_Calendar"
 
-#: po/tmp/evolution-event-editor.xml.h:33
+#: ui/evolution-event-editor.xml.h:33
 msgid "FIXME: Help"
 msgstr "FIXME: Axuda"
 
-#: po/tmp/evolution-event-editor.xml.h:34
+#: ui/evolution-event-editor.xml.h:34
 msgid "FIXME: In_complete Task"
 msgstr "FIXME: Tarefa in_completa"
 
-#: po/tmp/evolution-event-editor.xml.h:35
+#: ui/evolution-event-editor.xml.h:35
 msgid "FIXME: Insert File"
 msgstr "FIXME: Inserir Ficheiro"
 
-#: po/tmp/evolution-event-editor.xml.h:36
+#: ui/evolution-event-editor.xml.h:36
 msgid "FIXME: It_em..."
 msgstr "FIXME: _Elemento..."
 
-#: po/tmp/evolution-event-editor.xml.h:37
+#: ui/evolution-event-editor.xml.h:37
 msgid "FIXME: Paste _Special... "
 msgstr "FIXME: Pegar _Especial..."
 
-#: po/tmp/evolution-event-editor.xml.h:38
+#: ui/evolution-event-editor.xml.h:38
 msgid "FIXME: Print Pre_view"
 msgstr "FIXME: Pre_visualizaciСn da ImpresiСn"
 
-#: po/tmp/evolution-event-editor.xml.h:39
+#: ui/evolution-event-editor.xml.h:39
 msgid "FIXME: Pu_blish Form As..."
 msgstr "FIXME: Pu_blicar Formulario Como..."
 
-#: po/tmp/evolution-event-editor.xml.h:40
+#: ui/evolution-event-editor.xml.h:40
 msgid "FIXME: Publish _Form..."
 msgstr "FIXME: Publicar _Formulario..."
 
-#: 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 "FIXME: _Enviar"
 
-#: po/tmp/evolution-event-editor.xml.h:43
+#: ui/evolution-event-editor.xml.h:43
 msgid "FIXME: Save Attac_hments..."
 msgstr "FIXME: Gardar Ane_xos..."
 
-#: po/tmp/evolution-event-editor.xml.h:44
+#: ui/evolution-event-editor.xml.h:44
 msgid "FIXME: Script _Debugger"
 msgstr "FIXME: _Depurador de Script"
 
-#: po/tmp/evolution-event-editor.xml.h:45
+#: ui/evolution-event-editor.xml.h:45
 msgid "FIXME: Task _Request"
 msgstr "FIXME: Solicitude de _Tarefa"
 
-#: po/tmp/evolution-event-editor.xml.h:46
+#: ui/evolution-event-editor.xml.h:46
 msgid "FIXME: _Contact"
 msgstr "FIXME: _Contacto"
 
-#: po/tmp/evolution-event-editor.xml.h:47
+#: ui/evolution-event-editor.xml.h:47
 msgid "FIXME: _Customize..."
 msgstr "FIXME: _Personalizar..."
 
-#: po/tmp/evolution-event-editor.xml.h:48
+#: ui/evolution-event-editor.xml.h:48
 msgid "FIXME: _File..."
 msgstr "FIXME: _Ficheiro..."
 
-#: po/tmp/evolution-event-editor.xml.h:49
+#: ui/evolution-event-editor.xml.h:49
 msgid "FIXME: _Font..."
 msgstr "FIXME: _Fonte..."
 
-#: po/tmp/evolution-event-editor.xml.h:50
+#: ui/evolution-event-editor.xml.h:50
 msgid "FIXME: _Formatting"
 msgstr "FIXME: Fo_rmato"
 
-#: po/tmp/evolution-event-editor.xml.h:51
+#: ui/evolution-event-editor.xml.h:51
 msgid "FIXME: _Item"
 msgstr "FIXME: _Elemento"
 
-#: po/tmp/evolution-event-editor.xml.h:52
+#: ui/evolution-event-editor.xml.h:52
 msgid "FIXME: _Journal Entry"
 msgstr "FIXME: Entrada de _Xornal"
 
-#: po/tmp/evolution-event-editor.xml.h:53
+#: ui/evolution-event-editor.xml.h:53
 msgid "FIXME: _Last Item in Folder"
 msgstr "FIXME: _Derradeiro Elemento na Carpeta"
 
-#: po/tmp/evolution-event-editor.xml.h:54
+#: ui/evolution-event-editor.xml.h:54
 msgid "FIXME: _Mail Message"
 msgstr "FIXME: Enviar _Mensaxe"
 
-#: 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
 msgid "FIXME: _Move to Folder..."
 msgstr "FIXME: _Mover para a Carpeta..."
 
-#: po/tmp/evolution-event-editor.xml.h:57
+#: ui/evolution-event-editor.xml.h:57
 msgid "FIXME: _New Appointment"
 msgstr "FIXME: _Nova Cita"
 
-#: po/tmp/evolution-event-editor.xml.h:58
+#: ui/evolution-event-editor.xml.h:58
 msgid "FIXME: _Note"
 msgstr "FIXME: _Nota"
 
-#: po/tmp/evolution-event-editor.xml.h:59
+#: ui/evolution-event-editor.xml.h:59
 msgid "FIXME: _Object..."
 msgstr "FIXME: _Obxecto..."
 
-#: po/tmp/evolution-event-editor.xml.h:60
+#: ui/evolution-event-editor.xml.h:60
 msgid "FIXME: _Paragraph..."
 msgstr "FIXME: _ParАgrafo..."
 
-#: po/tmp/evolution-event-editor.xml.h:61
+#: ui/evolution-event-editor.xml.h:61
 msgid "FIXME: _Spelling..."
 msgstr "FIXME: _OrtografМa..."
 
-#: po/tmp/evolution-event-editor.xml.h:62
+#: ui/evolution-event-editor.xml.h:62
 msgid "FIXME: _Standard"
 msgstr "FIXME: _EstАndar"
 
-#: po/tmp/evolution-event-editor.xml.h:63
+#: ui/evolution-event-editor.xml.h:63
 msgid "FIXME: _Task"
 msgstr "FIXME: _Tarefa"
 
-#: po/tmp/evolution-event-editor.xml.h:64
+#: ui/evolution-event-editor.xml.h:64
 msgid "FIXME: _Unread Item"
 msgstr "FIXME: Elemento _non Lido"
 
-#: 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:10
+#: ui/evolution-event-editor.xml.h:66 ui/evolution-message-composer.xml.h:11
 msgid "F_ormat"
 msgstr "_Formatar"
 
-#: po/tmp/evolution-event-editor.xml.h:68
+#: ui/evolution-event-editor.xml.h:68
 msgid "Find Again"
 msgstr "Buscar Novamente"
 
-#: po/tmp/evolution-event-editor.xml.h:69
+#: ui/evolution-event-editor.xml.h:69
 msgid "Find _Again"
 msgstr "Buscar _Novamente"
 
-#: po/tmp/evolution-event-editor.xml.h:70
+#: ui/evolution-event-editor.xml.h:70
 msgid "Go to the next item"
 msgstr "Ir С elemento seguinte"
 
-#: po/tmp/evolution-event-editor.xml.h:71
+#: ui/evolution-event-editor.xml.h:71
 msgid "Go to the previous item"
 msgstr "Ir С elemento anterior"
 
-#: po/tmp/evolution-event-editor.xml.h:72
+#: ui/evolution-event-editor.xml.h:72
 msgid "Modify the file's properties"
 msgstr "Modificar as propiedades do ficheiro"
 
-#: po/tmp/evolution-event-editor.xml.h:73
+#: ui/evolution-event-editor.xml.h:73
 msgid "N_ext"
 msgstr "Se_guinte"
 
-#: po/tmp/evolution-event-editor.xml.h:75
+#: ui/evolution-event-editor.xml.h:75
 msgid "Paste"
 msgstr "Pegar"
 
-#: po/tmp/evolution-event-editor.xml.h:76
+#: ui/evolution-event-editor.xml.h:76
 msgid "Paste the clipboard"
 msgstr "Pegar o contido do cartafol"
 
-#: po/tmp/evolution-event-editor.xml.h:77
+#: ui/evolution-event-editor.xml.h:77
 msgid "Pre_vious"
 msgstr "An_terior"
 
-#: po/tmp/evolution-event-editor.xml.h:78
+#: ui/evolution-event-editor.xml.h:78
 msgid "Previous"
 msgstr "Anterior"
 
-#: po/tmp/evolution-event-editor.xml.h:79
+#: ui/evolution-event-editor.xml.h:79
 msgid "Print S_etup..."
 msgstr "_ConfiguraciСn da ImpresiСn..."
 
-#: po/tmp/evolution-event-editor.xml.h:80
+#: ui/evolution-event-editor.xml.h:80
 msgid "Print Setup"
 msgstr "ConfiguraciСn da ImpresiСn"
 
-#: po/tmp/evolution-event-editor.xml.h:83
+#: ui/evolution-event-editor.xml.h:83
 msgid "Properties"
 msgstr "Propiedades"
 
-#: po/tmp/evolution-event-editor.xml.h:84
+#: ui/evolution-event-editor.xml.h:84
 msgid "Redo"
 msgstr "Refacer"
 
-#: po/tmp/evolution-event-editor.xml.h:85
+#: ui/evolution-event-editor.xml.h:85
 msgid "Redo the undone action"
 msgstr "Refacer a acciСn desfeita"
 
-#: po/tmp/evolution-event-editor.xml.h:86
+#: ui/evolution-event-editor.xml.h:86
 msgid "Replace"
 msgstr "SubstituМr"
 
-#: po/tmp/evolution-event-editor.xml.h:87
+#: ui/evolution-event-editor.xml.h:87
 msgid "Replace a string"
 msgstr "SubstituМr unha cadea"
 
-#: 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 "Gardar a cita e pechar a caixa de diАlogo"
 
-#: po/tmp/evolution-event-editor.xml.h:92
-#: po/tmp/evolution-message-composer.xml.h:21
+#: ui/evolution-event-editor.xml.h:92 ui/evolution-message-composer.xml.h:24
 msgid "Save the current file"
 msgstr "Gardar o ficheiro actual"
 
-#: po/tmp/evolution-event-editor.xml.h:93
+#: ui/evolution-event-editor.xml.h:93
 #, fuzzy
 msgid "Schedule Meeting"
 msgstr "FIXME: Programar ReuniСn"
 
-#: po/tmp/evolution-event-editor.xml.h:94
+#: ui/evolution-event-editor.xml.h:94
 #, fuzzy
 msgid "Schedule _Meeting"
 msgstr "FIXME: _Programar ReuniСn"
 
-#: 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 "Buscar novamente a mesma cadea"
 
-#: po/tmp/evolution-event-editor.xml.h:97
+#: ui/evolution-event-editor.xml.h:97
 msgid "Search for a string"
 msgstr "Buscar unha cadea"
 
-#: 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
 msgid "Select everything"
 msgstr "Seleccionar todo"
 
-#: 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 "Configurar as opciСns de pАxina para a impresora actual"
 
-#: po/tmp/evolution-event-editor.xml.h:102
+#: ui/evolution-event-editor.xml.h:102
 msgid "Undo"
 msgstr "Desfacer"
 
-#: po/tmp/evolution-event-editor.xml.h:103
+#: ui/evolution-event-editor.xml.h:103
 msgid "Undo the last action"
 msgstr "Desfacer a Зltima acciСn"
 
-#: po/tmp/evolution-event-editor.xml.h:104
-#: po/tmp/evolution-message-composer.xml.h:34
+#: ui/evolution-event-editor.xml.h:104 ui/evolution-message-composer.xml.h:38
 msgid "_About..."
 msgstr "_Acerca de..."
 
-#: po/tmp/evolution-event-editor.xml.h:105
-#: po/tmp/evolution-message-composer.xml.h:35
+#: ui/evolution-event-editor.xml.h:105 ui/evolution-message-composer.xml.h:39
 msgid "_Close"
 msgstr "_Pechar"
 
-#: po/tmp/evolution-event-editor.xml.h:106
+#: ui/evolution-event-editor.xml.h:106
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: po/tmp/evolution-event-editor.xml.h:107
-#: po/tmp/evolution-message-composer.xml.h:36
+#: ui/evolution-event-editor.xml.h:107 ui/evolution-message-composer.xml.h:40
 msgid "_Debug"
 msgstr "_DepuraciСn"
 
-#: po/tmp/evolution-event-editor.xml.h:109
-#: po/tmp/evolution-message-composer.xml.h:37
-#: 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 "_Editar"
 
-#: po/tmp/evolution-event-editor.xml.h:111
+#: ui/evolution-event-editor.xml.h:111
 msgid "_Find..."
 msgstr "_Buscar..."
 
-#: po/tmp/evolution-event-editor.xml.h:112
+#: ui/evolution-event-editor.xml.h:112
 msgid "_Forms"
 msgstr "_Formularios"
 
-#: po/tmp/evolution-event-editor.xml.h:113
-#: po/tmp/evolution-message-composer.xml.h:39 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 "A_xuda"
 
-#: po/tmp/evolution-event-editor.xml.h:114
+#: ui/evolution-event-editor.xml.h:114
 msgid "_Insert"
 msgstr "_Inserir"
 
-#: po/tmp/evolution-event-editor.xml.h:115
+#: ui/evolution-event-editor.xml.h:115
 msgid "_Object"
 msgstr "_Obxecto"
 
-#: po/tmp/evolution-event-editor.xml.h:116
+#: ui/evolution-event-editor.xml.h:116
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: po/tmp/evolution-event-editor.xml.h:117
+#: ui/evolution-event-editor.xml.h:117
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: po/tmp/evolution-event-editor.xml.h:118
+#: ui/evolution-event-editor.xml.h:118
 msgid "_Properties..."
 msgstr "_Propiedades..."
 
-#: po/tmp/evolution-event-editor.xml.h:119
+#: ui/evolution-event-editor.xml.h:119
 msgid "_Redo"
 msgstr "_Refacer"
 
-#: po/tmp/evolution-event-editor.xml.h:120
+#: ui/evolution-event-editor.xml.h:120
 msgid "_Replace..."
 msgstr "_SubstituМr..."
 
-#: po/tmp/evolution-event-editor.xml.h:122
+#: ui/evolution-event-editor.xml.h:122
 msgid "_Toolbars"
 msgstr "_Barras de ferramentas"
 
-#: po/tmp/evolution-event-editor.xml.h:124
+#: ui/evolution-event-editor.xml.h:124
 msgid "_Undo"
 msgstr "_Desfacer"
 
 #.
-#. * 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 "Redactar"
 
-#: po/tmp/evolution-mail.xml.h:7
+#: ui/evolution-mail.xml.h:7
 msgid "Compose a new message"
 msgstr "Redactar unha nova mensaxe"
 
-#: po/tmp/evolution-mail.xml.h:9
+#: ui/evolution-mail.xml.h:9
 msgid "Copy message to a new folder"
 msgstr "Copiar a mensaxe nunha nova carpeta"
 
-#: 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 "_Carpeta"
 
-#: 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 "Esquecer _Contrasinais"
 
-#: po/tmp/evolution-mail.xml.h:20
+#: ui/evolution-mail.xml.h:20
 msgid "Get Mail"
 msgstr "Recibir Correo"
 
-#: po/tmp/evolution-mail.xml.h:21
+#: ui/evolution-mail.xml.h:22
 #, fuzzy
-msgid "Mail _Filters"
+msgid "Hide _Deleted messages"
+msgstr "Borrar Mensaxe"
+
+#: ui/evolution-mail.xml.h:23
+#, fuzzy
+msgid "Hide _Read messages"
+msgstr "Mensaxe reenviada - %s"
+
+#: ui/evolution-mail.xml.h:24
+#, fuzzy
+msgid "Hide _Selected messages"
+msgstr "Imprimir a mensaxe seleccionada"
+
+#: ui/evolution-mail.xml.h:25
+#, fuzzy
+msgid "Mail _Filters..."
 msgstr "_Filtros de Correo..."
 
-#: po/tmp/evolution-mail.xml.h:22
+#: ui/evolution-mail.xml.h:26
 #, fuzzy
-msgid "Manage Subscriptions"
+msgid "Manage Subscriptions..."
 msgstr "DescriciСn:"
 
-#: po/tmp/evolution-mail.xml.h:23
+#: ui/evolution-mail.xml.h:27
 msgid "Mar_k As Read"
 msgstr "Marcar como _Lida"
 
-#: po/tmp/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:28
 msgid "Mark As U_nread"
 msgstr "Marcar como _non Lida"
 
-#: po/tmp/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:29
 msgid "Move"
 msgstr "Mover"
 
-#: po/tmp/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:30
 msgid "Move message to a new folder"
 msgstr "Mover mensaxe a unha nova carpeta"
 
-#: po/tmp/evolution-mail.xml.h:27
+#: ui/evolution-mail.xml.h:31
 msgid "Previews the message to be printed"
 msgstr "Previsualiza a mensaxe que se vai imprimir"
 
-#: po/tmp/evolution-mail.xml.h:29
+#: ui/evolution-mail.xml.h:33
 msgid "Print Preview of message..."
 msgstr "PrevisualizaciСn da ImpresiСn da mensaxe..."
 
-#: po/tmp/evolution-mail.xml.h:30
+#: ui/evolution-mail.xml.h:34
 msgid "Print message to the printer"
 msgstr "Imprimir mensaxe na impresora"
 
-#: po/tmp/evolution-mail.xml.h:31
+#: ui/evolution-mail.xml.h:35
 msgid "Print message..."
 msgstr "Imprimir mensaxe..."
 
-#: po/tmp/evolution-mail.xml.h:35
+#: ui/evolution-mail.xml.h:39
 msgid "Reply to _All"
 msgstr "Responder a _Todos"
 
-#: po/tmp/evolution-mail.xml.h:36
+#: ui/evolution-mail.xml.h:40
 msgid "Reply to _Sender"
 msgstr "Responder С _Autor"
 
-#: po/tmp/evolution-mail.xml.h:39 po/tmp/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:43 ui/evolution-subscribe.xml.h:12
 msgid "Select _All"
 msgstr "Seleccionar _Todo"
 
-#: po/tmp/evolution-mail.xml.h:40
+#: ui/evolution-mail.xml.h:44
 msgid "Send queued mail and retrieve new mail"
 msgstr "Enviar o correo na cola e recibir o correo novo"
 
-#: po/tmp/evolution-mail.xml.h:41
+#: ui/evolution-mail.xml.h:45
+#, fuzzy
+msgid "Show _All messages"
+msgstr "Ver Todos"
+
+#: ui/evolution-mail.xml.h:46
 msgid "Threaded Message list"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:42
+#: ui/evolution-mail.xml.h:47
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:48
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:49
 msgid "View Raw Message Source"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:50
 msgid "_Apply Filters"
 msgstr "_Aplicar Filtros"
 
-#: po/tmp/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:51
 msgid "_Configure Folder"
 msgstr "_Configurar Carpeta"
 
-#: po/tmp/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:52
 #, fuzzy
 msgid "_Copy to Folder..."
 msgstr "_Copiar А Carpeta"
 
-#: po/tmp/evolution-mail.xml.h:49
+#: ui/evolution-mail.xml.h:54
 msgid "_Edit Message"
 msgstr "_Editar Mensaxe"
 
-#: po/tmp/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:55
 msgid "_Expunge"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:56
 msgid "_Filter on Subject"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:57
 msgid "_Forward"
 msgstr "_Reenviar"
 
-#: po/tmp/evolution-mail.xml.h:53 po/tmp/evolution-subscribe.xml.h:17
+#: ui/evolution-mail.xml.h:58 ui/evolution-subscribe.xml.h:17
 msgid "_Invert Selection"
 msgstr "_Inverter SelecciСn"
 
-#: po/tmp/evolution-mail.xml.h:54
-#, fuzzy
-msgid "_Mail Configuration"
-msgstr "ConfiguraciСn do Correo"
+#: ui/evolution-mail.xml.h:59
+msgid "_Mail Configuration..."
+msgstr "ConfiguraciСn do _Correo..."
 
-#: po/tmp/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:60
 msgid "_Message"
 msgstr "_Mensaxe"
 
-#: po/tmp/evolution-mail.xml.h:56
+#: ui/evolution-mail.xml.h:61
 #, fuzzy
 msgid "_Move to Folder..."
 msgstr "_Mover para a Carpeta"
 
-#: po/tmp/evolution-mail.xml.h:57
+#: ui/evolution-mail.xml.h:62
 msgid "_Open in New Window"
 msgstr "_Abrir nunha Nova Fiestra"
 
-#: po/tmp/evolution-mail.xml.h:58
+#: ui/evolution-mail.xml.h:63
 msgid "_Print Message"
 msgstr "_Imprimir Mensaxe"
 
-#: po/tmp/evolution-mail.xml.h:59
+#: ui/evolution-mail.xml.h:64
 #, fuzzy
 msgid "_Save Message As..."
 msgstr "Gardar como..."
 
-#: po/tmp/evolution-mail.xml.h:60
+#: ui/evolution-mail.xml.h:65
 #, fuzzy
 msgid "_Source"
 msgstr "Fontes"
 
-#: po/tmp/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:66
 msgid "_Threaded"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:67
 #, fuzzy
 msgid "_Undelete"
 msgstr "_Borrar"
 
-#: po/tmp/evolution-mail.xml.h:63
+#: ui/evolution-mail.xml.h:68
 msgid "_VFolder on Subject"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:64
+#: ui/evolution-mail.xml.h:69
 #, fuzzy
-msgid "_Virtual Folder Editor"
+msgid "_Virtual Folder Editor..."
 msgstr "Carpetas Virtuais"
 
 #.
-#. * 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
 #, fuzzy
 msgid "Attach"
 msgstr "IncluМr un ficheiro"
 
-#: po/tmp/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:9
 #, fuzzy
 msgid "Close the current file"
 msgstr "Gardar o ficheiro actual"
 
-#: po/tmp/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Encrypt this message with PGP"
+msgstr "Mensaxe cifrada"
+
+#: ui/evolution-message-composer.xml.h:12
 msgid "HTML"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:13
 #, fuzzy
 msgid "Insert a file as text into the message"
 msgstr "IncluМr un ficheiro como anexo na mensaxe"
 
-#: po/tmp/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:14
 msgid "Insert text file..."
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:16
 #, fuzzy
 msgid "Open a file"
 msgstr "Abrir ficheiro"
 
-#: po/tmp/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:17
+msgid "PGP Encrypt"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:18
+msgid "PGP Sign"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:20
 #, fuzzy
 msgid "Save As"
 msgstr "Gardar _Como"
 
-#: po/tmp/evolution-message-composer.xml.h:19
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save in _folder... (FIXME)"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:23
 #, fuzzy
 msgid "Save in folder..."
 msgstr "Ir А carpeta..."
 
-#: po/tmp/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:25
 #, fuzzy
 msgid "Save the current file with a different name"
 msgstr "Gardar o ficheiro actual"
 
-#: po/tmp/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:26
 #, fuzzy
 msgid "Save the message in a specified folder"
 msgstr "Mover mensaxe a unha nova carpeta"
 
-#: po/tmp/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:27
 #, fuzzy
 msgid "Send"
 msgstr "Autor"
 
-#: po/tmp/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:28
 #, fuzzy
 msgid "Send _Later"
 msgstr "Autor"
 
-#: po/tmp/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:29
 #, fuzzy
 msgid "Send _later"
 msgstr "Autor"
 
-#: po/tmp/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:30
 #, fuzzy
 msgid "Send the mail in HTML format"
 msgstr "Enviar mensaxes en formato HTML"
 
-#: po/tmp/evolution-message-composer.xml.h:28
+#: ui/evolution-message-composer.xml.h:31
 #, fuzzy
 msgid "Send the message later"
 msgstr "Previsualiza a mensaxe que se vai imprimir"
 
-#: po/tmp/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:32
 #, fuzzy
 msgid "Send the message now"
 msgstr "Enviar mensaxes en formato HTML"
 
-#: po/tmp/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:33
 #, fuzzy
 msgid "Send this message now"
 msgstr "Borrar esta mensaxe"
 
-#: po/tmp/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:34
 #, fuzzy
 msgid "Show / hide attachments"
 msgstr "Gardar Anexo"
 
-#: po/tmp/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:35
 #, fuzzy
 msgid "Show _attachments"
 msgstr "anexo"
 
-#: po/tmp/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:36
 #, fuzzy
 msgid "Show attachments"
 msgstr "anexo"
 
-#: po/tmp/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Sign this message with your PGP key"
+msgstr "Enviando unha mensaxe sen asunto"
+
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Insert text file... (FIXME)"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:45
 #, fuzzy
 msgid "_Open..."
 msgstr "Abrir..."
 
+#: 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 "Engadir a carpeta А sЗa lista de carpetas subscritas"
 
-#: po/tmp/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:9
 msgid "Refresh List"
 msgstr "Actualizar Lista"
 
-#: po/tmp/evolution-subscribe.xml.h:10
+#: ui/evolution-subscribe.xml.h:10
 msgid "Refresh List of Folders"
 msgstr "Actualizar Lista de Carpetas"
 
-#: po/tmp/evolution-subscribe.xml.h:11
+#: ui/evolution-subscribe.xml.h:11
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Eliminar a carpeta da sЗa lista de carpetas subscritas"
 
-#: po/tmp/evolution-subscribe.xml.h:13
+#: ui/evolution-subscribe.xml.h:13
 msgid "Subscribe"
 msgstr "Subscribir"
 
-#: po/tmp/evolution-subscribe.xml.h:14
+#: ui/evolution-subscribe.xml.h:14
 msgid "Unsubscribe"
 msgstr "Desubscribir"
 
 #.
-#. * 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 "Visualizar unha carpeta diferente"
 
-#: po/tmp/evolution.xml.h:7
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "_SaМr"
 
-#: po/tmp/evolution.xml.h:8
+#: ui/evolution.xml.h:8
 msgid "Evolution bar _shortcut"
 msgstr "_Atallo da barra do Evolution"
 
-#: po/tmp/evolution.xml.h:9
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "SaМr do programa"
 
-#: po/tmp/evolution.xml.h:10
+#: ui/evolution.xml.h:10
 msgid "Getting _Started"
 msgstr "_IniciaciСn"
 
-#: po/tmp/evolution.xml.h:11
+#: ui/evolution.xml.h:11
 msgid "Show information about Evolution"
 msgstr "Amosar informaciСn sobre o Evolution"
 
-#: po/tmp/evolution.xml.h:12
+#: ui/evolution.xml.h:12
 msgid "Show the _Folder Bar"
 msgstr "Amosar a Barra de _Carpetas"
 
-#: po/tmp/evolution.xml.h:13
+#: ui/evolution.xml.h:13
 msgid "Show the _Shortcut Bar"
 msgstr "Amosar a Barra de _Atallos"
 
-#: po/tmp/evolution.xml.h:14
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "Submit _Bug Report"
 msgstr "_Enviar un Informe de Erro"
 
-#: po/tmp/evolution.xml.h:15
+#: ui/evolution.xml.h:15
 #, fuzzy
 msgid "Submit bug report using Bug Buddy."
 msgstr "Enviar un informe de erro usando o 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 "Uso do Xestor de Co_ntactos"
 
-#: po/tmp/evolution.xml.h:19
+#: ui/evolution.xml.h:19
 msgid "Using the _Calendar"
 msgstr "Uso da _Axenda"
 
-#: po/tmp/evolution.xml.h:20
+#: ui/evolution.xml.h:20
 msgid "Using the _Mailer"
 msgstr "Uso do Cliente de _Correo"
 
-#: po/tmp/evolution.xml.h:21
+#: ui/evolution.xml.h:21
 msgid "_About Evolution..."
 msgstr "_Acerca do Evolution..."
 
-#: po/tmp/evolution.xml.h:22
+#: ui/evolution.xml.h:22
 msgid "_Appointment (FIXME)"
 msgstr "_Cita (FIXME)"
 
-#: po/tmp/evolution.xml.h:23
+#: ui/evolution.xml.h:23
 msgid "_Contact (FIXME)"
 msgstr "_Contacto (FIXME)"
 
-#: po/tmp/evolution.xml.h:26
+#: ui/evolution.xml.h:26
 msgid "_Folder"
 msgstr "_Carpeta"
 
-#: po/tmp/evolution.xml.h:27
+#: ui/evolution.xml.h:27
 msgid "_Go to Folder..."
 msgstr "_Ir para a Carpeta..."
 
-#: po/tmp/evolution.xml.h:29
+#: ui/evolution.xml.h:29
 msgid "_Index"
 msgstr "м_ndice"
 
-#: 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 "_ConfiguraciСn"
 
-#: po/tmp/evolution.xml.h:33
+#: ui/evolution.xml.h:33
 msgid "_Task (FIXME)"
 msgstr "_Tarefa (FIXME)"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2470
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d de %B de %Y"
 
@@ -6650,28 +7123,34 @@ msgstr "Hora do _final da reuniСn:"
 msgid "All Attendees"
 msgstr ""
 
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: widgets/misc/e-calendar-item.c:421
+msgid "MTWTFSS"
+msgstr "LMMXVSD"
+
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
+#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
 msgid "%B %Y"
 msgstr "%B de %Y"
 
-#: widgets/misc/e-clipped-label.c:107
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-dateedit.c:408
+#: widgets/misc/e-dateedit.c:407
 msgid "Now"
 msgstr "Agora"
 
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1249 widgets/misc/e-dateedit.c:1308
-#: widgets/misc/e-dateedit.c:1487
+#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
+#: widgets/misc/e-dateedit.c:1486
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1252 widgets/misc/e-dateedit.c:1311
-#: widgets/misc/e-dateedit.c:1490
+#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
+#: widgets/misc/e-dateedit.c:1489
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
@@ -6680,19 +7159,210 @@ msgstr "%I:%M %p"
 msgid "Group %i"
 msgstr "Grupo %i"
 
+#~ msgid "categories"
+#~ msgstr "categorМas"
+
+#~ msgid "Item(s) belong to these categories:"
+#~ msgstr "Elemento(s) pertencentes a estas categorМas:"
+
+#~ msgid "Available Categories:"
+#~ msgstr "CategorМas DispoЯibles:"
+
+#~ msgid "External Directories"
+#~ msgstr "Directorios Externos"
+
+#~ msgid "Port Number:"
+#~ msgstr "NЗmero de Porto:"
+
+#~ msgid "Empty days:"
+#~ msgstr "DМas baleiros:"
+
+#~ msgid "Appointments:"
+#~ msgstr "Citas:"
+
+#~ msgid "Highlighted day:"
+#~ msgstr "DМa salientado:"
+
+#~ msgid "Day numbers:"
+#~ msgstr "NЗmeros dos dМas:"
+
+#~ msgid "Current day's number:"
+#~ msgstr "NЗmero do dМa actual:"
+
+#~ msgid "may"
+#~ msgstr "maio"
+
+#~ msgid "sept"
+#~ msgstr "setem"
+
+#~ msgid "sunday"
+#~ msgstr "domingo"
+
+#~ msgid "monday"
+#~ msgstr "luns"
+
+#~ msgid "tuesday"
+#~ msgstr "martes"
+
+#~ msgid "tues"
+#~ msgstr "mart"
+
+#~ msgid "wednesday"
+#~ msgstr "mИrcores"
+
+#~ msgid "wednes"
+#~ msgstr "mИrcor"
+
+#~ msgid "thursday"
+#~ msgstr "xoves"
+
+#~ msgid "thur"
+#~ msgstr "xov"
+
+#~ msgid "thurs"
+#~ msgstr "xoves"
+
+#~ msgid "friday"
+#~ msgstr "venres"
+
+#~ msgid "saturday"
+#~ msgstr "sАbado"
+
+#~ msgid "fortnight"
+#~ msgstr "quincena"
+
+#~ msgid "min"
+#~ msgstr "min"
+
+#~ msgid "sec"
+#~ msgstr "seg"
+
+#~ msgid "tomorrow"
+#~ msgstr "maЯА"
+
+#~ msgid "yesterday"
+#~ msgstr "onte"
+
+#~ msgid "today"
+#~ msgstr "hoxe"
+
+#~ msgid "first"
+#~ msgstr "primeiro"
+
+#~ msgid "third"
+#~ msgstr "terceiro"
+
+#~ msgid "fourth"
+#~ msgstr "cuarto"
+
+#~ msgid "fifth"
+#~ msgstr "quinto"
+
+#~ msgid "sixth"
+#~ msgstr "sexto"
+
+#~ msgid "seventh"
+#~ msgstr "sИtimo"
+
+#~ msgid "eighth"
+#~ msgstr "oitavo"
+
+#~ msgid "ninth"
+#~ msgstr "noveno"
+
+#~ msgid "tenth"
+#~ msgstr "dИcimo"
+
+#~ msgid "eleventh"
+#~ msgstr "dИcimo primeiro"
+
+#~ msgid "twelfth"
+#~ msgstr "dИcimo segundo"
+
+#~ msgid "Year:"
+#~ msgstr "Ano:"
+
+#~ msgid ""
+#~ "Please select the date you want to go to.\n"
+#~ "When you click on a day, you will be taken\n"
+#~ "to that date."
+#~ msgstr ""
+#~ "Seleccione a data А que quere ir.\n"
+#~ "Cando prema nun dМa, serА levado a esa data."
+
+#~ msgid "Mail Source"
+#~ msgstr "Fonte de Correo"
+
 #~ msgid ""
-#~ "Are you sure you want\n"
-#~ "to delete this contact?"
+#~ "Your email configuration is now complete.\n"
+#~ "Click \"Finish\" to save your new settings"
 #~ msgstr ""
-#~ "©EstА seguro de que quere\n"
-#~ "borrar este contacto?"
+#~ "A configuraciСn do correo electrСnico estА completa.\n"
+#~ "Prema \"Finalizar\" para gardar a nova configuraciСn"
+
+#~ msgid "Send a message without a subject"
+#~ msgstr "Enviar unha mensaxe sen asunto"
+
+#~ msgid "Marking messages in folder \"%s\""
+#~ msgstr "Marcando mensaxes na carpeta \"%s\""
+
+#~ msgid "Mark messages in folder \"%s\""
+#~ msgstr "Marcar mensaxes na carpeta \"%s\""
+
+#~ msgid "Marking message %d of %d"
+#~ msgstr "Marcando a mensaxe %d de %d"
+
+#~ msgid "Forwarding messages \"%s\""
+#~ msgstr "Reenviando mensaxes \"%s\""
+
+#~ msgid "Forwarding a message without a subject"
+#~ msgstr "Reenviando unha mensaxe sen asunto"
+
+#~ msgid "Forward message \"%s\""
+#~ msgstr "Reenviar mensaxe \"%s\""
+
+#~ msgid "Loading \"%s\""
+#~ msgstr "Cargando \"%s\""
+
+#~ msgid "Creating \"%s\""
+#~ msgstr "Creando \"%s\""
+
+#~ msgid "Display message UID \"%s\""
+#~ msgstr "Amosar a mensaxe co UID \"%s\""
+
+#~ msgid "Opening messages from folder \"%s\""
+#~ msgstr "Abrindo as mensaxes da carpeta \"%s\""
+
+#~ msgid "Viewing messages from folder \"%s\""
+#~ msgstr "Vendo as mensaxes da carpeta \"%s\""
+
+#~ msgid "Retrieving message %d of %d (uid \"%s\")"
+#~ msgstr "Recibindo a mensaxe %d de %d (uid \"%s\")"
+
+#, fuzzy
+#~ msgid "Saving messages from folder \"%s\""
+#~ msgstr "Abrindo as mensaxes da carpeta \"%s\""
+
+#, fuzzy
+#~ msgid "Save messages from folder \"%s\""
+#~ msgstr "Abrindo as mensaxes da carpeta \"%s\""
+
+#~ msgid "N_ew Directory Server"
+#~ msgstr "Novo Servidor de _Directorio"
+
+#~ msgid "_Actions"
+#~ msgstr "_AcciСns"
+
+#~ msgid "_Save Calendar As"
+#~ msgstr "_Gardar Axenda Como"
+
+#, fuzzy
+#~ msgid "_Mail Configuration"
+#~ msgstr "ConfiguraciСn do Correo"
 
 #~ msgid "window2"
 #~ msgstr "window2"
 
-#~ msgid "Priority:"
-#~ msgstr "Prioridade:"
-
 #~ msgid "Time format"
 #~ msgstr "Formato da hora"
 
@@ -6732,90 +7402,24 @@ msgstr "Grupo %i"
 #~ msgid "Open in New Window"
 #~ msgstr "Abrir nunha Nova Fiestra"
 
-#~ msgid "Edit Message"
-#~ msgstr "Editar Mensaxe"
-
 #~ msgid "Forward Message"
 #~ msgstr "Reenviar esta mensaxe"
 
-#~ msgid "Delete Message"
-#~ msgstr "Borrar Mensaxe"
-
 #~ msgid "Move Message"
 #~ msgstr "Mover Mensaxe"
 
 #~ msgid "Copy Message"
 #~ msgstr "Copiar Mensaxe"
 
-#~ msgid "Account Information"
-#~ msgstr "InformaciСn de Contas"
-
-#~ msgid "Account Management"
-#~ msgstr "XestiСn e Contas"
-
-#~ msgid "Accounts"
-#~ msgstr "Contas"
-
 #~ msgid "Add Optional Fields..."
 #~ msgstr "Engadir Campos Opcionais..."
 
-#~ msgid "Authentication"
-#~ msgstr "AutenticaciСn"
-
 #~ msgid "Browse..."
 #~ msgstr "Explorar..."
 
-#~ msgid "Congratulations, your mail configuration is complete."
-#~ msgstr "Noraboa, a configuraciСn do correo estА completa."
-
-#~ msgid "Email Address:"
-#~ msgstr "Enderezo de Email:"
-
-#~ msgid "Evolution Mail Configuration"
-#~ msgstr "ConfiguraciСn de Correo do Evolution"
-
-#~ msgid "Full Name:"
-#~ msgstr "Nome Completo:"
-
-#~ msgid "IMAP"
-#~ msgstr "IMAP"
-
-#~ msgid "Mail"
-#~ msgstr "Correo"
-
-#~ msgid "Mail Configuration Druid"
-#~ msgstr "Axudante da ConfiguraciСn do Correo"
-
-#~ msgid "News"
-#~ msgstr "Novas"
-
-#~ msgid "Optional"
-#~ msgstr "Opcional"
-
 #~ msgid "Optional Information"
 #~ msgstr "InformaciСn Opcional"
 
-#~ msgid "Password:"
-#~ msgstr "Contrasinal:"
-
-#~ msgid "Reply-to:"
-#~ msgstr "Responder-a:"
-
-#~ msgid "SMTP"
-#~ msgstr "SMTP"
-
-#~ msgid "SMTP server requires authentication"
-#~ msgstr "O servidor SMTP require autenticaciСn"
-
-#~ msgid "Sending Mail"
-#~ msgstr "Enviando Correo"
-
-#~ msgid "Server Configuration"
-#~ msgstr "ConfiguraciСn do Servidor"
-
-#~ msgid "Server Type: "
-#~ msgstr "Tipo de Servidor: "
-
 #~ msgid "Couldn't create pipe to %s: %s"
 #~ msgstr "Non foi posible crear unha canalizaciСn con %s: %s"
 
@@ -6828,17 +7432,11 @@ msgstr "Grupo %i"
 #~ msgid "Don't know protocol to open URI `%s'"
 #~ msgstr "O protocolo para abrir o URI `%s' И descoЯecido"
 
-#~ msgid "_New Contact"
-#~ msgstr "_Novo Contacto"
-
 #~ msgid "New Ca_lendar"
 #~ msgstr "Nova A_xenda"
 
 #~ msgid "_New appointment..."
 #~ msgstr "_Nova cita..."
 
-#~ msgid "_Mail Configuration..."
-#~ msgstr "ConfiguraciСn do _Correo..."
-
 #~ msgid "_Create New Folder..."
 #~ msgstr "_Crear unha Nova Carpeta..."
diff --git a/po/hu.po b/po/hu.po
index 79c2931d8d..18ef06b835 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,8 @@
+#: camel/providers/smtp/camel-smtp-transport.c:287
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution VERSION\n"
-"POT-Creation-Date: 2000-12-13 16:26-0600\n"
+"POT-Creation-Date: 2001-01-06 00:11+0100\n"
 "PO-Revision-Date: 2000-11-08 19:50+0100\n"
 "Last-Translator: Szabolcs BAN <shooby@gnome.hu>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
@@ -297,10 +298,10 @@ msgstr ""
 #: addressbook/backend/ebook/load-pine-addressbook.c:17
 #: addressbook/backend/ebook/test-client-list.c:18
 #: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:991
+#: addressbook/conduit/address-conduit.c:1083
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1136
-#: calendar/conduits/todo/todo-conduit.c:945 calendar/gui/main.c:54
+#: calendar/conduits/calendar/calendar-conduit.c:1151
+#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "Nem tudom a bonobo-t elindМtani"
 
@@ -423,53 +424,36 @@ msgstr ""
 "Hiba lИpett fel a pilotok listАjАnak\n"
 "a gnome-pilot daemontСl valС lekИrИsekor "
 
-#: addressbook/conduit/address-conduit.c:197
+#: addressbook/conduit/address-conduit.c:195
 msgid "Cursor could not be loaded\n"
 msgstr "A kurzort nem tudom betЖlteni\n"
 
-#: addressbook/conduit/address-conduit.c:210
+#: addressbook/conduit/address-conduit.c:208
 msgid "EBook not loaded\n"
 msgstr "Az EBook nincs betЖltve\n"
 
-#: addressbook/conduit/address-conduit.c:583
-#: calendar/conduits/calendar/calendar-conduit.c:715
-#: calendar/conduits/todo/todo-conduit.c:523
+#: addressbook/conduit/address-conduit.c:646
+#: calendar/conduits/calendar/calendar-conduit.c:730
+#: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat server"
 msgstr "Nem tudom elindМtani a wombat szervert"
 
-#: addressbook/conduit/address-conduit.c:584
-#: calendar/conduits/calendar/calendar-conduit.c:716
-#: calendar/conduits/todo/todo-conduit.c:524
+#: addressbook/conduit/address-conduit.c:647
+#: calendar/conduits/calendar/calendar-conduit.c:731
+#: calendar/conduits/todo/todo-conduit.c:546
 msgid "Could not start wombat"
 msgstr "Nem tudom a wombat-ot elindМtani"
 
-#: addressbook/conduit/address-conduit.c:616
-#: addressbook/conduit/address-conduit.c:619
+#: addressbook/conduit/address-conduit.c:679
+#: addressbook/conduit/address-conduit.c:682
 msgid "Could not read pilot's Address application block"
 msgstr "Nem tudom a pilot Address application blokkjАt olvasni"
 
 #.
-#. * 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 "kategСriАk"
-
-#: addressbook/contact-editor/categories-strings.h:8
-msgid "Item(s) belong to these categories:"
-msgstr "Az elemek az alАbbi kategСriАkhoz tartoznak:"
-
-#: addressbook/contact-editor/categories-strings.h:9
-msgid "Available Categories:"
-msgstr "MeglИvУ mezУk"
-
-#.
-#. * 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 "NИvjegy tЖrlИse?"
 
@@ -483,7 +467,7 @@ msgid "_Add"
 msgstr "HozzА_ad"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:48
+#: ui/evolution-event-editor.xml.h:108 ui/evolution-mail.xml.h:53
 msgid "_Delete"
 msgstr "_TЖrЖl"
 
@@ -497,12 +481,13 @@ msgid "New phone type"
 msgstr "зj telefon tМpus"
 
 #.
-#. * 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 "HozzАad"
 
@@ -543,7 +528,7 @@ msgid "_Mobile"
 msgstr "_Mobil"
 
 #: 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 "ElsУdleges email"
 
@@ -560,7 +545,7 @@ msgid "C_ontacts..."
 msgstr "_NИvjegyek..."
 
 #: 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 "Ka_tegСriАk..."
 
@@ -577,7 +562,8 @@ msgid "_Address..."
 msgstr "_CМm..."
 
 #: 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 "Alap"
 
@@ -622,143 +608,143 @@ msgid "No_tes:"
 msgstr "Felje_gyzИsek:"
 
 #: 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 "RИszletek"
 
-#: addressbook/contact-editor/e-contact-editor.c:1266
+#: addressbook/contact-editor/e-contact-editor.c:1274
 msgid "Assistant"
 msgstr "Asszisztens"
 
-#: 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 "эzleti"
 
-#: addressbook/contact-editor/e-contact-editor.c:1268
+#: addressbook/contact-editor/e-contact-editor.c:1276
 msgid "Business 2"
 msgstr "2. эzleti"
 
-#: addressbook/contact-editor/e-contact-editor.c:1269
+#: addressbook/contact-editor/e-contact-editor.c:1277
 msgid "Business Fax"
 msgstr "эzleti fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1270
+#: addressbook/contact-editor/e-contact-editor.c:1278
 msgid "Callback"
 msgstr "VisszahМvАs"
 
-#: addressbook/contact-editor/e-contact-editor.c:1271
+#: addressbook/contact-editor/e-contact-editor.c:1279
 msgid "Car"
 msgstr "AutС"
 
-#: addressbook/contact-editor/e-contact-editor.c:1272
+#: addressbook/contact-editor/e-contact-editor.c:1280
 msgid "Company"
 msgstr "VАllalat"
 
-#: 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 "Otthoni"
 
-#: addressbook/contact-editor/e-contact-editor.c:1274
+#: addressbook/contact-editor/e-contact-editor.c:1282
 msgid "Home 2"
 msgstr "2. Otthoni"
 
-#: addressbook/contact-editor/e-contact-editor.c:1275
+#: addressbook/contact-editor/e-contact-editor.c:1283
 msgid "Home Fax"
 msgstr "Otthoni fax"
 
-#: 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 "Mobil"
 
-#: 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 "MАs"
 
-#: addressbook/contact-editor/e-contact-editor.c:1279
+#: addressbook/contact-editor/e-contact-editor.c:1287
 msgid "Other Fax"
 msgstr "EgyИb fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1280
+#: addressbook/contact-editor/e-contact-editor.c:1288
 msgid "Pager"
 msgstr "SzemИlyhМvС"
 
-#: addressbook/contact-editor/e-contact-editor.c:1281
+#: addressbook/contact-editor/e-contact-editor.c:1289
 msgid "Primary"
 msgstr "ElsУdleges"
 
-#: addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/contact-editor/e-contact-editor.c:1290
 msgid "Radio"
 msgstr "RАdiС"
 
-#: addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/contact-editor/e-contact-editor.c:1291
 msgid "Telex"
 msgstr "Telex"
 
-#: 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. email"
 
-#: addressbook/contact-editor/e-contact-editor.c:1330
+#: addressbook/contact-editor/e-contact-editor.c:1338
 msgid "Email 3"
 msgstr "3. email"
 
 #.
-#. * 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.cМm:"
 
-#: po/tmp/fulladdr.glade.h:7
+#: addressbook/contact-editor/fulladdr.glade.h:7
 msgid "Canada"
 msgstr "Kanada"
 
-#: po/tmp/fulladdr.glade.h:8
+#: addressbook/contact-editor/fulladdr.glade.h:8
 msgid "Check Address"
 msgstr "A cМm ellenУrzИse"
 
-#: po/tmp/fulladdr.glade.h:9
+#: addressbook/contact-editor/fulladdr.glade.h:9
 msgid "Countr_y:"
 msgstr "Ors_zАg:"
 
-#: po/tmp/fulladdr.glade.h:10
+#: addressbook/contact-editor/fulladdr.glade.h:10
 msgid "Finland"
 msgstr "FinnorszАg"
 
-#: po/tmp/fulladdr.glade.h:11
+#: addressbook/contact-editor/fulladdr.glade.h:11
 msgid "USA"
 msgstr "USA"
 
-#: po/tmp/fulladdr.glade.h:12
+#: addressbook/contact-editor/fulladdr.glade.h:12
 msgid "_Address:"
 msgstr "_CМm:"
 
-#: po/tmp/fulladdr.glade.h:13
+#: addressbook/contact-editor/fulladdr.glade.h:13
 msgid "_City:"
 msgstr "_VАros:"
 
-#: po/tmp/fulladdr.glade.h:14
+#: addressbook/contact-editor/fulladdr.glade.h:14
 msgid "_PO Box:"
 msgstr "_PostafiСk:"
 
-#: po/tmp/fulladdr.glade.h:15
+#: addressbook/contact-editor/fulladdr.glade.h:15
 msgid "_State/Province:"
 msgstr "а_llam/HelytartСsАg:"
 
-#: po/tmp/fulladdr.glade.h:16
+#: addressbook/contact-editor/fulladdr.glade.h:16
 msgid "_ZIP Code:"
 msgstr "_IrАnyМtСszАm:"
 
@@ -772,17 +758,20 @@ msgid "Check Full Name"
 msgstr "A teljes nИv ellenУrzИse"
 
 #: addressbook/contact-editor/fullname-strings.h:8
+#, fuzzy
 msgid ""
 "\n"
 "Mr.\n"
 "Mrs.\n"
+"Ms.\n"
+"Miss\n"
 "Dr.\n"
 msgstr ""
 "\n"
 "Dr.\n"
 "Prof.\n"
 
-#: addressbook/contact-editor/fullname-strings.h:13
+#: addressbook/contact-editor/fullname-strings.h:15
 msgid ""
 "\n"
 "Sr.\n"
@@ -796,44 +785,49 @@ msgstr ""
 "Ifj.\n"
 "жzv.\n"
 
-#: addressbook/contact-editor/fullname-strings.h:21
+#: addressbook/contact-editor/fullname-strings.h:23
 msgid "_First:"
 msgstr "_KeresztnИv:"
 
-#: addressbook/contact-editor/fullname-strings.h:22
+#: addressbook/contact-editor/fullname-strings.h:24
 msgid "_Title:"
 msgstr "_BeosztАs:"
 
-#: addressbook/contact-editor/fullname-strings.h:23
+#: addressbook/contact-editor/fullname-strings.h:25
 msgid "_Middle:"
 msgstr "_UtСnИv:"
 
-#: addressbook/contact-editor/fullname-strings.h:24
+#: addressbook/contact-editor/fullname-strings.h:26
 msgid "_Last:"
 msgstr "_VezetИknИv:"
 
-#: addressbook/contact-editor/fullname-strings.h:25
+#: addressbook/contact-editor/fullname-strings.h:27
 msgid "_Suffix:"
 msgstr "_ElУtag:"
 
-#: addressbook/gui/component/addressbook.c:263
+#: addressbook/gui/component/addressbook.c:231
 msgid "As _Minicards"
 msgstr "_KАrtyАkkИnt"
 
 #.
-#. * 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:269
-#: po/tmp/evolution-addressbook.xml.h:6
+#: addressbook/gui/component/addressbook.c:237
+#: ui/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr "_TАblАzatkИnt"
 
-#: addressbook/gui/component/addressbook.c:386
+#: addressbook/gui/component/addressbook.c:374
+#, c-format
+msgid "Enter password for %s"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:402
 msgid "Unable to open addressbook"
 msgstr "Nem tudom megnyitni a cМmjegyzИket"
 
-#: addressbook/gui/component/addressbook.c:391
+#: addressbook/gui/component/addressbook.c:407
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -854,77 +848,207 @@ msgstr ""
 "hasznАlni egy LDAP szervert, le kell tЖltened Иs\n"
 "telepМtened az OpenLDAP csomagot, Иs ЗjrafordМtani az EvolЗciСt.\n"
 
-#: addressbook/gui/component/addressbook.c:501 mail/folder-browser.c:136
+#: addressbook/gui/component/addressbook.c:528 mail/folder-browser.c:219
 msgid "Show All"
 msgstr "Mutasd mind"
 
-#: addressbook/gui/component/addressbook.c:503 mail/folder-browser.c:138
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 msgid "Advanced..."
 msgstr "HaladС..."
 
-#: addressbook/gui/component/addressbook.c:533
+#: addressbook/gui/component/addressbook.c:560
 msgid "Any field contains"
 msgstr "BАrmely mezУ tartalmazza"
 
-#: addressbook/gui/component/addressbook.c:534
+#: addressbook/gui/component/addressbook.c:561
 msgid "Name contains"
 msgstr "A nИv tartalmaz"
 
-#: addressbook/gui/component/addressbook.c:535
+#: addressbook/gui/component/addressbook.c:562
 msgid "Email contains"
 msgstr "Email tartalmaz"
 
-#: addressbook/gui/component/addressbook.c:621
+#: addressbook/gui/component/addressbook.c:648
 msgid "The URI that the Folder Browser will display"
 msgstr "Az URI amit a Mappa BЖngИszУ meg fog nyitni"
 
-#: addressbook/gui/component/e-ldap-storage.c:88
-msgid "External Directories"
-msgstr "KЭlsУ kЖnyvtАrak"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/e-msg-composer-attachment.glade.h:7
-#: po/tmp/ldap-server-dialog.glade.h:6
-msgid "Description:"
-msgstr "LeМrАs:"
+#: addressbook/gui/component/addressbook-storage.c:95
+#, fuzzy
+msgid "Other Contacts"
+msgstr "NИvjegy tЖrlИse?"
 
-#: po/tmp/ldap-server-dialog.glade.h:7
-msgid "LDAP Server:"
+#: addressbook/gui/component/addressbook-config.c:139
+#, fuzzy
+msgid "LDAP Server"
 msgstr "LDAP szerver:"
 
-#: po/tmp/ldap-server-dialog.glade.h:8
-msgid "Name:"
-msgstr "NИv:"
+#: addressbook/gui/component/addressbook-config.c:141
+#, fuzzy
+msgid "File"
+msgstr "_Mobil"
+
+#: addressbook/gui/component/addressbook-config.c:144
+#, fuzzy
+msgid "Unknown addressbook type"
+msgstr "Nem tudom megnyitni a cМmjegyzИket"
+
+#: 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 "JelszС"
+
+#: addressbook/gui/component/addressbook-config.c:157
+msgid "SASL"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:160
+#, fuzzy
+msgid "Unknown auth type"
+msgstr "Ismeretlen hiba"
+
+#: addressbook/gui/component/addressbook-config.c:169
+#, fuzzy
+msgid "Base"
+msgstr "Lap"
+
+#: addressbook/gui/component/addressbook-config.c:171
+msgid "One"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:173
+#, fuzzy
+msgid "Subtree"
+msgstr "ForrАs"
+
+#: addressbook/gui/component/addressbook-config.c:176
+msgid "Unknown scope type"
+msgstr ""
 
-#: po/tmp/ldap-server-dialog.glade.h:9
-msgid "Port Number:"
-msgstr "PortszАm:"
+#: addressbook/gui/component/addressbook-config.c:309
+msgid "Bind DN:"
+msgstr ""
 
-#: po/tmp/ldap-server-dialog.glade.h:10
+#: 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 "сrАk"
+
+#: addressbook/gui/component/addressbook-config.c:361
+#, fuzzy
+msgid "Port:"
+msgstr "PrioritАs:"
+
+#: addressbook/gui/component/addressbook-config.c:364
 msgid "Root DN:"
 msgstr "Root DN:"
 
+#: addressbook/gui/component/addressbook-config.c:384
+#, fuzzy
+msgid "Search Scope:"
+msgstr "KeresИs"
+
+#: addressbook/gui/component/addressbook-config.c:438
+#: mail/mail-config-druid.glade.h:14 mail/mail-config-gui.c:943
+msgid "Authentication:"
+msgstr "AuthentikАciС:"
+
+#: addressbook/gui/component/addressbook-config.c:455
+#: mail/mail-config-druid.glade.h:52 mail/mail-config-gui.c:934
+msgid "Path:"
+msgstr "зtvonal:"
+
+#: addressbook/gui/component/addressbook-config.c:460
+#, fuzzy
+msgid "Create path if it doesn't exist."
+msgstr "A fАjl nem lИtezik."
+
+#: addressbook/gui/component/addressbook-config.c:593
+#, fuzzy
+msgid "Edit Addressbook"
+msgstr "CМmjegyzИkbe mentИs"
+
+#: addressbook/gui/component/addressbook-config.c:595
+#, fuzzy
+msgid "Add Addressbook"
+msgstr "CМmjegyzИkbe mentИs"
+
+#: 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
+msgid "Name:"
+msgstr "NИv:"
+
+#: addressbook/gui/component/addressbook-config.c:617
+#: composer/e-msg-composer-attachment.glade.h:7
+msgid "Description:"
+msgstr "LeМrАs:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:7
+#, fuzzy
+msgid "Addressbook Sources"
+msgstr "ForrАs hozzАadАsa"
+
+#: 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 "TЖrЖl"
+
+#: 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 "Szerkeszt"
+
+#: addressbook/gui/component/addressbook-config.glade.h:10
+#, fuzzy
+msgid "Name"
+msgstr "NИv:"
+
+#: 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 "KeresИs..."
 
-#: po/tmp/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "Message Recipients"
 msgstr "LevИl cМmzettek"
 
-#: po/tmp/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "Select Names"
 msgstr "VАlassz neveket"
 
-#: 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 "VАlassz egy nevet a listАbСl:"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:147
@@ -933,119 +1057,119 @@ msgid "Search"
 msgstr "KeresИs"
 
 #.
-#. * 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 "a"
 
-#: po/tmp/alphabet.glade.h:8
+#: addressbook/gui/widgets/alphabet.glade.h:8
 msgid "b"
 msgstr "b"
 
-#: po/tmp/alphabet.glade.h:9
+#: addressbook/gui/widgets/alphabet.glade.h:9
 msgid "c"
 msgstr "c"
 
-#: po/tmp/alphabet.glade.h:10
+#: addressbook/gui/widgets/alphabet.glade.h:10
 msgid "d"
 msgstr "d"
 
-#: po/tmp/alphabet.glade.h:11
+#: addressbook/gui/widgets/alphabet.glade.h:11
 msgid "e"
 msgstr "e"
 
-#: po/tmp/alphabet.glade.h:12
+#: addressbook/gui/widgets/alphabet.glade.h:12
 msgid "f"
 msgstr "f"
 
-#: po/tmp/alphabet.glade.h:13
+#: addressbook/gui/widgets/alphabet.glade.h:13
 msgid "g"
 msgstr "g"
 
-#: calendar/cal-util/timeutil.c:100 po/tmp/alphabet.glade.h:14
+#: addressbook/gui/widgets/alphabet.glade.h:14
 msgid "h"
 msgstr "h"
 
-#: po/tmp/alphabet.glade.h:15
+#: addressbook/gui/widgets/alphabet.glade.h:15
 msgid "i"
 msgstr "i"
 
-#: po/tmp/alphabet.glade.h:16
+#: addressbook/gui/widgets/alphabet.glade.h:16
 msgid "j"
 msgstr "j"
 
-#: po/tmp/alphabet.glade.h:17
+#: addressbook/gui/widgets/alphabet.glade.h:17
 msgid "k"
 msgstr "k"
 
-#: po/tmp/alphabet.glade.h:18
+#: addressbook/gui/widgets/alphabet.glade.h:18
 msgid "l"
 msgstr "l"
 
-#: po/tmp/alphabet.glade.h:19
+#: addressbook/gui/widgets/alphabet.glade.h:19
 msgid "m"
 msgstr "m"
 
-#: po/tmp/alphabet.glade.h:20
+#: addressbook/gui/widgets/alphabet.glade.h:20
 msgid "n"
 msgstr "n"
 
-#: po/tmp/alphabet.glade.h:21
+#: addressbook/gui/widgets/alphabet.glade.h:21
 msgid "o"
 msgstr "o"
 
-#: po/tmp/alphabet.glade.h:22
+#: addressbook/gui/widgets/alphabet.glade.h:22
 msgid "p"
 msgstr "p"
 
-#: po/tmp/alphabet.glade.h:23
+#: addressbook/gui/widgets/alphabet.glade.h:23
 msgid "q"
 msgstr "q"
 
-#: po/tmp/alphabet.glade.h:24
+#: addressbook/gui/widgets/alphabet.glade.h:24
 msgid "r"
 msgstr "r"
 
-#: po/tmp/alphabet.glade.h:25
+#: addressbook/gui/widgets/alphabet.glade.h:25
 msgid "s"
 msgstr "s"
 
-#: po/tmp/alphabet.glade.h:26
+#: addressbook/gui/widgets/alphabet.glade.h:26
 msgid "t"
 msgstr "t"
 
-#: po/tmp/alphabet.glade.h:27
+#: addressbook/gui/widgets/alphabet.glade.h:27
 msgid "u"
 msgstr "u"
 
-#: po/tmp/alphabet.glade.h:28
+#: addressbook/gui/widgets/alphabet.glade.h:28
 msgid "v"
 msgstr "v"
 
-#: po/tmp/alphabet.glade.h:29
+#: addressbook/gui/widgets/alphabet.glade.h:29
 msgid "w"
 msgstr "w"
 
-#: po/tmp/alphabet.glade.h:30
+#: addressbook/gui/widgets/alphabet.glade.h:30
 msgid "x"
 msgstr "x"
 
-#: po/tmp/alphabet.glade.h:31
+#: addressbook/gui/widgets/alphabet.glade.h:31
 msgid "y"
 msgstr "y"
 
-#: po/tmp/alphabet.glade.h:32
+#: addressbook/gui/widgets/alphabet.glade.h:32
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:417
-#: addressbook/gui/widgets/e-minicard.c:338
+#: addressbook/gui/widgets/e-addressbook-view.c:451
+#: addressbook/gui/widgets/e-minicard.c:374
 msgid "Save as VCard"
 msgstr "VCard-kИnt mentИs"
 
@@ -1068,189 +1192,178 @@ msgstr ""
 "зj nИvjegy kИszМtИsИhez kattints kettУt ide."
 
 #.
-#. * 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 "10 pt. Tahoma"
 
-#: po/tmp/e-contact-print.glade.h:7
+#: addressbook/printing/e-contact-print.glade.h:7
 msgid "8 pt. Tahoma"
 msgstr "8 pt. Tahoma"
 
-#: po/tmp/e-contact-print.glade.h:8
+#: addressbook/printing/e-contact-print.glade.h:8
 msgid "Blank forms at end:"
 msgstr "A vИgИn a formok ЭrМtИse:"
 
-#: po/tmp/e-contact-print.glade.h:9
+#: addressbook/printing/e-contact-print.glade.h:9
 msgid "Body"
 msgstr "TЖrzs"
 
-#: po/tmp/e-contact-print.glade.h:10
+#: addressbook/printing/e-contact-print.glade.h:10
 msgid "Bottom:"
 msgstr "AlsС:"
 
-#: po/tmp/e-contact-print.glade.h:11
+#: addressbook/printing/e-contact-print.glade.h:11
 msgid "Dimensions:"
 msgstr "DimenziСk:"
 
-#: po/tmp/e-contact-print.glade.h:12
+#: addressbook/printing/e-contact-print.glade.h:12
 msgid "Font..."
 msgstr "BetШtМpus..."
 
-#: po/tmp/e-contact-print.glade.h:13
+#: addressbook/printing/e-contact-print.glade.h:13
 msgid "Fonts"
 msgstr "BetШtМpusok"
 
-#: po/tmp/e-contact-print.glade.h:14
+#: addressbook/printing/e-contact-print.glade.h:14
 msgid "Footer:"
 msgstr "LАblИc:"
 
-#: po/tmp/e-contact-print.glade.h:15
+#: addressbook/printing/e-contact-print.glade.h:15
 msgid "Format"
 msgstr "FormАtum"
 
-#: po/tmp/e-contact-print.glade.h:16
+#: addressbook/printing/e-contact-print.glade.h:16
 msgid "Header"
 msgstr "FejlИc"
 
-#: po/tmp/e-contact-print.glade.h:17
+#: addressbook/printing/e-contact-print.glade.h:17
 msgid "Header/Footer"
 msgstr "FejlИc/lАblИc"
 
-#: po/tmp/e-contact-print.glade.h:18
+#: addressbook/printing/e-contact-print.glade.h:18
 msgid "Headings"
 msgstr "FejlИcek"
 
-#: po/tmp/e-contact-print.glade.h:19
+#: addressbook/printing/e-contact-print.glade.h:19
 msgid "Headings for each letter"
 msgstr "FejlИc minden levИlnek"
 
-#: po/tmp/e-contact-print.glade.h:20
+#: addressbook/printing/e-contact-print.glade.h:20
 msgid "Height:"
 msgstr "MagassАg:"
 
-#: po/tmp/e-contact-print.glade.h:21
+#: addressbook/printing/e-contact-print.glade.h:21
 msgid "Immediately follow each other"
 msgstr "RЖgtЖn egymАs utАn kЖvetkeznek"
 
-#: po/tmp/e-contact-print.glade.h:22
+#: addressbook/printing/e-contact-print.glade.h:22
 msgid "Include:"
 msgstr "BeleИrtve:"
 
-#: po/tmp/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23
 msgid "Landscape"
 msgstr "FekvУ"
 
-#: po/tmp/e-contact-print.glade.h:24
+#: addressbook/printing/e-contact-print.glade.h:24
 msgid "Left:"
 msgstr "Bal:"
 
-#: po/tmp/e-contact-print.glade.h:25
+#: addressbook/printing/e-contact-print.glade.h:25
 msgid "Letter tabs on side"
 msgstr "LevИl cМmkИk minden lapon"
 
-#: po/tmp/e-contact-print.glade.h:26
+#: addressbook/printing/e-contact-print.glade.h:26
 msgid "Margins"
 msgstr "MargСk"
 
-#: po/tmp/e-contact-print.glade.h:27
+#: addressbook/printing/e-contact-print.glade.h:27
 msgid "Number of columns:"
 msgstr "Oszlopok szАma:"
 
-#: po/tmp/e-contact-print.glade.h:28
+#: addressbook/printing/e-contact-print.glade.h:28
 msgid "Options"
 msgstr "BeАllМtАsok"
 
-#: po/tmp/e-contact-print.glade.h:29
+#: addressbook/printing/e-contact-print.glade.h:29
 msgid "Orientation"
 msgstr "ElhelyezkedИs"
 
-#: po/tmp/e-contact-print.glade.h:30
+#: addressbook/printing/e-contact-print.glade.h:30
 msgid "Page"
 msgstr "Lap"
 
-#: po/tmp/e-contact-print.glade.h:31
+#: addressbook/printing/e-contact-print.glade.h:31
 msgid "Page Setup:"
 msgstr "Oldal beАllМtАs:"
 
-#: po/tmp/e-contact-print.glade.h:32
+#: addressbook/printing/e-contact-print.glade.h:32
 msgid "Paper"
 msgstr "PapМr"
 
-#: po/tmp/e-contact-print.glade.h:33
+#: addressbook/printing/e-contact-print.glade.h:33
 msgid "Paper source:"
 msgstr "PapМr forrАs:"
 
-#: po/tmp/e-contact-print.glade.h:34
+#: addressbook/printing/e-contact-print.glade.h:34
 msgid "Portrait"
 msgstr "аllС"
 
-#: po/tmp/e-contact-print.glade.h:35
+#: addressbook/printing/e-contact-print.glade.h:35
 msgid "Preview:"
 msgstr "ElУnИzet:"
 
-#: po/tmp/e-contact-print.glade.h:36
+#: addressbook/printing/e-contact-print.glade.h:36
 msgid "Print using gray shading"
 msgstr "NyomatАs szЭrkeskАlАs АrnyalАssal"
 
-#: po/tmp/e-contact-print.glade.h:37
+#: addressbook/printing/e-contact-print.glade.h:37
 msgid "Reverse on even pages"
 msgstr "PАros lapokon fordМtott"
 
-#: po/tmp/e-contact-print.glade.h:38
+#: addressbook/printing/e-contact-print.glade.h:38
 msgid "Right:"
 msgstr "Jobb:"
 
-#: po/tmp/e-contact-print.glade.h:39
+#: addressbook/printing/e-contact-print.glade.h:39
 msgid "Sections:"
 msgstr "SzekciСk:"
 
-#: po/tmp/e-contact-print.glade.h:40
+#: addressbook/printing/e-contact-print.glade.h:40
 msgid "Shading"
 msgstr "аrnyalАs"
 
-#: po/tmp/e-contact-print.glade.h:41
+#: addressbook/printing/e-contact-print.glade.h:41
 msgid "Size:"
 msgstr "MИret:"
 
-#: po/tmp/e-contact-print.glade.h:42
+#: addressbook/printing/e-contact-print.glade.h:42
 msgid "Start on a new page"
 msgstr "зj lapon kezdd"
 
-#: po/tmp/e-contact-print.glade.h:43
+#: addressbook/printing/e-contact-print.glade.h:43
 msgid "Style name:"
 msgstr "StМlus neve:"
 
-#: po/tmp/e-contact-print.glade.h:44
+#: addressbook/printing/e-contact-print.glade.h:44
 msgid "Top:"
 msgstr "FelsУ:"
 
-#: 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 "TМpus"
 
-#: po/tmp/e-contact-print.glade.h:46
+#: addressbook/printing/e-contact-print.glade.h:46
 msgid "Width:"
 msgstr "SzИlessИg:"
 
-#: po/tmp/e-contact-print.glade.h:47
+#: addressbook/printing/e-contact-print.glade.h:47
 msgid "label26"
 msgstr "label26"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:550
-#: calendar/gui/e-week-view.c:288 calendar/gui/print.c:605
-msgid "am"
-msgstr "de"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:553
-#: calendar/gui/e-week-view.c:291 calendar/gui/print.c:604
-msgid "pm"
-msgstr "du"
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 msgid "Evolution Calendar Conduit"
 msgstr "EvolЗciС naptАr csatorna"
@@ -1259,13 +1372,13 @@ msgstr "EvolЗciС naptАr csatorna"
 msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr "Az EvolЗciС naptАr csatorna beАllМtС eszkЖze.\n"
 
-#: calendar/conduits/calendar/calendar-conduit.c:671
-#: calendar/conduits/todo/todo-conduit.c:479
+#: calendar/conduits/calendar/calendar-conduit.c:686
+#: calendar/conduits/todo/todo-conduit.c:501
 msgid "Error while communicating with calendar server"
 msgstr "HibАs kommunikАciС a naptАr szerverrel"
 
-#: calendar/conduits/calendar/calendar-conduit.c:770
-#: calendar/conduits/calendar/calendar-conduit.c:773
+#: calendar/conduits/calendar/calendar-conduit.c:785
+#: calendar/conduits/calendar/calendar-conduit.c:788
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nem tudom a pilot Calendar application blokkjАt olvasni"
 
@@ -1277,123 +1390,162 @@ msgstr "EvolЗciС tennivalС csatorna"
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr "Az EvolЗciС tennivalС csatorna beАllМtС eszkЖze.\n"
 
-#: calendar/conduits/todo/todo-conduit.c:578
-#: calendar/conduits/todo/todo-conduit.c:581
+#: calendar/conduits/todo/todo-conduit.c:600
+#: calendar/conduits/todo/todo-conduit.c:603
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nem tudom a pilot Calendar ToDo blokkjАt olvasni"
 
-#: calendar/gui/calendar-commands.c:60
-msgid "Outline:"
-msgstr "KЖrvonal:"
+#.
+#. * 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 "FejlИcek:"
+#: 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:"
-msgstr "эres napok:"
+#.
+#. * 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 "MegbeszИlИsek:"
+#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:7
+#, fuzzy
+msgid "Calendar Server"
+msgstr "NaptАr"
 
-#: calendar/gui/calendar-commands.c:64
-msgid "Highlighted day:"
-msgstr "Kiemelt nap:"
+#.
+#. * 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
+#, fuzzy
+msgid "Evolution calendar executive summary component."
+msgstr "Nem tudom az EvolЗciС levelezУ komponensИt elindМtani."
 
-#: calendar/gui/calendar-commands.c:65
-msgid "Day numbers:"
-msgstr "Nap szАmozАs:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "EvolЗciС naptАr csatorna"
 
-#: calendar/gui/calendar-commands.c:66
-msgid "Current day's number:"
-msgstr "Jelenlegi nap szАma:"
+#: 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:"
-msgstr "TennivalС, ami mИg nem jАrt le:"
+#: 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:"
-msgstr "TennivalС, ami ma jАr le:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#, fuzzy
+msgid "Factory for the Evolution calendar component."
+msgstr "Az EvolЗciС naptАr csatorna beАllМtС eszkЖze.\n"
 
-#: calendar/gui/calendar-commands.c:69
-msgid "To-Do item that is overdue:"
-msgstr "TennivalС, ami lejАrt:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+msgid "Factory for the calendar iTip view control"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:354
+#: 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 "A talАlkozСd figyelmeztetУ Эzenete:"
+
+#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:8
+msgid "Snooze"
+msgstr "Szundi"
+
+#. 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 "Ok"
+
+#: calendar/gui/calendar-commands.c:229
 msgid "File not found"
 msgstr "Nem talАlom a fАjlt"
 
-#: calendar/gui/calendar-commands.c:378
+#: calendar/gui/calendar-commands.c:253
 msgid "Open calendar"
 msgstr "NaptАr megnyitАsa"
 
-#: calendar/gui/calendar-commands.c:417
+#: calendar/gui/calendar-commands.c:295
 msgid "Save calendar"
 msgstr "NaptАr mentИse"
 
+#: 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:282
+#: 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:2498
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:286 calendar/gui/calendar-model.c:736
+#: calendar/gui/calendar-model.c:288 calendar/gui/calendar-model.c:738
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time,
 #. in 12-hour format.
-#: calendar/gui/calendar-model.c:290 calendar/gui/calendar-model.c:739
+#: calendar/gui/calendar-model.c:292 calendar/gui/calendar-model.c:741
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:344 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 "NyilvАnos"
 
-#: calendar/gui/calendar-model.c:347 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 "SzemИlyes"
 
-#: calendar/gui/calendar-model.c:350 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 "Bizalmas"
 
-#: calendar/gui/calendar-model.c:353 calendar/gui/calendar-model.c:521
+#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:523
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: calendar/gui/calendar-model.c:441
+#: calendar/gui/calendar-model.c:443
 msgid "N"
 msgstr "и"
 
-#: calendar/gui/calendar-model.c:441
+#: calendar/gui/calendar-model.c:443
 msgid "S"
 msgstr "D"
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:445
 msgid "E"
 msgstr "K"
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:445
 msgid "W"
 msgstr "Ny"
 
-#: calendar/gui/calendar-model.c:515
+#: calendar/gui/calendar-model.c:517
 msgid "Transparent"
 msgstr "аttetszУ"
 
-#: calendar/gui/calendar-model.c:518
+#: calendar/gui/calendar-model.c:520
 msgid "Opaque"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:744
+#: calendar/gui/calendar-model.c:746
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1405,35 +1557,35 @@ msgstr ""
 "%s"
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:845 calendar/gui/calendar-model.c:893
+#: 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:1274 widgets/misc/e-dateedit.c:1455
+#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:863
+#: 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:866
+#: 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:870
+#: 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:873
+#: calendar/gui/calendar-model.c:875
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
-#: calendar/gui/calendar-model.c:993
+#: calendar/gui/calendar-model.c:995
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1443,14 +1595,37 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1033
+#: calendar/gui/calendar-model.c:1035
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "A szАzalИkos ИrtИk 0 Иs 100 kЖzЖtt lehet, bezАrСlag"
 
-#: calendar/gui/calendar-model.c:1073
+#: calendar/gui/calendar-model.c:1075
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "A prioritАs 1 Иs 9 kЖzЖtt lehet, bezАrСlag"
 
+#: calendar/gui/calendar-summary.c:81
+#, fuzzy
+msgid "%A, %e %B %Y"
+msgstr "%A, %B %d, %Y"
+
+#: calendar/gui/calendar-summary.c:224
+#, fuzzy
+msgid "<b>Error loading calendar</b>"
+msgstr "FАjl betЖltИsi hiba: %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 "NaptАr nyomtatАsa"
+
 #: calendar/gui/control-factory.c:125
 msgid "The URI that the calendar will display"
 msgstr "Az URI amit a naptАr megjelenМt"
@@ -1468,351 +1643,403 @@ msgid "No summary available."
 msgstr "Nincs elИrhetУ ЖsszegzИs."
 
 #.
-#. * 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 "BezАr"
 
-#: po/tmp/alarm-notify.glade.h:7
+#: calendar/gui/dialogs/alarm-notify.glade.h:7
 msgid "Edit appointment"
 msgstr "_IdУpont szerkesztИse"
 
-#: calendar/gui/gnome-cal.c:1466 po/tmp/alarm-notify.glade.h:8
-msgid "Snooze"
-msgstr "Szundi"
-
-#: po/tmp/alarm-notify.glade.h:9
+#: calendar/gui/dialogs/alarm-notify.glade.h:9
 msgid "Snooze time (minutes)"
 msgstr "Szundi idУ (percek)"
 
 #.
-#. * 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 perc"
 
-#: po/tmp/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "10 minutes"
 msgstr "10 perc"
 
-#: po/tmp/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "12 hour (am/pm)"
 msgstr "12 СrАs (de/du)"
 
-#: po/tmp/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "15 minutes"
 msgstr "15 perc"
 
-#: po/tmp/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "24 hour"
 msgstr "24 СrАs"
 
-#: po/tmp/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "30 minutes"
 msgstr "30 perc"
 
-#: po/tmp/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "60 minutes"
 msgstr "60 perc"
 
-#: 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 "Hang figyelmeztetИs"
 
-#: po/tmp/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Beep when alarm windows appear."
 msgstr "SМpolj a figyelmeztetУ ablak megjelenИsekor."
 
-#: po/tmp/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Calendar"
 msgstr "NaptАr"
 
-#: po/tmp/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Calendar Preferences"
 msgstr "NaptАr beАllМtАsok"
 
-#: po/tmp/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Colors"
 msgstr "SzМnek"
 
-#: po/tmp/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Compress weekends"
 msgstr "A hИtvИgИk ЖsszenyomАsa"
 
-#: po/tmp/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Date navigator options"
 msgstr "DАtum navigАtor beАllМtАsok"
 
-#: po/tmp/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Defaults"
 msgstr "AlapИrtelmezett"
 
-#: po/tmp/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Display options"
 msgstr "MegjelenМtИsi beАllМtАsok"
 
-#: po/tmp/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Due Date"
 msgstr "LejАrat"
 
-#: po/tmp/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #, fuzzy
 msgid "Enable snoozing for"
 msgstr "Szundi engedИse"
 
-#: po/tmp/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "End of day:"
 msgstr "Nap vИge:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:26
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "First day of week:"
 msgstr "A hИt elsУ napja:"
 
-#: 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 "PИ"
 
-#: 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 "PИntek"
 
-#: po/tmp/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Highlight"
 msgstr "KiemelИs"
 
-#: po/tmp/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "Items Due Today"
 msgstr "A ma lejАrС elemek"
 
-#: po/tmp/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "Items Due Today:"
 msgstr "A ma lejАrС elemek:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Items Not Yet Due"
 msgstr "MИg nem lejАrt elemek"
 
-#: po/tmp/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Items Not Yet Due:"
 msgstr "MИg nem lejАrt elemek:"
 
-#: 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 "HИ"
 
-#: 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 "HИtfУ"
 
-#: po/tmp/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "Overdue Items"
 msgstr "LejАrt elemek"
 
-#: po/tmp/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Overdue Items:"
 msgstr "LejАrt elemek:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Pick a color"
 msgstr "VАlassz egy szМnt"
 
-#: 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 "PrioritАs"
 
-#: po/tmp/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Remind me of all appointments"
 msgstr "Minden talАlkozСra figyelmeztess"
 
-#: po/tmp/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Reminders"
 msgstr "EmlИkeztetУk"
 
-#: 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 "Szo"
 
-#: 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 "Szombat"
 
-#: po/tmp/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Show"
 msgstr "Mutasd"
 
-#: po/tmp/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "Show appointment end times"
 msgstr "Mutasd az esemИnyek vИgpontjАt"
 
-#: po/tmp/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Show week numbers"
 msgstr "HИt szАmАnak mutatАsa"
 
-#: po/tmp/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "Start of day:"
 msgstr "Nap kezdete:"
 
 #. 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 "Va"
 
-#: 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 "VasАrnap"
 
-#: po/tmp/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "TaskPad"
 msgstr "FeladatTАbla"
 
-#: 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 "CsЭ"
 
-#: 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 "CsЭtЖrtЖk"
 
-#: po/tmp/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "Time Until Due"
 msgstr "LejАratig hАtralИvУ idУ"
 
-#: po/tmp/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "Time divisions:"
 msgstr "IdУosztАsok:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:55
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "Time format:"
 msgstr "IdУ formАtum:"
 
-#: 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 "Ke"
 
-#: 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 "Kedd"
 
-#: po/tmp/cal-prefs-dialog.glade.h:58
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "Visual Alarms"
 msgstr "VizuАlis figyelmeztetИs"
 
-#: 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 "Sze"
 
-#: 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 "Szerda"
 
-#: po/tmp/cal-prefs-dialog.glade.h:61
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "Work week"
 msgstr "MunkahИt"
 
-#: po/tmp/cal-prefs-dialog.glade.h:62
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "minutes before they occur."
 msgstr "perc bekЖvetkezИsЭkig."
 
-#: po/tmp/cal-prefs-dialog.glade.h:63
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "seconds."
 msgstr "mАsodperc."
 
+#: calendar/gui/dialogs/delete-comp.c:62
+#, fuzzy, c-format
+msgid "Are you sure you want to delete the appointment `%s'?"
+msgstr ""
+"TИnyleg tЖrЖlni akarod\n"
+"ezt a nИvjegyet?"
+
+#: calendar/gui/dialogs/delete-comp.c:65
+#, fuzzy
+msgid "Are you sure you want to delete this untitled appointment?"
+msgstr ""
+"TИnyleg tЖrЖlni akarod\n"
+"ezt a nИvjegyet?"
+
+#: calendar/gui/dialogs/delete-comp.c:71
+#, fuzzy, c-format
+msgid "Are you sure you want to delete the task `%s'?"
+msgstr ""
+"TИnyleg tЖrЖlni akarod\n"
+"ezt a nИvjegyet?"
+
+#: calendar/gui/dialogs/delete-comp.c:74
+#, fuzzy
+msgid "Are you sure you want to delete this untitled task?"
+msgstr ""
+"TИnyleg tЖrЖlni akarod\n"
+"ezt a nИvjegyet?"
+
+#: calendar/gui/dialogs/delete-comp.c:80
+#, fuzzy, c-format
+msgid "Are you sure you want to delete the journal entry `%s'?"
+msgstr ""
+"TИnyleg tЖrЖlni akarod\n"
+"ezt a nИvjegyet?"
+
+#: calendar/gui/dialogs/delete-comp.c:83
+#, fuzzy
+msgid "Are you sure want to delete this untitled journal entry?"
+msgstr ""
+"TИnyleg tЖrЖlni akarod\n"
+"ezt a nИvjegyet?"
+
 #.
-#. * 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 "% kИsz:"
 
-#: po/tmp/task-editor-dialog.glade.h:7
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
 msgid "C_lassification:"
 msgstr "B_esorolАs"
 
-#: po/tmp/task-editor-dialog.glade.h:9
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
 msgid "Cancelled"
 msgstr "TЖrЖlve"
 
-#: po/tmp/task-editor-dialog.glade.h:10
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
 msgid "Completed"
 msgstr "ElvИgezve"
 
-#: po/tmp/task-editor-dialog.glade.h:12
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
 msgid "Date Completed:"
 msgstr "TeljesМtИs dАtuma:"
 
-#: po/tmp/task-editor-dialog.glade.h:14
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
 msgid "High"
 msgstr "Magas"
 
-#: po/tmp/task-editor-dialog.glade.h:15
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
 msgid "In Progress"
 msgstr "Folyamatban"
 
-#: po/tmp/task-editor-dialog.glade.h:16
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
 msgid "Low"
 msgstr "Alacsony"
 
 #. 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
-#: widgets/misc/e-dateedit.c:422 widgets/misc/e-dateedit.c:1331
-#: widgets/misc/e-dateedit.c:1446
+#: 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 "Semmi"
 
-#: po/tmp/task-editor-dialog.glade.h:18
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
 msgid "Normal"
 msgstr "NormАlis"
 
-#: po/tmp/task-editor-dialog.glade.h:19
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
 msgid "Not Started"
 msgstr "Nem indult mИg el"
 
-#: po/tmp/task-editor-dialog.glade.h:22
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
 msgid "S_ummary"
 msgstr "ж_sszegzИs"
 
-#: po/tmp/task-editor-dialog.glade.h:23
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
 msgid "Sta_rt Date:"
 msgstr "Ke_zdИsi dАtum:"
 
-#: po/tmp/task-editor-dialog.glade.h:24
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
 msgid "Task"
 msgstr "Feladat"
 
-#: 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 "_NИvjegyek..."
 
-#: po/tmp/task-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
 msgid "_Due Date:"
 msgstr "Le_jАrat:"
 
-#: po/tmp/task-editor-dialog.glade.h:28
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
 msgid "_Priority:"
 msgstr "_PrioritАs:"
 
-#: po/tmp/task-editor-dialog.glade.h:29
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
 msgid "_Status:"
 msgstr "_StАtusz:"
 
-#: po/tmp/task-editor-dialog.glade.h:30
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
 msgid "task-editor-dialog"
 msgstr "task-editor-dialog"
 
@@ -1820,26 +2047,26 @@ msgstr "task-editor-dialog"
 msgid "Edit Task"
 msgstr "Feladat vИge"
 
-#: 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 "Nincs ЖsszegzИs"
 
-#: 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 "IdУpont - %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 "Feladat - %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 "NaplС bejegyzИs - %s"
 
-#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3277
+#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3250
 msgid "Do you want to save changes?"
 msgstr ""
 
@@ -1859,14 +2086,6 @@ msgstr "KИsznek jelЖl"
 msgid "Mark the task complete"
 msgstr "MegjelЖlИs mint kИsz feladat"
 
-#: calendar/gui/e-calendar-table.c:342 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:479 mail/mail-view.c:165
-#: 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 "TЖrЖl"
-
 #: calendar/gui/e-calendar-table.c:343
 msgid "Delete the task"
 msgstr "A feladat tЖrlИse"
@@ -1878,50 +2097,62 @@ msgstr "%02i perces osztАs"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1208
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1211
 #: calendar/gui/e-week-view-main-item.c:325
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1222
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1225
 #: calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1235
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1238
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view.c:2941 calendar/gui/e-day-view.c:2948
-#: calendar/gui/e-day-view.c:2957 calendar/gui/e-week-view.c:3165
-#: calendar/gui/e-week-view.c:3172 calendar/gui/e-week-view.c:3181
+#. 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:610
+msgid "am"
+msgstr "de"
+
+#. 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:609
+msgid "pm"
+msgstr "du"
+
+#: calendar/gui/e-day-view.c:2948 calendar/gui/e-day-view.c:2955
+#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3169
+#: calendar/gui/e-week-view.c:3176 calendar/gui/e-week-view.c:3185
 msgid "New appointment..."
 msgstr "зj _idУpont"
 
-#: calendar/gui/e-day-view.c:2945 calendar/gui/e-day-view.c:2952
-#: calendar/gui/e-week-view.c:3169 calendar/gui/e-week-view.c:3176
+#: calendar/gui/e-day-view.c:2952 calendar/gui/e-day-view.c:2959
+#: calendar/gui/e-week-view.c:3173 calendar/gui/e-week-view.c:3180
 msgid "Edit this appointment..."
 msgstr "A megbeszИlИs szerkesztИse..."
 
-#: calendar/gui/e-day-view.c:2946 calendar/gui/e-week-view.c:3170
-#: po/tmp/evolution-event-editor.xml.h:20
+#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3174
+#: ui/evolution-event-editor.xml.h:20
 msgid "Delete this appointment"
 msgstr "A megbeszИlИs tЖrlИse"
 
-#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3177
+#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3181
 msgid "Make this appointment movable"
 msgstr "A megbeszИlИs mozgathatСvА tИtele"
 
-#: calendar/gui/e-day-view.c:2954 calendar/gui/e-week-view.c:3178
+#: calendar/gui/e-day-view.c:2961 calendar/gui/e-week-view.c:3182
 msgid "Delete this occurrence"
 msgstr "A megjelenИs tЖrlИse"
 
-#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3179
+#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3183
 msgid "Delete all occurrences"
 msgstr "Az Жsszes megjelenИs tЖrlИse"
 
@@ -1933,662 +2164,490 @@ 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 "Minden napos esemИny"
 
-#: po/tmp/event-editor-dialog.glade.h:8
+#: calendar/gui/event-editor-dialog.glade.h:8
 #, fuzzy
 msgid "Appointment Basics"
 msgstr "MegbeszИlИsek:"
 
-#: po/tmp/event-editor-dialog.glade.h:9
+#: calendar/gui/event-editor-dialog.glade.h:9
 msgid "Classification"
 msgstr "BesorolАs"
 
-#: po/tmp/event-editor-dialog.glade.h:10
+#: calendar/gui/event-editor-dialog.glade.h:10
 msgid "Custom recurrence"
 msgstr "Megadott ismИtlУdИs"
 
-#: po/tmp/event-editor-dialog.glade.h:11
+#: calendar/gui/event-editor-dialog.glade.h:11
 msgid "Days"
 msgstr "Napok"
 
-#: po/tmp/event-editor-dialog.glade.h:13
+#: calendar/gui/event-editor-dialog.glade.h:13
 msgid "Every"
 msgstr "Minden"
 
-#: po/tmp/event-editor-dialog.glade.h:14
+#: calendar/gui/event-editor-dialog.glade.h:14
 msgid "Exceptions"
 msgstr "KivИtelek"
 
-#: po/tmp/event-editor-dialog.glade.h:16
+#: calendar/gui/event-editor-dialog.glade.h:16
 msgid "Hours"
 msgstr "сrАk"
 
-#: po/tmp/event-editor-dialog.glade.h:17
+#: calendar/gui/event-editor-dialog.glade.h:17
 msgid "Mail _to:"
 msgstr "LevИl _valakinek:"
 
-#: po/tmp/event-editor-dialog.glade.h:18
+#: calendar/gui/event-editor-dialog.glade.h:18
 msgid "Minutes"
 msgstr "Percek"
 
-#: po/tmp/event-editor-dialog.glade.h:19
+#: calendar/gui/event-editor-dialog.glade.h:19
 msgid "Modify"
 msgstr "MСdosМtАs"
 
-#: po/tmp/event-editor-dialog.glade.h:20
+#: calendar/gui/event-editor-dialog.glade.h:20
 msgid "No recurrence"
 msgstr "Nincs ismИtlУdИs"
 
-#: po/tmp/event-editor-dialog.glade.h:21
+#: calendar/gui/event-editor-dialog.glade.h:21
 #, fuzzy
 msgid "Preview"
 msgstr "ElУnИzet:"
 
-#: po/tmp/event-editor-dialog.glade.h:22
+#: calendar/gui/event-editor-dialog.glade.h:22
 msgid "Pri_vate"
 msgstr "SzemИ_lyes"
 
-#: po/tmp/event-editor-dialog.glade.h:23
+#: calendar/gui/event-editor-dialog.glade.h:23
 msgid "Pu_blic"
 msgstr "Nyil_vАnos"
 
-#: po/tmp/event-editor-dialog.glade.h:24
+#: calendar/gui/event-editor-dialog.glade.h:24
 msgid "Recurrence"
 msgstr "IsmИtlУdИs"
 
-#: po/tmp/event-editor-dialog.glade.h:25
+#: calendar/gui/event-editor-dialog.glade.h:25
 msgid "Recurrence Rule"
 msgstr "IsmИtlУdИsi szabАly"
 
-#: po/tmp/event-editor-dialog.glade.h:26
+#: calendar/gui/event-editor-dialog.glade.h:26
 msgid "Reminder"
 msgstr "EmlИkeztetУ"
 
-#: po/tmp/event-editor-dialog.glade.h:27
+#: calendar/gui/event-editor-dialog.glade.h:27
 msgid "Simple recurrence"
 msgstr "EgyszerШ ismИtlУdИs"
 
-#: po/tmp/event-editor-dialog.glade.h:28
+#: calendar/gui/event-editor-dialog.glade.h:28
 #, fuzzy
 msgid "Su_mmary:"
 msgstr "жsszegzИs:"
 
-#: po/tmp/event-editor-dialog.glade.h:29
+#: calendar/gui/event-editor-dialog.glade.h:29
 msgid "Time"
 msgstr "IdУ"
 
-#: po/tmp/event-editor-dialog.glade.h:30
+#: calendar/gui/event-editor-dialog.glade.h:30
 msgid "_Audio"
 msgstr "_Hang"
 
-#: po/tmp/event-editor-dialog.glade.h:31
+#: calendar/gui/event-editor-dialog.glade.h:31
 msgid "_Confidential"
 msgstr "_Bizalmas"
 
-#: po/tmp/event-editor-dialog.glade.h:32
+#: calendar/gui/event-editor-dialog.glade.h:32
 msgid "_Display"
 msgstr "_MegjelenМt"
 
-#: po/tmp/event-editor-dialog.glade.h:33
+#: calendar/gui/event-editor-dialog.glade.h:33
 msgid "_End time:"
 msgstr "_VИg idУpont:"
 
-#: po/tmp/event-editor-dialog.glade.h:34
+#: calendar/gui/event-editor-dialog.glade.h:34
 msgid "_Mail"
 msgstr "_LevИl"
 
-#: po/tmp/event-editor-dialog.glade.h:35
+#: calendar/gui/event-editor-dialog.glade.h:35
 msgid "_Program"
 msgstr "_Program"
 
-#: po/tmp/event-editor-dialog.glade.h:36
+#: calendar/gui/event-editor-dialog.glade.h:36
 msgid "_Run program:"
 msgstr "_Program indМtАsa:"
 
-#: po/tmp/event-editor-dialog.glade.h:37
+#: calendar/gui/event-editor-dialog.glade.h:37
 msgid "_Start time:"
 msgstr "_KezdИsi idУ:"
 
-#: po/tmp/event-editor-dialog.glade.h:38
+#: calendar/gui/event-editor-dialog.glade.h:38
 msgid "_Starting date:"
 msgstr "Ke_zdИsi dАtum:"
 
-#: po/tmp/event-editor-dialog.glade.h:39
+#: calendar/gui/event-editor-dialog.glade.h:39
 msgid "day(s)"
 msgstr "nap"
 
-#: po/tmp/event-editor-dialog.glade.h:40
+#: calendar/gui/event-editor-dialog.glade.h:40
 msgid "event-editor-dialog"
 msgstr "event-editor-dialog"
 
-#: po/tmp/event-editor-dialog.glade.h:41
+#: calendar/gui/event-editor-dialog.glade.h:41
 msgid "for"
 msgstr "ezИrt:"
 
-#: po/tmp/event-editor-dialog.glade.h:42
+#: calendar/gui/event-editor-dialog.glade.h:42
 msgid "forever"
 msgstr "ЖrЖkkИ"
 
-#: po/tmp/event-editor-dialog.glade.h:43
+#: calendar/gui/event-editor-dialog.glade.h:43
 msgid "label21"
 msgstr "label21"
 
-#: po/tmp/event-editor-dialog.glade.h:44
+#: calendar/gui/event-editor-dialog.glade.h:44
 msgid "month(s)"
 msgstr "hСnapban"
 
-#: po/tmp/event-editor-dialog.glade.h:45
+#: calendar/gui/event-editor-dialog.glade.h:45
 msgid "until"
 msgstr "amМg"
 
-#: po/tmp/event-editor-dialog.glade.h:46
+#: calendar/gui/event-editor-dialog.glade.h:46
 msgid "week(s)"
 msgstr "hИten"
 
-#: po/tmp/event-editor-dialog.glade.h:47
+#: calendar/gui/event-editor-dialog.glade.h:47
 msgid "year(s)"
 msgstr "Иvben"
 
-#: calendar/gui/event-editor.c:329
+#: calendar/gui/event-editor.c:325
 msgid "Edit Appointment"
 msgstr "MegbeszИlИs szerkesztИse"
 
-#: calendar/gui/event-editor.c:407
+#: calendar/gui/event-editor.c:403
 msgid "on"
 msgstr "ekkor:"
 
-#: calendar/gui/event-editor.c:432 calendar/gui/getdate.y:424
-#: filter/filter-datespec.c:65
+#: calendar/gui/event-editor.c:428 filter/filter-datespec.c:65
 msgid "day"
 msgstr "nap"
 
-#: calendar/gui/event-editor.c:559
+#: calendar/gui/event-editor.c:555
 msgid "on the"
 msgstr "ezen:"
 
-#: calendar/gui/event-editor.c:566
+#: calendar/gui/event-editor.c:562
 msgid "th"
 msgstr "."
 
-#: calendar/gui/event-editor.c:722
+#: calendar/gui/event-editor.c:716
 #, fuzzy
 msgid "occurrences"
 msgstr "elУfordulАsok"
 
-#: calendar/gui/event-editor.c:839
+#: calendar/gui/event-editor.c:833
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor.c:3079 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 "%a %b %d %Y"
 
-#: calendar/gui/getdate.y:391
-msgid "january"
-msgstr "januАr"
+#: calendar/gui/gnome-cal.c:676
+#, c-format
+msgid "Could not load the calendar in `%s'"
+msgstr ""
 
-#: calendar/gui/getdate.y:392
-msgid "february"
-msgstr "februАr"
+#: calendar/gui/gnome-cal.c:687
+#, fuzzy, c-format
+msgid "Could not create a calendar in `%s'"
+msgstr "Nem tudom a dialСgust elkИszМteni."
 
-#: calendar/gui/getdate.y:393
-msgid "march"
-msgstr "mАrcius"
+#: calendar/gui/gnome-cal.c:698
+#, c-format
+msgid "The method required to load `%s' is not supported"
+msgstr ""
 
-#: calendar/gui/getdate.y:394
-msgid "april"
+#.
+#. * 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
+#, fuzzy
+msgid "April"
 msgstr "Аprilis"
 
-#: calendar/gui/getdate.y:395
-msgid "may"
-msgstr "mАjus"
-
-#: calendar/gui/getdate.y:396
-msgid "june"
-msgstr "jЗnius"
-
-#: calendar/gui/getdate.y:397
-msgid "july"
-msgstr "jЗlius"
-
-#: calendar/gui/getdate.y:398
-msgid "august"
+#: calendar/gui/goto-dialog.glade.h:7
+#, fuzzy
+msgid "August"
 msgstr "augusztus"
 
-#: calendar/gui/getdate.y:399
-msgid "september"
-msgstr "szeptember"
-
-#: calendar/gui/getdate.y:400
-msgid "sept"
-msgstr "szept"
-
-#: calendar/gui/getdate.y:401
-msgid "october"
-msgstr "oktСber"
-
-#: calendar/gui/getdate.y:402
-msgid "november"
-msgstr "november"
-
-#: calendar/gui/getdate.y:403
-msgid "december"
+#: calendar/gui/goto-dialog.glade.h:8
+#, fuzzy
+msgid "December"
 msgstr "december"
 
-#: calendar/gui/getdate.y:404
-msgid "sunday"
-msgstr "vasАrnap"
-
-#: calendar/gui/getdate.y:405
-msgid "monday"
-msgstr "hИtfУ"
-
-#: calendar/gui/getdate.y:406
-msgid "tuesday"
-msgstr "kedd"
-
-#: calendar/gui/getdate.y:407
-msgid "tues"
-msgstr "kedd"
-
-#: calendar/gui/getdate.y:408
-msgid "wednesday"
-msgstr "szerda"
-
-#: calendar/gui/getdate.y:409
-msgid "wednes"
-msgstr "szerda"
-
-#: calendar/gui/getdate.y:410
-msgid "thursday"
-msgstr "csЭtЖrtЖk"
-
-#: calendar/gui/getdate.y:411
-msgid "thur"
-msgstr "csЭt"
-
-#: calendar/gui/getdate.y:412
-msgid "thurs"
-msgstr "csЭt"
-
-#: calendar/gui/getdate.y:413
-msgid "friday"
-msgstr "pИntek"
-
-#: calendar/gui/getdate.y:414
-msgid "saturday"
-msgstr "szombat"
-
-#: calendar/gui/getdate.y:420 filter/filter-datespec.c:62
-msgid "year"
-msgstr "Иv"
-
-#: calendar/gui/getdate.y:421 filter/filter-datespec.c:63
-msgid "month"
-msgstr "hСnap"
-
-#: calendar/gui/getdate.y:422
-msgid "fortnight"
-msgstr "kИt hИt"
-
-#: calendar/gui/getdate.y:423 filter/filter-datespec.c:64
-msgid "week"
-msgstr "hИt"
-
-#: calendar/gui/getdate.y:425 filter/filter-datespec.c:66
-msgid "hour"
-msgstr "Сra"
-
-#: calendar/gui/getdate.y:426 filter/filter-datespec.c:67
-msgid "minute"
-msgstr "perc"
-
-#: calendar/gui/getdate.y:427
-msgid "min"
-msgstr "perc"
-
-#: calendar/gui/getdate.y:428 filter/filter-datespec.c:68
-msgid "second"
-msgstr "mАsodperc"
-
-#: calendar/gui/getdate.y:429
-msgid "sec"
-msgstr "mp"
-
-#: calendar/gui/getdate.y:435
-msgid "tomorrow"
-msgstr "holnap"
-
-#: calendar/gui/getdate.y:436
-msgid "yesterday"
-msgstr "tegnap"
-
-#: calendar/gui/getdate.y:437
-msgid "today"
-msgstr "ma"
-
-#: calendar/gui/getdate.y:438 filter/filter-datespec.c:533
-#: filter/filter-datespec.c:693
-msgid "now"
-msgstr "most"
-
-#: calendar/gui/getdate.y:439
-msgid "last"
-msgstr "utolsС"
-
-#: calendar/gui/getdate.y:440
-msgid "this"
-msgstr "ez"
-
-#: calendar/gui/getdate.y:441
-msgid "next"
-msgstr "kЖvetkezУ"
-
-#: calendar/gui/getdate.y:442
-msgid "first"
-msgstr "elsУ"
-
-#. { N_("second"),		tUNUMBER,	2 },
-#: calendar/gui/getdate.y:444
-msgid "third"
-msgstr "harmadik"
-
-#: calendar/gui/getdate.y:445
-msgid "fourth"
-msgstr "negyedik"
-
-#: calendar/gui/getdate.y:446
-msgid "fifth"
-msgstr "ЖtЖdik"
-
-#: calendar/gui/getdate.y:447
-msgid "sixth"
-msgstr "hatodik"
-
-#: calendar/gui/getdate.y:448
-msgid "seventh"
-msgstr "hetedik"
-
-#: calendar/gui/getdate.y:449
-msgid "eighth"
-msgstr "nyolcadik"
-
-#: calendar/gui/getdate.y:450
-msgid "ninth"
-msgstr "kilencedik"
-
-#: calendar/gui/getdate.y:451
-msgid "tenth"
-msgstr "tizedik"
-
-#: calendar/gui/getdate.y:452
-msgid "eleventh"
-msgstr "tizenegyedik"
+#: calendar/gui/goto-dialog.glade.h:9
+#, fuzzy
+msgid "February"
+msgstr "februАr"
 
-#: calendar/gui/getdate.y:453
-msgid "twelfth"
-msgstr "tizenkettedik"
+#: calendar/gui/goto-dialog.glade.h:10
+#, fuzzy
+msgid "Go To Date"
+msgstr "DАtumra ugrАs"
 
-#: calendar/gui/getdate.y:454
-msgid "ago"
-msgstr "Сta"
+#: calendar/gui/goto-dialog.glade.h:11
+#, fuzzy
+msgid "Go To Today"
+msgstr "Ugorj mАra"
 
-#: calendar/gui/gnome-cal.c:718 calendar/gui/gnome-cal.c:1474
-#: calendar/gui/gnome-cal.c:1530
-msgid "Reminder of your appointment at "
-msgstr "A talАlkozСd figyelmeztetУ Эzenete:"
+#: calendar/gui/goto-dialog.glade.h:12
+#, fuzzy
+msgid "January"
+msgstr "januАr"
 
-#: calendar/gui/gnome-cal.c:1152
-#, c-format
-msgid "Could not load the calendar in `%s'"
-msgstr ""
+#: calendar/gui/goto-dialog.glade.h:13
+#, fuzzy
+msgid "July"
+msgstr "jЗlius"
 
-#: calendar/gui/gnome-cal.c:1163
-#, fuzzy, c-format
-msgid "Could not create a calendar in `%s'"
-msgstr "Nem tudom a dialСgust elkИszМteni."
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "June"
+msgstr "jЗnius"
 
-#: calendar/gui/gnome-cal.c:1174
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr ""
+#: calendar/gui/goto-dialog.glade.h:15
+#, fuzzy
+msgid "March"
+msgstr "mАrcius"
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1479 calendar/gui/gnome-cal.c:1534
-#: mail/mail-search-dialogue.c:104
-msgid "Ok"
-msgstr "Ok"
+#: calendar/gui/goto-dialog.glade.h:16
+#, fuzzy
+msgid "May"
+msgstr "HИtfУ"
 
-#: calendar/gui/goto.c:82
-msgid "Year:"
-msgstr "иv:"
+#: calendar/gui/goto-dialog.glade.h:17
+#, fuzzy
+msgid "November"
+msgstr "november"
 
-#: calendar/gui/goto.c:270
-msgid "Go to date"
-msgstr "DАtumra ugrАs"
+#: calendar/gui/goto-dialog.glade.h:18
+#, fuzzy
+msgid "October"
+msgstr "oktСber"
 
-#. Instructions
-#: calendar/gui/goto.c:281
-msgid ""
-"Please select the date you want to go to.\n"
-"When you click on a day, you will be taken\n"
-"to that date."
-msgstr ""
-"KИrlek vАlassz egy dАtumot amire lИpni akarsz.\n"
-"Ha egy napra kattintassz, arra a dАtumra leszel\n"
-"tИve."
+#: calendar/gui/goto-dialog.glade.h:19
+#, fuzzy
+msgid "September"
+msgstr "szeptember"
 
-#: calendar/gui/goto.c:318
-msgid "Go to today"
-msgstr "Ugorj mАra"
+#: calendar/gui/main.c:49
+#, fuzzy
+msgid "Could not initialize GNOME"
+msgstr "Nem tudom a bonobo-t elindМtani"
 
-#: 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 "V"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Mo"
 msgstr "H"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Tu"
 msgstr "K"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "We"
 msgstr "Sze"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Th"
 msgstr "Cs"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Fr"
 msgstr "P"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Sa"
 msgstr "Szo"
 
-#: calendar/gui/print.c:936
+#: calendar/gui/print.c:941
 msgid "Tasks"
 msgstr "Feladatok"
 
 #. Day
-#: calendar/gui/print.c:1066
+#: calendar/gui/print.c:1071
 msgid "Current day (%a %b %d %Y)"
 msgstr "Mai nap (%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
 #, fuzzy, c-format
 msgid "Current week (%s - %s)"
 msgstr "AktuАlis hИt (%s %s %d - %s %d %d)"
 
 #. Month
-#: calendar/gui/print.c:1100
+#: calendar/gui/print.c:1105
 #, fuzzy
 msgid "Current month (%b %Y)"
 msgstr "AktuАlis hСnap (%a %Y)"
 
 #. Year
-#: calendar/gui/print.c:1107
+#: calendar/gui/print.c:1112
 msgid "Current year (%Y)"
 msgstr "EzИv (%Y)"
 
-#: calendar/gui/print.c:1144
+#: calendar/gui/print.c:1149
 msgid "Print Calendar"
 msgstr "NaptАr nyomtatАsa"
 
-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:962
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1001
 msgid "Print Preview"
 msgstr "NyomtatАsi elУnИzet"
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: calendar/gui/weekday-picker.c:351 widgets/misc/e-calendar-item.c:416
-msgid "MTWTFSS"
-msgstr "HKSCPsV"
-
-#: calendar/gui/weekday-picker.c:353 calendar/gui/weekday-picker.c:443
+#: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
 msgid "SMTWTFS"
 msgstr "VHKSCPS"
 
@@ -2678,60 +2737,61 @@ msgstr ""
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:182
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr "%s szerver %s"
 
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:227
+#: camel/camel-remote-store.c:243
+#: camel/providers/smtp/camel-smtp-transport.c:162
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:228
+#: camel/camel-remote-store.c:244
 msgid "(unknown host)"
 msgstr "(ismeretlen szerver)"
 
-#: camel/camel-remote-store.c:452
+#: camel/camel-remote-store.c:483
 msgid "Server disconnected."
 msgstr ""
 
-#: camel/camel-service.c:120
+#: camel/camel-service.c:138
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:129
+#: camel/camel-service.c:147
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:138
+#: camel/camel-service.c:156
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:488
+#: camel/camel-service.c:526
 #, c-format
 msgid "No such host %s."
 msgstr ""
 
-#: camel/camel-service.c:491
+#: camel/camel-service.c:529
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr ""
 
-#: camel/camel-session.c:272
+#: camel/camel-session.c:297
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:360
+#: camel/camel-session.c:388
 #, fuzzy, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2756,52 +2816,52 @@ msgstr ""
 msgid "Port number in URL `%s' is non-numeric"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-auth.c:127
+#: camel/providers/imap/camel-imap-auth.c:133
 #, fuzzy, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
 "%s"
 msgstr "Nem tudok GPG/PGP programot pipe-olni: %s"
 
-#: camel/providers/imap/camel-imap-auth.c:198
+#: camel/providers/imap/camel-imap-auth.c:205
 msgid "Bad authentication response from server."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:216
+#: camel/providers/imap/camel-imap-command.c:231
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:224
+#: camel/providers/imap/camel-imap-command.c:239
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Az IMAP parancs sikertelen: %s"
 
-#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:240 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "Ismeretlen hiba"
 
-#: camel/providers/imap/camel-imap-command.c:271
+#: camel/providers/imap/camel-imap-command.c:286
 #, fuzzy
 msgid "Server response ended too soon."
 msgstr "Az IMAP szerver vАlasza nem tartalmaz %s informАciСt"
 
-#: camel/providers/imap/camel-imap-command.c:407
+#: camel/providers/imap/camel-imap-command.c:422
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Az IMAP szerver vАlasza nem tartalmaz %s informАciСt"
 
-#: camel/providers/imap/camel-imap-command.c:443
+#: camel/providers/imap/camel-imap-command.c:458
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:216
+#: 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:586
+#: camel/providers/imap/camel-imap-folder.c:532
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -2813,31 +2873,25 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:234
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:148
-msgid "Password"
-msgstr "JelszС"
-
-#: camel/providers/imap/camel-imap-store.c:236
+#: camel/providers/imap/camel-imap-store.c:248
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:245
+#: camel/providers/imap/camel-imap-store.c:257
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/providers/imap/camel-imap-store.c:247
+#: camel/providers/imap/camel-imap-store.c:259
 msgid ""
 "This option will connect to the IMAP server using Kerberos 4 authentication."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:333
+#: camel/providers/imap/camel-imap-store.c:345
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:359
+#: camel/providers/imap/camel-imap-store.c:373
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2845,7 +2899,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:539
+#: camel/providers/imap/camel-imap-store.c:564
 #, fuzzy, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
@@ -2934,12 +2988,12 @@ msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "LevИl mozgatАsa mАs mappАba"
 
 #: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:204
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-maildir-folder.c:207
+#: camel/providers/local/camel-maildir-folder.c:215
+#: camel/providers/local/camel-mbox-folder.c:317
 #: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:189
-#: camel/providers/local/camel-mh-folder.c:197
+#: camel/providers/local/camel-mh-folder.c:192
+#: camel/providers/local/camel-mh-folder.c:200
 #, fuzzy, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -2947,14 +3001,14 @@ msgid ""
 msgstr "Nem tudom beАllМtani a helyi tАrterЭletet -- %s"
 
 #: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-mbox-folder.c:317
 #: camel/providers/local/camel-mh-folder.c:183
 #, fuzzy
 msgid "No such message"
 msgstr "A levИl tovАbbМtАsa"
 
-#: camel/providers/local/camel-maildir-folder.c:213
-#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-maildir-folder.c:216
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "Invalid message contents"
 msgstr ""
 
@@ -2998,30 +3052,30 @@ msgstr ""
 msgid "not a maildir directory"
 msgstr "%s helyi levИlkЖnyvtАr"
 
-#: camel/providers/local/camel-mbox-folder.c:195
+#: camel/providers/local/camel-mbox-folder.c:201
 #, fuzzy, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Nem tudom beАllМtani a helyi tАrterЭletet -- %s"
 
-#: camel/providers/local/camel-mbox-folder.c:251
+#: camel/providers/local/camel-mbox-folder.c:257
 #, fuzzy, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "LevИl mozgatАsa mАs mappАba"
 
-#: camel/providers/local/camel-mbox-folder.c:327
-#: camel/providers/local/camel-mbox-folder.c:357
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:333
+#: camel/providers/local/camel-mbox-folder.c:365
+#: camel/providers/local/camel-mbox-folder.c:378
 #, fuzzy, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 msgstr "Nem tudom beАllМtani a helyi tАrterЭletet -- %s"
 
-#: camel/providers/local/camel-mbox-folder.c:358
+#: camel/providers/local/camel-mbox-folder.c:366
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:369
+#: camel/providers/local/camel-mbox-folder.c:379
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -3070,60 +3124,60 @@ msgstr ""
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:341
+#: camel/providers/local/camel-mbox-summary.c:343
 #, fuzzy, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "Nem tudom a dialСgust elkИszМteni."
 
-#: camel/providers/local/camel-mbox-summary.c:475
-#: camel/providers/local/camel-mbox-summary.c:661
+#: camel/providers/local/camel-mbox-summary.c:477
+#: camel/providers/local/camel-mbox-summary.c:668
 #, fuzzy, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
 "Nem tudom mАsolni a fАjlokat\n"
 "'%s'-be."
 
-#: camel/providers/local/camel-mbox-summary.c:491
+#: camel/providers/local/camel-mbox-summary.c:493
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:512
-#: camel/providers/local/camel-mbox-summary.c:520
-#: camel/providers/local/camel-mbox-summary.c:691
-#: camel/providers/local/camel-mbox-summary.c:699
+#: camel/providers/local/camel-mbox-summary.c:514
+#: camel/providers/local/camel-mbox-summary.c:522
+#: camel/providers/local/camel-mbox-summary.c:701
+#: camel/providers/local/camel-mbox-summary.c:709
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:562
+#: camel/providers/local/camel-mbox-summary.c:565
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:579
+#: camel/providers/local/camel-mbox-summary.c:582
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:595
-#: camel/providers/local/camel-mbox-summary.c:748
+#: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-mbox-summary.c:759
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:604
+#: camel/providers/local/camel-mbox-summary.c:609
 #, fuzzy, c-format
 msgid "Could not close temp folder: %s"
 msgstr ""
 "Nem tudom elkИszМteni a megadott mappАt:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:615
+#: camel/providers/local/camel-mbox-summary.c:620
 #, fuzzy, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nem tudom a dialСgust elkИszМteni."
 
-#: camel/providers/local/camel-mbox-summary.c:817
+#: camel/providers/local/camel-mbox-summary.c:830
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Ismeretlen hiba: %s"
@@ -3156,7 +3210,7 @@ msgstr ""
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:144
+#: camel/providers/nntp/camel-nntp-folder.c:115
 #, fuzzy, c-format
 msgid "Message %s not found."
 msgstr "Nem talАlom a fАjlt"
@@ -3206,16 +3260,16 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:179
+#: camel/providers/pop3/camel-pop3-folder.c:180
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:273
+#: camel/providers/pop3/camel-pop3-folder.c:274
 #, c-format
 msgid "No message with uid %s"
 msgstr "Nincs %s azonosМtСjЗ levИl"
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:288
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr ""
@@ -3253,47 +3307,48 @@ msgstr ""
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Nem tudok GPG/PGP programot pipe-olni: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:335
+#: camel/providers/pop3/camel-pop3-store.c:337
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:389
+#: camel/providers/pop3/camel-pop3-store.c:391
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:408
+#: camel/providers/pop3/camel-pop3-store.c:410
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending username: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:411
-#: camel/providers/pop3/camel-pop3-store.c:448
+#: camel/providers/pop3/camel-pop3-store.c:413
+#: camel/providers/pop3/camel-pop3-store.c:450
 msgid "(Unknown)"
 msgstr "(Ismeretlen)"
 
-#: camel/providers/pop3/camel-pop3-store.c:438
+#: camel/providers/pop3/camel-pop3-store.c:440
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:446
+#: camel/providers/pop3/camel-pop3-store.c:448
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:555
+#: camel/providers/pop3/camel-pop3-store.c:557
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Nincs '%s' mappa."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
+#: mail/mail-config-druid.glade.h:63
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -3341,8 +3396,133 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
+#: 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
+#, c-format
+msgid "Welcome response error: %s: possibly non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:281
+#, fuzzy
+msgid "No authentication required"
+msgstr "AuthentikАciС:"
+
+#: camel/providers/smtp/camel-smtp-transport.c:283
+msgid ""
+"This option will connect to the SMTP server without using any kind of "
+"authentication. This should be fine for connecting to most SMTP servers."
+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 ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:294
+msgid ""
+"This option will connect to the SMTP server using CRAM-MD5 authentication."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:332
+#, fuzzy, c-format
+msgid "SMTP server %s"
+msgstr "%s szerver %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:334
+#, c-format
+msgid "SMTP mail delivery via %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:359
+msgid "Cannot send message: sender address not defined."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:366
+msgid "Cannot send message: sender address not valid."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:380
+msgid "Cannot send message: no recipients defined."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:474
+#, c-format
+msgid "HELO request timed out: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:490
+#, c-format
+msgid "HELO response error: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:529
+#, c-format
+msgid "MAIL FROM request timed out: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:545
+#, c-format
+msgid "MAIL FROM response error: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:570
+#, fuzzy, c-format
+msgid "RCPT TO request timed out: %s: mail not sent"
+msgstr "Nem tudok GPG/PGP programot pipe-olni: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
+#, fuzzy, c-format
+msgid "RCPT TO response error: %s: mail not sent"
+msgstr "Nem tudok GPG/PGP programot pipe-olni: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:617
+#, fuzzy, c-format
+msgid "DATA request timed out: %s: mail not sent"
+msgstr "Nem tudok GPG/PGP programot pipe-olni: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:633
+#, c-format
+msgid "DATA response error: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:648
+#: camel/providers/smtp/camel-smtp-transport.c:666
+#, c-format
+msgid "DATA send timed out: message termination: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:682
+#, c-format
+msgid "DATA response error: message termination: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:706
+#, c-format
+msgid "RSET request timed out: %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:722
+#, fuzzy, c-format
+msgid "RSET response error: %s"
+msgstr "Ismeretlen hiba: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:745
+#, c-format
+msgid "QUIT request timed out: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#, c-format
+msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
 #: camel/providers/vee/camel-vee-provider.c:30
@@ -3378,83 +3558,83 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:144
+#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:155
 msgid "attachment"
 msgstr "csatolАs"
 
-#: composer/e-msg-composer-attachment-bar.c:417
-#: 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 "FАjl csatolАsa"
 
-#: composer/e-msg-composer-attachment-bar.c:464 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 "TЖrlИs"
 
-#: composer/e-msg-composer-attachment-bar.c:465
+#: composer/e-msg-composer-attachment-bar.c:461
 msgid "Remove selected items from the attachment list"
 msgstr "TЖrli a kivАlasztott elemeket a csatolАsi listАrСl"
 
-#: composer/e-msg-composer-attachment-bar.c:496
+#: composer/e-msg-composer-attachment-bar.c:492
 msgid "Add attachment..."
 msgstr "Csatol..."
 
-#: composer/e-msg-composer-attachment-bar.c:497
+#: composer/e-msg-composer-attachment-bar.c:493
 msgid "Attach a file to the message"
 msgstr "Csatolj egy fАjlt a levИlhez"
 
 #.
-#. * 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 "CsatolАs beАllМtАsok"
 
-#: po/tmp/e-msg-composer-attachment.glade.h:8
+#: composer/e-msg-composer-attachment.glade.h:8
 msgid "File name:"
 msgstr "FАjlnИv:"
 
-#: po/tmp/e-msg-composer-attachment.glade.h:9
+#: composer/e-msg-composer-attachment.glade.h:9
 msgid "MIME type:"
 msgstr "MIME tМpus:"
 
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:290
-#: mail/mail-format.c:621
+#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:303
+#: mail/mail-format.c:626
 msgid "From:"
 msgstr "FeladС:"
 
-#: composer/e-msg-composer-hdrs.c:238
+#: composer/e-msg-composer-hdrs.c:247
 msgid "Click here for the address book"
 msgstr "CМmjegyzИkben valС keresИshez kattints ide"
 
-#: composer/e-msg-composer-hdrs.c:291
+#: composer/e-msg-composer-hdrs.c:304
 #, fuzzy
 msgid "Enter the identity you wish to send this message from"
 msgstr "мrd be a leveleid feladСjАt, amilyen cМmrУl levelezel"
 
-#: composer/e-msg-composer-hdrs.c:295 mail/mail-format.c:625
+#: composer/e-msg-composer-hdrs.c:308 mail/mail-format.c:630
 msgid "To:"
 msgstr "To:"
 
-#: composer/e-msg-composer-hdrs.c:296
+#: composer/e-msg-composer-hdrs.c:309
 msgid "Enter the recipients of the message"
 msgstr "мrd be a levИl cМmzettjИt"
 
-#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:627
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:632
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:301
+#: composer/e-msg-composer-hdrs.c:314
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "мrd be, kik kapjanak mАsolatot a levИlrУl"
 
-#: composer/e-msg-composer-hdrs.c:306
+#: composer/e-msg-composer-hdrs.c:319
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:307
+#: 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."
@@ -3462,55 +3642,55 @@ msgstr ""
 "мrd be azokat a cМmeket, akik rejtett mАsolatot kapnak a levИlrУl, azaz a "
 "cМmzettnИl nem jelenik meg a cМmЭk"
 
-#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:629
+#: composer/e-msg-composer-hdrs.c:326 mail/mail-format.c:634
 msgid "Subject:"
 msgstr "TИma:"
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Enter the subject of the mail"
 msgstr "мrd be a levИl cМmИt (subject)"
 
-#: composer/e-msg-composer.c:429
+#: composer/e-msg-composer.c:430
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:599
+#: composer/e-msg-composer.c:600
 msgid "Save as..."
 msgstr "Ment mint..."
 
-#: composer/e-msg-composer.c:610
+#: composer/e-msg-composer.c:611
 #, c-format
 msgid "Error saving file: %s"
 msgstr "FАjl mentИsi hiba: %s"
 
-#: composer/e-msg-composer.c:630
+#: composer/e-msg-composer.c:631
 #, c-format
 msgid "Error loading file: %s"
 msgstr "FАjl betЖltИsi hiba: %s"
 
-#: composer/e-msg-composer.c:652
+#: composer/e-msg-composer.c:653
 #, fuzzy
 msgid "Saving changes to message..."
 msgstr "LevИl mentИse"
 
-#: composer/e-msg-composer.c:654
+#: composer/e-msg-composer.c:655
 #, fuzzy
 msgid "Save changes to message..."
 msgstr "LevИl mentИse"
 
-#: composer/e-msg-composer.c:695
+#: composer/e-msg-composer.c:696
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:739 shell/e-shell-view-menu.c:170
+#: composer/e-msg-composer.c:741 shell/e-shell-view-menu.c:167
 msgid "Evolution"
 msgstr "EvolЗciС"
 
-#: composer/e-msg-composer.c:745
+#: composer/e-msg-composer.c:747
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3520,27 +3700,27 @@ msgstr ""
 "\n"
 "Menteni akarod a vАltozАsaidat?"
 
-#: composer/e-msg-composer.c:767
+#: composer/e-msg-composer.c:772
 msgid "Open file"
 msgstr "FАjl megnyitАs"
 
-#: composer/e-msg-composer.c:893
+#: composer/e-msg-composer.c:898
 msgid "That file does not exist."
 msgstr "A fАjl nem lИtezik."
 
-#: composer/e-msg-composer.c:903
+#: composer/e-msg-composer.c:908
 msgid "That is not a regular file."
 msgstr "Nem sima fАjl."
 
-#: composer/e-msg-composer.c:913
+#: composer/e-msg-composer.c:918
 msgid "That file exists but is not readable."
 msgstr "Az a fАjl lИtezik, de nem olvashatС."
 
-#: composer/e-msg-composer.c:923
+#: composer/e-msg-composer.c:928
 msgid "That file appeared accesible but open(2) failed."
 msgstr "A fАjl elИrhetУnek lАtszik, de open(2) hiba tЖrtИnt."
 
-#: composer/e-msg-composer.c:945
+#: composer/e-msg-composer.c:950
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3548,15 +3728,15 @@ msgstr ""
 "A fАjl tЗl nagy (100K fЖlЖtti).\n"
 "TИnyleg be szeretnИd szЗrni?"
 
-#: composer/e-msg-composer.c:966
+#: composer/e-msg-composer.c:971
 msgid "An error occurred while reading the file."
 msgstr "Hiba tЖrtИnt megnyitАs kЖzben."
 
-#: composer/e-msg-composer.c:1343
+#: composer/e-msg-composer.c:1350
 msgid "Compose a message"
 msgstr "LevИl МrАsa"
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1427
 #, fuzzy
 msgid "Could not create composer window."
 msgstr "Nem tudom a dialСgust elkИszМteni."
@@ -3572,14 +3752,26 @@ msgid "Sear_ch"
 msgstr "KeresИs"
 
 #: filter/filter-datespec.c:62
+msgid "year"
+msgstr "Иv"
+
+#: filter/filter-datespec.c:62
 msgid "years"
 msgstr "Иvek"
 
 #: filter/filter-datespec.c:63
+msgid "month"
+msgstr "hСnap"
+
+#: filter/filter-datespec.c:63
 msgid "months"
 msgstr "hСnapok"
 
 #: filter/filter-datespec.c:64
+msgid "week"
+msgstr "hИt"
+
+#: filter/filter-datespec.c:64
 msgid "weeks"
 msgstr "hetek"
 
@@ -3588,14 +3780,26 @@ msgid "days"
 msgstr "napok"
 
 #: filter/filter-datespec.c:66
+msgid "hour"
+msgstr "Сra"
+
+#: filter/filter-datespec.c:66
 msgid "hours"
 msgstr "СrАk"
 
 #: filter/filter-datespec.c:67
+msgid "minute"
+msgstr "perc"
+
+#: filter/filter-datespec.c:67
 msgid "minutes"
 msgstr "percek"
 
 #: filter/filter-datespec.c:68
+msgid "second"
+msgstr "mАsodperc"
+
+#: filter/filter-datespec.c:68
 msgid "seconds"
 msgstr " mАsodpercek"
 
@@ -3646,6 +3850,10 @@ msgstr ""
 msgid "Compare against"
 msgstr ""
 
+#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
+msgid "now"
+msgstr "most"
+
 #: filter/filter-datespec.c:690
 msgid "<click here to select a date>"
 msgstr "<kattints ide a dАtum kivАlasztАsАhoz>"
@@ -3668,7 +3876,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 "SzШrУk szerkesztИse"
 
@@ -3703,243 +3911,254 @@ msgstr "мrj be egy mappa URI-t"
 msgid "<click here to select a folder>"
 msgstr "<kattints ide a mappa kivАlasztАsАhoz>"
 
-#: filter/filter-input.c:184
+#: filter/filter-input.c:185
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
 "%s"
 msgstr ""
 
-#: filter/filter-message-search.c:379 filter/filter-message-search.c:447
+#: filter/filter-message-search.c:380 filter/filter-message-search.c:448
 #, c-format
 msgid "Failed to perform regex search on message header: %s"
 msgstr ""
 
-#: filter/filter-part.c:456
+#: filter/filter-part.c:467
 msgid "Test"
 msgstr "Teszt"
 
-#: filter/filter-rule.c:520
+#: filter/filter-rule.c:530
 msgid "Rule name: "
 msgstr "SzabАly neve:"
 
-#: filter/filter-rule.c:524
+#: filter/filter-rule.c:534
 msgid "Untitled"
 msgstr "NИvtelen"
 
-#: filter/filter-rule.c:540
+#: filter/filter-rule.c:550
 msgid "If"
 msgstr "Ha"
 
-#: filter/filter-rule.c:557
+#: filter/filter-rule.c:567
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:561
+#: filter/filter-rule.c:571
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:566
+#: filter/filter-rule.c:576
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:577
+#: filter/filter-rule.c:587
 msgid "Add criterion"
 msgstr ""
 
-#: filter/filter-rule.c:583
+#: filter/filter-rule.c:593
 msgid "Remove criterion"
 msgstr ""
 
-#: mail/folder-browser.c:465 po/tmp/filter.glade.h:8
-#: po/tmp/mail-config.glade.h:9
-msgid "Edit"
-msgstr "Szerkeszt"
+#: filter/filter-system-flag.c:63
+#, fuzzy
+msgid "Replied to"
+msgstr "Mindenkinek"
+
+#. { _("Deleted"), "Deleted" },
+#. { _("Draft"), "Draft" },
+#: filter/filter-system-flag.c:66
+msgid "Important"
+msgstr ""
 
-#: po/tmp/filter.glade.h:10
+#: filter/filter-system-flag.c:67
+#, fuzzy
+msgid "Read"
+msgstr "RАdiС"
+
+#: filter/filter.glade.h:10
 msgid "Edit VFolders"
 msgstr "VMappАk szerkesztИse"
 
-#: po/tmp/filter.glade.h:11
+#: filter/filter.glade.h:11
 msgid "Filter Rules"
 msgstr "SzШrУ szabАlyok"
 
-#: 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
 #, fuzzy
 msgid "Outgoing"
 msgstr "KЖrvonal:"
 
-#: po/tmp/filter.glade.h:15
+#: filter/filter.glade.h:15
 msgid "Virtual Folders"
 msgstr "VirtuАlis MappАk"
 
-#: po/tmp/filter.glade.h:16
+#: filter/filter.glade.h:16
 msgid "vFolder Sources"
 msgstr "VMappa forrАsok"
 
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
+msgid "after"
+msgstr "utАna"
+
+#: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr "SzМn hozzАrendelИse"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "PontszАm hozzАrendelИse"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
+msgid "before"
+msgstr "elУtte"
+
+#: filter/libfilter-i18n.h:6
+msgid "contains"
+msgstr "tartalmaz"
+
+#: filter/libfilter-i18n.h:7
 msgid "Copy to Folder"
 msgstr "MappАba mАsolАs"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "FogadАs dАtuma"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "KЭldИs dАtuma"
 
-#: filter/libfilter-i18n.h:8
-msgid "Expression"
-msgstr "KifejezИs"
-
-#: filter/libfilter-i18n.h:9
-msgid "Forward to Address"
-msgstr "A levИl tovАbbМtАsa cМmre"
-
-#: filter/libfilter-i18n.h:10
-msgid "Message Body"
-msgstr "LevИltЖrzs"
-
 #: filter/libfilter-i18n.h:11
-#, fuzzy
-msgid "Message Header"
-msgstr "LevИltЖrzs"
+msgid "does not contain"
+msgstr "nem tartalmaz"
 
 #: filter/libfilter-i18n.h:12
-msgid "Message was received"
-msgstr ""
+msgid "does not end with"
+msgstr "nincs a vИgИn"
 
 #: filter/libfilter-i18n.h:13
-msgid "Message was sent"
-msgstr "A levИl el lett kЭldve"
+msgid "does not exist"
+msgstr "nem lИtezik"
 
 #: filter/libfilter-i18n.h:14
-msgid "Move to Folder"
-msgstr "MappАba mozgat"
+msgid "does not sound like"
+msgstr "nem Зgy hangzik mint"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not start with"
+msgstr "nincs az elejИn"
 
 #: filter/libfilter-i18n.h:16
-msgid "Recipients"
-msgstr "CМmzettek"
+msgid "ends with"
+msgstr "a vИgИn van"
 
 #: filter/libfilter-i18n.h:17
-msgid "Regex Match"
-msgstr ""
+msgid "exists"
+msgstr "lИtezik"
 
 #: filter/libfilter-i18n.h:18
-msgid "Sender"
-msgstr "FeladС"
+msgid "Expression"
+msgstr "KifejezИs"
 
 #: filter/libfilter-i18n.h:19
-#, fuzzy
-msgid "Set Status"
-msgstr "_StАtusz:"
+msgid "Forward to Address"
+msgstr "A levИl tovАbbМtАsa cМmre"
 
 #: filter/libfilter-i18n.h:20
-msgid "Source"
-msgstr "ForrАs"
+msgid "is"
+msgstr "egy"
 
 #: filter/libfilter-i18n.h:21
-msgid "Specific header"
-msgstr ""
+msgid "is greater than"
+msgstr "nagyobb mint"
 
 #: filter/libfilter-i18n.h:22
-#, fuzzy
-msgid "Status"
-msgstr "_StАtusz:"
+msgid "is less than"
+msgstr "kisebb mint"
 
 #: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
-msgstr ""
+msgid "is not"
+msgstr "nem egy"
 
 #: filter/libfilter-i18n.h:24
-msgid "Subject"
-msgstr "TИma"
+msgid "Message Body"
+msgstr "LevИltЖrzs"
 
 #: filter/libfilter-i18n.h:25
-msgid "after"
-msgstr "utАna"
+#, fuzzy
+msgid "Message Header"
+msgstr "LevИltЖrzs"
 
 #: filter/libfilter-i18n.h:26
-msgid "before"
-msgstr "elУtte"
+msgid "Message was received"
+msgstr ""
 
 #: filter/libfilter-i18n.h:27
-msgid "contains"
-msgstr "tartalmaz"
+msgid "Message was sent"
+msgstr "A levИl el lett kЭldve"
 
 #: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr "nem tartalmaz"
+msgid "Move to Folder"
+msgstr "MappАba mozgat"
 
 #: filter/libfilter-i18n.h:29
-msgid "does not end with"
-msgstr "nincs a vИgИn"
+msgid "on or after"
+msgstr "akkor vagy utАn volt"
 
 #: filter/libfilter-i18n.h:30
-msgid "does not exist"
-msgstr "nem lИtezik"
-
-#: filter/libfilter-i18n.h:31
-msgid "does not sound like"
-msgstr "nem Зgy hangzik mint"
+msgid "on or before"
+msgstr "akkor vagy elУbb"
 
 #: filter/libfilter-i18n.h:32
-msgid "does not start with"
-msgstr "nincs az elejИn"
+msgid "Recipients"
+msgstr "CМmzettek"
 
 #: filter/libfilter-i18n.h:33
-msgid "ends with"
-msgstr "a vИgИn van"
+msgid "Regex Match"
+msgstr ""
 
 #: filter/libfilter-i18n.h:34
-msgid "exists"
-msgstr "lИtezik"
+msgid "Sender"
+msgstr "FeladС"
 
 #: filter/libfilter-i18n.h:35
-msgid "is greater than"
-msgstr "nagyobb mint"
+#, fuzzy
+msgid "Set Status"
+msgstr "_StАtusz:"
 
 #: filter/libfilter-i18n.h:36
-msgid "is less than"
-msgstr "kisebb mint"
+msgid "sounds like"
+msgstr "Зgy hangzik, mint"
 
 #: filter/libfilter-i18n.h:37
-msgid "is not"
-msgstr "nem egy"
+msgid "Source"
+msgstr "ForrАs"
 
 #: filter/libfilter-i18n.h:38
-msgid "is"
-msgstr "egy"
+msgid "Specific header"
+msgstr ""
 
 #: filter/libfilter-i18n.h:39
-msgid "on or after"
-msgstr "akkor vagy utАn volt"
+msgid "starts with"
+msgstr "Мgy kezdУdik:"
 
 #: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr "akkor vagy elУbb"
+#, fuzzy
+msgid "Status"
+msgstr "_StАtusz:"
 
 #: filter/libfilter-i18n.h:41
-msgid "sounds like"
-msgstr "Зgy hangzik, mint"
+msgid "Stop Processing"
+msgstr ""
 
 #: filter/libfilter-i18n.h:42
-msgid "starts with"
-msgstr "Мgy kezdУdik:"
+msgid "Subject"
+msgstr "TИma"
 
 #: filter/libfilter-i18n.h:43
 msgid "was after"
@@ -3969,137 +4188,220 @@ msgstr "VMappa szabАly hozzАadАsa"
 msgid "Edit VFolder Rule"
 msgstr "VMappa szabАly szerkesztИse"
 
-#: mail/component-factory.c:227
+#: mail/component-factory.c:277
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Nem tudom az EvolЗciС levelezУ komponensИt elindМtani."
 
-#: mail/component-factory.c:266
+#: 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:16
+#: mail/folder-browser.c:223 ui/evolution-event-editor.xml.h:88
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "MentИs"
 
-#: mail/folder-browser.c:153
+#: mail/folder-browser.c:236
 msgid "Body or subject contains"
 msgstr "A szЖvegtЖrzs vagy a tИma tartalmaz"
 
-#: mail/folder-browser.c:154
+#: mail/folder-browser.c:237
 msgid "Body contains"
 msgstr "A szЖvegtЖrzs tartalmaz"
 
-#: mail/folder-browser.c:155
+#: mail/folder-browser.c:238
 msgid "Subject contains"
 msgstr "TИma tartalmaz"
 
-#: mail/folder-browser.c:156
+#: mail/folder-browser.c:239
 msgid "Body does not contain"
 msgstr "A szЖvegtЖrzs nem tartalmaz"
 
-#: mail/folder-browser.c:157
+#: mail/folder-browser.c:240
 msgid "Subject does not contain"
 msgstr "A tИma nem tartalmaz"
 
-#: mail/folder-browser.c:453
+#: mail/folder-browser.c:643
 msgid "VFolder on Subject"
 msgstr "VMappa a tИmАra"
 
-#: mail/folder-browser.c:454
+#: mail/folder-browser.c:644
 msgid "VFolder on Sender"
 msgstr "VMappa a feladСra"
 
-#: mail/folder-browser.c:455
+#: mail/folder-browser.c:645
 msgid "VFolder on Recipients"
 msgstr "VMappa a cМmzettekre"
 
-#: mail/folder-browser.c:457
+#: mail/folder-browser.c:647
 msgid "Filter on Subject"
 msgstr "SzШrУ a tИmАra"
 
-#: mail/folder-browser.c:458
+#: mail/folder-browser.c:648
 msgid "Filter on Sender"
 msgstr "SzШrУ a feladСn"
 
-#: mail/folder-browser.c:459
+#: mail/folder-browser.c:649
 msgid "Filter on Recipients"
 msgstr "SzШrУ a cМmzettekre"
 
-#: mail/folder-browser.c:460 mail/folder-browser.c:544
+#: mail/folder-browser.c:650 mail/folder-browser.c:779
 msgid "Filter on Mailing List"
 msgstr "SzШrУ a levelezИsi listАra"
 
-#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:14
+#: mail/folder-browser.c:655
+#, fuzzy
+msgid "Show all hidden"
+msgstr "Mutasd mind"
+
+#: mail/folder-browser.c:657
+#, fuzzy
+msgid "Hide selected"
+msgstr "TЖrЖlt"
+
+#. could use another mask, but not enough api do to it
+#: mail/folder-browser.c:660
+#, fuzzy
+msgid "Hide read"
+msgstr "RejtИs"
+
+#: mail/folder-browser.c:661
+#, fuzzy
+msgid "Hide deleted"
+msgstr "TЖrЖlt"
+
+#: mail/folder-browser.c:663 mail/folder-browser.c:790
+#, fuzzy
+msgid "Hide Subject"
+msgstr "TИma"
+
+#: mail/folder-browser.c:665 mail/folder-browser.c:796
+#, fuzzy
+msgid "Hide from Sender"
+msgstr "SzШrУ a feladСn"
+
+#: mail/folder-browser.c:670 ui/evolution-message-composer.xml.h:15
 msgid "Open"
 msgstr "MegnyitАs"
 
-#: mail/folder-browser.c:466
+#: mail/folder-browser.c:672
 #, fuzzy
 msgid "Save As..."
 msgstr "Ment mint..."
 
-#: mail/folder-browser.c:467 mail/mail-view.c:163
-#: po/tmp/evolution-addressbook.xml.h:13 po/tmp/evolution-calendar.xml.h:23
-#: po/tmp/evolution-mail.xml.h:28
+#: 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 "Nyomtat"
 
-#: mail/folder-browser.c:469
+#: mail/folder-browser.c:675
 #, fuzzy
 msgid "Reply to Sender"
 msgstr "Mindenkinek"
 
-#: mail/folder-browser.c:470 mail/mail-view.c:156
-#: po/tmp/evolution-mail.xml.h:34
+#: mail/folder-browser.c:676 mail/mail-view.c:141 ui/evolution-mail.xml.h:38
 msgid "Reply to All"
 msgstr "Mindenkinek"
 
-#: mail/folder-browser.c:471 mail/mail-view.c:159
-#: 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 "TovАbbМt"
 
-#: mail/folder-browser.c:472 po/tmp/evolution-mail.xml.h:18
+#: mail/folder-browser.c:678 ui/evolution-mail.xml.h:18
 #, fuzzy
 msgid "Forward inline"
 msgstr "TovАbbМt"
 
-#: mail/folder-browser.c:474
+#: mail/folder-browser.c:680
 msgid "Mark as Read"
 msgstr "JelЖlИs olvasottnak"
 
-#: mail/folder-browser.c:475
+#: mail/folder-browser.c:681
 msgid "Mark as Unread"
 msgstr "JelЖlИs nem olvasottnak"
 
-#: mail/folder-browser.c:477
+#: mail/folder-browser.c:683
 msgid "Move to Folder..."
 msgstr "MappАba mozgatАs..."
 
-#: mail/folder-browser.c:478
+#: mail/folder-browser.c:684
 msgid "Copy to Folder..."
 msgstr "MappАba mАsolАs..."
 
-#: mail/folder-browser.c:480
+#: mail/folder-browser.c:686
 msgid "Undelete"
 msgstr "VisszaАllМt"
 
 #. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
 #. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:484
+#: mail/folder-browser.c:690
 msgid "Apply Filters"
 msgstr "SzШrУk alkalmazАsa"
 
-#: mail/folder-browser.c:486 po/tmp/evolution-mail.xml.h:10
+#: mail/folder-browser.c:692 ui/evolution-mail.xml.h:10
 msgid "Create Rule From Message"
 msgstr "A levИlbУl gyАrts szabАlyt"
 
-#: mail/folder-browser.c:546
+#: mail/folder-browser.c:693 ui/evolution-mail.xml.h:21
+#, fuzzy
+msgid "Hide Messages"
+msgstr "LevИl _nyomtatАsa"
+
+#: mail/folder-browser.c:781
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "SzШrУ a levelezУ listАra (%s)"
 
+#: mail/folder-browser.c:787
+#, fuzzy, c-format
+msgid "Hide Subject \"%s\""
+msgstr "A tИma %s"
+
+#: 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 "Nem tudom a wombat-ot elindМtani"
+
+#: mail/local-config.glade.h:7
+#, fuzzy
+msgid "Mailbox Format"
+msgstr " ЖsszegzИs"
+
+#: mail/local-config.glade.h:8
+#, fuzzy
+msgid "New store format:"
+msgstr "зj telefon tМpus"
+
+#: 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
+#, fuzzy
+msgid "mh"
+msgstr "h"
+
 #: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
@@ -4158,7 +4460,7 @@ msgstr ""
 msgid "You have no Outbox configured"
 msgstr "Nincs kimenУ mappАd beАllМtva"
 
-#: mail/mail-callbacks.c:246
+#: mail/mail-callbacks.c:244
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -4166,94 +4468,330 @@ msgstr ""
 "Nincs tАrgya a levИlnek.\n"
 "TИnyleg elkЭldjem?"
 
-#: 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
+#, fuzzy
+msgid "Forwarded message:\n"
+msgstr "Forwarded message - %s"
+
+#: mail/mail-callbacks.c:611
 msgid "Move message(s) to"
 msgstr "LevИl(levelek) mozgatАsa mАs mappАba"
 
-#: mail/mail-callbacks.c:554
+#: mail/mail-callbacks.c:613
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "LevИl(levelek) mozgatАsa mАs mappАba"
 
-#: mail/mail-callbacks.c:665
+#: mail/mail-callbacks.c:748
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:699 mail/mail-display.c:72
+#: mail/mail-callbacks.c:781 mail/mail-display.c:79
 msgid "Overwrite file?"
 msgstr "FelЭlМrod a fАjlt?"
 
-#: mail/mail-callbacks.c:703 mail/mail-display.c:76
+#: mail/mail-callbacks.c:785 mail/mail-display.c:83
 #, fuzzy
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr "A megadott nИven mАr lИtezik mappa"
 
-#: mail/mail-callbacks.c:748
+#: mail/mail-callbacks.c:830
 #, fuzzy
 msgid "Save Message As..."
 msgstr "Ment mint..."
 
-#: mail/mail-callbacks.c:750
+#: mail/mail-callbacks.c:832
 #, fuzzy
 msgid "Save Messages As..."
 msgstr "Ment mint..."
 
-#: mail/mail-callbacks.c:877
+#: mail/mail-callbacks.c:916
 #, fuzzy, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr "FАjl betЖltИsi hiba: %s"
 
-#: mail/mail-callbacks.c:922
+#: mail/mail-callbacks.c:961
 #, fuzzy
 msgid "Print Message"
 msgstr "LevИl _nyomtatАsa"
 
-#: mail/mail-callbacks.c:969
+#: mail/mail-callbacks.c:1008
 #, fuzzy
 msgid "Printing of message failed"
 msgstr "LevИl _nyomtatАsa"
 
 #.
-#. * 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 "Nincs informАciС"
+
+#: mail/mail-config-druid.glade.h:8
+msgid "Account Management"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:9
+#, fuzzy
+msgid "Account Properties"
+msgstr "CsatolАs beАllМtАsok"
+
+#: mail/mail-config-druid.glade.h:11
+#, fuzzy
+msgid "Advanced"
+msgstr "HaladС..."
+
+#: mail/mail-config-druid.glade.h:12
+#, fuzzy
+msgid "Authentication"
+msgstr "AuthentikАciС:"
+
+#: mail/mail-config-druid.glade.h:13
+#, fuzzy
+msgid "Authentication Type:"
+msgstr "AuthentikАciС:"
+
+#: 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 "AlapИrtelmezett"
+
+#: mail/mail-config-druid.glade.h:26
+#, fuzzy
+msgid "Delete mail from server"
+msgstr "KilИpИs a levИlszerkesztУbУl"
+
+#: mail/mail-config-druid.glade.h:27
+#, fuzzy
+msgid "Done"
+msgstr "Semmi"
+
+#: mail/mail-config-druid.glade.h:28
+#, fuzzy
+msgid "E-Mail Address:"
+msgstr "Email cМm:"
+
+#: mail/mail-config-druid.glade.h:30
+#, fuzzy
+msgid "Email Address:"
+msgstr "Email cМm:"
+
+#: mail/mail-config-druid.glade.h:31
+#, fuzzy
+msgid "Evolution Mail Configuration"
+msgstr "LevelezИs beАllМtАsa"
+
+#: mail/mail-config-druid.glade.h:32
+#, fuzzy
+msgid "Full Name:"
+msgstr "Teljes nИv:"
+
+#: mail/mail-config-druid.glade.h:35
+#, fuzzy
+msgid "Hostname:"
+msgstr "FelhasznАlСlnИv:"
+
+#: mail/mail-config-druid.glade.h:36
+#, fuzzy
+msgid "IMAP"
+msgstr "IMAPv4"
+
+#: mail/mail-config-druid.glade.h:37
 msgid "Identity"
 msgstr "AzonosМtС"
 
-#: 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 "_LevИl"
+
+#: mail/mail-config-druid.glade.h:41
+#, fuzzy
+msgid "Mail Account"
+msgstr "Email tartalmaz"
+
+#: mail/mail-config-druid.glade.h:42
 msgid "Mail Configuration"
 msgstr "LevelezИs beАllМtАsa"
 
-#: po/tmp/mail-config-druid.glade.h:8
-msgid "Mail Source"
-msgstr "LevИl forrАs"
+#: mail/mail-config-druid.glade.h:43
+#, fuzzy
+msgid "Mail Configuration Druid"
+msgstr "LevelezИs beАllМtАsa"
 
-#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
-msgid "Mail Transport"
-msgstr "LevИl kЭldИs"
+#: 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 "зj..."
+
+#: mail/mail-config-druid.glade.h:48
+#, fuzzy
+msgid "Optional"
+msgstr "BeАllМtАsok"
+
+#: mail/mail-config-druid.glade.h:49 mail/mail-config-gui.c:485
+msgid "Organization:"
+msgstr "Szervezet:"
 
-#: po/tmp/mail-config-druid.glade.h:10
-msgid "Welcome to the Evolution Mail configuration wizard!\n"
+#: mail/mail-config-druid.glade.h:50
+msgid "Outgoing Mail Server"
 msgstr ""
 
-#: po/tmp/mail-config-druid.glade.h:14
+#: mail/mail-config-druid.glade.h:51
+#, fuzzy
+msgid "Password:"
+msgstr "JelszС"
+
+#: mail/mail-config-druid.glade.h:53
+msgid "Plain Text"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:54
+msgid "Receiving Email"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:55
+msgid "Remember my password"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:56 mail/mail-format.c:628
+msgid "Reply-To:"
+msgstr "Reply-To:"
+
+#: mail/mail-config-druid.glade.h:57
+#, fuzzy
+msgid "Reply-to:"
+msgstr "Reply-To:"
+
+#: mail/mail-config-druid.glade.h:58
+#, fuzzy
+msgid "Required"
+msgstr "_A kИrt emberek"
+
+#: mail/mail-config-druid.glade.h:60
+#, fuzzy
+msgid "Save password"
+msgstr "VCard-kИnt mentИs"
+
+#: mail/mail-config-druid.glade.h:61
+#, fuzzy
+msgid "Select signature file"
+msgstr "AlАМrАs fАjl:"
+
+#: 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 "LevelezИs beАllМtАsa"
+
+#: mail/mail-config-druid.glade.h:65
+msgid "Server Timeouts"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:66
+#, fuzzy
+msgid "Server Type: "
+msgstr "Szerver:"
+
+#: mail/mail-config-druid.glade.h:67
+msgid "Server requires authentication"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:68
+#, fuzzy
+msgid "Servers"
+msgstr "Szerver:"
+
+#: mail/mail-config-druid.glade.h:69 mail/mail-config-gui.c:496
+msgid "Signature file:"
+msgstr "AlАМrАs fАjl:"
+
+#: mail/mail-config-druid.glade.h:70
+#, fuzzy
+msgid "Signature:"
+msgstr "AlАМrАs fАjl:"
+
+#: mail/mail-config-druid.glade.h:71 mail/mail-config.glade.h:20
+msgid "Sources"
+msgstr "ForrАsok"
+
+#: 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 "TМpus"
+
+#: 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 ""
-"A levelezИsi beАllМtАsod most teljes.\n"
-"Kattints a 'Befejez' gombra a mentИshez"
+
+#: mail/mail-config-druid.glade.h:76
+#, fuzzy
+msgid "User Information"
+msgstr "Nincs informАciС"
+
+#: mail/mail-config-druid.glade.h:77 mail/mail-config-gui.c:928
+msgid "Username:"
+msgstr "FelhasznАlСlnИv:"
+
+#: 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 "percek"
 
 #: mail/mail-config-gui.c:433
 msgid ""
@@ -4270,15 +4808,7 @@ msgstr "Teljes nИv:"
 msgid "Email address:"
 msgstr "Email cМm:"
 
-#: mail/mail-config-gui.c:485
-msgid "Organization:"
-msgstr "Szervezet:"
-
-#: mail/mail-config-gui.c:496
-msgid "Signature file:"
-msgstr "AlАМrАs fАjl:"
-
-#: 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 "AlАМrАs fАjl"
 
@@ -4286,26 +4816,10 @@ msgstr "AlАМrАs fАjl"
 msgid "Server:"
 msgstr "Szerver:"
 
-#: mail/mail-config-gui.c:928
-msgid "Username:"
-msgstr "FelhasznАlСlnИv:"
-
-#: mail/mail-config-gui.c:934
-msgid "Path:"
-msgstr "зtvonal:"
-
-#: mail/mail-config-gui.c:943
-msgid "Authentication:"
-msgstr "AuthentikАciС:"
-
 #: mail/mail-config-gui.c:956
 msgid "Detect supported types..."
 msgstr "TАmogatott tМpusok detektАlАsa..."
 
-#: mail/mail-config-gui.c:968
-msgid "Remember this password"
-msgstr ""
-
 #: mail/mail-config-gui.c:991
 #, fuzzy
 msgid "Don't delete messages from server"
@@ -4319,7 +4833,7 @@ msgstr "BeАllМtАsok tesztelИse"
 msgid "Mail source type:"
 msgstr "LevИl forrАs tМpusa:"
 
-#: 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"
@@ -4347,6 +4861,14 @@ msgstr ""
 msgid "Mail transport type:"
 msgstr "LevИl kЭldИs"
 
+#: 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
 #, fuzzy
 msgid "Add Identity"
@@ -4399,78 +4921,86 @@ msgstr ""
 msgid "Query authorization at \"%s\""
 msgstr ""
 
-#: po/tmp/mail-config.glade.h:7
+#: mail/mail-config.glade.h:7
 msgid "Address"
 msgstr "CМm"
 
-#: po/tmp/mail-config.glade.h:10
+#: mail/mail-config.glade.h:10
 msgid "Identities"
 msgstr "AzonosМtСk"
 
-#: po/tmp/mail-config.glade.h:11
+#: mail/mail-config.glade.h:11
 msgid "Mail Sources"
 msgstr "LevИl forrАsok"
 
-#: po/tmp/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
+msgid "Mail Transport"
+msgstr "LevИl kЭldИs"
+
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Mark message as seen [ms]: "
 msgstr "_Minden olvasott levИl kijelЖlИse"
 
-#: po/tmp/mail-config.glade.h:14
+#: mail/mail-config.glade.h:14
 msgid "News Servers"
 msgstr "HМrcsoport-szerverek"
 
-#: po/tmp/mail-config.glade.h:15
+#: mail/mail-config.glade.h:15
 msgid "News Sources"
 msgstr "HМrcsoport forrАsok"
 
-#: po/tmp/mail-config.glade.h:16
+#: mail/mail-config.glade.h:16
 msgid "Organization"
 msgstr "Szervezet"
 
-#: po/tmp/mail-config.glade.h:18
+#: mail/mail-config.glade.h:18
 msgid "Send messages in HTML format"
 msgstr "A levelet HTML formАtumban kЭldd"
 
-#: po/tmp/mail-config.glade.h:20
-msgid "Sources"
-msgstr "ForrАsok"
-
-#: mail/mail-crypto.c:350 mail/mail-crypto.c:452 mail/mail-crypto.c:629
+#: 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."
 msgstr ""
 
-#: mail/mail-crypto.c:354 mail/mail-crypto.c:456 mail/mail-crypto.c:634
+#: mail/mail-crypto.c:357 mail/mail-crypto.c:462 mail/mail-crypto.c:640
+#: mail/mail-crypto.c:785
 msgid "No password provided."
 msgstr ""
 
-#: mail/mail-crypto.c:360 mail/mail-crypto.c:463 mail/mail-crypto.c:640
+#: mail/mail-crypto.c:363 mail/mail-crypto.c:469 mail/mail-crypto.c:646
+#: mail/mail-crypto.c:792 mail/mail-crypto.c:942
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Nem tudok GPG/PGP programot pipe-olni: %s"
 
-#: mail/mail-crypto.c:625
+#: mail/mail-crypto.c:631 mail/mail-crypto.c:777 mail/mail-crypto.c:936
 msgid "No GPG/PGP program available."
 msgstr "Nincs elИrhetУ GPG/PGP program."
 
-#: mail/mail-display.c:90
+#: mail/mail-crypto.c:953
+#, fuzzy, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "Nem tudok GPG/PGP programot pipe-olni: %s"
+
+#: mail/mail-display.c:98
 #, c-format
 msgid ""
 "Could not open file %s:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-display.c:113
+#: mail/mail-display.c:131
 #, fuzzy, c-format
 msgid "Could not write data: %s"
 msgstr "Nem tudom a dialСgust elkИszМteni."
 
-#: mail/mail-display.c:218
+#: mail/mail-display.c:229
 #, fuzzy
 msgid "Save Attachment"
 msgstr "FIXME: CsatolАsok me_ntИse..."
 
-#: mail/mail-display.c:258
+#: mail/mail-display.c:269
 #, fuzzy, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
@@ -4478,459 +5008,363 @@ msgstr ""
 "%s\n"
 "Hiba: %s"
 
-#: mail/mail-display.c:300
+#: mail/mail-display.c:311
 #, fuzzy
 msgid "Save to Disk..."
 msgstr "Ment mint..."
 
-#: mail/mail-display.c:302
+#: mail/mail-display.c:313
 #, fuzzy, c-format
 msgid "Open in %s..."
 msgstr "Megnyit..."
 
-#: mail/mail-display.c:304
+#: mail/mail-display.c:315
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:328
+#: mail/mail-display.c:339
 #, fuzzy
 msgid "External Viewer"
 msgstr "KЭlsУ kЖnyvtАrak"
 
-#: mail/mail-display.c:351
+#: mail/mail-display.c:362
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:355
+#: mail/mail-display.c:366
 msgid "Hide"
 msgstr "RejtИs"
 
-#: mail/mail-format.c:500
+#: mail/mail-format.c:503
 #, c-format
 msgid "%s attachment"
 msgstr "%s csatolАs"
 
-#: mail/mail-format.c:623
-msgid "Reply-To:"
-msgstr "Reply-To:"
-
-#: mail/mail-format.c:845
+#: mail/mail-format.c:851
 msgid "No GPG/PGP support available in this copy of Evolution."
 msgstr "Nincs az EvolЗciСnak ebben a pИldАnyАban GPG/PGP tАmogatАs."
 
-#: mail/mail-format.c:857
+#: mail/mail-format.c:863
 #, fuzzy
 msgid "Encrypted message not displayed"
 msgstr "HibАs Эzenet az feladС threadtУl?"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:869
 #, fuzzy
 msgid "Encrypted message"
 msgstr "LevИl elkЭldИse"
 
-#: mail/mail-format.c:864
+#: mail/mail-format.c:870
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1470
+#: mail/mail-format.c:1450
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1482
+#: mail/mail-format.c:1462
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1486
+#: mail/mail-format.c:1466
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1520
+#: mail/mail-format.c:1500
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1525
+#: mail/mail-format.c:1505
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-format.c:1695
+#: mail/mail-format.c:1675
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr ""
 
-#: mail/mail-local.c:202
+#: mail/mail-local.c:204
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:206
+#: mail/mail-local.c:208
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:261
+#: mail/mail-local.c:251
+#, fuzzy
+msgid "Reconfiguring folder"
+msgstr "_Mappa beАllМtАsa"
+
+#: mail/mail-local.c:269
 #, fuzzy
 msgid "Closing current folder"
 msgstr "_Mappa beАllМtАsa"
 
-#: mail/mail-local.c:293
+#: mail/mail-local.c:295
 msgid "Renaming old folder and opening"
 msgstr ""
 
-#: mail/mail-local.c:314
+#: mail/mail-local.c:313
 #, fuzzy
 msgid "Creating new folder"
 msgstr "зj mappa kИszМtИse"
 
-#: mail/mail-local.c:329
+#: mail/mail-local.c:327
 #, fuzzy
 msgid "Copying messages"
 msgstr "LevИl МrАsa"
 
-#: mail/mail-local.c:341
+#: 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:372
+#: 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:781
+#: mail/mail-local.c:787
 msgid "Registering local folder"
 msgstr ""
 
-#: mail/mail-local.c:783
+#: mail/mail-local.c:789
 #, fuzzy
 msgid "Register local folder"
 msgstr "зj mappa kИszМtИse"
 
-#: mail/mail-ops.c:79
+#: mail/mail-local.c:894
+#, fuzzy, c-format
+msgid ""
+"Unable to register folder '%s':\n"
+"%s"
+msgstr "Nem tudom a dialСgust elkИszМteni."
+
+#: mail/mail-mt.c:85
+#, c-format
+msgid ""
+"Error while '%s':\n"
+"%s"
+msgstr ""
+
+#: mail/mail-mt.c:87
+#, fuzzy, c-format
+msgid ""
+"Error while performing operation:\n"
+"%s"
+msgstr "FАjl betЖltИsi hiba: %s"
+
+#: mail/mail-mt.c:356 mail/mail-mt.c:385
+#, fuzzy
+msgid "Working"
+msgstr "MozgatАs alatt"
+
+#: mail/mail-ops.c:88
 #, fuzzy, c-format
 msgid "Fetching email from %s"
 msgstr "Levelek letЖltИse"
 
-#: mail/mail-ops.c:81
+#: mail/mail-ops.c:90
 #, fuzzy, c-format
 msgid "Fetch email from %s"
 msgstr "Levelek letЖltИse"
 
-#: mail/mail-ops.c:331
+#: mail/mail-ops.c:335
 #, c-format
 msgid "There is no new mail at %s."
 msgstr ""
 
-#: 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:538
+#: mail/mail-ops.c:551
 #, c-format
 msgid "Sending \"%s\""
 msgstr "'%s' kЭldИs alatt"
 
-#: mail/mail-ops.c:543
-msgid "Sending a message without a subject"
-msgstr ""
-
-#: mail/mail-ops.c:546
-#, c-format
-msgid "Send \"%s\""
-msgstr "'%s' kЭldИse"
-
-#: mail/mail-ops.c:549
+#: mail/mail-ops.c:553
 #, fuzzy
-msgid "Send a message without a subject"
-msgstr "A levИl elmentИse mАsik nИven"
+msgid "Sending message"
+msgstr "A levИl tЖrlИse"
 
-#: mail/mail-ops.c:720
+#: mail/mail-ops.c:669
 msgid "Sending queue"
 msgstr ""
 
-#: mail/mail-ops.c:722
+#: mail/mail-ops.c:671
 msgid "Send queue"
 msgstr ""
 
-#: mail/mail-ops.c:858 mail/mail-ops.c:865
+#: mail/mail-ops.c:804 mail/mail-ops.c:811
 #, c-format
 msgid "Appending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:862 mail/mail-ops.c:868
+#: mail/mail-ops.c:808 mail/mail-ops.c:814
 msgid "Appending a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:940
-#, c-format
-msgid "Expunging \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:942
-#, fuzzy, c-format
-msgid "Expunge \"%s\""
-msgstr "_TisztМt"
-
-#: mail/mail-ops.c:1001
+#: mail/mail-ops.c:897
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:899
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1006
+#: mail/mail-ops.c:902
 #, fuzzy, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "LevИl(levelek) mozgatАsa mАs mappАba"
 
-#: mail/mail-ops.c:1008
+#: mail/mail-ops.c:904
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1039
+#: mail/mail-ops.c:935
 msgid "Moving"
 msgstr "MozgatАs alatt"
 
-#: mail/mail-ops.c:1042
+#: mail/mail-ops.c:938
 msgid "Copying"
 msgstr "MАsolАs alatt"
 
-#: mail/mail-ops.c:1062
+#: mail/mail-ops.c:958
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1141
-#, fuzzy, c-format
-msgid "Marking messages in folder \"%s\""
-msgstr "LevИl mozgatАsa mАs mappАba"
-
-#: mail/mail-ops.c:1144
-#, fuzzy, c-format
-msgid "Mark messages in folder \"%s\""
-msgstr "LevИl mozgatАsa mАs mappАba"
-
-#: mail/mail-ops.c:1175
-#, c-format
-msgid "Marking message %d of %d"
-msgstr ""
-
-#: mail/mail-ops.c:1295
+#: mail/mail-ops.c:1033
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1297
-#, c-format
-msgid "Scan folders in \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1366 mail/subscribe-dialog.c:339
+#: mail/mail-ops.c:1099 mail/subscribe-dialog.c:341
 msgid "(No description)"
 msgstr "(Nincs leМrАs)"
 
-#: mail/mail-ops.c:1432
-#, c-format
-msgid "Attaching messages from folder \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1435
-#, fuzzy, c-format
-msgid "Attach messages from \"%s\""
-msgstr "KilИpИs a levИlszerkesztУbУl"
-
-#: mail/mail-ops.c:1535
-#, fuzzy, c-format
-msgid "Forwarding messages \"%s\""
-msgstr "A levИl tovАbbМtАsa"
-
-#: mail/mail-ops.c:1539
-msgid "Forwarding a message without a subject"
-msgstr ""
-
-#: mail/mail-ops.c:1542
-#, fuzzy, c-format
-msgid "Forward message \"%s\""
-msgstr "A levИl tovАbbМtАsa"
-
-#: mail/mail-ops.c:1546
-msgid "Forward a message without a subject"
-msgstr ""
-
-#: mail/mail-ops.c:1593
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1610
-msgid ""
-"Failed to generate mime part from message while generating forwarded message."
-msgstr ""
-
-#: mail/mail-ops.c:1665
+#: mail/mail-ops.c:1164
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Forwarded message - %s"
 
-#: mail/mail-ops.c:1679
-#, fuzzy
-msgid "Forwarded message:\n"
-msgstr "Forwarded message - %s"
-
-#: mail/mail-ops.c:1748
+#: mail/mail-ops.c:1205 mail/mail-ops.c:1274
 #, fuzzy, c-format
-msgid "Loading \"%s\""
-msgstr "FejlИcek"
+msgid "Opening folder %s"
+msgstr "Nem tudom beАllМtani a helyi tАrterЭletet -- %s"
 
-#: mail/mail-ops.c:1750
-#, c-format
-msgid "Load \"%s\""
-msgstr ""
+#: mail/mail-ops.c:1336
+#, fuzzy
+msgid "Synchronising folder"
+msgstr "SzinkronizАlАs"
 
-#: mail/mail-ops.c:1853
-#, c-format
-msgid "Creating \"%s\""
+#: mail/mail-ops.c:1386
+msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1855
+#: mail/mail-ops.c:1434
 #, fuzzy, c-format
-msgid "Create \"%s\""
-msgstr "LИtrehozva"
-
-#: mail/mail-ops.c:1903
-msgid "Exception while reporting result to shell component listener."
-msgstr ""
-
-#: mail/mail-ops.c:1949
-#, c-format
-msgid "Synchronizing \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1951
-#, c-format
-msgid "Synchronize \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:2015
-#, c-format
-msgid "Displaying message UID \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:2018
-#, fuzzy
-msgid "Clearing message display"
-msgstr "IdУ mutatАsa"
-
-#: mail/mail-ops.c:2021
-#, c-format
-msgid "Display message UID \"%s\""
-msgstr ""
+msgid "Retrieving message %s"
+msgstr "LevИl lista rendezИse tИma szerint"
 
-#: mail/mail-ops.c:2024
+#: mail/mail-ops.c:1497
 #, fuzzy
-msgid "Clear message display"
-msgstr "MegjelenМtИs szМnei"
-
-#: mail/mail-ops.c:2137
-#, c-format
-msgid "Opening messages from folder \"%s\""
-msgstr ""
+msgid "Retrieving messages"
+msgstr "LevИl МrАsa"
 
-#: mail/mail-ops.c:2140
+#: mail/mail-ops.c:1507
 #, c-format
-msgid "Open messages from \"%s\""
+msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:2244
-#, c-format
-msgid "Loading %s Folder"
+#: mail/mail-ops.c:1655
+#, fuzzy, c-format
+msgid "Loading %s Folder for %s"
 msgstr "%s mappa tЖltУdik"
 
-#: mail/mail-ops.c:2246
-#, c-format
-msgid "Load %s Folder"
-msgstr "%s mappa betЖltИse"
-
-#: mail/mail-ops.c:2310
-#, c-format
-msgid "Viewing messages from folder \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:2313
+#: mail/mail-ops.c:1657
 #, fuzzy, c-format
-msgid "View messages from \"%s\""
-msgstr "LevИl meg_tekintИse"
+msgid "Load %s Folder for %s"
+msgstr "%s mappa betЖltИse"
 
-#: mail/mail-ops.c:2339
-#, c-format
-msgid "Retrieving message %d of %d (uid \"%s\")"
-msgstr ""
+#: mail/mail-ops.c:1823
+#, fuzzy
+msgid "Saving messages"
+msgstr "LevИl МrАsa"
 
-#: mail/mail-ops.c:2428
+#: mail/mail-ops.c:1902
 #, fuzzy, c-format
-msgid "Saving messages from folder \"%s\""
-msgstr "LevИl mozgatАsa mАs mappАba"
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
+msgstr "Nem tudom a dialСgust elkИszМteni."
 
-#: mail/mail-ops.c:2431
+#: mail/mail-ops.c:1915
 #, fuzzy, c-format
-msgid "Save messages from folder \"%s\""
+msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "LevИl mozgatАsa mАs mappАba"
 
-#: mail/mail-ops.c:2474
+#: mail/mail-ops.c:1929
 #, fuzzy, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "LevИl mozgatАsa mАs mappАba"
+msgid ""
+"Error saving messages to: %s:\n"
+" %s"
+msgstr "FАjl mentИsi hiba: %s"
 
 #: mail/mail-search-dialogue.c:104
 msgid "Cancel"
 msgstr "MИgsem"
 
-#: mail/mail-summary.c:105 mail/mail-threads.c:728
+#: mail/mail-summary.c:110 mail/mail-threads.c:729
 msgid "Incomplete message written on pipe!"
 msgstr "Nem teljes Эzenet lett a csУbe Мrva!"
 
-#: mail/mail-threads.c:301
+#: mail/mail-threads.c:302
 #, c-format
 msgid ""
 "Error while preparing to %s:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-threads.c:675
+#: mail/mail-threads.c:676
 #, c-format
 msgid ""
 "Error while `%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-threads.c:732
+#: mail/mail-threads.c:733
 msgid "Error reading commands from dispatching thread."
 msgstr "Parancsok olvasАsАnАl hiba tЖrtИnt egy feladС threadtУl."
 
-#: mail/mail-threads.c:797
+#: mail/mail-threads.c:798
 msgid "Corrupted message from dispatching thread?"
 msgstr "HibАs Эzenet az feladС threadtУl?"
 
-#: mail/mail-threads.c:916
+#: mail/mail-threads.c:917
 msgid "Could not create dialog box."
 msgstr "Nem tudom a dialСgust elkИszМteni."
 
-#: mail/mail-threads.c:927
+#: mail/mail-threads.c:928
 msgid "User cancelled query."
 msgstr "A lekИrdezИst megszakМtottad."
 
@@ -4940,129 +5374,148 @@ msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Nem tudok GPG/PGP programot pipe-olni: %s"
 
 #. Get all uids of source
-#: mail/mail-tools.c:239
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Examining %s"
 msgstr ""
 
-#: mail/mail-tools.c:269
+#: mail/mail-tools.c:271
 #, c-format
 msgid ""
 "Could not read UID cache file \"%s\". You may receive duplicate messages."
 msgstr ""
 
-#. Info
-#: mail/mail-tools.c:290
+#: mail/mail-tools.c:300
 #, c-format
 msgid "Retrieving message %d of %d"
 msgstr ""
 
 #. Append it to dest
-#: mail/mail-tools.c:303
+#: mail/mail-tools.c:315
 #, c-format
 msgid "Writing message %d of %d"
 msgstr ""
 
-#: mail/mail-tools.c:332
+#: mail/mail-tools.c:347
 #, c-format
 msgid "Saving changes to %s"
 msgstr ""
 
-#: mail/mail-tools.c:369
+#: mail/mail-tools.c:381
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (forwarded message)"
 
-#: mail/mail-tools.c:379
+#: mail/mail-tools.c:391
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (no subject)"
 
-#: mail/mail-tools.c:418
+#: mail/mail-tools.c:427
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Forwarded message - %s"
 
-#: mail/mail-tools.c:420
+#: mail/mail-tools.c:429
 msgid "Forwarded message (no subject)"
 msgstr "Forwarded message (no subject)"
 
-#: mail/mail-tools.c:523
+#: mail/mail-tools.c:530
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-vfolder.c:147
+#: mail/mail-vfolder.c:149
 msgid "VFolders"
 msgstr "VMappАk"
 
-#: mail/mail-vfolder.c:296
+#: mail/mail-vfolder.c:298
 msgid "New VFolder"
 msgstr "зj VMappa"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:33
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:37
 msgid "Reply"
 msgstr "VАlasz"
 
-#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:38
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
 msgid "Reply to the sender of this message"
 msgstr "VАlasz kЭldИse a feladСnak erre a levИlre"
 
-#: mail/mail-view.c:156 po/tmp/evolution-mail.xml.h:37
+#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
 msgid "Reply to all recipients of this message"
 msgstr "VАlasz a feladСnak Иs az Жsszes cМmzettnek"
 
-#: mail/mail-view.c:159 po/tmp/evolution-mail.xml.h:19
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:19
 msgid "Forward this message"
 msgstr "A levИl tovАbbМtАsa"
 
-#: mail/mail-view.c:163 po/tmp/evolution-mail.xml.h:32
+#: mail/mail-view.c:148 ui/evolution-mail.xml.h:36
 msgid "Print the selected message"
 msgstr "A levИl nyomtatАsa"
 
-#: mail/mail-view.c:165 po/tmp/evolution-mail.xml.h:12
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:12
 msgid "Delete this message"
 msgstr "A levИl tЖrlИse"
 
-#: mail/message-list.c:572
+#: mail/message-list.c:590
 msgid "Unseen"
 msgstr "Nem nИzett"
 
-#: mail/message-list.c:575
+#: mail/message-list.c:593
 msgid "Seen"
 msgstr "NИzett"
 
-#: mail/message-list.c:578
+#: mail/message-list.c:596
 msgid "Answered"
 msgstr "MegvАlaszolt"
 
-#: mail/message-list.c:846
+#: mail/message-list.c:881
 #, c-format
 msgid "[ %s ]"
 msgstr ""
 
 #. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:858 mail/message-list.c:873
+#: mail/message-list.c:893 mail/message-list.c:909
 #, c-format
 msgid "%s, et al."
 msgstr ""
 
-#: mail/message-list.c:860 mail/message-list.c:875
+#: mail/message-list.c:896 mail/message-list.c:912
 #, fuzzy
 msgid "<unknown>"
 msgstr "Ismeretlen"
 
-#: mail/message-list.c:2068
-msgid "Rebuilding message view"
+#: mail/message-list.c:965
+msgid "?"
 msgstr ""
 
-#: mail/message-list.c:2070
-msgid "Rebuild message view"
+#: mail/message-list.c:972
+#, fuzzy
+msgid "Today %l:%M %p"
+msgstr "%I:%M %p"
+
+#: mail/message-list.c:981
+msgid "Yesterday %l:%M %p"
 msgstr ""
 
+#: mail/message-list.c:993
+#, fuzzy
+msgid "%a %l:%M %p"
+msgstr "%I:%M %p"
+
+#: mail/message-list.c:1001
+#, fuzzy
+msgid "%b %d %l:%M %p"
+msgstr "%a %m/%d/%Y %I:%M:%S %p"
+
+#: mail/message-list.c:1003
+#, fuzzy
+msgid "%b %d %Y"
+msgstr "%a %d %Y"
+
 #: mail/subscribe-dialog.c:139
 msgid "Display folders starting with:"
 msgstr ""
@@ -5077,27 +5530,27 @@ msgstr "_IndulАshoz"
 msgid "Get store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:282
+#: mail/subscribe-dialog.c:283
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:286
+#: mail/subscribe-dialog.c:287
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:290
+#: mail/subscribe-dialog.c:291
 #, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:293
+#: mail/subscribe-dialog.c:294
 #, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr ""
 
-#: shell/e-setup.c:112 shell/e-setup.c:183
+#: shell/e-setup.c:112 shell/e-setup.c:185
 msgid "Evolution installation"
 msgstr "EvolЗciС telepМtИs"
 
@@ -5114,26 +5567,26 @@ msgstr ""
 "KИrlek nyomd meg az 'OK' gombot az EvolЗciС felhasznАlСi fАjljainak "
 "telepМtИsИhez"
 
-#: shell/e-setup.c:155
+#: shell/e-setup.c:157
 #, fuzzy
 msgid "Could not update files correctly"
 msgstr "Nem tudom a dialСgust elkИszМteni."
 
-#: shell/e-setup.c:158 shell/e-setup.c:224
+#: shell/e-setup.c:160 shell/e-setup.c:228
 msgid "Evolution files successfully installed."
 msgstr "Az EvolЗciС fАjljai sikeresen telepЭltek."
 
-#: shell/e-setup.c:187
+#: shell/e-setup.c:189
 msgid "This seems to be the first time you run Evolution."
 msgstr "зgy lАtszik, elsУ alkalommal futtatod az EvolЗciСt."
 
-#: shell/e-setup.c:188
+#: shell/e-setup.c:190
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 "KИrlek nyomd meg az 'OK' gombot az EvolЗciС felhasznАlСi fАjljainak "
 "telepМtИsИhez"
 
-#: shell/e-setup.c:205
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -5144,7 +5597,7 @@ msgstr ""
 "%s\n"
 "Hiba: %s"
 
-#: shell/e-setup.c:220
+#: shell/e-setup.c:224
 #, c-format
 msgid ""
 "Cannot copy files into\n"
@@ -5153,7 +5606,7 @@ msgstr ""
 "Nem tudom mАsolni a fАjlokat\n"
 "'%s'-be."
 
-#: shell/e-setup.c:245
+#: shell/e-setup.c:249
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -5164,7 +5617,7 @@ msgstr ""
 "KИrlek mozgasd el a fАjlt hogy az EvolЗciС\n"
 "telepЭlni tudjon."
 
-#: shell/e-setup.c:257
+#: shell/e-setup.c:261
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -5200,7 +5653,7 @@ msgstr ""
 "A kivАlasztott mappa tМpusa nem jС a megadott\n"
 "mШvelethez."
 
-#: shell/e-shell-folder-selection-dialog.c:291
+#: shell/e-shell-folder-selection-dialog.c:297
 msgid "New..."
 msgstr "зj..."
 
@@ -5208,23 +5661,19 @@ msgstr "зj..."
 msgid "(Untitled)"
 msgstr "(NИvtelen)"
 
-#. you might have to call gnome_dialog_run() on the
-#. * dialog returned here, I don't remember...
-#.
-#: shell/e-shell-view-menu.c:114
+#: shell/e-shell-view-menu.c:111
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy nem talАlhatС a $PATH-odban."
 
-#. same as above
-#: shell/e-shell-view-menu.c:120
+#: shell/e-shell-view-menu.c:117
 msgid "Bug buddy could not be run."
 msgstr "A Bug buddy-t nem tudom futtatni."
 
-#: shell/e-shell-view-menu.c:172
+#: shell/e-shell-view-menu.c:169
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:174
+#: shell/e-shell-view-menu.c:171
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -5234,7 +5683,7 @@ msgstr ""
 "levelezИshez, naptАr Иs cМmjegyzИk funkciСkkal\n"
 "a GNOME grafikus kЖrnyezethez."
 
-#: shell/e-shell-view-menu.c:335
+#: shell/e-shell-view-menu.c:332
 msgid "Go to folder..."
 msgstr "MappАba menj..."
 
@@ -5333,9 +5782,8 @@ msgstr "Vedd le ezt az elemet az indМtСsАvrСl"
 msgid "Error saving shortcuts."
 msgstr "Nem sikerЭl elmenteni az elemeket."
 
-#: po/tmp/evolution-event-editor.xml.h:125
-#: po/tmp/evolution-message-composer.xml.h:43 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 "_NИzet"
 
@@ -5392,12 +5840,13 @@ msgid "The specified type is not supported in this storage"
 msgstr "A megadott tМpus nem tАmogatott ebben a tАrolСban."
 
 #: shell/main.c:74
+#, fuzzy
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
-"Over the last month and a half, our focus has been on making\n"
-"Evolution usable. Many of the Evolution developers are now using\n"
+"Over the time since the past release, our focus has been on making\n"
+"Evolution usable.  Many of the Evolution developers are now using\n"
 "Evolution to read their mail full time. You could too. (Just\n"
 "be sure to keep a backup.)\n"
 "\n"
@@ -5452,1247 +5901,1265 @@ msgstr "TiltАs."
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Nem tudom elindМtani a Bonobo komponens rendszert."
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-addressbook-ldap.xml.h:6
-#, fuzzy
-msgid "N_ew Directory Server"
-msgstr "HМrcsoport-szerverek"
-
-#: po/tmp/evolution-addressbook-ldap.xml.h:7
-#, fuzzy
-msgid "_Actions"
-msgstr "_MШveletek"
-
-#: po/tmp/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:7
 #, fuzzy
 msgid "Create a new contact"
 msgstr "Egy Зj nИvjegy kИszМtИse"
 
-#: po/tmp/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:9
 #, fuzzy
 msgid "Delete a contact"
 msgstr "NИvjegy tЖrlИse?"
 
-#: 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
 #, fuzzy
 msgid "Find"
 msgstr "FinnorszАg"
 
-#: 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
 #, fuzzy
 msgid "New"
 msgstr "зj..."
 
-#: 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
 #, fuzzy
 msgid "Stop Loading"
 msgstr "аrnyalАs"
 
-#: po/tmp/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:17
 #, fuzzy
 msgid "View All"
 msgstr "Mutasd mind"
 
-#: 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
+#, fuzzy
+msgid "_Addressbook Configuration..."
+msgstr "LevelezИs beАllМtАsa"
+
+#: ui/evolution-addressbook.xml.h:20
 #, fuzzy
 msgid "_Print Contacts..."
 msgstr "_NИvjegyek..."
 
-#: po/tmp/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:21
 msgid "_Search for contacts"
 msgstr ""
 
-#: po/tmp/evolution-addressbook.xml.h:21
-#: po/tmp/evolution-event-editor.xml.h:123
+#: ui/evolution-addressbook.xml.h:22 ui/evolution-event-editor.xml.h:123
 msgid "_Tools"
 msgstr "_EszkЖzЖk"
 
 #.
-#. * 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
 #, fuzzy
 msgid "5 Days"
 msgstr "Napok"
 
-#: po/tmp/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:7
 #, fuzzy
 msgid "Alter preferences"
 msgstr "NaptАr beАllМtАsok"
 
-#: po/tmp/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:8
 #, fuzzy
 msgid "Ca_lendar"
 msgstr "NaptАr"
 
-#: po/tmp/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:9
 #, fuzzy
 msgid "Calendar Preferences..."
 msgstr "NaptАr beАllМtАsok"
 
-#: po/tmp/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:10
 #, fuzzy
 msgid "Create a new appointment"
 msgstr "A megbeszИlИs tЖrlИse"
 
-#: po/tmp/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:11
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "зj mappa kИszМtИse"
 
-#: po/tmp/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:12
 #, fuzzy
 msgid "Day"
 msgstr "Napok"
 
-#: 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
 #, fuzzy
 msgid "Go to"
 msgstr "DАtumra ugrАs"
 
-#: po/tmp/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:16
 #, fuzzy
 msgid "Go to a specific date"
 msgstr "DАtumra ugrАs"
 
-#: po/tmp/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "Go to present time"
 msgstr "KЖvetkezУ elemre ugrАs"
 
-#: po/tmp/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:18
 #, fuzzy
 msgid "Month"
 msgstr "hСnap"
 
-#: 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
 #, fuzzy
 msgid "Next"
 msgstr "KЖ_vetkezУ"
 
-#: po/tmp/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:21
 #, fuzzy
 msgid "Open a calendar"
 msgstr "NaptАr megnyitАsa"
 
-#: po/tmp/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:22
 #, fuzzy
 msgid "Prev"
 msgstr "ElУnИzet:"
 
-#: po/tmp/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:24
 #, fuzzy
 msgid "Print this calendar"
 msgstr "NaptАr nyomtatАsa"
 
-#: 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 ""
 
-#: po/tmp/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:27
 msgid "Show 1 month"
 msgstr ""
 
-#: po/tmp/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:28
 #, fuzzy
 msgid "Show 1 week"
 msgstr "HИt szАmАnak mutatАsa"
 
-#: 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:414
+#: ui/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:413
 msgid "Today"
 msgstr "Ma"
 
-#: po/tmp/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:31
 #, fuzzy
 msgid "Week"
 msgstr "hИt"
 
-#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:31
+#: ui/evolution-calendar.xml.h:32 ui/evolution.xml.h:31
 #, fuzzy
 msgid "_New"
 msgstr "_NИzet"
 
-#: po/tmp/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:33
 #, fuzzy
 msgid "_Open Calendar"
 msgstr "NaptАr megnyitАsa"
 
-#: po/tmp/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:34
 #, fuzzy
 msgid "_Print this calendar"
 msgstr "NaptАr nyomtatАsa"
 
-#: po/tmp/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:35
 #, fuzzy
-msgid "_Save Calendar As"
-msgstr "NaptАr mentИse"
+msgid "_Save As..."
+msgstr "Ment mint..."
 
-#: po/tmp/evolution-contact-editor.xml.h:7
+#: ui/evolution-contact-editor.xml.h:7
 #, fuzzy
 msgid "Delete this item"
 msgstr "A megbeszИlИs tЖrlИse"
 
-#: po/tmp/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:8
 #, fuzzy
 msgid "Delete..."
 msgstr "TЖrЖl"
 
-#: 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
 #, fuzzy
 msgid "Print this item"
 msgstr "TennivalС szerkesztИse"
 
-#: 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
 #, fuzzy
 msgid "Print..."
 msgstr "Nyomtat"
 
-#: po/tmp/evolution-contact-editor.xml.h:13
-#: po/tmp/evolution-event-editor.xml.h:89
-#: po/tmp/evolution-message-composer.xml.h:18
+#: ui/evolution-contact-editor.xml.h:13 ui/evolution-event-editor.xml.h:89
+#: ui/evolution-message-composer.xml.h:21
 #, fuzzy
 msgid "Save _As..."
 msgstr "Ment mint..."
 
-#: 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
 #, fuzzy
 msgid "Send _message to contact..."
 msgstr "FIXME: эze_net ennek a szemИlynek"
 
-#: po/tmp/evolution-contact-editor.xml.h:19
-#: po/tmp/evolution-event-editor.xml.h:110
-#: po/tmp/evolution-message-composer.xml.h:38
-#: 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
 #, fuzzy
 msgid "_File"
 msgstr "_Mobil"
 
-#: po/tmp/evolution-contact-editor.xml.h:20
+#: ui/evolution-contact-editor.xml.h:20
 #, fuzzy
 msgid "_Print..."
 msgstr "Nyomtat"
 
-#: po/tmp/evolution-contact-editor.xml.h:21
-#: po/tmp/evolution-event-editor.xml.h:121
-#: po/tmp/evolution-message-composer.xml.h:42
+#: ui/evolution-contact-editor.xml.h:21 ui/evolution-event-editor.xml.h:121
+#: ui/evolution-message-composer.xml.h:46
 #, fuzzy
 msgid "_Save"
 msgstr "MentИs"
 
 #.
-#. * 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
 #, fuzzy
 msgid "About..."
 msgstr "BetШtМpus..."
 
-#: po/tmp/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:8
 msgid "Actio_ns"
 msgstr "_MШveletek"
 
-#: po/tmp/evolution-event-editor.xml.h:9
+#: ui/evolution-event-editor.xml.h:9
 #, fuzzy
 msgid "C_lear"
 msgstr "NaptАr"
 
-#: 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
 #, fuzzy
 msgid "Clear"
 msgstr "NaptАr"
 
-#: po/tmp/evolution-event-editor.xml.h:12
+#: ui/evolution-event-editor.xml.h:12
 #, fuzzy
 msgid "Clear the selection"
 msgstr "A kijelЖlt mappАk megtekintИse"
 
-#: po/tmp/evolution-event-editor.xml.h:14
+#: ui/evolution-event-editor.xml.h:14
 #, fuzzy
 msgid "Close this appointment"
 msgstr "A megbeszИlИs tЖrlИse"
 
-#: 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
 #, fuzzy
 msgid "Copy"
 msgstr "VАllalat"
 
-#: 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
 #, fuzzy
 msgid "FIXME: Address _Book..."
 msgstr "FIXME: _BetШtМpus..."
 
-#: po/tmp/evolution-event-editor.xml.h:24
+#: ui/evolution-event-editor.xml.h:24
 msgid "FIXME: Ch_oose Form..."
 msgstr "FIXME: VАlassz f_ormАt..."
 
-#: po/tmp/evolution-event-editor.xml.h:25
+#: ui/evolution-event-editor.xml.h:25
 #, fuzzy
 msgid "FIXME: Chec_k Names"
 msgstr "FIXME: _Feladat"
 
-#: po/tmp/evolution-event-editor.xml.h:26
+#: ui/evolution-event-editor.xml.h:26
 msgid "FIXME: Cop_y to Folder..."
 msgstr "FIXME: MappАba mАso_l..."
 
-#: po/tmp/evolution-event-editor.xml.h:27
+#: ui/evolution-event-editor.xml.h:27
 msgid "FIXME: D_esign a Form..."
 msgstr "FIXME: KИrdУМv t_ervezИse"
 
-#: po/tmp/evolution-event-editor.xml.h:28
+#: ui/evolution-event-editor.xml.h:28
 #, fuzzy
 msgid "FIXME: Define Print _Styles"
 msgstr "FIXME: NyomtatАsi stМlusok definiАlАsa..."
 
-#: po/tmp/evolution-event-editor.xml.h:29
+#: ui/evolution-event-editor.xml.h:29
 msgid "FIXME: Desi_gn This Form"
 msgstr "FIXME: AktuАlis kИrdУМv _tervezИse"
 
-#: po/tmp/evolution-event-editor.xml.h:30
+#: ui/evolution-event-editor.xml.h:30
 msgid "FIXME: Fi_rst Item in Folder"
 msgstr "FIXME: ElsУ e_lem a mappАban"
 
-#: po/tmp/evolution-event-editor.xml.h:31
+#: ui/evolution-event-editor.xml.h:31
 msgid "FIXME: For_ward"
 msgstr "FIXME: _TovАbbМt"
 
-#: po/tmp/evolution-event-editor.xml.h:32
+#: ui/evolution-event-editor.xml.h:32
 #, fuzzy
 msgid "FIXME: Forward as v_Calendar"
 msgstr "FIXME: _vCard-kИnt tovАbbkЭld"
 
-#: po/tmp/evolution-event-editor.xml.h:33
+#: ui/evolution-event-editor.xml.h:33
 #, fuzzy
 msgid "FIXME: Help"
 msgstr "FIXME: KЖvetkezУ"
 
-#: po/tmp/evolution-event-editor.xml.h:34
+#: ui/evolution-event-editor.xml.h:34
 #, fuzzy
 msgid "FIXME: In_complete Task"
 msgstr "FIXME: _Feladat"
 
-#: po/tmp/evolution-event-editor.xml.h:35
+#: ui/evolution-event-editor.xml.h:35
 #, fuzzy
 msgid "FIXME: Insert File"
 msgstr "FIXME: _Elem"
 
-#: po/tmp/evolution-event-editor.xml.h:36
+#: ui/evolution-event-editor.xml.h:36
 msgid "FIXME: It_em..."
 msgstr "FIXME: Elem..."
 
-#: po/tmp/evolution-event-editor.xml.h:37
+#: ui/evolution-event-editor.xml.h:37
 #, fuzzy
 msgid "FIXME: Paste _Special... "
 msgstr "FIXME: _SpeciАlis beillesztИs"
 
-#: po/tmp/evolution-event-editor.xml.h:38
+#: ui/evolution-event-editor.xml.h:38
 msgid "FIXME: Print Pre_view"
 msgstr "FIXME: NyomtatАs nИ_zet"
 
-#: po/tmp/evolution-event-editor.xml.h:39
+#: ui/evolution-event-editor.xml.h:39
 msgid "FIXME: Pu_blish Form As..."
 msgstr "FIXME: KИrdУМv publikАlАsa _mint..."
 
-#: po/tmp/evolution-event-editor.xml.h:40
+#: ui/evolution-event-editor.xml.h:40
 msgid "FIXME: Publish _Form..."
 msgstr "FIXME: KИrdУМv _publikАlАsa"
 
-#: po/tmp/evolution-event-editor.xml.h:41
+#: ui/evolution-event-editor.xml.h:41
 #, fuzzy
 msgid "FIXME: Rec_urrence..."
 msgstr "FIXME: _Objektum..."
 
-#: po/tmp/evolution-event-editor.xml.h:42
+#: ui/evolution-event-editor.xml.h:42
 msgid "FIXME: S_end"
 msgstr "FIXME: _ElkЭld"
 
-#: po/tmp/evolution-event-editor.xml.h:43
+#: ui/evolution-event-editor.xml.h:43
 msgid "FIXME: Save Attac_hments..."
 msgstr "FIXME: CsatolАsok me_ntИse..."
 
-#: po/tmp/evolution-event-editor.xml.h:44
+#: ui/evolution-event-editor.xml.h:44
 msgid "FIXME: Script _Debugger"
 msgstr "FIXME: Szkript _hibakeresУ"
 
-#: po/tmp/evolution-event-editor.xml.h:45
+#: ui/evolution-event-editor.xml.h:45
 msgid "FIXME: Task _Request"
 msgstr "FIXME: Feladat f_elhМvАs"
 
-#: po/tmp/evolution-event-editor.xml.h:46
+#: ui/evolution-event-editor.xml.h:46
 msgid "FIXME: _Contact"
 msgstr "FIXME: _CМmjegyzИk"
 
-#: po/tmp/evolution-event-editor.xml.h:47
+#: ui/evolution-event-editor.xml.h:47
 msgid "FIXME: _Customize..."
 msgstr "FIXME: _BeАllМt..."
 
-#: po/tmp/evolution-event-editor.xml.h:48
+#: ui/evolution-event-editor.xml.h:48
 msgid "FIXME: _File..."
 msgstr "FIXME: _FАjl..."
 
-#: po/tmp/evolution-event-editor.xml.h:49
+#: ui/evolution-event-editor.xml.h:49
 msgid "FIXME: _Font..."
 msgstr "FIXME: _BetШtМpus..."
 
-#: po/tmp/evolution-event-editor.xml.h:50
+#: ui/evolution-event-editor.xml.h:50
 #, fuzzy
 msgid "FIXME: _Formatting"
 msgstr "FIXME: __FormАzАs"
 
-#: po/tmp/evolution-event-editor.xml.h:51
+#: ui/evolution-event-editor.xml.h:51
 msgid "FIXME: _Item"
 msgstr "FIXME: _Elem"
 
-#: po/tmp/evolution-event-editor.xml.h:52
+#: ui/evolution-event-editor.xml.h:52
 msgid "FIXME: _Journal Entry"
 msgstr "FIXME: _NaplС bejegyzИs"
 
-#: po/tmp/evolution-event-editor.xml.h:53
+#: ui/evolution-event-editor.xml.h:53
 msgid "FIXME: _Last Item in Folder"
 msgstr "FIXME: _UtolsС elem a mappАban"
 
-#: po/tmp/evolution-event-editor.xml.h:54
+#: ui/evolution-event-editor.xml.h:54
 msgid "FIXME: _Mail Message"
 msgstr "FIXME: _LevИl"
 
-#: po/tmp/evolution-event-editor.xml.h:55
+#: ui/evolution-event-editor.xml.h:55
 msgid "FIXME: _Memo Style"
 msgstr "FIXME: _Memo stМlus"
 
-#: po/tmp/evolution-event-editor.xml.h:56
+#: ui/evolution-event-editor.xml.h:56
 msgid "FIXME: _Move to Folder..."
 msgstr "FIXME: _MappАba mozgat..."
 
-#: po/tmp/evolution-event-editor.xml.h:57
+#: ui/evolution-event-editor.xml.h:57
 #, fuzzy
 msgid "FIXME: _New Appointment"
 msgstr "FIXME: _IdУpont"
 
-#: po/tmp/evolution-event-editor.xml.h:58
+#: ui/evolution-event-editor.xml.h:58
 msgid "FIXME: _Note"
 msgstr "FIXME: _FeljegyzИs"
 
-#: po/tmp/evolution-event-editor.xml.h:59
+#: ui/evolution-event-editor.xml.h:59
 msgid "FIXME: _Object..."
 msgstr "FIXME: _Objektum..."
 
-#: po/tmp/evolution-event-editor.xml.h:60
+#: ui/evolution-event-editor.xml.h:60
 msgid "FIXME: _Paragraph..."
 msgstr "FIXME: B_ekezdИs..."
 
-#: po/tmp/evolution-event-editor.xml.h:61
+#: ui/evolution-event-editor.xml.h:61
 msgid "FIXME: _Spelling..."
 msgstr "FIXME: _HelyesМrАs..."
 
-#: po/tmp/evolution-event-editor.xml.h:62
+#: ui/evolution-event-editor.xml.h:62
 msgid "FIXME: _Standard"
 msgstr "FIXME: а_ltalАnos"
 
-#: po/tmp/evolution-event-editor.xml.h:63
+#: ui/evolution-event-editor.xml.h:63
 msgid "FIXME: _Task"
 msgstr "FIXME: _Feladat"
 
-#: po/tmp/evolution-event-editor.xml.h:64
+#: ui/evolution-event-editor.xml.h:64
 msgid "FIXME: _Unread Item"
 msgstr "FIXME: _Nem olvasott elem"
 
-#: 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:10
+#: ui/evolution-event-editor.xml.h:66 ui/evolution-message-composer.xml.h:11
 msgid "F_ormat"
 msgstr "F_ormАtum"
 
-#: 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 "KЖvetkezУ elemre ugrАs"
 
-#: po/tmp/evolution-event-editor.xml.h:71
+#: ui/evolution-event-editor.xml.h:71
 msgid "Go to the previous item"
 msgstr "Az elУzУ elemre ugrАs"
 
-#: po/tmp/evolution-event-editor.xml.h:72
+#: ui/evolution-event-editor.xml.h:72
 #, fuzzy
 msgid "Modify the file's properties"
 msgstr "TennivalС lista beАllМtАsai"
 
-#: po/tmp/evolution-event-editor.xml.h:73
+#: ui/evolution-event-editor.xml.h:73
 #, fuzzy
 msgid "N_ext"
 msgstr "KЖ_vetkezУ"
 
-#: po/tmp/evolution-event-editor.xml.h:75
+#: ui/evolution-event-editor.xml.h:75
 #, fuzzy
 msgid "Paste"
 msgstr "Lap"
 
-#: 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 "E_lУzУ"
 
-#: po/tmp/evolution-event-editor.xml.h:78
+#: ui/evolution-event-editor.xml.h:78
 #, fuzzy
 msgid "Previous"
 msgstr "E_lУzУ"
 
-#: 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
 #, fuzzy
 msgid "Print Setup"
 msgstr "Oldal beАllМtАs:"
 
-#: po/tmp/evolution-event-editor.xml.h:83
+#: ui/evolution-event-editor.xml.h:83
 #, fuzzy
 msgid "Properties"
 msgstr "иbresztУ beАllМtАsok"
 
-#: po/tmp/evolution-event-editor.xml.h:84
+#: ui/evolution-event-editor.xml.h:84
 #, fuzzy
 msgid "Redo"
 msgstr "RАdiС"
 
-#: 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
 #, fuzzy
 msgid "Replace"
 msgstr "VАlasz"
 
-#: 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:21
+#: ui/evolution-event-editor.xml.h:92 ui/evolution-message-composer.xml.h:24
 #, fuzzy
 msgid "Save the current file"
 msgstr "JelenidУre ugrАs"
 
-#: 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
 #, fuzzy
 msgid "Select All"
 msgstr "VАlassz mappАt"
 
-#: po/tmp/evolution-event-editor.xml.h:100
+#: ui/evolution-event-editor.xml.h:100
 #, fuzzy
 msgid "Select everything"
 msgstr "VАlassz mappАt"
 
-#: 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:34
+#: ui/evolution-event-editor.xml.h:104 ui/evolution-message-composer.xml.h:38
 #, fuzzy
 msgid "_About..."
 msgstr "BetШtМpus..."
 
-#: po/tmp/evolution-event-editor.xml.h:105
-#: po/tmp/evolution-message-composer.xml.h:35
+#: ui/evolution-event-editor.xml.h:105 ui/evolution-message-composer.xml.h:39
 #, fuzzy
 msgid "_Close"
 msgstr "BezАr"
 
-#: po/tmp/evolution-event-editor.xml.h:106
+#: ui/evolution-event-editor.xml.h:106
 #, fuzzy
 msgid "_Copy"
 msgstr "_VАllalat:"
 
-#: po/tmp/evolution-event-editor.xml.h:107
-#: po/tmp/evolution-message-composer.xml.h:36
+#: 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:37
-#: 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
 #, fuzzy
 msgid "_Edit"
 msgstr "Szerkeszt"
 
-#: po/tmp/evolution-event-editor.xml.h:111
+#: ui/evolution-event-editor.xml.h:111
 #, fuzzy
 msgid "_Find..."
 msgstr "KeresИs..."
 
-#: po/tmp/evolution-event-editor.xml.h:112
+#: ui/evolution-event-editor.xml.h:112
 msgid "_Forms"
 msgstr "_KИrdУМvek"
 
-#: po/tmp/evolution-event-editor.xml.h:113
-#: po/tmp/evolution-message-composer.xml.h:39 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
 #, fuzzy
 msgid "_Help"
 msgstr "_Otthoni"
 
-#: po/tmp/evolution-event-editor.xml.h:114
+#: ui/evolution-event-editor.xml.h:114
 msgid "_Insert"
 msgstr "_Beilleszt"
 
-#: po/tmp/evolution-event-editor.xml.h:115
+#: ui/evolution-event-editor.xml.h:115
 msgid "_Object"
 msgstr "_Objektum"
 
-#: po/tmp/evolution-event-editor.xml.h:116
+#: ui/evolution-event-editor.xml.h:116
 #, fuzzy
 msgid "_Paste"
 msgstr "_VezetИknИv:"
 
-#: po/tmp/evolution-event-editor.xml.h:117
+#: ui/evolution-event-editor.xml.h:117
 #, fuzzy
 msgid "_Print"
 msgstr "Nyomtat"
 
-#: po/tmp/evolution-event-editor.xml.h:118
+#: ui/evolution-event-editor.xml.h:118
 #, fuzzy
 msgid "_Properties..."
 msgstr "иbresztУ beАllМtАsok"
 
-#: po/tmp/evolution-event-editor.xml.h:119
+#: ui/evolution-event-editor.xml.h:119
 #, fuzzy
 msgid "_Redo"
 msgstr "RАdiС"
 
-#: 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 "_EszkЖzЖk"
 
-#: 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
 #, fuzzy
 msgid "Compose"
 msgstr "BezАr"
 
-#: po/tmp/evolution-mail.xml.h:7
+#: ui/evolution-mail.xml.h:7
 #, fuzzy
 msgid "Compose a new message"
 msgstr "LevИl МrАsa"
 
-#: po/tmp/evolution-mail.xml.h:9
+#: ui/evolution-mail.xml.h:9
 #, fuzzy
 msgid "Copy message to a new folder"
 msgstr "LevИl mozgatАsa mАs mappАba"
 
-#: 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
 #, fuzzy
 msgid "F_older"
 msgstr "MappАk"
 
-#: po/tmp/evolution-mail.xml.h:14
+#: ui/evolution-mail.xml.h:14
 #, fuzzy
 msgid "Fi_lter on Sender"
 msgstr "SzШrУ a feladСn"
 
-#: po/tmp/evolution-mail.xml.h:15
+#: ui/evolution-mail.xml.h:15
 #, fuzzy
 msgid "Filter on Rec_ipients"
 msgstr "SzШrУ a cМmzettekre"
 
-#: po/tmp/evolution-mail.xml.h:16
+#: ui/evolution-mail.xml.h:16
 #, fuzzy
 msgid "Forget _Passwords"
 msgstr "JelszС"
 
-#: po/tmp/evolution-mail.xml.h:20
+#: ui/evolution-mail.xml.h:20
 #, fuzzy
 msgid "Get Mail"
 msgstr "RИszletek"
 
-#: po/tmp/evolution-mail.xml.h:21
+#: ui/evolution-mail.xml.h:22
+#, fuzzy
+msgid "Hide _Deleted messages"
+msgstr "A levИl nyomtatАsa"
+
+#: ui/evolution-mail.xml.h:23
+#, fuzzy
+msgid "Hide _Read messages"
+msgstr "Forwarded message - %s"
+
+#: ui/evolution-mail.xml.h:24
+#, fuzzy
+msgid "Hide _Selected messages"
+msgstr "A levИl nyomtatАsa"
+
+#: ui/evolution-mail.xml.h:25
 #, fuzzy
-msgid "Mail _Filters"
+msgid "Mail _Filters..."
 msgstr "SzШrУk szerkesztИse"
 
-#: po/tmp/evolution-mail.xml.h:22
+#: ui/evolution-mail.xml.h:26
 #, fuzzy
-msgid "Manage Subscriptions"
+msgid "Manage Subscriptions..."
 msgstr "LeМrАs:"
 
-#: po/tmp/evolution-mail.xml.h:23
+#: ui/evolution-mail.xml.h:27
 #, fuzzy
 msgid "Mar_k As Read"
 msgstr "JelЖlИs olvasottnak"
 
-#: po/tmp/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:28
 #, fuzzy
 msgid "Mark As U_nread"
 msgstr "JelЖlИs nem olvasottnak"
 
-#: po/tmp/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:29
 #, fuzzy
 msgid "Move"
 msgstr "H"
 
-#: po/tmp/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:30
 #, fuzzy
 msgid "Move message to a new folder"
 msgstr "LevИl(levelek) mozgatАsa mАs mappАba"
 
-#: po/tmp/evolution-mail.xml.h:27
+#: ui/evolution-mail.xml.h:31
 msgid "Previews the message to be printed"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:29
+#: ui/evolution-mail.xml.h:33
 #, fuzzy
 msgid "Print Preview of message..."
 msgstr "NyomtatАsi elУnИzet"
 
-#: po/tmp/evolution-mail.xml.h:30
+#: ui/evolution-mail.xml.h:34
 msgid "Print message to the printer"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:31
+#: ui/evolution-mail.xml.h:35
 #, fuzzy
 msgid "Print message..."
 msgstr "LevИl _nyomtatАsa"
 
-#: po/tmp/evolution-mail.xml.h:35
+#: ui/evolution-mail.xml.h:39
 #, fuzzy
 msgid "Reply to _All"
 msgstr "Mindenkinek"
 
-#: po/tmp/evolution-mail.xml.h:36
+#: ui/evolution-mail.xml.h:40
 #, fuzzy
 msgid "Reply to _Sender"
 msgstr "Mindenkinek"
 
-#: po/tmp/evolution-mail.xml.h:39 po/tmp/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:43 ui/evolution-subscribe.xml.h:12
 #, fuzzy
 msgid "Select _All"
 msgstr "VАlassz mappАt"
 
-#: po/tmp/evolution-mail.xml.h:40
+#: ui/evolution-mail.xml.h:44
 msgid "Send queued mail and retrieve new mail"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:41
+#: ui/evolution-mail.xml.h:45
+#, fuzzy
+msgid "Show _All messages"
+msgstr "Mutasd mind"
+
+#: ui/evolution-mail.xml.h:46
 #, fuzzy
 msgid "Threaded Message list"
 msgstr "TИmaszerinti levИl lista"
 
-#: po/tmp/evolution-mail.xml.h:42
+#: ui/evolution-mail.xml.h:47
 #, fuzzy
 msgid "VFolder on Se_nder"
 msgstr "VMappa a feladСra"
 
-#: po/tmp/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:48
 #, fuzzy
 msgid "VFolder on _Recipients"
 msgstr "VMappa a cМmzettekre"
 
-#: po/tmp/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:49
 msgid "View Raw Message Source"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:50
 #, fuzzy
 msgid "_Apply Filters"
 msgstr "SzШrУk alkalmazАsa"
 
-#: po/tmp/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:51
 #, fuzzy
 msgid "_Configure Folder"
 msgstr "_Mappa beАllМtАsa"
 
-#: po/tmp/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:52
 #, fuzzy
 msgid "_Copy to Folder..."
 msgstr "MappАba mАsolАs..."
 
-#: po/tmp/evolution-mail.xml.h:49
+#: ui/evolution-mail.xml.h:54
 #, fuzzy
 msgid "_Edit Message"
 msgstr "LevИl _nyomtatАsa"
 
-#: po/tmp/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:55
 #, fuzzy
 msgid "_Expunge"
 msgstr "_TisztМt"
 
-#: po/tmp/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:56
 #, fuzzy
 msgid "_Filter on Subject"
 msgstr "SzШrУ a tИmАra"
 
-#: po/tmp/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:57
 #, fuzzy
 msgid "_Forward"
 msgstr "TovАbbМt"
 
-#: po/tmp/evolution-mail.xml.h:53 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:54
+#: ui/evolution-mail.xml.h:59
 #, fuzzy
-msgid "_Mail Configuration"
+msgid "_Mail Configuration..."
 msgstr "LevelezИs beАllМtАsa"
 
-#: po/tmp/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:60
 #, fuzzy
 msgid "_Message"
 msgstr "LevИltЖrzs"
 
-#: po/tmp/evolution-mail.xml.h:56
+#: ui/evolution-mail.xml.h:61
 #, fuzzy
 msgid "_Move to Folder..."
 msgstr "MappАba mozgatАs..."
 
-#: po/tmp/evolution-mail.xml.h:57
+#: ui/evolution-mail.xml.h:62
 msgid "_Open in New Window"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:58
+#: ui/evolution-mail.xml.h:63
 #, fuzzy
 msgid "_Print Message"
 msgstr "LevИl _nyomtatАsa"
 
-#: po/tmp/evolution-mail.xml.h:59
+#: ui/evolution-mail.xml.h:64
 #, fuzzy
 msgid "_Save Message As..."
 msgstr "Ment mint..."
 
-#: po/tmp/evolution-mail.xml.h:60
+#: ui/evolution-mail.xml.h:65
 #, fuzzy
 msgid "_Source"
 msgstr "ForrАs"
 
-#: po/tmp/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:66
 msgid "_Threaded"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:67
 #, fuzzy
 msgid "_Undelete"
 msgstr "VisszaАllМt"
 
-#: po/tmp/evolution-mail.xml.h:63
+#: ui/evolution-mail.xml.h:68
 #, fuzzy
 msgid "_VFolder on Subject"
 msgstr "VMappa a tИmАra"
 
-#: po/tmp/evolution-mail.xml.h:64
+#: ui/evolution-mail.xml.h:69
 #, fuzzy
-msgid "_Virtual Folder Editor"
+msgid "_Virtual Folder Editor..."
 msgstr "VirtuАlis MappАk"
 
 #.
-#. * 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
 #, fuzzy
 msgid "Attach"
 msgstr "FАjl csatolАsa"
 
-#: po/tmp/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:9
 #, fuzzy
 msgid "Close the current file"
 msgstr "JelenidУre ugrАs"
 
-#: po/tmp/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Encrypt this message with PGP"
+msgstr "LevИl elkЭldИse"
+
+#: ui/evolution-message-composer.xml.h:12
 msgid "HTML"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:13
 #, fuzzy
 msgid "Insert a file as text into the message"
 msgstr "Csatolj egy fАjlt a levИlhez"
 
-#: po/tmp/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:14
 msgid "Insert text file..."
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:16
 #, fuzzy
 msgid "Open a file"
 msgstr "FАjl megnyitАs"
 
-#: po/tmp/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:17
+msgid "PGP Encrypt"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:18
+msgid "PGP Sign"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:20
 #, fuzzy
 msgid "Save As"
 msgstr "MentИs"
 
-#: po/tmp/evolution-message-composer.xml.h:19
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save in _folder... (FIXME)"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:23
 #, fuzzy
 msgid "Save in folder..."
 msgstr "MappАba mozgatАs..."
 
-#: po/tmp/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:26
 #, fuzzy
 msgid "Save the message in a specified folder"
 msgstr ""
 "Nem tudom elkИszМteni a megadott mappАt:\n"
 "%s"
 
-#: po/tmp/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:27
 #, fuzzy
 msgid "Send"
 msgstr "FeladС"
 
-#: po/tmp/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:28
 #, fuzzy
 msgid "Send _Later"
 msgstr "FeladС"
 
-#: po/tmp/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:29
 #, fuzzy
 msgid "Send _later"
 msgstr "FeladС"
 
-#: po/tmp/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:30
 #, fuzzy
 msgid "Send the mail in HTML format"
 msgstr "A levelet HTML formАtumban kЭldd"
 
-#: po/tmp/evolution-message-composer.xml.h:28
+#: ui/evolution-message-composer.xml.h:31
 #, fuzzy
 msgid "Send the message later"
 msgstr "TИmaszerinti levИl lista"
 
-#: po/tmp/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:32
 #, fuzzy
 msgid "Send the message now"
 msgstr "A levelet HTML formАtumban kЭldd"
 
-#: po/tmp/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:33
 #, fuzzy
 msgid "Send this message now"
 msgstr "A levИl tЖrlИse"
 
-#: po/tmp/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:34
 #, fuzzy
 msgid "Show / hide attachments"
 msgstr "FIXME: CsatolАsok me_ntИse..."
 
-#: po/tmp/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:35
 #, fuzzy
 msgid "Show _attachments"
 msgstr "csatolАs"
 
-#: po/tmp/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:36
 #, fuzzy
 msgid "Show attachments"
 msgstr "csatolАs"
 
-#: po/tmp/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Sign this message with your PGP key"
+msgstr "A levИl elmentИse mАsik nИven"
+
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Insert text file... (FIXME)"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:45
 #, fuzzy
 msgid "_Open..."
 msgstr "Megnyit..."
 
+#: 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
 #, fuzzy
 msgid "E_xit"
 msgstr "Szerkeszt"
 
-#: po/tmp/evolution.xml.h:8
+#: ui/evolution.xml.h:8
 #, fuzzy
 msgid "Evolution bar _shortcut"
 msgstr "EvolЗciС naptАr csatorna"
 
-#: 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 "Nem indult mИg el"
 
-#: po/tmp/evolution.xml.h:11
+#: ui/evolution.xml.h:11
 msgid "Show information about Evolution"
 msgstr ""
 
-#: 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 "Nagy ikonok mutatАsa az elemeken"
 
-#: 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 ""
 
-#: 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
 #, fuzzy
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Vedd le ezt az elemet az indМtСsАvrСl"
 
-#: 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
 #, fuzzy
 msgid "Using the _Calendar"
 msgstr "NaptАr nyomtatАsa"
 
-#: 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
 #, fuzzy
 msgid "_About Evolution..."
 msgstr "EvolЗciС"
 
-#: po/tmp/evolution.xml.h:22
+#: ui/evolution.xml.h:22
 #, fuzzy
 msgid "_Appointment (FIXME)"
 msgstr "MegbeszИlИsek:"
 
-#: po/tmp/evolution.xml.h:23
+#: ui/evolution.xml.h:23
 #, fuzzy
 msgid "_Contact (FIXME)"
 msgstr "NИvjegy szerkesztУ"
 
-#: po/tmp/evolution.xml.h:26
+#: ui/evolution.xml.h:26
 #, fuzzy
 msgid "_Folder"
 msgstr "MappАk"
 
-#: po/tmp/evolution.xml.h:27
+#: ui/evolution.xml.h:27
 #, fuzzy
 msgid "_Go to Folder..."
 msgstr "MappАba menj..."
 
-#: po/tmp/evolution.xml.h:29
+#: ui/evolution.xml.h:29
 #, fuzzy
 msgid "_Index"
 msgstr "_Beilleszt"
 
-#: 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
 #, fuzzy
 msgid "_Settings"
 msgstr "BeАllМtАsok tesztelИse"
 
-#: po/tmp/evolution.xml.h:33
+#: ui/evolution.xml.h:33
 msgid "_Task (FIXME)"
 msgstr ""
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2470
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -6772,28 +7239,34 @@ msgstr "MegbeszИlИs _vИge:"
 msgid "All Attendees"
 msgstr "Minden meghМvott"
 
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: widgets/misc/e-calendar-item.c:421
+msgid "MTWTFSS"
+msgstr "HKSCPsV"
+
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
+#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-clipped-label.c:107
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-dateedit.c:408
+#: widgets/misc/e-dateedit.c:407
 msgid "Now"
 msgstr "Most"
 
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1249 widgets/misc/e-dateedit.c:1308
-#: widgets/misc/e-dateedit.c:1487
+#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
+#: widgets/misc/e-dateedit.c:1486
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1252 widgets/misc/e-dateedit.c:1311
-#: widgets/misc/e-dateedit.c:1490
+#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
+#: widgets/misc/e-dateedit.c:1489
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
@@ -6802,12 +7275,241 @@ msgstr "%I:%M %p"
 msgid "Group %i"
 msgstr "CsoportosМtАs %i"
 
+#~ msgid "categories"
+#~ msgstr "kategСriАk"
+
+#~ msgid "Item(s) belong to these categories:"
+#~ msgstr "Az elemek az alАbbi kategСriАkhoz tartoznak:"
+
+#~ msgid "Available Categories:"
+#~ msgstr "MeglИvУ mezУk"
+
+#~ msgid "External Directories"
+#~ msgstr "KЭlsУ kЖnyvtАrak"
+
+#~ msgid "Port Number:"
+#~ msgstr "PortszАm:"
+
+#~ msgid "Outline:"
+#~ msgstr "KЖrvonal:"
+
+#~ msgid "Headings:"
+#~ msgstr "FejlИcek:"
+
+#~ msgid "Empty days:"
+#~ msgstr "эres napok:"
+
+#~ msgid "Appointments:"
+#~ msgstr "MegbeszИlИsek:"
+
+#~ msgid "Highlighted day:"
+#~ msgstr "Kiemelt nap:"
+
+#~ msgid "Day numbers:"
+#~ msgstr "Nap szАmozАs:"
+
+#~ msgid "Current day's number:"
+#~ msgstr "Jelenlegi nap szАma:"
+
+#~ msgid "To-Do item that is not yet due:"
+#~ msgstr "TennivalС, ami mИg nem jАrt le:"
+
+#~ msgid "To-Do item that is due today:"
+#~ msgstr "TennivalС, ami ma jАr le:"
+
+#~ msgid "To-Do item that is overdue:"
+#~ msgstr "TennivalС, ami lejАrt:"
+
+#~ msgid "may"
+#~ msgstr "mАjus"
+
+#~ msgid "sept"
+#~ msgstr "szept"
+
+#~ msgid "sunday"
+#~ msgstr "vasАrnap"
+
+#~ msgid "monday"
+#~ msgstr "hИtfУ"
+
+#~ msgid "tuesday"
+#~ msgstr "kedd"
+
+#~ msgid "tues"
+#~ msgstr "kedd"
+
+#~ msgid "wednesday"
+#~ msgstr "szerda"
+
+#~ msgid "wednes"
+#~ msgstr "szerda"
+
+#~ msgid "thursday"
+#~ msgstr "csЭtЖrtЖk"
+
+#~ msgid "thur"
+#~ msgstr "csЭt"
+
+#~ msgid "thurs"
+#~ msgstr "csЭt"
+
+#~ msgid "friday"
+#~ msgstr "pИntek"
+
+#~ msgid "saturday"
+#~ msgstr "szombat"
+
+#~ msgid "fortnight"
+#~ msgstr "kИt hИt"
+
+#~ msgid "min"
+#~ msgstr "perc"
+
+#~ msgid "sec"
+#~ msgstr "mp"
+
+#~ msgid "tomorrow"
+#~ msgstr "holnap"
+
+#~ msgid "yesterday"
+#~ msgstr "tegnap"
+
+#~ msgid "today"
+#~ msgstr "ma"
+
+#~ msgid "last"
+#~ msgstr "utolsС"
+
+#~ msgid "this"
+#~ msgstr "ez"
+
+#~ msgid "next"
+#~ msgstr "kЖvetkezУ"
+
+#~ msgid "first"
+#~ msgstr "elsУ"
+
+#~ msgid "third"
+#~ msgstr "harmadik"
+
+#~ msgid "fourth"
+#~ msgstr "negyedik"
+
+#~ msgid "fifth"
+#~ msgstr "ЖtЖdik"
+
+#~ msgid "sixth"
+#~ msgstr "hatodik"
+
+#~ msgid "seventh"
+#~ msgstr "hetedik"
+
+#~ msgid "eighth"
+#~ msgstr "nyolcadik"
+
+#~ msgid "ninth"
+#~ msgstr "kilencedik"
+
+#~ msgid "tenth"
+#~ msgstr "tizedik"
+
+#~ msgid "eleventh"
+#~ msgstr "tizenegyedik"
+
+#~ msgid "twelfth"
+#~ msgstr "tizenkettedik"
+
+#~ msgid "ago"
+#~ msgstr "Сta"
+
+#~ msgid "Year:"
+#~ msgstr "иv:"
+
+#~ msgid ""
+#~ "Please select the date you want to go to.\n"
+#~ "When you click on a day, you will be taken\n"
+#~ "to that date."
+#~ msgstr ""
+#~ "KИrlek vАlassz egy dАtumot amire lИpni akarsz.\n"
+#~ "Ha egy napra kattintassz, arra a dАtumra leszel\n"
+#~ "tИve."
+
+#~ msgid "Mail Source"
+#~ msgstr "LevИl forrАs"
+
 #~ msgid ""
-#~ "Are you sure you want\n"
-#~ "to delete this contact?"
+#~ "Your email configuration is now complete.\n"
+#~ "Click \"Finish\" to save your new settings"
 #~ msgstr ""
-#~ "TИnyleg tЖrЖlni akarod\n"
-#~ "ezt a nИvjegyet?"
+#~ "A levelezИsi beАllМtАsod most teljes.\n"
+#~ "Kattints a 'Befejez' gombra a mentИshez"
+
+#~ msgid "Send \"%s\""
+#~ msgstr "'%s' kЭldИse"
+
+#, fuzzy
+#~ msgid "Expunge \"%s\""
+#~ msgstr "_TisztМt"
+
+#, fuzzy
+#~ msgid "Marking messages in folder \"%s\""
+#~ msgstr "LevИl mozgatАsa mАs mappАba"
+
+#, fuzzy
+#~ msgid "Mark messages in folder \"%s\""
+#~ msgstr "LevИl mozgatАsa mАs mappАba"
+
+#, fuzzy
+#~ msgid "Attach messages from \"%s\""
+#~ msgstr "KilИpИs a levИlszerkesztУbУl"
+
+#, fuzzy
+#~ msgid "Forwarding messages \"%s\""
+#~ msgstr "A levИl tovАbbМtАsa"
+
+#, fuzzy
+#~ msgid "Forward message \"%s\""
+#~ msgstr "A levИl tovАbbМtАsa"
+
+#, fuzzy
+#~ msgid "Loading \"%s\""
+#~ msgstr "FejlИcek"
+
+#, fuzzy
+#~ msgid "Create \"%s\""
+#~ msgstr "LИtrehozva"
+
+#, fuzzy
+#~ msgid "Clearing message display"
+#~ msgstr "IdУ mutatАsa"
+
+#, fuzzy
+#~ msgid "Clear message display"
+#~ msgstr "MegjelenМtИs szМnei"
+
+#, fuzzy
+#~ msgid "View messages from \"%s\""
+#~ msgstr "LevИl meg_tekintИse"
+
+#, fuzzy
+#~ msgid "Saving messages from folder \"%s\""
+#~ msgstr "LevИl mozgatАsa mАs mappАba"
+
+#, fuzzy
+#~ msgid "Save messages from folder \"%s\""
+#~ msgstr "LevИl mozgatАsa mАs mappАba"
+
+#, fuzzy
+#~ msgid "N_ew Directory Server"
+#~ msgstr "HМrcsoport-szerverek"
+
+#, fuzzy
+#~ msgid "_Actions"
+#~ msgstr "_MШveletek"
+
+#, fuzzy
+#~ msgid "_Save Calendar As"
+#~ msgstr "NaptАr mentИse"
 
 #~ msgid "window2"
 #~ msgstr "2.ablak"
@@ -6821,9 +7523,6 @@ msgstr "CsoportosМtАs %i"
 #~ msgid "Due Date:"
 #~ msgstr "LejАrat:"
 
-#~ msgid "Priority:"
-#~ msgstr "PrioritАs:"
-
 #~ msgid "Item Comments:"
 #~ msgstr "MegjegyzИsek:"
 
@@ -6919,9 +7618,6 @@ msgstr "CsoportosМtАs %i"
 #~ msgid "Could not load or create summary"
 #~ msgstr "Nem tudom a dialСgust elkИszМteni."
 
-#~ msgid "Deleted"
-#~ msgstr "TЖrЖlt"
-
 #~ msgid "does not match regex"
 #~ msgstr "nem egyezik a regex-el:"
 
@@ -6929,10 +7625,6 @@ msgstr "CsoportosМtАs %i"
 #~ msgstr "megegyezik a regex-el:"
 
 #, fuzzy
-#~ msgid "Cannot initialize Evolution's mail summary component."
-#~ msgstr "Nem tudom az EvolЗciС levelezУ komponensИt elindМtani."
-
-#, fuzzy
 #~ msgid "Cannot initialize Evolution's mail storage hash."
 #~ msgstr "Nem tudom az EvolЗciС levelezУ komponensИt elindМtani."
 
@@ -6951,12 +7643,6 @@ msgstr "CsoportosМtАs %i"
 #~ msgid "Couldn't create pipe to %s: %s"
 #~ msgstr "Nem tudok GPG/PGP programot pipe-olni: %s"
 
-#~ msgid "Mailbox summary"
-#~ msgstr " ЖsszegzИs"
-
-#~ msgid "Threading message list"
-#~ msgstr "LevИl lista rendezИse tИma szerint"
-
 #~ msgid "FIXME: Meeting Re_quest"
 #~ msgstr "FIXME: TalАlkozС _felhМvАs"
 
diff --git a/po/it.po b/po/it.po
index d02e3abb97..532f3386e6 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution 0.5\n"
-"POT-Creation-Date: 2000-12-18 03:25+0100\n"
+"POT-Creation-Date: 2001-01-06 00:11+0100\n"
 "PO-Revision-Date: 2000-12-16 18:21-01:00\n"
 "Last-Translator: Clara Tattoni <clara.tattoni@libero.it>\n"
 "Language-Team: Italiano <it@li.org>\n"
@@ -302,10 +302,10 @@ msgstr ""
 #: addressbook/backend/ebook/load-pine-addressbook.c:17
 #: addressbook/backend/ebook/test-client-list.c:18
 #: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:991
+#: addressbook/conduit/address-conduit.c:1083
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1136
-#: calendar/conduits/todo/todo-conduit.c:945 calendar/gui/main.c:54
+#: calendar/conduits/calendar/calendar-conduit.c:1151
+#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "Impossibile inizializzare Bonobo"
 
@@ -430,53 +430,36 @@ msgstr ""
 "la lista del Pilot dal \n"
 "demone gnome-pilot. "
 
-#: addressbook/conduit/address-conduit.c:197
+#: addressbook/conduit/address-conduit.c:195
 msgid "Cursor could not be loaded\n"
 msgstr "Il cursore non puР essere caricato\n"
 
-#: addressbook/conduit/address-conduit.c:210
+#: addressbook/conduit/address-conduit.c:208
 msgid "EBook not loaded\n"
 msgstr "EBook non caricato\n"
 
-#: addressbook/conduit/address-conduit.c:583
-#: calendar/conduits/calendar/calendar-conduit.c:715
-#: calendar/conduits/todo/todo-conduit.c:523
+#: addressbook/conduit/address-conduit.c:646
+#: calendar/conduits/calendar/calendar-conduit.c:730
+#: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat server"
 msgstr "Impossibile avviare il server wombat"
 
-#: addressbook/conduit/address-conduit.c:584
-#: calendar/conduits/calendar/calendar-conduit.c:716
-#: calendar/conduits/todo/todo-conduit.c:524
+#: addressbook/conduit/address-conduit.c:647
+#: calendar/conduits/calendar/calendar-conduit.c:731
+#: calendar/conduits/todo/todo-conduit.c:546
 msgid "Could not start wombat"
 msgstr "Impossibile avviare wombat"
 
-#: addressbook/conduit/address-conduit.c:616
-#: addressbook/conduit/address-conduit.c:619
+#: addressbook/conduit/address-conduit.c:679
+#: addressbook/conduit/address-conduit.c:682
 msgid "Could not read pilot's Address application block"
 msgstr "Impossibile leggere il blocco Indirizzi del Pilot"
 
 #.
-#. * 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 "categorie"
-
-#: addressbook/contact-editor/categories-strings.h:8
-msgid "Item(s) belong to these categories:"
-msgstr "Oggetto(i) appartenente a queste categorie:"
-
-#: addressbook/contact-editor/categories-strings.h:9
-msgid "Available Categories:"
-msgstr "Categorie disponibili:"
-
-#.
-#. * 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 "Cancellare il Contatto?"
 
@@ -490,7 +473,7 @@ msgid "_Add"
 msgstr "_Aggiungi"
 
 #: 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 "_Elimina"
 
@@ -504,12 +487,13 @@ msgid "New phone type"
 msgstr "Nuovo tipo di telefono"
 
 #.
-#. * 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 "Aggiungi"
 
@@ -550,7 +534,7 @@ msgid "_Mobile"
 msgstr "C_ellulare"
 
 #: 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 "Email principale"
 
@@ -567,7 +551,7 @@ msgid "C_ontacts..."
 msgstr "C_ontatti..."
 
 #: 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 "Ca_tegorie..."
 
@@ -584,7 +568,8 @@ msgid "_Address..."
 msgstr "_Indirizzo..."
 
 #: 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 "Generale"
 
@@ -629,143 +614,143 @@ msgid "No_tes:"
 msgstr "No_te:"
 
 #: 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 "Dettagli"
 
-#: addressbook/contact-editor/e-contact-editor.c:1266
+#: addressbook/contact-editor/e-contact-editor.c:1274
 msgid "Assistant"
 msgstr "P_artecipante"
 
-#: 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 "Ufficio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1268
+#: addressbook/contact-editor/e-contact-editor.c:1276
 msgid "Business 2"
 msgstr "Ufficio2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1269
+#: addressbook/contact-editor/e-contact-editor.c:1277
 msgid "Business Fax"
 msgstr "Fax Ufficio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1270
+#: addressbook/contact-editor/e-contact-editor.c:1278
 msgid "Callback"
 msgstr "Richiamare"
 
-#: addressbook/contact-editor/e-contact-editor.c:1271
+#: addressbook/contact-editor/e-contact-editor.c:1279
 msgid "Car"
 msgstr "Auto"
 
-#: addressbook/contact-editor/e-contact-editor.c:1272
+#: addressbook/contact-editor/e-contact-editor.c:1280
 msgid "Company"
 msgstr "Ditta"
 
-#: 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 "Casa"
 
-#: addressbook/contact-editor/e-contact-editor.c:1274
+#: addressbook/contact-editor/e-contact-editor.c:1282
 msgid "Home 2"
 msgstr "Casa 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1275
+#: addressbook/contact-editor/e-contact-editor.c:1283
 msgid "Home Fax"
 msgstr "Fax Casa"
 
-#: 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 "Cellulare"
 
-#: 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 "Altro"
 
-#: addressbook/contact-editor/e-contact-editor.c:1279
+#: addressbook/contact-editor/e-contact-editor.c:1287
 msgid "Other Fax"
 msgstr "Altro fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1280
+#: addressbook/contact-editor/e-contact-editor.c:1288
 msgid "Pager"
 msgstr "Impaginatore"
 
-#: addressbook/contact-editor/e-contact-editor.c:1281
+#: addressbook/contact-editor/e-contact-editor.c:1289
 msgid "Primary"
 msgstr "Principale"
 
-#: addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/contact-editor/e-contact-editor.c:1290
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/contact-editor/e-contact-editor.c:1291
 msgid "Telex"
 msgstr "Telex"
 
-#: 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 "Email 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1330
+#: addressbook/contact-editor/e-contact-editor.c:1338
 msgid "Email 3"
 msgstr "Email 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 "Indirizzo _2:"
 
-#: po/tmp/fulladdr.glade.h:7
+#: addressbook/contact-editor/fulladdr.glade.h:7
 msgid "Canada"
 msgstr "Canada"
 
-#: po/tmp/fulladdr.glade.h:8
+#: addressbook/contact-editor/fulladdr.glade.h:8
 msgid "Check Address"
 msgstr "Controlla Indirizzo"
 
-#: po/tmp/fulladdr.glade.h:9
+#: addressbook/contact-editor/fulladdr.glade.h:9
 msgid "Countr_y:"
 msgstr "_Stato:"
 
-#: po/tmp/fulladdr.glade.h:10
+#: addressbook/contact-editor/fulladdr.glade.h:10
 msgid "Finland"
 msgstr "Finlandia"
 
-#: po/tmp/fulladdr.glade.h:11
+#: addressbook/contact-editor/fulladdr.glade.h:11
 msgid "USA"
 msgstr "USA"
 
-#: po/tmp/fulladdr.glade.h:12
+#: addressbook/contact-editor/fulladdr.glade.h:12
 msgid "_Address:"
 msgstr "_Indirizzo:"
 
-#: po/tmp/fulladdr.glade.h:13
+#: addressbook/contact-editor/fulladdr.glade.h:13
 msgid "_City:"
 msgstr "_CittЮ:"
 
-#: po/tmp/fulladdr.glade.h:14
+#: addressbook/contact-editor/fulladdr.glade.h:14
 msgid "_PO Box:"
 msgstr "_Casella Postale:"
 
-#: po/tmp/fulladdr.glade.h:15
+#: addressbook/contact-editor/fulladdr.glade.h:15
 msgid "_State/Province:"
 msgstr "_Stato/Provincia:"
 
-#: po/tmp/fulladdr.glade.h:16
+#: addressbook/contact-editor/fulladdr.glade.h:16
 msgid "_ZIP Code:"
 msgstr "_ZIP/CAP:"
 
@@ -779,10 +764,13 @@ msgid "Check Full Name"
 msgstr "Verifiare Nome e Cognome"
 
 #: addressbook/contact-editor/fullname-strings.h:8
+#, fuzzy
 msgid ""
 "\n"
 "Mr.\n"
 "Mrs.\n"
+"Ms.\n"
+"Miss\n"
 "Dr.\n"
 msgstr ""
 "\n"
@@ -790,7 +778,7 @@ msgstr ""
 "Sig.ra\n"
 "Dott.\n"
 
-#: addressbook/contact-editor/fullname-strings.h:13
+#: addressbook/contact-editor/fullname-strings.h:15
 msgid ""
 "\n"
 "Sr.\n"
@@ -807,44 +795,49 @@ msgstr ""
 "II\n"
 "III\n"
 
-#: addressbook/contact-editor/fullname-strings.h:21
+#: addressbook/contact-editor/fullname-strings.h:23
 msgid "_First:"
 msgstr "_Nome:"
 
-#: addressbook/contact-editor/fullname-strings.h:22
+#: addressbook/contact-editor/fullname-strings.h:24
 msgid "_Title:"
 msgstr "_Titolo:"
 
-#: addressbook/contact-editor/fullname-strings.h:23
+#: addressbook/contact-editor/fullname-strings.h:25
 msgid "_Middle:"
 msgstr "_Secondo nome:"
 
-#: addressbook/contact-editor/fullname-strings.h:24
+#: addressbook/contact-editor/fullname-strings.h:26
 msgid "_Last:"
 msgstr "_Cognome:"
 
-#: addressbook/contact-editor/fullname-strings.h:25
+#: addressbook/contact-editor/fullname-strings.h:27
 msgid "_Suffix:"
 msgstr "S_uffisso:"
 
-#: addressbook/gui/component/addressbook.c:263
+#: addressbook/gui/component/addressbook.c:231
 msgid "As _Minicards"
 msgstr "Come _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:269
-#: po/tmp/evolution-addressbook.xml.h:6
+#: addressbook/gui/component/addressbook.c:237
+#: ui/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr "Come _Tabella"
 
-#: addressbook/gui/component/addressbook.c:386
+#: addressbook/gui/component/addressbook.c:374
+#, fuzzy, c-format
+msgid "Enter password for %s"
+msgstr "Inserire la passwoed NNTP di %s@%s"
+
+#: addressbook/gui/component/addressbook.c:402
 msgid "Unable to open addressbook"
 msgstr "Impossibile aprire la rubruca"
 
-#: addressbook/gui/component/addressbook.c:391
+#: 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"
@@ -864,77 +857,207 @@ msgstr ""
 "Se si desidera usare LDAP, Х necessario scaricare e \n"
 "installare OpenLDAP, ricompilare e reinstallare Evolution.\n"
 
-#: addressbook/gui/component/addressbook.c:501 mail/folder-browser.c:136
+#: addressbook/gui/component/addressbook.c:528 mail/folder-browser.c:219
 msgid "Show All"
 msgstr "Mostra Tutto"
 
-#: addressbook/gui/component/addressbook.c:503 mail/folder-browser.c:138
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 msgid "Advanced..."
 msgstr "Avanzato..."
 
-#: addressbook/gui/component/addressbook.c:533
+#: addressbook/gui/component/addressbook.c:560
 msgid "Any field contains"
 msgstr "Qualunque campo contiene"
 
-#: addressbook/gui/component/addressbook.c:534
+#: addressbook/gui/component/addressbook.c:561
 msgid "Name contains"
 msgstr "Il nome contiene"
 
-#: addressbook/gui/component/addressbook.c:535
+#: addressbook/gui/component/addressbook.c:562
 msgid "Email contains"
 msgstr "Email contiene"
 
-#: addressbook/gui/component/addressbook.c:621
+#: addressbook/gui/component/addressbook.c:648
 msgid "The URI that the Folder Browser will display"
 msgstr "La URI visualizzata dal Browser delle cartelle"
 
-#: addressbook/gui/component/e-ldap-storage.c:88
-msgid "External Directories"
-msgstr "Directory Esterne"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/e-msg-composer-attachment.glade.h:7
-#: po/tmp/ldap-server-dialog.glade.h:6
-msgid "Description:"
-msgstr "Descrizione:"
+#: addressbook/gui/component/addressbook-storage.c:95
+#, fuzzy
+msgid "Other Contacts"
+msgstr "Cancellare il Contatto?"
 
-#: po/tmp/ldap-server-dialog.glade.h:7
-msgid "LDAP Server:"
+#: addressbook/gui/component/addressbook-config.c:139
+#, fuzzy
+msgid "LDAP Server"
 msgstr "LDAP Server:"
 
-#: po/tmp/ldap-server-dialog.glade.h:8
-msgid "Name:"
-msgstr "Nome:"
+#: addressbook/gui/component/addressbook-config.c:141
+#, fuzzy
+msgid "File"
+msgstr "_File"
 
-#: po/tmp/ldap-server-dialog.glade.h:9
-msgid "Port Number:"
-msgstr "Porta Numero:"
+#: addressbook/gui/component/addressbook-config.c:144
+#, fuzzy
+msgid "Unknown addressbook type"
+msgstr "Impossibile aprire la rubruca"
 
-#: po/tmp/ldap-server-dialog.glade.h:10
+#: 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 "Password"
+
+#: addressbook/gui/component/addressbook-config.c:157
+msgid "SASL"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:160
+#, fuzzy
+msgid "Unknown auth type"
+msgstr "Errore sconosciuto"
+
+#: addressbook/gui/component/addressbook-config.c:169
+#, fuzzy
+msgid "Base"
+msgstr "Incolla"
+
+#: addressbook/gui/component/addressbook-config.c:171
+msgid "One"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:173
+#, fuzzy
+msgid "Subtree"
+msgstr "Iscrizione"
+
+#: 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 "Ricorda questa password"
+
+#: addressbook/gui/component/addressbook-config.c:360
+#: mail/mail-config-druid.glade.h:34
+#, fuzzy
+msgid "Host:"
+msgstr "Ore"
+
+#: addressbook/gui/component/addressbook-config.c:361
+#, fuzzy
+msgid "Port:"
+msgstr "_PrioritЮ:"
+
+#: addressbook/gui/component/addressbook-config.c:364
 msgid "Root DN:"
 msgstr "Root DN:"
 
+#: addressbook/gui/component/addressbook-config.c:384
+#, fuzzy
+msgid "Search Scope:"
+msgstr "Cerca"
+
+#: addressbook/gui/component/addressbook-config.c:438
+#: mail/mail-config-druid.glade.h:14 mail/mail-config-gui.c:943
+msgid "Authentication:"
+msgstr "Autenticazione:"
+
+#: addressbook/gui/component/addressbook-config.c:455
+#: mail/mail-config-druid.glade.h:52 mail/mail-config-gui.c:934
+msgid "Path:"
+msgstr "Percorso:"
+
+#: addressbook/gui/component/addressbook-config.c:460
+#, fuzzy
+msgid "Create path if it doesn't exist."
+msgstr "Il file noon esiste."
+
+#: addressbook/gui/component/addressbook-config.c:593
+#, fuzzy
+msgid "Edit Addressbook"
+msgstr "Salva nella rubrica"
+
+#: addressbook/gui/component/addressbook-config.c:595
+#, fuzzy
+msgid "Add Addressbook"
+msgstr "Salva nella rubrica"
+
+#: 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
+msgid "Name:"
+msgstr "Nome:"
+
+#: addressbook/gui/component/addressbook-config.c:617
+#: composer/e-msg-composer-attachment.glade.h:7
+msgid "Description:"
+msgstr "Descrizione:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:7
+#, fuzzy
+msgid "Addressbook Sources"
+msgstr "Aggiungi Sorgente"
+
+#: 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 "Elimina"
+
+#: 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 "Modifica"
+
+#: addressbook/gui/component/addressbook-config.glade.h:10
+#, fuzzy
+msgid "Name"
+msgstr "Nome:"
+
+#: 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 "Trova..."
 
-#: po/tmp/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "Message Recipients"
 msgstr "Destinatari del messaggio:"
 
-#: po/tmp/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "Select Names"
 msgstr "Seleziona Nomi"
 
-#: 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 "Seleziona un nome dalla Lista:"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:147
@@ -943,119 +1066,119 @@ msgid "Search"
 msgstr "Cerca"
 
 #.
-#. * 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 "a"
 
-#: po/tmp/alphabet.glade.h:8
+#: addressbook/gui/widgets/alphabet.glade.h:8
 msgid "b"
 msgstr "b"
 
-#: po/tmp/alphabet.glade.h:9
+#: addressbook/gui/widgets/alphabet.glade.h:9
 msgid "c"
 msgstr "c"
 
-#: po/tmp/alphabet.glade.h:10
+#: addressbook/gui/widgets/alphabet.glade.h:10
 msgid "d"
 msgstr "d"
 
-#: po/tmp/alphabet.glade.h:11
+#: addressbook/gui/widgets/alphabet.glade.h:11
 msgid "e"
 msgstr "e"
 
-#: po/tmp/alphabet.glade.h:12
+#: addressbook/gui/widgets/alphabet.glade.h:12
 msgid "f"
 msgstr "f"
 
-#: po/tmp/alphabet.glade.h:13
+#: addressbook/gui/widgets/alphabet.glade.h:13
 msgid "g"
 msgstr "g"
 
-#: calendar/cal-util/timeutil.c:66 po/tmp/alphabet.glade.h:14
+#: addressbook/gui/widgets/alphabet.glade.h:14
 msgid "h"
 msgstr "h"
 
-#: po/tmp/alphabet.glade.h:15
+#: addressbook/gui/widgets/alphabet.glade.h:15
 msgid "i"
 msgstr "i"
 
-#: po/tmp/alphabet.glade.h:16
+#: addressbook/gui/widgets/alphabet.glade.h:16
 msgid "j"
 msgstr "j"
 
-#: po/tmp/alphabet.glade.h:17
+#: addressbook/gui/widgets/alphabet.glade.h:17
 msgid "k"
 msgstr "k"
 
-#: po/tmp/alphabet.glade.h:18
+#: addressbook/gui/widgets/alphabet.glade.h:18
 msgid "l"
 msgstr "l"
 
-#: po/tmp/alphabet.glade.h:19
+#: addressbook/gui/widgets/alphabet.glade.h:19
 msgid "m"
 msgstr "m"
 
-#: po/tmp/alphabet.glade.h:20
+#: addressbook/gui/widgets/alphabet.glade.h:20
 msgid "n"
 msgstr "n"
 
-#: po/tmp/alphabet.glade.h:21
+#: addressbook/gui/widgets/alphabet.glade.h:21
 msgid "o"
 msgstr "o"
 
-#: po/tmp/alphabet.glade.h:22
+#: addressbook/gui/widgets/alphabet.glade.h:22
 msgid "p"
 msgstr "p"
 
-#: po/tmp/alphabet.glade.h:23
+#: addressbook/gui/widgets/alphabet.glade.h:23
 msgid "q"
 msgstr "q"
 
-#: po/tmp/alphabet.glade.h:24
+#: addressbook/gui/widgets/alphabet.glade.h:24
 msgid "r"
 msgstr "r"
 
-#: po/tmp/alphabet.glade.h:25
+#: addressbook/gui/widgets/alphabet.glade.h:25
 msgid "s"
 msgstr "s"
 
-#: po/tmp/alphabet.glade.h:26
+#: addressbook/gui/widgets/alphabet.glade.h:26
 msgid "t"
 msgstr "t"
 
-#: po/tmp/alphabet.glade.h:27
+#: addressbook/gui/widgets/alphabet.glade.h:27
 msgid "u"
 msgstr "u"
 
-#: po/tmp/alphabet.glade.h:28
+#: addressbook/gui/widgets/alphabet.glade.h:28
 msgid "v"
 msgstr "v"
 
-#: po/tmp/alphabet.glade.h:29
+#: addressbook/gui/widgets/alphabet.glade.h:29
 msgid "w"
 msgstr "w"
 
-#: po/tmp/alphabet.glade.h:30
+#: addressbook/gui/widgets/alphabet.glade.h:30
 msgid "x"
 msgstr "x"
 
-#: po/tmp/alphabet.glade.h:31
+#: addressbook/gui/widgets/alphabet.glade.h:31
 msgid "y"
 msgstr "y"
 
-#: po/tmp/alphabet.glade.h:32
+#: addressbook/gui/widgets/alphabet.glade.h:32
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:417
-#: addressbook/gui/widgets/e-minicard.c:338
+#: addressbook/gui/widgets/e-addressbook-view.c:451
+#: addressbook/gui/widgets/e-minicard.c:374
 msgid "Save as VCard"
 msgstr "Salva come VCard"
 
@@ -1078,189 +1201,178 @@ msgstr ""
 "Fare doppio click qui per creare un nuovo contatto."
 
 #.
-#. * 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 "10 pt. Tahoma"
 
-#: po/tmp/e-contact-print.glade.h:7
+#: addressbook/printing/e-contact-print.glade.h:7
 msgid "8 pt. Tahoma"
 msgstr "8 pt. Tahoma"
 
-#: po/tmp/e-contact-print.glade.h:8
+#: addressbook/printing/e-contact-print.glade.h:8
 msgid "Blank forms at end:"
 msgstr "Moduli bianchi alla fine:"
 
-#: po/tmp/e-contact-print.glade.h:9
+#: addressbook/printing/e-contact-print.glade.h:9
 msgid "Body"
 msgstr "Corpo"
 
-#: po/tmp/e-contact-print.glade.h:10
+#: addressbook/printing/e-contact-print.glade.h:10
 msgid "Bottom:"
 msgstr "Inferiore:"
 
-#: po/tmp/e-contact-print.glade.h:11
+#: addressbook/printing/e-contact-print.glade.h:11
 msgid "Dimensions:"
 msgstr "Dimensioni:"
 
-#: po/tmp/e-contact-print.glade.h:12
+#: addressbook/printing/e-contact-print.glade.h:12
 msgid "Font..."
 msgstr "Carattere..."
 
-#: po/tmp/e-contact-print.glade.h:13
+#: addressbook/printing/e-contact-print.glade.h:13
 msgid "Fonts"
 msgstr "Caratteri"
 
-#: po/tmp/e-contact-print.glade.h:14
+#: addressbook/printing/e-contact-print.glade.h:14
 msgid "Footer:"
 msgstr "Note a piХ di pagina:"
 
-#: po/tmp/e-contact-print.glade.h:15
+#: addressbook/printing/e-contact-print.glade.h:15
 msgid "Format"
 msgstr "Formato"
 
-#: po/tmp/e-contact-print.glade.h:16
+#: addressbook/printing/e-contact-print.glade.h:16
 msgid "Header"
 msgstr "Intestazione"
 
-#: po/tmp/e-contact-print.glade.h:17
+#: addressbook/printing/e-contact-print.glade.h:17
 msgid "Header/Footer"
 msgstr "Intestazione/Note a piХ di pagina"
 
-#: po/tmp/e-contact-print.glade.h:18
+#: addressbook/printing/e-contact-print.glade.h:18
 msgid "Headings"
 msgstr "Titoli"
 
-#: po/tmp/e-contact-print.glade.h:19
+#: addressbook/printing/e-contact-print.glade.h:19
 msgid "Headings for each letter"
 msgstr "Titolo per ogni lettera"
 
-#: po/tmp/e-contact-print.glade.h:20
+#: addressbook/printing/e-contact-print.glade.h:20
 msgid "Height:"
 msgstr "Altezza:"
 
-#: po/tmp/e-contact-print.glade.h:21
+#: addressbook/printing/e-contact-print.glade.h:21
 msgid "Immediately follow each other"
 msgstr "Concatenati l'un l'altro"
 
-#: po/tmp/e-contact-print.glade.h:22
+#: addressbook/printing/e-contact-print.glade.h:22
 msgid "Include:"
 msgstr "Includi:"
 
-#: po/tmp/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23
 msgid "Landscape"
 msgstr "Orizzontale"
 
-#: po/tmp/e-contact-print.glade.h:24
+#: addressbook/printing/e-contact-print.glade.h:24
 msgid "Left:"
 msgstr "Sinistra:"
 
-#: po/tmp/e-contact-print.glade.h:25
+#: addressbook/printing/e-contact-print.glade.h:25
 msgid "Letter tabs on side"
 msgstr "Lettere sul bordo"
 
-#: po/tmp/e-contact-print.glade.h:26
+#: addressbook/printing/e-contact-print.glade.h:26
 msgid "Margins"
 msgstr "Margini"
 
-#: po/tmp/e-contact-print.glade.h:27
+#: addressbook/printing/e-contact-print.glade.h:27
 msgid "Number of columns:"
 msgstr "Numero di colonne:"
 
-#: po/tmp/e-contact-print.glade.h:28
+#: addressbook/printing/e-contact-print.glade.h:28
 msgid "Options"
 msgstr "Opzioni"
 
-#: po/tmp/e-contact-print.glade.h:29
+#: addressbook/printing/e-contact-print.glade.h:29
 msgid "Orientation"
 msgstr "Orientazione"
 
-#: po/tmp/e-contact-print.glade.h:30
+#: addressbook/printing/e-contact-print.glade.h:30
 msgid "Page"
 msgstr "Pagina"
 
-#: po/tmp/e-contact-print.glade.h:31
+#: addressbook/printing/e-contact-print.glade.h:31
 msgid "Page Setup:"
 msgstr "Impostazione pagina:"
 
-#: po/tmp/e-contact-print.glade.h:32
+#: addressbook/printing/e-contact-print.glade.h:32
 msgid "Paper"
 msgstr "Carta"
 
-#: po/tmp/e-contact-print.glade.h:33
+#: addressbook/printing/e-contact-print.glade.h:33
 msgid "Paper source:"
 msgstr "Alimentazione della carta:"
 
-#: po/tmp/e-contact-print.glade.h:34
+#: addressbook/printing/e-contact-print.glade.h:34
 msgid "Portrait"
 msgstr "Verticale"
 
-#: po/tmp/e-contact-print.glade.h:35
+#: addressbook/printing/e-contact-print.glade.h:35
 msgid "Preview:"
 msgstr "Anteprima:"
 
-#: po/tmp/e-contact-print.glade.h:36
+#: addressbook/printing/e-contact-print.glade.h:36
 msgid "Print using gray shading"
 msgstr "Stampa usando ombreggiatura grigia"
 
-#: po/tmp/e-contact-print.glade.h:37
+#: addressbook/printing/e-contact-print.glade.h:37
 msgid "Reverse on even pages"
 msgstr "Inverti le pagine pari"
 
-#: po/tmp/e-contact-print.glade.h:38
+#: addressbook/printing/e-contact-print.glade.h:38
 msgid "Right:"
 msgstr "Destra:"
 
-#: po/tmp/e-contact-print.glade.h:39
+#: addressbook/printing/e-contact-print.glade.h:39
 msgid "Sections:"
 msgstr "Sezioni:"
 
-#: po/tmp/e-contact-print.glade.h:40
+#: addressbook/printing/e-contact-print.glade.h:40
 msgid "Shading"
 msgstr "Ombreggiatura"
 
-#: po/tmp/e-contact-print.glade.h:41
+#: addressbook/printing/e-contact-print.glade.h:41
 msgid "Size:"
 msgstr "Dimensione:"
 
-#: po/tmp/e-contact-print.glade.h:42
+#: addressbook/printing/e-contact-print.glade.h:42
 msgid "Start on a new page"
 msgstr "Inizia su una nuova pagina"
 
-#: po/tmp/e-contact-print.glade.h:43
+#: addressbook/printing/e-contact-print.glade.h:43
 msgid "Style name:"
 msgstr "Nome dello stile:"
 
-#: po/tmp/e-contact-print.glade.h:44
+#: addressbook/printing/e-contact-print.glade.h:44
 msgid "Top:"
 msgstr "Superiore:"
 
-#: 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 "Tipo:"
 
-#: po/tmp/e-contact-print.glade.h:46
+#: addressbook/printing/e-contact-print.glade.h:46
 msgid "Width:"
 msgstr "Larghezza:"
 
-#: po/tmp/e-contact-print.glade.h:47
+#: addressbook/printing/e-contact-print.glade.h:47
 msgid "label26"
 msgstr "label26"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/cal-util/timeutil.c:64 calendar/gui/e-day-view.c:551
-#: calendar/gui/e-week-view.c:288 calendar/gui/print.c:605
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/cal-util/timeutil.c:64 calendar/gui/e-day-view.c:554
-#: calendar/gui/e-week-view.c:291 calendar/gui/print.c:604
-msgid "pm"
-msgstr "pm"
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 msgid "Evolution Calendar Conduit"
 msgstr "Conduit per il Calendario di Evolution"
@@ -1270,13 +1382,13 @@ msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr ""
 "UtilitЮ di configurazione per il conduit del calendario di Evolution.\n"
 
-#: calendar/conduits/calendar/calendar-conduit.c:671
-#: calendar/conduits/todo/todo-conduit.c:479
+#: calendar/conduits/calendar/calendar-conduit.c:686
+#: calendar/conduits/todo/todo-conduit.c:501
 msgid "Error while communicating with calendar server"
 msgstr "Errore durante la comunicazione con il server del calendario"
 
-#: calendar/conduits/calendar/calendar-conduit.c:770
-#: calendar/conduits/calendar/calendar-conduit.c:773
+#: calendar/conduits/calendar/calendar-conduit.c:785
+#: calendar/conduits/calendar/calendar-conduit.c:788
 msgid "Could not read pilot's Calendar application block"
 msgstr "Impossibile leggere il blocco di applicazione del Calendario"
 
@@ -1288,123 +1400,162 @@ msgstr "Evolution ToDo Conduit"
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr "UtilitЮ di configurazione per il conduit di Evolution.\n"
 
-#: calendar/conduits/todo/todo-conduit.c:578
-#: calendar/conduits/todo/todo-conduit.c:581
+#: calendar/conduits/todo/todo-conduit.c:600
+#: calendar/conduits/todo/todo-conduit.c:603
 msgid "Could not read pilot's ToDo application block"
 msgstr "Impossibile leggere il blocco delle applicazioni da fare del Pilot "
 
-#: calendar/gui/calendar-commands.c:60
-msgid "Outline:"
-msgstr "Linea:"
+#.
+#. * 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 "Titoli:"
+#: 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:"
-msgstr "Giorni liberi:"
+#.
+#. * 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 "Appuntamenti:"
+#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:7
+#, fuzzy
+msgid "Calendar Server"
+msgstr "Calendario"
 
-#: calendar/gui/calendar-commands.c:64
-msgid "Highlighted day:"
-msgstr "Giorno evidenziato:"
+#.
+#. * 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 "Data:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Conduit per il Calendario di Evolution"
 
-#: calendar/gui/calendar-commands.c:66
-msgid "Current day's number:"
-msgstr "Data odierna:"
+#: 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:"
-msgstr "Obiettivo non ancora raggiunto:"
+#: 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:"
-msgstr "Obiettivo da raggiungere oggi:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#, fuzzy
+msgid "Factory for the Evolution calendar component."
+msgstr ""
+"UtilitЮ di configurazione per il conduit del calendario di Evolution.\n"
 
-#: calendar/gui/calendar-commands.c:69
-msgid "To-Do item that is overdue:"
-msgstr "Obiettivo raggiunto:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+msgid "Factory for the calendar iTip view control"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:354
+#: 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 "Promemoria dell'appuntamento alle"
+
+#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:8
+msgid "Snooze"
+msgstr "Suoneria"
+
+#. 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 "Ok"
+
+#: calendar/gui/calendar-commands.c:229
 msgid "File not found"
 msgstr "File non trovato"
 
-#: calendar/gui/calendar-commands.c:378
+#: calendar/gui/calendar-commands.c:253
 msgid "Open calendar"
 msgstr "Apri calendario"
 
-#: calendar/gui/calendar-commands.c:417
+#: calendar/gui/calendar-commands.c:295
 msgid "Save calendar"
 msgstr "Salva calendario"
 
+#: 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:2498
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
 #. 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 "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time,
 #. in 12-hour format.
-#: calendar/gui/calendar-model.c: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 "%a %m/%d/%Y %I:%M:%S %p"
 
-#: 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 "Pubblico"
 
-#: 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 "Privato"
 
-#: 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 "Confidenziale"
 
-#: 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 "Sconosciuto"
 
-#: calendar/gui/calendar-model.c:442
+#: calendar/gui/calendar-model.c:443
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:442
+#: calendar/gui/calendar-model.c:443
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:444
+#: calendar/gui/calendar-model.c:445
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:444
+#: calendar/gui/calendar-model.c:445
 msgid "W"
 msgstr "O"
 
-#: calendar/gui/calendar-model.c:516
+#: calendar/gui/calendar-model.c:517
 msgid "Transparent"
 msgstr "Trasparente"
 
-#: calendar/gui/calendar-model.c:519
+#: calendar/gui/calendar-model.c:520
 msgid "Opaque"
 msgstr "Opaco"
 
-#: calendar/gui/calendar-model.c:745
+#: calendar/gui/calendar-model.c:746
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1416,7 +1567,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"
@@ -1424,27 +1575,27 @@ msgstr "%m/%d/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c: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"
@@ -1454,14 +1605,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 "Il valore percentuale deve essere compreso tra 0 e 100, inclusi"
 
-#: calendar/gui/calendar-model.c:1074
+#: calendar/gui/calendar-model.c:1075
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "La prioritЮ dev'essere compresa tra 1 e 9, inclusi"
 
+#: calendar/gui/calendar-summary.c:81
+#, fuzzy
+msgid "%A, %e %B %Y"
+msgstr "%A, %B %d, %Y"
+
+#: calendar/gui/calendar-summary.c:224
+#, fuzzy
+msgid "<b>Error loading calendar</b>"
+msgstr "Errore nel caricare il file: %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 "Stampa Calendario"
+
 #: calendar/gui/control-factory.c:125
 msgid "The URI that the calendar will display"
 msgstr "La URI che il calendario visualizzerЮ"
@@ -1479,373 +1653,390 @@ msgid "No summary available."
 msgstr "Indice non disponibile."
 
 #.
-#. * 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 "Chiudi"
 
-#: po/tmp/alarm-notify.glade.h:7
+#: calendar/gui/dialogs/alarm-notify.glade.h:7
 msgid "Edit appointment"
 msgstr "Modifica appuntamenti"
 
-#: calendar/gui/gnome-cal.c:1466 po/tmp/alarm-notify.glade.h:8
-msgid "Snooze"
-msgstr "Suoneria"
-
-#: po/tmp/alarm-notify.glade.h:9
+#: calendar/gui/dialogs/alarm-notify.glade.h:9
 msgid "Snooze time (minutes)"
 msgstr "Suoneria (minuti)"
 
 #.
-#. * 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 minuti"
 
-#: po/tmp/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "10 minutes"
 msgstr "10 minuti"
 
-#: po/tmp/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "12 hour (am/pm)"
 msgstr "12 ore (am/pm)"
 
-#: po/tmp/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "15 minutes"
 msgstr "15 minuti"
 
-#: po/tmp/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "24 hour"
 msgstr "24 ore"
 
-#: po/tmp/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "30 minutes"
 msgstr "30 minuti"
 
-#: po/tmp/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "60 minutes"
 msgstr "60 minuti"
 
-#: po/tmp/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Alarms timeout after"
 msgstr "Interruzione avviso sonoro dopo"
 
-#: po/tmp/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Audio Alarms"
 msgstr "Avviso Sonoro"
 
-#: po/tmp/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Beep when alarm windows appear."
 msgstr "Emette un suono quondo appare la finestra di avviso"
 
-#: po/tmp/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Calendar"
 msgstr "Calendario"
 
-#: po/tmp/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Calendar Preferences"
 msgstr "Preferenze del Calendario"
 
-#: po/tmp/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Colors"
 msgstr "Colori"
 
-#: po/tmp/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Compress weekends"
 msgstr "Comprimi i fine settimana"
 
-#: po/tmp/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Date navigator options"
 msgstr "Opzioni del navigatore delle date"
 
-#: po/tmp/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Defaults"
 msgstr "Predefinito"
 
-#: po/tmp/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Display options"
 msgstr "Visualizza opzioni"
 
-#: po/tmp/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Due Date"
 msgstr "Scadenza"
 
-#: po/tmp/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "Enable snoozing for"
 msgstr "Attiva la suoneria per "
 
-#: po/tmp/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "End of day:"
 msgstr "Fine della giornata: "
 
-#: po/tmp/cal-prefs-dialog.glade.h:26
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "First day of week:"
 msgstr "Primo giorno della settimana:"
 
-#: 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 "Ven"
 
-#: 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 "VenerdЛ"
 
-#: po/tmp/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Highlight"
 msgstr "Evidenzia"
 
-#: po/tmp/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "Items Due Today"
 msgstr "Scadenze per oggi"
 
-#: po/tmp/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "Items Due Today:"
 msgstr "Scadenze per oggi:"
 
-#: 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 "Lun"
 
-#: 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 "LunedЛ"
 
-#: po/tmp/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "Overdue Items"
 msgstr "Compiti scaduti"
 
-#: 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 "Prendi un colore"
 
-#: 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 "PrioritЮ"
 
-#: po/tmp/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Remind me of all appointments"
 msgstr "Ricordami tutti gli appuntamenti"
 
-#: po/tmp/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Reminders"
 msgstr "Promemoria"
 
-#: 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 "Sab"
 
-#: 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 "Sabato"
 
-#: po/tmp/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Show"
 msgstr "Mostra"
 
-#: po/tmp/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "Show appointment end times"
 msgstr "Mostra i termini dell'appuntamento"
 
-#: po/tmp/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Show week numbers"
 msgstr "Mostra i numeri delle settimane"
 
-#: po/tmp/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "Start of day:"
 msgstr "Inizio della giornata:"
 
 #. 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 "Dom"
 
-#: 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 "Domenica"
 
-#: po/tmp/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "TaskPad"
 msgstr "TaskPad"
 
-#: 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 "Gio"
 
-#: 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 "GiovedЛ"
 
-#: po/tmp/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "Time Until Due"
 msgstr "Cronometra fino al termine"
 
-#: po/tmp/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "Time divisions:"
 msgstr "Suddivisione del tempo:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:55
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "Time format:"
 msgstr "Formato del tempo:"
 
-#: 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 "Mar"
 
-#: 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 "MartedЛ"
 
-#: po/tmp/cal-prefs-dialog.glade.h:58
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "Visual Alarms"
 msgstr "Avviso visivo"
 
-#: 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 "Mer"
 
-#: 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 "MercoledЛ"
 
-#: po/tmp/cal-prefs-dialog.glade.h:61
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "Work week"
 msgstr "Settimana lavorativa"
 
-#: po/tmp/cal-prefs-dialog.glade.h:62
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "minutes before they occur."
 msgstr "minuti prima che inizino."
 
-#: po/tmp/cal-prefs-dialog.glade.h:63
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "seconds."
 msgstr "secondi."
 
-#: calendar/gui/dialogs/delete-comp.c:57
-msgid "appointment"
-msgstr "appuntamento"
+#: calendar/gui/dialogs/delete-comp.c:62
+#, fuzzy, c-format
+msgid "Are you sure you want to delete the appointment `%s'?"
+msgstr "Sei sicuro di voler cancellare %s `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:61
+#: calendar/gui/dialogs/delete-comp.c:65
 #, fuzzy
-msgid "task"
-msgstr "Obiettivo"
+msgid "Are you sure you want to delete this untitled appointment?"
+msgstr "Sei sicuro di voler cancellare questo %s?"
 
-#: calendar/gui/dialogs/delete-comp.c:65
-msgid "journal entry"
-msgstr "voce nell'agenda"
+#: calendar/gui/dialogs/delete-comp.c:71
+#, fuzzy, c-format
+msgid "Are you sure you want to delete the task `%s'?"
+msgstr "Sei sicuro di voler cancellare %s `%s'?"
 
 #: calendar/gui/dialogs/delete-comp.c:74
-#, c-format
-msgid "Are you sure you want to delete the %s `%s'?"
+#, fuzzy
+msgid "Are you sure you want to delete this untitled task?"
+msgstr "Sei sicuro di voler cancellare questo %s?"
+
+#: calendar/gui/dialogs/delete-comp.c:80
+#, fuzzy, c-format
+msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Sei sicuro di voler cancellare %s `%s'?"
 
-#: calendar/gui/dialogs/delete-comp.c:77
-#, c-format
-msgid "Are you sure you want to delete this %s?"
+#: calendar/gui/dialogs/delete-comp.c:83
+#, fuzzy
+msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Sei sicuro di voler cancellare questo %s?"
 
 #.
-#. * 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 "% Comp_leta:"
 
-#: po/tmp/task-editor-dialog.glade.h:7
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
 msgid "C_lassification:"
 msgstr "C_lassificazione"
 
-#: po/tmp/task-editor-dialog.glade.h:9
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
 msgid "Cancelled"
 msgstr "Annullato"
 
-#: po/tmp/task-editor-dialog.glade.h:10
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
 msgid "Completed"
 msgstr "Completato"
 
-#: po/tmp/task-editor-dialog.glade.h:12
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
 msgid "Date Completed:"
 msgstr "Completato in data:"
 
-#: po/tmp/task-editor-dialog.glade.h:14
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
 msgid "High"
 msgstr "Altezza"
 
-#: po/tmp/task-editor-dialog.glade.h:15
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
 msgid "In Progress"
 msgstr "In corso"
 
-#: po/tmp/task-editor-dialog.glade.h:16
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
 msgid "Low"
 msgstr "Basso"
 
 #. 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 "Nessuno "
 
-#: po/tmp/task-editor-dialog.glade.h:18
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
 msgid "Normal"
 msgstr "Normale"
 
-#: po/tmp/task-editor-dialog.glade.h:19
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
 msgid "Not Started"
 msgstr "Da cominciare"
 
-#: po/tmp/task-editor-dialog.glade.h:22
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
 msgid "S_ummary"
 msgstr "_Riassunto"
 
-#: po/tmp/task-editor-dialog.glade.h:23
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
 msgid "Sta_rt Date:"
 msgstr "Data di _inizio:"
 
-#: po/tmp/task-editor-dialog.glade.h:24
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
 msgid "Task"
 msgstr "Obiettivo"
 
-#: 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 "_Contatti..."
 
-#: po/tmp/task-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
 msgid "_Due Date:"
 msgstr "Sca_denza:"
 
-#: po/tmp/task-editor-dialog.glade.h:28
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
 msgid "_Priority:"
 msgstr "_PrioritЮ:"
 
-#: po/tmp/task-editor-dialog.glade.h:29
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
 msgid "_Status:"
 msgstr "_Status:"
 
-#: po/tmp/task-editor-dialog.glade.h:30
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
 msgid "task-editor-dialog"
 msgstr "task-editor-dialog"
 
@@ -1853,26 +2044,26 @@ msgstr "task-editor-dialog"
 msgid "Edit Task"
 msgstr "Modifica Obiettivo"
 
-#: 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 "Niente indice"
 
-#: 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 "Appuntamento - %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 "Obiettivo - %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 "Voce nell'agenda - %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 "Salvare le modifiche?"
 
@@ -1892,14 +2083,6 @@ msgstr "Segna come Completato"
 msgid "Mark the task complete"
 msgstr "Segna l'obiettivo come raggiunto"
 
-#: calendar/gui/e-calendar-table.c:342 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:608 mail/mail-view.c:165
-#: 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 "Elimina"
-
 #: calendar/gui/e-calendar-table.c:343
 msgid "Delete the task"
 msgstr "Elimina questo obiettivo"
@@ -1911,50 +2094,62 @@ msgstr "%02i divisioni per minuto"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1209
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1211
 #: calendar/gui/e-week-view-main-item.c:325
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1223
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1225
 #: calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1236
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1238
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view.c:2944 calendar/gui/e-day-view.c:2951
-#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3167
-#: calendar/gui/e-week-view.c:3174 calendar/gui/e-week-view.c:3183
+#. 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:610
+msgid "am"
+msgstr "am"
+
+#. 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:609
+msgid "pm"
+msgstr "pm"
+
+#: calendar/gui/e-day-view.c:2948 calendar/gui/e-day-view.c:2955
+#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3169
+#: calendar/gui/e-week-view.c:3176 calendar/gui/e-week-view.c:3185
 msgid "New appointment..."
 msgstr "Nuovo appuntamento..."
 
-#: calendar/gui/e-day-view.c:2948 calendar/gui/e-day-view.c:2955
-#: calendar/gui/e-week-view.c:3171 calendar/gui/e-week-view.c:3178
+#: calendar/gui/e-day-view.c:2952 calendar/gui/e-day-view.c:2959
+#: calendar/gui/e-week-view.c:3173 calendar/gui/e-week-view.c:3180
 msgid "Edit this appointment..."
 msgstr "Modifica questo appuntamento..."
 
-#: calendar/gui/e-day-view.c:2949 calendar/gui/e-week-view.c:3172
-#: po/tmp/evolution-event-editor.xml.h:20
+#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3174
+#: ui/evolution-event-editor.xml.h:20
 msgid "Delete this appointment"
 msgstr "Elimina questo appuntamento"
 
-#: calendar/gui/e-day-view.c:2956 calendar/gui/e-week-view.c:3179
+#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3181
 msgid "Make this appointment movable"
 msgstr "Rendi rimandabile questo appuntamento"
 
-#: calendar/gui/e-day-view.c:2957 calendar/gui/e-week-view.c:3180
+#: calendar/gui/e-day-view.c:2961 calendar/gui/e-week-view.c:3182
 msgid "Delete this occurrence"
 msgstr "Elimina questa ricorrenza"
 
-#: calendar/gui/e-day-view.c:2958 calendar/gui/e-week-view.c:3181
+#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3183
 msgid "Delete all occurrences"
 msgstr "Elimina tutte le ricorrenze"
 
@@ -1966,437 +2161,482 @@ 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 "_Eventi della giornata"
 
-#: po/tmp/event-editor-dialog.glade.h:8
+#: calendar/gui/event-editor-dialog.glade.h:8
 msgid "Appointment Basics"
 msgstr "Appuntamenti di Base:"
 
-#: po/tmp/event-editor-dialog.glade.h:9
+#: calendar/gui/event-editor-dialog.glade.h:9
 msgid "Classification"
 msgstr "Classificazione"
 
-#: po/tmp/event-editor-dialog.glade.h:10
+#: calendar/gui/event-editor-dialog.glade.h:10
 msgid "Custom recurrence"
 msgstr "Ricorrenza personalizzata"
 
-#: po/tmp/event-editor-dialog.glade.h:11
+#: calendar/gui/event-editor-dialog.glade.h:11
 msgid "Days"
 msgstr "Giorni"
 
-#: po/tmp/event-editor-dialog.glade.h:13
+#: calendar/gui/event-editor-dialog.glade.h:13
 msgid "Every"
 msgstr "Ogni"
 
-#: po/tmp/event-editor-dialog.glade.h:14
+#: calendar/gui/event-editor-dialog.glade.h:14
 msgid "Exceptions"
 msgstr "Eccezioni"
 
-#: po/tmp/event-editor-dialog.glade.h:16
+#: calendar/gui/event-editor-dialog.glade.h:16
 msgid "Hours"
 msgstr "Ore"
 
-#: po/tmp/event-editor-dialog.glade.h:17
+#: calendar/gui/event-editor-dialog.glade.h:17
 msgid "Mail _to:"
 msgstr "_Scrivi a:"
 
-#: po/tmp/event-editor-dialog.glade.h:18
+#: calendar/gui/event-editor-dialog.glade.h:18
 msgid "Minutes"
 msgstr "Minuti"
 
-#: po/tmp/event-editor-dialog.glade.h:19
+#: calendar/gui/event-editor-dialog.glade.h:19
 msgid "Modify"
 msgstr "Modifica"
 
-#: po/tmp/event-editor-dialog.glade.h:20
+#: calendar/gui/event-editor-dialog.glade.h:20
 msgid "No recurrence"
 msgstr "Nessuna Ricorrenza"
 
-#: po/tmp/event-editor-dialog.glade.h:21
+#: calendar/gui/event-editor-dialog.glade.h:21
 msgid "Preview"
 msgstr "Anteprima"
 
-#: po/tmp/event-editor-dialog.glade.h:22
+#: calendar/gui/event-editor-dialog.glade.h:22
 msgid "Pri_vate"
 msgstr "Pri_vato"
 
-#: po/tmp/event-editor-dialog.glade.h:23
+#: calendar/gui/event-editor-dialog.glade.h:23
 msgid "Pu_blic"
 msgstr "Pub_blico"
 
-#: po/tmp/event-editor-dialog.glade.h:24
+#: calendar/gui/event-editor-dialog.glade.h:24
 msgid "Recurrence"
 msgstr "Ricorrenza"
 
-#: po/tmp/event-editor-dialog.glade.h:25
+#: calendar/gui/event-editor-dialog.glade.h:25
 msgid "Recurrence Rule"
 msgstr "Regole di ricorrenza"
 
-#: po/tmp/event-editor-dialog.glade.h:26
+#: calendar/gui/event-editor-dialog.glade.h:26
 msgid "Reminder"
 msgstr "Promemoria"
 
-#: po/tmp/event-editor-dialog.glade.h:27
+#: calendar/gui/event-editor-dialog.glade.h:27
 msgid "Simple recurrence"
 msgstr "Semplice ricorrenza"
 
-#: po/tmp/event-editor-dialog.glade.h:28
+#: calendar/gui/event-editor-dialog.glade.h:28
 msgid "Su_mmary:"
 msgstr "_Indice:"
 
-#: po/tmp/event-editor-dialog.glade.h:29
+#: calendar/gui/event-editor-dialog.glade.h:29
 msgid "Time"
 msgstr "Tempo"
 
-#: po/tmp/event-editor-dialog.glade.h:30
+#: calendar/gui/event-editor-dialog.glade.h:30
 msgid "_Audio"
 msgstr "_Audio"
 
-#: po/tmp/event-editor-dialog.glade.h:31
+#: calendar/gui/event-editor-dialog.glade.h:31
 msgid "_Confidential"
 msgstr "_Confidenziale"
 
-#: po/tmp/event-editor-dialog.glade.h:32
+#: calendar/gui/event-editor-dialog.glade.h:32
 msgid "_Display"
 msgstr "_Visualizza"
 
-#: po/tmp/event-editor-dialog.glade.h:33
+#: calendar/gui/event-editor-dialog.glade.h:33
 msgid "_End time:"
 msgstr "Ora di _fine:"
 
-#: po/tmp/event-editor-dialog.glade.h:34
+#: calendar/gui/event-editor-dialog.glade.h:34
 msgid "_Mail"
 msgstr "_Posta"
 
-#: po/tmp/event-editor-dialog.glade.h:35
+#: calendar/gui/event-editor-dialog.glade.h:35
 msgid "_Program"
 msgstr "_Programma"
 
-#: po/tmp/event-editor-dialog.glade.h:36
+#: calendar/gui/event-editor-dialog.glade.h:36
 msgid "_Run program:"
 msgstr "Esegui p_rogramma"
 
-#: po/tmp/event-editor-dialog.glade.h:37
+#: calendar/gui/event-editor-dialog.glade.h:37
 msgid "_Start time:"
 msgstr "_Ora di inizio:"
 
-#: po/tmp/event-editor-dialog.glade.h:38
+#: calendar/gui/event-editor-dialog.glade.h:38
 msgid "_Starting date:"
 msgstr "Data di _inizio:"
 
-#: po/tmp/event-editor-dialog.glade.h:39
+#: calendar/gui/event-editor-dialog.glade.h:39
 msgid "day(s)"
 msgstr "giorno(i)"
 
-#: 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 "per"
 
-#: po/tmp/event-editor-dialog.glade.h:42
+#: calendar/gui/event-editor-dialog.glade.h:42
 msgid "forever"
 msgstr "sempre"
 
-#: po/tmp/event-editor-dialog.glade.h:43
+#: calendar/gui/event-editor-dialog.glade.h:43
 msgid "label21"
 msgstr "label21"
 
-#: po/tmp/event-editor-dialog.glade.h:44
+#: calendar/gui/event-editor-dialog.glade.h:44
 msgid "month(s)"
 msgstr "mese(i)"
 
-#: po/tmp/event-editor-dialog.glade.h:45
+#: calendar/gui/event-editor-dialog.glade.h:45
 msgid "until"
 msgstr "fino a"
 
-#: po/tmp/event-editor-dialog.glade.h:46
+#: calendar/gui/event-editor-dialog.glade.h:46
 msgid "week(s)"
 msgstr "Settimana(e)"
 
-#: po/tmp/event-editor-dialog.glade.h:47
+#: calendar/gui/event-editor-dialog.glade.h:47
 msgid "year(s)"
 msgstr "anno(i)"
 
-#: calendar/gui/event-editor.c:329
+#: calendar/gui/event-editor.c:325
 msgid "Edit Appointment"
 msgstr "Modifica Appuntamenti"
 
-#: calendar/gui/event-editor.c:407
+#: calendar/gui/event-editor.c:403
 msgid "on"
 msgstr "il"
 
-#: 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 "giorno"
 
-#: calendar/gui/event-editor.c:559
+#: calendar/gui/event-editor.c:555
 msgid "on the"
 msgstr "il"
 
-#: 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
 msgid "occurrences"
 msgstr "ricorrenze"
 
-#: calendar/gui/event-editor.c:837
+#: calendar/gui/event-editor.c:833
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Questo appuntamento contiene ricorrenze che Evolution non puР modificare."
 
-#: 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 "%a %b %d %Y"
 
-#: calendar/gui/gnome-cal.c:718 calendar/gui/gnome-cal.c:1474
-#: calendar/gui/gnome-cal.c:1530
-msgid "Reminder of your appointment at "
-msgstr "Promemoria dell'appuntamento alle"
-
-#: calendar/gui/gnome-cal.c:1152
+#: calendar/gui/gnome-cal.c:676
 #, c-format
 msgid "Could not load the calendar in `%s'"
 msgstr "Impossibile caricare il calendario in `%s'"
 
-#: calendar/gui/gnome-cal.c:1163
+#: calendar/gui/gnome-cal.c:687
 #, c-format
 msgid "Could not create a calendar in `%s'"
 msgstr "Impossibile creare un calendario in `%s'"
 
-#: calendar/gui/gnome-cal.c:1174
+#: calendar/gui/gnome-cal.c:698
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "IL metodo richiesto per caricare `%s' non Х supportato"
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1479 calendar/gui/gnome-cal.c:1534
-#: mail/mail-search-dialogue.c:104
-msgid "Ok"
-msgstr "Ok"
+#.
+#. * 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
+#, fuzzy
+msgid "April"
+msgstr "aprile"
 
-#: calendar/gui/goto.c:82
-msgid "Year:"
-msgstr "Anno:"
+#: calendar/gui/goto-dialog.glade.h:7
+#, fuzzy
+msgid "August"
+msgstr "agosto"
 
-#: calendar/gui/goto.c:270
-msgid "Go to date"
-msgstr "Vai alla data"
+#: calendar/gui/goto-dialog.glade.h:8
+#, fuzzy
+msgid "December"
+msgstr "dicembre"
 
-#. Instructions
-#: calendar/gui/goto.c:281
-msgid ""
-"Please select the date you want to go to.\n"
-"When you click on a day, you will be taken\n"
-"to that date."
-msgstr ""
-"Selezionare la data a cui si vuole andare.\n"
-"Clickando su un giorno, si viene spostati\n"
-"su quella data."
+#: calendar/gui/goto-dialog.glade.h:9
+#, fuzzy
+msgid "February"
+msgstr "febbraio"
+
+#: calendar/gui/goto-dialog.glade.h:10
+#, fuzzy
+msgid "Go To Date"
+msgstr "Vai alla data"
 
-#: calendar/gui/goto.c:318
-msgid "Go to today"
+#: calendar/gui/goto-dialog.glade.h:11
+#, fuzzy
+msgid "Go To Today"
 msgstr "Vai a oggi"
 
-#: calendar/gui/print.c:288
+#: calendar/gui/goto-dialog.glade.h:12
+#, fuzzy
+msgid "January"
+msgstr "gennaio"
+
+#: calendar/gui/goto-dialog.glade.h:13
+#, fuzzy
+msgid "July"
+msgstr "luglio"
+
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "June"
+msgstr "giugno"
+
+#: calendar/gui/goto-dialog.glade.h:15
+#, fuzzy
+msgid "March"
+msgstr "marzo"
+
+#: calendar/gui/goto-dialog.glade.h:16
+#, fuzzy
+msgid "May"
+msgstr "LunedЛ"
+
+#: calendar/gui/goto-dialog.glade.h:17
+#, fuzzy
+msgid "November"
+msgstr "novembre"
+
+#: calendar/gui/goto-dialog.glade.h:18
+#, fuzzy
+msgid "October"
+msgstr "ottobre"
+
+#: calendar/gui/goto-dialog.glade.h:19
+#, fuzzy
+msgid "September"
+msgstr "settembre"
+
+#: calendar/gui/main.c:49
+#, fuzzy
+msgid "Could not initialize GNOME"
+msgstr "Impossibile inizializzare Bonobo"
+
+#: 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 "Do"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Mo"
 msgstr "Lu"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Tu"
 msgstr "Ma"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "We"
 msgstr "Me"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Th"
 msgstr "Gi"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Fr"
 msgstr "Ve"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Sa"
 msgstr "Sa"
 
-#: calendar/gui/print.c:936
+#: calendar/gui/print.c:941
 msgid "Tasks"
 msgstr "Obiettivi"
 
 #. Day
-#: calendar/gui/print.c:1066
+#: calendar/gui/print.c:1071
 msgid "Current day (%a %b %d %Y)"
 msgstr "Data odierna (%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 "Settimana corrente (%s  - %s) "
 
 #. Month
-#: calendar/gui/print.c:1100
+#: calendar/gui/print.c:1105
 msgid "Current month (%b %Y)"
 msgstr "Mese corrente (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1107
+#: calendar/gui/print.c:1112
 msgid "Current year (%Y)"
 msgstr "Anno corrente (%Y)"
 
-#: calendar/gui/print.c:1144
+#: calendar/gui/print.c:1149
 msgid "Print Calendar"
 msgstr "Stampa Calendario"
 
-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:962
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1001
 msgid "Print Preview"
 msgstr "Anteprima di stampa"
 
@@ -2492,61 +2732,61 @@ msgstr "Impossibile caricare %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Impossibile caricare %s: nessun codice di inizializzazione nel modulo."
 
-#: camel/camel-remote-store.c:182
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr "%s server %s"
 
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s servizio per %s su  %s"
 
-#: camel/camel-remote-store.c:227
+#: camel/camel-remote-store.c:243
 #: camel/providers/smtp/camel-smtp-transport.c:162
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Impossibile connettersi a %s (porta %d): %s"
 
-#: camel/camel-remote-store.c:228
+#: camel/camel-remote-store.c:244
 msgid "(unknown host)"
 msgstr "(host sconosciuto)"
 
-#: camel/camel-remote-store.c:452
+#: camel/camel-remote-store.c:483
 msgid "Server disconnected."
 msgstr "Server disconnesso."
 
-#: camel/camel-service.c:120
+#: camel/camel-service.c:138
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' necessita di un componente per lo username "
 
-#: camel/camel-service.c:129
+#: camel/camel-service.c:147
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' necessita di un componente per l'host"
 
-#: camel/camel-service.c:138
+#: camel/camel-service.c:156
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' necessita di un componente per il percorso"
 
-#: camel/camel-service.c:488
+#: camel/camel-service.c:526
 #, c-format
 msgid "No such host %s."
 msgstr "NOn c'Х l'host %s."
 
-#: camel/camel-service.c:491
+#: camel/camel-service.c:529
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr "Temporaneamente incapace di cercare il nome dell'host %s."
 
-#: camel/camel-session.c:272
+#: camel/camel-session.c:297
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Nessun fornitore disponibile per il protocollo `%s'"
 
-#: camel/camel-session.c:360
+#: camel/camel-session.c:388
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2570,7 +2810,7 @@ msgstr "La stringa URL `%s' contiene un protocollo non valido"
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "IL numero della porta nella stringa URL `%s' non Х numerico"
 
-#: camel/providers/imap/camel-imap-auth.c:127
+#: camel/providers/imap/camel-imap-auth.c:133
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
@@ -2579,44 +2819,44 @@ msgstr ""
 "Impossibile avere il ticket di Kerberos:\n"
 " %s"
 
-#: camel/providers/imap/camel-imap-auth.c:198
+#: camel/providers/imap/camel-imap-auth.c:205
 msgid "Bad authentication response from server."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:216
+#: camel/providers/imap/camel-imap-command.c:231
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Risposta inaspettata dal server IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:224
+#: camel/providers/imap/camel-imap-command.c:239
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Comando IMAP fallito: %s"
 
-#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:240 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "Errore sconosciuto"
 
-#: camel/providers/imap/camel-imap-command.c:271
+#: camel/providers/imap/camel-imap-command.c:286
 msgid "Server response ended too soon."
 msgstr "La risposta del server Х terminata troppo presto."
 
-#: camel/providers/imap/camel-imap-command.c:407
+#: camel/providers/imap/camel-imap-command.c:422
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "La risposta del server IMAP non contiene informazione %s"
 
-#: camel/providers/imap/camel-imap-command.c:443
+#: camel/providers/imap/camel-imap-command.c:458
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Risposta OK inattesa dal server IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:216
+#: camel/providers/imap/camel-imap-folder.c:196
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Impossibile caricare l'indice per %s"
 
-#: camel/providers/imap/camel-imap-folder.c:586
+#: camel/providers/imap/camel-imap-folder.c:532
 msgid "Could not find message body in FETCH response."
 msgstr "Impossibile trovare il corpo del messaggio nella risposta di FETCH."
 
@@ -2628,35 +2868,29 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Per leggere e archiviare la posta sui server IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:234
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:148
-msgid "Password"
-msgstr "Password"
-
-#: camel/providers/imap/camel-imap-store.c:236
+#: camel/providers/imap/camel-imap-store.c:248
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Questa opizone si connette al server IMAP usando una password di testo "
 "semplice."
 
-#: camel/providers/imap/camel-imap-store.c:245
+#: camel/providers/imap/camel-imap-store.c:257
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/providers/imap/camel-imap-store.c:247
+#: camel/providers/imap/camel-imap-store.c:259
 msgid ""
 "This option will connect to the IMAP server using Kerberos 4 authentication."
 msgstr ""
 "Con questa ci si connette al server IMAP usando Kerberos 4 per "
 "l'autenticazione."
 
-#: camel/providers/imap/camel-imap-store.c:333
+#: camel/providers/imap/camel-imap-store.c:345
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sInserire la password IMAP per %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:359
+#: camel/providers/imap/camel-imap-store.c:373
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2667,7 +2901,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:539
+#: camel/providers/imap/camel-imap-store.c:564
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Impossibile creare la directory %s: %s"
@@ -2752,12 +2986,12 @@ msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Impossibile accodare il messaggio alla cartella maildir: %s: %s"
 
 #: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:204
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-maildir-folder.c:207
+#: camel/providers/local/camel-maildir-folder.c:215
+#: camel/providers/local/camel-mbox-folder.c:317
 #: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:189
-#: camel/providers/local/camel-mh-folder.c:197
+#: camel/providers/local/camel-mh-folder.c:192
+#: camel/providers/local/camel-mh-folder.c:200
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -2767,13 +3001,13 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-mbox-folder.c:317
 #: camel/providers/local/camel-mh-folder.c:183
 msgid "No such message"
 msgstr "Messaggio assente"
 
-#: camel/providers/local/camel-maildir-folder.c:213
-#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-maildir-folder.c:216
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "Invalid message contents"
 msgstr "Contenuto del messaggio non valido"
 
@@ -2820,19 +3054,19 @@ msgstr "Impossibile cancellare la cartella `%s': %s"
 msgid "not a maildir directory"
 msgstr "non Х una directory maildir"
 
-#: camel/providers/local/camel-mbox-folder.c:195
+#: camel/providers/local/camel-mbox-folder.c:201
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Impossibile aprire la casella di posta: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:251
+#: camel/providers/local/camel-mbox-folder.c:257
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Inpossibile accodare il messaggio al file mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:327
-#: camel/providers/local/camel-mbox-folder.c:357
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:333
+#: camel/providers/local/camel-mbox-folder.c:365
+#: camel/providers/local/camel-mbox-folder.c:378
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -2841,11 +3075,11 @@ msgstr ""
 "Impossibile prendere il messaggio: %s dalla cartella: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:358
+#: camel/providers/local/camel-mbox-folder.c:366
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "La cartella appare irrimediabilmente corrotta."
 
-#: camel/providers/local/camel-mbox-folder.c:369
+#: camel/providers/local/camel-mbox-folder.c:379
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Fallita la costruziono del messaggio: mailbox corrotta?"
 
@@ -2900,56 +3134,56 @@ msgstr ""
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:341
+#: camel/providers/local/camel-mbox-summary.c:343
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "Impossibile creare indice per la cartella: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:475
-#: camel/providers/local/camel-mbox-summary.c:661
+#: camel/providers/local/camel-mbox-summary.c:477
+#: camel/providers/local/camel-mbox-summary.c:668
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr "Impossibile aprire la cartella per la quale creare l'indice %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:491
+#: camel/providers/local/camel-mbox-summary.c:493
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Impossibile creare una mbox temporanea: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:512
-#: camel/providers/local/camel-mbox-summary.c:520
-#: camel/providers/local/camel-mbox-summary.c:691
-#: camel/providers/local/camel-mbox-summary.c:699
+#: camel/providers/local/camel-mbox-summary.c:514
+#: camel/providers/local/camel-mbox-summary.c:522
+#: camel/providers/local/camel-mbox-summary.c:701
+#: camel/providers/local/camel-mbox-summary.c:709
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Indice e cartella non corrispondono, nemmeno dopo una sincronizzazione"
 
-#: camel/providers/local/camel-mbox-summary.c:562
+#: camel/providers/local/camel-mbox-summary.c:565
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Errore di scrittura nella mbox temporanea: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:579
+#: camel/providers/local/camel-mbox-summary.c:582
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Scrittura fallita su casella di posta temporanea %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:595
-#: camel/providers/local/camel-mbox-summary.c:748
+#: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-mbox-summary.c:759
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Impossibile chiudere la cartella sorgente %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:604
+#: camel/providers/local/camel-mbox-summary.c:609
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Impossibile chiudere la cartella temporanea: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:615
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Impossibile rinominare la cartella: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:817
+#: camel/providers/local/camel-mbox-summary.c:830
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Errore sconosciuto: %s"
@@ -2982,7 +3216,7 @@ msgstr "Fallito l'invio dello username al server"
 msgid "Server rejected username/password"
 msgstr "Il server ha rifiutato username/password"
 
-#: camel/providers/nntp/camel-nntp-folder.c:144
+#: camel/providers/nntp/camel-nntp-folder.c:115
 #, c-format
 msgid "Message %s not found."
 msgstr "Messaggio %s non trovato."
@@ -3034,16 +3268,16 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Impossibile aprire o creare il file .newsrc per %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:179
+#: camel/providers/pop3/camel-pop3-folder.c:180
 msgid "Could not open folder: message listing was incomplete."
 msgstr "Impossibile aprire la cartella: la lista dei messaggi era incompleta."
 
-#: camel/providers/pop3/camel-pop3-folder.c:273
+#: camel/providers/pop3/camel-pop3-folder.c:274
 #, c-format
 msgid "No message with uid %s"
 msgstr "Nessun messaggio con uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:288
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Impossibile scaricare messaggi dal server POP %s: %s"
@@ -3091,17 +3325,17 @@ msgstr ""
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Impossibile autenticare il KPOP server: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:335
+#: camel/providers/pop3/camel-pop3-store.c:337
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Impossibile connettersi al server POP su %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:389
+#: camel/providers/pop3/camel-pop3-store.c:391
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sPrego inserire la password del POP3 di %s@%s "
 
-#: camel/providers/pop3/camel-pop3-store.c:408
+#: camel/providers/pop3/camel-pop3-store.c:410
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3110,12 +3344,12 @@ msgstr ""
 "Impossibile connettersi al server POP.\\n\n"
 "Errore nell'invio dello username: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:411
-#: camel/providers/pop3/camel-pop3-store.c:448
+#: camel/providers/pop3/camel-pop3-store.c:413
+#: camel/providers/pop3/camel-pop3-store.c:450
 msgid "(Unknown)"
 msgstr "(Sconosciuto)"
 
-#: camel/providers/pop3/camel-pop3-store.c:438
+#: camel/providers/pop3/camel-pop3-store.c:440
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -3123,7 +3357,7 @@ msgstr ""
 "Impossibile connettersi al server POP.\\n\n"
 "Non Х presente il supporto per il meccaniscmo di autenticazione richiesto."
 
-#: camel/providers/pop3/camel-pop3-store.c:446
+#: camel/providers/pop3/camel-pop3-store.c:448
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3132,12 +3366,13 @@ msgstr ""
 "Impossibile connettersi al server POP.\\n\n"
 "Errore nell'invio della password: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:555
+#: camel/providers/pop3/camel-pop3-store.c:557
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Cartella `%s' non presente."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
+#: mail/mail-config-druid.glade.h:63
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -3188,8 +3423,14 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Posta consegnata attraverso il programma 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."
+#, fuzzy
+msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 "Per consegnare la posta connettendosi a un mail hub remoto usanto SMTP."
 
@@ -3213,6 +3454,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"
 
@@ -3355,83 +3597,83 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:149
+#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:155
 msgid "attachment"
 msgstr "allegato"
 
-#: composer/e-msg-composer-attachment-bar.c:417
-#: 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 "Allega un file"
 
-#: composer/e-msg-composer-attachment-bar.c:464 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 "Rimuovere"
 
-#: composer/e-msg-composer-attachment-bar.c:465
+#: composer/e-msg-composer-attachment-bar.c:461
 msgid "Remove selected items from the attachment list"
 msgstr "Rimuovere gli oggetti selezionati dalla lista degli allegati"
 
-#: composer/e-msg-composer-attachment-bar.c:496
+#: composer/e-msg-composer-attachment-bar.c:492
 msgid "Add attachment..."
 msgstr "Aggiungere allegato..."
 
-#: composer/e-msg-composer-attachment-bar.c:497
+#: composer/e-msg-composer-attachment-bar.c:493
 msgid "Attach a file to the message"
 msgstr "Allegare un file al messaggio"
 
 #.
-#. * 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 "ProprietЮ dell'allegato"
 
-#: po/tmp/e-msg-composer-attachment.glade.h:8
+#: composer/e-msg-composer-attachment.glade.h:8
 msgid "File name:"
 msgstr "Nome del file:"
 
-#: po/tmp/e-msg-composer-attachment.glade.h:9
+#: composer/e-msg-composer-attachment.glade.h:9
 msgid "MIME type:"
 msgstr "Tipo MIME:"
 
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:291
+#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:303
 #: mail/mail-format.c:626
 msgid "From:"
 msgstr "Da:"
 
-#: composer/e-msg-composer-hdrs.c:238
+#: composer/e-msg-composer-hdrs.c:247
 msgid "Click here for the address book"
 msgstr "Fare clic qui per la rubrica"
 
-#: composer/e-msg-composer-hdrs.c:292
+#: composer/e-msg-composer-hdrs.c:304
 msgid "Enter the identity you wish to send this message from"
 msgstr "Inserire l'identitЮ dalla quale si vuole inviare questo messaggio"
 
-#: composer/e-msg-composer-hdrs.c:296 mail/mail-format.c:630
+#: composer/e-msg-composer-hdrs.c:308 mail/mail-format.c:630
 msgid "To:"
 msgstr "A:"
 
-#: composer/e-msg-composer-hdrs.c:297
+#: composer/e-msg-composer-hdrs.c:309
 msgid "Enter the recipients of the message"
 msgstr "Inserire i destinatari del messaggio"
 
-#: composer/e-msg-composer-hdrs.c:301 mail/mail-format.c:632
+#: 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 ""
 "Inserire gli indirizzi che riceveranno una copia conforme del messaggio"
 
-#: 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."
@@ -3439,11 +3681,11 @@ msgstr ""
 "Inserire gli indirizzi che riceveranno una copia conforme del messaggio "
 "senza apparire nell'elenco dei destinatari del messaggio."
 
-#: composer/e-msg-composer-hdrs.c:314 mail/mail-format.c:634
+#: composer/e-msg-composer-hdrs.c:326 mail/mail-format.c:634
 msgid "Subject:"
 msgstr "Oggetto:"
 
-#: composer/e-msg-composer-hdrs.c:315
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Enter the subject of the mail"
 msgstr "Inserire l'oggetto dell'email"
 
@@ -3483,11 +3725,11 @@ msgstr "Salva i cambiamenti al messaggio..."
 msgid "Error saving composition to 'Drafts': %s"
 msgstr "Errore nel salvataggio del componimento in 'Bozze': %s"
 
-#: composer/e-msg-composer.c:740 shell/e-shell-view-menu.c:170
+#: 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"
@@ -3497,27 +3739,27 @@ msgstr ""
 "\n"
 "Salvare le modifiche?"
 
-#: composer/e-msg-composer.c:768
+#: composer/e-msg-composer.c:772
 msgid "Open file"
 msgstr "Apri file"
 
-#: composer/e-msg-composer.c:894
+#: composer/e-msg-composer.c:898
 msgid "That file does not exist."
 msgstr "Il file noon esiste."
 
-#: composer/e-msg-composer.c:904
+#: composer/e-msg-composer.c:908
 msgid "That is not a regular file."
 msgstr "Non Х un file regolare."
 
-#: composer/e-msg-composer.c:914
+#: composer/e-msg-composer.c:918
 msgid "That file exists but is not readable."
 msgstr "File esistente ma illeggibile."
 
-#: composer/e-msg-composer.c:924
+#: composer/e-msg-composer.c:928
 msgid "That file appeared accesible but open(2) failed."
 msgstr "File apparentemente accessibile ma open(2) non ha funzionato."
 
-#: 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?"
@@ -3525,15 +3767,15 @@ msgstr ""
 "Questo file Х molto grande (piЫ di 100K).\n"
 "Inserire ugualmente?"
 
-#: composer/e-msg-composer.c:967
+#: composer/e-msg-composer.c:971
 msgid "An error occurred while reading the file."
 msgstr "Si Х verificato un errore durante le lettura del file."
 
-#: composer/e-msg-composer.c:1346
+#: composer/e-msg-composer.c:1350
 msgid "Compose a message"
 msgstr "Componi un nuovo messaggio"
 
-#: composer/e-msg-composer.c:1423
+#: composer/e-msg-composer.c:1427
 msgid "Could not create composer window."
 msgstr "Impossibile creare la finestra di composizione."
 
@@ -3677,7 +3919,7 @@ msgstr "In entrata"
 msgid "outgoing"
 msgstr "In uscita"
 
-#: 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 "Modifica Filtri"
 
@@ -3714,7 +3956,7 @@ msgstr "Inserire la URI della Cartella"
 msgid "<click here to select a folder>"
 msgstr "<clicca qui per selezionare una cartella>"
 
-#: filter/filter-input.c:184
+#: filter/filter-input.c:185
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -3723,44 +3965,44 @@ msgstr ""
 "Errore nell'espressione regolare `%s':\n"
 "%s"
 
-#: filter/filter-message-search.c:379 filter/filter-message-search.c:447
+#: filter/filter-message-search.c:380 filter/filter-message-search.c:448
 #, c-format
 msgid "Failed to perform regex search on message header: %s"
 msgstr ""
 
-#: filter/filter-part.c:456
+#: filter/filter-part.c:467
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:520
+#: filter/filter-rule.c:530
 msgid "Rule name: "
 msgstr "Nome della Regola:"
 
-#: filter/filter-rule.c:524
+#: filter/filter-rule.c:534
 msgid "Untitled"
 msgstr "Senza nome"
 
-#: filter/filter-rule.c:540
+#: filter/filter-rule.c:550
 msgid "If"
 msgstr "Se"
 
-#: filter/filter-rule.c:557
+#: filter/filter-rule.c:567
 msgid "Execute actions"
 msgstr "Esegui le azioni"
 
-#: filter/filter-rule.c:561
+#: filter/filter-rule.c:571
 msgid "if all criteria are met"
 msgstr "se tutti i criteri sonon soddisfatti"
 
-#: filter/filter-rule.c:566
+#: filter/filter-rule.c:576
 msgid "if any criteria are met"
 msgstr "se qualche criterio Х soddisfatto"
 
-#: filter/filter-rule.c:577
+#: filter/filter-rule.c:587
 msgid "Add criterion"
 msgstr "Aggiungi criterio"
 
-#: filter/filter-rule.c:583
+#: filter/filter-rule.c:593
 msgid "Remove criterion"
 msgstr "Rimuovi criterio"
 
@@ -3768,14 +4010,8 @@ msgstr "Rimuovi criterio"
 msgid "Replied to"
 msgstr "Risposto a"
 
-#: filter/filter-system-flag.c:64
-msgid "Deleted"
-msgstr "Eliminato"
-
-#: filter/filter-system-flag.c:65
-msgid "Draft"
-msgstr "Bozze"
-
+#. { _("Deleted"), "Deleted" },
+#. { _("Draft"), "Draft" },
 #: filter/filter-system-flag.c:66
 msgid "Important"
 msgstr "Importante"
@@ -3784,191 +4020,186 @@ msgstr "Importante"
 msgid "Read"
 msgstr "Leggi"
 
-#: mail/folder-browser.c:594 po/tmp/filter.glade.h:8
-#: po/tmp/mail-config.glade.h:9
-msgid "Edit"
-msgstr "Modifica"
-
-#: po/tmp/filter.glade.h:10
+#: filter/filter.glade.h:10
 msgid "Edit VFolders"
 msgstr "Modifica VFolder"
 
-#: po/tmp/filter.glade.h:11
+#: filter/filter.glade.h:11
 msgid "Filter Rules"
 msgstr "Regole dei Filtri"
 
-#: po/tmp/filter.glade.h:12
+#: filter/filter.glade.h:12
 msgid "Incoming"
 msgstr "In entrata:"
 
-#: po/tmp/filter.glade.h:13
+#: filter/filter.glade.h:13
 msgid "Outgoing"
 msgstr "In uscita:"
 
-#: po/tmp/filter.glade.h:15
+#: filter/filter.glade.h:15
 msgid "Virtual Folders"
 msgstr "Cartelle Virtuali"
 
-#: po/tmp/filter.glade.h:16
+#: filter/filter.glade.h:16
 msgid "vFolder Sources"
 msgstr "Sorgenti delle cartelle virtuali"
 
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
+msgid "after"
+msgstr "dopo"
+
+#: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr "Assegna Colore"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Assegna un punteggio"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
+msgid "before"
+msgstr "prima"
+
+#: filter/libfilter-i18n.h:6
+msgid "contains"
+msgstr "contiene"
+
+#: filter/libfilter-i18n.h:7
 msgid "Copy to Folder"
 msgstr "Copia nella Cartella"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "Data di Ricezione"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "Data di spedizione"
 
-#: filter/libfilter-i18n.h:8
-msgid "Expression"
-msgstr "Espressione"
-
-#: filter/libfilter-i18n.h:9
-msgid "Forward to Address"
-msgstr "Inoltra all'Indirizzo"
-
-#: filter/libfilter-i18n.h:10
-msgid "Message Body"
-msgstr "Corpo del messaggio"
-
 #: filter/libfilter-i18n.h:11
-msgid "Message Header"
-msgstr "Header del messaggio"
+msgid "does not contain"
+msgstr "non contiene"
 
 #: filter/libfilter-i18n.h:12
-msgid "Message was received"
-msgstr "Il messaggio Х stato ricevuto"
+msgid "does not end with"
+msgstr "non finisce con"
 
 #: filter/libfilter-i18n.h:13
-msgid "Message was sent"
-msgstr "Il messaggio Х stato inviato"
+msgid "does not exist"
+msgstr "non esiste"
 
 #: filter/libfilter-i18n.h:14
-msgid "Move to Folder"
-msgstr "Sposta nella Cartella..."
+msgid "does not sound like"
+msgstr "non assomiglia a"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not start with"
+msgstr "non comincia per"
 
 #: filter/libfilter-i18n.h:16
-msgid "Recipients"
-msgstr "Destinatari"
+msgid "ends with"
+msgstr "finisce per"
 
 #: filter/libfilter-i18n.h:17
-msgid "Regex Match"
-msgstr ""
+msgid "exists"
+msgstr "esiste"
 
 #: filter/libfilter-i18n.h:18
-msgid "Sender"
-msgstr "Mittente"
+msgid "Expression"
+msgstr "Espressione"
 
 #: filter/libfilter-i18n.h:19
-msgid "Set Status"
-msgstr "Imposta _Status"
+msgid "Forward to Address"
+msgstr "Inoltra all'Indirizzo"
 
 #: filter/libfilter-i18n.h:20
-msgid "Source"
-msgstr "Sorgente"
+msgid "is"
+msgstr "Х"
 
 #: filter/libfilter-i18n.h:21
-msgid "Specific header"
-msgstr "Specifica header"
+msgid "is greater than"
+msgstr "Х maggiore di"
 
 #: filter/libfilter-i18n.h:22
-msgid "Status"
-msgstr "Status"
+msgid "is less than"
+msgstr "Х minore di"
 
 #: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
-msgstr "Arresta processo in corso"
+msgid "is not"
+msgstr "non Х"
 
 #: filter/libfilter-i18n.h:24
-msgid "Subject"
-msgstr "Oggetto"
+msgid "Message Body"
+msgstr "Corpo del messaggio"
 
 #: filter/libfilter-i18n.h:25
-msgid "after"
-msgstr "dopo"
+msgid "Message Header"
+msgstr "Header del messaggio"
 
 #: filter/libfilter-i18n.h:26
-msgid "before"
-msgstr "prima"
+msgid "Message was received"
+msgstr "Il messaggio Х stato ricevuto"
 
 #: filter/libfilter-i18n.h:27
-msgid "contains"
-msgstr "contiene"
+msgid "Message was sent"
+msgstr "Il messaggio Х stato inviato"
 
 #: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr "non contiene"
+msgid "Move to Folder"
+msgstr "Sposta nella Cartella..."
 
 #: filter/libfilter-i18n.h:29
-msgid "does not end with"
-msgstr "non finisce con"
+msgid "on or after"
+msgstr "alle o dopo"
 
 #: filter/libfilter-i18n.h:30
-msgid "does not exist"
-msgstr "non esiste"
-
-#: filter/libfilter-i18n.h:31
-msgid "does not sound like"
-msgstr "non assomiglia a"
+msgid "on or before"
+msgstr "Alle o prima"
 
 #: filter/libfilter-i18n.h:32
-msgid "does not start with"
-msgstr "non comincia per"
+msgid "Recipients"
+msgstr "Destinatari"
 
 #: filter/libfilter-i18n.h:33
-msgid "ends with"
-msgstr "finisce per"
+msgid "Regex Match"
+msgstr ""
 
 #: filter/libfilter-i18n.h:34
-msgid "exists"
-msgstr "esiste"
+msgid "Sender"
+msgstr "Mittente"
 
 #: filter/libfilter-i18n.h:35
-msgid "is greater than"
-msgstr "Х maggiore di"
+msgid "Set Status"
+msgstr "Imposta _Status"
 
 #: filter/libfilter-i18n.h:36
-msgid "is less than"
-msgstr "Х minore di"
+msgid "sounds like"
+msgstr "Assomiglia a"
 
 #: filter/libfilter-i18n.h:37
-msgid "is not"
-msgstr "non Х"
+msgid "Source"
+msgstr "Sorgente"
 
 #: filter/libfilter-i18n.h:38
-msgid "is"
-msgstr "Х"
+msgid "Specific header"
+msgstr "Specifica header"
 
 #: filter/libfilter-i18n.h:39
-msgid "on or after"
-msgstr "alle o dopo"
+msgid "starts with"
+msgstr "comincia per"
 
 #: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr "Alle o prima"
+msgid "Status"
+msgstr "Status"
 
 #: filter/libfilter-i18n.h:41
-msgid "sounds like"
-msgstr "Assomiglia a"
+msgid "Stop Processing"
+msgstr "Arresta processo in corso"
 
 #: filter/libfilter-i18n.h:42
-msgid "starts with"
-msgstr "comincia per"
+msgid "Subject"
+msgstr "Oggetto"
 
 #: filter/libfilter-i18n.h:43
 msgid "was after"
@@ -3998,180 +4229,217 @@ msgstr "Aggiungi regola per Cartella Virtuale"
 msgid "Edit VFolder Rule"
 msgstr "Modifica le regole per VFolder"
 
-#: mail/component-factory.c:227
+#: mail/component-factory.c:277
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Impossibile inizializzare il componente della posta di Evolution."
 
-#: mail/component-factory.c:266
+#: 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 "Salva"
 
-#: mail/folder-browser.c:153
+#: mail/folder-browser.c:236
 msgid "Body or subject contains"
 msgstr "Corpo o oggetto contengono"
 
-#: mail/folder-browser.c:154
+#: mail/folder-browser.c:237
 msgid "Body contains"
 msgstr "Il corpo contiene"
 
-#: mail/folder-browser.c:155
+#: mail/folder-browser.c:238
 msgid "Subject contains"
 msgstr "L'Oggetto contiene"
 
-#: mail/folder-browser.c:156
+#: mail/folder-browser.c:239
 msgid "Body does not contain"
 msgstr "Il Corpo non contiene"
 
-#: mail/folder-browser.c:157
+#: mail/folder-browser.c:240
 msgid "Subject does not contain"
 msgstr "L'Oggetto non contiene"
 
-#: mail/folder-browser.c:566
+#: mail/folder-browser.c:643
 msgid "VFolder on Subject"
 msgstr "Cartella Virtuale per Oggetto"
 
-#: mail/folder-browser.c:567
+#: mail/folder-browser.c:644
 msgid "VFolder on Sender"
 msgstr "Cartella Virtuale per Mittente"
 
-#: mail/folder-browser.c:568
+#: mail/folder-browser.c:645
 msgid "VFolder on Recipients"
 msgstr "Cartella Virtuale per Destinatari"
 
-#: mail/folder-browser.c:570
+#: mail/folder-browser.c:647
 msgid "Filter on Subject"
 msgstr "Filtra sull'Oggetto"
 
-#: mail/folder-browser.c:571
+#: mail/folder-browser.c:648
 msgid "Filter on Sender"
 msgstr "Filtro sul Mittente"
 
-#: mail/folder-browser.c:572
+#: mail/folder-browser.c:649
 msgid "Filter on Recipients"
 msgstr "Filtro sui Destinatari:"
 
-#: mail/folder-browser.c:573 mail/folder-browser.c:690
+#: mail/folder-browser.c:650 mail/folder-browser.c:779
 msgid "Filter on Mailing List"
 msgstr "Filtra sulla Mailng List"
 
-#: mail/folder-browser.c:578
+#: mail/folder-browser.c:655
 #, fuzzy
 msgid "Show all hidden"
 msgstr "Mostra Tutto"
 
-#: mail/folder-browser.c:580
+#: mail/folder-browser.c:657
 #, fuzzy
 msgid "Hide selected"
 msgstr "Eliminato"
 
 #. 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 "Nascondi"
 
-#: mail/folder-browser.c:584
+#: mail/folder-browser.c:661
 #, fuzzy
 msgid "Hide deleted"
 msgstr "Eliminato"
 
-#: mail/folder-browser.c:586 mail/folder-browser.c:701
+#: mail/folder-browser.c:663 mail/folder-browser.c:790
 #, fuzzy
 msgid "Hide Subject"
 msgstr "Oggetto"
 
-#: mail/folder-browser.c:588 mail/folder-browser.c:707
+#: mail/folder-browser.c:665 mail/folder-browser.c:796
 #, fuzzy
 msgid "Hide from Sender"
 msgstr "Filtro sul Mittente"
 
-#: 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 "Apri"
 
-#: mail/folder-browser.c:595
+#: mail/folder-browser.c:672
 msgid "Save As..."
 msgstr "Salva con nome..."
 
-#: mail/folder-browser.c:596 mail/mail-view.c:163
-#: 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 "Stampa"
 
-#: mail/folder-browser.c:598
+#: mail/folder-browser.c:675
 msgid "Reply to Sender"
 msgstr "Rispondi al Mittente"
 
-#: mail/folder-browser.c:599 mail/mail-view.c:156
-#: 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 "Rispondi a Tutti"
 
-#: mail/folder-browser.c:600 mail/mail-view.c:159
-#: 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 "Inoltra"
 
-#: mail/folder-browser.c:601 po/tmp/evolution-mail.xml.h:18
+#: mail/folder-browser.c:678 ui/evolution-mail.xml.h:18
 msgid "Forward inline"
 msgstr "Vai avanti"
 
-#: mail/folder-browser.c:603
+#: mail/folder-browser.c:680
 msgid "Mark as Read"
 msgstr "Segna come Letto"
 
-#: mail/folder-browser.c:604
+#: mail/folder-browser.c:681
 msgid "Mark as Unread"
 msgstr "Segna come Non Letto"
 
-#: mail/folder-browser.c:606
+#: mail/folder-browser.c:683
 msgid "Move to Folder..."
 msgstr "Sposta nella Cartella..."
 
-#: mail/folder-browser.c:607
+#: mail/folder-browser.c:684
 msgid "Copy to Folder..."
 msgstr "Copia nella Cartella..."
 
-#: mail/folder-browser.c:609
+#: mail/folder-browser.c:686
 msgid "Undelete"
 msgstr "Ripristina"
 
 #. { _("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 "Applica Filtri"
 
-#: 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 "Crea Regola dal Messaggio"
 
-#: 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 "Stampa Messaggio"
 
-#: mail/folder-browser.c:692
+#: mail/folder-browser.c:781
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtra sulla Mailng List (%s)"
 
-#: mail/folder-browser.c:698
+#: mail/folder-browser.c:787
 #, fuzzy, c-format
 msgid "Hide Subject \"%s\""
 msgstr "Oggetto Х %s"
 
-#: mail/folder-browser.c:704
+#: 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 "Impossibile avviare wombat"
+
+#: mail/local-config.glade.h:7
+#, fuzzy
+msgid "Mailbox Format"
+msgstr "Formato"
+
+#: mail/local-config.glade.h:8
+#, fuzzy
+msgid "New store format:"
+msgstr "Tipo di sorgente per le News:"
+
+#: 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
+#, fuzzy
+msgid "mh"
+msgstr "h"
+
 #: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
@@ -4232,7 +4500,7 @@ msgstr "Non Х stato impostato un sistema di trasporto per la posta"
 msgid "You have no Outbox configured"
 msgstr "Casella di posta in uscita non configurata"
 
-#: mail/mail-callbacks.c:246
+#: mail/mail-callbacks.c:244
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -4240,19 +4508,23 @@ msgstr ""
 "Questo messaggio non ha l'oggetto.\n"
 "Inviare lo stesso?"
 
-#: mail/mail-callbacks.c:291
+#: mail/mail-callbacks.c:312
 msgid "You must specify recipients in order to send this message."
 msgstr "х necessario specificare dei destinatari per inviare questo messaggio."
 
-#: mail/mail-callbacks.c:552
+#: mail/mail-callbacks.c:530
+msgid "Forwarded message:\n"
+msgstr "Messaggio inoltrato:\n"
+
+#: mail/mail-callbacks.c:611
 msgid "Move message(s) to"
 msgstr "Sposta messaggio(i) in"
 
-#: mail/mail-callbacks.c:554
+#: mail/mail-callbacks.c:613
 msgid "Copy message(s) to"
 msgstr "Copia messaggio(i) in"
 
-#: mail/mail-callbacks.c:665
+#: mail/mail-callbacks.c:748
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4260,11 +4532,11 @@ msgstr ""
 "х possibile modificare solo i messaggi\n"
 "salvati nella cartella Bozze."
 
-#: mail/mail-callbacks.c:699 mail/mail-display.c:73
+#: mail/mail-callbacks.c:781 mail/mail-display.c:79
 msgid "Overwrite file?"
 msgstr "Sovrascrivere il file?"
 
-#: mail/mail-callbacks.c:703 mail/mail-display.c:77
+#: mail/mail-callbacks.c:785 mail/mail-display.c:83
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -4272,15 +4544,15 @@ msgstr ""
 "Esiste giЮ un file con questo nome.\n"
 "Sovrascriverlo?"
 
-#: mail/mail-callbacks.c:748
+#: mail/mail-callbacks.c:830
 msgid "Save Message As..."
 msgstr "Salva Messaggio con nome..."
 
-#: mail/mail-callbacks.c:750
+#: mail/mail-callbacks.c:832
 msgid "Save Messages As..."
 msgstr "Salva messaggi con nome..."
 
-#: mail/mail-callbacks.c:877
+#: mail/mail-callbacks.c:916
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4289,45 +4561,278 @@ msgstr ""
 "Errore nel caricare le informazioni dei filtri:\n"
 "%s"
 
-#: mail/mail-callbacks.c:922
+#: mail/mail-callbacks.c:961
 msgid "Print Message"
 msgstr "Stampa Messaggio"
 
-#: mail/mail-callbacks.c:969
+#: mail/mail-callbacks.c:1008
 msgid "Printing of message failed"
 msgstr "Stampa Messaggio non riuscita"
 
 #.
-#. * 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 "Nessuna informazione"
+
+#: mail/mail-config-druid.glade.h:8
+msgid "Account Management"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:9
+#, fuzzy
+msgid "Account Properties"
+msgstr "ProprietЮ dell'allegato"
+
+#: mail/mail-config-druid.glade.h:11
+#, fuzzy
+msgid "Advanced"
+msgstr "Avanzato..."
+
+#: mail/mail-config-druid.glade.h:12
+#, fuzzy
+msgid "Authentication"
+msgstr "Autenticazione:"
+
+#: mail/mail-config-druid.glade.h:13
+#, fuzzy
+msgid "Authentication Type:"
+msgstr "Autenticazione:"
+
+#: 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 "Predefinito"
+
+#: mail/mail-config-druid.glade.h:26
+#, fuzzy
+msgid "Delete mail from server"
+msgstr "Non cancellare i messaggi dal server"
+
+#: mail/mail-config-druid.glade.h:27
+#, fuzzy
+msgid "Done"
+msgstr "Nessuno "
+
+#: mail/mail-config-druid.glade.h:28
+#, fuzzy
+msgid "E-Mail Address:"
+msgstr "Indirizzo email:"
+
+#: mail/mail-config-druid.glade.h:30
+#, fuzzy
+msgid "Email Address:"
+msgstr "Indirizzo email:"
+
+#: mail/mail-config-druid.glade.h:31
+#, fuzzy
+msgid "Evolution Mail Configuration"
+msgstr "Configurazione della Posta"
+
+#: mail/mail-config-druid.glade.h:32
+#, fuzzy
+msgid "Full Name:"
+msgstr "Nome e cognome:"
+
+#: mail/mail-config-druid.glade.h:35
+#, fuzzy
+msgid "Hostname:"
+msgstr "Username:"
+
+#: mail/mail-config-druid.glade.h:36
+#, fuzzy
+msgid "IMAP"
+msgstr "IMAPv4"
+
+#: mail/mail-config-druid.glade.h:37
 msgid "Identity"
 msgstr "IdentitЮ"
 
-#: 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 "_Posta"
+
+#: mail/mail-config-druid.glade.h:41
+#, fuzzy
+msgid "Mail Account"
+msgstr "Email contiene"
+
+#: mail/mail-config-druid.glade.h:42
 msgid "Mail Configuration"
 msgstr "Configurazione della Posta"
 
-#: po/tmp/mail-config-druid.glade.h:8
-msgid "Mail Source"
-msgstr "Sorgente della Posta"
+#: mail/mail-config-druid.glade.h:43
+#, fuzzy
+msgid "Mail Configuration Druid"
+msgstr "Configurazione della Posta"
 
-#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
-msgid "Mail Transport"
-msgstr "Trasporto della Posta"
+#: mail/mail-config-druid.glade.h:44
+msgid "Make this my default account"
+msgstr ""
 
-#: po/tmp/mail-config-druid.glade.h:10
-msgid "Welcome to the Evolution Mail configuration wizard!\n"
-msgstr "Benvenuto al Wizard per configurazione della Posta!\n"
+#: mail/mail-config-druid.glade.h:46
+#, fuzzy
+msgid "News"
+msgstr "Nuovo"
+
+#: mail/mail-config-druid.glade.h:48
+#, fuzzy
+msgid "Optional"
+msgstr "Opzioni"
+
+#: mail/mail-config-druid.glade.h:49 mail/mail-config-gui.c:485
+msgid "Organization:"
+msgstr "Organizzazione:"
+
+#: mail/mail-config-druid.glade.h:50
+msgid "Outgoing Mail Server"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:51
+#, fuzzy
+msgid "Password:"
+msgstr "Password"
+
+#: mail/mail-config-druid.glade.h:53
+msgid "Plain Text"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:54
+msgid "Receiving Email"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:55
+#, fuzzy
+msgid "Remember my password"
+msgstr "Ricorda questa password"
+
+#: mail/mail-config-druid.glade.h:56 mail/mail-format.c:628
+msgid "Reply-To:"
+msgstr "Rispondi a:"
+
+#: mail/mail-config-druid.glade.h:57
+#, fuzzy
+msgid "Reply-to:"
+msgstr "Rispondi a:"
+
+#: mail/mail-config-druid.glade.h:58
+#, fuzzy
+msgid "Required"
+msgstr "Personale _Richiesto"
+
+#: mail/mail-config-druid.glade.h:60
+#, fuzzy
+msgid "Save password"
+msgstr "Salva come VCard"
+
+#: mail/mail-config-druid.glade.h:61
+#, fuzzy
+msgid "Select signature file"
+msgstr "File con la firma:"
+
+#: 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 "Configurazione della Posta"
+
+#: mail/mail-config-druid.glade.h:65
+msgid "Server Timeouts"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:66
+#, fuzzy
+msgid "Server Type: "
+msgstr "Server:"
+
+#: mail/mail-config-druid.glade.h:67
+msgid "Server requires authentication"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:68
+#, fuzzy
+msgid "Servers"
+msgstr "Server:"
 
-#: po/tmp/mail-config-druid.glade.h:14
+#: mail/mail-config-druid.glade.h:69 mail/mail-config-gui.c:496
+msgid "Signature file:"
+msgstr "File con la firma:"
+
+#: mail/mail-config-druid.glade.h:70
+#, fuzzy
+msgid "Signature:"
+msgstr "File con la firma:"
+
+#: mail/mail-config-druid.glade.h:71 mail/mail-config.glade.h:20
+msgid "Sources"
+msgstr "Sorgenti"
+
+#: 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 "Tipo:"
+
+#: 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 ""
-"la configurazione della posta Х completata.\n"
-"Clicca \"Fine\" per salvare le nuove impostazioni"
+
+#: mail/mail-config-druid.glade.h:76
+#, fuzzy
+msgid "User Information"
+msgstr "Nessuna informazione"
+
+#: mail/mail-config-druid.glade.h:77 mail/mail-config-gui.c:928
+msgid "Username:"
+msgstr "Username:"
+
+#: mail/mail-config-druid.glade.h:78
+#, fuzzy
+msgid "Welcome to the Evolution Mail Configuration Druid.\n"
+msgstr "Benvenuto al Wizard per configurazione della Posta!\n"
+
+#: mail/mail-config-druid.glade.h:81
+#, fuzzy
+msgid "minute(s)"
+msgstr "Minuti"
 
 #: mail/mail-config-gui.c:433
 msgid ""
@@ -4347,15 +4852,7 @@ msgstr "Nome e cognome:"
 msgid "Email address:"
 msgstr "Indirizzo email:"
 
-#: mail/mail-config-gui.c:485
-msgid "Organization:"
-msgstr "Organizzazione:"
-
-#: mail/mail-config-gui.c:496
-msgid "Signature file:"
-msgstr "File con la firma:"
-
-#: 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 "File firma"
 
@@ -4363,26 +4860,10 @@ msgstr "File firma"
 msgid "Server:"
 msgstr "Server:"
 
-#: mail/mail-config-gui.c:928
-msgid "Username:"
-msgstr "Username:"
-
-#: mail/mail-config-gui.c:934
-msgid "Path:"
-msgstr "Percorso:"
-
-#: mail/mail-config-gui.c:943
-msgid "Authentication:"
-msgstr "Autenticazione:"
-
 #: mail/mail-config-gui.c:956
 msgid "Detect supported types..."
 msgstr "Trova i tipi supportati..."
 
-#: mail/mail-config-gui.c:968
-msgid "Remember this password"
-msgstr "Ricorda questa password"
-
 #: mail/mail-config-gui.c:991
 msgid "Don't delete messages from server"
 msgstr "Non cancellare i messaggi dal server"
@@ -4395,7 +4876,7 @@ msgstr "Prova Impostazioni"
 msgid "Mail source type:"
 msgstr "Tipo di sorgente della posta:"
 
-#: 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"
@@ -4433,6 +4914,21 @@ msgstr ""
 msgid "Mail transport type:"
 msgstr "Tipo di trasporto della posta:"
 
+#: mail/mail-config-gui.c:1183
+#, fuzzy
+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 ""
+"Selezionare il tipo di server della posta e inserirne le informazioni "
+"rilevanti. \n"
+"\n"
+"Se il server richiede un'autenticazione, Х possibile cliccare il\n"
+"bottone \"Trova i tipi supportati...\" dopo aver inserito le altre\n"
+"informazioni. "
+
 #: mail/mail-config-gui.c:1233
 msgid "Add Identity"
 msgstr "Aggiungi IdentitЮ"
@@ -4481,42 +4977,42 @@ msgstr "Ricerca in corso delle capacitЮ di autorizzazzione di \"%s\""
 msgid "Query authorization at \"%s\""
 msgstr "Ricerca autorizzazione a \"%s\""
 
-#: po/tmp/mail-config.glade.h:7
+#: mail/mail-config.glade.h:7
 msgid "Address"
 msgstr "Indirizzo"
 
-#: po/tmp/mail-config.glade.h:10
+#: mail/mail-config.glade.h:10
 msgid "Identities"
 msgstr "IdentitЮ"
 
-#: po/tmp/mail-config.glade.h:11
+#: mail/mail-config.glade.h:11
 msgid "Mail Sources"
 msgstr "Sorgente della Posta"
 
-#: po/tmp/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
+msgid "Mail Transport"
+msgstr "Trasporto della Posta"
+
+#: mail/mail-config.glade.h:13
 msgid "Mark message as seen [ms]: "
 msgstr "Segna il messaggi come visto [ms]:"
 
-#: po/tmp/mail-config.glade.h:14
+#: mail/mail-config.glade.h:14
 msgid "News Servers"
 msgstr "News Server:"
 
-#: po/tmp/mail-config.glade.h:15
+#: mail/mail-config.glade.h:15
 msgid "News Sources"
 msgstr "Sorgenti"
 
-#: po/tmp/mail-config.glade.h:16
+#: mail/mail-config.glade.h:16
 msgid "Organization"
 msgstr "Organizzazione"
 
-#: po/tmp/mail-config.glade.h:18
+#: mail/mail-config.glade.h:18
 msgid "Send messages in HTML format"
 msgstr "Invia posta in formato HTML"
 
-#: po/tmp/mail-config.glade.h:20
-msgid "Sources"
-msgstr "Sorgenti"
-
 #: 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."
@@ -4528,21 +5024,21 @@ msgid "No password provided."
 msgstr "Non Х stata fornita alcuna password."
 
 #: mail/mail-crypto.c:363 mail/mail-crypto.c:469 mail/mail-crypto.c:646
-#: mail/mail-crypto.c:792 mail/mail-crypto.c:923
+#: mail/mail-crypto.c:792 mail/mail-crypto.c:942
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Impossibile ridirigere verso GPG/PGP: %s  "
 
-#: mail/mail-crypto.c:631 mail/mail-crypto.c:777 mail/mail-crypto.c:917
+#: mail/mail-crypto.c:631 mail/mail-crypto.c:777 mail/mail-crypto.c:936
 msgid "No GPG/PGP program available."
 msgstr "Programma GPG/PGP non disponibile."
 
-#: mail/mail-crypto.c:945
+#: mail/mail-crypto.c:953
 #, fuzzy, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "Impossibile ridirigere: %s  "
 
-#: mail/mail-display.c:92
+#: mail/mail-display.c:98
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -4551,55 +5047,51 @@ msgstr ""
 "Impossibile aprire il file %s:\n"
 "%s "
 
-#: mail/mail-display.c:125
+#: mail/mail-display.c:131
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Impossibile srivere i dati: %s"
 
-#: mail/mail-display.c:223
+#: mail/mail-display.c:229
 msgid "Save Attachment"
 msgstr "Salva Allegati"
 
-#: mail/mail-display.c:263
+#: mail/mail-display.c:269
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Impossibile creare una directory temporanea: %s"
 
-#: mail/mail-display.c:305
+#: mail/mail-display.c:311
 msgid "Save to Disk..."
 msgstr "Salva su Disco..."
 
-#: mail/mail-display.c:307
+#: mail/mail-display.c:313
 #, c-format
 msgid "Open in %s..."
 msgstr "Apri in %s..."
 
-#: mail/mail-display.c:309
+#: mail/mail-display.c:315
 msgid "View Inline"
 msgstr "Visualizza In linea"
 
-#: mail/mail-display.c:333
+#: mail/mail-display.c:339
 msgid "External Viewer"
 msgstr "Visualizzatore Esterno"
 
-#: mail/mail-display.c:356
+#: mail/mail-display.c:362
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "View Inline (via %s)"
 
-#: mail/mail-display.c:360
+#: mail/mail-display.c:366
 msgid "Hide"
 msgstr "Nascondi"
 
-#: mail/mail-format.c:505
+#: mail/mail-format.c:503
 #, c-format
 msgid "%s attachment"
 msgstr "%s allegato"
 
-#: mail/mail-format.c:628
-msgid "Reply-To:"
-msgstr "Rispondi a:"
-
 #: mail/mail-format.c:851
 msgid "No GPG/PGP support available in this copy of Evolution."
 msgstr "Supporto PGP/GPG non disponibile in questa copia di Evolution."
@@ -4616,62 +5108,67 @@ msgstr "Messaggio cifrato"
 msgid "Click icon to decrypt."
 msgstr "Cliccare l'icona per decifrare."
 
-#: mail/mail-format.c:1442
+#: mail/mail-format.c:1450
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntatore al sito FTP (%s)"
 
-#: mail/mail-format.c:1454
+#: mail/mail-format.c:1462
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Puntatore al file locale (%s) valido al sito \"%s\""
 
-#: mail/mail-format.c:1458
+#: mail/mail-format.c:1466
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntatore a un file locale (%s)"
 
-#: mail/mail-format.c:1492
+#: mail/mail-format.c:1500
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Puntatore a dati esterni sconosciuti (tipo \"%s\")"
 
-#: mail/mail-format.c:1497
+#: mail/mail-format.c:1505
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-format.c:1667
+#: mail/mail-format.c:1675
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr ""
 
-#: mail/mail-local.c:202
+#: mail/mail-local.c:204
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Cambiamento del formato della cartella da  \"%s\" a  \"%s\" "
 
-#: mail/mail-local.c:206
+#: mail/mail-local.c:208
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Cambia il formato della cartella da \"%s\" a \"%s\""
 
-#: mail/mail-local.c:261
+#: mail/mail-local.c:251
+#, fuzzy
+msgid "Reconfiguring folder"
+msgstr "_Configura Cartella"
+
+#: mail/mail-local.c:269
 msgid "Closing current folder"
 msgstr "Chiusura cartella corrente"
 
-#: mail/mail-local.c:293
+#: mail/mail-local.c:295
 msgid "Renaming old folder and opening"
 msgstr "Rinomina vecchia cartella e apertura in corso"
 
-#: mail/mail-local.c:314
+#: mail/mail-local.c:313
 msgid "Creating new folder"
 msgstr "Creazione nuova cartella"
 
-#: mail/mail-local.c:329
+#: mail/mail-local.c:327
 msgid "Copying messages"
 msgstr "Copia messaggi"
 
-#: mail/mail-local.c:341
+#: mail/mail-local.c:348
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -4680,7 +5177,7 @@ msgstr ""
 "Impossibile salvare le metainfo della cartella; probabilmente non \n"
 "sarЮ piЫ possibile riaprire questa cartella: %s"
 
-#: mail/mail-local.c:372
+#: mail/mail-local.c:379
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -4688,301 +5185,209 @@ msgstr ""
 "Se non si riesce piЫ ad aprire questa mailbox, puР essere necessario\n"
 "ripararla manualmente."
 
-#: mail/mail-local.c:781
+#: mail/mail-local.c:787
 msgid "Registering local folder"
 msgstr "Registrazione cartella locale"
 
-#: mail/mail-local.c:783
+#: mail/mail-local.c:789
 msgid "Register local folder"
 msgstr "Registra cartella locale"
 
-#: mail/mail-ops.c:79
+#: mail/mail-local.c:894
+#, fuzzy, c-format
+msgid ""
+"Unable to register folder '%s':\n"
+"%s"
+msgstr "Impossibile salvare il file con la lista dei gruppi di %s: %s"
+
+#: mail/mail-mt.c:85
+#, fuzzy, c-format
+msgid ""
+"Error while '%s':\n"
+"%s"
+msgstr ""
+"Errore durante `%s':\n"
+"%s"
+
+#: mail/mail-mt.c:87
+#, fuzzy, c-format
+msgid ""
+"Error while performing operation:\n"
+"%s"
+msgstr ""
+"Errore nella preparazione a %s:\n"
+"%s"
+
+#: mail/mail-mt.c:356 mail/mail-mt.c:385
+#, fuzzy
+msgid "Working"
+msgstr "Spostamento in corso"
+
+#: mail/mail-ops.c:88
 #, c-format
 msgid "Fetching email from %s"
 msgstr "Scaricamento posta da %s in corso"
 
-#: mail/mail-ops.c:81
+#: mail/mail-ops.c:90
 #, c-format
 msgid "Fetch email from %s"
 msgstr "Scarica la posta da %s"
 
-#: mail/mail-ops.c:331
+#: mail/mail-ops.c:335
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "Non c'Х nuova posta su %s."
 
-#: mail/mail-ops.c:401
+#: mail/mail-ops.c:405
 msgid "Filtering email on demand"
 msgstr "Filtraggio della posta su richiesta"
 
-#: mail/mail-ops.c:403
+#: mail/mail-ops.c:407
 msgid "Filter email on demand"
 msgstr "Filtra la posta su richiesta"
 
-#: mail/mail-ops.c:538
+#: mail/mail-ops.c:551
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Invio di \"%s\" in corso"
 
-#: mail/mail-ops.c:543
-msgid "Sending a message without a subject"
-msgstr "Invio di un messaggio senza oggetto"
-
-#: mail/mail-ops.c:546
-#, c-format
-msgid "Send \"%s\""
-msgstr "Invia \"%s\""
-
-#: mail/mail-ops.c:549
-msgid "Send a message without a subject"
-msgstr "Invia un messaggio senza oggetto"
+#: mail/mail-ops.c:553
+#, fuzzy
+msgid "Sending message"
+msgstr "Invia questo messaggio adesso"
 
-#: mail/mail-ops.c:720
+#: mail/mail-ops.c:669
 msgid "Sending queue"
 msgstr "Invio della coda in corso"
 
-#: mail/mail-ops.c:722
+#: mail/mail-ops.c:671
 msgid "Send queue"
 msgstr "Invia la coda"
 
-#: mail/mail-ops.c:858 mail/mail-ops.c:865
+#: mail/mail-ops.c:804 mail/mail-ops.c:811
 #, c-format
 msgid "Appending \"%s\""
 msgstr "Accoda \"%s\""
 
-#: mail/mail-ops.c:862 mail/mail-ops.c:868
+#: mail/mail-ops.c:808 mail/mail-ops.c:814
 msgid "Appending a message without a subject"
 msgstr "Accoda un messaggio senza oggetto"
 
-#: mail/mail-ops.c:940
-#, c-format
-msgid "Expunging \"%s\""
-msgstr "Eliminazione \"%s\""
-
-#: mail/mail-ops.c:942
-#, c-format
-msgid "Expunge \"%s\""
-msgstr "Elimina \"%s\""
-
-#: mail/mail-ops.c:1001
+#: mail/mail-ops.c:897
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Spostamento messaggi da \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:899
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Copia messaggi da \"%s\" a \"%s\" in corso"
 
-#: mail/mail-ops.c:1006
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Sposta messaggi da \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:1008
+#: mail/mail-ops.c:904
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Copia i messaggi da \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:1039
+#: mail/mail-ops.c:935
 msgid "Moving"
 msgstr "Spostamento in corso"
 
-#: mail/mail-ops.c:1042
+#: mail/mail-ops.c:938
 msgid "Copying"
 msgstr "Copia in corso"
 
-#: mail/mail-ops.c:1062
+#: mail/mail-ops.c:958
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s messaggio %d di %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1141
-#, c-format
-msgid "Marking messages in folder \"%s\""
-msgstr "Segnatura dei messaggi nella cartella \"%s\" in corso"
-
-#: mail/mail-ops.c:1144
-#, c-format
-msgid "Mark messages in folder \"%s\""
-msgstr "Segna i messaggi nella cartella \"%s\""
-
-#: mail/mail-ops.c:1175
-#, c-format
-msgid "Marking message %d of %d"
-msgstr "Sto segnando il messaggio %d di %d"
-
-#: mail/mail-ops.c:1295
+#: mail/mail-ops.c:1033
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Scansione delle cartelle in \"%s\" in corso"
 
-#: mail/mail-ops.c:1297
-#, c-format
-msgid "Scan folders in \"%s\""
-msgstr "Scansione delle cartelle in \"%s\""
-
-#: mail/mail-ops.c:1366 mail/subscribe-dialog.c:339
+#: mail/mail-ops.c:1099 mail/subscribe-dialog.c:341
 msgid "(No description)"
 msgstr "(Nessuna descrizione)"
 
-#: mail/mail-ops.c:1432
-#, c-format
-msgid "Attaching messages from folder \"%s\""
-msgstr "Allega messaggi dalla cartella \"%s\""
-
-#: mail/mail-ops.c:1435
-#, c-format
-msgid "Attach messages from \"%s\""
-msgstr "Allega messaggi da \"%s\""
-
-#: mail/mail-ops.c:1535
-#, c-format
-msgid "Forwarding messages \"%s\""
-msgstr "Inoltro messaggi \"%s\" in corso"
-
-#: mail/mail-ops.c:1539
-msgid "Forwarding a message without a subject"
-msgstr "Inoltro messaggio senza oggetto in corso"
-
-#: mail/mail-ops.c:1542
-#, c-format
-msgid "Forward message \"%s\""
-msgstr "Inoltra messaggio \"%s\""
-
-#: mail/mail-ops.c:1546
-msgid "Forward a message without a subject"
-msgstr "Inoltra un messaggio senza oggetto"
-
-#: mail/mail-ops.c:1593
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Scarica in corso del messaggio numero %d di %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1610
-msgid ""
-"Failed to generate mime part from message while generating forwarded message."
-msgstr ""
-"Non Х riuscita la generazione della parte mime durante la generazione\n"
-"del messaggio da inoltrare. "
-
-#: mail/mail-ops.c:1665
+#: mail/mail-ops.c:1164
 msgid "Forwarded messages"
 msgstr "Messaggio inoltrato"
 
-#: mail/mail-ops.c:1679
-msgid "Forwarded message:\n"
-msgstr "Messaggio inoltrato:\n"
-
-#: mail/mail-ops.c:1748
-#, c-format
-msgid "Loading \"%s\""
-msgstr "Caricamento \"%s\" in corso"
-
-#: mail/mail-ops.c:1750
-#, c-format
-msgid "Load \"%s\""
-msgstr "Carica \"%s\""
-
-#: mail/mail-ops.c:1853
-#, c-format
-msgid "Creating \"%s\""
-msgstr "Creazione in corso \"%s\""
-
-#: mail/mail-ops.c:1855
-#, c-format
-msgid "Create \"%s\""
-msgstr "Crea \"%s\""
-
-#: mail/mail-ops.c:1903
-msgid "Exception while reporting result to shell component listener."
-msgstr ""
-"Eccezione nel riportare il risultato al componente di ascolto della\n"
-"shell."
+#: mail/mail-ops.c:1205 mail/mail-ops.c:1274
+#, fuzzy, c-format
+msgid "Opening folder %s"
+msgstr "Scansione delle cartelle in \"%s\" in corso"
 
-#: mail/mail-ops.c:1949
-#, c-format
-msgid "Synchronizing \"%s\""
+#: mail/mail-ops.c:1336
+#, fuzzy
+msgid "Synchronising folder"
 msgstr "Sincronizzazione \"%s\""
 
-#: mail/mail-ops.c:1951
-#, c-format
-msgid "Synchronize \"%s\""
-msgstr "Sincronizza \"%s\""
-
-#: mail/mail-ops.c:2015
-#, c-format
-msgid "Displaying message UID \"%s\""
-msgstr "Visualizzazione UID \"%s\" del messaggio"
-
-#: mail/mail-ops.c:2018
-msgid "Clearing message display"
-msgstr "Pulizia del display dei messaggi"
-
-#: mail/mail-ops.c:2021
-#, c-format
-msgid "Display message UID \"%s\""
-msgstr "Visualizza UID \"%s\" del messaggio"
+#: mail/mail-ops.c:1386
+#, fuzzy
+msgid "Expunging folder"
+msgstr "Eliminazione \"%s\""
 
-#: mail/mail-ops.c:2024
-msgid "Clear message display"
-msgstr "Pulisci il display dei messaggi"
+#: mail/mail-ops.c:1434
+#, fuzzy, c-format
+msgid "Retrieving message %s"
+msgstr "Scaricamento in corso del messaggio %d di %d"
 
-#: mail/mail-ops.c:2137
-#, c-format
-msgid "Opening messages from folder \"%s\""
-msgstr "Apertura messaggi dalla cartella \"%s\""
+#: mail/mail-ops.c:1497
+#, fuzzy
+msgid "Retrieving messages"
+msgstr "Scaricamento in corso del messaggio %d di %d"
 
-#: mail/mail-ops.c:2140
+#: mail/mail-ops.c:1507
 #, c-format
-msgid "Open messages from \"%s\""
-msgstr "Apri i messaggi di \"%s\""
+msgid "Retrieving message number %d of %d (uid \"%s\")"
+msgstr "Scarica in corso del messaggio numero %d di %d (uid \"%s\")"
 
-#: mail/mail-ops.c:2244
-#, c-format
-msgid "Loading %s Folder"
+#: mail/mail-ops.c:1655
+#, fuzzy, c-format
+msgid "Loading %s Folder for %s"
 msgstr "Caricamento Cartella %s"
 
-#: mail/mail-ops.c:2246
-#, c-format
-msgid "Load %s Folder"
+#: mail/mail-ops.c:1657
+#, fuzzy, c-format
+msgid "Load %s Folder for %s"
 msgstr "Carica Cartella %s"
 
-#: mail/mail-ops.c:2310
-#, c-format
-msgid "Viewing messages from folder \"%s\""
-msgstr "Visulaizzazione messaggi dalla cartella \"%s\""
-
-#: mail/mail-ops.c:2313
-#, c-format
-msgid "View messages from \"%s\""
-msgstr "Visualizza messaggi di \"%s\""
-
-#: mail/mail-ops.c:2339
-#, c-format
-msgid "Retrieving message %d of %d (uid \"%s\")"
-msgstr "Ricezione del messaggio %d di %d (uid \"%s\")"
-
-#: mail/mail-ops.c:2428
-#, c-format
-msgid "Saving messages from folder \"%s\""
-msgstr "Salvare messaggi dalla cartella \"%s\""
+#: mail/mail-ops.c:1823
+#, fuzzy
+msgid "Saving messages"
+msgstr "Copia messaggi"
 
-#: mail/mail-ops.c:2431
-#, c-format
-msgid "Save messages from folder \"%s\""
-msgstr "Salva messaggi dalla cartella \"%s\""
+#: mail/mail-ops.c:1902
+#, fuzzy, c-format
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
+msgstr "Impossibile salvare il file con la lista dei gruppi di %s: %s"
 
-#: mail/mail-ops.c:2474
+#: mail/mail-ops.c:1915
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Salvare messaggio %d di %d (uid \"%s\")"
 
+#: mail/mail-ops.c:1929
+#, fuzzy, c-format
+msgid ""
+"Error saving messages to: %s:\n"
+" %s"
+msgstr "Errore nel salvare il file: %s"
+
 #: mail/mail-search-dialogue.c:104
 msgid "Cancel"
 msgstr "Annulla"
 
-#: mail/mail-summary.c:105 mail/mail-threads.c:729
+#: mail/mail-summary.c:110 mail/mail-threads.c:729
 msgid "Incomplete message written on pipe!"
 msgstr "E` stato scritto un messaggio incompleto nella pipe!"
 
@@ -5026,12 +5431,12 @@ msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Impossibile creare una mbox temporanea `%s': %s"
 
 #. Get all uids of source
-#: mail/mail-tools.c:239
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Examining %s"
 msgstr "Esame di %s in corso"
 
-#: mail/mail-tools.c:269
+#: mail/mail-tools.c:271
 #, c-format
 msgid ""
 "Could not read UID cache file \"%s\". You may receive duplicate messages."
@@ -5039,42 +5444,41 @@ msgstr ""
 "Impossibile leggere il file cache UID \"%s\".  Potreste ricevere un\n"
 "duplicato del messaggio."
 
-#. Info
-#: mail/mail-tools.c:290
+#: mail/mail-tools.c:300
 #, c-format
 msgid "Retrieving message %d of %d"
 msgstr "Scaricamento in corso del messaggio %d di %d"
 
 #. Append it to dest
-#: mail/mail-tools.c:303
+#: mail/mail-tools.c:315
 #, c-format
 msgid "Writing message %d of %d"
 msgstr "Scrittura in corso del messaggio %d di %d"
 
-#: mail/mail-tools.c:332
+#: mail/mail-tools.c:347
 #, c-format
 msgid "Saving changes to %s"
 msgstr "Salvataggio dei cambiamenti in %s"
 
-#: mail/mail-tools.c:369
+#: mail/mail-tools.c:381
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (messagio inoltrato)"
 
-#: mail/mail-tools.c:379
+#: mail/mail-tools.c:391
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (nessun oggetto)"
 
-#: mail/mail-tools.c:418
+#: mail/mail-tools.c:427
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Messaggio inoltrato - %s"
 
-#: mail/mail-tools.c:420
+#: mail/mail-tools.c:429
 msgid "Forwarded message (no subject)"
 msgstr "Messaggio inoltrato (senza oggetto)"
 
-#: mail/mail-tools.c:523
+#: mail/mail-tools.c:530
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
@@ -5083,74 +5487,94 @@ msgstr ""
 "Impossibile aprire la location`%s':\n"
 "%s "
 
-#: mail/mail-vfolder.c:147
+#: mail/mail-vfolder.c:149
 msgid "VFolders"
 msgstr "Cartelle virtuali"
 
-#: mail/mail-vfolder.c:296
+#: mail/mail-vfolder.c:298
 msgid "New VFolder"
 msgstr "Nuova Cartella Virtuale"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:37
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:37
 msgid "Reply"
 msgstr "Rispondi"
 
-#: mail/mail-view.c:153 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 "Rispondi all'autore di questo messaggio"
 
-#: mail/mail-view.c:156 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 "Rispondi a tutti i destinatari di questo messaggio"
 
-#: mail/mail-view.c:159 po/tmp/evolution-mail.xml.h:19
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:19
 msgid "Forward this message"
 msgstr "Inoltra questo messaggio"
 
-#: mail/mail-view.c:163 po/tmp/evolution-mail.xml.h:36
+#: mail/mail-view.c:148 ui/evolution-mail.xml.h:36
 msgid "Print the selected message"
 msgstr "Stampa il messaggio selezionato"
 
-#: mail/mail-view.c:165 po/tmp/evolution-mail.xml.h:12
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:12
 msgid "Delete this message"
 msgstr "Elimina questo messaggio"
 
-#: mail/message-list.c:575
+#: mail/message-list.c:590
 msgid "Unseen"
 msgstr "Non visto"
 
-#: mail/message-list.c:578
+#: mail/message-list.c:593
 msgid "Seen"
 msgstr "Visto"
 
-#: mail/message-list.c:581
+#: mail/message-list.c:596
 msgid "Answered"
 msgstr "Risposto"
 
-#: mail/message-list.c:849
+#: mail/message-list.c:881
 #, c-format
 msgid "[ %s ]"
 msgstr "[ %s ]"
 
 #. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:861 mail/message-list.c:876
+#: mail/message-list.c:893 mail/message-list.c:909
 #, c-format
 msgid "%s, et al."
 msgstr "%s, et al."
 
-#: mail/message-list.c:863 mail/message-list.c:878
+#: mail/message-list.c:896 mail/message-list.c:912
 msgid "<unknown>"
 msgstr "<Sconosciuto>"
 
-#: mail/message-list.c:2252
-msgid "Rebuilding message view"
-msgstr "Rivisualizzazione del messaggio"
+#: mail/message-list.c:965
+msgid "?"
+msgstr ""
+
+#: mail/message-list.c:972
+#, fuzzy
+msgid "Today %l:%M %p"
+msgstr "%I:%M %p"
 
-#: mail/message-list.c:2254
-msgid "Rebuild message view"
-msgstr "Rivisualizza il messaggio"
+#: mail/message-list.c:981
+msgid "Yesterday %l:%M %p"
+msgstr ""
+
+#: mail/message-list.c:993
+#, fuzzy
+msgid "%a %l:%M %p"
+msgstr "%I:%M %p"
+
+#: mail/message-list.c:1001
+#, fuzzy
+msgid "%b %d %l:%M %p"
+msgstr "%a %m/%d/%Y %I:%M:%S %p"
+
+#: mail/message-list.c:1003
+#, fuzzy
+msgid "%b %d %Y"
+msgstr "%a %d %Y"
 
 #: mail/subscribe-dialog.c:139
 msgid "Display folders starting with:"
@@ -5166,27 +5590,27 @@ msgstr ""
 msgid "Get store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:282
+#: mail/subscribe-dialog.c:283
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Sottoscrivere cartella \"%s\" "
 
-#: mail/subscribe-dialog.c:286
+#: mail/subscribe-dialog.c:287
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Annullare sottoscrizione cartella \"%s\""
 
-#: mail/subscribe-dialog.c:290
+#: mail/subscribe-dialog.c:291
 #, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr "Sottoscrivi cartella \"%s\""
 
-#: mail/subscribe-dialog.c:293
+#: mail/subscribe-dialog.c:294
 #, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr "Annulla sottoscrizione cartella \"%s\""
 
-#: shell/e-setup.c:112 shell/e-setup.c:183
+#: shell/e-setup.c:112 shell/e-setup.c:185
 msgid "Evolution installation"
 msgstr "Installazione di Evolution"
 
@@ -5202,23 +5626,23 @@ msgstr ""
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr "Cliccare \"OK\" per installare i files, o \"Annulla\" per uscire."
 
-#: shell/e-setup.c:155
+#: shell/e-setup.c:157
 msgid "Could not update files correctly"
 msgstr "Impossibile aggiornare i file correttamente"
 
-#: shell/e-setup.c:158 shell/e-setup.c:224
+#: shell/e-setup.c:160 shell/e-setup.c:228
 msgid "Evolution files successfully installed."
 msgstr "File di Evolution installati con successo."
 
-#: shell/e-setup.c:187
+#: shell/e-setup.c:189
 msgid "This seems to be the first time you run Evolution."
 msgstr "Sembra che tu stia usando Evolution per la prima volta. "
 
-#: shell/e-setup.c:188
+#: shell/e-setup.c:190
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr "Cliccare \"OK\" per installare i files di utente di Evolution sotto"
 
-#: shell/e-setup.c:205
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -5229,7 +5653,7 @@ msgstr ""
 "%s\n"
 "Errore: %s"
 
-#: shell/e-setup.c:220
+#: shell/e-setup.c:224
 #, c-format
 msgid ""
 "Cannot copy files into\n"
@@ -5238,7 +5662,7 @@ msgstr ""
 "Impossibile copiare i file in\n"
 "`%s'"
 
-#: shell/e-setup.c:245
+#: shell/e-setup.c:249
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -5249,7 +5673,7 @@ msgstr ""
 "Spostarla per permettere l'installazione\n"
 "dei file utente di Evolution."
 
-#: shell/e-setup.c:257
+#: shell/e-setup.c:261
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -5293,23 +5717,19 @@ msgstr "Nuovo..."
 msgid "(Untitled)"
 msgstr "(Senza nome)"
 
-#. you might have to call gnome_dialog_run() on the
-#. * dialog returned here, I don't remember...
-#.
-#: shell/e-shell-view-menu.c:114
+#: shell/e-shell-view-menu.c:111
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Impossibile trovare Bug Buddy nel tuo $PATH. "
 
-#. same as above
-#: shell/e-shell-view-menu.c:120
+#: shell/e-shell-view-menu.c:117
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy non puР essere eseguito."
 
-#: shell/e-shell-view-menu.c:172
+#: shell/e-shell-view-menu.c:169
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:174
+#: shell/e-shell-view-menu.c:171
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -5319,7 +5739,7 @@ msgstr ""
 "per posta, calendario e gestione dei contatti\n"
 "nell'ambito dell'ambiente GNOME desktop.  "
 
-#: shell/e-shell-view-menu.c:335
+#: shell/e-shell-view-menu.c:332
 msgid "Go to folder..."
 msgstr "Vai alla cartella..."
 
@@ -5419,9 +5839,8 @@ msgstr "Rimuovi il collegamento dalla barra dei collegamenti"
 msgid "Error saving shortcuts."
 msgstr "Errore di salvataggio dei collegamenti."
 
-#: 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 "_Visualizza"
 
@@ -5537,1153 +5956,1136 @@ msgstr "Disabilita."
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Impossibile inizializzare il sistema di componenti Bonobo."
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-addressbook-ldap.xml.h:6
-msgid "N_ew Directory Server"
-msgstr "N_uovo Server delle Directory"
-
-#: po/tmp/evolution-addressbook-ldap.xml.h:7
-msgid "_Actions"
-msgstr "_Azioni"
-
-#: po/tmp/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:7
 msgid "Create a new contact"
 msgstr "Crea un nuovo contatto"
 
-#: po/tmp/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete a contact"
 msgstr "Cancella un contatto"
 
-#: 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 "Trova"
 
-#: po/tmp/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:11
 msgid "Find a contact"
 msgstr "Trova un contatto"
 
-#: 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 "Nuovo"
 
-#: po/tmp/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:14
 msgid "Print contacts"
 msgstr "Stampa contatti"
 
-#: po/tmp/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:15
 msgid "Stop"
 msgstr "Stop"
 
-#: po/tmp/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:16
 msgid "Stop Loading"
 msgstr "Arresta caricamento"
 
-#: po/tmp/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:17
 msgid "View All"
 msgstr "Visualizza Tutto"
 
-#: po/tmp/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:18
 msgid "View all contacts"
 msgstr "Visualizza tutti i contatti"
 
-#: po/tmp/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "_Addressbook Configuration..."
+msgstr "Configurazione della _Posta"
+
+#: ui/evolution-addressbook.xml.h:20
 msgid "_Print Contacts..."
 msgstr "Stampa _Contatti..."
 
-#: po/tmp/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:21
 msgid "_Search for contacts"
 msgstr "_Ceca Contatti"
 
-#: po/tmp/evolution-addressbook.xml.h:21
-#: po/tmp/evolution-event-editor.xml.h:123
+#: ui/evolution-addressbook.xml.h:22 ui/evolution-event-editor.xml.h:123
 msgid "_Tools"
 msgstr "S_trumenti"
 
 #.
-#. * 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 Giorni"
 
-#: po/tmp/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:7
 msgid "Alter preferences"
 msgstr "Cambia preferenze"
 
-#: po/tmp/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:8
 msgid "Ca_lendar"
 msgstr "Ca_lendario"
 
-#: po/tmp/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:9
 msgid "Calendar Preferences..."
 msgstr "Preferenze del Calendario..."
 
-#: po/tmp/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:10
 msgid "Create a new appointment"
 msgstr "Crea un nuovo appuntamento"
 
-#: po/tmp/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:11
 msgid "Create a new calendar"
 msgstr "Crea un nuovo calendario"
 
-#: po/tmp/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:12
 msgid "Day"
 msgstr "Giorno"
 
-#: po/tmp/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:13
 msgid "Go back in time"
 msgstr "Torna indietro nel tempo"
 
-#: po/tmp/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:14
 msgid "Go forward in time"
 msgstr "Vai avanti nel tempo"
 
-#: po/tmp/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to"
 msgstr "Vai al"
 
-#: po/tmp/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to a specific date"
 msgstr "Vai ad una data specifica"
 
-#: po/tmp/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:17
 msgid "Go to present time"
 msgstr "Vai al presente"
 
-#: po/tmp/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Mese"
 
-#: 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 "Successivo"
 
-#: po/tmp/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:21
 msgid "Open a calendar"
 msgstr "Apri un calendario"
 
-#: po/tmp/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:22
 msgid "Prev"
 msgstr "Prec"
 
-#: po/tmp/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:24
 msgid "Print this calendar"
 msgstr "Stampa questo calendario"
 
-#: po/tmp/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:25
 msgid "Save calendar as something else"
 msgstr "Salva calendario con altro nome"
 
-#: po/tmp/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 day"
 msgstr "Mostra 1 giorno"
 
-#: po/tmp/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:27
 msgid "Show 1 month"
 msgstr "Mostra 1 mese"
 
-#: po/tmp/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:28
 msgid "Show 1 week"
 msgstr "Mostra 1 settimana"
 
-#: po/tmp/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr "Mostra la settimana lavorativa"
 
-#: 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 "Oggi"
 
-#: po/tmp/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:31
 msgid "Week"
 msgstr "Settimana"
 
-#: 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 "_Nuovo"
 
-#: po/tmp/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:33
 msgid "_Open Calendar"
 msgstr "_Apri calendario"
 
-#: po/tmp/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:34
 msgid "_Print this calendar"
 msgstr "_Stampa questo calendario"
 
-#: po/tmp/evolution-calendar.xml.h:35
-msgid "_Save Calendar As"
-msgstr "_Salva Calendario come"
+#: ui/evolution-calendar.xml.h:35
+#, fuzzy
+msgid "_Save As..."
+msgstr "Salva con nome..."
 
-#: po/tmp/evolution-contact-editor.xml.h:7
+#: ui/evolution-contact-editor.xml.h:7
 msgid "Delete this item"
 msgstr "Elimina quest'oggetto"
 
-#: po/tmp/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:8
 msgid "Delete..."
 msgstr "Elimina..."
 
-#: po/tmp/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Help"
 msgstr "Aiuto"
 
-#: po/tmp/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:10
 msgid "Print En_velope..."
 msgstr "Stampa _Busta..."
 
-#: 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 "Stampa questo articolo"
 
-#: 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 "Stampa..."
 
-#: 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 "Salva _come..."
 
-#: 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 "Salva ed Esci"
 
-#: 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 "Salva il contatto e chiudi la finestra di dialogo"
 
-#: po/tmp/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-editor.xml.h:16
 msgid "Se_nd contact to other..."
 msgstr "_Invia contatto a altri..."
 
-#: 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 "Vedere aiuto in linea"
 
-#: po/tmp/evolution-contact-editor.xml.h:18
+#: ui/evolution-contact-editor.xml.h:18
 msgid "Send _message to contact..."
 msgstr "Invia un _messaggio al contatto..."
 
-#: 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 "_File"
 
-#: po/tmp/evolution-contact-editor.xml.h:20
+#: ui/evolution-contact-editor.xml.h:20
 msgid "_Print..."
 msgstr "S_tampa..."
 
-#: 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 "_Salva"
 
 #.
-#. * 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 "Informazioni su questa applicazione"
 
-#: po/tmp/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:7
 msgid "About..."
 msgstr "Informazioni su..."
 
-#: po/tmp/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:8
 msgid "Actio_ns"
 msgstr "Azio_ni"
 
-#: po/tmp/evolution-event-editor.xml.h:9
+#: ui/evolution-event-editor.xml.h:9
 msgid "C_lear"
 msgstr "_Annulla"
 
-#: po/tmp/evolution-event-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:10
 msgid "C_ut"
 msgstr "_Taglia"
 
-#: po/tmp/evolution-event-editor.xml.h:11
+#: ui/evolution-event-editor.xml.h:11
 msgid "Clear"
 msgstr "Annulla"
 
-#: po/tmp/evolution-event-editor.xml.h:12
+#: ui/evolution-event-editor.xml.h:12
 msgid "Clear the selection"
 msgstr "Annulla la Selezione"
 
-#: po/tmp/evolution-event-editor.xml.h:14
+#: ui/evolution-event-editor.xml.h:14
 msgid "Close this appointment"
 msgstr "Chiudi questo appuntamento"
 
-#: 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 "Copia"
 
-#: po/tmp/evolution-event-editor.xml.h:16
+#: ui/evolution-event-editor.xml.h:16
 msgid "Copy the selection"
 msgstr "Copia selezionato"
 
-#: po/tmp/evolution-event-editor.xml.h:17
+#: ui/evolution-event-editor.xml.h:17
 msgid "Cut"
 msgstr "Taglia"
 
-#: po/tmp/evolution-event-editor.xml.h:18
+#: ui/evolution-event-editor.xml.h:18
 msgid "Cut the selection"
 msgstr "Taglia selezionato"
 
-#: po/tmp/evolution-event-editor.xml.h:21
+#: ui/evolution-event-editor.xml.h:21
 msgid "Dump XML"
 msgstr "Dump XML"
 
-#: po/tmp/evolution-event-editor.xml.h:22
+#: ui/evolution-event-editor.xml.h:22
 msgid "Dump the UI Xml description"
 msgstr "Fa un Dump della descrizione UI Xml"
 
-#: po/tmp/evolution-event-editor.xml.h:23
+#: ui/evolution-event-editor.xml.h:23
 msgid "FIXME: Address _Book..."
 msgstr "FIXME: Address _Book..."
 
-#: 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
 #, fuzzy
 msgid "FIXME: Cop_y to Folder..."
 msgstr "Copia nella Cartella"
 
-#: 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
 #, fuzzy
 msgid "FIXME: For_ward"
 msgstr "Inoltra"
 
-#: 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
 #, fuzzy
 msgid "FIXME: Print Pre_view"
 msgstr "Anteprima di stampa"
 
-#: 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
 #, fuzzy
 msgid "FIXME: Rec_urrence..."
 msgstr "Ricorrenza"
 
-#: 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
 #, fuzzy
 msgid "FIXME: Save Attac_hments..."
 msgstr "Salva Allegati"
 
-#: 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
 #, fuzzy
 msgid "FIXME: _File..."
 msgstr "_Filtri Posta..."
 
-#: po/tmp/evolution-event-editor.xml.h:49
+#: ui/evolution-event-editor.xml.h:49
 #, fuzzy
 msgid "FIXME: _Font..."
 msgstr "Carattere..."
 
-#: 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
 #, fuzzy
 msgid "FIXME: _Journal Entry"
 msgstr "Voce nell'agenda - %s"
 
-#: 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
 msgid "FIXME: _Mail Message"
 msgstr "Invia Messaggio"
 
-#: 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 "_Sposta nella Cartella"
 
-#: po/tmp/evolution-event-editor.xml.h:57
+#: ui/evolution-event-editor.xml.h:57
 #, fuzzy
 msgid "FIXME: _New Appointment"
 msgstr "_Nuovo appuntamento..."
 
-#: 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 "F_ormato"
 
-#: po/tmp/evolution-event-editor.xml.h:68
+#: ui/evolution-event-editor.xml.h:68
 msgid "Find Again"
 msgstr "Cerca ancora"
 
-#: po/tmp/evolution-event-editor.xml.h:69
+#: ui/evolution-event-editor.xml.h:69
 msgid "Find _Again"
 msgstr "Trova _Ancora"
 
-#: po/tmp/evolution-event-editor.xml.h:70
+#: ui/evolution-event-editor.xml.h:70
 msgid "Go to the next item"
 msgstr "Vai al successivo"
 
-#: po/tmp/evolution-event-editor.xml.h:71
+#: ui/evolution-event-editor.xml.h:71
 msgid "Go to the previous item"
 msgstr "Vai al precedente"
 
-#: po/tmp/evolution-event-editor.xml.h:72
+#: ui/evolution-event-editor.xml.h:72
 msgid "Modify the file's properties"
 msgstr "Modifica le proprietЮ del file"
 
-#: po/tmp/evolution-event-editor.xml.h:73
+#: ui/evolution-event-editor.xml.h:73
 msgid "N_ext"
 msgstr "S_uccessivo"
 
-#: po/tmp/evolution-event-editor.xml.h:75
+#: ui/evolution-event-editor.xml.h:75
 msgid "Paste"
 msgstr "Incolla"
 
-#: po/tmp/evolution-event-editor.xml.h:76
+#: ui/evolution-event-editor.xml.h:76
 msgid "Paste the clipboard"
 msgstr "Incolla agli appunti"
 
-#: po/tmp/evolution-event-editor.xml.h:77
+#: ui/evolution-event-editor.xml.h:77
 msgid "Pre_vious"
 msgstr "_Precedente"
 
-#: po/tmp/evolution-event-editor.xml.h:78
+#: ui/evolution-event-editor.xml.h:78
 msgid "Previous"
 msgstr "Precedente"
 
-#: po/tmp/evolution-event-editor.xml.h:79
+#: ui/evolution-event-editor.xml.h:79
 msgid "Print S_etup..."
 msgstr "_Impostazioni Stampa..."
 
-#: po/tmp/evolution-event-editor.xml.h:80
+#: ui/evolution-event-editor.xml.h:80
 msgid "Print Setup"
 msgstr "Impostazione pagina"
 
-#: po/tmp/evolution-event-editor.xml.h:83
+#: ui/evolution-event-editor.xml.h:83
 msgid "Properties"
 msgstr "ProprietЮ"
 
-#: po/tmp/evolution-event-editor.xml.h:84
+#: ui/evolution-event-editor.xml.h:84
 msgid "Redo"
 msgstr "Rifai"
 
-#: po/tmp/evolution-event-editor.xml.h:85
+#: ui/evolution-event-editor.xml.h:85
 msgid "Redo the undone action"
 msgstr "Rifai l'azione annullata"
 
-#: po/tmp/evolution-event-editor.xml.h:86
+#: ui/evolution-event-editor.xml.h:86
 msgid "Replace"
 msgstr "Sostituisci"
 
-#: po/tmp/evolution-event-editor.xml.h:87
+#: ui/evolution-event-editor.xml.h:87
 msgid "Replace a string"
 msgstr "Sostituisci una stringa"
 
-#: 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 "Salva l'appuntamento e chiudi la finestra di dialogo"
 
-#: 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 "Salva il file corrente"
 
-#: po/tmp/evolution-event-editor.xml.h:93
+#: ui/evolution-event-editor.xml.h:93
 msgid "Schedule Meeting"
 msgstr "Pianifica una Riunione"
 
-#: po/tmp/evolution-event-editor.xml.h:94
+#: ui/evolution-event-editor.xml.h:94
 msgid "Schedule _Meeting"
 msgstr "Pianifica una _Riunione"
 
-#: po/tmp/evolution-event-editor.xml.h:95
+#: ui/evolution-event-editor.xml.h:95
 msgid "Schedule some sort of a meeting"
 msgstr "Pianifica un tipo di riunione"
 
-#: po/tmp/evolution-event-editor.xml.h:96
+#: ui/evolution-event-editor.xml.h:96
 msgid "Search again for the same string"
 msgstr "Cerca ancora la stessa stringa"
 
-#: po/tmp/evolution-event-editor.xml.h:97
+#: ui/evolution-event-editor.xml.h:97
 msgid "Search for a string"
 msgstr "Cerca una stringa"
 
-#: po/tmp/evolution-event-editor.xml.h:99
+#: ui/evolution-event-editor.xml.h:99
 msgid "Select All"
 msgstr "Seleziona Tutto"
 
-#: po/tmp/evolution-event-editor.xml.h:100
+#: ui/evolution-event-editor.xml.h:100
 msgid "Select everything"
 msgstr "Seleziona ogni cosa"
 
-#: 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 "Imposta i parametri della pagina per la stampante corrente"
 
-#: po/tmp/evolution-event-editor.xml.h:102
+#: ui/evolution-event-editor.xml.h:102
 msgid "Undo"
 msgstr "Annulla"
 
-#: po/tmp/evolution-event-editor.xml.h:103
+#: ui/evolution-event-editor.xml.h:103
 msgid "Undo the last action"
 msgstr "Annulla l'ultima azione"
 
-#: 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 "_Informazioni su"
 
-#: 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 "_Chiudi"
 
-#: po/tmp/evolution-event-editor.xml.h:106
+#: ui/evolution-event-editor.xml.h:106
 msgid "_Copy"
 msgstr "_Copia"
 
-#: 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 "_Debug"
 
-#: 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 "_Modifica"
 
-#: po/tmp/evolution-event-editor.xml.h:111
+#: ui/evolution-event-editor.xml.h:111
 msgid "_Find..."
 msgstr "_Trova..."
 
-#: po/tmp/evolution-event-editor.xml.h:112
+#: ui/evolution-event-editor.xml.h:112
 msgid "_Forms"
 msgstr "_Schede"
 
-#: 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 "_Aiuto"
 
-#: po/tmp/evolution-event-editor.xml.h:114
+#: ui/evolution-event-editor.xml.h:114
 msgid "_Insert"
 msgstr "_Inserisci"
 
-#: po/tmp/evolution-event-editor.xml.h:115
+#: ui/evolution-event-editor.xml.h:115
 msgid "_Object"
 msgstr "_Oggetto"
 
-#: po/tmp/evolution-event-editor.xml.h:116
+#: ui/evolution-event-editor.xml.h:116
 msgid "_Paste"
 msgstr "_Incolla"
 
-#: po/tmp/evolution-event-editor.xml.h:117
+#: ui/evolution-event-editor.xml.h:117
 msgid "_Print"
 msgstr "S_tampa"
 
-#: po/tmp/evolution-event-editor.xml.h:118
+#: ui/evolution-event-editor.xml.h:118
 msgid "_Properties..."
 msgstr "_ProprietЮ"
 
-#: po/tmp/evolution-event-editor.xml.h:119
+#: ui/evolution-event-editor.xml.h:119
 msgid "_Redo"
 msgstr "_Rifai"
 
-#: po/tmp/evolution-event-editor.xml.h:120
+#: ui/evolution-event-editor.xml.h:120
 msgid "_Replace..."
 msgstr "_Sostituisci"
 
-#: po/tmp/evolution-event-editor.xml.h:122
+#: ui/evolution-event-editor.xml.h:122
 msgid "_Toolbars"
 msgstr "Barra degli S_trumenti"
 
-#: po/tmp/evolution-event-editor.xml.h:124
+#: ui/evolution-event-editor.xml.h:124
 msgid "_Undo"
 msgstr "_Annulla"
 
 #.
-#. * 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 "Scrivi"
 
-#: po/tmp/evolution-mail.xml.h:7
+#: ui/evolution-mail.xml.h:7
 msgid "Compose a new message"
 msgstr "Scrivi un nuovo messaggio"
 
-#: po/tmp/evolution-mail.xml.h:9
+#: ui/evolution-mail.xml.h:9
 msgid "Copy message to a new folder"
 msgstr "Copia messaggio in una nuova cartella"
 
-#: 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 "C_artelle"
 
-#: po/tmp/evolution-mail.xml.h:14
+#: ui/evolution-mail.xml.h:14
 msgid "Fi_lter on Sender"
 msgstr "Fi_ltra sul Mittente"
 
-#: po/tmp/evolution-mail.xml.h:15
+#: ui/evolution-mail.xml.h:15
 msgid "Filter on Rec_ipients"
 msgstr "Filtro sui _Destinatari"
 
-#: po/tmp/evolution-mail.xml.h:16
+#: ui/evolution-mail.xml.h:16
 msgid "Forget _Passwords"
 msgstr "Dimantica _Password"
 
-#: po/tmp/evolution-mail.xml.h:20
+#: ui/evolution-mail.xml.h:20
 msgid "Get Mail"
 msgstr "Ricevi POsta"
 
-#: po/tmp/evolution-mail.xml.h:22
+#: ui/evolution-mail.xml.h:22
 #, fuzzy
 msgid "Hide _Deleted messages"
 msgstr "Stampa il messaggio selezionato"
 
-#: po/tmp/evolution-mail.xml.h:23
+#: ui/evolution-mail.xml.h:23
 #, fuzzy
 msgid "Hide _Read messages"
 msgstr "Messaggio inoltrato"
 
-#: po/tmp/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:24
 #, fuzzy
 msgid "Hide _Selected messages"
 msgstr "Stampa il messaggio selezionato"
 
-#: po/tmp/evolution-mail.xml.h:25
-msgid "Mail _Filters"
+#: ui/evolution-mail.xml.h:25
+#, fuzzy
+msgid "Mail _Filters..."
 msgstr "_Filtri Posta"
 
-#: po/tmp/evolution-mail.xml.h:26
-msgid "Manage Subscriptions"
+#: ui/evolution-mail.xml.h:26
+#, fuzzy
+msgid "Manage Subscriptions..."
 msgstr "Gestione sottoscrizioni"
 
-#: po/tmp/evolution-mail.xml.h:27
+#: ui/evolution-mail.xml.h:27
 msgid "Mar_k As Read"
 msgstr "S_egna come Letto"
 
-#: po/tmp/evolution-mail.xml.h:28
+#: ui/evolution-mail.xml.h:28
 msgid "Mark As U_nread"
 msgstr "Segna come _Non Letto"
 
-#: po/tmp/evolution-mail.xml.h:29
+#: ui/evolution-mail.xml.h:29
 msgid "Move"
 msgstr "Sposta"
 
-#: po/tmp/evolution-mail.xml.h:30
+#: ui/evolution-mail.xml.h:30
 msgid "Move message to a new folder"
 msgstr "Sposta il messaggio in una nuova cartella"
 
-#: po/tmp/evolution-mail.xml.h:31
+#: ui/evolution-mail.xml.h:31
 msgid "Previews the message to be printed"
 msgstr "Anteprime del messaggio da stampare"
 
-#: po/tmp/evolution-mail.xml.h:33
+#: ui/evolution-mail.xml.h:33
 msgid "Print Preview of message..."
 msgstr "Anteprima di stampa del messaggio..."
 
-#: po/tmp/evolution-mail.xml.h:34
+#: ui/evolution-mail.xml.h:34
 msgid "Print message to the printer"
 msgstr "Stampa messaggio con la stampante"
 
-#: po/tmp/evolution-mail.xml.h:35
+#: ui/evolution-mail.xml.h:35
 msgid "Print message..."
 msgstr "Stampa messaggio..."
 
-#: po/tmp/evolution-mail.xml.h:39
+#: ui/evolution-mail.xml.h:39
 msgid "Reply to _All"
 msgstr "Rispondi a _Tutti"
 
-#: po/tmp/evolution-mail.xml.h:40
+#: ui/evolution-mail.xml.h:40
 msgid "Reply to _Sender"
 msgstr "Rispondi al _Mittente"
 
-#: 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 "Seleziona _Tutto"
 
-#: po/tmp/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:44
 msgid "Send queued mail and retrieve new mail"
 msgstr "Invia la posta in coda e ricevi quella nuova"
 
-#: po/tmp/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:45
 #, fuzzy
 msgid "Show _All messages"
 msgstr "Mostra Tutto"
 
-#: po/tmp/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:46
 msgid "Threaded Message list"
 msgstr "LIsta di Messaggi a Thread"
 
-#: po/tmp/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:47
 msgid "VFolder on Se_nder"
 msgstr "Cartella virtuale sul _Mittente"
 
-#: po/tmp/evolution-mail.xml.h:48
+#: ui/evolution-mail.xml.h:48
 msgid "VFolder on _Recipients"
 msgstr "Cartella virtuale sui _Destinatari"
 
-#: po/tmp/evolution-mail.xml.h:49
+#: ui/evolution-mail.xml.h:49
 msgid "View Raw Message Source"
 msgstr "Vedi la sorgente grezza del messaggio"
 
-#: po/tmp/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:50
 msgid "_Apply Filters"
 msgstr "_Applica Filtri"
 
-#: po/tmp/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:51
 msgid "_Configure Folder"
 msgstr "_Configura Cartella"
 
-#: po/tmp/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:52
 msgid "_Copy to Folder..."
 msgstr "_Copia nella cartella..."
 
-#: po/tmp/evolution-mail.xml.h:54
+#: ui/evolution-mail.xml.h:54
 msgid "_Edit Message"
 msgstr "M_odifica Messaggio"
 
-#: po/tmp/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:55
 msgid "_Expunge"
 msgstr "_Elimina per sempre"
 
-#: po/tmp/evolution-mail.xml.h:56
+#: ui/evolution-mail.xml.h:56
 msgid "_Filter on Subject"
 msgstr "_Filtro sull'Oggetto"
 
-#: po/tmp/evolution-mail.xml.h:57
+#: ui/evolution-mail.xml.h:57
 msgid "_Forward"
 msgstr "_Inoltra"
 
-#: 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 "_Inverti Selezione"
 
-#: po/tmp/evolution-mail.xml.h:59
-msgid "_Mail Configuration"
+#: ui/evolution-mail.xml.h:59
+#, fuzzy
+msgid "_Mail Configuration..."
 msgstr "Configurazione della _Posta"
 
-#: po/tmp/evolution-mail.xml.h:60
+#: ui/evolution-mail.xml.h:60
 msgid "_Message"
 msgstr "_Messaggio"
 
-#: po/tmp/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:61
 msgid "_Move to Folder..."
 msgstr "_Sposta nella Cartella..."
 
-#: po/tmp/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:62
 msgid "_Open in New Window"
 msgstr "_Apri in una Nuova Finestra"
 
-#: po/tmp/evolution-mail.xml.h:63
+#: ui/evolution-mail.xml.h:63
 msgid "_Print Message"
 msgstr "_Stampa Messaggio"
 
-#: po/tmp/evolution-mail.xml.h:64
+#: ui/evolution-mail.xml.h:64
 msgid "_Save Message As..."
 msgstr "_Salva con Nome..."
 
-#: po/tmp/evolution-mail.xml.h:65
+#: ui/evolution-mail.xml.h:65
 msgid "_Source"
 msgstr "_Sorgente"
 
-#: po/tmp/evolution-mail.xml.h:66
+#: ui/evolution-mail.xml.h:66
 msgid "_Threaded"
 msgstr "A _Thread"
 
-#: po/tmp/evolution-mail.xml.h:67
+#: ui/evolution-mail.xml.h:67
 msgid "_Undelete"
 msgstr "_Ripristina"
 
-#: po/tmp/evolution-mail.xml.h:68
+#: ui/evolution-mail.xml.h:68
 msgid "_VFolder on Subject"
 msgstr "_Cartella Virtuale sull'Oggetto"
 
-#: po/tmp/evolution-mail.xml.h:69
-msgid "_Virtual Folder Editor"
+#: ui/evolution-mail.xml.h:69
+#, fuzzy
+msgid "_Virtual Folder Editor..."
 msgstr "Editor delle Cartelle _Virtuali"
 
 #.
-#. * 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 "Allega"
 
-#: po/tmp/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:9
 msgid "Close the current file"
 msgstr "Chiudi il file corrente"
 
-#: po/tmp/evolution-message-composer.xml.h:10
+#: ui/evolution-message-composer.xml.h:10
 #, fuzzy
 msgid "Encrypt this message with PGP"
 msgstr "Messaggio cifrato"
 
-#: 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 "Inserici un file come testo nel messaggio"
 
-#: po/tmp/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:14
 msgid "Insert text file..."
 msgstr "Inserici un file di testo..."
 
-#: po/tmp/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:16
 msgid "Open a file"
 msgstr "Apri un file"
 
-#: po/tmp/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:17
 msgid "PGP Encrypt"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:18
 msgid "PGP Sign"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save As"
 msgstr "Salva con Nome"
 
-#: 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 "Salva nella cartella..."
 
-#: 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 "Salva il file corrente con un nome diverso"
 
-#: po/tmp/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "Salva il messaggio in una cartella specificata"
 
-#: po/tmp/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "Invia"
 
-#: po/tmp/evolution-message-composer.xml.h:28
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr "Invia piЫ _Tardi"
 
-#: po/tmp/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr "Invia piЫ _tardi"
 
-#: po/tmp/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr "Invia la posta in formato HTML"
 
-#: po/tmp/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send the message later"
 msgstr "Invia il messaggio piЫ tardi"
 
-#: po/tmp/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:32
 msgid "Send the message now"
 msgstr "Invia il messaggio adesso"
 
-#: po/tmp/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:33
 msgid "Send this message now"
 msgstr "Invia questo messaggio adesso"
 
-#: po/tmp/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show / hide attachments"
 msgstr "Mostra / nascondi allegati"
 
-#: po/tmp/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show _attachments"
 msgstr "Mostra _allegati"
 
-#: po/tmp/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:36
 msgid "Show attachments"
 msgstr "Mostra allegati"
 
-#: po/tmp/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:37
 #, fuzzy
 msgid "Sign this message with your PGP key"
 msgstr "Invio di un messaggio senza oggetto"
 
-#: 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 "_Apri..."
 
-#: 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 "Aggiungi una cartella alla lista di cartelle a cui sei iscritto"
 
-#: po/tmp/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:9
 msgid "Refresh List"
 msgstr "Aggiorna Lista"
 
-#: po/tmp/evolution-subscribe.xml.h:10
+#: ui/evolution-subscribe.xml.h:10
 msgid "Refresh List of Folders"
 msgstr "Aggiorna la Lista delle Cartelle"
 
-#: po/tmp/evolution-subscribe.xml.h:11
+#: ui/evolution-subscribe.xml.h:11
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Elimina una cartella dalla lista delle cartelle a cui sei iscritto"
 
-#: po/tmp/evolution-subscribe.xml.h:13
+#: ui/evolution-subscribe.xml.h:13
 msgid "Subscribe"
 msgstr "Iscrizione"
 
-#: po/tmp/evolution-subscribe.xml.h:14
+#: ui/evolution-subscribe.xml.h:14
 msgid "Unsubscribe"
 msgstr "Annulla iscrizione"
 
 #.
-#. * 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 "Visualizza un'altra cartella"
 
-#: po/tmp/evolution.xml.h:7
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "E_sci"
 
-#: po/tmp/evolution.xml.h:8
+#: ui/evolution.xml.h:8
 msgid "Evolution bar _shortcut"
 msgstr "_Barra del Collegamenti di Evolution"
 
-#: po/tmp/evolution.xml.h:9
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Esci dal Programma"
 
-#: po/tmp/evolution.xml.h:10
+#: ui/evolution.xml.h:10
 msgid "Getting _Started"
 msgstr "Primi _Passi"
 
-#: po/tmp/evolution.xml.h:11
+#: ui/evolution.xml.h:11
 msgid "Show information about Evolution"
 msgstr "Mostra informazioni su Evolution"
 
-#: po/tmp/evolution.xml.h:12
+#: ui/evolution.xml.h:12
 msgid "Show the _Folder Bar"
 msgstr "Mostra la _Barra delle Cartelle"
 
-#: po/tmp/evolution.xml.h:13
+#: ui/evolution.xml.h:13
 msgid "Show the _Shortcut Bar"
 msgstr "Mostra la _Barra di Collegamento"
 
-#: po/tmp/evolution.xml.h:14
+#: ui/evolution.xml.h:14
 msgid "Submit _Bug Report"
 msgstr "Inoltra un _Bug Report"
 
-#: po/tmp/evolution.xml.h:15
+#: ui/evolution.xml.h:15
 msgid "Submit bug report using Bug Buddy."
 msgstr "Inoltra un Bug Report usando Bug Buddy."
 
-#: po/tmp/evolution.xml.h:16
+#: ui/evolution.xml.h:16
 msgid "Toggle whether to show the folder bar"
 msgstr "Mostra/nasconde la barra delle cartelle"
 
-#: po/tmp/evolution.xml.h:17
+#: ui/evolution.xml.h:17
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Mostra/nasconde la barra dei collegamenti"
 
-#: po/tmp/evolution.xml.h:18
+#: ui/evolution.xml.h:18
 msgid "Using the C_ontact Manager"
 msgstr "Uso del manger dei C_ontatti"
 
-#: po/tmp/evolution.xml.h:19
+#: ui/evolution.xml.h:19
 msgid "Using the _Calendar"
 msgstr "Uso del _Calendario"
 
-#: po/tmp/evolution.xml.h:20
+#: ui/evolution.xml.h:20
 msgid "Using the _Mailer"
 msgstr "Uso del programma di _Posta"
 
-#: po/tmp/evolution.xml.h:21
+#: ui/evolution.xml.h:21
 msgid "_About Evolution..."
 msgstr "_Informazioni su Evolution..."
 
-#: po/tmp/evolution.xml.h:22
+#: ui/evolution.xml.h:22
 #, fuzzy
 msgid "_Appointment (FIXME)"
 msgstr "Appuntamenti:"
 
-#: po/tmp/evolution.xml.h:23
+#: ui/evolution.xml.h:23
 #, fuzzy
 msgid "_Contact (FIXME)"
 msgstr "Editor dei Contatti"
 
-#: po/tmp/evolution.xml.h:26
+#: ui/evolution.xml.h:26
 msgid "_Folder"
 msgstr "_Cartelle"
 
-#: po/tmp/evolution.xml.h:27
+#: ui/evolution.xml.h:27
 msgid "_Go to Folder..."
 msgstr "_Vai alla cartella..."
 
-#: po/tmp/evolution.xml.h:29
+#: ui/evolution.xml.h:29
 msgid "_Index"
 msgstr "_Indice"
 
-#: po/tmp/evolution.xml.h:30
+#: ui/evolution.xml.h:30
 msgid "_Mail message (FIXME)"
 msgstr "_Invia messaggio"
 
-#: po/tmp/evolution.xml.h:32
+#: ui/evolution.xml.h:32
 msgid "_Settings"
 msgstr "_Impostazioni"
 
-#: po/tmp/evolution.xml.h:33
+#: ui/evolution.xml.h:33
 msgid "_Task (FIXME)"
 msgstr ""
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2470
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -6765,16 +7167,16 @@ msgstr "Tutti i partecipanti"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:416
+#: widgets/misc/e-calendar-item.c:421
 msgid "MTWTFSS"
 msgstr "LMMGVSD"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
+#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-clipped-label.c:107
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
@@ -6799,44 +7201,210 @@ msgstr "%I:%M %p"
 msgid "Group %i"
 msgstr "Gruppo %i"
 
-#~ msgid "january"
-#~ msgstr "gennaio"
+#~ msgid "categories"
+#~ msgstr "categorie"
 
-#~ msgid "february"
-#~ msgstr "febbraio"
+#~ msgid "Item(s) belong to these categories:"
+#~ msgstr "Oggetto(i) appartenente a queste categorie:"
 
-#~ msgid "march"
-#~ msgstr "marzo"
+#~ msgid "Available Categories:"
+#~ msgstr "Categorie disponibili:"
 
-#~ msgid "april"
-#~ msgstr "aprile"
+#~ msgid "External Directories"
+#~ msgstr "Directory Esterne"
 
-#~ msgid "may"
-#~ msgstr "maggio"
+#~ msgid "Port Number:"
+#~ msgstr "Porta Numero:"
 
-#~ msgid "june"
-#~ msgstr "giugno"
+#~ msgid "Outline:"
+#~ msgstr "Linea:"
 
-#~ msgid "july"
-#~ msgstr "luglio"
+#~ msgid "Headings:"
+#~ msgstr "Titoli:"
 
-#~ msgid "august"
-#~ msgstr "agosto"
+#~ msgid "Empty days:"
+#~ msgstr "Giorni liberi:"
 
-#~ msgid "september"
-#~ msgstr "settembre"
+#~ msgid "Appointments:"
+#~ msgstr "Appuntamenti:"
 
-#~ msgid "sept"
-#~ msgstr "set"
+#~ msgid "Highlighted day:"
+#~ msgstr "Giorno evidenziato:"
+
+#~ msgid "Day numbers:"
+#~ msgstr "Data:"
 
-#~ msgid "october"
-#~ msgstr "ottobre"
+#~ msgid "Current day's number:"
+#~ msgstr "Data odierna:"
 
-#~ msgid "november"
-#~ msgstr "novembre"
+#~ msgid "To-Do item that is not yet due:"
+#~ msgstr "Obiettivo non ancora raggiunto:"
 
-#~ msgid "december"
-#~ msgstr "dicembre"
+#~ msgid "To-Do item that is due today:"
+#~ msgstr "Obiettivo da raggiungere oggi:"
+
+#~ msgid "To-Do item that is overdue:"
+#~ msgstr "Obiettivo raggiunto:"
+
+#~ msgid "appointment"
+#~ msgstr "appuntamento"
+
+#, fuzzy
+#~ msgid "task"
+#~ msgstr "Obiettivo"
+
+#~ msgid "journal entry"
+#~ msgstr "voce nell'agenda"
+
+#~ msgid "Year:"
+#~ msgstr "Anno:"
+
+#~ msgid ""
+#~ "Please select the date you want to go to.\n"
+#~ "When you click on a day, you will be taken\n"
+#~ "to that date."
+#~ msgstr ""
+#~ "Selezionare la data a cui si vuole andare.\n"
+#~ "Clickando su un giorno, si viene spostati\n"
+#~ "su quella data."
+
+#~ msgid "Deleted"
+#~ msgstr "Eliminato"
+
+#~ msgid "Draft"
+#~ msgstr "Bozze"
+
+#~ msgid "Mail Source"
+#~ msgstr "Sorgente della Posta"
+
+#~ msgid ""
+#~ "Your email configuration is now complete.\n"
+#~ "Click \"Finish\" to save your new settings"
+#~ msgstr ""
+#~ "la configurazione della posta Х completata.\n"
+#~ "Clicca \"Fine\" per salvare le nuove impostazioni"
+
+#~ msgid "Sending a message without a subject"
+#~ msgstr "Invio di un messaggio senza oggetto"
+
+#~ msgid "Send \"%s\""
+#~ msgstr "Invia \"%s\""
+
+#~ msgid "Send a message without a subject"
+#~ msgstr "Invia un messaggio senza oggetto"
+
+#~ msgid "Expunge \"%s\""
+#~ msgstr "Elimina \"%s\""
+
+#~ msgid "Marking messages in folder \"%s\""
+#~ msgstr "Segnatura dei messaggi nella cartella \"%s\" in corso"
+
+#~ msgid "Mark messages in folder \"%s\""
+#~ msgstr "Segna i messaggi nella cartella \"%s\""
+
+#~ msgid "Marking message %d of %d"
+#~ msgstr "Sto segnando il messaggio %d di %d"
+
+#~ msgid "Scan folders in \"%s\""
+#~ msgstr "Scansione delle cartelle in \"%s\""
+
+#~ msgid "Attaching messages from folder \"%s\""
+#~ msgstr "Allega messaggi dalla cartella \"%s\""
+
+#~ msgid "Attach messages from \"%s\""
+#~ msgstr "Allega messaggi da \"%s\""
+
+#~ msgid "Forwarding messages \"%s\""
+#~ msgstr "Inoltro messaggi \"%s\" in corso"
+
+#~ msgid "Forwarding a message without a subject"
+#~ msgstr "Inoltro messaggio senza oggetto in corso"
+
+#~ msgid "Forward message \"%s\""
+#~ msgstr "Inoltra messaggio \"%s\""
+
+#~ msgid "Forward a message without a subject"
+#~ msgstr "Inoltra un messaggio senza oggetto"
+
+#~ msgid ""
+#~ "Failed to generate mime part from message while generating forwarded message."
+#~ msgstr ""
+#~ "Non Х riuscita la generazione della parte mime durante la generazione\n"
+#~ "del messaggio da inoltrare. "
+
+#~ msgid "Loading \"%s\""
+#~ msgstr "Caricamento \"%s\" in corso"
+
+#~ msgid "Load \"%s\""
+#~ msgstr "Carica \"%s\""
+
+#~ msgid "Creating \"%s\""
+#~ msgstr "Creazione in corso \"%s\""
+
+#~ msgid "Create \"%s\""
+#~ msgstr "Crea \"%s\""
+
+#~ msgid "Exception while reporting result to shell component listener."
+#~ msgstr ""
+#~ "Eccezione nel riportare il risultato al componente di ascolto della\n"
+#~ "shell."
+
+#~ msgid "Synchronize \"%s\""
+#~ msgstr "Sincronizza \"%s\""
+
+#~ msgid "Displaying message UID \"%s\""
+#~ msgstr "Visualizzazione UID \"%s\" del messaggio"
+
+#~ msgid "Clearing message display"
+#~ msgstr "Pulizia del display dei messaggi"
+
+#~ msgid "Display message UID \"%s\""
+#~ msgstr "Visualizza UID \"%s\" del messaggio"
+
+#~ msgid "Clear message display"
+#~ msgstr "Pulisci il display dei messaggi"
+
+#~ msgid "Opening messages from folder \"%s\""
+#~ msgstr "Apertura messaggi dalla cartella \"%s\""
+
+#~ msgid "Open messages from \"%s\""
+#~ msgstr "Apri i messaggi di \"%s\""
+
+#~ msgid "Viewing messages from folder \"%s\""
+#~ msgstr "Visulaizzazione messaggi dalla cartella \"%s\""
+
+#~ msgid "View messages from \"%s\""
+#~ msgstr "Visualizza messaggi di \"%s\""
+
+#~ msgid "Retrieving message %d of %d (uid \"%s\")"
+#~ msgstr "Ricezione del messaggio %d di %d (uid \"%s\")"
+
+#~ msgid "Saving messages from folder \"%s\""
+#~ msgstr "Salvare messaggi dalla cartella \"%s\""
+
+#~ msgid "Save messages from folder \"%s\""
+#~ msgstr "Salva messaggi dalla cartella \"%s\""
+
+#~ msgid "Rebuilding message view"
+#~ msgstr "Rivisualizzazione del messaggio"
+
+#~ msgid "Rebuild message view"
+#~ msgstr "Rivisualizza il messaggio"
+
+#~ msgid "N_ew Directory Server"
+#~ msgstr "N_uovo Server delle Directory"
+
+#~ msgid "_Actions"
+#~ msgstr "_Azioni"
+
+#~ msgid "_Save Calendar As"
+#~ msgstr "_Salva Calendario come"
+
+#~ msgid "may"
+#~ msgstr "maggio"
+
+#~ msgid "sept"
+#~ msgstr "set"
 
 #~ msgid "sunday"
 #~ msgstr "domenica"
diff --git a/po/ja.po b/po/ja.po
index 4a33180de5..054dfaa951 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -2,10 +2,11 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Akira TAGOH <tagoh@gnome.gr.jp>, 2000.
 #
+#: camel/providers/smtp/camel-smtp-transport.c:287
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution CVS-20001211\n"
-"POT-Creation-Date: 2000-12-13 16:26-0600\n"
+"POT-Creation-Date: 2001-01-06 00:11+0100\n"
 "PO-Revision-Date: 2000-12-11 21:58+0900\n"
 "Last-Translator: Akira TAGOH <tagoh@gnome.gr.jp>\n"
 "Language-Team: Japanese <translation@gnome.gr.jp>\n"
@@ -291,10 +292,10 @@ msgstr ""
 #: addressbook/backend/ebook/load-pine-addressbook.c:17
 #: addressbook/backend/ebook/test-client-list.c:18
 #: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:991
+#: addressbook/conduit/address-conduit.c:1083
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1136
-#: calendar/conduits/todo/todo-conduit.c:945 calendar/gui/main.c:54
+#: calendar/conduits/calendar/calendar-conduit.c:1151
+#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo ╓н╫И╢Э╡╫╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
@@ -417,54 +418,37 @@ msgstr ""
 "gnome-pilot ╔г║╪╔Б╔С╓╚╓И╔я╔╓╔М╔ц╔х╔Й╔╧╔х╓Р\n"
 "╪Хфю╓╥╓Х╓╕╓х╓╥╓©╩Ч╓к╔╗╔И║╪╓╛х╞ю╦╓╥╓ч╓╥╓©"
 
-#: addressbook/conduit/address-conduit.c:197
+#: addressbook/conduit/address-conduit.c:195
 msgid "Cursor could not be loaded\n"
 msgstr "╔╚║╪╔╫╔К╓офи╓ъ╧Ч╓ч╓Л╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©\n"
 
-#: addressbook/conduit/address-conduit.c:210
+#: addressbook/conduit/address-conduit.c:208
 msgid "EBook not loaded\n"
 msgstr "EBook ╓о╔М║╪╔и╓╣╓Л╓ф╓╓╓ч╓╩╓С\n"
 
-#: addressbook/conduit/address-conduit.c:583
-#: calendar/conduits/calendar/calendar-conduit.c:715
-#: calendar/conduits/todo/todo-conduit.c:523
+#: addressbook/conduit/address-conduit.c:646
+#: calendar/conduits/calendar/calendar-conduit.c:730
+#: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat server"
 msgstr "wombat ╔╣║╪╔п╓РЁ╚╩о╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
-#: addressbook/conduit/address-conduit.c:584
-#: calendar/conduits/calendar/calendar-conduit.c:716
-#: calendar/conduits/todo/todo-conduit.c:524
+#: addressbook/conduit/address-conduit.c:647
+#: calendar/conduits/calendar/calendar-conduit.c:731
+#: calendar/conduits/todo/todo-conduit.c:546
 msgid "Could not start wombat"
 msgstr "wombat ╓РЁ╚╩о╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
-#: addressbook/conduit/address-conduit.c:616
-#: addressbook/conduit/address-conduit.c:619
+#: addressbook/conduit/address-conduit.c:679
+#: addressbook/conduit/address-conduit.c:682
 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 "╔Ё╔С╔©╔╞╔х╓Р╨О╫Э?"
 
@@ -478,7 +462,7 @@ msgid "_Add"
 msgstr "ди╡ц(_A)"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:48
+#: ui/evolution-event-editor.xml.h:108 ui/evolution-mail.xml.h:53
 msgid "_Delete"
 msgstr "╨О╫Э(_D)"
 
@@ -492,12 +476,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 "ди╡ц"
 
@@ -538,7 +523,7 @@ msgid "_Mobile"
 msgstr "╔Б╔п╔╓╔К(_M)"
 
 #: 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 "╪Гмв╓й E ╔А║╪╔К"
 
@@ -555,7 +540,7 @@ msgid "C_ontacts..."
 msgstr "╔Ё╔С╔©╔╞╔х(_o)..."
 
 #: 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 "╔╚╔ф╔╢╔Й(_t)..."
 
@@ -572,7 +557,8 @@ msgid "_Address..."
 msgstr "╫╩╫Й(_A)..."
 
 #: 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 "╟Лхл"
 
@@ -617,143 +603,143 @@ msgid "No_tes:"
 msgstr "╔н║╪╔х(_t):"
 
 #: 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 "╩е╩Ж╓н FAX"
 
-#: 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 "╡х╓н FAX"
 
-#: 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 "╓╫╓нб╬╓н FAX"
 
-#: 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 "E ╔А║╪╔К2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1330
+#: addressbook/contact-editor/e-contact-editor.c:1338
 msgid "Email 3"
 msgstr "E ╔А║╪╔К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(_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 "╧Я(_y):"
 
-#: 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 "USA"
 
-#: po/tmp/fulladdr.glade.h:12
+#: addressbook/contact-editor/fulladdr.glade.h:12
 msgid "_Address:"
 msgstr "╫╩╫Й(_A):"
 
-#: po/tmp/fulladdr.glade.h:13
+#: addressbook/contact-editor/fulladdr.glade.h:13
 msgid "_City:"
 msgstr "╩тд╝б╪(_C):"
 
-#: 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 "╤Х/╫ё(_S):"
 
-#: po/tmp/fulladdr.glade.h:16
+#: addressbook/contact-editor/fulladdr.glade.h:16
 msgid "_ZIP Code:"
 msgstr "м╧йьхж╧Ф(_Z):"
 
@@ -767,10 +753,13 @@ msgid "Check Full Name"
 msgstr "╔у╔К╔м║╪╔Ю╓н╔а╔╖╔ц╔╞"
 
 #: addressbook/contact-editor/fullname-strings.h:8
+#, fuzzy
 msgid ""
 "\n"
 "Mr.\n"
 "Mrs.\n"
+"Ms.\n"
+"Miss\n"
 "Dr.\n"
 msgstr ""
 "\n"
@@ -778,7 +767,7 @@ msgstr ""
 "Mrs.\n"
 "Dr.\n"
 
-#: addressbook/contact-editor/fullname-strings.h:13
+#: addressbook/contact-editor/fullname-strings.h:15
 msgid ""
 "\n"
 "Sr.\n"
@@ -796,44 +785,49 @@ msgstr ""
 "III\n"
 "Esq.\n"
 
-#: addressbook/contact-editor/fullname-strings.h:21
+#: addressbook/contact-editor/fullname-strings.h:23
 msgid "_First:"
 msgstr "л╬(_F):"
 
-#: addressbook/contact-editor/fullname-strings.h:22
+#: addressbook/contact-editor/fullname-strings.h:24
 msgid "_Title:"
 msgstr "╥и╬н(а╟╓д╓╠)(_T):"
 
-#: addressbook/contact-editor/fullname-strings.h:23
+#: addressbook/contact-editor/fullname-strings.h:25
 msgid "_Middle:"
 msgstr "цФ╢жл╬(_M):"
 
-#: addressbook/contact-editor/fullname-strings.h:24
+#: addressbook/contact-editor/fullname-strings.h:26
 msgid "_Last:"
 msgstr "ю╚(_L):"
 
-#: addressbook/contact-editor/fullname-strings.h:25
+#: addressbook/contact-editor/fullname-strings.h:27
 msgid "_Suffix:"
 msgstr "╥и╬н(╦Е╓д╓╠)(_S):"
 
-#: addressbook/gui/component/addressbook.c:263
+#: addressbook/gui/component/addressbook.c:231
 msgid "As _Minicards"
 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/gui/component/addressbook.c:269
-#: po/tmp/evolution-addressbook.xml.h:6
+#: addressbook/gui/component/addressbook.c:237
+#: ui/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr "╔ф║╪╔ж╔К(_T)"
 
-#: addressbook/gui/component/addressbook.c:386
+#: addressbook/gui/component/addressbook.c:374
+#, fuzzy, c-format
+msgid "Enter password for %s"
+msgstr "%s@%s ╓н NNTP ╔я╔╧╔О║╪╔и╓РфЧно╓╥╓ф╓╞╓ю╓╣╓╓"
+
+#: addressbook/gui/component/addressbook.c:402
 msgid "Unable to open addressbook"
 msgstr "╫╩╫Йо©╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С"
 
-#: addressbook/gui/component/addressbook.c:391
+#: 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"
@@ -854,77 +848,207 @@ msgstr ""
 "╔ю╔╕╔С╔М║╪╔и║╓╓╫╓╥╓ф╔╓╔С╔╧╔х║╪╔К╓╥╓ф, ╔Ё╔С╔я╔╓╔К╩ед╬╓╥\n"
 "╓ф Evolution ╓Р╔╓╔С╔╧╔х║╪╔К╓╧╓Ки╛мв╓╛╓╒╓Й╓г╓╥╓Г╓╕.\n"
 
-#: addressbook/gui/component/addressbook.c:501 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:503 mail/folder-browser.c:138
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 msgid "Advanced..."
 msgstr "╬э╨ы..."
 
-#: addressbook/gui/component/addressbook.c:533
+#: addressbook/gui/component/addressbook.c:560
 msgid "Any field contains"
 msgstr "╔у╔ё║╪╔К╔и╓╛╪║╓н╓Б╓н╓Р╢ч╓Ю"
 
-#: addressbook/gui/component/addressbook.c:534
+#: addressbook/gui/component/addressbook.c:561
 msgid "Name contains"
 msgstr "л╬а╟╓╛╪║╓н╓Б╓н╓Р╢ч╓Ю"
 
-#: addressbook/gui/component/addressbook.c:535
+#: addressbook/gui/component/addressbook.c:562
 msgid "Email contains"
 msgstr "E ╔А║╪╔К╓╛╪║╓н╓Б╓н╓Р╢ч╓Ю"
 
-#: addressbook/gui/component/addressbook.c:621
+#: addressbook/gui/component/addressbook.c:648
 msgid "The URI that the Folder Browser will display"
 msgstr "╔у╔╘╔К╔ю╔ж╔И╔╕╔╤╓╛и╫╪╗╓╧╓К URI"
 
-#: addressbook/gui/component/e-ldap-storage.c:88
-msgid "External Directories"
-msgstr "Ё╟иТ╔г╔ё╔Л╔╞╔х╔Й"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/e-msg-composer-attachment.glade.h:7
-#: po/tmp/ldap-server-dialog.glade.h:6
-msgid "Description:"
-msgstr "юБлю:"
+#: addressbook/gui/component/addressbook-storage.c:95
+#, fuzzy
+msgid "Other Contacts"
+msgstr "╔Ё╔С╔©╔╞╔х╓Р╨О╫Э?"
 
-#: po/tmp/ldap-server-dialog.glade.h:7
-msgid "LDAP Server:"
+#: addressbook/gui/component/addressbook-config.c:139
+#, fuzzy
+msgid "LDAP Server"
 msgstr "LDAP ╔╣║╪╔п:"
 
-#: po/tmp/ldap-server-dialog.glade.h:8
-msgid "Name:"
-msgstr "л╬а╟:"
+#: addressbook/gui/component/addressbook-config.c:141
+#, fuzzy
+msgid "File"
+msgstr "╔у╔║╔╓╔К(_F)"
+
+#: 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 ""
 
-#: po/tmp/ldap-server-dialog.glade.h:9
-msgid "Port Number:"
-msgstr "╔щ║╪╔ххж╧Ф:"
+#: addressbook/gui/component/addressbook-config.c:160
+#, fuzzy
+msgid "Unknown auth type"
+msgstr "л╓цн╓н╔╗╔И║╪"
 
-#: po/tmp/ldap-server-dialog.glade.h:10
+#: 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 "м╔юХ╫Г╟л(_P):"
+
+#: addressbook/gui/component/addressbook-config.c:364
 msgid "Root DN:"
 msgstr "Root DN:"
 
+#: 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
+msgid "Name:"
+msgstr "л╬а╟:"
+
+#: 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 "л╬а╟:"
+
+#: 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
@@ -933,119 +1057,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 "a"
 
-#: po/tmp/alphabet.glade.h:8
+#: addressbook/gui/widgets/alphabet.glade.h:8
 msgid "b"
 msgstr "b"
 
-#: po/tmp/alphabet.glade.h:9
+#: addressbook/gui/widgets/alphabet.glade.h:9
 msgid "c"
 msgstr "c"
 
-#: po/tmp/alphabet.glade.h:10
+#: addressbook/gui/widgets/alphabet.glade.h:10
 msgid "d"
 msgstr "d"
 
-#: po/tmp/alphabet.glade.h:11
+#: addressbook/gui/widgets/alphabet.glade.h:11
 msgid "e"
 msgstr "e"
 
-#: po/tmp/alphabet.glade.h:12
+#: addressbook/gui/widgets/alphabet.glade.h:12
 msgid "f"
 msgstr "f"
 
-#: po/tmp/alphabet.glade.h:13
+#: addressbook/gui/widgets/alphabet.glade.h:13
 msgid "g"
 msgstr "g"
 
-#: calendar/cal-util/timeutil.c:100 po/tmp/alphabet.glade.h:14
+#: addressbook/gui/widgets/alphabet.glade.h:14
 msgid "h"
 msgstr "h"
 
-#: po/tmp/alphabet.glade.h:15
+#: addressbook/gui/widgets/alphabet.glade.h:15
 msgid "i"
 msgstr "i"
 
-#: po/tmp/alphabet.glade.h:16
+#: addressbook/gui/widgets/alphabet.glade.h:16
 msgid "j"
 msgstr "j"
 
-#: po/tmp/alphabet.glade.h:17
+#: addressbook/gui/widgets/alphabet.glade.h:17
 msgid "k"
 msgstr "k"
 
-#: po/tmp/alphabet.glade.h:18
+#: addressbook/gui/widgets/alphabet.glade.h:18
 msgid "l"
 msgstr "l"
 
-#: po/tmp/alphabet.glade.h:19
+#: addressbook/gui/widgets/alphabet.glade.h:19
 msgid "m"
 msgstr "m"
 
-#: po/tmp/alphabet.glade.h:20
+#: addressbook/gui/widgets/alphabet.glade.h:20
 msgid "n"
 msgstr "n"
 
-#: po/tmp/alphabet.glade.h:21
+#: addressbook/gui/widgets/alphabet.glade.h:21
 msgid "o"
 msgstr "o"
 
-#: po/tmp/alphabet.glade.h:22
+#: addressbook/gui/widgets/alphabet.glade.h:22
 msgid "p"
 msgstr "p"
 
-#: po/tmp/alphabet.glade.h:23
+#: addressbook/gui/widgets/alphabet.glade.h:23
 msgid "q"
 msgstr "q"
 
-#: po/tmp/alphabet.glade.h:24
+#: addressbook/gui/widgets/alphabet.glade.h:24
 msgid "r"
 msgstr "r"
 
-#: po/tmp/alphabet.glade.h:25
+#: addressbook/gui/widgets/alphabet.glade.h:25
 msgid "s"
 msgstr "s"
 
-#: po/tmp/alphabet.glade.h:26
+#: addressbook/gui/widgets/alphabet.glade.h:26
 msgid "t"
 msgstr "t"
 
-#: po/tmp/alphabet.glade.h:27
+#: addressbook/gui/widgets/alphabet.glade.h:27
 msgid "u"
 msgstr "u"
 
-#: po/tmp/alphabet.glade.h:28
+#: addressbook/gui/widgets/alphabet.glade.h:28
 msgid "v"
 msgstr "v"
 
-#: po/tmp/alphabet.glade.h:29
+#: addressbook/gui/widgets/alphabet.glade.h:29
 msgid "w"
 msgstr "w"
 
-#: po/tmp/alphabet.glade.h:30
+#: addressbook/gui/widgets/alphabet.glade.h:30
 msgid "x"
 msgstr "x"
 
-#: po/tmp/alphabet.glade.h:31
+#: addressbook/gui/widgets/alphabet.glade.h:31
 msgid "y"
 msgstr "y"
 
-#: po/tmp/alphabet.glade.h:32
+#: addressbook/gui/widgets/alphabet.glade.h:32
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:417
-#: addressbook/gui/widgets/e-minicard.c:338
+#: addressbook/gui/widgets/e-addressbook-view.c:451
+#: addressbook/gui/widgets/e-minicard.c:374
 msgid "Save as VCard"
 msgstr "VCard ╓гйщб╦"
 
@@ -1068,189 +1192,178 @@ 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 "10 pt. Tahoma"
 
-#: po/tmp/e-contact-print.glade.h:7
+#: addressbook/printing/e-contact-print.glade.h:7
 msgid "8 pt. Tahoma"
 msgstr "8 pt. Tahoma"
 
-#: 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"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:550
-#: calendar/gui/e-week-view.c:288 calendar/gui/print.c:605
-msgid "am"
-msgstr "╦Аа╟"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:553
-#: calendar/gui/e-week-view.c:291 calendar/gui/print.c:604
-msgid "pm"
-msgstr "╦А╦Е"
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 msgid "Evolution Calendar Conduit"
 msgstr "Evolution ╔╚╔Л╔С╔ю╔Ё╔С╔╦╔ц╔х"
@@ -1259,13 +1372,13 @@ msgstr "Evolution ╔╚╔Л╔С╔ю╔Ё╔С╔╦╔ц╔х"
 msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr "Evolution ╔╚╔Л╔С╔ю╔Ё╔С╔╦╔ц╔х╓н╓©╓А╓нюъдЙ╔Ф║╪╔ф╔ё╔Й╔ф╔ё╓г╓╧\n"
 
-#: calendar/conduits/calendar/calendar-conduit.c:671
-#: calendar/conduits/todo/todo-conduit.c:479
+#: calendar/conduits/calendar/calendar-conduit.c:686
+#: calendar/conduits/todo/todo-conduit.c:501
 msgid "Error while communicating with calendar server"
 msgstr "╔╚╔Л╔С╔ю╔╣║╪╔п╓гдл©╝цФ╓к╔╗╔И║╪╓╛х╞ю╦╓╥╓ч╓╥╓©"
 
-#: calendar/conduits/calendar/calendar-conduit.c:770
-#: calendar/conduits/calendar/calendar-conduit.c:773
+#: calendar/conduits/calendar/calendar-conduit.c:785
+#: calendar/conduits/calendar/calendar-conduit.c:788
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 "╔я╔╓╔М╔ц╔х╓н╔╚╔Л╔С╔ю╔╒╔в╔Й╔╠║╪╔╥╔Г╔С╔ж╔М╔ц╔╞╓Рфи╓ъ╧Ч╓Ю╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
@@ -1278,124 +1391,162 @@ msgstr "Evolution ToDo ╔Ё╔С╔╦╔ц╔х"
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr "Evolutiuon ToDo ╔Ё╔С╔╦╔ц╔х╓н╓©╓А╓нюъдЙ╔Ф║╪╔ф╔ё╔Й╔ф╔ё╓г╓╧\n"
 
-#: calendar/conduits/todo/todo-conduit.c:578
-#: calendar/conduits/todo/todo-conduit.c:581
+#: calendar/conduits/todo/todo-conduit.c:600
+#: calendar/conduits/todo/todo-conduit.c:603
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 "╔я╔╓╔М╔ц╔х╓н ToDo ╔╒╔в╔Й╔╠║╪╔╥╔Г╔С╔ж╔М╔ц╔╞╓Рфи╓ъ╧Ч╓Ю╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
-#: calendar/gui/calendar-commands.c:60
-msgid "Outline:"
-msgstr "Ё╣мв:"
+#.
+#. * 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/GNOME_Evolution_Calendar_Control.oaf.in.h:7
+msgid "Factory for the sample Calendar control"
+msgstr ""
+
+#.
+#. * 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:61
-msgid "Headings:"
-msgstr "╦╚╫п╓╥:"
+#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:7
+#, fuzzy
+msgid "Calendar Server"
+msgstr "╔╚╔Л╔С╔ю"
 
-#: calendar/gui/calendar-commands.c:62
-msgid "Empty days:"
-msgstr "╤У╓╜фЭ:"
+#.
+#. * 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:63
-msgid "Appointments:"
-msgstr "м╫лС:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Evolution ╔╚╔Л╔С╔ю╔Ё╔С╔╦╔ц╔х"
 
-#: calendar/gui/calendar-commands.c:64
-msgid "Highlighted day:"
-msgstr "╫емв╓йфЭ:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Evolution component for handling the calendar."
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:65
-msgid "Day numbers:"
-msgstr "фЭ©Т:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+msgid "Factory for the Calendar Summary component."
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:66
-msgid "Current day's number:"
-msgstr "╦╫╨ъ╓нфЭ©Т:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#, fuzzy
+msgid "Factory for the Evolution calendar component."
+msgstr "Evolution ╔╚╔Л╔С╔ю╔Ё╔С╔╦╔ц╔х╓н╓©╓А╓нюъдЙ╔Ф║╪╔ф╔ё╔Й╔ф╔ё╓г╓╧\n"
 
-#: calendar/gui/calendar-commands.c:67
-msgid "To-Do item that is not yet due:"
-msgstr "╓ч╓ю╢Э╦б╓нмХ╓ф╓╓╓й╓╓ ToDo ╔╒╔╓╔ф╔Ю:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+msgid "Factory for the calendar iTip view control"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:68
-msgid "To-Do item that is due today:"
-msgstr "╨ёфЭ╢Э╦б╓н ToDo ╔╒╔╓╔ф╔Ю:"
+#: 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:69
-msgid "To-Do item that is overdue:"
-msgstr "╢Э╦б╓н╡А╓╝╓© ToDo ╔╒╔╓╔ф╔Ю:"
+#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:8
+msgid "Snooze"
+msgstr "╣Ол╡╓Й"
 
-#: calendar/gui/calendar-commands.c:354
+#. 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 "Ok"
+
+#: 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:282
+#: 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:2498
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
 msgstr "%Y/%m/%d (%a)"
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:286 calendar/gui/calendar-model.c:736
+#: calendar/gui/calendar-model.c:288 calendar/gui/calendar-model.c:738
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Y/%m/%d (%a) %I:%M:%S"
 
 #. strftime format of a weekday, a date and a time,
 #. in 12-hour format.
-#: calendar/gui/calendar-model.c:290 calendar/gui/calendar-model.c:739
+#: calendar/gui/calendar-model.c:292 calendar/gui/calendar-model.c:741
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
 
-#: calendar/gui/calendar-model.c:344 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:347 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:350 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:353 calendar/gui/calendar-model.c:521
+#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:523
 msgid "Unknown"
 msgstr "л╓цн"
 
-#: calendar/gui/calendar-model.c:441
+#: calendar/gui/calendar-model.c:443
 msgid "N"
 msgstr "кл"
 
-#: calendar/gui/calendar-model.c:441
+#: calendar/gui/calendar-model.c:443
 msgid "S"
 msgstr "фН"
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:445
 msgid "E"
 msgstr "еЛ"
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:445
 msgid "W"
 msgstr "ю╬"
 
-#: calendar/gui/calendar-model.c:515
+#: calendar/gui/calendar-model.c:517
 msgid "Transparent"
 msgstr "ф╘лю"
 
-#: calendar/gui/calendar-model.c:518
+#: calendar/gui/calendar-model.c:520
 msgid "Opaque"
 msgstr "итф╘лю"
 
-#: calendar/gui/calendar-model.c:744
+#: calendar/gui/calendar-model.c:746
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1407,35 +1558,35 @@ msgstr ""
 "%s"
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:845 calendar/gui/calendar-model.c:893
+#: 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:1274 widgets/misc/e-dateedit.c:1455
+#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
 #. 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:863
+#: calendar/gui/calendar-model.c:865
 msgid "%I:%M:%S %p%n"
 msgstr "%H:%M:%S %p%n"
 
 #. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:866
+#: 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:870
+#: 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:873
+#: calendar/gui/calendar-model.c:875
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
-#: calendar/gui/calendar-model.c:993
+#: calendar/gui/calendar-model.c:995
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1445,14 +1596,37 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1033
+#: 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:1073
+#: 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 "%Y/%B/%d %A"
+
+#: 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"
@@ -1470,350 +1644,387 @@ 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:1466 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:62
+#, c-format
+msgid "Are you sure you want to delete the appointment `%s'?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:65
+msgid "Are you sure you want to delete this untitled appointment?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:71
+#, c-format
+msgid "Are you sure you want to delete the task `%s'?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:74
+msgid "Are you sure you want to delete this untitled task?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:80
+#, c-format
+msgid "Are you sure you want to delete the journal entry `%s'?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:83
+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 "% ╢╟н╩(_l):"
 
-#: po/tmp/task-editor-dialog.glade.h:7
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
 msgid "C_lassification:"
 msgstr "й╛нЮ(_l)"
 
-#: 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
-#: widgets/misc/e-dateedit.c:422 widgets/misc/e-dateedit.c:1331
-#: widgets/misc/e-dateedit.c:1446
+#: 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 "мвлС(_u)"
 
-#: po/tmp/task-editor-dialog.glade.h:23
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
 msgid "Sta_rt Date:"
 msgstr "Ё╚╩офЭ╩Ч(_r):"
 
-#: 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 "╔Ё╔С╔©╔╞╔х(_C)..."
 
-#: po/tmp/task-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
 msgid "_Due Date:"
 msgstr "╢ЭфЭ(_D):"
 
-#: po/tmp/task-editor-dialog.glade.h:28
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
 msgid "_Priority:"
 msgstr "м╔юХ╫Г╟л(_P):"
 
-#: po/tmp/task-editor-dialog.glade.h:29
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
 msgid "_Status:"
 msgstr "╬У╤╥(_S):"
 
-#: po/tmp/task-editor-dialog.glade.h:30
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
 msgid "task-editor-dialog"
 msgstr "╨Н╤х╔╗╔г╔ё╔©╔ю╔╓╔╒╔М╔╟"
 
@@ -1821,26 +2032,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:3277
+#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3250
 msgid "Do you want to save changes?"
 msgstr ""
 
@@ -1860,14 +2071,6 @@ msgstr "╢╟н╩╓Р╔ч║╪╔╞"
 msgid "Mark the task complete"
 msgstr "╢╟н╩╓╥╓©╨Н╤х╓Р╔ч║╪╔╞╓╥╓ч╓╧"
 
-#: calendar/gui/e-calendar-table.c:342 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:479 mail/mail-view.c:165
-#: 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 "╨Н╤х╓Р╨О╫Э╓╧╓К"
@@ -1879,50 +2082,62 @@ msgstr "%02i й╛й╛ЁД"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1208
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1211
 #: calendar/gui/e-week-view-main-item.c:325
 msgid "%A %d %B"
 msgstr "%B %d %A"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1222
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1225
 #: calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr "%b/%d (%a)"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1235
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1238
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%b/%d"
 
-#: calendar/gui/e-day-view.c:2941 calendar/gui/e-day-view.c:2948
-#: calendar/gui/e-day-view.c:2957 calendar/gui/e-week-view.c:3165
-#: calendar/gui/e-week-view.c:3172 calendar/gui/e-week-view.c:3181
+#. 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: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:609
+msgid "pm"
+msgstr "╦А╦Е"
+
+#: calendar/gui/e-day-view.c:2948 calendar/gui/e-day-view.c:2955
+#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3169
+#: calendar/gui/e-week-view.c:3176 calendar/gui/e-week-view.c:3185
 msgid "New appointment..."
 msgstr "©╥╣╛м╫лС..."
 
-#: calendar/gui/e-day-view.c:2945 calendar/gui/e-day-view.c:2952
-#: calendar/gui/e-week-view.c:3169 calendar/gui/e-week-view.c:3176
+#: calendar/gui/e-day-view.c:2952 calendar/gui/e-day-view.c:2959
+#: calendar/gui/e-week-view.c:3173 calendar/gui/e-week-view.c:3180
 msgid "Edit this appointment..."
 msgstr "╓Ё╓нм╫лС╓Рйт╫╦..."
 
-#: calendar/gui/e-day-view.c:2946 calendar/gui/e-week-view.c:3170
-#: po/tmp/evolution-event-editor.xml.h:20
+#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3174
+#: ui/evolution-event-editor.xml.h:20
 msgid "Delete this appointment"
 msgstr "╓Ё╓нм╫лС╓Р╨О╫Э"
 
-#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3177
+#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3181
 msgid "Make this appointment movable"
 msgstr "╓Ё╓нм╫лС╓Р╡дф╟╓к╓╧╓К"
 
-#: calendar/gui/e-day-view.c:2954 calendar/gui/e-week-view.c:3178
+#: calendar/gui/e-day-view.c:2961 calendar/gui/e-week-view.c:3182
 msgid "Delete this occurrence"
 msgstr "╓Ё╓н╫пмХ╩Ж╓Р╨О╫Э"
 
-#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3179
+#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3183
 msgid "Delete all occurrences"
 msgstr "╓╧╓ы╓ф╓н╫пмХ╩Ж╓Р╨О╫Э"
 
@@ -1934,657 +2149,485 @@ msgid "%d %B"
 msgstr "%B %d"
 
 #.
-#. * 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 "кХфЭ╓н╔╓╔ы╔С╔х(_l)"
 
-#: 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 "╔А║╪╔К╓наВ╓ЙюХ(_t):"
 
-#: 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 "╩Де╙(_v)"
 
-#: po/tmp/event-editor-dialog.glade.h:23
+#: calendar/gui/event-editor-dialog.glade.h:23
 msgid "Pu_blic"
 msgstr "╦Ье╙(_b)"
 
-#: 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 "мвлС(_m):"
 
-#: 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 "╔╙║╪╔г╔ё╔╙(_A)"
 
-#: po/tmp/event-editor-dialog.glade.h:31
+#: calendar/gui/event-editor-dialog.glade.h:31
 msgid "_Confidential"
 msgstr "╣║л╘(_C)"
 
-#: po/tmp/event-editor-dialog.glade.h:32
+#: calendar/gui/event-editor-dialog.glade.h:32
 msgid "_Display"
 msgstr "и╫╪╗(_D)"
 
-#: po/tmp/event-editor-dialog.glade.h:33
+#: calendar/gui/event-editor-dialog.glade.h:33
 msgid "_End time:"
 msgstr "╫╙н╩╩Ч╢ж(_E):"
 
-#: po/tmp/event-editor-dialog.glade.h:34
+#: calendar/gui/event-editor-dialog.glade.h:34
 msgid "_Mail"
 msgstr "╔А║╪╔К(_M)"
 
-#: po/tmp/event-editor-dialog.glade.h:35
+#: calendar/gui/event-editor-dialog.glade.h:35
 msgid "_Program"
 msgstr "╔в╔М╔╟╔И╔Ю(_P)"
 
-#: po/tmp/event-editor-dialog.glade.h:36
+#: calendar/gui/event-editor-dialog.glade.h:36
 msgid "_Run program:"
 msgstr "╔в╔М╔╟╔И╔Ю╓Р╪б╧т(_R):"
 
-#: po/tmp/event-editor-dialog.glade.h:37
+#: calendar/gui/event-editor-dialog.glade.h:37
 msgid "_Start time:"
 msgstr "Ё╚╩о╩Ч╢ж(_S):"
 
-#: po/tmp/event-editor-dialog.glade.h:38
+#: calendar/gui/event-editor-dialog.glade.h:38
 msgid "_Starting date:"
 msgstr "Ё╚╩офЭ(_S):"
 
-#: 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 "label21"
 
-#: 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
 msgid "on"
 msgstr ""
 
-#: calendar/gui/event-editor.c:432 calendar/gui/getdate.y:424
-#: 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
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/event-editor.c:566
+#: calendar/gui/event-editor.c:562
 msgid "th"
 msgstr ""
 
-#: calendar/gui/event-editor.c:722
+#: calendar/gui/event-editor.c:716
 msgid "occurrences"
 msgstr "╫пмХ╩Ж"
 
-#: calendar/gui/event-editor.c:839
+#: calendar/gui/event-editor.c:833
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "╓Ё╓нм╫лС╓о Evolution ╓╛йт╫╦╫пмХ╓й╓╓╨фх╞╓Р╢ч╓С╓г╓╓╓ч╓╧"
 
-#: calendar/gui/event-editor.c:3079 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 "%Y/%b/%d (%a)"
 
-#: calendar/gui/getdate.y:391
-msgid "january"
-msgstr "1╥Н"
+#: calendar/gui/gnome-cal.c:676
+#, c-format
+msgid "Could not load the calendar in `%s'"
+msgstr "'%s' ╓н╔╚╔Л╔С╔ю╓Рфи╓ъ╧Ч╓Ю╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
-#: calendar/gui/getdate.y:392
-msgid "february"
-msgstr "2╥Н"
+#: calendar/gui/gnome-cal.c:687
+#, c-format
+msgid "Could not create a calendar in `%s'"
+msgstr "'%s' ╓н╔╚╔Л╔С╔ю╓Р╨Ню╝╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
-#: calendar/gui/getdate.y:393
-msgid "march"
-msgstr "3╥Н"
+#: calendar/gui/gnome-cal.c:698
+#, c-format
+msgid "The method required to load `%s' is not supported"
+msgstr "'%s' ╓Рфи╓ъ╧Ч╓Ю╓Ё╓х╓Рмв╣А╓╣╓Л╓КйЩк║╓о╔╣╔щ║╪╔х╓╥╓ф╓╓╓ч╓╩╓С"
 
-#: calendar/gui/getdate.y:394
-msgid "april"
+#.
+#. * 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
+#, fuzzy
+msgid "April"
 msgstr "4╥Н"
 
-#: calendar/gui/getdate.y:395
-msgid "may"
-msgstr "5╥Н"
-
-#: calendar/gui/getdate.y:396
-msgid "june"
-msgstr "6╥Н"
-
-#: calendar/gui/getdate.y:397
-msgid "july"
-msgstr "7╥Н"
-
-#: calendar/gui/getdate.y:398
-msgid "august"
+#: calendar/gui/goto-dialog.glade.h:7
+#, fuzzy
+msgid "August"
 msgstr "8╥Н"
 
-#: calendar/gui/getdate.y:399
-msgid "september"
-msgstr "9╥Н"
-
-#: calendar/gui/getdate.y:400
-msgid "sept"
-msgstr "9╥Н"
-
-#: calendar/gui/getdate.y:401
-msgid "october"
-msgstr "10╥Н"
-
-#: calendar/gui/getdate.y:402
-msgid "november"
-msgstr "11╥Н"
-
-#: calendar/gui/getdate.y:403
-msgid "december"
+#: calendar/gui/goto-dialog.glade.h:8
+#, fuzzy
+msgid "December"
 msgstr "12╥Н"
 
-#: calendar/gui/getdate.y:404
-msgid "sunday"
-msgstr "фЭмк"
-
-#: calendar/gui/getdate.y:405
-msgid "monday"
-msgstr "╥Нмк"
-
-#: calendar/gui/getdate.y:406
-msgid "tuesday"
-msgstr "╡пмк"
-
-#: calendar/gui/getdate.y:407
-msgid "tues"
-msgstr "╡пмк"
-
-#: calendar/gui/getdate.y:408
-msgid "wednesday"
-msgstr "©Емк"
-
-#: calendar/gui/getdate.y:409
-msgid "wednes"
-msgstr "©Емк"
-
-#: calendar/gui/getdate.y:410
-msgid "thursday"
-msgstr "лзмк"
-
-#: calendar/gui/getdate.y:411
-msgid "thur"
-msgstr "лзмк"
-
-#: calendar/gui/getdate.y:412
-msgid "thurs"
-msgstr "лзмк"
-
-#: calendar/gui/getdate.y:413
-msgid "friday"
-msgstr "╤Бмк"
-
-#: calendar/gui/getdate.y:414
-msgid "saturday"
-msgstr "езмк"
-
-#: calendar/gui/getdate.y:420 filter/filter-datespec.c:62
-msgid "year"
-msgstr "г╞"
-
-#: calendar/gui/getdate.y:421 filter/filter-datespec.c:63
-msgid "month"
-msgstr "╥Н"
-
-#: calendar/gui/getdate.y:422
-msgid "fortnight"
-msgstr "2╫╣╢ж"
-
-#: calendar/gui/getdate.y:423 filter/filter-datespec.c:64
-msgid "week"
-msgstr "╫╣"
-
-#: calendar/gui/getdate.y:425 filter/filter-datespec.c:66
-msgid "hour"
-msgstr "╩Ч"
-
-#: calendar/gui/getdate.y:426 filter/filter-datespec.c:67
-msgid "minute"
-msgstr "й╛"
-
-#: calendar/gui/getdate.y:427
-msgid "min"
-msgstr "й╛"
-
-#: calendar/gui/getdate.y:428 filter/filter-datespec.c:68
-msgid "second"
-msgstr " иц"
-
-#: calendar/gui/getdate.y:429
-msgid "sec"
-msgstr "иц"
-
-#: calendar/gui/getdate.y:435
-msgid "tomorrow"
-msgstr "люфЭ"
-
-#: calendar/gui/getdate.y:436
-msgid "yesterday"
-msgstr "╨РфЭ"
-
-#: calendar/gui/getdate.y:437
-msgid "today"
-msgstr "╨ёфЭ"
-
-#: calendar/gui/getdate.y:438 filter/filter-datespec.c:533
-#: filter/filter-datespec.c:693
-msgid "now"
-msgstr "╨ё"
-
-#: calendar/gui/getdate.y:439
-msgid "last"
-msgstr "╨г╦Е"
-
-#: calendar/gui/getdate.y:440
-msgid "this"
-msgstr "╓Ё╓Л"
-
-#: calendar/gui/getdate.y:441
-msgid "next"
-msgstr "╪║"
-
-#: calendar/gui/getdate.y:442
-msgid "first"
-msgstr "1хжлэ"
-
-#. { N_("second"),		tUNUMBER,	2 },
-#: calendar/gui/getdate.y:444
-msgid "third"
-msgstr "3хжлэ"
-
-#: calendar/gui/getdate.y:445
-msgid "fourth"
-msgstr "4хжлэ"
-
-#: calendar/gui/getdate.y:446
-msgid "fifth"
-msgstr "5хжлэ"
-
-#: calendar/gui/getdate.y:447
-msgid "sixth"
-msgstr "6хжлэ"
-
-#: calendar/gui/getdate.y:448
-msgid "seventh"
-msgstr "7хжлэ"
-
-#: calendar/gui/getdate.y:449
-msgid "eighth"
-msgstr "8хжлэ"
-
-#: calendar/gui/getdate.y:450
-msgid "ninth"
-msgstr "9хжлэ"
-
-#: calendar/gui/getdate.y:451
-msgid "tenth"
-msgstr "10хжлэ"
-
-#: calendar/gui/getdate.y:452
-msgid "eleventh"
-msgstr "11хжлэ"
+#: calendar/gui/goto-dialog.glade.h:9
+#, fuzzy
+msgid "February"
+msgstr "2╥Н"
 
-#: calendar/gui/getdate.y:453
-msgid "twelfth"
-msgstr "12хжлэ"
+#: calendar/gui/goto-dialog.glade.h:10
+#, fuzzy
+msgid "Go To Date"
+msgstr "фЭ╓к╓а╓ь╟эф╟"
 
-#: calendar/gui/getdate.y:454
-msgid "ago"
-msgstr "а╟"
+#: calendar/gui/goto-dialog.glade.h:11
+#, fuzzy
+msgid "Go To Today"
+msgstr "╨ёфЭ╓ь╟эф╟"
 
-#: calendar/gui/gnome-cal.c:718 calendar/gui/gnome-cal.c:1474
-#: calendar/gui/gnome-cal.c:1530
-msgid "Reminder of your appointment at "
-msgstr "╓╒╓й╓©╓нм╫лС╓н╨еб╔ "
+#: calendar/gui/goto-dialog.glade.h:12
+#, fuzzy
+msgid "January"
+msgstr "1╥Н"
 
-#: calendar/gui/gnome-cal.c:1152
-#, c-format
-msgid "Could not load the calendar in `%s'"
-msgstr "'%s' ╓н╔╚╔Л╔С╔ю╓Рфи╓ъ╧Ч╓Ю╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
+#: calendar/gui/goto-dialog.glade.h:13
+#, fuzzy
+msgid "July"
+msgstr "7╥Н"
 
-#: calendar/gui/gnome-cal.c:1163
-#, c-format
-msgid "Could not create a calendar in `%s'"
-msgstr "'%s' ╓н╔╚╔Л╔С╔ю╓Р╨Ню╝╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "June"
+msgstr "6╥Н"
 
-#: calendar/gui/gnome-cal.c:1174
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr "'%s' ╓Рфи╓ъ╧Ч╓Ю╓Ё╓х╓Рмв╣А╓╣╓Л╓КйЩк║╓о╔╣╔щ║╪╔х╓╥╓ф╓╓╓ч╓╩╓С"
+#: calendar/gui/goto-dialog.glade.h:15
+#, fuzzy
+msgid "March"
+msgstr "3╥Н"
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1479 calendar/gui/gnome-cal.c:1534
-#: mail/mail-search-dialogue.c:104
-msgid "Ok"
-msgstr "Ok"
+#: calendar/gui/goto-dialog.glade.h:16
+#, fuzzy
+msgid "May"
+msgstr "╥НмкфЭ"
 
-#: calendar/gui/goto.c:82
-msgid "Year:"
-msgstr "г╞:"
+#: calendar/gui/goto-dialog.glade.h:17
+#, fuzzy
+msgid "November"
+msgstr "11╥Н"
 
-#: calendar/gui/goto.c:270
-msgid "Go to date"
-msgstr "фЭ╓к╓а╓ь╟эф╟"
+#: calendar/gui/goto-dialog.glade.h:18
+#, fuzzy
+msgid "October"
+msgstr "10╥Н"
 
-#. Instructions
-#: calendar/gui/goto.c:281
-msgid ""
-"Please select the date you want to go to.\n"
-"When you click on a day, you will be taken\n"
-"to that date."
-msgstr ""
-"╟эф╟╓╥╓©╓╓фЭ╓к╓а╓Ра╙бР╓╥╓ф╡╪╓╣╓╓\n"
-"фЭ╓к╓а╓Р╔╞╔Й╔ц╔╞╓╥╓©╩Ч, ╓╫╓нфЭ╓к╓а╓к╓й╓К\n"
-"╓г╓╥╓Г╓╕"
+#: calendar/gui/goto-dialog.glade.h:19
+#, fuzzy
+msgid "September"
+msgstr "9╥Н"
 
-#: calendar/gui/goto.c:318
-msgid "Go to today"
-msgstr "╨ёфЭ╓ь╟эф╟"
+#: calendar/gui/main.c:49
+#, fuzzy
+msgid "Could not initialize GNOME"
+msgstr "Bonobo ╓н╫И╢Э╡╫╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
-#: 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 "╨ёфЭ╓нфЭиу [%Y/%b/%d (%a)]"
 
-#: 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 "%b/%d (%a)"
 
-#: calendar/gui/print.c:1081
+#: calendar/gui/print.c:1086
 msgid "%a %d %Y"
 msgstr "%Y/%d (%a)"
 
-#: 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 "╨ё╥Н (%Y/%b)"
 
 #. 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:962
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1001
 msgid "Print Preview"
 msgstr "╟У╨Ч╔в╔Л╔с╔Е║╪"
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: calendar/gui/weekday-picker.c:351 widgets/misc/e-calendar-item.c:416
-msgid "MTWTFSS"
-msgstr "MTWTFSS"
-
-#: calendar/gui/weekday-picker.c:353 calendar/gui/weekday-picker.c:443
+#: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
 msgid "SMTWTFS"
 msgstr "SMTWTFS"
 
@@ -2675,60 +2718,61 @@ msgstr "%s ╓Р╔М║╪╔и╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "%s ╓Р╔М║╪╔и╫пмХ╓ч╓╩╓С╓г╓╥╓©: ╔Б╔╦╔Е║╪╔К╓н╔Ё║╪╔и╓╛╫И╢Э╡╫╓╣╓Л╓ф╓╓╓ч╓╩╓С"
 
-#: camel/camel-remote-store.c:182
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr "%s ╔╣║╪╔п %s"
 
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:227
+#: camel/camel-remote-store.c:243
+#: camel/providers/smtp/camel-smtp-transport.c:162
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "%s (╔щ║╪╔х %d) ╓ьюэбЁ╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
 
-#: camel/camel-remote-store.c:228
+#: camel/camel-remote-store.c:244
 msgid "(unknown host)"
 msgstr "(л╓цн╓н╔ш╔╧╔х)"
 
-#: camel/camel-remote-store.c:452
+#: camel/camel-remote-store.c:483
 msgid "Server disconnected."
 msgstr "╔╣║╪╔п╓х╓нюэбЁ╓оюзцг╓╣╓Л╓ч╓╥╓©"
 
-#: camel/camel-service.c:120
+#: camel/camel-service.c:138
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' ╓о╔Ф║╪╔╤л╬╔Ё╔С╔щ║╪╔м╔С╔х╓╛и╛мв╓г╓╧"
 
-#: camel/camel-service.c:129
+#: camel/camel-service.c:147
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' ╓о╔ш╔╧╔х╔Ё╔С╔щ║╪╔м╔С╔х╓╛и╛мв╓г╓╧"
 
-#: camel/camel-service.c:138
+#: camel/camel-service.c:156
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' ╓о╔я╔╧╔Ё╔С╔щ║╪╔м╔С╔х╓╛и╛мв╓г╓╧"
 
-#: camel/camel-service.c:488
+#: camel/camel-service.c:526
 #, c-format
 msgid "No such host %s."
 msgstr "╓╫╓н╓Х╓╕╓й╔ш╔╧╔х %s ╓о╓╒╓Й╓ч╓╩╓С"
 
-#: camel/camel-service.c:491
+#: camel/camel-service.c:529
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr ""
 
-#: camel/camel-session.c:272
+#: camel/camel-session.c:297
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "╔в╔М╔х╔Ё╔К `%s' ╓РмЬмя╓г╓╜╓К╔в╔М╔п╔╓╔ю╓о╓╒╓Й╓ч╓╩╓С"
 
-#: camel/camel-session.c:360
+#: camel/camel-session.c:388
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2752,7 +2796,7 @@ msgstr "URL й╦╩ЗнС `%s' ╓ол╣╦З╓й╔в╔М╔х╔Ё╔К╓Р╢ч╓С╓г╓╓╓ч╓╧"
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "URL `%s' ╓н╔щ║╪╔ххж╧Ф╓о©Т╩З╓г╓о╓╒╓Й╓ч╓╩╓С"
 
-#: camel/providers/imap/camel-imap-auth.c:127
+#: camel/providers/imap/camel-imap-auth.c:133
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
@@ -2761,44 +2805,44 @@ msgstr ""
 "Kerberos ╔а╔╠╔ц╔х╓Р╪Хфю╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©:\n"
 "%s"
 
-#: camel/providers/imap/camel-imap-auth.c:198
+#: camel/providers/imap/camel-imap-auth.c:205
 msgid "Bad authentication response from server."
 msgstr "╔╣║╪╔п╓╚╓И╢ж╟Ц╓ц╓©г╖╬з╠ЧеЗ╓╛╓╒╓Й╓ч╓╥╓©"
 
-#: camel/providers/imap/camel-imap-command.c:216
+#: camel/providers/imap/camel-imap-command.c:231
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "IMAP ╔╣║╪╔п╓╚╓Им╫╢Э╓╥╓й╓╓╠ЧеЗ╓╛╓╒╓Й╓ч╓╥╓©: %s"
 
-#: camel/providers/imap/camel-imap-command.c:224
+#: camel/providers/imap/camel-imap-command.c:239
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP ╔Ё╔ч╔С╔и╓о╪╨гт╓╥╓ч╓╥╓©: %s"
 
-#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:240 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "л╓цн╓н╔╗╔И║╪"
 
-#: camel/providers/imap/camel-imap-command.c:271
+#: camel/providers/imap/camel-imap-command.c:286
 msgid "Server response ended too soon."
 msgstr "╔╣║╪╔п╔Л╔╧╔щ╔С╔╧╓о╓╒╓ц╓╠╓й╓╞╫╙╓О╓Й╓ч╓╥╓©"
 
-#: camel/providers/imap/camel-imap-command.c:407
+#: camel/providers/imap/camel-imap-command.c:422
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP ╔╣║╪╔п╓н╠ЧеЗ╓о %s ╬ПйС╓Р╢ч╓С╓г╓╓╓ч╓╩╓С"
 
-#: camel/providers/imap/camel-imap-command.c:443
+#: camel/providers/imap/camel-imap-command.c:458
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "IMAP ╔╣║╪╔п╓╚╓Им╫╢Э╓╥╓й╓╓ OK ╠ЧеЗ╓╛╓╒╓Й╓ч╓╥╓©: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:216
+#: camel/providers/imap/camel-imap-folder.c:196
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "%s ╓нмвлС╓Р╔М║╪╔и╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
-#: camel/providers/imap/camel-imap-folder.c:586
+#: camel/providers/imap/camel-imap-folder.c:532
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH ╠ЧеЗ╓к╔А╔ц╔╩║╪╔╦кэбн╓Р╦╚иу╓╠╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
@@ -2810,32 +2854,26 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP ╔╣║╪╔п╓г╔А║╪╔К╓Рфи╓С╓ю╓Йцъюя╓╧╓К╓©╓А╓н╓Б╓н╓г╓╧"
 
-#: camel/providers/imap/camel-imap-store.c:234
-#: 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:236
+#: camel/providers/imap/camel-imap-store.c:248
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "╓Ё╓н╔╙╔в╔╥╔Г╔С╓о╔в╔Л╔╓╔С╔ф╔╜╔╧╔х╔я╔╧╔О║╪╔и╓Р╩х╓ц╓ф IMAP ╔╣║╪╔п╓кюэбЁ╓╥╓ч╓╧"
 
-#: camel/providers/imap/camel-imap-store.c:245
+#: camel/providers/imap/camel-imap-store.c:257
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/providers/imap/camel-imap-store.c:247
+#: camel/providers/imap/camel-imap-store.c:259
 msgid ""
 "This option will connect to the IMAP server using Kerberos 4 authentication."
 msgstr "╓Ё╓н╔╙╔в╔╥╔Г╔С╓о Kerberos 4 г╖╬з╓Р╩х╓ц╓ф IMAP ╔╣║╪╔п╓кюэбЁ╓╥╓ч╓╧"
 
-#: camel/providers/imap/camel-imap-store.c:333
+#: camel/providers/imap/camel-imap-store.c:345
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s %s@%s ╓н IMAP ╔я╔╧╔О║╪╔и╓РфЧно╓╥╓ф╓╞╓ю╓╣╓╓"
 
-#: camel/providers/imap/camel-imap-store.c:359
+#: camel/providers/imap/camel-imap-store.c:373
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2846,7 +2884,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:539
+#: camel/providers/imap/camel-imap-store.c:564
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "╔г╔ё╔Л╔╞╔х╔Й %s ╓Р╨Ню╝╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
@@ -2932,12 +2970,12 @@ msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "maildir ╥а╪╟╓н╔у╔╘╔К╔ю╓ь╔А╔ц╔╩║╪╔╦╓Рди╡ц╫пмХ╓ч╓╩╓С: %s: %s"
 
 #: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:204
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-maildir-folder.c:207
+#: camel/providers/local/camel-maildir-folder.c:215
+#: camel/providers/local/camel-mbox-folder.c:317
 #: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:189
-#: camel/providers/local/camel-mh-folder.c:197
+#: camel/providers/local/camel-mh-folder.c:192
+#: camel/providers/local/camel-mh-folder.c:200
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -2947,13 +2985,13 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-mbox-folder.c:317
 #: camel/providers/local/camel-mh-folder.c:183
 msgid "No such message"
 msgstr "╓╫╓н╓Х╓╕╓й╔А╔ц╔╩║╪╔╦╓о╓╒╓Й╓ч╓╩╓С"
 
-#: camel/providers/local/camel-maildir-folder.c:213
-#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-maildir-folder.c:216
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "Invalid message contents"
 msgstr "╔А╔ц╔╩║╪╔╦╓нфБмф╓ол╣╦З╓г╓╧"
 
@@ -3000,19 +3038,19 @@ msgstr "╔у╔╘╔К╔ю `%s' ╓Р╨О╫Э╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
 msgid "not a maildir directory"
 msgstr "maildir ╥а╪╟╓н╔г╔ё╔Л╔╞╔х╔Й╓г╓о╓╒╓Й╓ч╓╩╓С"
 
-#: camel/providers/local/camel-mbox-folder.c:195
+#: camel/providers/local/camel-mbox-folder.c:201
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "mailbox╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:251
+#: camel/providers/local/camel-mbox-folder.c:257
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "mbox ╔у╔║╔╓╔К╓к╔А╔ц╔╩║╪╔╦╓Рди╡ц╫пмХ╓ч╓╩╓С: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:327
-#: camel/providers/local/camel-mbox-folder.c:357
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:333
+#: camel/providers/local/camel-mbox-folder.c:365
+#: camel/providers/local/camel-mbox-folder.c:378
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -3021,11 +3059,11 @@ msgstr ""
 "╔А╔ц╔╩║╪╔╦ %s ╓Р╔у╔╘╔К╔ю %s ╓╚╓И╪Хфю╫пмХ╓ч╓╩╓С\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:358
+#: camel/providers/local/camel-mbox-folder.c:366
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:369
+#: camel/providers/local/camel-mbox-folder.c:379
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -3078,59 +3116,59 @@ msgstr "╔у╔╘╔К╔ю╓РЁ╚╓╠╓ч╓╩╓С╓г╓╥╓©: ╔А╔ц╔╩║╪╔╦╔Й╔╧╔х╓ол╓╢╟ю╝╓г╓╧"
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:341
+#: camel/providers/local/camel-mbox-summary.c:343
 #, fuzzy, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "%s ╓Р fork ╫пмХ╓ч╓╩╓С: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:475
-#: camel/providers/local/camel-mbox-summary.c:661
+#: camel/providers/local/camel-mbox-summary.c:477
+#: camel/providers/local/camel-mbox-summary.c:668
 #, fuzzy, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
 "╔у╔╘╔К╔ю `%s' ╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:491
+#: camel/providers/local/camel-mbox-summary.c:493
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "╔ф╔С╔щ╔И╔Й mailbox ╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:512
-#: camel/providers/local/camel-mbox-summary.c:520
-#: camel/providers/local/camel-mbox-summary.c:691
-#: camel/providers/local/camel-mbox-summary.c:699
+#: camel/providers/local/camel-mbox-summary.c:514
+#: camel/providers/local/camel-mbox-summary.c:522
+#: camel/providers/local/camel-mbox-summary.c:701
+#: camel/providers/local/camel-mbox-summary.c:709
 #, fuzzy
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "мвлС╓╛ит╟Лцв, ф╠╢Э╓╛цФцг╓╥╓ч╓╥╓©"
 
-#: camel/providers/local/camel-mbox-summary.c:562
+#: camel/providers/local/camel-mbox-summary.c:565
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "╨Н╤х mailbox ╓ь╫Я╓╜╫п╓╥цФ╓к╔╗╔И║╪: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:579
+#: camel/providers/local/camel-mbox-summary.c:582
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "╨Н╤х mailbox ╓ь╫Я╓╜╫п╓╥цФ╓к╔╗╔И║╪: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:595
-#: camel/providers/local/camel-mbox-summary.c:748
+#: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-mbox-summary.c:759
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "╦╣╓н╔у╔╘╔К╔ю %s ╓Рйд╓╦╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:604
+#: camel/providers/local/camel-mbox-summary.c:609
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "╨Н╤х╔у╔╘╔К╔ю╓Рйд╓╦╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:615
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "╔у╔╘╔К╔ю╓Р╔Й╔м║╪╔Ю╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:817
+#: camel/providers/local/camel-mbox-summary.c:830
 #, c-format
 msgid "Unknown error: %s"
 msgstr "л╓цн╓н╔╗╔И║╪: %s"
@@ -3163,7 +3201,7 @@ msgstr "╔╣║╪╔п╓ь╔Ф║╪╔╤л╬╓наВ©╝╓к╪╨гт╓╥╓ч╓╥╓©"
 msgid "Server rejected username/password"
 msgstr "╔╣║╪╔п╓о╔Ф║╪╔╤л╬/╔я╔╧╔О║╪╔и╓Р╣Яхщ╓╥╓ч╓╥╓©"
 
-#: camel/providers/nntp/camel-nntp-folder.c:144
+#: camel/providers/nntp/camel-nntp-folder.c:115
 #, c-format
 msgid "Message %s not found."
 msgstr "╔А╔ц╔╩║╪╔╦ %s ╓о╦╚иу╓╚╓Й╓ч╓╩╓С"
@@ -3214,16 +3252,16 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "%s ╓н .newsrc ╔у╔║╔╓╔К╓Р╨Ню╝╓ч╓©╓оЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:179
+#: camel/providers/pop3/camel-pop3-folder.c:180
 msgid "Could not open folder: message listing was incomplete."
 msgstr "╔у╔╘╔К╔ю╓РЁ╚╓╠╓ч╓╩╓С╓г╓╥╓©: ╔А╔ц╔╩║╪╔╦╔Й╔╧╔х╓ол╓╢╟ю╝╓г╓╧"
 
-#: camel/providers/pop3/camel-pop3-folder.c:273
+#: camel/providers/pop3/camel-pop3-folder.c:274
 #, c-format
 msgid "No message with uid %s"
 msgstr "uid %s ╓н╔А╔ц╔╩║╪╔╦╓о╓╒╓Й╓ч╓╩╓С"
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:288
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "POP ╔╣║╪╔п %s ╓╚╓И╔А╔ц╔╩║╪╔╦╓Р╪Хфю╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
@@ -3269,17 +3307,17 @@ msgstr "╓Ё╓Л╓о POP ╔╣║╪╔п╓ьюэбЁ╓╥, Kerberos 4 г╖╬з╓Р╩х╓╓╓ч╓╧."
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "KPOP ╔╣║╪╔п╓ьг╖╬з╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:335
+#: camel/providers/pop3/camel-pop3-store.c:337
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "%s ╓н POP ╔╣║╪╔п╓ьюэбЁ╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
-#: camel/providers/pop3/camel-pop3-store.c:389
+#: camel/providers/pop3/camel-pop3-store.c:391
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%s %s@%s ╓н POP3 ╔я╔╧╔О║╪╔и╓РфЧно╓╥╓ф╓╞╓ю╓╣╓╓"
 
-#: camel/providers/pop3/camel-pop3-store.c:408
+#: camel/providers/pop3/camel-pop3-store.c:410
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3288,12 +3326,12 @@ msgstr ""
 "POP ╔╣║╪╔п╓ьюэбЁ╫пмХ╓ч╓╩╓С\n"
 "╔Ф║╪╔╤л╬╓наВ©╝цФ╓к╔╗╔И║╪: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:411
-#: camel/providers/pop3/camel-pop3-store.c:448
+#: camel/providers/pop3/camel-pop3-store.c:413
+#: camel/providers/pop3/camel-pop3-store.c:450
 msgid "(Unknown)"
 msgstr "(л╓цн)"
 
-#: camel/providers/pop3/camel-pop3-store.c:438
+#: camel/providers/pop3/camel-pop3-store.c:440
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -3301,7 +3339,7 @@ msgstr ""
 "POP ╔╣║╪╔п╓ьюэбЁ╫пмХ╓ч╓╩╓С\n"
 "мв╣А╓╥╓©г╖╬з╪Йцй╓о╔╣╔щ║╪╔х╓╥╓ф╓╓╓ч╓╩╓С"
 
-#: camel/providers/pop3/camel-pop3-store.c:446
+#: camel/providers/pop3/camel-pop3-store.c:448
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3310,12 +3348,13 @@ msgstr ""
 "POP ╔╣║╪╔п╓ьюэбЁ╓г╓╜╓ч╓╩╓С\n"
 "╔я╔╧╔О║╪╔и╓наВ©╝цФ╓к╔╗╔И║╪: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:555
+#: camel/providers/pop3/camel-pop3-store.c:557
 #, c-format
 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"
 
@@ -3365,10 +3404,142 @@ 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."
+#, fuzzy
+msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "SMTP ╓Р╩х╓ц╓ф╔Й╔Б║╪╔х╓н╔А║╪╔К╔о╔ж╓ьюэбЁ╓╥╔А║╪╔К╓Ргш©╝"
 
+#: camel/providers/smtp/camel-smtp-transport.c:187
+#, c-format
+msgid "Welcome response error: %s: possibly non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:281
+#, fuzzy
+msgid "No authentication required"
+msgstr "г╖╬зйЩ╪╟:"
+
+#: camel/providers/smtp/camel-smtp-transport.c:283
+#, fuzzy
+msgid ""
+"This option will connect to the SMTP server without using any kind of "
+"authentication. This should be fine for connecting to most SMTP servers."
+msgstr ""
+"╓Ё╓н╔╙╔в╔╥╔Г╔С╓о╔в╔Л╔╓╔С╔ф╔╜╔╧╔х╓н╔я╔╧╔О║╪╔и╓Р╩х╓ц╓ф POP ╔╣║╪╔п╓ьюэбЁ╓╥╓ч╓╧. "
+"╓Ё╓Л╓об©╓╞╓н POP ╔╣║╪╔п╓г╔╣╔щ║╪╔х╓╣╓Л╓К╔╙╔в╔╥╔Г╔С╓г╓╧"
+
+#: 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 ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:294
+#, fuzzy
+msgid ""
+"This option will connect to the SMTP server using CRAM-MD5 authentication."
+msgstr "╓Ё╓н╔╙╔в╔╥╔Г╔С╓о Kerberos 4 г╖╬з╓Р╩х╓ц╓ф IMAP ╔╣║╪╔п╓кюэбЁ╓╥╓ч╓╧"
+
+#: camel/providers/smtp/camel-smtp-transport.c:332
+#, fuzzy, c-format
+msgid "SMTP server %s"
+msgstr "%s ╔╣║╪╔п %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:334
+#, fuzzy, c-format
+msgid "SMTP mail delivery via %s"
+msgstr "sendmail ╥пмЁ╓г╔А║╪╔К╓Ргш©╝"
+
+#: camel/providers/smtp/camel-smtp-transport.c:359
+msgid "Cannot send message: sender address not defined."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:366
+msgid "Cannot send message: sender address not valid."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:380
+#, fuzzy
+msgid "Cannot send message: no recipients defined."
+msgstr "mbox ╔у╔║╔╓╔К╓к╔А╔ц╔╩║╪╔╦╓Рди╡ц╫пмХ╓ч╓╩╓С: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:474
+#, c-format
+msgid "HELO request timed out: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:490
+#, c-format
+msgid "HELO response error: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:529
+#, c-format
+msgid "MAIL FROM request timed out: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:545
+#, c-format
+msgid "MAIL FROM response error: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:570
+#, fuzzy, c-format
+msgid "RCPT TO request timed out: %s: mail not sent"
+msgstr ""
+"sendmail ╓ь╔я╔╓╔в╓Р╨Ню╝╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s: ╔А║╪╔К╓оаВ©╝╓╥╓ч╓╩╓С╓г╓╥╓©"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
+#, fuzzy, c-format
+msgid "RCPT TO response error: %s: mail not sent"
+msgstr "%s ╓Р╪б╧т╫пмХ╓ч╓╩╓С╓г╓╥╓©: ╔А║╪╔К╓оаВ©╝╓╥╓ч╓╩╓С╓г╓╥╓©"
+
+#: camel/providers/smtp/camel-smtp-transport.c:617
+#, fuzzy, c-format
+msgid "DATA request timed out: %s: mail not sent"
+msgstr "%s ╓Р╪б╧т╫пмХ╓ч╓╩╓С╓г╓╥╓©: ╔А║╪╔К╓оаВ©╝╓╥╓ч╓╩╓С╓г╓╥╓©"
+
+#: camel/providers/smtp/camel-smtp-transport.c:633
+#, fuzzy, c-format
+msgid "DATA response error: %s: mail not sent"
+msgstr "sendmail ╓Р fork ╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s: ╔А║╪╔К╓оаВ©╝╓╥╓ч╓╩╓С╓г╓╥╓©"
+
+#: camel/providers/smtp/camel-smtp-transport.c:648
+#: camel/providers/smtp/camel-smtp-transport.c:666
+#, fuzzy, c-format
+msgid "DATA send timed out: message termination: %s: mail not sent"
+msgstr "sendmail ╓о╔╥╔╟╔й╔К %s ╓г╫╙н╩╓╥╓ч╓╥╓©: ╔А║╪╔К╓оаВ©╝╓╥╓ч╓╩╓С╓г╓╥╓©"
+
+#: camel/providers/smtp/camel-smtp-transport.c:682
+#, c-format
+msgid "DATA response error: message termination: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:706
+#, c-format
+msgid "RSET request timed out: %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:722
+#, fuzzy, c-format
+msgid "RSET response error: %s"
+msgstr "л╓цн╓н╔╗╔И║╪: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:745
+#, c-format
+msgid "QUIT request timed out: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#, c-format
+msgid "QUIT response error: %s: non-fatal"
+msgstr ""
+
 #: camel/providers/vee/camel-vee-provider.c:30
 msgid "Virtual folder email provider"
 msgstr "╡╬аш╔у╔╘╔К╔ю╔А║╪╔К╔в╔М╔п╔╓╔ю"
@@ -3402,82 +3573,82 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:144
+#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:155
 msgid "attachment"
 msgstr "е╨иу"
 
-#: composer/e-msg-composer-attachment-bar.c:417
-#: 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:464 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:465
+#: composer/e-msg-composer-attachment-bar.c:461
 msgid "Remove selected items from the attachment list"
 msgstr "е╨иуй╙╔Й╔╧╔х╓╚╓Иа╙бР╓╥╓©╔╒╔╓╔ф╔Ю╓Р╨О╫Э╓╥╓ч╓╧"
 
-#: composer/e-msg-composer-attachment-bar.c:496
+#: composer/e-msg-composer-attachment-bar.c:492
 msgid "Add attachment..."
 msgstr "е╨иу╓нди╡ц..."
 
-#: composer/e-msg-composer-attachment-bar.c:497
+#: 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: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:290
-#: mail/mail-format.c:621
+#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:303
+#: mail/mail-format.c:626
 msgid "From:"
 msgstr "From:"
 
-#: 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:291
+#: composer/e-msg-composer-hdrs.c:304
 msgid "Enter the identity you wish to send this message from"
 msgstr "╓Ё╓н╔А╔ц╔╩║╪╔╦╓РаВ©╝╓╥╓©╓╓©х╦╣╓РфЧно╓╥╓ч╓╧"
 
-#: composer/e-msg-composer-hdrs.c:295 mail/mail-format.c:625
+#: composer/e-msg-composer-hdrs.c:308 mail/mail-format.c:630
 msgid "To:"
 msgstr "To:"
 
-#: composer/e-msg-composer-hdrs.c:296
+#: composer/e-msg-composer-hdrs.c:309
 msgid "Enter the recipients of the message"
 msgstr "╔А╔ц╔╩║╪╔╦╓н╪У╪Х©м╓РфЧно╓╥╓ч╓╧"
 
-#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:627
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:632
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:301
+#: 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:306
+#: composer/e-msg-composer-hdrs.c:319
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:307
+#: 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."
@@ -3485,15 +3656,15 @@ msgstr ""
 "╔А╔ц╔╩║╪╔╦╓н╪У╪Х©м╔Й╔╧╔х╓нцФ╓к╦╫╓Л╓й╓╓╓г, "
 "╔А╔ц╔╩║╪╔╦╓н╔╚║╪╔э╔С╔Ё╔т║╪╓Р╪У©╝╓╧╓К╔╒╔и╔Л╔╧╓РфЧно╓╥╓ч╓╧"
 
-#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:629
+#: composer/e-msg-composer-hdrs.c:326 mail/mail-format.c:634
 msgid "Subject:"
 msgstr "Subject:"
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Enter the subject of the mail"
 msgstr "╔А║╪╔К╓ни╫бЙ╓РфЧно╓╥╓ч╓╧"
 
-#: composer/e-msg-composer.c:429
+#: composer/e-msg-composer.c:430
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -3502,38 +3673,38 @@ msgstr ""
 "╫Пл╬╔у╔║╔╓╔К %s ╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©:\n"
 "%s"
 
-#: composer/e-msg-composer.c:599
+#: composer/e-msg-composer.c:600
 msgid "Save as..."
 msgstr "йлл╬╓гйщб╦..."
 
-#: composer/e-msg-composer.c:610
+#: composer/e-msg-composer.c:611
 #, c-format
 msgid "Error saving file: %s"
 msgstr "╔у╔║╔╓╔К╓нйщб╦цФ╓к╔╗╔И║╪: %s"
 
-#: composer/e-msg-composer.c:630
+#: composer/e-msg-composer.c:631
 #, c-format
 msgid "Error loading file: %s"
 msgstr "╔у╔║╔╓╔К╓н╔М║╪╔ицФ╓к╔╗╔И║╪: %s"
 
-#: composer/e-msg-composer.c:652
+#: composer/e-msg-composer.c:653
 msgid "Saving changes to message..."
 msgstr "╔А╔ц╔╩║╪╔╦╓нйя╧╧╓Рйщб╦цФ..."
 
-#: composer/e-msg-composer.c:654
+#: composer/e-msg-composer.c:655
 msgid "Save changes to message..."
 msgstr "╔А╔ц╔╩║╪╔╦╓нйя╧╧╓Рйщб╦..."
 
-#: composer/e-msg-composer.c:695
+#: composer/e-msg-composer.c:696
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr "'аП╟фх╒' ╓ьаП╟ф╓Рйщб╦цФ╓к╔╗╔И║╪╓╛х╞ю╦╓╥╓ч╓╥╓©: %s"
 
-#: composer/e-msg-composer.c:739 shell/e-shell-view-menu.c:170
+#: composer/e-msg-composer.c:741 shell/e-shell-view-menu.c:167
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:745
+#: composer/e-msg-composer.c:747
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3543,27 +3714,27 @@ msgstr ""
 "\n"
 "йя╧╧╓Рйщб╦╓╥╓ч╓╧╓╚?"
 
-#: composer/e-msg-composer.c:767
+#: composer/e-msg-composer.c:772
 msgid "Open file"
 msgstr "╔у╔║╔╓╔К╓РЁ╚╓╞"
 
-#: composer/e-msg-composer.c:893
+#: composer/e-msg-composer.c:898
 msgid "That file does not exist."
 msgstr "╓╫╓н╔у╔║╔╓╔К╓об╦╨ъ╓╥╓ч╓╩╓С"
 
-#: composer/e-msg-composer.c:903
+#: composer/e-msg-composer.c:908
 msgid "That is not a regular file."
 msgstr "╓╫╓Л╓одл╬О╓н╔у╔║╔╓╔К╓г╓о╓╒╓Й╓ч╓╩╓С"
 
-#: composer/e-msg-composer.c:913
+#: composer/e-msg-composer.c:918
 msgid "That file exists but is not readable."
 msgstr "╓╫╓н╔у╔║╔╓╔К╓об╦╨ъ╓╥╓ч╓╧╓╛║╓фи╓ъ╪Х╓Й╡дг╫╓г╓о╓╒╓Й╓ч╓╩╓С"
 
-#: composer/e-msg-composer.c:923
+#: composer/e-msg-composer.c:928
 msgid "That file appeared accesible but open(2) failed."
 msgstr "╓╫╓н╔у╔║╔╓╔К╓о╔╒╔╞╔╩╔╧╡дг╫╓н╓Х╓╕╓к╦╚╓╗╓ч╓╧╓╛║╓open(2) ╓о╪╨гт╓╥╓ч╓╥╓©"
 
-#: composer/e-msg-composer.c:945
+#: composer/e-msg-composer.c:950
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3571,15 +3742,15 @@ msgstr ""
 "╔у╔║╔╓╔К╓о╓х╓ф╓БбГ╓╜╓╓ (100K ╟й╬Е) ╓г╓╧\n"
 "╓╫╓Л╓РачфЧ╓╧╓К╓Ё╓х╓Рк╬╓Ю╓н╓оЁн╓╚╓г╓╧╓╚?"
 
-#: composer/e-msg-composer.c:966
+#: composer/e-msg-composer.c:971
 msgid "An error occurred while reading the file."
 msgstr "╔у╔║╔╓╔Кфи╧ЧцФ╓н╢ж╓к╔╗╔И║╪╓ох╞ю╦╓╥╓ч╓╥╓©"
 
-#: composer/e-msg-composer.c:1343
+#: composer/e-msg-composer.c:1350
 msgid "Compose a message"
 msgstr "╔А╔ц╔╩║╪╔╦╓Р╨Ню╝╓╥╓ч╓╧"
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1427
 msgid "Could not create composer window."
 msgstr "╔А║╪╔К╨Ню╝╔╕╔ё╔С╔и╔╕╓Р╨Ню╝╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
@@ -3592,14 +3763,26 @@ msgid "Sear_ch"
 msgstr "╦║╨В(_c)"
 
 #: filter/filter-datespec.c:62
+msgid "year"
+msgstr "г╞"
+
+#: filter/filter-datespec.c:62
 msgid "years"
 msgstr "г╞"
 
 #: filter/filter-datespec.c:63
+msgid "month"
+msgstr "╥Н"
+
+#: filter/filter-datespec.c:63
 msgid "months"
 msgstr "╥Н"
 
 #: filter/filter-datespec.c:64
+msgid "week"
+msgstr "╫╣"
+
+#: filter/filter-datespec.c:64
 msgid "weeks"
 msgstr "╫╣"
 
@@ -3608,14 +3791,26 @@ msgid "days"
 msgstr "фЭ"
 
 #: filter/filter-datespec.c:66
+msgid "hour"
+msgstr "╩Ч"
+
+#: filter/filter-datespec.c:66
 msgid "hours"
 msgstr "╩Ч"
 
 #: filter/filter-datespec.c:67
+msgid "minute"
+msgstr "й╛"
+
+#: filter/filter-datespec.c:67
 msgid "minutes"
 msgstr "й╛"
 
 #: filter/filter-datespec.c:68
+msgid "second"
+msgstr " иц"
+
+#: filter/filter-datespec.c:68
 msgid "seconds"
 msgstr " иц"
 
@@ -3673,6 +3868,10 @@ msgstr "╦╫╨ъ╩Ч╧О╓ь╓наЙбп╩Ч╢ж"
 msgid "Compare against"
 msgstr "╣ухФЁс"
 
+#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
+msgid "now"
+msgstr "╨ё"
+
 #: filter/filter-datespec.c:690
 msgid "<click here to select a date>"
 msgstr "<фЭиу╓Ра╙бР╓╧╓К╓©╓А╓к╓Ё╓Ё╓Р╔╞╔Й╔ц╔╞╓╥╓ф╓╞╓ю╓╣╓╓>"
@@ -3695,7 +3894,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 "╔у╔ё╔К╔©╓Рйт╫╦"
 
@@ -3732,7 +3931,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"
@@ -3741,232 +3940,243 @@ msgstr ""
 "ю╣╣╛и╫╦╫ '%s' ╓г╔╗╔И║╪╓г╓╧:\n"
 "%s"
 
-#: filter/filter-message-search.c:379 filter/filter-message-search.c:447
+#: filter/filter-message-search.c:380 filter/filter-message-search.c:448
 #, c-format
 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:520
+#: filter/filter-rule.c:530
 msgid "Rule name: "
 msgstr "╔К║╪╔Кл╬: "
 
-#: filter/filter-rule.c:524
+#: filter/filter-rule.c:534
 msgid "Untitled"
 msgstr "╔©╔╓╔х╔К╓й╓╥"
 
-#: filter/filter-rule.c:540
+#: filter/filter-rule.c:550
 msgid "If"
 msgstr "╓Б╓╥"
 
-#: filter/filter-rule.c:557
+#: filter/filter-rule.c:567
 msgid "Execute actions"
 msgstr "╪║╓н╬Р╥О╓гф╟╨Н╓Р╪б╧т:"
 
-#: filter/filter-rule.c:561
+#: filter/filter-rule.c:571
 msgid "if all criteria are met"
 msgstr "╓╧╓ы╓ф╓н╢П╫Ю╓╛╡Я╓ц╓©╩Ч"
 
-#: filter/filter-rule.c:566
+#: filter/filter-rule.c:576
 msgid "if any criteria are met"
 msgstr "╓╓╓╞╓д╓╚╓н╢П╫Ю╓╛╡Я╓ц╓©╩Ч"
 
-#: filter/filter-rule.c:577
+#: filter/filter-rule.c:587
 msgid "Add criterion"
 msgstr "╢П╫Ю╓Рди╡ц"
 
-#: filter/filter-rule.c:583
+#: filter/filter-rule.c:593
 msgid "Remove criterion"
 msgstr "╢П╫Ю╓Р╨О╫Э"
 
-#: mail/folder-browser.c:465 po/tmp/filter.glade.h:8
-#: po/tmp/mail-config.glade.h:9
-msgid "Edit"
-msgstr "йт╫╦"
+#: filter/filter-system-flag.c:63
+#, fuzzy
+msgid "Replied to"
+msgstr "а╢╟В╓ьйж©╝"
+
+#. { _("Deleted"), "Deleted" },
+#. { _("Draft"), "Draft" },
+#: filter/filter-system-flag.c:66
+msgid "Important"
+msgstr ""
 
-#: po/tmp/filter.glade.h:10
+#: filter/filter-system-flag.c:67
+#, fuzzy
+msgid "Read"
+msgstr "╥╚╓Ййж╓╥"
+
+#: 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
 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
-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
-msgid "Status"
-msgstr "╔╧╔ф║╪╔©╔╧"
+msgid "is less than"
+msgstr "╓╛╪║╓н╓Б╓н╓Х╓Й╬╝╓╣╓╓"
 
 #: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
-msgstr "╫ХмЩдД╩ъ"
+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 "╓╛╪║╓н╓Б╓н╓г╫╙╓И╓й╓╓"
+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 "╓╛╪║╓н╓Б╓н╓Х╓ЙбГ╓╜╓╓"
+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"
-msgstr "╓╛╪║╓н╓Б╓н╓х╟Лцв╓╧╓К"
+msgid "Specific header"
+msgstr "╩ьдЙ╓н╔ь╔ц╔ю"
 
 #: filter/libfilter-i18n.h:39
-msgid "on or after"
-msgstr ""
+msgid "starts with"
+msgstr "╓╛╪║╓н╓Б╓н╓гЁ╚╩о╓╧╓К"
 
 #: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr ""
+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"
@@ -3996,134 +4206,216 @@ msgstr "╡╬аш╔у╔╘╔К╔ю╔К║╪╔К╓нди╡ц"
 msgid "Edit VFolder Rule"
 msgstr "╡╬аш╔у╔╘╔К╔ю╔К║╪╔К╓нйт╫╦"
 
-#: mail/component-factory.c:227
+#: mail/component-factory.c:277
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolution ╔А║╪╔К╔Ё╔С╔щ║╪╔м╔С╔х╓н╫И╢Э╡╫╓╛╫пмХ╓ч╓╩╓С"
 
-#: mail/component-factory.c:266
+#: 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:16
+#: 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:453
+#: mail/folder-browser.c:643
 msgid "VFolder on Subject"
 msgstr "и╫бЙ╓н╡╬аш╔у╔╘╔К╔ю"
 
-#: mail/folder-browser.c:454
+#: mail/folder-browser.c:644
 msgid "VFolder on Sender"
 msgstr "аВ©╝╪т╓н╡╬аш╔у╔╘╔К╔ю"
 
-#: mail/folder-browser.c:455
+#: mail/folder-browser.c:645
 msgid "VFolder on Recipients"
 msgstr "╪У©╝╪т╓н╡╬аш╔у╔╘╔К╔ю"
 
-#: mail/folder-browser.c:457
+#: mail/folder-browser.c:647
 msgid "Filter on Subject"
 msgstr "и╫бЙ╓н╔у╔ё╔К╔©"
 
-#: mail/folder-browser.c:458
+#: mail/folder-browser.c:648
 msgid "Filter on Sender"
 msgstr "аВ©╝╪т╓н╔у╔ё╔К╔©"
 
-#: mail/folder-browser.c:459
+#: mail/folder-browser.c:649
 msgid "Filter on Recipients"
 msgstr "╪У©╝╪т╓н╔у╔ё╔К╔©"
 
-#: mail/folder-browser.c:460 mail/folder-browser.c:544
+#: mail/folder-browser.c:650 mail/folder-browser.c:779
 msgid "Filter on Mailing List"
 msgstr "╔А║╪╔Й╔С╔╟╔Й╔╧╔х╓н╔у╔ё╔К╔©"
 
-#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:14
+#: mail/folder-browser.c:655
+#, fuzzy
+msgid "Show all hidden"
+msgstr "╓╧╓ы╓фи╫╪╗"
+
+#: mail/folder-browser.c:657
+msgid "Hide selected"
+msgstr ""
+
+#. could use another mask, but not enough api do to it
+#: mail/folder-browser.c:660
+#, fuzzy
+msgid "Hide read"
+msgstr "╠ё╓╧"
+
+#: mail/folder-browser.c:661
+#, fuzzy
+msgid "Hide deleted"
+msgstr "╨О╫Э╪Х╬ц"
+
+#: mail/folder-browser.c:663 mail/folder-browser.c:790
+#, fuzzy
+msgid "Hide Subject"
+msgstr "и╫бЙ"
+
+#: mail/folder-browser.c:665 mail/folder-browser.c:796
+#, fuzzy
+msgid "Hide from Sender"
+msgstr "аВ©╝╪т╓н╔у╔ё╔К╔©"
+
+#: mail/folder-browser.c:670 ui/evolution-message-composer.xml.h:15
 msgid "Open"
 msgstr "Ё╚╓╞"
 
-#: mail/folder-browser.c:466
+#: mail/folder-browser.c:672
 msgid "Save As..."
 msgstr "йлл╬╓гйщб╦..."
 
-#: mail/folder-browser.c:467 mail/mail-view.c:163
-#: po/tmp/evolution-addressbook.xml.h:13 po/tmp/evolution-calendar.xml.h:23
-#: po/tmp/evolution-mail.xml.h:28
+#: 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:469
+#: mail/folder-browser.c:675
 msgid "Reply to Sender"
 msgstr "аВ©╝╪т╓ьйж©╝"
 
-#: mail/folder-browser.c:470 mail/mail-view.c:156
-#: po/tmp/evolution-mail.xml.h:34
+#: 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:471 mail/mail-view.c:159
-#: 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:472 po/tmp/evolution-mail.xml.h:18
+#: mail/folder-browser.c:678 ui/evolution-mail.xml.h:18
 msgid "Forward inline"
 msgstr ""
 
-#: mail/folder-browser.c:474
+#: mail/folder-browser.c:680
 msgid "Mark as Read"
 msgstr "╢Шфи╓х╓╥╓ф╔ч║╪╔╞"
 
-#: mail/folder-browser.c:475
+#: mail/folder-browser.c:681
 msgid "Mark as Unread"
 msgstr "л╓фи╓х╓╥╓ф╔ч║╪╔╞"
 
-#: mail/folder-browser.c:477
+#: mail/folder-browser.c:683
 msgid "Move to Folder..."
 msgstr "╔у╔╘╔К╔ю╓ь╟эф╟..."
 
-#: mail/folder-browser.c:478
+#: mail/folder-browser.c:684
 msgid "Copy to Folder..."
 msgstr "╔у╔╘╔К╔ю╓ь╔Ё╔т║╪..."
 
-#: mail/folder-browser.c:480
+#: 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:484
+#: mail/folder-browser.c:690
 msgid "Apply Filters"
 msgstr "╔у╔ё╔К╔©е╛мя"
 
-#: mail/folder-browser.c:486 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:546
+#: mail/folder-browser.c:693 ui/evolution-mail.xml.h:21
+#, fuzzy
+msgid "Hide Messages"
+msgstr "╔А╔ц╔╩║╪╔╦╓Р╟У╨Ч"
+
+#: mail/folder-browser.c:781
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "╔А║╪╔Й╔С╔╟╔Й╔╧╔х╓н╔у╔ё╔К╔© (%s)"
 
+#: mail/folder-browser.c:787
+#, fuzzy, c-format
+msgid "Hide Subject \"%s\""
+msgstr "и╫бЙ╓о %s ╓г╓╧"
+
+#: 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
+#, fuzzy
+msgid "mh"
+msgstr "h"
+
 #: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
@@ -4184,7 +4476,7 @@ 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?"
@@ -4192,19 +4484,23 @@ msgstr ""
 "╓Ё╓н╔А╔ц╔╩║╪╔╦╓ои╫бЙ╓╛╓╒╓Й╓ч╓╩╓С\n"
 "кэеЖ╓каВ©╝╓╥╓ч╓╧╓╚?"
 
-#: 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
 msgid "Move message(s) to"
 msgstr "╔А╔ц╔╩║╪╔╦╓Р╟эф╟╓╥╓ч╓╧: "
 
-#: mail/mail-callbacks.c:554
+#: mail/mail-callbacks.c:613
 msgid "Copy message(s) to"
 msgstr "╔А╔ц╔╩║╪╔╦╓Р╔Ё╔т║╪╓╥╓ч╓╧: "
 
-#: mail/mail-callbacks.c:665
+#: mail/mail-callbacks.c:748
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4212,11 +4508,11 @@ msgstr ""
 "╔и╔И╔у╔х╔у╔╘╔К╔юфБ╓кйщб╦╓╣╓Л╓©\n"
 "╔А╔ц╔╩║╪╔╦╓ю╓╠╓Рйт╫╦╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╧"
 
-#: mail/mail-callbacks.c:699 mail/mail-display.c:72
+#: mail/mail-callbacks.c:781 mail/mail-display.c:79
 msgid "Overwrite file?"
 msgstr "╔у╔║╔╓╔К╓Р╬Е╫Я╓╜╓╥╓ч╓╧╓╚?"
 
-#: mail/mail-callbacks.c:703 mail/mail-display.c:76
+#: mail/mail-callbacks.c:785 mail/mail-display.c:83
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -4224,15 +4520,15 @@ msgstr ""
 "╓╫╓нл╬а╟╓н╔у╔║╔╓╔К╓о╓╧╓г╓кб╦╨ъ╓╥╓ч╓╧\n"
 "╬Е╫Я╓╜╓╥╓ч╓╧╓╚?"
 
-#: mail/mail-callbacks.c:748
+#: mail/mail-callbacks.c:830
 msgid "Save Message As..."
 msgstr "╔А╔ц╔╩║╪╔╦╓Рйлл╬╓гйщб╦..."
 
-#: mail/mail-callbacks.c:750
+#: mail/mail-callbacks.c:832
 msgid "Save Messages As..."
 msgstr "╔А╔ц╔╩║╪╔╦╓Рйлл╬╓гйщб╦..."
 
-#: mail/mail-callbacks.c:877
+#: mail/mail-callbacks.c:916
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4241,45 +4537,278 @@ msgstr ""
 "╔у╔ё╔К╔©╬ПйС╓н╔М║╪╔ицФ╓к╔╗╔И║╪:\n"
 "%s"
 
-#: mail/mail-callbacks.c:922
+#: mail/mail-callbacks.c:961
 msgid "Print Message"
 msgstr "╔А╔ц╔╩║╪╔╦╓Р╟У╨Ч"
 
-#: mail/mail-callbacks.c:969
+#: 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 "Email ╔╒╔и╔Л╔╧:"
+
+#: mail/mail-config-druid.glade.h:30
+#, fuzzy
+msgid "Email Address:"
+msgstr "Email ╔╒╔и╔Л╔╧:"
+
+#: 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 "IMAPv4"
+
+#: 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 "╔А║╪╔К(_M)"
+
+#: mail/mail-config-druid.glade.h:41
+#, fuzzy
+msgid "Mail Account"
+msgstr "E ╔А║╪╔К╓╛╪║╓н╓Б╓н╓Р╢ч╓Ю"
+
+#: 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"
-msgstr "╔А║╪╔К╓нгшаВ"
+#: mail/mail-config-druid.glade.h:44
+msgid "Make this my default account"
+msgstr ""
 
-#: po/tmp/mail-config-druid.glade.h:10
-msgid "Welcome to the Evolution Mail configuration wizard!\n"
-msgstr "╓Х╓╕╓Ё╓╫ Evolution ╔А║╪╔КюъдЙ╔╕╔ё╔╤║╪╔и╓ь!\n"
+#: 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 ""
+
+#: 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 "Reply-To:"
+
+#: mail/mail-config-druid.glade.h:57
+#, fuzzy
+msgid "Reply-to:"
+msgstr "Reply-To:"
+
+#: mail/mail-config-druid.glade.h:58
+#, fuzzy
+msgid "Required"
+msgstr "©м║╧╓╛и╛мв(_R)"
+
+#: 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 ""
-"╓╒╓й╓©╓нее╩р╔А║╪╔К╓нюъдЙ╓о╢╟н╩╓╥╓ч╓╥╓©\n"
-"\"╢╟н╩\" ╓Р╔╞╔Й╔ц╔╞╓╥╓ф©╥╓╥╓╓юъдЙ╓Рйщб╦╓╥╓ф╓╞╓ю╓╣╓╓"
+
+#: 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
+#, fuzzy
+msgid "Welcome to the Evolution Mail Configuration Druid.\n"
+msgstr "╓Х╓╕╓Ё╓╫ Evolution ╔А║╪╔КюъдЙ╔╕╔ё╔╤║╪╔и╓ь!\n"
+
+#: mail/mail-config-druid.glade.h:81
+#, fuzzy
+msgid "minute(s)"
+msgstr "й╛"
 
 #: mail/mail-config-gui.c:433
 msgid ""
@@ -4298,15 +4827,7 @@ msgstr "╔у╔К╔м║╪╔Ю:"
 msgid "Email address:"
 msgstr "Email ╔╒╔и╔Л╔╧:"
 
-#: 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 "╫Пл╬╔у╔║╔╓╔К"
 
@@ -4314,26 +4835,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 "╔╣║╪╔п╓╚╓И╔А╔ц╔╩║╪╔╦╓Р╨О╫Э╓╥╓й╓╓"
@@ -4346,7 +4851,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"
@@ -4380,6 +4885,19 @@ msgstr ""
 msgid "Mail transport type:"
 msgstr "╔А║╪╔КгшаВ╪Ойл:"
 
+#: mail/mail-config-gui.c:1183
+#, fuzzy
+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 ""
+"╓╒╓й╓©╓н╩Щ╓д╔А║╪╔К╔╣║╪╔п╓Ра╙бР╓╥╓ф╢ьо╒╓╧╓К╬ПйС╓РфЧно╓╥╓ф╓╞╓ю╓╣╓╓\n"
+"\n"
+"╔╣║╪╔п╓╛г╖╬з╓Ри╛мв╓х╓╧╓К╓й╓И║╓\"╔╣╔щ║╪╔х╓╣╓Л╓©╪Ойл╓Р╦║╫п...\" ╔э╔©╔С╓Р\n"
+"╔╞╔Й╔ц╔╞╓╥╓©╦Е╓кб╬╓н╬ПйС╓РфЧно╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╧"
+
 #: mail/mail-config-gui.c:1233
 msgid "Add Identity"
 msgstr "©х╦╣╓нди╡ц"
@@ -4428,60 +4946,68 @@ 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
 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:350 mail/mail-crypto.c:452 mail/mail-crypto.c:629
+#: 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."
 msgstr "╓╒╓й╓©╓н PGP/GPG ╔я╔╧╔у╔Л║╪╔╨╓РфЧно╓╥╓ф╓╞╓ю╓╣╓╓"
 
-#: mail/mail-crypto.c:354 mail/mail-crypto.c:456 mail/mail-crypto.c:634
+#: mail/mail-crypto.c:357 mail/mail-crypto.c:462 mail/mail-crypto.c:640
+#: mail/mail-crypto.c:785
 msgid "No password provided."
 msgstr "дС╤║╓╣╓Л╓©╔я╔╧╔О║╪╔и╓о╓╒╓Й╓ч╓╩╓С"
 
-#: mail/mail-crypto.c:360 mail/mail-crypto.c:463 mail/mail-crypto.c:640
+#: mail/mail-crypto.c:363 mail/mail-crypto.c:469 mail/mail-crypto.c:646
+#: mail/mail-crypto.c:792 mail/mail-crypto.c:942
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "GPG/PGP ╓ь╓н╔я╔╓╔в╓╛╨Ню╝╓г╓╜╓ч╓╩╓С╓г╓╥╓©: %s"
 
-#: mail/mail-crypto.c:625
+#: mail/mail-crypto.c:631 mail/mail-crypto.c:777 mail/mail-crypto.c:936
 msgid "No GPG/PGP program available."
 msgstr "GPG/PGP ╔в╔М╔╟╔И╔Ю╓омЬмя╓г╓╜╓ч╓╩╓С"
 
-#: mail/mail-display.c:90
+#: mail/mail-crypto.c:953
+#, fuzzy, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "╔я╔╓╔в╓╛╨Ню╝╓г╓╜╓ч╓╩╓С╓г╓╥╓©: %s"
+
+#: mail/mail-display.c:98
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -4490,435 +5016,347 @@ msgstr ""
 "╔у╔║╔╓╔К %s ╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©:\n"
 "%s"
 
-#: mail/mail-display.c:113
+#: mail/mail-display.c:131
 #, c-format
 msgid "Could not write data: %s"
 msgstr "╔г║╪╔©╓Р╫Я╓╜╫п╓╧╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
 
-#: mail/mail-display.c:218
+#: mail/mail-display.c:229
 msgid "Save Attachment"
 msgstr "е╨иу╓нйщб╦"
 
-#: mail/mail-display.c:258
+#: mail/mail-display.c:269
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "╨Н╤х╔г╔ё╔Л╔╞╔х╔Й╓Р╨Ню╝╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
 
-#: mail/mail-display.c:300
+#: mail/mail-display.c:311
 msgid "Save to Disk..."
 msgstr "╔г╔ё╔╧╔╞╓ьйщб╦..."
 
-#: mail/mail-display.c:302
+#: mail/mail-display.c:313
 #, c-format
 msgid "Open in %s..."
 msgstr "%s ╓кЁ╚╓╞..."
 
-#: mail/mail-display.c:304
+#: mail/mail-display.c:315
 msgid "View Inline"
 msgstr "╔╓╔С╔И╔╓╔Си╫╪╗"
 
-#: mail/mail-display.c:328
+#: mail/mail-display.c:339
 msgid "External Viewer"
 msgstr "Ё╟иТ╔с╔Е║╪╔╒"
 
-#: mail/mail-display.c:351
+#: mail/mail-display.c:362
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "╔╓╔С╔И╔╓╔Си╫╪╗ (%s╥пмЁ)"
 
-#: mail/mail-display.c:355
+#: mail/mail-display.c:366
 msgid "Hide"
 msgstr "╠ё╓╧"
 
-#: mail/mail-format.c:500
+#: mail/mail-format.c:503
 #, c-format
 msgid "%s attachment"
 msgstr "%s ╓Ре╨иу"
 
-#: mail/mail-format.c:623
-msgid "Reply-To:"
-msgstr "Reply-To:"
-
-#: mail/mail-format.c:845
+#: mail/mail-format.c:851
 msgid "No GPG/PGP support available in this copy of Evolution."
 msgstr "╓Ё╓н Evolution ╓н╔Ё╔т║╪╓г╓о GPG/PGP ╔╣╔щ║╪╔х╓омЬмя╫пмХ╓ч╓╩╓С"
 
-#: mail/mail-format.c:857
+#: mail/mail-format.c:863
 msgid "Encrypted message not displayed"
 msgstr "╟е╧Ф╡╫╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓ои╫╪╗╓╥╓ч╓╩╓С"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:869
 msgid "Encrypted message"
 msgstr "╟е╧Ф╡╫╓╣╓Л╓©╔А╔ц╔╩║╪╔╦"
 
-#: mail/mail-format.c:864
+#: mail/mail-format.c:870
 msgid "Click icon to decrypt."
 msgstr "╔╒╔╓╔Ё╔С╓Р╔╞╔Й╔ц╔╞╓╥╓фиЭ╧Ф╡╫╓╥╓ф╓╞╓ю╓╣╓╓"
 
-#: mail/mail-format.c:1470
+#: mail/mail-format.c:1450
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1482
+#: mail/mail-format.c:1462
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1486
+#: mail/mail-format.c:1466
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1520
+#: mail/mail-format.c:1500
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1525
+#: mail/mail-format.c:1505
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-format.c:1695
+#: mail/mail-format.c:1675
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr "On %s, %s wrote:\n"
 
-#: mail/mail-local.c:202
+#: mail/mail-local.c:204
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "╔у╔╘╔К╔ю \"%s\" ╓Р \"%s\" ╥а╪╟╓ьйя╧╧╓╥╓ф╓╓╓ч╓╧"
 
-#: mail/mail-local.c:206
+#: mail/mail-local.c:208
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "╔у╔╘╔К╔ю \"%s\" ╓Р \"%s\" ╥а╪╟╓ьйя╧╧╓╥╓ч╓╧"
 
-#: mail/mail-local.c:261
+#: mail/mail-local.c:251
+#, fuzzy
+msgid "Reconfiguring folder"
+msgstr "╔у╔╘╔К╔ю╧╫ю╝(_C)"
+
+#: mail/mail-local.c:269
 msgid "Closing current folder"
 msgstr "╦╫╨ъ╓н╔у╔╘╔К╔ю╓Р╔╞╔М║╪╔╨цФ"
 
-#: mail/mail-local.c:293
+#: mail/mail-local.c:295
 msgid "Renaming old folder and opening"
 msgstr "╦е╓╓╔у╔╘╔К╔ю╓Р╔Й╔м║╪╔Ю╓╥╓ф╔╙║╪╔в╔СцФ"
 
-#: mail/mail-local.c:314
+#: mail/mail-local.c:313
 msgid "Creating new folder"
 msgstr "©╥╣╛╔у╔╘╔К╔ю╓Р╨Ню╝цФ"
 
-#: mail/mail-local.c:329
+#: mail/mail-local.c:327
 msgid "Copying messages"
 msgstr "╔А╔ц╔╩║╪╔╦╓Р╔Ё╔т║╪цФ"
 
-#: mail/mail-local.c:341
+#: 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:372
+#: 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:781
+#: mail/mail-local.c:787
 msgid "Registering local folder"
 msgstr "╔М║╪╔╚╔К╔у╔╘╔К╔ю╓Репо©цФ"
 
-#: mail/mail-local.c:783
+#: mail/mail-local.c:789
 msgid "Register local folder"
 msgstr "╔М║╪╔╚╔К╔у╔╘╔К╔ю╓Репо©╓╥╓ч╓╧"
 
-#: mail/mail-ops.c:79
+#: 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 ╓ь╫ЮхВ╓╥╓ф╓╓╓К╢ж╓к╔╗╔И║╪╓╛х╞ю╦╓╥╓ч╓╥╓©:\n"
+"%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:81
+#: 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:538
+#: mail/mail-ops.c:551
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" ╓РаВ©╝цФ"
 
-#: mail/mail-ops.c:543
-msgid "Sending a message without a subject"
-msgstr "и╫бЙ╓й╓╥╓н╔А╔ц╔╩║╪╔╦╓РаВ©╝╓╥╓ф╓╓╓ч╓╧"
-
-#: mail/mail-ops.c:546
-#, c-format
-msgid "Send \"%s\""
-msgstr "\"%s\" ╓РаВ©╝╓╥╓ч╓╧"
-
-#: mail/mail-ops.c:549
-msgid "Send a message without a subject"
-msgstr "и╫бЙ╓й╓╥╓н╔А╔ц╔╩║╪╔╦╓РаВ©╝╓╥╓ч╓╧"
+#: mail/mail-ops.c:553
+#, fuzzy
+msgid "Sending message"
+msgstr "╓Ё╓н╔А╔ц╔╩║╪╔╦╓Р╨ёаВ©╝╓╥╓ч╓╧"
 
-#: mail/mail-ops.c:720
+#: mail/mail-ops.c:669
 msgid "Sending queue"
 msgstr "╔╜╔Е║╪╓РаВ©╝цФ"
 
-#: mail/mail-ops.c:722
+#: mail/mail-ops.c:671
 msgid "Send queue"
 msgstr "╔╜╔Е║╪╓РаВ©╝╓╥╓ч╓╧"
 
-#: mail/mail-ops.c:858 mail/mail-ops.c:865
+#: mail/mail-ops.c:804 mail/mail-ops.c:811
 #, c-format
 msgid "Appending \"%s\""
 msgstr "\"%s\" ╓Рди╡ццФ"
 
-#: mail/mail-ops.c:862 mail/mail-ops.c:868
+#: mail/mail-ops.c:808 mail/mail-ops.c:814
 msgid "Appending a message without a subject"
 msgstr "и╫бЙ╓й╓╥╓н╔А╔ц╔╩║╪╔╦╓Риу╡ц╓╥╓ф╓╓╓ч╓╧"
 
-#: mail/mail-ops.c:940
-#, c-format
-msgid "Expunging \"%s\""
-msgstr "\"%s\" ╓РкУ╬ццФ"
-
-#: mail/mail-ops.c:942
-#, c-format
-msgid "Expunge \"%s\""
-msgstr "\"%s\" ╓РкУ╬ц╓╥╓ч╓╧"
-
-#: mail/mail-ops.c:1001
+#: mail/mail-ops.c:897
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "\"%s\" ╓╚╓И \"%s\" ╓нцФ╓ь╔А╔ц╔╩║╪╔╦╓Р╟эф╟╓╥╓ф╓╓╓ч╓╧"
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:899
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "\"%s\" ╓╚╓И \"%s\" ╓нцФ╓ь╔А╔ц╔╩║╪╔╦╓Р╔Ё╔т║╪╓╥╓ф╓╓╓ч╓╧"
 
-#: mail/mail-ops.c:1006
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "\"%s\" ╓╚╓И \"%s\" ╓нцФ╓ь╔А╔ц╔╩║╪╔╦╓Р╟эф╟╓╥╓ч╓╧"
 
-#: mail/mail-ops.c:1008
+#: mail/mail-ops.c:904
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "\"%s\" ╓╚╓И \"%s\" ╓нцФ╓ь╔А╔ц╔╩║╪╔╦╓Р╔Ё╔т║╪╓╥╓ч╓╧"
 
-#: mail/mail-ops.c:1039
+#: mail/mail-ops.c:935
 msgid "Moving"
 msgstr "╟эф╟цФ"
 
-#: mail/mail-ops.c:1042
+#: mail/mail-ops.c:938
 msgid "Copying"
 msgstr "╔Ё╔т║╪цФ"
 
-#: mail/mail-ops.c:1062
+#: mail/mail-ops.c:958
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "╔А╔ц╔╩║╪╔╦╓Р %s %d / %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1141
-#, c-format
-msgid "Marking messages in folder \"%s\""
-msgstr "╔у╔╘╔К╔ю \"%s\" ╓нцФ╓н╔А╔ц╔╩║╪╔╦╓Р╔ч║╪╔╞╓╥╓ф╓╓╓ч╓╧"
-
-#: mail/mail-ops.c:1144
-#, c-format
-msgid "Mark messages in folder \"%s\""
-msgstr "╔у╔╘╔К╔ю \"%s\" ╓нцФ╓н╔А╔ц╔╩║╪╔╦╓Р╔ч║╪╔╞╓╥╓ч╓╧"
-
-#: mail/mail-ops.c:1175
-#, c-format
-msgid "Marking message %d of %d"
-msgstr "╔А╔ц╔╩║╪╔╦ %d / %d ╓Р╔ч║╪╔╞цФ"
-
-#: mail/mail-ops.c:1295
+#: mail/mail-ops.c:1033
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" ╓нцФ╓н╔у╔╘╔К╔ю╓РаЖ╨╨цФ"
 
-#: mail/mail-ops.c:1297
-#, c-format
-msgid "Scan folders in \"%s\""
-msgstr "\"%s\" ╓нцФ╓н╔у╔╘╔К╔ю╓РаЖ╨╨╓╥╓ч╓╧"
-
-#: mail/mail-ops.c:1366 mail/subscribe-dialog.c:339
+#: mail/mail-ops.c:1099 mail/subscribe-dialog.c:341
 msgid "(No description)"
 msgstr "(юБлю╓й╓╥)"
 
-#: mail/mail-ops.c:1432
-#, c-format
-msgid "Attaching messages from folder \"%s\""
-msgstr "╔у╔╘╔К╔ю \"%s\" ╓╚╓И╔А╔ц╔╩║╪╔╦╓Ре╨иуцФ"
-
-#: mail/mail-ops.c:1435
-#, c-format
-msgid "Attach messages from \"%s\""
-msgstr "\"%s\" ╓╚╓И╔А╔ц╔╩║╪╔╦╓Ре╨иу╓╥╓ч╓╧"
-
-#: mail/mail-ops.c:1535
-#, c-format
-msgid "Forwarding messages \"%s\""
-msgstr "╔А╔ц╔╩║╪╔╦ \"%s\" ╓Ре╬аВцФ"
-
-#: mail/mail-ops.c:1539
-msgid "Forwarding a message without a subject"
-msgstr "и╫бЙ╓й╓╥╓н╔А╔ц╔╩║╪╔╦╓Ре╬аВцФ"
-
-#: mail/mail-ops.c:1542
-#, c-format
-msgid "Forward message \"%s\""
-msgstr "╔А╔ц╔╩║╪╔╦ \"%s\" ╓Ре╬аВ╓╥╓ч╓╧"
-
-#: mail/mail-ops.c:1546
-msgid "Forward a message without a subject"
-msgstr "и╫бЙ╓й╓╥╓н╔А╔ц╔╩║╪╔╦╓Ре╬аВ╓╥╓ч╓╧"
-
-#: mail/mail-ops.c:1593
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "╔А╔ц╔╩║╪╔╦хж╧Ф╓Р╪Хфю╓╥╓ф╓╓╓ч╓╧ %d / %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1610
-msgid ""
-"Failed to generate mime part from message while generating forwarded message."
-msgstr ""
-"е╬аВ╓╣╓Л╓К╔А╔ц╔╩║╪╔╦╓Рю╦ю╝цФ╓к╔А╔ц╔╩║╪╔╦╓╚╓И MIME ╔я║╪╔х╓ню╦ю╝╓г╪╨гт╓╥╓ч╓╥╓©"
-
-#: mail/mail-ops.c:1665
+#: mail/mail-ops.c:1164
 msgid "Forwarded messages"
 msgstr "╔А╔ц╔╩║╪╔╦╓Ре╬аВ"
 
-#: mail/mail-ops.c:1679
-msgid "Forwarded message:\n"
-msgstr "╔А╔ц╔╩║╪╔╦╓Ре╬аВ:\n"
-
-#: mail/mail-ops.c:1748
-#, c-format
-msgid "Loading \"%s\""
-msgstr "\"%s\" ╓Р╔М║╪╔ицФ"
-
-#: mail/mail-ops.c:1750
-#, c-format
-msgid "Load \"%s\""
-msgstr "\"%s\" ╓Р╔М║╪╔и╓╥╓ч╓╧"
-
-#: mail/mail-ops.c:1853
-#, c-format
-msgid "Creating \"%s\""
-msgstr "\"%s\" ╓Р╨Ню╝цФ"
-
-#: mail/mail-ops.c:1855
-#, c-format
-msgid "Create \"%s\""
-msgstr "\"%s\" ╓Р╨Ню╝╓╥╓ч╓╧"
-
-#: mail/mail-ops.c:1903
-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:1949
-#, c-format
-msgid "Synchronizing \"%s\""
+#: mail/mail-ops.c:1336
+#, fuzzy
+msgid "Synchronising folder"
 msgstr "\"%s\" ╓Рф╠╢ЭцФ"
 
-#: mail/mail-ops.c:1951
-#, c-format
-msgid "Synchronize \"%s\""
-msgstr "\"%s\" ╓Рф╠╢Э╓╥╓ч╓╧"
-
-#: mail/mail-ops.c:2015
-#, c-format
-msgid "Displaying message UID \"%s\""
-msgstr "╔А╔ц╔╩║╪╔╦ UID \"%s\" ╓Ри╫╪╗цФ"
-
-#: mail/mail-ops.c:2018
-msgid "Clearing message display"
-msgstr "╔А╔ц╔╩║╪╔╦╔г╔ё╔╧╔в╔Л╔╓╓Р╔╞╔Й╔╒цФ"
-
-#: mail/mail-ops.c:2021
-#, c-format
-msgid "Display message UID \"%s\""
-msgstr "╔А╔ц╔╩║╪╔╦ UID \"%s\" ╓Ри╫╪╗╓╥╓ч╓╧"
+#: mail/mail-ops.c:1386
+#, fuzzy
+msgid "Expunging folder"
+msgstr "\"%s\" ╓РкУ╬ццФ"
 
-#: mail/mail-ops.c:2024
-msgid "Clear message display"
-msgstr "╔А╔ц╔╩║╪╔╦╔г╔ё╔╧╔в╔Л╔╓╓Р╔╞╔Й╔╒╓╥╓ч╓╧"
+#: mail/mail-ops.c:1434
+#, fuzzy, c-format
+msgid "Retrieving message %s"
+msgstr "╔А╔ц╔╩║╪╔╦╓Р╪Хфю╓╥╓ф╓╓╓ч╓╧ %d / %d"
 
-#: mail/mail-ops.c:2137
-#, c-format
-msgid "Opening messages from folder \"%s\""
-msgstr "╔у╔╘╔К╔ю \"%s\" ╓╚╓И╔А╔ц╔╩║╪╔╦╓РЁ╚╓╓╓ф╓╓╓ч╓╧"
+#: mail/mail-ops.c:1497
+#, fuzzy
+msgid "Retrieving messages"
+msgstr "╔А╔ц╔╩║╪╔╦╓Р╪Хфю╓╥╓ф╓╓╓ч╓╧ %d / %d"
 
-#: mail/mail-ops.c:2140
+#: mail/mail-ops.c:1507
 #, c-format
-msgid "Open messages from \"%s\""
-msgstr "\"%s\" ╓╚╓И╔А╔ц╔╩║╪╔╦╓РЁ╚╓╜╓ч╓╧"
+msgid "Retrieving message number %d of %d (uid \"%s\")"
+msgstr "╔А╔ц╔╩║╪╔╦хж╧Ф╓Р╪Хфю╓╥╓ф╓╓╓ч╓╧ %d / %d (uid \"%s\")"
 
-#: mail/mail-ops.c:2244
-#, c-format
-msgid "Loading %s Folder"
+#: mail/mail-ops.c:1655
+#, fuzzy, c-format
+msgid "Loading %s Folder for %s"
 msgstr "%s ╔у╔╘╔К╔ю╓Р╔М║╪╔ицФ"
 
-#: mail/mail-ops.c:2246
-#, c-format
-msgid "Load %s Folder"
+#: mail/mail-ops.c:1657
+#, fuzzy, c-format
+msgid "Load %s Folder for %s"
 msgstr "%s ╔у╔╘╔К╔ю╓Рфи╓ъ╧Ч╓ъ╓ч╓╧"
 
-#: mail/mail-ops.c:2310
-#, c-format
-msgid "Viewing messages from folder \"%s\""
-msgstr "╔у╔╘╔К╔ю \"%s\" ╓╚╓И╔А╔ц╔╩║╪╔╦╓Ри╫╪╗цФ"
-
-#: mail/mail-ops.c:2313
-#, c-format
-msgid "View messages from \"%s\""
-msgstr "\"%s\" ╓╚╓И╔А╔ц╔╩║╪╔╦╓Ри╫╪╗╓╥╓ч╓╧"
-
-#: mail/mail-ops.c:2339
-#, c-format
-msgid "Retrieving message %d of %d (uid \"%s\")"
-msgstr "╔А╔ц╔╩║╪╔╦╓Р╪Хфю╓╥╓ф╓╓╓ч╓╧ %d / %d (uid \"%s\")"
-
-#: mail/mail-ops.c:2428
-#, c-format
-msgid "Saving messages from folder \"%s\""
-msgstr "╔у╔╘╔К╔ю \"%s\" ╓╚╓И╔А╔ц╔╩║╪╔╦╓Рйщб╦цФ"
+#: mail/mail-ops.c:1823
+#, fuzzy
+msgid "Saving messages"
+msgstr "╔А╔ц╔╩║╪╔╦╓Р╔Ё╔т║╪цФ"
 
-#: mail/mail-ops.c:2431
-#, 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:2474
+#: mail/mail-ops.c:1915
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "╔А╔ц╔╩║╪╔╦╓Рйщб╦╓╥╓ф╓╓╓ч╓╧ %d / %d (uid \"%s\")"
 
+#: 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 "╔╜╔Ц╔С╔╩╔К"
 
-#: mail/mail-summary.c:105 mail/mail-threads.c:728
+#: mail/mail-summary.c:110 mail/mail-threads.c:729
 msgid "Incomplete message written on pipe!"
 msgstr "╔я╔╓╔в╬Е╓кит╢╟а╢╓й╔А╔ц╔╩║╪╔╦╓╛╫Я╓╚╓Л╓ч╓╥╓©!"
 
-#: mail/mail-threads.c:301
+#: mail/mail-threads.c:302
 #, c-format
 msgid ""
 "Error while preparing to %s:\n"
@@ -4927,7 +5365,7 @@ msgstr ""
 "%s ╓ь╫ЮхВ╓╥╓ф╓╓╓К╢ж╓к╔╗╔И║╪╓╛х╞ю╦╓╥╓ч╓╥╓©:\n"
 "%s"
 
-#: mail/mail-threads.c:675
+#: mail/mail-threads.c:676
 #, c-format
 msgid ""
 "Error while `%s':\n"
@@ -4936,19 +5374,19 @@ msgstr ""
 "'%s' ╓н╨щ╓к╔╗╔И║╪╓╛х╞ю╦╓╥╓ч╓╥╓©:\n"
 "%s"
 
-#: mail/mail-threads.c:732
+#: mail/mail-threads.c:733
 msgid "Error reading commands from dispatching thread."
 msgstr "ги╦╞╓╣╓Л╓©╔╧╔Л╔ц╔и╓╚╓И╔Ё╔ч╔С╔ифи╓ъ╧Ч╓ъцФ╓к╔╗╔И║╪╓╛х╞ю╦╓╥╓ч╓╥╓©"
 
-#: mail/mail-threads.c:797
+#: mail/mail-threads.c:798
 msgid "Corrupted message from dispatching thread?"
 msgstr "ги╦╞╓╣╓Л╓©╔╧╔Л╔ц╔и╓╚╓Иитю╣╓й╔А╔ц╔╩║╪╔╦?"
 
-#: mail/mail-threads.c:916
+#: mail/mail-threads.c:917
 msgid "Could not create dialog box."
 msgstr "╔ю╔╓╔╒╔М╔╟╔э╔ц╔╞╔╧╓Р╨Ню╝╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
-#: mail/mail-threads.c:927
+#: mail/mail-threads.c:928
 msgid "User cancelled query."
 msgstr "╔Ф║╪╔╤╓о╔╞╔╗╔Й╓Р╔╜╔Ц╔С╔╩╔К╓╥╓ч╓╥╓©"
 
@@ -4958,12 +5396,12 @@ msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "╔ф╔С╔щ╔И╔Й mbox '%s' ╓Р╨Ню╝╓г╓╜╓ч╓╩╓С╓г╓╥╓©: %s"
 
 #. Get all uids of source
-#: mail/mail-tools.c:239
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Examining %s"
 msgstr "%s ╓Рд╢╨╨цФ"
 
-#: mail/mail-tools.c:269
+#: mail/mail-tools.c:271
 #, c-format
 msgid ""
 "Could not read UID cache file \"%s\". You may receive duplicate messages."
@@ -4971,42 +5409,41 @@ msgstr ""
 "UID ╔╜╔Ц╔ц╔╥╔Е╔у╔║╔╓╔К \"%s\" ╓Рфи╓ъ╧Ч╓Ю╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©. "
 "╫ейё╓╥╓©╔А╔ц╔╩║╪╔╦╓Р╪Хфю╓╧╓К╓╚╓Б╓╥╓Л╓ч╓╩╓С"
 
-#. Info
-#: mail/mail-tools.c:290
+#: mail/mail-tools.c:300
 #, c-format
 msgid "Retrieving message %d of %d"
 msgstr "╔А╔ц╔╩║╪╔╦╓Р╪Хфю╓╥╓ф╓╓╓ч╓╧ %d / %d"
 
 #. Append it to dest
-#: mail/mail-tools.c:303
+#: mail/mail-tools.c:315
 #, c-format
 msgid "Writing message %d of %d"
 msgstr "╔А╔ц╔╩║╪╔╦╓Р╫Я╓╜╫п╓╥╓ф╓╓╓ч╓╧ %d / %d"
 
-#: mail/mail-tools.c:332
+#: mail/mail-tools.c:347
 #, c-format
 msgid "Saving changes to %s"
 msgstr "%s ╓ьйя╧╧╓Рйщб╦цФ"
 
-#: mail/mail-tools.c:369
+#: mail/mail-tools.c:381
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (╔А╔ц╔╩║╪╔╦╓Ре╬аВ)"
 
-#: mail/mail-tools.c:379
+#: mail/mail-tools.c:391
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (и╫бЙ╓й╓╥)"
 
-#: mail/mail-tools.c:418
+#: mail/mail-tools.c:427
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "╔А╔ц╔╩║╪╔╦╓Ре╬аВ╓╥╓ч╓╥╓© - %s"
 
-#: mail/mail-tools.c:420
+#: mail/mail-tools.c:429
 msgid "Forwarded message (no subject)"
 msgstr "╔А╔ц╔╩║╪╔╦╓Ре╬аВ╓╥╓ч╓╥╓© (и╫бЙ╓й╓╥)"
 
-#: mail/mail-tools.c:523
+#: mail/mail-tools.c:530
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
@@ -5015,74 +5452,94 @@ msgstr ""
 "'%s' ╓н╬Л╫Й╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С:\n"
 "%s"
 
-#: mail/mail-vfolder.c:147
+#: mail/mail-vfolder.c:149
 msgid "VFolders"
 msgstr "╡╬аш╔у╔╘╔К╔ю"
 
-#: mail/mail-vfolder.c:296
+#: mail/mail-vfolder.c:298
 msgid "New VFolder"
 msgstr "©╥╣╛╡╬аш╔у╔╘╔К╔ю"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:33
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:37
 msgid "Reply"
 msgstr "йж©╝"
 
-#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:38
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
 msgid "Reply to the sender of this message"
 msgstr "╔А╔ц╔╩║╪╔╦╓н╨╧╫п©м╓ьйж©╝╓╥╓ч╓╧"
 
-#: mail/mail-view.c:156 po/tmp/evolution-mail.xml.h:37
+#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
 msgid "Reply to all recipients of this message"
 msgstr "╓Ё╓н╔А╔ц╔╩║╪╔╦╓н╪У╪Х©ма╢╟В╓ьйж©╝╓╥╓ч╓╧"
 
-#: mail/mail-view.c:159 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:163 po/tmp/evolution-mail.xml.h:32
+#: mail/mail-view.c:148 ui/evolution-mail.xml.h:36
 msgid "Print the selected message"
 msgstr "а╙бР╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓Р╟У╨Ч╓╥╓ч╓╧"
 
-#: mail/mail-view.c:165 po/tmp/evolution-mail.xml.h:12
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:12
 msgid "Delete this message"
 msgstr "╓Ё╓н╔А╔ц╔╩║╪╔╦╓Р╨О╫Э╓╥╓ч╓╧"
 
-#: mail/message-list.c:572
+#: mail/message-list.c:590
 msgid "Unseen"
 msgstr "л╓фи"
 
-#: mail/message-list.c:575
+#: mail/message-list.c:593
 msgid "Seen"
 msgstr "╢Шфи"
 
-#: mail/message-list.c:578
+#: mail/message-list.c:596
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:846
+#: mail/message-list.c:881
 #, c-format
 msgid "[ %s ]"
 msgstr "[ %s ]"
 
 #. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:858 mail/message-list.c:873
+#: mail/message-list.c:893 mail/message-list.c:909
 #, c-format
 msgid "%s, et al."
 msgstr ""
 
-#: mail/message-list.c:860 mail/message-list.c:875
+#: mail/message-list.c:896 mail/message-list.c:912
 msgid "<unknown>"
 msgstr "<л╓цн>"
 
-#: mail/message-list.c:2068
-msgid "Rebuilding message view"
-msgstr "╔А╔ц╔╩║╪╔╦╔с╔Е║╪╓Р╨ф╧╫цшцФ"
+#: mail/message-list.c:965
+msgid "?"
+msgstr ""
 
-#: mail/message-list.c:2070
-msgid "Rebuild message view"
-msgstr "╔А╔ц╔╩║╪╔╦╔с╔Е║╪╓Р╨ф╧╫цш"
+#: mail/message-list.c:972
+#, fuzzy
+msgid "Today %l:%M %p"
+msgstr "%p %I:%M"
+
+#: mail/message-list.c:981
+msgid "Yesterday %l:%M %p"
+msgstr ""
+
+#: mail/message-list.c:993
+#, fuzzy
+msgid "%a %l:%M %p"
+msgstr "%p %I:%M"
+
+#: mail/message-list.c:1001
+#, fuzzy
+msgid "%b %d %l:%M %p"
+msgstr "%Y/%m/%d (%a) %p %I:%M:%S"
+
+#: mail/message-list.c:1003
+#, fuzzy
+msgid "%b %d %Y"
+msgstr "%Y/%d (%a)"
 
 #: mail/subscribe-dialog.c:139
 msgid "Display folders starting with:"
@@ -5098,27 +5555,27 @@ msgstr ""
 msgid "Get store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:282
+#: mail/subscribe-dialog.c:283
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:286
+#: mail/subscribe-dialog.c:287
 #, fuzzy, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "╔у╔╘╔К╔ю \"%s\" ╓╚╓И╔А╔ц╔╩║╪╔╦╓РЁ╚╓╓╓ф╓╓╓ч╓╧"
 
-#: mail/subscribe-dialog.c:290
+#: mail/subscribe-dialog.c:291
 #, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:293
+#: mail/subscribe-dialog.c:294
 #, fuzzy, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr "╔у╔╘╔К╔ю \"%s\" ╓╚╓И╔А╔ц╔╩║╪╔╦╓РЁ╚╓╓╓ф╓╓╓ч╓╧"
 
-#: shell/e-setup.c:112 shell/e-setup.c:183
+#: shell/e-setup.c:112 shell/e-setup.c:185
 msgid "Evolution installation"
 msgstr "Evolution ╓н╔╓╔С╔╧╔х║╪╔К"
 
@@ -5134,24 +5591,24 @@ msgstr ""
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr "\"OK\" ╓г╔у╔║╔╓╔К╓Р╔╓╔С╔╧╔х║╪╔К, ╓ч╓©╓о \"╔╜╔Ц╔С╔╩╔К\" ╓г╫╙н╩╓╥╓ч╓╧"
 
-#: shell/e-setup.c:155
+#: shell/e-setup.c:157
 msgid "Could not update files correctly"
 msgstr "ю╣╓╥╓╞╔у╔║╔╓╔К╓Р╧╧©╥╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
-#: shell/e-setup.c:158 shell/e-setup.c:224
+#: shell/e-setup.c:160 shell/e-setup.c:228
 msgid "Evolution files successfully installed."
 msgstr "Evolution ╓н╔у╔║╔╓╔К╓ою╣╓╥╓╞╔╓╔С╔╧╔х║╪╔К╓╣╓Л╓ч╓╥╓©"
 
-#: shell/e-setup.c:187
+#: shell/e-setup.c:189
 msgid "This seems to be the first time you run Evolution."
 msgstr "╓╒╓й╓©╓о Evolution ╓Р╫И╓А╓ф╪б╧т╓╥╓©╓Х╓╕╓к╩в╓╗╓ч╓╧"
 
-#: shell/e-setup.c:188
+#: shell/e-setup.c:190
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 "Evolution ╔Ф║╪╔╤╔у╔║╔╓╔К╓Р╔╓╔С╔╧╔х║╪╔К╓╥╓ч╓╧╓н╓г \"OK\" ╓Р╔╞╔Й╔ц╔╞╓╥╓ф╡╪╓╣╓╓"
 
-#: shell/e-setup.c:205
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -5162,7 +5619,7 @@ msgstr ""
 "\n"
 "╔╗╔И║╪: %s"
 
-#: shell/e-setup.c:220
+#: shell/e-setup.c:224
 #, c-format
 msgid ""
 "Cannot copy files into\n"
@@ -5171,7 +5628,7 @@ msgstr ""
 "'%s' ╓нцФ╓к╔у╔║╔╓╔К╓Р\n"
 "╔Ё╔т║╪╫пмХ╓ч╓╩╓С"
 
-#: shell/e-setup.c:245
+#: shell/e-setup.c:249
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -5182,7 +5639,7 @@ msgstr ""
 "Evolution ╔Ф║╪╔╤╔у╔║╔╓╔К╓н╔╓╔С╔╧╔х║╪╔К╓Р\n"
 "╣Жмф╓╧╓К╓©╓А╓к╟эф╟╓╥╓ф╡╪╓╣╓╓"
 
-#: shell/e-setup.c:257
+#: shell/e-setup.c:261
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -5218,7 +5675,7 @@ msgstr ""
 "а╙бР╓╥╓©╔у╔╘╔К╔ю╓н╪Ойл╓омв╣А╓╣╓Л╓©аЮ╨Н╓н╓©╓А╓к\n"
 "м╜╦З╓г╓о╓╒╓Й╓ч╓╩╓С"
 
-#: shell/e-shell-folder-selection-dialog.c:291
+#: shell/e-shell-folder-selection-dialog.c:297
 msgid "New..."
 msgstr "©╥╣╛..."
 
@@ -5226,23 +5683,19 @@ msgstr "©╥╣╛..."
 msgid "(Untitled)"
 msgstr "(╔©╔╓╔х╔К╓й╓╥)"
 
-#. you might have to call gnome_dialog_run() on the
-#. * dialog returned here, I don't remember...
-#.
-#: shell/e-shell-view-menu.c:114
+#: shell/e-shell-view-menu.c:111
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy ╓о╓╒╓й╓©╓н $PATH ╓к╓о╦╚╓д╓╚╓Й╓ч╓╩╓С"
 
-#. same as above
-#: shell/e-shell-view-menu.c:120
+#: shell/e-shell-view-menu.c:117
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy ╓о╪б╧т╓г╓╜╓ч╓╩╓С╓г╓╥╓©"
 
-#: shell/e-shell-view-menu.c:172
+#: shell/e-shell-view-menu.c:169
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:174
+#: shell/e-shell-view-menu.c:171
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -5254,7 +5707,7 @@ msgstr ""
 "╔╟╔К║╪╔в╔╕╔╖╔╒╔╒╔в╔Й╔╠║╪╔╥╔Г╔С╓н\n"
 "╔я╔ц╔╠║╪╔╦╔╫╔у╔х╓г╓╧"
 
-#: shell/e-shell-view-menu.c:335
+#: shell/e-shell-view-menu.c:332
 msgid "Go to folder..."
 msgstr "╔у╔╘╔К╔ю╓ь╟эф╟..."
 
@@ -5352,9 +5805,8 @@ msgstr "╔╥╔Г║╪╔х╔╚╔ц╔х╔п║╪╓╚╓И╓Ё╓н╔╥╔Г║╪╔х╔╚╔ц╔х╓Р╨О╫Э╓╥╓ч╓╧"
 msgid "Error saving shortcuts."
 msgstr "╔╥╔Г║╪╔х╔╚╔ц╔х╓нйщб╦цФ╓к╔╗╔И║╪╓╛х╞ю╦╓╥╓ч╓╥╓©"
 
-#: po/tmp/evolution-event-editor.xml.h:125
-#: po/tmp/evolution-message-composer.xml.h:43 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 "и╫╪╗(_V)"
 
@@ -5411,12 +5863,13 @@ msgid "The specified type is not supported in this storage"
 msgstr "╩ьдЙ╓╣╓Л╓©╪Ойл╓о╓Ё╓н╣╜╡╠аУцж╓г╓о╔╣╔щ║╪╔х╓╣╓Л╓ф╓╓╓ч╓╩╓С"
 
 #: shell/main.c:74
+#, fuzzy
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
-"Over the last month and a half, our focus has been on making\n"
-"Evolution usable. Many of the Evolution developers are now using\n"
+"Over the time since the past release, our focus has been on making\n"
+"Evolution usable.  Many of the Evolution developers are now using\n"
 "Evolution to read their mail full time. You could too. (Just\n"
 "be sure to keep a backup.)\n"
 "\n"
@@ -5472,1100 +5925,1125 @@ msgstr "л╣╦З"
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobo ╔Ё╔С╔щ║╪╔м╔С╔х╔╥╔╧╔ф╔Ю╓Р╫И╢Э╡╫╫пмХ╓ч╓╩╓С"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-addressbook-ldap.xml.h:6
-msgid "N_ew Directory Server"
-msgstr "©╥╣╛╔г╔ё╔Л╔╞╔х╔Й╔╣║╪╔п(_e)"
-
-#: po/tmp/evolution-addressbook-ldap.xml.h:7
-msgid "_Actions"
-msgstr "ф╟╨Н(_A)"
-
-#: 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
+#, fuzzy
+msgid "_Addressbook Configuration..."
+msgstr "╔А║╪╔КюъдЙ(_M)"
+
+#: ui/evolution-addressbook.xml.h:20
 msgid "_Print Contacts..."
 msgstr "╔Ё╔С╔©╔╞╔х╓Р╟У╨Ч(_P)..."
 
-#: po/tmp/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:21
 msgid "_Search for contacts"
 msgstr "╔Ё╔С╔©╔╞╔х╓н╦║╨В(_S)"
 
-#: po/tmp/evolution-addressbook.xml.h:21
-#: po/tmp/evolution-event-editor.xml.h:123
+#: ui/evolution-addressbook.xml.h:22 ui/evolution-event-editor.xml.h:123
 msgid "_Tools"
 msgstr "╔д║╪╔К(_T)"
 
 #.
-#. * 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 "╔╚╔Л╔С╔ю(_l)"
 
-#: 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:414
+#: 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 "©╥╣╛(_N)"
 
-#: po/tmp/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:33
 msgid "_Open Calendar"
 msgstr "╔╚╔Л╔С╔ю╓РЁ╚╓╞(_O)"
 
-#: po/tmp/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:34
 msgid "_Print this calendar"
 msgstr "╓Ё╓н╔╚╔Л╔С╔ю╓Р╟У╨Ч(_P)"
 
-#: po/tmp/evolution-calendar.xml.h:35
-msgid "_Save Calendar As"
-msgstr "╔╚╔Л╔С╔ю╓Рйлл╬╓гйщб╦(_S)"
+#: ui/evolution-calendar.xml.h:35
+#, fuzzy
+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 "╔╗╔С╔ы╔М║╪╔в╓Р╟У╨Ч(_v)..."
 
-#: 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:18
+#: 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 "йлл╬╓гйщб╦(_A)..."
 
-#: 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
 #, fuzzy
 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:38
-#: 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 "╔у╔║╔╓╔К(_F)"
 
-#: po/tmp/evolution-contact-editor.xml.h:20
+#: ui/evolution-contact-editor.xml.h:20
 msgid "_Print..."
 msgstr "╟У╨Ч(_P)..."
 
-#: po/tmp/evolution-contact-editor.xml.h:21
-#: po/tmp/evolution-event-editor.xml.h:121
-#: po/tmp/evolution-message-composer.xml.h:42
+#: ui/evolution-contact-editor.xml.h:21 ui/evolution-event-editor.xml.h:121
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Save"
 msgstr "йщб╦(_S)"
 
 #.
-#. * 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 "ф╟╨Н(_n)"
 
-#: po/tmp/evolution-event-editor.xml.h:9
+#: ui/evolution-event-editor.xml.h:9
 msgid "C_lear"
 msgstr "╔╞╔Й╔╒(_l)"
 
-#: po/tmp/evolution-event-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:10
 msgid "C_ut"
 msgstr "юз╪Х╓Й(_u)"
 
-#: 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 "XML ╓Р╔ю╔С╔в"
 
-#: po/tmp/evolution-event-editor.xml.h:22
+#: ui/evolution-event-editor.xml.h:22
 msgid "Dump the UI Xml description"
 msgstr "UI XML ╓н╣╜╫р╓Р╔ю╔С╔в╓╧╓К"
 
-#: po/tmp/evolution-event-editor.xml.h:23
+#: ui/evolution-event-editor.xml.h:23
 msgid "FIXME: Address _Book..."
 msgstr "FIXME: ╔╒╔и╔Л╔╧д╒(_B)..."
 
-#: po/tmp/evolution-event-editor.xml.h:24
+#: ui/evolution-event-editor.xml.h:24
 msgid "FIXME: Ch_oose Form..."
 msgstr "FIXME: ╔у╔╘║╪╔Ю╓Ра╙бР(_o)..."
 
-#: po/tmp/evolution-event-editor.xml.h:25
+#: ui/evolution-event-editor.xml.h:25
 msgid "FIXME: Chec_k Names"
 msgstr "FIXME: л╬а╟╓Р╔а╔╖╔ц╔╞(_k)"
 
-#: po/tmp/evolution-event-editor.xml.h:26
+#: ui/evolution-event-editor.xml.h:26
 msgid "FIXME: Cop_y to Folder..."
 msgstr "FIXME: ╔у╔╘╔К╔ю╓ь╔Ё╔т║╪(_y)..."
 
-#: po/tmp/evolution-event-editor.xml.h:27
+#: ui/evolution-event-editor.xml.h:27
 msgid "FIXME: D_esign a Form..."
 msgstr "FIXME: ╔у╔╘║╪╔Ю╓н╔г╔╤╔╓╔С(_e)..."
 
-#: po/tmp/evolution-event-editor.xml.h:28
+#: ui/evolution-event-editor.xml.h:28
 msgid "FIXME: Define Print _Styles"
 msgstr "FIXME: ╟У╨Ч╔╧╔©╔╓╔К╓РдЙ╣а(_S)"
 
-#: po/tmp/evolution-event-editor.xml.h:29
+#: ui/evolution-event-editor.xml.h:29
 msgid "FIXME: Desi_gn This Form"
 msgstr "FIXME: ╓Ё╓н╔у╔╘║╪╔Ю╓Р╔г╔╤╔╓╔С(_g)"
 
-#: po/tmp/evolution-event-editor.xml.h:30
+#: ui/evolution-event-editor.xml.h:30
 msgid "FIXME: Fi_rst Item in Folder"
 msgstr "FIXME: ╔у╔╘╔К╔ю╓н╨г╫И╓н╔╒╔╓╔ф╔Ю(_r)"
 
-#: po/tmp/evolution-event-editor.xml.h:31
+#: ui/evolution-event-editor.xml.h:31
 msgid "FIXME: For_ward"
 msgstr "FIXME: е╬аВ(_w)"
 
-#: po/tmp/evolution-event-editor.xml.h:32
+#: ui/evolution-event-editor.xml.h:32
 msgid "FIXME: Forward as v_Calendar"
 msgstr "FIXME: ╡╬аш╔╚╔Л╔С╔ю╓ге╬аВ(_C)"
 
-#: po/tmp/evolution-event-editor.xml.h:33
+#: ui/evolution-event-editor.xml.h:33
 msgid "FIXME: Help"
 msgstr "FIXME: ╔ь╔К╔в"
 
-#: po/tmp/evolution-event-editor.xml.h:34
+#: ui/evolution-event-editor.xml.h:34
 msgid "FIXME: In_complete Task"
 msgstr "FIXME: л╓╨Н╤х"
 
-#: po/tmp/evolution-event-editor.xml.h:35
+#: ui/evolution-event-editor.xml.h:35
 msgid "FIXME: Insert File"
 msgstr "FIXME: ╔у╔║╔╓╔К╓РачфЧ"
 
-#: po/tmp/evolution-event-editor.xml.h:36
+#: ui/evolution-event-editor.xml.h:36
 msgid "FIXME: It_em..."
 msgstr "FIXME: ╔╒╔╓╔ф╔Ю(_e)..."
 
-#: po/tmp/evolution-event-editor.xml.h:37
+#: ui/evolution-event-editor.xml.h:37
 msgid "FIXME: Paste _Special... "
 msgstr "FIXME: фцйл╓йе╫иу╓╠(_S)..."
 
-#: po/tmp/evolution-event-editor.xml.h:38
+#: ui/evolution-event-editor.xml.h:38
 msgid "FIXME: Print Pre_view"
 msgstr "FIXME: ╟У╨Ч╔в╔Л╔с╔Е║╪(_v)"
 
-#: po/tmp/evolution-event-editor.xml.h:39
+#: ui/evolution-event-editor.xml.h:39
 msgid "FIXME: Pu_blish Form As..."
 msgstr "FIXME: йлл╬╓г╔у╔╘║╪╔Ю╓Рх╞╧т(_b)..."
 
-#: po/tmp/evolution-event-editor.xml.h:40
+#: ui/evolution-event-editor.xml.h:40
 msgid "FIXME: Publish _Form..."
 msgstr "FIXME: ╔у╔╘║╪╔Ю╓Рх╞╧т(_F)..."
 
-#: po/tmp/evolution-event-editor.xml.h:41
+#: ui/evolution-event-editor.xml.h:41
 msgid "FIXME: Rec_urrence..."
 msgstr "FIXME: ╨фх╞(_u)..."
 
-#: po/tmp/evolution-event-editor.xml.h:42
+#: ui/evolution-event-editor.xml.h:42
 msgid "FIXME: S_end"
 msgstr "FIXME: аВ©╝(_e)"
 
-#: po/tmp/evolution-event-editor.xml.h:43
+#: ui/evolution-event-editor.xml.h:43
 msgid "FIXME: Save Attac_hments..."
 msgstr "FIXME: е╨иу╓нйщб╦(_h)..."
 
-#: po/tmp/evolution-event-editor.xml.h:44
+#: ui/evolution-event-editor.xml.h:44
 msgid "FIXME: Script _Debugger"
 msgstr "FIXME: ╔╧╔╞╔Й╔в╔х╔г╔п╔ц╔╛"
 
-#: po/tmp/evolution-event-editor.xml.h:45
+#: ui/evolution-event-editor.xml.h:45
 msgid "FIXME: Task _Request"
 msgstr "FIXME: ╨Н╤хмв╣А(_R)"
 
-#: po/tmp/evolution-event-editor.xml.h:46
+#: ui/evolution-event-editor.xml.h:46
 msgid "FIXME: _Contact"
 msgstr "FIXME: ╔Ё╔С╔©╔╞╔х(_C)"
 
-#: po/tmp/evolution-event-editor.xml.h:47
+#: ui/evolution-event-editor.xml.h:47
 msgid "FIXME: _Customize..."
 msgstr "FIXME: ╔╚╔╧╔©╔ч╔╓╔╨(_C)..."
 
-#: po/tmp/evolution-event-editor.xml.h:48
+#: ui/evolution-event-editor.xml.h:48
 msgid "FIXME: _File..."
 msgstr "FIXME: ╔у╔║╔╓╔К(_F)..."
 
-#: po/tmp/evolution-event-editor.xml.h:49
+#: ui/evolution-event-editor.xml.h:49
 msgid "FIXME: _Font..."
 msgstr "FIXME: ╔у╔╘╔С╔х(_F)..."
 
-#: po/tmp/evolution-event-editor.xml.h:50
+#: ui/evolution-event-editor.xml.h:50
 msgid "FIXME: _Formatting"
 msgstr "FIXME: ╔у╔╘║╪╔ч╔ц╔х(_F)"
 
-#: po/tmp/evolution-event-editor.xml.h:51
+#: ui/evolution-event-editor.xml.h:51
 msgid "FIXME: _Item"
 msgstr "FIXME: ╔╒╔╓╔ф╔Ю(_I)"
 
-#: po/tmp/evolution-event-editor.xml.h:52
+#: ui/evolution-event-editor.xml.h:52
 msgid "FIXME: _Journal Entry"
 msgstr "FIXME: ╩елУ╣╜фЧ(_J)"
 
-#: po/tmp/evolution-event-editor.xml.h:53
+#: ui/evolution-event-editor.xml.h:53
 msgid "FIXME: _Last Item in Folder"
 msgstr "FIXME: ╔у╔╘╔К╔ю╓н╨г╦Е╓н╔╒╔╓╔ф╔Ю(_L)"
 
-#: po/tmp/evolution-event-editor.xml.h:54
+#: ui/evolution-event-editor.xml.h:54
 msgid "FIXME: _Mail Message"
 msgstr "FIXME: ╔А╔ц╔╩║╪╔╦╓Р╔А║╪╔К(_M)"
 
-#: po/tmp/evolution-event-editor.xml.h:55
+#: ui/evolution-event-editor.xml.h:55
 msgid "FIXME: _Memo Style"
 msgstr "FIXME: ╔А╔Б╔╧╔©╔╓╔К"
 
-#: po/tmp/evolution-event-editor.xml.h:56
+#: ui/evolution-event-editor.xml.h:56
 msgid "FIXME: _Move to Folder..."
 msgstr "FIXME: ╔у╔╘╔К╔ю╓ь╟эф╟(_M)..."
 
-#: po/tmp/evolution-event-editor.xml.h:57
+#: ui/evolution-event-editor.xml.h:57
 msgid "FIXME: _New Appointment"
 msgstr "FIXME: ©╥╣╛м╫лС(_N)"
 
-#: po/tmp/evolution-event-editor.xml.h:58
+#: ui/evolution-event-editor.xml.h:58
 msgid "FIXME: _Note"
 msgstr "FIXME: ╔н║╪╔х(_N)"
 
-#: po/tmp/evolution-event-editor.xml.h:59
+#: ui/evolution-event-editor.xml.h:59
 msgid "FIXME: _Object..."
 msgstr "FIXME: ╔╙╔ж╔╦╔╖╔╞╔х(_O)..."
 
-#: po/tmp/evolution-event-editor.xml.h:60
+#: ui/evolution-event-editor.xml.h:60
 msgid "FIXME: _Paragraph..."
 msgstr "FIXME: цймН(_P)..."
 
-#: po/tmp/evolution-event-editor.xml.h:61
+#: ui/evolution-event-editor.xml.h:61
 msgid "FIXME: _Spelling..."
 msgstr "FIXME: ╔╧╔з╔К╔а╔╖╔ц╔╞(_S)..."
 
-#: po/tmp/evolution-event-editor.xml.h:62
+#: ui/evolution-event-editor.xml.h:62
 msgid "FIXME: _Standard"
 msgstr "FIXME: и╦╫Ю(_S)"
 
-#: po/tmp/evolution-event-editor.xml.h:63
+#: ui/evolution-event-editor.xml.h:63
 msgid "FIXME: _Task"
 msgstr "FIXME: ╨Н╤х(_T)"
 
-#: po/tmp/evolution-event-editor.xml.h:64
+#: ui/evolution-event-editor.xml.h:64
 msgid "FIXME: _Unread Item"
 msgstr "FIXME: л╓фи╔╒╔╓╔ф╔Ю(_U)"
 
-#: 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:10
+#: ui/evolution-event-editor.xml.h:66 ui/evolution-message-composer.xml.h:11
 msgid "F_ormat"
 msgstr "╔у╔╘║╪╔ч╔ц╔х(_o)"
 
-#: 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 "╓Б╓╕╟Леыц╣╓╧(_A)"
 
-#: 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 "╪║(_e)"
 
-#: 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 "а╟(_v)"
 
-#: 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 "╟У╨ЧюъдЙ(_e)..."
 
-#: 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:21
+#: 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 "╔ъ║╪╔ф╔ё╔С╔╟╓нм╫дЙ(_M)"
 
-#: 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
 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:34
+#: ui/evolution-event-editor.xml.h:104 ui/evolution-message-composer.xml.h:38
 msgid "_About..."
 msgstr "╬ПйС(_A)..."
 
-#: po/tmp/evolution-event-editor.xml.h:105
-#: po/tmp/evolution-message-composer.xml.h:35
+#: ui/evolution-event-editor.xml.h:105 ui/evolution-message-composer.xml.h:39
 msgid "_Close"
 msgstr "йд╓╦╓К(_C)"
 
-#: po/tmp/evolution-event-editor.xml.h:106
+#: ui/evolution-event-editor.xml.h:106
 msgid "_Copy"
 msgstr "╔Ё╔т║╪(_C)"
 
-#: po/tmp/evolution-event-editor.xml.h:107
-#: po/tmp/evolution-message-composer.xml.h:36
+#: ui/evolution-event-editor.xml.h:107 ui/evolution-message-composer.xml.h:40
 msgid "_Debug"
 msgstr "╔г╔п╔ц╔╟(_D)"
 
-#: po/tmp/evolution-event-editor.xml.h:109
-#: po/tmp/evolution-message-composer.xml.h:37
-#: 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 "йт╫╦(_E)"
 
-#: po/tmp/evolution-event-editor.xml.h:111
+#: ui/evolution-event-editor.xml.h:111
 msgid "_Find..."
 msgstr "╦║╨В(_F)..."
 
-#: po/tmp/evolution-event-editor.xml.h:112
+#: ui/evolution-event-editor.xml.h:112
 msgid "_Forms"
 msgstr "╔у╔╘║╪╔Ю(_F)"
 
-#: po/tmp/evolution-event-editor.xml.h:113
-#: po/tmp/evolution-message-composer.xml.h:39 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 "╔ь╔К╔в(_H)"
 
-#: po/tmp/evolution-event-editor.xml.h:114
+#: ui/evolution-event-editor.xml.h:114
 msgid "_Insert"
 msgstr "ачфЧ(_I)"
 
-#: po/tmp/evolution-event-editor.xml.h:115
+#: ui/evolution-event-editor.xml.h:115
 msgid "_Object"
 msgstr "╔╙╔ж╔╦╔╖╔╞╔х(_O)"
 
-#: po/tmp/evolution-event-editor.xml.h:116
+#: ui/evolution-event-editor.xml.h:116
 msgid "_Paste"
 msgstr "е╫иу╓╠(_P)"
 
-#: po/tmp/evolution-event-editor.xml.h:117
+#: ui/evolution-event-editor.xml.h:117
 msgid "_Print"
 msgstr "╟У╨Ч(_P)"
 
-#: po/tmp/evolution-event-editor.xml.h:118
+#: ui/evolution-event-editor.xml.h:118
 msgid "_Properties..."
 msgstr "╔в╔М╔я╔ф╔ё(P)..."
 
-#: po/tmp/evolution-event-editor.xml.h:119
+#: ui/evolution-event-editor.xml.h:119
 msgid "_Redo"
 msgstr "╥╚╓Ййж╓╥(_R)"
 
-#: po/tmp/evolution-event-editor.xml.h:120
+#: ui/evolution-event-editor.xml.h:120
 msgid "_Replace..."
 msgstr "╦╣╓клА╓╧(_R)..."
 
-#: po/tmp/evolution-event-editor.xml.h:122
+#: ui/evolution-event-editor.xml.h:122
 msgid "_Toolbars"
 msgstr "╔д║╪╔К╔п║╪(_T)"
 
-#: po/tmp/evolution-event-editor.xml.h:124
+#: ui/evolution-event-editor.xml.h:124
 msgid "_Undo"
 msgstr "╓Д╓Йд╬╓╥(_U)"
 
 #.
-#. * 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 "╔у╔╘╔К╔ю(_o)"
 
-#: po/tmp/evolution-mail.xml.h:14
+#: ui/evolution-mail.xml.h:14
 msgid "Fi_lter on Sender"
 msgstr "аВ©╝╪т╓н╔у╔ё╔К╔©(_l)"
 
-#: po/tmp/evolution-mail.xml.h:15
+#: ui/evolution-mail.xml.h:15
 msgid "Filter on Rec_ipients"
 msgstr "╪У©╝╪т╓н╔у╔ё╔К╔©(_i)"
 
-#: po/tmp/evolution-mail.xml.h:16
+#: ui/evolution-mail.xml.h:16
 msgid "Forget _Passwords"
 msgstr "╔я╔╧╔О║╪╔ий╤╪╨(_P)"
 
-#: po/tmp/evolution-mail.xml.h:20
+#: ui/evolution-mail.xml.h:20
 msgid "Get Mail"
 msgstr "╔А║╪╔К╓н╪Хфю"
 
-#: po/tmp/evolution-mail.xml.h:21
-msgid "Mail _Filters"
+#: ui/evolution-mail.xml.h:22
+#, fuzzy
+msgid "Hide _Deleted messages"
+msgstr "а╙бР╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓Р╟У╨Ч╓╥╓ч╓╧"
+
+#: ui/evolution-mail.xml.h:23
+#, fuzzy
+msgid "Hide _Read messages"
+msgstr "╔А╔ц╔╩║╪╔╦╓Ре╬аВ"
+
+#: ui/evolution-mail.xml.h:24
+#, fuzzy
+msgid "Hide _Selected messages"
+msgstr "а╙бР╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓Р╟У╨Ч╓╥╓ч╓╧"
+
+#: ui/evolution-mail.xml.h:25
+#, fuzzy
+msgid "Mail _Filters..."
 msgstr "╔А║╪╔К╔у╔ё╔К╔©(_F)"
 
-#: po/tmp/evolution-mail.xml.h:22
-msgid "Manage Subscriptions"
+#: ui/evolution-mail.xml.h:26
+#, fuzzy
+msgid "Manage Subscriptions..."
 msgstr "╧ьфи╢имЩ"
 
-#: po/tmp/evolution-mail.xml.h:23
+#: ui/evolution-mail.xml.h:27
 msgid "Mar_k As Read"
 msgstr "╢Шфи╓х╓╥╓ф╔ч║╪╔╞(_k)"
 
-#: po/tmp/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:28
 msgid "Mark As U_nread"
 msgstr "л╓фи╓х╓╥╓ф╔ч║╪╔╞(_n)"
 
-#: po/tmp/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:29
 msgid "Move"
 msgstr "╟эф╟"
 
-#: po/tmp/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:30
 msgid "Move message to a new folder"
 msgstr "©╥╣╛╔у╔╘╔К╔ю╓ь╔А╔ц╔╩║╪╔╦╓Р╟эф╟╓╥╓ч╓╧"
 
-#: po/tmp/evolution-mail.xml.h:27
+#: ui/evolution-mail.xml.h:31
 msgid "Previews the message to be printed"
 msgstr "╟У╨Ч╓╧╓К╔А╔ц╔╩║╪╔╦╓Ри╫╪╗╓╥╓ч╓╧"
 
-#: po/tmp/evolution-mail.xml.h:29
+#: ui/evolution-mail.xml.h:33
 msgid "Print Preview of message..."
 msgstr "╔А╔ц╔╩║╪╔╦╓н╟У╨Ч╔в╔Л╔с╔Е║╪..."
 
-#: po/tmp/evolution-mail.xml.h:30
+#: ui/evolution-mail.xml.h:34
 msgid "Print message to the printer"
 msgstr "╔в╔Й╔С╔©╓ь╔А╔ц╔╩║╪╔╦╓Р╟У╨Ч╓╥╓ч╓╧"
 
-#: po/tmp/evolution-mail.xml.h:31
+#: ui/evolution-mail.xml.h:35
 msgid "Print message..."
 msgstr "╔А╔ц╔╩║╪╔╦╓Р╟У╨Ч..."
 
-#: po/tmp/evolution-mail.xml.h:35
+#: ui/evolution-mail.xml.h:39
 msgid "Reply to _All"
 msgstr "а╢╟В╓ьйж©╝(_A)"
 
-#: po/tmp/evolution-mail.xml.h:36
+#: ui/evolution-mail.xml.h:40
 msgid "Reply to _Sender"
 msgstr "аВ©╝╪т╓ьйж©╝(_S)"
 
-#: po/tmp/evolution-mail.xml.h:39 po/tmp/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:43 ui/evolution-subscribe.xml.h:12
 msgid "Select _All"
 msgstr "╓╧╓ы╓фа╙бР(_A)"
 
-#: po/tmp/evolution-mail.xml.h:40
+#: ui/evolution-mail.xml.h:44
 msgid "Send queued mail and retrieve new mail"
 msgstr "╔╜╔Е║╪╓кфЧ╓Л╓И╓Л╓©╔А║╪╔К╓РаВ©╝╓╥╓ф©╥╓╥╓╓╔А║╪╔К╓Р╪Хфю╓╥╓ч╓╧"
 
-#: po/tmp/evolution-mail.xml.h:41
+#: ui/evolution-mail.xml.h:45
+#, fuzzy
+msgid "Show _All messages"
+msgstr "╓╧╓ы╓фи╫╪╗"
+
+#: ui/evolution-mail.xml.h:46
 msgid "Threaded Message list"
 msgstr "╔А╔ц╔╩║╪╔╦╔Й╔╧╔х╓Р╔╧╔Л╔ц╔и╓ги╫╪╗╓╥╓ч╓╧"
 
-#: po/tmp/evolution-mail.xml.h:42
+#: ui/evolution-mail.xml.h:47
 msgid "VFolder on Se_nder"
 msgstr "аВ©╝╪т╓н╡╬аш╔у╔╘╔К╔ю(_n)"
 
-#: po/tmp/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:48
 msgid "VFolder on _Recipients"
 msgstr "╪У©╝╪т╓н╡╬аш╔у╔╘╔К╔ю(_R)"
 
-#: po/tmp/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:49
 msgid "View Raw Message Source"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:50
 msgid "_Apply Filters"
 msgstr "╔у╔ё╔К╔©╓Ре╛мя(_A)"
 
-#: po/tmp/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:51
 msgid "_Configure Folder"
 msgstr "╔у╔╘╔К╔ю╧╫ю╝(_C)"
 
-#: po/tmp/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:52
 msgid "_Copy to Folder..."
 msgstr "╔у╔╘╔К╔ю╓ь╔Ё╔т║╪(_C)..."
 
-#: po/tmp/evolution-mail.xml.h:49
+#: ui/evolution-mail.xml.h:54
 msgid "_Edit Message"
 msgstr "╔А╔ц╔╩║╪╔╦╓Рйт╫╦(_E)"
 
-#: po/tmp/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:55
 msgid "_Expunge"
 msgstr "кУ╬ц(_E)"
 
-#: po/tmp/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:56
 msgid "_Filter on Subject"
 msgstr "и╫бЙ╓н╔у╔ё╔К╔©(_F)"
 
-#: po/tmp/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:57
 msgid "_Forward"
 msgstr "е╬аВ(_F)"
 
-#: po/tmp/evolution-mail.xml.h:53 po/tmp/evolution-subscribe.xml.h:17
+#: ui/evolution-mail.xml.h:58 ui/evolution-subscribe.xml.h:17
 msgid "_Invert Selection"
 msgstr "а╙бР╓Рх©е╬(_I)"
 
-#: po/tmp/evolution-mail.xml.h:54
-msgid "_Mail Configuration"
+#: ui/evolution-mail.xml.h:59
+#, fuzzy
+msgid "_Mail Configuration..."
 msgstr "╔А║╪╔КюъдЙ(_M)"
 
-#: po/tmp/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:60
 msgid "_Message"
 msgstr "╔А╔ц╔╩║╪╔╦(_M)"
 
-#: po/tmp/evolution-mail.xml.h:56
+#: ui/evolution-mail.xml.h:61
 msgid "_Move to Folder..."
 msgstr "╔у╔╘╔К╔ю╓ь╟эф╟(_M)..."
 
-#: po/tmp/evolution-mail.xml.h:57
+#: ui/evolution-mail.xml.h:62
 msgid "_Open in New Window"
 msgstr "©╥╣╛╔╕╔ё╔С╔и╔╕╓РЁ╚╓╞(_O)"
 
-#: po/tmp/evolution-mail.xml.h:58
+#: ui/evolution-mail.xml.h:63
 msgid "_Print Message"
 msgstr "╔А╔ц╔╩║╪╔╦╓Р╟У╨Ч(_P)"
 
-#: po/tmp/evolution-mail.xml.h:59
+#: ui/evolution-mail.xml.h:64
 msgid "_Save Message As..."
 msgstr "╔А╔ц╔╩║╪╔╦╓Рйлл╬╓гйщб╦(_S)..."
 
-#: po/tmp/evolution-mail.xml.h:60
+#: ui/evolution-mail.xml.h:65
 msgid "_Source"
 msgstr "╔╫║╪╔╧(_S)"
 
-#: po/tmp/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:66
 msgid "_Threaded"
 msgstr "╔╧╔Л╔ц╔и(_T)"
 
-#: po/tmp/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:67
 msgid "_Undelete"
 msgstr "╨О╫Э╪Х╬ц(_U)"
 
-#: po/tmp/evolution-mail.xml.h:63
+#: ui/evolution-mail.xml.h:68
 msgid "_VFolder on Subject"
 msgstr "и╫бЙ╓н╡╬аш╔у╔╘╔К╔ю(_V)"
 
-#: po/tmp/evolution-mail.xml.h:64
-msgid "_Virtual Folder Editor"
+#: ui/evolution-mail.xml.h:69
+#, fuzzy
+msgid "_Virtual Folder Editor..."
 msgstr "╡╬аш╔у╔╘╔К╔ю╔╗╔г╔ё╔©(_V)"
 
 #.
-#. * 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:11
+#: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Encrypt this message with PGP"
+msgstr "╟е╧Ф╡╫╓╣╓Л╓©╔А╔ц╔╩║╪╔╦"
+
+#: ui/evolution-message-composer.xml.h:12
 msgid "HTML"
 msgstr "HTML"
 
-#: po/tmp/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:13
 msgid "Insert a file as text into the message"
 msgstr "╔А╔ц╔╩║╪╔╦╓ь╔ф╔╜╔╧╔х╔у╔║╔╓╔К╓РачфЧ"
 
-#: po/tmp/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:14
 msgid "Insert text file..."
 msgstr "╔ф╔╜╔╧╔х╔у╔║╔╓╔К╓РачфЧ..."
 
-#: po/tmp/evolution-message-composer.xml.h:15
+#: 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 ""
+
+#: ui/evolution-message-composer.xml.h:18
+msgid "PGP Sign"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save As"
 msgstr "йлл╬╓гйщб╦"
 
-#: po/tmp/evolution-message-composer.xml.h:19
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save in _folder... (FIXME)"
 msgstr "╔у╔╘╔К╔ю╓ьйщб╦(_f)... (FIXME)"
 
-#: po/tmp/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "╔у╔╘╔К╔ю╓ьйщб╦..."
 
-#: po/tmp/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr "йлл╬╓г╦╫╨ъ╓н╔у╔║╔╓╔К╓Рйщб╦"
 
-#: po/tmp/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "╩ьдЙ╓н╔у╔╘╔К╔ю╓ь╔А╔ц╔╩║╪╔╦╓Рйщб╦"
 
-#: po/tmp/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "аВ©╝"
 
-#: po/tmp/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr "╦Е╓гаВ©╝(_L)"
 
-#: po/tmp/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr "╦Е╓гаВ©╝(_l)"
 
-#: po/tmp/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr "HTML ╥а╪╟╓г╔А║╪╔К╓РаВ©╝"
 
-#: po/tmp/evolution-message-composer.xml.h:28
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send the message later"
 msgstr "╔А╔ц╔╩║╪╔╦╓Р╦Е╓гаВ©╝╓╥╓ч╓╧"
 
-#: po/tmp/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:32
 msgid "Send the message now"
 msgstr "╔А╔ц╔╩║╪╔╦╓Р╨ёаВ©╝╓╥╓ч╓╧"
 
-#: po/tmp/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:33
 msgid "Send this message now"
 msgstr "╓Ё╓н╔А╔ц╔╩║╪╔╦╓Р╨ёаВ©╝╓╥╓ч╓╧"
 
-#: po/tmp/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show / hide attachments"
 msgstr "е╨иу╓ни╫╪╗ / хСи╫╪╗"
 
-#: po/tmp/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show _attachments"
 msgstr "е╨иу╓Ри╫╪╗(_a)"
 
-#: po/tmp/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:36
 msgid "Show attachments"
 msgstr "е╨иу╓Ри╫╪╗"
 
-#: po/tmp/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Sign this message with your PGP key"
+msgstr "и╫бЙ╓й╓╥╓н╔А╔ц╔╩║╪╔╦╓РаВ©╝╓╥╓ф╓╓╓ч╓╧"
+
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Insert text file... (FIXME)"
 msgstr "╔ф╔╜╔╧╔х╔у╔║╔╓╔К╓РачфЧ... (FIXME)"
 
-#: po/tmp/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Open..."
 msgstr "Ё╚╓╞(_O)..."
 
+#: 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 "╫╙н╩(_x)"
 
-#: po/tmp/evolution.xml.h:8
+#: ui/evolution.xml.h:8
 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
 msgid "Getting _Started"
 msgstr "╩о╓А(_S)"
 
-#: 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 "╔у╔╘╔К╔ю╔п║╪╓Ри╫╪╗(_F)"
 
-#: po/tmp/evolution.xml.h:13
+#: ui/evolution.xml.h:13
 msgid "Show the _Shortcut Bar"
 msgstr "╔╥╔Г║╪╔х╔╚╔ц╔х╔п║╪╓Ри╫╪╗(_S)"
 
-#: po/tmp/evolution.xml.h:14
+#: ui/evolution.xml.h:14
 msgid "Submit _Bug Report"
 msgstr "ит╤Я╧ГйС╧ПдС╫п(_B)"
 
-#: 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 "╔Ё╔С╔©╔╞╔х╔ч╔м║╪╔╦╔Ц╓н╩х╓╓йЩ(_o)"
 
-#: po/tmp/evolution.xml.h:19
+#: ui/evolution.xml.h:19
 msgid "Using the _Calendar"
 msgstr "╔╚╔Л╔С╔ю╓н╩х╓╓йЩ(_C)"
 
-#: po/tmp/evolution.xml.h:20
+#: ui/evolution.xml.h:20
 msgid "Using the _Mailer"
 msgstr "╔А║╪╔И╓н╩х╓╓йЩ(_M)"
 
-#: po/tmp/evolution.xml.h:21
+#: ui/evolution.xml.h:21
 msgid "_About Evolution..."
 msgstr "Evolution ╓к╓д╓╓╓ф(_A)..."
 
-#: po/tmp/evolution.xml.h:22
+#: ui/evolution.xml.h:22
 msgid "_Appointment (FIXME)"
 msgstr "лСб╚(_A) (FIXME)"
 
-#: po/tmp/evolution.xml.h:23
+#: ui/evolution.xml.h:23
 msgid "_Contact (FIXME)"
 msgstr "╔Ё╔С╔©╔╞╔х(_C) (FIXME)"
 
-#: po/tmp/evolution.xml.h:26
+#: ui/evolution.xml.h:26
 msgid "_Folder"
 msgstr "╔у╔╘╔К╔ю(_F)"
 
-#: po/tmp/evolution.xml.h:27
+#: ui/evolution.xml.h:27
 msgid "_Go to Folder..."
 msgstr "╔у╔╘╔К╔ю╓ь╟эф╟(_G)..."
 
-#: po/tmp/evolution.xml.h:29
+#: ui/evolution.xml.h:29
 msgid "_Index"
 msgstr "╔╓╔С╔г╔ц╔╞╔╧(_I)"
 
-#: po/tmp/evolution.xml.h:30
+#: ui/evolution.xml.h:30
 msgid "_Mail message (FIXME)"
 msgstr "╔А║╪╔К╔А╔ц╔╩║╪╔╦(_M) (FIXME)"
 
-#: po/tmp/evolution.xml.h:32
+#: ui/evolution.xml.h:32
 msgid "_Settings"
 msgstr "юъдЙ(_S)"
 
-#: po/tmp/evolution.xml.h:33
+#: ui/evolution.xml.h:33
 msgid "_Task (FIXME)"
 msgstr "╨Н╤х(_T) (FIXME)"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2470
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
 msgid "%A, %B %d, %Y"
 msgstr "%Y/%B/%d %A"
 
@@ -6645,28 +7123,34 @@ msgstr "╡Я╣д╫╙н╩╩Ч╢ж(_e):"
 msgid "All Attendees"
 msgstr "╓╧╓ы╓ф╓ниу╓╜е╨╓╓"
 
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: widgets/misc/e-calendar-item.c:421
+msgid "MTWTFSS"
+msgstr "MTWTFSS"
+
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
+#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
 msgid "%B %Y"
 msgstr "%Y %B"
 
-#: widgets/misc/e-clipped-label.c:107
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-dateedit.c:408
+#: widgets/misc/e-dateedit.c:407
 msgid "Now"
 msgstr "╨ё"
 
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1249 widgets/misc/e-dateedit.c:1308
-#: widgets/misc/e-dateedit.c:1487
+#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
+#: widgets/misc/e-dateedit.c:1486
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1252 widgets/misc/e-dateedit.c:1311
-#: widgets/misc/e-dateedit.c:1490
+#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
+#: widgets/misc/e-dateedit.c:1489
 msgid "%I:%M %p"
 msgstr "%p %I:%M"
 
@@ -6675,12 +7159,288 @@ msgstr "%p %I:%M"
 msgid "Group %i"
 msgstr "╔╟╔К║╪╔в %i"
 
+#~ msgid "categories"
+#~ msgstr "╔╚╔ф╔╢╔Й"
+
+#~ msgid "Item(s) belong to these categories:"
+#~ msgstr "╔╒╔╓╔ф╔Ю╓о╓Ё╓Л╓И╓н╔╚╔ф╔╢╔Й╓кб╟╓╥╓ф╓╓╓ч╓╧:"
+
+#~ msgid "Available Categories:"
+#~ msgstr "мЬмя╓г╓╜╓К╔╚╔ф╔╢╔Й:"
+
+#~ msgid "External Directories"
+#~ msgstr "Ё╟иТ╔г╔ё╔Л╔╞╔х╔Й"
+
+#~ msgid "Port Number:"
+#~ msgstr "╔щ║╪╔ххж╧Ф:"
+
+#~ msgid "Outline:"
+#~ msgstr "Ё╣мв:"
+
+#~ msgid "Headings:"
+#~ msgstr "╦╚╫п╓╥:"
+
+#~ msgid "Empty days:"
+#~ msgstr "╤У╓╜фЭ:"
+
+#~ msgid "Appointments:"
+#~ msgstr "м╫лС:"
+
+#~ msgid "Highlighted day:"
+#~ msgstr "╫емв╓йфЭ:"
+
+#~ msgid "Day numbers:"
+#~ msgstr "фЭ©Т:"
+
+#~ msgid "Current day's number:"
+#~ msgstr "╦╫╨ъ╓нфЭ©Т:"
+
+#~ msgid "To-Do item that is not yet due:"
+#~ msgstr "╓ч╓ю╢Э╦б╓нмХ╓ф╓╓╓й╓╓ ToDo ╔╒╔╓╔ф╔Ю:"
+
+#~ msgid "To-Do item that is due today:"
+#~ msgstr "╨ёфЭ╢Э╦б╓н ToDo ╔╒╔╓╔ф╔Ю:"
+
+#~ msgid "To-Do item that is overdue:"
+#~ msgstr "╢Э╦б╓н╡А╓╝╓© ToDo ╔╒╔╓╔ф╔Ю:"
+
+#~ msgid "may"
+#~ msgstr "5╥Н"
+
+#~ msgid "sept"
+#~ msgstr "9╥Н"
+
+#~ msgid "sunday"
+#~ msgstr "фЭмк"
+
+#~ msgid "monday"
+#~ msgstr "╥Нмк"
+
+#~ msgid "tuesday"
+#~ msgstr "╡пмк"
+
+#~ msgid "tues"
+#~ msgstr "╡пмк"
+
+#~ msgid "wednesday"
+#~ msgstr "©Емк"
+
+#~ msgid "wednes"
+#~ msgstr "©Емк"
+
+#~ msgid "thursday"
+#~ msgstr "лзмк"
+
+#~ msgid "thur"
+#~ msgstr "лзмк"
+
+#~ msgid "thurs"
+#~ msgstr "лзмк"
+
+#~ msgid "friday"
+#~ msgstr "╤Бмк"
+
+#~ msgid "saturday"
+#~ msgstr "езмк"
+
+#~ msgid "fortnight"
+#~ msgstr "2╫╣╢ж"
+
+#~ msgid "min"
+#~ msgstr "й╛"
+
+#~ msgid "sec"
+#~ msgstr "иц"
+
+#~ msgid "tomorrow"
+#~ msgstr "люфЭ"
+
+#~ msgid "yesterday"
+#~ msgstr "╨РфЭ"
+
+#~ msgid "today"
+#~ msgstr "╨ёфЭ"
+
+#~ msgid "last"
+#~ msgstr "╨г╦Е"
+
+#~ msgid "this"
+#~ msgstr "╓Ё╓Л"
+
+#~ msgid "next"
+#~ msgstr "╪║"
+
+#~ msgid "first"
+#~ msgstr "1хжлэ"
+
+#~ msgid "third"
+#~ msgstr "3хжлэ"
+
+#~ msgid "fourth"
+#~ msgstr "4хжлэ"
+
+#~ msgid "fifth"
+#~ msgstr "5хжлэ"
+
+#~ msgid "sixth"
+#~ msgstr "6хжлэ"
+
+#~ msgid "seventh"
+#~ msgstr "7хжлэ"
+
+#~ msgid "eighth"
+#~ msgstr "8хжлэ"
+
+#~ msgid "ninth"
+#~ msgstr "9хжлэ"
+
+#~ msgid "tenth"
+#~ msgstr "10хжлэ"
+
+#~ msgid "eleventh"
+#~ msgstr "11хжлэ"
+
+#~ msgid "twelfth"
+#~ msgstr "12хжлэ"
+
+#~ msgid "ago"
+#~ msgstr "а╟"
+
+#~ msgid "Year:"
+#~ msgstr "г╞:"
+
+#~ msgid ""
+#~ "Please select the date you want to go to.\n"
+#~ "When you click on a day, you will be taken\n"
+#~ "to that date."
+#~ msgstr ""
+#~ "╟эф╟╓╥╓©╓╓фЭ╓к╓а╓Ра╙бР╓╥╓ф╡╪╓╣╓╓\n"
+#~ "фЭ╓к╓а╓Р╔╞╔Й╔ц╔╞╓╥╓©╩Ч, ╓╫╓нфЭ╓к╓а╓к╓й╓К\n"
+#~ "╓г╓╥╓Г╓╕"
+
+#~ msgid "Mail Source"
+#~ msgstr "╔А║╪╔К╔╫║╪╔╧"
+
+#~ msgid ""
+#~ "Your email configuration is now complete.\n"
+#~ "Click \"Finish\" to save your new settings"
+#~ msgstr ""
+#~ "╓╒╓й╓©╓нее╩р╔А║╪╔К╓нюъдЙ╓о╢╟н╩╓╥╓ч╓╥╓©\n"
+#~ "\"╢╟н╩\" ╓Р╔╞╔Й╔ц╔╞╓╥╓ф©╥╓╥╓╓юъдЙ╓Рйщб╦╓╥╓ф╓╞╓ю╓╣╓╓"
+
+#~ msgid "Send \"%s\""
+#~ msgstr "\"%s\" ╓РаВ©╝╓╥╓ч╓╧"
+
+#~ msgid "Send a message without a subject"
+#~ msgstr "и╫бЙ╓й╓╥╓н╔А╔ц╔╩║╪╔╦╓РаВ©╝╓╥╓ч╓╧"
+
+#~ msgid "Expunge \"%s\""
+#~ msgstr "\"%s\" ╓РкУ╬ц╓╥╓ч╓╧"
+
+#~ msgid "Marking messages in folder \"%s\""
+#~ msgstr "╔у╔╘╔К╔ю \"%s\" ╓нцФ╓н╔А╔ц╔╩║╪╔╦╓Р╔ч║╪╔╞╓╥╓ф╓╓╓ч╓╧"
+
+#~ msgid "Mark messages in folder \"%s\""
+#~ msgstr "╔у╔╘╔К╔ю \"%s\" ╓нцФ╓н╔А╔ц╔╩║╪╔╦╓Р╔ч║╪╔╞╓╥╓ч╓╧"
+
+#~ msgid "Marking message %d of %d"
+#~ msgstr "╔А╔ц╔╩║╪╔╦ %d / %d ╓Р╔ч║╪╔╞цФ"
+
+#~ 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 ""
+#~ "Failed to generate mime part from message while generating forwarded message."
+#~ msgstr ""
+#~ "е╬аВ╓╣╓Л╓К╔А╔ц╔╩║╪╔╦╓Рю╦ю╝цФ╓к╔А╔ц╔╩║╪╔╦╓╚╓И MIME ╔я║╪╔х╓ню╦ю╝╓г╪╨гт╓╥╓ч╓╥╓©"
+
+#~ msgid "Loading \"%s\""
+#~ msgstr "\"%s\" ╓Р╔М║╪╔ицФ"
+
+#~ msgid "Load \"%s\""
+#~ msgstr "\"%s\" ╓Р╔М║╪╔и╓╥╓ч╓╧"
+
+#~ msgid "Creating \"%s\""
+#~ msgstr "\"%s\" ╓Р╨Ню╝цФ"
+
+#~ msgid "Create \"%s\""
+#~ msgstr "\"%s\" ╓Р╨Ню╝╓╥╓ч╓╧"
+
+#~ msgid "Exception while reporting result to shell component listener."
+#~ msgstr "╔╥╔╖╔К╔Ё╔С╔щ║╪╔м╔С╔х╔Й╔╧╔й║╪╓ь╥К╡л╓РйС╧П╓╧╓К╢ж╓кнЦЁ╟╓╛х╞ю╦╓╥╓ч╓╥╓©"
+
+#~ msgid "Synchronize \"%s\""
+#~ msgstr "\"%s\" ╓Рф╠╢Э╓╥╓ч╓╧"
+
+#~ msgid "Displaying message UID \"%s\""
+#~ msgstr "╔А╔ц╔╩║╪╔╦ UID \"%s\" ╓Ри╫╪╗цФ"
+
+#~ msgid "Clearing message display"
+#~ msgstr "╔А╔ц╔╩║╪╔╦╔г╔ё╔╧╔в╔Л╔╓╓Р╔╞╔Й╔╒цФ"
+
+#~ msgid "Display message UID \"%s\""
+#~ msgstr "╔А╔ц╔╩║╪╔╦ UID \"%s\" ╓Ри╫╪╗╓╥╓ч╓╧"
+
+#~ msgid "Clear message display"
+#~ msgstr "╔А╔ц╔╩║╪╔╦╔г╔ё╔╧╔в╔Л╔╓╓Р╔╞╔Й╔╒╓╥╓ч╓╧"
+
+#~ msgid "Opening messages from folder \"%s\""
+#~ msgstr "╔у╔╘╔К╔ю \"%s\" ╓╚╓И╔А╔ц╔╩║╪╔╦╓РЁ╚╓╓╓ф╓╓╓ч╓╧"
+
+#~ msgid "Open messages from \"%s\""
+#~ msgstr "\"%s\" ╓╚╓И╔А╔ц╔╩║╪╔╦╓РЁ╚╓╜╓ч╓╧"
+
+#~ msgid "Viewing messages from folder \"%s\""
+#~ msgstr "╔у╔╘╔К╔ю \"%s\" ╓╚╓И╔А╔ц╔╩║╪╔╦╓Ри╫╪╗цФ"
+
+#~ msgid "View messages from \"%s\""
+#~ msgstr "\"%s\" ╓╚╓И╔А╔ц╔╩║╪╔╦╓Ри╫╪╗╓╥╓ч╓╧"
+
+#~ msgid "Retrieving message %d of %d (uid \"%s\")"
+#~ msgstr "╔А╔ц╔╩║╪╔╦╓Р╪Хфю╓╥╓ф╓╓╓ч╓╧ %d / %d (uid \"%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 "╔А╔ц╔╩║╪╔╦╔с╔Е║╪╓Р╨ф╧╫цш"
+
+#~ msgid "N_ew Directory Server"
+#~ msgstr "©╥╣╛╔г╔ё╔Л╔╞╔х╔Й╔╣║╪╔п(_e)"
+
+#~ msgid "_Actions"
+#~ msgstr "ф╟╨Н(_A)"
+
+#~ msgid "_Save Calendar As"
+#~ msgstr "╔╚╔Л╔С╔ю╓Рйлл╬╓гйщб╦(_S)"
+
 #~ msgid "Could not create summary"
 #~ msgstr "мвлС╓Р╨Ню╝╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
-#~ msgid "Cannot append message to mbox file: %s"
-#~ msgstr "mbox ╔у╔║╔╓╔К╓к╔А╔ц╔╩║╪╔╦╓Рди╡ц╫пмХ╓ч╓╩╓С: %s"
-
 #~ msgid "Cannot get message: %s"
 #~ msgstr "╔А╔ц╔╩║╪╔╦╓Р╪Хфю╫пмХ╓ч╓╩╓С: %s"
 
diff --git a/po/lt.po b/po/lt.po
index c28fab3cc6..b3484efe39 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -2,10 +2,11 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Gediminas Paulauskas <menesis@delfi.lt>, 2000.
 #
+#: camel/providers/smtp/camel-smtp-transport.c:287
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.6.1\n"
-"POT-Creation-Date: 2000-12-13 16:26-0600\n"
+"POT-Creation-Date: 2001-01-06 00:11+0100\n"
 "PO-Revision-Date: 2000-11-01 05:35+0200\n"
 "Last-Translator: Gediminas Paulauskas <menesis@delfi.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -291,10 +292,10 @@ msgstr ""
 #: addressbook/backend/ebook/load-pine-addressbook.c:17
 #: addressbook/backend/ebook/test-client-list.c:18
 #: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:991
+#: addressbook/conduit/address-conduit.c:1083
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1136
-#: calendar/conduits/todo/todo-conduit.c:945 calendar/gui/main.c:54
+#: calendar/conduits/calendar/calendar-conduit.c:1151
+#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "NegalКjau inicializuoti Bonobo"
 
@@ -417,53 +418,36 @@ msgstr ""
 "аvyko klaida, bandant gauti pilotЬ\n"
 "sЮraПЮ iП gnome-pilot demono"
 
-#: addressbook/conduit/address-conduit.c:197
+#: addressbook/conduit/address-conduit.c:195
 msgid "Cursor could not be loaded\n"
 msgstr "NegalКjau Аkelti Чymeklio\n"
 
-#: addressbook/conduit/address-conduit.c:210
+#: addressbook/conduit/address-conduit.c:208
 msgid "EBook not loaded\n"
 msgstr "NАekelta EBook\n"
 
-#: addressbook/conduit/address-conduit.c:583
-#: calendar/conduits/calendar/calendar-conduit.c:715
-#: calendar/conduits/todo/todo-conduit.c:523
+#: addressbook/conduit/address-conduit.c:646
+#: calendar/conduits/calendar/calendar-conduit.c:730
+#: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat server"
 msgstr "NegalКjau paleisti wombat serverio"
 
-#: addressbook/conduit/address-conduit.c:584
-#: calendar/conduits/calendar/calendar-conduit.c:716
-#: calendar/conduits/todo/todo-conduit.c:524
+#: addressbook/conduit/address-conduit.c:647
+#: calendar/conduits/calendar/calendar-conduit.c:731
+#: calendar/conduits/todo/todo-conduit.c:546
 msgid "Could not start wombat"
 msgstr "NegalКjau paleisti wombat"
 
-#: addressbook/conduit/address-conduit.c:616
-#: addressbook/conduit/address-conduit.c:619
+#: addressbook/conduit/address-conduit.c:679
+#: addressbook/conduit/address-conduit.c:682
 msgid "Could not read pilot's Address application block"
 msgstr "Nepavyko perskaityti piloto Address programos bloko"
 
 #.
-#. * 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 "kategorijos"
-
-#: addressbook/contact-editor/categories-strings.h:8
-msgid "Item(s) belong to these categories:"
-msgstr "Daiktas (ai) priklauso Пioms kategorijoms:"
-
-#: addressbook/contact-editor/categories-strings.h:9
-msgid "Available Categories:"
-msgstr "Galimos kategorijos:"
-
-#.
-#. * 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 "IПtrinti kontaktЮ?"
 
@@ -477,7 +461,7 @@ msgid "_Add"
 msgstr "_PridКti"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:48
+#: ui/evolution-event-editor.xml.h:108 ui/evolution-mail.xml.h:53
 msgid "_Delete"
 msgstr "_IПtrinti"
 
@@ -491,12 +475,13 @@ msgid "New phone type"
 msgstr "Naujas telefono tipas"
 
 #.
-#. * 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 "PridКti"
 
@@ -537,7 +522,7 @@ msgid "_Mobile"
 msgstr "_Mobilus"
 
 #: 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 "Pagrindinis el. paПtas"
 
@@ -554,7 +539,7 @@ msgid "C_ontacts..."
 msgstr "K_ontaktai..."
 
 #: 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 "Kategorijos..."
 
@@ -571,7 +556,8 @@ msgid "_Address..."
 msgstr "_Adresas..."
 
 #: 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 "Paprastai"
 
@@ -616,143 +602,143 @@ msgid "No_tes:"
 msgstr "Pas_tabos:"
 
 #: 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 "IПsamiai"
 
-#: addressbook/contact-editor/e-contact-editor.c:1266
+#: addressbook/contact-editor/e-contact-editor.c:1274
 msgid "Assistant"
 msgstr "Asistento"
 
-#: 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 "Verslo"
 
-#: addressbook/contact-editor/e-contact-editor.c:1268
+#: addressbook/contact-editor/e-contact-editor.c:1276
 msgid "Business 2"
 msgstr "Verslo 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1269
+#: addressbook/contact-editor/e-contact-editor.c:1277
 msgid "Business Fax"
 msgstr "Verslo faksas"
 
-#: addressbook/contact-editor/e-contact-editor.c:1270
+#: addressbook/contact-editor/e-contact-editor.c:1278
 msgid "Callback"
 msgstr "Atsakiklis"
 
-#: addressbook/contact-editor/e-contact-editor.c:1271
+#: addressbook/contact-editor/e-contact-editor.c:1279
 msgid "Car"
 msgstr "Automobilio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1272
+#: addressbook/contact-editor/e-contact-editor.c:1280
 msgid "Company"
 msgstr "Kompanijos"
 
-#: 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 "NamЬ"
 
-#: addressbook/contact-editor/e-contact-editor.c:1274
+#: addressbook/contact-editor/e-contact-editor.c:1282
 msgid "Home 2"
 msgstr "NamЬ 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1275
+#: addressbook/contact-editor/e-contact-editor.c:1283
 msgid "Home Fax"
 msgstr "NamЬ faksas"
 
-#: 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 "Mobilus"
 
-#: 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 "Kitas"
 
-#: addressbook/contact-editor/e-contact-editor.c:1279
+#: addressbook/contact-editor/e-contact-editor.c:1287
 msgid "Other Fax"
 msgstr "Kitas faksas"
 
-#: addressbook/contact-editor/e-contact-editor.c:1280
+#: addressbook/contact-editor/e-contact-editor.c:1288
 msgid "Pager"
 msgstr "IeПkas"
 
-#: addressbook/contact-editor/e-contact-editor.c:1281
+#: addressbook/contact-editor/e-contact-editor.c:1289
 msgid "Primary"
 msgstr "Pagrindinis"
 
-#: addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/contact-editor/e-contact-editor.c:1290
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/contact-editor/e-contact-editor.c:1291
 msgid "Telex"
 msgstr "Teleksas"
 
-#: 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 "El. paПtas 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1330
+#: addressbook/contact-editor/e-contact-editor.c:1338
 msgid "Email 3"
 msgstr "El. paПtas 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 "Adresas _2:"
 
-#: po/tmp/fulladdr.glade.h:7
+#: addressbook/contact-editor/fulladdr.glade.h:7
 msgid "Canada"
 msgstr "Kanada"
 
-#: po/tmp/fulladdr.glade.h:8
+#: addressbook/contact-editor/fulladdr.glade.h:8
 msgid "Check Address"
 msgstr "Patikrinti adresЮ"
 
-#: po/tmp/fulladdr.glade.h:9
+#: addressbook/contact-editor/fulladdr.glade.h:9
 msgid "Countr_y:"
 msgstr "Valst_ybК:"
 
-#: po/tmp/fulladdr.glade.h:10
+#: addressbook/contact-editor/fulladdr.glade.h:10
 msgid "Finland"
 msgstr "Suomija"
 
-#: po/tmp/fulladdr.glade.h:11
+#: addressbook/contact-editor/fulladdr.glade.h:11
 msgid "USA"
 msgstr "JAV"
 
-#: po/tmp/fulladdr.glade.h:12
+#: addressbook/contact-editor/fulladdr.glade.h:12
 msgid "_Address:"
 msgstr "_Adresas:"
 
-#: po/tmp/fulladdr.glade.h:13
+#: addressbook/contact-editor/fulladdr.glade.h:13
 msgid "_City:"
 msgstr "_Miestas:"
 
-#: po/tmp/fulladdr.glade.h:14
+#: addressbook/contact-editor/fulladdr.glade.h:14
 msgid "_PO Box:"
 msgstr "_PO Box:"
 
-#: po/tmp/fulladdr.glade.h:15
+#: addressbook/contact-editor/fulladdr.glade.h:15
 msgid "_State/Province:"
 msgstr "_Valstija/Provincija:"
 
-#: po/tmp/fulladdr.glade.h:16
+#: addressbook/contact-editor/fulladdr.glade.h:16
 msgid "_ZIP Code:"
 msgstr "_ZIP/PaПto kodas:"
 
@@ -766,10 +752,13 @@ msgid "Check Full Name"
 msgstr "Tikrinti pilnЮ vardЮ"
 
 #: addressbook/contact-editor/fullname-strings.h:8
+#, fuzzy
 msgid ""
 "\n"
 "Mr.\n"
 "Mrs.\n"
+"Ms.\n"
+"Miss\n"
 "Dr.\n"
 msgstr ""
 "\n"
@@ -777,7 +766,7 @@ msgstr ""
 "Mrs.\n"
 "Dr.\n"
 
-#: addressbook/contact-editor/fullname-strings.h:13
+#: addressbook/contact-editor/fullname-strings.h:15
 msgid ""
 "\n"
 "Sr.\n"
@@ -795,44 +784,49 @@ msgstr ""
 "III\n"
 "Esq.\n"
 
-#: addressbook/contact-editor/fullname-strings.h:21
+#: addressbook/contact-editor/fullname-strings.h:23
 msgid "_First:"
 msgstr "_Vardas:"
 
-#: addressbook/contact-editor/fullname-strings.h:22
+#: addressbook/contact-editor/fullname-strings.h:24
 msgid "_Title:"
 msgstr "_Titulas:"
 
-#: addressbook/contact-editor/fullname-strings.h:23
+#: addressbook/contact-editor/fullname-strings.h:25
 msgid "_Middle:"
 msgstr "Vi_durinis:"
 
-#: addressbook/contact-editor/fullname-strings.h:24
+#: addressbook/contact-editor/fullname-strings.h:26
 msgid "_Last:"
 msgstr "_PavardК:"
 
-#: addressbook/contact-editor/fullname-strings.h:25
+#: addressbook/contact-editor/fullname-strings.h:27
 msgid "_Suffix:"
 msgstr "_GalШnК:"
 
-#: addressbook/gui/component/addressbook.c:263
+#: addressbook/gui/component/addressbook.c:231
 msgid "As _Minicards"
 msgstr "_MaЧos kortelКs"
 
 #.
-#. * 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:269
-#: po/tmp/evolution-addressbook.xml.h:6
+#: addressbook/gui/component/addressbook.c:237
+#: ui/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr "LentelК"
 
-#: addressbook/gui/component/addressbook.c:386
+#: addressbook/gui/component/addressbook.c:374
+#, fuzzy, c-format
+msgid "Enter password for %s"
+msgstr "PraПom Аvesti NNTP slaptaЧodА vartotojui %s@%s"
+
+#: addressbook/gui/component/addressbook.c:402
 msgid "Unable to open addressbook"
 msgstr "Negaliu atidaryti adresЬ knygelКs"
 
-#: addressbook/gui/component/addressbook.c:391
+#: addressbook/gui/component/addressbook.c:407
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -853,81 +847,211 @@ msgstr ""
 "naudoti LDAP, tu turi parsisЬsti ir Аdiegti OpenLDAP,\n"
 "o tada perkompiliuoti ir Аdiegti Evolution.\n"
 
-#: addressbook/gui/component/addressbook.c:501 mail/folder-browser.c:136
+#: addressbook/gui/component/addressbook.c:528 mail/folder-browser.c:219
 #, fuzzy
 msgid "Show All"
 msgstr "Rodyti"
 
-#: addressbook/gui/component/addressbook.c:503 mail/folder-browser.c:138
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 msgid "Advanced..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:533
+#: addressbook/gui/component/addressbook.c:560
 #, fuzzy
 msgid "Any field contains"
 msgstr "Tekstas turi"
 
-#: addressbook/gui/component/addressbook.c:534
+#: addressbook/gui/component/addressbook.c:561
 #, fuzzy
 msgid "Name contains"
 msgstr "turi"
 
-#: addressbook/gui/component/addressbook.c:535
+#: addressbook/gui/component/addressbook.c:562
 #, fuzzy
 msgid "Email contains"
 msgstr "turi"
 
-#: addressbook/gui/component/addressbook.c:621
+#: addressbook/gui/component/addressbook.c:648
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, kurА rodys AplankЬ narПyklК"
 
-#: addressbook/gui/component/e-ldap-storage.c:88
-msgid "External Directories"
-msgstr "IПorinКs direktorijos"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/e-msg-composer-attachment.glade.h:7
-#: po/tmp/ldap-server-dialog.glade.h:6
-msgid "Description:"
-msgstr "ApraПymas:"
+#: addressbook/gui/component/addressbook-storage.c:95
+#, fuzzy
+msgid "Other Contacts"
+msgstr "_Naujas kontaktas"
 
-#: po/tmp/ldap-server-dialog.glade.h:7
-msgid "LDAP Server:"
+#: addressbook/gui/component/addressbook-config.c:139
+#, fuzzy
+msgid "LDAP Server"
 msgstr "LDAP serveris:"
 
-#: po/tmp/ldap-server-dialog.glade.h:8
+#: addressbook/gui/component/addressbook-config.c:141
+#, fuzzy
+msgid "File"
+msgstr "_Byla"
+
+#: addressbook/gui/component/addressbook-config.c:144
+#, fuzzy
+msgid "Unknown addressbook type"
+msgstr "Negaliu atidaryti adresЬ knygelКs"
+
+#: 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 "SlaptaЧodis"
+
+#: addressbook/gui/component/addressbook-config.c:157
+msgid "SASL"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:160
+#, fuzzy
+msgid "Unknown auth type"
+msgstr "NeЧinoma klaida"
+
+#: addressbook/gui/component/addressbook-config.c:169
+#, fuzzy
+msgid "Base"
+msgstr "аdКti"
+
+#: addressbook/gui/component/addressbook-config.c:171
+msgid "One"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:173
+#, fuzzy
+msgid "Subtree"
+msgstr "UЧsakyti"
+
+#: 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 "Valandos"
+
+#: addressbook/gui/component/addressbook-config.c:361
+#, fuzzy
+msgid "Port:"
+msgstr "Svarbumas:"
+
+#: addressbook/gui/component/addressbook-config.c:364
+msgid "Root DN:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:384
+#, fuzzy
+msgid "Search Scope:"
+msgstr "PaieПka"
+
+#: addressbook/gui/component/addressbook-config.c:438
+#: mail/mail-config-druid.glade.h:14 mail/mail-config-gui.c:943
+msgid "Authentication:"
+msgstr "Autentikacija:"
+
+#: addressbook/gui/component/addressbook-config.c:455
+#: mail/mail-config-druid.glade.h:52 mail/mail-config-gui.c:934
+msgid "Path:"
+msgstr "Kelias:"
+
+#: addressbook/gui/component/addressbook-config.c:460
+#, fuzzy
+msgid "Create path if it doesn't exist."
+msgstr "Tokios bylos nКra."
+
+#: addressbook/gui/component/addressbook-config.c:593
+#, fuzzy
+msgid "Edit Addressbook"
+msgstr "аraПyti А adresЬ knygelФ"
+
+#: addressbook/gui/component/addressbook-config.c:595
+#, fuzzy
+msgid "Add Addressbook"
+msgstr "аraПyti А adresЬ knygelФ"
+
+#: 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
 msgid "Name:"
 msgstr "Vardas:"
 
-#: po/tmp/ldap-server-dialog.glade.h:9
-msgid "Port Number:"
-msgstr "Prievado numeris:"
+#: addressbook/gui/component/addressbook-config.c:617
+#: composer/e-msg-composer-attachment.glade.h:7
+msgid "Description:"
+msgstr "ApraПymas:"
 
-#: po/tmp/ldap-server-dialog.glade.h:10
-msgid "Root DN:"
+#: addressbook/gui/component/addressbook-config.glade.h:7
+#, fuzzy
+msgid "Addressbook Sources"
+msgstr "PridКti ПaltinА"
+
+#: 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 "IПtrinti"
+
+#: 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 "Taisyti"
+
+#: addressbook/gui/component/addressbook-config.glade.h:10
+#, fuzzy
+msgid "Name"
+msgstr "Vardas:"
+
+#: 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 "Rasti..."
 
-#: po/tmp/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "Message Recipients"
 msgstr "LaiПko gavКjai"
 
-#: po/tmp/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "Select Names"
 msgstr "Pasirink vardus"
 
-#: 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 "Pasirink vardЮ iП sЮraПo:"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:147
@@ -936,119 +1060,119 @@ msgid "Search"
 msgstr "PaieПka"
 
 #.
-#. * 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 "a"
 
-#: po/tmp/alphabet.glade.h:8
+#: addressbook/gui/widgets/alphabet.glade.h:8
 msgid "b"
 msgstr "b"
 
-#: po/tmp/alphabet.glade.h:9
+#: addressbook/gui/widgets/alphabet.glade.h:9
 msgid "c"
 msgstr "c"
 
-#: po/tmp/alphabet.glade.h:10
+#: addressbook/gui/widgets/alphabet.glade.h:10
 msgid "d"
 msgstr "d"
 
-#: po/tmp/alphabet.glade.h:11
+#: addressbook/gui/widgets/alphabet.glade.h:11
 msgid "e"
 msgstr "e"
 
-#: po/tmp/alphabet.glade.h:12
+#: addressbook/gui/widgets/alphabet.glade.h:12
 msgid "f"
 msgstr "f"
 
-#: po/tmp/alphabet.glade.h:13
+#: addressbook/gui/widgets/alphabet.glade.h:13
 msgid "g"
 msgstr "g"
 
-#: calendar/cal-util/timeutil.c:100 po/tmp/alphabet.glade.h:14
+#: addressbook/gui/widgets/alphabet.glade.h:14
 msgid "h"
 msgstr "h"
 
-#: po/tmp/alphabet.glade.h:15
+#: addressbook/gui/widgets/alphabet.glade.h:15
 msgid "i"
 msgstr "i"
 
-#: po/tmp/alphabet.glade.h:16
+#: addressbook/gui/widgets/alphabet.glade.h:16
 msgid "j"
 msgstr "j"
 
-#: po/tmp/alphabet.glade.h:17
+#: addressbook/gui/widgets/alphabet.glade.h:17
 msgid "k"
 msgstr "k"
 
-#: po/tmp/alphabet.glade.h:18
+#: addressbook/gui/widgets/alphabet.glade.h:18
 msgid "l"
 msgstr "l"
 
-#: po/tmp/alphabet.glade.h:19
+#: addressbook/gui/widgets/alphabet.glade.h:19
 msgid "m"
 msgstr "m"
 
-#: po/tmp/alphabet.glade.h:20
+#: addressbook/gui/widgets/alphabet.glade.h:20
 msgid "n"
 msgstr "n"
 
-#: po/tmp/alphabet.glade.h:21
+#: addressbook/gui/widgets/alphabet.glade.h:21
 msgid "o"
 msgstr "o"
 
-#: po/tmp/alphabet.glade.h:22
+#: addressbook/gui/widgets/alphabet.glade.h:22
 msgid "p"
 msgstr "p"
 
-#: po/tmp/alphabet.glade.h:23
+#: addressbook/gui/widgets/alphabet.glade.h:23
 msgid "q"
 msgstr "q"
 
-#: po/tmp/alphabet.glade.h:24
+#: addressbook/gui/widgets/alphabet.glade.h:24
 msgid "r"
 msgstr "r"
 
-#: po/tmp/alphabet.glade.h:25
+#: addressbook/gui/widgets/alphabet.glade.h:25
 msgid "s"
 msgstr "s"
 
-#: po/tmp/alphabet.glade.h:26
+#: addressbook/gui/widgets/alphabet.glade.h:26
 msgid "t"
 msgstr "t"
 
-#: po/tmp/alphabet.glade.h:27
+#: addressbook/gui/widgets/alphabet.glade.h:27
 msgid "u"
 msgstr "u"
 
-#: po/tmp/alphabet.glade.h:28
+#: addressbook/gui/widgets/alphabet.glade.h:28
 msgid "v"
 msgstr "v"
 
-#: po/tmp/alphabet.glade.h:29
+#: addressbook/gui/widgets/alphabet.glade.h:29
 msgid "w"
 msgstr "w"
 
-#: po/tmp/alphabet.glade.h:30
+#: addressbook/gui/widgets/alphabet.glade.h:30
 msgid "x"
 msgstr "x"
 
-#: po/tmp/alphabet.glade.h:31
+#: addressbook/gui/widgets/alphabet.glade.h:31
 msgid "y"
 msgstr "y"
 
-#: po/tmp/alphabet.glade.h:32
+#: addressbook/gui/widgets/alphabet.glade.h:32
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:417
-#: addressbook/gui/widgets/e-minicard.c:338
+#: addressbook/gui/widgets/e-addressbook-view.c:451
+#: addressbook/gui/widgets/e-minicard.c:374
 msgid "Save as VCard"
 msgstr "IПsaugoti kaip VCard"
 
@@ -1071,189 +1195,178 @@ msgstr ""
 "Dukart spragtelk, kad sukurtum naujЮ kontaktЮ."
 
 #.
-#. * 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 "10 pt. Tahoma"
 
-#: po/tmp/e-contact-print.glade.h:7
+#: addressbook/printing/e-contact-print.glade.h:7
 msgid "8 pt. Tahoma"
 msgstr "8 pt. Tahoma"
 
-#: po/tmp/e-contact-print.glade.h:8
+#: addressbook/printing/e-contact-print.glade.h:8
 msgid "Blank forms at end:"
 msgstr "TuПХios formos gale:"
 
-#: po/tmp/e-contact-print.glade.h:9
+#: addressbook/printing/e-contact-print.glade.h:9
 msgid "Body"
 msgstr "Tekstas"
 
-#: po/tmp/e-contact-print.glade.h:10
+#: addressbook/printing/e-contact-print.glade.h:10
 msgid "Bottom:"
 msgstr "ApaХioje:"
 
-#: po/tmp/e-contact-print.glade.h:11
+#: addressbook/printing/e-contact-print.glade.h:11
 msgid "Dimensions:"
 msgstr "Matavimo vienetai:"
 
-#: po/tmp/e-contact-print.glade.h:12
+#: addressbook/printing/e-contact-print.glade.h:12
 msgid "Font..."
 msgstr "пriftas..."
 
-#: po/tmp/e-contact-print.glade.h:13
+#: addressbook/printing/e-contact-print.glade.h:13
 msgid "Fonts"
 msgstr "пriftai"
 
-#: po/tmp/e-contact-print.glade.h:14
+#: addressbook/printing/e-contact-print.glade.h:14
 msgid "Footer:"
 msgstr "PoraПtК:"
 
-#: po/tmp/e-contact-print.glade.h:15
+#: addressbook/printing/e-contact-print.glade.h:15
 msgid "Format"
 msgstr "Formatas"
 
-#: po/tmp/e-contact-print.glade.h:16
+#: addressbook/printing/e-contact-print.glade.h:16
 msgid "Header"
 msgstr "AntraПtК"
 
-#: po/tmp/e-contact-print.glade.h:17
+#: addressbook/printing/e-contact-print.glade.h:17
 msgid "Header/Footer"
 msgstr "AntraПtК/PoraПtК"
 
-#: po/tmp/e-contact-print.glade.h:18
+#: addressbook/printing/e-contact-print.glade.h:18
 msgid "Headings"
 msgstr "AntraПtКs"
 
-#: po/tmp/e-contact-print.glade.h:19
+#: addressbook/printing/e-contact-print.glade.h:19
 msgid "Headings for each letter"
 msgstr "AntraПtКs kiekvienam laiПkui"
 
-#: po/tmp/e-contact-print.glade.h:20
+#: addressbook/printing/e-contact-print.glade.h:20
 msgid "Height:"
 msgstr "AukПtis:"
 
-#: po/tmp/e-contact-print.glade.h:21
+#: addressbook/printing/e-contact-print.glade.h:21
 msgid "Immediately follow each other"
 msgstr "Seka iПkart vienas po kito"
 
-#: po/tmp/e-contact-print.glade.h:22
+#: addressbook/printing/e-contact-print.glade.h:22
 msgid "Include:"
 msgstr "аtraukti:"
 
-#: po/tmp/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23
 msgid "Landscape"
 msgstr "GulsХias lapas"
 
-#: po/tmp/e-contact-print.glade.h:24
+#: addressbook/printing/e-contact-print.glade.h:24
 msgid "Left:"
 msgstr "KairКje:"
 
-#: po/tmp/e-contact-print.glade.h:25
+#: addressbook/printing/e-contact-print.glade.h:25
 msgid "Letter tabs on side"
 msgstr "LaiПkЬ kortelКs Пone"
 
-#: po/tmp/e-contact-print.glade.h:26
+#: addressbook/printing/e-contact-print.glade.h:26
 msgid "Margins"
 msgstr "ParaПtКs"
 
-#: po/tmp/e-contact-print.glade.h:27
+#: addressbook/printing/e-contact-print.glade.h:27
 msgid "Number of columns:"
 msgstr "StulpeliЬ skaiХius:"
 
-#: po/tmp/e-contact-print.glade.h:28
+#: addressbook/printing/e-contact-print.glade.h:28
 msgid "Options"
 msgstr "Parinktys"
 
-#: po/tmp/e-contact-print.glade.h:29
+#: addressbook/printing/e-contact-print.glade.h:29
 msgid "Orientation"
 msgstr "Orientacija"
 
-#: po/tmp/e-contact-print.glade.h:30
+#: addressbook/printing/e-contact-print.glade.h:30
 msgid "Page"
 msgstr "Puslapis"
 
-#: po/tmp/e-contact-print.glade.h:31
+#: addressbook/printing/e-contact-print.glade.h:31
 msgid "Page Setup:"
 msgstr "Puslapio nuostatos:"
 
-#: po/tmp/e-contact-print.glade.h:32
+#: addressbook/printing/e-contact-print.glade.h:32
 msgid "Paper"
 msgstr "Popierius"
 
-#: po/tmp/e-contact-print.glade.h:33
+#: addressbook/printing/e-contact-print.glade.h:33
 msgid "Paper source:"
 msgstr "Popieriaus Пaltinis:"
 
-#: po/tmp/e-contact-print.glade.h:34
+#: addressbook/printing/e-contact-print.glade.h:34
 msgid "Portrait"
 msgstr "StaХias lapas"
 
-#: po/tmp/e-contact-print.glade.h:35
+#: addressbook/printing/e-contact-print.glade.h:35
 msgid "Preview:"
 msgstr "PerЧiШra:"
 
-#: po/tmp/e-contact-print.glade.h:36
+#: addressbook/printing/e-contact-print.glade.h:36
 msgid "Print using gray shading"
 msgstr "Spausdinti naudojant pilkus ПeПКlius"
 
-#: po/tmp/e-contact-print.glade.h:37
+#: addressbook/printing/e-contact-print.glade.h:37
 msgid "Reverse on even pages"
 msgstr "Apversti lyginiuose puslapiuose"
 
-#: po/tmp/e-contact-print.glade.h:38
+#: addressbook/printing/e-contact-print.glade.h:38
 msgid "Right:"
 msgstr "DeПinКje:"
 
-#: po/tmp/e-contact-print.glade.h:39
+#: addressbook/printing/e-contact-print.glade.h:39
 msgid "Sections:"
 msgstr "Sekcijos:"
 
-#: po/tmp/e-contact-print.glade.h:40
+#: addressbook/printing/e-contact-print.glade.h:40
 msgid "Shading"
 msgstr "пeПКliai"
 
-#: po/tmp/e-contact-print.glade.h:41
+#: addressbook/printing/e-contact-print.glade.h:41
 msgid "Size:"
 msgstr "Dydis:"
 
-#: po/tmp/e-contact-print.glade.h:42
+#: addressbook/printing/e-contact-print.glade.h:42
 msgid "Start on a new page"
 msgstr "Prasideda naujame puslapyje"
 
-#: po/tmp/e-contact-print.glade.h:43
+#: addressbook/printing/e-contact-print.glade.h:43
 msgid "Style name:"
 msgstr "Stiliaus vardas:"
 
-#: po/tmp/e-contact-print.glade.h:44
+#: addressbook/printing/e-contact-print.glade.h:44
 msgid "Top:"
 msgstr "VirПuje:"
 
-#: 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 "Tipas:"
 
-#: po/tmp/e-contact-print.glade.h:46
+#: addressbook/printing/e-contact-print.glade.h:46
 msgid "Width:"
 msgstr "Plotis:"
 
-#: po/tmp/e-contact-print.glade.h:47
+#: addressbook/printing/e-contact-print.glade.h:47
 msgid "label26"
 msgstr "label26"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:550
-#: calendar/gui/e-week-view.c:288 calendar/gui/print.c:605
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:553
-#: calendar/gui/e-week-view.c:291 calendar/gui/print.c:604
-msgid "pm"
-msgstr "pm"
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 msgid "Evolution Calendar Conduit"
 msgstr "Evolution kalendoriaus konduitas"
@@ -1262,13 +1375,13 @@ msgstr "Evolution kalendoriaus konduitas"
 msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr "Evolution kalendoriaus konduito konfigШravimo Аrankis.\n"
 
-#: calendar/conduits/calendar/calendar-conduit.c:671
-#: calendar/conduits/todo/todo-conduit.c:479
+#: calendar/conduits/calendar/calendar-conduit.c:686
+#: calendar/conduits/todo/todo-conduit.c:501
 msgid "Error while communicating with calendar server"
 msgstr "аvyko klaida, bendraujant su kalendoriaus serveriu"
 
-#: calendar/conduits/calendar/calendar-conduit.c:770
-#: calendar/conduits/calendar/calendar-conduit.c:773
+#: calendar/conduits/calendar/calendar-conduit.c:785
+#: calendar/conduits/calendar/calendar-conduit.c:788
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nepavyko perskaityti piloto Calendar programos bloko"
 
@@ -1280,123 +1393,162 @@ msgstr "Evolution ToDo konduitas"
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr "Evolution ToDo konduito konfigШravimo Аrankis.\n"
 
-#: calendar/conduits/todo/todo-conduit.c:578
-#: calendar/conduits/todo/todo-conduit.c:581
+#: calendar/conduits/todo/todo-conduit.c:600
+#: calendar/conduits/todo/todo-conduit.c:603
 msgid "Could not read pilot's ToDo application block"
 msgstr "NegalКjau perskaityti piloto ToDo programos bloko"
 
-#: calendar/gui/calendar-commands.c:60
-msgid "Outline:"
-msgstr "KontШrai:"
+#.
+#. * 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 "AntraПtКs:"
+#: 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:"
-msgstr "TuПХios dienos:"
+#.
+#. * 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 "аvykiai:"
+#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:7
+#, fuzzy
+msgid "Calendar Server"
+msgstr "Kalendorius"
 
-#: calendar/gui/calendar-commands.c:64
-msgid "Highlighted day:"
-msgstr "ParyПkinta diena:"
+#.
+#. * 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
+#, fuzzy
+msgid "Evolution calendar executive summary component."
+msgstr "Negaliu inicializuoti Evolution paПto santraukos komponento."
 
-#: calendar/gui/calendar-commands.c:65
-msgid "Day numbers:"
-msgstr "DienЬ numeriai:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Evolution kalendoriaus konduitas"
 
-#: calendar/gui/calendar-commands.c:66
-msgid "Current day's number:"
-msgstr "пiandienos numeris:"
+#: 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:"
-msgstr "To-do punktas, kuriam dar ne laikas:"
+#: 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:"
-msgstr "To-do punktas, kurio laikas Пiandien:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#, fuzzy
+msgid "Factory for the Evolution calendar component."
+msgstr "Evolution kalendoriaus konduito konfigШravimo Аrankis.\n"
+
+#: 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:"
-msgstr "To-do punktas, kurio laikas praКjФs:"
+#: 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 "Priminti apie tavo АvykА"
 
-#: calendar/gui/calendar-commands.c:354
+#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:8
+msgid "Snooze"
+msgstr "UЧtildyti"
+
+#. 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 "Gerai"
+
+#: calendar/gui/calendar-commands.c:229
 msgid "File not found"
 msgstr "Byla nerasta"
 
-#: calendar/gui/calendar-commands.c:378
+#: calendar/gui/calendar-commands.c:253
 msgid "Open calendar"
 msgstr "Atidaryti kalendoriЬ"
 
-#: calendar/gui/calendar-commands.c:417
+#: calendar/gui/calendar-commands.c:295
 msgid "Save calendar"
 msgstr "IПsaugoti kalendoriЬ"
 
+#: 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:282
+#: 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:2498
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
 msgstr "%a %Y-%m-%d"
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:286 calendar/gui/calendar-model.c:736
+#: calendar/gui/calendar-model.c:288 calendar/gui/calendar-model.c:738
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %Y-%m-%d %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time,
 #. in 12-hour format.
-#: calendar/gui/calendar-model.c:290 calendar/gui/calendar-model.c:739
+#: calendar/gui/calendar-model.c:292 calendar/gui/calendar-model.c:741
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %Y-%m-%d %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:344 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 "VieПas"
 
-#: calendar/gui/calendar-model.c:347 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 "AsmeniПkas"
 
-#: calendar/gui/calendar-model.c:350 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 "Slaptas"
 
-#: calendar/gui/calendar-model.c:353 calendar/gui/calendar-model.c:521
+#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:523
 msgid "Unknown"
 msgstr "NeЧinomas"
 
-#: calendar/gui/calendar-model.c:441
+#: calendar/gui/calendar-model.c:443
 msgid "N"
 msgstr "п"
 
-#: calendar/gui/calendar-model.c:441
+#: calendar/gui/calendar-model.c:443
 msgid "S"
 msgstr "P"
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:445
 msgid "E"
 msgstr "R"
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:445
 msgid "W"
 msgstr "V"
 
-#: calendar/gui/calendar-model.c:515
+#: calendar/gui/calendar-model.c:517
 msgid "Transparent"
 msgstr "Skaidrus"
 
-#: calendar/gui/calendar-model.c:518
+#: calendar/gui/calendar-model.c:520
 msgid "Opaque"
 msgstr "Neskaidrus"
 
-#: calendar/gui/calendar-model.c:744
+#: calendar/gui/calendar-model.c:746
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1408,35 +1560,35 @@ msgstr ""
 "%s"
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:845 calendar/gui/calendar-model.c:893
+#: 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:1274 widgets/misc/e-dateedit.c:1455
+#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
 msgstr "%Y-%m-%d"
 
 #. 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:863
+#: 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:866
+#: 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:870
+#: 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:873
+#: calendar/gui/calendar-model.c:875
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
-#: calendar/gui/calendar-model.c:993
+#: calendar/gui/calendar-model.c:995
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1446,14 +1598,37 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1033
+#: calendar/gui/calendar-model.c:1035
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "ProcentinК reikПmК turi bШti tarp 0 ir 100 imtinai"
 
-#: calendar/gui/calendar-model.c:1073
+#: calendar/gui/calendar-model.c:1075
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "Svarbumas turi bШti tarp 1 ir 9 imtinai"
 
+#: calendar/gui/calendar-summary.c:81
+#, fuzzy
+msgid "%A, %e %B %Y"
+msgstr "%A, %B %d, %Y"
+
+#: calendar/gui/calendar-summary.c:224
+#, fuzzy
+msgid "<b>Error loading calendar</b>"
+msgstr "Klaida Аkeliant bylЮ: %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 "Spausdinti kalendoriЬ"
+
 #: calendar/gui/control-factory.c:125
 msgid "The URI that the calendar will display"
 msgstr "URI, kurА rodys kalendorius"
@@ -1471,350 +1646,402 @@ msgid "No summary available."
 msgstr "Nepateikta santraukos."
 
 #.
-#. * 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 "UЧdaryti"
 
-#: po/tmp/alarm-notify.glade.h:7
+#: calendar/gui/dialogs/alarm-notify.glade.h:7
 msgid "Edit appointment"
 msgstr "Keisti АvykА"
 
-#: calendar/gui/gnome-cal.c:1466 po/tmp/alarm-notify.glade.h:8
-msgid "Snooze"
-msgstr "UЧtildyti"
-
-#: po/tmp/alarm-notify.glade.h:9
+#: calendar/gui/dialogs/alarm-notify.glade.h:9
 msgid "Snooze time (minutes)"
 msgstr "UЧtildymo laikas (minutКmis)"
 
 #.
-#. * 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 minutКs"
 
-#: po/tmp/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "10 minutes"
 msgstr "10 minuХiЬ"
 
-#: po/tmp/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "12 hour (am/pm)"
 msgstr "12 valandЬ (am/pm)"
 
-#: po/tmp/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "15 minutes"
 msgstr "15 minuХiЬ"
 
-#: po/tmp/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "24 hour"
 msgstr "24 valandЬ"
 
-#: po/tmp/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "30 minutes"
 msgstr "30 minuХiЬ"
 
-#: po/tmp/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "60 minutes"
 msgstr "60 minuХiЬ"
 
-#: po/tmp/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Alarms timeout after"
 msgstr "PerspКjimai baigiasi po"
 
-#: po/tmp/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Audio Alarms"
 msgstr "PerspКjimai garsu"
 
-#: po/tmp/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Beep when alarm windows appear."
 msgstr "PyptelКti, kai atsiranda aliarmo langai."
 
-#: po/tmp/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Calendar"
 msgstr "Kalendorius"
 
-#: po/tmp/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Calendar Preferences"
 msgstr "Kalendoriaus nuostatos"
 
-#: po/tmp/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Colors"
 msgstr "Spalvos"
 
-#: po/tmp/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Compress weekends"
 msgstr "Suspausti savaitgalius"
 
-#: po/tmp/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Date navigator options"
 msgstr "DatЬ navigatoriaus parinktys"
 
-#: po/tmp/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Defaults"
 msgstr "аprasta"
 
-#: po/tmp/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Display options"
 msgstr "Rodymo parinktys"
 
-#: po/tmp/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Due Date"
 msgstr "Kada reikia"
 
-#: po/tmp/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "Enable snoozing for"
 msgstr "Leisti uЧtildymЮ"
 
-#: po/tmp/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "End of day:"
 msgstr "Dienos pabaiga:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:26
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "First day of week:"
 msgstr "Pirma savaitКs diena:"
 
-#: 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 "Pen"
 
-#: 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 "Penktadienis"
 
-#: po/tmp/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Highlight"
 msgstr "ParyПkinti"
 
-#: po/tmp/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "Items Due Today"
 msgstr "пiandienos Аvykius"
 
-#: po/tmp/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "Items Due Today:"
 msgstr "пiandienos Аvykiai:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Items Not Yet Due"
 msgstr "аvykius, kurie dar ne Пiandien"
 
-#: po/tmp/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Items Not Yet Due:"
 msgstr "аvykiai, kurie dar ne Пiandien:"
 
-#: 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 "Pir"
 
-#: 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 "PirmadienА"
 
-#: po/tmp/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "Overdue Items"
 msgstr "PraКjusius Аvykius"
 
-#: po/tmp/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Overdue Items:"
 msgstr "PraКjФ Аvykiai:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Pick a color"
 msgstr "Pasirink spalvЮ"
 
-#: 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 "Svarbumas"
 
-#: po/tmp/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Remind me of all appointments"
 msgstr "Priminti man apie visus Аvykius"
 
-#: po/tmp/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Reminders"
 msgstr "Priminimas"
 
-#: 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 "пeП"
 
-#: 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 "пeПtadienis"
 
-#: po/tmp/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Show"
 msgstr "Rodyti"
 
-#: po/tmp/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "Show appointment end times"
 msgstr "Rodyti АvykiЬ pabaigos laikus"
 
-#: po/tmp/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Show week numbers"
 msgstr "Rodyti savaiХiЬ numerius"
 
-#: po/tmp/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "Start of day:"
 msgstr "Dienos pradЧia:"
 
 #. 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 "Sek"
 
-#: 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 "SekmadienА"
 
-#: po/tmp/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "TaskPad"
 msgstr "UЧduotys"
 
-#: 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 "Ket"
 
-#: 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 "Ketvirtadienis"
 
-#: po/tmp/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "Time Until Due"
 msgstr "LikФs laikas"
 
-#: po/tmp/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "Time divisions:"
 msgstr "Laiko dalijimas:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:55
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "Time format:"
 msgstr "Laiko formatas:"
 
-#: 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 "Ant"
 
-#: 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 "Antradienis"
 
-#: po/tmp/cal-prefs-dialog.glade.h:58
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "Visual Alarms"
 msgstr "PerspКjimai vaizdu"
 
-#: 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 "Tre"
 
-#: 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 "TreХiadienis"
 
-#: po/tmp/cal-prefs-dialog.glade.h:61
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "Work week"
 msgstr "Darbo savaitК"
 
-#: po/tmp/cal-prefs-dialog.glade.h:62
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "minutes before they occur."
 msgstr "minutes prieП jiems Аvykstant."
 
-#: po/tmp/cal-prefs-dialog.glade.h:63
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "seconds."
 msgstr "sekundЧiЬ."
 
+#: calendar/gui/dialogs/delete-comp.c:62
+#, fuzzy, c-format
+msgid "Are you sure you want to delete the appointment `%s'?"
+msgstr ""
+"Ar tikrai nori iПtrinti \n"
+"ПА kontaktЮ?"
+
+#: calendar/gui/dialogs/delete-comp.c:65
+#, fuzzy
+msgid "Are you sure you want to delete this untitled appointment?"
+msgstr ""
+"Ar tikrai nori iПtrinti \n"
+"ПА kontaktЮ?"
+
+#: calendar/gui/dialogs/delete-comp.c:71
+#, fuzzy, c-format
+msgid "Are you sure you want to delete the task `%s'?"
+msgstr ""
+"Ar tikrai nori iПtrinti \n"
+"ПА kontaktЮ?"
+
+#: calendar/gui/dialogs/delete-comp.c:74
+#, fuzzy
+msgid "Are you sure you want to delete this untitled task?"
+msgstr ""
+"Ar tikrai nori iПtrinti \n"
+"ПА kontaktЮ?"
+
+#: calendar/gui/dialogs/delete-comp.c:80
+#, fuzzy, c-format
+msgid "Are you sure you want to delete the journal entry `%s'?"
+msgstr ""
+"Ar tikrai nori iПtrinti \n"
+"ПА kontaktЮ?"
+
+#: calendar/gui/dialogs/delete-comp.c:83
+#, fuzzy
+msgid "Are you sure want to delete this untitled journal entry?"
+msgstr ""
+"Ar tikrai nori iПtrinti \n"
+"ПА kontaktЮ?"
+
 #.
-#. * 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 "% А_vykdyta:"
 
-#: po/tmp/task-editor-dialog.glade.h:7
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
 msgid "C_lassification:"
 msgstr "K_lasifikacija:"
 
-#: po/tmp/task-editor-dialog.glade.h:9
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
 msgid "Cancelled"
 msgstr "Nutraukta"
 
-#: po/tmp/task-editor-dialog.glade.h:10
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
 msgid "Completed"
 msgstr "UЧbaigta"
 
-#: po/tmp/task-editor-dialog.glade.h:12
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
 msgid "Date Completed:"
 msgstr "UЧbaigimo data:"
 
-#: po/tmp/task-editor-dialog.glade.h:14
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
 msgid "High"
 msgstr "AukПtas"
 
-#: po/tmp/task-editor-dialog.glade.h:15
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
 msgid "In Progress"
 msgstr "Vykdoma"
 
-#: po/tmp/task-editor-dialog.glade.h:16
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
 msgid "Low"
 msgstr "чemas"
 
 #. 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
-#: widgets/misc/e-dateedit.c:422 widgets/misc/e-dateedit.c:1331
-#: widgets/misc/e-dateedit.c:1446
+#: 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 "Jokios"
 
-#: po/tmp/task-editor-dialog.glade.h:18
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
 msgid "Normal"
 msgstr "Normalus"
 
-#: po/tmp/task-editor-dialog.glade.h:19
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
 msgid "Not Started"
 msgstr "NepradКta"
 
-#: po/tmp/task-editor-dialog.glade.h:22
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
 msgid "S_ummary"
 msgstr "_Santrauka"
 
-#: po/tmp/task-editor-dialog.glade.h:23
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
 msgid "Sta_rt Date:"
 msgstr "_PradЧios data:"
 
-#: po/tmp/task-editor-dialog.glade.h:24
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
 msgid "Task"
 msgstr "UЧduotis"
 
-#: 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 "_Kontaktai..."
 
-#: po/tmp/task-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
 msgid "_Due Date:"
 msgstr "_Kada reikia:"
 
-#: po/tmp/task-editor-dialog.glade.h:28
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
 msgid "_Priority:"
 msgstr "_Svarbumas:"
 
-#: po/tmp/task-editor-dialog.glade.h:29
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
 msgid "_Status:"
 msgstr "_BШsena:"
 
-#: po/tmp/task-editor-dialog.glade.h:30
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
 msgid "task-editor-dialog"
 msgstr "task-editor-dialog"
 
@@ -1822,26 +2049,26 @@ msgstr "task-editor-dialog"
 msgid "Edit Task"
 msgstr "Taisyti uЧduotА"
 
-#: 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 "NКra santraukos"
 
-#: 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 "аvykis -- %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 "UЧduotis -- %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 "чurnalo АraПas -- %s"
 
-#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3277
+#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3250
 msgid "Do you want to save changes?"
 msgstr ""
 
@@ -1861,14 +2088,6 @@ msgstr "PaЧymКti uЧbaigta"
 msgid "Mark the task complete"
 msgstr "PaЧymКti, jog uЧduotis uЧbaigta"
 
-#: calendar/gui/e-calendar-table.c:342 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:479 mail/mail-view.c:165
-#: 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 "IПtrinti"
-
 #: calendar/gui/e-calendar-table.c:343
 msgid "Delete the task"
 msgstr "IПtrinti uЧduotА"
@@ -1880,50 +2099,62 @@ msgstr "%02i minuХiЬ padalos"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1208
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1211
 #: calendar/gui/e-week-view-main-item.c:325
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1222
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1225
 #: calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1235
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1238
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view.c:2941 calendar/gui/e-day-view.c:2948
-#: calendar/gui/e-day-view.c:2957 calendar/gui/e-week-view.c:3165
-#: calendar/gui/e-week-view.c:3172 calendar/gui/e-week-view.c:3181
+#. 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:610
+msgid "am"
+msgstr "am"
+
+#. 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:609
+msgid "pm"
+msgstr "pm"
+
+#: calendar/gui/e-day-view.c:2948 calendar/gui/e-day-view.c:2955
+#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3169
+#: calendar/gui/e-week-view.c:3176 calendar/gui/e-week-view.c:3185
 msgid "New appointment..."
 msgstr "Naujas Аvykis..."
 
-#: calendar/gui/e-day-view.c:2945 calendar/gui/e-day-view.c:2952
-#: calendar/gui/e-week-view.c:3169 calendar/gui/e-week-view.c:3176
+#: calendar/gui/e-day-view.c:2952 calendar/gui/e-day-view.c:2959
+#: calendar/gui/e-week-view.c:3173 calendar/gui/e-week-view.c:3180
 msgid "Edit this appointment..."
 msgstr "Taisyti ПА АvykА..."
 
-#: calendar/gui/e-day-view.c:2946 calendar/gui/e-week-view.c:3170
-#: po/tmp/evolution-event-editor.xml.h:20
+#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3174
+#: ui/evolution-event-editor.xml.h:20
 msgid "Delete this appointment"
 msgstr "IПtrinti ПА АvykА"
 
-#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3177
+#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3181
 msgid "Make this appointment movable"
 msgstr "Padaryti ПА АvykА judamu"
 
-#: calendar/gui/e-day-view.c:2954 calendar/gui/e-week-view.c:3178
+#: calendar/gui/e-day-view.c:2961 calendar/gui/e-week-view.c:3182
 msgid "Delete this occurrence"
 msgstr "IПtrinti ПА pasitaikymЮ"
 
-#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3179
+#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3183
 msgid "Delete all occurrences"
 msgstr "IПtrinti visus pasitaikymus"
 
@@ -1935,661 +2166,489 @@ 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 "Vis_os dienos Аvykis"
 
-#: po/tmp/event-editor-dialog.glade.h:8
+#: calendar/gui/event-editor-dialog.glade.h:8
 msgid "Appointment Basics"
 msgstr "аvykio pagrindai"
 
-#: po/tmp/event-editor-dialog.glade.h:9
+#: calendar/gui/event-editor-dialog.glade.h:9
 msgid "Classification"
 msgstr "Klasifikacija"
 
-#: po/tmp/event-editor-dialog.glade.h:10
+#: calendar/gui/event-editor-dialog.glade.h:10
 msgid "Custom recurrence"
 msgstr "Kitoks pakartojimas"
 
-#: po/tmp/event-editor-dialog.glade.h:11
+#: calendar/gui/event-editor-dialog.glade.h:11
 msgid "Days"
 msgstr "Dienos"
 
-#: po/tmp/event-editor-dialog.glade.h:13
+#: calendar/gui/event-editor-dialog.glade.h:13
 msgid "Every"
 msgstr "Kas"
 
-#: po/tmp/event-editor-dialog.glade.h:14
+#: calendar/gui/event-editor-dialog.glade.h:14
 msgid "Exceptions"
 msgstr "IПimtys"
 
-#: po/tmp/event-editor-dialog.glade.h:16
+#: calendar/gui/event-editor-dialog.glade.h:16
 msgid "Hours"
 msgstr "Valandos"
 
-#: po/tmp/event-editor-dialog.glade.h:17
+#: calendar/gui/event-editor-dialog.glade.h:17
 msgid "Mail _to:"
 msgstr "SiЬsti _kam:"
 
-#: po/tmp/event-editor-dialog.glade.h:18
+#: calendar/gui/event-editor-dialog.glade.h:18
 msgid "Minutes"
 msgstr "MinutКs"
 
-#: po/tmp/event-editor-dialog.glade.h:19
+#: calendar/gui/event-editor-dialog.glade.h:19
 msgid "Modify"
 msgstr "Keisti"
 
-#: po/tmp/event-editor-dialog.glade.h:20
+#: calendar/gui/event-editor-dialog.glade.h:20
 msgid "No recurrence"
 msgstr "Jokio pakartojimo"
 
-#: po/tmp/event-editor-dialog.glade.h:21
+#: calendar/gui/event-editor-dialog.glade.h:21
 #, fuzzy
 msgid "Preview"
 msgstr "PerЧiШra:"
 
-#: po/tmp/event-editor-dialog.glade.h:22
+#: calendar/gui/event-editor-dialog.glade.h:22
 msgid "Pri_vate"
 msgstr "As_meniПkas"
 
-#: po/tmp/event-editor-dialog.glade.h:23
+#: calendar/gui/event-editor-dialog.glade.h:23
 msgid "Pu_blic"
 msgstr "_VieПas"
 
-#: po/tmp/event-editor-dialog.glade.h:24
+#: calendar/gui/event-editor-dialog.glade.h:24
 msgid "Recurrence"
 msgstr "Pasikartojimas"
 
-#: po/tmp/event-editor-dialog.glade.h:25
+#: calendar/gui/event-editor-dialog.glade.h:25
 msgid "Recurrence Rule"
 msgstr "Pakartojimo taisyklК"
 
-#: po/tmp/event-editor-dialog.glade.h:26
+#: calendar/gui/event-editor-dialog.glade.h:26
 msgid "Reminder"
 msgstr "Priminimas"
 
-#: po/tmp/event-editor-dialog.glade.h:27
+#: calendar/gui/event-editor-dialog.glade.h:27
 msgid "Simple recurrence"
 msgstr "Paprastas pakartojimas"
 
-#: po/tmp/event-editor-dialog.glade.h:28
+#: calendar/gui/event-editor-dialog.glade.h:28
 msgid "Su_mmary:"
 msgstr "Sa_ntrauka:"
 
-#: po/tmp/event-editor-dialog.glade.h:29
+#: calendar/gui/event-editor-dialog.glade.h:29
 msgid "Time"
 msgstr "Laikas"
 
-#: po/tmp/event-editor-dialog.glade.h:30
+#: calendar/gui/event-editor-dialog.glade.h:30
 msgid "_Audio"
 msgstr "_Garsu"
 
-#: po/tmp/event-editor-dialog.glade.h:31
+#: calendar/gui/event-editor-dialog.glade.h:31
 msgid "_Confidential"
 msgstr "_Slaptas"
 
-#: po/tmp/event-editor-dialog.glade.h:32
+#: calendar/gui/event-editor-dialog.glade.h:32
 msgid "_Display"
 msgstr "_Vaizdu"
 
-#: po/tmp/event-editor-dialog.glade.h:33
+#: calendar/gui/event-editor-dialog.glade.h:33
 msgid "_End time:"
 msgstr "P_abaigos laikas:"
 
-#: po/tmp/event-editor-dialog.glade.h:34
+#: calendar/gui/event-editor-dialog.glade.h:34
 msgid "_Mail"
 msgstr "PaП_tu"
 
-#: po/tmp/event-editor-dialog.glade.h:35
+#: calendar/gui/event-editor-dialog.glade.h:35
 msgid "_Program"
 msgstr "_Programa"
 
-#: po/tmp/event-editor-dialog.glade.h:36
+#: calendar/gui/event-editor-dialog.glade.h:36
 msgid "_Run program:"
 msgstr "Pa_leisti programЮ:"
 
-#: po/tmp/event-editor-dialog.glade.h:37
+#: calendar/gui/event-editor-dialog.glade.h:37
 msgid "_Start time:"
 msgstr "_PradЧios laikas:"
 
-#: po/tmp/event-editor-dialog.glade.h:38
+#: calendar/gui/event-editor-dialog.glade.h:38
 msgid "_Starting date:"
 msgstr "_PradЧios data:"
 
-#: po/tmp/event-editor-dialog.glade.h:39
+#: calendar/gui/event-editor-dialog.glade.h:39
 msgid "day(s)"
 msgstr "dienЮ(as)"
 
-#: po/tmp/event-editor-dialog.glade.h:40
+#: calendar/gui/event-editor-dialog.glade.h:40
 msgid "event-editor-dialog"
 msgstr "event-editor-dialog"
 
-#: po/tmp/event-editor-dialog.glade.h:41
+#: calendar/gui/event-editor-dialog.glade.h:41
 msgid "for"
 msgstr "dКl"
 
-#: po/tmp/event-editor-dialog.glade.h:42
+#: calendar/gui/event-editor-dialog.glade.h:42
 msgid "forever"
 msgstr "amЧinai"
 
-#: po/tmp/event-editor-dialog.glade.h:43
+#: calendar/gui/event-editor-dialog.glade.h:43
 msgid "label21"
 msgstr "label21"
 
-#: po/tmp/event-editor-dialog.glade.h:44
+#: calendar/gui/event-editor-dialog.glade.h:44
 msgid "month(s)"
 msgstr "mКnesА(ius)"
 
-#: po/tmp/event-editor-dialog.glade.h:45
+#: calendar/gui/event-editor-dialog.glade.h:45
 msgid "until"
 msgstr "iki"
 
-#: po/tmp/event-editor-dialog.glade.h:46
+#: calendar/gui/event-editor-dialog.glade.h:46
 msgid "week(s)"
 msgstr "savaitФ(es)"
 
-#: po/tmp/event-editor-dialog.glade.h:47
+#: calendar/gui/event-editor-dialog.glade.h:47
 msgid "year(s)"
 msgstr "metus"
 
-#: calendar/gui/event-editor.c:329
+#: calendar/gui/event-editor.c:325
 msgid "Edit Appointment"
 msgstr "Taisyti АvykА"
 
-#: calendar/gui/event-editor.c:407
+#: calendar/gui/event-editor.c:403
 msgid "on"
 msgstr "lygiai"
 
-#: calendar/gui/event-editor.c:432 calendar/gui/getdate.y:424
-#: filter/filter-datespec.c:65
+#: calendar/gui/event-editor.c:428 filter/filter-datespec.c:65
 msgid "day"
 msgstr "diena"
 
-#: calendar/gui/event-editor.c:559
+#: calendar/gui/event-editor.c:555
 #, fuzzy
 msgid "on the"
 msgstr "mКnesis"
 
-#: calendar/gui/event-editor.c:566
+#: calendar/gui/event-editor.c:562
 #, fuzzy
 msgid "th"
 msgstr "4-a"
 
-#: calendar/gui/event-editor.c:722
+#: calendar/gui/event-editor.c:716
 #, fuzzy
 msgid "occurrences"
 msgstr "kartus pasitaikys"
 
-#: calendar/gui/event-editor.c:839
+#: calendar/gui/event-editor.c:833
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor.c:3079 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 "%a %b %d %Y"
 
-#: calendar/gui/getdate.y:391
-msgid "january"
-msgstr "sausis"
+#: calendar/gui/gnome-cal.c:676
+#, c-format
+msgid "Could not load the calendar in `%s'"
+msgstr "Nepavyko Аkelti kalendoriaus А ╔%s╢"
 
-#: calendar/gui/getdate.y:392
-msgid "february"
-msgstr "vasaris"
+#: calendar/gui/gnome-cal.c:687
+#, c-format
+msgid "Could not create a calendar in `%s'"
+msgstr "Nepavyko sukurti kalendoriaus Хia: ╔%s╢"
 
-#: calendar/gui/getdate.y:393
-msgid "march"
-msgstr "kovas"
+#: calendar/gui/gnome-cal.c:698
+#, c-format
+msgid "The method required to load `%s' is not supported"
+msgstr "Metodas, reikalingas Аkelti ╔%s╢, nepalaikomas"
 
-#: calendar/gui/getdate.y:394
-msgid "april"
+#.
+#. * 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
+#, fuzzy
+msgid "April"
 msgstr "balandis"
 
-#: calendar/gui/getdate.y:395
-msgid "may"
-msgstr "geguЧК"
-
-#: calendar/gui/getdate.y:396
-msgid "june"
-msgstr "birЧelis"
-
-#: calendar/gui/getdate.y:397
-msgid "july"
-msgstr "liepa"
-
-#: calendar/gui/getdate.y:398
-msgid "august"
+#: calendar/gui/goto-dialog.glade.h:7
+#, fuzzy
+msgid "August"
 msgstr "rugpjШtis"
 
-#: calendar/gui/getdate.y:399
-msgid "september"
-msgstr "rugsКjis"
-
-#: calendar/gui/getdate.y:400
-msgid "sept"
-msgstr "rugs"
-
-#: calendar/gui/getdate.y:401
-msgid "october"
-msgstr "spalis"
-
-#: calendar/gui/getdate.y:402
-msgid "november"
-msgstr "lapkritis"
-
-#: calendar/gui/getdate.y:403
-msgid "december"
+#: calendar/gui/goto-dialog.glade.h:8
+#, fuzzy
+msgid "December"
 msgstr "gruodis"
 
-#: calendar/gui/getdate.y:404
-msgid "sunday"
-msgstr "sekmadienis"
-
-#: calendar/gui/getdate.y:405
-msgid "monday"
-msgstr "pirmadienis"
-
-#: calendar/gui/getdate.y:406
-msgid "tuesday"
-msgstr "antradienis"
-
-#: calendar/gui/getdate.y:407
-msgid "tues"
-msgstr "antr"
-
-#: calendar/gui/getdate.y:408
-msgid "wednesday"
-msgstr "treХiadienis"
-
-#: calendar/gui/getdate.y:409
-msgid "wednes"
-msgstr "treХ"
-
-#: calendar/gui/getdate.y:410
-msgid "thursday"
-msgstr "ketvirtadienis"
-
-#: calendar/gui/getdate.y:411
-msgid "thur"
-msgstr "ketv"
-
-#: calendar/gui/getdate.y:412
-msgid "thurs"
-msgstr "ketv"
-
-#: calendar/gui/getdate.y:413
-msgid "friday"
-msgstr "penktadienis"
-
-#: calendar/gui/getdate.y:414
-msgid "saturday"
-msgstr "ПeПtadienis"
-
-#: calendar/gui/getdate.y:420 filter/filter-datespec.c:62
-msgid "year"
-msgstr "metai"
-
-#: calendar/gui/getdate.y:421 filter/filter-datespec.c:63
-msgid "month"
-msgstr "mКnesis"
-
-#: calendar/gui/getdate.y:422
-msgid "fortnight"
-msgstr "dvi savaitКs"
-
-#: calendar/gui/getdate.y:423 filter/filter-datespec.c:64
-msgid "week"
-msgstr "savaitК"
-
-#: calendar/gui/getdate.y:425 filter/filter-datespec.c:66
-msgid "hour"
-msgstr "valanda"
-
-#: calendar/gui/getdate.y:426 filter/filter-datespec.c:67
-msgid "minute"
-msgstr "minutК"
-
-#: calendar/gui/getdate.y:427
-msgid "min"
-msgstr "min."
-
-#: calendar/gui/getdate.y:428 filter/filter-datespec.c:68
-msgid "second"
-msgstr "sekundК"
-
-#: calendar/gui/getdate.y:429
-msgid "sec"
-msgstr "sek."
-
-#: calendar/gui/getdate.y:435
-msgid "tomorrow"
-msgstr "rytoj"
-
-#: calendar/gui/getdate.y:436
-msgid "yesterday"
-msgstr "vakar"
-
-#: calendar/gui/getdate.y:437
-msgid "today"
-msgstr "Пiandien"
-
-#: calendar/gui/getdate.y:438 filter/filter-datespec.c:533
-#: filter/filter-datespec.c:693
-msgid "now"
-msgstr "dabar"
-
-#: calendar/gui/getdate.y:439
-msgid "last"
-msgstr "paskutinis"
-
-#: calendar/gui/getdate.y:440
-msgid "this"
-msgstr "Пis"
-
-#: calendar/gui/getdate.y:441
-msgid "next"
-msgstr "tolesnis"
-
-#: calendar/gui/getdate.y:442
-msgid "first"
-msgstr "pirmas"
-
-#. { N_("second"),		tUNUMBER,	2 },
-#: calendar/gui/getdate.y:444
-msgid "third"
-msgstr "treХias"
-
-#: calendar/gui/getdate.y:445
-msgid "fourth"
-msgstr "ketvirtas"
-
-#: calendar/gui/getdate.y:446
-msgid "fifth"
-msgstr "penktas"
-
-#: calendar/gui/getdate.y:447
-msgid "sixth"
-msgstr "ПeПtas"
-
-#: calendar/gui/getdate.y:448
-msgid "seventh"
-msgstr "septintas"
-
-#: calendar/gui/getdate.y:449
-msgid "eighth"
-msgstr "aПtuntas"
-
-#: calendar/gui/getdate.y:450
-msgid "ninth"
-msgstr "devintas"
-
-#: calendar/gui/getdate.y:451
-msgid "tenth"
-msgstr "deПimtas"
-
-#: calendar/gui/getdate.y:452
-msgid "eleventh"
-msgstr "vienuoliktas"
+#: calendar/gui/goto-dialog.glade.h:9
+#, fuzzy
+msgid "February"
+msgstr "vasaris"
 
-#: calendar/gui/getdate.y:453
-msgid "twelfth"
-msgstr "dvyliktas"
+#: calendar/gui/goto-dialog.glade.h:10
+#, fuzzy
+msgid "Go To Date"
+msgstr "пokti А datЮ"
 
-#: calendar/gui/getdate.y:454
-msgid "ago"
-msgstr " "
+#: calendar/gui/goto-dialog.glade.h:11
+#, fuzzy
+msgid "Go To Today"
+msgstr "пokti А ПiandienЮ"
 
-#: calendar/gui/gnome-cal.c:718 calendar/gui/gnome-cal.c:1474
-#: calendar/gui/gnome-cal.c:1530
-msgid "Reminder of your appointment at "
-msgstr "Priminti apie tavo АvykА"
+#: calendar/gui/goto-dialog.glade.h:12
+#, fuzzy
+msgid "January"
+msgstr "sausis"
 
-#: calendar/gui/gnome-cal.c:1152
-#, c-format
-msgid "Could not load the calendar in `%s'"
-msgstr "Nepavyko Аkelti kalendoriaus А ╔%s╢"
+#: calendar/gui/goto-dialog.glade.h:13
+#, fuzzy
+msgid "July"
+msgstr "liepa"
 
-#: calendar/gui/gnome-cal.c:1163
-#, c-format
-msgid "Could not create a calendar in `%s'"
-msgstr "Nepavyko sukurti kalendoriaus Хia: ╔%s╢"
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "June"
+msgstr "birЧelis"
 
-#: calendar/gui/gnome-cal.c:1174
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr "Metodas, reikalingas Аkelti ╔%s╢, nepalaikomas"
+#: calendar/gui/goto-dialog.glade.h:15
+#, fuzzy
+msgid "March"
+msgstr "kovas"
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1479 calendar/gui/gnome-cal.c:1534
-#: mail/mail-search-dialogue.c:104
-msgid "Ok"
-msgstr "Gerai"
+#: calendar/gui/goto-dialog.glade.h:16
+#, fuzzy
+msgid "May"
+msgstr "PirmadienА"
 
-#: calendar/gui/goto.c:82
-msgid "Year:"
-msgstr "Metai:"
+#: calendar/gui/goto-dialog.glade.h:17
+#, fuzzy
+msgid "November"
+msgstr "lapkritis"
 
-#: calendar/gui/goto.c:270
-msgid "Go to date"
-msgstr "пokti А datЮ"
+#: calendar/gui/goto-dialog.glade.h:18
+#, fuzzy
+msgid "October"
+msgstr "spalis"
 
-#. Instructions
-#: calendar/gui/goto.c:281
-msgid ""
-"Please select the date you want to go to.\n"
-"When you click on a day, you will be taken\n"
-"to that date."
-msgstr ""
-"Pasirink datЮ, А kuriЮ nori nuПokti.\n"
-"Kai nuspausi ant dienos, atsirasi\n"
-"toje datoje"
+#: calendar/gui/goto-dialog.glade.h:19
+#, fuzzy
+msgid "September"
+msgstr "rugsКjis"
 
-#: calendar/gui/goto.c:318
-msgid "Go to today"
-msgstr "пokti А ПiandienЮ"
+#: calendar/gui/main.c:49
+#, fuzzy
+msgid "Could not initialize GNOME"
+msgstr "NegalКjau inicializuoti Bonobo"
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "1st"
 msgstr "1-a"
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "2nd"
 msgstr "2-a"
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "3rd"
 msgstr "3-a"
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "4th"
 msgstr "4-a"
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "5th"
 msgstr "5-a"
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "6th"
 msgstr "6-ta"
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "7th"
 msgstr "7-ta"
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "8th"
 msgstr "8-ta"
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "9th"
 msgstr "9-ta"
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "10th"
 msgstr "10-ta"
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "11th"
 msgstr "11-ta"
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "12th"
 msgstr "12-ta"
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "13th"
 msgstr "13-ta"
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "14th"
 msgstr "14-ta"
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "15th"
 msgstr "15-ta"
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "16th"
 msgstr "16-ta"
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "17th"
 msgstr "17-ta"
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "18th"
 msgstr "18-ta"
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "19th"
 msgstr "19-ta"
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "20th"
 msgstr "20-ta"
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "21st"
 msgstr "21-a"
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "22nd"
 msgstr "22-a"
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "23rd"
 msgstr "23-a"
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "24th"
 msgstr "24-ta"
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "25th"
 msgstr "25-ta"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "26th"
 msgstr "26-ta"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "27th"
 msgstr "27-ta"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "28th"
 msgstr "28-ta"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "29th"
 msgstr "29-ta"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "30th"
 msgstr "30-ta"
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:299
 msgid "31st"
 msgstr "31-a"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Su"
 msgstr "Sk"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Mo"
 msgstr "Pr"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Tu"
 msgstr "An"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "We"
 msgstr "Tr"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Th"
 msgstr "Kt"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Fr"
 msgstr "Pn"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Sa"
 msgstr "пt"
 
-#: calendar/gui/print.c:936
+#: calendar/gui/print.c:941
 msgid "Tasks"
 msgstr "UЧduotys"
 
 #. Day
-#: calendar/gui/print.c:1066
+#: calendar/gui/print.c:1071
 msgid "Current day (%a %b %d %Y)"
 msgstr "Esama diena (%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 "Esama savaitК (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1100
+#: calendar/gui/print.c:1105
 msgid "Current month (%b %Y)"
 msgstr "Esamas mКnuo (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1107
+#: calendar/gui/print.c:1112
 msgid "Current year (%Y)"
 msgstr "Esami metai (%Y)"
 
-#: calendar/gui/print.c:1144
+#: calendar/gui/print.c:1149
 msgid "Print Calendar"
 msgstr "Spausdinti kalendoriЬ"
 
-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:962
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1001
 msgid "Print Preview"
 msgstr "Spaudino perЧiШra"
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: calendar/gui/weekday-picker.c:351 widgets/misc/e-calendar-item.c:416
-msgid "MTWTFSS"
-msgstr "PATKPпS"
-
-#: calendar/gui/weekday-picker.c:353 calendar/gui/weekday-picker.c:443
+#: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
 msgid "SMTWTFS"
 msgstr "SPATKPп"
 
@@ -2679,60 +2738,61 @@ msgstr "Nepavyko Аkelti %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Nepavyko Аkelti %s: Modulyje nКra inicializacijos kodo."
 
-#: camel/camel-remote-store.c:182
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr "%s serveris %s"
 
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:227
+#: camel/camel-remote-store.c:243
+#: camel/providers/smtp/camel-smtp-transport.c:162
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "NegalКjau prisijungti prie %s (prievadas %d): %s"
 
-#: camel/camel-remote-store.c:228
+#: camel/camel-remote-store.c:244
 msgid "(unknown host)"
 msgstr "(neЧinomas hostas)"
 
-#: camel/camel-remote-store.c:452
+#: camel/camel-remote-store.c:483
 msgid "Server disconnected."
 msgstr ""
 
-#: camel/camel-service.c:120
+#: camel/camel-service.c:138
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL ╔%s╢ turi bШti su vartotojo vardu"
 
-#: camel/camel-service.c:129
+#: camel/camel-service.c:147
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL ╔%s╢ turi bШti su hostu"
 
-#: camel/camel-service.c:138
+#: camel/camel-service.c:156
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL ╔%s╢ turi bШti su keliu"
 
-#: camel/camel-service.c:488
+#: camel/camel-service.c:526
 #, c-format
 msgid "No such host %s."
 msgstr "NКra tokio hosto %s."
 
-#: camel/camel-service.c:491
+#: camel/camel-service.c:529
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr "Laikinai negaliu paieПkoti %s hosto vardo."
 
-#: camel/camel-session.c:272
+#: camel/camel-session.c:297
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Protokolui ╔%s╢ nКra tiekКjo."
 
-#: camel/camel-session.c:360
+#: camel/camel-session.c:388
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2756,53 +2816,53 @@ msgstr "URL eilutКje ╔%s╢ yra blogas protokolas"
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "Prievado numeris URL ╔%s╢ nКra skaХius."
 
-#: camel/providers/imap/camel-imap-auth.c:127
+#: camel/providers/imap/camel-imap-auth.c:133
 #, fuzzy, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
 "%s"
 msgstr "NegalКjau sukurti pipe: %s"
 
-#: camel/providers/imap/camel-imap-auth.c:198
+#: camel/providers/imap/camel-imap-auth.c:205
 #, fuzzy
 msgid "Bad authentication response from server."
 msgstr "NetikКtas atsakymas iП IMAP serverio: %s"
 
-#: camel/providers/imap/camel-imap-command.c:216
+#: camel/providers/imap/camel-imap-command.c:231
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "NetikКtas atsakymas iП IMAP serverio: %s"
 
-#: camel/providers/imap/camel-imap-command.c:224
+#: camel/providers/imap/camel-imap-command.c:239
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Nepavyko IMAP komanda: %s"
 
-#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:240 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "NeЧinoma klaida"
 
-#: camel/providers/imap/camel-imap-command.c:271
+#: camel/providers/imap/camel-imap-command.c:286
 #, fuzzy
 msgid "Server response ended too soon."
 msgstr "IMAP serverio atsakyme nebuvo %s informacijos"
 
-#: camel/providers/imap/camel-imap-command.c:407
+#: camel/providers/imap/camel-imap-command.c:422
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP serverio atsakyme nebuvo %s informacijos"
 
-#: camel/providers/imap/camel-imap-command.c:443
+#: camel/providers/imap/camel-imap-command.c:458
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "NetikКtas atsakymas OK iП IMAP serverio: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:216
+#: camel/providers/imap/camel-imap-folder.c:196
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Nepavyko Аkelti %s santraukos"
 
-#: camel/providers/imap/camel-imap-folder.c:586
+#: camel/providers/imap/camel-imap-folder.c:532
 msgid "Could not find message body in FETCH response."
 msgstr "NegalКjau rasti laiПko teksto FETCH atsakyme"
 
@@ -2814,34 +2874,28 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "PaПto skaitymui ir raПymui IMAP serveriuose."
 
-#: camel/providers/imap/camel-imap-store.c:234
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:148
-msgid "Password"
-msgstr "SlaptaЧodis"
-
-#: camel/providers/imap/camel-imap-store.c:236
+#: camel/providers/imap/camel-imap-store.c:248
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "пi parinktis jungsis prie IMAP serverio, naudojant paprasto teksto "
 "slaptaЧodА."
 
-#: camel/providers/imap/camel-imap-store.c:245
+#: camel/providers/imap/camel-imap-store.c:257
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/providers/imap/camel-imap-store.c:247
+#: camel/providers/imap/camel-imap-store.c:259
 msgid ""
 "This option will connect to the IMAP server using Kerberos 4 authentication."
 msgstr ""
 "пi parinktis jungsis prie IMAP serverio, naudojant Kerberos 4 autentikacijЮ."
 
-#: camel/providers/imap/camel-imap-store.c:333
+#: camel/providers/imap/camel-imap-store.c:345
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sPraПau, Аvesk IMAP slaptaЧodА %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:359
+#: camel/providers/imap/camel-imap-store.c:373
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2851,7 +2905,7 @@ msgstr ""
 "NegalКjau autentikuotis А IMAP serverА.\n"
 "%s\n"
 
-#: camel/providers/imap/camel-imap-store.c:539
+#: camel/providers/imap/camel-imap-store.c:564
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "NegalКjau sukurti katalogo %s: %s"
@@ -2940,12 +2994,12 @@ msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "NegalКjau pridurti laiПko prie mh aplanko: %s"
 
 #: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:204
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-maildir-folder.c:207
+#: camel/providers/local/camel-maildir-folder.c:215
+#: camel/providers/local/camel-mbox-folder.c:317
 #: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:189
-#: camel/providers/local/camel-mh-folder.c:197
+#: camel/providers/local/camel-mh-folder.c:192
+#: camel/providers/local/camel-mh-folder.c:200
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -2955,14 +3009,14 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-mbox-folder.c:317
 #: camel/providers/local/camel-mh-folder.c:183
 #, fuzzy
 msgid "No such message"
 msgstr "NКra tokio hosto %s."
 
-#: camel/providers/local/camel-maildir-folder.c:213
-#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-maildir-folder.c:216
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "Invalid message contents"
 msgstr ""
 
@@ -3010,19 +3064,19 @@ msgstr "NegalКjau iПtrinti aplanko ╔%s╢: %s"
 msgid "not a maildir directory"
 msgstr "Vietinis paПto katalogas %s"
 
-#: camel/providers/local/camel-mbox-folder.c:195
+#: camel/providers/local/camel-mbox-folder.c:201
 #, fuzzy, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "NegalКjau atidaryti laikinos paПto bylos: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:251
+#: camel/providers/local/camel-mbox-folder.c:257
 #, fuzzy, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "NegalКjau pridurti laiПko prie mbox bylos: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:327
-#: camel/providers/local/camel-mbox-folder.c:357
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:333
+#: camel/providers/local/camel-mbox-folder.c:365
+#: camel/providers/local/camel-mbox-folder.c:378
 #, fuzzy, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -3031,11 +3085,11 @@ msgstr ""
 "Negaliu gauti laiПko: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:358
+#: camel/providers/local/camel-mbox-folder.c:366
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:369
+#: camel/providers/local/camel-mbox-folder.c:379
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -3088,59 +3142,59 @@ msgstr "NegalКjau atidaryti aplanko: laiПkЬ sЮraПas buvo nepilnas."
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:341
+#: camel/providers/local/camel-mbox-summary.c:343
 #, fuzzy, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "NegalКjau uЧdaryti Пaltinio aplanko %s:  %s"
 
-#: camel/providers/local/camel-mbox-summary.c:475
-#: camel/providers/local/camel-mbox-summary.c:661
+#: camel/providers/local/camel-mbox-summary.c:477
+#: camel/providers/local/camel-mbox-summary.c:668
 #, fuzzy, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
 "NegalКjau atidaryti aplanko ╔%s╢: \n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:491
+#: camel/providers/local/camel-mbox-summary.c:493
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "NegalКjau atidaryti laikinos paПto bylos: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:512
-#: camel/providers/local/camel-mbox-summary.c:520
-#: camel/providers/local/camel-mbox-summary.c:691
-#: camel/providers/local/camel-mbox-summary.c:699
+#: camel/providers/local/camel-mbox-summary.c:514
+#: camel/providers/local/camel-mbox-summary.c:522
+#: camel/providers/local/camel-mbox-summary.c:701
+#: camel/providers/local/camel-mbox-summary.c:709
 #, fuzzy
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Santraukos nesutampa, nutraukiu sync"
 
-#: camel/providers/local/camel-mbox-summary.c:562
+#: camel/providers/local/camel-mbox-summary.c:565
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Klaida raПant А laikinЮ paПto dКЧutФ: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:579
+#: camel/providers/local/camel-mbox-summary.c:582
 #, fuzzy, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Klaida raПant А laikinЮ paПto dКЧutФ: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:595
-#: camel/providers/local/camel-mbox-summary.c:748
+#: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-mbox-summary.c:759
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "NegalКjau uЧdaryti Пaltinio aplanko %s:  %s"
 
-#: camel/providers/local/camel-mbox-summary.c:604
+#: camel/providers/local/camel-mbox-summary.c:609
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "NegalКjau uЧdaryti laikino aplanko:  %s"
 
-#: camel/providers/local/camel-mbox-summary.c:615
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "NegalКjau pervadinti aplanko: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:817
+#: camel/providers/local/camel-mbox-summary.c:830
 #, c-format
 msgid "Unknown error: %s"
 msgstr "NeЧinoma klaida: %s"
@@ -3173,7 +3227,7 @@ msgstr "Nepavyko serveriui nusiЬsti vartotojo vardo"
 msgid "Server rejected username/password"
 msgstr "Serveris atmetК vartotojo vardЮ/slaptaЧodА"
 
-#: camel/providers/nntp/camel-nntp-folder.c:144
+#: camel/providers/nntp/camel-nntp-folder.c:115
 #, c-format
 msgid "Message %s not found."
 msgstr "LaiПkas %s nerastas"
@@ -3224,16 +3278,16 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "NegalКjau atidaryti ar sukurti .newsrc bylos, skirtos %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:179
+#: camel/providers/pop3/camel-pop3-folder.c:180
 msgid "Could not open folder: message listing was incomplete."
 msgstr "NegalКjau atidaryti aplanko: laiПkЬ sЮraПas buvo nepilnas."
 
-#: camel/providers/pop3/camel-pop3-folder.c:273
+#: camel/providers/pop3/camel-pop3-folder.c:274
 #, c-format
 msgid "No message with uid %s"
 msgstr "NКra laiПko su uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:288
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "NegalКjau parsiЬsti laiПko iП POP serverio %s: %s"
@@ -3280,17 +3334,17 @@ msgstr ""
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "NegalКjau autentikuotis А KPOP serverА: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:335
+#: camel/providers/pop3/camel-pop3-store.c:337
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "NegalКjau prisijungti prie POP serverio %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:389
+#: camel/providers/pop3/camel-pop3-store.c:391
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sPraПau, Аvesk POP3 slaptaЧodА, skirtЮ %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:408
+#: camel/providers/pop3/camel-pop3-store.c:410
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3299,12 +3353,12 @@ msgstr ""
 "NegalКjau prisijungti prie POP serverio.\n"
 "Klaida siunХiant vartotojo vardЮ: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:411
-#: camel/providers/pop3/camel-pop3-store.c:448
+#: camel/providers/pop3/camel-pop3-store.c:413
+#: camel/providers/pop3/camel-pop3-store.c:450
 msgid "(Unknown)"
 msgstr "(NeЧinoma)"
 
-#: camel/providers/pop3/camel-pop3-store.c:438
+#: camel/providers/pop3/camel-pop3-store.c:440
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -3312,7 +3366,7 @@ msgstr ""
 "Negaliu prisijungti prie POP serverio.\n"
 "Jis nepalaiko norimo autentikacijos mechanizmo."
 
-#: camel/providers/pop3/camel-pop3-store.c:446
+#: camel/providers/pop3/camel-pop3-store.c:448
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3321,12 +3375,13 @@ msgstr ""
 "NegalКjau prisijungti prie POP serverio.\n"
 "Klaida siunХiant slaptaЧodА: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:555
+#: camel/providers/pop3/camel-pop3-store.c:557
 #, c-format
 msgid "No such folder `%s'."
 msgstr "NКra tokio aplanko ╔%s╢."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
+#: mail/mail-config-druid.glade.h:63
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -3375,11 +3430,142 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "PaПto siuntimas, naudojant sendmail programЮ"
 
+#: 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."
+#, fuzzy
+msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 "PaПto siuntimui, prisijungiant prie nutolusio paПto serverio, naudojant SMTP."
 
+#: camel/providers/smtp/camel-smtp-transport.c:187
+#, c-format
+msgid "Welcome response error: %s: possibly non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:281
+#, fuzzy
+msgid "No authentication required"
+msgstr "Autentikacija:"
+
+#: camel/providers/smtp/camel-smtp-transport.c:283
+#, fuzzy
+msgid ""
+"This option will connect to the SMTP server without using any kind of "
+"authentication. This should be fine for connecting to most SMTP servers."
+msgstr ""
+"пi parinktis jungsis prie POP serverio, naudojant paprasto teksto "
+"slaptaЧodА. Tai vienintelК parinktis, palaikoma daugelio POP serveriЬ."
+
+#: 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 ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:294
+#, fuzzy
+msgid ""
+"This option will connect to the SMTP server using CRAM-MD5 authentication."
+msgstr ""
+"пi parinktis jungsis prie IMAP serverio, naudojant Kerberos 4 autentikacijЮ."
+
+#: camel/providers/smtp/camel-smtp-transport.c:332
+#, fuzzy, c-format
+msgid "SMTP server %s"
+msgstr "%s serveris %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:334
+#, fuzzy, c-format
+msgid "SMTP mail delivery via %s"
+msgstr "PaПto siuntimas, naudojant sendmail programЮ"
+
+#: camel/providers/smtp/camel-smtp-transport.c:359
+msgid "Cannot send message: sender address not defined."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:366
+msgid "Cannot send message: sender address not valid."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:380
+msgid "Cannot send message: no recipients defined."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:474
+#, c-format
+msgid "HELO request timed out: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:490
+#, c-format
+msgid "HELO response error: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:529
+#, c-format
+msgid "MAIL FROM request timed out: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:545
+#, c-format
+msgid "MAIL FROM response error: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:570
+#, fuzzy, c-format
+msgid "RCPT TO request timed out: %s: mail not sent"
+msgstr "NegalКjau sukurti pipe А sendmail: %s: paПtas neiПiЬstas"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
+#, fuzzy, c-format
+msgid "RCPT TO response error: %s: mail not sent"
+msgstr "NegalКjau paleisti %s: paПtas neiПiЬstas."
+
+#: camel/providers/smtp/camel-smtp-transport.c:617
+#, fuzzy, c-format
+msgid "DATA request timed out: %s: mail not sent"
+msgstr "NegalКjau paleisti %s: paПtas neiПiЬstas."
+
+#: camel/providers/smtp/camel-smtp-transport.c:633
+#, c-format
+msgid "DATA response error: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:648
+#: camel/providers/smtp/camel-smtp-transport.c:666
+#, fuzzy, c-format
+msgid "DATA send timed out: message termination: %s: mail not sent"
+msgstr "sendmail'as baigК darbЮ su signalu %s: paПtas neiПiЬstas."
+
+#: camel/providers/smtp/camel-smtp-transport.c:682
+#, c-format
+msgid "DATA response error: message termination: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:706
+#, c-format
+msgid "RSET request timed out: %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:722
+#, fuzzy, c-format
+msgid "RSET response error: %s"
+msgstr "NeЧinoma klaida: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:745
+#, c-format
+msgid "QUIT request timed out: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#, c-format
+msgid "QUIT response error: %s: non-fatal"
+msgstr ""
+
 #: camel/providers/vee/camel-vee-provider.c:30
 msgid "Virtual folder email provider"
 msgstr "VirtualiЬ aplankЬ paПto tiekКjas."
@@ -3413,82 +3599,82 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:144
+#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:155
 msgid "attachment"
 msgstr "priedas"
 
-#: composer/e-msg-composer-attachment-bar.c:417
-#: 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 "Prisegti bylЮ"
 
-#: composer/e-msg-composer-attachment-bar.c:464 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 "PaПalinti"
 
-#: composer/e-msg-composer-attachment-bar.c:465
+#: composer/e-msg-composer-attachment-bar.c:461
 msgid "Remove selected items from the attachment list"
 msgstr "PaПalinti paЧymКtus daiktus iП priedЬ sЮraПo"
 
-#: composer/e-msg-composer-attachment-bar.c:496
+#: composer/e-msg-composer-attachment-bar.c:492
 msgid "Add attachment..."
 msgstr "Prisegti priedЮ..."
 
-#: composer/e-msg-composer-attachment-bar.c:497
+#: composer/e-msg-composer-attachment-bar.c:493
 msgid "Attach a file to the message"
 msgstr "Prisegti bylЮ prie Пio laiПko"
 
 #.
-#. * 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 "Priedo savybКs"
 
-#: po/tmp/e-msg-composer-attachment.glade.h:8
+#: composer/e-msg-composer-attachment.glade.h:8
 msgid "File name:"
 msgstr "Bylos vardas:"
 
-#: po/tmp/e-msg-composer-attachment.glade.h:9
+#: composer/e-msg-composer-attachment.glade.h:9
 msgid "MIME type:"
 msgstr "MIME tipas:"
 
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:290
-#: mail/mail-format.c:621
+#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:303
+#: mail/mail-format.c:626
 msgid "From:"
 msgstr "Nuo:"
 
-#: composer/e-msg-composer-hdrs.c:238
+#: composer/e-msg-composer-hdrs.c:247
 msgid "Click here for the address book"
 msgstr "Paspausk Хia, jei reikia adresЬ knygelКs"
 
-#: composer/e-msg-composer-hdrs.c:291
+#: composer/e-msg-composer-hdrs.c:304
 msgid "Enter the identity you wish to send this message from"
 msgstr "аvesk asmenybФ, iП kurios nori iПsiЬsti ПА laiПkЮ"
 
-#: composer/e-msg-composer-hdrs.c:295 mail/mail-format.c:625
+#: composer/e-msg-composer-hdrs.c:308 mail/mail-format.c:630
 msgid "To:"
 msgstr "Kam:"
 
-#: composer/e-msg-composer-hdrs.c:296
+#: composer/e-msg-composer-hdrs.c:309
 msgid "Enter the recipients of the message"
 msgstr "аvesk laiПko gavКjus"
 
-#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:627
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:632
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:301
+#: composer/e-msg-composer-hdrs.c:314
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "аvesk adresus, kurie gaus Пio laiПko carbon copy"
 
-#: composer/e-msg-composer-hdrs.c:306
+#: composer/e-msg-composer-hdrs.c:319
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:307
+#: 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."
@@ -3496,15 +3682,15 @@ msgstr ""
 "аvesk adresus, kurie gaus Пio laiПko carbon copy, bet jЬ nesimatys laiПko "
 "gavКjЬ sЮraПe."
 
-#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:629
+#: composer/e-msg-composer-hdrs.c:326 mail/mail-format.c:634
 msgid "Subject:"
 msgstr "Tema:"
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Enter the subject of the mail"
 msgstr "аvesk laiПko temЮ"
 
-#: composer/e-msg-composer.c:429
+#: composer/e-msg-composer.c:430
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -3513,38 +3699,38 @@ msgstr ""
 "NegalКjau atidaryti paraПo bylos %s: \n"
 "%s"
 
-#: composer/e-msg-composer.c:599
+#: composer/e-msg-composer.c:600
 msgid "Save as..."
 msgstr "IПsaugoti kaip..."
 
-#: composer/e-msg-composer.c:610
+#: composer/e-msg-composer.c:611
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Klaida iПsaugant bylЮ: %s"
 
-#: composer/e-msg-composer.c:630
+#: composer/e-msg-composer.c:631
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Klaida Аkeliant bylЮ: %s"
 
-#: composer/e-msg-composer.c:652
+#: composer/e-msg-composer.c:653
 msgid "Saving changes to message..."
 msgstr "IПsaugomi laiПko pakeitimai..."
 
-#: composer/e-msg-composer.c:654
+#: composer/e-msg-composer.c:655
 msgid "Save changes to message..."
 msgstr "IПsaugoti laiПko pakeitimus..."
 
-#: composer/e-msg-composer.c:695
+#: composer/e-msg-composer.c:696
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr "Klaida saugant kШrinА А ╔JuodraПХius╢: %s"
 
-#: composer/e-msg-composer.c:739 shell/e-shell-view-menu.c:170
+#: composer/e-msg-composer.c:741 shell/e-shell-view-menu.c:167
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:745
+#: composer/e-msg-composer.c:747
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3554,27 +3740,27 @@ msgstr ""
 "\n"
 "Ar norКtum iПsaugoti jo pakeitimus?"
 
-#: composer/e-msg-composer.c:767
+#: composer/e-msg-composer.c:772
 msgid "Open file"
 msgstr "Atidaryti bylЮ"
 
-#: composer/e-msg-composer.c:893
+#: composer/e-msg-composer.c:898
 msgid "That file does not exist."
 msgstr "Tokios bylos nКra."
 
-#: composer/e-msg-composer.c:903
+#: composer/e-msg-composer.c:908
 msgid "That is not a regular file."
 msgstr "Tai nКra paprasta byla."
 
-#: composer/e-msg-composer.c:913
+#: composer/e-msg-composer.c:918
 msgid "That file exists but is not readable."
 msgstr "Byla yra, bet jos neАmanoma perskaityti."
 
-#: composer/e-msg-composer.c:923
+#: composer/e-msg-composer.c:928
 msgid "That file appeared accesible but open(2) failed."
 msgstr "Ta byla atrodК pasiekiama, bet open(2) nepavyko."
 
-#: composer/e-msg-composer.c:945
+#: composer/e-msg-composer.c:950
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3582,15 +3768,15 @@ msgstr ""
 "Byla yra labai didelК (virП 100K).\n"
 "Ar tu tikrai nori jЮ Аterpti?"
 
-#: composer/e-msg-composer.c:966
+#: composer/e-msg-composer.c:971
 msgid "An error occurred while reading the file."
 msgstr "аvyko klaida, beskaitant bylЮ."
 
-#: composer/e-msg-composer.c:1343
+#: composer/e-msg-composer.c:1350
 msgid "Compose a message"
 msgstr "Sukurti laiПkЮ"
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1427
 msgid "Could not create composer window."
 msgstr "Negaliu sukurti raПyklКs lango"
 
@@ -3604,14 +3790,26 @@ msgid "Sear_ch"
 msgstr "PaieПka"
 
 #: filter/filter-datespec.c:62
+msgid "year"
+msgstr "metai"
+
+#: filter/filter-datespec.c:62
 msgid "years"
 msgstr "metЬ"
 
 #: filter/filter-datespec.c:63
+msgid "month"
+msgstr "mКnesis"
+
+#: filter/filter-datespec.c:63
 msgid "months"
 msgstr "mКnesiЬ"
 
 #: filter/filter-datespec.c:64
+msgid "week"
+msgstr "savaitК"
+
+#: filter/filter-datespec.c:64
 msgid "weeks"
 msgstr "savaiХiЬ"
 
@@ -3620,14 +3818,26 @@ msgid "days"
 msgstr "dienЬ"
 
 #: filter/filter-datespec.c:66
+msgid "hour"
+msgstr "valanda"
+
+#: filter/filter-datespec.c:66
 msgid "hours"
 msgstr "valandЬ"
 
 #: filter/filter-datespec.c:67
+msgid "minute"
+msgstr "minutК"
+
+#: filter/filter-datespec.c:67
 msgid "minutes"
 msgstr "minuХiЬ"
 
 #: filter/filter-datespec.c:68
+msgid "second"
+msgstr "sekundК"
+
+#: filter/filter-datespec.c:68
 msgid "seconds"
 msgstr "sekundЧiЬ"
 
@@ -3684,6 +3894,10 @@ msgstr "laikas, santykinis esamam laikui"
 msgid "Compare against"
 msgstr "Palyginti su"
 
+#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
+msgid "now"
+msgstr "dabar"
+
 #: filter/filter-datespec.c:690
 msgid "<click here to select a date>"
 msgstr "<spausk Хia, kad pasirinktum datЮ>"
@@ -3709,7 +3923,7 @@ msgstr ""
 "Gaunamas\n"
 "SiunХiamas\n"
 
-#: 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 "Keisti filtrus"
 
@@ -3746,7 +3960,7 @@ msgstr "аvesk aplanko URI"
 msgid "<click here to select a folder>"
 msgstr "<spausk Хia, kad pasirinktum aplankЮ>"
 
-#: filter/filter-input.c:184
+#: filter/filter-input.c:185
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -3755,239 +3969,250 @@ msgstr ""
 "Klaida reguliarioje iПraiПkoje ╔%s╢:\n"
 "%s"
 
-#: filter/filter-message-search.c:379 filter/filter-message-search.c:447
+#: filter/filter-message-search.c:380 filter/filter-message-search.c:448
 #, c-format
 msgid "Failed to perform regex search on message header: %s"
 msgstr ""
 
-#: filter/filter-part.c:456
+#: filter/filter-part.c:467
 msgid "Test"
 msgstr "Testuoti"
 
-#: filter/filter-rule.c:520
+#: filter/filter-rule.c:530
 msgid "Rule name: "
 msgstr "TaisyklКs pavadinimas:"
 
-#: filter/filter-rule.c:524
+#: filter/filter-rule.c:534
 msgid "Untitled"
 msgstr "BevardК"
 
-#: filter/filter-rule.c:540
+#: filter/filter-rule.c:550
 msgid "If"
 msgstr "Jei"
 
-#: filter/filter-rule.c:557
+#: filter/filter-rule.c:567
 msgid "Execute actions"
 msgstr "аvykdyti veiksmus"
 
-#: filter/filter-rule.c:561
+#: filter/filter-rule.c:571
 msgid "if all criteria are met"
 msgstr "jei visos sЮlygos tenkinamos"
 
-#: filter/filter-rule.c:566
+#: filter/filter-rule.c:576
 msgid "if any criteria are met"
 msgstr "jei kuri nors sЮlyga tenkinama"
 
-#: filter/filter-rule.c:577
+#: filter/filter-rule.c:587
 msgid "Add criterion"
 msgstr "PridКti sЮlygЮ"
 
-#: filter/filter-rule.c:583
+#: filter/filter-rule.c:593
 msgid "Remove criterion"
 msgstr "PaПalinti sЮlygЮ"
 
-#: mail/folder-browser.c:465 po/tmp/filter.glade.h:8
-#: po/tmp/mail-config.glade.h:9
-msgid "Edit"
-msgstr "Taisyti"
+#: filter/filter-system-flag.c:63
+#, fuzzy
+msgid "Replied to"
+msgstr "Ats. visiems"
+
+#. { _("Deleted"), "Deleted" },
+#. { _("Draft"), "Draft" },
+#: filter/filter-system-flag.c:66
+msgid "Important"
+msgstr ""
 
-#: po/tmp/filter.glade.h:10
+#: filter/filter-system-flag.c:67
+#, fuzzy
+msgid "Read"
+msgstr "Pakartoti"
+
+#: filter/filter.glade.h:10
 msgid "Edit VFolders"
 msgstr "Taisyti vAplankus"
 
-#: po/tmp/filter.glade.h:11
+#: filter/filter.glade.h:11
 msgid "Filter Rules"
 msgstr "Filtro taisyklКs"
 
-#: po/tmp/filter.glade.h:12
+#: filter/filter.glade.h:12
 #, fuzzy
 msgid "Incoming"
 msgstr ""
 "Gaunamas\n"
 "SiunХiamas\n"
 
-#: po/tmp/filter.glade.h:13
+#: filter/filter.glade.h:13
 #, fuzzy
 msgid "Outgoing"
 msgstr "KontШrai:"
 
-#: po/tmp/filter.glade.h:15
+#: filter/filter.glade.h:15
 msgid "Virtual Folders"
 msgstr "VirtualШs aplankai"
 
-#: po/tmp/filter.glade.h:16
+#: filter/filter.glade.h:16
 msgid "vFolder Sources"
 msgstr "vAplankЬ Пaltiniai"
 
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
+msgid "after"
+msgstr "po"
+
+#: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr "Priskirti spalvЮ"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Priskirti АvertА"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
+msgid "before"
+msgstr "prieП"
+
+#: filter/libfilter-i18n.h:6
+msgid "contains"
+msgstr "turi"
+
+#: filter/libfilter-i18n.h:7
 msgid "Copy to Folder"
 msgstr "Kopijuoti А aplankЮ"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "Gavimo data"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "Siuntimo data"
 
-#: filter/libfilter-i18n.h:8
-msgid "Expression"
-msgstr "IПraiПka"
-
-#: filter/libfilter-i18n.h:9
-msgid "Forward to Address"
-msgstr "PersiЬsti adresu"
-
-#: filter/libfilter-i18n.h:10
-msgid "Message Body"
-msgstr "LaiПko tekstas"
-
 #: filter/libfilter-i18n.h:11
-#, fuzzy
-msgid "Message Header"
-msgstr "LaiПko tekstas"
+msgid "does not contain"
+msgstr "neturi"
 
 #: filter/libfilter-i18n.h:12
-msgid "Message was received"
-msgstr "LaiПkas buvo gautas"
+msgid "does not end with"
+msgstr "nesibaigia"
 
 #: filter/libfilter-i18n.h:13
-msgid "Message was sent"
-msgstr "LaiПkas buvo iПsiЬstas"
+msgid "does not exist"
+msgstr "neegzistuoja"
 
 #: filter/libfilter-i18n.h:14
-msgid "Move to Folder"
-msgstr "Perkelti А aplankЮ"
+msgid "does not sound like"
+msgstr "neskamba panaПiai А"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not start with"
+msgstr "neprasideda"
 
 #: filter/libfilter-i18n.h:16
-msgid "Recipients"
-msgstr "GavКjai"
+msgid "ends with"
+msgstr "baigiasi"
 
 #: filter/libfilter-i18n.h:17
-msgid "Regex Match"
-msgstr ""
+msgid "exists"
+msgstr "egzistuoja"
 
 #: filter/libfilter-i18n.h:18
-msgid "Sender"
-msgstr "SiuntКjas"
+msgid "Expression"
+msgstr "IПraiПka"
 
 #: filter/libfilter-i18n.h:19
-#, fuzzy
-msgid "Set Status"
-msgstr "_BШsena:"
+msgid "Forward to Address"
+msgstr "PersiЬsti adresu"
 
 #: filter/libfilter-i18n.h:20
-msgid "Source"
-msgstr "пaltinis"
+msgid "is"
+msgstr "yra"
 
 #: filter/libfilter-i18n.h:21
-msgid "Specific header"
-msgstr "Savita antraПtК"
+msgid "is greater than"
+msgstr "yra didesnis uЧ"
 
 #: filter/libfilter-i18n.h:22
-#, fuzzy
-msgid "Status"
-msgstr "_BШsena:"
+msgid "is less than"
+msgstr "yra maЧesnis uЧ"
 
 #: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
-msgstr "Sustabdyti vykdymЮ"
+msgid "is not"
+msgstr "nКra"
 
 #: filter/libfilter-i18n.h:24
-msgid "Subject"
-msgstr "Tema"
+msgid "Message Body"
+msgstr "LaiПko tekstas"
 
 #: filter/libfilter-i18n.h:25
-msgid "after"
-msgstr "po"
+#, fuzzy
+msgid "Message Header"
+msgstr "LaiПko tekstas"
 
 #: filter/libfilter-i18n.h:26
-msgid "before"
-msgstr "prieП"
+msgid "Message was received"
+msgstr "LaiПkas buvo gautas"
 
 #: filter/libfilter-i18n.h:27
-msgid "contains"
-msgstr "turi"
+msgid "Message was sent"
+msgstr "LaiПkas buvo iПsiЬstas"
 
 #: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr "neturi"
+msgid "Move to Folder"
+msgstr "Perkelti А aplankЮ"
 
 #: filter/libfilter-i18n.h:29
-msgid "does not end with"
-msgstr "nesibaigia"
+msgid "on or after"
+msgstr "tuo metu arba po"
 
 #: filter/libfilter-i18n.h:30
-msgid "does not exist"
-msgstr "neegzistuoja"
-
-#: filter/libfilter-i18n.h:31
-msgid "does not sound like"
-msgstr "neskamba panaПiai А"
+msgid "on or before"
+msgstr "tuo metu ar prieП"
 
 #: filter/libfilter-i18n.h:32
-msgid "does not start with"
-msgstr "neprasideda"
+msgid "Recipients"
+msgstr "GavКjai"
 
 #: filter/libfilter-i18n.h:33
-msgid "ends with"
-msgstr "baigiasi"
+msgid "Regex Match"
+msgstr ""
 
 #: filter/libfilter-i18n.h:34
-msgid "exists"
-msgstr "egzistuoja"
+msgid "Sender"
+msgstr "SiuntКjas"
 
 #: filter/libfilter-i18n.h:35
-msgid "is greater than"
-msgstr "yra didesnis uЧ"
+#, fuzzy
+msgid "Set Status"
+msgstr "_BШsena:"
 
 #: filter/libfilter-i18n.h:36
-msgid "is less than"
-msgstr "yra maЧesnis uЧ"
+msgid "sounds like"
+msgstr "skamba panaПiai А"
 
 #: filter/libfilter-i18n.h:37
-msgid "is not"
-msgstr "nКra"
+msgid "Source"
+msgstr "пaltinis"
 
 #: filter/libfilter-i18n.h:38
-msgid "is"
-msgstr "yra"
+msgid "Specific header"
+msgstr "Savita antraПtК"
 
 #: filter/libfilter-i18n.h:39
-msgid "on or after"
-msgstr "tuo metu arba po"
+msgid "starts with"
+msgstr "prasideda"
 
 #: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr "tuo metu ar prieП"
+#, fuzzy
+msgid "Status"
+msgstr "_BШsena:"
 
 #: filter/libfilter-i18n.h:41
-msgid "sounds like"
-msgstr "skamba panaПiai А"
+msgid "Stop Processing"
+msgstr "Sustabdyti vykdymЮ"
 
 #: filter/libfilter-i18n.h:42
-msgid "starts with"
-msgstr "prasideda"
+msgid "Subject"
+msgstr "Tema"
 
 #: filter/libfilter-i18n.h:43
 msgid "was after"
@@ -4017,143 +4242,226 @@ msgstr "PridКti vAplanko taisyklФ"
 msgid "Edit VFolder Rule"
 msgstr "Keisti vAplanko taisyklФ"
 
-#: mail/component-factory.c:227
+#: mail/component-factory.c:277
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Negaliu inicializuoti Evolution paПto komponento."
 
-#: mail/component-factory.c:266
+#: mail/component-factory.c:316
 msgid "Cannot register storage with shell"
 msgstr "Negaliu uЧregistruoti laikmenos su shell'u"
 
-#: mail/folder-browser.c:140 po/tmp/evolution-event-editor.xml.h:88
-#: po/tmp/evolution-message-composer.xml.h:16
+#: mail/folder-browser.c:223 ui/evolution-event-editor.xml.h:88
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "IПsaugoti"
 
-#: mail/folder-browser.c:153
+#: mail/folder-browser.c:236
 msgid "Body or subject contains"
 msgstr "Tekstas ar tema turi"
 
-#: mail/folder-browser.c:154
+#: mail/folder-browser.c:237
 msgid "Body contains"
 msgstr "Tekstas turi"
 
-#: mail/folder-browser.c:155
+#: mail/folder-browser.c:238
 msgid "Subject contains"
 msgstr "Tema turi"
 
-#: mail/folder-browser.c:156
+#: mail/folder-browser.c:239
 msgid "Body does not contain"
 msgstr "Tekstas neturi"
 
-#: mail/folder-browser.c:157
+#: mail/folder-browser.c:240
 msgid "Subject does not contain"
 msgstr "Tema neturi"
 
-#: mail/folder-browser.c:453
+#: mail/folder-browser.c:643
 msgid "VFolder on Subject"
 msgstr "vAplankas pagal TemЮ"
 
-#: mail/folder-browser.c:454
+#: mail/folder-browser.c:644
 msgid "VFolder on Sender"
 msgstr "vAplankas pagal SiuntКjЮ"
 
-#: mail/folder-browser.c:455
+#: mail/folder-browser.c:645
 msgid "VFolder on Recipients"
 msgstr "vAplankas pagal GavКjus"
 
-#: mail/folder-browser.c:457
+#: mail/folder-browser.c:647
 msgid "Filter on Subject"
 msgstr "Filtruoti pagal TemЮ"
 
-#: mail/folder-browser.c:458
+#: mail/folder-browser.c:648
 msgid "Filter on Sender"
 msgstr "Filtruoti pagal SiuntКjЮ"
 
-#: mail/folder-browser.c:459
+#: mail/folder-browser.c:649
 msgid "Filter on Recipients"
 msgstr "Filtruoti pagal GavКjus"
 
-#: mail/folder-browser.c:460 mail/folder-browser.c:544
+#: mail/folder-browser.c:650 mail/folder-browser.c:779
 msgid "Filter on Mailing List"
 msgstr "Filtruoti pagal KonferencijЮ"
 
-#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:14
+#: mail/folder-browser.c:655
+#, fuzzy
+msgid "Show all hidden"
+msgstr "Rodyti"
+
+#: mail/folder-browser.c:657
+#, fuzzy
+msgid "Hide selected"
+msgstr "IПtrintas"
+
+#. could use another mask, but not enough api do to it
+#: mail/folder-browser.c:660
+#, fuzzy
+msgid "Hide read"
+msgstr "SlКpti"
+
+#: mail/folder-browser.c:661
+#, fuzzy
+msgid "Hide deleted"
+msgstr "IПtrintas"
+
+#: mail/folder-browser.c:663 mail/folder-browser.c:790
+#, fuzzy
+msgid "Hide Subject"
+msgstr "Tema"
+
+#: mail/folder-browser.c:665 mail/folder-browser.c:796
+#, fuzzy
+msgid "Hide from Sender"
+msgstr "Filtruoti pagal SiuntКjЮ"
+
+#: mail/folder-browser.c:670 ui/evolution-message-composer.xml.h:15
 #, fuzzy
 msgid "Open"
 msgstr "_Atidaryti"
 
-#: mail/folder-browser.c:466
+#: mail/folder-browser.c:672
 #, fuzzy
 msgid "Save As..."
 msgstr "IПsaugoti _kaip..."
 
-#: mail/folder-browser.c:467 mail/mail-view.c:163
-#: po/tmp/evolution-addressbook.xml.h:13 po/tmp/evolution-calendar.xml.h:23
-#: po/tmp/evolution-mail.xml.h:28
+#: 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 "Spausdinti"
 
-#: mail/folder-browser.c:469
+#: mail/folder-browser.c:675
 msgid "Reply to Sender"
 msgstr "Atsakyti siuntКjui"
 
-#: mail/folder-browser.c:470 mail/mail-view.c:156
-#: po/tmp/evolution-mail.xml.h:34
+#: mail/folder-browser.c:676 mail/mail-view.c:141 ui/evolution-mail.xml.h:38
 msgid "Reply to All"
 msgstr "Ats. visiems"
 
-#: mail/folder-browser.c:471 mail/mail-view.c:159
-#: 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 "PersiЬsti"
 
-#: mail/folder-browser.c:472 po/tmp/evolution-mail.xml.h:18
+#: mail/folder-browser.c:678 ui/evolution-mail.xml.h:18
 #, fuzzy
 msgid "Forward inline"
 msgstr "Eiti А ateities laikЮ"
 
-#: mail/folder-browser.c:474
+#: mail/folder-browser.c:680
 #, fuzzy
 msgid "Mark as Read"
 msgstr "PaЧymКti s_kaitytu"
 
-#: mail/folder-browser.c:475
+#: mail/folder-browser.c:681
 #, fuzzy
 msgid "Mark as Unread"
 msgstr "PaЧymКti _neskaityta"
 
-#: mail/folder-browser.c:477
+#: mail/folder-browser.c:683
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "Perkelti А aplankЮ"
 
-#: mail/folder-browser.c:478
+#: mail/folder-browser.c:684
 #, fuzzy
 msgid "Copy to Folder..."
 msgstr "Kopijuoti А aplankЮ"
 
-#: mail/folder-browser.c:480
+#: mail/folder-browser.c:686
 #, fuzzy
 msgid "Undelete"
 msgstr "IПtrinti"
 
 #. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
 #. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:484
+#: mail/folder-browser.c:690
 #, fuzzy
 msgid "Apply Filters"
 msgstr "_Pritaikyti filtrus"
 
-#: mail/folder-browser.c:486 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:546
+#: mail/folder-browser.c:693 ui/evolution-mail.xml.h:21
+#, fuzzy
+msgid "Hide Messages"
+msgstr "Taisyti laiПkЮ"
+
+#: mail/folder-browser.c:781
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtruoti pagal KonferencijЮ (%s)"
 
+#: mail/folder-browser.c:787
+#, fuzzy, c-format
+msgid "Hide Subject \"%s\""
+msgstr "Tema"
+
+#: 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 "NegalКjau paleisti wombat"
+
+#: mail/local-config.glade.h:7
+#, fuzzy
+msgid "Mailbox Format"
+msgstr "PaПto dКЧutКs santrauka"
+
+#: mail/local-config.glade.h:8
+#, fuzzy
+msgid "New store format:"
+msgstr "NaujienЬ Пaltinio tipas:"
+
+#: 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
+#, fuzzy
+msgid "mh"
+msgstr "h"
+
 #: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
@@ -4214,7 +4522,7 @@ msgstr "Tu nenustatei paПto siuntimo metodo"
 msgid "You have no Outbox configured"
 msgstr "Tu nesusitvarkei Siuntimo"
 
-#: mail/mail-callbacks.c:246
+#: mail/mail-callbacks.c:244
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -4222,19 +4530,24 @@ msgstr ""
 "пis laiПkas neturi temos.\n"
 "Tikrai siЬsti?"
 
-#: mail/mail-callbacks.c:291
+#: mail/mail-callbacks.c:312
 msgid "You must specify recipients in order to send this message."
 msgstr "Tu turi nurodyti gavКjus, kad galКtum iПsiЬsti laiПkЮ."
 
-#: mail/mail-callbacks.c:552
+#: mail/mail-callbacks.c:530
+#, fuzzy
+msgid "Forwarded message:\n"
+msgstr "PersiЬstas laiПkas -- %s"
+
+#: mail/mail-callbacks.c:611
 msgid "Move message(s) to"
 msgstr "Perkelti laiПkЮ(us) А"
 
-#: mail/mail-callbacks.c:554
+#: mail/mail-callbacks.c:613
 msgid "Copy message(s) to"
 msgstr "Kopijuoti laiПkЮ(us) А"
 
-#: mail/mail-callbacks.c:665
+#: mail/mail-callbacks.c:748
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4242,11 +4555,11 @@ msgstr ""
 "Tu gali taisyti tik laiПkus, esanХius \n"
 "JuodraПХiЬ aplanke."
 
-#: mail/mail-callbacks.c:699 mail/mail-display.c:72
+#: mail/mail-callbacks.c:781 mail/mail-display.c:79
 msgid "Overwrite file?"
 msgstr "UЧraПyti bylЮ?"
 
-#: mail/mail-callbacks.c:703 mail/mail-display.c:76
+#: mail/mail-callbacks.c:785 mail/mail-display.c:83
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -4254,17 +4567,17 @@ msgstr ""
 "Byla tokiu vardu jau yra.\n"
 "UЧraПyti jЮ?"
 
-#: mail/mail-callbacks.c:748
+#: mail/mail-callbacks.c:830
 #, fuzzy
 msgid "Save Message As..."
 msgstr "IПsaugoti kaip..."
 
-#: mail/mail-callbacks.c:750
+#: mail/mail-callbacks.c:832
 #, fuzzy
 msgid "Save Messages As..."
 msgstr "IПsaugoti kaip..."
 
-#: mail/mail-callbacks.c:877
+#: mail/mail-callbacks.c:916
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4273,45 +4586,275 @@ msgstr ""
 "Klaida, Аkeliant filtro informacijЮ:\n"
 "%s"
 
-#: mail/mail-callbacks.c:922
+#: mail/mail-callbacks.c:961
 msgid "Print Message"
 msgstr "Spausdinti laiПkЮ"
 
-#: mail/mail-callbacks.c:969
+#: mail/mail-callbacks.c:1008
 msgid "Printing of message failed"
 msgstr "Nepavyko atspausdinti laiПko"
 
 #.
-#. * 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 "NКra informacijos"
+
+#: mail/mail-config-druid.glade.h:8
+msgid "Account Management"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:9
+#, fuzzy
+msgid "Account Properties"
+msgstr "Priedo savybКs"
+
+#: mail/mail-config-druid.glade.h:11
+msgid "Advanced"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:12
+#, fuzzy
+msgid "Authentication"
+msgstr "Autentikacija:"
+
+#: mail/mail-config-druid.glade.h:13
+#, fuzzy
+msgid "Authentication Type:"
+msgstr "Autentikacija:"
+
+#: 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 "аprasta"
+
+#: mail/mail-config-druid.glade.h:26
+#, fuzzy
+msgid "Delete mail from server"
+msgstr "NeiПtrinti laiПkЬ iП serverio"
+
+#: mail/mail-config-druid.glade.h:27
+#, fuzzy
+msgid "Done"
+msgstr "Jokios"
+
+#: mail/mail-config-druid.glade.h:28
+#, fuzzy
+msgid "E-Mail Address:"
+msgstr "El. paПto adresas:"
+
+#: mail/mail-config-druid.glade.h:30
+#, fuzzy
+msgid "Email Address:"
+msgstr "El. paПto adresas:"
+
+#: mail/mail-config-druid.glade.h:31
+#, fuzzy
+msgid "Evolution Mail Configuration"
+msgstr "PaПto Nustatymas"
+
+#: mail/mail-config-druid.glade.h:32
+#, fuzzy
+msgid "Full Name:"
+msgstr "Pilnas vardas:"
+
+#: mail/mail-config-druid.glade.h:35
+#, fuzzy
+msgid "Hostname:"
+msgstr "Vartotojo vardas:"
+
+#: mail/mail-config-druid.glade.h:36
+#, fuzzy
+msgid "IMAP"
+msgstr "IMAPv4"
+
+#: mail/mail-config-druid.glade.h:37
 msgid "Identity"
 msgstr "AsmenybК"
 
-#: 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 "PaП_tu"
+
+#: mail/mail-config-druid.glade.h:41
+#, fuzzy
+msgid "Mail Account"
+msgstr "turi"
+
+#: mail/mail-config-druid.glade.h:42
 msgid "Mail Configuration"
 msgstr "PaПto Nustatymas"
 
-#: po/tmp/mail-config-druid.glade.h:8
-msgid "Mail Source"
-msgstr "PaПto Пaltinis"
+#: mail/mail-config-druid.glade.h:43
+#, fuzzy
+msgid "Mail Configuration Druid"
+msgstr "PaПto Nustatymas"
 
-#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
-msgid "Mail Transport"
-msgstr "PaПto siuntimas"
+#: 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 "Naujas"
+
+#: mail/mail-config-druid.glade.h:48
+#, fuzzy
+msgid "Optional"
+msgstr "Parinktys"
+
+#: mail/mail-config-druid.glade.h:49 mail/mail-config-gui.c:485
+msgid "Organization:"
+msgstr "Organizacija:"
+
+#: mail/mail-config-druid.glade.h:50
+msgid "Outgoing Mail Server"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:51
+#, fuzzy
+msgid "Password:"
+msgstr "SlaptaЧodis"
 
-#: po/tmp/mail-config-druid.glade.h:10
-msgid "Welcome to the Evolution Mail configuration wizard!\n"
+#: mail/mail-config-druid.glade.h:53
+msgid "Plain Text"
 msgstr ""
 
-#: po/tmp/mail-config-druid.glade.h:14
+#: mail/mail-config-druid.glade.h:54
+msgid "Receiving Email"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:55
+msgid "Remember my password"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:56 mail/mail-format.c:628
+msgid "Reply-To:"
+msgstr "Atsakyti-kam:"
+
+#: mail/mail-config-druid.glade.h:57
+#, fuzzy
+msgid "Reply-to:"
+msgstr "Atsakyti-kam:"
+
+#: mail/mail-config-druid.glade.h:58
+#, fuzzy
+msgid "Required"
+msgstr "_Reikalingi ЧmonКs"
+
+#: mail/mail-config-druid.glade.h:60
+#, fuzzy
+msgid "Save password"
+msgstr "IПsaugoti kaip VCard"
+
+#: mail/mail-config-druid.glade.h:61
+#, fuzzy
+msgid "Select signature file"
+msgstr "ParaПo byla:"
+
+#: 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 "PaПto Nustatymas"
+
+#: mail/mail-config-druid.glade.h:65
+msgid "Server Timeouts"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:66
+#, fuzzy
+msgid "Server Type: "
+msgstr "Serveris:"
+
+#: mail/mail-config-druid.glade.h:67
+msgid "Server requires authentication"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:68
+#, fuzzy
+msgid "Servers"
+msgstr "Serveris:"
+
+#: mail/mail-config-druid.glade.h:69 mail/mail-config-gui.c:496
+msgid "Signature file:"
+msgstr "ParaПo byla:"
+
+#: mail/mail-config-druid.glade.h:70
+#, fuzzy
+msgid "Signature:"
+msgstr "ParaПo byla:"
+
+#: mail/mail-config-druid.glade.h:71 mail/mail-config.glade.h:20
+msgid "Sources"
+msgstr "пaltiniai"
+
+#: 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 "Tipas:"
+
+#: 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 "NКra informacijos"
+
+#: mail/mail-config-druid.glade.h:77 mail/mail-config-gui.c:928
+msgid "Username:"
+msgstr "Vartotojo vardas:"
+
+#: mail/mail-config-druid.glade.h:78
+msgid "Welcome to the Evolution Mail Configuration Druid.\n"
 msgstr ""
-"Tavo paПto nustatymas uЧbaigtas. Spausk \n"
-"╔Baigti╢, kad iПsaugotum naujas nuostatas"
+
+#: mail/mail-config-druid.glade.h:81
+#, fuzzy
+msgid "minute(s)"
+msgstr "minuХiЬ"
 
 #: mail/mail-config-gui.c:433
 msgid ""
@@ -4331,15 +4874,7 @@ msgstr "Pilnas vardas:"
 msgid "Email address:"
 msgstr "El. paПto adresas:"
 
-#: mail/mail-config-gui.c:485
-msgid "Organization:"
-msgstr "Organizacija:"
-
-#: mail/mail-config-gui.c:496
-msgid "Signature file:"
-msgstr "ParaПo byla:"
-
-#: 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 "ParaПo byla"
 
@@ -4347,26 +4882,10 @@ msgstr "ParaПo byla"
 msgid "Server:"
 msgstr "Serveris:"
 
-#: mail/mail-config-gui.c:928
-msgid "Username:"
-msgstr "Vartotojo vardas:"
-
-#: mail/mail-config-gui.c:934
-msgid "Path:"
-msgstr "Kelias:"
-
-#: mail/mail-config-gui.c:943
-msgid "Authentication:"
-msgstr "Autentikacija:"
-
 #: mail/mail-config-gui.c:956
 msgid "Detect supported types..."
 msgstr "AtpaЧinti palaikomus tipus..."
 
-#: 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 "NeiПtrinti laiПkЬ iП serverio"
@@ -4379,7 +4898,7 @@ msgstr "Testuoti nuostatas"
 msgid "Mail source type:"
 msgstr "PaПto Пaltinio tipas:"
 
-#: 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"
@@ -4415,6 +4934,20 @@ msgstr ""
 msgid "Mail transport type:"
 msgstr "PaПto siuntimo tipas:"
 
+#: mail/mail-config-gui.c:1183
+#, fuzzy
+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 ""
+"Pasirink rШПА paПto serverio, kurА naudoji, ir Аvesk svarbiЮ informacijЮ "
+"apie jА.\n"
+"\n"
+"Jei serveris reikalauja tapatybКs patvirtinimo, gali paspausti ╔AtpaЧinti "
+"palaikomus tipus...╢ mygtukЮ, kai Аvesi informacijЮ."
+
 #: mail/mail-config-gui.c:1233
 msgid "Add Identity"
 msgstr "PridКti asmenybФ"
@@ -4463,60 +4996,68 @@ msgstr "UЧklausiamos ╔%s╢ autorizacijos galimybКs."
 msgid "Query authorization at \"%s\""
 msgstr "UЧklausti autorizacijos pas ╔%s╢"
 
-#: po/tmp/mail-config.glade.h:7
+#: mail/mail-config.glade.h:7
 msgid "Address"
 msgstr "Adresas"
 
-#: po/tmp/mail-config.glade.h:10
+#: mail/mail-config.glade.h:10
 msgid "Identities"
 msgstr "AsmenybКs"
 
-#: po/tmp/mail-config.glade.h:11
+#: mail/mail-config.glade.h:11
 msgid "Mail Sources"
 msgstr "PaПto Пaltiniai"
 
-#: po/tmp/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
+msgid "Mail Transport"
+msgstr "PaПto siuntimas"
+
+#: mail/mail-config.glade.h:13
 msgid "Mark message as seen [ms]: "
 msgstr "PaЧymКti laiПkЮ skaitytu [ms]:"
 
-#: po/tmp/mail-config.glade.h:14
+#: mail/mail-config.glade.h:14
 msgid "News Servers"
 msgstr "NaujienЬ serveriai"
 
-#: po/tmp/mail-config.glade.h:15
+#: mail/mail-config.glade.h:15
 msgid "News Sources"
 msgstr "NaujienЬ Пaltiniai"
 
-#: po/tmp/mail-config.glade.h:16
+#: mail/mail-config.glade.h:16
 msgid "Organization"
 msgstr "Organizacija"
 
-#: po/tmp/mail-config.glade.h:18
+#: mail/mail-config.glade.h:18
 msgid "Send messages in HTML format"
 msgstr "SiЬsti laiПkus HTML formatu"
 
-#: po/tmp/mail-config.glade.h:20
-msgid "Sources"
-msgstr "пaltiniai"
-
-#: mail/mail-crypto.c:350 mail/mail-crypto.c:452 mail/mail-crypto.c:629
+#: 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."
 msgstr ""
 
-#: mail/mail-crypto.c:354 mail/mail-crypto.c:456 mail/mail-crypto.c:634
+#: mail/mail-crypto.c:357 mail/mail-crypto.c:462 mail/mail-crypto.c:640
+#: mail/mail-crypto.c:785
 msgid "No password provided."
 msgstr "Nepateiktas saptaЧodis."
 
-#: mail/mail-crypto.c:360 mail/mail-crypto.c:463 mail/mail-crypto.c:640
+#: mail/mail-crypto.c:363 mail/mail-crypto.c:469 mail/mail-crypto.c:646
+#: mail/mail-crypto.c:792 mail/mail-crypto.c:942
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: mail/mail-crypto.c:625
+#: mail/mail-crypto.c:631 mail/mail-crypto.c:777 mail/mail-crypto.c:936
 msgid "No GPG/PGP program available."
 msgstr "NКra jokios PGP/GPG programos."
 
-#: mail/mail-display.c:90
+#: mail/mail-crypto.c:953
+#, fuzzy, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "NegalКjau sukurti pipe: %s"
+
+#: mail/mail-display.c:98
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -4525,127 +5066,128 @@ msgstr ""
 "NegalКjau atidaryti bylos %s: \n"
 "%s"
 
-#: mail/mail-display.c:113
+#: mail/mail-display.c:131
 #, c-format
 msgid "Could not write data: %s"
 msgstr "NegalКjau АraПyti duomenЬ: %s"
 
-#: mail/mail-display.c:218
+#: mail/mail-display.c:229
 msgid "Save Attachment"
 msgstr "IПsaugoti priedЮ"
 
-#: mail/mail-display.c:258
+#: mail/mail-display.c:269
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "NegalКjau sukurti laikino katalogo: %s"
 
-#: mail/mail-display.c:300
+#: mail/mail-display.c:311
 msgid "Save to Disk..."
 msgstr "IПsaugoti А diskЮ..."
 
-#: mail/mail-display.c:302
+#: mail/mail-display.c:313
 #, c-format
 msgid "Open in %s..."
 msgstr "Atidaryti su %s..."
 
-#: mail/mail-display.c:304
+#: mail/mail-display.c:315
 msgid "View Inline"
 msgstr "чiШrКti viduje"
 
-#: mail/mail-display.c:328
+#: mail/mail-display.c:339
 msgid "External Viewer"
 msgstr "IПorinК ЧiШrКklК"
 
-#: mail/mail-display.c:351
+#: mail/mail-display.c:362
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "чiШrКti viduje (per %s)"
 
-#: mail/mail-display.c:355
+#: mail/mail-display.c:366
 msgid "Hide"
 msgstr "SlКpti"
 
-#: mail/mail-format.c:500
+#: mail/mail-format.c:503
 #, c-format
 msgid "%s attachment"
 msgstr "%s priedas"
 
-#: mail/mail-format.c:623
-msgid "Reply-To:"
-msgstr "Atsakyti-kam:"
-
-#: mail/mail-format.c:845
+#: mail/mail-format.c:851
 msgid "No GPG/PGP support available in this copy of Evolution."
 msgstr ""
 
-#: mail/mail-format.c:857
+#: mail/mail-format.c:863
 msgid "Encrypted message not displayed"
 msgstr "UЧПifruotas laiПkas neparodytas"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:869
 msgid "Encrypted message"
 msgstr "UЧПifruotas laiПkas"
 
-#: mail/mail-format.c:864
+#: mail/mail-format.c:870
 msgid "Click icon to decrypt."
 msgstr "Paspausk ant ikonos, kad iППifruotum."
 
-#: mail/mail-format.c:1470
+#: mail/mail-format.c:1450
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "RodyklК А FTP saitЮ (%s)"
 
-#: mail/mail-format.c:1482
+#: mail/mail-format.c:1462
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "RodyklК А vietinФ bylЮ (%s), galiojanti saite ╔%s╢"
 
-#: mail/mail-format.c:1486
+#: mail/mail-format.c:1466
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "RodyklК А vietinФ bylЮ (%s)"
 
-#: mail/mail-format.c:1520
+#: mail/mail-format.c:1500
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "RodyklК А neЧinomus iПorinius duomenis (╔%s╢ tipo)"
 
-#: mail/mail-format.c:1525
+#: mail/mail-format.c:1505
 msgid "Malformed external-body part."
 msgstr "Blogai suformuota iПorinio kШno dalis."
 
-#: mail/mail-format.c:1695
+#: mail/mail-format.c:1675
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr ""
 
-#: mail/mail-local.c:202
+#: mail/mail-local.c:204
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "KeiХiamas aplanko ╔%s╢ formatas А ╔%s╢"
 
-#: mail/mail-local.c:206
+#: mail/mail-local.c:208
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Pakeisti aplanko ╔%s╢ formatЮ А ╔%s╢"
 
-#: mail/mail-local.c:261
+#: mail/mail-local.c:251
+#, fuzzy
+msgid "Reconfiguring folder"
+msgstr "_Tvarkyti aplankЮ"
+
+#: mail/mail-local.c:269
 msgid "Closing current folder"
 msgstr "UЧdaromas esamas aplankas"
 
-#: mail/mail-local.c:293
+#: mail/mail-local.c:295
 msgid "Renaming old folder and opening"
 msgstr "Pervadinamas senas aplankas ir atidaromas"
 
-#: mail/mail-local.c:314
+#: mail/mail-local.c:313
 msgid "Creating new folder"
 msgstr "Kuriamas naujas aplankas"
 
-#: mail/mail-local.c:329
+#: mail/mail-local.c:327
 msgid "Copying messages"
 msgstr "Kopijuojami laiПkai"
 
-#: mail/mail-local.c:341
+#: mail/mail-local.c:348
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -4654,7 +5196,7 @@ msgstr ""
 "Negaliu iПsaugoti metainfo. Tikriausiai tau daugiau\n"
 "nebepavyks atidaryti Пio aplanko: %s"
 
-#: mail/mail-local.c:372
+#: mail/mail-local.c:379
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -4662,306 +5204,216 @@ msgstr ""
 "Jei tu nebegali daugiau atidaryti Пios paПto\n"
 "dКЧutКs, tau teks sutaisyti jЮ rankutКmis."
 
-#: mail/mail-local.c:781
+#: mail/mail-local.c:787
 #, fuzzy
 msgid "Registering local folder"
 msgstr "Kuriamas naujas aplankas"
 
-#: mail/mail-local.c:783
+#: mail/mail-local.c:789
 #, fuzzy
 msgid "Register local folder"
 msgstr "Sukurti naujЮ aplankЮ"
 
-#: mail/mail-ops.c:79
+#: mail/mail-local.c:894
+#, fuzzy, c-format
+msgid ""
+"Unable to register folder '%s':\n"
+"%s"
+msgstr "Negaliu iПsaugoti grupЬ sЮraПo bylos dКl %s: %s"
+
+#: mail/mail-mt.c:85
+#, fuzzy, c-format
+msgid ""
+"Error while '%s':\n"
+"%s"
+msgstr ""
+"Klaida ╔%s╢ metu:\n"
+"%s."
+
+#: mail/mail-mt.c:87
+#, fuzzy, c-format
+msgid ""
+"Error while performing operation:\n"
+"%s"
+msgstr ""
+"Klaida pasiruoПiant %s:\n"
+"%s"
+
+#: mail/mail-mt.c:356 mail/mail-mt.c:385
+#, fuzzy
+msgid "Working"
+msgstr "Perkeliu"
+
+#: mail/mail-ops.c:88
 #, c-format
 msgid "Fetching email from %s"
 msgstr "ParsiunХiu paПtЮ iП %s"
 
-#: mail/mail-ops.c:81
+#: mail/mail-ops.c:90
 #, c-format
 msgid "Fetch email from %s"
 msgstr "ParsiЬsti paПtЮ iП %s"
 
-#: mail/mail-ops.c:331
+#: mail/mail-ops.c:335
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "NКra naujЬ laiПkЬ serveryje %s."
 
-#: mail/mail-ops.c:401
+#: mail/mail-ops.c:405
 msgid "Filtering email on demand"
 msgstr "Filtruoju el. paПtЮ pagal praПymЮ"
 
-#: mail/mail-ops.c:403
+#: mail/mail-ops.c:407
 msgid "Filter email on demand"
 msgstr "Filtruoti el. paПtЮ pagal praПymЮ"
 
-#: mail/mail-ops.c:538
+#: mail/mail-ops.c:551
 #, c-format
 msgid "Sending \"%s\""
 msgstr "SiunХiu ╔%s╢"
 
-#: mail/mail-ops.c:543
-msgid "Sending a message without a subject"
-msgstr "SiunХiu laiПkЮ be temos"
-
-#: mail/mail-ops.c:546
-#, c-format
-msgid "Send \"%s\""
-msgstr "SiЬsti ╔%s╢"
-
-#: mail/mail-ops.c:549
-msgid "Send a message without a subject"
-msgstr "SiЬsti laiПkЮ be temos"
+#: mail/mail-ops.c:553
+#, fuzzy
+msgid "Sending message"
+msgstr "IПtrinti ПА laiПkЮ"
 
-#: mail/mail-ops.c:720
+#: mail/mail-ops.c:669
 msgid "Sending queue"
 msgstr "SiunХiu iП eilКs"
 
-#: mail/mail-ops.c:722
+#: mail/mail-ops.c:671
 msgid "Send queue"
 msgstr "SiЬsti iП eilКs"
 
-#: mail/mail-ops.c:858 mail/mail-ops.c:865
+#: mail/mail-ops.c:804 mail/mail-ops.c:811
 #, c-format
 msgid "Appending \"%s\""
 msgstr "Prijungiu ╔%s╢"
 
-#: mail/mail-ops.c:862 mail/mail-ops.c:868
+#: mail/mail-ops.c:808 mail/mail-ops.c:814
 msgid "Appending a message without a subject"
 msgstr "Prijungiu laiПkЮ be temos"
 
-#: mail/mail-ops.c:940
-#, c-format
-msgid "Expunging \"%s\""
-msgstr "IПvaloma ╔%s╢"
-
-#: mail/mail-ops.c:942
-#, c-format
-msgid "Expunge \"%s\""
-msgstr "IПvalyti ╔%s╢"
-
-#: mail/mail-ops.c:1001
+#: mail/mail-ops.c:897
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Perkeliami laiПkai iП ╔%s╢ А ╔%s╢"
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:899
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Kopijuojami laiПkai iП ╔%s╢ А ╔%s╢"
 
-#: mail/mail-ops.c:1006
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Perkelti laiПkus iП ╔%s╢ А ╔%s╢"
 
-#: mail/mail-ops.c:1008
+#: mail/mail-ops.c:904
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Kopijuoti laiПkus iП ╔%s╢ А ╔%s╢"
 
-#: mail/mail-ops.c:1039
+#: mail/mail-ops.c:935
 msgid "Moving"
 msgstr "Perkeliu"
 
-#: mail/mail-ops.c:1042
+#: mail/mail-ops.c:938
 msgid "Copying"
 msgstr "Kopijuoju"
 
-#: mail/mail-ops.c:1062
+#: mail/mail-ops.c:958
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s laiПkЮ %d iП %d (uid ╔%s╢)"
 
-#: mail/mail-ops.c:1141
-#, c-format
-msgid "Marking messages in folder \"%s\""
-msgstr "PaЧymiu laiПkus aplanke ╔%s╢"
-
-#: mail/mail-ops.c:1144
-#, c-format
-msgid "Mark messages in folder \"%s\""
-msgstr "PaЧymКti laiПkus aplanke ╔%s╢"
-
-#: mail/mail-ops.c:1175
-#, c-format
-msgid "Marking message %d of %d"
-msgstr "PaЧymimas laiПkas %d iП %d"
-
-#: mail/mail-ops.c:1295
+#: mail/mail-ops.c:1033
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skaitomas aplankas iП ╔%s╢"
 
-#: mail/mail-ops.c:1297
-#, c-format
-msgid "Scan folders in \"%s\""
-msgstr "Skaityti aplankus iП ╔%s╢"
-
-#: mail/mail-ops.c:1366 mail/subscribe-dialog.c:339
+#: mail/mail-ops.c:1099 mail/subscribe-dialog.c:341
 msgid "(No description)"
 msgstr "(NКra apraПymo)"
 
-#: mail/mail-ops.c:1432
-#, c-format
-msgid "Attaching messages from folder \"%s\""
-msgstr "Prisegami laiПkai iП aplanko ╔%s╢"
-
-#: mail/mail-ops.c:1435
-#, c-format
-msgid "Attach messages from \"%s\""
-msgstr "Prisegami laiПkus iП aplanko ╔%s╢"
-
-#: mail/mail-ops.c:1535
-#, c-format
-msgid "Forwarding messages \"%s\""
-msgstr "PersiunХiu laiПkЮ ╔%s╢"
-
-#: mail/mail-ops.c:1539
-msgid "Forwarding a message without a subject"
-msgstr "PersiunХiu laiПkЮ be temos"
-
-#: mail/mail-ops.c:1542
-#, c-format
-msgid "Forward message \"%s\""
-msgstr "PersiЬsti laiПkЮ ╔%s╢"
-
-#: mail/mail-ops.c:1546
-msgid "Forward a message without a subject"
-msgstr "PersiЬsti laiПkЮ be temos"
-
-#: mail/mail-ops.c:1593
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Gaunamasa laiПkas numeris %d iП %d (uid ╔%s╢)"
-
-#: mail/mail-ops.c:1610
-msgid ""
-"Failed to generate mime part from message while generating forwarded message."
-msgstr ""
-"Nepavyko sugeneruoti laiПko mime dalies, generuojant persiunХiamЮ laiПkЮ."
-
-#: mail/mail-ops.c:1665
+#: mail/mail-ops.c:1164
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "PersiЬstas laiПkas -- %s"
 
-#: mail/mail-ops.c:1679
-#, fuzzy
-msgid "Forwarded message:\n"
-msgstr "PersiЬstas laiПkas -- %s"
-
-#: mail/mail-ops.c:1748
-#, c-format
-msgid "Loading \"%s\""
-msgstr "аkeliu ╔%s╢"
-
-#: mail/mail-ops.c:1750
-#, c-format
-msgid "Load \"%s\""
-msgstr "аkelti ╔%s╢"
-
-#: mail/mail-ops.c:1853
-#, c-format
-msgid "Creating \"%s\""
-msgstr "Sukuriu ╔%s╢"
-
-#: mail/mail-ops.c:1855
-#, c-format
-msgid "Create \"%s\""
-msgstr "Sukurti ╔%s╢"
-
-#: mail/mail-ops.c:1903
-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 "Skaitomas aplankas iП ╔%s╢"
 
-#: mail/mail-ops.c:1949
-#, c-format
-msgid "Synchronizing \"%s\""
+#: mail/mail-ops.c:1336
+#, fuzzy
+msgid "Synchronising folder"
 msgstr "Sinchronizuoju ╔%s╢"
 
-#: mail/mail-ops.c:1951
-#, c-format
-msgid "Synchronize \"%s\""
-msgstr "Sinchronizuoti ╔%s╢"
-
-#: mail/mail-ops.c:2015
-#, c-format
-msgid "Displaying message UID \"%s\""
-msgstr "Parodomas laiПkas UID ╔%s╢"
-
-#: mail/mail-ops.c:2018
-msgid "Clearing message display"
-msgstr "IПvalomas laiПkЬ rodinys"
-
-#: mail/mail-ops.c:2021
-#, c-format
-msgid "Display message UID \"%s\""
-msgstr "Parodyti laiПkЮ UID ╔%s╢"
+#: mail/mail-ops.c:1386
+#, fuzzy
+msgid "Expunging folder"
+msgstr "IПvaloma ╔%s╢"
 
-#: mail/mail-ops.c:2024
-msgid "Clear message display"
-msgstr "IПvalyti laiПkЬ rodinА"
+#: mail/mail-ops.c:1434
+#, fuzzy, c-format
+msgid "Retrieving message %s"
+msgstr "Gaunami laiПki: %s"
 
-#: mail/mail-ops.c:2137
-#, c-format
-msgid "Opening messages from folder \"%s\""
-msgstr "Atidaromi laiПkai iП aplanko ╔%s╢"
+#: mail/mail-ops.c:1497
+#, fuzzy
+msgid "Retrieving messages"
+msgstr "Gaunami laiПki: %s"
 
-#: mail/mail-ops.c:2140
+#: mail/mail-ops.c:1507
 #, c-format
-msgid "Open messages from \"%s\""
-msgstr "Atidaryti laiПkus iП ╔%s╢"
+msgid "Retrieving message number %d of %d (uid \"%s\")"
+msgstr "Gaunamasa laiПkas numeris %d iП %d (uid ╔%s╢)"
 
-#: mail/mail-ops.c:2244
-#, c-format
-msgid "Loading %s Folder"
+#: mail/mail-ops.c:1655
+#, fuzzy, c-format
+msgid "Loading %s Folder for %s"
 msgstr "аkeliamas %s aplankas"
 
-#: mail/mail-ops.c:2246
-#, c-format
-msgid "Load %s Folder"
+#: mail/mail-ops.c:1657
+#, fuzzy, c-format
+msgid "Load %s Folder for %s"
 msgstr "аkelti %s aplankЮ"
 
-#: mail/mail-ops.c:2310
-#, c-format
-msgid "Viewing messages from folder \"%s\""
-msgstr "чiШrimi laiПkai iП aplanko ╔%s╢"
-
-#: mail/mail-ops.c:2313
-#, c-format
-msgid "View messages from \"%s\""
-msgstr "чiШrКti laiПkus iП ╔%s╢"
-
-#: mail/mail-ops.c:2339
-#, c-format
-msgid "Retrieving message %d of %d (uid \"%s\")"
-msgstr "Gaunamas laiПkas %d  iП %d (uid ╔%s╢)"
-
-#: mail/mail-ops.c:2428
-#, fuzzy, c-format
-msgid "Saving messages from folder \"%s\""
-msgstr "Prisegami laiПkai iП aplanko ╔%s╢"
+#: mail/mail-ops.c:1823
+#, fuzzy
+msgid "Saving messages"
+msgstr "Kopijuojami laiПkai"
 
-#: mail/mail-ops.c:2431
+#: mail/mail-ops.c:1902
 #, fuzzy, c-format
-msgid "Save messages from folder \"%s\""
-msgstr "Atidaromi laiПkai iП aplanko ╔%s╢"
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
+msgstr "Negaliu iПsaugoti grupЬ sЮraПo bylos dКl %s: %s"
 
-#: mail/mail-ops.c:2474
+#: mail/mail-ops.c:1915
 #, fuzzy, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Gaunamas laiПkas %d  iП %d (uid ╔%s╢)"
 
+#: mail/mail-ops.c:1929
+#, fuzzy, c-format
+msgid ""
+"Error saving messages to: %s:\n"
+" %s"
+msgstr "Klaida iПsaugant bylЮ: %s"
+
 #: mail/mail-search-dialogue.c:104
 msgid "Cancel"
 msgstr "Nutraukti"
 
-#: mail/mail-summary.c:105 mail/mail-threads.c:728
+#: mail/mail-summary.c:110 mail/mail-threads.c:729
 msgid "Incomplete message written on pipe!"
 msgstr "Nepilnas laiПkas suraПytas А pipe!"
 
-#: mail/mail-threads.c:301
+#: mail/mail-threads.c:302
 #, c-format
 msgid ""
 "Error while preparing to %s:\n"
@@ -4970,7 +5422,7 @@ msgstr ""
 "Klaida pasiruoПiant %s:\n"
 "%s"
 
-#: mail/mail-threads.c:675
+#: mail/mail-threads.c:676
 #, c-format
 msgid ""
 "Error while `%s':\n"
@@ -4979,19 +5431,19 @@ msgstr ""
 "Klaida ╔%s╢ metu:\n"
 "%s."
 
-#: mail/mail-threads.c:732
+#: mail/mail-threads.c:733
 msgid "Error reading commands from dispatching thread."
 msgstr ""
 
-#: mail/mail-threads.c:797
+#: mail/mail-threads.c:798
 msgid "Corrupted message from dispatching thread?"
 msgstr ""
 
-#: mail/mail-threads.c:916
+#: mail/mail-threads.c:917
 msgid "Could not create dialog box."
 msgstr "NegalКjau sukurti dialogo lango."
 
-#: mail/mail-threads.c:927
+#: mail/mail-threads.c:928
 msgid "User cancelled query."
 msgstr "Vartotojas nutraukК uЧklausЮ."
 
@@ -5001,12 +5453,12 @@ msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "NegalКjau sukurti laikinos mbox ╔%s╢: %s"
 
 #. Get all uids of source
-#: mail/mail-tools.c:239
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Examining %s"
 msgstr "Egzaminuoju %s"
 
-#: mail/mail-tools.c:269
+#: mail/mail-tools.c:271
 #, c-format
 msgid ""
 "Could not read UID cache file \"%s\". You may receive duplicate messages."
@@ -5014,42 +5466,41 @@ msgstr ""
 "NegalКjau perskaityti UID keПo bylos ╔%s╢. Tu gali gauti pasikartojanХiЬ "
 "laiПkЬ."
 
-#. Info
-#: mail/mail-tools.c:290
+#: mail/mail-tools.c:300
 #, c-format
 msgid "Retrieving message %d of %d"
 msgstr "Gaunamas laiПkas %d  iП %d"
 
 #. Append it to dest
-#: mail/mail-tools.c:303
+#: mail/mail-tools.c:315
 #, c-format
 msgid "Writing message %d of %d"
 msgstr "аraПomas laiПkas %d iП %d"
 
-#: mail/mail-tools.c:332
+#: mail/mail-tools.c:347
 #, c-format
 msgid "Saving changes to %s"
 msgstr "IПsaugomi %s pakeitimai"
 
-#: mail/mail-tools.c:369
+#: mail/mail-tools.c:381
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (persiЬstas laiПkas)"
 
-#: mail/mail-tools.c:379
+#: mail/mail-tools.c:391
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (be temos)"
 
-#: mail/mail-tools.c:418
+#: mail/mail-tools.c:427
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "PersiЬstas laiПkas -- %s"
 
-#: mail/mail-tools.c:420
+#: mail/mail-tools.c:429
 msgid "Forwarded message (no subject)"
 msgstr "PersiЬstas laiПkas (be temos)"
 
-#: mail/mail-tools.c:523
+#: mail/mail-tools.c:530
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
@@ -5058,75 +5509,95 @@ msgstr ""
 "Negaliu atidaryti vietos ╔%s╢: \n"
 "%s"
 
-#: mail/mail-vfolder.c:147
+#: mail/mail-vfolder.c:149
 msgid "VFolders"
 msgstr "vAplankai"
 
-#: mail/mail-vfolder.c:296
+#: mail/mail-vfolder.c:298
 msgid "New VFolder"
 msgstr "Naujas vAplankas"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:33
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:37
 msgid "Reply"
 msgstr "Atsakyti"
 
-#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:38
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
 msgid "Reply to the sender of this message"
 msgstr "Atsakyti Пio laiПko siuntКjui"
 
-#: mail/mail-view.c:156 po/tmp/evolution-mail.xml.h:37
+#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
 msgid "Reply to all recipients of this message"
 msgstr "Atsakyti visiems Пio laiПko gavКjams"
 
-#: mail/mail-view.c:159 po/tmp/evolution-mail.xml.h:19
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:19
 msgid "Forward this message"
 msgstr "PersiЬsti ПА laiПkЮ"
 
-#: mail/mail-view.c:163 po/tmp/evolution-mail.xml.h:32
+#: mail/mail-view.c:148 ui/evolution-mail.xml.h:36
 msgid "Print the selected message"
 msgstr "Spausdinti parinktЮ laiПkЮ"
 
-#: mail/mail-view.c:165 po/tmp/evolution-mail.xml.h:12
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:12
 msgid "Delete this message"
 msgstr "IПtrinti ПА laiПkЮ"
 
-#: mail/message-list.c:572
+#: mail/message-list.c:590
 msgid "Unseen"
 msgstr "Nematytas"
 
-#: mail/message-list.c:575
+#: mail/message-list.c:593
 msgid "Seen"
 msgstr "Matytas"
 
-#: mail/message-list.c:578
+#: mail/message-list.c:596
 msgid "Answered"
 msgstr "Atsakyti"
 
-#: mail/message-list.c:846
+#: mail/message-list.c:881
 #, c-format
 msgid "[ %s ]"
 msgstr ""
 
 #. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:858 mail/message-list.c:873
+#: mail/message-list.c:893 mail/message-list.c:909
 #, c-format
 msgid "%s, et al."
 msgstr ""
 
-#: mail/message-list.c:860 mail/message-list.c:875
+#: mail/message-list.c:896 mail/message-list.c:912
 #, fuzzy
 msgid "<unknown>"
 msgstr "NeЧinomas"
 
-#: mail/message-list.c:2068
-msgid "Rebuilding message view"
-msgstr "Perstatau laiПkЬ vaizdЮ"
+#: mail/message-list.c:965
+msgid "?"
+msgstr ""
+
+#: mail/message-list.c:972
+#, fuzzy
+msgid "Today %l:%M %p"
+msgstr "%I:%M %p"
+
+#: mail/message-list.c:981
+msgid "Yesterday %l:%M %p"
+msgstr ""
+
+#: mail/message-list.c:993
+#, fuzzy
+msgid "%a %l:%M %p"
+msgstr "%I:%M %p"
 
-#: mail/message-list.c:2070
-msgid "Rebuild message view"
-msgstr "Perstatyti laiПkЬ vaizdЮ"
+#: mail/message-list.c:1001
+#, fuzzy
+msgid "%b %d %l:%M %p"
+msgstr "%a %Y-%m-%d %I:%M:%S %p"
+
+#: mail/message-list.c:1003
+#, fuzzy
+msgid "%b %d %Y"
+msgstr "%a %d %Y"
 
 #: mail/subscribe-dialog.c:139
 #, fuzzy
@@ -5143,27 +5614,27 @@ msgstr ""
 msgid "Get store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:282
+#: mail/subscribe-dialog.c:283
 #, fuzzy, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Skaitomas aplankas iП ╔%s╢"
 
-#: mail/subscribe-dialog.c:286
+#: mail/subscribe-dialog.c:287
 #, fuzzy, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Atidaromi laiПkai iП aplanko ╔%s╢"
 
-#: mail/subscribe-dialog.c:290
+#: mail/subscribe-dialog.c:291
 #, fuzzy, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr "Skaityti aplankus iП ╔%s╢"
 
-#: mail/subscribe-dialog.c:293
+#: mail/subscribe-dialog.c:294
 #, fuzzy, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr "Atidaromi laiПkai iП aplanko ╔%s╢"
 
-#: shell/e-setup.c:112 shell/e-setup.c:183
+#: shell/e-setup.c:112 shell/e-setup.c:185
 msgid "Evolution installation"
 msgstr "Evolution Аdiegimas"
 
@@ -5180,23 +5651,23 @@ msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "PraПau, paspausk ╔Gerai╢, kad Аdiegtum bylas, arba ╔AtПaukti╢, kad iПeitum."
 
-#: shell/e-setup.c:155
+#: shell/e-setup.c:157
 msgid "Could not update files correctly"
 msgstr "NegalКjau tvarkingai atnaujinti bylЬ"
 
-#: shell/e-setup.c:158 shell/e-setup.c:224
+#: shell/e-setup.c:160 shell/e-setup.c:228
 msgid "Evolution files successfully installed."
 msgstr "Evolution bylos sКkmingai Аdiegtos."
 
-#: shell/e-setup.c:187
+#: shell/e-setup.c:189
 msgid "This seems to be the first time you run Evolution."
 msgstr "Atrodo, kad tu pirmЮ kartЮ pasileidai Evolution."
 
-#: shell/e-setup.c:188
+#: shell/e-setup.c:190
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr "PraПau paspausti ╔Gerai╢, kad Аdiegtum Evolution vartotojo bylas А"
 
-#: shell/e-setup.c:205
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -5207,7 +5678,7 @@ msgstr ""
 "%s\n"
 "Klaida: %s"
 
-#: shell/e-setup.c:220
+#: shell/e-setup.c:224
 #, c-format
 msgid ""
 "Cannot copy files into\n"
@@ -5216,7 +5687,7 @@ msgstr ""
 "Negaliu kopijuoti bylЬ А\n"
 "╔%s╢."
 
-#: shell/e-setup.c:245
+#: shell/e-setup.c:249
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -5227,7 +5698,7 @@ msgstr ""
 "PraПau, perkelk jА, kad galКХiau Аdiegti\n"
 "Evolution vartotojo bylas."
 
-#: shell/e-setup.c:257
+#: shell/e-setup.c:261
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -5263,7 +5734,7 @@ msgstr ""
 "Pasirinkto aplanko tipas yra netinkamas\n"
 "praПytЮjam veiksmui."
 
-#: shell/e-shell-folder-selection-dialog.c:291
+#: shell/e-shell-folder-selection-dialog.c:297
 msgid "New..."
 msgstr "Naujas..."
 
@@ -5271,23 +5742,19 @@ msgstr "Naujas..."
 msgid "(Untitled)"
 msgstr "(Bevardis)"
 
-#. you might have to call gnome_dialog_run() on the
-#. * dialog returned here, I don't remember...
-#.
-#: shell/e-shell-view-menu.c:114
+#: shell/e-shell-view-menu.c:111
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy nerastas tavo kelyje ($PATH)."
 
-#. same as above
-#: shell/e-shell-view-menu.c:120
+#: shell/e-shell-view-menu.c:117
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy negalКjo bШti paleistas."
 
-#: shell/e-shell-view-menu.c:172
+#: shell/e-shell-view-menu.c:169
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:174
+#: shell/e-shell-view-menu.c:171
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -5297,7 +5764,7 @@ msgstr ""
 "paПtui, kalendoriams ir kontaktЬ tvarkymui\n"
 "GNOME darbo aplinkoje."
 
-#: shell/e-shell-view-menu.c:335
+#: shell/e-shell-view-menu.c:332
 msgid "Go to folder..."
 msgstr "Eiti А aplankЮ..."
 
@@ -5397,9 +5864,8 @@ msgstr "PaПalinti ПiЮ trumpФ iП trumpiЬ juostos"
 msgid "Error saving shortcuts."
 msgstr "Klaida iПsaugant trumpes."
 
-#: po/tmp/evolution-event-editor.xml.h:125
-#: po/tmp/evolution-message-composer.xml.h:43 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 "_Rodinys"
 
@@ -5460,8 +5926,8 @@ msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
-"Over the last month and a half, our focus has been on making\n"
-"Evolution usable. Many of the Evolution developers are now using\n"
+"Over the time since the past release, our focus has been on making\n"
+"Evolution usable.  Many of the Evolution developers are now using\n"
 "Evolution to read their mail full time. You could too. (Just\n"
 "be sure to keep a backup.)\n"
 "\n"
@@ -5498,1138 +5964,1158 @@ msgstr "UЧdraustas"
 msgid "Cannot initialize the Bonobo component system."
 msgstr "NegalКjau inicializuoti Bonobo komponentЬ sistemos."
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-addressbook-ldap.xml.h:6
-msgid "N_ew Directory Server"
-msgstr "N_aujas direktorijos serveris"
-
-#: po/tmp/evolution-addressbook-ldap.xml.h:7
-msgid "_Actions"
-msgstr "_Veiksmai"
-
-#: po/tmp/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:7
 msgid "Create a new contact"
 msgstr "Sukurti naujЮ kontaktЮ"
 
-#: po/tmp/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete a contact"
 msgstr "IПtrinti kontaktЮ"
 
-#: 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 "Rasti"
 
-#: po/tmp/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:11
 msgid "Find a contact"
 msgstr "Rasti kontaktЮ"
 
-#: 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 "Naujas"
 
-#: po/tmp/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:14
 msgid "Print contacts"
 msgstr "Spausdinti kontaktus"
 
-#: po/tmp/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:15
 msgid "Stop"
 msgstr "Stop"
 
-#: po/tmp/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:16
 msgid "Stop Loading"
 msgstr "Sustabdyti АkКlimЮ"
 
-#: po/tmp/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:17
 msgid "View All"
 msgstr "Rodyti visus"
 
-#: po/tmp/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:18
 msgid "View all contacts"
 msgstr "Rodyti visus kontaktus"
 
-#: po/tmp/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "_Addressbook Configuration..."
+msgstr "_PaПto nustatymas...."
+
+#: ui/evolution-addressbook.xml.h:20
 msgid "_Print Contacts..."
 msgstr "S_pausdinti kontaktus..."
 
-#: po/tmp/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:21
 msgid "_Search for contacts"
 msgstr "_IeПkoti kontaktЬ"
 
-#: po/tmp/evolution-addressbook.xml.h:21
-#: po/tmp/evolution-event-editor.xml.h:123
+#: ui/evolution-addressbook.xml.h:22 ui/evolution-event-editor.xml.h:123
 msgid "_Tools"
 msgstr "аran_kiai"
 
 #.
-#. * 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 Dienos"
 
-#: po/tmp/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:7
 msgid "Alter preferences"
 msgstr "Sutvarkyti kalendoriЬ"
 
-#: po/tmp/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:8
 #, fuzzy
 msgid "Ca_lendar"
 msgstr "Kalendorius"
 
-#: po/tmp/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:9
 msgid "Calendar Preferences..."
 msgstr "Kalendoriaus nuostatos..."
 
-#: po/tmp/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:10
 msgid "Create a new appointment"
 msgstr "Sukurti naujЮ АvykА"
 
-#: po/tmp/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:11
 msgid "Create a new calendar"
 msgstr "Sukurti naujЮ kalendoriЬ"
 
-#: po/tmp/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:12
 msgid "Day"
 msgstr "Diena"
 
-#: po/tmp/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:13
 msgid "Go back in time"
 msgstr "Eiti А ankstesnА laikЮ"
 
-#: po/tmp/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:14
 msgid "Go forward in time"
 msgstr "Eiti А ateities laikЮ"
 
-#: po/tmp/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to"
 msgstr "пokti"
 
-#: po/tmp/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to a specific date"
 msgstr "пokti А nurodytЮ datЮ"
 
-#: po/tmp/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:17
 msgid "Go to present time"
 msgstr "Eiti А dabartinА laikЮ"
 
-#: po/tmp/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "MКnesis"
 
-#: 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 "Pirmyn"
 
-#: po/tmp/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:21
 msgid "Open a calendar"
 msgstr "Atidaryti kalendoriЬ"
 
-#: po/tmp/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:22
 msgid "Prev"
 msgstr "Atgal"
 
-#: po/tmp/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:24
 msgid "Print this calendar"
 msgstr "Spausdinti ПА kalendoriЬ"
 
-#: po/tmp/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:25
 #, fuzzy
 msgid "Save calendar as something else"
 msgstr "_IПsaugoti kalendoriЬ kaip kaЧkЮ kitЮ"
 
-#: po/tmp/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 day"
 msgstr "Rodyti 1 dienЮ"
 
-#: po/tmp/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:27
 msgid "Show 1 month"
 msgstr "Rodyti 1 mКnesА"
 
-#: po/tmp/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:28
 msgid "Show 1 week"
 msgstr "Rodyti 1 savaitФ"
 
-#: po/tmp/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr "Rodyti darbo savaitФ"
 
-#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:414
+#: ui/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:413
 msgid "Today"
 msgstr "Dabar"
 
-#: po/tmp/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:31
 msgid "Week"
 msgstr "SavaitК"
 
-#: 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 "_Naujas"
 
-#: po/tmp/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:33
 msgid "_Open Calendar"
 msgstr "_Atidaryti kalendoriЬ"
 
-#: po/tmp/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:34
 msgid "_Print this calendar"
 msgstr "S_pausdinti ПА kalendoriЬ"
 
-#: po/tmp/evolution-calendar.xml.h:35
-msgid "_Save Calendar As"
-msgstr "_IПsaugoti kalendoriЬ kaip"
+#: ui/evolution-calendar.xml.h:35
+#, fuzzy
+msgid "_Save As..."
+msgstr "IПsaugoti _kaip..."
 
-#: po/tmp/evolution-contact-editor.xml.h:7
+#: ui/evolution-contact-editor.xml.h:7
 msgid "Delete this item"
 msgstr "IПtrinti ПА daiktЮ"
 
-#: po/tmp/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:8
 #, fuzzy
 msgid "Delete..."
 msgstr "IПtrinti"
 
-#: po/tmp/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-editor.xml.h:9
 #, fuzzy
 msgid "Help"
 msgstr "_Pagalba"
 
-#: po/tmp/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:10
 #, fuzzy
 msgid "Print En_velope..."
 msgstr "Spausdinimo _nuostatos...."
 
-#: 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 "Spausdinti ПА daiktЮ"
 
-#: 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 "Spausdinti..."
 
-#: po/tmp/evolution-contact-editor.xml.h:13
-#: po/tmp/evolution-event-editor.xml.h:89
-#: po/tmp/evolution-message-composer.xml.h:18
+#: 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 "IПsaugoti _kaip..."
 
-#: 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 "IПsaugoti ir uЧdaryti"
 
-#: 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 "IПsaugoti kontaktЮ ir uЧdaryti dialogo langЮ"
 
-#: 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 "Rodyti ЧinynЮ"
 
-#: po/tmp/evolution-contact-editor.xml.h:18
+#: ui/evolution-contact-editor.xml.h:18
 #, fuzzy
 msgid "Send _message to contact..."
 msgstr "SiЬsti laiПkЮ be temos"
 
-#: po/tmp/evolution-contact-editor.xml.h:19
-#: po/tmp/evolution-event-editor.xml.h:110
-#: po/tmp/evolution-message-composer.xml.h:38
-#: 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 "_Byla"
 
-#: po/tmp/evolution-contact-editor.xml.h:20
+#: ui/evolution-contact-editor.xml.h:20
 #, fuzzy
 msgid "_Print..."
 msgstr "Spausdinti..."
 
-#: po/tmp/evolution-contact-editor.xml.h:21
-#: po/tmp/evolution-event-editor.xml.h:121
-#: po/tmp/evolution-message-composer.xml.h:42
+#: ui/evolution-contact-editor.xml.h:21 ui/evolution-event-editor.xml.h:121
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Save"
 msgstr "IП_saugoti"
 
 #.
-#. * 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 "Apie ПiЮ aplikacijЮ"
 
-#: po/tmp/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:7
 msgid "About..."
 msgstr "Apie..."
 
-#: po/tmp/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:8
 msgid "Actio_ns"
 msgstr "_Veiksmai"
 
-#: po/tmp/evolution-event-editor.xml.h:9
+#: ui/evolution-event-editor.xml.h:9
 msgid "C_lear"
 msgstr "IПva_lyti"
 
-#: po/tmp/evolution-event-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:10
 msgid "C_ut"
 msgstr "_IПkirpti"
 
-#: po/tmp/evolution-event-editor.xml.h:11
+#: ui/evolution-event-editor.xml.h:11
 msgid "Clear"
 msgstr "IПvalyti"
 
-#: po/tmp/evolution-event-editor.xml.h:12
+#: ui/evolution-event-editor.xml.h:12
 msgid "Clear the selection"
 msgstr "IПvalyti paЧymКjimЮ"
 
-#: po/tmp/evolution-event-editor.xml.h:14
+#: ui/evolution-event-editor.xml.h:14
 msgid "Close this appointment"
 msgstr "UЧdaryti ПА АvykА"
 
-#: 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 "Kopijuoti"
 
-#: po/tmp/evolution-event-editor.xml.h:16
+#: ui/evolution-event-editor.xml.h:16
 msgid "Copy the selection"
 msgstr "Kopijuoti paЧymКjimЮ"
 
-#: po/tmp/evolution-event-editor.xml.h:17
+#: ui/evolution-event-editor.xml.h:17
 msgid "Cut"
 msgstr "IПkirpti"
 
-#: po/tmp/evolution-event-editor.xml.h:18
+#: ui/evolution-event-editor.xml.h:18
 msgid "Cut the selection"
 msgstr "IПkirpti paЧymКjimЮ"
 
-#: 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 "_AdresЬ knygelК..."
 
-#: po/tmp/evolution-event-editor.xml.h:24
+#: ui/evolution-event-editor.xml.h:24
 msgid "FIXME: Ch_oose Form..."
 msgstr "Pasirinkti _formЮ..."
 
-#: po/tmp/evolution-event-editor.xml.h:25
+#: ui/evolution-event-editor.xml.h:25
 msgid "FIXME: Chec_k Names"
 msgstr "_Tikrinti vardus"
 
-#: po/tmp/evolution-event-editor.xml.h:26
+#: ui/evolution-event-editor.xml.h:26
 msgid "FIXME: Cop_y to Folder..."
 msgstr "Kopi_juoti А aplankЮ"
 
-#: 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 "ApibrКЧti spausdinimo s_tilius"
 
-#: 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 "_Pirmas daiktas aplanke"
 
-#: po/tmp/evolution-event-editor.xml.h:31
+#: ui/evolution-event-editor.xml.h:31
 msgid "FIXME: For_ward"
 msgstr "Per_siЬsti"
 
-#: po/tmp/evolution-event-editor.xml.h:32
+#: ui/evolution-event-editor.xml.h:32
 msgid "FIXME: Forward as v_Calendar"
 msgstr "PersiЬsti kaip v_Calendar"
 
-#: po/tmp/evolution-event-editor.xml.h:33
+#: ui/evolution-event-editor.xml.h:33
 msgid "FIXME: Help"
 msgstr "Pagalba"
 
-#: po/tmp/evolution-event-editor.xml.h:34
+#: ui/evolution-event-editor.xml.h:34
 msgid "FIXME: In_complete Task"
 msgstr "Ne_baigta uЧduotis"
 
-#: po/tmp/evolution-event-editor.xml.h:35
+#: ui/evolution-event-editor.xml.h:35
 msgid "FIXME: Insert File"
 msgstr "аterpti bylЮ"
 
-#: po/tmp/evolution-event-editor.xml.h:36
+#: ui/evolution-event-editor.xml.h:36
 msgid "FIXME: It_em..."
 msgstr "_DaiktЮ..."
 
-#: 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 "Spaudinio perЧi_Шra"
 
-#: po/tmp/evolution-event-editor.xml.h:39
+#: ui/evolution-event-editor.xml.h:39
 msgid "FIXME: Pu_blish Form As..."
 msgstr "S_kelbti formЮ kaip..."
 
-#: po/tmp/evolution-event-editor.xml.h:40
+#: ui/evolution-event-editor.xml.h:40
 msgid "FIXME: Publish _Form..."
 msgstr "_Skelbti formЮ..."
 
-#: po/tmp/evolution-event-editor.xml.h:41
+#: ui/evolution-event-editor.xml.h:41
 msgid "FIXME: Rec_urrence..."
 msgstr "Pasi_kartojimas"
 
-#: po/tmp/evolution-event-editor.xml.h:42
+#: ui/evolution-event-editor.xml.h:42
 msgid "FIXME: S_end"
 msgstr "SiЬs_ti"
 
-#: po/tmp/evolution-event-editor.xml.h:43
+#: ui/evolution-event-editor.xml.h:43
 msgid "FIXME: Save Attac_hments..."
 msgstr "_IПsaugoti priedus..."
 
-#: 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 "UЧduoties _praПymas"
 
-#: po/tmp/evolution-event-editor.xml.h:46
+#: ui/evolution-event-editor.xml.h:46
 msgid "FIXME: _Contact"
 msgstr "_Kontaktas"
 
-#: po/tmp/evolution-event-editor.xml.h:47
+#: ui/evolution-event-editor.xml.h:47
 msgid "FIXME: _Customize..."
 msgstr "_Prisitaikyti..."
 
-#: po/tmp/evolution-event-editor.xml.h:48
+#: ui/evolution-event-editor.xml.h:48
 msgid "FIXME: _File..."
 msgstr "_BylЮ..."
 
-#: po/tmp/evolution-event-editor.xml.h:49
+#: ui/evolution-event-editor.xml.h:49
 msgid "FIXME: _Font..."
 msgstr "_пriftas..."
 
-#: po/tmp/evolution-event-editor.xml.h:50
+#: ui/evolution-event-editor.xml.h:50
 msgid "FIXME: _Formatting"
 msgstr "_Formatavimo"
 
-#: po/tmp/evolution-event-editor.xml.h:51
+#: ui/evolution-event-editor.xml.h:51
 msgid "FIXME: _Item"
 msgstr "_Daiktas"
 
-#: po/tmp/evolution-event-editor.xml.h:52
+#: ui/evolution-event-editor.xml.h:52
 msgid "FIXME: _Journal Entry"
 msgstr "_чurnalo АraПas"
 
-#: po/tmp/evolution-event-editor.xml.h:53
+#: ui/evolution-event-editor.xml.h:53
 msgid "FIXME: _Last Item in Folder"
 msgstr "P_askutinis daiktas aplanke"
 
-#: po/tmp/evolution-event-editor.xml.h:54
+#: ui/evolution-event-editor.xml.h:54
 msgid "FIXME: _Mail Message"
 msgstr "_SiЬsti laiПkЮ"
 
-#: po/tmp/evolution-event-editor.xml.h:55
+#: ui/evolution-event-editor.xml.h:55
 msgid "FIXME: _Memo Style"
 msgstr "_Memo stilius"
 
-#: po/tmp/evolution-event-editor.xml.h:56
+#: ui/evolution-event-editor.xml.h:56
 msgid "FIXME: _Move to Folder..."
 msgstr "Perke_lti А aplankЮ..."
 
-#: po/tmp/evolution-event-editor.xml.h:57
+#: ui/evolution-event-editor.xml.h:57
 msgid "FIXME: _New Appointment"
 msgstr "_Naujas Аvykis..."
 
-#: po/tmp/evolution-event-editor.xml.h:58
+#: ui/evolution-event-editor.xml.h:58
 msgid "FIXME: _Note"
 msgstr "_Pastaba"
 
-#: po/tmp/evolution-event-editor.xml.h:59
+#: ui/evolution-event-editor.xml.h:59
 msgid "FIXME: _Object..."
 msgstr "_ObjektЮ..."
 
-#: po/tmp/evolution-event-editor.xml.h:60
+#: ui/evolution-event-editor.xml.h:60
 msgid "FIXME: _Paragraph..."
 msgstr "_Pastraipa..."
 
-#: po/tmp/evolution-event-editor.xml.h:61
+#: ui/evolution-event-editor.xml.h:61
 msgid "FIXME: _Spelling..."
 msgstr "_RaПyba..."
 
-#: po/tmp/evolution-event-editor.xml.h:62
+#: ui/evolution-event-editor.xml.h:62
 msgid "FIXME: _Standard"
 msgstr "_StandartinК"
 
-#: po/tmp/evolution-event-editor.xml.h:63
+#: ui/evolution-event-editor.xml.h:63
 msgid "FIXME: _Task"
 msgstr "_UЧduotis"
 
-#: po/tmp/evolution-event-editor.xml.h:64
+#: ui/evolution-event-editor.xml.h:64
 msgid "FIXME: _Unread Item"
 msgstr "_Neskaitytas daiktas"
 
-#: po/tmp/evolution-event-editor.xml.h:65
+#: ui/evolution-event-editor.xml.h:65
 msgid "FIXME: what goes here?"
 msgstr "o kas Хia dabar?"
 
-#: po/tmp/evolution-event-editor.xml.h:66
-#: po/tmp/evolution-message-composer.xml.h:10
+#: ui/evolution-event-editor.xml.h:66 ui/evolution-message-composer.xml.h:11
 msgid "F_ormat"
 msgstr "F_ormatas"
 
-#: po/tmp/evolution-event-editor.xml.h:68
+#: ui/evolution-event-editor.xml.h:68
 msgid "Find Again"
 msgstr "Rasti vКl"
 
-#: po/tmp/evolution-event-editor.xml.h:69
+#: ui/evolution-event-editor.xml.h:69
 msgid "Find _Again"
 msgstr "Rasti _vКl"
 
-#: po/tmp/evolution-event-editor.xml.h:70
+#: ui/evolution-event-editor.xml.h:70
 msgid "Go to the next item"
 msgstr "Eiti А tolesnА daiktЮ"
 
-#: po/tmp/evolution-event-editor.xml.h:71
+#: ui/evolution-event-editor.xml.h:71
 msgid "Go to the previous item"
 msgstr "Eiti А ankstesnА daiktЮ"
 
-#: po/tmp/evolution-event-editor.xml.h:72
+#: ui/evolution-event-editor.xml.h:72
 msgid "Modify the file's properties"
 msgstr "Pakeisti bylos savybes"
 
-#: po/tmp/evolution-event-editor.xml.h:73
+#: ui/evolution-event-editor.xml.h:73
 msgid "N_ext"
 msgstr "_Tolesnis"
 
-#: po/tmp/evolution-event-editor.xml.h:75
+#: ui/evolution-event-editor.xml.h:75
 msgid "Paste"
 msgstr "аdКti"
 
-#: po/tmp/evolution-event-editor.xml.h:76
+#: ui/evolution-event-editor.xml.h:76
 msgid "Paste the clipboard"
 msgstr "аdКti iП krepПio"
 
-#: po/tmp/evolution-event-editor.xml.h:77
+#: ui/evolution-event-editor.xml.h:77
 msgid "Pre_vious"
 msgstr "_Ankstesnis"
 
-#: po/tmp/evolution-event-editor.xml.h:78
+#: ui/evolution-event-editor.xml.h:78
 msgid "Previous"
 msgstr "Ankstesnis"
 
-#: po/tmp/evolution-event-editor.xml.h:79
+#: ui/evolution-event-editor.xml.h:79
 msgid "Print S_etup..."
 msgstr "Spausdinimo _nuostatos...."
 
-#: po/tmp/evolution-event-editor.xml.h:80
+#: ui/evolution-event-editor.xml.h:80
 msgid "Print Setup"
 msgstr "Puslapio nuostatos"
 
-#: po/tmp/evolution-event-editor.xml.h:83
+#: ui/evolution-event-editor.xml.h:83
 msgid "Properties"
 msgstr "SavybКs"
 
-#: po/tmp/evolution-event-editor.xml.h:84
+#: ui/evolution-event-editor.xml.h:84
 msgid "Redo"
 msgstr "Pakartoti"
 
-#: po/tmp/evolution-event-editor.xml.h:85
+#: ui/evolution-event-editor.xml.h:85
 msgid "Redo the undone action"
 msgstr "Pakartoti atПauktЮ veiksmЮ"
 
-#: po/tmp/evolution-event-editor.xml.h:86
+#: ui/evolution-event-editor.xml.h:86
 msgid "Replace"
 msgstr "Pakeisti"
 
-#: po/tmp/evolution-event-editor.xml.h:87
+#: ui/evolution-event-editor.xml.h:87
 msgid "Replace a string"
 msgstr "Pakeisti eilutФ"
 
-#: 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 "IПsaugoti АvykА ir uЧdaryti dialogo langЮ"
 
-#: po/tmp/evolution-event-editor.xml.h:92
-#: po/tmp/evolution-message-composer.xml.h:21
+#: ui/evolution-event-editor.xml.h:92 ui/evolution-message-composer.xml.h:24
 msgid "Save the current file"
 msgstr "IПsaugoti esamЮ bylЮ"
 
-#: po/tmp/evolution-event-editor.xml.h:93
+#: ui/evolution-event-editor.xml.h:93
 #, fuzzy
 msgid "Schedule Meeting"
 msgstr "аraПyti susitikimЮ А dienotvarkФ"
 
-#: po/tmp/evolution-event-editor.xml.h:94
+#: ui/evolution-event-editor.xml.h:94
 #, fuzzy
 msgid "Schedule _Meeting"
 msgstr "аtraukti s_usitikimЮ А dienotvarkФ"
 
-#: po/tmp/evolution-event-editor.xml.h:95
+#: ui/evolution-event-editor.xml.h:95
 msgid "Schedule some sort of a meeting"
 msgstr "аraПyti А dienotvarkФ kaЧkokА susitikimЮ"
 
-#: po/tmp/evolution-event-editor.xml.h:96
+#: ui/evolution-event-editor.xml.h:96
 msgid "Search again for the same string"
 msgstr "VКl ieПkoti tos paХios eilutКs"
 
-#: po/tmp/evolution-event-editor.xml.h:97
+#: ui/evolution-event-editor.xml.h:97
 msgid "Search for a string"
 msgstr "IeПkoti eilutКs"
 
-#: po/tmp/evolution-event-editor.xml.h:99
+#: ui/evolution-event-editor.xml.h:99
 msgid "Select All"
 msgstr "PaЧymКti visЮ"
 
-#: po/tmp/evolution-event-editor.xml.h:100
+#: ui/evolution-event-editor.xml.h:100
 msgid "Select everything"
 msgstr "PaЧymКti viskЮ"
 
-#: 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 "Nustatyti puslapio parinktis tavo esamam spausdintuvui"
 
-#: po/tmp/evolution-event-editor.xml.h:102
+#: ui/evolution-event-editor.xml.h:102
 msgid "Undo"
 msgstr "AtПaukti"
 
-#: po/tmp/evolution-event-editor.xml.h:103
+#: ui/evolution-event-editor.xml.h:103
 msgid "Undo the last action"
 msgstr "AtПaukti paskutinА veiksmЮ"
 
-#: po/tmp/evolution-event-editor.xml.h:104
-#: po/tmp/evolution-message-composer.xml.h:34
+#: ui/evolution-event-editor.xml.h:104 ui/evolution-message-composer.xml.h:38
 msgid "_About..."
 msgstr "_Apie..."
 
-#: po/tmp/evolution-event-editor.xml.h:105
-#: po/tmp/evolution-message-composer.xml.h:35
+#: ui/evolution-event-editor.xml.h:105 ui/evolution-message-composer.xml.h:39
 msgid "_Close"
 msgstr "U_Чdaryti"
 
-#: po/tmp/evolution-event-editor.xml.h:106
+#: ui/evolution-event-editor.xml.h:106
 msgid "_Copy"
 msgstr "_Kopijuoti"
 
-#: po/tmp/evolution-event-editor.xml.h:107
-#: po/tmp/evolution-message-composer.xml.h:36
+#: ui/evolution-event-editor.xml.h:107 ui/evolution-message-composer.xml.h:40
 msgid "_Debug"
 msgstr "_Derinti"
 
-#: po/tmp/evolution-event-editor.xml.h:109
-#: po/tmp/evolution-message-composer.xml.h:37
-#: 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 "_Taisa"
 
-#: po/tmp/evolution-event-editor.xml.h:111
+#: ui/evolution-event-editor.xml.h:111
 msgid "_Find..."
 msgstr "_Rasti..."
 
-#: po/tmp/evolution-event-editor.xml.h:112
+#: ui/evolution-event-editor.xml.h:112
 msgid "_Forms"
 msgstr "_Formos"
 
-#: po/tmp/evolution-event-editor.xml.h:113
-#: po/tmp/evolution-message-composer.xml.h:39 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 "_Pagalba"
 
-#: po/tmp/evolution-event-editor.xml.h:114
+#: ui/evolution-event-editor.xml.h:114
 msgid "_Insert"
 msgstr "аterpt_i"
 
-#: po/tmp/evolution-event-editor.xml.h:115
+#: ui/evolution-event-editor.xml.h:115
 msgid "_Object"
 msgstr "_Objektas"
 
-#: po/tmp/evolution-event-editor.xml.h:116
+#: ui/evolution-event-editor.xml.h:116
 msgid "_Paste"
 msgstr "а_dКti"
 
-#: po/tmp/evolution-event-editor.xml.h:117
+#: ui/evolution-event-editor.xml.h:117
 msgid "_Print"
 msgstr "S_pausdinti"
 
-#: po/tmp/evolution-event-editor.xml.h:118
+#: ui/evolution-event-editor.xml.h:118
 msgid "_Properties..."
 msgstr "_SavybКs..."
 
-#: po/tmp/evolution-event-editor.xml.h:119
+#: ui/evolution-event-editor.xml.h:119
 msgid "_Redo"
 msgstr "Paka_rtoti"
 
-#: po/tmp/evolution-event-editor.xml.h:120
+#: ui/evolution-event-editor.xml.h:120
 msgid "_Replace..."
 msgstr "_Pakeisti..."
 
-#: po/tmp/evolution-event-editor.xml.h:122
+#: ui/evolution-event-editor.xml.h:122
 msgid "_Toolbars"
 msgstr "а_rankiЬ juostos"
 
-#: po/tmp/evolution-event-editor.xml.h:124
+#: ui/evolution-event-editor.xml.h:124
 msgid "_Undo"
 msgstr "_AtПaukti"
 
 #.
-#. * 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 "Sukurti"
 
-#: po/tmp/evolution-mail.xml.h:7
+#: ui/evolution-mail.xml.h:7
 msgid "Compose a new message"
 msgstr "Sukurti naujЮ laiПkЮ"
 
-#: po/tmp/evolution-mail.xml.h:9
+#: ui/evolution-mail.xml.h:9
 msgid "Copy message to a new folder"
 msgstr "Kopijuoti laiПkЮ А naujЮ aplankЮ"
 
-#: 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 "_Aplankas"
 
-#: po/tmp/evolution-mail.xml.h:14
+#: ui/evolution-mail.xml.h:14
 msgid "Fi_lter on Sender"
 msgstr "Fi_ltruoti pagal SiuntКjЮ"
 
-#: po/tmp/evolution-mail.xml.h:15
+#: ui/evolution-mail.xml.h:15
 msgid "Filter on Rec_ipients"
 msgstr "Filtruoti pagal _GavКjus"
 
-#: po/tmp/evolution-mail.xml.h:16
+#: ui/evolution-mail.xml.h:16
 msgid "Forget _Passwords"
 msgstr "Pa_mirПti slaptaЧodЧius"
 
-#: po/tmp/evolution-mail.xml.h:20
+#: ui/evolution-mail.xml.h:20
 msgid "Get Mail"
 msgstr "Gauti paПtЮ"
 
-#: po/tmp/evolution-mail.xml.h:21
+#: ui/evolution-mail.xml.h:22
+#, fuzzy
+msgid "Hide _Deleted messages"
+msgstr "IПtrinti laiПkЮ"
+
+#: ui/evolution-mail.xml.h:23
+#, fuzzy
+msgid "Hide _Read messages"
+msgstr "PersiЬstas laiПkas -- %s"
+
+#: ui/evolution-mail.xml.h:24
+#, fuzzy
+msgid "Hide _Selected messages"
+msgstr "Spausdinti parinktЮ laiПkЮ"
+
+#: ui/evolution-mail.xml.h:25
 #, fuzzy
-msgid "Mail _Filters"
+msgid "Mail _Filters..."
 msgstr "PaПto _filtrai..."
 
-#: po/tmp/evolution-mail.xml.h:22
+#: ui/evolution-mail.xml.h:26
 #, fuzzy
-msgid "Manage Subscriptions"
+msgid "Manage Subscriptions..."
 msgstr "Tvarkyti uЧsakymus..."
 
-#: po/tmp/evolution-mail.xml.h:23
+#: ui/evolution-mail.xml.h:27
 msgid "Mar_k As Read"
 msgstr "PaЧymКti s_kaitytu"
 
-#: po/tmp/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:28
 msgid "Mark As U_nread"
 msgstr "PaЧymКti _neskaityta"
 
-#: po/tmp/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:29
 msgid "Move"
 msgstr "Perkelti"
 
-#: po/tmp/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:30
 msgid "Move message to a new folder"
 msgstr "Perkelti laiПkЮ А naujЮ aplankЮ"
 
-#: po/tmp/evolution-mail.xml.h:27
+#: ui/evolution-mail.xml.h:31
 msgid "Previews the message to be printed"
 msgstr "PerЧiШrКti laiПkЮ prieП spausdinant"
 
-#: po/tmp/evolution-mail.xml.h:29
+#: ui/evolution-mail.xml.h:33
 msgid "Print Preview of message..."
 msgstr "LaiПko spaudinio perЧiШra..."
 
-#: po/tmp/evolution-mail.xml.h:30
+#: ui/evolution-mail.xml.h:34
 msgid "Print message to the printer"
 msgstr "Spausdinti laiПkЮ spausdintuvu"
 
-#: po/tmp/evolution-mail.xml.h:31
+#: ui/evolution-mail.xml.h:35
 msgid "Print message..."
 msgstr "Spausdinti laiПkЮ..."
 
-#: po/tmp/evolution-mail.xml.h:35
+#: ui/evolution-mail.xml.h:39
 msgid "Reply to _All"
 msgstr "Atsakyti _visiems"
 
-#: po/tmp/evolution-mail.xml.h:36
+#: ui/evolution-mail.xml.h:40
 msgid "Reply to _Sender"
 msgstr "Atsakyti _siuntКjui"
 
-#: po/tmp/evolution-mail.xml.h:39 po/tmp/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:43 ui/evolution-subscribe.xml.h:12
 msgid "Select _All"
 msgstr "PaЧymКti _viskЮ"
 
-#: po/tmp/evolution-mail.xml.h:40
+#: ui/evolution-mail.xml.h:44
 msgid "Send queued mail and retrieve new mail"
 msgstr "IПsiЬsti laukianti АaПtЮ ir parsiЬsti naujЮ paПtЮ"
 
-#: po/tmp/evolution-mail.xml.h:41
+#: ui/evolution-mail.xml.h:45
+#, fuzzy
+msgid "Show _All messages"
+msgstr "Rodyti"
+
+#: ui/evolution-mail.xml.h:46
 msgid "Threaded Message list"
 msgstr "Gijomis suskirstytas laiПkЬ sЮraПas"
 
-#: po/tmp/evolution-mail.xml.h:42
+#: ui/evolution-mail.xml.h:47
 msgid "VFolder on Se_nder"
 msgstr "vAplankas pagal Siu_ntКjЮ"
 
-#: po/tmp/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:48
 msgid "VFolder on _Recipients"
 msgstr "vAplankas pagal _GavКjus"
 
-#: po/tmp/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:49
 msgid "View Raw Message Source"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:50
 msgid "_Apply Filters"
 msgstr "_Pritaikyti filtrus"
 
-#: po/tmp/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:51
 msgid "_Configure Folder"
 msgstr "_Tvarkyti aplankЮ"
 
-#: po/tmp/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:52
 #, fuzzy
 msgid "_Copy to Folder..."
 msgstr "_Kopijuoti А aplankЮ"
 
-#: po/tmp/evolution-mail.xml.h:49
+#: ui/evolution-mail.xml.h:54
 msgid "_Edit Message"
 msgstr "_Taisyti laiПkЮ"
 
-#: po/tmp/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:55
 msgid "_Expunge"
 msgstr "IП_tuПtinti"
 
-#: po/tmp/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:56
 msgid "_Filter on Subject"
 msgstr "_Filtruoti pagal TemЮ"
 
-#: po/tmp/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:57
 msgid "_Forward"
 msgstr "_PersiЬsti"
 
-#: po/tmp/evolution-mail.xml.h:53 po/tmp/evolution-subscribe.xml.h:17
+#: ui/evolution-mail.xml.h:58 ui/evolution-subscribe.xml.h:17
 msgid "_Invert Selection"
 msgstr "_Invertuoti paЧymКjimЮ"
 
-#: po/tmp/evolution-mail.xml.h:54
-#, fuzzy
-msgid "_Mail Configuration"
-msgstr "PaПto Nustatymas"
+#: ui/evolution-mail.xml.h:59
+msgid "_Mail Configuration..."
+msgstr "_PaПto nustatymas...."
 
-#: po/tmp/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:60
 msgid "_Message"
 msgstr "_LaiПkas"
 
-#: po/tmp/evolution-mail.xml.h:56
+#: ui/evolution-mail.xml.h:61
 #, fuzzy
 msgid "_Move to Folder..."
 msgstr "_Perkelti А aplankЮ"
 
-#: po/tmp/evolution-mail.xml.h:57
+#: ui/evolution-mail.xml.h:62
 msgid "_Open in New Window"
 msgstr "_Atidaryti naujame lange"
 
-#: po/tmp/evolution-mail.xml.h:58
+#: ui/evolution-mail.xml.h:63
 msgid "_Print Message"
 msgstr "_Spausdinti laiПkЮ"
 
-#: po/tmp/evolution-mail.xml.h:59
+#: ui/evolution-mail.xml.h:64
 #, fuzzy
 msgid "_Save Message As..."
 msgstr "IПsaugoti kaip..."
 
-#: po/tmp/evolution-mail.xml.h:60
+#: ui/evolution-mail.xml.h:65
 #, fuzzy
 msgid "_Source"
 msgstr "пaltinis"
 
-#: po/tmp/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:66
 msgid "_Threaded"
 msgstr "_Gijomis"
 
-#: po/tmp/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:67
 #, fuzzy
 msgid "_Undelete"
 msgstr "_IПtrinti"
 
-#: po/tmp/evolution-mail.xml.h:63
+#: ui/evolution-mail.xml.h:68
 msgid "_VFolder on Subject"
 msgstr "_vAplankas pagal TemЮ"
 
-#: po/tmp/evolution-mail.xml.h:64
+#: ui/evolution-mail.xml.h:69
 #, fuzzy
-msgid "_Virtual Folder Editor"
+msgid "_Virtual Folder Editor..."
 msgstr "_VirtualiЬ aplankЬ taisiklis..."
 
 #.
-#. * 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
 #, fuzzy
 msgid "Attach"
 msgstr "Prisegti bylЮ"
 
-#: po/tmp/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:9
 #, fuzzy
 msgid "Close the current file"
 msgstr "IПsaugoti esamЮ bylЮ"
 
-#: po/tmp/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Encrypt this message with PGP"
+msgstr "UЧПifruotas laiПkas"
+
+#: ui/evolution-message-composer.xml.h:12
 msgid "HTML"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:13
 #, fuzzy
 msgid "Insert a file as text into the message"
 msgstr "Prisegti bylЮ prie Пio laiПko"
 
-#: po/tmp/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:14
 msgid "Insert text file..."
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:16
 #, fuzzy
 msgid "Open a file"
 msgstr "Atidaryti bylЮ"
 
-#: po/tmp/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:17
+msgid "PGP Encrypt"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:18
+msgid "PGP Sign"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:20
 #, fuzzy
 msgid "Save As"
 msgstr "IПsaugoti k_aip"
 
-#: po/tmp/evolution-message-composer.xml.h:19
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save in _folder... (FIXME)"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:23
 #, fuzzy
 msgid "Save in folder..."
 msgstr "Eiti А aplankЮ..."
 
-#: po/tmp/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:25
 #, fuzzy
 msgid "Save the current file with a different name"
 msgstr "IПsaugoti esamЮ bylЮ"
 
-#: po/tmp/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:26
 #, fuzzy
 msgid "Save the message in a specified folder"
 msgstr "Perkelti laiПkЮ А naujЮ aplankЮ"
 
-#: po/tmp/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:27
 #, fuzzy
 msgid "Send"
 msgstr "SiuntКjas"
 
-#: po/tmp/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:28
 #, fuzzy
 msgid "Send _Later"
 msgstr "SiuntКjas"
 
-#: po/tmp/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:29
 #, fuzzy
 msgid "Send _later"
 msgstr "SiuntКjas"
 
-#: po/tmp/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:30
 #, fuzzy
 msgid "Send the mail in HTML format"
 msgstr "SiЬsti laiПkus HTML formatu"
 
-#: po/tmp/evolution-message-composer.xml.h:28
+#: ui/evolution-message-composer.xml.h:31
 #, fuzzy
 msgid "Send the message later"
 msgstr "Suskirstyti laiПkus А gijas"
 
-#: po/tmp/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:32
 #, fuzzy
 msgid "Send the message now"
 msgstr "SiЬsti laiПkus HTML formatu"
 
-#: po/tmp/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:33
 #, fuzzy
 msgid "Send this message now"
 msgstr "IПtrinti ПА laiПkЮ"
 
-#: po/tmp/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:34
 #, fuzzy
 msgid "Show / hide attachments"
 msgstr "IПsaugoti priedЮ"
 
-#: po/tmp/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:35
 #, fuzzy
 msgid "Show _attachments"
 msgstr "priedas"
 
-#: po/tmp/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:36
 #, fuzzy
 msgid "Show attachments"
 msgstr "priedas"
 
-#: po/tmp/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Sign this message with your PGP key"
+msgstr "SiunХiu laiПkЮ be temos"
+
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Insert text file... (FIXME)"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:45
 #, fuzzy
 msgid "_Open..."
 msgstr "Atidaryti..."
 
+#: 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 "PridКti aplankЮ А uЧsakytЬ aplankЬ sЮraПЮ"
 
-#: po/tmp/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:9
 msgid "Refresh List"
 msgstr "Atnaujinti sЮraПЮ"
 
-#: po/tmp/evolution-subscribe.xml.h:10
+#: ui/evolution-subscribe.xml.h:10
 msgid "Refresh List of Folders"
 msgstr "Atnaujinti aplankЬ sЮraПЮ"
 
-#: po/tmp/evolution-subscribe.xml.h:11
+#: ui/evolution-subscribe.xml.h:11
 msgid "Remove folder from your list of subscribed folders"
 msgstr "PaПalinti aplankЮ iП uЧsakytЬ aplankЬ sЮraПo"
 
-#: po/tmp/evolution-subscribe.xml.h:13
+#: ui/evolution-subscribe.xml.h:13
 msgid "Subscribe"
 msgstr "UЧsakyti"
 
-#: po/tmp/evolution-subscribe.xml.h:14
+#: ui/evolution-subscribe.xml.h:14
 msgid "Unsubscribe"
 msgstr "Atsisakyti"
 
 #.
-#. * 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 "Parodyti kitЮ aplankЮ"
 
-#: po/tmp/evolution.xml.h:7
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "I_Пeiti"
 
-#: po/tmp/evolution.xml.h:8
+#: ui/evolution.xml.h:8
 msgid "Evolution bar _shortcut"
 msgstr "Evolution juostos _trumpК"
 
-#: po/tmp/evolution.xml.h:9
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "IПeiti iП programos"
 
-#: po/tmp/evolution.xml.h:10
+#: ui/evolution.xml.h:10
 msgid "Getting _Started"
 msgstr "_SusipaЧinimas"
 
-#: po/tmp/evolution.xml.h:11
+#: ui/evolution.xml.h:11
 msgid "Show information about Evolution"
 msgstr "Parodyti informacijЮ apie Evolution"
 
-#: po/tmp/evolution.xml.h:12
+#: ui/evolution.xml.h:12
 msgid "Show the _Folder Bar"
 msgstr "Rodyti _AplankЬ juostЮ"
 
-#: po/tmp/evolution.xml.h:13
+#: ui/evolution.xml.h:13
 msgid "Show the _Shortcut Bar"
 msgstr "Rodyti _TrumpiЬ juostЮ"
 
-#: po/tmp/evolution.xml.h:14
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "Submit _Bug Report"
 msgstr "IП_siЬsti klaidos praneПimЮ"
 
-#: po/tmp/evolution.xml.h:15
+#: ui/evolution.xml.h:15
 #, fuzzy
 msgid "Submit bug report using Bug Buddy."
 msgstr "PraneПti apie klaidЮ, naudojant Bug Buddy"
 
-#: po/tmp/evolution.xml.h:16
+#: ui/evolution.xml.h:16
 msgid "Toggle whether to show the folder bar"
 msgstr "Perjungti, ar rodyti aplankЬ juostЮ"
 
-#: po/tmp/evolution.xml.h:17
+#: ui/evolution.xml.h:17
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Perjungti, ar rodyti trumpiЬ juostЮ"
 
-#: po/tmp/evolution.xml.h:18
+#: ui/evolution.xml.h:18
 msgid "Using the C_ontact Manager"
 msgstr "K_ontaktЬ menedЧerio naudojimas"
 
-#: po/tmp/evolution.xml.h:19
+#: ui/evolution.xml.h:19
 msgid "Using the _Calendar"
 msgstr "_Kalendoriaus vartojimas"
 
-#: po/tmp/evolution.xml.h:20
+#: ui/evolution.xml.h:20
 msgid "Using the _Mailer"
 msgstr "PaПto programos naudojimas"
 
-#: po/tmp/evolution.xml.h:21
+#: ui/evolution.xml.h:21
 msgid "_About Evolution..."
 msgstr "_Apie Evolution..."
 
-#: po/tmp/evolution.xml.h:22
+#: ui/evolution.xml.h:22
 msgid "_Appointment (FIXME)"
 msgstr "а_vykis"
 
-#: po/tmp/evolution.xml.h:23
+#: ui/evolution.xml.h:23
 msgid "_Contact (FIXME)"
 msgstr "_Kontaktas"
 
-#: po/tmp/evolution.xml.h:26
+#: ui/evolution.xml.h:26
 msgid "_Folder"
 msgstr "_Aplankas"
 
-#: po/tmp/evolution.xml.h:27
+#: ui/evolution.xml.h:27
 msgid "_Go to Folder..."
 msgstr "_Eiti А aplankЮ..."
 
-#: po/tmp/evolution.xml.h:29
+#: ui/evolution.xml.h:29
 msgid "_Index"
 msgstr "_Turinys"
 
-#: po/tmp/evolution.xml.h:30
+#: ui/evolution.xml.h:30
 msgid "_Mail message (FIXME)"
 msgstr "_PaПto laiПkas"
 
-#: po/tmp/evolution.xml.h:32
+#: ui/evolution.xml.h:32
 msgid "_Settings"
 msgstr "_Nuostatos"
 
-#: po/tmp/evolution.xml.h:33
+#: ui/evolution.xml.h:33
 msgid "_Task (FIXME)"
 msgstr "_UЧduotis"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2470
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -6709,28 +7195,34 @@ msgstr "Susitikimo pa_baigos laikas:"
 msgid "All Attendees"
 msgstr "Visi dalyviai"
 
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: widgets/misc/e-calendar-item.c:421
+msgid "MTWTFSS"
+msgstr "PATKPпS"
+
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
+#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-clipped-label.c:107
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-dateedit.c:408
+#: widgets/misc/e-dateedit.c:407
 msgid "Now"
 msgstr "Dabar"
 
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1249 widgets/misc/e-dateedit.c:1308
-#: widgets/misc/e-dateedit.c:1487
+#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
+#: widgets/misc/e-dateedit.c:1486
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1252 widgets/misc/e-dateedit.c:1311
-#: widgets/misc/e-dateedit.c:1490
+#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
+#: widgets/misc/e-dateedit.c:1489
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
@@ -6739,12 +7231,287 @@ msgstr "%I:%M %p"
 msgid "Group %i"
 msgstr "GrupК %i"
 
+#~ msgid "categories"
+#~ msgstr "kategorijos"
+
+#~ msgid "Item(s) belong to these categories:"
+#~ msgstr "Daiktas (ai) priklauso Пioms kategorijoms:"
+
+#~ msgid "Available Categories:"
+#~ msgstr "Galimos kategorijos:"
+
+#~ msgid "External Directories"
+#~ msgstr "IПorinКs direktorijos"
+
+#~ msgid "Port Number:"
+#~ msgstr "Prievado numeris:"
+
+#~ msgid "Outline:"
+#~ msgstr "KontШrai:"
+
+#~ msgid "Headings:"
+#~ msgstr "AntraПtКs:"
+
+#~ msgid "Empty days:"
+#~ msgstr "TuПХios dienos:"
+
+#~ msgid "Appointments:"
+#~ msgstr "аvykiai:"
+
+#~ msgid "Highlighted day:"
+#~ msgstr "ParyПkinta diena:"
+
+#~ msgid "Day numbers:"
+#~ msgstr "DienЬ numeriai:"
+
+#~ msgid "Current day's number:"
+#~ msgstr "пiandienos numeris:"
+
+#~ msgid "To-Do item that is not yet due:"
+#~ msgstr "To-do punktas, kuriam dar ne laikas:"
+
+#~ msgid "To-Do item that is due today:"
+#~ msgstr "To-do punktas, kurio laikas Пiandien:"
+
+#~ msgid "To-Do item that is overdue:"
+#~ msgstr "To-do punktas, kurio laikas praКjФs:"
+
+#~ msgid "may"
+#~ msgstr "geguЧК"
+
+#~ msgid "sept"
+#~ msgstr "rugs"
+
+#~ msgid "sunday"
+#~ msgstr "sekmadienis"
+
+#~ msgid "monday"
+#~ msgstr "pirmadienis"
+
+#~ msgid "tuesday"
+#~ msgstr "antradienis"
+
+#~ msgid "tues"
+#~ msgstr "antr"
+
+#~ msgid "wednesday"
+#~ msgstr "treХiadienis"
+
+#~ msgid "wednes"
+#~ msgstr "treХ"
+
+#~ msgid "thursday"
+#~ msgstr "ketvirtadienis"
+
+#~ msgid "thur"
+#~ msgstr "ketv"
+
+#~ msgid "thurs"
+#~ msgstr "ketv"
+
+#~ msgid "friday"
+#~ msgstr "penktadienis"
+
+#~ msgid "saturday"
+#~ msgstr "ПeПtadienis"
+
+#~ msgid "fortnight"
+#~ msgstr "dvi savaitКs"
+
+#~ msgid "min"
+#~ msgstr "min."
+
+#~ msgid "sec"
+#~ msgstr "sek."
+
+#~ msgid "tomorrow"
+#~ msgstr "rytoj"
+
+#~ msgid "yesterday"
+#~ msgstr "vakar"
+
+#~ msgid "today"
+#~ msgstr "Пiandien"
+
+#~ msgid "last"
+#~ msgstr "paskutinis"
+
+#~ msgid "this"
+#~ msgstr "Пis"
+
+#~ msgid "next"
+#~ msgstr "tolesnis"
+
+#~ msgid "first"
+#~ msgstr "pirmas"
+
+#~ msgid "third"
+#~ msgstr "treХias"
+
+#~ msgid "fourth"
+#~ msgstr "ketvirtas"
+
+#~ msgid "fifth"
+#~ msgstr "penktas"
+
+#~ msgid "sixth"
+#~ msgstr "ПeПtas"
+
+#~ msgid "seventh"
+#~ msgstr "septintas"
+
+#~ msgid "eighth"
+#~ msgstr "aПtuntas"
+
+#~ msgid "ninth"
+#~ msgstr "devintas"
+
+#~ msgid "tenth"
+#~ msgstr "deПimtas"
+
+#~ msgid "eleventh"
+#~ msgstr "vienuoliktas"
+
+#~ msgid "twelfth"
+#~ msgstr "dvyliktas"
+
+#~ msgid "ago"
+#~ msgstr " "
+
+#~ msgid "Year:"
+#~ msgstr "Metai:"
+
+#~ msgid ""
+#~ "Please select the date you want to go to.\n"
+#~ "When you click on a day, you will be taken\n"
+#~ "to that date."
+#~ msgstr ""
+#~ "Pasirink datЮ, А kuriЮ nori nuПokti.\n"
+#~ "Kai nuspausi ant dienos, atsirasi\n"
+#~ "toje datoje"
+
+#~ msgid "Mail Source"
+#~ msgstr "PaПto Пaltinis"
+
+#~ msgid ""
+#~ "Your email configuration is now complete.\n"
+#~ "Click \"Finish\" to save your new settings"
+#~ msgstr ""
+#~ "Tavo paПto nustatymas uЧbaigtas. Spausk \n"
+#~ "╔Baigti╢, kad iПsaugotum naujas nuostatas"
+
+#~ msgid "Send \"%s\""
+#~ msgstr "SiЬsti ╔%s╢"
+
+#~ msgid "Send a message without a subject"
+#~ msgstr "SiЬsti laiПkЮ be temos"
+
+#~ msgid "Expunge \"%s\""
+#~ msgstr "IПvalyti ╔%s╢"
+
+#~ msgid "Marking messages in folder \"%s\""
+#~ msgstr "PaЧymiu laiПkus aplanke ╔%s╢"
+
+#~ msgid "Mark messages in folder \"%s\""
+#~ msgstr "PaЧymКti laiПkus aplanke ╔%s╢"
+
+#~ msgid "Marking message %d of %d"
+#~ msgstr "PaЧymimas laiПkas %d iП %d"
+
+#~ msgid "Scan folders in \"%s\""
+#~ msgstr "Skaityti aplankus iП ╔%s╢"
+
+#~ msgid "Attaching messages from folder \"%s\""
+#~ msgstr "Prisegami laiПkai iП aplanko ╔%s╢"
+
+#~ msgid "Attach messages from \"%s\""
+#~ msgstr "Prisegami laiПkus iП aplanko ╔%s╢"
+
+#~ msgid "Forwarding messages \"%s\""
+#~ msgstr "PersiunХiu laiПkЮ ╔%s╢"
+
+#~ msgid "Forwarding a message without a subject"
+#~ msgstr "PersiunХiu laiПkЮ be temos"
+
+#~ msgid "Forward message \"%s\""
+#~ msgstr "PersiЬsti laiПkЮ ╔%s╢"
+
+#~ msgid "Forward a message without a subject"
+#~ msgstr "PersiЬsti laiПkЮ be temos"
+
 #~ msgid ""
-#~ "Are you sure you want\n"
-#~ "to delete this contact?"
+#~ "Failed to generate mime part from message while generating forwarded message."
 #~ msgstr ""
-#~ "Ar tikrai nori iПtrinti \n"
-#~ "ПА kontaktЮ?"
+#~ "Nepavyko sugeneruoti laiПko mime dalies, generuojant persiunХiamЮ laiПkЮ."
+
+#~ msgid "Loading \"%s\""
+#~ msgstr "аkeliu ╔%s╢"
+
+#~ msgid "Load \"%s\""
+#~ msgstr "аkelti ╔%s╢"
+
+#~ msgid "Creating \"%s\""
+#~ msgstr "Sukuriu ╔%s╢"
+
+#~ msgid "Create \"%s\""
+#~ msgstr "Sukurti ╔%s╢"
+
+#~ msgid "Synchronize \"%s\""
+#~ msgstr "Sinchronizuoti ╔%s╢"
+
+#~ msgid "Displaying message UID \"%s\""
+#~ msgstr "Parodomas laiПkas UID ╔%s╢"
+
+#~ msgid "Clearing message display"
+#~ msgstr "IПvalomas laiПkЬ rodinys"
+
+#~ msgid "Display message UID \"%s\""
+#~ msgstr "Parodyti laiПkЮ UID ╔%s╢"
+
+#~ msgid "Clear message display"
+#~ msgstr "IПvalyti laiПkЬ rodinА"
+
+#~ msgid "Opening messages from folder \"%s\""
+#~ msgstr "Atidaromi laiПkai iП aplanko ╔%s╢"
+
+#~ msgid "Open messages from \"%s\""
+#~ msgstr "Atidaryti laiПkus iП ╔%s╢"
+
+#~ msgid "Viewing messages from folder \"%s\""
+#~ msgstr "чiШrimi laiПkai iП aplanko ╔%s╢"
+
+#~ msgid "View messages from \"%s\""
+#~ msgstr "чiШrКti laiПkus iП ╔%s╢"
+
+#~ msgid "Retrieving message %d of %d (uid \"%s\")"
+#~ msgstr "Gaunamas laiПkas %d  iП %d (uid ╔%s╢)"
+
+#, fuzzy
+#~ msgid "Saving messages from folder \"%s\""
+#~ msgstr "Prisegami laiПkai iП aplanko ╔%s╢"
+
+#, fuzzy
+#~ msgid "Save messages from folder \"%s\""
+#~ msgstr "Atidaromi laiПkai iП aplanko ╔%s╢"
+
+#~ msgid "Rebuilding message view"
+#~ msgstr "Perstatau laiПkЬ vaizdЮ"
+
+#~ msgid "Rebuild message view"
+#~ msgstr "Perstatyti laiПkЬ vaizdЮ"
+
+#~ msgid "N_ew Directory Server"
+#~ msgstr "N_aujas direktorijos serveris"
+
+#~ msgid "_Actions"
+#~ msgstr "_Veiksmai"
+
+#~ msgid "_Save Calendar As"
+#~ msgstr "_IПsaugoti kalendoriЬ kaip"
+
+#, fuzzy
+#~ msgid "_Mail Configuration"
+#~ msgstr "PaПto Nustatymas"
 
 #~ msgid "Quick Search"
 #~ msgstr "Greita paieПka"
@@ -6783,9 +7550,6 @@ msgstr "GrupК %i"
 #~ msgid "Due Date:"
 #~ msgstr "Kada reikia:"
 
-#~ msgid "Priority:"
-#~ msgstr "Svarbumas:"
-
 #~ msgid "Item Comments:"
 #~ msgstr "Daikto komentarai:"
 
@@ -6899,9 +7663,6 @@ msgstr "GrupК %i"
 #~ msgid "Could not rename folder `%s': %s exists"
 #~ msgstr "NegalКjau pervadinti aplanko ╔%s╢: jau yra toks %s"
 
-#~ msgid "Deleted"
-#~ msgstr "IПtrintas"
-
 #~ msgid "Draft"
 #~ msgstr "JuodraПtis"
 
@@ -6917,9 +7678,6 @@ msgstr "GrupК %i"
 #~ msgid "matches regex"
 #~ msgstr "tenkina regex"
 
-#~ msgid "Cannot initialize Evolution's mail summary component."
-#~ msgstr "Negaliu inicializuoti Evolution paПto santraukos komponento."
-
 #~ msgid "Cannot initialize Evolution's mail storage hash."
 #~ msgstr "Negaliu inicializuoti Evolution paПto laikymo hash'o."
 
@@ -6955,27 +7713,15 @@ msgstr "GrupК %i"
 #~ msgid " (XXX unread)"
 #~ msgstr " (XXX neskaitytЬ)"
 
-#~ msgid "Retrieving messages : %s"
-#~ msgstr "Gaunami laiПki: %s"
-
-#~ msgid "Mailbox summary"
-#~ msgstr "PaПto dКЧutКs santrauka"
-
 #~ msgid "Don't know protocol to open URI `%s'"
 #~ msgstr "NeЧinau protokolo, kaip atidaryti URI ╔%s╢"
 
 #~ msgid "Open in New Window"
 #~ msgstr "Atidaryti naujame lange"
 
-#~ msgid "Edit Message"
-#~ msgstr "Taisyti laiПkЮ"
-
 #~ msgid "Forward Message"
 #~ msgstr "PersiЬsti laiПkЮ"
 
-#~ msgid "Delete Message"
-#~ msgstr "IПtrinti laiПkЮ"
-
 #~ msgid "Move Message"
 #~ msgstr "Perkelti laiПkЮ"
 
@@ -6985,17 +7731,11 @@ msgstr "GrupК %i"
 #~ msgid "Threading message list"
 #~ msgstr "LaiПkai skirstomi А gijas"
 
-#~ msgid "_New Contact"
-#~ msgstr "_Naujas kontaktas"
-
 #~ msgid "New Ca_lendar"
 #~ msgstr "Naujas ka_lendorius"
 
 #~ msgid "_New appointment..."
 #~ msgstr "_Naujas Аvykis..."
 
-#~ msgid "_Mail Configuration..."
-#~ msgstr "_PaПto nustatymas...."
-
 #~ msgid "_Create New Folder..."
 #~ msgstr "_Sukurti naujЮ aplankЮ..."
diff --git a/po/nl.po b/po/nl.po
index b88731507c..63c84def5f 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -4,10 +4,11 @@
 # Gerard Oskamp <gerard@linuxfreak.nl>, 2000
 # Dennis Smit <synap@area101.penguin.nl>, 2000
 # Almer S. Tigelaar <almer1@dds.nl>, 2000
+#: camel/providers/smtp/camel-smtp-transport.c:287
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution CVS\n"
-"POT-Creation-Date: 2000-12-13 16:26-0600\n"
+"POT-Creation-Date: 2001-01-06 00:11+0100\n"
 "PO-Revision-Date: 2000-12-02 15:02+0100\n"
 "Last-Translator: Almer S. Tigelaar <almer1@dds.nl>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -320,10 +321,10 @@ msgstr ""
 #: addressbook/backend/ebook/load-pine-addressbook.c:17
 #: addressbook/backend/ebook/test-client-list.c:18
 #: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:991
+#: addressbook/conduit/address-conduit.c:1083
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1136
-#: calendar/conduits/todo/todo-conduit.c:945 calendar/gui/main.c:54
+#: calendar/conduits/calendar/calendar-conduit.c:1151
+#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "Kon Bonobo niet initialiseren"
 
@@ -444,57 +445,37 @@ msgid ""
 "pilot list from the gnome-pilot daemon"
 msgstr "Fout bij het ophalen van de pilot list van de gnome-pilot daemon"
 
-#: addressbook/conduit/address-conduit.c:197
+#: addressbook/conduit/address-conduit.c:195
 msgid "Cursor could not be loaded\n"
 msgstr "Cursor kon niet worden geladen\n"
 
-#: addressbook/conduit/address-conduit.c:210
+#: addressbook/conduit/address-conduit.c:208
 msgid "EBook not loaded\n"
 msgstr "EBook niet geladen\n"
 
-#: addressbook/conduit/address-conduit.c:583
-#: calendar/conduits/calendar/calendar-conduit.c:715
-#: calendar/conduits/todo/todo-conduit.c:523
+#: addressbook/conduit/address-conduit.c:646
+#: calendar/conduits/calendar/calendar-conduit.c:730
+#: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat server"
 msgstr "Kon \"wombat\" server niet starten"
 
-#: addressbook/conduit/address-conduit.c:584
-#: calendar/conduits/calendar/calendar-conduit.c:716
-#: calendar/conduits/todo/todo-conduit.c:524
+#: addressbook/conduit/address-conduit.c:647
+#: calendar/conduits/calendar/calendar-conduit.c:731
+#: calendar/conduits/todo/todo-conduit.c:546
 msgid "Could not start wombat"
 msgstr "Kon \"wombat\" niet starten"
 
-#: addressbook/conduit/address-conduit.c:616
-#: addressbook/conduit/address-conduit.c:619
+#: addressbook/conduit/address-conduit.c:679
+#: addressbook/conduit/address-conduit.c:682
 msgid "Could not read pilot's Address application block"
 msgstr "Kon het adres applicatie blok niet uit de pilot lezen"
 
-# addressbook/contact-editor/categories-strings.h:7

-#.
-#. * 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 "CategorieКn"
-
-# addressbook/contact-editor/categories-strings.h:8

-#: addressbook/contact-editor/categories-strings.h:8
-msgid "Item(s) belong to these categories:"
-msgstr "Item(s) die tot deze categorie behoren:"
-
-# addressbook/contact-editor/categories-strings.h:9

-#: addressbook/contact-editor/categories-strings.h:9
-msgid "Available Categories:"
-msgstr "Beschikbare CategorieКn:"
-
 # addressbook/gui/component/addressbook.c:426

 #.
-#. * 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 "Contact verwijderen?"
 
@@ -511,7 +492,7 @@ msgstr "_Toevoegen"
 # addressbook/contact-editor/e-contact-editor-strings.h:8

 # addressbook/contact-editor/e-contact-editor.c:673

 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:48
+#: ui/evolution-event-editor.xml.h:108 ui/evolution-mail.xml.h:53
 msgid "_Delete"
 msgstr "_Verwijderen"
 
@@ -529,12 +510,13 @@ msgstr "Nieuw telefoon type"
 
 # addressbook/contact-editor/e-contact-editor-strings.h:11

 #.
-#. * 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 "Toevoegen"
 
@@ -586,7 +568,7 @@ msgstr "_Mobiele Telefoon"
 # addressbook/contact-editor/e-contact-editor-strings.h:23

 # addressbook/contact-editor/e-contact-editor.c:1340

 #: 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 "Primaire E-mail"
 
@@ -607,7 +589,7 @@ msgstr "K_ontakten..."
 
 # addressbook/contact-editor/e-contact-editor-strings.h:27

 #: 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 "Ca_tegorieКn..."
 
@@ -628,7 +610,8 @@ msgstr "_Adres..."
 
 # addressbook/contact-editor/e-contact-editor-strings.h:30

 #: 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 "Algemeen"
 
@@ -684,172 +667,172 @@ msgstr "Aa_ntekeningen:"
 
 # addressbook/contact-editor/e-contact-editor-strings.h:41

 #: 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 "Details"
 
 # addressbook/contact-editor/e-contact-editor.c:1278

-#: addressbook/contact-editor/e-contact-editor.c:1266
+#: addressbook/contact-editor/e-contact-editor.c:1274
 msgid "Assistant"
 msgstr "Assistent"
 
 # addressbook/contact-editor/e-contact-editor.c:1279

 # addressbook/contact-editor/e-contact-editor.c:1383

-#: 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 "Bedrijf"
 
 # addressbook/contact-editor/e-contact-editor.c:1280

-#: addressbook/contact-editor/e-contact-editor.c:1268
+#: addressbook/contact-editor/e-contact-editor.c:1276
 msgid "Business 2"
 msgstr "Bedrijf 2"
 
 # addressbook/contact-editor/e-contact-editor.c:1281

-#: addressbook/contact-editor/e-contact-editor.c:1269
+#: addressbook/contact-editor/e-contact-editor.c:1277
 msgid "Business Fax"
 msgstr "Bedrijfs Fax"
 
 # addressbook/contact-editor/e-contact-editor.c:1282

-#: addressbook/contact-editor/e-contact-editor.c:1270
+#: addressbook/contact-editor/e-contact-editor.c:1278
 msgid "Callback"
 msgstr "Terugbel"
 
 # addressbook/contact-editor/e-contact-editor.c:1283

-#: addressbook/contact-editor/e-contact-editor.c:1271
+#: addressbook/contact-editor/e-contact-editor.c:1279
 msgid "Car"
 msgstr "Auto"
 
 # addressbook/contact-editor/e-contact-editor.c:1284

-#: addressbook/contact-editor/e-contact-editor.c:1272
+#: addressbook/contact-editor/e-contact-editor.c:1280
 msgid "Company"
 msgstr "Bedrijf"
 
 # addressbook/contact-editor/e-contact-editor.c:1285

 # addressbook/contact-editor/e-contact-editor.c:1384

-#: 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 "Thuis"
 
 # addressbook/contact-editor/e-contact-editor.c:1286

-#: addressbook/contact-editor/e-contact-editor.c:1274
+#: addressbook/contact-editor/e-contact-editor.c:1282
 msgid "Home 2"
 msgstr "Thuis 2"
 
 # addressbook/contact-editor/e-contact-editor.c:1287

-#: addressbook/contact-editor/e-contact-editor.c:1275
+#: addressbook/contact-editor/e-contact-editor.c:1283
 msgid "Home Fax"
 msgstr "Fax Thuis"
 
 # addressbook/contact-editor/e-contact-editor.c:1288

-#: addressbook/contact-editor/e-contact-editor.c:1276
+#: addressbook/contact-editor/e-contact-editor.c:1284
 msgid "ISDN"
 msgstr "ISDN Nummer"
 
 # addressbook/contact-editor/e-contact-editor.c:1289

-#: addressbook/contact-editor/e-contact-editor.c:1277
+#: addressbook/contact-editor/e-contact-editor.c:1285
 msgid "Mobile"
 msgstr "Mobiele Telefoon"
 
 # addressbook/contact-editor/e-contact-editor.c:1290

 # addressbook/contact-editor/e-contact-editor.c:1385

-#: 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 "Overige"
 
 # addressbook/contact-editor/e-contact-editor.c:1291

-#: addressbook/contact-editor/e-contact-editor.c:1279
+#: addressbook/contact-editor/e-contact-editor.c:1287
 msgid "Other Fax"
 msgstr "Andere Fax"
 
 # addressbook/contact-editor/e-contact-editor.c:1292

-#: addressbook/contact-editor/e-contact-editor.c:1280
+#: addressbook/contact-editor/e-contact-editor.c:1288
 msgid "Pager"
 msgstr "Oppieper"
 
 # addressbook/contact-editor/e-contact-editor.c:1293

-#: addressbook/contact-editor/e-contact-editor.c:1281
+#: addressbook/contact-editor/e-contact-editor.c:1289
 msgid "Primary"
 msgstr "Eerste"
 
 # addressbook/contact-editor/e-contact-editor.c:1294

-#: addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/contact-editor/e-contact-editor.c:1290
 msgid "Radio"
 msgstr "Radio"
 
 # addressbook/contact-editor/e-contact-editor.c:1295

-#: addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/contact-editor/e-contact-editor.c:1291
 msgid "Telex"
 msgstr "Telex"
 
 # addressbook/contact-editor/e-contact-editor.c:1296

-#: 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:1341

-#: addressbook/contact-editor/e-contact-editor.c:1329
+#: addressbook/contact-editor/e-contact-editor.c:1337
 msgid "Email 2"
 msgstr "E-mail 2"
 
 # addressbook/contact-editor/e-contact-editor.c:1342

-#: addressbook/contact-editor/e-contact-editor.c:1330
+#: addressbook/contact-editor/e-contact-editor.c:1338
 msgid "Email 3"
 msgstr "E-mail 3"
 
 # addressbook/contact-editor/e-contact-editor-strings.h:18

 #.
-#. * 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 "Adres _2:"
 
-#: po/tmp/fulladdr.glade.h:7
+#: addressbook/contact-editor/fulladdr.glade.h:7
 msgid "Canada"
 msgstr "Canada"
 
 # composer/e-msg-composer-address-dialog.glade.h:11

-#: po/tmp/fulladdr.glade.h:8
+#: addressbook/contact-editor/fulladdr.glade.h:8
 msgid "Check Address"
 msgstr "Controleer Adres"
 
-#: po/tmp/fulladdr.glade.h:9
+#: addressbook/contact-editor/fulladdr.glade.h:9
 msgid "Countr_y:"
 msgstr "_Land:"
 
 # addressbook/gui/component/addressbook.c:424

-#: po/tmp/fulladdr.glade.h:10
+#: addressbook/contact-editor/fulladdr.glade.h:10
 msgid "Finland"
 msgstr "Finland"
 
-#: po/tmp/fulladdr.glade.h:11
+#: addressbook/contact-editor/fulladdr.glade.h:11
 msgid "USA"
 msgstr "USA"
 
 # addressbook/contact-editor/e-contact-editor-strings.h:18

-#: po/tmp/fulladdr.glade.h:12
+#: addressbook/contact-editor/fulladdr.glade.h:12
 msgid "_Address:"
 msgstr "_Adres:"
 
 # addressbook/contact-editor/e-contact-editor-strings.h:36

-#: po/tmp/fulladdr.glade.h:13
+#: addressbook/contact-editor/fulladdr.glade.h:13
 msgid "_City:"
 msgstr "_Gemeente:"
 
-#: po/tmp/fulladdr.glade.h:14
+#: addressbook/contact-editor/fulladdr.glade.h:14
 msgid "_PO Box:"
 msgstr "_Postbus:"
 
-#: po/tmp/fulladdr.glade.h:15
+#: addressbook/contact-editor/fulladdr.glade.h:15
 msgid "_State/Province:"
 msgstr "_Staat/Provincie:"
 
-#: po/tmp/fulladdr.glade.h:16
+#: addressbook/contact-editor/fulladdr.glade.h:16
 msgid "_ZIP Code:"
 msgstr "_Postcode:"
 
@@ -865,10 +848,13 @@ msgstr "Controleer Volledige Naam"
 
 # addressbook/contact-editor/fullname-strings.h:13

 #: addressbook/contact-editor/fullname-strings.h:8
+#, fuzzy
 msgid ""
 "\n"
 "Mr.\n"
 "Mrs.\n"
+"Ms.\n"
+"Miss\n"
 "Dr.\n"
 msgstr ""
 "\n"
@@ -877,7 +863,7 @@ msgstr ""
 "Dr.\n"
 
 # addressbook/contact-editor/fullname-strings.h:18

-#: addressbook/contact-editor/fullname-strings.h:13
+#: addressbook/contact-editor/fullname-strings.h:15
 msgid ""
 "\n"
 "Sr.\n"
@@ -896,53 +882,58 @@ msgstr ""
 "Esq.\n"
 
 # addressbook/contact-editor/fullname-strings.h:9

-#: addressbook/contact-editor/fullname-strings.h:21
+#: addressbook/contact-editor/fullname-strings.h:23
 msgid "_First:"
 msgstr "Voornaam:"
 
 # addressbook/contact-editor/fullname-strings.h:8

-#: addressbook/contact-editor/fullname-strings.h:22
+#: addressbook/contact-editor/fullname-strings.h:24
 msgid "_Title:"
 msgstr "_Titel:"
 
 # addressbook/contact-editor/fullname-strings.h:10

-#: addressbook/contact-editor/fullname-strings.h:23
+#: addressbook/contact-editor/fullname-strings.h:25
 msgid "_Middle:"
 msgstr "Tweede Naa_m:"
 
 # addressbook/contact-editor/fullname-strings.h:11

-#: addressbook/contact-editor/fullname-strings.h:24
+#: addressbook/contact-editor/fullname-strings.h:26
 msgid "_Last:"
 msgstr "Achternaam:"
 
 # addressbook/contact-editor/fullname-strings.h:12

-#: addressbook/contact-editor/fullname-strings.h:25
+#: addressbook/contact-editor/fullname-strings.h:27
 msgid "_Suffix:"
 msgstr "Achtervoeg_sel:"
 
 # addressbook/gui/component/addressbook.c:1046

-#: addressbook/gui/component/addressbook.c:263
+#: addressbook/gui/component/addressbook.c:231
 msgid "As _Minicards"
 msgstr "Als _Minikaarten"
 
 # addressbook/gui/component/addressbook.c:499

 # addressbook/gui/component/addressbook.c:1039

 #.
-#. * 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:269
-#: po/tmp/evolution-addressbook.xml.h:6
+#: addressbook/gui/component/addressbook.c:237
+#: ui/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr "Als _Tabel"
 
+#: addressbook/gui/component/addressbook.c:374
+#, fuzzy, c-format
+msgid "Enter password for %s"
+msgstr "Voer het NNTP wachtwoord voor %s@%s in"
+
 # addressbook/gui/component/addressbook.c:593

-#: addressbook/gui/component/addressbook.c:386
+#: addressbook/gui/component/addressbook.c:402
 msgid "Unable to open addressbook"
 msgstr "Kan het adresboek niet openen"
 
 # addressbook/gui/component/addressbook.c:598

-#: addressbook/gui/component/addressbook.c:391
+#: 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"
@@ -962,93 +953,242 @@ msgstr ""
 "OpenLDAP downloaden en installeren en Evolution hercompileren\n"
 "en opnieuw installeren.\n"
 
-#: addressbook/gui/component/addressbook.c:501 mail/folder-browser.c:136
+#: addressbook/gui/component/addressbook.c:528 mail/folder-browser.c:219
 msgid "Show All"
 msgstr "Allen Weergeven"
 
 # calendar/gui/gncal-todo.c:479

 # composer/e-msg-composer-address-dialog.glade.h:13

-#: addressbook/gui/component/addressbook.c:503 mail/folder-browser.c:138
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 msgid "Advanced..."
 msgstr "Geavanceerd..."
 
-#: addressbook/gui/component/addressbook.c:533
+#: addressbook/gui/component/addressbook.c:560
 msgid "Any field contains"
 msgstr "Een veld bevat"
 
 # addressbook/contact-editor/e-contact-editor.c:808

 # calendar/gui/event-editor.c:1282

-#: addressbook/gui/component/addressbook.c:534
+#: addressbook/gui/component/addressbook.c:561
 msgid "Name contains"
 msgstr "Naam bevat"
 
 # addressbook/contact-editor/e-contact-editor.c:808

 # calendar/gui/event-editor.c:1282

-#: addressbook/gui/component/addressbook.c:535
+#: addressbook/gui/component/addressbook.c:562
 msgid "Email contains"
 msgstr "E-mail bevat"
 
 # addressbook/gui/component/addressbook.c:1097

-#: addressbook/gui/component/addressbook.c:621
+#: addressbook/gui/component/addressbook.c:648
 msgid "The URI that the Folder Browser will display"
 msgstr "De URI die de Map Bladeraar zal laten zien"
 
-#: addressbook/gui/component/e-ldap-storage.c:88
-msgid "External Directories"
-msgstr "Externe Directories"
-
-# addressbook/gui/component/ldap-server-dialog.glade.h:7

-# composer/e-msg-composer-attachment.glade.h:9

-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/e-msg-composer-attachment.glade.h:7
-#: po/tmp/ldap-server-dialog.glade.h:6
-msgid "Description:"
-msgstr "Beschrijving:"
+#: addressbook/gui/component/addressbook-storage.c:95
+#, fuzzy
+msgid "Other Contacts"
+msgstr "Andere Snelkoppelingen"
 
 # addressbook/gui/component/ldap-server-dialog.glade.h:8

-#: po/tmp/ldap-server-dialog.glade.h:7
-msgid "LDAP Server:"
+#: addressbook/gui/component/addressbook-config.c:139
+#, fuzzy
+msgid "LDAP Server"
 msgstr "LDAP Server:"
 
-# addressbook/gui/component/ldap-server-dialog.glade.h:11

-# composer/e-msg-composer-address-dialog.glade.h:8

-#: po/tmp/ldap-server-dialog.glade.h:8
-msgid "Name:"
-msgstr "Naam:"
+# widgets/e-table/e-table-config.glade.h:10

+#: addressbook/gui/component/addressbook-config.c:141
+#, fuzzy
+msgid "File"
+msgstr "_Bestand"
 
-# addressbook/gui/component/ldap-server-dialog.glade.h:9

-#: po/tmp/ldap-server-dialog.glade.h:9
-msgid "Port Number:"
+# addressbook/gui/component/addressbook.c:593

+#: addressbook/gui/component/addressbook-config.c:144
+#, fuzzy
+msgid "Unknown addressbook type"
+msgstr "Kan het adresboek niet openen"
+
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "None (anonymous mode)"
+msgstr ""
+
+# mail/folder-browser-factory.c:101

+#: 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 "Wachtwoord"
+
+#: addressbook/gui/component/addressbook-config.c:157
+msgid "SASL"
+msgstr ""
+
+# shell/e-storage.c:434

+#: addressbook/gui/component/addressbook-config.c:160
+#, fuzzy
+msgid "Unknown auth type"
+msgstr "Onbekende fout"
+
+# composer/e-msg-composer-address-dialog.c:191

+# composer/e-msg-composer-address-dialog.c:199 composer/e-msg-composer.c:947

+#: addressbook/gui/component/addressbook-config.c:169
+#, fuzzy
+msgid "Base"
+msgstr "Plakken"
+
+#: addressbook/gui/component/addressbook-config.c:171
+#, fuzzy
+msgid "One"
+msgstr "Eigenaar:"
+
+#: addressbook/gui/component/addressbook-config.c:173
+#, fuzzy
+msgid "Subtree"
+msgstr "Aanmelden"
+
+#: 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 "Onthoud dit wachtwoord"
+
+# calendar/gui/gncal-todo.c:718 calendar/gui/gncal-todo.c:722

+#: addressbook/gui/component/addressbook-config.c:360
+#: mail/mail-config-druid.glade.h:34
+#, fuzzy
+msgid "Host:"
+msgstr "Uren"
+
+# calendar/gui/gncal-todo.c:190

+#: addressbook/gui/component/addressbook-config.c:361
+msgid "Port:"
 msgstr "Poort:"
 
 # addressbook/gui/component/ldap-server-dialog.glade.h:10

-#: po/tmp/ldap-server-dialog.glade.h:10
+#: addressbook/gui/component/addressbook-config.c:364
 msgid "Root DN:"
 msgstr "Wortel DN:"
 
+# composer/e-msg-composer-address-dialog.glade.h:9

+#: addressbook/gui/component/addressbook-config.c:384
+#, fuzzy
+msgid "Search Scope:"
+msgstr "Zoeken"
+
+# mail/mail-config.c:739 mail/mail-config.c:819

+#: addressbook/gui/component/addressbook-config.c:438
+#: mail/mail-config-druid.glade.h:14 mail/mail-config-gui.c:943
+msgid "Authentication:"
+msgstr "Authenticatie:"
+
+# mail/mail-config.c:732

+#: addressbook/gui/component/addressbook-config.c:455
+#: mail/mail-config-druid.glade.h:52 mail/mail-config-gui.c:934
+msgid "Path:"
+msgstr "Pad:"
+
+# composer/e-msg-composer.c:676

+#: addressbook/gui/component/addressbook-config.c:460
+#, fuzzy
+msgid "Create path if it doesn't exist."
+msgstr "Het bestand bestaat niet."
+
+# addressbook/gui/component/addressbook.c:593

+#: addressbook/gui/component/addressbook-config.c:593
+#, fuzzy
+msgid "Edit Addressbook"
+msgstr "Opslaan in adresboek"
+
+# addressbook/gui/component/addressbook.c:593

+#: addressbook/gui/component/addressbook-config.c:595
+#, fuzzy
+msgid "Add Addressbook"
+msgstr "Opslaan in adresboek"
+
+#: 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/ldap-server-dialog.glade.h:11

+# composer/e-msg-composer-address-dialog.glade.h:8

+#: addressbook/gui/component/addressbook-config.c:616
+#: mail/mail-config-druid.glade.h:45
+msgid "Name:"
+msgstr "Naam:"
+
+# addressbook/gui/component/ldap-server-dialog.glade.h:7

+# composer/e-msg-composer-attachment.glade.h:9

+#: addressbook/gui/component/addressbook-config.c:617
+#: composer/e-msg-composer-attachment.glade.h:7
+msgid "Description:"
+msgstr "Beschrijving:"
+
+# mail/mail-config.c:1490

+#: addressbook/gui/component/addressbook-config.glade.h:7
+#, fuzzy
+msgid "Addressbook Sources"
+msgstr "Bron Toevoegen"
+
+# addressbook/contact-editor/e-contact-editor.c:852

+# addressbook/gui/component/addressbook.c:426 calendar/gui/gncal-todo.c:499

+# mail/folder-browser-factory.c:45

+#: 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 "Verwijderen"
+
+# calendar/gui/gncal-todo.c:488

+#: 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 "Bewerken"
+
+# composer/e-msg-composer-address-dialog.glade.h:10

+#: addressbook/gui/component/addressbook-config.glade.h:10
+msgid "Name"
+msgstr "Naam"
+
+#: addressbook/gui/component/addressbook-config.glade.h:11
+#, fuzzy
+msgid "URI"
+msgstr "URL"
+
 # addressbook/gui/component/addressbook.c:424

 #.
-#. * 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 "Vind..."
 
 # composer/e-msg-composer-address-dialog.glade.h:7

-#: po/tmp/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "Message Recipients"
 msgstr "Geaddresseerden"
 
-#: po/tmp/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "Select Names"
 msgstr "Selecteer namen"
 
-#: 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 "Selecteer naam uit lijst:"
 
 # composer/e-msg-composer-address-dialog.glade.h:9

@@ -1059,148 +1199,148 @@ msgstr "Zoeken"
 
 # addressbook/gui/component/alphabet.glade.h:8

 #.
-#. * 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"
 
 # addressbook/gui/component/alphabet.glade.h:9

-#: po/tmp/alphabet.glade.h:7
+#: addressbook/gui/widgets/alphabet.glade.h:7
 msgid "a"
 msgstr "a"
 
 # addressbook/gui/component/alphabet.glade.h:10

-#: po/tmp/alphabet.glade.h:8
+#: addressbook/gui/widgets/alphabet.glade.h:8
 msgid "b"
 msgstr "b"
 
 # addressbook/gui/component/alphabet.glade.h:11

-#: po/tmp/alphabet.glade.h:9
+#: addressbook/gui/widgets/alphabet.glade.h:9
 msgid "c"
 msgstr "c"
 
 # addressbook/gui/component/alphabet.glade.h:12

-#: po/tmp/alphabet.glade.h:10
+#: addressbook/gui/widgets/alphabet.glade.h:10
 msgid "d"
 msgstr "d"
 
 # addressbook/gui/component/alphabet.glade.h:13

-#: po/tmp/alphabet.glade.h:11
+#: addressbook/gui/widgets/alphabet.glade.h:11
 msgid "e"
 msgstr "e"
 
 # addressbook/gui/component/alphabet.glade.h:14

-#: po/tmp/alphabet.glade.h:12
+#: addressbook/gui/widgets/alphabet.glade.h:12
 msgid "f"
 msgstr "f"
 
 # addressbook/gui/component/alphabet.glade.h:15

-#: po/tmp/alphabet.glade.h:13
+#: addressbook/gui/widgets/alphabet.glade.h:13
 msgid "g"
 msgstr "g"
 
 # addressbook/gui/component/alphabet.glade.h:16

 # calendar/cal-util/timeutil.c:98

-#: calendar/cal-util/timeutil.c:100 po/tmp/alphabet.glade.h:14
+#: addressbook/gui/widgets/alphabet.glade.h:14
 msgid "h"
 msgstr "h"
 
 # addressbook/gui/component/alphabet.glade.h:17

-#: po/tmp/alphabet.glade.h:15
+#: addressbook/gui/widgets/alphabet.glade.h:15
 msgid "i"
 msgstr "i"
 
 # addressbook/gui/component/alphabet.glade.h:18

-#: po/tmp/alphabet.glade.h:16
+#: addressbook/gui/widgets/alphabet.glade.h:16
 msgid "j"
 msgstr "j"
 
 # addressbook/gui/component/alphabet.glade.h:19

-#: po/tmp/alphabet.glade.h:17
+#: addressbook/gui/widgets/alphabet.glade.h:17
 msgid "k"
 msgstr "k"
 
 # addressbook/gui/component/alphabet.glade.h:20

-#: po/tmp/alphabet.glade.h:18
+#: addressbook/gui/widgets/alphabet.glade.h:18
 msgid "l"
 msgstr "l"
 
 # addressbook/gui/component/alphabet.glade.h:21

-#: po/tmp/alphabet.glade.h:19
+#: addressbook/gui/widgets/alphabet.glade.h:19
 msgid "m"
 msgstr "m"
 
 # addressbook/gui/component/alphabet.glade.h:22

-#: po/tmp/alphabet.glade.h:20
+#: addressbook/gui/widgets/alphabet.glade.h:20
 msgid "n"
 msgstr "n"
 
 # addressbook/gui/component/alphabet.glade.h:23

-#: po/tmp/alphabet.glade.h:21
+#: addressbook/gui/widgets/alphabet.glade.h:21
 msgid "o"
 msgstr "o"
 
 # addressbook/gui/component/alphabet.glade.h:24

-#: po/tmp/alphabet.glade.h:22
+#: addressbook/gui/widgets/alphabet.glade.h:22
 msgid "p"
 msgstr "p"
 
 # addressbook/gui/component/alphabet.glade.h:25

-#: po/tmp/alphabet.glade.h:23
+#: addressbook/gui/widgets/alphabet.glade.h:23
 msgid "q"
 msgstr "q"
 
 # addressbook/gui/component/alphabet.glade.h:26

-#: po/tmp/alphabet.glade.h:24
+#: addressbook/gui/widgets/alphabet.glade.h:24
 msgid "r"
 msgstr "r"
 
 # addressbook/gui/component/alphabet.glade.h:27

-#: po/tmp/alphabet.glade.h:25
+#: addressbook/gui/widgets/alphabet.glade.h:25
 msgid "s"
 msgstr "s"
 
 # addressbook/gui/component/alphabet.glade.h:28

-#: po/tmp/alphabet.glade.h:26
+#: addressbook/gui/widgets/alphabet.glade.h:26
 msgid "t"
 msgstr "t"
 
 # addressbook/gui/component/alphabet.glade.h:29

-#: po/tmp/alphabet.glade.h:27
+#: addressbook/gui/widgets/alphabet.glade.h:27
 msgid "u"
 msgstr "u"
 
 # addressbook/gui/component/alphabet.glade.h:30

-#: po/tmp/alphabet.glade.h:28
+#: addressbook/gui/widgets/alphabet.glade.h:28
 msgid "v"
 msgstr "v"
 
 # addressbook/gui/component/alphabet.glade.h:31

-#: po/tmp/alphabet.glade.h:29
+#: addressbook/gui/widgets/alphabet.glade.h:29
 msgid "w"
 msgstr "w"
 
 # addressbook/gui/component/alphabet.glade.h:32

-#: po/tmp/alphabet.glade.h:30
+#: addressbook/gui/widgets/alphabet.glade.h:30
 msgid "x"
 msgstr "x"
 
 # addressbook/gui/component/alphabet.glade.h:33

-#: po/tmp/alphabet.glade.h:31
+#: addressbook/gui/widgets/alphabet.glade.h:31
 msgid "y"
 msgstr "y"
 
 # addressbook/gui/component/alphabet.glade.h:34

-#: po/tmp/alphabet.glade.h:32
+#: addressbook/gui/widgets/alphabet.glade.h:32
 msgid "z"
 msgstr "z"
 
 # addressbook/gui/component/addressbook.c:943

 # addressbook/gui/minicard/e-minicard.c:330

-#: addressbook/gui/widgets/e-addressbook-view.c:417
-#: addressbook/gui/widgets/e-minicard.c:338
+#: addressbook/gui/widgets/e-addressbook-view.c:451
+#: addressbook/gui/widgets/e-minicard.c:374
 msgid "Save as VCard"
 msgstr "Opslaan als VCard"
 
@@ -1226,36 +1366,36 @@ msgstr ""
 
 # addressbook/printing/e-contact-print.glade.h:23

 #.
-#. * 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 "10 punts Tahoma"
 
 # addressbook/printing/e-contact-print.glade.h:25

-#: po/tmp/e-contact-print.glade.h:7
+#: addressbook/printing/e-contact-print.glade.h:7
 msgid "8 pt. Tahoma"
 msgstr "8 punts Tahoma"
 
 # addressbook/printing/e-contact-print.glade.h:18

-#: po/tmp/e-contact-print.glade.h:8
+#: addressbook/printing/e-contact-print.glade.h:8
 msgid "Blank forms at end:"
 msgstr "Lege formulieren op het einde:"
 
 # addressbook/printing/e-contact-print.glade.h:24

-#: po/tmp/e-contact-print.glade.h:9
+#: addressbook/printing/e-contact-print.glade.h:9
 msgid "Body"
 msgstr "Inhoud"
 
 # addressbook/printing/e-contact-print.glade.h:38

-#: po/tmp/e-contact-print.glade.h:10
+#: addressbook/printing/e-contact-print.glade.h:10
 msgid "Bottom:"
 msgstr "Onderkant:"
 
 # addressbook/printing/e-contact-print.glade.h:32

 # addressbook/printing/e-contact-print.glade.h:44

-#: po/tmp/e-contact-print.glade.h:11
+#: addressbook/printing/e-contact-print.glade.h:11
 msgid "Dimensions:"
 msgstr "Dimensies:"
 
@@ -1263,203 +1403,190 @@ msgstr "Dimensies:"
 # addressbook/printing/e-contact-print.glade.h:21

 # addressbook/printing/e-contact-print.glade.h:51

 # addressbook/printing/e-contact-print.glade.h:54

-#: po/tmp/e-contact-print.glade.h:12
+#: addressbook/printing/e-contact-print.glade.h:12
 msgid "Font..."
 msgstr "Lettertype..."
 
 # addressbook/printing/e-contact-print.glade.h:19

-#: po/tmp/e-contact-print.glade.h:13
+#: addressbook/printing/e-contact-print.glade.h:13
 msgid "Fonts"
 msgstr "Lettertypen"
 
 # addressbook/printing/e-contact-print.glade.h:53

-#: po/tmp/e-contact-print.glade.h:14
+#: addressbook/printing/e-contact-print.glade.h:14
 msgid "Footer:"
 msgstr "Voet:"
 
 # addressbook/printing/e-contact-print.glade.h:28

-#: po/tmp/e-contact-print.glade.h:15
+#: addressbook/printing/e-contact-print.glade.h:15
 msgid "Format"
 msgstr "Formaat"
 
 # addressbook/printing/e-contact-print.glade.h:52

-#: po/tmp/e-contact-print.glade.h:16
+#: addressbook/printing/e-contact-print.glade.h:16
 msgid "Header"
 msgstr "Kop"
 
 # addressbook/printing/e-contact-print.glade.h:56

-#: po/tmp/e-contact-print.glade.h:17
+#: addressbook/printing/e-contact-print.glade.h:17
 msgid "Header/Footer"
 msgstr "Koptekst/Voettekst"
 
 # addressbook/printing/e-contact-print.glade.h:22

-#: po/tmp/e-contact-print.glade.h:18
+#: addressbook/printing/e-contact-print.glade.h:18
 msgid "Headings"
 msgstr "Koppen"
 
 # addressbook/printing/e-contact-print.glade.h:15

-#: po/tmp/e-contact-print.glade.h:19
+#: addressbook/printing/e-contact-print.glade.h:19
 msgid "Headings for each letter"
 msgstr "Koppen voor elke letter"
 
 # addressbook/printing/e-contact-print.glade.h:34

 # addressbook/printing/e-contact-print.glade.h:46

-#: po/tmp/e-contact-print.glade.h:20
+#: addressbook/printing/e-contact-print.glade.h:20
 msgid "Height:"
 msgstr "Hoogte:"
 
 # addressbook/printing/e-contact-print.glade.h:13

-#: po/tmp/e-contact-print.glade.h:21
+#: addressbook/printing/e-contact-print.glade.h:21
 msgid "Immediately follow each other"
 msgstr "Elkaar direct opvolgend"
 
 # addressbook/printing/e-contact-print.glade.h:11

-#: po/tmp/e-contact-print.glade.h:22
+#: addressbook/printing/e-contact-print.glade.h:22
 msgid "Include:"
 msgstr "Insluiten:"
 
 # addressbook/printing/e-contact-print.glade.h:49

-#: po/tmp/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23
 msgid "Landscape"
 msgstr "Liggend"
 
 # addressbook/printing/e-contact-print.glade.h:39

-#: po/tmp/e-contact-print.glade.h:24
+#: addressbook/printing/e-contact-print.glade.h:24
 msgid "Left:"
 msgstr "Links:"
 
 # addressbook/printing/e-contact-print.glade.h:14

-#: po/tmp/e-contact-print.glade.h:25
+#: addressbook/printing/e-contact-print.glade.h:25
 msgid "Letter tabs on side"
 msgstr "Letter tabs aan de kant"
 
 # addressbook/printing/e-contact-print.glade.h:36

-#: po/tmp/e-contact-print.glade.h:26
+#: addressbook/printing/e-contact-print.glade.h:26
 msgid "Margins"
 msgstr "Marges"
 
 # addressbook/printing/e-contact-print.glade.h:17

-#: po/tmp/e-contact-print.glade.h:27
+#: addressbook/printing/e-contact-print.glade.h:27
 msgid "Number of columns:"
 msgstr "Aantal kolommen:"
 
 # addressbook/printing/e-contact-print.glade.h:10

-#: po/tmp/e-contact-print.glade.h:28
+#: addressbook/printing/e-contact-print.glade.h:28
 msgid "Options"
 msgstr "Opties"
 
 # addressbook/printing/e-contact-print.glade.h:47

-#: po/tmp/e-contact-print.glade.h:29
+#: addressbook/printing/e-contact-print.glade.h:29
 msgid "Orientation"
 msgstr "Orientatie"
 
 # addressbook/printing/e-contact-print.glade.h:41

-#: po/tmp/e-contact-print.glade.h:30
+#: addressbook/printing/e-contact-print.glade.h:30
 msgid "Page"
 msgstr "Pagina"
 
 # addressbook/printing/e-contact-print.glade.h:7

-#: po/tmp/e-contact-print.glade.h:31
+#: addressbook/printing/e-contact-print.glade.h:31
 msgid "Page Setup:"
 msgstr "Pagina Instellingen:"
 
 # addressbook/printing/e-contact-print.glade.h:29

 # addressbook/printing/e-contact-print.glade.h:50

-#: po/tmp/e-contact-print.glade.h:32
+#: addressbook/printing/e-contact-print.glade.h:32
 msgid "Paper"
 msgstr "Paper"
 
 # addressbook/printing/e-contact-print.glade.h:35

-#: po/tmp/e-contact-print.glade.h:33
+#: addressbook/printing/e-contact-print.glade.h:33
 msgid "Paper source:"
 msgstr "Papier bron:"
 
 # addressbook/printing/e-contact-print.glade.h:48

-#: po/tmp/e-contact-print.glade.h:34
+#: addressbook/printing/e-contact-print.glade.h:34
 msgid "Portrait"
 msgstr "Staand"
 
 # addressbook/printing/e-contact-print.glade.h:9

-#: po/tmp/e-contact-print.glade.h:35
+#: addressbook/printing/e-contact-print.glade.h:35
 msgid "Preview:"
 msgstr "Voorbeeld:"
 
 # addressbook/printing/e-contact-print.glade.h:27

-#: po/tmp/e-contact-print.glade.h:36
+#: addressbook/printing/e-contact-print.glade.h:36
 msgid "Print using gray shading"
 msgstr "Maak gebruik van grijze schaduw op de afdruk"
 
 # addressbook/printing/e-contact-print.glade.h:55

-#: po/tmp/e-contact-print.glade.h:37
+#: addressbook/printing/e-contact-print.glade.h:37
 msgid "Reverse on even pages"
 msgstr "Omgedraaid afdrukken op even pagina's"
 
 # addressbook/printing/e-contact-print.glade.h:40

-#: po/tmp/e-contact-print.glade.h:38
+#: addressbook/printing/e-contact-print.glade.h:38
 msgid "Right:"
 msgstr "Rechts:"
 
 # addressbook/printing/e-contact-print.glade.h:12

-#: po/tmp/e-contact-print.glade.h:39
+#: addressbook/printing/e-contact-print.glade.h:39
 msgid "Sections:"
 msgstr "Secties:"
 
 # addressbook/printing/e-contact-print.glade.h:26

-#: po/tmp/e-contact-print.glade.h:40
+#: addressbook/printing/e-contact-print.glade.h:40
 msgid "Shading"
 msgstr "Shaduw"
 
 # addressbook/printing/e-contact-print.glade.h:42

-#: po/tmp/e-contact-print.glade.h:41
+#: addressbook/printing/e-contact-print.glade.h:41
 msgid "Size:"
 msgstr "Grootte:"
 
 # addressbook/printing/e-contact-print.glade.h:16

-#: po/tmp/e-contact-print.glade.h:42
+#: addressbook/printing/e-contact-print.glade.h:42
 msgid "Start on a new page"
 msgstr "Begin op een nieuwe pagina"
 
 # addressbook/printing/e-contact-print.glade.h:8

-#: po/tmp/e-contact-print.glade.h:43
+#: addressbook/printing/e-contact-print.glade.h:43
 msgid "Style name:"
 msgstr "Stijl Naam:"
 
 # addressbook/printing/e-contact-print.glade.h:37

-#: po/tmp/e-contact-print.glade.h:44
+#: addressbook/printing/e-contact-print.glade.h:44
 msgid "Top:"
 msgstr "Top:"
 
 # addressbook/printing/e-contact-print.glade.h:30

-#: 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 "Type:"
 
 # addressbook/printing/e-contact-print.glade.h:33

 # addressbook/printing/e-contact-print.glade.h:45

-#: po/tmp/e-contact-print.glade.h:46
+#: addressbook/printing/e-contact-print.glade.h:46
 msgid "Width:"
 msgstr "Breedte:"
 
 # addressbook/printing/e-contact-print.glade.h:31

 # addressbook/printing/e-contact-print.glade.h:43

-#: po/tmp/e-contact-print.glade.h:47
+#: addressbook/printing/e-contact-print.glade.h:47
 msgid "label26"
 msgstr "label26"
 
-# calendar/cal-util/timeutil.c:96 calendar/gui/print.c:544

-#. String to use in 12-hour time format for times in the morning.
-#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:550
-#: calendar/gui/e-week-view.c:288 calendar/gui/print.c:605
-msgid "am"
-msgstr "am"
-
-# calendar/cal-util/timeutil.c:96 calendar/gui/print.c:543

-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:553
-#: calendar/gui/e-week-view.c:291 calendar/gui/print.c:604
-msgid "pm"
-msgstr "pm"
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 msgid "Evolution Calendar Conduit"
 msgstr "Evolution Kalender Kanaal"
@@ -1468,13 +1595,13 @@ msgstr "Evolution Kalender Kanaal"
 msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr "Configuratie programma voor het evolution kalender kanaal.\n"
 
-#: calendar/conduits/calendar/calendar-conduit.c:671
-#: calendar/conduits/todo/todo-conduit.c:479
+#: calendar/conduits/calendar/calendar-conduit.c:686
+#: calendar/conduits/todo/todo-conduit.c:501
 msgid "Error while communicating with calendar server"
 msgstr "Fout tijdens communiceren met kalender server"
 
-#: calendar/conduits/calendar/calendar-conduit.c:770
-#: calendar/conduits/calendar/calendar-conduit.c:773
+#: calendar/conduits/calendar/calendar-conduit.c:785
+#: calendar/conduits/calendar/calendar-conduit.c:788
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kon het Kalender applicatie blok niet uit de pilot lezen"
 
@@ -1487,141 +1614,176 @@ msgstr "Evolution ToDo Kanaal"
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr "Configuratie programma voor het evolution to-do kanaal.\n"
 
-#: calendar/conduits/todo/todo-conduit.c:578
-#: calendar/conduits/todo/todo-conduit.c:581
+#: calendar/conduits/todo/todo-conduit.c:600
+#: calendar/conduits/todo/todo-conduit.c:603
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kon het to-do applicatie blok niet uit de pilot lezen"
 
-# calendar/gui/calendar-commands.c:56

-#: calendar/gui/calendar-commands.c:60
-msgid "Outline:"
-msgstr "Buitenlijn:"
+#.
+#. * 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:57

-#: calendar/gui/calendar-commands.c:61
-msgid "Headings:"
-msgstr "Koppen:"
+#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:7
+msgid "Factory for the sample Calendar control"
+msgstr ""
 
-# calendar/gui/calendar-commands.c:58

-#: calendar/gui/calendar-commands.c:62
-msgid "Empty days:"
-msgstr "Lege dagen:"
+#.
+#. * 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:59

-#: calendar/gui/calendar-commands.c:63
-msgid "Appointments:"
-msgstr "Afspraaken:"
+# calendar/gui/calendar-commands.c:659

+#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:7
+#, fuzzy
+msgid "Calendar Server"
+msgstr "Kalender"
 
-# calendar/gui/calendar-commands.c:60

-#: calendar/gui/calendar-commands.c:64
-msgid "Highlighted day:"
-msgstr "Gemarkeerde dag:"
+# mail/component-factory.c:196

+#.
+#. * 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
+#, fuzzy
+msgid "Evolution calendar executive summary component."
+msgstr "Kan het post samenvattings gedeelte van Evolution niet initialiseren."
 
-# calendar/gui/calendar-commands.c:61

-#: calendar/gui/calendar-commands.c:65
-msgid "Day numbers:"
-msgstr "Dag nummers:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Evolution Kalender Kanaal"
 
-# calendar/gui/calendar-commands.c:62

-#: calendar/gui/calendar-commands.c:66
-msgid "Current day's number:"
-msgstr "Nummer van vandaag:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Evolution component for handling the calendar."
+msgstr ""
 
-# calendar/gui/calendar-commands.c:63

-#: calendar/gui/calendar-commands.c:67
-msgid "To-Do item that is not yet due:"
-msgstr "To-Do item dat nog niet verlopen is:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+msgid "Factory for the Calendar Summary component."
+msgstr ""
 
-# calendar/gui/calendar-commands.c:64

-#: calendar/gui/calendar-commands.c:68
-msgid "To-Do item that is due today:"
-msgstr "To-Do item dat vandaag af moet:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#, fuzzy
+msgid "Factory for the Evolution calendar component."
+msgstr "Configuratie programma voor het evolution kalender kanaal.\n"
 
-# calendar/gui/calendar-commands.c:65

-#: calendar/gui/calendar-commands.c:69
-msgid "To-Do item that is overdue:"
-msgstr "To-Do item dat af moest zijn:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+msgid "Factory for the calendar iTip view control"
+msgstr ""
+
+# calendar/gui/gnome-cal.c:453 calendar/gui/gnome-cal.c:1064

+# calendar/gui/gnome-cal.c:1120

+#: 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 "Herinnering van je afspraak op "
+
+# calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1056

+#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:8
+msgid "Snooze"
+msgstr "Sluimeren"
+
+# calendar/gui/gnome-cal.c:1069 calendar/gui/gnome-cal.c:1124

+#. 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 "Ok"
 
 # calendar/gui/calendar-commands.c:434

-#: calendar/gui/calendar-commands.c:354
+#: calendar/gui/calendar-commands.c:229
 msgid "File not found"
 msgstr "Bestand niet gevonden"
 
 # calendar/gui/calendar-commands.c:456

-#: calendar/gui/calendar-commands.c:378
+#: calendar/gui/calendar-commands.c:253
 msgid "Open calendar"
 msgstr "Open kalender"
 
 # calendar/gui/calendar-commands.c:495

-#: calendar/gui/calendar-commands.c:417
+#: calendar/gui/calendar-commands.c:295
 msgid "Save calendar"
 msgstr "Kalender opslaan"
 
+#: calendar/gui/calendar-commands.c:432
+msgid ""
+"Could not create the calendar view.  Please check your ORBit and OAF setup."
+msgstr ""
+
 # calendar/gui/event-editor.c:1745

 #. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:282
+#: 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:2498
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
 msgstr "%a %d-%m-%Y"
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:286 calendar/gui/calendar-model.c:736
+#: calendar/gui/calendar-model.c:288 calendar/gui/calendar-model.c:738
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d-%m-%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time,
 #. in 12-hour format.
-#: calendar/gui/calendar-model.c:290 calendar/gui/calendar-model.c:739
+#: calendar/gui/calendar-model.c:292 calendar/gui/calendar-model.c:741
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d-%m-%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:344 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 "Publiekelijk"
 
-#: calendar/gui/calendar-model.c:347 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 "Prive"
 
-#: calendar/gui/calendar-model.c:350 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 "Vertrouwelijk"
 
 # shell/e-storage.c:434

-#: calendar/gui/calendar-model.c:353 calendar/gui/calendar-model.c:521
+#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:523
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: calendar/gui/calendar-model.c:441
+#: calendar/gui/calendar-model.c:443
 msgid "N"
 msgstr "N"
 
 # calendar/gui/print.c:326

-#: calendar/gui/calendar-model.c:441
+#: calendar/gui/calendar-model.c:443
 msgid "S"
 msgstr "Z"
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:445
 msgid "E"
 msgstr "O"
 
 # calendar/gui/print.c:326

-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:445
 msgid "W"
 msgstr "W"
 
 # mail/mail-config.c:1220

-#: calendar/gui/calendar-model.c:515
+#: calendar/gui/calendar-model.c:517
 msgid "Transparent"
 msgstr "Doorzichtig"
 
-#: calendar/gui/calendar-model.c:518
+#: calendar/gui/calendar-model.c:520
 msgid "Opaque"
 msgstr "Mat"
 
-#: calendar/gui/calendar-model.c:744
+#: calendar/gui/calendar-model.c:746
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1633,35 +1795,35 @@ msgstr ""
 "%s"
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:845 calendar/gui/calendar-model.c:893
+#: 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:1274 widgets/misc/e-dateedit.c:1455
+#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
 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:863
+#: 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:866
+#: 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:870
+#: 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:873
+#: calendar/gui/calendar-model.c:875
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
-#: calendar/gui/calendar-model.c:993
+#: calendar/gui/calendar-model.c:995
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1671,14 +1833,40 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1033
+#: calendar/gui/calendar-model.c:1035
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Het percentage mag niet kleiner zijn dan 0 en niet groter dan 100"
 
-#: calendar/gui/calendar-model.c:1073
+#: calendar/gui/calendar-model.c:1075
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "De prioriteit mag niet kleiner zijn dan 1 en niet groter dan 9"
 
+# calendar/gui/event-editor.c:1745

+#: calendar/gui/calendar-summary.c:81
+#, fuzzy
+msgid "%A, %e %B %Y"
+msgstr "%A, %d %B, %Y"
+
+# composer/e-msg-composer.c:494

+#: calendar/gui/calendar-summary.c:224
+#, fuzzy
+msgid "<b>Error loading calendar</b>"
+msgstr "Error bij openen bestand: %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/print.c:1084

+#: calendar/gui/calendar-summary.c:293
+#, fuzzy
+msgid "Loading Calendar"
+msgstr "Druk Kalender af"
+
 # calendar/gui/control-factory.c:136

 #: calendar/gui/control-factory.c:125
 msgid "The URI that the calendar will display"
@@ -1701,410 +1889,461 @@ msgstr "Geen samenvatting beschikbaar."
 
 # calendar/gui/dialogs/alarm-notify.glade.h:7

 #.
-#. * 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 "Sluiten"
 
 # calendar/gui/dialogs/alarm-notify.glade.h:9

-#: po/tmp/alarm-notify.glade.h:7
+#: calendar/gui/dialogs/alarm-notify.glade.h:7
 msgid "Edit appointment"
 msgstr "Afspraak bewerken"
 
-# calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1056

-#: calendar/gui/gnome-cal.c:1466 po/tmp/alarm-notify.glade.h:8
-msgid "Snooze"
-msgstr "Sluimeren"
-
 # calendar/gui/dialogs/alarm-notify.glade.h:10

-#: po/tmp/alarm-notify.glade.h:9
+#: calendar/gui/dialogs/alarm-notify.glade.h:9
 msgid "Snooze time (minutes)"
 msgstr "Sluimer tijd (minuten)"
 
 # calendar/gui/getdate.y:426

 #.
-#. * 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 minuten"
 
 # calendar/gui/getdate.y:426

-#: po/tmp/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "10 minutes"
 msgstr "10 minuten"
 
 # calendar/gui/prop.c:335

-#: po/tmp/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "12 hour (am/pm)"
 msgstr "12 uurs (am/pm)"
 
 # calendar/gui/getdate.y:426

-#: po/tmp/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "15 minutes"
 msgstr "15 minuten"
 
 # calendar/gui/prop.c:336

-#: po/tmp/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "24 hour"
 msgstr "24 uurs"
 
 # calendar/gui/getdate.y:426

-#: po/tmp/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "30 minutes"
 msgstr "30 minuten"
 
 # calendar/gui/getdate.y:426

-#: po/tmp/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "60 minutes"
 msgstr "60 minuten"
 
 # calendar/gui/prop.c:803

-#: po/tmp/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Alarms timeout after"
 msgstr "Alarm stopt na"
 
 # calendar/gui/prop.c:780

-#: po/tmp/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Audio Alarms"
 msgstr "Audio Alarmen"
 
-#: po/tmp/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Beep when alarm windows appear."
 msgstr "Piep als het alarm venster verschijnt."
 
 # calendar/gui/calendar-commands.c:659

-#: po/tmp/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Calendar"
 msgstr "Kalender"
 
 # calendar/gui/calendar-commands.c:696 calendar/gui/prop.c:712

-#: po/tmp/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Calendar Preferences"
 msgstr "Kalender Instellingen"
 
 # calendar/gui/prop.c:522

-#: po/tmp/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Colors"
 msgstr "Kleuren"
 
-#: po/tmp/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Compress weekends"
 msgstr "Weekeinden comprimeren"
 
-#: po/tmp/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Date navigator options"
 msgstr "Datum navigator instellingen"
 
 # calendar/gui/prop.c:836

-#: po/tmp/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Defaults"
 msgstr "Standaard instellingen"
 
-#: po/tmp/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Display options"
 msgstr "Weergave instellingen"
 
 # calendar/gui/gncal-todo.c:426 calendar/gui/prop.c:604

-#: po/tmp/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Due Date"
 msgstr "Verloop Datum"
 
 # calendar/gui/prop.c:820

-#: po/tmp/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "Enable snoozing for"
 msgstr "Maak sluimeren mogelijk voor"
 
-#: po/tmp/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "End of day:"
 msgstr "Eind van dag:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:26
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "First day of week:"
 msgstr "Eerste dag van de week:"
 
 # calendar/gui/gnome-month-item.c:741

-#: 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 "Vrij"
 
 # calendar/gui/getdate.y:413

-#: 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 "Vrijdag"
 
 # calendar/gui/calendar-commands.c:60

-#: po/tmp/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Highlight"
 msgstr "Markeer"
 
 # calendar/gui/prop.c:648

-#: po/tmp/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "Items Due Today"
 msgstr "Items die vandaag verlopen"
 
-#: po/tmp/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "Items Due Today:"
 msgstr "Items die vandaag verlopen:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Items Not Yet Due"
 msgstr "Items die nog niet zijn verlopen"
 
-#: po/tmp/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Items Not Yet Due:"
 msgstr "Items die nog niet zijn verlopen:"
 
 # calendar/gui/gnome-month-item.c:737

-#: 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 "Maa"
 
 # calendar/gui/prop.c:348

-#: 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 "Maandag"
 
 # calendar/gui/prop.c:642

-#: po/tmp/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "Overdue Items"
 msgstr "Verlopen items"
 
-#: po/tmp/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Overdue Items:"
 msgstr "Verlopen items:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Pick a color"
 msgstr "Kies een kleur"
 
 # calendar/gui/gncal-todo.c:427 calendar/gui/prop.c:605

 # mail/message-list.c:474

-#: 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 "Prioriteit"
 
 # calendar/gui/gnome-cal.c:453 calendar/gui/gnome-cal.c:1064

 # calendar/gui/gnome-cal.c:1120

-#: po/tmp/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Remind me of all appointments"
 msgstr "Herinner me van alle afspraken"
 
-#: po/tmp/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Reminders"
 msgstr "Herinneringen"
 
 # calendar/gui/gnome-month-item.c:742

-#: 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 "Zat"
 
 # calendar/gui/getdate.y:414

-#: 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 "Zaterdag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Show"
 msgstr "Weergeven"
 
 # calendar/gui/event-editor.c:298

-#: po/tmp/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "Show appointment end times"
 msgstr "Geef eindtijden afspraken weer"
 
 # calendar/gui/calendar-commands.c:528

-#: po/tmp/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Show week numbers"
 msgstr "Geef weeknummers weer"
 
 # calendar/gui/goto.c:264

-#: po/tmp/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "Start of day:"
 msgstr "Start van dag:"
 
 # calendar/gui/gnome-month-item.c:736

 #. 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 "Zon"
 
 # calendar/gui/prop.c:347

-#: 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 "Zondag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "TaskPad"
 msgstr "TaakBlad"
 
 # calendar/gui/gnome-month-item.c:740

-#: 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 "Don"
 
 # calendar/gui/getdate.y:410

-#: 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 "Donderdag"
 
 # calendar/gui/prop.c:606

-#: po/tmp/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "Time Until Due"
 msgstr "Tijd Tot Verlooptijd"
 
 # calendar/gui/e-day-view-time-item.c:391

-#: po/tmp/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "Time divisions:"
 msgstr "Tijd delingen:"
 
 # calendar/gui/prop.c:334

-#: po/tmp/cal-prefs-dialog.glade.h:55
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "Time format:"
 msgstr "Tijdsformaat:"
 
 # calendar/gui/gnome-month-item.c:738

-#: 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 "Din"
 
 # calendar/gui/getdate.y:406

-#: 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 "Dinsdag"
 
 # calendar/gui/prop.c:780

-#: po/tmp/cal-prefs-dialog.glade.h:58
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "Visual Alarms"
 msgstr "Visuele Alarmen"
 
 # calendar/gui/gnome-month-item.c:739

-#: 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 "Woe"
 
 # calendar/gui/getdate.y:408

-#: 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 "Woensdag"
 
 # calendar/gui/getdate.y:423

-#: po/tmp/cal-prefs-dialog.glade.h:61
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "Work week"
 msgstr "Werk week"
 
-#: po/tmp/cal-prefs-dialog.glade.h:62
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "minutes before they occur."
 msgstr "minuten voor ze plaatsvinden."
 
 # calendar/gui/prop.c:814 calendar/gui/prop.c:831

-#: po/tmp/cal-prefs-dialog.glade.h:63
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "seconds."
 msgstr "seconden."
 
+#: calendar/gui/dialogs/delete-comp.c:62
+#, fuzzy, c-format
+msgid "Are you sure you want to delete the appointment `%s'?"
+msgstr ""
+"Weet u zeker dat u dit contact\n"
+"wilt verwijderen?"
+
+#: calendar/gui/dialogs/delete-comp.c:65
+#, fuzzy
+msgid "Are you sure you want to delete this untitled appointment?"
+msgstr ""
+"Weet u zeker dat u dit contact\n"
+"wilt verwijderen?"
+
+#: calendar/gui/dialogs/delete-comp.c:71
+#, fuzzy, c-format
+msgid "Are you sure you want to delete the task `%s'?"
+msgstr ""
+"Weet u zeker dat u dit contact\n"
+"wilt verwijderen?"
+
+#: calendar/gui/dialogs/delete-comp.c:74
+#, fuzzy
+msgid "Are you sure you want to delete this untitled task?"
+msgstr ""
+"Weet u zeker dat u dit contact\n"
+"wilt verwijderen?"
+
+#: calendar/gui/dialogs/delete-comp.c:80
+#, fuzzy, c-format
+msgid "Are you sure you want to delete the journal entry `%s'?"
+msgstr ""
+"Weet u zeker dat u dit contact\n"
+"wilt verwijderen?"
+
+#: calendar/gui/dialogs/delete-comp.c:83
+#, fuzzy
+msgid "Are you sure want to delete this untitled journal entry?"
+msgstr ""
+"Weet u zeker dat u dit contact\n"
+"wilt verwijderen?"
+
 #.
-#. * 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 "% Af:"
 
-#: po/tmp/task-editor-dialog.glade.h:7
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
 msgid "C_lassification:"
 msgstr "C_lassificatie:"
 
 # filter/filter-editor.c:212

-#: po/tmp/task-editor-dialog.glade.h:9
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
 msgid "Cancelled"
 msgstr "Geannuleerd"
 
-#: po/tmp/task-editor-dialog.glade.h:10
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
 msgid "Completed"
 msgstr "Gedaan"
 
 # calendar/gui/gncal-todo.c:207

-#: po/tmp/task-editor-dialog.glade.h:12
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
 msgid "Date Completed:"
 msgstr "Datum Afgemaakt:"
 
 # addressbook/printing/e-contact-print.glade.h:34

 # addressbook/printing/e-contact-print.glade.h:46

-#: po/tmp/task-editor-dialog.glade.h:14
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
 msgid "High"
 msgstr "Hoog"
 
-#: po/tmp/task-editor-dialog.glade.h:15
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
 msgid "In Progress"
 msgstr "In Uitvoer"
 
 # calendar/gui/getdate.y:438

-#: po/tmp/task-editor-dialog.glade.h:16
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
 msgid "Low"
 msgstr "Laag"
 
 # shell/e-shell-view.c:596

 #. 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
-#: widgets/misc/e-dateedit.c:422 widgets/misc/e-dateedit.c:1331
-#: widgets/misc/e-dateedit.c:1446
+#: 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 "Geen"
 
 # addressbook/printing/e-contact-print.glade.h:28

-#: po/tmp/task-editor-dialog.glade.h:18
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
 msgid "Normal"
 msgstr "Normaal"
 
-#: po/tmp/task-editor-dialog.glade.h:19
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
 msgid "Not Started"
 msgstr "Niet Gestart"
 
 # calendar/gui/gncal-todo.c:425

-#: po/tmp/task-editor-dialog.glade.h:22
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
 msgid "S_ummary"
 msgstr "S_amenvatting"
 
-#: po/tmp/task-editor-dialog.glade.h:23
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
 msgid "Sta_rt Date:"
 msgstr "Sta_rt Datum:"
 
-#: po/tmp/task-editor-dialog.glade.h:24
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
 msgid "Task"
 msgstr "_Taak"
 
-#: po/tmp/task-editor-dialog.glade.h:25
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
 msgid "URL:"
 msgstr "URL:"
 
 # addressbook/contact-editor/e-contact-editor-strings.h:26

-#: po/tmp/task-editor-dialog.glade.h:26
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
 msgid "_Contacts..."
 msgstr "C_ontacten..."
 
 # addressbook/contact-editor/e-contact-editor-strings.h:31

-#: po/tmp/task-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
 msgid "_Due Date:"
 msgstr "_Verloop Datum:"
 
 # calendar/gui/gncal-todo.c:190

-#: po/tmp/task-editor-dialog.glade.h:28
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
 msgid "_Priority:"
 msgstr "_Prioriteit:"
 
 # addressbook/contact-editor/e-contact-editor-strings.h:35

-#: po/tmp/task-editor-dialog.glade.h:29
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
 msgid "_Status:"
 msgstr "_Status:"
 
-#: po/tmp/task-editor-dialog.glade.h:30
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
 msgid "task-editor-dialog"
 msgstr "taak-bewerkings-dialoogvenster"
 
@@ -2113,30 +2352,30 @@ msgid "Edit Task"
 msgstr "Taak Bewerken"
 
 # calendar/gui/event-editor.c:294

-#: 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 "Geen opsomming"
 
 # calendar/gui/event-editor.c:298

-#: 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 "Afspraak - %s"
 
 # calendar/gui/event-editor.c:301

-#: 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 "Taak - %s"
 
 # calendar/gui/event-editor.c:304

-#: 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 "Dagboek Item - %s"
 
 # composer/e-msg-composer-attachment-bar.c:395

-#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3277
+#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3250
 #, fuzzy
 msgid "Do you want to save changes?"
 msgstr "Bezig met voorbereiden van wijzingen opslaan aan bericht..."
@@ -2157,17 +2396,6 @@ msgstr "Markeer als Gedaan"
 msgid "Mark the task complete"
 msgstr "Markeer de taak als gedaan"
 
-# addressbook/contact-editor/e-contact-editor.c:852

-# addressbook/gui/component/addressbook.c:426 calendar/gui/gncal-todo.c:499

-# mail/folder-browser-factory.c:45

-#: calendar/gui/e-calendar-table.c:342 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:479 mail/mail-view.c:165
-#: 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 "Verwijderen"
-
 # addressbook/contact-editor/e-contact-editor.c:853

 # calendar/gui/event-editor.c:1337 calendar/gui/gncal-todo.c:327

 #: calendar/gui/e-calendar-table.c:343
@@ -2183,7 +2411,7 @@ msgstr "%02i minuten delingen"
 # calendar/gui/event-editor.c:1745

 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1208
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1211
 #: calendar/gui/e-week-view-main-item.c:325
 msgid "%A %d %B"
 msgstr "%A %d %B"
@@ -2191,52 +2419,66 @@ msgstr "%A %d %B"
 # calendar/gui/event-editor.c:1745

 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1222
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1225
 #: calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1235
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1238
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
+# calendar/cal-util/timeutil.c:96 calendar/gui/print.c:544

+#. 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:610
+msgid "am"
+msgstr "am"
+
+# calendar/cal-util/timeutil.c:96 calendar/gui/print.c:543

+#. 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:609
+msgid "pm"
+msgstr "pm"
+
 # calendar/gui/e-day-view.c:2317 calendar/gui/e-day-view.c:2324

 # calendar/gui/e-day-view.c:2333 calendar/gui/e-week-view.c:2643

 # calendar/gui/e-week-view.c:2650 calendar/gui/e-week-view.c:2659

-#: calendar/gui/e-day-view.c:2941 calendar/gui/e-day-view.c:2948
-#: calendar/gui/e-day-view.c:2957 calendar/gui/e-week-view.c:3165
-#: calendar/gui/e-week-view.c:3172 calendar/gui/e-week-view.c:3181
+#: calendar/gui/e-day-view.c:2948 calendar/gui/e-day-view.c:2955
+#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3169
+#: calendar/gui/e-week-view.c:3176 calendar/gui/e-week-view.c:3185
 msgid "New appointment..."
 msgstr "Nieuwe Afspraak..."
 
 # calendar/gui/e-day-view.c:2321 calendar/gui/e-day-view.c:2328

 # calendar/gui/e-week-view.c:2647 calendar/gui/e-week-view.c:2654

-#: calendar/gui/e-day-view.c:2945 calendar/gui/e-day-view.c:2952
-#: calendar/gui/e-week-view.c:3169 calendar/gui/e-week-view.c:3176
+#: calendar/gui/e-day-view.c:2952 calendar/gui/e-day-view.c:2959
+#: calendar/gui/e-week-view.c:3173 calendar/gui/e-week-view.c:3180
 msgid "Edit this appointment..."
 msgstr "Bewerk deze afspraak..."
 
 # calendar/gui/e-day-view.c:2322 calendar/gui/e-week-view.c:2648

-#: calendar/gui/e-day-view.c:2946 calendar/gui/e-week-view.c:3170
-#: po/tmp/evolution-event-editor.xml.h:20
+#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3174
+#: ui/evolution-event-editor.xml.h:20
 msgid "Delete this appointment"
 msgstr "Verwijdert deze afspraak"
 
 # calendar/gui/e-day-view.c:2329 calendar/gui/e-week-view.c:2655

-#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3177
+#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3181
 msgid "Make this appointment movable"
 msgstr "Maak deze afspraak verplaatsbaar"
 
 # calendar/gui/e-day-view.c:2330 calendar/gui/e-week-view.c:2656

-#: calendar/gui/e-day-view.c:2954 calendar/gui/e-week-view.c:3178
+#: calendar/gui/e-day-view.c:2961 calendar/gui/e-week-view.c:3182
 msgid "Delete this occurrence"
 msgstr "Verwijder deze gebeurtenis"
 
 # calendar/gui/e-day-view.c:2331 calendar/gui/e-week-view.c:2657

-#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3179
+#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3183
 msgid "Delete all occurrences"
 msgstr "Verwijder alle gebeurtenissen"
 
@@ -2248,787 +2490,572 @@ 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 "_Gebeurtenis die de gehele dag plaatsvind"
 
 # calendar/gui/calendar-commands.c:59

-#: po/tmp/event-editor-dialog.glade.h:8
+#: calendar/gui/event-editor-dialog.glade.h:8
 msgid "Appointment Basics"
 msgstr "Afspraak Basis:"
 
-#: po/tmp/event-editor-dialog.glade.h:9
+#: calendar/gui/event-editor-dialog.glade.h:9
 msgid "Classification"
 msgstr "Classificatie"
 
-#: po/tmp/event-editor-dialog.glade.h:10
+#: calendar/gui/event-editor-dialog.glade.h:10
 msgid "Custom recurrence"
 msgstr "Aangepaste herhaling"
 
 # calendar/gui/gncal-todo.c:713 calendar/gui/gncal-todo.c:717

-#: po/tmp/event-editor-dialog.glade.h:11
+#: calendar/gui/event-editor-dialog.glade.h:11
 msgid "Days"
 msgstr "Dagen"
 
-#: po/tmp/event-editor-dialog.glade.h:13
+#: calendar/gui/event-editor-dialog.glade.h:13
 msgid "Every"
 msgstr "Elke"
 
-#: po/tmp/event-editor-dialog.glade.h:14
+#: calendar/gui/event-editor-dialog.glade.h:14
 msgid "Exceptions"
 msgstr "Uitzonderingen"
 
 # calendar/gui/gncal-todo.c:718 calendar/gui/gncal-todo.c:722

-#: po/tmp/event-editor-dialog.glade.h:16
+#: calendar/gui/event-editor-dialog.glade.h:16
 msgid "Hours"
 msgstr "Uren"
 
 # mail/mail-config.c:1199

-#: po/tmp/event-editor-dialog.glade.h:17
+#: calendar/gui/event-editor-dialog.glade.h:17
 msgid "Mail _to:"
 msgstr "Post _naar:"
 
 # calendar/gui/gncal-todo.c:723 calendar/gui/gncal-todo.c:727

-#: po/tmp/event-editor-dialog.glade.h:18
+#: calendar/gui/event-editor-dialog.glade.h:18
 msgid "Minutes"
 msgstr "Minuten"
 
 # calendar/gui/prop.c:348

-#: po/tmp/event-editor-dialog.glade.h:19
+#: calendar/gui/event-editor-dialog.glade.h:19
 msgid "Modify"
 msgstr "Aanpassen"
 
-#: po/tmp/event-editor-dialog.glade.h:20
+#: calendar/gui/event-editor-dialog.glade.h:20
 msgid "No recurrence"
 msgstr "Geen herhaling"
 
 # addressbook/printing/e-contact-print.glade.h:9

-#: po/tmp/event-editor-dialog.glade.h:21
+#: calendar/gui/event-editor-dialog.glade.h:21
 msgid "Preview"
 msgstr "Voorbeeld"
 
-#: po/tmp/event-editor-dialog.glade.h:22
+#: calendar/gui/event-editor-dialog.glade.h:22
 msgid "Pri_vate"
 msgstr "Pri_vИ"
 
-#: po/tmp/event-editor-dialog.glade.h:23
+#: calendar/gui/event-editor-dialog.glade.h:23
 msgid "Pu_blic"
 msgstr "Pu_bliekelijk"
 
-#: po/tmp/event-editor-dialog.glade.h:24
+#: calendar/gui/event-editor-dialog.glade.h:24
 msgid "Recurrence"
 msgstr "Herhaling"
 
-#: po/tmp/event-editor-dialog.glade.h:25
+#: calendar/gui/event-editor-dialog.glade.h:25
 msgid "Recurrence Rule"
 msgstr "Herhalings Regel"
 
-#: po/tmp/event-editor-dialog.glade.h:26
+#: calendar/gui/event-editor-dialog.glade.h:26
 msgid "Reminder"
 msgstr "Herinnering"
 
-#: po/tmp/event-editor-dialog.glade.h:27
+#: calendar/gui/event-editor-dialog.glade.h:27
 msgid "Simple recurrence"
 msgstr "Eenvoudige herhaling"
 
 # calendar/gui/gncal-todo.c:171

-#: po/tmp/event-editor-dialog.glade.h:28
+#: calendar/gui/event-editor-dialog.glade.h:28
 msgid "Su_mmary:"
 msgstr "Opso_mming:"
 
 # calendar/gui/gncal-todo.c:428

-#: po/tmp/event-editor-dialog.glade.h:29
+#: calendar/gui/event-editor-dialog.glade.h:29
 msgid "Time"
 msgstr "Resterende tijd"
 
 # addressbook/contact-editor/e-contact-editor-strings.h:7

-#: po/tmp/event-editor-dialog.glade.h:30
+#: calendar/gui/event-editor-dialog.glade.h:30
 msgid "_Audio"
 msgstr "_Geluid"
 
-#: po/tmp/event-editor-dialog.glade.h:31
+#: calendar/gui/event-editor-dialog.glade.h:31
 msgid "_Confidential"
 msgstr "_Vertrouwelijk"
 
-#: po/tmp/event-editor-dialog.glade.h:32
+#: calendar/gui/event-editor-dialog.glade.h:32
 msgid "_Display"
 msgstr "_Weergave"
 
-#: po/tmp/event-editor-dialog.glade.h:33
+#: calendar/gui/event-editor-dialog.glade.h:33
 msgid "_End time:"
 msgstr "_Eindtijd:"
 
-#: po/tmp/event-editor-dialog.glade.h:34
+#: calendar/gui/event-editor-dialog.glade.h:34
 msgid "_Mail"
 msgstr "_Post"
 
-#: po/tmp/event-editor-dialog.glade.h:35
+#: calendar/gui/event-editor-dialog.glade.h:35
 msgid "_Program"
 msgstr "_Programma"
 
-#: po/tmp/event-editor-dialog.glade.h:36
+#: calendar/gui/event-editor-dialog.glade.h:36
 msgid "_Run program:"
 msgstr "P_rogramma starten:"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:601

-#: po/tmp/event-editor-dialog.glade.h:37
+#: calendar/gui/event-editor-dialog.glade.h:37
 msgid "_Start time:"
 msgstr "_Begintijd:"
 
 # calendar/gui/goto.c:264

-#: po/tmp/event-editor-dialog.glade.h:38
+#: calendar/gui/event-editor-dialog.glade.h:38
 msgid "_Starting date:"
 msgstr "_Begin datum:"
 
 # calendar/gui/getdate.y:424

-#: po/tmp/event-editor-dialog.glade.h:39
+#: calendar/gui/event-editor-dialog.glade.h:39
 msgid "day(s)"
 msgstr "dag(en)"
 
-#: po/tmp/event-editor-dialog.glade.h:40
+#: calendar/gui/event-editor-dialog.glade.h:40
 msgid "event-editor-dialog"
 msgstr "gebeurtenis-bewerkings-dialoog"
 
 # calendar/gui/getdate.y:445

-#: po/tmp/event-editor-dialog.glade.h:41
+#: calendar/gui/event-editor-dialog.glade.h:41
 msgid "for"
 msgstr "voor"
 
-#: po/tmp/event-editor-dialog.glade.h:42
+#: calendar/gui/event-editor-dialog.glade.h:42
 msgid "forever"
 msgstr "oneindig"
 
 # widgets/e-table/e-table-group.glade.h:9

-#: po/tmp/event-editor-dialog.glade.h:43
+#: calendar/gui/event-editor-dialog.glade.h:43
 msgid "label21"
 msgstr "label21"
 
-#: po/tmp/event-editor-dialog.glade.h:44
+#: calendar/gui/event-editor-dialog.glade.h:44
 msgid "month(s)"
 msgstr "maand(en)"
 
 # shell/e-shell-folder-title-bar.c:355

-#: po/tmp/event-editor-dialog.glade.h:45
+#: calendar/gui/event-editor-dialog.glade.h:45
 msgid "until"
 msgstr "totdat"
 
 # calendar/gui/getdate.y:423

-#: po/tmp/event-editor-dialog.glade.h:46
+#: calendar/gui/event-editor-dialog.glade.h:46
 msgid "week(s)"
 msgstr "week(en)"
 
 # calendar/gui/getdate.y:420

-#: po/tmp/event-editor-dialog.glade.h:47
+#: calendar/gui/event-editor-dialog.glade.h:47
 msgid "year(s)"
 msgstr "jar(en)"
 
 # calendar/gui/event-editor.c:289

-#: calendar/gui/event-editor.c:329
+#: calendar/gui/event-editor.c:325
 msgid "Edit Appointment"
 msgstr "Afspraak Bewerken"
 
 # calendar/gui/gnome-month-item.c:737

-#: calendar/gui/event-editor.c:407
+#: calendar/gui/event-editor.c:403
 msgid "on"
 msgstr "op"
 
 # calendar/gui/getdate.y:424

-#: calendar/gui/event-editor.c:432 calendar/gui/getdate.y:424
-#: filter/filter-datespec.c:65
+#: calendar/gui/event-editor.c:428 filter/filter-datespec.c:65
 msgid "day"
 msgstr "dag"
 
 # calendar/gui/getdate.y:421

-#: calendar/gui/event-editor.c:559
+#: calendar/gui/event-editor.c:555
 msgid "on the"
 msgstr "op de"
 
 # calendar/gui/print.c:265

-#: calendar/gui/event-editor.c:566
+#: calendar/gui/event-editor.c:562
 msgid "th"
 msgstr "e"
 
 # calendar/gui/e-day-view.c:2331 calendar/gui/e-week-view.c:2657

-#: calendar/gui/event-editor.c:722
+#: calendar/gui/event-editor.c:716
 msgid "occurrences"
 msgstr "gebeurtenissen"
 
-#: calendar/gui/event-editor.c:839
+#: calendar/gui/event-editor.c:833
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Deze afspraak bevat herhalingen de Evolution niet kan bewerken."
 
 # calendar/gui/event-editor.c:1745

-#: calendar/gui/event-editor.c:3079 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 "%a %b %d %Y"
 
-# calendar/gui/getdate.y:391

-#: calendar/gui/getdate.y:391
-msgid "january"
-msgstr "januari"
+#: calendar/gui/gnome-cal.c:676
+#, c-format
+msgid "Could not load the calendar in `%s'"
+msgstr "Kon de kalender in `%s' niet laden"
 
-# calendar/gui/getdate.y:392

-#: calendar/gui/getdate.y:392
-msgid "february"
-msgstr "februari"
+#: calendar/gui/gnome-cal.c:687
+#, c-format
+msgid "Could not create a calendar in `%s'"
+msgstr "Kon kalender niet in aanmaken in `%s'"
 
-# calendar/gui/getdate.y:393

-#: calendar/gui/getdate.y:393
-msgid "march"
-msgstr "maart"
+#: calendar/gui/gnome-cal.c:698
+#, c-format
+msgid "The method required to load `%s' is not supported"
+msgstr "De methode die nodig is om `%s' te laden word niet ondersteund"
 
 # calendar/gui/getdate.y:394

-#: calendar/gui/getdate.y:394
-msgid "april"
+#.
+#. * 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
+#, fuzzy
+msgid "April"
 msgstr "april"
 
-# calendar/gui/getdate.y:395

-#: calendar/gui/getdate.y:395
-msgid "may"
-msgstr "may"
-
-# calendar/gui/getdate.y:396

-#: calendar/gui/getdate.y:396
-msgid "june"
-msgstr "juni"
-
-# calendar/gui/getdate.y:397

-#: calendar/gui/getdate.y:397
-msgid "july"
-msgstr "juli"
-
 # calendar/gui/getdate.y:398

-#: calendar/gui/getdate.y:398
-msgid "august"
+#: calendar/gui/goto-dialog.glade.h:7
+#, fuzzy
+msgid "August"
 msgstr "augustus"
 
-# calendar/gui/getdate.y:399

-#: calendar/gui/getdate.y:399
-msgid "september"
-msgstr "september"
-
-# calendar/gui/getdate.y:400

-#: calendar/gui/getdate.y:400
-msgid "sept"
-msgstr "sept"
-
-# calendar/gui/getdate.y:401

-#: calendar/gui/getdate.y:401
-msgid "october"
-msgstr "oktober"
-
-# calendar/gui/getdate.y:402

-#: calendar/gui/getdate.y:402
-msgid "november"
-msgstr "november"
-
 # calendar/gui/getdate.y:403

-#: calendar/gui/getdate.y:403
-msgid "december"
+#: calendar/gui/goto-dialog.glade.h:8
+#, fuzzy
+msgid "December"
 msgstr "december"
 
-# calendar/gui/getdate.y:404

-#: calendar/gui/getdate.y:404
-msgid "sunday"
-msgstr "zondag"
-
-# calendar/gui/getdate.y:405

-#: calendar/gui/getdate.y:405
-msgid "monday"
-msgstr "maandag"
-
-# calendar/gui/getdate.y:406

-#: calendar/gui/getdate.y:406
-msgid "tuesday"
-msgstr "dinsdag"
-
-# calendar/gui/getdate.y:407

-#: calendar/gui/getdate.y:407
-msgid "tues"
-msgstr "di"
-
-# calendar/gui/getdate.y:408

-#: calendar/gui/getdate.y:408
-msgid "wednesday"
-msgstr "woensdag"
-
-# calendar/gui/getdate.y:409

-#: calendar/gui/getdate.y:409
-msgid "wednes"
-msgstr "woe"
-
-# calendar/gui/getdate.y:410

-#: calendar/gui/getdate.y:410
-msgid "thursday"
-msgstr "donderdag"
-
-# calendar/gui/getdate.y:411

-#: calendar/gui/getdate.y:411
-msgid "thur"
-msgstr "do"
-
-# calendar/gui/getdate.y:412

-#: calendar/gui/getdate.y:412
-msgid "thurs"
-msgstr "don"
-
-# calendar/gui/getdate.y:413

-#: calendar/gui/getdate.y:413
-msgid "friday"
-msgstr "vrijdag"
-
-# calendar/gui/getdate.y:414

-#: calendar/gui/getdate.y:414
-msgid "saturday"
-msgstr "zaterdag"
-
-# calendar/gui/getdate.y:420

-#: calendar/gui/getdate.y:420 filter/filter-datespec.c:62
-msgid "year"
-msgstr "jaar"
-
-# calendar/gui/getdate.y:421

-#: calendar/gui/getdate.y:421 filter/filter-datespec.c:63
-msgid "month"
-msgstr "maand"
-
-# calendar/gui/getdate.y:422

-#: calendar/gui/getdate.y:422
-msgid "fortnight"
-msgstr "twee weken"
-
-# calendar/gui/getdate.y:423

-#: calendar/gui/getdate.y:423 filter/filter-datespec.c:64
-msgid "week"
-msgstr "week"
-
-# calendar/gui/getdate.y:425

-#: calendar/gui/getdate.y:425 filter/filter-datespec.c:66
-msgid "hour"
-msgstr "uur"
-
-# calendar/gui/getdate.y:426

-#: calendar/gui/getdate.y:426 filter/filter-datespec.c:67
-msgid "minute"
-msgstr "minuut"
-
-# calendar/gui/getdate.y:427

-#: calendar/gui/getdate.y:427
-msgid "min"
-msgstr "min"
-
-# calendar/gui/getdate.y:428

-#: calendar/gui/getdate.y:428 filter/filter-datespec.c:68
-msgid "second"
-msgstr "seconde"
-
-# calendar/gui/getdate.y:429

-#: calendar/gui/getdate.y:429
-msgid "sec"
-msgstr "sec"
-
-# calendar/gui/getdate.y:435

-#: calendar/gui/getdate.y:435
-msgid "tomorrow"
-msgstr "morgen"
-
-# calendar/gui/getdate.y:436

-#: calendar/gui/getdate.y:436
-msgid "yesterday"
-msgstr "gisteren"
-
-# calendar/gui/getdate.y:437

-#: calendar/gui/getdate.y:437
-msgid "today"
-msgstr "vandaag"
-
-# calendar/gui/getdate.y:438

-#: calendar/gui/getdate.y:438 filter/filter-datespec.c:533
-#: filter/filter-datespec.c:693
-msgid "now"
-msgstr "nu"
-
-# calendar/gui/getdate.y:439

-#: calendar/gui/getdate.y:439
-msgid "last"
-msgstr "afgelopen"
-
-# calendar/gui/getdate.y:440

-#: calendar/gui/getdate.y:440
-msgid "this"
-msgstr "deze"
-
-# calendar/gui/getdate.y:441

-#: calendar/gui/getdate.y:441
-msgid "next"
-msgstr "volgende"
-
-# calendar/gui/getdate.y:442

-#: calendar/gui/getdate.y:442
-msgid "first"
-msgstr "eerste"
-
-# calendar/gui/getdate.y:444

-#. { N_("second"),		tUNUMBER,	2 },
-#: calendar/gui/getdate.y:444
-msgid "third"
-msgstr "derde"
-
-# calendar/gui/getdate.y:445

-#: calendar/gui/getdate.y:445
-msgid "fourth"
-msgstr "vierde"
-
-# calendar/gui/getdate.y:446

-#: calendar/gui/getdate.y:446
-msgid "fifth"
-msgstr "vijfde"
-
-# calendar/gui/getdate.y:447

-#: calendar/gui/getdate.y:447
-msgid "sixth"
-msgstr "zesde"
-
-# calendar/gui/getdate.y:448

-#: calendar/gui/getdate.y:448
-msgid "seventh"
-msgstr "sevende"
-
-# calendar/gui/getdate.y:449

-#: calendar/gui/getdate.y:449
-msgid "eighth"
-msgstr "achtste"
-
-# calendar/gui/getdate.y:450

-#: calendar/gui/getdate.y:450
-msgid "ninth"
-msgstr "negende"
-
-# calendar/gui/getdate.y:451

-#: calendar/gui/getdate.y:451
-msgid "tenth"
-msgstr "tiende"
-
-# calendar/gui/getdate.y:452

-#: calendar/gui/getdate.y:452
-msgid "eleventh"
-msgstr "elfde"
+# calendar/gui/getdate.y:392

+#: calendar/gui/goto-dialog.glade.h:9
+#, fuzzy
+msgid "February"
+msgstr "februari"
 
-# calendar/gui/getdate.y:453

-#: calendar/gui/getdate.y:453
-msgid "twelfth"
-msgstr "twaalfde"
+# calendar/gui/goto.c:264

+#: calendar/gui/goto-dialog.glade.h:10
+#, fuzzy
+msgid "Go To Date"
+msgstr "Ga naar datum"
 
-# calendar/gui/getdate.y:454

-#: calendar/gui/getdate.y:454
-msgid "ago"
-msgstr "geleden"
+# calendar/gui/goto.c:312

+#: calendar/gui/goto-dialog.glade.h:11
+#, fuzzy
+msgid "Go To Today"
+msgstr "Ga naar vandaag"
 
-# calendar/gui/gnome-cal.c:453 calendar/gui/gnome-cal.c:1064

-# calendar/gui/gnome-cal.c:1120

-#: calendar/gui/gnome-cal.c:718 calendar/gui/gnome-cal.c:1474
-#: calendar/gui/gnome-cal.c:1530
-msgid "Reminder of your appointment at "
-msgstr "Herinnering van je afspraak op "
+# calendar/gui/getdate.y:391

+#: calendar/gui/goto-dialog.glade.h:12
+#, fuzzy
+msgid "January"
+msgstr "januari"
 
-#: calendar/gui/gnome-cal.c:1152
-#, c-format
-msgid "Could not load the calendar in `%s'"
-msgstr "Kon de kalender in `%s' niet laden"
+# calendar/gui/getdate.y:397

+#: calendar/gui/goto-dialog.glade.h:13
+#, fuzzy
+msgid "July"
+msgstr "juli"
 
-#: calendar/gui/gnome-cal.c:1163
-#, c-format
-msgid "Could not create a calendar in `%s'"
-msgstr "Kon kalender niet in aanmaken in `%s'"
+# calendar/gui/getdate.y:396

+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "June"
+msgstr "juni"
 
-#: calendar/gui/gnome-cal.c:1174
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr "De methode die nodig is om `%s' te laden word niet ondersteund"
+# calendar/gui/getdate.y:393

+#: calendar/gui/goto-dialog.glade.h:15
+#, fuzzy
+msgid "March"
+msgstr "maart"
 
-# calendar/gui/gnome-cal.c:1069 calendar/gui/gnome-cal.c:1124

-#. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1479 calendar/gui/gnome-cal.c:1534
-#: mail/mail-search-dialogue.c:104
-msgid "Ok"
-msgstr "Ok"
+# calendar/gui/prop.c:348

+#: calendar/gui/goto-dialog.glade.h:16
+#, fuzzy
+msgid "May"
+msgstr "Maandag"
 
-# calendar/gui/goto.c:82

-#: calendar/gui/goto.c:82
-msgid "Year:"
-msgstr "Jaar:"
+# calendar/gui/getdate.y:402

+#: calendar/gui/goto-dialog.glade.h:17
+#, fuzzy
+msgid "November"
+msgstr "november"
 
-# calendar/gui/goto.c:264

-#: calendar/gui/goto.c:270
-msgid "Go to date"
-msgstr "Ga naar datum"
+# calendar/gui/getdate.y:401

+#: calendar/gui/goto-dialog.glade.h:18
+#, fuzzy
+msgid "October"
+msgstr "oktober"
 
-# calendar/gui/goto.c:275

-#. Instructions
-#: calendar/gui/goto.c:281
-msgid ""
-"Please select the date you want to go to.\n"
-"When you click on a day, you will be taken\n"
-"to that date."
-msgstr ""
-"Selecteer de datum waar je naar toe wil.\n"
-"Wanneer op je die dag klikt, ga je naar die\n"
-"dag toe."
+# calendar/gui/getdate.y:399

+#: calendar/gui/goto-dialog.glade.h:19
+#, fuzzy
+msgid "September"
+msgstr "september"
 
-# calendar/gui/goto.c:312

-#: calendar/gui/goto.c:318
-msgid "Go to today"
-msgstr "Ga naar vandaag"
+# addressbook/backend/ebook/load-pine-addressbook.c:41
+# addressbook/gui/component/addressbook-factory.c:58 calendar/gui/main.c:68
+#: calendar/gui/main.c:49
+#, fuzzy
+msgid "Could not initialize GNOME"
+msgstr "Kon Bonobo niet initialiseren"
 
 # calendar/gui/print.c:265

-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "1st"
 msgstr "1e"
 
 # calendar/gui/print.c:265

-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "2nd"
 msgstr "2e"
 
 # calendar/gui/print.c:265

-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "3rd"
 msgstr "3e"
 
 # calendar/gui/print.c:265

-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "4th"
 msgstr "4e"
 
 # calendar/gui/print.c:265

-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "5th"
 msgstr "5e"
 
 # calendar/gui/print.c:266

-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "6th"
 msgstr "6e"
 
 # calendar/gui/print.c:266

-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "7th"
 msgstr "7e"
 
 # calendar/gui/print.c:266

-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "8th"
 msgstr "8e"
 
 # calendar/gui/print.c:266

-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "9th"
 msgstr "9e"
 
 # calendar/gui/print.c:266

-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "10th"
 msgstr "10e"
 
 # calendar/gui/print.c:267

-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "11th"
 msgstr "11e"
 
 # calendar/gui/print.c:267

-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "12th"
 msgstr "12e"
 
 # calendar/gui/print.c:267

-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "13th"
 msgstr "13e"
 
 # calendar/gui/print.c:267

-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "14th"
 msgstr "14e"
 
 # calendar/gui/print.c:267

-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "15th"
 msgstr "15e"
 
 # calendar/gui/print.c:268

-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "16th"
 msgstr "16e"
 
 # calendar/gui/print.c:268

-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "17th"
 msgstr "17e"
 
 # calendar/gui/print.c:268

-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "18th"
 msgstr "18e"
 
 # calendar/gui/print.c:268

-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "19th"
 msgstr "19e"
 
 # calendar/gui/print.c:268

-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "20th"
 msgstr "20ste"
 
 # calendar/gui/print.c:269

-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "21st"
 msgstr "21ste"
 
 # calendar/gui/print.c:269

-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "22nd"
 msgstr "22ste"
 
 # calendar/gui/print.c:269

-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "23rd"
 msgstr "23ste"
 
 # calendar/gui/print.c:269

-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "24th"
 msgstr "24ste"
 
 # calendar/gui/print.c:269

-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "25th"
 msgstr "25ste"
 
 # calendar/gui/print.c:270

-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "26th"
 msgstr "26ste"
 
 # calendar/gui/print.c:270

-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "27th"
 msgstr "27ste"
 
 # calendar/gui/print.c:270

-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "28th"
 msgstr "28ste"
 
 # calendar/gui/print.c:270

-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "29th"
 msgstr "29ste"
 
 # calendar/gui/print.c:270

-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "30th"
 msgstr "30ste"
 
 # calendar/gui/print.c:271

-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:299
 msgid "31st"
 msgstr "31ste"
 
 # calendar/gui/print.c:326

-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Su"
 msgstr "Zo"
 
 # calendar/gui/print.c:326

-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Mo"
 msgstr "Ma"
 
 # calendar/gui/print.c:326

-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Tu"
 msgstr "Di"
 
 # calendar/gui/print.c:326

-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "We"
 msgstr "Wo"
 
 # calendar/gui/print.c:326

-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Th"
 msgstr "Do"
 
 # calendar/gui/print.c:326

-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Fr"
 msgstr "Vr"
 
 # calendar/gui/print.c:326

-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Sa"
 msgstr "Za"
 
-#: calendar/gui/print.c:936
+#: calendar/gui/print.c:941
 msgid "Tasks"
 msgstr "_Taken"
 
 # calendar/gui/print.c:980

 #. Day
-#: calendar/gui/print.c:1066
+#: calendar/gui/print.c:1071
 msgid "Current day (%a %b %d %Y)"
 msgstr "Dag van vandaag (%a %b %d %Y)"
 
 # calendar/gui/event-editor.c:1745

-#: 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/event-editor.c:1745

-#: calendar/gui/print.c:1081
+#: calendar/gui/print.c:1086
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
 # calendar/gui/print.c:1004

-#: calendar/gui/print.c:1092
+#: calendar/gui/print.c:1097
 #, c-format
 msgid "Current week (%s - %s)"
 msgstr "Huidige week (%s - %s)"
 
 # calendar/gui/print.c:1040

 #. Month
-#: calendar/gui/print.c:1100
+#: calendar/gui/print.c:1105
 msgid "Current month (%b %Y)"
 msgstr "Huidige maand (%b %Y)"
 
 # calendar/gui/print.c:1047

 #. Year
-#: calendar/gui/print.c:1107
+#: calendar/gui/print.c:1112
 msgid "Current year (%Y)"
 msgstr "Huidig jaar (%Y)"
 
 # calendar/gui/print.c:1084

-#: calendar/gui/print.c:1144
+#: calendar/gui/print.c:1149
 msgid "Print Calendar"
 msgstr "Druk Kalender af"
 
 # calendar/gui/print.c:1249

-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:962
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1001
 msgid "Print Preview"
 msgstr "Afdrukvoorbeeld"
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: calendar/gui/weekday-picker.c:351 widgets/misc/e-calendar-item.c:416
-msgid "MTWTFSS"
-msgstr "MDWDVZZ"
-
-#: calendar/gui/weekday-picker.c:353 calendar/gui/weekday-picker.c:443
+#: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
 msgid "SMTWTFS"
 msgstr "ZMDWDVZ"
 
@@ -3124,61 +3151,62 @@ msgid "Could not load %s: No initialization code in module."
 msgstr "Kon %s niet laden: Geen initialisatie code in de module."
 
 # mail/mail-config.c:1658

-#: camel/camel-remote-store.c:182
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr "%s server %s"
 
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s service voor %s op %s"
 
-#: camel/camel-remote-store.c:227
+#: camel/camel-remote-store.c:243
+#: camel/providers/smtp/camel-smtp-transport.c:162
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Kon niet verbinden met %s (poort %d): %s"
 
-#: camel/camel-remote-store.c:228
+#: camel/camel-remote-store.c:244
 msgid "(unknown host)"
 msgstr "(onbekende computer)"
 
-#: camel/camel-remote-store.c:452
+#: camel/camel-remote-store.c:483
 msgid "Server disconnected."
 msgstr "Server verbrak de verbinding."
 
-#: camel/camel-service.c:120
+#: camel/camel-service.c:138
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' heeft een gebruikersnaam gedeelte nodig"
 
-#: camel/camel-service.c:129
+#: camel/camel-service.c:147
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' heeft een computernaam gedeelte nodig"
 
-#: camel/camel-service.c:138
+#: camel/camel-service.c:156
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' heeft een pad gedeelte nodig"
 
-#: camel/camel-service.c:488
+#: camel/camel-service.c:526
 #, c-format
 msgid "No such host %s."
 msgstr "Computer %s niet gevonden."
 
-#: camel/camel-service.c:491
+#: camel/camel-service.c:529
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr "Kan computernaam %s tijdelijk niet opzoeken"
 
-#: camel/camel-session.c:272
+#: camel/camel-session.c:297
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Geen aanbieder beschikbaar voor protocol `%s'"
 
 # shell/e-setup.c:69

-#: camel/camel-session.c:360
+#: camel/camel-session.c:388
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3202,7 +3230,7 @@ msgstr "URL `%s' bevat een ongeldig protocol"
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "Poort nummer in URL `%s' is niet numeriek"
 
-#: camel/providers/imap/camel-imap-auth.c:127
+#: camel/providers/imap/camel-imap-auth.c:133
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
@@ -3211,45 +3239,45 @@ msgstr ""
 "Kon Kerberos ticket niet vergaren:\n"
 "%s"
 
-#: camel/providers/imap/camel-imap-auth.c:198
+#: camel/providers/imap/camel-imap-auth.c:205
 msgid "Bad authentication response from server."
 msgstr "Slechte authenticatie respons van server."
 
-#: camel/providers/imap/camel-imap-command.c:216
+#: camel/providers/imap/camel-imap-command.c:231
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Onverwachte respons van IMAP server: %s"
 
-#: camel/providers/imap/camel-imap-command.c:224
+#: camel/providers/imap/camel-imap-command.c:239
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP commando mislukt: %s"
 
 # shell/e-storage.c:434

-#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:240 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "Onbekende fout"
 
-#: camel/providers/imap/camel-imap-command.c:271
+#: camel/providers/imap/camel-imap-command.c:286
 msgid "Server response ended too soon."
 msgstr "Het antwoord van de server eindigde te snel."
 
-#: camel/providers/imap/camel-imap-command.c:407
+#: camel/providers/imap/camel-imap-command.c:422
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "De respons van de IMAP server bevatte geen %s informatie"
 
-#: camel/providers/imap/camel-imap-command.c:443
+#: camel/providers/imap/camel-imap-command.c:458
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "De IMAP Server gaf onverwacht een 'OK' respons: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:216
+#: camel/providers/imap/camel-imap-folder.c:196
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Kon samenvatting voor %s niet laden"
 
-#: camel/providers/imap/camel-imap-folder.c:586
+#: camel/providers/imap/camel-imap-folder.c:532
 msgid "Could not find message body in FETCH response."
 msgstr "Kon bericht inhoud niet vinden in FETCH respons."
 
@@ -3261,36 +3289,29 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Voor het lezen en opslaan van post op IMAP servers."
 
-# mail/folder-browser-factory.c:101

-#: camel/providers/imap/camel-imap-store.c:234
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:148
-msgid "Password"
-msgstr "Wachtwoord"
-
-#: camel/providers/imap/camel-imap-store.c:236
+#: camel/providers/imap/camel-imap-store.c:248
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Deze optie zal bij het verbinden met de IMAP server het wachtwoord versturen "
 "als platte tekst."
 
-#: camel/providers/imap/camel-imap-store.c:245
+#: camel/providers/imap/camel-imap-store.c:257
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/providers/imap/camel-imap-store.c:247
+#: camel/providers/imap/camel-imap-store.c:259
 msgid ""
 "This option will connect to the IMAP server using Kerberos 4 authentication."
 msgstr ""
 "Deze optie zal bij het verbinden met de IMAP server gebruik maken van "
 "Kerberos 4 authenticatie."
 
-#: camel/providers/imap/camel-imap-store.c:333
+#: camel/providers/imap/camel-imap-store.c:345
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sVoor het IMAP wachtwoord voor %s@%s in"
 
-#: camel/providers/imap/camel-imap-store.c:359
+#: camel/providers/imap/camel-imap-store.c:373
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3302,7 +3323,7 @@ msgstr ""
 "\n"
 
 # shell/e-setup.c:69

-#: camel/providers/imap/camel-imap-store.c:539
+#: camel/providers/imap/camel-imap-store.c:564
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Kon directory %s niet maken: %s"
@@ -3390,12 +3411,12 @@ msgstr "Kan bericht niet toevoegen aan maildir map: %s: %s"
 
 # mail/folder-browser-factory.c:41

 #: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:204
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-maildir-folder.c:207
+#: camel/providers/local/camel-maildir-folder.c:215
+#: camel/providers/local/camel-mbox-folder.c:317
 #: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:189
-#: camel/providers/local/camel-mh-folder.c:197
+#: camel/providers/local/camel-mh-folder.c:192
+#: camel/providers/local/camel-mh-folder.c:200
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -3405,14 +3426,14 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-mbox-folder.c:317
 #: camel/providers/local/camel-mh-folder.c:183
 msgid "No such message"
 msgstr "Een dergelijk bericht bestaat niet"
 
 # addressbook/contact-editor/e-contact-editor.c:782

-#: camel/providers/local/camel-maildir-folder.c:213
-#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-maildir-folder.c:216
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "Invalid message contents"
 msgstr "Ongeldige bericht inhoud"
 
@@ -3460,20 +3481,20 @@ msgstr "Kon map `%s' niet verwijderen: %s"
 msgid "not a maildir directory"
 msgstr "geen maildir directory"
 
-#: camel/providers/local/camel-mbox-folder.c:195
+#: camel/providers/local/camel-mbox-folder.c:201
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Kon postvak niet openen: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:251
+#: camel/providers/local/camel-mbox-folder.c:257
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Kan bericht niet aan mbox bestand toevoegen: %s: %s"
 
 # mail/folder-browser-factory.c:41

-#: camel/providers/local/camel-mbox-folder.c:327
-#: camel/providers/local/camel-mbox-folder.c:357
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:333
+#: camel/providers/local/camel-mbox-folder.c:365
+#: camel/providers/local/camel-mbox-folder.c:378
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -3482,11 +3503,11 @@ msgstr ""
 "Kan bericht %s uit folder %s niet vergaren\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:358
+#: camel/providers/local/camel-mbox-folder.c:366
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "De map lijkt onherstelbaar beschadigt te zijn."
 
-#: camel/providers/local/camel-mbox-folder.c:369
+#: camel/providers/local/camel-mbox-folder.c:379
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Opbouwen bericht mislukt: Beschadigde mailbox?"
 
@@ -3540,57 +3561,57 @@ msgstr "Kon map %s niet openen: er zal worden samengevat vanaf positie %ld: %s"
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Fatale e-mail ontleed fout op positie %ld in map %s"
 
-#: camel/providers/local/camel-mbox-summary.c:341
+#: camel/providers/local/camel-mbox-summary.c:343
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "Kon map niet samenvatten: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:475
-#: camel/providers/local/camel-mbox-summary.c:661
+#: camel/providers/local/camel-mbox-summary.c:477
+#: camel/providers/local/camel-mbox-summary.c:668
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr "Kon map %s niet openen voor genereren van samenvatting: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:491
+#: camel/providers/local/camel-mbox-summary.c:493
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Kon tijdelijk postvak niet openen: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:512
-#: camel/providers/local/camel-mbox-summary.c:520
-#: camel/providers/local/camel-mbox-summary.c:691
-#: camel/providers/local/camel-mbox-summary.c:699
+#: camel/providers/local/camel-mbox-summary.c:514
+#: camel/providers/local/camel-mbox-summary.c:522
+#: camel/providers/local/camel-mbox-summary.c:701
+#: camel/providers/local/camel-mbox-summary.c:709
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Samenvatting en map niet gelijk, zelfs na synchronisatie"
 
-#: camel/providers/local/camel-mbox-summary.c:562
+#: camel/providers/local/camel-mbox-summary.c:565
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Fout bij het schrijven naar tijdelijk postvak: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:579
+#: camel/providers/local/camel-mbox-summary.c:582
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Fout bij het schrijven naar tijdelijk postvak %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:595
-#: camel/providers/local/camel-mbox-summary.c:748
+#: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-mbox-summary.c:759
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kon de bron map %s niet sluiten: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:604
+#: camel/providers/local/camel-mbox-summary.c:609
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Kon de tijdelijke map niet sluiten: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:615
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kon de naam van de map niet wijzigen: %s"
 
 # shell/e-storage.c:434

-#: camel/providers/local/camel-mbox-summary.c:817
+#: camel/providers/local/camel-mbox-summary.c:830
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Onbekende fout: %s"
@@ -3624,7 +3645,7 @@ msgid "Server rejected username/password"
 msgstr "Volgens de server is de gebruikernaam en/of het wachtwoord ongeldig"
 
 # calendar/gui/calendar-commands.c:434

-#: camel/providers/nntp/camel-nntp-folder.c:144
+#: camel/providers/nntp/camel-nntp-folder.c:115
 #, c-format
 msgid "Message %s not found."
 msgstr "Bericht %s kon niet worden gevonden."
@@ -3677,16 +3698,16 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Het .newsrc bestand kon niet geopend of gemaakt worden voor %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:179
+#: camel/providers/pop3/camel-pop3-folder.c:180
 msgid "Could not open folder: message listing was incomplete."
 msgstr "Kon map niet openen: berichtenlijst was niet compleet."
 
-#: camel/providers/pop3/camel-pop3-folder.c:273
+#: camel/providers/pop3/camel-pop3-folder.c:274
 #, c-format
 msgid "No message with uid %s"
 msgstr "Geen bericht met uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:288
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Kon bericht niet van POP server %s halen: %s"
@@ -3734,17 +3755,17 @@ msgstr ""
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Kon niet aanmelden bij KPOP server: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:335
+#: camel/providers/pop3/camel-pop3-store.c:337
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Kon niet verbinden met POP server op %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:389
+#: camel/providers/pop3/camel-pop3-store.c:391
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sVoer het POP3 wachtwoord voor %s@%s in"
 
-#: camel/providers/pop3/camel-pop3-store.c:408
+#: camel/providers/pop3/camel-pop3-store.c:410
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3754,12 +3775,12 @@ msgstr ""
 "Fout bij versturen van gebruikersnaam: %s"
 
 # shell/e-storage.c:434

-#: camel/providers/pop3/camel-pop3-store.c:411
-#: camel/providers/pop3/camel-pop3-store.c:448
+#: camel/providers/pop3/camel-pop3-store.c:413
+#: camel/providers/pop3/camel-pop3-store.c:450
 msgid "(Unknown)"
 msgstr "(Onbekend)"
 
-#: camel/providers/pop3/camel-pop3-store.c:438
+#: camel/providers/pop3/camel-pop3-store.c:440
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -3767,7 +3788,7 @@ msgstr ""
 "Fout bij verbinden met de POP server.\n"
 "Geen ondersteuning voor de ingestelde aanmeldings methode."
 
-#: camel/providers/pop3/camel-pop3-store.c:446
+#: camel/providers/pop3/camel-pop3-store.c:448
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3776,13 +3797,14 @@ msgstr ""
 "Fout bij verbinden met de POP server.\n"
 "Fout bij het versturen van het wachtwoord: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:555
+#: camel/providers/pop3/camel-pop3-store.c:557
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Map `%s' bestaat niet."
 
 # composer/e-msg-composer.c:894 composer/e-msg-composer.c:942

 #: camel/providers/sendmail/camel-sendmail-provider.c:34
+#: mail/mail-config-druid.glade.h:63
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -3834,12 +3856,149 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Post aflevering via het sendmail programma"
 
+#: camel/providers/smtp/camel-smtp-provider.c:34
+#: mail/mail-config-druid.glade.h:59
+msgid "SMTP"
+msgstr "SMTP"
+
 #: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP."
+#, fuzzy
+msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 "Voor het afleveren van post doormiddel van het verbinden met een mailhub op "
 "afstand gebruik makend van SMTP."
 
+#: camel/providers/smtp/camel-smtp-transport.c:187
+#, c-format
+msgid "Welcome response error: %s: possibly non-fatal"
+msgstr ""
+
+# mail/mail-config.c:739 mail/mail-config.c:819

+#: camel/providers/smtp/camel-smtp-transport.c:281
+#, fuzzy
+msgid "No authentication required"
+msgstr "Authenticatie"
+
+#: camel/providers/smtp/camel-smtp-transport.c:283
+#, fuzzy
+msgid ""
+"This option will connect to the SMTP server without using any kind of "
+"authentication. This should be fine for connecting to most SMTP servers."
+msgstr ""
+"Bij het verbinden met de POP server het wachtwoord versturen in platte tekst "
+"vorm. Deze optie is de enige optie die word ondersteund door de meeste POP "
+"servers."
+
+#: 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 ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:294
+#, fuzzy
+msgid ""
+"This option will connect to the SMTP server using CRAM-MD5 authentication."
+msgstr ""
+"Deze optie zal bij het verbinden met de IMAP server gebruik maken van "
+"Kerberos 4 authenticatie."
+
+# mail/mail-config.c:1658

+#: camel/providers/smtp/camel-smtp-transport.c:332
+#, fuzzy, c-format
+msgid "SMTP server %s"
+msgstr "%s server %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:334
+#, fuzzy, c-format
+msgid "SMTP mail delivery via %s"
+msgstr "Post aflevering via het sendmail programma"
+
+#: camel/providers/smtp/camel-smtp-transport.c:359
+msgid "Cannot send message: sender address not defined."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:366
+msgid "Cannot send message: sender address not valid."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:380
+#, fuzzy
+msgid "Cannot send message: no recipients defined."
+msgstr "Kan bericht niet aan mbox bestand toevoegen: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:474
+#, c-format
+msgid "HELO request timed out: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:490
+#, c-format
+msgid "HELO response error: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:529
+#, c-format
+msgid "MAIL FROM request timed out: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:545
+#, c-format
+msgid "MAIL FROM response error: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:570
+#, fuzzy, c-format
+msgid "RCPT TO request timed out: %s: mail not sent"
+msgstr "Kon kanaal naar sendmail niet maken: %s: bericht niet verstuurt"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
+#, fuzzy, c-format
+msgid "RCPT TO response error: %s: mail not sent"
+msgstr "Kon %s niet uitvoeren: bericht niet verstuurd."
+
+#: camel/providers/smtp/camel-smtp-transport.c:617
+#, fuzzy, c-format
+msgid "DATA request timed out: %s: mail not sent"
+msgstr "Kon %s niet uitvoeren: bericht niet verstuurd."
+
+#: camel/providers/smtp/camel-smtp-transport.c:633
+#, fuzzy, c-format
+msgid "DATA response error: %s: mail not sent"
+msgstr "Kon sendmail niet starten: %s: bericht niet verstuurt"
+
+#: camel/providers/smtp/camel-smtp-transport.c:648
+#: camel/providers/smtp/camel-smtp-transport.c:666
+#, fuzzy, c-format
+msgid "DATA send timed out: message termination: %s: mail not sent"
+msgstr "sendmail stopte met signaal %s: bericht niet verstuurd."
+
+#: camel/providers/smtp/camel-smtp-transport.c:682
+#, c-format
+msgid "DATA response error: message termination: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:706
+#, c-format
+msgid "RSET request timed out: %s"
+msgstr ""
+
+# shell/e-storage.c:434

+#: camel/providers/smtp/camel-smtp-transport.c:722
+#, fuzzy, c-format
+msgid "RSET response error: %s"
+msgstr "Onbekende fout: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:745
+#, c-format
+msgid "QUIT request timed out: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#, c-format
+msgid "QUIT response error: %s: non-fatal"
+msgstr ""
+
 # mail/folder-browser-factory.c:89

 #: camel/providers/vee/camel-vee-provider.c:30
 msgid "Virtual folder email provider"
@@ -3881,99 +4040,99 @@ msgstr "%.1fG"
 
 # composer/e-msg-composer-attachment-bar.c:299

 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:144
+#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:155
 msgid "attachment"
 msgstr "bijvoegsel"
 
 # composer/e-msg-composer.c:951

-#: composer/e-msg-composer-attachment-bar.c:417
-#: 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 "Voeg een bestand bij"
 
 # composer/e-msg-composer-attachment-bar.c:362 shell/e-shortcuts-view.c:333

-#: composer/e-msg-composer-attachment-bar.c:464 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 "Verwijderen"
 
 # composer/e-msg-composer-attachment-bar.c:363

-#: composer/e-msg-composer-attachment-bar.c:465
+#: composer/e-msg-composer-attachment-bar.c:461
 msgid "Remove selected items from the attachment list"
 msgstr "Verwijder het geselecteerde bestand uit de lijst van attachments"
 
 # composer/e-msg-composer-attachment-bar.c:394

-#: composer/e-msg-composer-attachment-bar.c:496
+#: composer/e-msg-composer-attachment-bar.c:492
 msgid "Add attachment..."
 msgstr "Bestand bijvoegen..."
 
 # composer/e-msg-composer-attachment-bar.c:395

-#: composer/e-msg-composer-attachment-bar.c:497
+#: composer/e-msg-composer-attachment-bar.c:493
 msgid "Attach a file to the message"
 msgstr "Voeg een bestand bij het bericht"
 
 # composer/e-msg-composer-attachment.glade.h:7

 #.
-#. * 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 "Attachment eigenschappen"
 
 # composer/e-msg-composer-attachment.glade.h:10

-#: po/tmp/e-msg-composer-attachment.glade.h:8
+#: composer/e-msg-composer-attachment.glade.h:8
 msgid "File name:"
 msgstr "Bestandsnaam:"
 
 # composer/e-msg-composer-attachment.glade.h:8

-#: po/tmp/e-msg-composer-attachment.glade.h:9
+#: composer/e-msg-composer-attachment.glade.h:9
 msgid "MIME type:"
 msgstr "MIME type:"
 
 # mail/message-list.c:488

-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:290
-#: mail/mail-format.c:621
+#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:303
+#: mail/mail-format.c:626
 msgid "From:"
 msgstr "Van:"
 
 # composer/e-msg-composer-hdrs.c:174

-#: composer/e-msg-composer-hdrs.c:238
+#: composer/e-msg-composer-hdrs.c:247
 msgid "Click here for the address book"
 msgstr "Klik hier voor het adresboek"
 
 # composer/e-msg-composer-hdrs.c:217

-#: composer/e-msg-composer-hdrs.c:291
+#: composer/e-msg-composer-hdrs.c:304
 msgid "Enter the identity you wish to send this message from"
 msgstr "Geef de identiteit waarvan je dit bericht wilt versturen"
 
 # composer/e-msg-composer-hdrs.c:216

-#: composer/e-msg-composer-hdrs.c:295 mail/mail-format.c:625
+#: composer/e-msg-composer-hdrs.c:308 mail/mail-format.c:630
 msgid "To:"
 msgstr "Aan:"
 
 # composer/e-msg-composer-hdrs.c:217

-#: composer/e-msg-composer-hdrs.c:296
+#: composer/e-msg-composer-hdrs.c:309
 msgid "Enter the recipients of the message"
 msgstr "Geef de geaddresseerden"
 
 # composer/e-msg-composer-hdrs.c:221

-#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:627
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:632
 msgid "Cc:"
 msgstr "Cc:"
 
 # composer/e-msg-composer-hdrs.c:222

-#: composer/e-msg-composer-hdrs.c:301
+#: composer/e-msg-composer-hdrs.c:314
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Geef de adressen die een kopie van het bericht moeten krijgen"
 
 # composer/e-msg-composer-hdrs.c:227

-#: composer/e-msg-composer-hdrs.c:306
+#: composer/e-msg-composer-hdrs.c:319
 msgid "Bcc:"
 msgstr "Bcc:"
 
 # composer/e-msg-composer-hdrs.c:228

-#: composer/e-msg-composer-hdrs.c:307
+#: 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."
@@ -3982,16 +4141,16 @@ msgstr ""
 "op de geadresseerden-lijst van het bericht verschijnen."
 
 # composer/e-msg-composer-hdrs.c:234

-#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:629
+#: composer/e-msg-composer-hdrs.c:326 mail/mail-format.c:634
 msgid "Subject:"
 msgstr "Onderwerp:"
 
 # composer/e-msg-composer-hdrs.c:235

-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Enter the subject of the mail"
 msgstr "Geef het onderwerp van het bericht"
 
-#: composer/e-msg-composer.c:429
+#: composer/e-msg-composer.c:430
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -4001,41 +4160,41 @@ msgstr ""
 "%s"
 
 # composer/e-msg-composer.c:463

-#: composer/e-msg-composer.c:599
+#: composer/e-msg-composer.c:600
 msgid "Save as..."
 msgstr "Opslaan als..."
 
 # composer/e-msg-composer.c:474

-#: composer/e-msg-composer.c:610
+#: composer/e-msg-composer.c:611
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fout bij opslaan bestand: %s"
 
 # composer/e-msg-composer.c:494

-#: composer/e-msg-composer.c:630
+#: composer/e-msg-composer.c:631
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error bij openen bestand: %s"
 
-#: composer/e-msg-composer.c:652
+#: composer/e-msg-composer.c:653
 msgid "Saving changes to message..."
 msgstr "Bezig met opslaan wijzigingen aan bericht..."
 
-#: composer/e-msg-composer.c:654
+#: composer/e-msg-composer.c:655
 msgid "Save changes to message..."
 msgstr "Wijzigingen aan bericht opslaan..."
 
-#: composer/e-msg-composer.c:695
+#: composer/e-msg-composer.c:696
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr "Fout bij het opslaan van de compositie naar 'Klad': %s"
 
 # shell/e-shell-view-menu.c:159

-#: composer/e-msg-composer.c:739 shell/e-shell-view-menu.c:170
+#: composer/e-msg-composer.c:741 shell/e-shell-view-menu.c:167
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:745
+#: composer/e-msg-composer.c:747
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -4046,32 +4205,32 @@ msgstr ""
 "Wil je je wijzingen opslaan?"
 
 # composer/e-msg-composer.c:561

-#: composer/e-msg-composer.c:767
+#: composer/e-msg-composer.c:772
 msgid "Open file"
 msgstr "Bestand openen"
 
 # composer/e-msg-composer.c:676

-#: composer/e-msg-composer.c:893
+#: composer/e-msg-composer.c:898
 msgid "That file does not exist."
 msgstr "Het bestand bestaat niet."
 
 # composer/e-msg-composer.c:686

-#: composer/e-msg-composer.c:903
+#: composer/e-msg-composer.c:908
 msgid "That is not a regular file."
 msgstr "Het is geen gewoon bestand."
 
 # composer/e-msg-composer.c:696

-#: composer/e-msg-composer.c:913
+#: composer/e-msg-composer.c:918
 msgid "That file exists but is not readable."
 msgstr "Het bestand bestaat maar is niet leesbaar."
 
 # composer/e-msg-composer.c:707

-#: composer/e-msg-composer.c:923
+#: composer/e-msg-composer.c:928
 msgid "That file appeared accesible but open(2) failed."
 msgstr "Het bestand is toegangelijk maar open(2) mislukte."
 
 # composer/e-msg-composer.c:729

-#: composer/e-msg-composer.c:945
+#: composer/e-msg-composer.c:950
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -4080,17 +4239,17 @@ msgstr ""
 "Weet u zeker dat u het wil invoegen?"
 
 # composer/e-msg-composer.c:748

-#: composer/e-msg-composer.c:966
+#: composer/e-msg-composer.c:971
 msgid "An error occurred while reading the file."
 msgstr "Een fout trad op tijdens het openen van het bestand."
 
 # composer/e-msg-composer.c:1127

-#: composer/e-msg-composer.c:1343
+#: composer/e-msg-composer.c:1350
 msgid "Compose a message"
 msgstr "Stelt een nieuw bericht op"
 
 # mail/mail-threads.c:814

-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1427
 msgid "Could not create composer window."
 msgstr ""
 "Kon het dialoog venster voor het opstellen van een nieuw bericht niet "
@@ -4108,16 +4267,31 @@ msgstr "_Zoeken"
 
 # calendar/gui/getdate.y:420

 #: filter/filter-datespec.c:62
+msgid "year"
+msgstr "jaar"
+
+# calendar/gui/getdate.y:420

+#: filter/filter-datespec.c:62
 msgid "years"
 msgstr "jaren"
 
 # calendar/gui/getdate.y:421

 #: filter/filter-datespec.c:63
+msgid "month"
+msgstr "maand"
+
+# calendar/gui/getdate.y:421

+#: filter/filter-datespec.c:63
 msgid "months"
 msgstr "maanden"
 
 # calendar/gui/getdate.y:423

 #: filter/filter-datespec.c:64
+msgid "week"
+msgstr "week"
+
+# calendar/gui/getdate.y:423

+#: filter/filter-datespec.c:64
 msgid "weeks"
 msgstr "weken"
 
@@ -4128,14 +4302,29 @@ msgstr "dagen"
 
 # calendar/gui/getdate.y:425

 #: filter/filter-datespec.c:66
+msgid "hour"
+msgstr "uur"
+
+# calendar/gui/getdate.y:425

+#: filter/filter-datespec.c:66
 msgid "hours"
 msgstr "uren"
 
 # calendar/gui/getdate.y:426

 #: filter/filter-datespec.c:67
+msgid "minute"
+msgstr "minuut"
+
+# calendar/gui/getdate.y:426

+#: filter/filter-datespec.c:67
 msgid "minutes"
 msgstr "minuten"
 
+# calendar/gui/getdate.y:428

+#: filter/filter-datespec.c:68
+msgid "second"
+msgstr "seconde"
+
 # calendar/gui/prop.c:814 calendar/gui/prop.c:831

 #: filter/filter-datespec.c:68
 msgid "seconds"
@@ -4196,6 +4385,11 @@ msgstr "Een tijd relatief aan de huidige tijd"
 msgid "Compare against"
 msgstr "Vergelijk tegen"
 
+# calendar/gui/getdate.y:438

+#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
+msgid "now"
+msgstr "nu"
+
 # addressbook/gui/component/addressbook.c:1010

 #: filter/filter-datespec.c:690
 msgid "<click here to select a date>"
@@ -4225,7 +4419,7 @@ msgid "outgoing"
 msgstr "Uitgaand"
 
 # filter/filter-editor.c:198

-#: 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 "Filters Bewerken"
 
@@ -4265,7 +4459,7 @@ msgstr "Voer een Map URI in"
 msgid "<click here to select a folder>"
 msgstr "<klik hier om een map te selecteren>"
 
-#: filter/filter-input.c:184
+#: filter/filter-input.c:185
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -4274,263 +4468,273 @@ msgstr ""
 "Fout in reguliere expressie '%s':\n"
 "%s"
 
-#: filter/filter-message-search.c:379 filter/filter-message-search.c:447
+#: filter/filter-message-search.c:380 filter/filter-message-search.c:448
 #, c-format
 msgid "Failed to perform regex search on message header: %s"
 msgstr "Fout bij het uitoefenen van regex zoekactie op bericht kop: %s"
 
-#: filter/filter-part.c:456
+#: filter/filter-part.c:467
 msgid "Test"
 msgstr "Test"
 
 # composer/e-msg-composer-attachment.glade.h:10

-#: filter/filter-rule.c:520
+#: filter/filter-rule.c:530
 msgid "Rule name: "
 msgstr "Regel naam: "
 
 # shell/e-shell-folder-title-bar.c:355

-#: filter/filter-rule.c:524
+#: filter/filter-rule.c:534
 msgid "Untitled"
 msgstr "Geen Titel"
 
 # addressbook/gui/component/alphabet.glade.h:14

-#: filter/filter-rule.c:540
+#: filter/filter-rule.c:550
 msgid "If"
 msgstr "Als"
 
-#: filter/filter-rule.c:557
+#: filter/filter-rule.c:567
 msgid "Execute actions"
 msgstr "Acties uitvoeren"
 
-#: filter/filter-rule.c:561
+#: filter/filter-rule.c:571
 msgid "if all criteria are met"
 msgstr "als aan alle criteria wordt voldaan"
 
-#: filter/filter-rule.c:566
+#: filter/filter-rule.c:576
 msgid "if any criteria are met"
 msgstr "als aan een van de criteria wordt voldaan"
 
 # addressbook/contact-editor/e-contact-editor.c:808

 # calendar/gui/event-editor.c:1282

-#: filter/filter-rule.c:577
+#: filter/filter-rule.c:587
 msgid "Add criterion"
 msgstr "Criteria toevoegen"
 
-#: filter/filter-rule.c:583
+#: filter/filter-rule.c:593
 msgid "Remove criterion"
 msgstr "Deze criteria Verwijderen"
 
-# calendar/gui/gncal-todo.c:488

-#: mail/folder-browser.c:465 po/tmp/filter.glade.h:8
-#: po/tmp/mail-config.glade.h:9
-msgid "Edit"
-msgstr "Bewerken"
+# mail/folder-browser-factory.c:35

+#: filter/filter-system-flag.c:63
+msgid "Replied to"
+msgstr "Beantwoord aan"
+
+#. { _("Deleted"), "Deleted" },
+#. { _("Draft"), "Draft" },
+#: filter/filter-system-flag.c:66
+msgid "Important"
+msgstr ""
+
+# addressbook/contact-editor/e-contact-editor.c:1294

+#: filter/filter-system-flag.c:67
+msgid "Read"
+msgstr "Gelezen"
 
 # filter/filter-editor.c:198

-#: po/tmp/filter.glade.h:10
+#: filter/filter.glade.h:10
 msgid "Edit VFolders"
 msgstr "Bewerk VMappen"
 
 # mail/mail-config.c:1490

-#: po/tmp/filter.glade.h:11
+#: filter/filter.glade.h:11
 msgid "Filter Rules"
 msgstr "Filter Regels"
 
-#: po/tmp/filter.glade.h:12
+#: filter/filter.glade.h:12
 msgid "Incoming"
 msgstr "Inkomend"
 
 # calendar/gui/calendar-commands.c:56

-#: po/tmp/filter.glade.h:13
+#: filter/filter.glade.h:13
 msgid "Outgoing"
 msgstr "Uitgaand"
 
 # mail/folder-browser-factory.c:89

-#: po/tmp/filter.glade.h:15
+#: filter/filter.glade.h:15
 msgid "Virtual Folders"
 msgstr "Virtuele Mappen"
 
 # mail/mail-config.c:1199

-#: po/tmp/filter.glade.h:16
+#: filter/filter.glade.h:16
 msgid "vFolder Sources"
 msgstr "VMap Bronnen"
 
+# filter/filter-editor.c:198

 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
+msgid "after"
+msgstr "na"
+
+#: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr "Geef Kleur"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Geef Score"
 
+#: filter/libfilter-i18n.h:5
+msgid "before"
+msgstr "voor"
+
+# addressbook/contact-editor/e-contact-editor.c:808

+# calendar/gui/event-editor.c:1282

+#: filter/libfilter-i18n.h:6
+msgid "contains"
+msgstr "bevat"
+
 # shell/e-shell-view-menu.c:402

-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:7
 msgid "Copy to Folder"
 msgstr "KopieКr naar Map"
 
 # mail/message-list.c:509

-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "Ontvangst datum"
 
 # mail/message-list.c:502

-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "Verzend datum"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:33

-#: filter/libfilter-i18n.h:8
-msgid "Expression"
-msgstr "Expressie"
-
-# mail/folder-browser-factory.c:37

-#: filter/libfilter-i18n.h:9
-msgid "Forward to Address"
-msgstr "Doorsturen naar Adres"
-
-#: filter/libfilter-i18n.h:10
-msgid "Message Body"
-msgstr "Bericht"
-
 #: filter/libfilter-i18n.h:11
-msgid "Message Header"
-msgstr "Bericht Kop"
+msgid "does not contain"
+msgstr "bevat niet"
 
-# composer/e-msg-composer-address-dialog.glade.h:7

 #: filter/libfilter-i18n.h:12
-msgid "Message was received"
-msgstr "Bericht ontvangen"
+msgid "does not end with"
+msgstr "eindigt niet op"
 
+# composer/e-msg-composer.c:676

 #: filter/libfilter-i18n.h:13
-msgid "Message was sent"
-msgstr "Bericht verzonden"
+msgid "does not exist"
+msgstr "bestaat niet"
 
-# shell/e-shell-view-menu.c:402

 #: filter/libfilter-i18n.h:14
-msgid "Move to Folder"
-msgstr "Verplaats naar Map"
+msgid "does not sound like"
+msgstr "klinkt niet als"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not start with"
+msgstr "begint niet met"
 
-# composer/e-msg-composer-address-dialog.glade.h:7

 #: filter/libfilter-i18n.h:16
-msgid "Recipients"
-msgstr "Geaddresseerden"
+msgid "ends with"
+msgstr "eindigt op"
 
+# calendar/gui/getdate.y:441

 #: filter/libfilter-i18n.h:17
-msgid "Regex Match"
-msgstr "Overeenkomende Regex"
+msgid "exists"
+msgstr "bestaat"
 
-# composer/e-msg-composer.c:894 composer/e-msg-composer.c:942

+# addressbook/contact-editor/e-contact-editor-strings.h:33

 #: filter/libfilter-i18n.h:18
-msgid "Sender"
-msgstr "Afzender"
+msgid "Expression"
+msgstr "Expressie"
 
-# mail/message-list.c:460

+# mail/folder-browser-factory.c:37

 #: filter/libfilter-i18n.h:19
-msgid "Set Status"
-msgstr "Stel Status in"
+msgid "Forward to Address"
+msgstr "Doorsturen naar Adres"
 
-# mail/mail-config.c:1490

+# addressbook/gui/component/alphabet.glade.h:17

 #: filter/libfilter-i18n.h:20
-msgid "Source"
-msgstr "Bron"
+msgid "is"
+msgstr "is"
 
 #: filter/libfilter-i18n.h:21
-msgid "Specific header"
-msgstr "Specifieke kop"
+msgid "is greater than"
+msgstr "is grote dan"
 
-# addressbook/contact-editor/e-contact-editor-strings.h:35

 #: filter/libfilter-i18n.h:22
-msgid "Status"
-msgstr "Status"
+msgid "is less than"
+msgstr "is kleiner dan"
 
 #: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
-msgstr "Stop met Verwerken"
+msgid "is not"
+msgstr "is niet"
 
-# mail/message-list.c:495

 #: filter/libfilter-i18n.h:24
-msgid "Subject"
-msgstr "Onderwerp"
+msgid "Message Body"
+msgstr "Bericht"
 
-# filter/filter-editor.c:198

 #: filter/libfilter-i18n.h:25
-msgid "after"
-msgstr "na"
+msgid "Message Header"
+msgstr "Bericht Kop"
 
+# composer/e-msg-composer-address-dialog.glade.h:7

 #: filter/libfilter-i18n.h:26
-msgid "before"
-msgstr "voor"
+msgid "Message was received"
+msgstr "Bericht ontvangen"
 
-# addressbook/contact-editor/e-contact-editor.c:808

-# calendar/gui/event-editor.c:1282

 #: filter/libfilter-i18n.h:27
-msgid "contains"
-msgstr "bevat"
+msgid "Message was sent"
+msgstr "Bericht verzonden"
 
+# shell/e-shell-view-menu.c:402

 #: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr "bevat niet"
+msgid "Move to Folder"
+msgstr "Verplaats naar Map"
 
+# filter/filter-editor.c:198

 #: filter/libfilter-i18n.h:29
-msgid "does not end with"
-msgstr "eindigt niet op"
+msgid "on or after"
+msgstr "op of na"
 
-# composer/e-msg-composer.c:676

 #: filter/libfilter-i18n.h:30
-msgid "does not exist"
-msgstr "bestaat niet"
-
-#: filter/libfilter-i18n.h:31
-msgid "does not sound like"
-msgstr "klinkt niet als"
+msgid "on or before"
+msgstr "op of voor"
 
+# composer/e-msg-composer-address-dialog.glade.h:7

 #: filter/libfilter-i18n.h:32
-msgid "does not start with"
-msgstr "begint niet met"
+msgid "Recipients"
+msgstr "Geaddresseerden"
 
 #: filter/libfilter-i18n.h:33
-msgid "ends with"
-msgstr "eindigt op"
+msgid "Regex Match"
+msgstr "Overeenkomende Regex"
 
-# calendar/gui/getdate.y:441

+# composer/e-msg-composer.c:894 composer/e-msg-composer.c:942

 #: filter/libfilter-i18n.h:34
-msgid "exists"
-msgstr "bestaat"
+msgid "Sender"
+msgstr "Afzender"
 
+# mail/message-list.c:460

 #: filter/libfilter-i18n.h:35
-msgid "is greater than"
-msgstr "is grote dan"
+msgid "Set Status"
+msgstr "Stel Status in"
 
 #: filter/libfilter-i18n.h:36
-msgid "is less than"
-msgstr "is kleiner dan"
+msgid "sounds like"
+msgstr "klinkt als"
 
+# mail/mail-config.c:1490

 #: filter/libfilter-i18n.h:37
-msgid "is not"
-msgstr "is niet"
+msgid "Source"
+msgstr "Bron"
 
-# addressbook/gui/component/alphabet.glade.h:17

 #: filter/libfilter-i18n.h:38
-msgid "is"
-msgstr "is"
+msgid "Specific header"
+msgstr "Specifieke kop"
 
-# filter/filter-editor.c:198

 #: filter/libfilter-i18n.h:39
-msgid "on or after"
-msgstr "op of na"
+msgid "starts with"
+msgstr "begint met"
 
+# addressbook/contact-editor/e-contact-editor-strings.h:35

 #: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr "op of voor"
+msgid "Status"
+msgstr "Status"
 
 #: filter/libfilter-i18n.h:41
-msgid "sounds like"
-msgstr "klinkt als"
+msgid "Stop Processing"
+msgstr "Stop met Verwerken"
 
+# mail/message-list.c:495

 #: filter/libfilter-i18n.h:42
-msgid "starts with"
-msgstr "begint met"
+msgid "Subject"
+msgstr "Onderwerp"
 
 # filter/filter-editor.c:198

 #: filter/libfilter-i18n.h:43
@@ -4567,134 +4771,171 @@ msgid "Edit VFolder Rule"
 msgstr "Bewerk VMap Regel"
 
 # mail/component-factory.c:196

-#: mail/component-factory.c:227
+#: mail/component-factory.c:277
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan het post gedeelte van Evolution niet initialiseren."
 
-#: mail/component-factory.c:266
+#: mail/component-factory.c:316
 msgid "Cannot register storage with shell"
 msgstr "Kan opslag niet registreren met shell"
 
 # calendar/gui/print.c:326

-#: mail/folder-browser.c:140 po/tmp/evolution-event-editor.xml.h:88
-#: po/tmp/evolution-message-composer.xml.h:16
+#: mail/folder-browser.c:223 ui/evolution-event-editor.xml.h:88
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "Opslaan"
 
-#: mail/folder-browser.c:153
+#: mail/folder-browser.c:236
 msgid "Body or subject contains"
 msgstr "Bericht of onderwerp bevat"
 
-#: mail/folder-browser.c:154
+#: mail/folder-browser.c:237
 msgid "Body contains"
 msgstr "Bericht bevat"
 
 # mail/message-list.c:495

-#: mail/folder-browser.c:155
+#: mail/folder-browser.c:238
 msgid "Subject contains"
 msgstr "Onderwerp bevat"
 
-#: mail/folder-browser.c:156
+#: mail/folder-browser.c:239
 msgid "Body does not contain"
 msgstr "Bericht bevat niet"
 
-#: mail/folder-browser.c:157
+#: mail/folder-browser.c:240
 msgid "Subject does not contain"
 msgstr "Onderwerp bevat niet"
 
-#: mail/folder-browser.c:453
+#: mail/folder-browser.c:643
 msgid "VFolder on Subject"
 msgstr "VMap op Onderwerp"
 
-#: mail/folder-browser.c:454
+#: mail/folder-browser.c:644
 msgid "VFolder on Sender"
 msgstr "VMap op Afzender"
 
-#: mail/folder-browser.c:455
+#: mail/folder-browser.c:645
 msgid "VFolder on Recipients"
 msgstr "VMap op Geadresseerden"
 
-#: mail/folder-browser.c:457
+#: mail/folder-browser.c:647
 msgid "Filter on Subject"
 msgstr "Filter op Onderwerp"
 
-#: mail/folder-browser.c:458
+#: mail/folder-browser.c:648
 msgid "Filter on Sender"
 msgstr "Filter op Afzender"
 
-#: mail/folder-browser.c:459
+#: mail/folder-browser.c:649
 msgid "Filter on Recipients"
 msgstr "Filter op Geadresseerden"
 
-#: mail/folder-browser.c:460 mail/folder-browser.c:544
+#: mail/folder-browser.c:650 mail/folder-browser.c:779
 msgid "Filter on Mailing List"
 msgstr "Filter op Mailing Lijst"
 
-#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:14
+#: mail/folder-browser.c:655
+#, fuzzy
+msgid "Show all hidden"
+msgstr "Allen Weergeven"
+
+# addressbook/contact-editor/e-contact-editor.c:852

+# addressbook/gui/component/addressbook.c:426 calendar/gui/gncal-todo.c:499

+# mail/folder-browser-factory.c:45

+#: mail/folder-browser.c:657
+#, fuzzy
+msgid "Hide selected"
+msgstr "Verwijderd"
+
+# addressbook/printing/e-contact-print.glade.h:52

+#. could use another mask, but not enough api do to it
+#: mail/folder-browser.c:660
+#, fuzzy
+msgid "Hide read"
+msgstr "Verbergen"
+
+# addressbook/contact-editor/e-contact-editor.c:852

+# addressbook/gui/component/addressbook.c:426 calendar/gui/gncal-todo.c:499

+# mail/folder-browser-factory.c:45

+#: mail/folder-browser.c:661
+#, fuzzy
+msgid "Hide deleted"
+msgstr "Verwijderd"
+
+# mail/message-list.c:495

+#: mail/folder-browser.c:663 mail/folder-browser.c:790
+#, fuzzy
+msgid "Hide Subject"
+msgstr "Onderwerp"
+
+#: mail/folder-browser.c:665 mail/folder-browser.c:796
+#, fuzzy
+msgid "Hide from Sender"
+msgstr "Filter op Afzender"
+
+#: mail/folder-browser.c:670 ui/evolution-message-composer.xml.h:15
 msgid "Open"
 msgstr "Openen"
 
 # composer/e-msg-composer.c:463

-#: mail/folder-browser.c:466
+#: mail/folder-browser.c:672
 msgid "Save As..."
 msgstr "Opslaan Als..."
 
 # addressbook/gui/component/addressbook.c:425

 # addressbook/gui/component/addressbook.c:492

 # calendar/gui/calendar-commands.c:548 mail/folder-browser-factory.c:43

-#: mail/folder-browser.c:467 mail/mail-view.c:163
-#: po/tmp/evolution-addressbook.xml.h:13 po/tmp/evolution-calendar.xml.h:23
-#: po/tmp/evolution-mail.xml.h:28
+#: 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 "Afdrukken"
 
 # mail/folder-browser-factory.c:35

-#: mail/folder-browser.c:469
+#: mail/folder-browser.c:675
 msgid "Reply to Sender"
 msgstr "Afzender beantwoorden"
 
 # mail/folder-browser-factory.c:35

-#: mail/folder-browser.c:470 mail/mail-view.c:156
-#: po/tmp/evolution-mail.xml.h:34
+#: mail/folder-browser.c:676 mail/mail-view.c:141 ui/evolution-mail.xml.h:38
 msgid "Reply to All"
 msgstr "Iedereen beantwoorden"
 
 # mail/folder-browser-factory.c:37

-#: mail/folder-browser.c:471 mail/mail-view.c:159
-#: 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 "Doorsturen"
 
 # calendar/gui/calendar-commands.c:554

-#: mail/folder-browser.c:472 po/tmp/evolution-mail.xml.h:18
+#: mail/folder-browser.c:678 ui/evolution-mail.xml.h:18
 #, fuzzy
 msgid "Forward inline"
 msgstr "Ga vooruit in tijd"
 
-#: mail/folder-browser.c:474
+#: mail/folder-browser.c:680
 msgid "Mark as Read"
 msgstr "Markeer Als Gelezen"
 
 # addressbook/contact-editor/e-contact-editor.c:704

 # calendar/gui/event-editor.c:1179

-#: mail/folder-browser.c:475
+#: mail/folder-browser.c:681
 msgid "Mark as Unread"
 msgstr "Markeer Als Ongelezen"
 
 # shell/e-shell-view-menu.c:402

-#: mail/folder-browser.c:477
+#: mail/folder-browser.c:683
 msgid "Move to Folder..."
 msgstr "Verplaats naar Map..."
 
 # shell/e-shell-view-menu.c:402

-#: mail/folder-browser.c:478
+#: mail/folder-browser.c:684
 msgid "Copy to Folder..."
 msgstr "KopiКer naar Map..."
 
 # addressbook/contact-editor/e-contact-editor.c:852

 # addressbook/gui/component/addressbook.c:426 calendar/gui/gncal-todo.c:499

 # mail/folder-browser-factory.c:45

-#: mail/folder-browser.c:480
+#: mail/folder-browser.c:686
 msgid "Undelete"
 msgstr "Terughalen"
 
@@ -4702,19 +4943,81 @@ msgstr "Terughalen"
 # calendar/gui/event-editor.c:1222

 #. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
 #. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:484
+#: mail/folder-browser.c:690
 msgid "Apply Filters"
 msgstr "Filters Toepassen"
 
-#: mail/folder-browser.c:486 po/tmp/evolution-mail.xml.h:10
+#: mail/folder-browser.c:692 ui/evolution-mail.xml.h:10
 msgid "Create Rule From Message"
 msgstr "Maak Regel Van Bericht"
 
-#: mail/folder-browser.c:546
+# composer/e-msg-composer.c:894

+#: mail/folder-browser.c:693 ui/evolution-mail.xml.h:21
+#, fuzzy
+msgid "Hide Messages"
+msgstr "Bericht Bewerken"
+
+#: mail/folder-browser.c:781
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filter op Mailing Lijst (%s)"
 
+# mail/message-list.c:495

+#: mail/folder-browser.c:787
+#, fuzzy, c-format
+msgid "Hide Subject \"%s\""
+msgstr "Onderwerp is %s"
+
+#: 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 "Bezig met vergaren opslag voor \"%s\""
+
+# calendar/gui/event-editor.c:294

+#: mail/local-config.glade.h:7
+#, fuzzy
+msgid "Mailbox Format"
+msgstr "Samenvatting postvak"
+
+# addressbook/contact-editor/e-contact-editor-strings.h:10

+# addressbook/contact-editor/e-contact-editor-strings.h:12

+#: mail/local-config.glade.h:8
+#, fuzzy
+msgid "New store format:"
+msgstr "Nieuws bron type:"
+
+#: 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
+#, fuzzy
+msgid "mbox"
+msgstr "Postvak In"
+
+# addressbook/gui/component/alphabet.glade.h:16

+# calendar/cal-util/timeutil.c:98

+#: mail/local-config.glade.h:12
+#, fuzzy
+msgid "mh"
+msgstr "h"
+
 # mail/mail-config.c:1199

 #: mail/mail-autofilter.c:71
 #, c-format
@@ -4779,7 +5082,7 @@ msgid "You have no Outbox configured"
 msgstr "Er is geen \"Postvak uit\" geconfigureerd"
 
 # mail/mail-ops.c:386

-#: mail/mail-callbacks.c:246
+#: mail/mail-callbacks.c:244
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -4787,22 +5090,27 @@ msgstr ""
 "Dit bericht heeft geen onderwerp.\n"
 "Weet u zeker dat u het wilt versturen?"
 
-#: mail/mail-callbacks.c:291
+#: mail/mail-callbacks.c:312
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 "De geadresseerde moeten worden gespecificeerd om dit bericht te versturen."
 
+# mail/folder-browser-factory.c:37

+#: mail/mail-callbacks.c:530
+msgid "Forwarded message:\n"
+msgstr "Doorgestuurd bericht:\n"
+
 # mail/folder-browser-factory.c:41

-#: mail/mail-callbacks.c:552
+#: mail/mail-callbacks.c:611
 msgid "Move message(s) to"
 msgstr "Verplaats bericht(en) naar"
 
 # composer/e-msg-composer.c:1127

-#: mail/mail-callbacks.c:554
+#: mail/mail-callbacks.c:613
 msgid "Copy message(s) to"
 msgstr "KopiКer bericht(en) naar"
 
-#: mail/mail-callbacks.c:665
+#: mail/mail-callbacks.c:748
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4810,12 +5118,12 @@ msgstr ""
 "Je mag alleen berichten bewerken die opgeslagen zijn\n"
 "in de Klad map."
 
-#: mail/mail-callbacks.c:699 mail/mail-display.c:72
+#: mail/mail-callbacks.c:781 mail/mail-display.c:79
 msgid "Overwrite file?"
 msgstr "Bestand overschrijven?"
 
 # shell/e-storage.c:416

-#: mail/mail-callbacks.c:703 mail/mail-display.c:76
+#: mail/mail-callbacks.c:785 mail/mail-display.c:83
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -4823,16 +5131,16 @@ msgstr ""
 "Er bestaat al een bestand met die naam.\n"
 "Overschrijven?"
 
-#: mail/mail-callbacks.c:748
+#: mail/mail-callbacks.c:830
 msgid "Save Message As..."
 msgstr "Bericht Opslaan Als..."
 
-#: mail/mail-callbacks.c:750
+#: mail/mail-callbacks.c:832
 msgid "Save Messages As..."
 msgstr "Berichten Opslaan Als..."
 
 # composer/e-msg-composer.c:494

-#: mail/mail-callbacks.c:877
+#: mail/mail-callbacks.c:916
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4841,49 +5149,307 @@ msgstr ""
 "Fout bij het laden van filter informatie:\n"
 "%s"
 
-#: mail/mail-callbacks.c:922
+#: mail/mail-callbacks.c:961
 msgid "Print Message"
 msgstr "Bericht Afdrukken"
 
-#: mail/mail-callbacks.c:969
+#: mail/mail-callbacks.c:1008
 msgid "Printing of message failed"
 msgstr "Afdrukken van bericht mislukt"
 
-# mail/mail-config.c:1180

+# addressbook/contact-editor/e-contact-editor.c:808

+# calendar/gui/event-editor.c:1282

 #.
-#. * 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
+#, fuzzy
+msgid "Account"
+msgstr "Accounts"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:389

+#: mail/mail-config-druid.glade.h:7
+msgid "Account Information"
+msgstr "Account Informatie"
+
+#: mail/mail-config-druid.glade.h:8
+msgid "Account Management"
+msgstr "Account Beheer"
+
+# composer/e-msg-composer-attachment.glade.h:7

+#: mail/mail-config-druid.glade.h:9
+#, fuzzy
+msgid "Account Properties"
+msgstr "Attachment eigenschappen"
+
+# calendar/gui/gncal-todo.c:479

+# composer/e-msg-composer-address-dialog.glade.h:13

+#: mail/mail-config-druid.glade.h:11
+#, fuzzy
+msgid "Advanced"
+msgstr "Geavanceerd..."
+
+# mail/mail-config.c:739 mail/mail-config.c:819

+#: mail/mail-config-druid.glade.h:12
+msgid "Authentication"
+msgstr "Authenticatie"
+
+# mail/mail-config.c:739 mail/mail-config.c:819

+#: mail/mail-config-druid.glade.h:13
+#, fuzzy
+msgid "Authentication Type:"
+msgstr "Authenticatie:"
+
+#: mail/mail-config-druid.glade.h:15
+msgid "Automatically check mail every "
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:17
+#, fuzzy
+msgid "Congratulations, your mail configuration is complete.\n"
+msgstr "Gefeliciteerd, je e-mail configuratie is compleet."
+
+#: mail/mail-config-druid.glade.h:23
+msgid "DIGEST-MD5"
+msgstr ""
+
+# calendar/gui/prop.c:836

+#: mail/mail-config-druid.glade.h:24
+msgid "Default"
+msgstr "Standaardwaarde"
+
+#: mail/mail-config-druid.glade.h:26
+#, fuzzy
+msgid "Delete mail from server"
+msgstr "Verwijder de berichten niet van de server"
+
+# shell/e-shell-view.c:596

+#: mail/mail-config-druid.glade.h:27
+msgid "Done"
+msgstr "Klaar"
+
+# mail/mail-config.c:305

+#: mail/mail-config-druid.glade.h:28
+#, fuzzy
+msgid "E-Mail Address:"
+msgstr "E-mail Adres:"
+
+# mail/mail-config.c:305

+#: mail/mail-config-druid.glade.h:30
+msgid "Email Address:"
+msgstr "E-mail Adres:"
+
+# mail/mail-config.c:1163 mail/mail-config.c:1242

+#: mail/mail-config-druid.glade.h:31
+msgid "Evolution Mail Configuration"
+msgstr "Evolution Post Configuratie"
+
+# mail/mail-config.c:277

+#: mail/mail-config-druid.glade.h:32
+msgid "Full Name:"
+msgstr "Volledige Naam:"
+
+# mail/mail-config.c:725

+#: mail/mail-config-druid.glade.h:35
+#, fuzzy
+msgid "Hostname:"
+msgstr "Gebruikersnaam:"
+
+#: mail/mail-config-druid.glade.h:36
+msgid "IMAP"
+msgstr "IMAP"
+
+# mail/mail-config.c:1180

+#: mail/mail-config-druid.glade.h:37
 msgid "Identity"
 msgstr "Identiteit"
 
+#: 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
+msgid "Mail"
+msgstr "Post"
+
+# addressbook/contact-editor/e-contact-editor.c:808

+# calendar/gui/event-editor.c:1282

+#: mail/mail-config-druid.glade.h:41
+#, fuzzy
+msgid "Mail Account"
+msgstr "Accounts"
+
 # mail/mail-config.c:1163 mail/mail-config.c:1242

-#: po/tmp/mail-config-druid.glade.h:7
+#: mail/mail-config-druid.glade.h:42
 msgid "Mail Configuration"
 msgstr "Post Configuratie"
 
-# mail/mail-config.c:1199

-#: po/tmp/mail-config-druid.glade.h:8
-msgid "Mail Source"
-msgstr "Post Bron"
+# mail/mail-config.c:1163 mail/mail-config.c:1242

+#: mail/mail-config-druid.glade.h:43
+msgid "Mail Configuration Druid"
+msgstr "Post Configuratie Druide"
 
-# mail/mail-config.c:1220

-#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
-msgid "Mail Transport"
-msgstr "Post Transport"
+#: mail/mail-config-druid.glade.h:44
+msgid "Make this my default account"
+msgstr "Stel dit in als standaard account"
 
-#: po/tmp/mail-config-druid.glade.h:10
-msgid "Welcome to the Evolution Mail configuration wizard!\n"
-msgstr "Welkom bij de Evolution Post Configuratie Wizard!\n"
+# shell/e-shell-view-menu.c:398

+#: mail/mail-config-druid.glade.h:46
+msgid "News"
+msgstr "Nieuws"
 
-#: po/tmp/mail-config-druid.glade.h:14
+# addressbook/printing/e-contact-print.glade.h:10

+#: mail/mail-config-druid.glade.h:48
+msgid "Optional"
+msgstr "Optioneel"
+
+# mail/mail-config.c:328

+#: mail/mail-config-druid.glade.h:49 mail/mail-config-gui.c:485
+msgid "Organization:"
+msgstr "Organisatie:"
+
+#: mail/mail-config-druid.glade.h:50
+msgid "Outgoing Mail Server"
+msgstr ""
+
+# mail/folder-browser-factory.c:101

+#: mail/mail-config-druid.glade.h:51
+msgid "Password:"
+msgstr "Wachtwoord:"
+
+#: mail/mail-config-druid.glade.h:53
+msgid "Plain Text"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:54
+msgid "Receiving Email"
+msgstr "Bezig met ontvangen E-mail"
+
+#: mail/mail-config-druid.glade.h:55
+#, fuzzy
+msgid "Remember my password"
+msgstr "Onthoud dit wachtwoord"
+
+# mail/folder-browser-factory.c:34

+#: mail/mail-config-druid.glade.h:56 mail/mail-format.c:628
+msgid "Reply-To:"
+msgstr "Antwoord-Naar:"
+
+# mail/folder-browser-factory.c:34

+#: mail/mail-config-druid.glade.h:57
+msgid "Reply-to:"
+msgstr "Antwoord-naar:"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:565

+#: mail/mail-config-druid.glade.h:58
+msgid "Required"
+msgstr "Benodigd"
+
+# addressbook/gui/component/addressbook.c:943

+# addressbook/gui/minicard/e-minicard.c:330

+#: mail/mail-config-druid.glade.h:60
+#, fuzzy
+msgid "Save password"
+msgstr "Opslaan als VCard"
+
+# mail/mail-config.c:340

+#: mail/mail-config-druid.glade.h:61
+#, fuzzy
+msgid "Select signature file"
+msgstr "Signatuur bestand:"
+
+# composer/e-msg-composer.c:894 composer/e-msg-composer.c:942

+#: mail/mail-config-druid.glade.h:62
+msgid "Sending Email"
+msgstr "Bezig met versturen E-mail"
+
+# mail/mail-config.c:1163 mail/mail-config.c:1242

+#: mail/mail-config-druid.glade.h:64
+msgid "Server Configuration"
+msgstr "Server Configuratie"
+
+# mail/mail-config.c:718 mail/mail-config.c:812 mail/mail-config.c:1621

+#: mail/mail-config-druid.glade.h:65
+#, fuzzy
+msgid "Server Timeouts"
+msgstr "Server Type: "
+
+# mail/mail-config.c:718 mail/mail-config.c:812 mail/mail-config.c:1621

+#: mail/mail-config-druid.glade.h:66
+msgid "Server Type: "
+msgstr "Server Type: "
+
+#: mail/mail-config-druid.glade.h:67
+#, fuzzy
+msgid "Server requires authentication"
+msgstr "SMTP server heeft authenticatie nodig"
+
+# mail/mail-config.c:718 mail/mail-config.c:812 mail/mail-config.c:1621

+#: mail/mail-config-druid.glade.h:68
+#, fuzzy
+msgid "Servers"
+msgstr "Server:"
+
+# mail/mail-config.c:340

+#: mail/mail-config-druid.glade.h:69 mail/mail-config-gui.c:496
+msgid "Signature file:"
+msgstr "Signatuur bestand:"
+
+# mail/mail-config.c:340

+#: mail/mail-config-druid.glade.h:70
+#, fuzzy
+msgid "Signature:"
+msgstr "Signatuur bestand:"
+
+# mail/mail-config.c:1490

+#: mail/mail-config-druid.glade.h:71 mail/mail-config.glade.h:20
+msgid "Sources"
+msgstr "Bronnen"
+
+#: mail/mail-config-druid.glade.h:72
+#, fuzzy
+msgid "This server requires a secure connection (SSL)"
+msgstr "SMTP server heeft authenticatie nodig"
+
+# addressbook/printing/e-contact-print.glade.h:30

+#: mail/mail-config-druid.glade.h:73
+#, fuzzy
+msgid "Type"
+msgstr "Type:"
+
+#: 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 ""
-"Je e-mail configuratie is nu klaar.\n"
-"Klik op \"Einde\" om je nieuwe instellingen op te slaan"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:389

+#: mail/mail-config-druid.glade.h:76
+#, fuzzy
+msgid "User Information"
+msgstr "Geen informatie"
+
+# mail/mail-config.c:725

+#: mail/mail-config-druid.glade.h:77 mail/mail-config-gui.c:928
+msgid "Username:"
+msgstr "Gebruikersnaam:"
+
+#: mail/mail-config-druid.glade.h:78
+#, fuzzy
+msgid "Welcome to the Evolution Mail Configuration Druid.\n"
+msgstr "Welkom bij de Evolution Post Configuratie Wizard!\n"
+
+# calendar/gui/getdate.y:426

+#: mail/mail-config-druid.glade.h:81
+#, fuzzy
+msgid "minute(s)"
+msgstr "minuten"
 
 # mail/mail-config.c:262

 #: mail/mail-config-gui.c:433
@@ -4906,18 +5472,8 @@ msgstr "Volledige naam:"
 msgid "Email address:"
 msgstr "E-mail adres:"
 
-# mail/mail-config.c:328

-#: mail/mail-config-gui.c:485
-msgid "Organization:"
-msgstr "Organisatie:"
-
-# mail/mail-config.c:340

-#: mail/mail-config-gui.c:496
-msgid "Signature file:"
-msgstr "Signatuur bestand:"
-
 # mail/mail-config.c:345

-#: 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 "Signatuur Bestand"
 
@@ -4926,30 +5482,11 @@ msgstr "Signatuur Bestand"
 msgid "Server:"
 msgstr "Server:"
 
-# mail/mail-config.c:725

-#: mail/mail-config-gui.c:928
-msgid "Username:"
-msgstr "Gebruikersnaam:"
-
-# mail/mail-config.c:732

-#: mail/mail-config-gui.c:934
-msgid "Path:"
-msgstr "Pad:"
-
-# mail/mail-config.c:739 mail/mail-config.c:819

-#: mail/mail-config-gui.c:943
-msgid "Authentication:"
-msgstr "Authenticatie:"
-
 # mail/mail-config.c:751 mail/mail-config.c:831

 #: mail/mail-config-gui.c:956
 msgid "Detect supported types..."
 msgstr "Detecteer ondersteunde types..."
 
-#: mail/mail-config-gui.c:968
-msgid "Remember this password"
-msgstr "Onthoud dit wachtwoord"
-
 #: mail/mail-config-gui.c:991
 msgid "Don't delete messages from server"
 msgstr "Verwijder de berichten niet van de server"
@@ -4964,7 +5501,7 @@ msgid "Mail source type:"
 msgstr "Post bron type:"
 
 # mail/mail-config.c:960

-#: 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"
@@ -5002,6 +5539,20 @@ msgstr ""
 msgid "Mail transport type:"
 msgstr "Mail transport type:"
 
+# mail/mail-config.c:960

+#: mail/mail-config-gui.c:1183
+#, fuzzy
+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 ""
+"Selecteer het soort postserver, en de overige benodigde infomatie.\n"
+"\n"
+"Als de server authenticatie vereist, kan je op \"Detecteer ondersteunde "
+"types...\" klikken nadat je de overige informatie hebt ingevuld."
+
 # mail/mail-config.c:1345

 #: mail/mail-config-gui.c:1233
 msgid "Add Identity"
@@ -5057,67 +5608,75 @@ msgid "Query authorization at \"%s\""
 msgstr "Aanmeldings mogelijkheden van \"%s\" onderzoeken"
 
 # composer/e-msg-composer-address-dialog.glade.h:11

-#: po/tmp/mail-config.glade.h:7
+#: mail/mail-config.glade.h:7
 msgid "Address"
 msgstr "Adres"
 
 # mail/mail-config.c:1180

-#: po/tmp/mail-config.glade.h:10
+#: mail/mail-config.glade.h:10
 msgid "Identities"
 msgstr "Identiteiten"
 
 # mail/mail-config.c:1199

-#: po/tmp/mail-config.glade.h:11
+#: mail/mail-config.glade.h:11
 msgid "Mail Sources"
 msgstr "Post Bronnen"
 
-#: po/tmp/mail-config.glade.h:13
+# mail/mail-config.c:1220

+#: mail/mail-config.glade.h:12
+msgid "Mail Transport"
+msgstr "Post Transport"
+
+#: mail/mail-config.glade.h:13
 msgid "Mark message as seen [ms]: "
 msgstr "Markeer bericht als gelezen [ms]: "
 
 # mail/mail-config.c:1658

-#: po/tmp/mail-config.glade.h:14
+#: mail/mail-config.glade.h:14
 msgid "News Servers"
 msgstr "Nieuws Servers"
 
 # mail/mail-config.c:1490

-#: po/tmp/mail-config.glade.h:15
+#: mail/mail-config.glade.h:15
 msgid "News Sources"
 msgstr "Nieuws Bronnen"
 
 # mail/mail-config.c:328

-#: po/tmp/mail-config.glade.h:16
+#: mail/mail-config.glade.h:16
 msgid "Organization"
 msgstr "Organisatie"
 
-#: po/tmp/mail-config.glade.h:18
+#: mail/mail-config.glade.h:18
 msgid "Send messages in HTML format"
 msgstr "Stuur berichten in HTML formaat"
 
-# mail/mail-config.c:1490

-#: po/tmp/mail-config.glade.h:20
-msgid "Sources"
-msgstr "Bronnen"
-
-#: mail/mail-crypto.c:350 mail/mail-crypto.c:452 mail/mail-crypto.c:629
+#: 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."
 msgstr "Voer je PGP/GPG passphrase in."
 
-#: mail/mail-crypto.c:354 mail/mail-crypto.c:456 mail/mail-crypto.c:634
+#: mail/mail-crypto.c:357 mail/mail-crypto.c:462 mail/mail-crypto.c:640
+#: mail/mail-crypto.c:785
 msgid "No password provided."
 msgstr "Geen wachtwoord ingevoerd."
 
-#: mail/mail-crypto.c:360 mail/mail-crypto.c:463 mail/mail-crypto.c:640
+#: mail/mail-crypto.c:363 mail/mail-crypto.c:469 mail/mail-crypto.c:646
+#: mail/mail-crypto.c:792 mail/mail-crypto.c:942
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Kon de pipe naar GPG/PGP niet maken: %s"
 
 # calendar/gui/event-editor.c:294

-#: mail/mail-crypto.c:625
+#: mail/mail-crypto.c:631 mail/mail-crypto.c:777 mail/mail-crypto.c:936
 msgid "No GPG/PGP program available."
 msgstr "Geen GPG/PGP programma beschikbaar."
 
-#: mail/mail-display.c:90
+#: mail/mail-crypto.c:953
+#, fuzzy, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "Kon de pipe niet maken: %s"
+
+#: mail/mail-display.c:98
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -5127,137 +5686,137 @@ msgstr ""
 "%s"
 
 # mail/mail-threads.c:814

-#: mail/mail-display.c:113
+#: mail/mail-display.c:131
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kon gegevens niet wegschrijven: %s"
 
 # addressbook/contact-editor/e-contact-editor.c:671

 # calendar/gui/event-editor.c:1146

-#: mail/mail-display.c:218
+#: mail/mail-display.c:229
 msgid "Save Attachment"
 msgstr "Aanhangsel Opslaan"
 
-#: mail/mail-display.c:258
+#: mail/mail-display.c:269
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Kon tijdelijke directory niet maken: %s"
 
 # composer/e-msg-composer.c:463

-#: mail/mail-display.c:300
+#: mail/mail-display.c:311
 msgid "Save to Disk..."
 msgstr "Opslaan op Schijf..."
 
-#: mail/mail-display.c:302
+#: mail/mail-display.c:313
 #, c-format
 msgid "Open in %s..."
 msgstr "Openen in %s..."
 
-#: mail/mail-display.c:304
+#: mail/mail-display.c:315
 msgid "View Inline"
 msgstr "Geef Ingebonden Weer"
 
-#: mail/mail-display.c:328
+#: mail/mail-display.c:339
 msgid "External Viewer"
 msgstr "Extern Weergave Programma"
 
-#: mail/mail-display.c:351
+#: mail/mail-display.c:362
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Geef Ingebonden Weer (via %s)"
 
 # addressbook/printing/e-contact-print.glade.h:52

-#: mail/mail-display.c:355
+#: mail/mail-display.c:366
 msgid "Hide"
 msgstr "Verbergen"
 
 # composer/e-msg-composer-attachment-bar.c:299

-#: mail/mail-format.c:500
+#: mail/mail-format.c:503
 #, c-format
 msgid "%s attachment"
 msgstr "%s bijvoegsel"
 
-# mail/folder-browser-factory.c:34

-#: mail/mail-format.c:623
-msgid "Reply-To:"
-msgstr "Antwoord-Naar:"
-
-#: mail/mail-format.c:845
+#: mail/mail-format.c:851
 msgid "No GPG/PGP support available in this copy of Evolution."
 msgstr "Geen GPG/PGP ondersteuning beschikbaar in deze versie van Evolution."
 
 # calendar/gui/prop.c:519

-#: mail/mail-format.c:857
+#: mail/mail-format.c:863
 msgid "Encrypted message not displayed"
 msgstr "Versleutelde berichten worden niet weergegeven"
 
 # composer/e-msg-composer.c:894

-#: mail/mail-format.c:863
+#: mail/mail-format.c:869
 msgid "Encrypted message"
 msgstr "Versleuteld bericht"
 
-#: mail/mail-format.c:864
+#: mail/mail-format.c:870
 msgid "Click icon to decrypt."
 msgstr "Klik op het icoon om te decoderen."
 
-#: mail/mail-format.c:1470
+#: mail/mail-format.c:1450
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Wijzer naar FTP site (%s)"
 
-#: mail/mail-format.c:1482
+#: mail/mail-format.c:1462
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Wijzer naar lokaal bestand (%s) geldig bij site \"%s\""
 
-#: mail/mail-format.c:1486
+#: mail/mail-format.c:1466
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Wijzer naar lokaal bestand (%s)"
 
-#: mail/mail-format.c:1520
+#: mail/mail-format.c:1500
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Wijzer naar onbekende externe gegevens (\"%s\" type)"
 
-#: mail/mail-format.c:1525
+#: mail/mail-format.c:1505
 msgid "Malformed external-body part."
 msgstr "Misvorms extern-bericht gedeelte"
 
-#: mail/mail-format.c:1695
+#: mail/mail-format.c:1675
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr "Op %s, %s schreef:\n"
 
-#: mail/mail-local.c:202
+#: mail/mail-local.c:204
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Bezig met veranderen mapformaat van \"%s\" naar \"%s\""
 
-#: mail/mail-local.c:206
+#: mail/mail-local.c:208
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Verander map van \"%s\" naar \"%s\" formaat"
 
-#: mail/mail-local.c:261
+#: mail/mail-local.c:251
+#, fuzzy
+msgid "Reconfiguring folder"
+msgstr "_Configureer Map"
+
+#: mail/mail-local.c:269
 msgid "Closing current folder"
 msgstr "Huidige map gesloten"
 
-#: mail/mail-local.c:293
+#: mail/mail-local.c:295
 msgid "Renaming old folder and opening"
 msgstr "Naam oude map gewijzigd en map geopend"
 
 # shell/e-shell-view-menu.c:404

-#: mail/mail-local.c:314
+#: mail/mail-local.c:313
 msgid "Creating new folder"
 msgstr "Bezig met aanmaken van nieuwe map"
 
 # composer/e-msg-composer.c:1127

-#: mail/mail-local.c:329
+#: mail/mail-local.c:327
 msgid "Copying messages"
 msgstr "Bezig met het kopiКren van berichten"
 
-#: mail/mail-local.c:341
+#: mail/mail-local.c:348
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -5266,7 +5825,7 @@ msgstr ""
 "Kan map metainfo niet opslaan: deze map kan waarschijnlijk niet\n"
 "meer worden geopend: %s"
 
-#: mail/mail-local.c:372
+#: mail/mail-local.c:379
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -5275,325 +5834,229 @@ msgstr ""
 "allicht noodzakelijk om deze handmatig te repareren."
 
 # shell/e-shell-view-menu.c:404

-#: mail/mail-local.c:781
+#: mail/mail-local.c:787
 msgid "Registering local folder"
 msgstr "Bezig met registreren lokale map"
 
 # shell/e-shell-view-menu.c:404

-#: mail/mail-local.c:783
+#: mail/mail-local.c:789
 msgid "Register local folder"
 msgstr "Registreren lokale map"
 
+#: mail/mail-local.c:894
+#, fuzzy, c-format
+msgid ""
+"Unable to register folder '%s':\n"
+"%s"
+msgstr "Fout bij het opslaan van het groepenlijst bestand voor %s: %s"
+
+#: mail/mail-mt.c:85
+#, fuzzy, c-format
+msgid ""
+"Error while '%s':\n"
+"%s"
+msgstr ""
+"Fout tijdens `%s':\n"
+"%s"
+
+#: mail/mail-mt.c:87
+#, fuzzy, c-format
+msgid ""
+"Error while performing operation:\n"
+"%s"
+msgstr ""
+"Fout tijden het preparen van %s:\n"
+"%s"
+
+# calendar/gui/gnome-month-item.c:737

+#: mail/mail-mt.c:356 mail/mail-mt.c:385
+#, fuzzy
+msgid "Working"
+msgstr "Bezig met verplaatsen"
+
 # mail/mail-ops.c:374

-#: mail/mail-ops.c:79
+#: mail/mail-ops.c:88
 #, c-format
 msgid "Fetching email from %s"
 msgstr "Bezig met ophalen post van %s"
 
 # mail/mail-ops.c:374

-#: mail/mail-ops.c:81
+#: mail/mail-ops.c:90
 #, c-format
 msgid "Fetch email from %s"
 msgstr "Post ophalen van %s"
 
-#: mail/mail-ops.c:331
+#: mail/mail-ops.c:335
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "Er is geen nieuwe post op %s."
 
-#: mail/mail-ops.c:401
+#: mail/mail-ops.c:405
 msgid "Filtering email on demand"
 msgstr "Bezig met op verzoek filteren van post"
 
-#: mail/mail-ops.c:403
+#: mail/mail-ops.c:407
 msgid "Filter email on demand"
 msgstr "Filter post op verzoek"
 
-#: mail/mail-ops.c:538
+#: mail/mail-ops.c:551
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Bezig met verzenden \"%s\""
 
-#: mail/mail-ops.c:543
-msgid "Sending a message without a subject"
-msgstr "Bezig met versturen van een bericht zonder onderwerp"
-
-# calendar/gui/gncal-todo.c:728 calendar/gui/gncal-todo.c:732

-#: mail/mail-ops.c:546
-#, c-format
-msgid "Send \"%s\""
-msgstr "Verstuur \"%s\""
-
-#: mail/mail-ops.c:549
-msgid "Send a message without a subject"
-msgstr "Stuur een bericht zonder onderwerp"
+#: mail/mail-ops.c:553
+#, fuzzy
+msgid "Sending message"
+msgstr "Verzonden email-berichten"
 
-#: mail/mail-ops.c:720
+#: mail/mail-ops.c:669
 msgid "Sending queue"
 msgstr "Bezig met verzenden wachtrij"
 
-#: mail/mail-ops.c:722
+#: mail/mail-ops.c:671
 msgid "Send queue"
 msgstr "Verzendings wachtrij"
 
-#: mail/mail-ops.c:858 mail/mail-ops.c:865
+#: mail/mail-ops.c:804 mail/mail-ops.c:811
 #, c-format
 msgid "Appending \"%s\""
 msgstr "Bezig met toevoegen \"%s\""
 
-#: mail/mail-ops.c:862 mail/mail-ops.c:868
+#: mail/mail-ops.c:808 mail/mail-ops.c:814
 msgid "Appending a message without a subject"
 msgstr "Bezig met toevoegen van een bericht zonder onderwerp"
 
-#: mail/mail-ops.c:940
-#, c-format
-msgid "Expunging \"%s\""
-msgstr "Bezig met Legen \"%s\""
-
-# mail/folder-browser-factory.c:77

-#: mail/mail-ops.c:942
-#, c-format
-msgid "Expunge \"%s\""
-msgstr "Legen \"%s\""
-
-#: mail/mail-ops.c:1001
+#: mail/mail-ops.c:897
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Bezig met Verplaatsen berichten van \"%s\" naar \"%s\""
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:899
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Bezig met kopiКren berichten van \"%s\" naar \"%s\""
 
-#: mail/mail-ops.c:1006
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Verplaats berichten van \"%s\" naar \"%s\""
 
-#: mail/mail-ops.c:1008
+#: mail/mail-ops.c:904
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "KopiКer berichten van \"%s\" naar \"%s\""
 
 # calendar/gui/gnome-month-item.c:737

-#: mail/mail-ops.c:1039
+#: mail/mail-ops.c:935
 msgid "Moving"
 msgstr "Bezig met verplaatsen"
 
 # composer/e-msg-composer-address-dialog.c:187 composer/e-msg-composer.c:946

-#: mail/mail-ops.c:1042
+#: mail/mail-ops.c:938
 msgid "Copying"
 msgstr "Bezig met kopiКren"
 
-#: mail/mail-ops.c:1062
+#: mail/mail-ops.c:958
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s bericht %d van %d (uid \"%s\")"
 
-# mail/folder-browser-factory.c:41

-#: mail/mail-ops.c:1141
-#, c-format
-msgid "Marking messages in folder \"%s\""
-msgstr "Bezig met Markeren berichten in map \"%s\""
-
-# mail/folder-browser-factory.c:41

-#: mail/mail-ops.c:1144
-#, c-format
-msgid "Mark messages in folder \"%s\""
-msgstr "Markeer berichten in map \"%s\""
-
-# mail/folder-browser-factory.c:41

-#: mail/mail-ops.c:1175
-#, c-format
-msgid "Marking message %d of %d"
-msgstr "Bezig met markeren bericht %d van %d"
-
-#: mail/mail-ops.c:1295
+#: mail/mail-ops.c:1033
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Bezig met scannen van mappen in \"%s\""
 
-#: mail/mail-ops.c:1297
-#, c-format
-msgid "Scan folders in \"%s\""
-msgstr "Scan mappen in \"%s\""
-
 # addressbook/gui/component/ldap-server-dialog.glade.h:7

 # composer/e-msg-composer-attachment.glade.h:9

-#: mail/mail-ops.c:1366 mail/subscribe-dialog.c:339
+#: mail/mail-ops.c:1099 mail/subscribe-dialog.c:341
 msgid "(No description)"
 msgstr "(Geen beschrijving)"
 
-#: mail/mail-ops.c:1432
-#, c-format
-msgid "Attaching messages from folder \"%s\""
-msgstr "Bezig met bijvoegen berichten uit map \"%s\""
-
-#: mail/mail-ops.c:1435
-#, c-format
-msgid "Attach messages from \"%s\""
-msgstr "Voeg berichten van \"%s\" bij"
-
-# mail/folder-browser-factory.c:37

-#: mail/mail-ops.c:1535
-#, c-format
-msgid "Forwarding messages \"%s\""
-msgstr "Bezig met Doorsturen berichten \"%s\""
-
-#: mail/mail-ops.c:1539
-msgid "Forwarding a message without a subject"
-msgstr "Bezig met doorsturen berichten zonder onderwerp"
-
 # mail/folder-browser-factory.c:37

-#: mail/mail-ops.c:1542
-#, c-format
-msgid "Forward message \"%s\""
-msgstr "Bericht \"%s\" doorsturen"
-
-#: mail/mail-ops.c:1546
-msgid "Forward a message without a subject"
-msgstr "Stuur een bericht door zonder onderwerp"
-
-#: mail/mail-ops.c:1593
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Bezig met ophalen bericht %d van %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1610
-msgid ""
-"Failed to generate mime part from message while generating forwarded message."
-msgstr ""
-"Fout bij genereren mime deel van bericht tijden het genereren van het door "
-"te sturen bericht."
-
-# mail/folder-browser-factory.c:37

-#: mail/mail-ops.c:1665
+#: mail/mail-ops.c:1164
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Doorgestuurd bericht:\n"
 
-# mail/folder-browser-factory.c:37

-#: mail/mail-ops.c:1679
-msgid "Forwarded message:\n"
-msgstr "Doorgestuurd bericht:\n"
-
-#: mail/mail-ops.c:1748
-#, c-format
-msgid "Loading \"%s\""
-msgstr "Bezig met laden \"%s\""
-
-#: mail/mail-ops.c:1750
-#, c-format
-msgid "Load \"%s\""
-msgstr "Laden \"%s\""
-
-#: mail/mail-ops.c:1853
-#, c-format
-msgid "Creating \"%s\""
-msgstr "Bezig met Maken \"%s\""
-
-#: mail/mail-ops.c:1855
-#, c-format
-msgid "Create \"%s\""
-msgstr "Maken \"%s\""
-
-#: mail/mail-ops.c:1903
-msgid "Exception while reporting result to shell component listener."
-msgstr ""
-"Uitzondering tijdens het rapporteren van het resultaat aan de 'shell "
-"component listener'."
+#: mail/mail-ops.c:1205 mail/mail-ops.c:1274
+#, fuzzy, c-format
+msgid "Opening folder %s"
+msgstr "Bezig met scannen van mappen in \"%s\""
 
-#: mail/mail-ops.c:1949
-#, c-format
-msgid "Synchronizing \"%s\""
+#: mail/mail-ops.c:1336
+#, fuzzy
+msgid "Synchronising folder"
 msgstr "Bezig met Synchronizeren \"%s\""
 
-#: mail/mail-ops.c:1951
-#, c-format
-msgid "Synchronize \"%s\""
-msgstr "Synchronizeren \"%s\""
-
-#: mail/mail-ops.c:2015
-#, c-format
-msgid "Displaying message UID \"%s\""
-msgstr "Bezig met weergeven UID van bericht \"%s\""
-
-#: mail/mail-ops.c:2018
-msgid "Clearing message display"
-msgstr "Bezig met leegmaken berichtweergave"
-
-#: mail/mail-ops.c:2021
-#, c-format
-msgid "Display message UID \"%s\""
-msgstr "Geef UID van bericht \"%s\" weer"
+#: mail/mail-ops.c:1386
+#, fuzzy
+msgid "Expunging folder"
+msgstr "Bezig met Legen \"%s\""
 
-# calendar/gui/prop.c:519

-#: mail/mail-ops.c:2024
-msgid "Clear message display"
-msgstr "Maak berichtweergave leeg"
+# mail/folder-browser-factory.c:37

+#: mail/mail-ops.c:1434
+#, fuzzy, c-format
+msgid "Retrieving message %s"
+msgstr "Bezig met ophalen berichten : %s"
 
-#: mail/mail-ops.c:2137
-#, c-format
-msgid "Opening messages from folder \"%s\""
-msgstr "Bezig met openen berichten uit map \"%s\""
+# mail/folder-browser-factory.c:37

+#: mail/mail-ops.c:1497
+#, fuzzy
+msgid "Retrieving messages"
+msgstr "Bezig met ophalen berichten : %s"
 
-#: mail/mail-ops.c:2140
+#: mail/mail-ops.c:1507
 #, c-format
-msgid "Open messages from \"%s\""
-msgstr "Open berichten van \"%s\""
+msgid "Retrieving message number %d of %d (uid \"%s\")"
+msgstr "Bezig met ophalen bericht %d van %d (uid \"%s\")"
 
-#: mail/mail-ops.c:2244
-#, c-format
-msgid "Loading %s Folder"
+#: mail/mail-ops.c:1655
+#, fuzzy, c-format
+msgid "Loading %s Folder for %s"
 msgstr "Bezig met laden %s Map"
 
-#: mail/mail-ops.c:2246
-#, c-format
-msgid "Load %s Folder"
+#: mail/mail-ops.c:1657
+#, fuzzy, c-format
+msgid "Load %s Folder for %s"
 msgstr "Laad \"%s\" Map"
 
-#: mail/mail-ops.c:2310
-#, c-format
-msgid "Viewing messages from folder \"%s\""
-msgstr "Bezig met bekijken berichten uit map \"%s\""
-
-#: mail/mail-ops.c:2313
-#, c-format
-msgid "View messages from \"%s\""
-msgstr "Bekijk berichten uit \"%s\""
-
-#: mail/mail-ops.c:2339
-#, c-format
-msgid "Retrieving message %d of %d (uid \"%s\")"
-msgstr "Bezig met ophalen bericht %d van %d (uid \"%s\")"
-
-#: mail/mail-ops.c:2428
-#, c-format
-msgid "Saving messages from folder \"%s\""
-msgstr "Bezig opslaan berichten uit map \"%s\""
+# composer/e-msg-composer.c:1127

+#: mail/mail-ops.c:1823
+#, fuzzy
+msgid "Saving messages"
+msgstr "Bezig met het kopiКren van berichten"
 
-#: mail/mail-ops.c:2431
-#, c-format
-msgid "Save messages from folder \"%s\""
-msgstr "Bezig met opslaan berichten uit map \"%s\""
+#: mail/mail-ops.c:1902
+#, fuzzy, c-format
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
+msgstr "Fout bij het opslaan van het groepenlijst bestand voor %s: %s"
 
-#: mail/mail-ops.c:2474
+#: mail/mail-ops.c:1915
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Bezig met opslaan bericht %d van %d (uid \"%s\")"
 
+# composer/e-msg-composer.c:474

+#: mail/mail-ops.c:1929
+#, fuzzy, c-format
+msgid ""
+"Error saving messages to: %s:\n"
+" %s"
+msgstr "Fout bij opslaan bestand: %s"
+
 # filter/filter-editor.c:212

 #: mail/mail-search-dialogue.c:104
 msgid "Cancel"
 msgstr "Annuleren"
 
 # mail/mail-threads.c:621

-#: mail/mail-summary.c:105 mail/mail-threads.c:728
+#: mail/mail-summary.c:110 mail/mail-threads.c:729
 msgid "Incomplete message written on pipe!"
 msgstr "Onafgemaakt bericht naar pipe geschreven!"
 
-#: mail/mail-threads.c:301
+#: mail/mail-threads.c:302
 #, c-format
 msgid ""
 "Error while preparing to %s:\n"
@@ -5602,7 +6065,7 @@ msgstr ""
 "Fout tijden het preparen van %s:\n"
 "%s"
 
-#: mail/mail-threads.c:675
+#: mail/mail-threads.c:676
 #, c-format
 msgid ""
 "Error while `%s':\n"
@@ -5612,23 +6075,23 @@ msgstr ""
 "%s"
 
 # mail/mail-threads.c:623

-#: mail/mail-threads.c:732
+#: mail/mail-threads.c:733
 msgid "Error reading commands from dispatching thread."
 msgstr ""
 "Fout tijdens het lezen van commando's van het verzendende parallele proces"
 
 # mail/mail-threads.c:712

-#: mail/mail-threads.c:797
+#: mail/mail-threads.c:798
 msgid "Corrupted message from dispatching thread?"
 msgstr "Verminkt bericht van het verzend parallel proces?"
 
 # mail/mail-threads.c:814

-#: mail/mail-threads.c:916
+#: mail/mail-threads.c:917
 msgid "Could not create dialog box."
 msgstr "Kon dialoog venster niet aanmaken."
 
 # mail/mail-threads.c:849

-#: mail/mail-threads.c:927
+#: mail/mail-threads.c:928
 msgid "User cancelled query."
 msgstr "Gebruiker heeft vraag afgebroken."
 
@@ -5638,12 +6101,12 @@ msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Kon tijdelijke mbox `%s' niet maken: %s"
 
 #. Get all uids of source
-#: mail/mail-tools.c:239
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Examining %s"
 msgstr "Bezig met Bestuderen %s"
 
-#: mail/mail-tools.c:269
+#: mail/mail-tools.c:271
 #, c-format
 msgid ""
 "Could not read UID cache file \"%s\". You may receive duplicate messages."
@@ -5651,46 +6114,45 @@ msgstr ""
 "Kon UID cache bestand \"%s\" niet lezen. Je zou dubbele berichten kunnen "
 "ontvangen."
 
-#. Info
-#: mail/mail-tools.c:290
+#: mail/mail-tools.c:300
 #, c-format
 msgid "Retrieving message %d of %d"
 msgstr "Bezig met ophalen bericht %d van %d"
 
 # mail/folder-browser-factory.c:41

 #. Append it to dest
-#: mail/mail-tools.c:303
+#: mail/mail-tools.c:315
 #, c-format
 msgid "Writing message %d of %d"
 msgstr "Bezig met wegschrijven bericht %d van %d"
 
-#: mail/mail-tools.c:332
+#: mail/mail-tools.c:347
 #, c-format
 msgid "Saving changes to %s"
 msgstr "Bezig met opslaan wijzingen aan %s"
 
 # mail/folder-browser-factory.c:37

-#: mail/mail-tools.c:369
+#: mail/mail-tools.c:381
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (doorgestuurd bericht)"
 
-#: mail/mail-tools.c:379
+#: mail/mail-tools.c:391
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (geen onderwerp)"
 
 # mail/folder-browser-factory.c:37

-#: mail/mail-tools.c:418
+#: mail/mail-tools.c:427
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Doorgestuurd bericht - %s"
 
 # mail/folder-browser-factory.c:37

-#: mail/mail-tools.c:420
+#: mail/mail-tools.c:429
 msgid "Forwarded message (no subject)"
 msgstr "Doorgestuurd bericht (geen onderwerp)"
 
-#: mail/mail-tools.c:523
+#: mail/mail-tools.c:530
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
@@ -5700,86 +6162,106 @@ msgstr ""
 "%s"
 
 # shell/e-shell-view.c:208

-#: mail/mail-vfolder.c:147
+#: mail/mail-vfolder.c:149
 msgid "VFolders"
 msgstr "VMappen"
 
-#: mail/mail-vfolder.c:296
+#: mail/mail-vfolder.c:298
 msgid "New VFolder"
 msgstr "Nieuwe VMap"
 
 # mail/folder-browser-factory.c:34

 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:33
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:37
 msgid "Reply"
 msgstr "Beantwoorden"
 
 # mail/folder-browser-factory.c:34

-#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:38
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
 msgid "Reply to the sender of this message"
 msgstr "Beantwoord dit bericht"
 
 # mail/folder-browser-factory.c:35

-#: mail/mail-view.c:156 po/tmp/evolution-mail.xml.h:37
+#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
 msgid "Reply to all recipients of this message"
 msgstr "Stuur antwoord naar alle geadresseerden van dit bericht"
 
 # mail/folder-browser-factory.c:37

-#: mail/mail-view.c:159 po/tmp/evolution-mail.xml.h:19
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:19
 msgid "Forward this message"
 msgstr "Dit bericht doorsturen"
 
 # mail/folder-browser-factory.c:43

-#: mail/mail-view.c:163 po/tmp/evolution-mail.xml.h:32
+#: mail/mail-view.c:148 ui/evolution-mail.xml.h:36
 msgid "Print the selected message"
 msgstr "Druk dit bericht af"
 
 # mail/folder-browser-factory.c:45

-#: mail/mail-view.c:165 po/tmp/evolution-mail.xml.h:12
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:12
 msgid "Delete this message"
 msgstr "Verwijdert dit bericht"
 
 # calendar/gui/getdate.y:448

-#: mail/message-list.c:572
+#: mail/message-list.c:590
 msgid "Unseen"
 msgstr "Ongelezen"
 
 # composer/e-msg-composer.c:894 composer/e-msg-composer.c:942

-#: mail/message-list.c:575
+#: mail/message-list.c:593
 msgid "Seen"
 msgstr "Gelezen"
 
-#: mail/message-list.c:578
+#: mail/message-list.c:596
 msgid "Answered"
 msgstr "Beantwoord"
 
 # calendar/gui/calendar-commands.c:746

-#: mail/message-list.c:846
+#: mail/message-list.c:881
 #, c-format
 msgid "[ %s ]"
 msgstr "[ %s ]"
 
 #. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:858 mail/message-list.c:873
+#: mail/message-list.c:893 mail/message-list.c:909
 #, c-format
 msgid "%s, et al."
 msgstr "%s, en dergelijke."
 
 # shell/e-storage.c:434

-#: mail/message-list.c:860 mail/message-list.c:875
+#: mail/message-list.c:896 mail/message-list.c:912
 msgid "<unknown>"
 msgstr "<onbekend>"
 
-# mail/folder-browser-factory.c:37

-#: mail/message-list.c:2068
-msgid "Rebuilding message view"
-msgstr "Bezig met herstructureren van bericht weergave"
+# calendar/gui/event-editor.c:594 calendar/gui/event-editor.c:688

+#: mail/message-list.c:965
+msgid "?"
+msgstr "?"
 
-# composer/e-msg-composer.c:894

-#: mail/message-list.c:2070
-msgid "Rebuild message view"
-msgstr "Herstructureer bericht weergave"
+#: mail/message-list.c:972
+#, fuzzy
+msgid "Today %l:%M %p"
+msgstr "%I:%M %p"
+
+#: mail/message-list.c:981
+msgid "Yesterday %l:%M %p"
+msgstr ""
+
+#: mail/message-list.c:993
+#, fuzzy
+msgid "%a %l:%M %p"
+msgstr "%I:%M %p"
+
+#: mail/message-list.c:1001
+#, fuzzy
+msgid "%b %d %l:%M %p"
+msgstr "%a %d-%m-%Y %I:%M:%S %p"
+
+# calendar/gui/event-editor.c:1745

+#: mail/message-list.c:1003
+#, fuzzy
+msgid "%b %d %Y"
+msgstr "%a %d %Y"
 
 #: mail/subscribe-dialog.c:139
 msgid "Display folders starting with:"
@@ -5795,28 +6277,28 @@ msgstr "Bezig met vergaren opslag voor \"%s\""
 msgid "Get store for \"%s\""
 msgstr "Bezig met vergaren opslag voor \"%s\""
 
-#: mail/subscribe-dialog.c:282
+#: mail/subscribe-dialog.c:283
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Bezig met aanmelden bij map \"%s\""
 
-#: mail/subscribe-dialog.c:286
+#: mail/subscribe-dialog.c:287
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Bezig met afmelden bij map \"%s\""
 
-#: mail/subscribe-dialog.c:290
+#: mail/subscribe-dialog.c:291
 #, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr "Aanmelden bij map \"%s\""
 
-#: mail/subscribe-dialog.c:293
+#: mail/subscribe-dialog.c:294
 #, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr "Afmelden bij map \"%s\""
 
 # shell/e-setup.c:47

-#: shell/e-setup.c:112 shell/e-setup.c:183
+#: shell/e-setup.c:112 shell/e-setup.c:185
 msgid "Evolution installation"
 msgstr "Evolution installatie"
 
@@ -5836,27 +6318,27 @@ msgstr ""
 "breken."
 
 # mail/mail-threads.c:814

-#: shell/e-setup.c:155
+#: shell/e-setup.c:157
 msgid "Could not update files correctly"
 msgstr "Kon bestanden niet correct updaten"
 
 # shell/e-setup.c:88

-#: shell/e-setup.c:158 shell/e-setup.c:224
+#: shell/e-setup.c:160 shell/e-setup.c:228
 msgid "Evolution files successfully installed."
 msgstr "Evolution bestanden succesvol geinstalleerd."
 
 # shell/e-setup.c:51

-#: shell/e-setup.c:187
+#: shell/e-setup.c:189
 msgid "This seems to be the first time you run Evolution."
 msgstr "Het lijkt erop dat dit de eerste keer is dat je Evolution start."
 
 # shell/e-setup.c:52

-#: shell/e-setup.c:188
+#: shell/e-setup.c:190
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr "Klik op \"OK\" om de Evolution files te installeren in"
 
 # shell/e-setup.c:69

-#: shell/e-setup.c:205
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -5868,7 +6350,7 @@ msgstr ""
 "Fout: %s"
 
 # shell/e-setup.c:84

-#: shell/e-setup.c:220
+#: shell/e-setup.c:224
 #, c-format
 msgid ""
 "Cannot copy files into\n"
@@ -5878,7 +6360,7 @@ msgstr ""
 "`%s'."
 
 # shell/e-setup.c:108

-#: shell/e-setup.c:245
+#: shell/e-setup.c:249
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -5890,7 +6372,7 @@ msgstr ""
 "bestanden af te maken."
 
 # shell/e-setup.c:108

-#: shell/e-setup.c:257
+#: shell/e-setup.c:261
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -5931,7 +6413,7 @@ msgstr ""
 "voor de opdracht."
 
 # shell/e-shell-folder-selection-dialog.c:236

-#: shell/e-shell-folder-selection-dialog.c:291
+#: shell/e-shell-folder-selection-dialog.c:297
 msgid "New..."
 msgstr "Nieuw..."
 
@@ -5941,26 +6423,22 @@ msgid "(Untitled)"
 msgstr "(Geen)"
 
 # shell/e-shell-view-menu.c:110

-#. you might have to call gnome_dialog_run() on the
-#. * dialog returned here, I don't remember...
-#.
-#: shell/e-shell-view-menu.c:114
+#: shell/e-shell-view-menu.c:111
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy kon niet worden gevonden in het $PATH."
 
 # shell/e-shell-view-menu.c:116

-#. same as above
-#: shell/e-shell-view-menu.c:120
+#: shell/e-shell-view-menu.c:117
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy kon niet worden gestart."
 
 # shell/e-shell-view-menu.c:161

-#: shell/e-shell-view-menu.c:172
+#: shell/e-shell-view-menu.c:169
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
 # shell/e-shell-view-menu.c:163

-#: shell/e-shell-view-menu.c:174
+#: shell/e-shell-view-menu.c:171
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -5971,7 +6449,7 @@ msgstr ""
 "in de GNOME werkomgeving."
 
 # shell/e-shell-view-menu.c:301

-#: shell/e-shell-view-menu.c:335
+#: shell/e-shell-view-menu.c:332
 msgid "Go to folder..."
 msgstr "Ga naar folder..."
 
@@ -6088,9 +6566,8 @@ msgid "Error saving shortcuts."
 msgstr "Fout bij opslaan van snelkoppelingen."
 
 # shell/e-shell-view-menu.c:398

-#: po/tmp/evolution-event-editor.xml.h:125
-#: po/tmp/evolution-message-composer.xml.h:43 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 "Weerga_ve"
 
@@ -6161,12 +6638,13 @@ msgstr "Het gespecificeerde type word niet ondersteund door deze opslag"
 
 # shell/main.c:99

 #: shell/main.c:74
+#, fuzzy
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
-"Over the last month and a half, our focus has been on making\n"
-"Evolution usable. Many of the Evolution developers are now using\n"
+"Over the time since the past release, our focus has been on making\n"
+"Evolution usable.  Many of the Evolution developers are now using\n"
 "Evolution to read their mail full time. You could too. (Just\n"
 "be sure to keep a backup.)\n"
 "\n"
@@ -6223,329 +6701,313 @@ msgstr "Uitzetten."
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kan het Bonobo componentensysteem niet initializeren"
 
-# addressbook/gui/component/addressbook.c:514

-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-addressbook-ldap.xml.h:6
-msgid "N_ew Directory Server"
-msgstr "Ni_euwe Directory Server"
-
-# shell/e-shell-view-menu.c:474

-#: po/tmp/evolution-addressbook-ldap.xml.h:7
-msgid "_Actions"
-msgstr "_Acties"
-
 # shell/e-shell-view-menu.c:404

-#: po/tmp/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:7
 msgid "Create a new contact"
 msgstr "Nieuw contact maken"
 
 # addressbook/gui/component/addressbook.c:426

-#: po/tmp/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete a contact"
 msgstr "Selecteer een contact"
 
 # addressbook/gui/component/addressbook.c:424

-#: 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 "Vinden"
 
 # addressbook/gui/component/addressbook.c:424

-#: po/tmp/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:11
 msgid "Find a contact"
 msgstr "Zoek een contact"
 
 # shell/e-shell-view-menu.c:398

-#: 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 "Nieuw"
 
 # addressbook/gui/component/addressbook.c:425

-#: po/tmp/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:14
 msgid "Print contacts"
 msgstr "Druk contacten af"
 
-#: po/tmp/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:15
 msgid "Stop"
 msgstr "Stoppen"
 
 # addressbook/printing/e-contact-print.glade.h:26

-#: po/tmp/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:16
 msgid "Stop Loading"
 msgstr "Stop met Laden"
 
-#: po/tmp/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:17
 msgid "View All"
 msgstr "Allen Weergeven"
 
 # addressbook/gui/component/addressbook.c:424

-#: po/tmp/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:18
 msgid "View all contacts"
 msgstr "Geef alle kontaken weer"
 
+# mail/folder-browser-factory.c:95

+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "_Addressbook Configuration..."
+msgstr "_Mail Configuratie..."
+
 # addressbook/gui/component/addressbook.c:425

-#: po/tmp/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:20
 msgid "_Print Contacts..."
 msgstr "_Druk Kontakten af..."
 
-#: po/tmp/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:21
 msgid "_Search for contacts"
 msgstr "_Zoek naar kontakten"
 
 # addressbook/contact-editor/e-contact-editor.c:807

 # calendar/gui/event-editor.c:1281 shell/e-shell-view-menu.c:473

-#: po/tmp/evolution-addressbook.xml.h:21
-#: po/tmp/evolution-event-editor.xml.h:123
+#: ui/evolution-addressbook.xml.h:22 ui/evolution-event-editor.xml.h:123
 msgid "_Tools"
 msgstr "_Gereedschap"
 
 # calendar/gui/calendar-commands.c:525

 #.
-#. * 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 Dagen"
 
 # calendar/gui/calendar-commands.c:696 calendar/gui/prop.c:712

-#: po/tmp/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:7
 msgid "Alter preferences"
 msgstr "Instellingen Wijzigen"
 
 # calendar/gui/calendar-commands.c:659

-#: po/tmp/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:8
 msgid "Ca_lendar"
 msgstr "Ka_lender"
 
 # calendar/gui/calendar-commands.c:696 calendar/gui/prop.c:712

-#: po/tmp/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:9
 msgid "Calendar Preferences..."
 msgstr "Kalender Instellingen..."
 
 # calendar/gui/calendar-commands.c:544 calendar/gui/calendar-commands.c:682

-#: po/tmp/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:10
 msgid "Create a new appointment"
 msgstr "Maak een nieuwe afspraak"
 
 # calendar/gui/calendar-commands.c:660

-#: po/tmp/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:11
 msgid "Create a new calendar"
 msgstr "Maak een nieuwe kalender"
 
 # calendar/gui/calendar-commands.c:522 calendar/gui/gncal-todo.c:713

 # calendar/gui/gncal-todo.c:717

-#: po/tmp/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:12
 msgid "Day"
 msgstr "Dag"
 
 # calendar/gui/calendar-commands.c:552

-#: po/tmp/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:13
 msgid "Go back in time"
 msgstr "Ga terug in tijd"
 
 # calendar/gui/calendar-commands.c:554

-#: po/tmp/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:14
 msgid "Go forward in time"
 msgstr "Ga vooruit in tijd"
 
 # calendar/gui/calendar-commands.c:558

-#: po/tmp/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to"
 msgstr "Ga naar"
 
 # calendar/gui/calendar-commands.c:558

-#: po/tmp/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to a specific date"
 msgstr "Ga naar specifieke datum"
 
 # calendar/gui/calendar-commands.c:553

-#: po/tmp/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:17
 msgid "Go to present time"
 msgstr "Ga naar huidig moment"
 
 # calendar/gui/calendar-commands.c:531

-#: po/tmp/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Maand"
 
 # calendar/gui/calendar-commands.c:554 filter/filter-editor.c:210

-#: 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 "Volgende"
 
 # calendar/gui/calendar-commands.c:664

-#: po/tmp/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:21
 msgid "Open a calendar"
 msgstr "Open een kalender"
 
 # calendar/gui/calendar-commands.c:552

-#: po/tmp/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:22
 msgid "Prev"
 msgstr "Vorige"
 
 # calendar/gui/calendar-commands.c:548 calendar/gui/calendar-commands.c:674

-#: po/tmp/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:24
 msgid "Print this calendar"
 msgstr "Druk deze kalender af"
 
 # calendar/gui/calendar-commands.c:668 calendar/gui/calendar-commands.c:669

-#: po/tmp/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:25
 msgid "Save calendar as something else"
 msgstr "Kalender bewaren als iets anders"
 
 # calendar/gui/calendar-commands.c:522

-#: po/tmp/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 day"
 msgstr "Laat 1 dag zien"
 
 # calendar/gui/calendar-commands.c:531

-#: po/tmp/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:27
 msgid "Show 1 month"
 msgstr "Toon 1 maand"
 
 # calendar/gui/calendar-commands.c:528

-#: po/tmp/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:28
 msgid "Show 1 week"
 msgstr "Laat 1 week zien"
 
 # calendar/gui/calendar-commands.c:525

-#: po/tmp/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr "Laat de werkweek zien"
 
 # calendar/gui/calendar-commands.c:553

-#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:414
+#: ui/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:413
 msgid "Today"
 msgstr "Vandaag"
 
 # calendar/gui/calendar-commands.c:528 calendar/gui/gncal-todo.c:712

-#: po/tmp/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:31
 msgid "Week"
 msgstr "Week"
 
 # shell/e-shell-view-menu.c:398

-#: 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 "_Nieuw"
 
 # calendar/gui/calendar-commands.c:663

-#: po/tmp/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:33
 msgid "_Open Calendar"
 msgstr "Open Ka_lender"
 
 # calendar/gui/calendar-commands.c:548 calendar/gui/calendar-commands.c:674

-#: po/tmp/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:34
 msgid "_Print this calendar"
 msgstr "_Druk deze kalender af"
 
-# calendar/gui/calendar-commands.c:668 calendar/gui/calendar-commands.c:669

-#: po/tmp/evolution-calendar.xml.h:35
-msgid "_Save Calendar As"
-msgstr "_Bewaar Kalender Als"
+# composer/e-msg-composer.c:463

+#: ui/evolution-calendar.xml.h:35
+#, fuzzy
+msgid "_Save As..."
+msgstr "Opslaan Als..."
 
 # addressbook/contact-editor/e-contact-editor.c:853

 # calendar/gui/event-editor.c:1337 calendar/gui/gncal-todo.c:327

-#: po/tmp/evolution-contact-editor.xml.h:7
+#: ui/evolution-contact-editor.xml.h:7
 msgid "Delete this item"
 msgstr "Verwijderd dit item"
 
 # addressbook/contact-editor/e-contact-editor.c:852

 # addressbook/gui/component/addressbook.c:426 calendar/gui/gncal-todo.c:499

 # mail/folder-browser-factory.c:45

-#: po/tmp/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:8
 msgid "Delete..."
 msgstr "Verwijderen..."
 
 # addressbook/contact-editor/e-contact-editor-strings.h:20

-#: po/tmp/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Help"
 msgstr "Help"
 
 # addressbook/contact-editor/e-contact-editor.c:844

 # calendar/gui/calendar-commands.c:673

-#: po/tmp/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:10
 msgid "Print En_velope..."
 msgstr "En_velop Afdrukken..."
 
 # addressbook/contact-editor/e-contact-editor.c:845

 # calendar/gui/event-editor.c:1326

-#: 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 "Item afdrukken"
 
 # addressbook/contact-editor/e-contact-editor.c:844

 # calendar/gui/calendar-commands.c:673

-#: 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 "Afdrukken..."
 
 # composer/e-msg-composer.c:463

-#: po/tmp/evolution-contact-editor.xml.h:13
-#: po/tmp/evolution-event-editor.xml.h:89
-#: po/tmp/evolution-message-composer.xml.h:18
+#: 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 "Opslaan _Als..."
 
 # addressbook/contact-editor/e-contact-editor.c:839

-#: 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 "Opslaan en Sluiten"
 
 # addressbook/contact-editor/e-contact-editor.c:840

 # calendar/gui/event-editor.c:1321

-#: 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 "Bewaar dit kontakt en sluit het dialoogvenster"
 
-#: po/tmp/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-editor.xml.h:16
 msgid "Se_nd contact to other..."
 msgstr "Stu_ur contact naar ander..."
 
 # addressbook/contact-editor/e-contact-editor.c:863

 # calendar/gui/event-editor.c:1344

-#: 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 "Zie help"
 
 # addressbook/contact-editor/e-contact-editor.c:782

-#: po/tmp/evolution-contact-editor.xml.h:18
+#: ui/evolution-contact-editor.xml.h:18
 msgid "Send _message to contact..."
 msgstr "Nieuw _bericht naar contact..."
 
 # widgets/e-table/e-table-config.glade.h:10

-#: po/tmp/evolution-contact-editor.xml.h:19
-#: po/tmp/evolution-event-editor.xml.h:110
-#: po/tmp/evolution-message-composer.xml.h:38
-#: 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 "_Bestand"
 
 # addressbook/contact-editor/e-contact-editor.c:844

 # calendar/gui/calendar-commands.c:673

-#: po/tmp/evolution-contact-editor.xml.h:20
+#: ui/evolution-contact-editor.xml.h:20
 msgid "_Print..."
 msgstr "_Afdrukken..."
 
 # calendar/gui/print.c:326

-#: po/tmp/evolution-contact-editor.xml.h:21
-#: po/tmp/evolution-event-editor.xml.h:121
-#: po/tmp/evolution-message-composer.xml.h:42
+#: ui/evolution-contact-editor.xml.h:21 ui/evolution-event-editor.xml.h:121
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Save"
 msgstr "_Opslaan"
 
 #.
-#. * 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 "Over deze applicatie"
 
@@ -6553,1042 +7015,1084 @@ msgstr "Over deze applicatie"
 # addressbook/printing/e-contact-print.glade.h:21

 # addressbook/printing/e-contact-print.glade.h:51

 # addressbook/printing/e-contact-print.glade.h:54

-#: po/tmp/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:7
 msgid "About..."
 msgstr "Over..."
 
 # shell/e-shell-view-menu.c:474

-#: po/tmp/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:8
 msgid "Actio_ns"
 msgstr "Ac_ties"
 
 # calendar/gui/calendar-commands.c:659

-#: po/tmp/evolution-event-editor.xml.h:9
+#: ui/evolution-event-editor.xml.h:9
 msgid "C_lear"
 msgstr "W_issen"
 
 # composer/e-msg-composer-address-dialog.c:183 composer/e-msg-composer.c:945

-#: po/tmp/evolution-event-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:10
 msgid "C_ut"
 msgstr "K_nippen"
 
 # calendar/gui/calendar-commands.c:659

-#: po/tmp/evolution-event-editor.xml.h:11
+#: ui/evolution-event-editor.xml.h:11
 msgid "Clear"
 msgstr "Wissen"
 
-#: po/tmp/evolution-event-editor.xml.h:12
+#: ui/evolution-event-editor.xml.h:12
 msgid "Clear the selection"
 msgstr "Selectie wissen"
 
 # calendar/gui/e-day-view.c:2322 calendar/gui/e-week-view.c:2648

-#: po/tmp/evolution-event-editor.xml.h:14
+#: ui/evolution-event-editor.xml.h:14
 msgid "Close this appointment"
 msgstr "Deze afspraak sluiten"
 
 # composer/e-msg-composer-address-dialog.c:187 composer/e-msg-composer.c:946

-#: 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 "KopiКren"
 
-#: po/tmp/evolution-event-editor.xml.h:16
+#: ui/evolution-event-editor.xml.h:16
 msgid "Copy the selection"
 msgstr "KopiКer de selectie"
 
 # composer/e-msg-composer-address-dialog.c:183 composer/e-msg-composer.c:945

-#: po/tmp/evolution-event-editor.xml.h:17
+#: ui/evolution-event-editor.xml.h:17
 msgid "Cut"
 msgstr "Knippen"
 
-#: po/tmp/evolution-event-editor.xml.h:18
+#: ui/evolution-event-editor.xml.h:18
 msgid "Cut the selection"
 msgstr "Knip de selectie"
 
-#: po/tmp/evolution-event-editor.xml.h:21
+#: ui/evolution-event-editor.xml.h:21
 msgid "Dump XML"
 msgstr "XML Dumpen"
 
-#: po/tmp/evolution-event-editor.xml.h:22
+#: ui/evolution-event-editor.xml.h:22
 msgid "Dump the UI Xml description"
 msgstr "Dump de UI Xml omschrijving"
 
 # calendar/gui/event-editor.c:1251

-#: po/tmp/evolution-event-editor.xml.h:23
+#: ui/evolution-event-editor.xml.h:23
 msgid "FIXME: Address _Book..."
 msgstr "FIXME: Adres _Boek..."
 
 # addressbook/contact-editor/e-contact-editor.c:653

 # addressbook/contact-editor/e-contact-editor.c:758

 # calendar/gui/event-editor.c:1128 calendar/gui/event-editor.c:1235

-#: po/tmp/evolution-event-editor.xml.h:24
+#: ui/evolution-event-editor.xml.h:24
 msgid "FIXME: Ch_oose Form..."
 msgstr "FIXME: Seleecteer F_ormulier"
 
 # calendar/gui/event-editor.c:1250

-#: po/tmp/evolution-event-editor.xml.h:25
+#: ui/evolution-event-editor.xml.h:25
 msgid "FIXME: Chec_k Names"
 msgstr "FIXME: Controleer Namen"
 
 # addressbook/contact-editor/e-contact-editor.c:675

 # calendar/gui/event-editor.c:1150

-#: po/tmp/evolution-event-editor.xml.h:26
+#: ui/evolution-event-editor.xml.h:26
 msgid "FIXME: Cop_y to Folder..."
 msgstr "FIXME: Kopieer naar Folder..."
 
 # addressbook/contact-editor/e-contact-editor.c:761

 # calendar/gui/event-editor.c:1238

-#: po/tmp/evolution-event-editor.xml.h:27
+#: ui/evolution-event-editor.xml.h:27
 msgid "FIXME: D_esign a Form..."
 msgstr "FIXME: Ontw_erp een Formulier..."
 
 # addressbook/contact-editor/e-contact-editor.c:660

 # calendar/gui/event-editor.c:1135

-#: po/tmp/evolution-event-editor.xml.h:28
+#: ui/evolution-event-editor.xml.h:28
 msgid "FIXME: Define Print _Styles"
 msgstr "FIXME: DefiniКer Print _Stijlen..."
 
 # addressbook/contact-editor/e-contact-editor.c:760

 # calendar/gui/event-editor.c:1237

-#: po/tmp/evolution-event-editor.xml.h:29
+#: ui/evolution-event-editor.xml.h:29
 msgid "FIXME: Desi_gn This Form"
 msgstr "FIXME: Ontwerp dit Formulier"
 
 # addressbook/contact-editor/e-contact-editor.c:715

 # calendar/gui/event-editor.c:1190

-#: po/tmp/evolution-event-editor.xml.h:30
+#: ui/evolution-event-editor.xml.h:30
 msgid "FIXME: Fi_rst Item in Folder"
 msgstr "FIXME: Ee_rste Item in Folder"
 
 # addressbook/contact-editor/e-contact-editor.c:793

 # calendar/gui/event-editor.c:1266

-#: po/tmp/evolution-event-editor.xml.h:31
+#: ui/evolution-event-editor.xml.h:31
 msgid "FIXME: For_ward"
 msgstr "FIXME: Doorsturen"
 
 # calendar/gui/event-editor.c:1265

-#: po/tmp/evolution-event-editor.xml.h:32
+#: ui/evolution-event-editor.xml.h:32
 msgid "FIXME: Forward as v_Calendar"
 msgstr "FIXME: Doorsturen als v_Calendar"
 
 # addressbook/contact-editor/e-contact-editor.c:862

 # calendar/gui/event-editor.c:1343

-#: po/tmp/evolution-event-editor.xml.h:33
+#: ui/evolution-event-editor.xml.h:33
 msgid "FIXME: Help"
 msgstr "FIXME: Help"
 
 # addressbook/contact-editor/e-contact-editor.c:648

 # calendar/gui/event-editor.c:1123

-#: po/tmp/evolution-event-editor.xml.h:34
+#: ui/evolution-event-editor.xml.h:34
 msgid "FIXME: In_complete Task"
 msgstr "FIXME: Niet complete taak"
 
 # addressbook/contact-editor/e-contact-editor.c:848

 # calendar/gui/event-editor.c:1327

-#: po/tmp/evolution-event-editor.xml.h:35
+#: ui/evolution-event-editor.xml.h:35
 msgid "FIXME: Insert File"
 msgstr "FIXME: Bestand Bijvoegen"
 
 # addressbook/contact-editor/e-contact-editor.c:746

 # calendar/gui/event-editor.c:1223

-#: po/tmp/evolution-event-editor.xml.h:36
+#: ui/evolution-event-editor.xml.h:36
 msgid "FIXME: It_em..."
 msgstr "FIXME: It_em..."
 
 # addressbook/contact-editor/e-contact-editor.c:699

 # calendar/gui/event-editor.c:1174

-#: po/tmp/evolution-event-editor.xml.h:37
+#: ui/evolution-event-editor.xml.h:37
 msgid "FIXME: Paste _Special... "
 msgstr "FIXME: Plakken _Speciaal..."
 
 # addressbook/contact-editor/e-contact-editor.c:678

 # calendar/gui/event-editor.c:1153

-#: po/tmp/evolution-event-editor.xml.h:38
+#: ui/evolution-event-editor.xml.h:38
 msgid "FIXME: Print Pre_view"
 msgstr "FIXME: Afdruk_voorbeeld"
 
 # addressbook/contact-editor/e-contact-editor.c:764

 # calendar/gui/event-editor.c:1241

-#: po/tmp/evolution-event-editor.xml.h:39
+#: ui/evolution-event-editor.xml.h:39
 msgid "FIXME: Pu_blish Form As..."
 msgstr "FIXME: Pu_bliceer een Formulier als..."
 
 # addressbook/contact-editor/e-contact-editor.c:763

 # calendar/gui/event-editor.c:1240

-#: po/tmp/evolution-event-editor.xml.h:40
+#: ui/evolution-event-editor.xml.h:40
 msgid "FIXME: Publish _Form..."
 msgstr "FIXME: Publiceer een _Formulier..."
 
 # calendar/gui/event-editor.c:1260

-#: po/tmp/evolution-event-editor.xml.h:41
+#: ui/evolution-event-editor.xml.h:41
 msgid "FIXME: Rec_urrence..."
 msgstr "FIXME: _Herhaling..."
 
 # addressbook/contact-editor/e-contact-editor.c:667

 # calendar/gui/event-editor.c:1142

-#: po/tmp/evolution-event-editor.xml.h:42
+#: ui/evolution-event-editor.xml.h:42
 msgid "FIXME: S_end"
 msgstr "FIXME: V_ersturen"
 
 # calendar/gui/event-editor.c:1333

-#: po/tmp/evolution-event-editor.xml.h:43
+#: ui/evolution-event-editor.xml.h:43
 msgid "FIXME: Save Attac_hments..."
 msgstr "FIXME: Aanhangels Opslaan..."
 
 # addressbook/contact-editor/e-contact-editor.c:766

 # calendar/gui/event-editor.c:1243

-#: po/tmp/evolution-event-editor.xml.h:44
+#: ui/evolution-event-editor.xml.h:44
 msgid "FIXME: Script _Debugger"
 msgstr "FIXME: Script _Debugger"
 
 # addressbook/contact-editor/e-contact-editor.c:649

 # calendar/gui/event-editor.c:1124

-#: po/tmp/evolution-event-editor.xml.h:45
+#: ui/evolution-event-editor.xml.h:45
 msgid "FIXME: Task _Request"
 msgstr "FIXME: Taak Verzoek"
 
 # addressbook/contact-editor/e-contact-editor.c:647

 # calendar/gui/event-editor.c:1122

-#: po/tmp/evolution-event-editor.xml.h:46
+#: ui/evolution-event-editor.xml.h:46
 msgid "FIXME: _Contact"
 msgstr "FIXME: _Contact"
 
 # addressbook/contact-editor/e-contact-editor.c:732

 # calendar/gui/event-editor.c:1207

-#: po/tmp/evolution-event-editor.xml.h:47
+#: ui/evolution-event-editor.xml.h:47
 msgid "FIXME: _Customize..."
 msgstr "FIXME: Aanpassen..."
 
 # addressbook/contact-editor/e-contact-editor.c:745

 # calendar/gui/event-editor.c:1222

-#: po/tmp/evolution-event-editor.xml.h:48
+#: ui/evolution-event-editor.xml.h:48
 msgid "FIXME: _File..."
 msgstr "FIXME: Bestand..."
 
 # addressbook/contact-editor/e-contact-editor.c:752

 # calendar/gui/event-editor.c:1229

-#: po/tmp/evolution-event-editor.xml.h:49
+#: ui/evolution-event-editor.xml.h:49
 msgid "FIXME: _Font..."
 msgstr "FIXME: _Font..."
 
 # addressbook/contact-editor/e-contact-editor.c:729

 # calendar/gui/event-editor.c:1204

-#: po/tmp/evolution-event-editor.xml.h:50
+#: ui/evolution-event-editor.xml.h:50
 msgid "FIXME: _Formatting"
 msgstr "FIXME: _Opmaak"
 
 # addressbook/contact-editor/e-contact-editor.c:713

 # addressbook/contact-editor/e-contact-editor.c:720

 # calendar/gui/event-editor.c:1188 calendar/gui/event-editor.c:1195

-#: po/tmp/evolution-event-editor.xml.h:51
+#: ui/evolution-event-editor.xml.h:51
 msgid "FIXME: _Item"
 msgstr "FIXME: _Item"
 
 # addressbook/contact-editor/e-contact-editor.c:650

 # calendar/gui/event-editor.c:1125

-#: po/tmp/evolution-event-editor.xml.h:52
+#: ui/evolution-event-editor.xml.h:52
 msgid "FIXME: _Journal Entry"
 msgstr "FIXME: Dagboek Item"
 
 # addressbook/contact-editor/e-contact-editor.c:722

 # calendar/gui/event-editor.c:1197

-#: po/tmp/evolution-event-editor.xml.h:53
+#: ui/evolution-event-editor.xml.h:53
 msgid "FIXME: _Last Item in Folder"
 msgstr "FIXME: _Laatste Item in Folder"
 
 # addressbook/contact-editor/e-contact-editor.c:646

 # calendar/gui/event-editor.c:1121

-#: po/tmp/evolution-event-editor.xml.h:54
+#: ui/evolution-event-editor.xml.h:54
 msgid "FIXME: _Mail Message"
 msgstr "FIXME: _Mail bericht"
 
 # addressbook/contact-editor/e-contact-editor.c:658

 # calendar/gui/event-editor.c:1133

-#: po/tmp/evolution-event-editor.xml.h:55
+#: ui/evolution-event-editor.xml.h:55
 msgid "FIXME: _Memo Style"
 msgstr "FIXME: _Memo Stijl"
 
 # addressbook/contact-editor/e-contact-editor.c:674

 # calendar/gui/event-editor.c:1149

-#: po/tmp/evolution-event-editor.xml.h:56
+#: ui/evolution-event-editor.xml.h:56
 msgid "FIXME: _Move to Folder..."
 msgstr "FIXME: Verplaats naar Folder..."
 
 # calendar/gui/event-editor.c:1258

-#: po/tmp/evolution-event-editor.xml.h:57
+#: ui/evolution-event-editor.xml.h:57
 msgid "FIXME: _New Appointment"
 msgstr "FIXME: _Nieuwe Afspraak"
 
 # addressbook/contact-editor/e-contact-editor.c:651

 # calendar/gui/event-editor.c:1126

-#: po/tmp/evolution-event-editor.xml.h:58
+#: ui/evolution-event-editor.xml.h:58
 msgid "FIXME: _Note"
 msgstr "FIXME: Aanteke_ning"
 
 # addressbook/contact-editor/e-contact-editor.c:747

 # calendar/gui/event-editor.c:1224

-#: po/tmp/evolution-event-editor.xml.h:59
+#: ui/evolution-event-editor.xml.h:59
 msgid "FIXME: _Object..."
 msgstr "FIXME: _Object..."
 
 # addressbook/contact-editor/e-contact-editor.c:753

 # calendar/gui/event-editor.c:1230

-#: po/tmp/evolution-event-editor.xml.h:60
+#: ui/evolution-event-editor.xml.h:60
 msgid "FIXME: _Paragraph..."
 msgstr "FIXME: _Paragraaf..."
 
 # addressbook/contact-editor/e-contact-editor.c:771

 # calendar/gui/event-editor.c:1248

-#: po/tmp/evolution-event-editor.xml.h:61
+#: ui/evolution-event-editor.xml.h:61
 msgid "FIXME: _Spelling..."
 msgstr "FIXME: _Spelling..."
 
 # addressbook/contact-editor/e-contact-editor.c:727

 # calendar/gui/event-editor.c:1202

-#: po/tmp/evolution-event-editor.xml.h:62
+#: ui/evolution-event-editor.xml.h:62
 msgid "FIXME: _Standard"
 msgstr "FIXME: _Standaard"
 
 # addressbook/contact-editor/e-contact-editor.c:648

 # calendar/gui/event-editor.c:1123

-#: po/tmp/evolution-event-editor.xml.h:63
+#: ui/evolution-event-editor.xml.h:63
 msgid "FIXME: _Task"
 msgstr "FIXME: _Taak"
 
 # addressbook/contact-editor/e-contact-editor.c:714

 # addressbook/contact-editor/e-contact-editor.c:721

 # calendar/gui/event-editor.c:1189 calendar/gui/event-editor.c:1196

-#: po/tmp/evolution-event-editor.xml.h:64
+#: ui/evolution-event-editor.xml.h:64
 msgid "FIXME: _Unread Item"
 msgstr "FIXME: Ongelezen Item"
 
-#: po/tmp/evolution-event-editor.xml.h:65
+#: ui/evolution-event-editor.xml.h:65
 msgid "FIXME: what goes here?"
 msgstr "FIXME: what moet hier staan?"
 
 # addressbook/contact-editor/e-contact-editor.c:806

 # calendar/gui/event-editor.c:1280

-#: po/tmp/evolution-event-editor.xml.h:66
-#: po/tmp/evolution-message-composer.xml.h:10
+#: ui/evolution-event-editor.xml.h:66 ui/evolution-message-composer.xml.h:11
 msgid "F_ormat"
 msgstr "_Opmaak"
 
-#: po/tmp/evolution-event-editor.xml.h:68
+#: ui/evolution-event-editor.xml.h:68
 msgid "Find Again"
 msgstr "Opnieuw Zoeken"
 
-#: po/tmp/evolution-event-editor.xml.h:69
+#: ui/evolution-event-editor.xml.h:69
 msgid "Find _Again"
 msgstr "Opnieuw _Vinden"
 
 # addressbook/contact-editor/e-contact-editor.c:860

 # calendar/gui/event-editor.c:1342

-#: po/tmp/evolution-event-editor.xml.h:70
+#: ui/evolution-event-editor.xml.h:70
 msgid "Go to the next item"
 msgstr "Ga naar het volgende item"
 
 # addressbook/contact-editor/e-contact-editor.c:857

 # calendar/gui/event-editor.c:1340

-#: po/tmp/evolution-event-editor.xml.h:71
+#: ui/evolution-event-editor.xml.h:71
 msgid "Go to the previous item"
 msgstr "Ga naar het vorige item"
 
 # calendar/gui/prop.c:678

-#: po/tmp/evolution-event-editor.xml.h:72
+#: ui/evolution-event-editor.xml.h:72
 msgid "Modify the file's properties"
 msgstr "De bestandseigenschappen wijzigen"
 
 # calendar/gui/calendar-commands.c:554 filter/filter-editor.c:210

-#: po/tmp/evolution-event-editor.xml.h:73
+#: ui/evolution-event-editor.xml.h:73
 msgid "N_ext"
 msgstr "V_olgende"
 
 # composer/e-msg-composer-address-dialog.c:191

 # composer/e-msg-composer-address-dialog.c:199 composer/e-msg-composer.c:947

-#: po/tmp/evolution-event-editor.xml.h:75
+#: ui/evolution-event-editor.xml.h:75
 msgid "Paste"
 msgstr "Plakken"
 
 # composer/e-msg-composer-address-dialog.c:192

 # composer/e-msg-composer-address-dialog.c:200

-#: po/tmp/evolution-event-editor.xml.h:76
+#: ui/evolution-event-editor.xml.h:76
 msgid "Paste the clipboard"
 msgstr "Plak het klembord"
 
 # addressbook/contact-editor/e-contact-editor.c:737

 # calendar/gui/event-editor.c:1212

-#: po/tmp/evolution-event-editor.xml.h:77
+#: ui/evolution-event-editor.xml.h:77
 msgid "Pre_vious"
 msgstr "_Vorige"
 
 # addressbook/contact-editor/e-contact-editor.c:737

 # calendar/gui/event-editor.c:1212

-#: po/tmp/evolution-event-editor.xml.h:78
+#: ui/evolution-event-editor.xml.h:78
 msgid "Previous"
 msgstr "Vorige"
 
 # addressbook/contact-editor/e-contact-editor.c:844

 # calendar/gui/calendar-commands.c:673

-#: po/tmp/evolution-event-editor.xml.h:79
+#: ui/evolution-event-editor.xml.h:79
 msgid "Print S_etup..."
 msgstr "Afdruk In_stellingen..."
 
 # addressbook/printing/e-contact-print.glade.h:7

-#: po/tmp/evolution-event-editor.xml.h:80
+#: ui/evolution-event-editor.xml.h:80
 msgid "Print Setup"
 msgstr "Printer Instellingen"
 
 # composer/e-msg-composer-address-dialog.glade.h:12

-#: po/tmp/evolution-event-editor.xml.h:83
+#: ui/evolution-event-editor.xml.h:83
 msgid "Properties"
 msgstr "Eigenschappen"
 
 # addressbook/contact-editor/e-contact-editor.c:1294

-#: po/tmp/evolution-event-editor.xml.h:84
+#: ui/evolution-event-editor.xml.h:84
 msgid "Redo"
 msgstr "Herhalen"
 
-#: po/tmp/evolution-event-editor.xml.h:85
+#: ui/evolution-event-editor.xml.h:85
 msgid "Redo the undone action"
 msgstr "De laatst ongedaan gemaakte bewerking opnieuw uitvoeren"
 
 # mail/folder-browser-factory.c:34

-#: po/tmp/evolution-event-editor.xml.h:86
+#: ui/evolution-event-editor.xml.h:86
 msgid "Replace"
 msgstr "Vervangen"
 
-#: po/tmp/evolution-event-editor.xml.h:87
+#: ui/evolution-event-editor.xml.h:87
 msgid "Replace a string"
 msgstr "Tekenreeks vervangen"
 
 # addressbook/contact-editor/e-contact-editor.c:840

 # calendar/gui/event-editor.c:1321

-#: 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 "Bewaar de afspraak en sluit dit venster"
 
 # calendar/gui/calendar-commands.c:553

-#: po/tmp/evolution-event-editor.xml.h:92
-#: po/tmp/evolution-message-composer.xml.h:21
+#: ui/evolution-event-editor.xml.h:92 ui/evolution-message-composer.xml.h:24
 msgid "Save the current file"
 msgstr "Huidig bestand opslaan"
 
-#: po/tmp/evolution-event-editor.xml.h:93
+#: ui/evolution-event-editor.xml.h:93
 msgid "Schedule Meeting"
 msgstr "Afspraak Plannen"
 
-#: po/tmp/evolution-event-editor.xml.h:94
+#: ui/evolution-event-editor.xml.h:94
 msgid "Schedule _Meeting"
 msgstr "_Afspraak Plannen"
 
-#: po/tmp/evolution-event-editor.xml.h:95
+#: ui/evolution-event-editor.xml.h:95
 msgid "Schedule some sort of a meeting"
 msgstr "Een soort afspraak maken"
 
-#: po/tmp/evolution-event-editor.xml.h:96
+#: ui/evolution-event-editor.xml.h:96
 msgid "Search again for the same string"
 msgstr "Probeer opnieuw de zelfde tekenreeks te vinden"
 
-#: po/tmp/evolution-event-editor.xml.h:97
+#: ui/evolution-event-editor.xml.h:97
 msgid "Search for a string"
 msgstr "Zoek naar een tekenreeks"
 
-#: po/tmp/evolution-event-editor.xml.h:99
+#: ui/evolution-event-editor.xml.h:99
 msgid "Select All"
 msgstr "Alles Selecteren"
 
-#: po/tmp/evolution-event-editor.xml.h:100
+#: ui/evolution-event-editor.xml.h:100
 msgid "Select everything"
 msgstr "Selecteer alles"
 
-#: 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 "Stel de pagina instellingen in voor de huidige printer"
 
 # composer/e-msg-composer.c:948

-#: po/tmp/evolution-event-editor.xml.h:102
+#: ui/evolution-event-editor.xml.h:102
 msgid "Undo"
 msgstr "Ongedaan maken"
 
 # composer/e-msg-composer.c:948

-#: po/tmp/evolution-event-editor.xml.h:103
+#: ui/evolution-event-editor.xml.h:103
 msgid "Undo the last action"
 msgstr "Maak de laatste bewerking ongedaan"
 
 # shell/e-shell-view-menu.c:159

-#: po/tmp/evolution-event-editor.xml.h:104
-#: po/tmp/evolution-message-composer.xml.h:34
+#: ui/evolution-event-editor.xml.h:104 ui/evolution-message-composer.xml.h:38
 msgid "_About..."
 msgstr "_Over..."
 
 # calendar/gui/dialogs/alarm-notify.glade.h:7

-#: po/tmp/evolution-event-editor.xml.h:105
-#: po/tmp/evolution-message-composer.xml.h:35
+#: ui/evolution-event-editor.xml.h:105 ui/evolution-message-composer.xml.h:39
 msgid "_Close"
 msgstr "_Sluiten"
 
 # composer/e-msg-composer-address-dialog.c:187 composer/e-msg-composer.c:946

-#: po/tmp/evolution-event-editor.xml.h:106
+#: ui/evolution-event-editor.xml.h:106
 msgid "_Copy"
 msgstr "_KopiКren"
 
-#: po/tmp/evolution-event-editor.xml.h:107
-#: po/tmp/evolution-message-composer.xml.h:36
+#: ui/evolution-event-editor.xml.h:107 ui/evolution-message-composer.xml.h:40
 msgid "_Debug"
 msgstr "_Debug"
 
 # calendar/gui/gncal-todo.c:488

-#: po/tmp/evolution-event-editor.xml.h:109
-#: po/tmp/evolution-message-composer.xml.h:37
-#: 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 "B_ewerken..."
 
 # addressbook/gui/component/addressbook.c:424

-#: po/tmp/evolution-event-editor.xml.h:111
+#: ui/evolution-event-editor.xml.h:111
 msgid "_Find..."
 msgstr "_Vind..."
 
 # addressbook/contact-editor/e-contact-editor.c:773

 # calendar/gui/event-editor.c:1253

-#: po/tmp/evolution-event-editor.xml.h:112
+#: ui/evolution-event-editor.xml.h:112
 msgid "_Forms"
 msgstr "_Formulier"
 
 # addressbook/contact-editor/e-contact-editor-strings.h:20

-#: po/tmp/evolution-event-editor.xml.h:113
-#: po/tmp/evolution-message-composer.xml.h:39 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 "_Help"
 
 # addressbook/contact-editor/e-contact-editor.c:805

 # calendar/gui/event-editor.c:1279

-#: po/tmp/evolution-event-editor.xml.h:114
+#: ui/evolution-event-editor.xml.h:114
 msgid "_Insert"
 msgstr "_Invoegen"
 
 # addressbook/contact-editor/e-contact-editor.c:708

 # calendar/gui/event-editor.c:1183

-#: po/tmp/evolution-event-editor.xml.h:115
+#: ui/evolution-event-editor.xml.h:115
 msgid "_Object"
 msgstr "_Object"
 
 # composer/e-msg-composer-address-dialog.c:191

 # composer/e-msg-composer-address-dialog.c:199 composer/e-msg-composer.c:947

-#: po/tmp/evolution-event-editor.xml.h:116
+#: ui/evolution-event-editor.xml.h:116
 msgid "_Paste"
 msgstr "_Plakken"
 
 # addressbook/gui/component/addressbook.c:425

 # addressbook/gui/component/addressbook.c:492

 # calendar/gui/calendar-commands.c:548 mail/folder-browser-factory.c:43

-#: po/tmp/evolution-event-editor.xml.h:117
+#: ui/evolution-event-editor.xml.h:117
 msgid "_Print"
 msgstr "_Afdrukken"
 
 # composer/e-msg-composer-address-dialog.glade.h:12

-#: po/tmp/evolution-event-editor.xml.h:118
+#: ui/evolution-event-editor.xml.h:118
 msgid "_Properties..."
 msgstr "_Eigenschappen..."
 
 # addressbook/contact-editor/e-contact-editor.c:1294

-#: po/tmp/evolution-event-editor.xml.h:119
+#: ui/evolution-event-editor.xml.h:119
 msgid "_Redo"
 msgstr "_Herhalen"
 
 # composer/e-msg-composer.c:463

-#: po/tmp/evolution-event-editor.xml.h:120
+#: ui/evolution-event-editor.xml.h:120
 msgid "_Replace..."
 msgstr "Ve_rvangen..."
 
 # addressbook/contact-editor/e-contact-editor.c:740

 # calendar/gui/event-editor.c:1217

-#: po/tmp/evolution-event-editor.xml.h:122
+#: ui/evolution-event-editor.xml.h:122
 msgid "_Toolbars"
 msgstr "_Werkbalk"
 
 # composer/e-msg-composer.c:948

-#: po/tmp/evolution-event-editor.xml.h:124
+#: ui/evolution-event-editor.xml.h:124
 msgid "_Undo"
 msgstr "_Ongedaan maken"
 
 # mail/folder-browser-factory.c:30

 #.
-#. * 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 "Opstellen"
 
 # mail/folder-browser-factory.c:30

-#: po/tmp/evolution-mail.xml.h:7
+#: ui/evolution-mail.xml.h:7
 msgid "Compose a new message"
 msgstr "Stel een nieuw bericht op"
 
 # mail/folder-browser-factory.c:41

-#: po/tmp/evolution-mail.xml.h:9
+#: ui/evolution-mail.xml.h:9
 msgid "Copy message to a new folder"
 msgstr "KopiКer het bericht naar een nieuwe map"
 
 # shell/e-shell-view-menu.c:365

-#: 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 "_Map"
 
-#: po/tmp/evolution-mail.xml.h:14
+#: ui/evolution-mail.xml.h:14
 msgid "Fi_lter on Sender"
 msgstr "Filteren op Afzender"
 
-#: po/tmp/evolution-mail.xml.h:15
+#: ui/evolution-mail.xml.h:15
 msgid "Filter on Rec_ipients"
 msgstr "Filteren op Geadresseerden"
 
 # mail/folder-browser-factory.c:101

-#: po/tmp/evolution-mail.xml.h:16
+#: ui/evolution-mail.xml.h:16
 msgid "Forget _Passwords"
 msgstr "Wachtwoorden _Vergeten"
 
 # mail/folder-browser-factory.c:29

-#: po/tmp/evolution-mail.xml.h:20
+#: ui/evolution-mail.xml.h:20
 msgid "Get Mail"
 msgstr "Post Ophalen"
 
+# mail/folder-browser-factory.c:45

+#: ui/evolution-mail.xml.h:22
+#, fuzzy
+msgid "Hide _Deleted messages"
+msgstr "Bericht Verwijderen"
+
+# mail/folder-browser-factory.c:37

+#: ui/evolution-mail.xml.h:23
+#, fuzzy
+msgid "Hide _Read messages"
+msgstr "Doorgestuurd bericht:\n"
+
+# mail/folder-browser-factory.c:43

+#: ui/evolution-mail.xml.h:24
+#, fuzzy
+msgid "Hide _Selected messages"
+msgstr "Druk dit bericht af"
+
 # addressbook/contact-editor/e-contact-editor.c:745

 # calendar/gui/event-editor.c:1222

-#: po/tmp/evolution-mail.xml.h:21
-msgid "Mail _Filters"
+#: ui/evolution-mail.xml.h:25
+#, fuzzy
+msgid "Mail _Filters..."
 msgstr "Post _Filters"
 
-#: po/tmp/evolution-mail.xml.h:22
-msgid "Manage Subscriptions"
+#: ui/evolution-mail.xml.h:26
+#, fuzzy
+msgid "Manage Subscriptions..."
 msgstr "Aanmeldingen Beheren"
 
-#: po/tmp/evolution-mail.xml.h:23
+#: ui/evolution-mail.xml.h:27
 msgid "Mar_k As Read"
 msgstr "_Markeer Als Gelezen"
 
 # addressbook/contact-editor/e-contact-editor.c:704

 # calendar/gui/event-editor.c:1179

-#: po/tmp/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:28
 msgid "Mark As U_nread"
 msgstr "Markeer Als _Ongelezen"
 
 # calendar/gui/print.c:326

-#: po/tmp/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:29
 msgid "Move"
 msgstr "Verplaatsen"
 
 # mail/folder-browser-factory.c:41

-#: po/tmp/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:30
 msgid "Move message to a new folder"
 msgstr "Sla het bericht op in een bepaalde folder"
 
 # composer/e-msg-composer.c:894

-#: po/tmp/evolution-mail.xml.h:27
+#: ui/evolution-mail.xml.h:31
 msgid "Previews the message to be printed"
 msgstr "Geeft een voorbeeld van het af te drukken bericht"
 
 # calendar/gui/print.c:1249

-#: po/tmp/evolution-mail.xml.h:29
+#: ui/evolution-mail.xml.h:33
 msgid "Print Preview of message..."
 msgstr "Afdrukvoorbeeld van bericht..."
 
-#: po/tmp/evolution-mail.xml.h:30
+#: ui/evolution-mail.xml.h:34
 msgid "Print message to the printer"
 msgstr "Bericht afdrukken naar de printer"
 
-#: po/tmp/evolution-mail.xml.h:31
+#: ui/evolution-mail.xml.h:35
 msgid "Print message..."
 msgstr "Bericht afdrukken..."
 
 # mail/folder-browser-factory.c:35

-#: po/tmp/evolution-mail.xml.h:35
+#: ui/evolution-mail.xml.h:39
 msgid "Reply to _All"
 msgstr "Iedereen Be_antwoorden"
 
 # mail/folder-browser-factory.c:35

-#: po/tmp/evolution-mail.xml.h:36
+#: ui/evolution-mail.xml.h:40
 msgid "Reply to _Sender"
 msgstr "Af_zender beantwoorden"
 
-#: po/tmp/evolution-mail.xml.h:39 po/tmp/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:43 ui/evolution-subscribe.xml.h:12
 msgid "Select _All"
 msgstr "_Alles Selecteren"
 
-#: po/tmp/evolution-mail.xml.h:40
+#: ui/evolution-mail.xml.h:44
 msgid "Send queued mail and retrieve new mail"
 msgstr "Post in de wachtrij versturen en nieuwe post ophalen"
 
+#: ui/evolution-mail.xml.h:45
+#, fuzzy
+msgid "Show _All messages"
+msgstr "Verzonden email-berichten"
+
 # mail/folder-browser-factory.c:37

-#: po/tmp/evolution-mail.xml.h:41
+#: ui/evolution-mail.xml.h:46
 msgid "Threaded Message list"
 msgstr "Berichtenlijst met Weergave van Onderlinge Relaties"
 
-#: po/tmp/evolution-mail.xml.h:42
+#: ui/evolution-mail.xml.h:47
 msgid "VFolder on Se_nder"
 msgstr "VMap op Afze_nder"
 
-#: po/tmp/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:48
 msgid "VFolder on _Recipients"
 msgstr "VMap op _Geadresseerden"
 
 # mail/mail-config.c:1490

-#: po/tmp/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:49
 msgid "View Raw Message Source"
 msgstr "Bekijk Pure Bericht Bron"
 
 # addressbook/contact-editor/e-contact-editor.c:745

 # calendar/gui/event-editor.c:1222

-#: po/tmp/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:50
 msgid "_Apply Filters"
 msgstr "Filters _Toepassen"
 
-#: po/tmp/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:51
 msgid "_Configure Folder"
 msgstr "_Configureer Map"
 
 # shell/e-shell-view-menu.c:402

-#: po/tmp/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:52
 msgid "_Copy to Folder..."
 msgstr "_KopiКren naar Map..."
 
 # composer/e-msg-composer.c:894

-#: po/tmp/evolution-mail.xml.h:49
+#: ui/evolution-mail.xml.h:54
 msgid "_Edit Message"
 msgstr "Bericht _Bewerken"
 
 # mail/folder-browser-factory.c:77

-#: po/tmp/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:55
 msgid "_Expunge"
 msgstr "_Legen"
 
-#: po/tmp/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:56
 msgid "_Filter on Subject"
 msgstr "_Filteren op Onderwerp"
 
 # mail/folder-browser-factory.c:37

-#: po/tmp/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:57
 msgid "_Forward"
 msgstr "_Doorsturen"
 
-#: po/tmp/evolution-mail.xml.h:53 po/tmp/evolution-subscribe.xml.h:17
+#: ui/evolution-mail.xml.h:58 ui/evolution-subscribe.xml.h:17
 msgid "_Invert Selection"
 msgstr "Selectie _Inverteren"
 
-# mail/mail-config.c:1163 mail/mail-config.c:1242

-#: po/tmp/evolution-mail.xml.h:54
-msgid "_Mail Configuration"
-msgstr "_Post Configuratie"
+# mail/folder-browser-factory.c:95

+#: ui/evolution-mail.xml.h:59
+msgid "_Mail Configuration..."
+msgstr "_Mail Configuratie..."
 
-#: po/tmp/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:60
 msgid "_Message"
 msgstr "_Bericht"
 
 # shell/e-shell-view-menu.c:402

-#: po/tmp/evolution-mail.xml.h:56
+#: ui/evolution-mail.xml.h:61
 msgid "_Move to Folder..."
 msgstr "_Verplaatsen naar Map..."
 
-#: po/tmp/evolution-mail.xml.h:57
+#: ui/evolution-mail.xml.h:62
 msgid "_Open in New Window"
 msgstr "_Openen in Nieuw Venster"
 
-#: po/tmp/evolution-mail.xml.h:58
+#: ui/evolution-mail.xml.h:63
 msgid "_Print Message"
 msgstr "Bericht A_fdrukken"
 
 # composer/e-msg-composer.c:463

-#: po/tmp/evolution-mail.xml.h:59
+#: ui/evolution-mail.xml.h:64
 msgid "_Save Message As..."
 msgstr "Bericht Op_slaan als..."
 
 # mail/mail-config.c:1490

-#: po/tmp/evolution-mail.xml.h:60
+#: ui/evolution-mail.xml.h:65
 msgid "_Source"
 msgstr "_Bron"
 
-#: po/tmp/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:66
 msgid "_Threaded"
 msgstr "Rela_ties weergeven"
 
 # addressbook/contact-editor/e-contact-editor-strings.h:8

 # addressbook/contact-editor/e-contact-editor.c:673

-#: po/tmp/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:67
 msgid "_Undelete"
 msgstr "_Herstellen"
 
-#: po/tmp/evolution-mail.xml.h:63
+#: ui/evolution-mail.xml.h:68
 msgid "_VFolder on Subject"
 msgstr "_VMap op Onderwerp"
 
 # mail/folder-browser-factory.c:89

-#: po/tmp/evolution-mail.xml.h:64
+#: ui/evolution-mail.xml.h:69
 #, fuzzy
-msgid "_Virtual Folder Editor"
+msgid "_Virtual Folder Editor..."
 msgstr "_Virtuele Map Bewerker"
 
 # composer/e-msg-composer.c:951

 #.
-#. * 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 "Bijvoegen"
 
 # calendar/gui/calendar-commands.c:553

-#: po/tmp/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:9
 msgid "Close the current file"
 msgstr "Huidig bestand sluiten"
 
-#: po/tmp/evolution-message-composer.xml.h:11
+# composer/e-msg-composer.c:894

+#: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Encrypt this message with PGP"
+msgstr "Versleuteld bericht"
+
+#: ui/evolution-message-composer.xml.h:12
 msgid "HTML"
 msgstr "HTML"
 
 # composer/e-msg-composer.c:891

-#: po/tmp/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:13
 msgid "Insert a file as text into the message"
 msgstr "Voeg een bestand bij het bericht"
 
 # composer/e-msg-composer.c:891

-#: po/tmp/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:14
 msgid "Insert text file..."
 msgstr "Tekst bestand invoegen..."
 
 # composer/e-msg-composer.c:561

-#: po/tmp/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:16
 msgid "Open a file"
 msgstr "Bestand openen"
 
+#: ui/evolution-message-composer.xml.h:17
+msgid "PGP Encrypt"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:18
+msgid "PGP Sign"
+msgstr ""
+
 # composer/e-msg-composer.c:463

-#: po/tmp/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save As"
 msgstr "Opslaan Als"
 
 # composer/e-msg-composer.c:888

-#: po/tmp/evolution-message-composer.xml.h:19
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save in _folder... (FIXME)"
 msgstr "Opslaan in _map... (FIXME)"
 
 # composer/e-msg-composer.c:888

-#: po/tmp/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "Opslaan in _map..."
 
 # composer/e-msg-composer.c:888

-#: po/tmp/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr "Sla het huidige bestand op onder een andere naam"
 
 # composer/e-msg-composer.c:888

-#: po/tmp/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "Sla het bericht op in een bepaalde folder"
 
 # composer/e-msg-composer.c:894 composer/e-msg-composer.c:942

-#: po/tmp/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "Versturen"
 
 # filter/filter-editor.c:198

-#: po/tmp/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr "_Later Versturen"
 
 # filter/filter-editor.c:198

-#: po/tmp/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr "_Later versturen"
 
-#: po/tmp/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr "Stuur de mail in HTML formaat"
 
 # composer/e-msg-composer.c:942

-#: po/tmp/evolution-message-composer.xml.h:28
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send the message later"
 msgstr "Dit bericht later versturen"
 
 # composer/e-msg-composer.c:942

-#: po/tmp/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:32
 msgid "Send the message now"
 msgstr "Dit bericht nu versturen"
 
 # composer/e-msg-composer.c:942

-#: po/tmp/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:33
 msgid "Send this message now"
 msgstr "Dit bericht nu versturen"
 
 # composer/e-msg-composer.c:907

-#: po/tmp/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show / hide attachments"
 msgstr "Toon / Verberg bijvoegsels"
 
 # composer/e-msg-composer.c:906

-#: po/tmp/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show _attachments"
 msgstr "Bekijk _bijvoegsels"
 
 # composer/e-msg-composer.c:906

-#: po/tmp/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:36
 msgid "Show attachments"
 msgstr "Bekijk bijvoegsels"
 
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Sign this message with your PGP key"
+msgstr "Bezig met versturen van een bericht zonder onderwerp"
+
 # composer/e-msg-composer.c:891

-#: po/tmp/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Insert text file... (FIXME)"
 msgstr "Voeg test-bestand _in... (FIXME)"
 
-#: po/tmp/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Open..."
 msgstr "_Openen..."
 
+#: 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 "map toevoegen aan de lijst van aangemelde mappen"
 
-#: po/tmp/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:9
 msgid "Refresh List"
 msgstr "Lijst Verfrissen"
 
-#: po/tmp/evolution-subscribe.xml.h:10
+#: ui/evolution-subscribe.xml.h:10
 msgid "Refresh List of Folders"
 msgstr "Lijst of Mappen Verfrissen"
 
-#: po/tmp/evolution-subscribe.xml.h:11
+#: ui/evolution-subscribe.xml.h:11
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Map verwijderen van je lijst van aangemelde mappen"
 
-#: po/tmp/evolution-subscribe.xml.h:13
+#: ui/evolution-subscribe.xml.h:13
 msgid "Subscribe"
 msgstr "Aanmelden"
 
-#: po/tmp/evolution-subscribe.xml.h:14
+#: ui/evolution-subscribe.xml.h:14
 msgid "Unsubscribe"
 msgstr "Afmelden"
 
 # shell/e-shell-view-menu.c:402

 #.
-#. * 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 "Toon een andere map"
 
 # calendar/gui/gncal-todo.c:488

-#: po/tmp/evolution.xml.h:7
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "Stop_pen"
 
-#: po/tmp/evolution.xml.h:8
+#: ui/evolution.xml.h:8
 msgid "Evolution bar _shortcut"
 msgstr "Evolution balk _snelkoppeling"
 
-#: po/tmp/evolution.xml.h:9
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Programma verlaten"
 
 # shell/e-shell-view-menu.c:443

-#: po/tmp/evolution.xml.h:10
+#: ui/evolution.xml.h:10
 msgid "Getting _Started"
 msgstr "_Beginnen"
 
-#: po/tmp/evolution.xml.h:11
+#: ui/evolution.xml.h:11
 msgid "Show information about Evolution"
 msgstr "Geef informatie over Evolution weer"
 
 # shell/e-shell-view-menu.c:422

-#: po/tmp/evolution.xml.h:12
+#: ui/evolution.xml.h:12
 msgid "Show the _Folder Bar"
 msgstr "_Mapbalk Tonen"
 
 # shell/e-shell-view-menu.c:419

-#: po/tmp/evolution.xml.h:13
+#: ui/evolution.xml.h:13
 msgid "Show the _Shortcut Bar"
 msgstr "Snelkoppelingenbalk Tonen"
 
 # shell/e-shell-view-menu.c:457

-#: po/tmp/evolution.xml.h:14
+#: ui/evolution.xml.h:14
 msgid "Submit _Bug Report"
 msgstr "_Bug Report Insturen"
 
 # shell/e-shell-view-menu.c:458

-#: po/tmp/evolution.xml.h:15
+#: ui/evolution.xml.h:15
 msgid "Submit bug report using Bug Buddy."
 msgstr "Bug Report insturen met Bug Buddy."
 
 # shell/e-shell-view-menu.c:423

-#: po/tmp/evolution.xml.h:16
+#: ui/evolution.xml.h:16
 msgid "Toggle whether to show the folder bar"
 msgstr "Toont de mapbalk"
 
 # shell/e-shell-view-menu.c:420

-#: po/tmp/evolution.xml.h:17
+#: ui/evolution.xml.h:17
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Toont de snelkoppelingenbalk"
 
 # shell/e-shell-view-menu.c:452

-#: po/tmp/evolution.xml.h:18
+#: ui/evolution.xml.h:18
 msgid "Using the C_ontact Manager"
 msgstr "Gebruik van de Kont_akt Beheerder"
 
 # shell/e-shell-view-menu.c:449

-#: po/tmp/evolution.xml.h:19
+#: ui/evolution.xml.h:19
 msgid "Using the _Calendar"
 msgstr "Gebruik van de _Kalender"
 
 # shell/e-shell-view-menu.c:446

-#: po/tmp/evolution.xml.h:20
+#: ui/evolution.xml.h:20
 msgid "Using the _Mailer"
 msgstr "De _Mailer Gebruiken"
 
 # shell/e-shell-view-menu.c:159

-#: po/tmp/evolution.xml.h:21
+#: ui/evolution.xml.h:21
 msgid "_About Evolution..."
 msgstr "_Over Evolution..."
 
 # shell/e-shell-view-menu.c:378

-#: po/tmp/evolution.xml.h:22
+#: ui/evolution.xml.h:22
 msgid "_Appointment (FIXME)"
 msgstr "_Afspraak (FIXME)"
 
 # shell/e-shell-view-menu.c:381

-#: po/tmp/evolution.xml.h:23
+#: ui/evolution.xml.h:23
 msgid "_Contact (FIXME)"
 msgstr "_Kontakt (FIXME)"
 
 # shell/e-shell-view-menu.c:365

-#: po/tmp/evolution.xml.h:26
+#: ui/evolution.xml.h:26
 msgid "_Folder"
 msgstr "_Map"
 
 # shell/e-shell-view-menu.c:402

-#: po/tmp/evolution.xml.h:27
+#: ui/evolution.xml.h:27
 msgid "_Go to Folder..."
 msgstr "_Ga naar Map..."
 
 # shell/e-shell-view-menu.c:440

-#: po/tmp/evolution.xml.h:29
+#: ui/evolution.xml.h:29
 msgid "_Index"
 msgstr "_Index"
 
 # shell/e-shell-view-menu.c:375

-#: po/tmp/evolution.xml.h:30
+#: ui/evolution.xml.h:30
 msgid "_Mail message (FIXME)"
 msgstr "_Bericht mailen (FIXME)"
 
 # addressbook/printing/e-contact-print.glade.h:12

-#: po/tmp/evolution.xml.h:32
+#: ui/evolution.xml.h:32
 msgid "_Settings"
 msgstr "In_stellingen:"
 
 # shell/e-shell-view-menu.c:384

-#: po/tmp/evolution.xml.h:33
+#: ui/evolution.xml.h:33
 msgid "_Task (FIXME)"
 msgstr "_Taak (FIXME)"
 
@@ -7596,7 +8100,7 @@ msgstr "_Taak (FIXME)"
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2470
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B, %Y"
 
@@ -7695,31 +8199,37 @@ msgstr "_Eindtijd vergadering:"
 msgid "All Attendees"
 msgstr "Alle Gasten"
 
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: widgets/misc/e-calendar-item.c:421
+msgid "MTWTFSS"
+msgstr "MDWDVZZ"
+
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
+#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
 msgid "%B %Y"
 msgstr "%B %Y"
 
 # widgets/misc/e-clipped-label.c:106

-#: widgets/misc/e-clipped-label.c:107
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
 # addressbook/gui/component/addressbook.c:420

 # calendar/gui/calendar-commands.c:544

-#: widgets/misc/e-dateedit.c:408
+#: widgets/misc/e-dateedit.c:407
 msgid "Now"
 msgstr "Nu"
 
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1249 widgets/misc/e-dateedit.c:1308
-#: widgets/misc/e-dateedit.c:1487
+#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
+#: widgets/misc/e-dateedit.c:1486
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1252 widgets/misc/e-dateedit.c:1311
-#: widgets/misc/e-dateedit.c:1490
+#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
+#: widgets/misc/e-dateedit.c:1489
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
@@ -7729,13 +8239,360 @@ msgstr "%I:%M %p"
 msgid "Group %i"
 msgstr "Group %i"
 
+# addressbook/contact-editor/categories-strings.h:7

+#~ msgid "categories"
+#~ msgstr "CategorieКn"
+
+# addressbook/contact-editor/categories-strings.h:8

+#~ msgid "Item(s) belong to these categories:"
+#~ msgstr "Item(s) die tot deze categorie behoren:"
+
+# addressbook/contact-editor/categories-strings.h:9

+#~ msgid "Available Categories:"
+#~ msgstr "Beschikbare CategorieКn:"
+
+#~ msgid "External Directories"
+#~ msgstr "Externe Directories"
+
+# addressbook/gui/component/ldap-server-dialog.glade.h:9

+#~ msgid "Port Number:"
+#~ msgstr "Poort:"
+
+# calendar/gui/calendar-commands.c:56

+#~ msgid "Outline:"
+#~ msgstr "Buitenlijn:"
+
+# calendar/gui/calendar-commands.c:57

+#~ msgid "Headings:"
+#~ msgstr "Koppen:"
+
+# calendar/gui/calendar-commands.c:58

+#~ msgid "Empty days:"
+#~ msgstr "Lege dagen:"
+
+# calendar/gui/calendar-commands.c:59

+#~ msgid "Appointments:"
+#~ msgstr "Afspraaken:"
+
+# calendar/gui/calendar-commands.c:60

+#~ msgid "Highlighted day:"
+#~ msgstr "Gemarkeerde dag:"
+
+# calendar/gui/calendar-commands.c:61

+#~ msgid "Day numbers:"
+#~ msgstr "Dag nummers:"
+
+# calendar/gui/calendar-commands.c:62

+#~ msgid "Current day's number:"
+#~ msgstr "Nummer van vandaag:"
+
+# calendar/gui/calendar-commands.c:63

+#~ msgid "To-Do item that is not yet due:"
+#~ msgstr "To-Do item dat nog niet verlopen is:"
+
+# calendar/gui/calendar-commands.c:64

+#~ msgid "To-Do item that is due today:"
+#~ msgstr "To-Do item dat vandaag af moet:"
+
+# calendar/gui/calendar-commands.c:65

+#~ msgid "To-Do item that is overdue:"
+#~ msgstr "To-Do item dat af moest zijn:"
+
+# calendar/gui/getdate.y:395

+#~ msgid "may"
+#~ msgstr "may"
+
+# calendar/gui/getdate.y:400

+#~ msgid "sept"
+#~ msgstr "sept"
+
+# calendar/gui/getdate.y:404

+#~ msgid "sunday"
+#~ msgstr "zondag"
+
+# calendar/gui/getdate.y:405

+#~ msgid "monday"
+#~ msgstr "maandag"
+
+# calendar/gui/getdate.y:406

+#~ msgid "tuesday"
+#~ msgstr "dinsdag"
+
+# calendar/gui/getdate.y:407

+#~ msgid "tues"
+#~ msgstr "di"
+
+# calendar/gui/getdate.y:408

+#~ msgid "wednesday"
+#~ msgstr "woensdag"
+
+# calendar/gui/getdate.y:409

+#~ msgid "wednes"
+#~ msgstr "woe"
+
+# calendar/gui/getdate.y:410

+#~ msgid "thursday"
+#~ msgstr "donderdag"
+
+# calendar/gui/getdate.y:411

+#~ msgid "thur"
+#~ msgstr "do"
+
+# calendar/gui/getdate.y:412

+#~ msgid "thurs"
+#~ msgstr "don"
+
+# calendar/gui/getdate.y:413

+#~ msgid "friday"
+#~ msgstr "vrijdag"
+
+# calendar/gui/getdate.y:414

+#~ msgid "saturday"
+#~ msgstr "zaterdag"
+
+# calendar/gui/getdate.y:422

+#~ msgid "fortnight"
+#~ msgstr "twee weken"
+
+# calendar/gui/getdate.y:427

+#~ msgid "min"
+#~ msgstr "min"
+
+# calendar/gui/getdate.y:429

+#~ msgid "sec"
+#~ msgstr "sec"
+
+# calendar/gui/getdate.y:435

+#~ msgid "tomorrow"
+#~ msgstr "morgen"
+
+# calendar/gui/getdate.y:436

+#~ msgid "yesterday"
+#~ msgstr "gisteren"
+
+# calendar/gui/getdate.y:437

+#~ msgid "today"
+#~ msgstr "vandaag"
+
+# calendar/gui/getdate.y:439

+#~ msgid "last"
+#~ msgstr "afgelopen"
+
+# calendar/gui/getdate.y:440

+#~ msgid "this"
+#~ msgstr "deze"
+
+# calendar/gui/getdate.y:441

+#~ msgid "next"
+#~ msgstr "volgende"
+
+# calendar/gui/getdate.y:442

+#~ msgid "first"
+#~ msgstr "eerste"
+
+# calendar/gui/getdate.y:444

+#~ msgid "third"
+#~ msgstr "derde"
+
+# calendar/gui/getdate.y:445

+#~ msgid "fourth"
+#~ msgstr "vierde"
+
+# calendar/gui/getdate.y:446

+#~ msgid "fifth"
+#~ msgstr "vijfde"
+
+# calendar/gui/getdate.y:447

+#~ msgid "sixth"
+#~ msgstr "zesde"
+
+# calendar/gui/getdate.y:448

+#~ msgid "seventh"
+#~ msgstr "sevende"
+
+# calendar/gui/getdate.y:449

+#~ msgid "eighth"
+#~ msgstr "achtste"
+
+# calendar/gui/getdate.y:450

+#~ msgid "ninth"
+#~ msgstr "negende"
+
+# calendar/gui/getdate.y:451

+#~ msgid "tenth"
+#~ msgstr "tiende"
+
+# calendar/gui/getdate.y:452

+#~ msgid "eleventh"
+#~ msgstr "elfde"
+
+# calendar/gui/getdate.y:453

+#~ msgid "twelfth"
+#~ msgstr "twaalfde"
+
+# calendar/gui/getdate.y:454

+#~ msgid "ago"
+#~ msgstr "geleden"
+
+# calendar/gui/goto.c:82

+#~ msgid "Year:"
+#~ msgstr "Jaar:"
+
+# calendar/gui/goto.c:275

+#~ msgid ""
+#~ "Please select the date you want to go to.\n"
+#~ "When you click on a day, you will be taken\n"
+#~ "to that date."
+#~ msgstr ""
+#~ "Selecteer de datum waar je naar toe wil.\n"
+#~ "Wanneer op je die dag klikt, ga je naar die\n"
+#~ "dag toe."
+
+# mail/mail-config.c:1199

+#~ msgid "Mail Source"
+#~ msgstr "Post Bron"
+
+#~ msgid ""
+#~ "Your email configuration is now complete.\n"
+#~ "Click \"Finish\" to save your new settings"
+#~ msgstr ""
+#~ "Je e-mail configuratie is nu klaar.\n"
+#~ "Klik op \"Einde\" om je nieuwe instellingen op te slaan"
+
+# calendar/gui/gncal-todo.c:728 calendar/gui/gncal-todo.c:732

+#~ msgid "Send \"%s\""
+#~ msgstr "Verstuur \"%s\""
+
+#~ msgid "Send a message without a subject"
+#~ msgstr "Stuur een bericht zonder onderwerp"
+
+# mail/folder-browser-factory.c:77

+#~ msgid "Expunge \"%s\""
+#~ msgstr "Legen \"%s\""
+
+# mail/folder-browser-factory.c:41

+#~ msgid "Marking messages in folder \"%s\""
+#~ msgstr "Bezig met Markeren berichten in map \"%s\""
+
+# mail/folder-browser-factory.c:41

+#~ msgid "Mark messages in folder \"%s\""
+#~ msgstr "Markeer berichten in map \"%s\""
+
+# mail/folder-browser-factory.c:41

+#~ msgid "Marking message %d of %d"
+#~ msgstr "Bezig met markeren bericht %d van %d"
+
+#~ msgid "Scan folders in \"%s\""
+#~ msgstr "Scan mappen in \"%s\""
+
+#~ msgid "Attaching messages from folder \"%s\""
+#~ msgstr "Bezig met bijvoegen berichten uit map \"%s\""
+
+#~ msgid "Attach messages from \"%s\""
+#~ msgstr "Voeg berichten van \"%s\" bij"
+
+# mail/folder-browser-factory.c:37

+#~ msgid "Forwarding messages \"%s\""
+#~ msgstr "Bezig met Doorsturen berichten \"%s\""
+
+#~ msgid "Forwarding a message without a subject"
+#~ msgstr "Bezig met doorsturen berichten zonder onderwerp"
+
+# mail/folder-browser-factory.c:37

+#~ msgid "Forward message \"%s\""
+#~ msgstr "Bericht \"%s\" doorsturen"
+
+#~ msgid "Forward a message without a subject"
+#~ msgstr "Stuur een bericht door zonder onderwerp"
+
+#~ msgid ""
+#~ "Failed to generate mime part from message while generating forwarded message."
+#~ msgstr ""
+#~ "Fout bij genereren mime deel van bericht tijden het genereren van het door "
+#~ "te sturen bericht."
+
+#~ msgid "Loading \"%s\""
+#~ msgstr "Bezig met laden \"%s\""
+
+#~ msgid "Load \"%s\""
+#~ msgstr "Laden \"%s\""
+
+#~ msgid "Creating \"%s\""
+#~ msgstr "Bezig met Maken \"%s\""
+
+#~ msgid "Create \"%s\""
+#~ msgstr "Maken \"%s\""
+
+#~ msgid "Exception while reporting result to shell component listener."
+#~ msgstr ""
+#~ "Uitzondering tijdens het rapporteren van het resultaat aan de 'shell "
+#~ "component listener'."
+
+#~ msgid "Synchronize \"%s\""
+#~ msgstr "Synchronizeren \"%s\""
+
+#~ msgid "Displaying message UID \"%s\""
+#~ msgstr "Bezig met weergeven UID van bericht \"%s\""
+
+#~ msgid "Clearing message display"
+#~ msgstr "Bezig met leegmaken berichtweergave"
+
+#~ msgid "Display message UID \"%s\""
+#~ msgstr "Geef UID van bericht \"%s\" weer"
+
+# calendar/gui/prop.c:519

+#~ msgid "Clear message display"
+#~ msgstr "Maak berichtweergave leeg"
+
+#~ msgid "Opening messages from folder \"%s\""
+#~ msgstr "Bezig met openen berichten uit map \"%s\""
+
+#~ msgid "Open messages from \"%s\""
+#~ msgstr "Open berichten van \"%s\""
+
+#~ msgid "Viewing messages from folder \"%s\""
+#~ msgstr "Bezig met bekijken berichten uit map \"%s\""
+
+#~ msgid "View messages from \"%s\""
+#~ msgstr "Bekijk berichten uit \"%s\""
+
+#~ msgid "Retrieving message %d of %d (uid \"%s\")"
+#~ msgstr "Bezig met ophalen bericht %d van %d (uid \"%s\")"
+
+#~ msgid "Saving messages from folder \"%s\""
+#~ msgstr "Bezig opslaan berichten uit map \"%s\""
+
+#~ msgid "Save messages from folder \"%s\""
+#~ msgstr "Bezig met opslaan berichten uit map \"%s\""
+
+# mail/folder-browser-factory.c:37

+#~ msgid "Rebuilding message view"
+#~ msgstr "Bezig met herstructureren van bericht weergave"
+
+# composer/e-msg-composer.c:894

+#~ msgid "Rebuild message view"
+#~ msgstr "Herstructureer bericht weergave"
+
+# addressbook/gui/component/addressbook.c:514

+#~ msgid "N_ew Directory Server"
+#~ msgstr "Ni_euwe Directory Server"
+
+# shell/e-shell-view-menu.c:474

+#~ msgid "_Actions"
+#~ msgstr "_Acties"
+
+# calendar/gui/calendar-commands.c:668 calendar/gui/calendar-commands.c:669

+#~ msgid "_Save Calendar As"
+#~ msgstr "_Bewaar Kalender Als"
+
+# mail/mail-config.c:1163 mail/mail-config.c:1242

+#~ msgid "_Mail Configuration"
+#~ msgstr "_Post Configuratie"
+
 # mail/mail-threads.c:814

 #~ msgid "Could not create summary"
 #~ msgstr "Kon samenvatting niet maken"
 
-#~ msgid "Cannot append message to mbox file: %s"
-#~ msgstr "Kan bericht niet aan mbox bestand toevoegen: %s"
-
 # shell/e-shell.c:299

 #~ msgid "Cannot get message: %s"
 #~ msgstr "Kan bericht niet vergaren: %s"
@@ -7794,19 +8651,6 @@ msgstr "Group %i"
 #~ msgid "Flagged"
 #~ msgstr "Gevlagd"
 
-# addressbook/contact-editor/e-contact-editor.c:1294

-#~ msgid "Read"
-#~ msgstr "Gelezen"
-
-# mail/folder-browser-factory.c:35

-#~ msgid "Replied to"
-#~ msgstr "Beantwoord aan"
-
-# mail/component-factory.c:196

-#~ msgid "Cannot initialize Evolution's mail summary component."
-#~ msgstr ""
-#~ "Kan het post samenvattings gedeelte van Evolution niet initialiseren."
-
 # mail/component-factory.c:196

 #~ msgid "Cannot initialize Evolution's mail storage hash."
 #~ msgstr ""
@@ -7836,12 +8680,6 @@ msgstr "Group %i"
 #~ msgid "window2"
 #~ msgstr "venster2"
 
-# addressbook/contact-editor/e-contact-editor.c:852

-# addressbook/gui/component/addressbook.c:426 calendar/gui/gncal-todo.c:499

-# mail/folder-browser-factory.c:45

-#~ msgid "Deleted"
-#~ msgstr "Verwijderd"
-
 # filter/filter-editor.c:198

 #~ msgid "Draft"
 #~ msgstr "Klad"
@@ -7855,18 +8693,6 @@ msgstr "Group %i"
 #~ msgid "matches regex"
 #~ msgstr "is gelijk aan reguliere expressie"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:389

-#~ msgid "Account Information"
-#~ msgstr "Account Informatie"
-
-#~ msgid "Account Management"
-#~ msgstr "Account Beheer"
-
-# addressbook/contact-editor/e-contact-editor.c:808

-# calendar/gui/event-editor.c:1282

-#~ msgid "Accounts"
-#~ msgstr "Accounts"
-
 # calendar/gui/gncal-todo.c:325

 #~ msgid "Add Optional Fields..."
 #~ msgstr "Optionele Velden Toevoegen..."
@@ -7875,70 +8701,18 @@ msgstr "Group %i"
 #~ msgid "Additional Identity Fields"
 #~ msgstr "Optionele Identiteits Velden"
 
-# mail/mail-config.c:739 mail/mail-config.c:819

-#~ msgid "Authentication"
-#~ msgstr "Authenticatie"
-
 # calendar/gui/dialogs/alarm-notify.glade.h:7

 #~ msgid "Browse..."
 #~ msgstr "Bladeren..."
 
-#~ msgid "Congratulations, your mail configuration is complete."
-#~ msgstr "Gefeliciteerd, je e-mail configuratie is compleet."
-
-# calendar/gui/prop.c:836

-#~ msgid "Default"
-#~ msgstr "Standaardwaarde"
-
-# shell/e-shell-view.c:596

-#~ msgid "Done"
-#~ msgstr "Klaar"
-
 # mail/mail-config.c:1163 mail/mail-config.c:1242

 #~ msgid "Edit Mail Configuration Settings"
 #~ msgstr "Bewerk Post Configuratie Instellingen"
 
-# mail/mail-config.c:305

-#~ msgid "Email Address:"
-#~ msgstr "E-mail Adres:"
-
-# mail/mail-config.c:1163 mail/mail-config.c:1242

-#~ msgid "Evolution Mail Configuration"
-#~ msgstr "Evolution Post Configuratie"
-
-# mail/mail-config.c:277

-#~ msgid "Full Name:"
-#~ msgstr "Volledige Naam:"
-
-#~ msgid "IMAP"
-#~ msgstr "IMAP"
-
-#~ msgid "Mail"
-#~ msgstr "Post"
-
-# mail/mail-config.c:1163 mail/mail-config.c:1242

-#~ msgid "Mail Configuration Druid"
-#~ msgstr "Post Configuratie Druide"
-
-#~ msgid "Make this my default account"
-#~ msgstr "Stel dit in als standaard account"
-
-# shell/e-shell-view-menu.c:398

-#~ msgid "News"
-#~ msgstr "Nieuws"
-
-# addressbook/printing/e-contact-print.glade.h:10

-#~ msgid "Optional"
-#~ msgstr "Optioneel"
-
 # widgets/meeting-time-sel/e-meeting-time-sel.c:389

 #~ msgid "Optional Information"
 #~ msgstr "Optionele Informatie"
 
-# mail/folder-browser-factory.c:101

-#~ msgid "Password:"
-#~ msgstr "Wachtwoord:"
-
 #~ msgid ""
 #~ "Please enter information about your incoming mail server below. If you don't "
 #~ "know what"
@@ -7962,42 +8736,13 @@ msgstr "Group %i"
 #~ msgid "Preferred type: "
 #~ msgstr "Voorkeurstype:"
 
-#~ msgid "Receiving Email"
-#~ msgstr "Bezig met ontvangen E-mail"
-
 #~ msgid "Receiving Mail"
 #~ msgstr "Bezig met ontvangen Post"
 
-# mail/folder-browser-factory.c:34

-#~ msgid "Reply-to:"
-#~ msgstr "Antwoord-naar:"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:565

-#~ msgid "Required"
-#~ msgstr "Benodigd"
-
-#~ msgid "SMTP"
-#~ msgstr "SMTP"
-
-#~ msgid "SMTP server requires authentication"
-#~ msgstr "SMTP server heeft authenticatie nodig"
-
-# composer/e-msg-composer.c:894 composer/e-msg-composer.c:942

-#~ msgid "Sending Email"
-#~ msgstr "Bezig met versturen E-mail"
-
 # composer/e-msg-composer.c:894 composer/e-msg-composer.c:942

 #~ msgid "Sending Mail"
 #~ msgstr "Bezig met versturen Post"
 
-# mail/mail-config.c:1163 mail/mail-config.c:1242

-#~ msgid "Server Configuration"
-#~ msgstr "Server Configuratie"
-
-# mail/mail-config.c:718 mail/mail-config.c:812 mail/mail-config.c:1621

-#~ msgid "Server Type: "
-#~ msgstr "Server Type: "
-
 #~ msgid ""
 #~ "You are almost done with the mail configuration process. The identity, "
 #~ "incoming"
@@ -8028,10 +8773,6 @@ msgstr "Group %i"
 #~ msgid "_Open"
 #~ msgstr "_Openen"
 
-# mail/folder-browser-factory.c:95

-#~ msgid "_Mail Configuration..."
-#~ msgstr "_Mail Configuratie..."
-
 # shell/e-shell-view-menu.c:404

 #~ msgid "Create a new folder"
 #~ msgstr "Nieuwe map aanmaken"
@@ -8173,10 +8914,6 @@ msgstr "Group %i"
 #~ msgid "View message sources from \"%s\""
 #~ msgstr "Bekijk bericht bronnen uit \"%s\""
 
-# calendar/gui/event-editor.c:294

-#~ msgid "Mailbox summary"
-#~ msgstr "Samenvatting postvak"
-
 # mail/folder-browser-factory.c:37

 #~ msgid "Threading message list"
 #~ msgstr "Bezig met weergeven van onderlinge relaties in berichtenlijst"
@@ -8188,13 +8925,6 @@ msgstr "Group %i"
 #~ msgid "BLARG\n"
 #~ msgstr "BLARG\n"
 
-#~ msgid ""
-#~ "Are you sure you want\n"
-#~ "to delete this contact?"
-#~ msgstr ""
-#~ "Weet u zeker dat u dit contact\n"
-#~ "wilt verwijderen?"
-
 # composer/e-msg-composer-address-dialog.glade.h:9

 #~ msgid "Quick Search"
 #~ msgstr "Snel Zoeken"
@@ -8248,28 +8978,16 @@ msgstr "Group %i"
 #~ msgid " (XXX unread)"
 #~ msgstr " (XXX ongelezen)"
 
-# mail/folder-browser-factory.c:37

-#~ msgid "Retrieving messages : %s"
-#~ msgstr "Bezig met ophalen berichten : %s"
-
 #~ msgid "Don't know protocol to open URI `%s'"
 #~ msgstr "Geen protocol om URI `%s' te openen"
 
 #~ msgid "Open in New Window"
 #~ msgstr "Open in Nieuw Venster"
 
-# composer/e-msg-composer.c:894

-#~ msgid "Edit Message"
-#~ msgstr "Bericht Bewerken"
-
 # mail/folder-browser-factory.c:37

 #~ msgid "Forward Message"
 #~ msgstr "Bericht Doorsturen"
 
-# mail/folder-browser-factory.c:45

-#~ msgid "Delete Message"
-#~ msgstr "Bericht Verwijderen"
-
 #~ msgid "Move Message"
 #~ msgstr "Bericht Verplaatsen"
 
@@ -8501,10 +9219,6 @@ msgstr "Group %i"
 #~ msgid "Search..."
 #~ msgstr "Zoeken..."
 
-# composer/e-msg-composer-address-dialog.glade.h:10

-#~ msgid "Name"
-#~ msgstr "Naam"
-
 # composer/e-msg-composer-address-dialog.glade.h:14

 #~ msgid "To: >>"
 #~ msgstr "Aan: >>"
@@ -8666,9 +9380,6 @@ msgstr "Group %i"
 #~ msgid "S_ubject:"
 #~ msgstr "Onderwerp:"
 
-#~ msgid "Owner:"
-#~ msgstr "Eigenaar:"
-
 #~ msgid ""
 #~ "Not Started\n"
 #~ "In Progress\n"
@@ -8713,9 +9424,6 @@ msgstr "Group %i"
 #~ msgid "Transparency"
 #~ msgstr "Transparantheid"
 
-#~ msgid "URL"
-#~ msgstr "URL"
-
 # addressbook/contact-editor/e-contact-editor.c:671

 # calendar/gui/event-editor.c:1146

 #~ msgid "FIXME: Invite _Attendees..."
@@ -8801,10 +9509,6 @@ msgstr "Group %i"
 #~ "Je moet het mail programma configuren\n"
 #~ "voordat je mail kunt versturen."
 
-# calendar/gui/gncal-todo.c:190

-#~ msgid "Port:"
-#~ msgstr "Poort:"
-
 #~ msgid "Bad folder passed to fetch_mail"
 #~ msgstr "Slechte map gepasseerd naar fetch_mail"
 
@@ -8943,10 +9647,6 @@ msgstr "Group %i"
 #~ msgid "Create a new appointment for today"
 #~ msgstr "Maak een nieuwe afspraak voor vandaag"
 
-# calendar/gui/event-editor.c:594 calendar/gui/event-editor.c:688

-#~ msgid "?"
-#~ msgstr "?"
-
 # composer/e-msg-composer.c:945

 #~ msgid "Cut selected region into the clipboard"
 #~ msgstr "Knip het geselecteerde gebied naar het klembord"
@@ -9085,18 +9785,9 @@ msgstr "Group %i"
 #~ msgid "Executive Summary"
 #~ msgstr "Samenvatting"
 
-#~ msgid "Inbox"
-#~ msgstr "Postvak In"
-
-#~ msgid "Sent mail messages"
-#~ msgstr "Verzonden email-berichten"
-
 #~ msgid "Tasks list"
 #~ msgstr "Taaklisjt"
 
-#~ msgid "Other Shortcuts"
-#~ msgstr "Andere Snelkoppelingen"
-
 #~ msgid "Enables some debugging functions"
 #~ msgstr "Zet wat debugging functies aan"
 
diff --git a/po/nn.po b/po/nn.po
index 5fe77edc5f..df47638b0f 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -2,10 +2,11 @@
 # Copyright (C) 2000 Gaute Hvoslef Kvalnes.
 # Gaute Hvoslef Kvalnes <ai98ghk@stud.hib.no>, 2000.
 #
+#: camel/providers/smtp/camel-smtp-transport.c:287
 msgid ""
 msgstr ""
 "Project-Id-Version: KDE PIM/abbrowser\n"
-"POT-Creation-Date: 2000-12-13 16:26-0600\n"
+"POT-Creation-Date: 2001-01-06 00:11+0100\n"
 "PO-Revision-Date: 2000-09-07 20:17+02:00\n"
 "Last-Translator: Gaute Hvoslef Kvalnes <ai98ghk@stud.hib.no>\n"
 "Language-Team: Norwegian (Nynorsk)\n"
@@ -249,10 +250,10 @@ msgstr "Praksis"
 #: addressbook/backend/ebook/load-pine-addressbook.c:17
 #: addressbook/backend/ebook/test-client-list.c:18
 #: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:991
+#: addressbook/conduit/address-conduit.c:1083
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1136
-#: calendar/conduits/todo/todo-conduit.c:945 calendar/gui/main.c:54
+#: calendar/conduits/calendar/calendar-conduit.c:1151
+#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikkje initiere Bonobo"
 
@@ -378,57 +379,38 @@ msgid ""
 "pilot list from the gnome-pilot daemon"
 msgstr "Feil under opning av dette dokumentet"
 
-#: addressbook/conduit/address-conduit.c:197
+#: addressbook/conduit/address-conduit.c:195
 msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:210
+#: addressbook/conduit/address-conduit.c:208
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:583
-#: calendar/conduits/calendar/calendar-conduit.c:715
-#: calendar/conduits/todo/todo-conduit.c:523
+#: addressbook/conduit/address-conduit.c:646
+#: calendar/conduits/calendar/calendar-conduit.c:730
+#: calendar/conduits/todo/todo-conduit.c:545
 #, fuzzy
 msgid "Could not start wombat server"
 msgstr "Kunne ikkje starta underprosess."
 
-#: addressbook/conduit/address-conduit.c:584
-#: calendar/conduits/calendar/calendar-conduit.c:716
-#: calendar/conduits/todo/todo-conduit.c:524
+#: addressbook/conduit/address-conduit.c:647
+#: calendar/conduits/calendar/calendar-conduit.c:731
+#: calendar/conduits/todo/todo-conduit.c:546
 #, fuzzy
 msgid "Could not start wombat"
 msgstr "Kunne ikkje starta %1."
 
-#: addressbook/conduit/address-conduit.c:616
-#: addressbook/conduit/address-conduit.c:619
+#: addressbook/conduit/address-conduit.c:679
+#: addressbook/conduit/address-conduit.c:682
 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
-#, fuzzy
-msgid "categories"
-msgstr "Kategoriar"
-
-#: addressbook/contact-editor/categories-strings.h:8
-msgid "Item(s) belong to these categories:"
-msgstr ""
-
-#: addressbook/contact-editor/categories-strings.h:9
-#, fuzzy
-msgid "Available Categories:"
-msgstr "Tilgjengelege kategoriar"
-
-#.
-#. * 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
 #, fuzzy
 msgid "Delete Contact?"
 msgstr "Slett kolonne"
@@ -444,7 +426,7 @@ msgid "_Add"
 msgstr "Legg til"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:48
+#: ui/evolution-event-editor.xml.h:108 ui/evolution-mail.xml.h:53
 #, fuzzy
 msgid "_Delete"
 msgstr "Slett"
@@ -461,12 +443,13 @@ msgid "New phone type"
 msgstr "&Ny type"
 
 #.
-#. * 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 "Legg til"
 
@@ -515,7 +498,7 @@ msgid "_Mobile"
 msgstr "Mobil:"
 
 #: 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
 #, fuzzy
 msgid "Primary Email"
 msgstr "Primц╕r&oppsett"
@@ -536,7 +519,7 @@ msgid "C_ontacts..."
 msgstr "&Innhald ..."
 
 #: 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
 #, fuzzy
 msgid "Ca_tegories..."
 msgstr "Kategoriar ..."
@@ -557,7 +540,8 @@ msgid "_Address..."
 msgstr "Adresse"
 
 #: 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 "Generelt"
 
@@ -612,160 +596,160 @@ msgid "No_tes:"
 msgstr "Notat:"
 
 #: 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 "Detaljar"
 
-#: addressbook/contact-editor/e-contact-editor.c:1266
+#: addressbook/contact-editor/e-contact-editor.c:1274
 #, fuzzy
 msgid "Assistant"
 msgstr "Namn pц╔ assistent"
 
-#: 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 "Firma"
 
-#: addressbook/contact-editor/e-contact-editor.c:1268
+#: addressbook/contact-editor/e-contact-editor.c:1276
 #, fuzzy
 msgid "Business 2"
 msgstr "Firma"
 
-#: addressbook/contact-editor/e-contact-editor.c:1269
+#: addressbook/contact-editor/e-contact-editor.c:1277
 msgid "Business Fax"
 msgstr "Firma-fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1270
+#: addressbook/contact-editor/e-contact-editor.c:1278
 msgid "Callback"
 msgstr "Ring tilbake"
 
-#: addressbook/contact-editor/e-contact-editor.c:1271
+#: addressbook/contact-editor/e-contact-editor.c:1279
 #, fuzzy
 msgid "Car"
 msgstr "Teikn"
 
-#: addressbook/contact-editor/e-contact-editor.c:1272
+#: addressbook/contact-editor/e-contact-editor.c:1280
 msgid "Company"
 msgstr "Firma"
 
-#: 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 "Heim"
 
-#: addressbook/contact-editor/e-contact-editor.c:1274
+#: addressbook/contact-editor/e-contact-editor.c:1282
 #, fuzzy
 msgid "Home 2"
 msgstr "Heim"
 
-#: addressbook/contact-editor/e-contact-editor.c:1275
+#: addressbook/contact-editor/e-contact-editor.c:1283
 msgid "Home Fax"
 msgstr "Heime-faks"
 
-#: 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
 #, fuzzy
 msgid "Mobile"
 msgstr "Mobil:"
 
-#: 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 "Anna"
 
-#: addressbook/contact-editor/e-contact-editor.c:1279
+#: addressbook/contact-editor/e-contact-editor.c:1287
 msgid "Other Fax"
 msgstr "Alternativ faks"
 
-#: addressbook/contact-editor/e-contact-editor.c:1280
+#: addressbook/contact-editor/e-contact-editor.c:1288
 msgid "Pager"
 msgstr "Personsц╦kjar"
 
-#: addressbook/contact-editor/e-contact-editor.c:1281
+#: addressbook/contact-editor/e-contact-editor.c:1289
 #, fuzzy
 msgid "Primary"
 msgstr "Privat"
 
-#: addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/contact-editor/e-contact-editor.c:1290
 #, fuzzy
 msgid "Radio"
 msgstr "Tilfeldig"
 
-#: addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/contact-editor/e-contact-editor.c:1291
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/contact-editor/e-contact-editor.c:1292
 #, fuzzy
 msgid "TTY/TDD"
 msgstr "TTY/TDD-telefon"
 
-#: addressbook/contact-editor/e-contact-editor.c:1329
+#: addressbook/contact-editor/e-contact-editor.c:1337
 #, fuzzy
 msgid "Email 2"
 msgstr "E-post 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1330
+#: addressbook/contact-editor/e-contact-editor.c:1338
 #, fuzzy
 msgid "Email 3"
 msgstr "E-post 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
 #, fuzzy
 msgid "Address _2:"
 msgstr "Adresse"
 
-#: 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
 #, fuzzy
 msgid "Check Address"
 msgstr "Alternativ adresse"
 
-#: po/tmp/fulladdr.glade.h:9
+#: addressbook/contact-editor/fulladdr.glade.h:9
 #, fuzzy
 msgid "Countr_y:"
 msgstr "Land:"
 
-#: 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
 #, fuzzy
 msgid "_Address:"
 msgstr "Adresse"
 
-#: po/tmp/fulladdr.glade.h:13
+#: addressbook/contact-editor/fulladdr.glade.h:13
 #, fuzzy
 msgid "_City:"
 msgstr "Stad:"
 
-#: po/tmp/fulladdr.glade.h:14
+#: addressbook/contact-editor/fulladdr.glade.h:14
 #, fuzzy
 msgid "_PO Box:"
 msgstr "Postboks"
 
-#: po/tmp/fulladdr.glade.h:15
+#: addressbook/contact-editor/fulladdr.glade.h:15
 #, fuzzy
 msgid "_State/Province:"
 msgstr "Stat/provins"
 
-#: po/tmp/fulladdr.glade.h:16
+#: addressbook/contact-editor/fulladdr.glade.h:16
 #, fuzzy
 msgid "_ZIP Code:"
 msgstr "ZIP/Postnummer"
@@ -785,10 +769,12 @@ msgid ""
 "\n"
 "Mr.\n"
 "Mrs.\n"
+"Ms.\n"
+"Miss\n"
 "Dr.\n"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:13
+#: addressbook/contact-editor/fullname-strings.h:15
 msgid ""
 "\n"
 "Sr.\n"
@@ -799,52 +785,57 @@ msgid ""
 "Esq.\n"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:21
+#: addressbook/contact-editor/fullname-strings.h:23
 #, fuzzy
 msgid "_First:"
 msgstr "Fц╦renamn"
 
-#: addressbook/contact-editor/fullname-strings.h:22
+#: addressbook/contact-editor/fullname-strings.h:24
 #, fuzzy
 msgid "_Title:"
 msgstr "Tittel:"
 
-#: addressbook/contact-editor/fullname-strings.h:23
+#: addressbook/contact-editor/fullname-strings.h:25
 #, fuzzy
 msgid "_Middle:"
 msgstr "Midt pц╔:"
 
-#: addressbook/contact-editor/fullname-strings.h:24
+#: addressbook/contact-editor/fullname-strings.h:26
 #, fuzzy
 msgid "_Last:"
 msgstr "Etternamn"
 
-#: addressbook/contact-editor/fullname-strings.h:25
+#: addressbook/contact-editor/fullname-strings.h:27
 #, fuzzy
 msgid "_Suffix:"
 msgstr "Etterstaving"
 
-#: addressbook/gui/component/addressbook.c:263
+#: addressbook/gui/component/addressbook.c:231
 #, fuzzy
 msgid "As _Minicards"
 msgstr "Bruk jokerteikn"
 
 #.
-#. * 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:269
-#: po/tmp/evolution-addressbook.xml.h:6
+#: addressbook/gui/component/addressbook.c:237
+#: ui/evolution-addressbook.xml.h:6
 #, fuzzy
 msgid "As _Table"
 msgstr "Tabell"
 
-#: addressbook/gui/component/addressbook.c:386
+#: addressbook/gui/component/addressbook.c:374
+#, c-format
+msgid "Enter password for %s"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:402
 #, fuzzy
 msgid "Unable to open addressbook"
 msgstr "Kan ikkje opna adresseboka."
 
-#: addressbook/gui/component/addressbook.c:391
+#: 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"
@@ -856,85 +847,212 @@ msgid ""
 "OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:501 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:503 mail/folder-browser.c:138
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 #, fuzzy
 msgid "Advanced..."
 msgstr "Legg til ..."
 
-#: addressbook/gui/component/addressbook.c:533
+#: addressbook/gui/component/addressbook.c:560
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:534
+#: addressbook/gui/component/addressbook.c:561
 msgid "Name contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:535
+#: addressbook/gui/component/addressbook.c:562
 #, fuzzy
 msgid "Email contains"
 msgstr "Smц╔ ikon"
 
-#: addressbook/gui/component/addressbook.c:621
+#: addressbook/gui/component/addressbook.c:648
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
-#: addressbook/gui/component/e-ldap-storage.c:88
+#: addressbook/gui/component/addressbook-storage.c:95
 #, fuzzy
-msgid "External Directories"
-msgstr "Separate katalogar"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/e-msg-composer-attachment.glade.h:7
-#: po/tmp/ldap-server-dialog.glade.h:6
-msgid "Description:"
-msgstr "Skildring:"
+msgid "Other Contacts"
+msgstr "Slett kolonne"
 
-#: po/tmp/ldap-server-dialog.glade.h:7
+#: addressbook/gui/component/addressbook-config.c:139
 #, fuzzy
-msgid "LDAP Server:"
+msgid "LDAP Server"
 msgstr "Tenar:"
 
-#: po/tmp/ldap-server-dialog.glade.h:8
-msgid "Name:"
-msgstr "Navn:"
+#: addressbook/gui/component/addressbook-config.c:141
+#, fuzzy
+msgid "File"
+msgstr "Fil"
+
+#: addressbook/gui/component/addressbook-config.c:144
+#, fuzzy
+msgid "Unknown addressbook type"
+msgstr "Kan ikkje opna adresseboka."
+
+#: 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 "Ukjend feil"
+
+#: addressbook/gui/component/addressbook-config.c:169
+#, fuzzy
+msgid "Base"
+msgstr "Lim inn"
 
-#: po/tmp/ldap-server-dialog.glade.h:9
-msgid "Port Number:"
-msgstr "Portnummer:"
+#: addressbook/gui/component/addressbook-config.c:171
+msgid "One"
+msgstr ""
 
-#: po/tmp/ldap-server-dialog.glade.h:10
+#: addressbook/gui/component/addressbook-config.c:173
+#, fuzzy
+msgid "Subtree"
+msgstr "Kjelder"
+
+#: 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 "time/timar"
+
+#: addressbook/gui/component/addressbook-config.c:361
+#, fuzzy
+msgid "Port:"
+msgstr "Prioritet:"
+
+#: addressbook/gui/component/addressbook-config.c:364
 #, fuzzy
 msgid "Root DN:"
 msgstr "Rot"
 
+#: addressbook/gui/component/addressbook-config.c:384
+#, fuzzy
+msgid "Search Scope:"
+msgstr "Sц╦k"
+
+#: addressbook/gui/component/addressbook-config.c:438
+#: mail/mail-config-druid.glade.h:14 mail/mail-config-gui.c:943
+msgid "Authentication:"
+msgstr "Autentisering:"
+
+#: addressbook/gui/component/addressbook-config.c:455
+#: mail/mail-config-druid.glade.h:52 mail/mail-config-gui.c:934
+msgid "Path:"
+msgstr "Sti:"
+
+#: addressbook/gui/component/addressbook-config.c:460
+#, fuzzy
+msgid "Create path if it doesn't exist."
+msgstr "Fila finst ikkje\n"
+
+#: addressbook/gui/component/addressbook-config.c:593
+#, fuzzy
+msgid "Edit Addressbook"
+msgstr "KDE adressebok"
+
+#: addressbook/gui/component/addressbook-config.c:595
+#, fuzzy
+msgid "Add Addressbook"
+msgstr "KDE adressebok"
+
+#: 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
+msgid "Name:"
+msgstr "Navn:"
+
+#: addressbook/gui/component/addressbook-config.c:617
+#: composer/e-msg-composer-attachment.glade.h:7
+msgid "Description:"
+msgstr "Skildring:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:7
+#, fuzzy
+msgid "Addressbook Sources"
+msgstr "Kjelde:"
+
+#: 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 "Slett"
+
+#: 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 "Rediger"
+
+#: addressbook/gui/component/addressbook-config.glade.h:10
+msgid "Name"
+msgstr "Namn"
+
+#: addressbook/gui/component/addressbook-config.glade.h:11
+#, fuzzy
+msgid "URI"
+msgstr "URL"
+
 #.
-#. * 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 "Finn ..."
 
-#: po/tmp/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 #, fuzzy
 msgid "Message Recipients"
 msgstr "Melding motteken"
 
-#: po/tmp/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 #, fuzzy
 msgid "Select Names"
 msgstr "Merk omrц╔de"
 
-#: po/tmp/select-names.glade.h:9
+#: addressbook/gui/component/select-names/select-names.glade.h:9
 #, fuzzy
-msgid "Select name from List:"
+msgid "Select name from:"
 msgstr "Vel ei gruppe fц╦rst."
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:147
@@ -943,135 +1061,135 @@ msgid "Search"
 msgstr "Sц╦k"
 
 #.
-#. * 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 ""
 
-#: po/tmp/alphabet.glade.h:7
+#: addressbook/gui/widgets/alphabet.glade.h:7
 #, fuzzy
 msgid "a"
 msgstr "am"
 
-#: po/tmp/alphabet.glade.h:8
+#: addressbook/gui/widgets/alphabet.glade.h:8
 #, fuzzy
 msgid "b"
 msgstr "av"
 
-#: po/tmp/alphabet.glade.h:9
+#: addressbook/gui/widgets/alphabet.glade.h:9
 #, fuzzy
 msgid "c"
 msgstr "cm"
 
-#: po/tmp/alphabet.glade.h:10
+#: addressbook/gui/widgets/alphabet.glade.h:10
 #, fuzzy
 msgid "d"
 msgstr "Id"
 
-#: 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
 #, fuzzy
 msgid "g"
 msgstr "gs"
 
-#: calendar/cal-util/timeutil.c:100 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
 #, fuzzy
 msgid "i"
 msgstr "er"
 
-#: 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
 #, fuzzy
 msgid "k"
 msgstr "Ok"
 
-#: 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
 #, fuzzy
 msgid "m"
 msgstr "ms"
 
-#: po/tmp/alphabet.glade.h:20
+#: addressbook/gui/widgets/alphabet.glade.h:20
 #, fuzzy
 msgid "n"
 msgstr "Pц╔"
 
-#: po/tmp/alphabet.glade.h:21
+#: addressbook/gui/widgets/alphabet.glade.h:21
 #, fuzzy
 msgid "o"
 msgstr "Nei"
 
-#: po/tmp/alphabet.glade.h:22
+#: addressbook/gui/widgets/alphabet.glade.h:22
 #, fuzzy
 msgid "p"
 msgstr "pm"
 
-#: 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
 #, fuzzy
 msgid "r"
 msgstr "Dr"
 
-#: po/tmp/alphabet.glade.h:25
+#: addressbook/gui/widgets/alphabet.glade.h:25
 msgid "s"
 msgstr "s"
 
-#: po/tmp/alphabet.glade.h:26
+#: addressbook/gui/widgets/alphabet.glade.h:26
 #, fuzzy
 msgid "t"
 msgstr "Qt"
 
-#: 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
 #, fuzzy
 msgid "x"
 msgstr "Tx"
 
-#: po/tmp/alphabet.glade.h:31
+#: addressbook/gui/widgets/alphabet.glade.h:31
 #, fuzzy
 msgid "y"
 msgstr "av"
 
-#: po/tmp/alphabet.glade.h:32
+#: addressbook/gui/widgets/alphabet.glade.h:32
 #, fuzzy
 msgid "z"
 msgstr "Hz"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:417
-#: addressbook/gui/widgets/e-minicard.c:338
+#: addressbook/gui/widgets/e-addressbook-view.c:451
+#: addressbook/gui/widgets/e-minicard.c:374
 #, fuzzy
 msgid "Save as VCard"
 msgstr "Lagra som"
@@ -1091,206 +1209,195 @@ 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 ""
 
-#: po/tmp/e-contact-print.glade.h:7
+#: addressbook/printing/e-contact-print.glade.h:7
 msgid "8 pt. Tahoma"
 msgstr ""
 
-#: 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 "Kropp"
 
-#: po/tmp/e-contact-print.glade.h:10
+#: addressbook/printing/e-contact-print.glade.h:10
 msgid "Bottom:"
 msgstr "Botn:"
 
-#: po/tmp/e-contact-print.glade.h:11
+#: addressbook/printing/e-contact-print.glade.h:11
 #, fuzzy
 msgid "Dimensions:"
 msgstr "Dimensjonar"
 
-#: po/tmp/e-contact-print.glade.h:12
+#: addressbook/printing/e-contact-print.glade.h:12
 msgid "Font..."
 msgstr "Skrifttype ..."
 
-#: po/tmp/e-contact-print.glade.h:13
+#: addressbook/printing/e-contact-print.glade.h:13
 msgid "Fonts"
 msgstr "Skrifttypar"
 
-#: po/tmp/e-contact-print.glade.h:14
+#: addressbook/printing/e-contact-print.glade.h:14
 #, fuzzy
 msgid "Footer:"
 msgstr "Botntekst"
 
-#: po/tmp/e-contact-print.glade.h:15
+#: addressbook/printing/e-contact-print.glade.h:15
 msgid "Format"
 msgstr "Format"
 
-#: po/tmp/e-contact-print.glade.h:16
+#: addressbook/printing/e-contact-print.glade.h:16
 msgid "Header"
 msgstr "Dekl."
 
-#: po/tmp/e-contact-print.glade.h:17
+#: addressbook/printing/e-contact-print.glade.h:17
 #, fuzzy
 msgid "Header/Footer"
 msgstr "&Topp-/botntekst ..."
 
-#: po/tmp/e-contact-print.glade.h:18
+#: addressbook/printing/e-contact-print.glade.h:18
 #, fuzzy
 msgid "Headings"
 msgstr "Les"
 
-#: po/tmp/e-contact-print.glade.h:19
+#: addressbook/printing/e-contact-print.glade.h:19
 #, fuzzy
 msgid "Headings for each letter"
 msgstr "Les mapper"
 
-#: po/tmp/e-contact-print.glade.h:20
+#: addressbook/printing/e-contact-print.glade.h:20
 msgid "Height:"
 msgstr "Hц╦gd:"
 
-#: 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
 #, fuzzy
 msgid "Include:"
 msgstr "Inkluder fil"
 
-#: po/tmp/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23
 msgid "Landscape"
 msgstr "Liggjande"
 
-#: po/tmp/e-contact-print.glade.h:24
+#: addressbook/printing/e-contact-print.glade.h:24
 msgid "Left:"
 msgstr "Venstre:"
 
-#: 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
 #, fuzzy
 msgid "Margins"
 msgstr "&Marg"
 
-#: po/tmp/e-contact-print.glade.h:27
+#: addressbook/printing/e-contact-print.glade.h:27
 #, fuzzy
 msgid "Number of columns:"
 msgstr "Tal pц╔ kolonnar:"
 
-#: po/tmp/e-contact-print.glade.h:28
+#: addressbook/printing/e-contact-print.glade.h:28
 msgid "Options"
 msgstr "Val"
 
-#: po/tmp/e-contact-print.glade.h:29
+#: addressbook/printing/e-contact-print.glade.h:29
 msgid "Orientation"
 msgstr "Retning"
 
-#: po/tmp/e-contact-print.glade.h:30
+#: addressbook/printing/e-contact-print.glade.h:30
 msgid "Page"
 msgstr "Side"
 
-#: po/tmp/e-contact-print.glade.h:31
+#: addressbook/printing/e-contact-print.glade.h:31
 #, fuzzy
 msgid "Page Setup:"
 msgstr "Speloppsett"
 
-#: po/tmp/e-contact-print.glade.h:32
+#: addressbook/printing/e-contact-print.glade.h:32
 msgid "Paper"
 msgstr "Papir"
 
-#: po/tmp/e-contact-print.glade.h:33
+#: addressbook/printing/e-contact-print.glade.h:33
 #, fuzzy
 msgid "Paper source:"
 msgstr "Papir&storleik:"
 
-#: po/tmp/e-contact-print.glade.h:34
+#: addressbook/printing/e-contact-print.glade.h:34
 msgid "Portrait"
 msgstr "Stц╔ande"
 
-#: po/tmp/e-contact-print.glade.h:35
+#: addressbook/printing/e-contact-print.glade.h:35
 msgid "Preview:"
 msgstr "Fц╦rehandsvising:"
 
-#: po/tmp/e-contact-print.glade.h:36
+#: addressbook/printing/e-contact-print.glade.h:36
 #, fuzzy
 msgid "Print using gray shading"
 msgstr "Skriv med grц╔nyansar"
 
-#: po/tmp/e-contact-print.glade.h:37
+#: addressbook/printing/e-contact-print.glade.h:37
 #, fuzzy
 msgid "Reverse on even pages"
 msgstr "Merk partal-sider"
 
-#: po/tmp/e-contact-print.glade.h:38
+#: addressbook/printing/e-contact-print.glade.h:38
 msgid "Right:"
 msgstr "Hц╦gre:"
 
-#: po/tmp/e-contact-print.glade.h:39
+#: addressbook/printing/e-contact-print.glade.h:39
 #, fuzzy
 msgid "Sections:"
 msgstr "Del:"
 
-#: po/tmp/e-contact-print.glade.h:40
+#: addressbook/printing/e-contact-print.glade.h:40
 #, fuzzy
 msgid "Shading"
 msgstr "Lagring"
 
-#: po/tmp/e-contact-print.glade.h:41
+#: addressbook/printing/e-contact-print.glade.h:41
 msgid "Size:"
 msgstr "Storleik:"
 
-#: po/tmp/e-contact-print.glade.h:42
+#: addressbook/printing/e-contact-print.glade.h:42
 #, fuzzy
 msgid "Start on a new page"
 msgstr "Startar nytt spel ..."
 
-#: po/tmp/e-contact-print.glade.h:43
+#: addressbook/printing/e-contact-print.glade.h:43
 #, fuzzy
 msgid "Style name:"
 msgstr "Typenamn:"
 
-#: po/tmp/e-contact-print.glade.h:44
+#: addressbook/printing/e-contact-print.glade.h:44
 msgid "Top:"
 msgstr "Topp:"
 
-#: 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 "Type:"
 
-#: po/tmp/e-contact-print.glade.h:46
+#: addressbook/printing/e-contact-print.glade.h:46
 msgid "Width:"
 msgstr "Breidd:"
 
-#: po/tmp/e-contact-print.glade.h:47
+#: addressbook/printing/e-contact-print.glade.h:47
 #, fuzzy
 msgid "label26"
 msgstr "Etikett"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:550
-#: calendar/gui/e-week-view.c:288 calendar/gui/print.c:605
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:553
-#: calendar/gui/e-week-view.c:291 calendar/gui/print.c:604
-msgid "pm"
-msgstr "pm"
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 #, fuzzy
 msgid "Evolution Calendar Conduit"
@@ -1301,14 +1408,14 @@ msgstr "Tilgjengelege lenkjer:"
 msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr "ц≤ydelagd oppsettfil."
 
-#: calendar/conduits/calendar/calendar-conduit.c:671
-#: calendar/conduits/todo/todo-conduit.c:479
+#: calendar/conduits/calendar/calendar-conduit.c:686
+#: calendar/conduits/todo/todo-conduit.c:501
 #, fuzzy
 msgid "Error while communicating with calendar server"
 msgstr "Feil ved tilkopling til tenar."
 
-#: calendar/conduits/calendar/calendar-conduit.c:770
-#: calendar/conduits/calendar/calendar-conduit.c:773
+#: calendar/conduits/calendar/calendar-conduit.c:785
+#: calendar/conduits/calendar/calendar-conduit.c:788
 #, fuzzy
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
@@ -1321,139 +1428,171 @@ msgstr ""
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:578
-#: calendar/conduits/todo/todo-conduit.c:581
+#: calendar/conduits/todo/todo-conduit.c:600
+#: calendar/conduits/todo/todo-conduit.c:603
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:60
-#, fuzzy
-msgid "Outline:"
-msgstr "Oversikt"
+#.
+#. * 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
-#, fuzzy
-msgid "Headings:"
-msgstr "Overskrift:"
+#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:7
+msgid "Factory for the sample Calendar control"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:62
-#, fuzzy
-msgid "Empty days:"
-msgstr " dag"
+#.
+#. * 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
+#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:7
 #, fuzzy
-msgid "Appointments:"
-msgstr "Avtale"
+msgid "Calendar Server"
+msgstr "Skriv ut alle"
 
-#: calendar/gui/calendar-commands.c:64
+#.
+#. * 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
 #, fuzzy
-msgid "Highlighted day:"
-msgstr "Opplysing:"
+msgid "Evolution calendar executive summary component."
+msgstr "Kan ikkje initialisera lokale variablar"
 
-#: calendar/gui/calendar-commands.c:65
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
 #, fuzzy
-msgid "Day numbers:"
-msgstr "Hц╦gste tal"
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Tilgjengelege lenkjer:"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Evolution component for handling the calendar."
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:66
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+msgid "Factory for the Calendar Summary component."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
 #, fuzzy
-msgid "Current day's number:"
-msgstr "Noverande namn:"
+msgid "Factory for the Evolution calendar component."
+msgstr "ц≤ydelagd oppsettfil."
 
-#: calendar/gui/calendar-commands.c:67
-msgid "To-Do item that is not yet due:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+msgid "Factory for the calendar iTip view control"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:68
-msgid "To-Do item that is due today:"
+#: 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:69
+#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:8
 #, fuzzy
-msgid "To-Do item that is overdue:"
-msgstr "Element i hugselista:"
+msgid "Snooze"
+msgstr "Spooler"
+
+#. 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 "Ok"
 
-#: calendar/gui/calendar-commands.c:354
+#: calendar/gui/calendar-commands.c:229
 msgid "File not found"
 msgstr "Fann ikkje fil"
 
-#: calendar/gui/calendar-commands.c:378
+#: calendar/gui/calendar-commands.c:253
 #, fuzzy
 msgid "Open calendar"
 msgstr "Feil ved opning"
 
-#: calendar/gui/calendar-commands.c:417
+#: calendar/gui/calendar-commands.c:295
 #, fuzzy
 msgid "Save calendar"
 msgstr "Ny kalender"
 
+#: 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:282
+#: 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:2498
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
 msgstr ""
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:286 calendar/gui/calendar-model.c:736
+#: 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:290 calendar/gui/calendar-model.c:739
+#: 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:344 po/tmp/task-editor-dialog.glade.h:21
+#: calendar/gui/calendar-model.c:346
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
 #, fuzzy
 msgid "Public"
 msgstr "Praksis"
 
-#: calendar/gui/calendar-model.c:347 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 "Privat"
 
-#: calendar/gui/calendar-model.c:350 po/tmp/task-editor-dialog.glade.h:11
+#: calendar/gui/calendar-model.c:352
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
 #, fuzzy
 msgid "Confidential"
 msgstr "Eksponentiell"
 
-#: calendar/gui/calendar-model.c:353 calendar/gui/calendar-model.c:521
+#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:523
 msgid "Unknown"
 msgstr "Ukjend"
 
-#: calendar/gui/calendar-model.c:441
+#: calendar/gui/calendar-model.c:443
 #, fuzzy
 msgid "N"
 msgstr "Nr"
 
-#: calendar/gui/calendar-model.c:441
+#: calendar/gui/calendar-model.c:443
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:445
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:445
 #, fuzzy
 msgid "W"
 msgstr "RW"
 
-#: calendar/gui/calendar-model.c:515
+#: calendar/gui/calendar-model.c:517
 #, fuzzy
 msgid "Transparent"
 msgstr "Gjennomsiktig "
 
-#: calendar/gui/calendar-model.c:518
+#: calendar/gui/calendar-model.c:520
 #, fuzzy
 msgid "Opaque"
 msgstr "Opna"
 
-#: calendar/gui/calendar-model.c:744
+#: calendar/gui/calendar-model.c:746
 #, fuzzy, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1462,51 +1601,76 @@ msgid ""
 msgstr "Ein bandindeks mц╔ vera valt i treet."
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:845 calendar/gui/calendar-model.c:893
+#: 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:1274 widgets/misc/e-dateedit.c:1455
+#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
 msgstr ""
 
 #. 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:863
+#: calendar/gui/calendar-model.c:865
 msgid "%I:%M:%S %p%n"
 msgstr ""
 
 #. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:866
+#: calendar/gui/calendar-model.c:868
 msgid "%H:%M:%S%n"
 msgstr ""
 
 #. 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:870
+#: calendar/gui/calendar-model.c:872
 msgid "%I:%M %p%n"
 msgstr ""
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:873
+#: calendar/gui/calendar-model.c:875
 #, fuzzy
 msgid "%H:%M%n"
 msgstr "%H:%M"
 
-#: calendar/gui/calendar-model.c:993
+#: calendar/gui/calendar-model.c:995
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1033
+#: calendar/gui/calendar-model.c:1035
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1073
+#: calendar/gui/calendar-model.c:1075
 #, fuzzy
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "Prioriteten mц╔ vera i omrц╔det 1-99"
 
+#: calendar/gui/calendar-summary.c:81
+#, fuzzy
+msgid "%A, %e %B %Y"
+msgstr "%1 bit %2 %3"
+
+#: calendar/gui/calendar-summary.c:224
+#, fuzzy
+msgid "<b>Error loading calendar</b>"
+msgstr ""
+"Feil ved nedlasting av fil:\n"
+"%1"
+
+#: 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 "Skriv ut alle"
+
 #: calendar/gui/control-factory.c:125
 #, fuzzy
 msgid "The URI that the calendar will display"
@@ -1526,398 +1690,437 @@ msgid "No summary available."
 msgstr "Ingen bilete tilgjengeleg."
 
 #.
-#. * 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 "Lukk"
 
-#: po/tmp/alarm-notify.glade.h:7
+#: calendar/gui/dialogs/alarm-notify.glade.h:7
 #, fuzzy
 msgid "Edit appointment"
 msgstr "&Endra avtale ..."
 
-#: calendar/gui/gnome-cal.c:1466 po/tmp/alarm-notify.glade.h:8
-#, fuzzy
-msgid "Snooze"
-msgstr "Spooler"
-
-#: po/tmp/alarm-notify.glade.h:9
+#: calendar/gui/dialogs/alarm-notify.glade.h:9
 #, fuzzy
 msgid "Snooze time (minutes)"
 msgstr "Lц╔g grense (minutt):"
 
 #.
-#. * 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
 #, fuzzy
 msgid "05 minutes"
 msgstr "minutt"
 
-#: po/tmp/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 #, fuzzy
 msgid "10 minutes"
 msgstr "minutt"
 
-#: po/tmp/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "12 hour (am/pm)"
 msgstr ""
 
-#: po/tmp/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 #, fuzzy
 msgid "15 minutes"
 msgstr "minutt"
 
-#: po/tmp/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 #, fuzzy
 msgid "24 hour"
 msgstr "time/timar"
 
-#: po/tmp/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 #, fuzzy
 msgid "30 minutes"
 msgstr "minutt"
 
-#: po/tmp/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #, fuzzy
 msgid "60 minutes"
 msgstr "minutt"
 
-#: 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
 #, fuzzy
 msgid "Audio Alarms"
 msgstr "Alarm"
 
-#: 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
 #, fuzzy
 msgid "Calendar"
 msgstr "Skriv ut alle"
 
-#: po/tmp/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #, fuzzy
 msgid "Calendar Preferences"
 msgstr "Innstillingar"
 
-#: po/tmp/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Colors"
 msgstr "Fargar"
 
-#: 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 "Standard"
 
-#: po/tmp/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 #, fuzzy
 msgid "Display options"
 msgstr "Vis"
 
-#: po/tmp/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Due Date"
 msgstr "Forfallsdato"
 
-#: 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
 #, fuzzy
 msgid "End of day:"
 msgstr "Slutt trekk"
 
-#: 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 "Fre"
 
-#: 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
 #, fuzzy
 msgid "Friday"
 msgstr "Fredag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 #, fuzzy
 msgid "Highlight"
 msgstr "Opplysing:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #, fuzzy
 msgid "Items Due Today"
 msgstr "&Opplys syntaks"
 
-#: 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 "Mц╔n"
 
-#: 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 "Mц╔ndag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #, fuzzy
 msgid "Overdue Items"
 msgstr "&Syntaksmerkingsmodusar"
 
-#: 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 "Prioritet"
 
-#: po/tmp/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
 msgid "Remind me of all appointments"
 msgstr "&Slett avtale"
 
-#: po/tmp/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #, fuzzy
 msgid "Reminders"
 msgstr "Pц╔minning:"
 
-#: 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 "Lau"
 
-#: 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
 #, fuzzy
 msgid "Saturday"
 msgstr "Laurdag"
 
-#: 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
 #, fuzzy
 msgid "Show appointment end times"
 msgstr "Avtale"
 
-#: po/tmp/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #, fuzzy
 msgid "Show week numbers"
 msgstr "Vis %1"
 
-#: po/tmp/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 #, fuzzy
 msgid "Start of day:"
 msgstr "Start-dato"
 
 #. 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 "Sun"
 
-#: 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 "Sundag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 #, fuzzy
 msgid "TaskPad"
 msgstr "Oppgц╔ve"
 
-#: 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 "Tor"
 
-#: 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
 #, fuzzy
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 #, fuzzy
 msgid "Time Until Due"
 msgstr "Tid og dato"
 
-#: po/tmp/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 #, fuzzy
 msgid "Time divisions:"
 msgstr "Dimensjonar"
 
-#: po/tmp/cal-prefs-dialog.glade.h:55
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 #, fuzzy
 msgid "Time format:"
 msgstr "Tidsformat:"
 
-#: 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 "Tys"
 
-#: 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
 #, fuzzy
 msgid "Tuesday"
 msgstr "Tysdag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:58
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 #, fuzzy
 msgid "Visual Alarms"
 msgstr "Alarm"
 
-#: 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 "Ons"
 
-#: 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
 #, fuzzy
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:61
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 #, fuzzy
 msgid "Work week"
 msgstr "Veke"
 
-#: 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
 #, fuzzy
 msgid "seconds."
 msgstr "sekund"
 
+#: calendar/gui/dialogs/delete-comp.c:62
+#, fuzzy, c-format
+msgid "Are you sure you want to delete the appointment `%s'?"
+msgstr "Er du sikker pц╔ at du vil sletta denne klassen?"
+
+#: calendar/gui/dialogs/delete-comp.c:65
+#, fuzzy
+msgid "Are you sure you want to delete this untitled appointment?"
+msgstr "Er du sikker pц╔ at du vil sletta denne klassen?"
+
+#: calendar/gui/dialogs/delete-comp.c:71
+#, fuzzy, c-format
+msgid "Are you sure you want to delete the task `%s'?"
+msgstr "Er du sikker pц╔ at du vil sletta denne klassen?"
+
+#: calendar/gui/dialogs/delete-comp.c:74
+#, fuzzy
+msgid "Are you sure you want to delete this untitled task?"
+msgstr "Er du sikker pц╔ at du vil sletta denne klassen?"
+
+#: calendar/gui/dialogs/delete-comp.c:80
+#, fuzzy, c-format
+msgid "Are you sure you want to delete the journal entry `%s'?"
+msgstr "Er du sikker pц╔ at du vil sletta denne klassen?"
+
+#: calendar/gui/dialogs/delete-comp.c:83
+#, fuzzy
+msgid "Are you sure want to delete this untitled journal entry?"
+msgstr "Er du sikker pц╔ at du vil sletta denne klassen?"
+
 #.
-#. * 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
 #, fuzzy
 msgid "% Comp_lete:"
 msgstr "Ferdig"
 
-#: po/tmp/task-editor-dialog.glade.h:7
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
 #, fuzzy
 msgid "C_lassification:"
 msgstr "&Forstц╦rring"
 
-#: po/tmp/task-editor-dialog.glade.h:9
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
 #, fuzzy
 msgid "Cancelled"
 msgstr "Avbroten."
 
-#: po/tmp/task-editor-dialog.glade.h:10
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
 msgid "Completed"
 msgstr "Ferdig"
 
-#: po/tmp/task-editor-dialog.glade.h:12
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
 #, fuzzy
 msgid "Date Completed:"
 msgstr "Ferdig"
 
-#: po/tmp/task-editor-dialog.glade.h:14
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
 #, fuzzy
 msgid "High"
 msgstr "Hц╦gd"
 
-#: po/tmp/task-editor-dialog.glade.h:15
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
 #, fuzzy
 msgid "In Progress"
 msgstr "Framgong:"
 
-#: po/tmp/task-editor-dialog.glade.h:16
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
 #, fuzzy
 msgid "Low"
 msgstr "Senk"
 
 #. 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
-#: widgets/misc/e-dateedit.c:422 widgets/misc/e-dateedit.c:1331
-#: widgets/misc/e-dateedit.c:1446
+#: 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 "Ingen"
 
-#: po/tmp/task-editor-dialog.glade.h:18
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
 msgid "Normal"
 msgstr "Normal"
 
-#: po/tmp/task-editor-dialog.glade.h:19
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
 #, fuzzy
 msgid "Not Started"
 msgstr "Starta"
 
-#: po/tmp/task-editor-dialog.glade.h:22
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
 #, fuzzy
 msgid "S_ummary"
 msgstr "Samandrag"
 
-#: po/tmp/task-editor-dialog.glade.h:23
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
 #, fuzzy
 msgid "Sta_rt Date:"
 msgstr "Start-dato:"
 
-#: po/tmp/task-editor-dialog.glade.h:24
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
 msgid "Task"
 msgstr "Oppgц╔ve"
 
-#: 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
 #, fuzzy
 msgid "_Contacts..."
 msgstr "&Innhald ..."
 
-#: po/tmp/task-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
 #, fuzzy
 msgid "_Due Date:"
 msgstr "Forfallsdato:"
 
-#: po/tmp/task-editor-dialog.glade.h:28
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
 #, fuzzy
 msgid "_Priority:"
 msgstr "Prioritet:"
 
-#: po/tmp/task-editor-dialog.glade.h:29
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
 #, fuzzy
 msgid "_Status:"
 msgstr "Status:"
 
-#: po/tmp/task-editor-dialog.glade.h:30
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
 msgid "task-editor-dialog"
 msgstr ""
 
@@ -1925,27 +2128,27 @@ msgstr ""
 msgid "Edit Task"
 msgstr "Rediger oppgц╔ve"
 
-#: 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
 #, fuzzy
 msgid "No summary"
 msgstr "oppsummering"
 
-#: 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
 #, fuzzy, c-format
 msgid "Appointment - %s"
 msgstr "Avtale"
 
-#: 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
 #, fuzzy, c-format
 msgid "Task - %s"
 msgstr "Oppgц╔ver"
 
-#: 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 ""
 
-#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3277
+#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3250
 #, fuzzy
 msgid "Do you want to save changes?"
 msgstr "I ferd med ц╔ senda e-post ..."
@@ -1969,14 +2172,6 @@ msgstr "Ferdig"
 msgid "Mark the task complete"
 msgstr "Marker alle som l&esne"
 
-#: calendar/gui/e-calendar-table.c:342 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:479 mail/mail-view.c:165
-#: 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 "Slett"
-
 #: calendar/gui/e-calendar-table.c:343
 #, fuzzy
 msgid "Delete the task"
@@ -1989,56 +2184,68 @@ msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1208
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1211
 #: calendar/gui/e-week-view-main-item.c:325
 msgid "%A %d %B"
 msgstr ""
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1222
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1225
 #: calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr ""
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1235
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1238
 #: calendar/gui/e-week-view-main-item.c:348
 #, fuzzy
 msgid "%d %b"
 msgstr "%1 %2"
 
-#: calendar/gui/e-day-view.c:2941 calendar/gui/e-day-view.c:2948
-#: calendar/gui/e-day-view.c:2957 calendar/gui/e-week-view.c:3165
-#: calendar/gui/e-week-view.c:3172 calendar/gui/e-week-view.c:3181
+#. 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:610
+msgid "am"
+msgstr "am"
+
+#. 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:609
+msgid "pm"
+msgstr "pm"
+
+#: calendar/gui/e-day-view.c:2948 calendar/gui/e-day-view.c:2955
+#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3169
+#: calendar/gui/e-week-view.c:3176 calendar/gui/e-week-view.c:3185
 #, fuzzy
 msgid "New appointment..."
 msgstr "&Vis avtale ..."
 
-#: calendar/gui/e-day-view.c:2945 calendar/gui/e-day-view.c:2952
-#: calendar/gui/e-week-view.c:3169 calendar/gui/e-week-view.c:3176
+#: calendar/gui/e-day-view.c:2952 calendar/gui/e-day-view.c:2959
+#: calendar/gui/e-week-view.c:3173 calendar/gui/e-week-view.c:3180
 #, fuzzy
 msgid "Edit this appointment..."
 msgstr "&Endra avtale ..."
 
-#: calendar/gui/e-day-view.c:2946 calendar/gui/e-week-view.c:3170
-#: po/tmp/evolution-event-editor.xml.h:20
+#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3174
+#: ui/evolution-event-editor.xml.h:20
 #, fuzzy
 msgid "Delete this appointment"
 msgstr "&Slett avtale"
 
-#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3177
+#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3181
 #, fuzzy
 msgid "Make this appointment movable"
 msgstr "Se&nd avtale"
 
-#: calendar/gui/e-day-view.c:2954 calendar/gui/e-week-view.c:3178
+#: calendar/gui/e-day-view.c:2961 calendar/gui/e-week-view.c:3182
 #, fuzzy
 msgid "Delete this occurrence"
 msgstr "Erstatt denne fц╦rekomsten?"
 
-#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3179
+#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3183
 #, fuzzy
 msgid "Delete all occurrences"
 msgstr "Slettar klassen"
@@ -2052,755 +2259,534 @@ msgid "%d %B"
 msgstr "%1 %2"
 
 #.
-#. * 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
 #, fuzzy
 msgid "Appointment Basics"
 msgstr "Avtale"
 
-#: po/tmp/event-editor-dialog.glade.h:9
+#: calendar/gui/event-editor-dialog.glade.h:9
 #, fuzzy
 msgid "Classification"
 msgstr "&Forstц╦rring"
 
-#: po/tmp/event-editor-dialog.glade.h:10
+#: calendar/gui/event-editor-dialog.glade.h:10
 #, fuzzy
 msgid "Custom recurrence"
 msgstr "Repetering"
 
-#: po/tmp/event-editor-dialog.glade.h:11
+#: calendar/gui/event-editor-dialog.glade.h:11
 #, fuzzy
 msgid "Days"
 msgstr "Dag"
 
-#: po/tmp/event-editor-dialog.glade.h:13
+#: calendar/gui/event-editor-dialog.glade.h:13
 #, fuzzy
 msgid "Every"
 msgstr "kvar"
 
-#: po/tmp/event-editor-dialog.glade.h:14
+#: calendar/gui/event-editor-dialog.glade.h:14
 msgid "Exceptions"
 msgstr "Unntak"
 
-#: po/tmp/event-editor-dialog.glade.h:16
+#: calendar/gui/event-editor-dialog.glade.h:16
 #, fuzzy
 msgid "Hours"
 msgstr "time/timar"
 
-#: po/tmp/event-editor-dialog.glade.h:17
+#: calendar/gui/event-editor-dialog.glade.h:17
 #, fuzzy
 msgid "Mail _to:"
 msgstr "E-post:"
 
-#: po/tmp/event-editor-dialog.glade.h:18
+#: calendar/gui/event-editor-dialog.glade.h:18
 #, fuzzy
 msgid "Minutes"
 msgstr "minutt"
 
-#: po/tmp/event-editor-dialog.glade.h:19
+#: calendar/gui/event-editor-dialog.glade.h:19
 #, fuzzy
 msgid "Modify"
 msgstr "Mц╔ndag"
 
-#: po/tmp/event-editor-dialog.glade.h:20
+#: calendar/gui/event-editor-dialog.glade.h:20
 #, fuzzy
 msgid "No recurrence"
 msgstr "Repetering"
 
-#: po/tmp/event-editor-dialog.glade.h:21
+#: calendar/gui/event-editor-dialog.glade.h:21
 #, fuzzy
 msgid "Preview"
 msgstr "Fц╦rehandsvising:"
 
-#: po/tmp/event-editor-dialog.glade.h:22
+#: calendar/gui/event-editor-dialog.glade.h:22
 #, fuzzy
 msgid "Pri_vate"
 msgstr "Privat"
 
-#: po/tmp/event-editor-dialog.glade.h:23
+#: calendar/gui/event-editor-dialog.glade.h:23
 #, fuzzy
 msgid "Pu_blic"
 msgstr "Praksis"
 
-#: po/tmp/event-editor-dialog.glade.h:24
+#: calendar/gui/event-editor-dialog.glade.h:24
 msgid "Recurrence"
 msgstr "Repetering"
 
-#: po/tmp/event-editor-dialog.glade.h:25
+#: calendar/gui/event-editor-dialog.glade.h:25
 #, fuzzy
 msgid "Recurrence Rule"
 msgstr "Regel for repetering"
 
-#: po/tmp/event-editor-dialog.glade.h:26
+#: calendar/gui/event-editor-dialog.glade.h:26
 #, fuzzy
 msgid "Reminder"
 msgstr "Pц╔minning:"
 
-#: po/tmp/event-editor-dialog.glade.h:27
+#: calendar/gui/event-editor-dialog.glade.h:27
 #, fuzzy
 msgid "Simple recurrence"
 msgstr "Repetering"
 
-#: po/tmp/event-editor-dialog.glade.h:28
+#: calendar/gui/event-editor-dialog.glade.h:28
 #, fuzzy
 msgid "Su_mmary:"
 msgstr "Samandrag:"
 
-#: po/tmp/event-editor-dialog.glade.h:29
+#: calendar/gui/event-editor-dialog.glade.h:29
 msgid "Time"
 msgstr "Tid"
 
-#: po/tmp/event-editor-dialog.glade.h:30
+#: calendar/gui/event-editor-dialog.glade.h:30
 #, fuzzy
 msgid "_Audio"
 msgstr "Lyd"
 
-#: po/tmp/event-editor-dialog.glade.h:31
+#: calendar/gui/event-editor-dialog.glade.h:31
 #, fuzzy
 msgid "_Confidential"
 msgstr "Eksponentiell"
 
-#: po/tmp/event-editor-dialog.glade.h:32
+#: calendar/gui/event-editor-dialog.glade.h:32
 #, fuzzy
 msgid "_Display"
 msgstr "Vis"
 
-#: po/tmp/event-editor-dialog.glade.h:33
+#: calendar/gui/event-editor-dialog.glade.h:33
 #, fuzzy
 msgid "_End time:"
 msgstr "Slutt-tid:"
 
-#: po/tmp/event-editor-dialog.glade.h:34
+#: calendar/gui/event-editor-dialog.glade.h:34
 #, fuzzy
 msgid "_Mail"
 msgstr "Send"
 
-#: po/tmp/event-editor-dialog.glade.h:35
+#: calendar/gui/event-editor-dialog.glade.h:35
 #, fuzzy
 msgid "_Program"
 msgstr "Program"
 
-#: po/tmp/event-editor-dialog.glade.h:36
+#: calendar/gui/event-editor-dialog.glade.h:36
 #, fuzzy
 msgid "_Run program:"
 msgstr "Terminalprogram:"
 
-#: po/tmp/event-editor-dialog.glade.h:37
+#: calendar/gui/event-editor-dialog.glade.h:37
 #, fuzzy
 msgid "_Start time:"
 msgstr "Start-tid:"
 
-#: po/tmp/event-editor-dialog.glade.h:38
+#: calendar/gui/event-editor-dialog.glade.h:38
 #, fuzzy
 msgid "_Starting date:"
 msgstr "Start-dato"
 
-#: po/tmp/event-editor-dialog.glade.h:39
+#: calendar/gui/event-editor-dialog.glade.h:39
 msgid "day(s)"
 msgstr "dag(ar)"
 
-#: po/tmp/event-editor-dialog.glade.h:40
+#: calendar/gui/event-editor-dialog.glade.h:40
 #, fuzzy
 msgid "event-editor-dialog"
 msgstr "Opnar angrehistoriedialogen"
 
-#: po/tmp/event-editor-dialog.glade.h:41
+#: calendar/gui/event-editor-dialog.glade.h:41
 #, fuzzy
 msgid "for"
 msgstr "Munnar"
 
-#: po/tmp/event-editor-dialog.glade.h:42
+#: calendar/gui/event-editor-dialog.glade.h:42
 #, fuzzy
 msgid "forever"
 msgstr "Repeterer for alltid"
 
-#: po/tmp/event-editor-dialog.glade.h:43
+#: calendar/gui/event-editor-dialog.glade.h:43
 #, fuzzy
 msgid "label21"
 msgstr "Etikett"
 
-#: po/tmp/event-editor-dialog.glade.h:44
+#: calendar/gui/event-editor-dialog.glade.h:44
 msgid "month(s)"
 msgstr "mц╔nad(er)"
 
-#: po/tmp/event-editor-dialog.glade.h:45
+#: calendar/gui/event-editor-dialog.glade.h:45
 #, fuzzy
 msgid "until"
 msgstr "utan tittel"
 
-#: po/tmp/event-editor-dialog.glade.h:46
+#: calendar/gui/event-editor-dialog.glade.h:46
 #, fuzzy
 msgid "week(s)"
 msgstr "veke(r) pц╔:"
 
-#: po/tmp/event-editor-dialog.glade.h:47
+#: calendar/gui/event-editor-dialog.glade.h:47
 msgid "year(s)"
 msgstr "ц╔r"
 
-#: calendar/gui/event-editor.c:329
+#: calendar/gui/event-editor.c:325
 #, fuzzy
 msgid "Edit Appointment"
 msgstr "&Endra avtale ..."
 
-#: calendar/gui/event-editor.c:407
+#: calendar/gui/event-editor.c:403
 #, fuzzy
 msgid "on"
 msgstr "Mц╔n"
 
-#: calendar/gui/event-editor.c:432 calendar/gui/getdate.y:424
-#: filter/filter-datespec.c:65
+#: calendar/gui/event-editor.c:428 filter/filter-datespec.c:65
 msgid "day"
 msgstr "dagen"
 
-#: calendar/gui/event-editor.c:559
+#: calendar/gui/event-editor.c:555
 #, fuzzy
 msgid "on the"
 msgstr "Mц╔nad"
 
-#: calendar/gui/event-editor.c:566
+#: calendar/gui/event-editor.c:562
 #, fuzzy
 msgid "th"
 msgstr "4."
 
-#: calendar/gui/event-editor.c:722
+#: calendar/gui/event-editor.c:716
 #, fuzzy
 msgid "occurrences"
 msgstr "gong(ar)"
 
-#: calendar/gui/event-editor.c:839
+#: calendar/gui/event-editor.c:833
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor.c:3079 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
 #, fuzzy
 msgid "%a %b %d %Y"
 msgstr "%1 bit %2 %3"
 
-#: calendar/gui/getdate.y:391
-#, fuzzy
-msgid "january"
-msgstr "Januar"
+#: calendar/gui/gnome-cal.c:676
+#, fuzzy, c-format
+msgid "Could not load the calendar in `%s'"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: calendar/gui/getdate.y:392
-#, fuzzy
-msgid "february"
-msgstr "Februar"
+#: calendar/gui/gnome-cal.c:687
+#, fuzzy, c-format
+msgid "Could not create a calendar in `%s'"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: calendar/gui/getdate.y:393
-#, fuzzy
-msgid "march"
-msgstr "Mars"
+#: calendar/gui/gnome-cal.c:698
+#, fuzzy, c-format
+msgid "The method required to load `%s' is not supported"
+msgstr "Metoden %1 er ikkje stц╦tta."
 
-#: calendar/gui/getdate.y:394
+#.
+#. * 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
 #, fuzzy
-msgid "april"
+msgid "April"
 msgstr "April"
 
-#: calendar/gui/getdate.y:395
-#, fuzzy
-msgid "may"
-msgstr "Mai"
-
-#: calendar/gui/getdate.y:396
+#: calendar/gui/goto-dialog.glade.h:7
 #, fuzzy
-msgid "june"
-msgstr "Juni"
-
-#: calendar/gui/getdate.y:397
-#, fuzzy
-msgid "july"
-msgstr "Juli"
-
-#: calendar/gui/getdate.y:398
-#, fuzzy
-msgid "august"
+msgid "August"
 msgstr "August"
 
-#: calendar/gui/getdate.y:399
-#, fuzzy
-msgid "september"
-msgstr "September"
-
-#: calendar/gui/getdate.y:400
-#, fuzzy
-msgid "sept"
-msgstr "Nullstill"
-
-#: calendar/gui/getdate.y:401
-#, fuzzy
-msgid "october"
-msgstr "Oktober"
-
-#: calendar/gui/getdate.y:402
-#, fuzzy
-msgid "november"
-msgstr "November"
-
-#: calendar/gui/getdate.y:403
+#: calendar/gui/goto-dialog.glade.h:8
 #, fuzzy
-msgid "december"
+msgid "December"
 msgstr "Desember"
 
-#: calendar/gui/getdate.y:404
-#, fuzzy
-msgid "sunday"
-msgstr "Sundag"
-
-#: calendar/gui/getdate.y:405
-#, fuzzy
-msgid "monday"
-msgstr "Mц╔ndag"
-
-#: calendar/gui/getdate.y:406
-#, fuzzy
-msgid "tuesday"
-msgstr "Tysdag"
-
-#: calendar/gui/getdate.y:407
-#, fuzzy
-msgid "tues"
-msgstr "sann"
-
-#: calendar/gui/getdate.y:408
-#, fuzzy
-msgid "wednesday"
-msgstr "Onsdag"
-
-#: calendar/gui/getdate.y:409
-#, fuzzy
-msgid "wednes"
-msgstr "Sverige"
-
-#: calendar/gui/getdate.y:410
-#, fuzzy
-msgid "thursday"
-msgstr "Torsdag"
-
-#: calendar/gui/getdate.y:411
-#, fuzzy
-msgid "thur"
-msgstr "Anna"
-
-#: calendar/gui/getdate.y:412
-#, fuzzy
-msgid "thurs"
-msgstr "Andre"
-
-#: calendar/gui/getdate.y:413
-#, fuzzy
-msgid "friday"
-msgstr "Fredag"
-
-#: calendar/gui/getdate.y:414
-#, fuzzy
-msgid "saturday"
-msgstr "Laurdag"
-
-#: calendar/gui/getdate.y:420 filter/filter-datespec.c:62
-#, fuzzy
-msgid "year"
-msgstr "ц┘r"
-
-#: calendar/gui/getdate.y:421 filter/filter-datespec.c:63
-#, fuzzy
-msgid "month"
-msgstr "Mц╔nad"
-
-#: calendar/gui/getdate.y:422
-#, fuzzy
-msgid "fortnight"
-msgstr "hц╦gre"
-
-#: calendar/gui/getdate.y:423 filter/filter-datespec.c:64
-#, fuzzy
-msgid "week"
-msgstr "Veke"
-
-#: calendar/gui/getdate.y:425 filter/filter-datespec.c:66
-#, fuzzy
-msgid "hour"
-msgstr "time/timar"
-
-#: calendar/gui/getdate.y:426 filter/filter-datespec.c:67
-#, fuzzy
-msgid "minute"
-msgstr "minutt"
-
-#: calendar/gui/getdate.y:427
-#, fuzzy
-msgid "min"
-msgstr " min"
-
-#: calendar/gui/getdate.y:428 filter/filter-datespec.c:68
-#, fuzzy
-msgid "second"
-msgstr "sekund"
-
-#: calendar/gui/getdate.y:429
-#, fuzzy
-msgid "sec"
-msgstr " sek"
-
-#: calendar/gui/getdate.y:435
-#, fuzzy
-msgid "tomorrow"
-msgstr "Comoros"
-
-#: calendar/gui/getdate.y:436
-#, fuzzy
-msgid "yesterday"
-msgstr "kvar dag"
-
-#: calendar/gui/getdate.y:437
-msgid "today"
-msgstr "i dag"
-
-#: calendar/gui/getdate.y:438 filter/filter-datespec.c:533
-#: filter/filter-datespec.c:693
+#: calendar/gui/goto-dialog.glade.h:9
 #, fuzzy
-msgid "now"
-msgstr "nei"
-
-#: calendar/gui/getdate.y:439
-#, fuzzy
-msgid "last"
-msgstr "Etternamn"
-
-#: calendar/gui/getdate.y:440
-#, fuzzy
-msgid "this"
-msgstr "er"
-
-#: calendar/gui/getdate.y:441
-#, fuzzy
-msgid "next"
-msgstr "Neste"
-
-#: calendar/gui/getdate.y:442
-#, fuzzy
-msgid "first"
-msgstr "Fц╦renamn"
-
-#. { N_("second"),		tUNUMBER,	2 },
-#: calendar/gui/getdate.y:444
-#, fuzzy
-msgid "third"
-msgstr "Anna"
+msgid "February"
+msgstr "Februar"
 
-#: calendar/gui/getdate.y:445
+#: calendar/gui/goto-dialog.glade.h:10
 #, fuzzy
-msgid "fourth"
-msgstr "Munnar"
+msgid "Go To Date"
+msgstr "Gц╔ til side"
 
-#: calendar/gui/getdate.y:446
+#: calendar/gui/goto-dialog.glade.h:11
 #, fuzzy
-msgid "fifth"
-msgstr "Shift"
+msgid "Go To Today"
+msgstr "Gц╔ til &i dag"
 
-#: calendar/gui/getdate.y:447
+#: calendar/gui/goto-dialog.glade.h:12
 #, fuzzy
-msgid "sixth"
-msgstr "Hц╦gre"
+msgid "January"
+msgstr "Januar"
 
-#: calendar/gui/getdate.y:448
+#: calendar/gui/goto-dialog.glade.h:13
 #, fuzzy
-msgid "seventh"
-msgstr "partalssider"
+msgid "July"
+msgstr "Juli"
 
-#: calendar/gui/getdate.y:449
+#: calendar/gui/goto-dialog.glade.h:14
 #, fuzzy
-msgid "eighth"
-msgstr "hц╦gd"
+msgid "June"
+msgstr "Juni"
 
-#: calendar/gui/getdate.y:450
+#: calendar/gui/goto-dialog.glade.h:15
 #, fuzzy
-msgid "ninth"
-msgstr "int"
+msgid "March"
+msgstr "Mars"
 
-#: calendar/gui/getdate.y:451
+#: calendar/gui/goto-dialog.glade.h:16
 #, fuzzy
-msgid "tenth"
-msgstr "1 tidel"
+msgid "May"
+msgstr "Mц╔ndag"
 
-#: calendar/gui/getdate.y:452
+#: calendar/gui/goto-dialog.glade.h:17
 #, fuzzy
-msgid "eleventh"
-msgstr "partalssider"
-
-#: calendar/gui/getdate.y:453
-msgid "twelfth"
-msgstr ""
+msgid "November"
+msgstr "November"
 
-#: calendar/gui/getdate.y:454
+#: calendar/gui/goto-dialog.glade.h:18
 #, fuzzy
-msgid "ago"
-msgstr "Tag"
-
-#: calendar/gui/gnome-cal.c:718 calendar/gui/gnome-cal.c:1474
-#: calendar/gui/gnome-cal.c:1530
-msgid "Reminder of your appointment at "
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:1152
-#, fuzzy, c-format
-msgid "Could not load the calendar in `%s'"
-msgstr "Kunne ikkje lasta kalender '%1'.\n"
-
-#: calendar/gui/gnome-cal.c:1163
-#, fuzzy, c-format
-msgid "Could not create a calendar in `%s'"
-msgstr "Kunne ikkje lasta kalender '%1'.\n"
-
-#: calendar/gui/gnome-cal.c:1174
-#, fuzzy, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr "Metoden %1 er ikkje stц╦tta."
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1479 calendar/gui/gnome-cal.c:1534
-#: mail/mail-search-dialogue.c:104
-msgid "Ok"
-msgstr "Ok"
-
-#: calendar/gui/goto.c:82
-msgid "Year:"
-msgstr "ц┘r:"
+msgid "October"
+msgstr "Oktober"
 
-#: calendar/gui/goto.c:270
+#: calendar/gui/goto-dialog.glade.h:19
 #, fuzzy
-msgid "Go to date"
-msgstr "Gц╔ til side"
-
-#. Instructions
-#: calendar/gui/goto.c:281
-msgid ""
-"Please select the date you want to go to.\n"
-"When you click on a day, you will be taken\n"
-"to that date."
-msgstr ""
+msgid "September"
+msgstr "September"
 
-#: calendar/gui/goto.c:318
+#: calendar/gui/main.c:49
 #, fuzzy
-msgid "Go to today"
-msgstr "Gц╔ til &i dag"
+msgid "Could not initialize GNOME"
+msgstr "Kunne ikkje initiere Bonobo"
 
-#: 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
 #, fuzzy
 msgid "Su"
 msgstr "Sum"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 #, fuzzy
 msgid "Mo"
 msgstr "Mц╔n"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 #, fuzzy
 msgid "Tu"
 msgstr "Tys"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 #, fuzzy
 msgid "We"
 msgstr "Ons"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 #, fuzzy
 msgid "Th"
 msgstr "Tor"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 #, fuzzy
 msgid "Fr"
 msgstr "Fre"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 #, fuzzy
 msgid "Sa"
 msgstr "Lau"
 
-#: calendar/gui/print.c:936
+#: calendar/gui/print.c:941
 msgid "Tasks"
 msgstr "Oppgц╔ver"
 
 #. Day
-#: calendar/gui/print.c:1066
+#: calendar/gui/print.c:1071
 msgid "Current day (%a %b %d %Y)"
 msgstr ""
 
-#: 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 ""
 
-#: calendar/gui/print.c:1081
+#: calendar/gui/print.c:1086
 msgid "%a %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1092
+#: calendar/gui/print.c:1097
 #, c-format
 msgid "Current week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1100
+#: calendar/gui/print.c:1105
 #, fuzzy
 msgid "Current month (%b %Y)"
 msgstr "Denne mц╔naden"
 
 #. Year
-#: calendar/gui/print.c:1107
+#: calendar/gui/print.c:1112
 #, fuzzy
 msgid "Current year (%Y)"
 msgstr "Gjeldande: %1"
 
-#: calendar/gui/print.c:1144
+#: calendar/gui/print.c:1149
 #, fuzzy
 msgid "Print Calendar"
 msgstr "Skriv ut alle"
 
-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:962
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1001
 #, fuzzy
 msgid "Print Preview"
 msgstr "&Fц╦rehandsvising ..."
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: calendar/gui/weekday-picker.c:351 widgets/misc/e-calendar-item.c:416
-msgid "MTWTFSS"
-msgstr ""
-
-#: calendar/gui/weekday-picker.c:353 calendar/gui/weekday-picker.c:443
+#: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
 msgid "SMTWTFS"
 msgstr ""
 
@@ -2898,60 +2884,61 @@ msgstr "Kunne ikkje lasta kalender '%1'.\n"
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:182
+#: camel/camel-remote-store.c:191
 #, fuzzy, c-format
 msgid "%s server %s"
 msgstr "Diskusjonsgruppetenarar"
 
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:227
+#: camel/camel-remote-store.c:243
+#: camel/providers/smtp/camel-smtp-transport.c:162
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:228
+#: camel/camel-remote-store.c:244
 msgid "(unknown host)"
 msgstr ""
 
-#: camel/camel-remote-store.c:452
+#: camel/camel-remote-store.c:483
 msgid "Server disconnected."
 msgstr ""
 
-#: camel/camel-service.c:120
+#: camel/camel-service.c:138
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:129
+#: camel/camel-service.c:147
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:138
+#: camel/camel-service.c:156
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:488
+#: camel/camel-service.c:526
 #, c-format
 msgid "No such host %s."
 msgstr ""
 
-#: camel/camel-service.c:491
+#: camel/camel-service.c:529
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr ""
 
-#: camel/camel-session.c:272
+#: camel/camel-session.c:297
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:360
+#: camel/camel-session.c:388
 #, fuzzy, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2975,51 +2962,51 @@ msgstr ""
 msgid "Port number in URL `%s' is non-numeric"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-auth.c:127
+#: camel/providers/imap/camel-imap-auth.c:133
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
 "%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-auth.c:198
+#: camel/providers/imap/camel-imap-auth.c:205
 msgid "Bad authentication response from server."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:216
+#: camel/providers/imap/camel-imap-command.c:231
 #, fuzzy, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Slett e-post frц╔ tenaren"
 
-#: camel/providers/imap/camel-imap-command.c:224
+#: camel/providers/imap/camel-imap-command.c:239
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:240 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "Ukjend feil"
 
-#: camel/providers/imap/camel-imap-command.c:271
+#: camel/providers/imap/camel-imap-command.c:286
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:407
+#: camel/providers/imap/camel-imap-command.c:422
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:443
+#: camel/providers/imap/camel-imap-command.c:458
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:216
+#: camel/providers/imap/camel-imap-folder.c:196
 #, fuzzy, c-format
 msgid "Could not load summary for %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/imap/camel-imap-folder.c:586
+#: camel/providers/imap/camel-imap-folder.c:532
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -3031,31 +3018,25 @@ msgstr ""
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:234
-#: 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:236
+#: camel/providers/imap/camel-imap-store.c:248
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:245
+#: camel/providers/imap/camel-imap-store.c:257
 msgid "Kerberos 4"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:247
+#: camel/providers/imap/camel-imap-store.c:259
 msgid ""
 "This option will connect to the IMAP server using Kerberos 4 authentication."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:333
+#: camel/providers/imap/camel-imap-store.c:345
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:359
+#: camel/providers/imap/camel-imap-store.c:373
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3063,7 +3044,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:539
+#: camel/providers/imap/camel-imap-store.c:564
 #, fuzzy, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
@@ -3158,12 +3139,12 @@ msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Mottek meldingar frц╔ %1"
 
 #: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:204
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-maildir-folder.c:207
+#: camel/providers/local/camel-maildir-folder.c:215
+#: camel/providers/local/camel-mbox-folder.c:317
 #: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:189
-#: camel/providers/local/camel-mh-folder.c:197
+#: camel/providers/local/camel-mh-folder.c:192
+#: camel/providers/local/camel-mh-folder.c:200
 #, fuzzy, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -3171,14 +3152,14 @@ msgid ""
 msgstr "Kan ikkje setja blokkstorleik for band."
 
 #: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-mbox-folder.c:317
 #: camel/providers/local/camel-mh-folder.c:183
 #, fuzzy
 msgid "No such message"
 msgstr "Vidaresendt melding"
 
-#: camel/providers/local/camel-maildir-folder.c:213
-#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-maildir-folder.c:216
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "Invalid message contents"
 msgstr ""
 
@@ -3224,7 +3205,7 @@ msgstr "Kunne ikkje lasta kalender '%1'.\n"
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:195
+#: camel/providers/local/camel-mbox-folder.c:201
 #, fuzzy, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
@@ -3232,25 +3213,25 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: camel/providers/local/camel-mbox-folder.c:251
+#: camel/providers/local/camel-mbox-folder.c:257
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:327
-#: camel/providers/local/camel-mbox-folder.c:357
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:333
+#: camel/providers/local/camel-mbox-folder.c:365
+#: camel/providers/local/camel-mbox-folder.c:378
 #, fuzzy, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 msgstr "Mottek meldingar frц╔ %1"
 
-#: camel/providers/local/camel-mbox-folder.c:358
+#: camel/providers/local/camel-mbox-folder.c:366
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:369
+#: camel/providers/local/camel-mbox-folder.c:379
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -3300,18 +3281,18 @@ msgstr ""
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:341
+#: camel/providers/local/camel-mbox-summary.c:343
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:475
-#: camel/providers/local/camel-mbox-summary.c:661
+#: camel/providers/local/camel-mbox-summary.c:477
+#: camel/providers/local/camel-mbox-summary.c:668
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:491
+#: camel/providers/local/camel-mbox-summary.c:493
 #, fuzzy, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
@@ -3319,40 +3300,40 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: camel/providers/local/camel-mbox-summary.c:512
-#: camel/providers/local/camel-mbox-summary.c:520
-#: camel/providers/local/camel-mbox-summary.c:691
-#: camel/providers/local/camel-mbox-summary.c:699
+#: camel/providers/local/camel-mbox-summary.c:514
+#: camel/providers/local/camel-mbox-summary.c:522
+#: camel/providers/local/camel-mbox-summary.c:701
+#: camel/providers/local/camel-mbox-summary.c:709
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:562
+#: camel/providers/local/camel-mbox-summary.c:565
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:579
+#: camel/providers/local/camel-mbox-summary.c:582
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:595
-#: camel/providers/local/camel-mbox-summary.c:748
+#: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-mbox-summary.c:759
 #, fuzzy, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/local/camel-mbox-summary.c:604
+#: camel/providers/local/camel-mbox-summary.c:609
 #, fuzzy, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/local/camel-mbox-summary.c:615
+#: camel/providers/local/camel-mbox-summary.c:620
 #, fuzzy, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/local/camel-mbox-summary.c:817
+#: camel/providers/local/camel-mbox-summary.c:830
 #, fuzzy, c-format
 msgid "Unknown error: %s"
 msgstr "Ukjend feil"
@@ -3385,7 +3366,7 @@ msgstr ""
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:144
+#: camel/providers/nntp/camel-nntp-folder.c:115
 #, fuzzy, c-format
 msgid "Message %s not found."
 msgstr "Fann ikkje fil"
@@ -3436,16 +3417,16 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:179
+#: camel/providers/pop3/camel-pop3-folder.c:180
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:273
+#: camel/providers/pop3/camel-pop3-folder.c:274
 #, fuzzy, c-format
 msgid "No message with uid %s"
 msgstr "Lag meldingar og slц╔ saman"
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:288
 #, fuzzy, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Slett e-post frц╔ tenaren"
@@ -3483,48 +3464,49 @@ msgstr ""
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Kunne ikkje starta underprosess."
 
-#: camel/providers/pop3/camel-pop3-store.c:335
+#: camel/providers/pop3/camel-pop3-store.c:337
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: camel/providers/pop3/camel-pop3-store.c:389
+#: camel/providers/pop3/camel-pop3-store.c:391
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:408
+#: camel/providers/pop3/camel-pop3-store.c:410
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending username: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:411
-#: camel/providers/pop3/camel-pop3-store.c:448
+#: camel/providers/pop3/camel-pop3-store.c:413
+#: camel/providers/pop3/camel-pop3-store.c:450
 #, fuzzy
 msgid "(Unknown)"
 msgstr "Ukjend"
 
-#: camel/providers/pop3/camel-pop3-store.c:438
+#: camel/providers/pop3/camel-pop3-store.c:440
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:446
+#: camel/providers/pop3/camel-pop3-store.c:448
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:555
+#: camel/providers/pop3/camel-pop3-store.c:557
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
+#: mail/mail-config-druid.glade.h:63
 #, fuzzy
 msgid "Sendmail"
 msgstr "Send"
@@ -3573,8 +3555,133 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
+#: 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
+#, c-format
+msgid "Welcome response error: %s: possibly non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:281
+#, fuzzy
+msgid "No authentication required"
+msgstr "Autentisering:"
+
+#: camel/providers/smtp/camel-smtp-transport.c:283
+msgid ""
+"This option will connect to the SMTP server without using any kind of "
+"authentication. This should be fine for connecting to most SMTP servers."
+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 ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:294
+msgid ""
+"This option will connect to the SMTP server using CRAM-MD5 authentication."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:332
+#, fuzzy, c-format
+msgid "SMTP server %s"
+msgstr "Diskusjonsgruppetenarar"
+
+#: camel/providers/smtp/camel-smtp-transport.c:334
+#, c-format
+msgid "SMTP mail delivery via %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:359
+msgid "Cannot send message: sender address not defined."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:366
+msgid "Cannot send message: sender address not valid."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:380
+msgid "Cannot send message: no recipients defined."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:474
+#, c-format
+msgid "HELO request timed out: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:490
+#, c-format
+msgid "HELO response error: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:529
+#, c-format
+msgid "MAIL FROM request timed out: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:545
+#, c-format
+msgid "MAIL FROM response error: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:570
+#, fuzzy, c-format
+msgid "RCPT TO request timed out: %s: mail not sent"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
+#, fuzzy, c-format
+msgid "RCPT TO response error: %s: mail not sent"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
+
+#: camel/providers/smtp/camel-smtp-transport.c:617
+#, fuzzy, c-format
+msgid "DATA request timed out: %s: mail not sent"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
+
+#: camel/providers/smtp/camel-smtp-transport.c:633
+#, c-format
+msgid "DATA response error: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:648
+#: camel/providers/smtp/camel-smtp-transport.c:666
+#, c-format
+msgid "DATA send timed out: message termination: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:682
+#, c-format
+msgid "DATA response error: message termination: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:706
+#, c-format
+msgid "RSET request timed out: %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:722
+#, fuzzy, c-format
+msgid "RSET response error: %s"
+msgstr "Ukjend feil"
+
+#: camel/providers/smtp/camel-smtp-transport.c:745
+#, c-format
+msgid "QUIT request timed out: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#, c-format
+msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
 #: camel/providers/vee/camel-vee-provider.c:30
@@ -3611,108 +3718,108 @@ msgid "%.1fG"
 msgstr "%1 GB"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:144
+#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:155
 #, fuzzy
 msgid "attachment"
 msgstr "Vedlegg"
 
-#: composer/e-msg-composer-attachment-bar.c:417
-#: po/tmp/evolution-message-composer.xml.h:7
+#: composer/e-msg-composer-attachment-bar.c:413
+#: ui/evolution-message-composer.xml.h:7
 #, fuzzy
 msgid "Attach a file"
 msgstr "Legg ved fil"
 
-#: composer/e-msg-composer-attachment-bar.c:464 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 "Fjern"
 
-#: composer/e-msg-composer-attachment-bar.c:465
+#: composer/e-msg-composer-attachment-bar.c:461
 #, fuzzy
 msgid "Remove selected items from the attachment list"
 msgstr "Fjern det valte programmet frц╔ lista"
 
-#: composer/e-msg-composer-attachment-bar.c:496
+#: composer/e-msg-composer-attachment-bar.c:492
 #, fuzzy
 msgid "Add attachment..."
 msgstr "Vedlegg"
 
-#: composer/e-msg-composer-attachment-bar.c:497
+#: composer/e-msg-composer-attachment-bar.c:493
 #, fuzzy
 msgid "Attach a file to the message"
 msgstr "Kunne ikkje lagra melding(ar)."
 
 #.
-#. * 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
 #, fuzzy
 msgid "Attachment properties"
 msgstr "Vedleggseigenskapar"
 
-#: po/tmp/e-msg-composer-attachment.glade.h:8
+#: composer/e-msg-composer-attachment.glade.h:8
 msgid "File name:"
 msgstr "Filnamn:"
 
-#: po/tmp/e-msg-composer-attachment.glade.h:9
+#: composer/e-msg-composer-attachment.glade.h:9
 #, fuzzy
 msgid "MIME type:"
 msgstr "MIME-type"
 
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:290
-#: mail/mail-format.c:621
+#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:303
+#: mail/mail-format.c:626
 msgid "From:"
 msgstr "Frц╔:"
 
-#: composer/e-msg-composer-hdrs.c:238
+#: composer/e-msg-composer-hdrs.c:247
 #, fuzzy
 msgid "Click here for the address book"
 msgstr "Legg adresse til adresseboka"
 
-#: composer/e-msg-composer-hdrs.c:291
+#: composer/e-msg-composer-hdrs.c:304
 msgid "Enter the identity you wish to send this message from"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:295 mail/mail-format.c:625
+#: composer/e-msg-composer-hdrs.c:308 mail/mail-format.c:630
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:296
+#: composer/e-msg-composer-hdrs.c:309
 #, fuzzy
 msgid "Enter the recipients of the message"
 msgstr "Oppgi eit nytt namn pц╔ meldinga."
 
-#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:627
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:632
 #, fuzzy
 msgid "Cc:"
 msgstr "&CC:"
 
-#: composer/e-msg-composer-hdrs.c:301
+#: 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:306
+#: composer/e-msg-composer-hdrs.c:319
 #, fuzzy
 msgid "Bcc:"
 msgstr "&Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:307
+#: 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."
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:629
+#: composer/e-msg-composer-hdrs.c:326 mail/mail-format.c:634
 msgid "Subject:"
 msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:327
 #, fuzzy
 msgid "Enter the subject of the mail"
 msgstr "Oppgi typen til medlemsvariabelen her."
 
-#: composer/e-msg-composer.c:429
+#: composer/e-msg-composer.c:430
 #, fuzzy, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -3722,45 +3829,45 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: composer/e-msg-composer.c:599
+#: composer/e-msg-composer.c:600
 msgid "Save as..."
 msgstr "Lagra som ..."
 
-#: composer/e-msg-composer.c:610
+#: composer/e-msg-composer.c:611
 #, fuzzy, c-format
 msgid "Error saving file: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:630
+#: composer/e-msg-composer.c:631
 #, fuzzy, c-format
 msgid "Error loading file: %s"
 msgstr ""
 "Feil ved nedlasting av fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:652
+#: composer/e-msg-composer.c:653
 #, fuzzy
 msgid "Saving changes to message..."
 msgstr "Lagrar alle endra filer ..."
 
-#: composer/e-msg-composer.c:654
+#: composer/e-msg-composer.c:655
 #, fuzzy
 msgid "Save changes to message..."
 msgstr "Lagrar alle endra filer ..."
 
-#: composer/e-msg-composer.c:695
+#: composer/e-msg-composer.c:696
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:739 shell/e-shell-view-menu.c:170
+#: composer/e-msg-composer.c:741 shell/e-shell-view-menu.c:167
 #, fuzzy
 msgid "Evolution"
 msgstr "Opplц╦ysing"
 
-#: composer/e-msg-composer.c:745
+#: composer/e-msg-composer.c:747
 #, fuzzy
 msgid ""
 "This message has not been sent.\n"
@@ -3770,47 +3877,47 @@ msgstr ""
 "Dette er siste trekk.\n"
 "Vil du leggja til fleire trekk?"
 
-#: composer/e-msg-composer.c:767
+#: composer/e-msg-composer.c:772
 msgid "Open file"
 msgstr "Opna fil"
 
-#: composer/e-msg-composer.c:893
+#: composer/e-msg-composer.c:898
 #, fuzzy
 msgid "That file does not exist."
 msgstr "Fila finst ikkje\n"
 
-#: composer/e-msg-composer.c:903
+#: composer/e-msg-composer.c:908
 #, fuzzy
 msgid "That is not a regular file."
 msgstr "er ei vanleg fil"
 
-#: composer/e-msg-composer.c:913
+#: composer/e-msg-composer.c:918
 #, fuzzy
 msgid "That file exists but is not readable."
 msgstr "%1 finst, men er inga vanleg fil"
 
-#: composer/e-msg-composer.c:923
+#: composer/e-msg-composer.c:928
 msgid "That file appeared accesible but open(2) failed."
 msgstr ""
 
-#: composer/e-msg-composer.c:945
+#: composer/e-msg-composer.c:950
 #, fuzzy
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
 msgstr "Det finst ulagra endringar. Er du sikker pц╔ at du vil avslutta?"
 
-#: composer/e-msg-composer.c:966
+#: composer/e-msg-composer.c:971
 #, fuzzy
 msgid "An error occurred while reading the file."
 msgstr "Feil ved opning av fil."
 
-#: composer/e-msg-composer.c:1343
+#: composer/e-msg-composer.c:1350
 #, fuzzy
 msgid "Compose a message"
 msgstr "Lukk melding"
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1427
 #, fuzzy
 msgid "Could not create composer window."
 msgstr "Kan ikkje laga nytt vindauge.\n"
@@ -3827,16 +3934,31 @@ msgstr "Sц╦k"
 
 #: filter/filter-datespec.c:62
 #, fuzzy
+msgid "year"
+msgstr "ц┘r"
+
+#: filter/filter-datespec.c:62
+#, fuzzy
 msgid "years"
 msgstr "ц╔r"
 
 #: filter/filter-datespec.c:63
 #, fuzzy
+msgid "month"
+msgstr "Mц╔nad"
+
+#: filter/filter-datespec.c:63
+#, fuzzy
 msgid "months"
 msgstr "mц╔nad(er)"
 
 #: filter/filter-datespec.c:64
 #, fuzzy
+msgid "week"
+msgstr "Veke"
+
+#: filter/filter-datespec.c:64
+#, fuzzy
 msgid "weeks"
 msgstr "Veke"
 
@@ -3847,14 +3969,29 @@ msgstr " dag"
 
 #: filter/filter-datespec.c:66
 #, fuzzy
+msgid "hour"
+msgstr "time/timar"
+
+#: filter/filter-datespec.c:66
+#, fuzzy
 msgid "hours"
 msgstr "time/timar"
 
 #: filter/filter-datespec.c:67
+#, fuzzy
+msgid "minute"
+msgstr "minutt"
+
+#: filter/filter-datespec.c:67
 msgid "minutes"
 msgstr "minutt"
 
 #: filter/filter-datespec.c:68
+#, fuzzy
+msgid "second"
+msgstr "sekund"
+
+#: filter/filter-datespec.c:68
 msgid "seconds"
 msgstr "sekund"
 
@@ -3907,6 +4044,11 @@ msgstr "Vis hendingane for denne dagen"
 msgid "Compare against"
 msgstr "Kompilatorц╔tvaringar"
 
+#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
+#, fuzzy
+msgid "now"
+msgstr "nei"
+
 #: filter/filter-datespec.c:690
 #, fuzzy
 msgid "<click here to select a date>"
@@ -3932,7 +4074,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
 #, fuzzy
 msgid "Edit Filters"
 msgstr "Rediger fil"
@@ -3973,7 +4115,7 @@ msgstr ""
 msgid "<click here to select a folder>"
 msgstr "Trykk for ц╔ velja ein skrifttype"
 
-#: filter/filter-input.c:184
+#: filter/filter-input.c:185
 #, fuzzy, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -3982,266 +4124,277 @@ msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: filter/filter-message-search.c:379 filter/filter-message-search.c:447
+#: filter/filter-message-search.c:380 filter/filter-message-search.c:448
 #, c-format
 msgid "Failed to perform regex search on message header: %s"
 msgstr ""
 
-#: filter/filter-part.c:456
+#: filter/filter-part.c:467
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:520
+#: filter/filter-rule.c:530
 #, fuzzy
 msgid "Rule name: "
 msgstr "Filnamn:"
 
-#: filter/filter-rule.c:524
+#: filter/filter-rule.c:534
 #, fuzzy
 msgid "Untitled"
 msgstr "Utan tittel"
 
-#: filter/filter-rule.c:540
+#: filter/filter-rule.c:550
 #, fuzzy
 msgid "If"
 msgstr "I"
 
-#: filter/filter-rule.c:557
+#: filter/filter-rule.c:567
 #, fuzzy
 msgid "Execute actions"
 msgstr "Kц╦yr autorun.sh"
 
-#: filter/filter-rule.c:561
+#: filter/filter-rule.c:571
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:566
+#: filter/filter-rule.c:576
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:577
+#: filter/filter-rule.c:587
 #, fuzzy
 msgid "Add criterion"
 msgstr "Legg til kriterium"
 
-#: filter/filter-rule.c:583
+#: filter/filter-rule.c:593
 #, fuzzy
 msgid "Remove criterion"
 msgstr "Fjern element"
 
-#: mail/folder-browser.c:465 po/tmp/filter.glade.h:8
-#: po/tmp/mail-config.glade.h:9
-msgid "Edit"
-msgstr "Rediger"
+#: filter/filter-system-flag.c:63
+#, fuzzy
+msgid "Replied to"
+msgstr "Svar til alle:"
+
+#. { _("Deleted"), "Deleted" },
+#. { _("Draft"), "Draft" },
+#: filter/filter-system-flag.c:66
+msgid "Important"
+msgstr ""
+
+#: filter/filter-system-flag.c:67
+#, fuzzy
+msgid "Read"
+msgstr "Tilfeldig"
 
-#: po/tmp/filter.glade.h:10
+#: filter/filter.glade.h:10
 #, fuzzy
 msgid "Edit VFolders"
 msgstr "Rediger filterreglar"
 
-#: po/tmp/filter.glade.h:11
+#: filter/filter.glade.h:11
 #, fuzzy
 msgid "Filter Rules"
 msgstr "Filter-reglar"
 
-#: 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
 #, fuzzy
 msgid "Outgoing"
 msgstr "Oversikt"
 
-#: po/tmp/filter.glade.h:15
+#: filter/filter.glade.h:15
 #, fuzzy
 msgid "Virtual Folders"
 msgstr "Mapper"
 
-#: po/tmp/filter.glade.h:16
+#: filter/filter.glade.h:16
 #, fuzzy
 msgid "vFolder Sources"
 msgstr "Kjelder"
 
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
+#, fuzzy
+msgid "after"
+msgstr "Slutt etter"
+
+#: 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
+#, fuzzy
+msgid "contains"
+msgstr "Handlingar"
+
+#: filter/libfilter-i18n.h:7
 #, fuzzy
 msgid "Copy to Folder"
 msgstr "Kopier til mappe"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:8
 #, fuzzy
 msgid "Date received"
 msgstr "Motta"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:9
 #, fuzzy
 msgid "Date sent"
 msgstr "Dato"
 
-#: filter/libfilter-i18n.h:8
-#, fuzzy
-msgid "Expression"
-msgstr "&Yrke:"
-
-#: filter/libfilter-i18n.h:9
-#, fuzzy
-msgid "Forward to Address"
-msgstr "Vidaresendt melding"
-
-#: filter/libfilter-i18n.h:10
-#, fuzzy
-msgid "Message Body"
-msgstr "Flytta alle meldingar til papirkorga"
-
 #: filter/libfilter-i18n.h:11
-#, fuzzy
-msgid "Message Header"
-msgstr "Melding motteken"
+msgid "does not contain"
+msgstr ""
 
 #: filter/libfilter-i18n.h:12
-#, fuzzy
-msgid "Message was received"
-msgstr "Melding motteken"
+msgid "does not end with"
+msgstr ""
 
 #: filter/libfilter-i18n.h:13
 #, fuzzy
-msgid "Message was sent"
-msgstr "Lag meldingar og slц╔ saman"
+msgid "does not exist"
+msgstr "Fila finst ikkje\n"
 
 #: filter/libfilter-i18n.h:14
 #, fuzzy
-msgid "Move to Folder"
-msgstr "Flytt til mappe"
+msgid "does not sound like"
+msgstr "Fann ikkje fil"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:15
 #, fuzzy
-msgid "Recipients"
-msgstr "Nyleg brukte fargar"
+msgid "does not start with"
+msgstr "Kunne ikkje starta %1."
 
-#: filter/libfilter-i18n.h:17
-msgid "Regex Match"
+#: filter/libfilter-i18n.h:16
+msgid "ends with"
 msgstr ""
 
+#: filter/libfilter-i18n.h:17
+#, fuzzy
+msgid "exists"
+msgstr "Neste"
+
 #: filter/libfilter-i18n.h:18
 #, fuzzy
-msgid "Sender"
-msgstr "Send"
+msgid "Expression"
+msgstr "&Yrke:"
 
 #: filter/libfilter-i18n.h:19
 #, fuzzy
-msgid "Set Status"
-msgstr "Status:"
+msgid "Forward to Address"
+msgstr "Vidaresendt melding"
 
 #: filter/libfilter-i18n.h:20
 #, fuzzy
-msgid "Source"
-msgstr "Kjelder"
+msgid "is"
+msgstr "er"
 
 #: filter/libfilter-i18n.h:21
-msgid "Specific header"
+msgid "is greater than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:22
-#, fuzzy
-msgid "Status"
-msgstr "Status:"
+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 "Emne"
+#, fuzzy
+msgid "Message Body"
+msgstr "Flytta alle meldingar til papirkorga"
 
 #: filter/libfilter-i18n.h:25
 #, fuzzy
-msgid "after"
-msgstr "Slutt etter"
+msgid "Message Header"
+msgstr "Melding motteken"
 
 #: filter/libfilter-i18n.h:26
-msgid "before"
-msgstr ""
+#, fuzzy
+msgid "Message was received"
+msgstr "Melding motteken"
 
 #: filter/libfilter-i18n.h:27
 #, fuzzy
-msgid "contains"
-msgstr "Handlingar"
+msgid "Message was sent"
+msgstr "Lag meldingar og slц╔ saman"
 
 #: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr ""
+#, fuzzy
+msgid "Move to Folder"
+msgstr "Flytt til mappe"
 
 #: filter/libfilter-i18n.h:29
-msgid "does not end with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:30
 #, fuzzy
-msgid "does not exist"
-msgstr "Fila finst ikkje\n"
+msgid "on or after"
+msgstr "Slutt etter"
 
-#: filter/libfilter-i18n.h:31
-#, fuzzy
-msgid "does not sound like"
-msgstr "Fann ikkje fil"
+#: filter/libfilter-i18n.h:30
+msgid "on or before"
+msgstr ""
 
 #: filter/libfilter-i18n.h:32
 #, fuzzy
-msgid "does not start with"
-msgstr "Kunne ikkje starta %1."
+msgid "Recipients"
+msgstr "Nyleg brukte fargar"
 
 #: filter/libfilter-i18n.h:33
-msgid "ends with"
+msgid "Regex Match"
 msgstr ""
 
 #: filter/libfilter-i18n.h:34
 #, fuzzy
-msgid "exists"
-msgstr "Neste"
+msgid "Sender"
+msgstr "Send"
 
 #: filter/libfilter-i18n.h:35
-msgid "is greater than"
-msgstr ""
+#, fuzzy
+msgid "Set Status"
+msgstr "Status:"
 
 #: filter/libfilter-i18n.h:36
-msgid "is less than"
+msgid "sounds like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:37
-msgid "is not"
-msgstr ""
+#, fuzzy
+msgid "Source"
+msgstr "Kjelder"
 
 #: filter/libfilter-i18n.h:38
-#, fuzzy
-msgid "is"
-msgstr "er"
+msgid "Specific header"
+msgstr ""
 
 #: filter/libfilter-i18n.h:39
-#, fuzzy
-msgid "on or after"
-msgstr "Slutt etter"
+msgid "starts with"
+msgstr ""
 
 #: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr ""
+#, fuzzy
+msgid "Status"
+msgstr "Status:"
 
 #: filter/libfilter-i18n.h:41
-msgid "sounds like"
+msgid "Stop Processing"
 msgstr ""
 
 #: filter/libfilter-i18n.h:42
-msgid "starts with"
-msgstr ""
+msgid "Subject"
+msgstr "Emne"
 
 #: filter/libfilter-i18n.h:43
 #, fuzzy
@@ -4276,153 +4429,234 @@ msgstr "Rediger filterreglar"
 msgid "Edit VFolder Rule"
 msgstr "Rediger filterreglar"
 
-#: mail/component-factory.c:227
+#: mail/component-factory.c:277
 #, fuzzy
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan ikkje initialisera lokale variablar"
 
-#: mail/component-factory.c:266
+#: 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:16
+#: mail/folder-browser.c:223 ui/evolution-event-editor.xml.h:88
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "Lagra"
 
-#: 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
 #, fuzzy
 msgid "Subject contains"
 msgstr "Emne"
 
-#: 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:453
+#: mail/folder-browser.c:643
 #, fuzzy
 msgid "VFolder on Subject"
 msgstr "Ingen emne"
 
-#: mail/folder-browser.c:454
+#: mail/folder-browser.c:644
 #, fuzzy
 msgid "VFolder on Sender"
 msgstr "Mappenamn:"
 
-#: mail/folder-browser.c:455
+#: mail/folder-browser.c:645
 #, fuzzy
 msgid "VFolder on Recipients"
 msgstr "Mappa finst: "
 
-#: mail/folder-browser.c:457
+#: mail/folder-browser.c:647
 #, fuzzy
 msgid "Filter on Subject"
 msgstr "Ingen emne"
 
-#: mail/folder-browser.c:458
+#: mail/folder-browser.c:648
 #, fuzzy
 msgid "Filter on Sender"
 msgstr "Fil under:"
 
-#: mail/folder-browser.c:459
+#: mail/folder-browser.c:649
 #, fuzzy
 msgid "Filter on Recipients"
 msgstr "Skriv ut filer"
 
-#: mail/folder-browser.c:460 mail/folder-browser.c:544
+#: mail/folder-browser.c:650 mail/folder-browser.c:779
 #, fuzzy
 msgid "Filter on Mailing List"
 msgstr "Fil alt i liste"
 
-#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:14
+#: mail/folder-browser.c:655
+msgid "Show all hidden"
+msgstr ""
+
+#: mail/folder-browser.c:657
+msgid "Hide selected"
+msgstr ""
+
+#. could use another mask, but not enough api do to it
+#: mail/folder-browser.c:660
+#, fuzzy
+msgid "Hide read"
+msgstr "Skjul"
+
+#: mail/folder-browser.c:661
+#, fuzzy
+msgid "Hide deleted"
+msgstr "Slett"
+
+#: mail/folder-browser.c:663 mail/folder-browser.c:790
+#, fuzzy
+msgid "Hide Subject"
+msgstr "Emne"
+
+#: mail/folder-browser.c:665 mail/folder-browser.c:796
+#, fuzzy
+msgid "Hide from Sender"
+msgstr "Fil under:"
+
+#: mail/folder-browser.c:670 ui/evolution-message-composer.xml.h:15
 #, fuzzy
 msgid "Open"
 msgstr "Opna ..."
 
-#: mail/folder-browser.c:466
+#: mail/folder-browser.c:672
 #, fuzzy
 msgid "Save As..."
 msgstr "Lagra som ..."
 
-#: mail/folder-browser.c:467 mail/mail-view.c:163
-#: po/tmp/evolution-addressbook.xml.h:13 po/tmp/evolution-calendar.xml.h:23
-#: po/tmp/evolution-mail.xml.h:28
+#: 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 "Skriv ut"
 
-#: mail/folder-browser.c:469
+#: mail/folder-browser.c:675
 #, fuzzy
 msgid "Reply to Sender"
 msgstr "Svar til avsendar:"
 
-#: mail/folder-browser.c:470 mail/mail-view.c:156
-#: po/tmp/evolution-mail.xml.h:34
+#: mail/folder-browser.c:676 mail/mail-view.c:141 ui/evolution-mail.xml.h:38
 #, fuzzy
 msgid "Reply to All"
 msgstr "Svar til alle:"
 
-#: mail/folder-browser.c:471 mail/mail-view.c:159
-#: 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 "Fram"
 
-#: mail/folder-browser.c:472 po/tmp/evolution-mail.xml.h:18
+#: mail/folder-browser.c:678 ui/evolution-mail.xml.h:18
 #, fuzzy
 msgid "Forward inline"
 msgstr "Fram"
 
-#: mail/folder-browser.c:474
+#: mail/folder-browser.c:680
 #, fuzzy
 msgid "Mark as Read"
 msgstr "Mar&ker som ulesen"
 
-#: mail/folder-browser.c:475
+#: mail/folder-browser.c:681
 #, fuzzy
 msgid "Mark as Unread"
 msgstr "Mar&ker som ulesen"
 
-#: mail/folder-browser.c:477
+#: mail/folder-browser.c:683
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "Flytt til mappe"
 
-#: mail/folder-browser.c:478
+#: mail/folder-browser.c:684
 #, fuzzy
 msgid "Copy to Folder..."
 msgstr "Flytt til mappe"
 
-#: mail/folder-browser.c:480
+#: mail/folder-browser.c:686
 #, fuzzy
 msgid "Undelete"
 msgstr "Slett"
 
 #. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
 #. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:484
+#: mail/folder-browser.c:690
 msgid "Apply Filters"
 msgstr ""
 
-#: mail/folder-browser.c:486 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:546
+#: mail/folder-browser.c:693 ui/evolution-mail.xml.h:21
+#, fuzzy
+msgid "Hide Messages"
+msgstr "Lagra melding"
+
+#: mail/folder-browser.c:781
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
+#: mail/folder-browser.c:787
+#, fuzzy, c-format
+msgid "Hide Subject \"%s\""
+msgstr "Emne"
+
+#: 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 "Kunne ikkje starta %1."
+
+#: mail/local-config.glade.h:7
+#, fuzzy
+msgid "Mailbox Format"
+msgstr "Format"
+
+#: mail/local-config.glade.h:8
+#, fuzzy
+msgid "New store format:"
+msgstr "&Ny type"
+
+#: 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
+#, fuzzy
+msgid "mh"
+msgstr "ms"
+
 #: mail/mail-autofilter.c:71
 #, fuzzy, c-format
 msgid "Mail to %s"
@@ -4475,106 +4709,340 @@ msgstr ""
 msgid "You have no Outbox configured"
 msgstr ""
 
-#: mail/mail-callbacks.c:246
+#: mail/mail-callbacks.c:244
 #, fuzzy
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr "Meldinga har ingen sendar"
 
-#: 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
+#, fuzzy
+msgid "Forwarded message:\n"
+msgstr "Vidaresendt melding frц╔ %1"
+
+#: mail/mail-callbacks.c:611
 #, fuzzy
 msgid "Move message(s) to"
 msgstr "Flytta alle meldingar til papirkorga"
 
-#: mail/mail-callbacks.c:554
+#: mail/mail-callbacks.c:613
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "&Kopier bileteplassering"
 
-#: mail/mail-callbacks.c:665
+#: mail/mail-callbacks.c:748
 #, fuzzy
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr "Vil du lagra denne artikkelen i Kladd-mappa?"
 
-#: mail/mail-callbacks.c:699 mail/mail-display.c:72
+#: mail/mail-callbacks.c:781 mail/mail-display.c:79
 #, fuzzy
 msgid "Overwrite file?"
 msgstr "Overskriv filer"
 
-#: mail/mail-callbacks.c:703 mail/mail-display.c:76
+#: mail/mail-callbacks.c:785 mail/mail-display.c:83
 #, fuzzy
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr "Ei fil med det namnet finst alt. Vil du skriva over den?"
 
-#: mail/mail-callbacks.c:748
+#: mail/mail-callbacks.c:830
 #, fuzzy
 msgid "Save Message As..."
 msgstr "Lagra melding"
 
-#: mail/mail-callbacks.c:750
+#: mail/mail-callbacks.c:832
 #, fuzzy
 msgid "Save Messages As..."
 msgstr "Lagra melding"
 
-#: mail/mail-callbacks.c:877
+#: mail/mail-callbacks.c:916
 #, fuzzy, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr "Les filinformasjon"
 
-#: mail/mail-callbacks.c:922
+#: mail/mail-callbacks.c:961
 #, fuzzy
 msgid "Print Message"
 msgstr "Private meldingar"
 
-#: mail/mail-callbacks.c:969
+#: mail/mail-callbacks.c:1008
 #, fuzzy
 msgid "Printing of message failed"
 msgstr "Feil ved skriving av band-ID."
 
 #.
-#. * 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 "Informasjon"
+
+#: mail/mail-config-druid.glade.h:8
+msgid "Account Management"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:9
+#, fuzzy
+msgid "Account Properties"
+msgstr "Vedleggseigenskapar"
+
+#: mail/mail-config-druid.glade.h:11
+#, fuzzy
+msgid "Advanced"
+msgstr "Legg til ..."
+
+#: mail/mail-config-druid.glade.h:12
+#, fuzzy
+msgid "Authentication"
+msgstr "Autentisering:"
+
+#: mail/mail-config-druid.glade.h:13
+#, fuzzy
+msgid "Authentication Type:"
+msgstr "Autentisering:"
+
+#: 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 "Standard"
+
+#: mail/mail-config-druid.glade.h:26
+#, fuzzy
+msgid "Delete mail from server"
+msgstr "Slett e-post frц╔ tenaren"
+
+#: mail/mail-config-druid.glade.h:27
+#, fuzzy
+msgid "Done"
+msgstr "Ingen"
+
+#: mail/mail-config-druid.glade.h:28
+#, fuzzy
+msgid "E-Mail Address:"
+msgstr "E-post-adresse:"
+
+#: mail/mail-config-druid.glade.h:30
+#, fuzzy
+msgid "Email Address:"
+msgstr "E-post-adresse:"
+
+#: mail/mail-config-druid.glade.h:31
+#, fuzzy
+msgid "Evolution Mail Configuration"
+msgstr "Oppsett"
+
+#: mail/mail-config-druid.glade.h:32
+#, fuzzy
+msgid "Full Name:"
+msgstr "Fullt namn"
+
+#: mail/mail-config-druid.glade.h:35
+#, fuzzy
+msgid "Hostname:"
+msgstr "Brukarnamn:"
+
+#: mail/mail-config-druid.glade.h:36
+msgid "IMAP"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:37
 msgid "Identity"
 msgstr "Identitet"
 
-#: 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
+msgid "Kerberos"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:40
+#, fuzzy
+msgid "Mail"
+msgstr "Send"
+
+#: mail/mail-config-druid.glade.h:41
+#, fuzzy
+msgid "Mail Account"
+msgstr "Smц╔ ikon"
+
+#: mail/mail-config-druid.glade.h:42
 #, fuzzy
 msgid "Mail Configuration"
 msgstr "Oppsett"
 
-#: po/tmp/mail-config-druid.glade.h:8
+#: mail/mail-config-druid.glade.h:43
 #, fuzzy
-msgid "Mail Source"
-msgstr "E-posttenar"
+msgid "Mail Configuration Druid"
+msgstr "Oppsett"
 
-#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
+#: mail/mail-config-druid.glade.h:44
+msgid "Make this my default account"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:46
 #, fuzzy
-msgid "Mail Transport"
-msgstr "&E-post-transport"
+msgid "News"
+msgstr "Ny ..."
+
+#: mail/mail-config-druid.glade.h:48
+#, fuzzy
+msgid "Optional"
+msgstr "Val"
+
+#: mail/mail-config-druid.glade.h:49 mail/mail-config-gui.c:485
+msgid "Organization:"
+msgstr "Organisasjon:"
+
+#: 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
+msgid "Password:"
 msgstr ""
 
-#: po/tmp/mail-config-druid.glade.h:14
+#: mail/mail-config-druid.glade.h:53
+msgid "Plain Text"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:54
+msgid "Receiving Email"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:55
+msgid "Remember my password"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:56 mail/mail-format.c:628
+#, fuzzy
+msgid "Reply-To:"
+msgstr "Svar"
+
+#: mail/mail-config-druid.glade.h:57
+#, fuzzy
+msgid "Reply-to:"
+msgstr "Svar"
+
+#: mail/mail-config-druid.glade.h:58
+msgid "Required"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:60
+#, fuzzy
+msgid "Save password"
+msgstr "Lagra som"
+
+#: mail/mail-config-druid.glade.h:61
+#, fuzzy
+msgid "Select signature file"
+msgstr "Signaturfil:"
+
+#: mail/mail-config-druid.glade.h:62
+#, fuzzy
+msgid "Sending Email"
+msgstr "Send"
+
+#: mail/mail-config-druid.glade.h:64
+#, fuzzy
+msgid "Server Configuration"
+msgstr "Oppsett"
+
+#: mail/mail-config-druid.glade.h:65
+msgid "Server Timeouts"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:66
+#, fuzzy
+msgid "Server Type: "
+msgstr "Tenar:"
+
+#: mail/mail-config-druid.glade.h:67
+msgid "Server requires authentication"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:68
+#, fuzzy
+msgid "Servers"
+msgstr "Tenar:"
+
+#: mail/mail-config-druid.glade.h:69 mail/mail-config-gui.c:496
+#, fuzzy
+msgid "Signature file:"
+msgstr "Signaturfil:"
+
+#: mail/mail-config-druid.glade.h:70
+#, fuzzy
+msgid "Signature:"
+msgstr "Signaturfil:"
+
+#: mail/mail-config-druid.glade.h:71 mail/mail-config.glade.h:20
+msgid "Sources"
+msgstr "Kjelder"
+
+#: 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 "Type:"
+
+#: 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 "Informasjon"
+
+#: mail/mail-config-druid.glade.h:77 mail/mail-config-gui.c:928
+msgid "Username:"
+msgstr "Brukarnamn:"
+
+#: 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 "minutt"
+
 #: mail/mail-config-gui.c:433
 msgid ""
 "Enter your name and email address to be used in outgoing mail. You may also, "
@@ -4591,16 +5059,7 @@ msgstr "Fullt namn"
 msgid "Email address:"
 msgstr "E-post-adresse:"
 
-#: mail/mail-config-gui.c:485
-msgid "Organization:"
-msgstr "Organisasjon:"
-
-#: mail/mail-config-gui.c:496
-#, fuzzy
-msgid "Signature file:"
-msgstr "Signaturfil:"
-
-#: 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
 #, fuzzy
 msgid "Signature File"
 msgstr "Signaturfil:"
@@ -4609,27 +5068,11 @@ msgstr "Signaturfil:"
 msgid "Server:"
 msgstr "Tenar:"
 
-#: mail/mail-config-gui.c:928
-msgid "Username:"
-msgstr "Brukarnamn:"
-
-#: mail/mail-config-gui.c:934
-msgid "Path:"
-msgstr "Sti:"
-
-#: mail/mail-config-gui.c:943
-msgid "Authentication:"
-msgstr "Autentisering:"
-
 #: mail/mail-config-gui.c:956
 #, fuzzy
 msgid "Detect supported types..."
 msgstr "Vel modemtype ..."
 
-#: mail/mail-config-gui.c:968
-msgid "Remember this password"
-msgstr ""
-
 #: mail/mail-config-gui.c:991
 #, fuzzy
 msgid "Don't delete messages from server"
@@ -4645,7 +5088,7 @@ msgstr "Skriftinnstillingar"
 msgid "Mail source type:"
 msgstr "E-post-&transport:"
 
-#: 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"
@@ -4673,6 +5116,14 @@ msgstr ""
 msgid "Mail transport type:"
 msgstr "E-post-&transport:"
 
+#: 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
 #, fuzzy
 msgid "Add Identity"
@@ -4728,70 +5179,79 @@ msgstr ""
 msgid "Query authorization at \"%s\""
 msgstr ""
 
-#: po/tmp/mail-config.glade.h:7
+#: mail/mail-config.glade.h:7
 msgid "Address"
 msgstr "Adresse"
 
-#: po/tmp/mail-config.glade.h:10
+#: mail/mail-config.glade.h:10
 #, fuzzy
 msgid "Identities"
 msgstr "Identifikator"
 
-#: po/tmp/mail-config.glade.h:11
+#: mail/mail-config.glade.h:11
 #, fuzzy
 msgid "Mail Sources"
 msgstr "Kjelder"
 
-#: po/tmp/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
+#, fuzzy
+msgid "Mail Transport"
+msgstr "&E-post-transport"
+
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Mark message as seen [ms]: "
 msgstr "Lag meldingar og slц╔ saman"
 
-#: po/tmp/mail-config.glade.h:14
+#: mail/mail-config.glade.h:14
 #, fuzzy
 msgid "News Servers"
 msgstr "Diskusjonsgruppetenarar"
 
-#: po/tmp/mail-config.glade.h:15
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "News Sources"
 msgstr "Kjelder"
 
-#: po/tmp/mail-config.glade.h:16
+#: mail/mail-config.glade.h:16
 #, fuzzy
 msgid "Organization"
 msgstr "Organisasjon:"
 
-#: po/tmp/mail-config.glade.h:18
+#: mail/mail-config.glade.h:18
 #, fuzzy
 msgid "Send messages in HTML format"
 msgstr "Send meldingar:"
 
-#: po/tmp/mail-config.glade.h:20
-msgid "Sources"
-msgstr "Kjelder"
-
-#: mail/mail-crypto.c:350 mail/mail-crypto.c:452 mail/mail-crypto.c:629
+#: mail/mail-crypto.c:353 mail/mail-crypto.c:458 mail/mail-crypto.c:635
+#: mail/mail-crypto.c:781
 #, fuzzy
 msgid "Please enter your PGP/GPG passphrase."
 msgstr "Oppgi ditt OpenPGP-passord"
 
-#: mail/mail-crypto.c:354 mail/mail-crypto.c:456 mail/mail-crypto.c:634
+#: mail/mail-crypto.c:357 mail/mail-crypto.c:462 mail/mail-crypto.c:640
+#: mail/mail-crypto.c:785
 #, fuzzy
 msgid "No password provided."
 msgstr "Ingen passord oppgitt."
 
-#: mail/mail-crypto.c:360 mail/mail-crypto.c:463 mail/mail-crypto.c:640
+#: mail/mail-crypto.c:363 mail/mail-crypto.c:469 mail/mail-crypto.c:646
+#: mail/mail-crypto.c:792 mail/mail-crypto.c:942
 #, fuzzy, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Kunne ikkje laga katalog\n"
 
-#: mail/mail-crypto.c:625
+#: mail/mail-crypto.c:631 mail/mail-crypto.c:777 mail/mail-crypto.c:936
 #, fuzzy
 msgid "No GPG/PGP program available."
 msgstr "Ingen bilete tilgjengeleg."
 
-#: mail/mail-display.c:90
+#: mail/mail-crypto.c:953
+#, fuzzy, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "Kunne ikkje laga katalog\n"
+
+#: mail/mail-display.c:98
 #, fuzzy, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -4801,17 +5261,17 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: mail/mail-display.c:113
+#: mail/mail-display.c:131
 #, fuzzy, c-format
 msgid "Could not write data: %s"
 msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#: mail/mail-display.c:218
+#: mail/mail-display.c:229
 #, fuzzy
 msgid "Save Attachment"
 msgstr "Smarte vedlegg"
 
-#: mail/mail-display.c:258
+#: mail/mail-display.c:269
 #, fuzzy, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
@@ -4819,444 +5279,350 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: mail/mail-display.c:300
+#: mail/mail-display.c:311
 #, fuzzy
 msgid "Save to Disk..."
 msgstr "Lagra til disk"
 
-#: mail/mail-display.c:302
+#: mail/mail-display.c:313
 #, fuzzy, c-format
 msgid "Open in %s..."
 msgstr "Opnar URL ..."
 
-#: mail/mail-display.c:304
+#: mail/mail-display.c:315
 #, fuzzy
 msgid "View Inline"
 msgstr "Vinkel"
 
-#: mail/mail-display.c:328
+#: mail/mail-display.c:339
 #, fuzzy
 msgid "External Viewer"
 msgstr "Hendingsvisar"
 
-#: mail/mail-display.c:351
+#: mail/mail-display.c:362
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:355
+#: mail/mail-display.c:366
 msgid "Hide"
 msgstr "Skjul"
 
-#: mail/mail-format.c:500
+#: mail/mail-format.c:503
 #, fuzzy, c-format
 msgid "%s attachment"
 msgstr "Vedlegg"
 
-#: mail/mail-format.c:623
-#, fuzzy
-msgid "Reply-To:"
-msgstr "Svar"
-
-#: mail/mail-format.c:845
+#: mail/mail-format.c:851
 msgid "No GPG/PGP support available in this copy of Evolution."
 msgstr ""
 
-#: mail/mail-format.c:857
+#: mail/mail-format.c:863
 #, fuzzy
 msgid "Encrypted message not displayed"
 msgstr "Endra tidsvising"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:869
 #, fuzzy
 msgid "Encrypted message"
 msgstr "Lagra melding"
 
-#: mail/mail-format.c:864
+#: mail/mail-format.c:870
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1470
+#: mail/mail-format.c:1450
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1482
+#: mail/mail-format.c:1462
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1486
+#: mail/mail-format.c:1466
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1520
+#: mail/mail-format.c:1500
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1525
+#: mail/mail-format.c:1505
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-format.c:1695
+#: mail/mail-format.c:1675
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr ""
 
-#: mail/mail-local.c:202
+#: mail/mail-local.c:204
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:206
+#: mail/mail-local.c:208
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:261
+#: mail/mail-local.c:251
+msgid "Reconfiguring folder"
+msgstr ""
+
+#: mail/mail-local.c:269
 msgid "Closing current folder"
 msgstr ""
 
-#: mail/mail-local.c:293
+#: mail/mail-local.c:295
 msgid "Renaming old folder and opening"
 msgstr ""
 
-#: mail/mail-local.c:314
+#: mail/mail-local.c:313
 #, fuzzy
 msgid "Creating new folder"
 msgstr "Lagar ei ny mappe"
 
-#: mail/mail-local.c:329
+#: mail/mail-local.c:327
 #, fuzzy
 msgid "Copying messages"
 msgstr "Melding"
 
-#: mail/mail-local.c:341
+#: 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:372
+#: 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:781
+#: mail/mail-local.c:787
 msgid "Registering local folder"
 msgstr ""
 
-#: mail/mail-local.c:783
+#: mail/mail-local.c:789
 msgid "Register local folder"
 msgstr ""
 
-#: mail/mail-ops.c:79
+#: mail/mail-local.c:894
+#, fuzzy, c-format
+msgid ""
+"Unable to register folder '%s':\n"
+"%s"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
+
+#: mail/mail-mt.c:85
+#, fuzzy, c-format
+msgid ""
+"Error while '%s':\n"
+"%s"
+msgstr ""
+"Feil ved laging av fil '%1':\n"
+"%2"
+
+#: mail/mail-mt.c:87
+#, fuzzy, c-format
+msgid ""
+"Error while performing operation:\n"
+"%s"
+msgstr ""
+"Feil ved lesing av fil:\n"
+"%s"
+
+#: mail/mail-mt.c:356 mail/mail-mt.c:385
+#, fuzzy
+msgid "Working"
+msgstr "Flyttar"
+
+#: mail/mail-ops.c:88
 #, fuzzy, c-format
 msgid "Fetching email from %s"
 msgstr "Hentar data frц╔ %1"
 
-#: mail/mail-ops.c:81
+#: mail/mail-ops.c:90
 #, fuzzy, c-format
 msgid "Fetch email from %s"
 msgstr "Slett e-post frц╔ tenaren"
 
-#: mail/mail-ops.c:331
+#: mail/mail-ops.c:335
 #, fuzzy, c-format
 msgid "There is no new mail at %s."
 msgstr "Det er ikkje band i stasjonen."
 
-#: mail/mail-ops.c:401
+#: mail/mail-ops.c:405
 #, fuzzy
 msgid "Filtering email on demand"
 msgstr "Ring ved fц╦respurnad"
 
-#: mail/mail-ops.c:403
+#: mail/mail-ops.c:407
 #, fuzzy
 msgid "Filter email on demand"
 msgstr "Ring ved fц╦respurnad"
 
-#: mail/mail-ops.c:538
+#: mail/mail-ops.c:551
 #, fuzzy, c-format
 msgid "Sending \"%s\""
 msgstr "Sender %1"
 
-#: mail/mail-ops.c:543
+#: mail/mail-ops.c:553
 #, fuzzy
-msgid "Sending a message without a subject"
-msgstr "Sender meldingar til %1"
-
-#: mail/mail-ops.c:546
-#, fuzzy, c-format
-msgid "Send \"%s\""
-msgstr "Lagra: %s"
-
-#: mail/mail-ops.c:549
-#, fuzzy
-msgid "Send a message without a subject"
-msgstr "Sender ei melding til ein nettverksspelar"
+msgid "Sending message"
+msgstr "Sen melding"
 
-#: mail/mail-ops.c:720
+#: mail/mail-ops.c:669
 #, fuzzy
 msgid "Sending queue"
 msgstr "&Send meldingane i kц╦en"
 
-#: mail/mail-ops.c:722
+#: mail/mail-ops.c:671
 #, fuzzy
 msgid "Send queue"
 msgstr "&Send meldingane i kц╦en"
 
-#: mail/mail-ops.c:858 mail/mail-ops.c:865
+#: mail/mail-ops.c:804 mail/mail-ops.c:811
 #, fuzzy, c-format
 msgid "Appending \"%s\""
 msgstr "Sender %1"
 
-#: mail/mail-ops.c:862 mail/mail-ops.c:868
+#: mail/mail-ops.c:808 mail/mail-ops.c:814
 #, fuzzy
 msgid "Appending a message without a subject"
 msgstr "Sender meldingar til %1"
 
-#: mail/mail-ops.c:940
-#, fuzzy, c-format
-msgid "Expunging \"%s\""
-msgstr "Forventar %1"
-
-#: mail/mail-ops.c:942
-#, c-format
-msgid "Expunge \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1001
+#: mail/mail-ops.c:897
 #, fuzzy, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Mottek meldingar frц╔ %1"
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:899
 #, fuzzy, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Mottek meldingar frц╔ %1"
 
-#: mail/mail-ops.c:1006
+#: mail/mail-ops.c:902
 #, fuzzy, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Flytta alle meldingar til papirkorga"
 
-#: mail/mail-ops.c:1008
+#: mail/mail-ops.c:904
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1039
+#: mail/mail-ops.c:935
 msgid "Moving"
 msgstr "Flyttar"
 
-#: mail/mail-ops.c:1042
+#: mail/mail-ops.c:938
 msgid "Copying"
 msgstr "Kopierer"
 
-#: mail/mail-ops.c:1062
+#: mail/mail-ops.c:958
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1141
-#, fuzzy, c-format
-msgid "Marking messages in folder \"%s\""
-msgstr "Markerer meldingar"
-
-#: mail/mail-ops.c:1144
-#, fuzzy, c-format
-msgid "Mark messages in folder \"%s\""
-msgstr "Lag meldingar og slц╔ saman"
-
-#: mail/mail-ops.c:1175
-#, fuzzy, c-format
-msgid "Marking message %d of %d"
-msgstr "Markerer meldingar"
-
-#: mail/mail-ops.c:1295
+#: mail/mail-ops.c:1033
 #, fuzzy, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/mail-ops.c:1297
-#, fuzzy, c-format
-msgid "Scan folders in \"%s\""
-msgstr "Lag ny mappe i %1"
-
-#: mail/mail-ops.c:1366 mail/subscribe-dialog.c:339
+#: mail/mail-ops.c:1099 mail/subscribe-dialog.c:341
 #, fuzzy
 msgid "(No description)"
 msgstr "Inga skildring"
 
-#: mail/mail-ops.c:1432
-#, fuzzy, c-format
-msgid "Attaching messages from folder \"%s\""
-msgstr "Mottek meldingar frц╔ %1"
-
-#: mail/mail-ops.c:1435
-#, fuzzy, c-format
-msgid "Attach messages from \"%s\""
-msgstr "Melding frц╔ %s"
-
-#: mail/mail-ops.c:1535
-#, fuzzy, c-format
-msgid "Forwarding messages \"%s\""
-msgstr "Markerer meldingar"
-
-#: mail/mail-ops.c:1539
-#, fuzzy
-msgid "Forwarding a message without a subject"
-msgstr "advarsel: denne meldinga er ikkje brukt"
-
-#: mail/mail-ops.c:1542
-#, fuzzy, c-format
-msgid "Forward message \"%s\""
-msgstr "Vidaresendt melding"
-
-#: mail/mail-ops.c:1546
-#, fuzzy
-msgid "Forward a message without a subject"
-msgstr "Vidaresendt melding frц╔ %1"
-
-#: mail/mail-ops.c:1593
-#, fuzzy, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Mottek meldingar frц╔ %1"
-
-#: mail/mail-ops.c:1610
-msgid ""
-"Failed to generate mime part from message while generating forwarded message."
-msgstr ""
-
-#: mail/mail-ops.c:1665
+#: mail/mail-ops.c:1164
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Vidaresendt melding frц╔ %1"
 
-#: mail/mail-ops.c:1679
-#, fuzzy
-msgid "Forwarded message:\n"
-msgstr "Vidaresendt melding frц╔ %1"
-
-#: mail/mail-ops.c:1748
+#: mail/mail-ops.c:1205 mail/mail-ops.c:1274
 #, fuzzy, c-format
-msgid "Loading \"%s\""
-msgstr "Lastar meldingar"
-
-#: mail/mail-ops.c:1750
-#, fuzzy, c-format
-msgid "Load \"%s\""
-msgstr "Last inn"
-
-#: mail/mail-ops.c:1853
-#, fuzzy, c-format
-msgid "Creating \"%s\""
-msgstr "Lagar"
-
-#: mail/mail-ops.c:1855
-#, fuzzy, c-format
-msgid "Create \"%s\""
-msgstr "Laga"
-
-#: mail/mail-ops.c:1903
-msgid "Exception while reporting result to shell component listener."
-msgstr ""
-
-#: mail/mail-ops.c:1949
-#, fuzzy, c-format
-msgid "Synchronizing \"%s\""
-msgstr "Synkroniser"
+msgid "Opening folder %s"
+msgstr "Leitar etter tilleggsmodular"
 
-#: mail/mail-ops.c:1951
-#, fuzzy, c-format
-msgid "Synchronize \"%s\""
+#: mail/mail-ops.c:1336
+#, fuzzy
+msgid "Synchronising folder"
 msgstr "Synkroniser"
 
-#: mail/mail-ops.c:2015
-#, fuzzy, c-format
-msgid "Displaying message UID \"%s\""
-msgstr "Vis meldingstorleik"
-
-#: mail/mail-ops.c:2018
+#: mail/mail-ops.c:1386
 #, fuzzy
-msgid "Clearing message display"
-msgstr "Markerer meldingar"
+msgid "Expunging folder"
+msgstr "Forventar %1"
 
-#: mail/mail-ops.c:2021
+#: mail/mail-ops.c:1434
 #, fuzzy, c-format
-msgid "Display message UID \"%s\""
-msgstr "Vis meldingstorleik"
+msgid "Retrieving message %s"
+msgstr "Mottek meldingar frц╔ %1"
 
-#: mail/mail-ops.c:2024
+#: mail/mail-ops.c:1497
 #, fuzzy
-msgid "Clear message display"
-msgstr "Endra tidsvising"
-
-#: mail/mail-ops.c:2137
-#, fuzzy, c-format
-msgid "Opening messages from folder \"%s\""
+msgid "Retrieving messages"
 msgstr "Mottek meldingar frц╔ %1"
 
-#: mail/mail-ops.c:2140
+#: mail/mail-ops.c:1507
 #, fuzzy, c-format
-msgid "Open messages from \"%s\""
-msgstr "Melding frц╔ %s"
+msgid "Retrieving message number %d of %d (uid \"%s\")"
+msgstr "Mottek meldingar frц╔ %1"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:1655
 #, fuzzy, c-format
-msgid "Loading %s Folder"
+msgid "Loading %s Folder for %s"
 msgstr "Les mapper"
 
-#: mail/mail-ops.c:2246
+#: mail/mail-ops.c:1657
 #, fuzzy, c-format
-msgid "Load %s Folder"
+msgid "Load %s Folder for %s"
 msgstr "Endra mappe"
 
-#: mail/mail-ops.c:2310
-#, fuzzy, c-format
-msgid "Viewing messages from folder \"%s\""
-msgstr "Mottek meldingar frц╔ %1"
-
-#: mail/mail-ops.c:2313
-#, fuzzy, c-format
-msgid "View messages from \"%s\""
-msgstr "Melding frц╔ %s"
-
-#: mail/mail-ops.c:2339
-#, fuzzy, c-format
-msgid "Retrieving message %d of %d (uid \"%s\")"
-msgstr "Mottek meldingar frц╔ %1"
+#: mail/mail-ops.c:1823
+#, fuzzy
+msgid "Saving messages"
+msgstr "Melding"
 
-#: mail/mail-ops.c:2428
+#: mail/mail-ops.c:1902
 #, fuzzy, c-format
-msgid "Saving messages from folder \"%s\""
-msgstr "Mottek meldingar frц╔ %1"
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: mail/mail-ops.c:2431
+#: mail/mail-ops.c:1915
 #, fuzzy, c-format
-msgid "Save messages from folder \"%s\""
+msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Mottek meldingar frц╔ %1"
 
-#: mail/mail-ops.c:2474
+#: mail/mail-ops.c:1929
 #, fuzzy, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr "Mottek meldingar frц╔ %1"
+msgid ""
+"Error saving messages to: %s:\n"
+" %s"
+msgstr ""
+"Feil ved lesing a fil:\n"
+"%1"
 
 #: mail/mail-search-dialogue.c:104
 #, fuzzy
 msgid "Cancel"
 msgstr "Avbroten."
 
-#: mail/mail-summary.c:105 mail/mail-threads.c:728
+#: mail/mail-summary.c:110 mail/mail-threads.c:729
 #, fuzzy
 msgid "Incomplete message written on pipe!"
 msgstr "<ferdig melding>"
 
-#: mail/mail-threads.c:301
+#: mail/mail-threads.c:302
 #, fuzzy, c-format
 msgid ""
 "Error while preparing to %s:\n"
@@ -5265,7 +5631,7 @@ msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: mail/mail-threads.c:675
+#: mail/mail-threads.c:676
 #, fuzzy, c-format
 msgid ""
 "Error while `%s':\n"
@@ -5274,20 +5640,20 @@ msgstr ""
 "Feil ved laging av fil '%1':\n"
 "%2"
 
-#: mail/mail-threads.c:732
+#: mail/mail-threads.c:733
 msgid "Error reading commands from dispatching thread."
 msgstr ""
 
-#: mail/mail-threads.c:797
+#: mail/mail-threads.c:798
 msgid "Corrupted message from dispatching thread?"
 msgstr ""
 
-#: mail/mail-threads.c:916
+#: mail/mail-threads.c:917
 #, fuzzy
 msgid "Could not create dialog box."
 msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#: mail/mail-threads.c:927
+#: mail/mail-threads.c:928
 #, fuzzy
 msgid "User cancelled query."
 msgstr ""
@@ -5303,54 +5669,53 @@ msgstr ""
 "%2"
 
 #. Get all uids of source
-#: mail/mail-tools.c:239
+#: mail/mail-tools.c:241
 #, fuzzy, c-format
 msgid "Examining %s"
 msgstr "Forventar %1"
 
-#: mail/mail-tools.c:269
+#: mail/mail-tools.c:271
 #, c-format
 msgid ""
 "Could not read UID cache file \"%s\". You may receive duplicate messages."
 msgstr ""
 
-#. Info
-#: mail/mail-tools.c:290
+#: mail/mail-tools.c:300
 #, fuzzy, c-format
 msgid "Retrieving message %d of %d"
 msgstr "Mottek meldingar frц╔ %1"
 
 #. Append it to dest
-#: mail/mail-tools.c:303
+#: mail/mail-tools.c:315
 #, fuzzy, c-format
 msgid "Writing message %d of %d"
 msgstr "Mottek meldingar frц╔ %1"
 
-#: mail/mail-tools.c:332
+#: mail/mail-tools.c:347
 #, fuzzy, c-format
 msgid "Saving changes to %s"
 msgstr "Lagrar alle endra filer ..."
 
-#: mail/mail-tools.c:369
+#: mail/mail-tools.c:381
 #, fuzzy, c-format
 msgid "[%s] (forwarded message)"
 msgstr "Vidaresendt melding"
 
-#: mail/mail-tools.c:379
+#: mail/mail-tools.c:391
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (ingen emne)"
 
-#: mail/mail-tools.c:418
+#: mail/mail-tools.c:427
 #, fuzzy, c-format
 msgid "Forwarded message - %s"
 msgstr "Vidaresendt melding frц╔ %1"
 
-#: mail/mail-tools.c:420
+#: mail/mail-tools.c:429
 #, fuzzy
 msgid "Forwarded message (no subject)"
 msgstr "Vidaresendt melding frц╔ %1"
 
-#: mail/mail-tools.c:523
+#: mail/mail-tools.c:530
 #, fuzzy, c-format
 msgid ""
 "Cannot open location `%s':\n"
@@ -5360,86 +5725,104 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: mail/mail-vfolder.c:147
+#: mail/mail-vfolder.c:149
 #, fuzzy
 msgid "VFolders"
 msgstr "Mapper"
 
-#: mail/mail-vfolder.c:296
+#: mail/mail-vfolder.c:298
 #, fuzzy
 msgid "New VFolder"
 msgstr "Ny mappe"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:33
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:37
 msgid "Reply"
 msgstr "Svar"
 
-#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:38
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
 #, fuzzy
 msgid "Reply to the sender of this message"
 msgstr "Fann ikkje sendaren av denne meldinga"
 
-#: mail/mail-view.c:156 po/tmp/evolution-mail.xml.h:37
+#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
 #, fuzzy
 msgid "Reply to all recipients of this message"
 msgstr "Fann ikkje sendaren av denne meldinga"
 
-#: mail/mail-view.c:159 po/tmp/evolution-mail.xml.h:19
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:19
 #, fuzzy
 msgid "Forward this message"
 msgstr "Vidaresendt melding"
 
-#: mail/mail-view.c:163 po/tmp/evolution-mail.xml.h:32
+#: mail/mail-view.c:148 ui/evolution-mail.xml.h:36
 #, fuzzy
 msgid "Print the selected message"
 msgstr "Sentrer dei valte elementa"
 
-#: mail/mail-view.c:165 po/tmp/evolution-mail.xml.h:12
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:12
 #, fuzzy
 msgid "Delete this message"
 msgstr "Slett denne adressa"
 
-#: mail/message-list.c:572
+#: mail/message-list.c:590
 #, fuzzy
 msgid "Unseen"
 msgstr "partalssider"
 
-#: mail/message-list.c:575
+#: mail/message-list.c:593
 #, fuzzy
 msgid "Seen"
 msgstr "Send"
 
-#: mail/message-list.c:578
+#: mail/message-list.c:596
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:846
+#: mail/message-list.c:881
 #, c-format
 msgid "[ %s ]"
 msgstr ""
 
 #. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:858 mail/message-list.c:873
+#: mail/message-list.c:893 mail/message-list.c:909
 #, c-format
 msgid "%s, et al."
 msgstr ""
 
-#: mail/message-list.c:860 mail/message-list.c:875
+#: mail/message-list.c:896 mail/message-list.c:912
 #, fuzzy
 msgid "<unknown>"
 msgstr "Ukjend"
 
-#: mail/message-list.c:2068
+#: mail/message-list.c:965
+msgid "?"
+msgstr ""
+
+#: mail/message-list.c:972
 #, fuzzy
-msgid "Rebuilding message view"
-msgstr "Feil ved skriving av band-ID."
+msgid "Today %l:%M %p"
+msgstr "%H:%M"
+
+#: mail/message-list.c:981
+msgid "Yesterday %l:%M %p"
+msgstr ""
 
-#: mail/message-list.c:2070
+#: mail/message-list.c:993
 #, fuzzy
-msgid "Rebuild message view"
-msgstr "Sen melding"
+msgid "%a %l:%M %p"
+msgstr "%H:%M"
+
+#: mail/message-list.c:1001
+#, fuzzy
+msgid "%b %d %l:%M %p"
+msgstr "%H:%M"
+
+#: mail/message-list.c:1003
+#, fuzzy
+msgid "%b %d %Y"
+msgstr "%1 bit %2 %3"
 
 #: mail/subscribe-dialog.c:139
 msgid "Display folders starting with:"
@@ -5455,27 +5838,27 @@ msgstr ""
 msgid "Get store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:282
+#: mail/subscribe-dialog.c:283
 #, fuzzy, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/subscribe-dialog.c:286
+#: mail/subscribe-dialog.c:287
 #, fuzzy, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Mottek meldingar frц╔ %1"
 
-#: mail/subscribe-dialog.c:290
+#: mail/subscribe-dialog.c:291
 #, fuzzy, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr "Lag ny mappe i %1"
 
-#: mail/subscribe-dialog.c:293
+#: mail/subscribe-dialog.c:294
 #, fuzzy, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr "Mottek meldingar frц╔ %1"
 
-#: shell/e-setup.c:112 shell/e-setup.c:183
+#: shell/e-setup.c:112 shell/e-setup.c:185
 #, fuzzy
 msgid "Evolution installation"
 msgstr "KDeelop-installering"
@@ -5490,28 +5873,28 @@ msgstr ""
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 
-#: shell/e-setup.c:155
+#: shell/e-setup.c:157
 #, fuzzy
 msgid "Could not update files correctly"
 msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#: shell/e-setup.c:158 shell/e-setup.c:224
+#: shell/e-setup.c:160 shell/e-setup.c:228
 #, fuzzy
 msgid "Evolution files successfully installed."
 msgstr "Alle filer vart sletta."
 
-#: shell/e-setup.c:187
+#: shell/e-setup.c:189
 #, fuzzy
 msgid "This seems to be the first time you run Evolution."
 msgstr ""
 "Dette er fц╦rste nivц╔\n"
 "i denne samlinga."
 
-#: shell/e-setup.c:188
+#: shell/e-setup.c:190
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 
-#: shell/e-setup.c:205
+#: shell/e-setup.c:209
 #, fuzzy, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -5521,14 +5904,14 @@ msgstr ""
 "Kan ikkje laga heimekatalog\n"
 "Feil: %1"
 
-#: shell/e-setup.c:220
+#: shell/e-setup.c:224
 #, fuzzy, c-format
 msgid ""
 "Cannot copy files into\n"
 "`%s'."
 msgstr "kan ikkje opna fila %1"
 
-#: shell/e-setup.c:245
+#: shell/e-setup.c:249
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -5536,7 +5919,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:257
+#: shell/e-setup.c:261
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -5569,7 +5952,7 @@ msgid ""
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:291
+#: shell/e-shell-folder-selection-dialog.c:297
 msgid "New..."
 msgstr "Ny ..."
 
@@ -5578,32 +5961,28 @@ msgstr "Ny ..."
 msgid "(Untitled)"
 msgstr "Utan tittel"
 
-#. you might have to call gnome_dialog_run() on the
-#. * dialog returned here, I don't remember...
-#.
-#: shell/e-shell-view-menu.c:114
+#: shell/e-shell-view-menu.c:111
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
-#. same as above
-#: shell/e-shell-view-menu.c:120
+#: shell/e-shell-view-menu.c:117
 #, fuzzy
 msgid "Bug buddy could not be run."
 msgstr "Kunne ikkje lagra adresseboka."
 
-#: shell/e-shell-view-menu.c:172
+#: shell/e-shell-view-menu.c:169
 #, fuzzy
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr "Opphavsrett (c), %1 1997-2000"
 
-#: shell/e-shell-view-menu.c:174
+#: shell/e-shell-view-menu.c:171
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
 "within the GNOME desktop environment."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:335
+#: shell/e-shell-view-menu.c:332
 #, fuzzy
 msgid "Go to folder..."
 msgstr "Flytt til mappe"
@@ -5710,9 +6089,8 @@ msgstr ""
 msgid "Error saving shortcuts."
 msgstr "Feil ved lagring av innstillingar."
 
-#: po/tmp/evolution-event-editor.xml.h:125
-#: po/tmp/evolution-message-composer.xml.h:43 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
 #, fuzzy
 msgid "_View"
 msgstr "Vis"
@@ -5786,8 +6164,8 @@ msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
-"Over the last month and a half, our focus has been on making\n"
-"Evolution usable. Many of the Evolution developers are now using\n"
+"Over the time since the past release, our focus has been on making\n"
+"Evolution usable.  Many of the Evolution developers are now using\n"
 "Evolution to read their mail full time. You could too. (Just\n"
 "be sure to keep a backup.)\n"
 "\n"
@@ -5824,1268 +6202,1287 @@ msgstr "Deaktivert"
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kan ikkje initialisera adresseboka"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-addressbook-ldap.xml.h:6
-#, fuzzy
-msgid "N_ew Directory Server"
-msgstr "Diskusjonsgruppetenarar"
-
-#: po/tmp/evolution-addressbook-ldap.xml.h:7
-#, fuzzy
-msgid "_Actions"
-msgstr "Handlingar"
-
-#: po/tmp/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:7
 #, fuzzy
 msgid "Create a new contact"
 msgstr "Lagar eit nytt dokument"
 
-#: po/tmp/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:9
 #, fuzzy
 msgid "Delete a contact"
 msgstr "Slett kolonne"
 
-#: 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
 #, fuzzy
 msgid "Find"
 msgstr "Finn ..."
 
-#: 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
 #, fuzzy
 msgid "New"
 msgstr "Ny ..."
 
-#: 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
 #, fuzzy
 msgid "Stop Loading"
 msgstr "Lagring"
 
-#: po/tmp/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:17
 #, fuzzy
 msgid "View All"
 msgstr "Vinkel"
 
-#: 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
+#, fuzzy
+msgid "_Addressbook Configuration..."
+msgstr "Oppsett"
+
+#: ui/evolution-addressbook.xml.h:20
 #, fuzzy
 msgid "_Print Contacts..."
 msgstr "&Innhald ..."
 
-#: po/tmp/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:21
 msgid "_Search for contacts"
 msgstr ""
 
-#: po/tmp/evolution-addressbook.xml.h:21
-#: po/tmp/evolution-event-editor.xml.h:123
+#: ui/evolution-addressbook.xml.h:22 ui/evolution-event-editor.xml.h:123
 #, fuzzy
 msgid "_Tools"
 msgstr "Verktц╦y"
 
 #.
-#. * 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
 #, fuzzy
 msgid "5 Days"
 msgstr " dag"
 
-#: po/tmp/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:7
 #, fuzzy
 msgid "Alter preferences"
 msgstr "Innstillingar"
 
-#: po/tmp/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:8
 #, fuzzy
 msgid "Ca_lendar"
 msgstr "Skriv ut alle"
 
-#: po/tmp/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:9
 #, fuzzy
 msgid "Calendar Preferences..."
 msgstr "Innstillingar"
 
-#: po/tmp/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:10
 #, fuzzy
 msgid "Create a new appointment"
 msgstr "&Slett avtale"
 
-#: po/tmp/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:11
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "Feil ved opning"
 
-#: po/tmp/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:12
 msgid "Day"
 msgstr "Dag"
 
-#: 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
 #, fuzzy
 msgid "Go to"
 msgstr "Gц╔ til side"
 
-#: po/tmp/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:16
 #, fuzzy
 msgid "Go to a specific date"
 msgstr "Gц╔ til side"
 
-#: po/tmp/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:17
 #, fuzzy
 msgid "Go to present time"
 msgstr "Ikkje vis den overskytande teksten"
 
-#: po/tmp/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Mц╔nad"
 
-#: 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
 #, fuzzy
 msgid "Next"
 msgstr "Neste"
 
-#: po/tmp/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:21
 #, fuzzy
 msgid "Open a calendar"
 msgstr "Feil ved opning"
 
-#: po/tmp/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:22
 #, fuzzy
 msgid "Prev"
 msgstr "Fц╦rehandsvising:"
 
-#: po/tmp/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:24
 #, fuzzy
 msgid "Print this calendar"
 msgstr "Skriv ut alle"
 
-#: 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
 #, fuzzy
 msgid "Show 1 day"
 msgstr "Vis dato"
 
-#: po/tmp/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:27
 #, fuzzy
 msgid "Show 1 month"
 msgstr "Vis metodar"
 
-#: po/tmp/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:28
 #, fuzzy
 msgid "Show 1 week"
 msgstr "Vis %1"
 
-#: po/tmp/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:29
 #, fuzzy
 msgid "Show the working week"
 msgstr "Vis hovudvindauget"
 
-#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:414
+#: ui/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:413
 #, fuzzy
 msgid "Today"
 msgstr "i dag"
 
-#: po/tmp/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:31
 msgid "Week"
 msgstr "Veke"
 
-#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:31
+#: ui/evolution-calendar.xml.h:32 ui/evolution.xml.h:31
 #, fuzzy
 msgid "_New"
 msgstr "Vis"
 
-#: po/tmp/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:33
 #, fuzzy
 msgid "_Open Calendar"
 msgstr "Feil ved opning"
 
-#: po/tmp/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:34
 #, fuzzy
 msgid "_Print this calendar"
 msgstr "Skriv ut alle"
 
-#: po/tmp/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:35
 #, fuzzy
-msgid "_Save Calendar As"
-msgstr "Ny kalender"
+msgid "_Save As..."
+msgstr "Lagra som ..."
 
-#: po/tmp/evolution-contact-editor.xml.h:7
+#: ui/evolution-contact-editor.xml.h:7
 #, fuzzy
 msgid "Delete this item"
 msgstr "Slett denne adressa"
 
-#: po/tmp/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:8
 #, fuzzy
 msgid "Delete..."
 msgstr "Slett"
 
-#: 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
 #, fuzzy
 msgid "Print this item"
 msgstr "Skriv til fil"
 
-#: 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
 #, fuzzy
 msgid "Print..."
 msgstr "Skriv ut"
 
-#: po/tmp/evolution-contact-editor.xml.h:13
-#: po/tmp/evolution-event-editor.xml.h:89
-#: po/tmp/evolution-message-composer.xml.h:18
+#: ui/evolution-contact-editor.xml.h:13 ui/evolution-event-editor.xml.h:89
+#: ui/evolution-message-composer.xml.h:21
 #, fuzzy
 msgid "Save _As..."
 msgstr "Lagra som ..."
 
-#: 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
 #, fuzzy
 msgid "Save and Close"
 msgstr "Lagra ei fil"
 
-#: 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
 #, fuzzy
 msgid "See online help"
 msgstr "Me er tilkopla!"
 
-#: po/tmp/evolution-contact-editor.xml.h:18
+#: ui/evolution-contact-editor.xml.h:18
 #, fuzzy
 msgid "Send _message to contact..."
 msgstr "Sender ei melding til ein nettverksspelar"
 
-#: po/tmp/evolution-contact-editor.xml.h:19
-#: po/tmp/evolution-event-editor.xml.h:110
-#: po/tmp/evolution-message-composer.xml.h:38
-#: 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
 #, fuzzy
 msgid "_File"
 msgstr "Fil"
 
-#: po/tmp/evolution-contact-editor.xml.h:20
+#: ui/evolution-contact-editor.xml.h:20
 #, fuzzy
 msgid "_Print..."
 msgstr "Skriv ut"
 
-#: po/tmp/evolution-contact-editor.xml.h:21
-#: po/tmp/evolution-event-editor.xml.h:121
-#: po/tmp/evolution-message-composer.xml.h:42
+#: ui/evolution-contact-editor.xml.h:21 ui/evolution-event-editor.xml.h:121
+#: ui/evolution-message-composer.xml.h:46
 #, fuzzy
 msgid "_Save"
 msgstr "Lagra"
 
 #.
-#. * 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
 #, fuzzy
 msgid "About..."
 msgstr "Skrifttype ..."
 
-#: po/tmp/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:8
 #, fuzzy
 msgid "Actio_ns"
 msgstr "Handlingar"
 
-#: po/tmp/evolution-event-editor.xml.h:9
+#: ui/evolution-event-editor.xml.h:9
 #, fuzzy
 msgid "C_lear"
 msgstr "Teikn"
 
-#: po/tmp/evolution-event-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:10
 #, fuzzy
 msgid "C_ut"
 msgstr "Klipp ut"
 
-#: po/tmp/evolution-event-editor.xml.h:11
+#: ui/evolution-event-editor.xml.h:11
 #, fuzzy
 msgid "Clear"
 msgstr "Teikn"
 
-#: po/tmp/evolution-event-editor.xml.h:12
+#: ui/evolution-event-editor.xml.h:12
 #, fuzzy
 msgid "Clear the selection"
 msgstr "Slettar den valte fila"
 
-#: po/tmp/evolution-event-editor.xml.h:14
+#: ui/evolution-event-editor.xml.h:14
 #, fuzzy
 msgid "Close this appointment"
 msgstr "&Slett avtale"
 
-#: 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 "Kopier"
 
-#: 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 "Klipp ut"
 
-#: 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
 #, fuzzy
 msgid "FIXME: Address _Book..."
 msgstr "Adresse&bok ..."
 
-#: 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
 #, fuzzy
 msgid "FIXME: Cop_y to Folder..."
 msgstr "Kopier til mappe"
 
-#: 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
 #, fuzzy
 msgid "FIXME: Define Print _Styles"
 msgstr "&Fц╦rehandsvising ..."
 
-#: 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
 #, fuzzy
 msgid "FIXME: For_ward"
 msgstr "Fort framover"
 
-#: 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
 #, fuzzy
 msgid "FIXME: Help"
 msgstr "&KDE-hjelp"
 
-#: 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
 #, fuzzy
 msgid "FIXME: Insert File"
 msgstr "Sett inn fil ..."
 
-#: 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
 #, fuzzy
 msgid "FIXME: Paste _Special... "
 msgstr "Lim inn spesiell ..."
 
-#: po/tmp/evolution-event-editor.xml.h:38
+#: ui/evolution-event-editor.xml.h:38
 #, fuzzy
 msgid "FIXME: Print Pre_view"
 msgstr "&Fц╦rehandsvising ..."
 
-#: 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
 #, fuzzy
 msgid "FIXME: Rec_urrence..."
 msgstr "Repetering"
 
-#: 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
 #, fuzzy
 msgid "FIXME: Save Attac_hments..."
 msgstr "Smarte vedlegg"
 
-#: 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
 #, fuzzy
 msgid "FIXME: _Customize..."
 msgstr "Tilpass ..."
 
-#: po/tmp/evolution-event-editor.xml.h:48
+#: ui/evolution-event-editor.xml.h:48
 #, fuzzy
 msgid "FIXME: _File..."
 msgstr "Sett inn fil ..."
 
-#: po/tmp/evolution-event-editor.xml.h:49
+#: ui/evolution-event-editor.xml.h:49
 #, fuzzy
 msgid "FIXME: _Font..."
 msgstr "Skrifttype ..."
 
-#: po/tmp/evolution-event-editor.xml.h:50
+#: ui/evolution-event-editor.xml.h:50
 #, fuzzy
 msgid "FIXME: _Formatting"
 msgstr "Tekstformatering"
 
-#: 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
 msgid "FIXME: _Mail Message"
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:55
+#: ui/evolution-event-editor.xml.h:55
 #, fuzzy
 msgid "FIXME: _Memo Style"
 msgstr "Elementstil"
 
-#: po/tmp/evolution-event-editor.xml.h:56
+#: ui/evolution-event-editor.xml.h:56
 #, fuzzy
 msgid "FIXME: _Move to Folder..."
 msgstr "Flytt til mappe"
 
-#: po/tmp/evolution-event-editor.xml.h:57
+#: ui/evolution-event-editor.xml.h:57
 #, fuzzy
 msgid "FIXME: _New Appointment"
 msgstr "Se&nd avtale"
 
-#: 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
 #, fuzzy
 msgid "FIXME: _Object..."
 msgstr "&Objekt ..."
 
-#: po/tmp/evolution-event-editor.xml.h:60
+#: ui/evolution-event-editor.xml.h:60
 #, fuzzy
 msgid "FIXME: _Paragraph..."
 msgstr "&Avsnitt ..."
 
-#: po/tmp/evolution-event-editor.xml.h:61
+#: ui/evolution-event-editor.xml.h:61
 #, fuzzy
 msgid "FIXME: _Spelling..."
 msgstr "&Stavekontroll ..."
 
-#: po/tmp/evolution-event-editor.xml.h:62
+#: ui/evolution-event-editor.xml.h:62
 #, fuzzy
 msgid "FIXME: _Standard"
 msgstr "Standard"
 
-#: 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:10
+#: ui/evolution-event-editor.xml.h:66 ui/evolution-message-composer.xml.h:11
 #, fuzzy
 msgid "F_ormat"
 msgstr "Format"
 
-#: 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
 #, fuzzy
 msgid "Go to the next item"
 msgstr "Ikkje vis den overskytande teksten"
 
-#: po/tmp/evolution-event-editor.xml.h:71
+#: ui/evolution-event-editor.xml.h:71
 #, fuzzy
 msgid "Go to the previous item"
 msgstr "Gц╔ til neste som treng ettersyn"
 
-#: po/tmp/evolution-event-editor.xml.h:72
+#: ui/evolution-event-editor.xml.h:72
 #, fuzzy
 msgid "Modify the file's properties"
 msgstr "Linjeeigenskapar"
 
-#: po/tmp/evolution-event-editor.xml.h:73
+#: ui/evolution-event-editor.xml.h:73
 #, fuzzy
 msgid "N_ext"
 msgstr "Neste"
 
-#: po/tmp/evolution-event-editor.xml.h:75
+#: ui/evolution-event-editor.xml.h:75
 msgid "Paste"
 msgstr "Lim inn"
 
-#: po/tmp/evolution-event-editor.xml.h:76
+#: ui/evolution-event-editor.xml.h:76
 #, fuzzy
 msgid "Paste the clipboard"
 msgstr "Limer inn ..."
 
-#: po/tmp/evolution-event-editor.xml.h:77
+#: ui/evolution-event-editor.xml.h:77
 #, fuzzy
 msgid "Pre_vious"
 msgstr "Fц╦rre"
 
-#: po/tmp/evolution-event-editor.xml.h:78
+#: ui/evolution-event-editor.xml.h:78
 #, fuzzy
 msgid "Previous"
 msgstr "Fц╦rre"
 
-#: 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
 #, fuzzy
 msgid "Print Setup"
 msgstr "Speloppsett"
 
-#: po/tmp/evolution-event-editor.xml.h:83
+#: ui/evolution-event-editor.xml.h:83
 #, fuzzy
 msgid "Properties"
 msgstr "Eigenskapar ..."
 
-#: po/tmp/evolution-event-editor.xml.h:84
+#: ui/evolution-event-editor.xml.h:84
 #, fuzzy
 msgid "Redo"
 msgstr "Tilfeldig"
 
-#: po/tmp/evolution-event-editor.xml.h:85
+#: ui/evolution-event-editor.xml.h:85
 #, fuzzy
 msgid "Redo the undone action"
 msgstr "Fjern ein kolonne"
 
-#: po/tmp/evolution-event-editor.xml.h:86
+#: ui/evolution-event-editor.xml.h:86
 #, fuzzy
 msgid "Replace"
 msgstr "Svar"
 
-#: 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:21
+#: ui/evolution-event-editor.xml.h:92 ui/evolution-message-composer.xml.h:24
 #, fuzzy
 msgid "Save the current file"
 msgstr "tid no"
 
-#: po/tmp/evolution-event-editor.xml.h:93
+#: ui/evolution-event-editor.xml.h:93
 #, fuzzy
 msgid "Schedule Meeting"
 msgstr "Kц╦yreplan ..."
 
-#: po/tmp/evolution-event-editor.xml.h:94
+#: ui/evolution-event-editor.xml.h:94
 #, fuzzy
 msgid "Schedule _Meeting"
 msgstr "Kц╦yreplan ..."
 
-#: 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
 #, fuzzy
 msgid "Select All"
 msgstr "Vel mappe"
 
-#: po/tmp/evolution-event-editor.xml.h:100
+#: ui/evolution-event-editor.xml.h:100
 #, fuzzy
 msgid "Select everything"
 msgstr "Vel mappe"
 
-#: 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:34
+#: ui/evolution-event-editor.xml.h:104 ui/evolution-message-composer.xml.h:38
 #, fuzzy
 msgid "_About..."
 msgstr "Skrifttype ..."
 
-#: po/tmp/evolution-event-editor.xml.h:105
-#: po/tmp/evolution-message-composer.xml.h:35
+#: ui/evolution-event-editor.xml.h:105 ui/evolution-message-composer.xml.h:39
 #, fuzzy
 msgid "_Close"
 msgstr "Lukk"
 
-#: po/tmp/evolution-event-editor.xml.h:106
+#: ui/evolution-event-editor.xml.h:106
 #, fuzzy
 msgid "_Copy"
 msgstr "Kopier"
 
-#: po/tmp/evolution-event-editor.xml.h:107
-#: po/tmp/evolution-message-composer.xml.h:36
+#: 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:37
-#: 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
 #, fuzzy
 msgid "_Edit"
 msgstr "Rediger"
 
-#: po/tmp/evolution-event-editor.xml.h:111
+#: ui/evolution-event-editor.xml.h:111
 #, fuzzy
 msgid "_Find..."
 msgstr "Finn ..."
 
-#: po/tmp/evolution-event-editor.xml.h:112
+#: ui/evolution-event-editor.xml.h:112
 #, fuzzy
 msgid "_Forms"
 msgstr "Forum"
 
-#: po/tmp/evolution-event-editor.xml.h:113
-#: po/tmp/evolution-message-composer.xml.h:39 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
 #, fuzzy
 msgid "_Help"
 msgstr "Heim"
 
-#: po/tmp/evolution-event-editor.xml.h:114
+#: ui/evolution-event-editor.xml.h:114
 #, fuzzy
 msgid "_Insert"
 msgstr "Set inn"
 
-#: po/tmp/evolution-event-editor.xml.h:115
+#: ui/evolution-event-editor.xml.h:115
 #, fuzzy
 msgid "_Object"
 msgstr "Objekt"
 
-#: po/tmp/evolution-event-editor.xml.h:116
+#: ui/evolution-event-editor.xml.h:116
 #, fuzzy
 msgid "_Paste"
 msgstr "Lim inn"
 
-#: po/tmp/evolution-event-editor.xml.h:117
+#: ui/evolution-event-editor.xml.h:117
 #, fuzzy
 msgid "_Print"
 msgstr "Skriv ut"
 
-#: po/tmp/evolution-event-editor.xml.h:118
+#: ui/evolution-event-editor.xml.h:118
 #, fuzzy
 msgid "_Properties..."
 msgstr "Eigenskapar ..."
 
-#: po/tmp/evolution-event-editor.xml.h:119
+#: ui/evolution-event-editor.xml.h:119
 #, fuzzy
 msgid "_Redo"
 msgstr "Tilfeldig"
 
-#: po/tmp/evolution-event-editor.xml.h:120
+#: ui/evolution-event-editor.xml.h:120
 #, fuzzy
 msgid "_Replace..."
 msgstr "Opna ..."
 
-#: po/tmp/evolution-event-editor.xml.h:122
+#: ui/evolution-event-editor.xml.h:122
 #, fuzzy
 msgid "_Toolbars"
 msgstr "Verktц╦ylinjer"
 
-#: 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
 #, fuzzy
 msgid "Compose"
 msgstr "Lukk"
 
-#: po/tmp/evolution-mail.xml.h:7
+#: ui/evolution-mail.xml.h:7
 #, fuzzy
 msgid "Compose a new message"
 msgstr "Lukk melding"
 
-#: po/tmp/evolution-mail.xml.h:9
+#: ui/evolution-mail.xml.h:9
 #, fuzzy
 msgid "Copy message to a new folder"
 msgstr "&Kopier bileteplassering"
 
-#: 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
 #, fuzzy
 msgid "F_older"
 msgstr "Mapper"
 
-#: po/tmp/evolution-mail.xml.h:14
+#: ui/evolution-mail.xml.h:14
 #, fuzzy
 msgid "Fi_lter on Sender"
 msgstr "Fil under:"
 
-#: po/tmp/evolution-mail.xml.h:15
+#: ui/evolution-mail.xml.h:15
 #, fuzzy
 msgid "Filter on Rec_ipients"
 msgstr "Skriv ut filer"
 
-#: 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
 #, fuzzy
 msgid "Get Mail"
 msgstr "Detaljar"
 
-#: po/tmp/evolution-mail.xml.h:21
+#: ui/evolution-mail.xml.h:22
+#, fuzzy
+msgid "Hide _Deleted messages"
+msgstr "Neste melding"
+
+#: ui/evolution-mail.xml.h:23
+#, fuzzy
+msgid "Hide _Read messages"
+msgstr "Vidaresendt melding frц╔ %1"
+
+#: ui/evolution-mail.xml.h:24
+#, fuzzy
+msgid "Hide _Selected messages"
+msgstr "Sentrer dei valte elementa"
+
+#: ui/evolution-mail.xml.h:25
 #, fuzzy
-msgid "Mail _Filters"
+msgid "Mail _Filters..."
 msgstr "E-post:"
 
-#: po/tmp/evolution-mail.xml.h:22
+#: ui/evolution-mail.xml.h:26
 #, fuzzy
-msgid "Manage Subscriptions"
+msgid "Manage Subscriptions..."
 msgstr "Skildring:"
 
-#: po/tmp/evolution-mail.xml.h:23
+#: ui/evolution-mail.xml.h:27
 msgid "Mar_k As Read"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:28
 #, fuzzy
 msgid "Mark As U_nread"
 msgstr "Mar&ker som ulesen"
 
-#: po/tmp/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:29
 #, fuzzy
 msgid "Move"
 msgstr "Mц╔n"
 
-#: po/tmp/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:30
 #, fuzzy
 msgid "Move message to a new folder"
 msgstr "Lagra side til ascii-fil"
 
-#: po/tmp/evolution-mail.xml.h:27
+#: ui/evolution-mail.xml.h:31
 #, fuzzy
 msgid "Previews the message to be printed"
 msgstr "Sen melding"
 
-#: po/tmp/evolution-mail.xml.h:29
+#: ui/evolution-mail.xml.h:33
 #, fuzzy
 msgid "Print Preview of message..."
 msgstr "&Fц╦rehandsvising ..."
 
-#: po/tmp/evolution-mail.xml.h:30
+#: ui/evolution-mail.xml.h:34
 msgid "Print message to the printer"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:31
+#: ui/evolution-mail.xml.h:35
 #, fuzzy
 msgid "Print message..."
 msgstr "Private meldingar"
 
-#: po/tmp/evolution-mail.xml.h:35
+#: ui/evolution-mail.xml.h:39
 #, fuzzy
 msgid "Reply to _All"
 msgstr "Svar til alle:"
 
-#: po/tmp/evolution-mail.xml.h:36
+#: ui/evolution-mail.xml.h:40
 #, fuzzy
 msgid "Reply to _Sender"
 msgstr "Svar til avsendar:"
 
-#: po/tmp/evolution-mail.xml.h:39 po/tmp/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:43 ui/evolution-subscribe.xml.h:12
 #, fuzzy
 msgid "Select _All"
 msgstr "Vel mappe"
 
-#: po/tmp/evolution-mail.xml.h:40
+#: ui/evolution-mail.xml.h:44
 msgid "Send queued mail and retrieve new mail"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:41
+#: ui/evolution-mail.xml.h:45
+#, fuzzy
+msgid "Show _All messages"
+msgstr "Vidaresendt melding frц╔ %1"
+
+#: ui/evolution-mail.xml.h:46
 #, fuzzy
 msgid "Threaded Message list"
 msgstr "Vidaresendt melding frц╔ %1"
 
-#: po/tmp/evolution-mail.xml.h:42
+#: ui/evolution-mail.xml.h:47
 #, fuzzy
 msgid "VFolder on Se_nder"
 msgstr "Mappenamn:"
 
-#: po/tmp/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:48
 #, fuzzy
 msgid "VFolder on _Recipients"
 msgstr "Mappa finst: "
 
-#: po/tmp/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:49
 msgid "View Raw Message Source"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:50
 msgid "_Apply Filters"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:51
 msgid "_Configure Folder"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:52
 #, fuzzy
 msgid "_Copy to Folder..."
 msgstr "Kopier til mappe"
 
-#: po/tmp/evolution-mail.xml.h:49
+#: ui/evolution-mail.xml.h:54
 #, fuzzy
 msgid "_Edit Message"
 msgstr "Legg til melding"
 
-#: po/tmp/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:55
 msgid "_Expunge"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:56
 #, fuzzy
 msgid "_Filter on Subject"
 msgstr "Ingen emne"
 
-#: po/tmp/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:57
 #, fuzzy
 msgid "_Forward"
 msgstr "Fram"
 
-#: po/tmp/evolution-mail.xml.h:53 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:54
+#: ui/evolution-mail.xml.h:59
 #, fuzzy
-msgid "_Mail Configuration"
+msgid "_Mail Configuration..."
 msgstr "Oppsett"
 
-#: po/tmp/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:60
 #, fuzzy
 msgid "_Message"
 msgstr "Legg til melding"
 
-#: po/tmp/evolution-mail.xml.h:56
+#: ui/evolution-mail.xml.h:61
 #, fuzzy
 msgid "_Move to Folder..."
 msgstr "Flytt til mappe"
 
-#: po/tmp/evolution-mail.xml.h:57
+#: ui/evolution-mail.xml.h:62
 #, fuzzy
 msgid "_Open in New Window"
 msgstr "&Opna i eige vindauge"
 
-#: po/tmp/evolution-mail.xml.h:58
+#: ui/evolution-mail.xml.h:63
 #, fuzzy
 msgid "_Print Message"
 msgstr "Private meldingar"
 
-#: po/tmp/evolution-mail.xml.h:59
+#: ui/evolution-mail.xml.h:64
 #, fuzzy
 msgid "_Save Message As..."
 msgstr "Lagra melding"
 
-#: po/tmp/evolution-mail.xml.h:60
+#: ui/evolution-mail.xml.h:65
 #, fuzzy
 msgid "_Source"
 msgstr "Kjelder"
 
-#: po/tmp/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:66
 msgid "_Threaded"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:67
 #, fuzzy
 msgid "_Undelete"
 msgstr "Slett"
 
-#: po/tmp/evolution-mail.xml.h:63
+#: ui/evolution-mail.xml.h:68
 #, fuzzy
 msgid "_VFolder on Subject"
 msgstr "Ingen emne"
 
-#: po/tmp/evolution-mail.xml.h:64
-msgid "_Virtual Folder Editor"
-msgstr ""
+#: ui/evolution-mail.xml.h:69
+#, fuzzy
+msgid "_Virtual Folder Editor..."
+msgstr "Mapper"
 
 #.
-#. * 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
 #, fuzzy
 msgid "Attach"
 msgstr "&Legg ved"
 
-#: po/tmp/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:9
 #, fuzzy
 msgid "Close the current file"
 msgstr "tid no"
 
-#: po/tmp/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Encrypt this message with PGP"
+msgstr "Lagra melding"
+
+#: ui/evolution-message-composer.xml.h:12
 msgid "HTML"
 msgstr "HTML"
 
-#: po/tmp/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:13
 #, fuzzy
 msgid "Insert a file as text into the message"
 msgstr "Oppgi eit nytt namn pц╔ meldinga."
 
-#: po/tmp/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:14
 #, fuzzy
 msgid "Insert text file..."
 msgstr "Sett inn fil ..."
 
-#: po/tmp/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:16
 #, fuzzy
 msgid "Open a file"
 msgstr "Opna fil"
 
-#: po/tmp/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:17
+msgid "PGP Encrypt"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:18
+msgid "PGP Sign"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:20
 #, fuzzy
 msgid "Save As"
 msgstr "Lagra"
 
-#: po/tmp/evolution-message-composer.xml.h:19
+#: ui/evolution-message-composer.xml.h:22
 #, fuzzy
 msgid "Save in _folder... (FIXME)"
 msgstr "Lagrar fil ..."
 
-#: po/tmp/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:23
 #, fuzzy
 msgid "Save in folder..."
 msgstr "Lagrar fil ..."
 
-#: po/tmp/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:25
 #, fuzzy
 msgid "Save the current file with a different name"
 msgstr "Sender ei melding til ein nettverksspelar"
 
-#: po/tmp/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:26
 #, fuzzy
 msgid "Save the message in a specified folder"
 msgstr "Lagra side til ascii-fil"
 
-#: po/tmp/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "Send"
 
-#: po/tmp/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:28
 #, fuzzy
 msgid "Send _Later"
 msgstr "Send &seinare"
 
-#: po/tmp/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:29
 #, fuzzy
 msgid "Send _later"
 msgstr "Send &seinare"
 
-#: po/tmp/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:28
+#: ui/evolution-message-composer.xml.h:31
 #, fuzzy
 msgid "Send the message later"
 msgstr "Sen melding"
 
-#: po/tmp/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:32
 #, fuzzy
 msgid "Send the message now"
 msgstr "Sen melding"
 
-#: po/tmp/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:33
 #, fuzzy
 msgid "Send this message now"
 msgstr "Sen melding"
 
-#: po/tmp/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:34
 #, fuzzy
 msgid "Show / hide attachments"
 msgstr "Vedlegg som ikon"
 
-#: po/tmp/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:35
 #, fuzzy
 msgid "Show _attachments"
 msgstr "Vedlegg"
 
-#: po/tmp/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:36
 #, fuzzy
 msgid "Show attachments"
 msgstr "Vedlegg"
 
-#: po/tmp/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Sign this message with your PGP key"
+msgstr "Sender meldingar til %1"
+
+#: ui/evolution-message-composer.xml.h:44
 #, fuzzy
 msgid "_Insert text file... (FIXME)"
 msgstr "Sett inn fil ..."
 
-#: po/tmp/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:45
 #, fuzzy
 msgid "_Open..."
 msgstr "Opna ..."
 
+#: 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
 #, fuzzy
 msgid "E_xit"
 msgstr "Avslutt"
 
-#: po/tmp/evolution.xml.h:8
+#: ui/evolution.xml.h:8
 #, fuzzy
 msgid "Evolution bar _shortcut"
 msgstr "Evalueringsfeil"
 
-#: 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 "Starta"
 
-#: po/tmp/evolution.xml.h:11
+#: ui/evolution.xml.h:11
 msgid "Show information about Evolution"
 msgstr ""
 
-#: 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
 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 ""
 
-#: 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
 #, fuzzy
 msgid "Using the _Calendar"
 msgstr "Skriv ut alle"
 
-#: 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
 #, fuzzy
 msgid "_About Evolution..."
 msgstr "Opplц╦ysing"
 
-#: po/tmp/evolution.xml.h:22
+#: ui/evolution.xml.h:22
 #, fuzzy
 msgid "_Appointment (FIXME)"
 msgstr "Avtale"
 
-#: po/tmp/evolution.xml.h:23
+#: ui/evolution.xml.h:23
 #, fuzzy
 msgid "_Contact (FIXME)"
 msgstr "Comment=X-redigering"
 
-#: po/tmp/evolution.xml.h:26
+#: ui/evolution.xml.h:26
 #, fuzzy
 msgid "_Folder"
 msgstr "Mapper"
 
-#: po/tmp/evolution.xml.h:27
+#: ui/evolution.xml.h:27
 #, fuzzy
 msgid "_Go to Folder..."
 msgstr "Flytt til mappe"
 
-#: po/tmp/evolution.xml.h:29
+#: ui/evolution.xml.h:29
 #, fuzzy
 msgid "_Index"
 msgstr "Set inn"
 
-#: 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
 #, fuzzy
 msgid "_Settings"
 msgstr "Skriftinnstillingar"
 
-#: po/tmp/evolution.xml.h:33
+#: ui/evolution.xml.h:33
 msgid "_Task (FIXME)"
 msgstr ""
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2470
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
 msgid "%A, %B %d, %Y"
 msgstr ""
 
@@ -7177,31 +7574,37 @@ msgstr ""
 msgid "All Attendees"
 msgstr "Kontaktar"
 
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: widgets/misc/e-calendar-item.c:421
+msgid "MTWTFSS"
+msgstr ""
+
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
+#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
 #, fuzzy
 msgid "%B %Y"
 msgstr "%1 %2"
 
-#: widgets/misc/e-clipped-label.c:107
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr " ..."
 
-#: widgets/misc/e-dateedit.c:408
+#: widgets/misc/e-dateedit.c:407
 #, fuzzy
 msgid "Now"
 msgstr "&No"
 
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1249 widgets/misc/e-dateedit.c:1308
-#: widgets/misc/e-dateedit.c:1487
+#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
+#: widgets/misc/e-dateedit.c:1486
 #, fuzzy
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1252 widgets/misc/e-dateedit.c:1311
-#: widgets/misc/e-dateedit.c:1490
+#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
+#: widgets/misc/e-dateedit.c:1489
 #, fuzzy
 msgid "%I:%M %p"
 msgstr "%H:%M"
@@ -7211,6 +7614,323 @@ msgstr "%H:%M"
 msgid "Group %i"
 msgstr "Gruppe %1"
 
+#, fuzzy
+#~ msgid "categories"
+#~ msgstr "Kategoriar"
+
+#, fuzzy
+#~ msgid "Available Categories:"
+#~ msgstr "Tilgjengelege kategoriar"
+
+#, fuzzy
+#~ msgid "External Directories"
+#~ msgstr "Separate katalogar"
+
+#~ msgid "Port Number:"
+#~ msgstr "Portnummer:"
+
+#, fuzzy
+#~ msgid "Outline:"
+#~ msgstr "Oversikt"
+
+#, fuzzy
+#~ msgid "Headings:"
+#~ msgstr "Overskrift:"
+
+#, fuzzy
+#~ msgid "Empty days:"
+#~ msgstr " dag"
+
+#, fuzzy
+#~ msgid "Appointments:"
+#~ msgstr "Avtale"
+
+#, fuzzy
+#~ msgid "Highlighted day:"
+#~ msgstr "Opplysing:"
+
+#, fuzzy
+#~ msgid "Day numbers:"
+#~ msgstr "Hц╦gste tal"
+
+#, fuzzy
+#~ msgid "Current day's number:"
+#~ msgstr "Noverande namn:"
+
+#, fuzzy
+#~ msgid "To-Do item that is overdue:"
+#~ msgstr "Element i hugselista:"
+
+#, fuzzy
+#~ msgid "may"
+#~ msgstr "Mai"
+
+#, fuzzy
+#~ msgid "sept"
+#~ msgstr "Nullstill"
+
+#, fuzzy
+#~ msgid "sunday"
+#~ msgstr "Sundag"
+
+#, fuzzy
+#~ msgid "monday"
+#~ msgstr "Mц╔ndag"
+
+#, fuzzy
+#~ msgid "tuesday"
+#~ msgstr "Tysdag"
+
+#, fuzzy
+#~ msgid "tues"
+#~ msgstr "sann"
+
+#, fuzzy
+#~ msgid "wednesday"
+#~ msgstr "Onsdag"
+
+#, fuzzy
+#~ msgid "wednes"
+#~ msgstr "Sverige"
+
+#, fuzzy
+#~ msgid "thursday"
+#~ msgstr "Torsdag"
+
+#, fuzzy
+#~ msgid "thur"
+#~ msgstr "Anna"
+
+#, fuzzy
+#~ msgid "thurs"
+#~ msgstr "Andre"
+
+#, fuzzy
+#~ msgid "friday"
+#~ msgstr "Fredag"
+
+#, fuzzy
+#~ msgid "saturday"
+#~ msgstr "Laurdag"
+
+#, fuzzy
+#~ msgid "fortnight"
+#~ msgstr "hц╦gre"
+
+#, fuzzy
+#~ msgid "min"
+#~ msgstr " min"
+
+#, fuzzy
+#~ msgid "sec"
+#~ msgstr " sek"
+
+#, fuzzy
+#~ msgid "tomorrow"
+#~ msgstr "Comoros"
+
+#, fuzzy
+#~ msgid "yesterday"
+#~ msgstr "kvar dag"
+
+#~ msgid "today"
+#~ msgstr "i dag"
+
+#, fuzzy
+#~ msgid "last"
+#~ msgstr "Etternamn"
+
+#, fuzzy
+#~ msgid "this"
+#~ msgstr "er"
+
+#, fuzzy
+#~ msgid "next"
+#~ msgstr "Neste"
+
+#, fuzzy
+#~ msgid "first"
+#~ msgstr "Fц╦renamn"
+
+#, fuzzy
+#~ msgid "third"
+#~ msgstr "Anna"
+
+#, fuzzy
+#~ msgid "fourth"
+#~ msgstr "Munnar"
+
+#, fuzzy
+#~ msgid "fifth"
+#~ msgstr "Shift"
+
+#, fuzzy
+#~ msgid "sixth"
+#~ msgstr "Hц╦gre"
+
+#, fuzzy
+#~ msgid "seventh"
+#~ msgstr "partalssider"
+
+#, fuzzy
+#~ msgid "eighth"
+#~ msgstr "hц╦gd"
+
+#, fuzzy
+#~ msgid "ninth"
+#~ msgstr "int"
+
+#, fuzzy
+#~ msgid "tenth"
+#~ msgstr "1 tidel"
+
+#, fuzzy
+#~ msgid "eleventh"
+#~ msgstr "partalssider"
+
+#, fuzzy
+#~ msgid "ago"
+#~ msgstr "Tag"
+
+#~ msgid "Year:"
+#~ msgstr "ц┘r:"
+
+#, fuzzy
+#~ msgid "Mail Source"
+#~ msgstr "E-posttenar"
+
+#, fuzzy
+#~ msgid "Send \"%s\""
+#~ msgstr "Lagra: %s"
+
+#, fuzzy
+#~ msgid "Send a message without a subject"
+#~ msgstr "Sender ei melding til ein nettverksspelar"
+
+#, fuzzy
+#~ msgid "Marking messages in folder \"%s\""
+#~ msgstr "Markerer meldingar"
+
+#, fuzzy
+#~ msgid "Mark messages in folder \"%s\""
+#~ msgstr "Lag meldingar og slц╔ saman"
+
+#, fuzzy
+#~ msgid "Marking message %d of %d"
+#~ msgstr "Markerer meldingar"
+
+#, fuzzy
+#~ msgid "Scan folders in \"%s\""
+#~ msgstr "Lag ny mappe i %1"
+
+#, fuzzy
+#~ msgid "Attaching messages from folder \"%s\""
+#~ msgstr "Mottek meldingar frц╔ %1"
+
+#, fuzzy
+#~ msgid "Attach messages from \"%s\""
+#~ msgstr "Melding frц╔ %s"
+
+#, fuzzy
+#~ msgid "Forwarding messages \"%s\""
+#~ msgstr "Markerer meldingar"
+
+#, fuzzy
+#~ msgid "Forwarding a message without a subject"
+#~ msgstr "advarsel: denne meldinga er ikkje brukt"
+
+#, fuzzy
+#~ msgid "Forward message \"%s\""
+#~ msgstr "Vidaresendt melding"
+
+#, fuzzy
+#~ msgid "Forward a message without a subject"
+#~ msgstr "Vidaresendt melding frц╔ %1"
+
+#, fuzzy
+#~ msgid "Loading \"%s\""
+#~ msgstr "Lastar meldingar"
+
+#, fuzzy
+#~ msgid "Load \"%s\""
+#~ msgstr "Last inn"
+
+#, fuzzy
+#~ msgid "Creating \"%s\""
+#~ msgstr "Lagar"
+
+#, fuzzy
+#~ msgid "Create \"%s\""
+#~ msgstr "Laga"
+
+#, fuzzy
+#~ msgid "Synchronize \"%s\""
+#~ msgstr "Synkroniser"
+
+#, fuzzy
+#~ msgid "Displaying message UID \"%s\""
+#~ msgstr "Vis meldingstorleik"
+
+#, fuzzy
+#~ msgid "Clearing message display"
+#~ msgstr "Markerer meldingar"
+
+#, fuzzy
+#~ msgid "Display message UID \"%s\""
+#~ msgstr "Vis meldingstorleik"
+
+#, fuzzy
+#~ msgid "Clear message display"
+#~ msgstr "Endra tidsvising"
+
+#, fuzzy
+#~ msgid "Opening messages from folder \"%s\""
+#~ msgstr "Mottek meldingar frц╔ %1"
+
+#, fuzzy
+#~ msgid "Open messages from \"%s\""
+#~ msgstr "Melding frц╔ %s"
+
+#, fuzzy
+#~ msgid "Viewing messages from folder \"%s\""
+#~ msgstr "Mottek meldingar frц╔ %1"
+
+#, fuzzy
+#~ msgid "View messages from \"%s\""
+#~ msgstr "Melding frц╔ %s"
+
+#, fuzzy
+#~ msgid "Retrieving message %d of %d (uid \"%s\")"
+#~ msgstr "Mottek meldingar frц╔ %1"
+
+#, fuzzy
+#~ msgid "Saving messages from folder \"%s\""
+#~ msgstr "Mottek meldingar frц╔ %1"
+
+#, fuzzy
+#~ msgid "Save messages from folder \"%s\""
+#~ msgstr "Mottek meldingar frц╔ %1"
+
+#, fuzzy
+#~ msgid "Rebuilding message view"
+#~ msgstr "Feil ved skriving av band-ID."
+
+#, fuzzy
+#~ msgid "Rebuild message view"
+#~ msgstr "Sen melding"
+
+#, fuzzy
+#~ msgid "N_ew Directory Server"
+#~ msgstr "Diskusjonsgruppetenarar"
+
+#, fuzzy
+#~ msgid "_Actions"
+#~ msgstr "Handlingar"
+
+#, fuzzy
+#~ msgid "_Save Calendar As"
+#~ msgstr "Ny kalender"
+
 #~ msgid "(C) 1998 the Free Software Foundation"
 #~ msgstr "(C) 1998 the Free Software Foundation"
 
@@ -7225,12 +7945,6 @@ msgstr "Gruppe %1"
 #~ msgstr "Feil ved tilkopling til tenar."
 
 #, fuzzy
-#~ msgid ""
-#~ "Are you sure you want\n"
-#~ "to delete this contact?"
-#~ msgstr "Er du sikker pц╔ at du vil sletta denne klassen?"
-
-#, fuzzy
 #~ msgid "_Street Address:"
 #~ msgstr "Gateadresse"
 
@@ -7319,9 +8033,6 @@ msgstr "Gruppe %1"
 #~ msgid "Transparency"
 #~ msgstr "Gjennomsiktig "
 
-#~ msgid "URL"
-#~ msgstr "URL"
-
 #, fuzzy
 #~ msgid "FIXME: Ca_lendar..."
 #~ msgstr "&Slц╔ saman kalender ..."
@@ -7387,9 +8098,6 @@ msgstr "Gruppe %1"
 #~ msgid "Due Date:"
 #~ msgstr "Forfallsdato:"
 
-#~ msgid "Priority:"
-#~ msgstr "Prioritet:"
-
 #, fuzzy
 #~ msgid "Time display"
 #~ msgstr "Endra tidsvising"
@@ -7449,9 +8157,6 @@ msgstr "Gruppe %1"
 #~ msgid "Search..."
 #~ msgstr "Sц╦k ..."
 
-#~ msgid "Name"
-#~ msgstr "Namn"
-
 #, fuzzy
 #~ msgid "To: >>"
 #~ msgstr "Til:"
@@ -7497,14 +8202,6 @@ msgstr "Gruppe %1"
 #~ msgstr "Comment=E-postredigering"
 
 #, fuzzy
-#~ msgid "Send this message"
-#~ msgstr "Sen melding"
-
-#, fuzzy
-#~ msgid "Cannot initialize Evolution's mail summary component."
-#~ msgstr "Kan ikkje initialisera lokale variablar"
-
-#, fuzzy
 #~ msgid "Run filter \"%s\""
 #~ msgstr "Inga slik fil \"%s\"!"
 
@@ -7520,11 +8217,3 @@ msgstr "Gruppe %1"
 #, fuzzy
 #~ msgid "Forward Message"
 #~ msgstr "Vidaresendt melding"
-
-#, fuzzy
-#~ msgid "Delete Message"
-#~ msgstr "Neste melding"
-
-#, fuzzy
-#~ msgid "Move Message"
-#~ msgstr "Lagra melding"
diff --git a/po/no.po b/po/no.po
index 0dcb209203..884e6344b1 100644
--- a/po/no.po
+++ b/po/no.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.8\n"
-"POT-Creation-Date: 2000-12-25 10:46+0100\n"
-"PO-Revision-Date: 2000-12-25 10:49+01:00\n"
+"POT-Creation-Date: 2001-01-09 13:25+0100\n"
+"PO-Revision-Date: 2001-01-09 13:28+01:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -307,7 +307,7 @@ msgstr ""
 #: addressbook/conduit/address-conduit.c:1083
 #: addressbook/gui/component/addressbook-factory.c:38
 #: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
+#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:55
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikke initialisere Bonobo"
 
@@ -455,28 +455,7 @@ msgstr "Kunne ikke starte wombat"
 msgid "Could not read pilot's Address application block"
 msgstr "Kunne ikke lese pilotens adresseapplikasjonsblokk"
 
-#.
-#. * 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 "kategorier"
-
-#: addressbook/contact-editor/categories-strings.h:8
-msgid "Item(s) belong to these categories:"
-msgstr "OppfЬring(er) hЬrer til disse kategoriene:"
-
-#: addressbook/contact-editor/categories-strings.h:9
-msgid "Available Categories:"
-msgstr "Tilgjengelige kategorier:"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * 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:1
 msgid "Delete Contact?"
 msgstr "Slett kontakt?"
 
@@ -490,7 +469,7 @@ msgid "_Add"
 msgstr "_Legg til"
 
 #: 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:103 ui/evolution-mail.xml.h:48
 msgid "_Delete"
 msgstr "_Slett"
 
@@ -503,13 +482,10 @@ msgstr "Telefontyper"
 msgid "New phone type"
 msgstr "Ny telefontype"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * 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:1
+#: calendar/gui/event-editor-dialog.glade.h:2 filter/filter.glade.h:1
+#: mail/mail-config-druid.glade.h:5 mail/mail-config.glade.h:1
 msgid "Add"
 msgstr "Legg til"
 
@@ -550,7 +526,7 @@ msgid "_Mobile"
 msgstr "_Mobil"
 
 #: 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 "PrimФr e-post"
 
@@ -567,7 +543,8 @@ msgid "C_ontacts..."
 msgstr "K_ontakter..."
 
 #: 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:3
+#: calendar/gui/event-editor-dialog.glade.h:4
 msgid "Ca_tegories..."
 msgstr "Ka_tegorier..."
 
@@ -584,7 +561,8 @@ msgid "_Address..."
 msgstr "_Adresse..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: po/tmp/event-editor-dialog.glade.h:15
+#: calendar/gui/event-editor-dialog.glade.h:11
+#: mail/mail-config-druid.glade.h:26
 msgid "General"
 msgstr "Generell"
 
@@ -629,143 +607,139 @@ msgid "No_tes:"
 msgstr "No_tater:"
 
 #: 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:8
 msgid "Details"
 msgstr "Detaljer"
 
-#: addressbook/contact-editor/e-contact-editor.c:1266
+#: addressbook/contact-editor/e-contact-editor.c:1274
 msgid "Assistant"
 msgstr "Assistent"
 
-#: 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 "Arbeid"
 
-#: addressbook/contact-editor/e-contact-editor.c:1268
+#: addressbook/contact-editor/e-contact-editor.c:1276
 msgid "Business 2"
 msgstr "Arbeid 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1269
+#: addressbook/contact-editor/e-contact-editor.c:1277
 msgid "Business Fax"
 msgstr "Faks pЕ arbeid"
 
-#: addressbook/contact-editor/e-contact-editor.c:1270
+#: addressbook/contact-editor/e-contact-editor.c:1278
 msgid "Callback"
 msgstr "Tilbakering"
 
-#: addressbook/contact-editor/e-contact-editor.c:1271
+#: addressbook/contact-editor/e-contact-editor.c:1279
 msgid "Car"
 msgstr "Bil"
 
-#: addressbook/contact-editor/e-contact-editor.c:1272
+#: addressbook/contact-editor/e-contact-editor.c:1280
 msgid "Company"
 msgstr "Firma"
 
-#: 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 "Hjemme"
 
-#: addressbook/contact-editor/e-contact-editor.c:1274
+#: addressbook/contact-editor/e-contact-editor.c:1282
 msgid "Home 2"
 msgstr "Hjemme 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1275
+#: addressbook/contact-editor/e-contact-editor.c:1283
 msgid "Home Fax"
 msgstr "Faks hjemme"
 
-#: 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 "Mobil"
 
-#: 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:12
 msgid "Other"
 msgstr "Annet"
 
-#: addressbook/contact-editor/e-contact-editor.c:1279
+#: addressbook/contact-editor/e-contact-editor.c:1287
 msgid "Other Fax"
 msgstr "Annen faks"
 
-#: addressbook/contact-editor/e-contact-editor.c:1280
+#: addressbook/contact-editor/e-contact-editor.c:1288
 msgid "Pager"
 msgstr "PersonsЬker"
 
-#: addressbook/contact-editor/e-contact-editor.c:1281
+#: addressbook/contact-editor/e-contact-editor.c:1289
 msgid "Primary"
 msgstr "PrimФr"
 
-#: addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/contact-editor/e-contact-editor.c:1290
 msgid "Radio"
 msgstr "Radio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/contact-editor/e-contact-editor.c:1291
 msgid "Telex"
 msgstr "Teleks"
 
-#: addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/contact-editor/e-contact-editor.c:1292
 msgid "TTY/TDD"
 msgstr "TTY/TTD"
 
-#: addressbook/contact-editor/e-contact-editor.c:1329
+#: addressbook/contact-editor/e-contact-editor.c:1337
 msgid "Email 2"
 msgstr "E-post 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1330
+#: addressbook/contact-editor/e-contact-editor.c:1338
 msgid "Email 3"
 msgstr "E-post 3"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/fulladdr.glade.h:6
+#: addressbook/contact-editor/fulladdr.glade.h:1
 msgid "Address _2:"
 msgstr "Adresse _2:"
 
-#: po/tmp/fulladdr.glade.h:7
+#: addressbook/contact-editor/fulladdr.glade.h:2
 msgid "Canada"
 msgstr "Kanada"
 
-#: po/tmp/fulladdr.glade.h:8
+#: addressbook/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "Sjekk adresse"
 
-#: po/tmp/fulladdr.glade.h:9
+#: addressbook/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "Lan_d:"
 
-#: po/tmp/fulladdr.glade.h:10
+#: addressbook/contact-editor/fulladdr.glade.h:5
 msgid "Finland"
 msgstr "Finland"
 
-#: po/tmp/fulladdr.glade.h:11
+#: addressbook/contact-editor/fulladdr.glade.h:6
 msgid "USA"
 msgstr "USA"
 
-#: po/tmp/fulladdr.glade.h:12
+#: addressbook/contact-editor/fulladdr.glade.h:7
 msgid "_Address:"
 msgstr "_Adresse:"
 
-#: po/tmp/fulladdr.glade.h:13
+#: addressbook/contact-editor/fulladdr.glade.h:8
 msgid "_City:"
 msgstr "_By:"
 
-#: po/tmp/fulladdr.glade.h:14
+#: addressbook/contact-editor/fulladdr.glade.h:9
 msgid "_PO Box:"
 msgstr "_Postboks:"
 
-#: po/tmp/fulladdr.glade.h:15
+#: addressbook/contact-editor/fulladdr.glade.h:10
 msgid "_State/Province:"
 msgstr "_Stat/Provins:"
 
-#: po/tmp/fulladdr.glade.h:16
+#: addressbook/contact-editor/fulladdr.glade.h:11
 msgid "_ZIP Code:"
 msgstr "_ZIP/Postnummer:"
 
@@ -832,24 +806,25 @@ msgstr "_Etternavn:"
 msgid "_Suffix:"
 msgstr "_Suffiks:"
 
-#: addressbook/gui/component/addressbook.c:263
+#: addressbook/gui/component/addressbook.c:231
 msgid "As _Minicards"
 msgstr "Som _minikort"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: addressbook/gui/component/addressbook.c:269
-#: po/tmp/evolution-addressbook.xml.h:6
+#: addressbook/gui/component/addressbook.c:237
+#: ui/evolution-addressbook.xml.h:1
 msgid "As _Table"
 msgstr "Som _tabell"
 
-#: addressbook/gui/component/addressbook.c:386
+#: addressbook/gui/component/addressbook.c:374
+#, c-format
+msgid "Enter password for %s"
+msgstr "Skriv inn passord for %s"
+
+#: addressbook/gui/component/addressbook.c:402
 msgid "Unable to open addressbook"
 msgstr "Kunne ikke Еpne adresseboken"
 
-#: addressbook/gui/component/addressbook.c:391
+#: 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"
@@ -870,198 +845,304 @@ msgstr ""
 "installere OpenLDAP, deretter mЕ du kompilere og\n"
 "installere Evolution pЕ nytt.\n"
 
-#: addressbook/gui/component/addressbook.c:501 mail/folder-browser.c:136
+#: addressbook/gui/component/addressbook.c:528 mail/folder-browser.c:219
 msgid "Show All"
 msgstr "Vis alle"
 
-#: addressbook/gui/component/addressbook.c:503 mail/folder-browser.c:138
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 msgid "Advanced..."
 msgstr "Avansert..."
 
-#: addressbook/gui/component/addressbook.c:533
+#: addressbook/gui/component/addressbook.c:560
 msgid "Any field contains"
 msgstr "Et felt inneholder"
 
-#: addressbook/gui/component/addressbook.c:534
+#: addressbook/gui/component/addressbook.c:561
 msgid "Name contains"
 msgstr "Navn inneholder"
 
-#: addressbook/gui/component/addressbook.c:535
+#: addressbook/gui/component/addressbook.c:562
 msgid "Email contains"
 msgstr "E-post inneholder"
 
-#: addressbook/gui/component/addressbook.c:621
+#: addressbook/gui/component/addressbook.c:648
 msgid "The URI that the Folder Browser will display"
 msgstr "URIen som mappeutforskeren vil vise"
 
-#: addressbook/gui/component/e-ldap-storage.c:88
-msgid "External Directories"
-msgstr "Eksterne kataloger"
+#: addressbook/gui/component/addressbook-storage.c:95
+msgid "Other Contacts"
+msgstr "Andre kontakter"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/e-msg-composer-attachment.glade.h:7
-#: po/tmp/ldap-server-dialog.glade.h:6
-msgid "Description:"
-msgstr "Beskrivelse:"
+#: addressbook/gui/component/addressbook-config.c:139
+msgid "LDAP Server"
+msgstr "LDAP-tjener"
 
-#: po/tmp/ldap-server-dialog.glade.h:7
-msgid "LDAP Server:"
-msgstr "LDAP-tjener:"
+#: addressbook/gui/component/addressbook-config.c:141
+msgid "File"
+msgstr "Fil"
 
-#: po/tmp/ldap-server-dialog.glade.h:8
-msgid "Name:"
-msgstr "Navn:"
+#: addressbook/gui/component/addressbook-config.c:144
+msgid "Unknown addressbook type"
+msgstr "Ukjent type adressebok"
+
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "None (anonymous mode)"
+msgstr "Ingen (anonym modus)"
+
+#: 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 "Passord"
+
+#: addressbook/gui/component/addressbook-config.c:157
+msgid "SASL"
+msgstr "SASL"
+
+#: addressbook/gui/component/addressbook-config.c:160
+msgid "Unknown auth type"
+msgstr "Ukjent autentiseringstype"
+
+#: addressbook/gui/component/addressbook-config.c:169
+msgid "Base"
+msgstr "Basis"
+
+#: addressbook/gui/component/addressbook-config.c:171
+msgid "One"
+msgstr "En"
+
+#: addressbook/gui/component/addressbook-config.c:173
+msgid "Subtree"
+msgstr "Undertre"
+
+#: addressbook/gui/component/addressbook-config.c:176
+msgid "Unknown scope type"
+msgstr "Ukjent type omrЕde"
+
+#: addressbook/gui/component/addressbook-config.c:309
+msgid "Bind DN:"
+msgstr "Bind DN:"
 
-#: po/tmp/ldap-server-dialog.glade.h:9
-msgid "Port Number:"
-msgstr "Portnummer:"
+#: addressbook/gui/component/addressbook-config.c:311
+#: mail/mail-config-gui.c:968
+msgid "Remember this password"
+msgstr "Husk dette passordet"
 
-#: po/tmp/ldap-server-dialog.glade.h:10
+#: addressbook/gui/component/addressbook-config.c:360
+#: mail/mail-config-druid.glade.h:27
+msgid "Host:"
+msgstr "Vert:"
+
+#: addressbook/gui/component/addressbook-config.c:361
+msgid "Port:"
+msgstr "Port:"
+
+#: addressbook/gui/component/addressbook-config.c:364
 msgid "Root DN:"
 msgstr "Rot DN:"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/select-names.glade.h:6
+#: addressbook/gui/component/addressbook-config.c:384
+msgid "Search Scope:"
+msgstr "SЬkeomrЕde:"
+
+#: addressbook/gui/component/addressbook-config.c:438
+#: mail/mail-config-druid.glade.h:9 mail/mail-config-gui.c:943
+msgid "Authentication:"
+msgstr "Autentisering:"
+
+#: addressbook/gui/component/addressbook-config.c:455
+#: mail/mail-config-druid.glade.h:46 mail/mail-config-gui.c:934
+msgid "Path:"
+msgstr "Sti:"
+
+#: addressbook/gui/component/addressbook-config.c:460
+msgid "Create path if it doesn't exist."
+msgstr "Opprett sti hvis den ikke eksisterer."
+
+#: addressbook/gui/component/addressbook-config.c:593
+msgid "Edit Addressbook"
+msgstr "RedigИr adressebok"
+
+#: addressbook/gui/component/addressbook-config.c:595
+msgid "Add Addressbook"
+msgstr "Legg til adressebok"
+
+#: addressbook/gui/component/addressbook-config.c:611
+msgid ""
+"Select the kind of addressbook you have, and enter the relevant information "
+"about it."
+msgstr "Velg type adressebok du har, og skriv inn relevant informasjon om den."
+
+#: addressbook/gui/component/addressbook-config.c:616
+#: mail/mail-config-druid.glade.h:39
+msgid "Name:"
+msgstr "Navn:"
+
+#: addressbook/gui/component/addressbook-config.c:617
+#: composer/e-msg-composer-attachment.glade.h:2
+msgid "Description:"
+msgstr "Beskrivelse:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:2
+msgid "Addressbook Sources"
+msgstr "Adressebok-kilder"
+
+#: addressbook/gui/component/addressbook-config.glade.h:3
+#: calendar/gui/e-calendar-table.c:342
+#: calendar/gui/event-editor-dialog.glade.h:8 filter/filter.glade.h:2
+#: filter/libfilter-i18n.h:10 mail/folder-browser.c:685
+#: mail/mail-config-druid.glade.h:19 mail/mail-config.glade.h:3
+#: mail/mail-view.c:150 ui/evolution-addressbook.xml.h:3
+#: ui/evolution-event-editor.xml.h:14 ui/evolution-mail.xml.h:6
+msgid "Delete"
+msgstr "Slett"
+
+#: addressbook/gui/component/addressbook-config.glade.h:4
+#: filter/filter.glade.h:3 mail/folder-browser.c:671
+#: mail/mail-config-druid.glade.h:22 mail/mail-config.glade.h:4
+msgid "Edit"
+msgstr "RedigИr"
+
+#: addressbook/gui/component/addressbook-config.glade.h:5
+msgid "Name"
+msgstr "Navn"
+
+#: addressbook/gui/component/addressbook-config.glade.h:6
+msgid "URI"
+msgstr "URI"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:1
 msgid "Find..."
 msgstr "Finn..."
 
-#: po/tmp/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "Message Recipients"
 msgstr "Meldingsmottakere:"
 
-#: po/tmp/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:3
 msgid "Select Names"
 msgstr "Velg navn"
 
-#: po/tmp/select-names.glade.h:9
-msgid "Select name from List:"
-msgstr "Velg navn fra liste:"
+#: addressbook/gui/component/select-names/select-names.glade.h:4
+msgid "Select name from:"
+msgstr "Velg navn fra:"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:147
 #: mail/mail-search-dialogue.c:104
 msgid "Search"
 msgstr "SЬk"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/alphabet.glade.h:6
+#: addressbook/gui/widgets/alphabet.glade.h:1
 msgid "123"
 msgstr "123"
 
-#: po/tmp/alphabet.glade.h:7
+#: addressbook/gui/widgets/alphabet.glade.h:2
 msgid "a"
 msgstr "a"
 
-#: po/tmp/alphabet.glade.h:8
+#: addressbook/gui/widgets/alphabet.glade.h:3
 msgid "b"
 msgstr "b"
 
-#: po/tmp/alphabet.glade.h:9
+#: addressbook/gui/widgets/alphabet.glade.h:4
 msgid "c"
 msgstr "c"
 
-#: po/tmp/alphabet.glade.h:10
+#: addressbook/gui/widgets/alphabet.glade.h:5
 msgid "d"
 msgstr "d"
 
-#: po/tmp/alphabet.glade.h:11
+#: addressbook/gui/widgets/alphabet.glade.h:6
 msgid "e"
 msgstr "e"
 
-#: po/tmp/alphabet.glade.h:12
+#: addressbook/gui/widgets/alphabet.glade.h:7
 msgid "f"
 msgstr "f"
 
-#: po/tmp/alphabet.glade.h:13
+#: addressbook/gui/widgets/alphabet.glade.h:8
 msgid "g"
 msgstr "g"
 
-#: po/tmp/alphabet.glade.h:14
+#: addressbook/gui/widgets/alphabet.glade.h:9
 msgid "h"
 msgstr "h"
 
-#: po/tmp/alphabet.glade.h:15
+#: addressbook/gui/widgets/alphabet.glade.h:10
 msgid "i"
 msgstr "i"
 
-#: po/tmp/alphabet.glade.h:16
+#: addressbook/gui/widgets/alphabet.glade.h:11
 msgid "j"
 msgstr "j"
 
-#: po/tmp/alphabet.glade.h:17
+#: addressbook/gui/widgets/alphabet.glade.h:12
 msgid "k"
 msgstr "k"
 
-#: po/tmp/alphabet.glade.h:18
+#: addressbook/gui/widgets/alphabet.glade.h:13
 msgid "l"
 msgstr "l"
 
-#: po/tmp/alphabet.glade.h:19
+#: addressbook/gui/widgets/alphabet.glade.h:14
 msgid "m"
 msgstr "m"
 
-#: po/tmp/alphabet.glade.h:20
+#: addressbook/gui/widgets/alphabet.glade.h:15
 msgid "n"
 msgstr "n"
 
-#: po/tmp/alphabet.glade.h:21
+#: addressbook/gui/widgets/alphabet.glade.h:16
 msgid "o"
 msgstr "o"
 
-#: po/tmp/alphabet.glade.h:22
+#: addressbook/gui/widgets/alphabet.glade.h:17
 msgid "p"
 msgstr "p"
 
-#: po/tmp/alphabet.glade.h:23
+#: addressbook/gui/widgets/alphabet.glade.h:18
 msgid "q"
 msgstr "q"
 
-#: po/tmp/alphabet.glade.h:24
+#: addressbook/gui/widgets/alphabet.glade.h:19
 msgid "r"
 msgstr "r"
 
-#: po/tmp/alphabet.glade.h:25
+#: addressbook/gui/widgets/alphabet.glade.h:20
 msgid "s"
 msgstr "s"
 
-#: po/tmp/alphabet.glade.h:26
+#: addressbook/gui/widgets/alphabet.glade.h:21
 msgid "t"
 msgstr "t"
 
-#: po/tmp/alphabet.glade.h:27
+#: addressbook/gui/widgets/alphabet.glade.h:22
 msgid "u"
 msgstr "u"
 
-#: po/tmp/alphabet.glade.h:28
+#: addressbook/gui/widgets/alphabet.glade.h:23
 msgid "v"
 msgstr "v"
 
-#: po/tmp/alphabet.glade.h:29
+#: addressbook/gui/widgets/alphabet.glade.h:24
 msgid "w"
 msgstr "w"
 
-#: po/tmp/alphabet.glade.h:30
+#: addressbook/gui/widgets/alphabet.glade.h:25
 msgid "x"
 msgstr "x"
 
-#: po/tmp/alphabet.glade.h:31
+#: addressbook/gui/widgets/alphabet.glade.h:26
 msgid "y"
 msgstr "y"
 
-#: po/tmp/alphabet.glade.h:32
+#: addressbook/gui/widgets/alphabet.glade.h:27
 msgid "z"
 msgstr "z"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:451
-#: addressbook/gui/widgets/e-minicard.c:338
+#: addressbook/gui/widgets/e-minicard.c:374
 msgid "Save as VCard"
 msgstr "Lagre som VCard"
 
@@ -1083,175 +1164,172 @@ msgstr ""
 "\n"
 "Dobbelklikk her for Е opprette en ny kontakt."
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * 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:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
 
-#: po/tmp/e-contact-print.glade.h:7
+#: addressbook/printing/e-contact-print.glade.h:2
 msgid "8 pt. Tahoma"
 msgstr "8 pt. Tahoma"
 
-#: po/tmp/e-contact-print.glade.h:8
+#: addressbook/printing/e-contact-print.glade.h:3
 msgid "Blank forms at end:"
 msgstr "Blanke skjema pЕ slutten:"
 
-#: po/tmp/e-contact-print.glade.h:9
+#: addressbook/printing/e-contact-print.glade.h:4
 msgid "Body"
 msgstr "Kropp"
 
-#: po/tmp/e-contact-print.glade.h:10
+#: addressbook/printing/e-contact-print.glade.h:5
 msgid "Bottom:"
 msgstr "Bunn:"
 
-#: po/tmp/e-contact-print.glade.h:11
+#: addressbook/printing/e-contact-print.glade.h:6
 msgid "Dimensions:"
 msgstr "Dimensjoner:"
 
-#: po/tmp/e-contact-print.glade.h:12
+#: addressbook/printing/e-contact-print.glade.h:7
 msgid "Font..."
 msgstr "Skrifttype..."
 
-#: po/tmp/e-contact-print.glade.h:13
+#: addressbook/printing/e-contact-print.glade.h:8
 msgid "Fonts"
 msgstr "Skrifttyper"
 
-#: po/tmp/e-contact-print.glade.h:14
+#: addressbook/printing/e-contact-print.glade.h:9
 msgid "Footer:"
 msgstr "Bunntekst:"
 
-#: po/tmp/e-contact-print.glade.h:15
+#: addressbook/printing/e-contact-print.glade.h:10
 msgid "Format"
 msgstr "Format"
 
-#: po/tmp/e-contact-print.glade.h:16
+#: addressbook/printing/e-contact-print.glade.h:11
 msgid "Header"
 msgstr "Topptekst"
 
-#: po/tmp/e-contact-print.glade.h:17
+#: addressbook/printing/e-contact-print.glade.h:12
 msgid "Header/Footer"
 msgstr "Topp-/bunntekst"
 
-#: po/tmp/e-contact-print.glade.h:18
+#: addressbook/printing/e-contact-print.glade.h:13
 msgid "Headings"
 msgstr "Topptekster"
 
-#: po/tmp/e-contact-print.glade.h:19
+#: addressbook/printing/e-contact-print.glade.h:14
 msgid "Headings for each letter"
 msgstr "Topptekst for hver bokstav"
 
-#: po/tmp/e-contact-print.glade.h:20
+#: addressbook/printing/e-contact-print.glade.h:15
 msgid "Height:"
 msgstr "HЬyde:"
 
-#: po/tmp/e-contact-print.glade.h:21
+#: addressbook/printing/e-contact-print.glade.h:16
 msgid "Immediately follow each other"
 msgstr "Rett etter hverandre"
 
-#: po/tmp/e-contact-print.glade.h:22
+#: addressbook/printing/e-contact-print.glade.h:17
 msgid "Include:"
 msgstr "Inkluder:"
 
-#: po/tmp/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:18
 msgid "Landscape"
 msgstr "Landskap"
 
-#: po/tmp/e-contact-print.glade.h:24
+#: addressbook/printing/e-contact-print.glade.h:19
 msgid "Left:"
 msgstr "Venstre:"
 
-#: po/tmp/e-contact-print.glade.h:25
+#: addressbook/printing/e-contact-print.glade.h:20
 msgid "Letter tabs on side"
 msgstr "Bokstavfaner pЕ siden"
 
-#: po/tmp/e-contact-print.glade.h:26
+#: addressbook/printing/e-contact-print.glade.h:21
 msgid "Margins"
 msgstr "Marger"
 
-#: po/tmp/e-contact-print.glade.h:27
+#: addressbook/printing/e-contact-print.glade.h:22
 msgid "Number of columns:"
 msgstr "Antall kolonner:"
 
-#: po/tmp/e-contact-print.glade.h:28
+#: addressbook/printing/e-contact-print.glade.h:23
 msgid "Options"
 msgstr "Alternativer"
 
-#: po/tmp/e-contact-print.glade.h:29
+#: addressbook/printing/e-contact-print.glade.h:24
 msgid "Orientation"
 msgstr "Orientering"
 
-#: po/tmp/e-contact-print.glade.h:30
+#: addressbook/printing/e-contact-print.glade.h:25
 msgid "Page"
 msgstr "Side"
 
-#: po/tmp/e-contact-print.glade.h:31
+#: addressbook/printing/e-contact-print.glade.h:26
 msgid "Page Setup:"
 msgstr "Sideoppsett"
 
-#: po/tmp/e-contact-print.glade.h:32
+#: addressbook/printing/e-contact-print.glade.h:27
 msgid "Paper"
 msgstr "Papir"
 
-#: po/tmp/e-contact-print.glade.h:33
+#: addressbook/printing/e-contact-print.glade.h:28
 msgid "Paper source:"
 msgstr "Papirkilde:"
 
-#: po/tmp/e-contact-print.glade.h:34
+#: addressbook/printing/e-contact-print.glade.h:29
 msgid "Portrait"
 msgstr "Portrett"
 
-#: po/tmp/e-contact-print.glade.h:35
+#: addressbook/printing/e-contact-print.glade.h:30
 msgid "Preview:"
 msgstr "ForhЕndsvis:"
 
-#: po/tmp/e-contact-print.glade.h:36
+#: addressbook/printing/e-contact-print.glade.h:31
 msgid "Print using gray shading"
 msgstr "Skriv ut med grЕtoner"
 
-#: po/tmp/e-contact-print.glade.h:37
+#: addressbook/printing/e-contact-print.glade.h:32
 msgid "Reverse on even pages"
 msgstr "Motsatt pЕ like sider"
 
-#: po/tmp/e-contact-print.glade.h:38
+#: addressbook/printing/e-contact-print.glade.h:33
 msgid "Right:"
 msgstr "HЬyre:"
 
-#: po/tmp/e-contact-print.glade.h:39
+#: addressbook/printing/e-contact-print.glade.h:34
 msgid "Sections:"
 msgstr "Seksjoner:"
 
-#: po/tmp/e-contact-print.glade.h:40
+#: addressbook/printing/e-contact-print.glade.h:35
 msgid "Shading"
 msgstr "Skyggelegging"
 
-#: po/tmp/e-contact-print.glade.h:41
+#: addressbook/printing/e-contact-print.glade.h:36
 msgid "Size:"
 msgstr "StЬrrelse:"
 
-#: po/tmp/e-contact-print.glade.h:42
+#: addressbook/printing/e-contact-print.glade.h:37
 msgid "Start on a new page"
 msgstr "Start pЕ en ny side"
 
-#: po/tmp/e-contact-print.glade.h:43
+#: addressbook/printing/e-contact-print.glade.h:38
 msgid "Style name:"
 msgstr "Stilnavn:"
 
-#: po/tmp/e-contact-print.glade.h:44
+#: addressbook/printing/e-contact-print.glade.h:39
 msgid "Top:"
 msgstr "Topp:"
 
-#: po/tmp/e-contact-print.glade.h:45
+#: addressbook/printing/e-contact-print.glade.h:40
+#: mail/mail-config-druid.glade.h:68
 msgid "Type:"
 msgstr "Type:"
 
-#: po/tmp/e-contact-print.glade.h:46
+#: addressbook/printing/e-contact-print.glade.h:41
 msgid "Width:"
 msgstr "Bredde:"
 
-#: po/tmp/e-contact-print.glade.h:47
+#: addressbook/printing/e-contact-print.glade.h:42
 msgid "label26"
 msgstr "etikett26"
 
@@ -1286,118 +1364,143 @@ msgstr "KonfigurasjonsverktЬy for evolutions oppgavelistekomponent.\n"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunne ikke lese pilotens applikasjonsblokk for oppgaveliste"
 
-#: calendar/gui/calendar-commands.c:60
-msgid "Outline:"
-msgstr "Omriss:"
+#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:1
+msgid "A sample Bonobo control which displays an calendar."
+msgstr "Eksempel pЕ Bonobo-kontroll som viser en kalender."
+
+#: calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in.h:2
+msgid "Factory for the sample Calendar control"
+msgstr "Factory for eksempelkontroll for kalender"
+
+#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:1
+msgid "Calendar Repository"
+msgstr "Kalenderlager"
 
-#: calendar/gui/calendar-commands.c:61
-msgid "Headings:"
-msgstr "Topptekster:"
+#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:2
+msgid "Calendar Server"
+msgstr "Kalendertjener"
 
-#: calendar/gui/calendar-commands.c:62
-msgid "Empty days:"
-msgstr "Tomme dager:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+msgid "Evolution calendar executive summary component."
+msgstr "Evolution komponent for kalendersammendrag."
 
-#: calendar/gui/calendar-commands.c:63
-msgid "Appointments:"
-msgstr "Avtaler:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Evolution kalender iTip/iMip-visning"
 
-#: calendar/gui/calendar-commands.c:64
-msgid "Highlighted day:"
-msgstr "Merket dag:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+msgid "Evolution component for handling the calendar."
+msgstr "Evolution komponent for hЕndtering av kalenderen."
 
-#: calendar/gui/calendar-commands.c:65
-msgid "Day numbers:"
-msgstr "Dagnummer:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+msgid "Factory for the Calendar Summary component."
+msgstr "Factory for kalenderens sammendragskomponent."
 
-#: calendar/gui/calendar-commands.c:66
-msgid "Current day's number:"
-msgstr "Nummer for idag:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+msgid "Factory for the Evolution calendar component."
+msgstr "Factory for Evolution kalender-komponent."
 
-#: calendar/gui/calendar-commands.c:67
-msgid "To-Do item that is not yet due:"
-msgstr "OppgavelisteoppfЬring som ikke har gЕtt ut ennЕ:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+msgid "Factory for the calendar iTip view control"
+msgstr "Factory for kalenderens iTip visningskontroll"
+
+#: 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 "PЕminnelse om din avtale "
 
-#: calendar/gui/calendar-commands.c:68
-msgid "To-Do item that is due today:"
-msgstr "OppgavelisteoppfЬring som gЕr ut idag:"
+#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:3
+msgid "Snooze"
+msgstr "Utsett"
 
-#: calendar/gui/calendar-commands.c:69
-msgid "To-Do item that is overdue:"
-msgstr "OppgavelisteoppfЬring som har gЕtt ut:"
+#. 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 "Ok"
 
-#: calendar/gui/calendar-commands.c:354
+#: calendar/gui/calendar-commands.c:229
 msgid "File not found"
 msgstr "Fil ikke funnet"
 
-#: calendar/gui/calendar-commands.c:378
+#: calendar/gui/calendar-commands.c:253
 msgid "Open calendar"
 msgstr "еpne kalender"
 
-#: calendar/gui/calendar-commands.c:417
+#: calendar/gui/calendar-commands.c:295
 msgid "Save calendar"
 msgstr "Lagre kalender"
 
+#: calendar/gui/calendar-commands.c:432
+msgid ""
+"Could not create the calendar view.  Please check your ORBit and OAF setup."
+msgstr ""
+"Kunne ikke opprette kalendervisning. Vennligst sjekk din ORBit og OAF "
+"konfigurasjon."
+
 #. 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:2498
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
 msgstr "%a %d.%m.%Y"
 
 #. 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:718
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d.%m.%Y %H:%M:%S"
 
 #. 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:721
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d.%m.%Y %H:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:345 po/tmp/task-editor-dialog.glade.h:21
+#: calendar/gui/calendar-model.c:326
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
 msgid "Public"
 msgstr "Offentlig"
 
-#: calendar/gui/calendar-model.c:348 po/tmp/task-editor-dialog.glade.h:20
+#: calendar/gui/calendar-model.c:329
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:351 po/tmp/task-editor-dialog.glade.h:11
+#: calendar/gui/calendar-model.c:332
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:6
 msgid "Confidential"
 msgstr "Konfidensiell"
 
-#: calendar/gui/calendar-model.c:354 calendar/gui/calendar-model.c:522
+#: calendar/gui/calendar-model.c:335 calendar/gui/calendar-model.c:503
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: calendar/gui/calendar-model.c:442
+#: calendar/gui/calendar-model.c:423
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:442
+#: calendar/gui/calendar-model.c:423
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:444
+#: calendar/gui/calendar-model.c:425
 msgid "E"
 msgstr "ь"
 
-#: calendar/gui/calendar-model.c:444
+#: calendar/gui/calendar-model.c:425
 msgid "W"
 msgstr "V"
 
-#: calendar/gui/calendar-model.c:516
+#: calendar/gui/calendar-model.c:497
 msgid "Transparent"
 msgstr "Gjennomsiktig"
 
-#: calendar/gui/calendar-model.c:519
+#: calendar/gui/calendar-model.c:500
 msgid "Opaque"
 msgstr "Ugjennomsiktig"
 
-#: calendar/gui/calendar-model.c:745
+#: calendar/gui/calendar-model.c:726
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1409,7 +1512,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:827 calendar/gui/calendar-model.c:875
 #: 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"
@@ -1417,27 +1520,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:845
 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:848
 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:852
 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:855
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
-#: calendar/gui/calendar-model.c:994
+#: calendar/gui/calendar-model.c:975
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1447,14 +1550,38 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1034
+#: calendar/gui/calendar-model.c:1015
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Prosentverdien mЕ vФre mellom 0 og 100, inklusive"
 
-#: calendar/gui/calendar-model.c:1074
+#: calendar/gui/calendar-model.c:1055
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "Prioriteten mЕ vФre mellom 0 og 9, inklusive"
 
+#: calendar/gui/calendar-summary.c:83
+msgid "%A, %e %B %Y"
+msgstr "%A, %e %B %Y"
+
+#: calendar/gui/calendar-summary.c:119 calendar/gui/calendar-summary.c:125
+msgid "%I:%M%p"
+msgstr "%I:%M%p"
+
+#: calendar/gui/calendar-summary.c:276
+msgid "<b>Error loading calendar</b>"
+msgstr "<b>Feil under lasting av kalender</b>"
+
+#: calendar/gui/calendar-summary.c:281
+msgid "<b>Error loading calendar:<br>Calendar in use."
+msgstr "<b>Feil under lasting av kalender:<br>Kalender i bruk."
+
+#: calendar/gui/calendar-summary.c:287
+msgid "<b>Error loading calendar:<br>Method not supported"
+msgstr "<b>Feil under lasting av kalender:<br>Metoden er ikke stЬttet"
+
+#: calendar/gui/calendar-summary.c:367
+msgid "Loading Calendar"
+msgstr "Laster kalender"
+
 #: calendar/gui/control-factory.c:125
 msgid "The URI that the calendar will display"
 msgstr "URIen som kalenderen skal vise"
@@ -1471,390 +1598,403 @@ msgstr "Melding om din avtale pЕ %A %b %d %Y %H:%M"
 msgid "No summary available."
 msgstr "Ingen sammendrag tilgjengelig."
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * 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:1
+#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:8
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-subscribe.xml.h:2
 msgid "Close"
 msgstr "Lukk"
 
-#: po/tmp/alarm-notify.glade.h:7
+#: calendar/gui/dialogs/alarm-notify.glade.h:2
 msgid "Edit appointment"
 msgstr "Rediger avtale:"
 
-#: calendar/gui/gnome-cal.c:1333 po/tmp/alarm-notify.glade.h:8
-msgid "Snooze"
-msgstr "Utsett"
-
-#: po/tmp/alarm-notify.glade.h:9
+#: calendar/gui/dialogs/alarm-notify.glade.h:4
 msgid "Snooze time (minutes)"
 msgstr "Utsett-tid (minutter)"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * 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:1
 msgid "05 minutes"
 msgstr "5 minutter"
 
-#: po/tmp/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
 msgid "10 minutes"
 msgstr "10 minutter"
 
-#: po/tmp/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
 msgid "12 hour (am/pm)"
 msgstr "12 timer (am/pm)"
 
-#: po/tmp/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:4
 msgid "15 minutes"
 msgstr "15 minutter"
 
-#: po/tmp/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:5
 msgid "24 hour"
 msgstr "24 timer"
 
-#: po/tmp/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
 msgid "30 minutes"
 msgstr "30 minutter"
 
-#: po/tmp/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "60 minutes"
 msgstr "60 minutter"
 
-#: po/tmp/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "Alarms timeout after"
 msgstr "Tidsavbrudd for alarm etter"
 
-#: po/tmp/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "Audio Alarms"
 msgstr "Lyd-alarmer"
 
-#: po/tmp/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "Beep when alarm windows appear."
 msgstr "Pip nЕr alarmvinduet kommer til syne."
 
-#: po/tmp/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Calendar"
 msgstr "Kalender"
 
-#: po/tmp/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Calendar Preferences"
 msgstr "Brukervalg for kalender"
 
-#: po/tmp/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Colors"
 msgstr "Farger"
 
-#: po/tmp/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Compress weekends"
 msgstr "KomprimИr helger"
 
-#: po/tmp/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Date navigator options"
 msgstr "Alternativer for datonavigator"
 
-#: po/tmp/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Defaults"
 msgstr "Forvalg"
 
-#: po/tmp/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Display options"
 msgstr "Vis alternativer"
 
-#: po/tmp/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Due Date"
 msgstr "Ferdig-dato"
 
-#: po/tmp/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Enable snoozing for"
 msgstr "SlЕ pЕ utsetting for "
 
-#: po/tmp/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "End of day:"
 msgstr "Dagen slutter:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:26
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "First day of week:"
 msgstr "FЬrste dag i uken:"
 
-#: calendar/gui/gnome-month-item.c:741 po/tmp/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/gnome-month-item.c:741
 msgid "Fri"
 msgstr "Fre"
 
-#: calendar/gui/event-editor.c:437 po/tmp/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/event-editor.c:438
 msgid "Friday"
 msgstr "Fredag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "Highlight"
 msgstr "MarkИr"
 
-#: po/tmp/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "Items Due Today"
 msgstr "OppfЬringer som gЕr ut idag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Items Due Today:"
 msgstr "OppfЬringer som gЕr ut i dag:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Items Not Yet Due"
 msgstr "OppfЬringer som ikke har gЕtt ut"
 
-#: po/tmp/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 msgid "Items Not Yet Due:"
 msgstr "OppfЬringer som ikke har gЕtt ut:"
 
-#: calendar/gui/gnome-month-item.c:737 po/tmp/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/gnome-month-item.c:737
 msgid "Mon"
 msgstr "Man"
 
-#: calendar/gui/event-editor.c:433 po/tmp/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/event-editor.c:434
 msgid "Monday"
 msgstr "Mandag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "Overdue Items"
 msgstr "UtgЕtte oppfЬringer"
 
-#: po/tmp/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Overdue Items:"
 msgstr "UtgЕtte oppfЬringer:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Pick a color"
 msgstr "Velg en farge"
 
-#: filter/libfilter-i18n.h:15 po/tmp/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34 filter/libfilter-i18n.h:31
 msgid "Priority"
 msgstr "Prioritet"
 
-#: po/tmp/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "Remind me of all appointments"
 msgstr "PЕminnelse om alle avtaler"
 
-#: po/tmp/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "Reminders"
 msgstr "PЕminnelser"
 
-#: calendar/gui/gnome-month-item.c:742 po/tmp/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/gnome-month-item.c:742
 msgid "Sat"
 msgstr "LЬr"
 
-#: calendar/gui/event-editor.c:438 po/tmp/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/event-editor.c:439
 msgid "Saturday"
 msgstr "LЬrdag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "Show"
 msgstr "Vis"
 
-#: po/tmp/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Show appointment end times"
 msgstr "Vis tid for avtalers slutt"
 
-#: po/tmp/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Show week numbers"
 msgstr "Vis ukenummer"
 
-#: po/tmp/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "Start of day:"
 msgstr "Dagen starter:"
 
 #. 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:43
+#: calendar/gui/gnome-month-item.c:736
 msgid "Sun"
 msgstr "SЬn"
 
-#: calendar/gui/event-editor.c:439 po/tmp/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/event-editor.c:440
 msgid "Sunday"
 msgstr "SЬndag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "TaskPad"
 msgstr "Oppgaveblokk"
 
-#: calendar/gui/gnome-month-item.c:740 po/tmp/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/gnome-month-item.c:740
 msgid "Thu"
 msgstr "Tor"
 
-#: calendar/gui/event-editor.c:436 po/tmp/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/event-editor.c:437
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Time Until Due"
 msgstr "Tid fЬr den gЕr ut"
 
-#: po/tmp/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "Time divisions:"
 msgstr "Oppdeling av tid:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:55
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "Time format:"
 msgstr "Tidformat:"
 
-#: calendar/gui/gnome-month-item.c:738 po/tmp/cal-prefs-dialog.glade.h:56
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/gnome-month-item.c:738
 msgid "Tue"
 msgstr "Tir"
 
-#: calendar/gui/event-editor.c:434 po/tmp/cal-prefs-dialog.glade.h:57
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/event-editor.c:435
 msgid "Tuesday"
 msgstr "Tirsdag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:58
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "Visual Alarms"
 msgstr "Visuelle alarmer"
 
-#: calendar/gui/gnome-month-item.c:739 po/tmp/cal-prefs-dialog.glade.h:59
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: calendar/gui/gnome-month-item.c:739
 msgid "Wed"
 msgstr "Ons"
 
-#: calendar/gui/event-editor.c:435 po/tmp/cal-prefs-dialog.glade.h:60
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: calendar/gui/event-editor.c:436
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:61
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "Work week"
 msgstr "Arbeidsuke"
 
-#: po/tmp/cal-prefs-dialog.glade.h:62
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "minutes before they occur."
 msgstr "minutter i forveien."
 
-#: po/tmp/cal-prefs-dialog.glade.h:63
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "seconds."
 msgstr "sekunder"
 
-#: calendar/gui/dialogs/delete-comp.c:57
-msgid "Are you sure you want to delete the appointment"
-msgstr "Er du sikker pЕ at du vil slette denne avtalen"
-
-#: calendar/gui/dialogs/delete-comp.c:61
-msgid "Are you sure you want to delete the task"
-msgstr "Er du sikker pЕ at du vil slette denne oppgaven"
+#: calendar/gui/dialogs/delete-comp.c:62
+#, c-format
+msgid "Are you sure you want to delete the appointment `%s'?"
+msgstr "Er du sikker pЕ at du vil slette avtalen `%s'?"
 
 #: calendar/gui/dialogs/delete-comp.c:65
-msgid "Are you sure you want to delete the journal entry"
-msgstr "Er du sikker pЕ at du vil slette journaloppfЬringen"
+msgid "Are you sure you want to delete this untitled appointment?"
+msgstr "Er du sikker pЕ at du vil slette denne avtalen uten tittel?"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/task-editor-dialog.glade.h:6
+#: calendar/gui/dialogs/delete-comp.c:71
+#, c-format
+msgid "Are you sure you want to delete the task `%s'?"
+msgstr "Er du sikker pЕ at du vil slette oppgaven `%s'?"
+
+#: calendar/gui/dialogs/delete-comp.c:74
+msgid "Are you sure you want to delete this untitled task?"
+msgstr "Er du sikker pЕ at du vil slette denne oppgaven uten tittel?"
+
+#: calendar/gui/dialogs/delete-comp.c:80
+#, c-format
+msgid "Are you sure you want to delete the journal entry `%s'?"
+msgstr "Er du sikker pЕ at du vil slette journaloppfЬringen `%s'?"
+
+#: calendar/gui/dialogs/delete-comp.c:83
+msgid "Are you sure want to delete this untitled journal entry?"
+msgstr "Er du sikker pЕ at du vil slette denne journaloppfЬringen uten tittel?"
+
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:1
 msgid "% Comp_lete:"
 msgstr "% ferdi_g:"
 
-#: po/tmp/task-editor-dialog.glade.h:7
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:2
 msgid "C_lassification:"
 msgstr "K_lassifisering"
 
-#: po/tmp/task-editor-dialog.glade.h:9
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:4
 msgid "Cancelled"
 msgstr "Avbrutt"
 
-#: po/tmp/task-editor-dialog.glade.h:10
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:5
 msgid "Completed"
 msgstr "FullfЬrt"
 
-#: po/tmp/task-editor-dialog.glade.h:12
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
 msgid "Date Completed:"
 msgstr "FullfЬrt dato:"
 
-#: po/tmp/task-editor-dialog.glade.h:14
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
 msgid "High"
 msgstr "HЬy"
 
-#: po/tmp/task-editor-dialog.glade.h:15
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
 msgid "In Progress"
 msgstr "Under arbeid"
 
-#: po/tmp/task-editor-dialog.glade.h:16
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
 msgid "Low"
 msgstr "Lav"
 
 #. 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:12
+#: mail/mail-config-druid.glade.h:41 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 "Ingen"
 
-#: po/tmp/task-editor-dialog.glade.h:18
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
 msgid "Normal"
 msgstr "Normal"
 
-#: po/tmp/task-editor-dialog.glade.h:19
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
 msgid "Not Started"
 msgstr "Ikke startet"
 
-#: po/tmp/task-editor-dialog.glade.h:22
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
 msgid "S_ummary"
 msgstr "Sa_mmendrag"
 
-#: po/tmp/task-editor-dialog.glade.h:23
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
 msgid "Sta_rt Date:"
 msgstr "Sta_rt dato:"
 
-#: po/tmp/task-editor-dialog.glade.h:24
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
 msgid "Task"
 msgstr "Oppgave"
 
-#: po/tmp/task-editor-dialog.glade.h:25
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
 msgid "URL:"
 msgstr "URL:"
 
-#: po/tmp/task-editor-dialog.glade.h:26
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
 msgid "_Contacts..."
 msgstr "_Kontakter..."
 
-#: po/tmp/task-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
 msgid "_Due Date:"
 msgstr "Fer_dig-dato:"
 
-#: po/tmp/task-editor-dialog.glade.h:28
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
 msgid "_Priority:"
 msgstr "_Prioritet:"
 
-#: po/tmp/task-editor-dialog.glade.h:29
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
 msgid "_Status:"
 msgstr "_Status:"
 
-#: po/tmp/task-editor-dialog.glade.h:30
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
 msgid "task-editor-dialog"
 msgstr "task-editor-dialog"
 
-#: calendar/gui/dialogs/task-editor.c:681
+#: calendar/gui/dialogs/task-editor.c:690
 msgid "Edit Task"
 msgstr "RedigИr oppgave"
 
-#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:335
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:336
 msgid "No summary"
 msgstr "Ingen sammendrag"
 
-#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:341
+#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:342
 #, c-format
 msgid "Appointment - %s"
 msgstr "Avtale - %s"
 
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:344
+#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:345
 #, c-format
 msgid "Task - %s"
 msgstr "Oppgave - %s"
 
-#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:347
+#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:348
 #, c-format
 msgid "Journal entry - %s"
 msgstr "JournaloppfЬring - %s"
 
-#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3254
+#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3269
 msgid "Do you want to save changes?"
 msgstr "Vil du lagre endringene?"
 
@@ -1874,14 +2014,6 @@ msgstr "Merk som fullfЬrt"
 msgid "Mark the task complete"
 msgstr "Merk oppgaven som fullfЬrt"
 
-#: 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 "Slett"
-
 #: calendar/gui/e-calendar-table.c:343
 msgid "Delete the task"
 msgstr "Slett oppgaven"
@@ -1893,65 +2025,149 @@ msgstr "%02i minutters oppdeling"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1209
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1211
 #: calendar/gui/e-week-view-main-item.c:325
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1223
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1225
 #: calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1236
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1238
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:551 calendar/gui/e-week-view.c:288
-#: calendar/gui/print.c:605
+#: calendar/gui/print.c:610
 msgid "am"
 msgstr "am"
 
 #. 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 "pm"
 
-#: calendar/gui/e-day-view.c:2946 calendar/gui/e-day-view.c:2953
-#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3169
+#: calendar/gui/e-day-view.c:2948 calendar/gui/e-day-view.c:2955
+#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3169
 #: calendar/gui/e-week-view.c:3176 calendar/gui/e-week-view.c:3185
 msgid "New appointment..."
 msgstr "Ny avtale..."
 
-#: calendar/gui/e-day-view.c:2950 calendar/gui/e-day-view.c:2957
+#: calendar/gui/e-day-view.c:2952 calendar/gui/e-day-view.c:2959
 #: calendar/gui/e-week-view.c:3173 calendar/gui/e-week-view.c:3180
 msgid "Edit this appointment..."
 msgstr "RedigИr denne avtalen..."
 
-#: calendar/gui/e-day-view.c:2951 calendar/gui/e-week-view.c:3174
-#: po/tmp/evolution-event-editor.xml.h:20
+#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3174
+#: ui/evolution-event-editor.xml.h:15
 msgid "Delete this appointment"
 msgstr "Slett denne avtalen"
 
-#: calendar/gui/e-day-view.c:2958 calendar/gui/e-week-view.c:3181
+#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3181
 msgid "Make this appointment movable"
 msgstr "GjЬr denne avtalen flyttbar"
 
-#: calendar/gui/e-day-view.c:2959 calendar/gui/e-week-view.c:3182
+#: calendar/gui/e-day-view.c:2961 calendar/gui/e-week-view.c:3182
 msgid "Delete this occurrence"
 msgstr "Slett denne oppfЬringen"
 
-#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3183
+#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3183
 msgid "Delete all occurrences"
 msgstr "Slett alle oppfЬringer"
 
+#: calendar/gui/e-itip-control.c:140
+msgid "I couldn't update your calendar file!\n"
+msgstr "Kunne ikke oppdatere din kalenderfil!\n"
+
+#: calendar/gui/e-itip-control.c:147 calendar/gui/e-itip-control.c:489
+msgid "Component successfully updated."
+msgstr "Oppdatering av komponent fullfЬrt."
+
+#: calendar/gui/e-itip-control.c:154
+msgid "There was an error loading the calendar file."
+msgstr "Det oppsto en feil under lasting av kalenderfilen."
+
+#: calendar/gui/e-itip-control.c:178
+msgid "I couldn't open your calendar file!\n"
+msgstr "Kunne ikke Еpne din kalenderfil!\n"
+
+#: calendar/gui/e-itip-control.c:437 calendar/gui/e-itip-control.c:508
+msgid "I couldn't load your calendar file!\n"
+msgstr "Kunne ikke laste din kalenderfil!\n"
+
+#: calendar/gui/e-itip-control.c:449
+msgid "I couldn't read your calendar file!\n"
+msgstr "Kunne ikke lese din kalenderfil!\n"
+
+#: calendar/gui/e-itip-control.c:462
+msgid "This is a reply from someone who was uninvited!"
+msgstr "Dette er et svar fra noen som ikke er invitert!"
+
+#: calendar/gui/e-itip-control.c:478
+msgid "I couldn't update your calendar store."
+msgstr "Kunne ikke oppdatere ditt kalenderlager."
+
+#: calendar/gui/e-itip-control.c:519
+msgid "I couldn't delete the calendar component!\n"
+msgstr "Kunne ikke slette kalenderkomponenten!\n"
+
+#: calendar/gui/e-itip-control.c:529
+msgid "Component successfully deleted."
+msgstr "Sletting av komponent fullfЬrt."
+
+#: calendar/gui/e-itip-control.c:673
+msgid "I don't recognize this type of calendar component."
+msgstr "Kan ikke kjenne igjen denne typen kalenderkomponent."
+
+#: calendar/gui/e-itip-control.c:759
+msgid "Add to Calendar"
+msgstr "Legg til i kalenderen"
+
+#: calendar/gui/e-itip-control.c:793
+msgid "Accept"
+msgstr "AkseptИr"
+
+#: calendar/gui/e-itip-control.c:794
+msgid "Decline"
+msgstr "AvslЕ"
+
+#: calendar/gui/e-itip-control.c:795
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
+msgid "Tentative"
+msgstr "Tentativ"
+
+#: calendar/gui/e-itip-control.c:839
+msgid "Update Calendar"
+msgstr "OppdatИr kalender"
+
+#: calendar/gui/e-itip-control.c:862
+msgid "Cancel Meeting"
+msgstr "Alys mЬte"
+
+#: calendar/gui/e-tasks.c:281
+#, c-format
+msgid "Could not load the tasks in `%s'"
+msgstr "Kunne ikke laste oppgavene i `%s'"
+
+#: calendar/gui/e-tasks.c:292
+#, c-format
+msgid "Could not create a tasks file in `%s'"
+msgstr "Kunne ikke opprette oppgavefil i `%s'"
+
+#: calendar/gui/e-tasks.c:304 calendar/gui/gnome-cal.c:698
+#, c-format
+msgid "The method required to load `%s' is not supported"
+msgstr "Metoden som er nЬdvendig for Е laste `%s' er ikke stЬttet"
+
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
@@ -1959,422 +2175,466 @@ msgstr "Slett alle oppfЬringer"
 msgid "%d %B"
 msgstr "%d %B"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * 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:1
 msgid "A_ll day event"
 msgstr "Varer he_le dagen"
 
-#: po/tmp/event-editor-dialog.glade.h:8
+#: calendar/gui/event-editor-dialog.glade.h:3
 msgid "Appointment Basics"
 msgstr "Grunnleggende om avtaler"
 
-#: po/tmp/event-editor-dialog.glade.h:9
+#: calendar/gui/event-editor-dialog.glade.h:5
 msgid "Classification"
 msgstr "Klassifisering"
 
-#: po/tmp/event-editor-dialog.glade.h:10
+#: calendar/gui/event-editor-dialog.glade.h:6
 msgid "Custom recurrence"
 msgstr "Egendefinert gjeninntreffelse"
 
-#: po/tmp/event-editor-dialog.glade.h:11
+#: calendar/gui/event-editor-dialog.glade.h:7
 msgid "Days"
 msgstr "Dager"
 
-#: po/tmp/event-editor-dialog.glade.h:13
+#: calendar/gui/event-editor-dialog.glade.h:9
 msgid "Every"
 msgstr "Hver"
 
-#: po/tmp/event-editor-dialog.glade.h:14
+#: calendar/gui/event-editor-dialog.glade.h:10
 msgid "Exceptions"
 msgstr "Unntak"
 
-#: po/tmp/event-editor-dialog.glade.h:16
+#: calendar/gui/event-editor-dialog.glade.h:12
 msgid "Hours"
 msgstr "Timer"
 
-#: po/tmp/event-editor-dialog.glade.h:17
+#: calendar/gui/event-editor-dialog.glade.h:13
 msgid "Mail _to:"
 msgstr "Send _til:"
 
-#: po/tmp/event-editor-dialog.glade.h:18
+#: calendar/gui/event-editor-dialog.glade.h:14
 msgid "Minutes"
 msgstr "Minutter"
 
-#: po/tmp/event-editor-dialog.glade.h:19
+#: calendar/gui/event-editor-dialog.glade.h:15
 msgid "Modify"
 msgstr "Endre"
 
-#: po/tmp/event-editor-dialog.glade.h:20
+#: calendar/gui/event-editor-dialog.glade.h:16
 msgid "No recurrence"
 msgstr "Ingen gjeninntreffelse"
 
-#: po/tmp/event-editor-dialog.glade.h:21
+#: calendar/gui/event-editor-dialog.glade.h:17
 msgid "Preview"
 msgstr "ForhЕndsvis"
 
-#: po/tmp/event-editor-dialog.glade.h:22
+#: calendar/gui/event-editor-dialog.glade.h:18
 msgid "Pri_vate"
 msgstr "Pri_vat"
 
-#: po/tmp/event-editor-dialog.glade.h:23
+#: calendar/gui/event-editor-dialog.glade.h:19
 msgid "Pu_blic"
 msgstr "Of_fentlig"
 
-#: po/tmp/event-editor-dialog.glade.h:24
+#: calendar/gui/event-editor-dialog.glade.h:20
 msgid "Recurrence"
 msgstr "Gjeninntreffelse"
 
-#: po/tmp/event-editor-dialog.glade.h:25
+#: calendar/gui/event-editor-dialog.glade.h:21
 msgid "Recurrence Rule"
 msgstr "Regel for gjenintreffelse"
 
-#: po/tmp/event-editor-dialog.glade.h:26
+#: calendar/gui/event-editor-dialog.glade.h:22
 msgid "Reminder"
 msgstr "PЕminnelse"
 
-#: po/tmp/event-editor-dialog.glade.h:27
+#: calendar/gui/event-editor-dialog.glade.h:23
 msgid "Simple recurrence"
 msgstr "Enkel gjeninntreffelse"
 
-#: po/tmp/event-editor-dialog.glade.h:28
+#: calendar/gui/event-editor-dialog.glade.h:24
 msgid "Su_mmary:"
 msgstr "Sa_mmendrag:"
 
-#: po/tmp/event-editor-dialog.glade.h:29
+#: calendar/gui/event-editor-dialog.glade.h:25
 msgid "Time"
 msgstr "Tid"
 
-#: po/tmp/event-editor-dialog.glade.h:30
+#: calendar/gui/event-editor-dialog.glade.h:26
 msgid "_Audio"
 msgstr "_Lyd"
 
-#: po/tmp/event-editor-dialog.glade.h:31
+#: calendar/gui/event-editor-dialog.glade.h:27
 msgid "_Confidential"
 msgstr "_Konfidensiell"
 
-#: po/tmp/event-editor-dialog.glade.h:32
+#: calendar/gui/event-editor-dialog.glade.h:28
+msgid "_Contacts"
+msgstr "_Kontakter"
+
+#: calendar/gui/event-editor-dialog.glade.h:29
 msgid "_Display"
 msgstr "_Vis"
 
-#: po/tmp/event-editor-dialog.glade.h:33
+#: calendar/gui/event-editor-dialog.glade.h:30
 msgid "_End time:"
 msgstr "S_lutt-tid:"
 
-#: po/tmp/event-editor-dialog.glade.h:34
+#: calendar/gui/event-editor-dialog.glade.h:31
 msgid "_Mail"
 msgstr "_E-post"
 
-#: po/tmp/event-editor-dialog.glade.h:35
+#: calendar/gui/event-editor-dialog.glade.h:32
 msgid "_Program"
 msgstr "_Program"
 
-#: po/tmp/event-editor-dialog.glade.h:36
+#: calendar/gui/event-editor-dialog.glade.h:33
 msgid "_Run program:"
 msgstr "KjЬ_r program:"
 
-#: po/tmp/event-editor-dialog.glade.h:37
+#: calendar/gui/event-editor-dialog.glade.h:34
 msgid "_Start time:"
 msgstr "_Start-tid:"
 
-#: po/tmp/event-editor-dialog.glade.h:38
+#: calendar/gui/event-editor-dialog.glade.h:35
 msgid "_Starting date:"
 msgstr "_Start dato:"
 
-#: po/tmp/event-editor-dialog.glade.h:39
+#: calendar/gui/event-editor-dialog.glade.h:36
 msgid "day(s)"
 msgstr "dag(er)"
 
-#: po/tmp/event-editor-dialog.glade.h:40
+#: calendar/gui/event-editor-dialog.glade.h:37
 msgid "event-editor-dialog"
 msgstr "event-editor-dialog"
 
-#: po/tmp/event-editor-dialog.glade.h:41
+#: calendar/gui/event-editor-dialog.glade.h:38
 msgid "for"
 msgstr "for"
 
-#: po/tmp/event-editor-dialog.glade.h:42
+#: calendar/gui/event-editor-dialog.glade.h:39
 msgid "forever"
 msgstr "for alltid"
 
-#: po/tmp/event-editor-dialog.glade.h:43
+#: calendar/gui/event-editor-dialog.glade.h:40
 msgid "label21"
 msgstr "etikett21"
 
-#: po/tmp/event-editor-dialog.glade.h:44
+#: calendar/gui/event-editor-dialog.glade.h:41
 msgid "month(s)"
 msgstr "mЕned(er)"
 
-#: po/tmp/event-editor-dialog.glade.h:45
+#: calendar/gui/event-editor-dialog.glade.h:42
 msgid "until"
 msgstr "til"
 
-#: po/tmp/event-editor-dialog.glade.h:46
+#: calendar/gui/event-editor-dialog.glade.h:43
 msgid "week(s)"
 msgstr "uke(r)"
 
-#: po/tmp/event-editor-dialog.glade.h:47
+#: calendar/gui/event-editor-dialog.glade.h:44
 msgid "year(s)"
 msgstr "Еr"
 
-#: calendar/gui/event-editor.c:329
+#: calendar/gui/event-editor.c:330
 msgid "Edit Appointment"
 msgstr "Rediger avtale"
 
-#: calendar/gui/event-editor.c:407
+#: calendar/gui/event-editor.c:408
 msgid "on"
 msgstr "pЕ"
 
-#: calendar/gui/event-editor.c:432 filter/filter-datespec.c:65
+#: calendar/gui/event-editor.c:433 filter/filter-datespec.c:65
 msgid "day"
 msgstr "dag"
 
-#: calendar/gui/event-editor.c:559
+#: calendar/gui/event-editor.c:560
 msgid "on the"
 msgstr "den"
 
-#: calendar/gui/event-editor.c:566
+#: calendar/gui/event-editor.c:567
 msgid "th"
 msgstr "de"
 
-#: calendar/gui/event-editor.c:720
+#: calendar/gui/event-editor.c:721
 msgid "occurrences"
 msgstr "gjentakelser"
 
-#: calendar/gui/event-editor.c:837
+#: calendar/gui/event-editor.c:838
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 "Denne avtalen har gjeninntreffelser som ikke kan redigeres av Evolution."
 
-#: 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:3092 calendar/gui/print.c:1090
+#: calendar/gui/print.c:1092 calendar/gui/print.c:1093
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: 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 "PЕminnelse om din avtale "
-
-#: calendar/gui/gnome-cal.c:1022
+#: calendar/gui/gnome-cal.c:676
 #, c-format
 msgid "Could not load the calendar in `%s'"
 msgstr "Kunne ikke laste kalenderen i `%s'"
 
-#: calendar/gui/gnome-cal.c:1033
+#: calendar/gui/gnome-cal.c:687
 #, c-format
 msgid "Could not create a calendar in `%s'"
 msgstr "Kunne ikke opprette kalender i `%s'"
 
-#: calendar/gui/gnome-cal.c:1044
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr "Metoden som er nЬdvendig for Е laste `%s' er ikke stЬttet"
+#: calendar/gui/goto-dialog.glade.h:1
+msgid "April"
+msgstr "April"
 
-#. 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 "Ok"
+#: calendar/gui/goto-dialog.glade.h:2
+msgid "August"
+msgstr "August"
+
+#: calendar/gui/goto-dialog.glade.h:3
+msgid "December"
+msgstr "Desember"
+
+#: calendar/gui/goto-dialog.glade.h:4
+msgid "February"
+msgstr "Februar"
 
-#: calendar/gui/main.c:49
+#: calendar/gui/goto-dialog.glade.h:5
+msgid "Go To Date"
+msgstr "GЕ til dato"
+
+#: calendar/gui/goto-dialog.glade.h:6
+msgid "Go To Today"
+msgstr "GЕ til idag"
+
+#: calendar/gui/goto-dialog.glade.h:7
+msgid "January"
+msgstr "Januar"
+
+#: calendar/gui/goto-dialog.glade.h:8
+msgid "July"
+msgstr "Juli"
+
+#: calendar/gui/goto-dialog.glade.h:9
+msgid "June"
+msgstr "Juni"
+
+#: calendar/gui/goto-dialog.glade.h:10
+msgid "March"
+msgstr "Mars"
+
+#: calendar/gui/goto-dialog.glade.h:11
+msgid "May"
+msgstr "Mai"
+
+#: calendar/gui/goto-dialog.glade.h:12
+msgid "November"
+msgstr "November"
+
+#: calendar/gui/goto-dialog.glade.h:13
+msgid "October"
+msgstr "Oktober"
+
+#: calendar/gui/goto-dialog.glade.h:14
+msgid "September"
+msgstr "September"
+
+#: calendar/gui/main.c:50
 msgid "Could not initialize GNOME"
 msgstr "Kunne ikke initiere 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 "SЬn"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Mo"
 msgstr "Man"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Tu"
 msgstr "Tir"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "We"
 msgstr "Ons"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Th"
 msgstr "Tor"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Fr"
 msgstr "Fre"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Sa"
 msgstr "LЬr"
 
-#: calendar/gui/print.c:936
+#: calendar/gui/print.c:941
 msgid "Tasks"
 msgstr "Oppgaver"
 
 #. Day
-#: calendar/gui/print.c:1066
+#: calendar/gui/print.c:1071
 msgid "Current day (%a %b %d %Y)"
 msgstr "I dag (%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 "Denne uken (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1100
+#: calendar/gui/print.c:1105
 msgid "Current month (%b %Y)"
 msgstr "Denne mЕneden (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1107
+#: calendar/gui/print.c:1112
 msgid "Current year (%Y)"
 msgstr "Dette Еret (%Y)"
 
-#: calendar/gui/print.c:1144
+#: calendar/gui/print.c:1149
 msgid "Print Calendar"
 msgstr "Skriv ut kalender"
 
-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:914
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1012
 msgid "Print Preview"
 msgstr "ForhЕndsvisning av utskrift"
 
+#: calendar/gui/tasks-control.c:103
+msgid "The URI of the tasks folder to display"
+msgstr "URIen til oppgavemappen skal vises"
+
 #: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
 msgid "SMTWTFS"
 msgstr "SMTWTFS"
@@ -2584,12 +2844,12 @@ msgstr "Svar fra IMAP-tjener inneholdt ikke %s-informasjon"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Uventet svar 'OK' fra IMAP-tjener: %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 "Kunne ikke laste sammendrag for %s"
 
-#: 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 "Kunne ikke finne meldingskropp i FETCH-svar."
 
@@ -2601,12 +2861,6 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "For lesing og lagring av e-post pЕ IMAP-tjenere."
 
-#: 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 "Passord"
-
 #: camel/providers/imap/camel-imap-store.c:248
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
@@ -3065,17 +3319,17 @@ msgstr ""
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Kunne ikke autentisere mot KPOP-tjener: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:335
+#: camel/providers/pop3/camel-pop3-store.c:337
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Kunne ikke koble til POP-tjener pЕ %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:389
+#: camel/providers/pop3/camel-pop3-store.c:391
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sVennligst skriv inn POP3-passord for %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:408
+#: camel/providers/pop3/camel-pop3-store.c:410
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3084,12 +3338,12 @@ msgstr ""
 "Kunne ikke koble til POP-tjener.\n"
 "Feil under oversending av brukernavn: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:411
-#: camel/providers/pop3/camel-pop3-store.c:448
+#: camel/providers/pop3/camel-pop3-store.c:413
+#: camel/providers/pop3/camel-pop3-store.c:450
 msgid "(Unknown)"
 msgstr "(Ukjent)"
 
-#: camel/providers/pop3/camel-pop3-store.c:438
+#: camel/providers/pop3/camel-pop3-store.c:440
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -3097,7 +3351,7 @@ msgstr ""
 "Kunne ikke koble til POP-tjeneren.\n"
 "Ingen stЬtte for forespurt autentiseringsmekanisme."
 
-#: camel/providers/pop3/camel-pop3-store.c:446
+#: camel/providers/pop3/camel-pop3-store.c:448
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3106,12 +3360,13 @@ msgstr ""
 "Kunne ikke koble til POP-tjener.\n"
 "Feil ved oversending av passord: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:555
+#: camel/providers/pop3/camel-pop3-store.c:557
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ingen slik mappe `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
+#: mail/mail-config-druid.glade.h:57
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -3162,6 +3417,7 @@ msgid "Mail delivery via the sendmail program"
 msgstr "Levering av e-post via sendmail programmet"
 
 #: camel/providers/smtp/camel-smtp-provider.c:34
+#: mail/mail-config-druid.glade.h:53
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -3188,6 +3444,7 @@ msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:292
 #: camel/providers/smtp/camel-smtp-transport.c:297
+#: mail/mail-config-druid.glade.h:10
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
@@ -3324,82 +3581,78 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:150
+#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:155
 msgid "attachment"
 msgstr "vedlegg"
 
-#: composer/e-msg-composer-attachment-bar.c:417
-#: po/tmp/evolution-message-composer.xml.h:7
+#: composer/e-msg-composer-attachment-bar.c:413
+#: ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "Legg ved en fil"
 
-#: composer/e-msg-composer-attachment-bar.c:464 po/tmp/filter.glade.h:14
+#: composer/e-msg-composer-attachment-bar.c:460 filter/filter.glade.h:9
 #: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
 msgid "Remove"
 msgstr "Fjern"
 
-#: composer/e-msg-composer-attachment-bar.c:465
+#: composer/e-msg-composer-attachment-bar.c:461
 msgid "Remove selected items from the attachment list"
 msgstr "Fjern valgte oppfЬringer fra vedleggslisten"
 
-#: composer/e-msg-composer-attachment-bar.c:496
+#: composer/e-msg-composer-attachment-bar.c:492
 msgid "Add attachment..."
 msgstr "Legg til vedlegg..."
 
-#: composer/e-msg-composer-attachment-bar.c:497
+#: composer/e-msg-composer-attachment-bar.c:493
 msgid "Attach a file to the message"
 msgstr "Legg en fil ved meldingen"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * 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:1
 msgid "Attachment properties"
 msgstr "Egenskaper for vedlegg"
 
-#: po/tmp/e-msg-composer-attachment.glade.h:8
+#: composer/e-msg-composer-attachment.glade.h:3
 msgid "File name:"
 msgstr "Filnavn:"
 
-#: po/tmp/e-msg-composer-attachment.glade.h:9
+#: composer/e-msg-composer-attachment.glade.h:4
 msgid "MIME type:"
 msgstr "MIME-type:"
 
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:291
+#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:305
 #: mail/mail-format.c:626
 msgid "From:"
 msgstr "Fra:"
 
-#: composer/e-msg-composer-hdrs.c:238
+#: composer/e-msg-composer-hdrs.c:249
 msgid "Click here for the address book"
 msgstr "Klikk her for Е fЕ opp adresseboken"
 
-#: composer/e-msg-composer-hdrs.c:292
+#: composer/e-msg-composer-hdrs.c:306
 msgid "Enter the identity you wish to send this message from"
 msgstr "Skriv inn identiteten du Ьnsker Е bruke ved sending av denne meldingen"
 
-#: composer/e-msg-composer-hdrs.c:296 mail/mail-format.c:630
+#: composer/e-msg-composer-hdrs.c:310 mail/mail-format.c:630
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:297
+#: composer/e-msg-composer-hdrs.c:311
 msgid "Enter the recipients of the message"
 msgstr "Skriv inn mottakerene for meldingen"
 
-#: composer/e-msg-composer-hdrs.c:301 mail/mail-format.c:632
+#: composer/e-msg-composer-hdrs.c:315 mail/mail-format.c:632
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:302
+#: composer/e-msg-composer-hdrs.c:316
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Skriv inn adressene som skal motta en kopi av meldingen"
 
-#: composer/e-msg-composer-hdrs.c:307
+#: composer/e-msg-composer-hdrs.c:321
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:308
+#: composer/e-msg-composer-hdrs.c:322
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -3407,11 +3660,11 @@ msgstr ""
 "Skriv inn adressene som skal motta en kopi av meldingen uten Е komme til "
 "syne i mottakerlisten for meldingen."
 
-#: composer/e-msg-composer-hdrs.c:314 mail/mail-format.c:634
+#: composer/e-msg-composer-hdrs.c:328 mail/mail-format.c:634
 msgid "Subject:"
 msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:315
+#: composer/e-msg-composer-hdrs.c:329
 msgid "Enter the subject of the mail"
 msgstr "Skriv inn emnet for meldingen"
 
@@ -3451,11 +3704,11 @@ msgstr "Lagre endringer til meldingen..."
 msgid "Error saving composition to 'Drafts': %s"
 msgstr "Feil under lagring av brevet i 'Skisser': %s"
 
-#: composer/e-msg-composer.c:740 shell/e-shell-view-menu.c:170
+#: 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"
@@ -3465,27 +3718,27 @@ msgstr ""
 "\n"
 "Vil du lagre endringene?"
 
-#: composer/e-msg-composer.c:768
+#: composer/e-msg-composer.c:772
 msgid "Open file"
 msgstr "еpne fil"
 
-#: composer/e-msg-composer.c:894
+#: composer/e-msg-composer.c:898
 msgid "That file does not exist."
 msgstr "Filen eksisterer ikke."
 
-#: composer/e-msg-composer.c:904
+#: composer/e-msg-composer.c:908
 msgid "That is not a regular file."
 msgstr "Er ikke en vanlig fil."
 
-#: composer/e-msg-composer.c:914
+#: composer/e-msg-composer.c:918
 msgid "That file exists but is not readable."
 msgstr "Filen eksisterer men er ikke lesbar."
 
-#: composer/e-msg-composer.c:924
+#: composer/e-msg-composer.c:928
 msgid "That file appeared accesible but open(2) failed."
 msgstr "Filen ser ut til Е vФre tilgjengelig men open(2) feilet."
 
-#: 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?"
@@ -3493,15 +3746,15 @@ msgstr ""
 "File en meget stor (mer enn 100K).\n"
 "Er du sikker pЕ at du vil sette den inn?"
 
-#: composer/e-msg-composer.c:967
+#: composer/e-msg-composer.c:971
 msgid "An error occurred while reading the file."
 msgstr "En feil oppsto under lesing fra filen."
 
-#: composer/e-msg-composer.c:1346
+#: composer/e-msg-composer.c:1350
 msgid "Compose a message"
 msgstr "Skriv en melding"
 
-#: composer/e-msg-composer.c:1423
+#: composer/e-msg-composer.c:1427
 msgid "Could not create composer window."
 msgstr "Kan ikke opprette komponeringsvinduet."
 
@@ -3645,7 +3898,7 @@ msgstr "innkommende"
 msgid "outgoing"
 msgstr "utgЕende"
 
-#: filter/filter-editor.c:456 po/tmp/filter.glade.h:9
+#: filter/filter-editor.c:456 filter/filter.glade.h:4
 msgid "Edit Filters"
 msgstr "RedigИr filtre"
 
@@ -3682,7 +3935,7 @@ msgstr "Skriv inn URI for mappen"
 msgid "<click here to select a folder>"
 msgstr "<klikk her for Е velge en mappe>"
 
-#: filter/filter-input.c:184
+#: filter/filter-input.c:185
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -3691,44 +3944,44 @@ msgstr ""
 "Feil i regulФrt uttrykk '%s':\n"
 "%s"
 
-#: filter/filter-message-search.c:379 filter/filter-message-search.c:447
+#: filter/filter-message-search.c:380 filter/filter-message-search.c:448
 #, c-format
 msgid "Failed to perform regex search on message header: %s"
 msgstr "Feil under utfЬrelse av sЬk etter vanlig uttrykk i meldingshode: %s"
 
-#: filter/filter-part.c:456
+#: filter/filter-part.c:467
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:522
+#: filter/filter-rule.c:530
 msgid "Rule name: "
 msgstr "Regelnavn: "
 
-#: filter/filter-rule.c:526
+#: filter/filter-rule.c:534
 msgid "Untitled"
 msgstr "Uten navn"
 
-#: filter/filter-rule.c:542
+#: filter/filter-rule.c:550
 msgid "If"
 msgstr "Hvis"
 
-#: filter/filter-rule.c:559
+#: filter/filter-rule.c:567
 msgid "Execute actions"
 msgstr "UtfЬr handlinger"
 
-#: filter/filter-rule.c:563
+#: filter/filter-rule.c:571
 msgid "if all criteria are met"
 msgstr "hvis alle kriterier er mЬtt"
 
-#: filter/filter-rule.c:568
+#: filter/filter-rule.c:576
 msgid "if any criteria are met"
 msgstr "hvis et kriterie er mЬtt"
 
-#: filter/filter-rule.c:579
+#: filter/filter-rule.c:587
 msgid "Add criterion"
 msgstr "Legg til kriterie"
 
-#: filter/filter-rule.c:585
+#: filter/filter-rule.c:593
 msgid "Remove criterion"
 msgstr "Fjern kriterie"
 
@@ -3736,14 +3989,8 @@ msgstr "Fjern kriterie"
 msgid "Replied to"
 msgstr "Svart til"
 
-#: filter/filter-system-flag.c:64
-msgid "Deleted"
-msgstr "Slettet"
-
-#: filter/filter-system-flag.c:65
-msgid "Draft"
-msgstr "Skisse"
-
+#. { _("Deleted"), "Deleted" },
+#. { _("Draft"), "Draft" },
 #: filter/filter-system-flag.c:66
 msgid "Important"
 msgstr "Viktig"
@@ -3752,191 +3999,186 @@ msgstr "Viktig"
 msgid "Read"
 msgstr "Les"
 
-#: mail/folder-browser.c:594 po/tmp/filter.glade.h:8
-#: po/tmp/mail-config.glade.h:9
-msgid "Edit"
-msgstr "RedigИr"
-
-#: po/tmp/filter.glade.h:10
+#: filter/filter.glade.h:5
 msgid "Edit VFolders"
 msgstr "RedigИr VFoldere"
 
-#: po/tmp/filter.glade.h:11
+#: filter/filter.glade.h:6
 msgid "Filter Rules"
 msgstr "Filterregler"
 
-#: po/tmp/filter.glade.h:12
+#: filter/filter.glade.h:7
 msgid "Incoming"
 msgstr "Innkommende"
 
-#: po/tmp/filter.glade.h:13
+#: filter/filter.glade.h:8
 msgid "Outgoing"
 msgstr "UtgЕende"
 
-#: po/tmp/filter.glade.h:15
+#: filter/filter.glade.h:10
 msgid "Virtual Folders"
 msgstr "Virtuelle mapper"
 
-#: po/tmp/filter.glade.h:16
+#: filter/filter.glade.h:11
 msgid "vFolder Sources"
 msgstr "vFolder kilder"
 
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
+msgid "after"
+msgstr "etter"
+
+#: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr "Gi farge"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Gi poeng"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
+msgid "before"
+msgstr "fЬr"
+
+#: filter/libfilter-i18n.h:6
+msgid "contains"
+msgstr "inneholder"
+
+#: filter/libfilter-i18n.h:7
 msgid "Copy to Folder"
 msgstr "KopiИr til mappe"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "Dato mottatt"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "Dato sendt"
 
-#: filter/libfilter-i18n.h:8
-msgid "Expression"
-msgstr "Uttrykk"
-
-#: filter/libfilter-i18n.h:9
-msgid "Forward to Address"
-msgstr "Videresend til adresse"
-
-#: filter/libfilter-i18n.h:10
-msgid "Message Body"
-msgstr "Meldingskropp"
-
 #: filter/libfilter-i18n.h:11
-msgid "Message Header"
-msgstr "Meldingshode"
+msgid "does not contain"
+msgstr "inneholder ikke"
 
 #: filter/libfilter-i18n.h:12
-msgid "Message was received"
-msgstr "Meldingen ble mottatt"
+msgid "does not end with"
+msgstr "slutter ikke med"
 
 #: filter/libfilter-i18n.h:13
-msgid "Message was sent"
-msgstr "Meldingen ble sendt"
+msgid "does not exist"
+msgstr "eksisterer ikke"
 
 #: filter/libfilter-i18n.h:14
-msgid "Move to Folder"
-msgstr "Flytt til mappe"
+msgid "does not sound like"
+msgstr "ligner ikke"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not start with"
+msgstr "starter ikke med"
 
 #: filter/libfilter-i18n.h:16
-msgid "Recipients"
-msgstr "Mottakere"
+msgid "ends with"
+msgstr "slutter med"
 
 #: filter/libfilter-i18n.h:17
-msgid "Regex Match"
-msgstr "Treff pЕ vanlig uttrykk"
+msgid "exists"
+msgstr "eksisterer"
 
 #: filter/libfilter-i18n.h:18
-msgid "Sender"
-msgstr "Avsender"
+msgid "Expression"
+msgstr "Uttrykk"
 
 #: filter/libfilter-i18n.h:19
-msgid "Set Status"
-msgstr "Sett status"
+msgid "Forward to Address"
+msgstr "Videresend til adresse"
 
 #: filter/libfilter-i18n.h:20
-msgid "Source"
-msgstr "Kilde"
+msgid "is"
+msgstr "er"
 
 #: filter/libfilter-i18n.h:21
-msgid "Specific header"
-msgstr "Spesifikk header"
+msgid "is greater than"
+msgstr "er stЬrre enn"
 
 #: filter/libfilter-i18n.h:22
-msgid "Status"
-msgstr "Status"
+msgid "is less than"
+msgstr "er mindre enn"
 
 #: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
-msgstr "Stopp behandling"
+msgid "is not"
+msgstr "er ikke"
 
 #: filter/libfilter-i18n.h:24
-msgid "Subject"
-msgstr "Emne"
+msgid "Message Body"
+msgstr "Meldingskropp"
 
 #: filter/libfilter-i18n.h:25
-msgid "after"
-msgstr "etter"
+msgid "Message Header"
+msgstr "Meldingshode"
 
 #: filter/libfilter-i18n.h:26
-msgid "before"
-msgstr "fЬr"
+msgid "Message was received"
+msgstr "Meldingen ble mottatt"
 
 #: filter/libfilter-i18n.h:27
-msgid "contains"
-msgstr "inneholder"
+msgid "Message was sent"
+msgstr "Meldingen ble sendt"
 
 #: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr "inneholder ikke"
+msgid "Move to Folder"
+msgstr "Flytt til mappe"
 
 #: filter/libfilter-i18n.h:29
-msgid "does not end with"
-msgstr "slutter ikke med"
+msgid "on or after"
+msgstr "pЕ eller etter"
 
 #: filter/libfilter-i18n.h:30
-msgid "does not exist"
-msgstr "eksisterer ikke"
-
-#: filter/libfilter-i18n.h:31
-msgid "does not sound like"
-msgstr "ligner ikke"
+msgid "on or before"
+msgstr "pЕ eller fЬr"
 
 #: filter/libfilter-i18n.h:32
-msgid "does not start with"
-msgstr "starter ikke med"
+msgid "Recipients"
+msgstr "Mottakere"
 
 #: filter/libfilter-i18n.h:33
-msgid "ends with"
-msgstr "slutter med"
+msgid "Regex Match"
+msgstr "Treff pЕ vanlig uttrykk"
 
 #: filter/libfilter-i18n.h:34
-msgid "exists"
-msgstr "eksisterer"
+msgid "Sender"
+msgstr "Avsender"
 
 #: filter/libfilter-i18n.h:35
-msgid "is greater than"
-msgstr "er stЬrre enn"
+msgid "Set Status"
+msgstr "Sett status"
 
 #: filter/libfilter-i18n.h:36
-msgid "is less than"
-msgstr "er mindre enn"
+msgid "sounds like"
+msgstr "lyder som"
 
 #: filter/libfilter-i18n.h:37
-msgid "is not"
-msgstr "er ikke"
+msgid "Source"
+msgstr "Kilde"
 
 #: filter/libfilter-i18n.h:38
-msgid "is"
-msgstr "er"
+msgid "Specific header"
+msgstr "Spesifikk header"
 
 #: filter/libfilter-i18n.h:39
-msgid "on or after"
-msgstr "pЕ eller etter"
+msgid "starts with"
+msgstr "starter med"
 
 #: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr "pЕ eller fЬr"
+msgid "Status"
+msgstr "Status"
 
 #: filter/libfilter-i18n.h:41
-msgid "sounds like"
-msgstr "lyder som"
+msgid "Stop Processing"
+msgstr "Stopp behandling"
 
 #: filter/libfilter-i18n.h:42
-msgid "starts with"
-msgstr "starter med"
+msgid "Subject"
+msgstr "Emne"
 
 #: filter/libfilter-i18n.h:43
 msgid "was after"
@@ -3966,173 +4208,205 @@ msgstr "Legg til regel for VFolder"
 msgid "Edit VFolder Rule"
 msgstr "RedigИr VFolder regel"
 
-#: mail/component-factory.c:229
+#: mail/component-factory.c:280
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan ikke initiere Evolutions e-postkomponent."
 
-#: mail/component-factory.c:268
+#: mail/component-factory.c:319
 msgid "Cannot register storage with shell"
 msgstr "Kan ikke registrere lagring i skallet"
 
-#: 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:83
+#: ui/evolution-message-composer.xml.h:14
 msgid "Save"
 msgstr "Lagre"
 
-#: mail/folder-browser.c:153
+#: mail/folder-browser.c:236
 msgid "Body or subject contains"
 msgstr "Kropp eller emne inneholder"
 
-#: mail/folder-browser.c:154
+#: mail/folder-browser.c:237
 msgid "Body contains"
 msgstr "Kropp inneholder"
 
-#: mail/folder-browser.c:155
+#: mail/folder-browser.c:238
 msgid "Subject contains"
 msgstr "Emne inneholder"
 
-#: mail/folder-browser.c:156
+#: mail/folder-browser.c:239
 msgid "Body does not contain"
 msgstr "Kropp inneholder ikke"
 
-#: mail/folder-browser.c:157
+#: mail/folder-browser.c:240
 msgid "Subject does not contain"
 msgstr "Emne inneholder ikke"
 
-#: mail/folder-browser.c:566
+#: mail/folder-browser.c:643
 msgid "VFolder on Subject"
 msgstr "VFolder for emne"
 
-#: mail/folder-browser.c:567
+#: mail/folder-browser.c:644
 msgid "VFolder on Sender"
 msgstr "VFolder for sender"
 
-#: mail/folder-browser.c:568
+#: mail/folder-browser.c:645
 msgid "VFolder on Recipients"
 msgstr "VFolder for mottakere"
 
-#: mail/folder-browser.c:570
+#: mail/folder-browser.c:647
 msgid "Filter on Subject"
 msgstr "FiltrИr etter emne"
 
-#: mail/folder-browser.c:571
+#: mail/folder-browser.c:648
 msgid "Filter on Sender"
 msgstr "FiltrИr etter sender"
 
-#: mail/folder-browser.c:572
+#: mail/folder-browser.c:649
 msgid "Filter on Recipients"
 msgstr "FiltrИr etter mottaker"
 
-#: 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 "FiltrИr etter e-postliste"
 
-#: mail/folder-browser.c:578
+#: mail/folder-browser.c:655
 msgid "Show all hidden"
 msgstr "Vis alle skjulte"
 
-#: mail/folder-browser.c:580
+#: mail/folder-browser.c:657
 msgid "Hide selected"
 msgstr "Skjul valgte"
 
 #. could use another mask, but not enough api do to it
-#: mail/folder-browser.c:583
+#: mail/folder-browser.c:660
 msgid "Hide read"
 msgstr "Skjul leste"
 
-#: mail/folder-browser.c:584
+#: mail/folder-browser.c:661
 msgid "Hide deleted"
 msgstr "Skjul slettede"
 
-#: mail/folder-browser.c:586 mail/folder-browser.c:703
+#: mail/folder-browser.c:663 mail/folder-browser.c:790
 msgid "Hide Subject"
 msgstr "Skjul emne"
 
-#: mail/folder-browser.c:588 mail/folder-browser.c:709
+#: mail/folder-browser.c:665 mail/folder-browser.c:796
 msgid "Hide from Sender"
 msgstr "Skjul fra sender"
 
-#: mail/folder-browser.c:593 po/tmp/evolution-message-composer.xml.h:15
+#: mail/folder-browser.c:670 ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "еpne"
 
-#: mail/folder-browser.c:595
+#: mail/folder-browser.c:672
 msgid "Save As..."
 msgstr "Lagre som..."
 
-#: 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:8 ui/evolution-calendar.xml.h:18
+#: ui/evolution-mail.xml.h:27
 msgid "Print"
 msgstr "Skriv ut"
 
-#: mail/folder-browser.c:598
+#: mail/folder-browser.c:675
 msgid "Reply to Sender"
 msgstr "Svar til sender"
 
-#: 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:33
 msgid "Reply to All"
 msgstr "Svar til alle"
 
-#: 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:12
 msgid "Forward"
 msgstr "Videresend"
 
-#: mail/folder-browser.c:601 po/tmp/evolution-mail.xml.h:18
+#: mail/folder-browser.c:678 ui/evolution-mail.xml.h:13
 msgid "Forward inline"
 msgstr "Videresend \"inline\""
 
-#: mail/folder-browser.c:603
+#: mail/folder-browser.c:680
 msgid "Mark as Read"
 msgstr "MarkИr som lest"
 
-#: mail/folder-browser.c:604
+#: mail/folder-browser.c:681
 msgid "Mark as Unread"
 msgstr "Merk som ulest"
 
-#: mail/folder-browser.c:606
+#: mail/folder-browser.c:683
 msgid "Move to Folder..."
 msgstr "Flytt til mappe..."
 
-#: mail/folder-browser.c:607
+#: mail/folder-browser.c:684
 msgid "Copy to Folder..."
 msgstr "KopiИr til mappe..."
 
-#: mail/folder-browser.c:609
+#: mail/folder-browser.c:686
 msgid "Undelete"
 msgstr "Angre slett"
 
 #. { _("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 "PЕfЬr filtre"
 
-#: mail/folder-browser.c:615 po/tmp/evolution-mail.xml.h:10
+#: mail/folder-browser.c:692 ui/evolution-mail.xml.h:5
 msgid "Create Rule From Message"
 msgstr "Lage regel fra melding"
 
-#: mail/folder-browser.c:616 po/tmp/evolution-mail.xml.h:21
+#: mail/folder-browser.c:693 ui/evolution-mail.xml.h:16
 msgid "Hide Messages"
 msgstr "Skjul meldinger"
 
-#: mail/folder-browser.c:694
+#: mail/folder-browser.c:781
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "FiltrИr etter e-postliste (%s)"
 
-#: mail/folder-browser.c:700
+#: mail/folder-browser.c:787
 #, c-format
 msgid "Hide Subject \"%s\""
 msgstr "Skjul emne \"%s\""
 
-#: mail/folder-browser.c:706
+#: mail/folder-browser.c:793
 #, c-format
 msgid "Hide from Sender <%s>"
 msgstr "Skjul fra sender <%s>"
 
+#: mail/local-config.glade.h:1
+msgid "Current store format:"
+msgstr "Aktivt lagringsformat:"
+
+#: mail/local-config.glade.h:2
+msgid "Mailbox Format"
+msgstr "Format for postboks"
+
+#: mail/local-config.glade.h:3
+msgid "New store format:"
+msgstr "Nytt lagringsformat:"
+
+#: mail/local-config.glade.h:4
+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 ""
+"Merk: Ved konvertering mellom postboksformater, kan en feil (slik som mangel "
+"pЕ diskplass) ikke nЬdvendigvis rettes opp igjen. Vennligst bruk denne "
+"funksjonen med forsiktighet."
+
+#: mail/local-config.glade.h:5
+msgid "maildir"
+msgstr "maildir"
+
+#: mail/local-config.glade.h:6
+msgid "mbox"
+msgstr "mbox"
+
+#: mail/local-config.glade.h:7
+msgid "mh"
+msgstr "mh"
+
 #: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
@@ -4153,7 +4427,7 @@ msgstr "E-post fra %s"
 msgid "%s mailing list"
 msgstr "%s e-postliste"
 
-#: mail/mail-callbacks.c:74
+#: mail/mail-callbacks.c:78
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -4165,7 +4439,7 @@ msgstr ""
 "motta eller skrive meldinger.\n"
 "Vil du konfigurere den nЕ?"
 
-#: mail/mail-callbacks.c:114
+#: mail/mail-callbacks.c:121
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -4173,7 +4447,7 @@ msgstr ""
 "Du mЕ konfigurere en identitet\n"
 "fЬr du kan skrive e-post."
 
-#: mail/mail-callbacks.c:128
+#: mail/mail-callbacks.c:133
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -4181,19 +4455,19 @@ msgstr ""
 "Du mЕ konfigurere en e-post-transport\n"
 "fЬr du kan skrive e-post."
 
-#: mail/mail-callbacks.c:164 mail/mail-callbacks.c:176
+#: mail/mail-callbacks.c:169 mail/mail-callbacks.c:181
 msgid "You have no mail sources configured"
 msgstr "Du har ikke konfigurert e-postkilder"
 
-#: mail/mail-callbacks.c:213
+#: mail/mail-callbacks.c:218
 msgid "You have not set a mail transport method"
 msgstr "Du har ikke satt en transportmetode for e-post"
 
-#: mail/mail-callbacks.c:222
+#: mail/mail-callbacks.c:227
 msgid "You have no Outbox configured"
 msgstr "Du har ikke konfigurert en utboks"
 
-#: mail/mail-callbacks.c:246
+#: mail/mail-callbacks.c:249
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -4201,19 +4475,23 @@ msgstr ""
 "Denne meldingen har ikke emne.\n"
 "Send likevel?"
 
-#: mail/mail-callbacks.c:291
+#: mail/mail-callbacks.c:317
 msgid "You must specify recipients in order to send this message."
 msgstr "Du mЕ spesifisere mottakere for Е kunne sende denne meldingen."
 
-#: mail/mail-callbacks.c:552
+#: mail/mail-callbacks.c:537
+msgid "Forwarded message:\n"
+msgstr "Videresendt melding:\n"
+
+#: mail/mail-callbacks.c:618
 msgid "Move message(s) to"
 msgstr "Flytt melding(er) til"
 
-#: mail/mail-callbacks.c:554
+#: mail/mail-callbacks.c:620
 msgid "Copy message(s) to"
 msgstr "KopiИr melding(er) til"
 
-#: mail/mail-callbacks.c:669
+#: mail/mail-callbacks.c:755
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4221,11 +4499,11 @@ msgstr ""
 "Du kan kun redigere meldinger lagret\n"
 "i Skisser-katalogen."
 
-#: mail/mail-callbacks.c:703 mail/mail-display.c:74
+#: mail/mail-callbacks.c:788 mail/mail-display.c:79
 msgid "Overwrite file?"
 msgstr "Overskriv fil?"
 
-#: mail/mail-callbacks.c:707 mail/mail-display.c:78
+#: mail/mail-callbacks.c:792 mail/mail-display.c:83
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -4233,15 +4511,15 @@ msgstr ""
 "En fil med samme navn eksisterer allerede.\n"
 "Overskriv den?"
 
-#: mail/mail-callbacks.c:752
+#: mail/mail-callbacks.c:837
 msgid "Save Message As..."
 msgstr "Lagre melding som..."
 
-#: mail/mail-callbacks.c:754
+#: mail/mail-callbacks.c:839
 msgid "Save Messages As..."
 msgstr "Lagre meldinger som..."
 
-#: mail/mail-callbacks.c:829
+#: mail/mail-callbacks.c:923
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4250,45 +4528,229 @@ msgstr ""
 "Feil under lasting av filter-informasjon:\n"
 "%s"
 
-#: mail/mail-callbacks.c:874
+#: mail/mail-callbacks.c:972
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
-#: mail/mail-callbacks.c:921
+#: mail/mail-callbacks.c:1019
 msgid "Printing of message failed"
 msgstr "Feil under utskrift av melding"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/mail-config-druid.glade.h:6
+#: mail/mail-config-druid.glade.h:1
+msgid "Account"
+msgstr "Konto"
+
+#: mail/mail-config-druid.glade.h:2
+msgid "Account Information"
+msgstr "Kontoinformasjon"
+
+#: mail/mail-config-druid.glade.h:3
+msgid "Account Management"
+msgstr "HЕndtering av konti"
+
+#: mail/mail-config-druid.glade.h:4
+msgid "Account Properties"
+msgstr "Egenskaper for konto"
+
+#: mail/mail-config-druid.glade.h:6
+msgid "Advanced"
+msgstr "Avansert"
+
+#: mail/mail-config-druid.glade.h:7
+msgid "Authentication"
+msgstr "Autentisering"
+
+#: mail/mail-config-druid.glade.h:8
+msgid "Authentication Type:"
+msgstr "Autentiseringstype:"
+
+#: mail/mail-config-druid.glade.h:11
+msgid "Congratulations, your mail configuration is complete.\n"
+msgstr "Gratulerer, konfigurasjon av e-post er fullfЬrt.\n"
+
+#: mail/mail-config-druid.glade.h:17
+msgid "DIGEST-MD5"
+msgstr "DIGEST-MD5"
+
+#: mail/mail-config-druid.glade.h:18
+msgid "Default"
+msgstr "Forvalgt"
+
+#: mail/mail-config-druid.glade.h:20
+msgid "Done"
+msgstr "Ferdig"
+
+#: mail/mail-config-druid.glade.h:21
+msgid "E-Mail Address:"
+msgstr "E-post adresse:"
+
+#: mail/mail-config-druid.glade.h:23
+msgid "Email Address:"
+msgstr "E-post adresse:"
+
+#: mail/mail-config-druid.glade.h:24
+msgid "Evolution Mail Configuration"
+msgstr "Evolution e-post-konfigurasjon"
+
+#: mail/mail-config-druid.glade.h:25
+msgid "Full Name:"
+msgstr "Fullt navn:"
+
+#: mail/mail-config-druid.glade.h:28
+msgid "Hostname:"
+msgstr "Vertsnavn:"
+
+#: mail/mail-config-druid.glade.h:29
 msgid "Identity"
 msgstr "Identitet"
 
-#: po/tmp/mail-config-druid.glade.h:7
+#: mail/mail-config-druid.glade.h:30
+msgid "Incoming Mail Server"
+msgstr "E-posttjener for innkommende post"
+
+#: mail/mail-config-druid.glade.h:31
+msgid "Keep mail on server"
+msgstr "Behold e-post pЕ tjener"
+
+#: mail/mail-config-druid.glade.h:32
+msgid "Kerberos"
+msgstr "Kerberos"
+
+#: mail/mail-config-druid.glade.h:33
+msgid "Mail"
+msgstr "E-post"
+
+#: mail/mail-config-druid.glade.h:34
+msgid "Mail Account"
+msgstr "E-post konto"
+
+#: mail/mail-config-druid.glade.h:35
 msgid "Mail Configuration"
 msgstr "E-post-konfigurasjon"
 
-#: po/tmp/mail-config-druid.glade.h:8
-msgid "Mail Source"
-msgstr "E-post-kilde"
+#: mail/mail-config-druid.glade.h:36
+msgid "Mail Configuration Druid"
+msgstr "E-post-konfigurasjonsdruide"
 
-#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
-msgid "Mail Transport"
-msgstr "E-post-transport"
+#: mail/mail-config-druid.glade.h:37
+msgid "Make this my default account"
+msgstr "Bruk denne som standard konto"
+
+#: mail/mail-config-druid.glade.h:38
+msgid "Miscellaneous"
+msgstr "Forskjellig"
+
+#: mail/mail-config-druid.glade.h:40
+msgid "News"
+msgstr "News"
+
+#: mail/mail-config-druid.glade.h:42
+msgid "Optional"
+msgstr "Valgfri"
+
+#: mail/mail-config-druid.glade.h:43 mail/mail-config-gui.c:485
+msgid "Organization:"
+msgstr "Organisasjon:"
+
+#: mail/mail-config-druid.glade.h:44
+msgid "Outgoing Mail Server"
+msgstr "E-posttjener for utgЕende post"
+
+#: mail/mail-config-druid.glade.h:45
+msgid "Password:"
+msgstr "Passord:"
+
+#: mail/mail-config-druid.glade.h:47
+msgid "Plain Text"
+msgstr "Vanlig tekst"
+
+#: mail/mail-config-druid.glade.h:48
+msgid "Receiving Email"
+msgstr "Mottar e-post"
+
+#: mail/mail-config-druid.glade.h:49
+msgid "Remember my password"
+msgstr "Husk mitt passord"
 
-#: po/tmp/mail-config-druid.glade.h:10
-msgid "Welcome to the Evolution Mail configuration wizard!\n"
-msgstr "Velkommen til konfigurasjonsdruiden for Evolution e-post!\n"
+#: mail/mail-config-druid.glade.h:50 mail/mail-format.c:628
+msgid "Reply-To:"
+msgstr "Svar-til:"
+
+#: mail/mail-config-druid.glade.h:51
+msgid "Reply-to:"
+msgstr "Svar-til:"
+
+#: mail/mail-config-druid.glade.h:52
+msgid "Required"
+msgstr "NЬdvendige"
+
+#: mail/mail-config-druid.glade.h:54
+msgid "Save password"
+msgstr "Lagre passord"
+
+#: mail/mail-config-druid.glade.h:55
+msgid "Select signature file"
+msgstr "Velg signaturfil"
+
+#: mail/mail-config-druid.glade.h:56
+msgid "Sending Email"
+msgstr "Sender e-post"
+
+#: mail/mail-config-druid.glade.h:58
+msgid "Server Configuration"
+msgstr "Tjenerkonfigurasjon"
+
+#: mail/mail-config-druid.glade.h:59
+msgid "Server Type: "
+msgstr "Tjenertype: "
+
+#: mail/mail-config-druid.glade.h:60
+msgid "Server requires authentication"
+msgstr "Tjener krever autentisering"
+
+#: mail/mail-config-druid.glade.h:61
+msgid "Servers"
+msgstr "Tjenere"
 
-#: po/tmp/mail-config-druid.glade.h:14
+#: mail/mail-config-druid.glade.h:62 mail/mail-config-gui.c:496
+msgid "Signature file:"
+msgstr "Signaturfil:"
+
+#: mail/mail-config-druid.glade.h:63
+msgid "Signature:"
+msgstr "Signatur:"
+
+#: mail/mail-config-druid.glade.h:64 mail/mail-config.glade.h:15
+msgid "Sources"
+msgstr "Kilder"
+
+#: mail/mail-config-druid.glade.h:65
+msgid "This server requires a secure connection (SSL)"
+msgstr "Denne tjeneren krever en sikker forbindelse (SSL)"
+
+#: mail/mail-config-druid.glade.h:66
+msgid "Type"
+msgstr "Type"
+
+#: mail/mail-config-druid.glade.h:67
 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 ""
-"Din e-post-konfigurasjon er nЕ komplett.\n"
-"Klikk \"FullfЬr\" for Е lagre dine nye innstillinger"
+"Skriv inn et referansenavn for disse tjenerene. For eksempel: \"Arbeid\" "
+"eller \"Hjemme\"."
+
+#: mail/mail-config-druid.glade.h:69
+msgid "User Information"
+msgstr "Brukerinformasjon"
+
+#: mail/mail-config-druid.glade.h:70 mail/mail-config-gui.c:928
+msgid "Username:"
+msgstr "Brukernavn:"
+
+#: mail/mail-config-druid.glade.h:71
+msgid "Welcome to the Evolution Mail Configuration Druid.\n"
+msgstr "Velkommen til konfigurasjonsdruiden for Evolution e-post.\n"
 
 #: mail/mail-config-gui.c:433
 msgid ""
@@ -4307,15 +4769,7 @@ msgstr "Fullt navn:"
 msgid "Email address:"
 msgstr "E-post adresse:"
 
-#: mail/mail-config-gui.c:485
-msgid "Organization:"
-msgstr "Organisasjon:"
-
-#: mail/mail-config-gui.c:496
-msgid "Signature file:"
-msgstr "Signaturfil:"
-
-#: mail/mail-config-gui.c:501 po/tmp/mail-config.glade.h:19
+#: mail/mail-config-gui.c:501 mail/mail-config.glade.h:14
 msgid "Signature File"
 msgstr "Signaturfil"
 
@@ -4323,26 +4777,10 @@ msgstr "Signaturfil"
 msgid "Server:"
 msgstr "Tjener:"
 
-#: mail/mail-config-gui.c:928
-msgid "Username:"
-msgstr "Brukernavn:"
-
-#: mail/mail-config-gui.c:934
-msgid "Path:"
-msgstr "Sti:"
-
-#: mail/mail-config-gui.c:943
-msgid "Authentication:"
-msgstr "Autentisering:"
-
 #: mail/mail-config-gui.c:956
 msgid "Detect supported types..."
 msgstr "SЬk etter stЬttede typer..."
 
-#: mail/mail-config-gui.c:968
-msgid "Remember this password"
-msgstr "Husk dette passordet"
-
 #: mail/mail-config-gui.c:991
 msgid "Don't delete messages from server"
 msgstr "Ikke slett meldinger fra tjeneren"
@@ -4451,42 +4889,42 @@ msgstr "SpЬr etter autorisasjonsegenskaper for \"%s\""
 msgid "Query authorization at \"%s\""
 msgstr "SpЬr etter autorisasjon hos \"%s\""
 
-#: po/tmp/mail-config.glade.h:7
+#: mail/mail-config.glade.h:2
 msgid "Address"
 msgstr "Adresse"
 
-#: po/tmp/mail-config.glade.h:10
+#: mail/mail-config.glade.h:5
 msgid "Identities"
 msgstr "Identiteter"
 
-#: po/tmp/mail-config.glade.h:11
+#: mail/mail-config.glade.h:6
 msgid "Mail Sources"
 msgstr "E-post-kilder"
 
-#: po/tmp/mail-config.glade.h:13
+#: mail/mail-config.glade.h:7
+msgid "Mail Transport"
+msgstr "E-post-transport"
+
+#: mail/mail-config.glade.h:8
 msgid "Mark message as seen [ms]: "
 msgstr "Merk melding som sett [ms]: "
 
-#: po/tmp/mail-config.glade.h:14
+#: mail/mail-config.glade.h:9
 msgid "News Servers"
 msgstr "News-tjenere"
 
-#: po/tmp/mail-config.glade.h:15
+#: mail/mail-config.glade.h:10
 msgid "News Sources"
 msgstr "News-kilder"
 
-#: po/tmp/mail-config.glade.h:16
+#: mail/mail-config.glade.h:11
 msgid "Organization"
 msgstr "Organisasjon"
 
-#: po/tmp/mail-config.glade.h:18
+#: mail/mail-config.glade.h:13
 msgid "Send messages in HTML format"
 msgstr "Send meldinger i HTML-format"
 
-#: po/tmp/mail-config.glade.h:20
-msgid "Sources"
-msgstr "Kilder"
-
 #: 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."
@@ -4498,21 +4936,21 @@ msgid "No password provided."
 msgstr "Ingen passord gitt."
 
 #: mail/mail-crypto.c:363 mail/mail-crypto.c:469 mail/mail-crypto.c:646
-#: mail/mail-crypto.c:792 mail/mail-crypto.c:923
+#: mail/mail-crypto.c:792 mail/mail-crypto.c:942
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Kunne ikke opprette rЬr til GPG/PGP: %s"
 
-#: mail/mail-crypto.c:631 mail/mail-crypto.c:777 mail/mail-crypto.c:917
+#: mail/mail-crypto.c:631 mail/mail-crypto.c:777 mail/mail-crypto.c:936
 msgid "No GPG/PGP program available."
 msgstr "Ingen GPG/PGP-program tilgjengelig."
 
-#: mail/mail-crypto.c:945
+#: mail/mail-crypto.c:953
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "Kunne ikke opprette midlertidig fil: %s"
 
-#: mail/mail-display.c:93
+#: mail/mail-display.c:98
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -4521,55 +4959,51 @@ msgstr ""
 "Kan ikke Еpne fil %s:\n"
 "%s"
 
-#: mail/mail-display.c:126
+#: mail/mail-display.c:131
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: mail/mail-display.c:224
+#: mail/mail-display.c:229
 msgid "Save Attachment"
 msgstr "Lagre vedlegg"
 
-#: mail/mail-display.c:264
+#: mail/mail-display.c:269
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Kunne ikke opprette midlertidig katalog: %s"
 
-#: mail/mail-display.c:306
+#: mail/mail-display.c:311
 msgid "Save to Disk..."
 msgstr "Lagre til disk..."
 
-#: mail/mail-display.c:308
+#: mail/mail-display.c:313
 #, c-format
 msgid "Open in %s..."
 msgstr "еpne i %s..."
 
-#: mail/mail-display.c:310
+#: mail/mail-display.c:315
 msgid "View Inline"
 msgstr "Vis \"inline\""
 
-#: mail/mail-display.c:334
+#: mail/mail-display.c:339
 msgid "External Viewer"
 msgstr "Ekstern visning"
 
-#: mail/mail-display.c:357
+#: mail/mail-display.c:362
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Vis \"inline\" (via %s)"
 
-#: mail/mail-display.c:361
+#: mail/mail-display.c:366
 msgid "Hide"
 msgstr "Skjul"
 
-#: mail/mail-format.c:505
+#: mail/mail-format.c:503
 #, c-format
 msgid "%s attachment"
 msgstr "%s-vedlegg"
 
-#: mail/mail-format.c:628
-msgid "Reply-To:"
-msgstr "Svar-til:"
-
 #: mail/mail-format.c:851
 msgid "No GPG/PGP support available in this copy of Evolution."
 msgstr "Ingen GPG/PGP-stЬtte tilgjengelig i denne versjonen av Evolution."
@@ -4615,33 +5049,37 @@ msgstr "Feilutformet del for ekstern-kropp."
 msgid "On %s, %s wrote:\n"
 msgstr "Den %s, skrev %s:\n"
 
-#: mail/mail-local.c:203
+#: mail/mail-local.c:204
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Endrer mappe \"%s\" til \"%s\"-format"
 
-#: mail/mail-local.c:207
+#: mail/mail-local.c:208
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Endre mappe \"%s\" til \"%s\"-format"
 
-#: mail/mail-local.c:262
+#: mail/mail-local.c:251
+msgid "Reconfiguring folder"
+msgstr "Omkonfigurerer mappe"
+
+#: mail/mail-local.c:269
 msgid "Closing current folder"
 msgstr "Lukker aktiv mappe"
 
-#: mail/mail-local.c:294
+#: mail/mail-local.c:295
 msgid "Renaming old folder and opening"
 msgstr "Endrer navn pЕ gammel mappe og gjenЕpner"
 
-#: mail/mail-local.c:315
+#: mail/mail-local.c:313
 msgid "Creating new folder"
 msgstr "Oppretter en ny mappe"
 
-#: mail/mail-local.c:330
+#: mail/mail-local.c:327
 msgid "Copying messages"
 msgstr "Kopierer meldinger"
 
-#: 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"
@@ -4650,7 +5088,7 @@ msgstr ""
 "Kan ikke lagre metainformasjon for mappe; du vil sannsynligvis\n"
 "ikke kunne Еpne denne mappen igjen: %s"
 
-#: 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."
@@ -4658,299 +5096,209 @@ msgstr ""
 "Hvis du ikke kan Еpne denne postboksen igjen mЕ\n"
 "du reparere den manuelt."
 
-#: mail/mail-local.c:782
+#: mail/mail-local.c:787
 msgid "Registering local folder"
 msgstr "Registrerer lokal mappe"
 
-#: mail/mail-local.c:784
+#: mail/mail-local.c:789
 msgid "Register local folder"
 msgstr "RegistrИr lokal mappe"
 
-#: mail/mail-ops.c:82
+#: mail/mail-local.c:894
+#, c-format
+msgid ""
+"Unable to register folder '%s':\n"
+"%s"
+msgstr ""
+"Kan ikke registrer mappe '%s':\n"
+"%s"
+
+#: mail/mail-mt.c:85
+#, c-format
+msgid ""
+"Error while '%s':\n"
+"%s"
+msgstr ""
+"Feil under '%s':\n"
+"%s"
+
+#: mail/mail-mt.c:87
+#, c-format
+msgid ""
+"Error while performing operation:\n"
+"%s"
+msgstr ""
+"Feil under utfЬring av operasjon:\n"
+"%s"
+
+#: mail/mail-mt.c:356 mail/mail-mt.c:385
+msgid "Working"
+msgstr "Arbeider"
+
+#: mail/mail-ops.c:89
 #, c-format
 msgid "Fetching email from %s"
 msgstr "Henter e-post fra %s"
 
-#: mail/mail-ops.c:84
+#: mail/mail-ops.c:91
 #, c-format
 msgid "Fetch email from %s"
 msgstr "Hent e-post fra %s"
 
-#: mail/mail-ops.c:329
+#: mail/mail-ops.c:336
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "Ingen ny e-post pЕ %s."
 
-#: mail/mail-ops.c:399
+#: mail/mail-ops.c:406
 msgid "Filtering email on demand"
 msgstr "Filtrering av post etter behov"
 
-#: mail/mail-ops.c:401
+#: mail/mail-ops.c:408
 msgid "Filter email on demand"
 msgstr "Fi_ltrИr e-post ved behov"
 
-#: mail/mail-ops.c:538
+#: mail/mail-ops.c:552
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sender \"%s\""
 
-#: mail/mail-ops.c:543
-msgid "Sending a message without a subject"
-msgstr "Sender en melding uten emne"
-
-#: mail/mail-ops.c:546
-#, c-format
-msgid "Send \"%s\""
-msgstr "Send \"%s\""
-
-#: mail/mail-ops.c:549
-msgid "Send a message without a subject"
-msgstr "Send en melding uten emne"
+#: mail/mail-ops.c:554
+msgid "Sending message"
+msgstr "Sender melding"
 
-#: mail/mail-ops.c:720
+#: mail/mail-ops.c:670
 msgid "Sending queue"
 msgstr "Sender kЬ"
 
-#: mail/mail-ops.c:722
+#: mail/mail-ops.c:672
 msgid "Send queue"
 msgstr "Send kЬ"
 
-#: mail/mail-ops.c:858 mail/mail-ops.c:865
+#: mail/mail-ops.c:805 mail/mail-ops.c:812
 #, c-format
 msgid "Appending \"%s\""
 msgstr "Legger til \"%s\""
 
-#: mail/mail-ops.c:862 mail/mail-ops.c:868
+#: mail/mail-ops.c:809 mail/mail-ops.c:815
 msgid "Appending a message without a subject"
 msgstr "Legger til en melding uten emne"
 
-#: mail/mail-ops.c:940
-#, c-format
-msgid "Expunging \"%s\""
-msgstr "Fjerner \"%s\""
-
-#: mail/mail-ops.c:942
-#, c-format
-msgid "Expunge \"%s\""
-msgstr "Fjern \"%s\""
-
-#: mail/mail-ops.c:1001
+#: mail/mail-ops.c:898
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Flytter meldinger fra \"%s\" til \"%s\""
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:900
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Kopierer meldinger fra \"%s\" til \"%s\""
 
-#: mail/mail-ops.c:1006
+#: mail/mail-ops.c:903
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Flytt meldinger fra \"%s\" til \"%s\""
 
-#: mail/mail-ops.c:1008
+#: mail/mail-ops.c:905
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "KopiИr meldinger fra \"%s\" til \"%s\""
 
-#: mail/mail-ops.c:1039
+#: mail/mail-ops.c:936
 msgid "Moving"
 msgstr "Flytter"
 
-#: mail/mail-ops.c:1042
+#: mail/mail-ops.c:939
 msgid "Copying"
 msgstr "KopiИrer"
 
-#: mail/mail-ops.c:1062
+#: mail/mail-ops.c:959
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s melding %d av %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1141
-#, c-format
-msgid "Marking messages in folder \"%s\""
-msgstr "Merker meldinger i mappe \"%s"
-
-#: mail/mail-ops.c:1144
-#, c-format
-msgid "Mark messages in folder \"%s\""
-msgstr "Merk meldinger i mappe \"%s\""
-
-#: mail/mail-ops.c:1175
-#, c-format
-msgid "Marking message %d of %d"
-msgstr "Merker melding %d av %d"
-
-#: mail/mail-ops.c:1296
+#: mail/mail-ops.c:1034
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i \"%s\""
 
-#: mail/mail-ops.c:1298
-#, c-format
-msgid "Scan folders in \"%s\""
-msgstr "Skann foldere i \"%s\""
-
-#: mail/mail-ops.c:1367 mail/subscribe-dialog.c:339
+#: mail/mail-ops.c:1100 mail/subscribe-dialog.c:341
 msgid "(No description)"
 msgstr "(Ingen beskrivelse)"
 
-#: mail/mail-ops.c:1433
-#, c-format
-msgid "Attaching messages from folder \"%s\""
-msgstr "Legger ved meldinger fra mappe \"%s\""
-
-#: mail/mail-ops.c:1436
-#, c-format
-msgid "Attach messages from \"%s\""
-msgstr "Legg ved meldinger fra \"%s\""
-
-#: mail/mail-ops.c:1536
-#, c-format
-msgid "Forwarding messages \"%s\""
-msgstr "Videresender meldinger \"%s\""
-
-#: mail/mail-ops.c:1540
-msgid "Forwarding a message without a subject"
-msgstr "Videresender en melding uten emne"
-
-#: mail/mail-ops.c:1543
-#, c-format
-msgid "Forward message \"%s\""
-msgstr "Videresend meldingen \"%s\""
-
-#: mail/mail-ops.c:1547
-msgid "Forward a message without a subject"
-msgstr "Videresend en melding uten emne"
-
-#: mail/mail-ops.c:1594
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Henter melding nummer %d av %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1611
-msgid ""
-"Failed to generate mime part from message while generating forwarded message."
-msgstr ""
-"Kunne ikke generere MIME-del fra melding under generering av videresendt "
-"melding."
-
-#: mail/mail-ops.c:1666
+#: mail/mail-ops.c:1165
 msgid "Forwarded messages"
 msgstr "Videresendte meldinger"
 
-#: mail/mail-ops.c:1680
-msgid "Forwarded message:\n"
-msgstr "Videresendt melding:\n"
-
-#: mail/mail-ops.c:1749
-#, c-format
-msgid "Loading \"%s\""
-msgstr "Laster \"%s\""
-
-#: mail/mail-ops.c:1751
-#, c-format
-msgid "Load \"%s\""
-msgstr "Last \"%s\""
-
-#: mail/mail-ops.c:1854
-#, c-format
-msgid "Creating \"%s\""
-msgstr "Oppretter \"%s\""
-
-#: mail/mail-ops.c:1856
+#: mail/mail-ops.c:1206 mail/mail-ops.c:1275
 #, c-format
-msgid "Create \"%s\""
-msgstr "Opprett \"%s\""
-
-#: mail/mail-ops.c:1904
-msgid "Exception while reporting result to shell component listener."
-msgstr "Unntak under rapportering av resultat til skallkomponentens lytter."
+msgid "Opening folder %s"
+msgstr "еpner mappe %s"
 
-#: mail/mail-ops.c:1950
-#, c-format
-msgid "Synchronizing \"%s\""
-msgstr "Synkroniserer \"%s\""
+#: mail/mail-ops.c:1337
+msgid "Synchronising folder"
+msgstr "Synkroniserer mappe"
 
-#: mail/mail-ops.c:1952
-#, c-format
-msgid "Synchronize \"%s\""
-msgstr "SynkronisИr \"%s\""
+#: mail/mail-ops.c:1387
+msgid "Expunging folder"
+msgstr "TЬmmer mappe"
 
-#: mail/mail-ops.c:2017
+#: mail/mail-ops.c:1435
 #, c-format
-msgid "Displaying message UID \"%s\""
-msgstr "Viser melding-UID \"%s\""
+msgid "Retrieving message %s"
+msgstr "Henter melding %s"
 
-#: mail/mail-ops.c:2020
-msgid "Clearing message display"
-msgstr "TЬmmer meldingsvisning"
+#: mail/mail-ops.c:1498
+msgid "Retrieving messages"
+msgstr "Henter meldinger"
 
-#: mail/mail-ops.c:2023
+#: mail/mail-ops.c:1508
 #, c-format
-msgid "Display message UID \"%s\""
-msgstr "Vis meldings-UID \"%s\""
-
-#: mail/mail-ops.c:2026
-msgid "Clear message display"
-msgstr "TЬm meldingsvisning"
-
-#: mail/mail-ops.c:2217
-#, c-format
-msgid "Opening messages from folder \"%s\""
-msgstr "еpner meldinger fra mappe \"%s\""
-
-#: mail/mail-ops.c:2220
-#, c-format
-msgid "Open messages from \"%s\""
-msgstr "еpne meldinger fra \"%s\""
-
-#: mail/mail-ops.c:2324
-#, c-format
-msgid "Loading %s Folder"
-msgstr "Laster %s-mappe"
-
-#: mail/mail-ops.c:2326
-#, c-format
-msgid "Load %s Folder"
-msgstr "Last %s-mappe"
-
-#: mail/mail-ops.c:2390
-#, c-format
-msgid "Viewing messages from folder \"%s\""
-msgstr "Viser meldinger fra mappe \"%s\""
+msgid "Retrieving message number %d of %d (uid \"%s\")"
+msgstr "Henter melding nummer %d av %d (uid \"%s\")"
 
-#: mail/mail-ops.c:2393
+#: mail/mail-ops.c:1656
 #, c-format
-msgid "View messages from \"%s\""
-msgstr "Vis meldinger fra \"%s\""
+msgid "Loading %s Folder for %s"
+msgstr "Laster %s-mappe for %s"
 
-#: mail/mail-ops.c:2426
+#: mail/mail-ops.c:1658
 #, c-format
-msgid "Retrieving message %d of %d (uid \"%s\")"
-msgstr "Henter melding %d av %d (uid \"%s\")"
+msgid "Load %s Folder for %s"
+msgstr "Last %s-mappe for %s"
 
-#: mail/mail-ops.c:2517
-#, c-format
-msgid "Saving messages from folder \"%s\""
-msgstr "Lagrer meldinger fra mappe \"%s\""
+#: mail/mail-ops.c:1824
+msgid "Saving messages"
+msgstr "Lagrer meldinger"
 
-#: mail/mail-ops.c:2520
+#: mail/mail-ops.c:1903
 #, c-format
-msgid "Save messages from folder \"%s\""
-msgstr "Lagre meldinger fra mappe \"%s\""
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
+msgstr ""
+"Kunne ikke opprette utdatafil: %s\n"
+" %s"
 
-#: mail/mail-ops.c:2563
+#: mail/mail-ops.c:1916
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Lagrer melding %d av %d (uid \"%s\")"
 
+#: mail/mail-ops.c:1930
+#, c-format
+msgid ""
+"Error saving messages to: %s:\n"
+" %s"
+msgstr ""
+"Feil under lagring av av meldinger til: %s:\n"
+" %s"
+
 #: mail/mail-search-dialogue.c:104
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: mail/mail-summary.c:110 mail/mail-threads.c:729
+#: mail/mail-summary.c:111 mail/mail-threads.c:729
 msgid "Incomplete message written on pipe!"
 msgstr "Uferdig melding skrevet pЕ rЬr!"
 
@@ -4994,53 +5342,53 @@ msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Kunne ikke opprette midlertidig mbox `%s': %s"
 
 #. Get all uids of source
-#: mail/mail-tools.c:240
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Examining %s"
 msgstr "UndersЬker %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 ""
 "Kunne ikke lese bufferfil for UID \"%s\". Du kan motta dupliserte meldinger."
 
-#: mail/mail-tools.c:299
+#: mail/mail-tools.c:300
 #, c-format
 msgid "Retrieving message %d of %d"
 msgstr "Henter melding %d av %d"
 
 #. Append it to dest
-#: mail/mail-tools.c:314
+#: mail/mail-tools.c:315
 #, c-format
 msgid "Writing message %d of %d"
 msgstr "Skriver melding %d av %d"
 
-#: mail/mail-tools.c:346
+#: mail/mail-tools.c:347
 #, c-format
 msgid "Saving changes to %s"
 msgstr "Lagrer endringer til %s"
 
-#: mail/mail-tools.c:383
+#: mail/mail-tools.c:381
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (videresendt melding)"
 
-#: mail/mail-tools.c:393
+#: mail/mail-tools.c:391
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (uten emne)"
 
-#: mail/mail-tools.c:432
+#: mail/mail-tools.c:427
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Videresendt melding - %s"
 
-#: mail/mail-tools.c:434
+#: mail/mail-tools.c:429
 msgid "Forwarded message (no subject)"
 msgstr "Videresendt melding (uten emne)"
 
-#: mail/mail-tools.c:537
+#: mail/mail-tools.c:530
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
@@ -5059,89 +5407,81 @@ msgstr "Ny VFolder"
 
 #. 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:32
 msgid "Reply"
 msgstr "Svar"
 
-#: mail/mail-view.c:148 po/tmp/evolution-mail.xml.h:42
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:37
 msgid "Reply to the sender of this message"
 msgstr "Svar til avsender av denne meldingen"
 
-#: mail/mail-view.c:151 po/tmp/evolution-mail.xml.h:41
+#: mail/mail-view.c:141 ui/evolution-mail.xml.h:36
 msgid "Reply to all recipients of this message"
 msgstr "Svar til alle mottakere av denne meldingen"
 
-#: mail/mail-view.c:154 po/tmp/evolution-mail.xml.h:19
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:14
 msgid "Forward this message"
 msgstr "Videresend denne meldingen"
 
-#: mail/mail-view.c:158 po/tmp/evolution-mail.xml.h:36
+#: mail/mail-view.c:148 ui/evolution-mail.xml.h:31
 msgid "Print the selected message"
 msgstr "Skriv ut den valgte meldingen"
 
-#: mail/mail-view.c:160 po/tmp/evolution-mail.xml.h:12
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:7
 msgid "Delete this message"
 msgstr "Slett denne meldingen"
 
-#: mail/message-list.c:590
+#: mail/message-list.c:593
 msgid "Unseen"
 msgstr "Ulest"
 
-#: mail/message-list.c:593
+#: mail/message-list.c:596
 msgid "Seen"
 msgstr "Lest"
 
-#: mail/message-list.c:596
+#: mail/message-list.c:599
 msgid "Answered"
 msgstr "Besvart"
 
-#: mail/message-list.c:881
+#: mail/message-list.c:884
 #, c-format
 msgid "[ %s ]"
 msgstr "[ %s ]"
 
 #. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:893 mail/message-list.c:909
+#: mail/message-list.c:896 mail/message-list.c:912
 #, c-format
 msgid "%s, et al."
 msgstr "%s, et al."
 
-#: mail/message-list.c:896 mail/message-list.c:912
+#: mail/message-list.c:899 mail/message-list.c:915
 msgid "<unknown>"
 msgstr "<ukjent>"
 
-#: mail/message-list.c:965
+#: mail/message-list.c:968
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:972
+#: mail/message-list.c:975
 msgid "Today %l:%M %p"
 msgstr "Idag %l:%M %p"
 
-#: mail/message-list.c:981
+#: mail/message-list.c:984
 msgid "Yesterday %l:%M %p"
 msgstr "I gЕr %l:%M %p"
 
-#: mail/message-list.c:993
+#: mail/message-list.c:996
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1001
+#: mail/message-list.c:1004
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1003
+#: mail/message-list.c:1006
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2347
-msgid "Rebuilding message view"
-msgstr "Bygger opp meldingsvisningen pЕ nytt"
-
-#: mail/message-list.c:2349
-msgid "Rebuild message view"
-msgstr "Gjenoppbygg meldingsvisningen"
-
 #: mail/subscribe-dialog.c:139
 msgid "Display folders starting with:"
 msgstr "Vis mapper som som starter med:"
@@ -5156,27 +5496,27 @@ msgstr "Henter lager for \"%s\""
 msgid "Get store for \"%s\""
 msgstr "Hent lager for \"%s\""
 
-#: mail/subscribe-dialog.c:282
+#: mail/subscribe-dialog.c:283
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Abonnerer pЕ mappe \"%s\""
 
-#: mail/subscribe-dialog.c:286
+#: mail/subscribe-dialog.c:287
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Sletter abonnement pЕ mappe \"%s\""
 
-#: mail/subscribe-dialog.c:290
+#: mail/subscribe-dialog.c:291
 #, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr "AbonnИr pЕ mappe \"%s\""
 
-#: mail/subscribe-dialog.c:293
+#: mail/subscribe-dialog.c:294
 #, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr "Slett abonnement pЕ mappe \"%s\""
 
-#: shell/e-setup.c:112 shell/e-setup.c:183
+#: shell/e-setup.c:112 shell/e-setup.c:185
 msgid "Evolution installation"
 msgstr "Evolution installasjon"
 
@@ -5194,23 +5534,23 @@ msgstr ""
 "Vennligst klikk \"OK\" for Е installere filene, eller \"Avbryt\" for Е "
 "avslutte."
 
-#: shell/e-setup.c:155
+#: shell/e-setup.c:157
 msgid "Could not update files correctly"
 msgstr "Kunne ikke oppdatere filene."
 
-#: shell/e-setup.c:158 shell/e-setup.c:224
+#: shell/e-setup.c:160 shell/e-setup.c:228
 msgid "Evolution files successfully installed."
 msgstr "Evolutions filer ble installert."
 
-#: shell/e-setup.c:187
+#: shell/e-setup.c:189
 msgid "This seems to be the first time you run Evolution."
 msgstr "Dette ser ut til Е vФre fЬrste gang du kjЬrer Evolution."
 
-#: shell/e-setup.c:188
+#: shell/e-setup.c:190
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr "Vennligst klikk \"OK\" for Е installere Evolutions brukerfiler under"
 
-#: shell/e-setup.c:205
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -5221,7 +5561,7 @@ msgstr ""
 "%s\n"
 "Feil: %s"
 
-#: shell/e-setup.c:220
+#: shell/e-setup.c:224
 #, c-format
 msgid ""
 "Cannot copy files into\n"
@@ -5230,7 +5570,7 @@ msgstr ""
 "Kan ikke kopiere filer til\n"
 "`%s'."
 
-#: shell/e-setup.c:245
+#: shell/e-setup.c:249
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -5241,7 +5581,7 @@ msgstr ""
 "Venligst flytt denne for Е tillate installasjon\n"
 "av Evolution's brukerfiler."
 
-#: shell/e-setup.c:257
+#: shell/e-setup.c:261
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -5285,23 +5625,19 @@ msgstr "Ny..."
 msgid "(Untitled)"
 msgstr "(Uten navn)"
 
-#. you might have to call gnome_dialog_run() on the
-#. * dialog returned here, I don't remember...
-#.
-#: shell/e-shell-view-menu.c:114
+#: shell/e-shell-view-menu.c:111
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy ble ikke funnet i din $PATH."
 
-#. same as above
-#: shell/e-shell-view-menu.c:120
+#: shell/e-shell-view-menu.c:117
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy kunne ikke kjЬres."
 
-#: shell/e-shell-view-menu.c:172
+#: shell/e-shell-view-menu.c:169
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:174
+#: shell/e-shell-view-menu.c:171
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -5311,7 +5647,7 @@ msgstr ""
 "for e-post, kalender og kontaktdatabaser for\n"
 "GNOME skrivebordsmiljЬet."
 
-#: shell/e-shell-view-menu.c:335
+#: shell/e-shell-view-menu.c:332
 msgid "Go to folder..."
 msgstr "GЕ til mappe..."
 
@@ -5411,9 +5747,8 @@ msgstr "Fjern denne snarveien fra snarveilinjen"
 msgid "Error saving shortcuts."
 msgstr "Feil under lagring av snarveier."
 
-#: 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:120
+#: ui/evolution-message-composer.xml.h:43 ui/evolution.xml.h:29
 msgid "_View"
 msgstr "_Vis"
 
@@ -5528,1142 +5863,1091 @@ msgstr "SlЕ av."
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kunne ikke initialisere Bonobo komponentsystemet."
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-addressbook-ldap.xml.h:6
-msgid "N_ew Directory Server"
-msgstr "Ny katalog-tj_ener"
-
-#: po/tmp/evolution-addressbook-ldap.xml.h:7
-msgid "_Actions"
-msgstr "H_andlinger"
-
-#: po/tmp/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:2
 msgid "Create a new contact"
 msgstr "Opprett en ny kontakt"
 
-#: po/tmp/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:4
 msgid "Delete a contact"
 msgstr "Slett en kontakt"
 
-#: po/tmp/evolution-addressbook.xml.h:10
-#: po/tmp/evolution-event-editor.xml.h:67
+#: ui/evolution-addressbook.xml.h:5 ui/evolution-event-editor.xml.h:62
 msgid "Find"
 msgstr "Finn"
 
-#: po/tmp/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:6
 msgid "Find a contact"
 msgstr "Finn en kontakt"
 
-#: po/tmp/evolution-addressbook.xml.h:12 po/tmp/evolution-calendar.xml.h:19
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:14
 msgid "New"
 msgstr "Ny"
 
-#: po/tmp/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:9
 msgid "Print contacts"
 msgstr "Skriv ut kontakter"
 
-#: po/tmp/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:10
 msgid "Stop"
 msgstr "Stopp"
 
-#: po/tmp/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:11
 msgid "Stop Loading"
 msgstr "Stopp innlesing"
 
-#: po/tmp/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:12
 msgid "View All"
 msgstr "Vis alle"
 
-#: po/tmp/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:13
 msgid "View all contacts"
 msgstr "Vis alle kontakter"
 
-#: po/tmp/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:14
+msgid "_Addressbook Configuration..."
+msgstr "Konfigurasjon av adressebok..."
+
+#: ui/evolution-addressbook.xml.h:15
 msgid "_Print Contacts..."
 msgstr "S_kriv ut kontakter..."
 
-#: po/tmp/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:16
 msgid "_Search for contacts"
 msgstr "_SЬk etter kontakter"
 
-#: po/tmp/evolution-addressbook.xml.h:21
-#: po/tmp/evolution-event-editor.xml.h:123
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-event-editor.xml.h:118
 msgid "_Tools"
 msgstr "_VerktЬy"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-calendar.xml.h:6
+#: ui/evolution-calendar.xml.h:1
 msgid "5 Days"
 msgstr "5 dager"
 
-#: po/tmp/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:2
 msgid "Alter preferences"
 msgstr "Endre brukervalg"
 
-#: po/tmp/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:3
 msgid "Ca_lendar"
 msgstr "Ka_lender"
 
-#: po/tmp/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:4
 msgid "Calendar Preferences..."
 msgstr "Brukervalg for kalender..."
 
-#: po/tmp/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:5
 msgid "Create a new appointment"
 msgstr "Opprett en ny avtale"
 
-#: po/tmp/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:6
 msgid "Create a new calendar"
 msgstr "Opprett en ny kalender"
 
-#: po/tmp/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:7
 msgid "Day"
 msgstr "Dag"
 
-#: po/tmp/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:8
 msgid "Go back in time"
 msgstr "GЕ tilbake i tid"
 
-#: po/tmp/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:9
 msgid "Go forward in time"
 msgstr "GЕ fremover i tid"
 
-#: po/tmp/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:10
 msgid "Go to"
 msgstr "GЕ til"
 
-#: po/tmp/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:11
 msgid "Go to a specific date"
 msgstr "GЕ til en spesifikk dato"
 
-#: po/tmp/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:12
 msgid "Go to present time"
 msgstr "GЕ til i dag"
 
-#: po/tmp/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:13
 msgid "Month"
 msgstr "MЕned"
 
-#: po/tmp/evolution-calendar.xml.h:20 po/tmp/evolution-event-editor.xml.h:74
+#: ui/evolution-calendar.xml.h:15 ui/evolution-event-editor.xml.h:69
 msgid "Next"
 msgstr "Neste"
 
-#: po/tmp/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:16
 msgid "Open a calendar"
 msgstr "еpne en kalender"
 
-#: po/tmp/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:17
 msgid "Prev"
 msgstr "Forrige"
 
-#: po/tmp/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:19
 msgid "Print this calendar"
 msgstr "Skriv ut denne kalenderen"
 
-#: po/tmp/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:20
 msgid "Save calendar as something else"
 msgstr "Lagre kalender som noe annet"
 
-#: po/tmp/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:21
 msgid "Show 1 day"
 msgstr "Vis 1 dag"
 
-#: po/tmp/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:22
 msgid "Show 1 month"
 msgstr "Vis 1 mЕned"
 
-#: po/tmp/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:23
 msgid "Show 1 week"
 msgstr "Vis 1 uke"
 
-#: po/tmp/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:24
 msgid "Show the working week"
 msgstr "Vis arbeidsuken"
 
-#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:413
+#: ui/evolution-calendar.xml.h:25 widgets/misc/e-dateedit.c:413
 msgid "Today"
 msgstr "Idag"
 
-#: po/tmp/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:26
 msgid "Week"
 msgstr "Uke"
 
-#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:31
+#: ui/evolution-calendar.xml.h:27 ui/evolution.xml.h:26
 msgid "_New"
 msgstr "_Ny"
 
-#: po/tmp/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:28
 msgid "_Open Calendar"
 msgstr "_еpne kalender"
 
-#: po/tmp/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:29
 msgid "_Print this calendar"
 msgstr "S_kriv ut denne kalenderen"
 
-#: po/tmp/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:30
 msgid "_Save As..."
 msgstr "Lagre _som..."
 
-#: po/tmp/evolution-contact-editor.xml.h:7
+#: ui/evolution-contact-editor.xml.h:2
 msgid "Delete this item"
 msgstr "Slett denne oppfЬringen"
 
-#: po/tmp/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:3
 msgid "Delete..."
 msgstr "Slett..."
 
-#: po/tmp/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-editor.xml.h:4
 msgid "Help"
 msgstr "Hjelp"
 
-#: po/tmp/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:5
 msgid "Print En_velope..."
 msgstr "Skriv ut konvolutt..."
 
-#: po/tmp/evolution-contact-editor.xml.h:11
-#: po/tmp/evolution-event-editor.xml.h:81
+#: ui/evolution-contact-editor.xml.h:6 ui/evolution-event-editor.xml.h:76
 msgid "Print this item"
 msgstr "Skriv ut denne oppfЬringen"
 
-#: po/tmp/evolution-contact-editor.xml.h:12
-#: po/tmp/evolution-event-editor.xml.h:82
+#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:77
 msgid "Print..."
 msgstr "Skriv ut..."
 
-#: 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:8 ui/evolution-event-editor.xml.h:84
+#: ui/evolution-message-composer.xml.h:16
 msgid "Save _As..."
 msgstr "L_agre som..."
 
-#: po/tmp/evolution-contact-editor.xml.h:14
-#: po/tmp/evolution-event-editor.xml.h:90
+#: ui/evolution-contact-editor.xml.h:9 ui/evolution-event-editor.xml.h:85
 msgid "Save and Close"
 msgstr "Lagre og lukk"
 
-#: po/tmp/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-editor.xml.h:10
 msgid "Save the contact and close the dialog box"
 msgstr "Lagre kontakten og lukk dialogboksen"
 
-#: po/tmp/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-editor.xml.h:11
 msgid "Se_nd contact to other..."
 msgstr "Se_nd kontakt til andre..."
 
-#: po/tmp/evolution-contact-editor.xml.h:17
-#: po/tmp/evolution-event-editor.xml.h:98
+#: ui/evolution-contact-editor.xml.h:12 ui/evolution-event-editor.xml.h:93
 msgid "See online help"
 msgstr "Se hjelp"
 
-#: po/tmp/evolution-contact-editor.xml.h:18
+#: ui/evolution-contact-editor.xml.h:13
 msgid "Send _message to contact..."
 msgstr "Send _melding til kontakt..."
 
-#: 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:14 ui/evolution-event-editor.xml.h:105
+#: ui/evolution-message-composer.xml.h:37 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:20
 msgid "_File"
 msgstr "_Fil"
 
-#: po/tmp/evolution-contact-editor.xml.h:20
+#: ui/evolution-contact-editor.xml.h:15
 msgid "_Print..."
 msgstr "S_kriv ut..."
 
-#: 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:16 ui/evolution-event-editor.xml.h:116
+#: ui/evolution-message-composer.xml.h:41
 msgid "_Save"
 msgstr "_Lagre"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-event-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:1
 msgid "About this application"
 msgstr "Om denne applikasjonen"
 
-#: po/tmp/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:2
 msgid "About..."
 msgstr "Om..."
 
-#: po/tmp/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:3
 msgid "Actio_ns"
 msgstr "Ha_ndlinger"
 
-#: po/tmp/evolution-event-editor.xml.h:9
+#: ui/evolution-event-editor.xml.h:4
 msgid "C_lear"
 msgstr "T_Ьm"
 
-#: po/tmp/evolution-event-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:5
 msgid "C_ut"
 msgstr "Klipp _ut"
 
-#: po/tmp/evolution-event-editor.xml.h:11
+#: ui/evolution-event-editor.xml.h:6
 msgid "Clear"
 msgstr "TЬm"
 
-#: po/tmp/evolution-event-editor.xml.h:12
+#: ui/evolution-event-editor.xml.h:7
 msgid "Clear the selection"
 msgstr "TЬm utvalget"
 
-#: po/tmp/evolution-event-editor.xml.h:14
+#: ui/evolution-event-editor.xml.h:9
 msgid "Close this appointment"
 msgstr "Lukk denne avtalen"
 
-#: po/tmp/evolution-event-editor.xml.h:15 po/tmp/evolution-mail.xml.h:8
+#: ui/evolution-event-editor.xml.h:10 ui/evolution-mail.xml.h:3
 msgid "Copy"
 msgstr "KopiИr"
 
-#: po/tmp/evolution-event-editor.xml.h:16
+#: ui/evolution-event-editor.xml.h:11
 msgid "Copy the selection"
 msgstr "KopiИr utvalget"
 
-#: po/tmp/evolution-event-editor.xml.h:17
+#: ui/evolution-event-editor.xml.h:12
 msgid "Cut"
 msgstr "Klipp ut"
 
-#: po/tmp/evolution-event-editor.xml.h:18
+#: ui/evolution-event-editor.xml.h:13
 msgid "Cut the selection"
 msgstr "Klipp ut utvalget"
 
-#: po/tmp/evolution-event-editor.xml.h:21
+#: ui/evolution-event-editor.xml.h:16
 msgid "Dump XML"
 msgstr "Dump XML"
 
-#: po/tmp/evolution-event-editor.xml.h:22
+#: ui/evolution-event-editor.xml.h:17
 msgid "Dump the UI Xml description"
 msgstr "Dump beskrivelse av grensesnittet som XML"
 
-#: po/tmp/evolution-event-editor.xml.h:23
+#: ui/evolution-event-editor.xml.h:18
 msgid "FIXME: Address _Book..."
 msgstr "Addresse_bok..."
 
-#: po/tmp/evolution-event-editor.xml.h:24
+#: ui/evolution-event-editor.xml.h:19
 msgid "FIXME: Ch_oose Form..."
 msgstr "Velg skjema..."
 
-#: po/tmp/evolution-event-editor.xml.h:25
+#: ui/evolution-event-editor.xml.h:20
 msgid "FIXME: Chec_k Names"
 msgstr "Sjek_k navn"
 
-#: po/tmp/evolution-event-editor.xml.h:26
+#: ui/evolution-event-editor.xml.h:21
 msgid "FIXME: Cop_y to Folder..."
 msgstr "KopiИr til mappe..."
 
-#: po/tmp/evolution-event-editor.xml.h:27
+#: ui/evolution-event-editor.xml.h:22
 msgid "FIXME: D_esign a Form..."
 msgstr "U_tform et skjema..."
 
-#: po/tmp/evolution-event-editor.xml.h:28
+#: ui/evolution-event-editor.xml.h:23
 msgid "FIXME: Define Print _Styles"
-msgstr "DefinИr utskriftstiler"
+msgstr "DefinИr utskrift_stiler"
 
-#: po/tmp/evolution-event-editor.xml.h:29
+#: ui/evolution-event-editor.xml.h:24
 msgid "FIXME: Desi_gn This Form"
 msgstr "_Utform dette skjemaet"
 
-#: po/tmp/evolution-event-editor.xml.h:30
+#: ui/evolution-event-editor.xml.h:25
 msgid "FIXME: Fi_rst Item in Folder"
 msgstr "FЬ_rste oppfЬring i mappe"
 
-#: po/tmp/evolution-event-editor.xml.h:31
+#: ui/evolution-event-editor.xml.h:26
 msgid "FIXME: For_ward"
 msgstr "_Videresend"
 
-#: po/tmp/evolution-event-editor.xml.h:32
+#: ui/evolution-event-editor.xml.h:27
 msgid "FIXME: Forward as v_Calendar"
 msgstr "Videresend som v_Calendar"
 
-#: po/tmp/evolution-event-editor.xml.h:33
+#: ui/evolution-event-editor.xml.h:28
 msgid "FIXME: Help"
 msgstr "Hjelp"
 
-#: po/tmp/evolution-event-editor.xml.h:34
+#: ui/evolution-event-editor.xml.h:29
 msgid "FIXME: In_complete Task"
 msgstr "U_komplett oppgave"
 
-#: po/tmp/evolution-event-editor.xml.h:35
+#: ui/evolution-event-editor.xml.h:30
 msgid "FIXME: Insert File"
 msgstr "Sett inn fil"
 
-#: po/tmp/evolution-event-editor.xml.h:36
+#: ui/evolution-event-editor.xml.h:31
 msgid "FIXME: It_em..."
 msgstr "Opp_fЬring"
 
-#: po/tmp/evolution-event-editor.xml.h:37
+#: ui/evolution-event-editor.xml.h:32
 msgid "FIXME: Paste _Special... "
 msgstr "Lim inn _spesial..."
 
-#: po/tmp/evolution-event-editor.xml.h:38
+#: ui/evolution-event-editor.xml.h:33
 msgid "FIXME: Print Pre_view"
 msgstr "ForhЕndsvisning av utskrift"
 
-#: po/tmp/evolution-event-editor.xml.h:39
+#: ui/evolution-event-editor.xml.h:34
 msgid "FIXME: Pu_blish Form As..."
 msgstr "Pu_blisИr skjema som..."
 
-#: po/tmp/evolution-event-editor.xml.h:40
+#: ui/evolution-event-editor.xml.h:35
 msgid "FIXME: Publish _Form..."
 msgstr "PublisИr skjema..."
 
-#: po/tmp/evolution-event-editor.xml.h:41
+#: ui/evolution-event-editor.xml.h:36
 msgid "FIXME: Rec_urrence..."
 msgstr "Gjentakelse..."
 
-#: po/tmp/evolution-event-editor.xml.h:42
+#: ui/evolution-event-editor.xml.h:37
 msgid "FIXME: S_end"
 msgstr "_Send"
 
-#: po/tmp/evolution-event-editor.xml.h:43
+#: ui/evolution-event-editor.xml.h:38
 msgid "FIXME: Save Attac_hments..."
 msgstr "Lagre vedle_gg..."
 
-#: po/tmp/evolution-event-editor.xml.h:44
+#: ui/evolution-event-editor.xml.h:39
 msgid "FIXME: Script _Debugger"
 msgstr "FeilsЬking i skript"
 
-#: po/tmp/evolution-event-editor.xml.h:45
+#: ui/evolution-event-editor.xml.h:40
 msgid "FIXME: Task _Request"
 msgstr "Oppgavefo_respЬrsel"
 
-#: po/tmp/evolution-event-editor.xml.h:46
+#: ui/evolution-event-editor.xml.h:41
 msgid "FIXME: _Contact"
 msgstr "_Kontakt"
 
-#: po/tmp/evolution-event-editor.xml.h:47
+#: ui/evolution-event-editor.xml.h:42
 msgid "FIXME: _Customize..."
 msgstr "_Tilpass..."
 
-#: po/tmp/evolution-event-editor.xml.h:48
+#: ui/evolution-event-editor.xml.h:43
 msgid "FIXME: _File..."
 msgstr "_Fil..."
 
-#: po/tmp/evolution-event-editor.xml.h:49
+#: ui/evolution-event-editor.xml.h:44
 msgid "FIXME: _Font..."
 msgstr "FIXME: Skri_fttyper..."
 
-#: po/tmp/evolution-event-editor.xml.h:50
+#: ui/evolution-event-editor.xml.h:45
 msgid "FIXME: _Formatting"
 msgstr "_Formatering"
 
-#: po/tmp/evolution-event-editor.xml.h:51
+#: ui/evolution-event-editor.xml.h:46
 msgid "FIXME: _Item"
 msgstr "_OppfЬring"
 
-#: po/tmp/evolution-event-editor.xml.h:52
+#: ui/evolution-event-editor.xml.h:47
 msgid "FIXME: _Journal Entry"
 msgstr "_JournaloppfЬring"
 
-#: po/tmp/evolution-event-editor.xml.h:53
+#: ui/evolution-event-editor.xml.h:48
 msgid "FIXME: _Last Item in Folder"
 msgstr "_Siste oppfЬring i mappe"
 
-#: po/tmp/evolution-event-editor.xml.h:54
+#: ui/evolution-event-editor.xml.h:49
 msgid "FIXME: _Mail Message"
 msgstr "Send _melding"
 
-#: po/tmp/evolution-event-editor.xml.h:55
+#: ui/evolution-event-editor.xml.h:50
 msgid "FIXME: _Memo Style"
 msgstr "_Notis-stil"
 
-#: po/tmp/evolution-event-editor.xml.h:56
+#: ui/evolution-event-editor.xml.h:51
 msgid "FIXME: _Move to Folder..."
 msgstr "_Flytt til mappe..."
 
-#: po/tmp/evolution-event-editor.xml.h:57
+#: ui/evolution-event-editor.xml.h:52
 msgid "FIXME: _New Appointment"
 msgstr "_Ny avtale"
 
-#: po/tmp/evolution-event-editor.xml.h:58
+#: ui/evolution-event-editor.xml.h:53
 msgid "FIXME: _Note"
 msgstr "_Notis"
 
-#: po/tmp/evolution-event-editor.xml.h:59
+#: ui/evolution-event-editor.xml.h:54
 msgid "FIXME: _Object..."
 msgstr "_Objekt..."
 
-#: po/tmp/evolution-event-editor.xml.h:60
+#: ui/evolution-event-editor.xml.h:55
 msgid "FIXME: _Paragraph..."
 msgstr "_Avsnitt..."
 
-#: po/tmp/evolution-event-editor.xml.h:61
+#: ui/evolution-event-editor.xml.h:56
 msgid "FIXME: _Spelling..."
 msgstr "_Stavekontroll..."
 
-#: po/tmp/evolution-event-editor.xml.h:62
+#: ui/evolution-event-editor.xml.h:57
 msgid "FIXME: _Standard"
 msgstr "_Standard"
 
-#: po/tmp/evolution-event-editor.xml.h:63
+#: ui/evolution-event-editor.xml.h:58
 msgid "FIXME: _Task"
 msgstr "_Oppgave"
 
-#: po/tmp/evolution-event-editor.xml.h:64
+#: ui/evolution-event-editor.xml.h:59
 msgid "FIXME: _Unread Item"
 msgstr "_Ulest oppfЬring"
 
-#: po/tmp/evolution-event-editor.xml.h:65
+#: ui/evolution-event-editor.xml.h:60
 msgid "FIXME: what goes here?"
 msgstr "Hva gЕr her?"
 
-#: po/tmp/evolution-event-editor.xml.h:66
-#: po/tmp/evolution-message-composer.xml.h:11
+#: ui/evolution-event-editor.xml.h:61 ui/evolution-message-composer.xml.h:6
 msgid "F_ormat"
 msgstr "F_ormat"
 
-#: po/tmp/evolution-event-editor.xml.h:68
+#: ui/evolution-event-editor.xml.h:63
 msgid "Find Again"
 msgstr "Finn igjen"
 
-#: po/tmp/evolution-event-editor.xml.h:69
+#: ui/evolution-event-editor.xml.h:64
 msgid "Find _Again"
 msgstr "Finn ig_jen"
 
-#: po/tmp/evolution-event-editor.xml.h:70
+#: ui/evolution-event-editor.xml.h:65
 msgid "Go to the next item"
 msgstr "GЕ til neste oppfЬring"
 
-#: po/tmp/evolution-event-editor.xml.h:71
+#: ui/evolution-event-editor.xml.h:66
 msgid "Go to the previous item"
 msgstr "GЕ til forrige oppfЬring"
 
-#: po/tmp/evolution-event-editor.xml.h:72
+#: ui/evolution-event-editor.xml.h:67
 msgid "Modify the file's properties"
 msgstr "Endre filens egenskaper"
 
-#: po/tmp/evolution-event-editor.xml.h:73
+#: ui/evolution-event-editor.xml.h:68
 msgid "N_ext"
 msgstr "N_este"
 
-#: po/tmp/evolution-event-editor.xml.h:75
+#: ui/evolution-event-editor.xml.h:70
 msgid "Paste"
 msgstr "Lim inn"
 
-#: po/tmp/evolution-event-editor.xml.h:76
+#: ui/evolution-event-editor.xml.h:71
 msgid "Paste the clipboard"
 msgstr "Lim inn fra utklippstavlen"
 
-#: po/tmp/evolution-event-editor.xml.h:77
+#: ui/evolution-event-editor.xml.h:72
 msgid "Pre_vious"
 msgstr "Forri_ge"
 
-#: po/tmp/evolution-event-editor.xml.h:78
+#: ui/evolution-event-editor.xml.h:73
 msgid "Previous"
 msgstr "Forrige"
 
-#: po/tmp/evolution-event-editor.xml.h:79
+#: ui/evolution-event-editor.xml.h:74
 msgid "Print S_etup..."
 msgstr "Skriveropps_ett..."
 
-#: po/tmp/evolution-event-editor.xml.h:80
+#: ui/evolution-event-editor.xml.h:75
 msgid "Print Setup"
 msgstr "Skriveroppsett"
 
-#: po/tmp/evolution-event-editor.xml.h:83
+#: ui/evolution-event-editor.xml.h:78
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: po/tmp/evolution-event-editor.xml.h:84
+#: ui/evolution-event-editor.xml.h:79
 msgid "Redo"
 msgstr "Gjenopprett"
 
-#: po/tmp/evolution-event-editor.xml.h:85
+#: ui/evolution-event-editor.xml.h:80
 msgid "Redo the undone action"
 msgstr "Gjenopprett angret handling"
 
-#: po/tmp/evolution-event-editor.xml.h:86
+#: ui/evolution-event-editor.xml.h:81
 msgid "Replace"
 msgstr "Erstatt"
 
-#: po/tmp/evolution-event-editor.xml.h:87
+#: ui/evolution-event-editor.xml.h:82
 msgid "Replace a string"
 msgstr "Erstattt en streng"
 
-#: po/tmp/evolution-event-editor.xml.h:91
+#: ui/evolution-event-editor.xml.h:86
 msgid "Save the appointment and close the dialog box"
 msgstr "Lagre avtalen og lukk dialogboksen"
 
-#: po/tmp/evolution-event-editor.xml.h:92
-#: po/tmp/evolution-message-composer.xml.h:24
+#: ui/evolution-event-editor.xml.h:87 ui/evolution-message-composer.xml.h:19
 msgid "Save the current file"
 msgstr "Lagre aktiv fil"
 
-#: po/tmp/evolution-event-editor.xml.h:93
+#: ui/evolution-event-editor.xml.h:88
 msgid "Schedule Meeting"
 msgstr "Sett opp mЬte"
 
-#: po/tmp/evolution-event-editor.xml.h:94
+#: ui/evolution-event-editor.xml.h:89
 msgid "Schedule _Meeting"
 msgstr "Sett opp _mЬte"
 
-#: po/tmp/evolution-event-editor.xml.h:95
+#: ui/evolution-event-editor.xml.h:90
 msgid "Schedule some sort of a meeting"
 msgstr "Sett opp ett eller annet mЬte"
 
-#: po/tmp/evolution-event-editor.xml.h:96
+#: ui/evolution-event-editor.xml.h:91
 msgid "Search again for the same string"
 msgstr "SЬk etter samme streng pЕ nytt"
 
-#: po/tmp/evolution-event-editor.xml.h:97
+#: ui/evolution-event-editor.xml.h:92
 msgid "Search for a string"
 msgstr "SЬk etter en streng"
 
-#: po/tmp/evolution-event-editor.xml.h:99
+#: ui/evolution-event-editor.xml.h:94
 msgid "Select All"
 msgstr "Velg alle"
 
-#: po/tmp/evolution-event-editor.xml.h:100
+#: ui/evolution-event-editor.xml.h:95
 msgid "Select everything"
 msgstr "Velg alt"
 
-#: po/tmp/evolution-event-editor.xml.h:101
+#: ui/evolution-event-editor.xml.h:96
 msgid "Setup the page settings for your current printer"
 msgstr "RedigИr sideinnstillinger for aktiv skriver"
 
-#: po/tmp/evolution-event-editor.xml.h:102
+#: ui/evolution-event-editor.xml.h:97
 msgid "Undo"
 msgstr "Angre"
 
-#: po/tmp/evolution-event-editor.xml.h:103
+#: ui/evolution-event-editor.xml.h:98
 msgid "Undo the last action"
 msgstr "Angre siste handling"
 
-#: po/tmp/evolution-event-editor.xml.h:104
-#: po/tmp/evolution-message-composer.xml.h:38
+#: ui/evolution-event-editor.xml.h:99 ui/evolution-message-composer.xml.h:33
 msgid "_About..."
 msgstr "_Om..."
 
-#: po/tmp/evolution-event-editor.xml.h:105
-#: po/tmp/evolution-message-composer.xml.h:39
+#: ui/evolution-event-editor.xml.h:100 ui/evolution-message-composer.xml.h:34
 msgid "_Close"
 msgstr "L_ukk"
 
-#: po/tmp/evolution-event-editor.xml.h:106
+#: ui/evolution-event-editor.xml.h:101
 msgid "_Copy"
 msgstr "_KopiИr"
 
-#: po/tmp/evolution-event-editor.xml.h:107
-#: po/tmp/evolution-message-composer.xml.h:40
+#: ui/evolution-event-editor.xml.h:102 ui/evolution-message-composer.xml.h:35
 msgid "_Debug"
 msgstr "_FeilsЬk"
 
-#: 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:104 ui/evolution-message-composer.xml.h:36
+#: ui/evolution-subscribe.xml.h:10 ui/evolution.xml.h:19
 msgid "_Edit"
 msgstr "R_edigИr"
 
-#: po/tmp/evolution-event-editor.xml.h:111
+#: ui/evolution-event-editor.xml.h:106
 msgid "_Find..."
 msgstr "_Finn..."
 
-#: po/tmp/evolution-event-editor.xml.h:112
+#: ui/evolution-event-editor.xml.h:107
 msgid "_Forms"
 msgstr "Sk_jemaer"
 
-#: 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:108 ui/evolution-message-composer.xml.h:38
+#: ui/evolution.xml.h:23
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: po/tmp/evolution-event-editor.xml.h:114
+#: ui/evolution-event-editor.xml.h:109
 msgid "_Insert"
 msgstr "Sett _inn"
 
-#: po/tmp/evolution-event-editor.xml.h:115
+#: ui/evolution-event-editor.xml.h:110
 msgid "_Object"
 msgstr "_Objekt"
 
-#: po/tmp/evolution-event-editor.xml.h:116
+#: ui/evolution-event-editor.xml.h:111
 msgid "_Paste"
 msgstr "_Lim inn"
 
-#: po/tmp/evolution-event-editor.xml.h:117
+#: ui/evolution-event-editor.xml.h:112
 msgid "_Print"
 msgstr "S_kriv ut"
 
-#: po/tmp/evolution-event-editor.xml.h:118
+#: ui/evolution-event-editor.xml.h:113
 msgid "_Properties..."
 msgstr "Egenska_per..."
 
-#: po/tmp/evolution-event-editor.xml.h:119
+#: ui/evolution-event-editor.xml.h:114
 msgid "_Redo"
 msgstr "Gjenopp_rett"
 
-#: po/tmp/evolution-event-editor.xml.h:120
+#: ui/evolution-event-editor.xml.h:115
 msgid "_Replace..."
 msgstr "E_rstatt..."
 
-#: po/tmp/evolution-event-editor.xml.h:122
+#: ui/evolution-event-editor.xml.h:117
 msgid "_Toolbars"
 msgstr "Verk_tЬylinjer"
 
-#: po/tmp/evolution-event-editor.xml.h:124
+#: ui/evolution-event-editor.xml.h:119
 msgid "_Undo"
 msgstr "_Angre"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-mail.xml.h:6
+#: ui/evolution-mail.xml.h:1
 msgid "Compose"
 msgstr "KomponИr"
 
-#: po/tmp/evolution-mail.xml.h:7
+#: ui/evolution-mail.xml.h:2
 msgid "Compose a new message"
 msgstr "KomponИr en ny melding"
 
-#: po/tmp/evolution-mail.xml.h:9
+#: ui/evolution-mail.xml.h:4
 msgid "Copy message to a new folder"
 msgstr "KopiИr meldingen til en ny mappe"
 
-#: po/tmp/evolution-mail.xml.h:13 po/tmp/evolution-subscribe.xml.h:8
+#: ui/evolution-mail.xml.h:8 ui/evolution-subscribe.xml.h:3
 msgid "F_older"
 msgstr "M_appe"
 
-#: po/tmp/evolution-mail.xml.h:14
+#: ui/evolution-mail.xml.h:9
 msgid "Fi_lter on Sender"
 msgstr "Fi_ltrИr etter sender"
 
-#: po/tmp/evolution-mail.xml.h:15
+#: ui/evolution-mail.xml.h:10
 msgid "Filter on Rec_ipients"
 msgstr "F_iltrИr etter mottaker"
 
-#: po/tmp/evolution-mail.xml.h:16
+#: ui/evolution-mail.xml.h:11
 msgid "Forget _Passwords"
 msgstr "Glem _passord"
 
-#: po/tmp/evolution-mail.xml.h:20
+#: ui/evolution-mail.xml.h:15
 msgid "Get Mail"
 msgstr "Hent e-post"
 
-#: po/tmp/evolution-mail.xml.h:22
+#: ui/evolution-mail.xml.h:17
 msgid "Hide _Deleted messages"
 msgstr "Skjul slette_de meldinger"
 
-#: po/tmp/evolution-mail.xml.h:23
+#: ui/evolution-mail.xml.h:18
 msgid "Hide _Read messages"
 msgstr "Skjul le_ste meldinger"
 
-#: po/tmp/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:19
 msgid "Hide _Selected messages"
 msgstr "_Skjul valgte meldinger"
 
-#: po/tmp/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:20
 msgid "Mail _Filters..."
 msgstr "E-post _filtre..."
 
-#: po/tmp/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:21
 msgid "Manage Subscriptions..."
 msgstr "HЕndtИr abonnement..."
 
-#: po/tmp/evolution-mail.xml.h:27
+#: ui/evolution-mail.xml.h:22
 msgid "Mar_k As Read"
 msgstr "Mar_kИr som lest"
 
-#: po/tmp/evolution-mail.xml.h:28
+#: ui/evolution-mail.xml.h:23
 msgid "Mark As U_nread"
 msgstr "Merk som _ulest"
 
-#: po/tmp/evolution-mail.xml.h:29
+#: ui/evolution-mail.xml.h:24
 msgid "Move"
 msgstr "Flytt"
 
-#: po/tmp/evolution-mail.xml.h:30
+#: ui/evolution-mail.xml.h:25
 msgid "Move message to a new folder"
 msgstr "Flytt meldingen til en ny mappe"
 
-#: po/tmp/evolution-mail.xml.h:31
+#: ui/evolution-mail.xml.h:26
 msgid "Previews the message to be printed"
 msgstr "Viser forhЕndsvisning av meldingen som skal skrives ut"
 
-#: po/tmp/evolution-mail.xml.h:33
+#: ui/evolution-mail.xml.h:28
 msgid "Print Preview of message..."
 msgstr "Vis forhЕndsvisning av melding..."
 
-#: po/tmp/evolution-mail.xml.h:34
+#: ui/evolution-mail.xml.h:29
 msgid "Print message to the printer"
 msgstr "Skriv ut denne meldingen pЕ skriveren"
 
-#: po/tmp/evolution-mail.xml.h:35
+#: ui/evolution-mail.xml.h:30
 msgid "Print message..."
 msgstr "Skriv ut melding..."
 
-#: po/tmp/evolution-mail.xml.h:39
+#: ui/evolution-mail.xml.h:34
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: po/tmp/evolution-mail.xml.h:40
+#: ui/evolution-mail.xml.h:35
 msgid "Reply to _Sender"
 msgstr "Svar til _sender"
 
-#: po/tmp/evolution-mail.xml.h:43 po/tmp/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:38 ui/evolution-subscribe.xml.h:7
 msgid "Select _All"
 msgstr "Velg _alle"
 
-#: po/tmp/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:39
 msgid "Send queued mail and retrieve new mail"
 msgstr "Send kЬlagt e-post og hent ny e-post"
 
-#: po/tmp/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:40
 msgid "Show _All messages"
 msgstr "Vis _alle meldinger"
 
-#: po/tmp/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:41
 msgid "Threaded Message list"
 msgstr "Meldingsliste med trЕder"
 
-#: po/tmp/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:42
 msgid "VFolder on Se_nder"
 msgstr "VFolder for se_nder"
 
-#: po/tmp/evolution-mail.xml.h:48
+#: ui/evolution-mail.xml.h:43
 msgid "VFolder on _Recipients"
 msgstr "VFolder for mottake_re"
 
-#: po/tmp/evolution-mail.xml.h:49
+#: ui/evolution-mail.xml.h:44
 msgid "View Raw Message Source"
 msgstr "Vis rЕ meldingskode"
 
-#: po/tmp/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:45
 msgid "_Apply Filters"
 msgstr "_PЕfЬr filtre"
 
-#: po/tmp/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:46
 msgid "_Configure Folder"
 msgstr "_KonfigurИr mappe"
 
-#: po/tmp/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:47
 msgid "_Copy to Folder..."
 msgstr "_KopiИr til mappe..."
 
-#: po/tmp/evolution-mail.xml.h:54
+#: ui/evolution-mail.xml.h:49
 msgid "_Edit Message"
 msgstr "R_edigИr melding"
 
-#: po/tmp/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:50
 msgid "_Expunge"
-msgstr "_Fjern"
+msgstr "_TЬm"
 
-#: po/tmp/evolution-mail.xml.h:56
+#: ui/evolution-mail.xml.h:51
 msgid "_Filter on Subject"
 msgstr "_FiltrИr etter emne"
 
-#: po/tmp/evolution-mail.xml.h:57
+#: ui/evolution-mail.xml.h:52
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: po/tmp/evolution-mail.xml.h:58 po/tmp/evolution-subscribe.xml.h:17
+#: ui/evolution-mail.xml.h:53 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "Re_versИr utvalg"
 
-#: po/tmp/evolution-mail.xml.h:59
+#: ui/evolution-mail.xml.h:54
 msgid "_Mail Configuration..."
 msgstr "_E-post konfigurasjon..."
 
-#: po/tmp/evolution-mail.xml.h:60
+#: ui/evolution-mail.xml.h:55
 msgid "_Message"
 msgstr "_Melding"
 
-#: po/tmp/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:56
 msgid "_Move to Folder..."
 msgstr "F_lytt til mappe..."
 
-#: po/tmp/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:57
 msgid "_Open in New Window"
 msgstr "_еpne i nytt vindu"
 
-#: po/tmp/evolution-mail.xml.h:63
+#: ui/evolution-mail.xml.h:58
 msgid "_Print Message"
 msgstr "S_kriv ut melding"
 
-#: po/tmp/evolution-mail.xml.h:64
+#: ui/evolution-mail.xml.h:59
 msgid "_Save Message As..."
 msgstr "Lagre melding _som..."
 
-#: po/tmp/evolution-mail.xml.h:65
+#: ui/evolution-mail.xml.h:60
 msgid "_Source"
 msgstr "_Kildekode"
 
-#: po/tmp/evolution-mail.xml.h:66
+#: ui/evolution-mail.xml.h:61
 msgid "_Threaded"
 msgstr "Med _trЕder"
 
-#: po/tmp/evolution-mail.xml.h:67
+#: ui/evolution-mail.xml.h:62
 msgid "_Undelete"
 msgstr "A_ngre slett"
 
-#: po/tmp/evolution-mail.xml.h:68
+#: ui/evolution-mail.xml.h:63
 msgid "_VFolder on Subject"
 msgstr "_VFolder for emne"
 
-#: po/tmp/evolution-mail.xml.h:69
+#: ui/evolution-mail.xml.h:64
 msgid "_Virtual Folder Editor..."
 msgstr "Redigering av _virtuelle mapper..."
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-message-composer.xml.h:6
+#: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Legg ved"
 
-#: po/tmp/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:4
 msgid "Close the current file"
 msgstr "Lukk aktiv fil"
 
-#: po/tmp/evolution-message-composer.xml.h:10
+#: ui/evolution-message-composer.xml.h:5
 msgid "Encrypt this message with PGP"
 msgstr "KryptИr denne meldingen med PGP"
 
-#: po/tmp/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:7
 msgid "HTML"
 msgstr "HTML"
 
-#: po/tmp/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:8
 msgid "Insert a file as text into the message"
 msgstr "Sett inn en tekstfil i meldingen"
 
-#: po/tmp/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:9
 msgid "Insert text file..."
 msgstr "Sett inn tekstfil..."
 
-#: po/tmp/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:11
 msgid "Open a file"
 msgstr "еpne en fil"
 
-#: po/tmp/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:12
 msgid "PGP Encrypt"
 msgstr "KryptИr med PGP"
 
-#: po/tmp/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:13
 msgid "PGP Sign"
 msgstr "SignИr med PGP"
 
-#: po/tmp/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:15
 msgid "Save As"
 msgstr "Lagre som"
 
-#: po/tmp/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:17
 msgid "Save in _folder... (FIXME)"
 msgstr "Lagre i _mappe..."
 
-#: po/tmp/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:18
 msgid "Save in folder..."
 msgstr "Lagre i mappe..."
 
-#: po/tmp/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save the current file with a different name"
 msgstr "Lagre aktiv fil med et nytt navn"
 
-#: po/tmp/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:21
 msgid "Save the message in a specified folder"
 msgstr "Lagre meldingen i en spesifisert mappe"
 
-#: po/tmp/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:22
 msgid "Send"
 msgstr "Send"
 
-#: po/tmp/evolution-message-composer.xml.h:28
+#: ui/evolution-message-composer.xml.h:23
 msgid "Send _Later"
 msgstr "Send se_nere"
 
-#: po/tmp/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:24
 msgid "Send _later"
 msgstr "Send se_nere"
 
-#: po/tmp/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:25
 msgid "Send the mail in HTML format"
 msgstr "Send meldingen i HTML-format"
 
-#: po/tmp/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:26
 msgid "Send the message later"
 msgstr "Send meldingen senere"
 
-#: po/tmp/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send the message now"
 msgstr "Send meldingen nЕ"
 
-#: po/tmp/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send this message now"
 msgstr "Send denne meldingen nЕ"
 
-#: po/tmp/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:29
 msgid "Show / hide attachments"
 msgstr "Vis/skjul vedlegg"
 
-#: po/tmp/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:30
 msgid "Show _attachments"
 msgstr "Vis _vedlegg"
 
-#: po/tmp/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:31
 msgid "Show attachments"
 msgstr "Vis vedlegg"
 
-#: po/tmp/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:32
 msgid "Sign this message with your PGP key"
 msgstr "SignИr denne meldingen med din PGP-nЬkkel"
 
-#: po/tmp/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:39
 msgid "_Insert text file... (FIXME)"
 msgstr "Sett _inn tekstfil..."
 
-#: po/tmp/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:40
 msgid "_Open..."
 msgstr "_еpne..."
 
-#: po/tmp/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:42
 msgid "_Security"
 msgstr "_Sikkerhet"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-subscribe.xml.h:6
+#: ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "Legg til mappe pЕ listen over abonnerte mapper"
 
-#: po/tmp/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:4
 msgid "Refresh List"
 msgstr "Les listen pЕ nytt"
 
-#: po/tmp/evolution-subscribe.xml.h:10
+#: ui/evolution-subscribe.xml.h:5
 msgid "Refresh List of Folders"
 msgstr "Les mappelisten pЕ nytt"
 
-#: po/tmp/evolution-subscribe.xml.h:11
+#: ui/evolution-subscribe.xml.h:6
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Fjern mappe fra din liste over abbonerte mapper"
 
-#: po/tmp/evolution-subscribe.xml.h:13
+#: ui/evolution-subscribe.xml.h:8
 msgid "Subscribe"
 msgstr "AbonnИr"
 
-#: po/tmp/evolution-subscribe.xml.h:14
+#: ui/evolution-subscribe.xml.h:9
 msgid "Unsubscribe"
 msgstr "Fjern abonnement"
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution.xml.h:6
+#: ui/evolution.xml.h:1
 msgid "Display a different folder"
 msgstr "Vis en annen mappe"
 
-#: po/tmp/evolution.xml.h:7
+#: ui/evolution.xml.h:2
 msgid "E_xit"
 msgstr "A_vslutt"
 
-#: po/tmp/evolution.xml.h:8
+#: ui/evolution.xml.h:3
 msgid "Evolution bar _shortcut"
 msgstr "Evolution-linje _snarvei"
 
-#: po/tmp/evolution.xml.h:9
+#: ui/evolution.xml.h:4
 msgid "Exit the program"
 msgstr "Avslutt programmet"
 
-#: po/tmp/evolution.xml.h:10
+#: ui/evolution.xml.h:5
 msgid "Getting _Started"
 msgstr "Kom _igang"
 
-#: po/tmp/evolution.xml.h:11
+#: ui/evolution.xml.h:6
 msgid "Show information about Evolution"
 msgstr "Vis informasjon om Evolution"
 
-#: po/tmp/evolution.xml.h:12
+#: ui/evolution.xml.h:7
 msgid "Show the _Folder Bar"
 msgstr "Vis _mappelinjen"
 
-#: po/tmp/evolution.xml.h:13
+#: ui/evolution.xml.h:8
 msgid "Show the _Shortcut Bar"
 msgstr "Vis _snarveilinjen"
 
-#: po/tmp/evolution.xml.h:14
+#: ui/evolution.xml.h:9
 msgid "Submit _Bug Report"
 msgstr "Sen_d inn feilrapport"
 
-#: po/tmp/evolution.xml.h:15
+#: ui/evolution.xml.h:10
 msgid "Submit bug report using Bug Buddy."
 msgstr "Send inn feilrapport ved bruk av Bug Buddy."
 
-#: po/tmp/evolution.xml.h:16
+#: ui/evolution.xml.h:11
 msgid "Toggle whether to show the folder bar"
 msgstr "SlЕ av/pЕ visning av mappelinjen"
 
-#: po/tmp/evolution.xml.h:17
+#: ui/evolution.xml.h:12
 msgid "Toggle whether to show the shortcut bar"
 msgstr "SlЕ av/pЕ visning av snarveilinjen"
 
-#: po/tmp/evolution.xml.h:18
+#: ui/evolution.xml.h:13
 msgid "Using the C_ontact Manager"
 msgstr "Bruk av k_ontaktdatabasen"
 
-#: po/tmp/evolution.xml.h:19
+#: ui/evolution.xml.h:14
 msgid "Using the _Calendar"
 msgstr "Bruk av _kalenderen"
 
-#: po/tmp/evolution.xml.h:20
+#: ui/evolution.xml.h:15
 msgid "Using the _Mailer"
 msgstr "Bruk av e-_postprogrammet"
 
-#: po/tmp/evolution.xml.h:21
+#: ui/evolution.xml.h:16
 msgid "_About Evolution..."
 msgstr "_Om Evolution..."
 
-#: po/tmp/evolution.xml.h:22
+#: ui/evolution.xml.h:17
 msgid "_Appointment (FIXME)"
 msgstr "_Avtale"
 
-#: po/tmp/evolution.xml.h:23
+#: ui/evolution.xml.h:18
 msgid "_Contact (FIXME)"
 msgstr "_Kontakt"
 
-#: po/tmp/evolution.xml.h:26
+#: ui/evolution.xml.h:21
 msgid "_Folder"
 msgstr "_Mappe"
 
-#: po/tmp/evolution.xml.h:27
+#: ui/evolution.xml.h:22
 msgid "_Go to Folder..."
 msgstr "_GЕ til mappe..."
 
-#: po/tmp/evolution.xml.h:29
+#: ui/evolution.xml.h:24
 msgid "_Index"
 msgstr "_Indeks"
 
-#: po/tmp/evolution.xml.h:30
+#: ui/evolution.xml.h:25
 msgid "_Mail message (FIXME)"
 msgstr "Send _melding"
 
-#: po/tmp/evolution.xml.h:32
+#: ui/evolution.xml.h:27
 msgid "_Settings"
 msgstr "Inn_stillinger"
 
-#: po/tmp/evolution.xml.h:33
+#: ui/evolution.xml.h:28
 msgid "_Task (FIXME)"
 msgstr "_Oppgave"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2470
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr "Tentativ"
-
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:387
 msgid "Busy"
 msgstr "Opptatt"
@@ -6747,7 +7031,7 @@ msgstr "MTWTFSS"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-clipped-label.c:107
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
@@ -6772,6 +7056,223 @@ msgstr "%I:%M %p"
 msgid "Group %i"
 msgstr "Gruppe %i"
 
+#~ msgid "Automatically check mail every "
+#~ msgstr "Sjekk etter e-post hver "
+
+#~ msgid "IMAP"
+#~ msgstr "IMAP"
+
+#~ msgid "Server Timeouts"
+#~ msgstr "Tidsavbrudd for tjener"
+
+#~ msgid "minute(s)"
+#~ msgstr "minutt(er)"
+
+#~ msgid "categories"
+#~ msgstr "kategorier"
+
+#~ msgid "Item(s) belong to these categories:"
+#~ msgstr "OppfЬring(er) hЬrer til disse kategoriene:"
+
+#~ msgid "Available Categories:"
+#~ msgstr "Tilgjengelige kategorier:"
+
+#~ msgid "Deleted"
+#~ msgstr "Slettet"
+
+#~ msgid "Draft"
+#~ msgstr "Skisse"
+
+#~ msgid "Mail Source"
+#~ msgstr "E-post-kilde"
+
+#~ msgid ""
+#~ "Your email configuration is now complete.\n"
+#~ "Click \"Finish\" to save your new settings"
+#~ msgstr ""
+#~ "Din e-post-konfigurasjon er nЕ komplett.\n"
+#~ "Klikk \"FullfЬr\" for Е lagre dine nye innstillinger"
+
+#~ msgid "Sending a message without a subject"
+#~ msgstr "Sender en melding uten emne"
+
+#~ msgid "Send \"%s\""
+#~ msgstr "Send \"%s\""
+
+#~ msgid "Send a message without a subject"
+#~ msgstr "Send en melding uten emne"
+
+#~ msgid "Marking messages in folder \"%s\""
+#~ msgstr "Merker meldinger i mappe \"%s"
+
+#~ msgid "Mark messages in folder \"%s\""
+#~ msgstr "Merk meldinger i mappe \"%s\""
+
+#~ msgid "Marking message %d of %d"
+#~ msgstr "Merker melding %d av %d"
+
+#~ msgid "Scan folders in \"%s\""
+#~ msgstr "Skann foldere i \"%s\""
+
+#~ msgid "Attaching messages from folder \"%s\""
+#~ msgstr "Legger ved meldinger fra mappe \"%s\""
+
+#~ msgid "Attach messages from \"%s\""
+#~ msgstr "Legg ved meldinger fra \"%s\""
+
+#~ msgid "Forwarding messages \"%s\""
+#~ msgstr "Videresender meldinger \"%s\""
+
+#~ msgid "Forwarding a message without a subject"
+#~ msgstr "Videresender en melding uten emne"
+
+#~ msgid "Forward message \"%s\""
+#~ msgstr "Videresend meldingen \"%s\""
+
+#~ msgid "Forward a message without a subject"
+#~ msgstr "Videresend en melding uten emne"
+
+#~ msgid ""
+#~ "Failed to generate mime part from message while generating forwarded message."
+#~ msgstr ""
+#~ "Kunne ikke generere MIME-del fra melding under generering av videresendt "
+#~ "melding."
+
+#~ msgid "Creating \"%s\""
+#~ msgstr "Oppretter \"%s\""
+
+#~ msgid "Create \"%s\""
+#~ msgstr "Opprett \"%s\""
+
+#~ msgid "Exception while reporting result to shell component listener."
+#~ msgstr "Unntak under rapportering av resultat til skallkomponentens lytter."
+
+#~ msgid "Saving messages from folder \"%s\""
+#~ msgstr "Lagrer meldinger fra mappe \"%s\""
+
+#~ msgid "Save messages from folder \"%s\""
+#~ msgstr "Lagre meldinger fra mappe \"%s\""
+
+#~ msgid "Rebuilding message view"
+#~ msgstr "Bygger opp meldingsvisningen pЕ nytt"
+
+#~ msgid "Rebuild message view"
+#~ msgstr "Gjenoppbygg meldingsvisningen"
+
+#~ msgid "Note: When converting between mailbox formats, a failure\n"
+#~ msgstr "Merk: Ved konvertering mellom postboksformater, kan en feil\n"
+
+#~ msgid "FIXME: _Appointment"
+#~ msgstr "_Avtale"
+
+#~ msgid "FIXME: Meeting Re_quest"
+#~ msgstr "MЬteforesp_Ьrsel"
+
+#~ msgid "Page Set_up"
+#~ msgstr "Sideoppsett"
+
+#~ msgid "FIXME: Mark as U_nread"
+#~ msgstr "Merk som ulest"
+
+#~ msgid "FIXME: __Formatting"
+#~ msgstr "_Formatering"
+
+#~ msgid "Ne_xt"
+#~ msgstr "Nes_te"
+
+#~ msgid "FIXME: Previous"
+#~ msgstr "Forrige"
+
+#~ msgid "FIXME: Next"
+#~ msgstr "Neste"
+
+#~ msgid "External Directories"
+#~ msgstr "Eksterne kataloger"
+
+#~ msgid "Port Number:"
+#~ msgstr "Portnummer:"
+
+#~ msgid "Outline:"
+#~ msgstr "Omriss:"
+
+#~ msgid "Headings:"
+#~ msgstr "Topptekster:"
+
+#~ msgid "Empty days:"
+#~ msgstr "Tomme dager:"
+
+#~ msgid "Appointments:"
+#~ msgstr "Avtaler:"
+
+#~ msgid "Highlighted day:"
+#~ msgstr "Merket dag:"
+
+#~ msgid "Day numbers:"
+#~ msgstr "Dagnummer:"
+
+#~ msgid "Current day's number:"
+#~ msgstr "Nummer for idag:"
+
+#~ msgid "To-Do item that is not yet due:"
+#~ msgstr "OppgavelisteoppfЬring som ikke har gЕtt ut ennЕ:"
+
+#~ msgid "To-Do item that is due today:"
+#~ msgstr "OppgavelisteoppfЬring som gЕr ut idag:"
+
+#~ msgid "To-Do item that is overdue:"
+#~ msgstr "OppgavelisteoppfЬring som har gЕtt ut:"
+
+#~ msgid "Expunging \"%s\""
+#~ msgstr "Fjerner \"%s\""
+
+#~ msgid "Expunge \"%s\""
+#~ msgstr "TЬm \"%s\""
+
+#~ msgid "Loading \"%s\""
+#~ msgstr "Laster \"%s\""
+
+#~ msgid "Load \"%s\""
+#~ msgstr "Last \"%s\""
+
+#~ msgid "Synchronizing \"%s\""
+#~ msgstr "Synkroniserer \"%s\""
+
+#~ msgid "Synchronize \"%s\""
+#~ msgstr "SynkronisИr \"%s\""
+
+#~ msgid "Displaying message UID \"%s\""
+#~ msgstr "Viser melding-UID \"%s\""
+
+#~ msgid "Clearing message display"
+#~ msgstr "TЬmmer meldingsvisning"
+
+#~ msgid "Display message UID \"%s\""
+#~ msgstr "Vis meldings-UID \"%s\""
+
+#~ msgid "Clear message display"
+#~ msgstr "TЬm meldingsvisning"
+
+#~ msgid "Opening messages from folder \"%s\""
+#~ msgstr "еpner meldinger fra mappe \"%s\""
+
+#~ msgid "Open messages from \"%s\""
+#~ msgstr "еpne meldinger fra \"%s\""
+
+#~ msgid "Viewing messages from folder \"%s\""
+#~ msgstr "Viser meldinger fra mappe \"%s\""
+
+#~ msgid "View messages from \"%s\""
+#~ msgstr "Vis meldinger fra \"%s\""
+
+#~ msgid "Retrieving message %d of %d (uid \"%s\")"
+#~ msgstr "Henter melding %d av %d (uid \"%s\")"
+
+#~ msgid "N_ew Directory Server"
+#~ msgstr "Ny katalog-tj_ener"
+
+#~ msgid "_Actions"
+#~ msgstr "H_andlinger"
+
 #~ msgid "appointment"
 #~ msgstr "avtaler"
 
@@ -6784,9 +7285,6 @@ msgstr "Gruppe %i"
 #~ msgid "Year:"
 #~ msgstr "еr:"
 
-#~ msgid "Go to date"
-#~ msgstr "GЕ til dato"
-
 #~ msgid ""
 #~ "Please select the date you want to go to.\n"
 #~ "When you click on a day, you will be taken\n"
@@ -6796,54 +7294,18 @@ msgstr "Gruppe %i"
 #~ "NЕr du klikker pЕ en dag vil du flytte\n"
 #~ "deg til denne datoen."
 
-#~ msgid "Go to today"
-#~ msgstr "GЕ til idag"
-
 #~ msgid "_Mail Configuration"
 #~ msgstr "E-post-ko_nfigurasjon"
 
 #~ msgid "_Save Calendar As"
 #~ msgstr "Lagre kalender _som"
 
-#~ msgid "january"
-#~ msgstr "januar"
-
-#~ msgid "february"
-#~ msgstr "februar"
-
-#~ msgid "march"
-#~ msgstr "mars"
-
-#~ msgid "april"
-#~ msgstr "april"
-
 #~ msgid "may"
 #~ msgstr "mai"
 
-#~ msgid "june"
-#~ msgstr "juni"
-
-#~ msgid "july"
-#~ msgstr "juli"
-
-#~ msgid "august"
-#~ msgstr "august"
-
-#~ msgid "september"
-#~ msgstr "september"
-
 #~ msgid "sept"
 #~ msgstr "sept"
 
-#~ msgid "october"
-#~ msgstr "oktober"
-
-#~ msgid "november"
-#~ msgstr "november"
-
-#~ msgid "december"
-#~ msgstr "desember"
-
 #~ msgid "sunday"
 #~ msgstr "sЬndag"
 
@@ -7010,9 +7472,6 @@ msgstr "Gruppe %i"
 #~ msgid "Cannot fork %s: %s"
 #~ msgstr "Kan ikke kjЬre fork pЕ %s: %s"
 
-#~ msgid "Cannot initialize Evolution's mail summary component."
-#~ msgstr "Kan ikke initiere Evolution's e-postsammendrag-komponent."
-
 #~ msgid "Cannot initialize Evolution's mail storage hash."
 #~ msgstr "Kan ikke initiere Evolutions e-postlagrings-hash."
 
@@ -7025,9 +7484,6 @@ msgstr "Gruppe %i"
 #~ msgid "Forward as Attachment"
 #~ msgstr "Videresend som vedlegg"
 
-#~ msgid "_New Contact"
-#~ msgstr "_Ny kontakt"
-
 #~ msgid "New Ca_lendar"
 #~ msgstr "Ny ka_lender"
 
@@ -7084,9 +7540,6 @@ msgstr "Gruppe %i"
 #~ msgid "Due Date:"
 #~ msgstr "Ferdig-dato:"
 
-#~ msgid "Priority:"
-#~ msgstr "Prioritet:"
-
 #~ msgid "Item Comments:"
 #~ msgstr "Kommentarer for oppfЬring:"
 
@@ -7187,15 +7640,6 @@ msgstr "Gruppe %i"
 #~ "innstillinger kan du begynne Е sende og motta e-post\n"
 #~ "med Иn gang. Klikk neste for Е fortsette."
 
-#~ msgid "Account Information"
-#~ msgstr "Kontoinformasjon"
-
-#~ msgid "Account Management"
-#~ msgstr "HЕndtering av konti"
-
-#~ msgid "Accounts"
-#~ msgstr "Konti"
-
 #~ msgid "Add Optional Fields..."
 #~ msgstr "Legg til tillegsfelt..."
 
@@ -7205,51 +7649,12 @@ msgstr "Gruppe %i"
 #~ msgid "Browse..."
 #~ msgstr "Bla gjennom..."
 
-#~ msgid "Congratulations, your mail configuration is complete."
-#~ msgstr "Gratulerer, konfigurasjon av e-post er fullfЬrt."
-
-#~ msgid "Default"
-#~ msgstr "Forvalgt"
-
-#~ msgid "Done"
-#~ msgstr "Ferdig"
-
 #~ msgid "Edit Mail Configuration Settings"
 #~ msgstr "RedigИr innstillinger for e-post-konfigurasjon"
 
-#~ msgid "Email Address:"
-#~ msgstr "E-post adresse:"
-
-#~ msgid "Evolution Mail Configuration"
-#~ msgstr "Evolution e-post-konfigurasjon"
-
-#~ msgid "Full Name:"
-#~ msgstr "Fullt navn:"
-
-#~ msgid "IMAP"
-#~ msgstr "IMAP"
-
-#~ msgid "Mail"
-#~ msgstr "E-post"
-
-#~ msgid "Mail Configuration Druid"
-#~ msgstr "E-post-konfigurasjonsdruide"
-
-#~ msgid "Make this my default account"
-#~ msgstr "Bruk denne som standard konto"
-
-#~ msgid "News"
-#~ msgstr "News"
-
-#~ msgid "Optional"
-#~ msgstr "Valgfri"
-
 #~ msgid "Optional Information"
 #~ msgstr "Valgfri informasjon"
 
-#~ msgid "Password:"
-#~ msgstr "Passord:"
-
 #~ msgid ""
 #~ "Please enter information about your incoming mail server below. If you don't "
 #~ "know what"
@@ -7274,33 +7679,12 @@ msgstr "Gruppe %i"
 #~ msgid "Preferred type: "
 #~ msgstr "Foretrukket type: "
 
-#~ msgid "Receiving Email"
-#~ msgstr "Mottar e-post"
-
 #~ msgid "Receiving Mail"
 #~ msgstr "Mottar e-post"
 
-#~ msgid "Reply-to:"
-#~ msgstr "Svar-til:"
-
-#~ msgid "Required"
-#~ msgstr "NЬdvendige"
-
-#~ msgid "SMTP server requires authentication"
-#~ msgstr "SMTP-tjener mЕ ha autentisering"
-
-#~ msgid "Sending Email"
-#~ msgstr "Sender e-post"
-
 #~ msgid "Sending Mail"
 #~ msgstr "Sender e-post"
 
-#~ msgid "Server Configuration"
-#~ msgstr "Tjenerkonfigurasjon"
-
-#~ msgid "Server Type: "
-#~ msgstr "Tjenertype: "
-
 #~ msgid ""
 #~ "You are almost done with the mail configuration process. The identity, "
 #~ "incoming"
@@ -7312,9 +7696,6 @@ msgstr "Gruppe %i"
 #~ "Your mail server supports the following types of authentication. Please"
 #~ msgstr "Din e-post tjener stЬtter fЬlgende typer autentisering. Vennligst"
 
-#~ msgid "Mailbox summary"
-#~ msgstr "Sammendrag for postboks"
-
 #~ msgid "Threading message list"
 #~ msgstr "Utvider trЕder for meldingsliste"
 
@@ -7324,9 +7705,6 @@ msgstr "Gruppe %i"
 #~ msgid "Drafts"
 #~ msgstr "Skisser"
 
-#~ msgid "Outbox"
-#~ msgstr "Utboks"
-
 #~ msgid "Sent"
 #~ msgstr "Sendt"
 
@@ -7387,21 +7765,12 @@ msgstr "Gruppe %i"
 #~ msgid "Bad storage URL (no server): %s"
 #~ msgstr "Ugyldig URL for lagring (ingen tjener): %s"
 
-#~ msgid "Retrieving messages : %s"
-#~ msgstr "Henter meldinger : %s"
-
 #~ msgid "File As"
 #~ msgstr "Lagre som"
 
-#~ msgid "Name"
-#~ msgstr "Navn"
-
 #~ msgid "Family Name"
 #~ msgstr "Etternavn"
 
-#~ msgid "Email"
-#~ msgstr "E-post"
-
 #~ msgid "Prim"
 #~ msgstr "Pri"
 
@@ -7492,24 +7861,6 @@ msgstr "Gruppe %i"
 #~ msgid "_Unselect All"
 #~ msgstr "_Velg bort alt"
 
-#~ msgid "FIXME: _Appointment"
-#~ msgstr "_Avtale"
-
-#~ msgid "FIXME: Meeting Re_quest"
-#~ msgstr "MЬteforesp_Ьrsel"
-
-#~ msgid "Page Set_up"
-#~ msgstr "Sideoppsett"
-
-#~ msgid "FIXME: Mark as U_nread"
-#~ msgstr "Merk som ulest"
-
-#~ msgid "FIXME: __Formatting"
-#~ msgstr "_Formatering"
-
-#~ msgid "Ne_xt"
-#~ msgstr "Nes_te"
-
 #~ msgid "FIXME: _New Task"
 #~ msgstr "_Ny oppgave"
 
@@ -7549,12 +7900,6 @@ msgstr "Gruppe %i"
 #~ msgid "Delete this task"
 #~ msgstr "Slett denne oppgaven"
 
-#~ msgid "FIXME: Previous"
-#~ msgstr "Forrige"
-
-#~ msgid "FIXME: Next"
-#~ msgstr "Neste"
-
 #~ msgid "FIXME: Ca_lendar..."
 #~ msgstr "Ka_lender..."
 
diff --git a/po/pl.po b/po/pl.po
index 5ef5c5c449..b184826a99 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,7 +1,8 @@
+#: camel/providers/smtp/camel-smtp-transport.c:287
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2000-12-13 16:26-0600\n"
+"POT-Creation-Date: 2001-01-06 00:11+0100\n"
 "PO-Revision-Date: 2000-11-30 14:00+0100\n"
 "Last-Translator: GNOME PL Team <translators@gnome.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -281,10 +282,10 @@ msgstr ""
 #: addressbook/backend/ebook/load-pine-addressbook.c:17
 #: addressbook/backend/ebook/test-client-list.c:18
 #: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:991
+#: addressbook/conduit/address-conduit.c:1083
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1136
-#: calendar/conduits/todo/todo-conduit.c:945 calendar/gui/main.c:54
+#: calendar/conduits/calendar/calendar-conduit.c:1151
+#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "Nie mo©na zainicjowaФ Bonobo"
 
@@ -405,53 +406,36 @@ msgstr ""
 "Podczas prСby pobrania listy pilotСw od demona\n"
 "gnome-pilot wyst╠piЁ bЁ╠d"
 
-#: addressbook/conduit/address-conduit.c:197
+#: addressbook/conduit/address-conduit.c:195
 msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:210
+#: addressbook/conduit/address-conduit.c:208
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:583
-#: calendar/conduits/calendar/calendar-conduit.c:715
-#: calendar/conduits/todo/todo-conduit.c:523
+#: addressbook/conduit/address-conduit.c:646
+#: calendar/conduits/calendar/calendar-conduit.c:730
+#: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat server"
 msgstr "Nie mo©na uruchomiФ serwera wombat"
 
-#: addressbook/conduit/address-conduit.c:584
-#: calendar/conduits/calendar/calendar-conduit.c:716
-#: calendar/conduits/todo/todo-conduit.c:524
+#: addressbook/conduit/address-conduit.c:647
+#: calendar/conduits/calendar/calendar-conduit.c:731
+#: calendar/conduits/todo/todo-conduit.c:546
 msgid "Could not start wombat"
 msgstr "Nie mo©na uruchomiФ wombata"
 
-#: addressbook/conduit/address-conduit.c:616
-#: addressbook/conduit/address-conduit.c:619
+#: addressbook/conduit/address-conduit.c:679
+#: addressbook/conduit/address-conduit.c:682
 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 "kategorie"
-
-#: addressbook/contact-editor/categories-strings.h:8
-msgid "Item(s) belong to these categories:"
-msgstr "Elementy nale©╠ce do tych kategorii:"
-
-#: addressbook/contact-editor/categories-strings.h:9
-msgid "Available Categories:"
-msgstr "DostЙpne kategorie:"
-
-#.
-#. * 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 "Usun╠Ф kontakt?"
 
@@ -465,7 +449,7 @@ msgid "_Add"
 msgstr "_Dodaj"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:48
+#: ui/evolution-event-editor.xml.h:108 ui/evolution-mail.xml.h:53
 msgid "_Delete"
 msgstr "_UsuЯ"
 
@@ -479,12 +463,13 @@ msgid "New phone type"
 msgstr "Nowy typ telefonu"
 
 #.
-#. * 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 "Dodaj"
 
@@ -525,7 +510,7 @@ msgid "_Mobile"
 msgstr "P_rzeno╤ny"
 
 #: 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 "GЁСwny e-mail"
 
@@ -542,7 +527,7 @@ msgid "C_ontacts..."
 msgstr "_Kontakty..."
 
 #: 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 "K_ategorie..."
 
@@ -559,7 +544,8 @@ msgid "_Address..."
 msgstr "_Adres..."
 
 #: 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 "OgСlne"
 
@@ -604,145 +590,145 @@ msgid "No_tes:"
 msgstr "_Notatki:"
 
 #: 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 "SzczegСЁy"
 
-#: addressbook/contact-editor/e-contact-editor.c:1266
+#: addressbook/contact-editor/e-contact-editor.c:1274
 msgid "Assistant"
 msgstr "Asystent"
 
-#: 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 "Praca"
 
-#: addressbook/contact-editor/e-contact-editor.c:1268
+#: addressbook/contact-editor/e-contact-editor.c:1276
 msgid "Business 2"
 msgstr "Praca 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1269
+#: addressbook/contact-editor/e-contact-editor.c:1277
 msgid "Business Fax"
 msgstr "Faks sЁu©bowy"
 
-#: 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 "SamochСd"
 
-#: addressbook/contact-editor/e-contact-editor.c:1272
+#: addressbook/contact-editor/e-contact-editor.c:1280
 msgid "Company"
 msgstr "Firma"
 
-#: 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 "Dom"
 
-#: addressbook/contact-editor/e-contact-editor.c:1274
+#: addressbook/contact-editor/e-contact-editor.c:1282
 msgid "Home 2"
 msgstr "Dom 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1275
+#: addressbook/contact-editor/e-contact-editor.c:1283
 msgid "Home Fax"
 msgstr "Faks w domu"
 
-#: 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 "Przeno╤ny"
 
-#: 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 "Inne"
 
-#: addressbook/contact-editor/e-contact-editor.c:1279
+#: addressbook/contact-editor/e-contact-editor.c:1287
 msgid "Other Fax"
 msgstr "Inny faks"
 
-#: addressbook/contact-editor/e-contact-editor.c:1280
+#: addressbook/contact-editor/e-contact-editor.c:1288
 msgid "Pager"
 msgstr "Pager"
 
-#: addressbook/contact-editor/e-contact-editor.c:1281
+#: addressbook/contact-editor/e-contact-editor.c:1289
 msgid "Primary"
 msgstr "GЁСwny"
 
-#: 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 ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1329
+#: addressbook/contact-editor/e-contact-editor.c:1337
 msgid "Email 2"
 msgstr "E-mail 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1330
+#: addressbook/contact-editor/e-contact-editor.c:1338
 msgid "Email 3"
 msgstr "E-mail 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 "Adres _2:"
 
-#: po/tmp/fulladdr.glade.h:7
+#: addressbook/contact-editor/fulladdr.glade.h:7
 #, fuzzy
 msgid "Canada"
 msgstr "Terminarz"
 
-#: 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 "_Kraj:"
 
-#: po/tmp/fulladdr.glade.h:10
+#: addressbook/contact-editor/fulladdr.glade.h:10
 #, fuzzy
 msgid "Finland"
 msgstr "Znajd╪"
 
-#: 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 "_Adres:"
 
-#: po/tmp/fulladdr.glade.h:13
+#: addressbook/contact-editor/fulladdr.glade.h:13
 msgid "_City:"
 msgstr "_Miasto:"
 
-#: 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 "_Stan/Prowincja:"
 
-#: po/tmp/fulladdr.glade.h:16
+#: addressbook/contact-editor/fulladdr.glade.h:16
 msgid "_ZIP Code:"
 msgstr ""
 
@@ -756,10 +742,13 @@ msgid "Check Full Name"
 msgstr ""
 
 #: addressbook/contact-editor/fullname-strings.h:8
+#, fuzzy
 msgid ""
 "\n"
 "Mr.\n"
 "Mrs.\n"
+"Ms.\n"
+"Miss\n"
 "Dr.\n"
 msgstr ""
 "\n"
@@ -767,7 +756,7 @@ msgstr ""
 "Pani\n"
 "Dr\n"
 
-#: addressbook/contact-editor/fullname-strings.h:13
+#: addressbook/contact-editor/fullname-strings.h:15
 msgid ""
 "\n"
 "Sr.\n"
@@ -778,44 +767,49 @@ msgid ""
 "Esq.\n"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:21
+#: addressbook/contact-editor/fullname-strings.h:23
 msgid "_First:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:22
+#: addressbook/contact-editor/fullname-strings.h:24
 msgid "_Title:"
 msgstr "_TytuЁ:"
 
-#: addressbook/contact-editor/fullname-strings.h:23
+#: addressbook/contact-editor/fullname-strings.h:25
 msgid "_Middle:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:24
+#: addressbook/contact-editor/fullname-strings.h:26
 msgid "_Last:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:25
+#: addressbook/contact-editor/fullname-strings.h:27
 msgid "_Suffix:"
 msgstr "_Przyrostek:"
 
-#: addressbook/gui/component/addressbook.c:263
+#: addressbook/gui/component/addressbook.c:231
 msgid "As _Minicards"
 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/gui/component/addressbook.c:269
-#: po/tmp/evolution-addressbook.xml.h:6
+#: addressbook/gui/component/addressbook.c:237
+#: ui/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr "Jako _tabela"
 
-#: addressbook/gui/component/addressbook.c:386
+#: addressbook/gui/component/addressbook.c:374
+#, fuzzy, c-format
+msgid "Enter password for %s"
+msgstr "Wprowad╪ hasЁo NNTP dla %s@%s"
+
+#: addressbook/gui/component/addressbook.c:402
 msgid "Unable to open addressbook"
 msgstr "Nie mo©na otworzyФ ksi╠©ki adresowej"
 
-#: addressbook/gui/component/addressbook.c:391
+#: 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,77 +821,207 @@ msgid ""
 "OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:501 mail/folder-browser.c:136
+#: addressbook/gui/component/addressbook.c:528 mail/folder-browser.c:219
 msgid "Show All"
 msgstr "Wy╤wietl wszystkie"
 
-#: addressbook/gui/component/addressbook.c:503 mail/folder-browser.c:138
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 msgid "Advanced..."
 msgstr "Zaawansowane..."
 
-#: addressbook/gui/component/addressbook.c:533
+#: addressbook/gui/component/addressbook.c:560
 msgid "Any field contains"
 msgstr "Jakiekolwiek pole zawiera"
 
-#: addressbook/gui/component/addressbook.c:534
+#: addressbook/gui/component/addressbook.c:561
 msgid "Name contains"
 msgstr "Nazwa zawiera"
 
-#: addressbook/gui/component/addressbook.c:535
+#: addressbook/gui/component/addressbook.c:562
 msgid "Email contains"
 msgstr "E-mail zawiera"
 
-#: addressbook/gui/component/addressbook.c:621
+#: addressbook/gui/component/addressbook.c:648
 msgid "The URI that the Folder Browser will display"
 msgstr "URI ktСre ma wy╤wietliФ przegl╠darka katalogСw"
 
-#: addressbook/gui/component/e-ldap-storage.c:88
-msgid "External Directories"
-msgstr "ZewnЙtrzne katalogi"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/e-msg-composer-attachment.glade.h:7
-#: po/tmp/ldap-server-dialog.glade.h:6
-msgid "Description:"
-msgstr "Opis:"
+#: addressbook/gui/component/addressbook-storage.c:95
+#, fuzzy
+msgid "Other Contacts"
+msgstr "_Nowy Kontakt"
 
-#: po/tmp/ldap-server-dialog.glade.h:7
-msgid "LDAP Server:"
+#: addressbook/gui/component/addressbook-config.c:139
+#, fuzzy
+msgid "LDAP Server"
 msgstr "Serwer LDAP:"
 
-#: po/tmp/ldap-server-dialog.glade.h:8
+#: addressbook/gui/component/addressbook-config.c:141
+#, fuzzy
+msgid "File"
+msgstr "_Plik"
+
+#: addressbook/gui/component/addressbook-config.c:144
+#, fuzzy
+msgid "Unknown addressbook type"
+msgstr "Nie mo©na otworzyФ ksi╠©ki adresowej"
+
+#: 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 "HasЁo"
+
+#: addressbook/gui/component/addressbook-config.c:157
+msgid "SASL"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:160
+#, fuzzy
+msgid "Unknown auth type"
+msgstr "Nieznany bЁ╠d"
+
+#: addressbook/gui/component/addressbook-config.c:169
+#, fuzzy
+msgid "Base"
+msgstr "Wklej"
+
+#: addressbook/gui/component/addressbook-config.c:171
+msgid "One"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:173
+#, fuzzy
+msgid "Subtree"
+msgstr "Zapisz"
+
+#: 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 "Godziny"
+
+#: addressbook/gui/component/addressbook-config.c:361
+#, fuzzy
+msgid "Port:"
+msgstr "_Priorytety:"
+
+#: addressbook/gui/component/addressbook-config.c:364
+msgid "Root DN:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:384
+#, fuzzy
+msgid "Search Scope:"
+msgstr "Wyszukiwanie"
+
+#: addressbook/gui/component/addressbook-config.c:438
+#: mail/mail-config-druid.glade.h:14 mail/mail-config-gui.c:943
+msgid "Authentication:"
+msgstr "Uwierzytelnianie:"
+
+#: addressbook/gui/component/addressbook-config.c:455
+#: mail/mail-config-druid.glade.h:52 mail/mail-config-gui.c:934
+msgid "Path:"
+msgstr "╕cie©ka:"
+
+#: addressbook/gui/component/addressbook-config.c:460
+#, fuzzy
+msgid "Create path if it doesn't exist."
+msgstr "Podany plik nie istnieje."
+
+#: addressbook/gui/component/addressbook-config.c:593
+#, fuzzy
+msgid "Edit Addressbook"
+msgstr "Zapisz w ksi╠©ce adresowej"
+
+#: addressbook/gui/component/addressbook-config.c:595
+#, fuzzy
+msgid "Add Addressbook"
+msgstr "Zapisz w ksi╠©ce adresowej"
+
+#: 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
 msgid "Name:"
 msgstr "Nazwa:"
 
-#: po/tmp/ldap-server-dialog.glade.h:9
-msgid "Port Number:"
-msgstr "Numer portu:"
+#: addressbook/gui/component/addressbook-config.c:617
+#: composer/e-msg-composer-attachment.glade.h:7
+msgid "Description:"
+msgstr "Opis:"
 
-#: po/tmp/ldap-server-dialog.glade.h:10
-msgid "Root DN:"
+#: addressbook/gui/component/addressbook-config.glade.h:7
+#, fuzzy
+msgid "Addressbook Sources"
+msgstr "Dodaj ╪rСdЁo"
+
+#: 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 "UsuЯ"
+
+#: 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 "Edycja"
+
+#: addressbook/gui/component/addressbook-config.glade.h:10
+#, fuzzy
+msgid "Name"
+msgstr "Nazwa:"
+
+#: 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 "Znajd╪..."
 
-#: po/tmp/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "Message Recipients"
 msgstr "Odbiorcy listu"
 
-#: po/tmp/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "Select Names"
 msgstr "Wybierz nazw"
 
-#: 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 "Wybierz nazwЙ z listy:"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:147
@@ -906,131 +1030,131 @@ msgid "Search"
 msgstr "Wyszukiwanie"
 
 #.
-#. * 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
 #, fuzzy
 msgid "a"
 msgstr "am"
 
-#: 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
 #, fuzzy
 msgid "e"
 msgstr "╕r"
 
-#: po/tmp/alphabet.glade.h:12
+#: addressbook/gui/widgets/alphabet.glade.h:12
 #, fuzzy
 msgid "f"
 msgstr "Lista warunkСw"
 
-#: po/tmp/alphabet.glade.h:13
+#: addressbook/gui/widgets/alphabet.glade.h:13
 msgid "g"
 msgstr ""
 
-#: calendar/cal-util/timeutil.c:100 po/tmp/alphabet.glade.h:14
+#: addressbook/gui/widgets/alphabet.glade.h:14
 msgid "h"
 msgstr "h"
 
-#: po/tmp/alphabet.glade.h:15
+#: addressbook/gui/widgets/alphabet.glade.h:15
 #, fuzzy
 msgid "i"
 msgstr "jest"
 
-#: 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
 #, fuzzy
 msgid "k"
 msgstr "Ok"
 
-#: 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
 #, fuzzy
 msgid "m"
 msgstr "am"
 
-#: 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
 #, fuzzy
 msgid "o"
 msgstr "Po"
 
-#: po/tmp/alphabet.glade.h:22
+#: addressbook/gui/widgets/alphabet.glade.h:22
 #, fuzzy
 msgid "p"
 msgstr "pm"
 
-#: 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
 #, fuzzy
 msgid "r"
 msgstr "Pt"
 
-#: po/tmp/alphabet.glade.h:25
+#: addressbook/gui/widgets/alphabet.glade.h:25
 #, fuzzy
 msgid "s"
 msgstr "jest"
 
-#: po/tmp/alphabet.glade.h:26
+#: addressbook/gui/widgets/alphabet.glade.h:26
 #, fuzzy
 msgid "t"
 msgstr "."
 
-#: po/tmp/alphabet.glade.h:27
+#: addressbook/gui/widgets/alphabet.glade.h:27
 #, fuzzy
 msgid "u"
 msgstr "Ni"
 
-#: 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:417
-#: addressbook/gui/widgets/e-minicard.c:338
+#: addressbook/gui/widgets/e-addressbook-view.c:451
+#: addressbook/gui/widgets/e-minicard.c:374
 msgid "Save as VCard"
 msgstr "Zapisz jako VCard"
 
@@ -1048,189 +1172,178 @@ 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 "10-punktowa Tahoma"
 
-#: po/tmp/e-contact-print.glade.h:7
+#: addressbook/printing/e-contact-print.glade.h:7
 msgid "8 pt. Tahoma"
 msgstr "8-ounktowa Tahoma"
 
-#: 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 "Tre╤Ф"
 
-#: po/tmp/e-contact-print.glade.h:10
+#: addressbook/printing/e-contact-print.glade.h:10
 msgid "Bottom:"
 msgstr "DСЁ:"
 
-#: po/tmp/e-contact-print.glade.h:11
+#: addressbook/printing/e-contact-print.glade.h:11
 msgid "Dimensions:"
 msgstr "Wymiary:"
 
-#: po/tmp/e-contact-print.glade.h:12
+#: addressbook/printing/e-contact-print.glade.h:12
 msgid "Font..."
 msgstr "Czcionka..."
 
-#: po/tmp/e-contact-print.glade.h:13
+#: addressbook/printing/e-contact-print.glade.h:13
 msgid "Fonts"
 msgstr "Czcionki"
 
-#: po/tmp/e-contact-print.glade.h:14
+#: addressbook/printing/e-contact-print.glade.h:14
 msgid "Footer:"
 msgstr "Stopka:"
 
-#: 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 "GЁСwka"
 
-#: po/tmp/e-contact-print.glade.h:17
+#: addressbook/printing/e-contact-print.glade.h:17
 msgid "Header/Footer"
 msgstr "GЁСwka/Stopka"
 
-#: 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 "Wysoko╤Ф:"
 
-#: 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 "Pejza©"
 
-#: po/tmp/e-contact-print.glade.h:24
+#: addressbook/printing/e-contact-print.glade.h:24
 msgid "Left:"
 msgstr "Lewy:"
 
-#: po/tmp/e-contact-print.glade.h:25
+#: addressbook/printing/e-contact-print.glade.h:25
 msgid "Letter tabs on side"
 msgstr "ZakЁadki liter z boku"
 
-#: po/tmp/e-contact-print.glade.h:26
+#: addressbook/printing/e-contact-print.glade.h:26
 msgid "Margins"
 msgstr "Marginesy"
 
-#: po/tmp/e-contact-print.glade.h:27
+#: addressbook/printing/e-contact-print.glade.h:27
 msgid "Number of columns:"
 msgstr "Liczba kolumn:"
 
-#: po/tmp/e-contact-print.glade.h:28
+#: addressbook/printing/e-contact-print.glade.h:28
 msgid "Options"
 msgstr "Opcje"
 
-#: po/tmp/e-contact-print.glade.h:29
+#: addressbook/printing/e-contact-print.glade.h:29
 msgid "Orientation"
 msgstr "UЁo©enie"
 
-#: po/tmp/e-contact-print.glade.h:30
+#: addressbook/printing/e-contact-print.glade.h:30
 msgid "Page"
 msgstr "Strona"
 
-#: po/tmp/e-contact-print.glade.h:31
+#: addressbook/printing/e-contact-print.glade.h:31
 msgid "Page Setup:"
 msgstr "Ustawienia strony:"
 
-#: po/tmp/e-contact-print.glade.h:32
+#: addressbook/printing/e-contact-print.glade.h:32
 msgid "Paper"
 msgstr "Papier"
 
-#: po/tmp/e-contact-print.glade.h:33
+#: addressbook/printing/e-contact-print.glade.h:33
 msgid "Paper source:"
 msgstr "╛rСdЁo papieru:"
 
-#: po/tmp/e-contact-print.glade.h:34
+#: addressbook/printing/e-contact-print.glade.h:34
 msgid "Portrait"
 msgstr "Portret"
 
-#: po/tmp/e-contact-print.glade.h:35
+#: addressbook/printing/e-contact-print.glade.h:35
 msgid "Preview:"
 msgstr "Podgl╠d:"
 
-#: 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 "Odwrotnie na stronach parzystych"
 
-#: po/tmp/e-contact-print.glade.h:38
+#: addressbook/printing/e-contact-print.glade.h:38
 msgid "Right:"
 msgstr "Prawy:"
 
-#: po/tmp/e-contact-print.glade.h:39
+#: addressbook/printing/e-contact-print.glade.h:39
 msgid "Sections:"
 msgstr "Sekcje:"
 
-#: 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 "Rozmiar:"
 
-#: po/tmp/e-contact-print.glade.h:42
+#: addressbook/printing/e-contact-print.glade.h:42
 msgid "Start on a new page"
 msgstr "Rozpoczynanie na nowej stronie"
 
-#: po/tmp/e-contact-print.glade.h:43
+#: addressbook/printing/e-contact-print.glade.h:43
 msgid "Style name:"
 msgstr "Nazwa stylu:"
 
-#: po/tmp/e-contact-print.glade.h:44
+#: addressbook/printing/e-contact-print.glade.h:44
 msgid "Top:"
 msgstr "GСra:"
 
-#: 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 "Typ:"
 
-#: po/tmp/e-contact-print.glade.h:46
+#: addressbook/printing/e-contact-print.glade.h:46
 msgid "Width:"
 msgstr "Szeroko╤Ф:"
 
-#: po/tmp/e-contact-print.glade.h:47
+#: addressbook/printing/e-contact-print.glade.h:47
 msgid "label26"
 msgstr "etykieta26"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:550
-#: calendar/gui/e-week-view.c:288 calendar/gui/print.c:605
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:553
-#: calendar/gui/e-week-view.c:291 calendar/gui/print.c:604
-msgid "pm"
-msgstr "pm"
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 msgid "Evolution Calendar Conduit"
 msgstr ""
@@ -1239,13 +1352,13 @@ msgstr ""
 msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:671
-#: calendar/conduits/todo/todo-conduit.c:479
+#: calendar/conduits/calendar/calendar-conduit.c:686
+#: calendar/conduits/todo/todo-conduit.c:501
 msgid "Error while communicating with calendar server"
 msgstr "BЁ╠d przy komunikacji z serwerem terminarza"
 
-#: calendar/conduits/calendar/calendar-conduit.c:770
-#: calendar/conduits/calendar/calendar-conduit.c:773
+#: calendar/conduits/calendar/calendar-conduit.c:785
+#: calendar/conduits/calendar/calendar-conduit.c:788
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
@@ -1257,123 +1370,160 @@ msgstr ""
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:578
-#: calendar/conduits/todo/todo-conduit.c:581
+#: calendar/conduits/todo/todo-conduit.c:600
+#: calendar/conduits/todo/todo-conduit.c:603
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:60
-msgid "Outline:"
-msgstr "Obrys:"
+#.
+#. * 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 "NagЁСwki:"
+#: 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:"
-msgstr "Puste dni:"
+#.
+#. * 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 "Terminy:"
+#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:7
+#, fuzzy
+msgid "Calendar Server"
+msgstr "Terminarz"
 
-#: calendar/gui/calendar-commands.c:64
-msgid "Highlighted day:"
-msgstr "Pod╤wietlenie dnia"
+#.
+#. * 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 "Numery dni:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:66
-msgid "Current day's number:"
-msgstr "Numer bie©╠cego dnia:"
+#: 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 "Nie mo©na zainicjowaФ komponentu pocztowego Evlution."
+
+#: 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 "Przypomnienie o terminie "
+
+#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:8
+msgid "Snooze"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:354
+#. 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 "Ok"
+
+#: calendar/gui/calendar-commands.c:229
 msgid "File not found"
 msgstr "Nie odnaleziono pliku"
 
-#: calendar/gui/calendar-commands.c:378
+#: calendar/gui/calendar-commands.c:253
 msgid "Open calendar"
 msgstr "OtwСrz terminarz"
 
-#: calendar/gui/calendar-commands.c:417
+#: calendar/gui/calendar-commands.c:295
 msgid "Save calendar"
 msgstr "Zapisz terminarz"
 
+#: 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:282
+#: 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:2498
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:286 calendar/gui/calendar-model.c:736
+#: calendar/gui/calendar-model.c:288 calendar/gui/calendar-model.c:738
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time,
 #. in 12-hour format.
-#: calendar/gui/calendar-model.c:290 calendar/gui/calendar-model.c:739
+#: calendar/gui/calendar-model.c:292 calendar/gui/calendar-model.c:741
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:344 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 "Publiczny"
 
-#: calendar/gui/calendar-model.c:347 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 "Prywatny"
 
-#: calendar/gui/calendar-model.c:350 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 "Tajny"
 
-#: calendar/gui/calendar-model.c:353 calendar/gui/calendar-model.c:521
+#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:523
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: calendar/gui/calendar-model.c:441
+#: calendar/gui/calendar-model.c:443
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:441
+#: calendar/gui/calendar-model.c:443
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:445
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:445
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:515
+#: calendar/gui/calendar-model.c:517
 msgid "Transparent"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:518
+#: calendar/gui/calendar-model.c:520
 msgid "Opaque"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:744
+#: calendar/gui/calendar-model.c:746
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1385,35 +1535,35 @@ msgstr ""
 "%s"
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:845 calendar/gui/calendar-model.c:893
+#: 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:1274 widgets/misc/e-dateedit.c:1455
+#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
 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:863
+#: 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:866
+#: 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:870
+#: 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:873
+#: calendar/gui/calendar-model.c:875
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
-#: calendar/gui/calendar-model.c:993
+#: calendar/gui/calendar-model.c:995
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1423,14 +1573,37 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1033
+#: calendar/gui/calendar-model.c:1035
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Warto╤Ф procentowa musi siЙ zawieraФ w przedziale od 0 do 100 wЁ╠cznie"
 
-#: calendar/gui/calendar-model.c:1073
+#: calendar/gui/calendar-model.c:1075
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "Priorytet musi siЙ zawieraФ w przedziale od 1 do 9 wЁ╠cznie"
 
+#: calendar/gui/calendar-summary.c:81
+#, fuzzy
+msgid "%A, %e %B %Y"
+msgstr "%A, %B %d, %Y"
+
+#: calendar/gui/calendar-summary.c:224
+#, fuzzy
+msgid "<b>Error loading calendar</b>"
+msgstr "BЁ╠d przy odczycie pliku : %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 "Drukuj terminarz"
+
 #: calendar/gui/control-factory.c:125
 msgid "The URI that the calendar will display"
 msgstr ""
@@ -1448,360 +1621,397 @@ 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 "Zamknij"
 
-#: po/tmp/alarm-notify.glade.h:7
+#: calendar/gui/dialogs/alarm-notify.glade.h:7
 msgid "Edit appointment"
 msgstr "Modyfikuj termin"
 
-#: calendar/gui/gnome-cal.c:1466 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
 #, fuzzy
 msgid "05 minutes"
 msgstr "minut"
 
-#: po/tmp/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 #, fuzzy
 msgid "10 minutes"
 msgstr "minut"
 
-#: po/tmp/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "12 hour (am/pm)"
 msgstr "12-godzinny (am/pm)"
 
-#: po/tmp/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 #, fuzzy
 msgid "15 minutes"
 msgstr "minut"
 
-#: po/tmp/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "24 hour"
 msgstr "24-godzinny"
 
-#: po/tmp/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 #, fuzzy
 msgid "30 minutes"
 msgstr "minut"
 
-#: po/tmp/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #, fuzzy
 msgid "60 minutes"
 msgstr "minut"
 
-#: 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 "Alarmy d╪wiЙkowe"
 
-#: po/tmp/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Beep when alarm windows appear."
 msgstr "SygnaЁ d╪wiЙkowy przy pojawianiu siЙ okien alarmu."
 
-#: po/tmp/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Calendar"
 msgstr "Terminarz"
 
-#: po/tmp/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Calendar Preferences"
 msgstr "Ustawienia termiarza"
 
-#: po/tmp/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Colors"
 msgstr "Kolory"
 
-#: po/tmp/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Compress weekends"
 msgstr "Kompresowanie weekendСw"
 
-#: po/tmp/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Date navigator options"
 msgstr "Opcje wyboru daty"
 
-#: po/tmp/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Defaults"
 msgstr "Domy╤lne"
 
-#: po/tmp/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Display options"
 msgstr "Opcje wy╤wietlania"
 
-#: po/tmp/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Due Date"
 msgstr "Data wykonania"
 
-#: 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 "Koniec dnia:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:26
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "First day of week:"
 msgstr "Pierwszy dzieЯ tygodnia:"
 
-#: 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 "Pi╠"
 
-#: 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 "Pi╠tek"
 
-#: 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 "Pon"
 
-#: 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 "PoniedziaЁek"
 
-#: 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 "WybСr koloru"
 
-#: 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 "Priorytet"
 
-#: 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 "Sob"
 
-#: 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 "Sobota"
 
-#: 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 "Wy╤wietlanie czasu koЯca terminu"
 
-#: po/tmp/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Show week numbers"
 msgstr "Wy╤wietlanie numerСw tygodni"
 
-#: po/tmp/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "Start of day:"
 msgstr "Pocz╠tek dnia:"
 
 #. 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 "Nie"
 
-#: 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 "Niedziela"
 
-#: 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 "Czw"
 
-#: 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 "Czwartek"
 
-#: 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 "PrzedziaЁy czasu:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:55
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "Time format:"
 msgstr "Format czasu:"
 
-#: 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 "Wto"
 
-#: 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 "Wtorek"
 
-#: po/tmp/cal-prefs-dialog.glade.h:58
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "Visual Alarms"
 msgstr "Alarmy wizualne"
 
-#: 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 "╕ro"
 
-#: 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 "╕roda"
 
-#: po/tmp/cal-prefs-dialog.glade.h:61
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "Work week"
 msgstr "TydzieЯ roboczy"
 
-#: 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:62
+#, c-format
+msgid "Are you sure you want to delete the appointment `%s'?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:65
+msgid "Are you sure you want to delete this untitled appointment?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:71
+#, c-format
+msgid "Are you sure you want to delete the task `%s'?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:74
+msgid "Are you sure you want to delete this untitled task?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:80
+#, c-format
+msgid "Are you sure you want to delete the journal entry `%s'?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:83
+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 "% _zakoЯczenia:"
 
-#: 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
 #, fuzzy
 msgid "Cancelled"
 msgstr "Anuluj"
 
-#: po/tmp/task-editor-dialog.glade.h:10
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
 #, fuzzy
 msgid "Completed"
 msgstr "% _zakoЯczenia:"
 
-#: po/tmp/task-editor-dialog.glade.h:12
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
 msgid "Date Completed:"
 msgstr "Data zakoЯczenia:"
 
-#: po/tmp/task-editor-dialog.glade.h:14
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
 #, fuzzy
 msgid "High"
 msgstr "Wysoko╤Ф:"
 
-#: 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
 #, fuzzy
 msgid "Low"
 msgstr "teraz"
 
 #. 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
-#: widgets/misc/e-dateedit.c:422 widgets/misc/e-dateedit.c:1331
-#: widgets/misc/e-dateedit.c:1446
+#: 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 "Brak"
 
-#: 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
 #, fuzzy
 msgid "Not Started"
 msgstr "_Rozpoczynanie"
 
-#: 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 "Czas _rozpoczЙcia:"
 
-#: po/tmp/task-editor-dialog.glade.h:24
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
 msgid "Task"
 msgstr "Zadanie"
 
-#: 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 "_Kontakty..."
 
-#: 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 "_Priorytety:"
 
-#: po/tmp/task-editor-dialog.glade.h:29
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
 msgid "_Status:"
 msgstr "_Stan:"
 
-#: po/tmp/task-editor-dialog.glade.h:30
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
 msgid "task-editor-dialog"
 msgstr ""
 
@@ -1809,26 +2019,26 @@ msgstr ""
 msgid "Edit Task"
 msgstr "Modyfikuj zadanie"
 
-#: 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 "Termin - %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 "Zadanie - %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 ""
 
-#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3277
+#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3250
 msgid "Do you want to save changes?"
 msgstr ""
 
@@ -1848,14 +2058,6 @@ msgstr "Oznacz jako zakoЯczone"
 msgid "Mark the task complete"
 msgstr "Oznacza zadanie jako zakoЯczone"
 
-#: calendar/gui/e-calendar-table.c:342 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:479 mail/mail-view.c:165
-#: 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 "UsuЯ"
-
 #: calendar/gui/e-calendar-table.c:343
 msgid "Delete the task"
 msgstr "Usuwa zadanie"
@@ -1867,50 +2069,62 @@ msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1208
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1211
 #: calendar/gui/e-week-view-main-item.c:325
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1222
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1225
 #: calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1235
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1238
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view.c:2941 calendar/gui/e-day-view.c:2948
-#: calendar/gui/e-day-view.c:2957 calendar/gui/e-week-view.c:3165
-#: calendar/gui/e-week-view.c:3172 calendar/gui/e-week-view.c:3181
+#. 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:610
+msgid "am"
+msgstr "am"
+
+#. 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:609
+msgid "pm"
+msgstr "pm"
+
+#: calendar/gui/e-day-view.c:2948 calendar/gui/e-day-view.c:2955
+#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3169
+#: calendar/gui/e-week-view.c:3176 calendar/gui/e-week-view.c:3185
 msgid "New appointment..."
 msgstr "Nowy termin..."
 
-#: calendar/gui/e-day-view.c:2945 calendar/gui/e-day-view.c:2952
-#: calendar/gui/e-week-view.c:3169 calendar/gui/e-week-view.c:3176
+#: calendar/gui/e-day-view.c:2952 calendar/gui/e-day-view.c:2959
+#: calendar/gui/e-week-view.c:3173 calendar/gui/e-week-view.c:3180
 msgid "Edit this appointment..."
 msgstr "Modyfikuj termin..."
 
-#: calendar/gui/e-day-view.c:2946 calendar/gui/e-week-view.c:3170
-#: po/tmp/evolution-event-editor.xml.h:20
+#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3174
+#: ui/evolution-event-editor.xml.h:20
 msgid "Delete this appointment"
 msgstr "UsuЯ termin"
 
-#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3177
+#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3181
 msgid "Make this appointment movable"
 msgstr "PrzeksztaЁФ ten termin w przesuwalny"
 
-#: calendar/gui/e-day-view.c:2954 calendar/gui/e-week-view.c:3178
+#: calendar/gui/e-day-view.c:2961 calendar/gui/e-week-view.c:3182
 msgid "Delete this occurrence"
 msgstr "UsuЯ to wyst╠pienie"
 
-#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3179
+#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3183
 msgid "Delete all occurrences"
 msgstr "UsuЯ wszystkie wyst╠pienia"
 
@@ -1922,657 +2136,485 @@ 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 "Wydarzenie _caЁodniowe"
 
-#: po/tmp/event-editor-dialog.glade.h:8
+#: calendar/gui/event-editor-dialog.glade.h:8
 msgid "Appointment Basics"
 msgstr "Podstawowe elementy"
 
-#: po/tmp/event-editor-dialog.glade.h:9
+#: calendar/gui/event-editor-dialog.glade.h:9
 msgid "Classification"
 msgstr "Klasyfikacja"
 
-#: po/tmp/event-editor-dialog.glade.h:10
+#: calendar/gui/event-editor-dialog.glade.h:10
 msgid "Custom recurrence"
 msgstr "Dowolna powtarzalno╤Ф"
 
-#: po/tmp/event-editor-dialog.glade.h:11
+#: calendar/gui/event-editor-dialog.glade.h:11
 msgid "Days"
 msgstr "Dni"
 
-#: 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 "Wyj╠tki"
 
-#: po/tmp/event-editor-dialog.glade.h:16
+#: calendar/gui/event-editor-dialog.glade.h:16
 msgid "Hours"
 msgstr "Godziny"
 
-#: po/tmp/event-editor-dialog.glade.h:17
+#: calendar/gui/event-editor-dialog.glade.h:17
 msgid "Mail _to:"
 msgstr "_Adresat listu:"
 
-#: po/tmp/event-editor-dialog.glade.h:18
+#: calendar/gui/event-editor-dialog.glade.h:18
 msgid "Minutes"
 msgstr "Minuty"
 
-#: po/tmp/event-editor-dialog.glade.h:19
+#: calendar/gui/event-editor-dialog.glade.h:19
 msgid "Modify"
 msgstr "ZmieЯ"
 
-#: po/tmp/event-editor-dialog.glade.h:20
+#: calendar/gui/event-editor-dialog.glade.h:20
 msgid "No recurrence"
 msgstr "Brak powtarzalno╤ci"
 
-#: po/tmp/event-editor-dialog.glade.h:21
+#: calendar/gui/event-editor-dialog.glade.h:21
 msgid "Preview"
 msgstr "Podgl╠d"
 
-#: po/tmp/event-editor-dialog.glade.h:22
+#: calendar/gui/event-editor-dialog.glade.h:22
 msgid "Pri_vate"
 msgstr "P_rywatny"
 
-#: po/tmp/event-editor-dialog.glade.h:23
+#: calendar/gui/event-editor-dialog.glade.h:23
 msgid "Pu_blic"
 msgstr "Pu_bliczny"
 
-#: po/tmp/event-editor-dialog.glade.h:24
+#: calendar/gui/event-editor-dialog.glade.h:24
 msgid "Recurrence"
 msgstr "Powtarzalno╤Ф"
 
-#: po/tmp/event-editor-dialog.glade.h:25
+#: calendar/gui/event-editor-dialog.glade.h:25
 msgid "Recurrence Rule"
 msgstr "ReguЁa powtarzalno╤ci"
 
-#: po/tmp/event-editor-dialog.glade.h:26
+#: calendar/gui/event-editor-dialog.glade.h:26
 msgid "Reminder"
 msgstr "Przypominanie"
 
-#: po/tmp/event-editor-dialog.glade.h:27
+#: calendar/gui/event-editor-dialog.glade.h:27
 msgid "Simple recurrence"
 msgstr "Prosta powtarzalno╤Ф"
 
-#: po/tmp/event-editor-dialog.glade.h:28
+#: calendar/gui/event-editor-dialog.glade.h:28
 msgid "Su_mmary:"
 msgstr "Z_estawienie:"
 
-#: po/tmp/event-editor-dialog.glade.h:29
+#: calendar/gui/event-editor-dialog.glade.h:29
 msgid "Time"
 msgstr "Czas"
 
-#: po/tmp/event-editor-dialog.glade.h:30
+#: calendar/gui/event-editor-dialog.glade.h:30
 msgid "_Audio"
 msgstr "_D╪wiЙk"
 
-#: po/tmp/event-editor-dialog.glade.h:31
+#: calendar/gui/event-editor-dialog.glade.h:31
 msgid "_Confidential"
 msgstr "_Tajny"
 
-#: po/tmp/event-editor-dialog.glade.h:32
+#: calendar/gui/event-editor-dialog.glade.h:32
 msgid "_Display"
 msgstr "_Wy╤wietlanie"
 
-#: po/tmp/event-editor-dialog.glade.h:33
+#: calendar/gui/event-editor-dialog.glade.h:33
 msgid "_End time:"
 msgstr "Czas _zakoЯczenia"
 
-#: po/tmp/event-editor-dialog.glade.h:34
+#: calendar/gui/event-editor-dialog.glade.h:34
 msgid "_Mail"
 msgstr "_List"
 
-#: po/tmp/event-editor-dialog.glade.h:35
+#: calendar/gui/event-editor-dialog.glade.h:35
 msgid "_Program"
 msgstr "_Program"
 
-#: po/tmp/event-editor-dialog.glade.h:36
+#: calendar/gui/event-editor-dialog.glade.h:36
 msgid "_Run program:"
 msgstr "U_ruchomiany program:"
 
-#: po/tmp/event-editor-dialog.glade.h:37
+#: calendar/gui/event-editor-dialog.glade.h:37
 msgid "_Start time:"
 msgstr "Czas _rozpoczЙcia:"
 
-#: po/tmp/event-editor-dialog.glade.h:38
+#: calendar/gui/event-editor-dialog.glade.h:38
 msgid "_Starting date:"
 msgstr "Czas _rozpoczЙcia:"
 
-#: po/tmp/event-editor-dialog.glade.h:39
+#: calendar/gui/event-editor-dialog.glade.h:39
 msgid "day(s)"
 msgstr "dzieЯ/dni"
 
-#: po/tmp/event-editor-dialog.glade.h:40
+#: calendar/gui/event-editor-dialog.glade.h:40
 msgid "event-editor-dialog"
 msgstr "event-editor-dialog"
 
-#: 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 "etykieta21"
 
-#: po/tmp/event-editor-dialog.glade.h:44
+#: calendar/gui/event-editor-dialog.glade.h:44
 msgid "month(s)"
 msgstr "miesiЙcy"
 
-#: 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 "tygodni"
 
-#: po/tmp/event-editor-dialog.glade.h:47
+#: calendar/gui/event-editor-dialog.glade.h:47
 msgid "year(s)"
 msgstr "lat"
 
-#: calendar/gui/event-editor.c:329
+#: calendar/gui/event-editor.c:325
 msgid "Edit Appointment"
 msgstr "Modyfikuj termin"
 
-#: calendar/gui/event-editor.c:407
+#: calendar/gui/event-editor.c:403
 msgid "on"
 msgstr ""
 
-#: calendar/gui/event-editor.c:432 calendar/gui/getdate.y:424
-#: filter/filter-datespec.c:65
+#: calendar/gui/event-editor.c:428 filter/filter-datespec.c:65
 msgid "day"
 msgstr "dzieЯ"
 
-#: calendar/gui/event-editor.c:559
+#: calendar/gui/event-editor.c:555
 msgid "on the"
 msgstr ""
 
-#: calendar/gui/event-editor.c:566
+#: calendar/gui/event-editor.c:562
 msgid "th"
 msgstr "."
 
-#: calendar/gui/event-editor.c:722
+#: calendar/gui/event-editor.c:716
 msgid "occurrences"
 msgstr "powtСrzenia"
 
-#: calendar/gui/event-editor.c:839
+#: calendar/gui/event-editor.c:833
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor.c:3079 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 "%a %d %b %Y"
 
-#: calendar/gui/getdate.y:391
-msgid "january"
-msgstr "styczeЯ"
+#: calendar/gui/gnome-cal.c:676
+#, c-format
+msgid "Could not load the calendar in `%s'"
+msgstr "Nie mo©na wczytaФ terminarza w \"%s\""
 
-#: calendar/gui/getdate.y:392
-msgid "february"
-msgstr "luty"
+#: calendar/gui/gnome-cal.c:687
+#, c-format
+msgid "Could not create a calendar in `%s'"
+msgstr "Nie mo©na wczytaФ terminarza w \"%s\""
 
-#: calendar/gui/getdate.y:393
-msgid "march"
-msgstr "marzec"
+#: calendar/gui/gnome-cal.c:698
+#, c-format
+msgid "The method required to load `%s' is not supported"
+msgstr ""
 
-#: calendar/gui/getdate.y:394
-msgid "april"
+#.
+#. * 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
+#, fuzzy
+msgid "April"
 msgstr "kwiecieЯ"
 
-#: calendar/gui/getdate.y:395
-msgid "may"
-msgstr "maj"
-
-#: calendar/gui/getdate.y:396
-msgid "june"
-msgstr "czerwiec"
-
-#: calendar/gui/getdate.y:397
-msgid "july"
-msgstr "lipiec"
-
-#: calendar/gui/getdate.y:398
-msgid "august"
+#: calendar/gui/goto-dialog.glade.h:7
+#, fuzzy
+msgid "August"
 msgstr "sierpieЯ"
 
-#: calendar/gui/getdate.y:399
-msgid "september"
-msgstr "wrzesieЯ"
-
-#: calendar/gui/getdate.y:400
-msgid "sept"
-msgstr "wrz"
-
-#: calendar/gui/getdate.y:401
-msgid "october"
-msgstr "pa╪dziernik"
-
-#: calendar/gui/getdate.y:402
-msgid "november"
-msgstr "listopad"
-
-#: calendar/gui/getdate.y:403
-msgid "december"
+#: calendar/gui/goto-dialog.glade.h:8
+#, fuzzy
+msgid "December"
 msgstr "grudzieЯ"
 
-#: calendar/gui/getdate.y:404
-msgid "sunday"
-msgstr "niedziela"
-
-#: calendar/gui/getdate.y:405
-msgid "monday"
-msgstr "poniedziaЁek"
-
-#: calendar/gui/getdate.y:406
-msgid "tuesday"
-msgstr "wtorek"
-
-#: calendar/gui/getdate.y:407
-msgid "tues"
-msgstr "wto"
-
-#: calendar/gui/getdate.y:408
-msgid "wednesday"
-msgstr "╤roda"
-
-#: calendar/gui/getdate.y:409
-msgid "wednes"
-msgstr "╤ro"
-
-#: calendar/gui/getdate.y:410
-msgid "thursday"
-msgstr "czwartek"
-
-#: calendar/gui/getdate.y:411
-msgid "thur"
-msgstr "czw"
-
-#: calendar/gui/getdate.y:412
-msgid "thurs"
-msgstr "czw"
-
-#: calendar/gui/getdate.y:413
-msgid "friday"
-msgstr "pi╠tek"
-
-#: calendar/gui/getdate.y:414
-msgid "saturday"
-msgstr "sobota"
-
-#: calendar/gui/getdate.y:420 filter/filter-datespec.c:62
-msgid "year"
-msgstr "rok"
-
-#: calendar/gui/getdate.y:421 filter/filter-datespec.c:63
-msgid "month"
-msgstr "miesi╠c"
-
-#: calendar/gui/getdate.y:422
-msgid "fortnight"
-msgstr "dwa tygodnie"
-
-#: calendar/gui/getdate.y:423 filter/filter-datespec.c:64
-msgid "week"
-msgstr "tydzieЯ"
-
-#: calendar/gui/getdate.y:425 filter/filter-datespec.c:66
-msgid "hour"
-msgstr "godzina"
-
-#: calendar/gui/getdate.y:426 filter/filter-datespec.c:67
-msgid "minute"
-msgstr "minuta"
-
-#: calendar/gui/getdate.y:427
-msgid "min"
-msgstr "min"
-
-#: calendar/gui/getdate.y:428 filter/filter-datespec.c:68
-msgid "second"
-msgstr "sekunda"
-
-#: calendar/gui/getdate.y:429
-msgid "sec"
-msgstr "sek"
-
-#: calendar/gui/getdate.y:435
-msgid "tomorrow"
-msgstr "jutro"
-
-#: calendar/gui/getdate.y:436
-msgid "yesterday"
-msgstr "wczoraj"
-
-#: calendar/gui/getdate.y:437
-msgid "today"
-msgstr "dzi╤"
-
-#: calendar/gui/getdate.y:438 filter/filter-datespec.c:533
-#: filter/filter-datespec.c:693
-msgid "now"
-msgstr "teraz"
-
-#: calendar/gui/getdate.y:439
-msgid "last"
-msgstr "ostatni"
-
-#: calendar/gui/getdate.y:440
-msgid "this"
-msgstr "ten"
-
-#: calendar/gui/getdate.y:441
-msgid "next"
-msgstr "nastЙpny"
-
-#: calendar/gui/getdate.y:442
-msgid "first"
-msgstr "pierwszy"
-
-#. { N_("second"),		tUNUMBER,	2 },
-#: calendar/gui/getdate.y:444
-msgid "third"
-msgstr "trzeci"
-
-#: calendar/gui/getdate.y:445
-msgid "fourth"
-msgstr "czwarty"
-
-#: calendar/gui/getdate.y:446
-msgid "fifth"
-msgstr "pi╠ty"
-
-#: calendar/gui/getdate.y:447
-msgid "sixth"
-msgstr "szСsty"
-
-#: calendar/gui/getdate.y:448
-msgid "seventh"
-msgstr "siСdmy"
-
-#: calendar/gui/getdate.y:449
-msgid "eighth"
-msgstr "Сsmy"
-
-#: calendar/gui/getdate.y:450
-msgid "ninth"
-msgstr "dziewi╠ty"
-
-#: calendar/gui/getdate.y:451
-msgid "tenth"
-msgstr "dziesi╠ty"
-
-#: calendar/gui/getdate.y:452
-msgid "eleventh"
-msgstr "jedenasty"
+#: calendar/gui/goto-dialog.glade.h:9
+#, fuzzy
+msgid "February"
+msgstr "luty"
 
-#: calendar/gui/getdate.y:453
-msgid "twelfth"
-msgstr "dwunasty"
+#: calendar/gui/goto-dialog.glade.h:10
+#, fuzzy
+msgid "Go To Date"
+msgstr "Przejd╪ do daty:"
 
-#: calendar/gui/getdate.y:454
-msgid "ago"
-msgstr "temu"
+#: calendar/gui/goto-dialog.glade.h:11
+#, fuzzy
+msgid "Go To Today"
+msgstr "Przejd╪ do dnia dzisiejszego"
 
-#: calendar/gui/gnome-cal.c:718 calendar/gui/gnome-cal.c:1474
-#: calendar/gui/gnome-cal.c:1530
-msgid "Reminder of your appointment at "
-msgstr "Przypomnienie o terminie "
+#: calendar/gui/goto-dialog.glade.h:12
+#, fuzzy
+msgid "January"
+msgstr "styczeЯ"
 
-#: calendar/gui/gnome-cal.c:1152
-#, c-format
-msgid "Could not load the calendar in `%s'"
-msgstr "Nie mo©na wczytaФ terminarza w \"%s\""
+#: calendar/gui/goto-dialog.glade.h:13
+#, fuzzy
+msgid "July"
+msgstr "lipiec"
 
-#: calendar/gui/gnome-cal.c:1163
-#, c-format
-msgid "Could not create a calendar in `%s'"
-msgstr "Nie mo©na wczytaФ terminarza w \"%s\""
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "June"
+msgstr "czerwiec"
 
-#: calendar/gui/gnome-cal.c:1174
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr ""
+#: calendar/gui/goto-dialog.glade.h:15
+#, fuzzy
+msgid "March"
+msgstr "marzec"
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1479 calendar/gui/gnome-cal.c:1534
-#: mail/mail-search-dialogue.c:104
-msgid "Ok"
-msgstr "Ok"
+#: calendar/gui/goto-dialog.glade.h:16
+#, fuzzy
+msgid "May"
+msgstr "PoniedziaЁek"
 
-#: calendar/gui/goto.c:82
-msgid "Year:"
-msgstr "Rok:"
+#: calendar/gui/goto-dialog.glade.h:17
+#, fuzzy
+msgid "November"
+msgstr "listopad"
 
-#: calendar/gui/goto.c:270
-msgid "Go to date"
-msgstr "Przejd╪ do daty:"
+#: calendar/gui/goto-dialog.glade.h:18
+#, fuzzy
+msgid "October"
+msgstr "pa╪dziernik"
 
-#. Instructions
-#: calendar/gui/goto.c:281
-msgid ""
-"Please select the date you want to go to.\n"
-"When you click on a day, you will be taken\n"
-"to that date."
-msgstr ""
-"Wybierz datЙ, do ktСrej chcesz przej╤Ф.\n"
-"KlikniЙcie na dniu spowoduje przej╤cie\n"
-"do wybranego dnia."
+#: calendar/gui/goto-dialog.glade.h:19
+#, fuzzy
+msgid "September"
+msgstr "wrzesieЯ"
 
-#: calendar/gui/goto.c:318
-msgid "Go to today"
-msgstr "Przejd╪ do dnia dzisiejszego"
+#: calendar/gui/main.c:49
+#, fuzzy
+msgid "Could not initialize GNOME"
+msgstr "Nie mo©na zainicjowaФ Bonobo"
 
-#: 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 "Ni"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Mo"
 msgstr "Po"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Tu"
 msgstr "Wt"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "We"
 msgstr "╕r"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Th"
 msgstr "Cz"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Fr"
 msgstr "Pt"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Sa"
 msgstr "So"
 
-#: calendar/gui/print.c:936
+#: calendar/gui/print.c:941
 msgid "Tasks"
 msgstr "Zadania"
 
 #. Day
-#: calendar/gui/print.c:1066
+#: calendar/gui/print.c:1071
 msgid "Current day (%a %b %d %Y)"
 msgstr "Bie©╠cy dzieЯ (%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 "Bie©╠cy tydzieЯ (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1100
+#: calendar/gui/print.c:1105
 msgid "Current month (%b %Y)"
 msgstr "Bie©╠cy miesi╠Ф (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1107
+#: calendar/gui/print.c:1112
 msgid "Current year (%Y)"
 msgstr "Bie©╠cy rok (%Y)"
 
-#: calendar/gui/print.c:1144
+#: calendar/gui/print.c:1149
 msgid "Print Calendar"
 msgstr "Drukuj terminarz"
 
-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:962
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1001
 msgid "Print Preview"
 msgstr "Podgl╠d wydruku"
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: calendar/gui/weekday-picker.c:351 widgets/misc/e-calendar-item.c:416
-msgid "MTWTFSS"
-msgstr ""
-
-#: calendar/gui/weekday-picker.c:353 calendar/gui/weekday-picker.c:443
+#: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
 msgid "SMTWTFS"
 msgstr ""
 
@@ -2662,60 +2704,61 @@ msgstr "Nie mo©na wczytaФ %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Nie mo©na wczytaФ %s: Brak kodu inicjuj╠cego w module."
 
-#: camel/camel-remote-store.c:182
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:227
+#: camel/camel-remote-store.c:243
+#: camel/providers/smtp/camel-smtp-transport.c:162
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Nie mo©na nawi╠zaЯ poЁ╠czenia z %s (port %d): %s"
 
-#: camel/camel-remote-store.c:228
+#: camel/camel-remote-store.c:244
 msgid "(unknown host)"
 msgstr "(nieznany komputer)"
 
-#: camel/camel-remote-store.c:452
+#: camel/camel-remote-store.c:483
 msgid "Server disconnected."
 msgstr ""
 
-#: camel/camel-service.c:120
+#: camel/camel-service.c:138
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "W URL-u \"%s\" wymagana jest nazwa u©ytkownika"
 
-#: camel/camel-service.c:129
+#: camel/camel-service.c:147
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "W URL-u \"%s\" wymagana jest nazwa komputera"
 
-#: camel/camel-service.c:138
+#: camel/camel-service.c:156
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "W URL-u \"%s\" wymagana jest ╤cie©ka"
 
-#: camel/camel-service.c:488
+#: camel/camel-service.c:526
 #, c-format
 msgid "No such host %s."
 msgstr "Nie ma komputera o nazwie %s."
 
-#: camel/camel-service.c:491
+#: camel/camel-service.c:529
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr ""
 
-#: camel/camel-session.c:272
+#: camel/camel-session.c:297
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Brak dostarczyciela dla protokoЁu \"%s\""
 
-#: camel/camel-session.c:360
+#: camel/camel-session.c:388
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2739,52 +2782,52 @@ msgstr "URL \"%s\" nie zawiera niepoprawn╠ nazwЙ protokoЁu"
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "Numer portu w URL-u \"%s\" nie jest numeryczny"
 
-#: camel/providers/imap/camel-imap-auth.c:127
+#: camel/providers/imap/camel-imap-auth.c:133
 #, fuzzy, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
 "%s"
 msgstr "Utworzenie potoku nie powiodЁo siЙ: %s"
 
-#: camel/providers/imap/camel-imap-auth.c:198
+#: camel/providers/imap/camel-imap-auth.c:205
 #, fuzzy
 msgid "Bad authentication response from server."
 msgstr "Nieoczekiwana odpowied╪ od serwera IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:216
+#: camel/providers/imap/camel-imap-command.c:231
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Nieoczekiwana odpowied╪ od serwera IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:224
+#: camel/providers/imap/camel-imap-command.c:239
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Nie powiodЁo siЙ polecenie IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:240 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "Nieznany bЁ╠d"
 
-#: camel/providers/imap/camel-imap-command.c:271
+#: camel/providers/imap/camel-imap-command.c:286
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:407
+#: camel/providers/imap/camel-imap-command.c:422
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:443
+#: camel/providers/imap/camel-imap-command.c:458
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Nieoczekiwana odpowied╪ OK od serwera IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:216
+#: 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:586
+#: camel/providers/imap/camel-imap-folder.c:532
 msgid "Could not find message body in FETCH response."
 msgstr "Nie mo©na odnale╪Ф tre╤ci listu w odpowiedzi na FETCH."
 
@@ -2796,35 +2839,29 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:234
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:148
-msgid "Password"
-msgstr "HasЁo"
-
-#: camel/providers/imap/camel-imap-store.c:236
+#: camel/providers/imap/camel-imap-store.c:248
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Przy tej opcji nast╠pi poЁ╠czenie z serwerem IMAP z u©yciem haseЁ w postaci "
 "czystego tekstu."
 
-#: camel/providers/imap/camel-imap-store.c:245
+#: camel/providers/imap/camel-imap-store.c:257
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/providers/imap/camel-imap-store.c:247
+#: camel/providers/imap/camel-imap-store.c:259
 msgid ""
 "This option will connect to the IMAP server using Kerberos 4 authentication."
 msgstr ""
 "Przy tej opcji nast╠pi poЁ╠czenie z serwerem IMAP z wykorzystaniem "
 "uwierzytelniania Kerberos 4."
 
-#: camel/providers/imap/camel-imap-store.c:333
+#: camel/providers/imap/camel-imap-store.c:345
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sWprowad╪ hasЁo IMAP dla %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:359
+#: camel/providers/imap/camel-imap-store.c:373
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2835,7 +2872,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:539
+#: camel/providers/imap/camel-imap-store.c:564
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Nie mo©na utworzyФ katalogu %s: %s"
@@ -2922,12 +2959,12 @@ msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Nie mo©na doЁ╠czyФ listu do foldera mh: %s"
 
 #: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:204
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-maildir-folder.c:207
+#: camel/providers/local/camel-maildir-folder.c:215
+#: camel/providers/local/camel-mbox-folder.c:317
 #: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:189
-#: camel/providers/local/camel-mh-folder.c:197
+#: camel/providers/local/camel-mh-folder.c:192
+#: camel/providers/local/camel-mh-folder.c:200
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -2937,14 +2974,14 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-mbox-folder.c:317
 #: camel/providers/local/camel-mh-folder.c:183
 #, fuzzy
 msgid "No such message"
 msgstr "Nie ma komputera o nazwie %s."
 
-#: camel/providers/local/camel-maildir-folder.c:213
-#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-maildir-folder.c:216
+#: camel/providers/local/camel-mh-folder.c:201
 #, fuzzy
 msgid "Invalid message contents"
 msgstr "Wy╤lij _list do kontaktu..."
@@ -2994,19 +3031,19 @@ msgstr "Nie mo©na usun╠Ф foldera \"%s\": %s"
 msgid "not a maildir directory"
 msgstr "Lokalny katalog z listami %s"
 
-#: camel/providers/local/camel-mbox-folder.c:195
+#: camel/providers/local/camel-mbox-folder.c:201
 #, fuzzy, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Nie mo©na otworzyФ tymczasowej skrzynki: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:251
+#: camel/providers/local/camel-mbox-folder.c:257
 #, fuzzy, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Nie mo©na doЁ╠czyФ listu do pliku mbox: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:327
-#: camel/providers/local/camel-mbox-folder.c:357
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:333
+#: camel/providers/local/camel-mbox-folder.c:365
+#: camel/providers/local/camel-mbox-folder.c:378
 #, fuzzy, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -3015,11 +3052,11 @@ msgstr ""
 "Nie mo©na pobraФ listu: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:358
+#: camel/providers/local/camel-mbox-folder.c:366
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:369
+#: camel/providers/local/camel-mbox-folder.c:379
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -3072,58 +3109,58 @@ msgstr "Nie mo©na otworzyФ foldera: spis listСw byЁ niekompletny."
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:341
+#: camel/providers/local/camel-mbox-summary.c:343
 #, fuzzy, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "Nie mo©na utworzyФ procesu dla %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:475
-#: camel/providers/local/camel-mbox-summary.c:661
+#: camel/providers/local/camel-mbox-summary.c:477
+#: camel/providers/local/camel-mbox-summary.c:668
 #, fuzzy, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
 "Nie mo©na otworzyФ foldera \"%s\":\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:491
+#: camel/providers/local/camel-mbox-summary.c:493
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Nie mo©na otworzyФ tymczasowej skrzynki: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:512
-#: camel/providers/local/camel-mbox-summary.c:520
-#: camel/providers/local/camel-mbox-summary.c:691
-#: camel/providers/local/camel-mbox-summary.c:699
+#: camel/providers/local/camel-mbox-summary.c:514
+#: camel/providers/local/camel-mbox-summary.c:522
+#: camel/providers/local/camel-mbox-summary.c:701
+#: camel/providers/local/camel-mbox-summary.c:709
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:562
+#: camel/providers/local/camel-mbox-summary.c:565
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:579
+#: camel/providers/local/camel-mbox-summary.c:582
 #, fuzzy, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Nie mo©na otworzyФ pliku z listami %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:595
-#: camel/providers/local/camel-mbox-summary.c:748
+#: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-mbox-summary.c:759
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Nie mo©na zamkn╠Ф foldera ╪rСdЁowego %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:604
+#: camel/providers/local/camel-mbox-summary.c:609
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Nie mo©na zamkn╠Ф foldera tymczasowego: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:615
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nie mo©na zmieniФ nazwy foldera: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:817
+#: camel/providers/local/camel-mbox-summary.c:830
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Nieznany bЁ╠d: %s"
@@ -3156,7 +3193,7 @@ msgstr "WysЁanie nazwy u©ytkownika do serwera nie powiodЁo siЙ"
 msgid "Server rejected username/password"
 msgstr "Serwer odrzuciЁ nazwЙ u©ytkownika/hasЁo"
 
-#: camel/providers/nntp/camel-nntp-folder.c:144
+#: camel/providers/nntp/camel-nntp-folder.c:115
 #, c-format
 msgid "Message %s not found."
 msgstr "Nie odnaleziono listu %s."
@@ -3206,16 +3243,16 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Nie mo©na otworzyФ lub utworzyФ pliku .newsrc dla %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:179
+#: camel/providers/pop3/camel-pop3-folder.c:180
 msgid "Could not open folder: message listing was incomplete."
 msgstr "Nie mo©na otworzyФ foldera: spis listСw byЁ niekompletny."
 
-#: camel/providers/pop3/camel-pop3-folder.c:273
+#: camel/providers/pop3/camel-pop3-folder.c:274
 #, c-format
 msgid "No message with uid %s"
 msgstr "Brak listu o warto╤ci uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:288
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Nie mo©na pobraФ listu z serwera POP %s: %s"
@@ -3253,17 +3290,17 @@ msgstr ""
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Nie mo©na przeprowadziФ uwierzytelnienia na serwerze KPOP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:335
+#: camel/providers/pop3/camel-pop3-store.c:337
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Nie mo©na nawi╠zaФ poЁ╠czenia z serwerem POP pod adresem %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:389
+#: camel/providers/pop3/camel-pop3-store.c:391
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sWprowad╪ hasЁo POP3 dla %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:408
+#: camel/providers/pop3/camel-pop3-store.c:410
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3272,18 +3309,18 @@ msgstr ""
 "Nie mo©na nawi╠zaФ poЁ╠czenia z serwerem POP.\n"
 "Wyst╠piЁ bЁ╠d przy wysyЁaniu nazwy u©ytkownika: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:411
-#: camel/providers/pop3/camel-pop3-store.c:448
+#: camel/providers/pop3/camel-pop3-store.c:413
+#: camel/providers/pop3/camel-pop3-store.c:450
 msgid "(Unknown)"
 msgstr "(Nieznane)"
 
-#: camel/providers/pop3/camel-pop3-store.c:438
+#: camel/providers/pop3/camel-pop3-store.c:440
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:446
+#: camel/providers/pop3/camel-pop3-store.c:448
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3292,12 +3329,13 @@ msgstr ""
 "Nie mo©na nawi╠zaФ poЁ╠czenia z serwerem POP.\n"
 "Wyst╠piЁ bЁ╠d przy wysyЁaniu hasЁa: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:555
+#: camel/providers/pop3/camel-pop3-store.c:557
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Folder \"%s\" nie istnieje."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
+#: mail/mail-config-druid.glade.h:63
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -3353,8 +3391,142 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "WysyЁanie listСw za pomoc╠ programu 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
+#, c-format
+msgid "Welcome response error: %s: possibly non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:281
+#, fuzzy
+msgid "No authentication required"
+msgstr "Uwierzytelnianie:"
+
+#: camel/providers/smtp/camel-smtp-transport.c:283
+msgid ""
+"This option will connect to the SMTP server without using any kind of "
+"authentication. This should be fine for connecting to most SMTP servers."
+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 ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:294
+#, fuzzy
+msgid ""
+"This option will connect to the SMTP server using CRAM-MD5 authentication."
+msgstr ""
+"Przy tej opcji nast╠pi poЁ╠czenie z serwerem IMAP z wykorzystaniem "
+"uwierzytelniania Kerberos 4."
+
+#: camel/providers/smtp/camel-smtp-transport.c:332
+#, c-format
+msgid "SMTP server %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:334
+#, fuzzy, c-format
+msgid "SMTP mail delivery via %s"
+msgstr "WysyЁanie listСw za pomoc╠ programu sendmail"
+
+#: camel/providers/smtp/camel-smtp-transport.c:359
+msgid "Cannot send message: sender address not defined."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:366
+msgid "Cannot send message: sender address not valid."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:380
+msgid "Cannot send message: no recipients defined."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:474
+#, c-format
+msgid "HELO request timed out: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:490
+#, c-format
+msgid "HELO response error: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:529
+#, c-format
+msgid "MAIL FROM request timed out: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:545
+#, c-format
+msgid "MAIL FROM response error: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:570
+#, fuzzy, c-format
+msgid "RCPT TO request timed out: %s: mail not sent"
+msgstr ""
+"Nie mo©na utworzyФ potoku do programu sendmail: %s: poczta nie zostaЁa "
+"wysЁana"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
+#, fuzzy, c-format
+msgid "RCPT TO response error: %s: mail not sent"
+msgstr "Nie mo©na wykonaФ %s: poczta nie zostaЁa wysЁana."
+
+#: camel/providers/smtp/camel-smtp-transport.c:617
+#, fuzzy, c-format
+msgid "DATA request timed out: %s: mail not sent"
+msgstr "Nie mo©na wykonaФ %s: poczta nie zostaЁa wysЁana."
+
+#: camel/providers/smtp/camel-smtp-transport.c:633
+#, fuzzy, c-format
+msgid "DATA response error: %s: mail not sent"
+msgstr ""
+"Nie mo©na utworzyФ procesu dla programu sendmail: %s: poczta nie zostaЁa "
+"wysЁana"
+
+#: camel/providers/smtp/camel-smtp-transport.c:648
+#: camel/providers/smtp/camel-smtp-transport.c:666
+#, fuzzy, c-format
+msgid "DATA send timed out: message termination: %s: mail not sent"
+msgstr ""
+"Program sendmail zostaЁ przerwany przez sygnaЁ %s: poczta nie zostaЁa "
+"wysЁana."
+
+#: camel/providers/smtp/camel-smtp-transport.c:682
+#, c-format
+msgid "DATA response error: message termination: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:706
+#, c-format
+msgid "RSET request timed out: %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:722
+#, fuzzy, c-format
+msgid "RSET response error: %s"
+msgstr "Nieznany bЁ╠d: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:745
+#, c-format
+msgid "QUIT request timed out: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#, c-format
+msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
 #: camel/providers/vee/camel-vee-provider.c:30
@@ -3390,135 +3562,135 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:144
+#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:155
 msgid "attachment"
 msgstr "zaЁ╠cznik"
 
-#: composer/e-msg-composer-attachment-bar.c:417
-#: 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 "ZaЁ╠czenie pliku"
 
-#: composer/e-msg-composer-attachment-bar.c:464 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 "UsuЯ"
 
-#: composer/e-msg-composer-attachment-bar.c:465
+#: composer/e-msg-composer-attachment-bar.c:461
 msgid "Remove selected items from the attachment list"
 msgstr "Usuwa wybrane elementy z listy zaЁ╠cznikСw"
 
-#: composer/e-msg-composer-attachment-bar.c:496
+#: composer/e-msg-composer-attachment-bar.c:492
 msgid "Add attachment..."
 msgstr "Dodaj zaЁ╠cznik..."
 
-#: composer/e-msg-composer-attachment-bar.c:497
+#: composer/e-msg-composer-attachment-bar.c:493
 msgid "Attach a file to the message"
 msgstr "ZaЁ╠cza plik do listu"
 
 #.
-#. * 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 "WЁa╤ciwo╤ci zaЁ╠cznika"
 
-#: po/tmp/e-msg-composer-attachment.glade.h:8
+#: composer/e-msg-composer-attachment.glade.h:8
 msgid "File name:"
 msgstr "Nazwa pliku:"
 
-#: po/tmp/e-msg-composer-attachment.glade.h:9
+#: composer/e-msg-composer-attachment.glade.h:9
 msgid "MIME type:"
 msgstr "Typ MIME:"
 
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:290
-#: mail/mail-format.c:621
+#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:303
+#: mail/mail-format.c:626
 msgid "From:"
 msgstr "Od:"
 
-#: composer/e-msg-composer-hdrs.c:238
+#: composer/e-msg-composer-hdrs.c:247
 msgid "Click here for the address book"
 msgstr "Kliknij tu aby otworzyФ ksi╠©kЙ adresow╠"
 
-#: composer/e-msg-composer-hdrs.c:291
+#: composer/e-msg-composer-hdrs.c:304
 msgid "Enter the identity you wish to send this message from"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:295 mail/mail-format.c:625
+#: composer/e-msg-composer-hdrs.c:308 mail/mail-format.c:630
 msgid "To:"
 msgstr "Dla:"
 
-#: composer/e-msg-composer-hdrs.c:296
+#: composer/e-msg-composer-hdrs.c:309
 msgid "Enter the recipients of the message"
 msgstr "Podaj adres odbiorcy listu"
 
-#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:627
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:632
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:301
+#: composer/e-msg-composer-hdrs.c:314
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Podaj adresy, pod ktСre zostanie przesЁana kopia listu"
 
-#: composer/e-msg-composer-hdrs.c:306
+#: composer/e-msg-composer-hdrs.c:319
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:307
+#: 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."
 msgstr ""
 "Podaj adresy, pod ktСre zostanie przesЁana kopia listu bez listy odbiorcСw."
 
-#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:629
+#: composer/e-msg-composer-hdrs.c:326 mail/mail-format.c:634
 msgid "Subject:"
 msgstr "Temat:"
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Enter the subject of the mail"
 msgstr "Podaj temat listu"
 
-#: composer/e-msg-composer.c:429
+#: composer/e-msg-composer.c:430
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:599
+#: composer/e-msg-composer.c:600
 msgid "Save as..."
 msgstr "Zapisz jako..."
 
-#: composer/e-msg-composer.c:610
+#: composer/e-msg-composer.c:611
 #, c-format
 msgid "Error saving file: %s"
 msgstr "BЁ╠d przy zapisie pliku: %s"
 
-#: composer/e-msg-composer.c:630
+#: composer/e-msg-composer.c:631
 #, c-format
 msgid "Error loading file: %s"
 msgstr "BЁ╠d przy odczycie pliku : %s"
 
-#: composer/e-msg-composer.c:652
+#: composer/e-msg-composer.c:653
 msgid "Saving changes to message..."
 msgstr "Zapisywanie zmian listu..."
 
-#: composer/e-msg-composer.c:654
+#: composer/e-msg-composer.c:655
 msgid "Save changes to message..."
 msgstr "Zapisz zmiany listu..."
 
-#: composer/e-msg-composer.c:695
+#: composer/e-msg-composer.c:696
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:739 shell/e-shell-view-menu.c:170
+#: composer/e-msg-composer.c:741 shell/e-shell-view-menu.c:167
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:745
+#: composer/e-msg-composer.c:747
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3528,29 +3700,29 @@ msgstr ""
 "\n"
 "Czy chcesz zapisaФ zmiany?"
 
-#: composer/e-msg-composer.c:767
+#: composer/e-msg-composer.c:772
 msgid "Open file"
 msgstr "Otwiera plik"
 
-#: composer/e-msg-composer.c:893
+#: composer/e-msg-composer.c:898
 msgid "That file does not exist."
 msgstr "Podany plik nie istnieje."
 
-#: composer/e-msg-composer.c:903
+#: composer/e-msg-composer.c:908
 msgid "That is not a regular file."
 msgstr "Podany plik nie jest zwykЁym plikiem."
 
-#: composer/e-msg-composer.c:913
+#: composer/e-msg-composer.c:918
 msgid "That file exists but is not readable."
 msgstr "Podany plik istnieje, lecz nie mo©na go odczytaФ."
 
-#: composer/e-msg-composer.c:923
+#: composer/e-msg-composer.c:928
 msgid "That file appeared accesible but open(2) failed."
 msgstr ""
 "Podany plik wydaje siЙ byФ odczytywalny, lecz funkcja open(2) nie powiodЁa "
 "siЙ."
 
-#: composer/e-msg-composer.c:945
+#: composer/e-msg-composer.c:950
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3558,15 +3730,15 @@ msgstr ""
 "Plik jest bardzo du©y (wiЙkszy ni© 100K).\n"
 "Czy na pewno chcesz go wstawiФ?"
 
-#: composer/e-msg-composer.c:966
+#: composer/e-msg-composer.c:971
 msgid "An error occurred while reading the file."
 msgstr "Podczas odczytu pliku wyst╠piЁ bЁ╠d."
 
-#: composer/e-msg-composer.c:1343
+#: composer/e-msg-composer.c:1350
 msgid "Compose a message"
 msgstr "Tworzenie listu"
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1427
 msgid "Could not create composer window."
 msgstr ""
 
@@ -3579,14 +3751,26 @@ msgid "Sear_ch"
 msgstr "_Wyszukiwanie"
 
 #: filter/filter-datespec.c:62
+msgid "year"
+msgstr "rok"
+
+#: filter/filter-datespec.c:62
 msgid "years"
 msgstr "lat"
 
 #: filter/filter-datespec.c:63
+msgid "month"
+msgstr "miesi╠c"
+
+#: filter/filter-datespec.c:63
 msgid "months"
 msgstr "miesiЙcy"
 
 #: filter/filter-datespec.c:64
+msgid "week"
+msgstr "tydzieЯ"
+
+#: filter/filter-datespec.c:64
 msgid "weeks"
 msgstr "tygodni"
 
@@ -3595,14 +3779,26 @@ msgid "days"
 msgstr "dni"
 
 #: filter/filter-datespec.c:66
+msgid "hour"
+msgstr "godzina"
+
+#: filter/filter-datespec.c:66
 msgid "hours"
 msgstr "godzin"
 
 #: filter/filter-datespec.c:67
+msgid "minute"
+msgstr "minuta"
+
+#: filter/filter-datespec.c:67
 msgid "minutes"
 msgstr "minut"
 
 #: filter/filter-datespec.c:68
+msgid "second"
+msgstr "sekunda"
+
+#: filter/filter-datespec.c:68
 msgid "seconds"
 msgstr "sekund"
 
@@ -3659,6 +3855,10 @@ msgstr "czasem podanym wzglЙdem bie©╠cego"
 msgid "Compare against"
 msgstr "PorСwnanie z"
 
+#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
+msgid "now"
+msgstr "teraz"
+
 #: filter/filter-datespec.c:690
 msgid "<click here to select a date>"
 msgstr "<kliknij, aby wybraФ datЙ>"
@@ -3681,7 +3881,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 ""
 
@@ -3716,7 +3916,7 @@ msgstr "Wprowad╪ URI foldera"
 msgid "<click here to select a folder>"
 msgstr "<kliknij, aby wybraФ folder> "
 
-#: filter/filter-input.c:184
+#: filter/filter-input.c:185
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -3725,235 +3925,246 @@ msgstr ""
 "BЁ╠d w wyra©eniu regularnym \"%s\":\n"
 "%s"
 
-#: filter/filter-message-search.c:379 filter/filter-message-search.c:447
+#: filter/filter-message-search.c:380 filter/filter-message-search.c:448
 #, c-format
 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:520
+#: filter/filter-rule.c:530
 msgid "Rule name: "
 msgstr "Nazwa reguЁy: "
 
-#: filter/filter-rule.c:524
+#: filter/filter-rule.c:534
 msgid "Untitled"
 msgstr "Bez nazwy"
 
-#: filter/filter-rule.c:540
+#: filter/filter-rule.c:550
 msgid "If"
 msgstr "Lista warunkСw"
 
-#: filter/filter-rule.c:557
+#: filter/filter-rule.c:567
 msgid "Execute actions"
 msgstr "Wykonywanie czynno╤ci"
 
-#: filter/filter-rule.c:561
+#: filter/filter-rule.c:571
 msgid "if all criteria are met"
 msgstr "przy speЁnieniu wszystkich kryteriСw"
 
-#: filter/filter-rule.c:566
+#: filter/filter-rule.c:576
 msgid "if any criteria are met"
 msgstr "przy speЁnieniu ktСregokolwiek z kryteriСw"
 
-#: filter/filter-rule.c:577
+#: filter/filter-rule.c:587
 msgid "Add criterion"
 msgstr "Dodaj kryterium"
 
-#: filter/filter-rule.c:583
+#: filter/filter-rule.c:593
 msgid "Remove criterion"
 msgstr "UsuЯ kryterium"
 
-#: mail/folder-browser.c:465 po/tmp/filter.glade.h:8
-#: po/tmp/mail-config.glade.h:9
-msgid "Edit"
-msgstr "Edycja"
+#: filter/filter-system-flag.c:63
+#, fuzzy
+msgid "Replied to"
+msgstr "Wszystkim"
+
+#. { _("Deleted"), "Deleted" },
+#. { _("Draft"), "Draft" },
+#: filter/filter-system-flag.c:66
+msgid "Important"
+msgstr ""
 
-#: po/tmp/filter.glade.h:10
+#: filter/filter-system-flag.c:67
+#, fuzzy
+msgid "Read"
+msgstr "PonСw"
+
+#: filter/filter.glade.h:10
 msgid "Edit VFolders"
 msgstr "Modyfikacja VFolderСw"
 
-#: po/tmp/filter.glade.h:11
+#: filter/filter.glade.h:11
 msgid "Filter Rules"
 msgstr "ReguЁy filtrСw"
 
-#: 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
 #, fuzzy
 msgid "Outgoing"
 msgstr "Obrys:"
 
-#: po/tmp/filter.glade.h:15
+#: filter/filter.glade.h:15
 msgid "Virtual Folders"
 msgstr "Wirtualne foldery"
 
-#: po/tmp/filter.glade.h:16
+#: filter/filter.glade.h:16
 msgid "vFolder Sources"
 msgstr "╛rСdЁa VFolderСw"
 
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
+msgid "after"
+msgstr "po"
+
+#: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr "Przypisz kolor"
 
-#: 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 "przed"
+
+#: filter/libfilter-i18n.h:6
+msgid "contains"
+msgstr "zawiera"
+
+#: filter/libfilter-i18n.h:7
 msgid "Copy to Folder"
 msgstr "Kopiuj do foldera"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "Data otrzymania"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "Data wysЁania"
 
-#: filter/libfilter-i18n.h:8
-msgid "Expression"
-msgstr "Wyra©enie"
-
-#: filter/libfilter-i18n.h:9
-msgid "Forward to Address"
-msgstr "Prze╤lij na adres"
-
-#: filter/libfilter-i18n.h:10
-msgid "Message Body"
-msgstr "Tre╤Ф listu"
-
 #: filter/libfilter-i18n.h:11
-msgid "Message Header"
-msgstr "NagЁСwek listu"
+msgid "does not contain"
+msgstr "nie zawiera"
 
 #: filter/libfilter-i18n.h:12
-msgid "Message was received"
-msgstr "List zostaЁ otrzymany"
+msgid "does not end with"
+msgstr "nie koЯczy siЙ na"
 
 #: filter/libfilter-i18n.h:13
-msgid "Message was sent"
-msgstr "List zostaЁ wysЁany"
+msgid "does not exist"
+msgstr "nie istnieje"
 
 #: filter/libfilter-i18n.h:14
-msgid "Move to Folder"
-msgstr "Przenie╤ do foldera"
+msgid "does not sound like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:15
+msgid "does not start with"
+msgstr "nie rozpoczyna siЙ od"
 
 #: filter/libfilter-i18n.h:16
-msgid "Recipients"
-msgstr "Lista odbiorcСw"
+msgid "ends with"
+msgstr "koЯczy siЙ na"
 
 #: filter/libfilter-i18n.h:17
-msgid "Regex Match"
-msgstr ""
+msgid "exists"
+msgstr "istnieje"
 
 #: filter/libfilter-i18n.h:18
-msgid "Sender"
-msgstr "Nadawca"
+msgid "Expression"
+msgstr "Wyra©enie"
 
 #: filter/libfilter-i18n.h:19
-#, fuzzy
-msgid "Set Status"
-msgstr "_Stan:"
+msgid "Forward to Address"
+msgstr "Prze╤lij na adres"
 
 #: filter/libfilter-i18n.h:20
-msgid "Source"
-msgstr "╛rСdЁo"
+msgid "is"
+msgstr "jest"
 
 #: filter/libfilter-i18n.h:21
-msgid "Specific header"
-msgstr "Okre╤lony nagЁСwek"
+msgid "is greater than"
+msgstr "jest wiЙkszy ni©"
 
 #: filter/libfilter-i18n.h:22
-#, fuzzy
-msgid "Status"
-msgstr "_Stan:"
+msgid "is less than"
+msgstr "jest mniejszy ni©"
 
 #: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
-msgstr "Zatrzymanie przetwarzania"
+msgid "is not"
+msgstr "nie jest"
 
 #: filter/libfilter-i18n.h:24
-msgid "Subject"
-msgstr "Temat"
+msgid "Message Body"
+msgstr "Tre╤Ф listu"
 
 #: filter/libfilter-i18n.h:25
-msgid "after"
-msgstr "po"
+msgid "Message Header"
+msgstr "NagЁСwek listu"
 
 #: filter/libfilter-i18n.h:26
-msgid "before"
-msgstr "przed"
+msgid "Message was received"
+msgstr "List zostaЁ otrzymany"
 
 #: filter/libfilter-i18n.h:27
-msgid "contains"
-msgstr "zawiera"
+msgid "Message was sent"
+msgstr "List zostaЁ wysЁany"
 
 #: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr "nie zawiera"
+msgid "Move to Folder"
+msgstr "Przenie╤ do foldera"
 
 #: filter/libfilter-i18n.h:29
-msgid "does not end with"
-msgstr "nie koЯczy siЙ na"
+msgid "on or after"
+msgstr "w lub po"
 
 #: filter/libfilter-i18n.h:30
-msgid "does not exist"
-msgstr "nie istnieje"
-
-#: filter/libfilter-i18n.h:31
-msgid "does not sound like"
-msgstr ""
+msgid "on or before"
+msgstr "w lub przed"
 
 #: filter/libfilter-i18n.h:32
-msgid "does not start with"
-msgstr "nie rozpoczyna siЙ od"
+msgid "Recipients"
+msgstr "Lista odbiorcСw"
 
 #: filter/libfilter-i18n.h:33
-msgid "ends with"
-msgstr "koЯczy siЙ na"
+msgid "Regex Match"
+msgstr ""
 
 #: filter/libfilter-i18n.h:34
-msgid "exists"
-msgstr "istnieje"
+msgid "Sender"
+msgstr "Nadawca"
 
 #: filter/libfilter-i18n.h:35
-msgid "is greater than"
-msgstr "jest wiЙkszy ni©"
+#, fuzzy
+msgid "Set Status"
+msgstr "_Stan:"
 
 #: filter/libfilter-i18n.h:36
-msgid "is less than"
-msgstr "jest mniejszy ni©"
+msgid "sounds like"
+msgstr ""
 
 #: filter/libfilter-i18n.h:37
-msgid "is not"
-msgstr "nie jest"
+msgid "Source"
+msgstr "╛rСdЁo"
 
 #: filter/libfilter-i18n.h:38
-msgid "is"
-msgstr "jest"
+msgid "Specific header"
+msgstr "Okre╤lony nagЁСwek"
 
 #: filter/libfilter-i18n.h:39
-msgid "on or after"
-msgstr "w lub po"
+msgid "starts with"
+msgstr ""
 
 #: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr "w lub przed"
+#, fuzzy
+msgid "Status"
+msgstr "_Stan:"
 
 #: filter/libfilter-i18n.h:41
-msgid "sounds like"
-msgstr ""
+msgid "Stop Processing"
+msgstr "Zatrzymanie przetwarzania"
 
 #: filter/libfilter-i18n.h:42
-msgid "starts with"
-msgstr ""
+msgid "Subject"
+msgstr "Temat"
 
 #: filter/libfilter-i18n.h:43
 msgid "was after"
@@ -3983,136 +4194,218 @@ msgstr "Dodaj reguЁЙ VFoldera"
 msgid "Edit VFolder Rule"
 msgstr "Zmodyfikuj reguЁЙ VFoldera"
 
-#: mail/component-factory.c:227
+#: mail/component-factory.c:277
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Nie mo©na zainicjowaФ komponentu pocztowego Evlution."
 
-#: mail/component-factory.c:266
+#: 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:16
+#: mail/folder-browser.c:223 ui/evolution-event-editor.xml.h:88
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "Zapisz"
 
-#: mail/folder-browser.c:153
+#: mail/folder-browser.c:236
 msgid "Body or subject contains"
 msgstr "Tre╤Ф lub temat zawiera"
 
-#: mail/folder-browser.c:154
+#: mail/folder-browser.c:237
 msgid "Body contains"
 msgstr "Tre╤Ф zawiera"
 
-#: mail/folder-browser.c:155
+#: mail/folder-browser.c:238
 msgid "Subject contains"
 msgstr "Temat zawiera"
 
-#: mail/folder-browser.c:156
+#: mail/folder-browser.c:239
 msgid "Body does not contain"
 msgstr "Tre╤Ф nie zawiera"
 
-#: mail/folder-browser.c:157
+#: mail/folder-browser.c:240
 msgid "Subject does not contain"
 msgstr "Temat nie zawiera"
 
-#: mail/folder-browser.c:453
+#: mail/folder-browser.c:643
 msgid "VFolder on Subject"
 msgstr "UtwСrz VFolder w oparciu o temat"
 
-#: mail/folder-browser.c:454
+#: mail/folder-browser.c:644
 msgid "VFolder on Sender"
 msgstr "UtwСrz VFolder w oparciu o nadawcЙ"
 
-#: mail/folder-browser.c:455
+#: mail/folder-browser.c:645
 msgid "VFolder on Recipients"
 msgstr "UtwСrz VFolder w oparciu o odbiorcСw"
 
-#: mail/folder-browser.c:457
+#: mail/folder-browser.c:647
 msgid "Filter on Subject"
 msgstr "UtwСrz filtr w oparciu o temat"
 
-#: mail/folder-browser.c:458
+#: mail/folder-browser.c:648
 msgid "Filter on Sender"
 msgstr "UtwСrz filtr w oparciu o nadawcЙ"
 
-#: mail/folder-browser.c:459
+#: mail/folder-browser.c:649
 msgid "Filter on Recipients"
 msgstr "UtwСrz filtr w oparciu o odbiorcСw"
 
-#: mail/folder-browser.c:460 mail/folder-browser.c:544
+#: mail/folder-browser.c:650 mail/folder-browser.c:779
 msgid "Filter on Mailing List"
 msgstr "UtwСrz filtr w oparciu o listЙ dyskusyjn╠"
 
-#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:14
+#: mail/folder-browser.c:655
+#, fuzzy
+msgid "Show all hidden"
+msgstr "Wy╤wietl wszystkie"
+
+#: mail/folder-browser.c:657
+#, fuzzy
+msgid "Hide selected"
+msgstr "UsuniЙty"
+
+#. could use another mask, but not enough api do to it
+#: mail/folder-browser.c:660
+#, fuzzy
+msgid "Hide read"
+msgstr "Ukryj"
+
+#: mail/folder-browser.c:661
+#, fuzzy
+msgid "Hide deleted"
+msgstr "UsuniЙty"
+
+#: mail/folder-browser.c:663 mail/folder-browser.c:790
+#, fuzzy
+msgid "Hide Subject"
+msgstr "Temat"
+
+#: mail/folder-browser.c:665 mail/folder-browser.c:796
+#, fuzzy
+msgid "Hide from Sender"
+msgstr "UtwСrz filtr w oparciu o nadawcЙ"
+
+#: mail/folder-browser.c:670 ui/evolution-message-composer.xml.h:15
 msgid "Open"
 msgstr "OtwСrz"
 
-#: mail/folder-browser.c:466
+#: mail/folder-browser.c:672
 #, fuzzy
 msgid "Save As..."
 msgstr "Zapisz j_ako..."
 
-#: mail/folder-browser.c:467 mail/mail-view.c:163
-#: po/tmp/evolution-addressbook.xml.h:13 po/tmp/evolution-calendar.xml.h:23
-#: po/tmp/evolution-mail.xml.h:28
+#: 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 "Drukuj"
 
-#: mail/folder-browser.c:469
+#: mail/folder-browser.c:675
 msgid "Reply to Sender"
 msgstr "Odpowiedz nadawcy"
 
-#: mail/folder-browser.c:470 mail/mail-view.c:156
-#: po/tmp/evolution-mail.xml.h:34
+#: mail/folder-browser.c:676 mail/mail-view.c:141 ui/evolution-mail.xml.h:38
 msgid "Reply to All"
 msgstr "Wszystkim"
 
-#: mail/folder-browser.c:471 mail/mail-view.c:159
-#: 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 "Prze╤lij"
 
-#: mail/folder-browser.c:472 po/tmp/evolution-mail.xml.h:18
+#: mail/folder-browser.c:678 ui/evolution-mail.xml.h:18
 #, fuzzy
 msgid "Forward inline"
 msgstr "Przemieszcza w czasie do przodu"
 
-#: mail/folder-browser.c:474
+#: mail/folder-browser.c:680
 msgid "Mark as Read"
 msgstr "Oznacz jako przeczytany"
 
-#: mail/folder-browser.c:475
+#: mail/folder-browser.c:681
 msgid "Mark as Unread"
 msgstr "Oznacz jako nieprzeczytany"
 
-#: mail/folder-browser.c:477
+#: mail/folder-browser.c:683
 msgid "Move to Folder..."
 msgstr "Przenie╤ do foldera..."
 
-#: mail/folder-browser.c:478
+#: mail/folder-browser.c:684
 msgid "Copy to Folder..."
 msgstr "Kopiuj do foldera..."
 
-#: mail/folder-browser.c:480
+#: mail/folder-browser.c:686
 msgid "Undelete"
 msgstr "Cofnij usuniЙcie"
 
 #. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
 #. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:484
+#: mail/folder-browser.c:690
 msgid "Apply Filters"
 msgstr "Zastosuj filtry"
 
-#: mail/folder-browser.c:486 po/tmp/evolution-mail.xml.h:10
+#: mail/folder-browser.c:692 ui/evolution-mail.xml.h:10
 msgid "Create Rule From Message"
 msgstr "UtwСrz reguЁЙ na podstawie listu"
 
-#: mail/folder-browser.c:546
+#: mail/folder-browser.c:693 ui/evolution-mail.xml.h:21
+#, fuzzy
+msgid "Hide Messages"
+msgstr "Wydrukuj list"
+
+#: mail/folder-browser.c:781
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "UtwСrz filtr w oparciu o listЙ dyskusyjn╠ (%s)"
 
+#: mail/folder-browser.c:787
+#, c-format
+msgid "Hide Subject \"%s\""
+msgstr ""
+
+#: 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 "Nie mo©na uruchomiФ wombata"
+
+#: mail/local-config.glade.h:7
+msgid "Mailbox Format"
+msgstr ""
+
+#: mail/local-config.glade.h:8
+#, fuzzy
+msgid "New store format:"
+msgstr "Format czasu:"
+
+#: 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
+#, fuzzy
+msgid "mh"
+msgstr "h"
+
 #: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
@@ -4165,7 +4458,7 @@ msgstr ""
 msgid "You have no Outbox configured"
 msgstr "Nie zostaЁ skonfigurowany folder Poczta wychodz╠ca"
 
-#: mail/mail-callbacks.c:246
+#: mail/mail-callbacks.c:244
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -4173,19 +4466,23 @@ msgstr ""
 "List nie zawiera tematu.\n"
 "NaprawdЙ wysЁaФ?"
 
-#: 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 "PrzesЁany list:\n"
+
+#: mail/mail-callbacks.c:611
 msgid "Move message(s) to"
 msgstr "Przenoszenie listСw do foldera"
 
-#: mail/mail-callbacks.c:554
+#: mail/mail-callbacks.c:613
 msgid "Copy message(s) to"
 msgstr "Kopiowanie listСw do foldera"
 
-#: mail/mail-callbacks.c:665
+#: mail/mail-callbacks.c:748
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4193,11 +4490,11 @@ msgstr ""
 "Mo©liwe jest redagowanie wyЁ╠cznie\n"
 "listСw zapisanych w folderze Poczta robocza."
 
-#: mail/mail-callbacks.c:699 mail/mail-display.c:72
+#: mail/mail-callbacks.c:781 mail/mail-display.c:79
 msgid "Overwrite file?"
 msgstr "NadpisaФ plik?"
 
-#: mail/mail-callbacks.c:703 mail/mail-display.c:76
+#: mail/mail-callbacks.c:785 mail/mail-display.c:83
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -4205,17 +4502,17 @@ msgstr ""
 "Plik o tej nazwie ju© istnieje.\n"
 "NadpisaФ go?"
 
-#: mail/mail-callbacks.c:748
+#: mail/mail-callbacks.c:830
 #, fuzzy
 msgid "Save Message As..."
 msgstr "Zapisz jako..."
 
-#: mail/mail-callbacks.c:750
+#: mail/mail-callbacks.c:832
 #, fuzzy
 msgid "Save Messages As..."
 msgstr "Zapisz jako..."
 
-#: mail/mail-callbacks.c:877
+#: mail/mail-callbacks.c:916
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4224,45 +4521,276 @@ msgstr ""
 "BЁ╠d przy wczytywaniu informacji o filtrze:\n"
 "%s"
 
-#: mail/mail-callbacks.c:922
+#: mail/mail-callbacks.c:961
 msgid "Print Message"
 msgstr "Wydrukuj list"
 
-#: mail/mail-callbacks.c:969
+#: mail/mail-callbacks.c:1008
 msgid "Printing of message failed"
 msgstr "Wydrukowanie listu nie powiodЁo siЙ"
 
 #.
-#. * 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 "Brak informacji"
+
+#: mail/mail-config-druid.glade.h:8
+msgid "Account Management"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:9
+#, fuzzy
+msgid "Account Properties"
+msgstr "WЁa╤ciwo╤ci zaЁ╠cznika"
+
+#: mail/mail-config-druid.glade.h:11
+#, fuzzy
+msgid "Advanced"
+msgstr "Zaawansowane..."
+
+#: mail/mail-config-druid.glade.h:12
+#, fuzzy
+msgid "Authentication"
+msgstr "Uwierzytelnianie:"
+
+#: mail/mail-config-druid.glade.h:13
+#, fuzzy
+msgid "Authentication Type:"
+msgstr "Uwierzytelnianie:"
+
+#: 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 "Domy╤lne"
+
+#: mail/mail-config-druid.glade.h:26
+#, fuzzy
+msgid "Delete mail from server"
+msgstr "bez usuwania listСw z serwera"
+
+#: mail/mail-config-druid.glade.h:27
+#, fuzzy
+msgid "Done"
+msgstr "Brak"
+
+#: mail/mail-config-druid.glade.h:28
+#, fuzzy
+msgid "E-Mail Address:"
+msgstr "Adres e-mail:"
+
+#: mail/mail-config-druid.glade.h:30
+#, fuzzy
+msgid "Email Address:"
+msgstr "Adres e-mail:"
+
+#: mail/mail-config-druid.glade.h:31
+#, fuzzy
+msgid "Evolution Mail Configuration"
+msgstr "Konfiguracja poczty"
+
+#: mail/mail-config-druid.glade.h:32
+#, fuzzy
+msgid "Full Name:"
+msgstr "PeЁna nazwa:"
+
+#: mail/mail-config-druid.glade.h:35
+#, fuzzy
+msgid "Hostname:"
+msgstr "nazwa u©ytkownika:"
+
+#: mail/mail-config-druid.glade.h:36
+#, fuzzy
+msgid "IMAP"
+msgstr "IMAPv4"
+
+#: mail/mail-config-druid.glade.h:37
 msgid "Identity"
 msgstr "Dane osobowe"
 
-#: 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 "_List"
+
+#: mail/mail-config-druid.glade.h:41
+#, fuzzy
+msgid "Mail Account"
+msgstr "E-mail zawiera"
+
+#: mail/mail-config-druid.glade.h:42
 msgid "Mail Configuration"
 msgstr "Konfiguracja poczty"
 
-#: po/tmp/mail-config-druid.glade.h:8
-msgid "Mail Source"
-msgstr "╛rСdЁo listСw"
+#: mail/mail-config-druid.glade.h:43
+#, fuzzy
+msgid "Mail Configuration Druid"
+msgstr "Konfiguracja poczty"
 
-#: 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 "Nowy"
+
+#: mail/mail-config-druid.glade.h:48
+#, fuzzy
+msgid "Optional"
+msgstr "Opcje"
+
+#: mail/mail-config-druid.glade.h:49 mail/mail-config-gui.c:485
+msgid "Organization:"
+msgstr "Organizacja:"
+
+#: mail/mail-config-druid.glade.h:50
+msgid "Outgoing Mail Server"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:51
+#, fuzzy
+msgid "Password:"
+msgstr "HasЁo"
+
+#: mail/mail-config-druid.glade.h:53
+msgid "Plain Text"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:54
+msgid "Receiving Email"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:55
+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 "Odpowiedz"
+
+#: mail/mail-config-druid.glade.h:58
+#, fuzzy
+msgid "Required"
+msgstr "_Wymagani ludzie"
+
+#: mail/mail-config-druid.glade.h:60
+#, fuzzy
+msgid "Save password"
+msgstr "Zapisz jako VCard"
+
+#: mail/mail-config-druid.glade.h:61
+#, fuzzy
+msgid "Select signature file"
+msgstr "Plik z podpisem:"
+
+#: 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 "Konfiguracja poczty"
+
+#: mail/mail-config-druid.glade.h:65
+msgid "Server Timeouts"
 msgstr ""
 
-#: po/tmp/mail-config-druid.glade.h:10
-msgid "Welcome to the Evolution Mail configuration wizard!\n"
+#: mail/mail-config-druid.glade.h:66
+#, fuzzy
+msgid "Server Type: "
+msgstr "Serwer:"
+
+#: mail/mail-config-druid.glade.h:67
+msgid "Server requires authentication"
 msgstr ""
 
-#: po/tmp/mail-config-druid.glade.h:14
+#: mail/mail-config-druid.glade.h:68
+#, fuzzy
+msgid "Servers"
+msgstr "Serwer:"
+
+#: mail/mail-config-druid.glade.h:69 mail/mail-config-gui.c:496
+msgid "Signature file:"
+msgstr "Plik z podpisem:"
+
+#: mail/mail-config-druid.glade.h:70
+#, fuzzy
+msgid "Signature:"
+msgstr "Plik z podpisem:"
+
+#: mail/mail-config-druid.glade.h:71 mail/mail-config.glade.h:20
+msgid "Sources"
+msgstr "╛rСdЁa"
+
+#: 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 "Typ:"
+
+#: 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 "Brak informacji"
+
+#: mail/mail-config-druid.glade.h:77 mail/mail-config-gui.c:928
+msgid "Username:"
+msgstr "nazwa u©ytkownika:"
+
+#: mail/mail-config-druid.glade.h:78
+msgid "Welcome to the Evolution Mail Configuration Druid.\n"
 msgstr ""
-"Konfiguracja poczta zostaЁa zakoЯczona.\n"
-"Kliknij \"ZakoЯcz\", aby zapisaФ nowe ustawienia."
+
+#: mail/mail-config-druid.glade.h:81
+#, fuzzy
+msgid "minute(s)"
+msgstr "minut"
 
 #: mail/mail-config-gui.c:433
 msgid ""
@@ -4279,15 +4807,7 @@ msgstr "PeЁna nazwa:"
 msgid "Email address:"
 msgstr "Adres e-mail:"
 
-#: mail/mail-config-gui.c:485
-msgid "Organization:"
-msgstr "Organizacja:"
-
-#: mail/mail-config-gui.c:496
-msgid "Signature file:"
-msgstr "Plik z podpisem:"
-
-#: 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 "Plik z podpisem"
 
@@ -4295,26 +4815,10 @@ msgstr "Plik z podpisem"
 msgid "Server:"
 msgstr "Serwer:"
 
-#: mail/mail-config-gui.c:928
-msgid "Username:"
-msgstr "nazwa u©ytkownika:"
-
-#: mail/mail-config-gui.c:934
-msgid "Path:"
-msgstr "╕cie©ka:"
-
-#: mail/mail-config-gui.c:943
-msgid "Authentication:"
-msgstr "Uwierzytelnianie:"
-
 #: mail/mail-config-gui.c:956
 msgid "Detect supported types..."
 msgstr "Wykryj obsЁugiwane typy..."
 
-#: 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 "bez usuwania listСw z serwera"
@@ -4327,7 +4831,7 @@ msgstr "Przetestuj ustawienia"
 msgid "Mail source type:"
 msgstr "Typ ╪rСdЁa listСw:"
 
-#: 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"
@@ -4353,6 +4857,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 ""
@@ -4401,60 +4913,68 @@ msgstr ""
 msgid "Query authorization at \"%s\""
 msgstr ""
 
-#: po/tmp/mail-config.glade.h:7
+#: mail/mail-config.glade.h:7
 msgid "Address"
 msgstr "Adres"
 
-#: 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 "╛rСdЁa listСw"
 
-#: po/tmp/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
+msgid "Mail Transport"
+msgstr ""
+
+#: mail/mail-config.glade.h:13
 msgid "Mark message as seen [ms]: "
 msgstr "OpС╪nienie oznaczania listu jako widzianego [ms]: "
 
-#: 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 "Organizacja"
 
-#: po/tmp/mail-config.glade.h:18
+#: mail/mail-config.glade.h:18
 msgid "Send messages in HTML format"
 msgstr "WysyЁanie listСw w formacie HTML"
 
-#: po/tmp/mail-config.glade.h:20
-msgid "Sources"
-msgstr "╛rСdЁa"
-
-#: mail/mail-crypto.c:350 mail/mail-crypto.c:452 mail/mail-crypto.c:629
+#: 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."
 msgstr ""
 
-#: mail/mail-crypto.c:354 mail/mail-crypto.c:456 mail/mail-crypto.c:634
+#: mail/mail-crypto.c:357 mail/mail-crypto.c:462 mail/mail-crypto.c:640
+#: mail/mail-crypto.c:785
 msgid "No password provided."
 msgstr "Nie podano hasЁa."
 
-#: mail/mail-crypto.c:360 mail/mail-crypto.c:463 mail/mail-crypto.c:640
+#: mail/mail-crypto.c:363 mail/mail-crypto.c:469 mail/mail-crypto.c:646
+#: mail/mail-crypto.c:792 mail/mail-crypto.c:942
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Nie mo©na utworzyФ potoku do GPG/PGP: %s"
 
-#: mail/mail-crypto.c:625
+#: mail/mail-crypto.c:631 mail/mail-crypto.c:777 mail/mail-crypto.c:936
 msgid "No GPG/PGP program available."
 msgstr "Brak dostЙpnego programu GPG/PGP."
 
-#: mail/mail-display.c:90
+#: mail/mail-crypto.c:953
+#, fuzzy, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "Utworzenie potoku nie powiodЁo siЙ: %s"
+
+#: mail/mail-display.c:98
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -4463,442 +4983,358 @@ msgstr ""
 "Nie mo©na otworzyФ pliku %s:\n"
 "%s"
 
-#: mail/mail-display.c:113
+#: mail/mail-display.c:131
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nie mo©na zapisaФ danych: %s"
 
-#: mail/mail-display.c:218
+#: mail/mail-display.c:229
 msgid "Save Attachment"
 msgstr "Zapis zaЁ╠cznika"
 
-#: mail/mail-display.c:258
+#: mail/mail-display.c:269
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nie mo©na utworzyФ katalogu tymczasowego: %s"
 
-#: mail/mail-display.c:300
+#: mail/mail-display.c:311
 msgid "Save to Disk..."
 msgstr "Zapisz na dysk..."
 
-#: mail/mail-display.c:302
+#: mail/mail-display.c:313
 #, c-format
 msgid "Open in %s..."
 msgstr "OtwСrz za pomoc╠ programu %s..."
 
-#: mail/mail-display.c:304
+#: mail/mail-display.c:315
 msgid "View Inline"
 msgstr "Wy╤wietl na miejscu"
 
-#: mail/mail-display.c:328
+#: mail/mail-display.c:339
 msgid "External Viewer"
 msgstr "ZewnЙtrzna przegl╠darka"
 
-#: mail/mail-display.c:351
+#: mail/mail-display.c:362
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Wy╤wietl na miejscu (za pomoc╠ programu %s)"
 
-#: mail/mail-display.c:355
+#: mail/mail-display.c:366
 msgid "Hide"
 msgstr "Ukryj"
 
-#: mail/mail-format.c:500
+#: mail/mail-format.c:503
 #, c-format
 msgid "%s attachment"
 msgstr "ZaЁ╠cznik %s"
 
-#: mail/mail-format.c:623
-msgid "Reply-To:"
-msgstr ""
-
-#: mail/mail-format.c:845
+#: mail/mail-format.c:851
 msgid "No GPG/PGP support available in this copy of Evolution."
 msgstr "W tej kopii Evolution nie jest dostЙpna obsЁuga GPG/PGP"
 
-#: mail/mail-format.c:857
+#: mail/mail-format.c:863
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:869
 msgid "Encrypted message"
 msgstr "List zaszyfrowany"
 
-#: mail/mail-format.c:864
+#: mail/mail-format.c:870
 msgid "Click icon to decrypt."
 msgstr "Kliknij ikonЙ aby rozszyfrowaФ."
 
-#: mail/mail-format.c:1470
+#: mail/mail-format.c:1450
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Wska╪nik do witryny FTP (%s)"
 
-#: mail/mail-format.c:1482
+#: mail/mail-format.c:1462
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1486
+#: mail/mail-format.c:1466
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Wska╪nik do lokalnego pliku (%s)"
 
-#: mail/mail-format.c:1520
+#: mail/mail-format.c:1500
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1525
+#: mail/mail-format.c:1505
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-format.c:1695
+#: mail/mail-format.c:1675
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr ""
 
-#: mail/mail-local.c:202
+#: mail/mail-local.c:204
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Konwertowanie foldera \"%s\" na format \"%s\""
 
-#: mail/mail-local.c:206
+#: mail/mail-local.c:208
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Przekonwertuj folder \"%s\" na format \"%s\""
 
-#: mail/mail-local.c:261
+#: mail/mail-local.c:251
+#, fuzzy
+msgid "Reconfiguring folder"
+msgstr "_Skonfiguruj folder"
+
+#: mail/mail-local.c:269
 msgid "Closing current folder"
 msgstr "Zamykanie bie©╠cego foldera"
 
-#: mail/mail-local.c:293
+#: mail/mail-local.c:295
 msgid "Renaming old folder and opening"
 msgstr ""
 
-#: mail/mail-local.c:314
+#: mail/mail-local.c:313
 msgid "Creating new folder"
 msgstr "Tworzenie nowego foldera"
 
-#: mail/mail-local.c:329
+#: mail/mail-local.c:327
 msgid "Copying messages"
 msgstr "Kopiowanie listСw"
 
-#: mail/mail-local.c:341
+#: 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:372
+#: 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:781
+#: mail/mail-local.c:787
 msgid "Registering local folder"
 msgstr "Rejestrowanie lokalnego foldera"
 
-#: mail/mail-local.c:783
+#: mail/mail-local.c:789
 msgid "Register local folder"
 msgstr "Zarejestruj lokalny folder"
 
-#: mail/mail-ops.c:79
+# y, c-format
+#: mail/mail-local.c:894
+#, fuzzy, c-format
+msgid ""
+"Unable to register folder '%s':\n"
+"%s"
+msgstr ""
+"Nie mo©na utworzyФ foldera \"%s\":\n"
+"%s"
+
+#: mail/mail-mt.c:85
+#, fuzzy, c-format
+msgid ""
+"Error while '%s':\n"
+"%s"
+msgstr ""
+"BЁ╠d podczas \"%s\":\n"
+"%s"
+
+#: mail/mail-mt.c:87
+#, fuzzy, c-format
+msgid ""
+"Error while performing operation:\n"
+"%s"
+msgstr ""
+"BЁ╠d przy wczytywaniu informacji o filtrze:\n"
+"%s"
+
+#: mail/mail-mt.c:356 mail/mail-mt.c:385
+#, fuzzy
+msgid "Working"
+msgstr "Przenoszenie"
+
+#: mail/mail-ops.c:88
 #, c-format
 msgid "Fetching email from %s"
 msgstr ""
 
-#: mail/mail-ops.c:81
+#: mail/mail-ops.c:90
 #, c-format
 msgid "Fetch email from %s"
 msgstr ""
 
-#: mail/mail-ops.c:331
+#: mail/mail-ops.c:335
 #, c-format
 msgid "There is no new mail at %s."
 msgstr ""
 
-#: mail/mail-ops.c:401
+#: mail/mail-ops.c:405
 msgid "Filtering email on demand"
 msgstr "Filtrowanie listu na ©╠danie"
 
-#: mail/mail-ops.c:403
+#: mail/mail-ops.c:407
 msgid "Filter email on demand"
 msgstr "Filtruj list na ©╠danie"
 
-#: mail/mail-ops.c:538
+#: mail/mail-ops.c:551
 #, c-format
 msgid "Sending \"%s\""
 msgstr "WysyЁanie \"%s\""
 
-#: mail/mail-ops.c:543
-msgid "Sending a message without a subject"
-msgstr "WysyЁanie listu bez tematu"
-
-#: mail/mail-ops.c:546
-#, c-format
-msgid "Send \"%s\""
-msgstr "Wy╤lij \"%s\""
-
-#: mail/mail-ops.c:549
-msgid "Send a message without a subject"
-msgstr "Wy╤lij list bez tematu"
+#: mail/mail-ops.c:553
+#, fuzzy
+msgid "Sending message"
+msgstr "Natychmiast wysyЁa wiadomo╤Ф"
 
-#: mail/mail-ops.c:720
+#: mail/mail-ops.c:669
 msgid "Sending queue"
 msgstr "WysyЁanie kolejki"
 
-#: mail/mail-ops.c:722
+#: mail/mail-ops.c:671
 msgid "Send queue"
 msgstr "Wy╤lij kolejkЙ"
 
-#: mail/mail-ops.c:858 mail/mail-ops.c:865
+#: mail/mail-ops.c:804 mail/mail-ops.c:811
 #, c-format
 msgid "Appending \"%s\""
 msgstr "DoЁ╠czanie \"%s\""
 
-#: mail/mail-ops.c:862 mail/mail-ops.c:868
+#: mail/mail-ops.c:808 mail/mail-ops.c:814
 msgid "Appending a message without a subject"
 msgstr "DoЁ╠czanie listu bez tematu"
 
-#: mail/mail-ops.c:940
-#, c-format
-msgid "Expunging \"%s\""
-msgstr "Czyszczenie \"%s\""
-
-#: mail/mail-ops.c:942
-#, c-format
-msgid "Expunge \"%s\""
-msgstr "Wyczy╤Ф \"%s\""
-
-#: mail/mail-ops.c:1001
+#: mail/mail-ops.c:897
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Przenoszenie listСw z \"%s\" do \"%s\""
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:899
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Kopiowanie listСw z \"%s\" do \"%s\""
 
-#: mail/mail-ops.c:1006
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Przenie╤ listy z \"%s\" do \"%s\""
 
-#: mail/mail-ops.c:1008
+#: mail/mail-ops.c:904
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Skopiuj listy z \"%s\" do \"%s\""
 
-#: mail/mail-ops.c:1039
+#: mail/mail-ops.c:935
 msgid "Moving"
 msgstr "Przenoszenie"
 
-#: mail/mail-ops.c:1042
+#: mail/mail-ops.c:938
 msgid "Copying"
 msgstr "Kopiowanie"
 
-#: mail/mail-ops.c:1062
+#: mail/mail-ops.c:958
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1141
-#, c-format
-msgid "Marking messages in folder \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1144
-#, c-format
-msgid "Mark messages in folder \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1175
-#, c-format
-msgid "Marking message %d of %d"
-msgstr "Zaznaczanie listu %d z %d"
-
-#: mail/mail-ops.c:1295
+#: mail/mail-ops.c:1033
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1297
-#, c-format
-msgid "Scan folders in \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1366 mail/subscribe-dialog.c:339
+#: mail/mail-ops.c:1099 mail/subscribe-dialog.c:341
 msgid "(No description)"
 msgstr "(Brak opisu)"
 
-#: mail/mail-ops.c:1432
-#, c-format
-msgid "Attaching messages from folder \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1435
-#, c-format
-msgid "Attach messages from \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1535
-#, c-format
-msgid "Forwarding messages \"%s\""
-msgstr "PrzesyЁanie listСw \"%s\""
-
-#: mail/mail-ops.c:1539
-msgid "Forwarding a message without a subject"
-msgstr "PrzesyЁanie listu bez tematu"
-
-#: mail/mail-ops.c:1542
-#, c-format
-msgid "Forward message \"%s\""
-msgstr "Prze╤lij list \"%s\""
-
-#: mail/mail-ops.c:1546
-msgid "Forward a message without a subject"
-msgstr "Prze╤lij list bez tematu"
-
-#: mail/mail-ops.c:1593
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1610
-msgid ""
-"Failed to generate mime part from message while generating forwarded message."
-msgstr ""
-
-#: mail/mail-ops.c:1665
+#: mail/mail-ops.c:1164
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "PrzesЁany list:\n"
 
-#: mail/mail-ops.c:1679
-msgid "Forwarded message:\n"
-msgstr "PrzesЁany list:\n"
-
-#: mail/mail-ops.c:1748
-#, c-format
-msgid "Loading \"%s\""
-msgstr "Wczytywanie \"%s\""
-
-#: mail/mail-ops.c:1750
-#, c-format
-msgid "Load \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1853
-#, c-format
-msgid "Creating \"%s\""
-msgstr "Tworzenie \"%s\""
-
-#: mail/mail-ops.c:1855
-#, c-format
-msgid "Create \"%s\""
-msgstr "UtwСrz \"%s\""
-
-#: mail/mail-ops.c:1903
-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 "Nie mo©na utworzyФ procesu dla %s: %s"
 
-#: mail/mail-ops.c:1949
-#, c-format
-msgid "Synchronizing \"%s\""
+#: mail/mail-ops.c:1336
+#, fuzzy
+msgid "Synchronising folder"
 msgstr "Synchronizowanie \"%s\""
 
-#: mail/mail-ops.c:1951
-#, c-format
-msgid "Synchronize \"%s\""
-msgstr "Zsynchronizuj \"%s\""
-
-#: mail/mail-ops.c:2015
-#, c-format
-msgid "Displaying message UID \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:2018
-msgid "Clearing message display"
-msgstr ""
-
-#: mail/mail-ops.c:2021
-#, c-format
-msgid "Display message UID \"%s\""
-msgstr ""
+#: mail/mail-ops.c:1386
+#, fuzzy
+msgid "Expunging folder"
+msgstr "Czyszczenie \"%s\""
 
-#: mail/mail-ops.c:2024
-msgid "Clear message display"
-msgstr ""
+#: mail/mail-ops.c:1434
+#, fuzzy, c-format
+msgid "Retrieving message %s"
+msgstr "Pobieranie listu %d z %d"
 
-#: mail/mail-ops.c:2137
-#, c-format
-msgid "Opening messages from folder \"%s\""
-msgstr ""
+#: mail/mail-ops.c:1497
+#, fuzzy
+msgid "Retrieving messages"
+msgstr "Pobieranie listu %d z %d"
 
-#: mail/mail-ops.c:2140
+#: mail/mail-ops.c:1507
 #, c-format
-msgid "Open messages from \"%s\""
+msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:2244
-#, c-format
-msgid "Loading %s Folder"
+#: mail/mail-ops.c:1655
+#, fuzzy, c-format
+msgid "Loading %s Folder for %s"
 msgstr "Wczytywanie foldera %s"
 
-#: mail/mail-ops.c:2246
-#, c-format
-msgid "Load %s Folder"
-msgstr ""
-
-#: mail/mail-ops.c:2310
-#, c-format
-msgid "Viewing messages from folder \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:2313
-#, c-format
-msgid "View messages from \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:2339
-#, c-format
-msgid "Retrieving message %d of %d (uid \"%s\")"
-msgstr ""
+#: mail/mail-ops.c:1657
+#, fuzzy, c-format
+msgid "Load %s Folder for %s"
+msgstr "Wczytywanie foldera %s"
 
-#: mail/mail-ops.c:2428
-#, c-format
-msgid "Saving messages from folder \"%s\""
-msgstr "Zapisywanie listСw z foldera \"%s\""
+#: mail/mail-ops.c:1823
+#, fuzzy
+msgid "Saving messages"
+msgstr "Kopiowanie listСw"
 
-#: mail/mail-ops.c:2431
+#: mail/mail-ops.c:1902
 #, fuzzy, c-format
-msgid "Save messages from folder \"%s\""
-msgstr "Zapisywanie listСw z foldera \"%s\""
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
+msgstr "Nie mo©na otworzyФ lub utworzyФ pliku .newsrc dla %s: %s"
 
-#: mail/mail-ops.c:2474
+#: mail/mail-ops.c:1915
 #, fuzzy, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Zaznaczanie listu %d z %d"
 
+#: mail/mail-ops.c:1929
+#, fuzzy, c-format
+msgid ""
+"Error saving messages to: %s:\n"
+" %s"
+msgstr "BЁ╠d przy zapisie pliku: %s"
+
 #: mail/mail-search-dialogue.c:104
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: mail/mail-summary.c:105 mail/mail-threads.c:728
+#: mail/mail-summary.c:110 mail/mail-threads.c:729
 msgid "Incomplete message written on pipe!"
 msgstr ""
 
-#: mail/mail-threads.c:301
+#: mail/mail-threads.c:302
 #, c-format
 msgid ""
 "Error while preparing to %s:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-threads.c:675
+#: mail/mail-threads.c:676
 #, c-format
 msgid ""
 "Error while `%s':\n"
@@ -4907,19 +5343,19 @@ msgstr ""
 "BЁ╠d podczas \"%s\":\n"
 "%s"
 
-#: mail/mail-threads.c:732
+#: mail/mail-threads.c:733
 msgid "Error reading commands from dispatching thread."
 msgstr ""
 
-#: mail/mail-threads.c:797
+#: mail/mail-threads.c:798
 msgid "Corrupted message from dispatching thread?"
 msgstr ""
 
-#: mail/mail-threads.c:916
+#: mail/mail-threads.c:917
 msgid "Could not create dialog box."
 msgstr "Nie mo©na utworzyФ okna dialogowego."
 
-#: mail/mail-threads.c:927
+#: mail/mail-threads.c:928
 msgid "User cancelled query."
 msgstr ""
 
@@ -4929,128 +5365,147 @@ msgid "Couldn't create temporary mbox `%s': %s"
 msgstr ""
 
 #. Get all uids of source
-#: mail/mail-tools.c:239
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Examining %s"
 msgstr ""
 
-#: mail/mail-tools.c:269
+#: mail/mail-tools.c:271
 #, c-format
 msgid ""
 "Could not read UID cache file \"%s\". You may receive duplicate messages."
 msgstr ""
 
-#. Info
-#: mail/mail-tools.c:290
+#: mail/mail-tools.c:300
 #, c-format
 msgid "Retrieving message %d of %d"
 msgstr "Pobieranie listu %d z %d"
 
 #. Append it to dest
-#: mail/mail-tools.c:303
+#: mail/mail-tools.c:315
 #, c-format
 msgid "Writing message %d of %d"
 msgstr "Zapisywanie listu %d z %d"
 
-#: mail/mail-tools.c:332
+#: mail/mail-tools.c:347
 #, c-format
 msgid "Saving changes to %s"
 msgstr "Zapisywanie zmian do %s"
 
-#: mail/mail-tools.c:369
+#: mail/mail-tools.c:381
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (przesЁany list)"
 
-#: mail/mail-tools.c:379
+#: mail/mail-tools.c:391
 msgid "Fwd: (no subject)"
 msgstr ""
 
-#: mail/mail-tools.c:418
+#: mail/mail-tools.c:427
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "PrzesЁany list - %s"
 
-#: mail/mail-tools.c:420
+#: mail/mail-tools.c:429
 msgid "Forwarded message (no subject)"
 msgstr "PrzesЁany list (bez tematu)"
 
-#: mail/mail-tools.c:523
+#: mail/mail-tools.c:530
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-vfolder.c:147
+#: mail/mail-vfolder.c:149
 msgid "VFolders"
 msgstr "VFoldery"
 
-#: mail/mail-vfolder.c:296
+#: mail/mail-vfolder.c:298
 msgid "New VFolder"
 msgstr "Nowy VFolder"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:33
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:37
 msgid "Reply"
 msgstr "Odpowiedz"
 
-#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:38
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
 msgid "Reply to the sender of this message"
 msgstr "Odpowiada nadawcy listu"
 
-#: mail/mail-view.c:156 po/tmp/evolution-mail.xml.h:37
+#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
 msgid "Reply to all recipients of this message"
 msgstr "Odpowiada wszystkim odbiorcom listu"
 
-#: mail/mail-view.c:159 po/tmp/evolution-mail.xml.h:19
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:19
 msgid "Forward this message"
 msgstr "PrzesyЁa list dalej"
 
-#: mail/mail-view.c:163 po/tmp/evolution-mail.xml.h:32
+#: mail/mail-view.c:148 ui/evolution-mail.xml.h:36
 msgid "Print the selected message"
 msgstr "Drukuje list"
 
-#: mail/mail-view.c:165 po/tmp/evolution-mail.xml.h:12
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:12
 msgid "Delete this message"
 msgstr "Usuwa list"
 
-#: mail/message-list.c:572
+#: mail/message-list.c:590
 msgid "Unseen"
 msgstr "Niewidziany"
 
-#: mail/message-list.c:575
+#: mail/message-list.c:593
 msgid "Seen"
 msgstr "Widziany"
 
-#: mail/message-list.c:578
+#: mail/message-list.c:596
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:846
+#: mail/message-list.c:881
 #, c-format
 msgid "[ %s ]"
 msgstr ""
 
 #. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:858 mail/message-list.c:873
+#: mail/message-list.c:893 mail/message-list.c:909
 #, c-format
 msgid "%s, et al."
 msgstr ""
 
-#: mail/message-list.c:860 mail/message-list.c:875
+#: mail/message-list.c:896 mail/message-list.c:912
 #, fuzzy
 msgid "<unknown>"
 msgstr "Nieznany"
 
-#: mail/message-list.c:2068
-msgid "Rebuilding message view"
-msgstr "Przebudowywanie widoku listu"
+#: mail/message-list.c:965
+msgid "?"
+msgstr ""
+
+#: mail/message-list.c:972
+#, fuzzy
+msgid "Today %l:%M %p"
+msgstr "%I:%M %p"
+
+#: mail/message-list.c:981
+msgid "Yesterday %l:%M %p"
+msgstr ""
+
+#: mail/message-list.c:993
+#, fuzzy
+msgid "%a %l:%M %p"
+msgstr "%I:%M %p"
+
+#: mail/message-list.c:1001
+#, fuzzy
+msgid "%b %d %l:%M %p"
+msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: mail/message-list.c:2070
-msgid "Rebuild message view"
-msgstr "Przebudowywanie widoku listu"
+#: mail/message-list.c:1003
+#, fuzzy
+msgid "%b %d %Y"
+msgstr "%a %d %Y"
 
 #: mail/subscribe-dialog.c:139
 msgid "Display folders starting with:"
@@ -5066,27 +5521,27 @@ msgstr ""
 msgid "Get store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:282
+#: mail/subscribe-dialog.c:283
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:286
+#: mail/subscribe-dialog.c:287
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:290
+#: mail/subscribe-dialog.c:291
 #, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:293
+#: mail/subscribe-dialog.c:294
 #, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr ""
 
-#: shell/e-setup.c:112 shell/e-setup.c:183
+#: shell/e-setup.c:112 shell/e-setup.c:185
 msgid "Evolution installation"
 msgstr "Instalacja Evolution"
 
@@ -5100,23 +5555,23 @@ msgstr ""
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr "Kliknij \"OK\" aby zainstalowaФ pliki lub \"Anuluj\" aby zakoЯczyФ."
 
-#: shell/e-setup.c:155
+#: shell/e-setup.c:157
 msgid "Could not update files correctly"
 msgstr ""
 
-#: shell/e-setup.c:158 shell/e-setup.c:224
+#: shell/e-setup.c:160 shell/e-setup.c:228
 msgid "Evolution files successfully installed."
 msgstr ""
 
-#: shell/e-setup.c:187
+#: shell/e-setup.c:189
 msgid "This seems to be the first time you run Evolution."
 msgstr ""
 
-#: shell/e-setup.c:188
+#: shell/e-setup.c:190
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 
-#: shell/e-setup.c:205
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -5127,7 +5582,7 @@ msgstr ""
 "%s\n"
 "BЁ╠d: %s"
 
-#: shell/e-setup.c:220
+#: shell/e-setup.c:224
 #, c-format
 msgid ""
 "Cannot copy files into\n"
@@ -5136,7 +5591,7 @@ msgstr ""
 "Nie mo©na skopiowaФ plikСw do\n"
 "\"%s\"."
 
-#: shell/e-setup.c:245
+#: shell/e-setup.c:249
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -5144,7 +5599,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:257
+#: shell/e-setup.c:261
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -5175,7 +5630,7 @@ msgid ""
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:291
+#: shell/e-shell-folder-selection-dialog.c:297
 msgid "New..."
 msgstr "Nowy..."
 
@@ -5183,23 +5638,19 @@ msgstr "Nowy..."
 msgid "(Untitled)"
 msgstr ""
 
-#. you might have to call gnome_dialog_run() on the
-#. * dialog returned here, I don't remember...
-#.
-#: shell/e-shell-view-menu.c:114
+#: shell/e-shell-view-menu.c:111
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug buddy nie znajduje siЙ w ╤cie©ce."
 
-#. same as above
-#: shell/e-shell-view-menu.c:120
+#: shell/e-shell-view-menu.c:117
 msgid "Bug buddy could not be run."
 msgstr "Nie mo©na uruchomiФ Bug buddy."
 
-#: shell/e-shell-view-menu.c:172
+#: shell/e-shell-view-menu.c:169
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:174
+#: shell/e-shell-view-menu.c:171
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -5211,7 +5662,7 @@ msgstr ""
 "i zarz╠dzanie kontaktami w\n"
 "╤rodowisku GNOME."
 
-#: shell/e-shell-view-menu.c:335
+#: shell/e-shell-view-menu.c:332
 msgid "Go to folder..."
 msgstr ""
 
@@ -5307,9 +5758,8 @@ msgstr ""
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:125
-#: po/tmp/evolution-message-composer.xml.h:43 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 "_Widok"
 
@@ -5371,8 +5821,8 @@ msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
-"Over the last month and a half, our focus has been on making\n"
-"Evolution usable. Many of the Evolution developers are now using\n"
+"Over the time since the past release, our focus has been on making\n"
+"Evolution usable.  Many of the Evolution developers are now using\n"
 "Evolution to read their mail full time. You could too. (Just\n"
 "be sure to keep a backup.)\n"
 "\n"
@@ -5427,1106 +5877,1126 @@ msgstr ""
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Nie mo©na zainicjowaФ systemu komponentСw Bonobo."
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-addressbook-ldap.xml.h:6
-msgid "N_ew Directory Server"
-msgstr "_Nowy serwer katalogowy"
-
-#: po/tmp/evolution-addressbook-ldap.xml.h:7
-msgid "_Actions"
-msgstr "_Czynno╤ci"
-
-#: po/tmp/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:7
 msgid "Create a new contact"
 msgstr "Tworzy nowy kontakt"
 
-#: po/tmp/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete a contact"
 msgstr "UsuЯ kontakt"
 
-#: 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 "Znajd╪"
 
-#: po/tmp/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:11
 msgid "Find a contact"
 msgstr "Odnajduje kontakt"
 
-#: 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 "Nowy"
 
-#: po/tmp/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:14
 msgid "Print contacts"
 msgstr "Drukuj kontakty"
 
-#: po/tmp/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:15
 msgid "Stop"
 msgstr "Zatrzymaj"
 
-#: po/tmp/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:16
 msgid "Stop Loading"
 msgstr "Zatrzymuje wczytywanie"
 
-#: po/tmp/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:17
 msgid "View All"
 msgstr "Wy╤wietl wszystkie"
 
-#: po/tmp/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:18
 msgid "View all contacts"
 msgstr "Wy╤wietla wszystkie kontakty"
 
-#: po/tmp/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "_Addressbook Configuration..."
+msgstr "Konfiguracja _listСw"
+
+#: ui/evolution-addressbook.xml.h:20
 msgid "_Print Contacts..."
 msgstr "_Drukuj kontakty..."
 
-#: po/tmp/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:21
 msgid "_Search for contacts"
 msgstr "_Szukaj kontaktСw"
 
-#: po/tmp/evolution-addressbook.xml.h:21
-#: po/tmp/evolution-event-editor.xml.h:123
+#: ui/evolution-addressbook.xml.h:22 ui/evolution-event-editor.xml.h:123
 msgid "_Tools"
 msgstr "_NarzЙdzia"
 
 #.
-#. * 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 dni"
 
-#: 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
 #, fuzzy
 msgid "Ca_lendar"
 msgstr "Terminarz"
 
-#: po/tmp/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:9
 msgid "Calendar Preferences..."
 msgstr "Ustawienia terminarza..."
 
-#: po/tmp/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:10
 msgid "Create a new appointment"
 msgstr "Tworzy nowy termin"
 
-#: po/tmp/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:11
 msgid "Create a new calendar"
 msgstr "Tworzy nowy termianrz"
 
-#: po/tmp/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:12
 msgid "Day"
 msgstr "DzieЯ"
 
-#: po/tmp/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:13
 msgid "Go back in time"
 msgstr "Przemieszcza w czasie do tyЁu"
 
-#: po/tmp/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:14
 msgid "Go forward in time"
 msgstr "Przemieszcza w czasie do przodu"
 
-#: po/tmp/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to"
 msgstr "Przejd╪"
 
-#: po/tmp/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to a specific date"
 msgstr "Przemieszcza do podanej daty"
 
-#: po/tmp/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:17
 msgid "Go to present time"
 msgstr "Przemieszcza do bie©╠cego czasu"
 
-#: po/tmp/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Miesi╠c"
 
-#: 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 "NastЙpny"
 
-#: po/tmp/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:21
 msgid "Open a calendar"
 msgstr "Otwiera terminarz"
 
-#: po/tmp/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:22
 msgid "Prev"
 msgstr "Poprzedni"
 
-#: po/tmp/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:24
 msgid "Print this calendar"
 msgstr "Drukuje terminarz"
 
-#: po/tmp/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:25
 msgid "Save calendar as something else"
 msgstr "Zapisuje terminarz w innej formie"
 
-#: po/tmp/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 day"
 msgstr "Wy╤wietla jeden dzieЯ"
 
-#: po/tmp/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:27
 msgid "Show 1 month"
 msgstr "Wy╤wietla jeden miesi╠c"
 
-#: po/tmp/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:28
 msgid "Show 1 week"
 msgstr "Wy╤wietla jeden tydzieЯ"
 
-#: po/tmp/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr "Wy╤wietla tydzieЯ roboczy"
 
-#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:414
+#: ui/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:413
 msgid "Today"
 msgstr "Dzi╤"
 
-#: po/tmp/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:31
 msgid "Week"
 msgstr "TydzieЯ"
 
-#: 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 "_Nowy"
 
-#: po/tmp/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:33
 msgid "_Open Calendar"
 msgstr "_OtwСrz terminarz"
 
-#: 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
-msgid "_Save Calendar As"
-msgstr "_Zapisz terminarz jako"
+#: ui/evolution-calendar.xml.h:35
+#, fuzzy
+msgid "_Save As..."
+msgstr "Zapisz j_ako..."
 
-#: po/tmp/evolution-contact-editor.xml.h:7
+#: ui/evolution-contact-editor.xml.h:7
 msgid "Delete this item"
 msgstr "Usuwa bie©╠cy element"
 
-#: po/tmp/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:8
 msgid "Delete..."
 msgstr "UsuЯ..."
 
-#: po/tmp/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Help"
 msgstr "Pomoc"
 
-#: 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 "Drukuje bie©╠cy element"
 
-#: 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 "Drukuj..."
 
-#: po/tmp/evolution-contact-editor.xml.h:13
-#: po/tmp/evolution-event-editor.xml.h:89
-#: po/tmp/evolution-message-composer.xml.h:18
+#: 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 "Zapisz j_ako..."
 
-#: 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 "Zapisz i zamknij"
 
-#: 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 "Zapisuje kontakt i zamyka okno dialogowe"
 
-#: 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 "Wy╤lij _list do kontaktu..."
 
-#: po/tmp/evolution-contact-editor.xml.h:19
-#: po/tmp/evolution-event-editor.xml.h:110
-#: po/tmp/evolution-message-composer.xml.h:38
-#: 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 "_Plik"
 
-#: po/tmp/evolution-contact-editor.xml.h:20
+#: ui/evolution-contact-editor.xml.h:20
 msgid "_Print..."
 msgstr "_Drukuj..."
 
-#: po/tmp/evolution-contact-editor.xml.h:21
-#: po/tmp/evolution-event-editor.xml.h:121
-#: po/tmp/evolution-message-composer.xml.h:42
+#: ui/evolution-contact-editor.xml.h:21 ui/evolution-event-editor.xml.h:121
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Save"
 msgstr "_Zapisz"
 
 #.
-#. * 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 "Informacje o aplikacji"
 
-#: po/tmp/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:7
 msgid "About..."
 msgstr "Informacje o..."
 
-#: po/tmp/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:8
 msgid "Actio_ns"
 msgstr "_Czynno╤ci"
 
-#: po/tmp/evolution-event-editor.xml.h:9
+#: ui/evolution-event-editor.xml.h:9
 msgid "C_lear"
 msgstr "Wyc_zy╤Ф"
 
-#: po/tmp/evolution-event-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:10
 msgid "C_ut"
 msgstr "_Wytnij"
 
-#: po/tmp/evolution-event-editor.xml.h:11
+#: ui/evolution-event-editor.xml.h:11
 msgid "Clear"
 msgstr "Wyczy╤Ф"
 
-#: po/tmp/evolution-event-editor.xml.h:12
+#: ui/evolution-event-editor.xml.h:12
 msgid "Clear the selection"
 msgstr "Czy╤ci zaznaczenie"
 
-#: po/tmp/evolution-event-editor.xml.h:14
+#: ui/evolution-event-editor.xml.h:14
 msgid "Close this appointment"
 msgstr "Zamyka termin"
 
-#: 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 "Kopiuj"
 
-#: po/tmp/evolution-event-editor.xml.h:16
+#: ui/evolution-event-editor.xml.h:16
 msgid "Copy the selection"
 msgstr "Kopiuje zaznaczenie"
 
-#: po/tmp/evolution-event-editor.xml.h:17
+#: ui/evolution-event-editor.xml.h:17
 msgid "Cut"
 msgstr "Wytnij"
 
-#: po/tmp/evolution-event-editor.xml.h:18
+#: ui/evolution-event-editor.xml.h:18
 msgid "Cut the selection"
 msgstr "Wycina zaznaczenie"
 
-#: po/tmp/evolution-event-editor.xml.h:21
+#: ui/evolution-event-editor.xml.h:21
 msgid "Dump XML"
 msgstr "Wypisz XML"
 
-#: po/tmp/evolution-event-editor.xml.h:22
+#: ui/evolution-event-editor.xml.h:22
 msgid "Dump the UI Xml description"
 msgstr "Wypisuje opis interfejsu u©ytkownika w XML-u"
 
-#: 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 "_Kontakt"
 
-#: 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 "_Plik..."
 
-#: po/tmp/evolution-event-editor.xml.h:49
+#: ui/evolution-event-editor.xml.h:49
 msgid "FIXME: _Font..."
 msgstr "_Czcionka..."
 
-#: 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
 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
 msgid "FIXME: _Move to Folder..."
 msgstr ""
 
-#: po/tmp/evolution-event-editor.xml.h:57
+#: ui/evolution-event-editor.xml.h:57
 msgid "FIXME: _New Appointment"
 msgstr "_Nowy termin"
 
-#: 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 "_Akapit..."
 
-#: po/tmp/evolution-event-editor.xml.h:61
+#: ui/evolution-event-editor.xml.h:61
 msgid "FIXME: _Spelling..."
 msgstr "P_isownia..."
 
-#: 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:10
+#: 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 "Znajd╪ ponownie"
 
-#: po/tmp/evolution-event-editor.xml.h:69
+#: ui/evolution-event-editor.xml.h:69
 msgid "Find _Again"
 msgstr "Znajd╪ p_onownie"
 
-#: po/tmp/evolution-event-editor.xml.h:70
+#: ui/evolution-event-editor.xml.h:70
 msgid "Go to the next item"
 msgstr "Przechodzi do nastЙpnego elementu"
 
-#: po/tmp/evolution-event-editor.xml.h:71
+#: ui/evolution-event-editor.xml.h:71
 msgid "Go to the previous item"
 msgstr "Przechodzi do poprzedniego elementu"
 
-#: po/tmp/evolution-event-editor.xml.h:72
+#: ui/evolution-event-editor.xml.h:72
 msgid "Modify the file's properties"
 msgstr "Modyfikuje wЁa╤ciwo╤ci pliku"
 
-#: po/tmp/evolution-event-editor.xml.h:73
+#: ui/evolution-event-editor.xml.h:73
 msgid "N_ext"
 msgstr "_NastЙpny"
 
-#: po/tmp/evolution-event-editor.xml.h:75
+#: ui/evolution-event-editor.xml.h:75
 msgid "Paste"
 msgstr "Wklej"
 
-#: po/tmp/evolution-event-editor.xml.h:76
+#: ui/evolution-event-editor.xml.h:76
 msgid "Paste the clipboard"
 msgstr "Wkleja zawarto╤Ф schowka"
 
-#: po/tmp/evolution-event-editor.xml.h:77
+#: ui/evolution-event-editor.xml.h:77
 msgid "Pre_vious"
 msgstr "_Poprzedni"
 
-#: po/tmp/evolution-event-editor.xml.h:78
+#: ui/evolution-event-editor.xml.h:78
 msgid "Previous"
 msgstr "Poprzedni"
 
-#: po/tmp/evolution-event-editor.xml.h:79
+#: ui/evolution-event-editor.xml.h:79
 msgid "Print S_etup..."
 msgstr "Ustawienia _wydruku..."
 
-#: po/tmp/evolution-event-editor.xml.h:80
+#: ui/evolution-event-editor.xml.h:80
 msgid "Print Setup"
 msgstr "Ustawienia wydruku"
 
-#: po/tmp/evolution-event-editor.xml.h:83
+#: ui/evolution-event-editor.xml.h:83
 msgid "Properties"
 msgstr "WЁa╤ciwo╤ci"
 
-#: po/tmp/evolution-event-editor.xml.h:84
+#: ui/evolution-event-editor.xml.h:84
 msgid "Redo"
 msgstr "PonСw"
 
-#: po/tmp/evolution-event-editor.xml.h:85
+#: ui/evolution-event-editor.xml.h:85
 msgid "Redo the undone action"
 msgstr "Ponawia cofniЙt╠ czynno╤Ф"
 
-#: po/tmp/evolution-event-editor.xml.h:86
+#: ui/evolution-event-editor.xml.h:86
 msgid "Replace"
 msgstr "Zast╠p"
 
-#: po/tmp/evolution-event-editor.xml.h:87
+#: ui/evolution-event-editor.xml.h:87
 msgid "Replace a string"
 msgstr "ZastЙpuje napis"
 
-#: 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 "Zapisuje termin i zamyka okno"
 
-#: po/tmp/evolution-event-editor.xml.h:92
-#: po/tmp/evolution-message-composer.xml.h:21
+#: ui/evolution-event-editor.xml.h:92 ui/evolution-message-composer.xml.h:24
 msgid "Save the current file"
 msgstr "Zapisuje bie©╠cy plik"
 
-#: 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 "Ponownie wyszukuje ten sam napis"
 
-#: po/tmp/evolution-event-editor.xml.h:97
+#: ui/evolution-event-editor.xml.h:97
 msgid "Search for a string"
 msgstr "Wyszukuje napis"
 
-#: po/tmp/evolution-event-editor.xml.h:99
+#: ui/evolution-event-editor.xml.h:99
 msgid "Select All"
 msgstr "Zaznacz wszystkie"
 
-#: po/tmp/evolution-event-editor.xml.h:100
+#: ui/evolution-event-editor.xml.h:100
 msgid "Select everything"
 msgstr "Zaznacza wszystko"
 
-#: 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 "Cofnij"
 
-#: po/tmp/evolution-event-editor.xml.h:103
+#: ui/evolution-event-editor.xml.h:103
 msgid "Undo the last action"
 msgstr "Cofa ostatni╠ czynno╤Ф"
 
-#: po/tmp/evolution-event-editor.xml.h:104
-#: po/tmp/evolution-message-composer.xml.h:34
+#: ui/evolution-event-editor.xml.h:104 ui/evolution-message-composer.xml.h:38
 msgid "_About..."
 msgstr "_Informacje o..."
 
-#: po/tmp/evolution-event-editor.xml.h:105
-#: po/tmp/evolution-message-composer.xml.h:35
+#: ui/evolution-event-editor.xml.h:105 ui/evolution-message-composer.xml.h:39
 msgid "_Close"
 msgstr "_Zamknij"
 
-#: po/tmp/evolution-event-editor.xml.h:106
+#: ui/evolution-event-editor.xml.h:106
 msgid "_Copy"
 msgstr "_Kopiuj"
 
-#: po/tmp/evolution-event-editor.xml.h:107
-#: po/tmp/evolution-message-composer.xml.h:36
+#: 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:37
-#: 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 "_Edycja"
 
-#: po/tmp/evolution-event-editor.xml.h:111
+#: ui/evolution-event-editor.xml.h:111
 msgid "_Find..."
 msgstr "_Znajd╪..."
 
-#: 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:39 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 "Pomo_c"
 
-#: po/tmp/evolution-event-editor.xml.h:114
+#: ui/evolution-event-editor.xml.h:114
 msgid "_Insert"
 msgstr "_Wstaw"
 
-#: po/tmp/evolution-event-editor.xml.h:115
+#: ui/evolution-event-editor.xml.h:115
 msgid "_Object"
 msgstr "_Obiekt"
 
-#: po/tmp/evolution-event-editor.xml.h:116
+#: ui/evolution-event-editor.xml.h:116
 msgid "_Paste"
 msgstr "Wk_lej"
 
-#: po/tmp/evolution-event-editor.xml.h:117
+#: ui/evolution-event-editor.xml.h:117
 msgid "_Print"
 msgstr "_Drukuj"
 
-#: po/tmp/evolution-event-editor.xml.h:118
+#: ui/evolution-event-editor.xml.h:118
 msgid "_Properties..."
 msgstr "_WЁa╤ciwo╤ci..."
 
-#: po/tmp/evolution-event-editor.xml.h:119
+#: ui/evolution-event-editor.xml.h:119
 msgid "_Redo"
 msgstr "_PonСw"
 
-#: po/tmp/evolution-event-editor.xml.h:120
+#: ui/evolution-event-editor.xml.h:120
 msgid "_Replace..."
 msgstr "_Zast╠p..."
 
-#: 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 "_Cofnij"
 
 #.
-#. * 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 "UtwСrz"
 
-#: po/tmp/evolution-mail.xml.h:7
+#: ui/evolution-mail.xml.h:7
 msgid "Compose a new message"
 msgstr "Tworzy nowy list"
 
-#: po/tmp/evolution-mail.xml.h:9
+#: ui/evolution-mail.xml.h:9
 msgid "Copy message to a new folder"
 msgstr "Kopiuje list do nowego foldera"
 
-#: 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 "_Folder"
 
-#: po/tmp/evolution-mail.xml.h:14
+#: ui/evolution-mail.xml.h:14
 msgid "Fi_lter on Sender"
 msgstr "UtwСrz filtr w oparciu o n_adawcЙ"
 
-#: po/tmp/evolution-mail.xml.h:15
+#: ui/evolution-mail.xml.h:15
 msgid "Filter on Rec_ipients"
 msgstr "UtwСrz filtr w oparciu o o_dbiorcСw"
 
-#: po/tmp/evolution-mail.xml.h:16
+#: ui/evolution-mail.xml.h:16
 msgid "Forget _Passwords"
 msgstr "Zapomnij _hasЁa"
 
-#: po/tmp/evolution-mail.xml.h:20
+#: ui/evolution-mail.xml.h:20
 msgid "Get Mail"
 msgstr "Pobierz"
 
-#: po/tmp/evolution-mail.xml.h:21
+#: ui/evolution-mail.xml.h:22
 #, fuzzy
-msgid "Mail _Filters"
+msgid "Hide _Deleted messages"
+msgstr "Drukuje list"
+
+#: ui/evolution-mail.xml.h:23
+#, fuzzy
+msgid "Hide _Read messages"
+msgstr "PrzesЁany list:\n"
+
+#: ui/evolution-mail.xml.h:24
+#, fuzzy
+msgid "Hide _Selected messages"
+msgstr "Drukuje list"
+
+#: ui/evolution-mail.xml.h:25
+#, fuzzy
+msgid "Mail _Filters..."
 msgstr "_Filtry listСw..."
 
-#: po/tmp/evolution-mail.xml.h:22
+#: ui/evolution-mail.xml.h:26
 #, fuzzy
-msgid "Manage Subscriptions"
+msgid "Manage Subscriptions..."
 msgstr "Opis:"
 
-#: po/tmp/evolution-mail.xml.h:23
+#: ui/evolution-mail.xml.h:27
 msgid "Mar_k As Read"
 msgstr "Oznacz jako p_rzeczytany"
 
-#: po/tmp/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:28
 msgid "Mark As U_nread"
 msgstr "Oznacz jako _nieprzeczytany"
 
-#: po/tmp/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:29
 msgid "Move"
 msgstr "Przenie╤"
 
-#: po/tmp/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:30
 msgid "Move message to a new folder"
 msgstr "Przenosi list do nowego foldera"
 
-#: po/tmp/evolution-mail.xml.h:27
+#: ui/evolution-mail.xml.h:31
 msgid "Previews the message to be printed"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:29
+#: ui/evolution-mail.xml.h:33
 msgid "Print Preview of message..."
 msgstr "Podgl╠d wydruku listu..."
 
-#: po/tmp/evolution-mail.xml.h:30
+#: ui/evolution-mail.xml.h:34
 msgid "Print message to the printer"
 msgstr "Drukuje list na drukarce"
 
-#: po/tmp/evolution-mail.xml.h:31
+#: ui/evolution-mail.xml.h:35
 msgid "Print message..."
 msgstr "Wydrukuj list..."
 
-#: po/tmp/evolution-mail.xml.h:35
+#: ui/evolution-mail.xml.h:39
 msgid "Reply to _All"
 msgstr "Odpowiedz _wszystkim"
 
-#: po/tmp/evolution-mail.xml.h:36
+#: ui/evolution-mail.xml.h:40
 msgid "Reply to _Sender"
 msgstr "Odpowiedz _nadawcy"
 
-#: po/tmp/evolution-mail.xml.h:39 po/tmp/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:43 ui/evolution-subscribe.xml.h:12
 msgid "Select _All"
 msgstr "Zaznacz _wszystkie"
 
-#: po/tmp/evolution-mail.xml.h:40
+#: ui/evolution-mail.xml.h:44
 msgid "Send queued mail and retrieve new mail"
 msgstr "WysyЁa listy w kolejce i pobiera nowe"
 
-#: po/tmp/evolution-mail.xml.h:41
+#: ui/evolution-mail.xml.h:45
+#, fuzzy
+msgid "Show _All messages"
+msgstr "Wy╤wietl wszystkie"
+
+#: ui/evolution-mail.xml.h:46
 msgid "Threaded Message list"
 msgstr "Wy╤wietlanie listСw z wyodrЙbnieniem w╠tkСw"
 
-#: po/tmp/evolution-mail.xml.h:42
+#: ui/evolution-mail.xml.h:47
 msgid "VFolder on Se_nder"
 msgstr "UtwСrz VFolder w oparciu o _nadawcЙ"
 
-#: po/tmp/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:48
 msgid "VFolder on _Recipients"
 msgstr "UtwСrz VFolder w oparciu o _odbiorcСw"
 
-#: po/tmp/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:49
 msgid "View Raw Message Source"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:50
 msgid "_Apply Filters"
 msgstr "_Zastosuj filtry"
 
-#: po/tmp/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:51
 msgid "_Configure Folder"
 msgstr "_Skonfiguruj folder"
 
-#: po/tmp/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:52
 msgid "_Copy to Folder..."
 msgstr "_Skopiuj do foldera..."
 
-#: po/tmp/evolution-mail.xml.h:49
+#: ui/evolution-mail.xml.h:54
 msgid "_Edit Message"
 msgstr "_Zredaguj list"
 
-#: po/tmp/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:55
 msgid "_Expunge"
 msgstr "_Wyczy╤Ф"
 
-#: po/tmp/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:56
 msgid "_Filter on Subject"
 msgstr "UtwСrz filtr w oparciu o t_emat"
 
-#: po/tmp/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:57
 msgid "_Forward"
 msgstr "_Prze╤lij"
 
-#: po/tmp/evolution-mail.xml.h:53 po/tmp/evolution-subscribe.xml.h:17
+#: ui/evolution-mail.xml.h:58 ui/evolution-subscribe.xml.h:17
 msgid "_Invert Selection"
 msgstr "_OdwrСФ zaznaczenie"
 
-#: po/tmp/evolution-mail.xml.h:54
-#, fuzzy
-msgid "_Mail Configuration"
-msgstr "Konfiguracja poczty"
+#: ui/evolution-mail.xml.h:59
+msgid "_Mail Configuration..."
+msgstr "Konfiguracja _listСw"
 
-#: po/tmp/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:60
 msgid "_Message"
 msgstr "_List"
 
-#: po/tmp/evolution-mail.xml.h:56
+#: ui/evolution-mail.xml.h:61
 msgid "_Move to Folder..."
 msgstr "P_rzenie╤ do foldera..."
 
-#: po/tmp/evolution-mail.xml.h:57
+#: ui/evolution-mail.xml.h:62
 msgid "_Open in New Window"
 msgstr "_OtwСrz w nowym oknie"
 
-#: po/tmp/evolution-mail.xml.h:58
+#: ui/evolution-mail.xml.h:63
 msgid "_Print Message"
 msgstr "_Drukuj list"
 
-#: po/tmp/evolution-mail.xml.h:59
+#: ui/evolution-mail.xml.h:64
 #, fuzzy
 msgid "_Save Message As..."
 msgstr "Zapisz jako..."
 
-#: po/tmp/evolution-mail.xml.h:60
+#: ui/evolution-mail.xml.h:65
 msgid "_Source"
 msgstr "╛_rСdЁo"
 
-#: po/tmp/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:66
 msgid "_Threaded"
 msgstr "Z _w╠tkami"
 
-#: po/tmp/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:67
 msgid "_Undelete"
 msgstr "_Cofnij usuniЙcie"
 
-#: po/tmp/evolution-mail.xml.h:63
+#: ui/evolution-mail.xml.h:68
 msgid "_VFolder on Subject"
 msgstr "UtwСrz VFolder w oparciu o _temat"
 
-#: po/tmp/evolution-mail.xml.h:64
+#: ui/evolution-mail.xml.h:69
 #, fuzzy
-msgid "_Virtual Folder Editor"
+msgid "_Virtual Folder Editor..."
 msgstr "Edytor _wirtualnych folderСw..."
 
 #.
-#. * 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 "ZaЁ╠cz"
 
-#: po/tmp/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:9
 msgid "Close the current file"
 msgstr "Zamyka bie©╠cy plik"
 
-#: po/tmp/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Encrypt this message with PGP"
+msgstr "List zaszyfrowany"
+
+#: ui/evolution-message-composer.xml.h:12
 msgid "HTML"
 msgstr "HTML"
 
-#: po/tmp/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:13
 msgid "Insert a file as text into the message"
 msgstr "Wstawia zawarto╤Ф pliku jako tekst do listu"
 
-#: po/tmp/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:14
 msgid "Insert text file..."
 msgstr "Wstaw plik tekstowy.."
 
-#: po/tmp/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:16
 msgid "Open a file"
 msgstr "Otwiera plik"
 
-#: po/tmp/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:17
+msgid "PGP Encrypt"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:18
+msgid "PGP Sign"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save As"
 msgstr "Zapisz jako"
 
-#: po/tmp/evolution-message-composer.xml.h:19
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save in _folder... (FIXME)"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "Zapisz do foldera..."
 
-#: po/tmp/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "Zapisuje list w podanym folderze"
 
-#: po/tmp/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "Wy╤lij"
 
-#: po/tmp/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr "Wy╤lij pС╪_niej"
 
-#: po/tmp/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr "Wy╤lij pС╪_niej"
 
-#: po/tmp/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:28
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send the message later"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:32
 msgid "Send the message now"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:33
 msgid "Send this message now"
 msgstr "Natychmiast wysyЁa wiadomo╤Ф"
 
-#: po/tmp/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show / hide attachments"
 msgstr "Wy╤wietla / ukrywa zaЁ╠czniki"
 
-#: po/tmp/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show _attachments"
 msgstr "Wy╤wietlanie _zaЁ╠cznikСw"
 
-#: po/tmp/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:36
 msgid "Show attachments"
 msgstr "PrzeЁ╠cza wy╤wietlanie zaЁ╠cznikСw"
 
-#: po/tmp/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Sign this message with your PGP key"
+msgstr "WysyЁanie listu bez tematu"
+
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Insert text file... (FIXME)"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Open..."
 msgstr "_OtwСrz..."
 
+#: 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 "Od╤wie© listЙ"
 
-#: po/tmp/evolution-subscribe.xml.h:10
+#: ui/evolution-subscribe.xml.h:10
 msgid "Refresh List of Folders"
 msgstr "Od╤wie©a listЙ folderСw"
 
-#: 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 "Zapisz"
 
-#: po/tmp/evolution-subscribe.xml.h:14
+#: ui/evolution-subscribe.xml.h:14
 msgid "Unsubscribe"
 msgstr "Wypisz"
 
 #.
-#. * 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 "Wy╤wietla inny folder"
 
-#: po/tmp/evolution.xml.h:7
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "Za_koЯcz"
 
-#: po/tmp/evolution.xml.h:8
+#: ui/evolution.xml.h:8
 msgid "Evolution bar _shortcut"
 msgstr ""
 
-#: po/tmp/evolution.xml.h:9
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "KoЯczy pracЙ programu"
 
-#: po/tmp/evolution.xml.h:10
+#: ui/evolution.xml.h:10
 msgid "Getting _Started"
 msgstr "_Rozpoczynanie"
 
-#: po/tmp/evolution.xml.h:11
+#: ui/evolution.xml.h:11
 msgid "Show information about Evolution"
 msgstr "Wy╤wietla informacje o Evolution"
 
-#: po/tmp/evolution.xml.h:12
+#: ui/evolution.xml.h:12
 msgid "Show the _Folder Bar"
 msgstr "Wy╤wietlanie paska f_olderСw"
 
-#: po/tmp/evolution.xml.h:13
+#: ui/evolution.xml.h:13
 msgid "Show the _Shortcut Bar"
 msgstr "Wy╤wietlanie paska _skrСtСw"
 
-#: po/tmp/evolution.xml.h:14
+#: ui/evolution.xml.h:14
 msgid "Submit _Bug Report"
 msgstr "Wy╤lij zgЁoszenie _bЁЙdu"
 
-#: po/tmp/evolution.xml.h:15
+#: ui/evolution.xml.h:15
 #, fuzzy
 msgid "Submit bug report using Bug Buddy."
 msgstr "WysyЁa zgЁoszenie bЁЙdu za pomoc╠ Bug Buddy"
 
-#: po/tmp/evolution.xml.h:16
+#: ui/evolution.xml.h:16
 msgid "Toggle whether to show the folder bar"
 msgstr "PrzeЁ╠cza wy╤wietlanie paska folderСw"
 
-#: po/tmp/evolution.xml.h:17
+#: ui/evolution.xml.h:17
 msgid "Toggle whether to show the shortcut bar"
 msgstr "PrzeЁ╠cza wy╤wietlanie paska skrСtСw"
 
-#: 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 "_Informacje o Evolution..."
 
-#: po/tmp/evolution.xml.h:22
+#: ui/evolution.xml.h:22
 msgid "_Appointment (FIXME)"
 msgstr "_Termin (FIXME)"
 
-#: po/tmp/evolution.xml.h:23
+#: ui/evolution.xml.h:23
 msgid "_Contact (FIXME)"
 msgstr "_Kontakt (FIXME)"
 
-#: po/tmp/evolution.xml.h:26
+#: ui/evolution.xml.h:26
 msgid "_Folder"
 msgstr "_Folder"
 
-#: po/tmp/evolution.xml.h:27
+#: ui/evolution.xml.h:27
 msgid "_Go to Folder..."
 msgstr "_Przejd╪ do foldera..."
 
-#: po/tmp/evolution.xml.h:29
+#: ui/evolution.xml.h:29
 msgid "_Index"
 msgstr "_Indeks"
 
-#: 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 "_Ustawienia"
 
-#: po/tmp/evolution.xml.h:33
+#: ui/evolution.xml.h:33
 msgid "_Task (FIXME)"
 msgstr "_Zadanie (FIXME)"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2470
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -6606,28 +7076,34 @@ msgstr "Czas _koЯca spotkania:"
 msgid "All Attendees"
 msgstr ""
 
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: widgets/misc/e-calendar-item.c:421
+msgid "MTWTFSS"
+msgstr ""
+
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
+#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-clipped-label.c:107
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-dateedit.c:408
+#: widgets/misc/e-dateedit.c:407
 msgid "Now"
 msgstr "Teraz"
 
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1249 widgets/misc/e-dateedit.c:1308
-#: widgets/misc/e-dateedit.c:1487
+#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
+#: widgets/misc/e-dateedit.c:1486
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1252 widgets/misc/e-dateedit.c:1311
-#: widgets/misc/e-dateedit.c:1490
+#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
+#: widgets/misc/e-dateedit.c:1489
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
@@ -6636,6 +7112,228 @@ msgstr "%I:%M %p"
 msgid "Group %i"
 msgstr "Grupa %i"
 
+#~ msgid "categories"
+#~ msgstr "kategorie"
+
+#~ msgid "Item(s) belong to these categories:"
+#~ msgstr "Elementy nale©╠ce do tych kategorii:"
+
+#~ msgid "Available Categories:"
+#~ msgstr "DostЙpne kategorie:"
+
+#~ msgid "External Directories"
+#~ msgstr "ZewnЙtrzne katalogi"
+
+#~ msgid "Port Number:"
+#~ msgstr "Numer portu:"
+
+#~ msgid "Outline:"
+#~ msgstr "Obrys:"
+
+#~ msgid "Headings:"
+#~ msgstr "NagЁСwki:"
+
+#~ msgid "Empty days:"
+#~ msgstr "Puste dni:"
+
+#~ msgid "Appointments:"
+#~ msgstr "Terminy:"
+
+#~ msgid "Highlighted day:"
+#~ msgstr "Pod╤wietlenie dnia"
+
+#~ msgid "Day numbers:"
+#~ msgstr "Numery dni:"
+
+#~ msgid "Current day's number:"
+#~ msgstr "Numer bie©╠cego dnia:"
+
+#~ msgid "may"
+#~ msgstr "maj"
+
+#~ msgid "sept"
+#~ msgstr "wrz"
+
+#~ msgid "sunday"
+#~ msgstr "niedziela"
+
+#~ msgid "monday"
+#~ msgstr "poniedziaЁek"
+
+#~ msgid "tuesday"
+#~ msgstr "wtorek"
+
+#~ msgid "tues"
+#~ msgstr "wto"
+
+#~ msgid "wednesday"
+#~ msgstr "╤roda"
+
+#~ msgid "wednes"
+#~ msgstr "╤ro"
+
+#~ msgid "thursday"
+#~ msgstr "czwartek"
+
+#~ msgid "thur"
+#~ msgstr "czw"
+
+#~ msgid "thurs"
+#~ msgstr "czw"
+
+#~ msgid "friday"
+#~ msgstr "pi╠tek"
+
+#~ msgid "saturday"
+#~ msgstr "sobota"
+
+#~ msgid "fortnight"
+#~ msgstr "dwa tygodnie"
+
+#~ msgid "min"
+#~ msgstr "min"
+
+#~ msgid "sec"
+#~ msgstr "sek"
+
+#~ msgid "tomorrow"
+#~ msgstr "jutro"
+
+#~ msgid "yesterday"
+#~ msgstr "wczoraj"
+
+#~ msgid "today"
+#~ msgstr "dzi╤"
+
+#~ msgid "last"
+#~ msgstr "ostatni"
+
+#~ msgid "this"
+#~ msgstr "ten"
+
+#~ msgid "next"
+#~ msgstr "nastЙpny"
+
+#~ msgid "first"
+#~ msgstr "pierwszy"
+
+#~ msgid "third"
+#~ msgstr "trzeci"
+
+#~ msgid "fourth"
+#~ msgstr "czwarty"
+
+#~ msgid "fifth"
+#~ msgstr "pi╠ty"
+
+#~ msgid "sixth"
+#~ msgstr "szСsty"
+
+#~ msgid "seventh"
+#~ msgstr "siСdmy"
+
+#~ msgid "eighth"
+#~ msgstr "Сsmy"
+
+#~ msgid "ninth"
+#~ msgstr "dziewi╠ty"
+
+#~ msgid "tenth"
+#~ msgstr "dziesi╠ty"
+
+#~ msgid "eleventh"
+#~ msgstr "jedenasty"
+
+#~ msgid "twelfth"
+#~ msgstr "dwunasty"
+
+#~ msgid "ago"
+#~ msgstr "temu"
+
+#~ msgid "Year:"
+#~ msgstr "Rok:"
+
+#~ msgid ""
+#~ "Please select the date you want to go to.\n"
+#~ "When you click on a day, you will be taken\n"
+#~ "to that date."
+#~ msgstr ""
+#~ "Wybierz datЙ, do ktСrej chcesz przej╤Ф.\n"
+#~ "KlikniЙcie na dniu spowoduje przej╤cie\n"
+#~ "do wybranego dnia."
+
+#~ msgid "Mail Source"
+#~ msgstr "╛rСdЁo listСw"
+
+#~ msgid ""
+#~ "Your email configuration is now complete.\n"
+#~ "Click \"Finish\" to save your new settings"
+#~ msgstr ""
+#~ "Konfiguracja poczta zostaЁa zakoЯczona.\n"
+#~ "Kliknij \"ZakoЯcz\", aby zapisaФ nowe ustawienia."
+
+#~ msgid "Send \"%s\""
+#~ msgstr "Wy╤lij \"%s\""
+
+#~ msgid "Send a message without a subject"
+#~ msgstr "Wy╤lij list bez tematu"
+
+#~ msgid "Expunge \"%s\""
+#~ msgstr "Wyczy╤Ф \"%s\""
+
+#~ msgid "Marking message %d of %d"
+#~ msgstr "Zaznaczanie listu %d z %d"
+
+#~ msgid "Forwarding messages \"%s\""
+#~ msgstr "PrzesyЁanie listСw \"%s\""
+
+#~ msgid "Forwarding a message without a subject"
+#~ msgstr "PrzesyЁanie listu bez tematu"
+
+#~ msgid "Forward message \"%s\""
+#~ msgstr "Prze╤lij list \"%s\""
+
+#~ msgid "Forward a message without a subject"
+#~ msgstr "Prze╤lij list bez tematu"
+
+#~ msgid "Loading \"%s\""
+#~ msgstr "Wczytywanie \"%s\""
+
+#~ msgid "Creating \"%s\""
+#~ msgstr "Tworzenie \"%s\""
+
+#~ msgid "Create \"%s\""
+#~ msgstr "UtwСrz \"%s\""
+
+#~ msgid "Synchronize \"%s\""
+#~ msgstr "Zsynchronizuj \"%s\""
+
+#~ msgid "Saving messages from folder \"%s\""
+#~ msgstr "Zapisywanie listСw z foldera \"%s\""
+
+#, fuzzy
+#~ msgid "Save messages from folder \"%s\""
+#~ msgstr "Zapisywanie listСw z foldera \"%s\""
+
+#~ msgid "Rebuilding message view"
+#~ msgstr "Przebudowywanie widoku listu"
+
+#~ msgid "Rebuild message view"
+#~ msgstr "Przebudowywanie widoku listu"
+
+#~ msgid "N_ew Directory Server"
+#~ msgstr "_Nowy serwer katalogowy"
+
+#~ msgid "_Actions"
+#~ msgstr "_Czynno╤ci"
+
+#~ msgid "_Save Calendar As"
+#~ msgstr "_Zapisz terminarz jako"
+
+#, fuzzy
+#~ msgid "_Mail Configuration"
+#~ msgstr "Konfiguracja poczty"
+
 #~ msgid "window2"
 #~ msgstr "okno2"
 
@@ -6655,9 +7353,6 @@ msgstr "Grupa %i"
 #~ msgid "MH folders may not be nested."
 #~ msgstr "Foldery MH nie mog╠ byФ zagnie©d©one"
 
-#~ msgid "Deleted"
-#~ msgstr "UsuniЙty"
-
 #~ msgid "Draft"
 #~ msgstr "Roboczy"
 
@@ -6679,9 +7374,6 @@ msgstr "Grupa %i"
 #~ msgid "Saving messages from \"%s\""
 #~ msgstr "Zapisywanie listСw z \"%s\""
 
-#~ msgid "_New Contact"
-#~ msgstr "_Nowy Kontakt"
-
 #~ msgid "New Ca_lendar"
 #~ msgstr "Nowy _terminarz"
 
@@ -6691,9 +7383,6 @@ msgstr "Grupa %i"
 #~ msgid "_Open"
 #~ msgstr "_OtwСrz"
 
-#~ msgid "_Mail Configuration..."
-#~ msgstr "Konfiguracja _listСw"
-
 #~ msgid "Bold"
 #~ msgstr "Pogrubienie"
 
diff --git a/po/pt.po b/po/pt.po
index 75b30d9b4a..871187a71f 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2,10 +2,11 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Tiago AntЦo <tiagoantao@bigfoot.com>, 2000.
 #
+#: camel/providers/smtp/camel-smtp-transport.c:287
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.1\n"
-"POT-Creation-Date: 2000-12-13 16:26-0600\n"
+"POT-Creation-Date: 2001-01-06 00:11+0100\n"
 "PO-Revision-Date: 2000-04-16 16:33+01:00\n"
 "Last-Translator: Tiago AntЦo <tiagoantao@bigfoot.com>\n"
 "Language-Team: Gnome Portuguese <gnome@poli.org>\n"
@@ -240,10 +241,10 @@ msgstr ""
 #: addressbook/backend/ebook/load-pine-addressbook.c:17
 #: addressbook/backend/ebook/test-client-list.c:18
 #: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:991
+#: addressbook/conduit/address-conduit.c:1083
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1136
-#: calendar/conduits/todo/todo-conduit.c:945 calendar/gui/main.c:54
+#: calendar/conduits/calendar/calendar-conduit.c:1151
+#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "NЦo se consegui inicializar Bonobo"
 
@@ -366,54 +367,37 @@ msgstr ""
 "Um excepГЦo ocorreu enquanto se tentava carregar dados no componente com "
 "PersistStream"
 
-#: addressbook/conduit/address-conduit.c:197
+#: addressbook/conduit/address-conduit.c:195
 msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:210
+#: addressbook/conduit/address-conduit.c:208
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:583
-#: calendar/conduits/calendar/calendar-conduit.c:715
-#: calendar/conduits/todo/todo-conduit.c:523
+#: addressbook/conduit/address-conduit.c:646
+#: calendar/conduits/calendar/calendar-conduit.c:730
+#: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat server"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:584
-#: calendar/conduits/calendar/calendar-conduit.c:716
-#: calendar/conduits/todo/todo-conduit.c:524
+#: addressbook/conduit/address-conduit.c:647
+#: calendar/conduits/calendar/calendar-conduit.c:731
+#: calendar/conduits/todo/todo-conduit.c:546
 #, fuzzy
 msgid "Could not start wombat"
 msgstr "NЦo se consegui inicializar Bonobo"
 
-#: addressbook/conduit/address-conduit.c:616
-#: addressbook/conduit/address-conduit.c:619
+#: addressbook/conduit/address-conduit.c:679
+#: addressbook/conduit/address-conduit.c:682
 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
 #, fuzzy
 msgid "Delete Contact?"
 msgstr "Apagar um contacto"
@@ -429,7 +413,7 @@ msgid "_Add"
 msgstr "Adicionar"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:48
+#: ui/evolution-event-editor.xml.h:108 ui/evolution-mail.xml.h:53
 #, fuzzy
 msgid "_Delete"
 msgstr "Apagar"
@@ -444,12 +428,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 "Adicionar"
 
@@ -495,7 +480,7 @@ msgid "_Mobile"
 msgstr "TelemСvel"
 
 #: 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 "EndereГo principal de correio electrСnico"
 
@@ -513,7 +498,7 @@ msgid "C_ontacts..."
 msgstr "_Contacto"
 
 #: 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 ""
 
@@ -532,7 +517,8 @@ msgid "_Address..."
 msgstr "EndereГo"
 
 #: 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 ""
 
@@ -578,147 +564,147 @@ msgid "No_tes:"
 msgstr "_Nota"
 
 #: 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 ""
 
-#: 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 "Carro"
 
-#: addressbook/contact-editor/e-contact-editor.c:1272
+#: addressbook/contact-editor/e-contact-editor.c:1280
 msgid "Company"
 msgstr "Empresa"
 
-#: 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 "Casa"
 
-#: addressbook/contact-editor/e-contact-editor.c:1274
+#: addressbook/contact-editor/e-contact-editor.c:1282
 msgid "Home 2"
 msgstr "Casa 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1275
+#: addressbook/contact-editor/e-contact-editor.c:1283
 msgid "Home Fax"
 msgstr "Fax de casa"
 
-#: addressbook/contact-editor/e-contact-editor.c:1276
+#: addressbook/contact-editor/e-contact-editor.c:1284
 msgid "ISDN"
 msgstr "RDIS"
 
-#: addressbook/contact-editor/e-contact-editor.c:1277
+#: addressbook/contact-editor/e-contact-editor.c:1285
 msgid "Mobile"
 msgstr "TelemСvel"
 
-#: 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 "Outro"
 
-#: addressbook/contact-editor/e-contact-editor.c:1279
+#: addressbook/contact-editor/e-contact-editor.c:1287
 msgid "Other Fax"
 msgstr "Outro Fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1280
+#: addressbook/contact-editor/e-contact-editor.c:1288
 msgid "Pager"
 msgstr "Bip"
 
-#: addressbook/contact-editor/e-contact-editor.c:1281
+#: addressbook/contact-editor/e-contact-editor.c:1289
 msgid "Primary"
 msgstr "PrimАrio"
 
-#: 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 "Telex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/contact-editor/e-contact-editor.c:1292
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1329
+#: addressbook/contact-editor/e-contact-editor.c:1337
 msgid "Email 2"
 msgstr "Correio electrСnico 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1330
+#: addressbook/contact-editor/e-contact-editor.c:1338
 msgid "Email 3"
 msgstr "Correio electrСnico 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
 #, fuzzy
 msgid "Address _2:"
 msgstr "EndereГo"
 
-#: 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
 #, fuzzy
 msgid "Check Address"
 msgstr "EndereГo"
 
-#: 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
 #, fuzzy
 msgid "Finland"
 msgstr "Encontrar"
 
-#: 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
 #, fuzzy
 msgid "_Address:"
 msgstr "EndereГo"
 
-#: 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 ""
 
@@ -737,10 +723,12 @@ msgid ""
 "\n"
 "Mr.\n"
 "Mrs.\n"
+"Ms.\n"
+"Miss\n"
 "Dr.\n"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:13
+#: addressbook/contact-editor/fullname-strings.h:15
 msgid ""
 "\n"
 "Sr.\n"
@@ -751,46 +739,51 @@ msgid ""
 "Esq.\n"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:21
+#: addressbook/contact-editor/fullname-strings.h:23
 #, fuzzy
 msgid "_First:"
 msgstr "_Pasta"
 
-#: addressbook/contact-editor/fullname-strings.h:22
+#: addressbook/contact-editor/fullname-strings.h:24
 msgid "_Title:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:23
+#: addressbook/contact-editor/fullname-strings.h:25
 #, fuzzy
 msgid "_Middle:"
 msgstr "_Correio"
 
-#: addressbook/contact-editor/fullname-strings.h:24
+#: addressbook/contact-editor/fullname-strings.h:26
 msgid "_Last:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:25
+#: addressbook/contact-editor/fullname-strings.h:27
 msgid "_Suffix:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:263
+#: addressbook/gui/component/addressbook.c:231
 msgid "As _Minicards"
 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/gui/component/addressbook.c:269
-#: po/tmp/evolution-addressbook.xml.h:6
+#: addressbook/gui/component/addressbook.c:237
+#: ui/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr "Como _Tabela"
 
-#: addressbook/gui/component/addressbook.c:386
+#: addressbook/gui/component/addressbook.c:374
+#, c-format
+msgid "Enter password for %s"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:402
 msgid "Unable to open addressbook"
 msgstr "ImpossМvel abrir o livro de endereГos"
 
-#: addressbook/gui/component/addressbook.c:391
+#: 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"
@@ -802,87 +795,215 @@ msgid ""
 "OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:501 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:503 mail/folder-browser.c:138
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 #, fuzzy
 msgid "Advanced..."
 msgstr "Adicionar..."
 
-#: addressbook/gui/component/addressbook.c:533
+#: addressbook/gui/component/addressbook.c:560
 #, fuzzy
 msgid "Any field contains"
 msgstr "Uma pasta contendo tarefas"
 
-#: addressbook/gui/component/addressbook.c:534
+#: addressbook/gui/component/addressbook.c:561
 msgid "Name contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:535
+#: addressbook/gui/component/addressbook.c:562
 #, fuzzy
 msgid "Email contains"
 msgstr "мcone_s pequenos"
 
-#: addressbook/gui/component/addressbook.c:621
+#: addressbook/gui/component/addressbook.c:648
 msgid "The URI that the Folder Browser will display"
 msgstr "O URI que o navegador de pastas mostrarА"
 
-#: addressbook/gui/component/e-ldap-storage.c:88
-msgid "External Directories"
+#: addressbook/gui/component/addressbook-storage.c:95
+#, fuzzy
+msgid "Other Contacts"
+msgstr "_Novo Contacto"
+
+#: addressbook/gui/component/addressbook-config.c:139
+#, fuzzy
+msgid "LDAP Server"
+msgstr "Servidor:"
+
+#: addressbook/gui/component/addressbook-config.c:141
+#, fuzzy
+msgid "File"
+msgstr "_Pasta"
+
+#: addressbook/gui/component/addressbook-config.c:144
+#, fuzzy
+msgid "Unknown addressbook type"
+msgstr "ImpossМvel abrir o livro de endereГos"
+
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "None (anonymous mode)"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/e-msg-composer-attachment.glade.h:7
-#: po/tmp/ldap-server-dialog.glade.h:6
+#: 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
 #, fuzzy
-msgid "Description:"
-msgstr "Nenhuma descriГЦo"
+msgid "Password"
+msgstr "Esquecer _Senhas"
+
+#: addressbook/gui/component/addressbook-config.c:157
+msgid "SASL"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:160
+msgid "Unknown auth type"
+msgstr ""
 
-#: po/tmp/ldap-server-dialog.glade.h:7
+#: addressbook/gui/component/addressbook-config.c:169
 #, fuzzy
-msgid "LDAP Server:"
-msgstr "Servidor:"
+msgid "Base"
+msgstr "Colar"
+
+#: addressbook/gui/component/addressbook-config.c:171
+msgid "One"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:173
+#, fuzzy
+msgid "Subtree"
+msgstr "Fontes"
+
+#: 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 "Horas"
+
+#: addressbook/gui/component/addressbook-config.c:361
+#, fuzzy
+msgid "Port:"
+msgstr "Prioridade:"
+
+#: addressbook/gui/component/addressbook-config.c:364
+msgid "Root DN:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:384
+#, fuzzy
+msgid "Search Scope:"
+msgstr "Ano"
+
+#: addressbook/gui/component/addressbook-config.c:438
+#: mail/mail-config-druid.glade.h:14 mail/mail-config-gui.c:943
+msgid "Authentication:"
+msgstr "AutenticaГЦo"
+
+#: addressbook/gui/component/addressbook-config.c:455
+#: mail/mail-config-druid.glade.h:52 mail/mail-config-gui.c:934
+msgid "Path:"
+msgstr "Caminho"
+
+#: addressbook/gui/component/addressbook-config.c:460
+msgid "Create path if it doesn't exist."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:593
+#, fuzzy
+msgid "Edit Addressbook"
+msgstr "ImpossМvel abrir o livro de endereГos"
 
-#: po/tmp/ldap-server-dialog.glade.h:8
+#: addressbook/gui/component/addressbook-config.c:595
+#, fuzzy
+msgid "Add Addressbook"
+msgstr "ImpossМvel abrir o livro de endereГos"
+
+#: 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 "Nome"
 
-#: po/tmp/ldap-server-dialog.glade.h:9
-msgid "Port Number:"
+#: addressbook/gui/component/addressbook-config.c:617
+#: composer/e-msg-composer-attachment.glade.h:7
+#, fuzzy
+msgid "Description:"
+msgstr "Nenhuma descriГЦo"
+
+#: addressbook/gui/component/addressbook-config.glade.h:7
+#, fuzzy
+msgid "Addressbook Sources"
+msgstr "Adicionar Fonte"
+
+#: 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 "Apagar"
+
+#: 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 ""
 
-#: po/tmp/ldap-server-dialog.glade.h:10
-msgid "Root DN:"
+#: addressbook/gui/component/addressbook-config.glade.h:10
+#, fuzzy
+msgid "Name"
+msgstr "Nome"
+
+#: 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
 #, fuzzy
 msgid "Find..."
 msgstr "Encontrar"
 
-#: po/tmp/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 #, fuzzy
 msgid "Message Recipients"
 msgstr "SituaГЦo das mensagens"
 
-#: po/tmp/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 #, fuzzy
 msgid "Select Names"
 msgstr "_Items seleccionados"
 
-#: po/tmp/select-names.glade.h:9
-msgid "Select name from List:"
-msgstr ""
+#: addressbook/gui/component/select-names/select-names.glade.h:9
+#, fuzzy
+msgid "Select name from:"
+msgstr "_Items seleccionados"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:147
 #: mail/mail-search-dialogue.c:104
@@ -891,129 +1012,129 @@ msgid "Search"
 msgstr "Ano"
 
 #.
-#. * 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 ""
 
-#: po/tmp/alphabet.glade.h:7
+#: addressbook/gui/widgets/alphabet.glade.h:7
 #, fuzzy
 msgid "a"
 msgstr "am"
 
-#: po/tmp/alphabet.glade.h:8
+#: addressbook/gui/widgets/alphabet.glade.h:8
 #, fuzzy
 msgid "b"
 msgstr "%b"
 
-#: po/tmp/alphabet.glade.h:9
+#: addressbook/gui/widgets/alphabet.glade.h:9
 #, fuzzy
 msgid "c"
 msgstr "Cc"
 
-#: 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
 #, fuzzy
 msgid "e"
 msgstr "Qa"
 
-#: 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 ""
 
-#: calendar/cal-util/timeutil.c:100 po/tmp/alphabet.glade.h:14
+#: addressbook/gui/widgets/alphabet.glade.h:14
 msgid "h"
 msgstr "h"
 
-#: 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
 #, fuzzy
 msgid "k"
 msgstr "Ok"
 
-#: 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
 #, fuzzy
 msgid "m"
 msgstr "am"
 
-#: 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
 #, fuzzy
 msgid "o"
 msgstr "Para"
 
-#: po/tmp/alphabet.glade.h:22
+#: addressbook/gui/widgets/alphabet.glade.h:22
 #, fuzzy
 msgid "p"
 msgstr "pm"
 
-#: 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
 #, fuzzy
 msgid "r"
 msgstr "Sx"
 
-#: 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
 #, fuzzy
 msgid "u"
 msgstr "Do"
 
-#: 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:417
-#: addressbook/gui/widgets/e-minicard.c:338
+#: addressbook/gui/widgets/e-addressbook-view.c:451
+#: addressbook/gui/widgets/e-minicard.c:374
 msgid "Save as VCard"
 msgstr "Gravar como VCard"
 
@@ -1032,210 +1153,199 @@ 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 ""
 
-#: po/tmp/e-contact-print.glade.h:7
+#: addressbook/printing/e-contact-print.glade.h:7
 msgid "8 pt. Tahoma"
 msgstr ""
 
-#: 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
 #, fuzzy
 msgid "Body"
 msgstr "Hoje"
 
-#: 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
 #, fuzzy
 msgid "Font..."
 msgstr "Imprimir..."
 
-#: po/tmp/e-contact-print.glade.h:13
+#: addressbook/printing/e-contact-print.glade.h:13
 #, fuzzy
 msgid "Fonts"
 msgstr "MЙs"
 
-#: 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
 #, fuzzy
 msgid "Format"
 msgstr "F_ormato"
 
-#: po/tmp/e-contact-print.glade.h:16
+#: addressbook/printing/e-contact-print.glade.h:16
 #, fuzzy
 msgid "Header"
 msgstr "Ano"
 
-#: 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
 #, fuzzy
 msgid "Headings"
 msgstr "CabeГalhos:"
 
-#: 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
 #, fuzzy
 msgid "Height:"
 msgstr "CabeГalhos:"
 
-#: 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
 #, fuzzy
 msgid "Margins"
 msgstr "мcones _grandes"
 
-#: 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
 #, fuzzy
 msgid "Options"
 msgstr "_OpГУes"
 
-#: po/tmp/e-contact-print.glade.h:29
+#: addressbook/printing/e-contact-print.glade.h:29
 #, fuzzy
 msgid "Orientation"
 msgstr "OrganizaГЦo"
 
-#: po/tmp/e-contact-print.glade.h:30
+#: addressbook/printing/e-contact-print.glade.h:30
 #, fuzzy
 msgid "Page"
 msgstr "Bip"
 
-#: 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
 #, fuzzy
 msgid "Paper"
 msgstr "Bip"
 
-#: po/tmp/e-contact-print.glade.h:33
+#: addressbook/printing/e-contact-print.glade.h:33
 #, fuzzy
 msgid "Paper source:"
 msgstr "Fontes de correio"
 
-#: po/tmp/e-contact-print.glade.h:34
+#: addressbook/printing/e-contact-print.glade.h:34
 #, fuzzy
 msgid "Portrait"
 msgstr "Prioridade"
 
-#: po/tmp/e-contact-print.glade.h:35
+#: addressbook/printing/e-contact-print.glade.h:35
 #, fuzzy
 msgid "Preview:"
 msgstr "Prever impressЦo"
 
-#: 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
 #, fuzzy
 msgid "Sections:"
 msgstr "Segundos"
 
-#: po/tmp/e-contact-print.glade.h:40
+#: addressbook/printing/e-contact-print.glade.h:40
 #, fuzzy
 msgid "Shading"
 msgstr "CabeГalhos:"
 
-#: po/tmp/e-contact-print.glade.h:41
+#: addressbook/printing/e-contact-print.glade.h:41
 #, fuzzy
 msgid "Size:"
 msgstr "Tamanho"
 
-#: po/tmp/e-contact-print.glade.h:42
+#: addressbook/printing/e-contact-print.glade.h:42
 #, fuzzy
 msgid "Start on a new page"
 msgstr "Enviar uma nova mensagem"
 
-#: po/tmp/e-contact-print.glade.h:43
+#: addressbook/printing/e-contact-print.glade.h:43
 #, fuzzy
 msgid "Style name:"
 msgstr "Nome completo:"
 
-#: po/tmp/e-contact-print.glade.h:44
+#: addressbook/printing/e-contact-print.glade.h:44
 #, fuzzy
 msgid "Top:"
 msgstr "Para:"
 
-#: 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 ""
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:550
-#: calendar/gui/e-week-view.c:288 calendar/gui/print.c:605
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:553
-#: calendar/gui/e-week-view.c:291 calendar/gui/print.c:604
-msgid "pm"
-msgstr "pm"
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 #, fuzzy
 msgid "Evolution Calendar Conduit"
@@ -1245,13 +1355,13 @@ msgstr "Atalho para _barra do Evolution"
 msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:671
-#: calendar/conduits/todo/todo-conduit.c:479
+#: calendar/conduits/calendar/calendar-conduit.c:686
+#: calendar/conduits/todo/todo-conduit.c:501
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:770
-#: calendar/conduits/calendar/calendar-conduit.c:773
+#: calendar/conduits/calendar/calendar-conduit.c:785
+#: calendar/conduits/calendar/calendar-conduit.c:788
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
@@ -1264,127 +1374,166 @@ msgstr "Atalho para _barra do Evolution"
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:578
-#: calendar/conduits/todo/todo-conduit.c:581
+#: calendar/conduits/todo/todo-conduit.c:600
+#: calendar/conduits/todo/todo-conduit.c:603
 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 "CabeГalhos:"
+#: 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:"
-msgstr "Dias vazios:"
+#.
+#. * 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 "Compromissos:"
+#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:7
+#, fuzzy
+msgid "Calendar Server"
+msgstr "Novo Ca_lendАrio"
 
-#: 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 "Atalho para _barra do Evolution"
 
-#: calendar/gui/calendar-commands.c:66
-msgid "Current day's number:"
+#: 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 "NЦo consigo inicializar o componente de mail do Evolution."
+
+#: 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
+#, fuzzy
+msgid "Snooze"
+msgstr "Tamanho"
+
+#. 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 "Ok"
+
+#: calendar/gui/calendar-commands.c:229
 msgid "File not found"
 msgstr "Ficheiro nЦo encontrado"
 
-#: calendar/gui/calendar-commands.c:378
+#: calendar/gui/calendar-commands.c:253
 msgid "Open calendar"
 msgstr "Abrir calendАrio"
 
-#: calendar/gui/calendar-commands.c:417
+#: calendar/gui/calendar-commands.c:295
 msgid "Save calendar"
 msgstr "Gravar calendАrio"
 
+#: 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:282
+#: 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:2498
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
 msgstr ""
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:286 calendar/gui/calendar-model.c:736
+#: 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:290 calendar/gui/calendar-model.c:739
+#: 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:344 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:347 po/tmp/task-editor-dialog.glade.h:20
+#: calendar/gui/calendar-model.c:349
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
 #, fuzzy
 msgid "Private"
 msgstr "Imprimir"
 
-#: calendar/gui/calendar-model.c:350 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:353 calendar/gui/calendar-model.c:521
+#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:523
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:441
+#: calendar/gui/calendar-model.c:443
 msgid "N"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:441
+#: calendar/gui/calendar-model.c:443
 #, fuzzy
 msgid "S"
 msgstr "Do"
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:445
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:445
 #, fuzzy
 msgid "W"
 msgstr "Qa"
 
-#: calendar/gui/calendar-model.c:515
+#: calendar/gui/calendar-model.c:517
 #, fuzzy
 msgid "Transparent"
 msgstr "Transportes"
 
-#: calendar/gui/calendar-model.c:518
+#: calendar/gui/calendar-model.c:520
 msgid "Opaque"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:744
+#: calendar/gui/calendar-model.c:746
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1393,49 +1542,70 @@ msgid ""
 msgstr ""
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:845 calendar/gui/calendar-model.c:893
+#: 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:1274 widgets/misc/e-dateedit.c:1455
+#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
 msgstr ""
 
 #. 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:863
+#: calendar/gui/calendar-model.c:865
 msgid "%I:%M:%S %p%n"
 msgstr ""
 
 #. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:866
+#: calendar/gui/calendar-model.c:868
 msgid "%H:%M:%S%n"
 msgstr ""
 
 #. 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:870
+#: calendar/gui/calendar-model.c:872
 msgid "%I:%M %p%n"
 msgstr ""
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:873
+#: calendar/gui/calendar-model.c:875
 msgid "%H:%M%n"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:993
+#: calendar/gui/calendar-model.c:995
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1033
+#: calendar/gui/calendar-model.c:1035
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1073
+#: calendar/gui/calendar-model.c:1075
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr ""
 
+#: calendar/gui/calendar-summary.c:81
+msgid "%A, %e %B %Y"
+msgstr ""
+
+#: calendar/gui/calendar-summary.c:224
+msgid "<b>Error loading calendar</b>"
+msgstr ""
+
+#: 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 "Imprimir calendАrio"
+
 #: calendar/gui/control-factory.c:125
 msgid "The URI that the calendar will display"
 msgstr "O URI que o calendАrio mostrarА"
@@ -1454,379 +1624,415 @@ msgid "No summary available."
 msgstr "Nenhum sumАrio"
 
 #.
-#. * 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
 #, fuzzy
 msgid "Close"
 msgstr "Cores"
 
-#: po/tmp/alarm-notify.glade.h:7
+#: calendar/gui/dialogs/alarm-notify.glade.h:7
 #, fuzzy
 msgid "Edit appointment"
 msgstr "_Editar Compromisso"
 
-#: calendar/gui/gnome-cal.c:1466 po/tmp/alarm-notify.glade.h:8
-#, fuzzy
-msgid "Snooze"
-msgstr "Tamanho"
-
-#: 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
 #, fuzzy
 msgid "05 minutes"
 msgstr "Minutos"
 
-#: po/tmp/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 #, fuzzy
 msgid "10 minutes"
 msgstr "Minutos"
 
-#: po/tmp/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 #, fuzzy
 msgid "12 hour (am/pm)"
 msgstr "12 horas (AM/PM)"
 
-#: po/tmp/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 #, fuzzy
 msgid "15 minutes"
 msgstr "Minutos"
 
-#: po/tmp/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 #, fuzzy
 msgid "24 hour"
 msgstr "24 horas"
 
-#: po/tmp/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 #, fuzzy
 msgid "30 minutes"
 msgstr "Minutos"
 
-#: po/tmp/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #, fuzzy
 msgid "60 minutes"
 msgstr "Minutos"
 
-#: 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
 #, fuzzy
 msgid "Audio Alarms"
 msgstr "Alarmes"
 
-#: 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
 #, fuzzy
 msgid "Calendar"
 msgstr "Novo Ca_lendАrio"
 
-#: po/tmp/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #, fuzzy
 msgid "Calendar Preferences"
 msgstr "PreferЙncias"
 
-#: po/tmp/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Colors"
 msgstr "Cores"
 
-#: 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 "Sex"
 
-#: 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
 #, fuzzy
 msgid "Friday"
 msgstr "Sex"
 
-#: 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 "Seg"
 
-#: 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 "Segunda-feira"
 
-#: 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 "Prioridade"
 
-#: 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 "SАb"
 
-#: 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
 #, fuzzy
 msgid "Saturday"
 msgstr "Domingo"
 
-#: 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
 #, fuzzy
 msgid "Show appointment end times"
 msgstr "Compromisso - %s"
 
-#: po/tmp/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #, fuzzy
 msgid "Show week numbers"
 msgstr "Mostrar 1 semana"
 
-#: 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 "Dom"
 
-#: 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 "Domingo"
 
-#: po/tmp/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 #, fuzzy
 msgid "TaskPad"
 msgstr "_Tarefa"
 
-#: 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 "Qui"
 
-#: 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
 #, fuzzy
 msgid "Thursday"
 msgstr "Hoje"
 
-#: 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 "Ter"
 
-#: 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
 #, fuzzy
 msgid "Tuesday"
 msgstr "Hoje"
 
-#: po/tmp/cal-prefs-dialog.glade.h:58
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 #, fuzzy
 msgid "Visual Alarms"
 msgstr "Alarmes"
 
-#: 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 "Qua"
 
-#: 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
 #, fuzzy
 msgid "Work week"
 msgstr "Semana"
 
-#: 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
 #, fuzzy
 msgid "seconds."
 msgstr " segundos"
 
+#: calendar/gui/dialogs/delete-comp.c:62
+#, c-format
+msgid "Are you sure you want to delete the appointment `%s'?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:65
+msgid "Are you sure you want to delete this untitled appointment?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:71
+#, c-format
+msgid "Are you sure you want to delete the task `%s'?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:74
+msgid "Are you sure you want to delete this untitled task?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:80
+#, c-format
+msgid "Are you sure you want to delete the journal entry `%s'?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:83
+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
-#: widgets/misc/e-dateedit.c:422 widgets/misc/e-dateedit.c:1331
-#: widgets/misc/e-dateedit.c:1446
+#: 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 "Nenhuma"
 
-#: po/tmp/task-editor-dialog.glade.h:18
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
 #, fuzzy
 msgid "Normal"
 msgstr "F_ormato"
 
-#: po/tmp/task-editor-dialog.glade.h:19
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
 #, fuzzy
 msgid "Not Started"
 msgstr "_ComeГando"
 
-#: po/tmp/task-editor-dialog.glade.h:22
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
 #, fuzzy
 msgid "S_ummary"
 msgstr "SumАrio"
 
-#: 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
 #, fuzzy
 msgid "Task"
 msgstr "_Tarefa"
 
-#: po/tmp/task-editor-dialog.glade.h:25
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
 msgid "URL:"
 msgstr ""
 
-#: po/tmp/task-editor-dialog.glade.h:26
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
 #, fuzzy
 msgid "_Contacts..."
 msgstr "_Contacto"
 
-#: 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
 #, fuzzy
 msgid "_Priority:"
 msgstr "Prioridade:"
 
-#: 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 ""
 
@@ -1834,26 +2040,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 "Nenhum sumАrio"
 
-#: 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 "Compromisso - %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 "Tarefa - %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
 #, fuzzy, c-format
 msgid "Journal entry - %s"
 msgstr "_Entrada diАria?"
 
-#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3277
+#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3250
 msgid "Do you want to save changes?"
 msgstr ""
 
@@ -1874,14 +2080,6 @@ msgstr ""
 msgid "Mark the task complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:342 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:479 mail/mail-view.c:165
-#: 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 "Apagar"
-
 #: calendar/gui/e-calendar-table.c:343
 #, fuzzy
 msgid "Delete the task"
@@ -1894,50 +2092,62 @@ msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1208
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1211
 #: calendar/gui/e-week-view-main-item.c:325
 msgid "%A %d %B"
 msgstr ""
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1222
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1225
 #: calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr ""
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1235
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1238
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2941 calendar/gui/e-day-view.c:2948
-#: calendar/gui/e-day-view.c:2957 calendar/gui/e-week-view.c:3165
-#: calendar/gui/e-week-view.c:3172 calendar/gui/e-week-view.c:3181
+#. 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:610
+msgid "am"
+msgstr "am"
+
+#. 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:609
+msgid "pm"
+msgstr "pm"
+
+#: calendar/gui/e-day-view.c:2948 calendar/gui/e-day-view.c:2955
+#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3169
+#: calendar/gui/e-week-view.c:3176 calendar/gui/e-week-view.c:3185
 msgid "New appointment..."
 msgstr "Novo compromisso"
 
-#: calendar/gui/e-day-view.c:2945 calendar/gui/e-day-view.c:2952
-#: calendar/gui/e-week-view.c:3169 calendar/gui/e-week-view.c:3176
+#: calendar/gui/e-day-view.c:2952 calendar/gui/e-day-view.c:2959
+#: calendar/gui/e-week-view.c:3173 calendar/gui/e-week-view.c:3180
 msgid "Edit this appointment..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2946 calendar/gui/e-week-view.c:3170
-#: po/tmp/evolution-event-editor.xml.h:20
+#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3174
+#: ui/evolution-event-editor.xml.h:20
 msgid "Delete this appointment"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3177
+#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3181
 msgid "Make this appointment movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2954 calendar/gui/e-week-view.c:3178
+#: calendar/gui/e-day-view.c:2961 calendar/gui/e-week-view.c:3182
 msgid "Delete this occurrence"
 msgstr "Apagar esta ocurrЙncia"
 
-#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3179
+#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3183
 msgid "Delete all occurrences"
 msgstr "Apagar todas as ocurrЙncias"
 
@@ -1949,694 +2159,495 @@ msgid "%d %B"
 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/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
 #, fuzzy
 msgid "Appointment Basics"
 msgstr "Compromissos:"
 
-#: 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 "DiasRascunhos"
 
-#: 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
 #, fuzzy
 msgid "Exceptions"
 msgstr "_AcГУes"
 
-#: po/tmp/event-editor-dialog.glade.h:16
+#: calendar/gui/event-editor-dialog.glade.h:16
 msgid "Hours"
 msgstr "Horas"
 
-#: po/tmp/event-editor-dialog.glade.h:17
+#: calendar/gui/event-editor-dialog.glade.h:17
 #, fuzzy
 msgid "Mail _to:"
 msgstr "atalhos principais"
 
-#: po/tmp/event-editor-dialog.glade.h:18
+#: calendar/gui/event-editor-dialog.glade.h:18
 msgid "Minutes"
 msgstr "Minutos"
 
-#: po/tmp/event-editor-dialog.glade.h:19
+#: calendar/gui/event-editor-dialog.glade.h:19
 #, fuzzy
 msgid "Modify"
 msgstr "Segunda-feira"
 
-#: 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
 #, fuzzy
 msgid "Preview"
 msgstr "Prever impressЦo"
 
-#: po/tmp/event-editor-dialog.glade.h:22
+#: calendar/gui/event-editor-dialog.glade.h:22
 #, fuzzy
 msgid "Pri_vate"
 msgstr "Activar"
 
-#: 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
 #, fuzzy
 msgid "Su_mmary:"
 msgstr "SumАrio:"
 
-#: 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
 #, fuzzy
 msgid "_End time:"
 msgstr "Hora de _fim de _encontro"
 
-#: po/tmp/event-editor-dialog.glade.h:34
+#: calendar/gui/event-editor-dialog.glade.h:34
 msgid "_Mail"
 msgstr "_Correio"
 
-#: 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
 #, fuzzy
 msgid "_Start time:"
 msgstr "Hora de Мn_icio de encontro"
 
-#: 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
 #, fuzzy
 msgid "day(s)"
 msgstr "DiasRascunhos"
 
-#: 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 ""
 
-#: po/tmp/event-editor-dialog.glade.h:44
+#: calendar/gui/event-editor-dialog.glade.h:44
 #, fuzzy
 msgid "month(s)"
 msgstr "MЙs"
 
-#: 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
 #, fuzzy
 msgid "week(s)"
 msgstr "Semanas"
 
-#: 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 "_Editar Compromisso"
 
-#: calendar/gui/event-editor.c:407
+#: calendar/gui/event-editor.c:403
 #, fuzzy
 msgid "on"
 msgstr "Seg"
 
-#: calendar/gui/event-editor.c:432 calendar/gui/getdate.y:424
-#: filter/filter-datespec.c:65
+#: calendar/gui/event-editor.c:428 filter/filter-datespec.c:65
 #, fuzzy
 msgid "day"
 msgstr "Hoje"
 
-#: calendar/gui/event-editor.c:559
+#: calendar/gui/event-editor.c:555
 #, fuzzy
 msgid "on the"
 msgstr "MЙs"
 
-#: calendar/gui/event-editor.c:566
+#: calendar/gui/event-editor.c:562
 #, fuzzy
 msgid "th"
 msgstr "h"
 
-#: calendar/gui/event-editor.c:722
+#: calendar/gui/event-editor.c:716
 #, fuzzy
 msgid "occurrences"
 msgstr "Apagar todas as ocurrЙncias"
 
-#: calendar/gui/event-editor.c:839
+#: calendar/gui/event-editor.c:833
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor.c:3079 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/getdate.y:391
-msgid "january"
+#: calendar/gui/gnome-cal.c:676
+#, c-format
+msgid "Could not load the calendar in `%s'"
 msgstr ""
 
-#: calendar/gui/getdate.y:392
-msgid "february"
-msgstr ""
+#: calendar/gui/gnome-cal.c:687
+#, fuzzy, c-format
+msgid "Could not create a calendar in `%s'"
+msgstr "Criar um novo calendАrio"
 
-#: calendar/gui/getdate.y:393
-msgid "march"
+#: calendar/gui/gnome-cal.c:698
+#, c-format
+msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/getdate.y:394
+#.
+#. * 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
 #, fuzzy
-msgid "april"
+msgid "April"
 msgstr "_Correio"
 
-#: calendar/gui/getdate.y:395
-#, fuzzy
-msgid "may"
-msgstr "Dia"
-
-#: calendar/gui/getdate.y:396
-msgid "june"
-msgstr ""
-
-#: calendar/gui/getdate.y:397
-msgid "july"
-msgstr ""
-
-#: calendar/gui/getdate.y:398
-msgid "august"
+#: calendar/gui/goto-dialog.glade.h:7
+msgid "August"
 msgstr ""
 
-#: calendar/gui/getdate.y:399
-msgid "september"
+#: calendar/gui/goto-dialog.glade.h:8
+msgid "December"
 msgstr ""
 
-#: calendar/gui/getdate.y:400
-msgid "sept"
+#: calendar/gui/goto-dialog.glade.h:9
+msgid "February"
 msgstr ""
 
-#: calendar/gui/getdate.y:401
-msgid "october"
+#: calendar/gui/goto-dialog.glade.h:10
+msgid "Go To Date"
 msgstr ""
 
-#: calendar/gui/getdate.y:402
-msgid "november"
-msgstr ""
-
-#: calendar/gui/getdate.y:403
-msgid "december"
-msgstr ""
-
-#: calendar/gui/getdate.y:404
+#: calendar/gui/goto-dialog.glade.h:11
 #, fuzzy
-msgid "sunday"
-msgstr "Domingo"
-
-#: calendar/gui/getdate.y:405
-#, fuzzy
-msgid "monday"
-msgstr "Segunda-feira"
-
-#: calendar/gui/getdate.y:406
-#, fuzzy
-msgid "tuesday"
-msgstr "Domingo"
-
-#: calendar/gui/getdate.y:407
-msgid "tues"
-msgstr ""
-
-#: calendar/gui/getdate.y:408
-msgid "wednesday"
-msgstr ""
+msgid "Go To Today"
+msgstr "Hoje"
 
-#: calendar/gui/getdate.y:409
-msgid "wednes"
+#: calendar/gui/goto-dialog.glade.h:12
+msgid "January"
 msgstr ""
 
-#: calendar/gui/getdate.y:410
-msgid "thursday"
+#: calendar/gui/goto-dialog.glade.h:13
+msgid "July"
 msgstr ""
 
-#: calendar/gui/getdate.y:411
-#, fuzzy
-msgid "thur"
-msgstr "Outro"
-
-#: calendar/gui/getdate.y:412
-#, fuzzy
-msgid "thurs"
-msgstr "Outro"
-
-#: calendar/gui/getdate.y:413
-#, fuzzy
-msgid "friday"
-msgstr "PrimАrio"
-
-#: calendar/gui/getdate.y:414
-msgid "saturday"
+#: calendar/gui/goto-dialog.glade.h:14
+msgid "June"
 msgstr ""
 
-#: calendar/gui/getdate.y:420 filter/filter-datespec.c:62
+#: calendar/gui/goto-dialog.glade.h:15
 #, fuzzy
-msgid "year"
+msgid "March"
 msgstr "Ano"
 
-#: calendar/gui/getdate.y:421 filter/filter-datespec.c:63
+#: calendar/gui/goto-dialog.glade.h:16
 #, fuzzy
-msgid "month"
-msgstr "MЙs"
-
-#: calendar/gui/getdate.y:422
-msgid "fortnight"
-msgstr ""
-
-#: calendar/gui/getdate.y:423 filter/filter-datespec.c:64
-#, fuzzy
-msgid "week"
-msgstr "Semana"
-
-#: calendar/gui/getdate.y:425 filter/filter-datespec.c:66
-#, fuzzy
-msgid "hour"
-msgstr "Hora"
-
-#: calendar/gui/getdate.y:426 filter/filter-datespec.c:67
-#, fuzzy
-msgid "minute"
-msgstr "Minuto"
-
-#: calendar/gui/getdate.y:427
-msgid "min"
-msgstr ""
-
-#: calendar/gui/getdate.y:428 filter/filter-datespec.c:68
-#, fuzzy
-msgid "second"
-msgstr " segundos"
-
-#: calendar/gui/getdate.y:429
-msgid "sec"
-msgstr ""
-
-#: calendar/gui/getdate.y:435
-msgid "tomorrow"
-msgstr ""
-
-#: calendar/gui/getdate.y:436
-msgid "yesterday"
-msgstr ""
-
-#: calendar/gui/getdate.y:437
-#, fuzzy
-msgid "today"
-msgstr "Hoje"
-
-#: calendar/gui/getdate.y:438 filter/filter-datespec.c:533
-#: filter/filter-datespec.c:693
-msgid "now"
-msgstr ""
-
-#: calendar/gui/getdate.y:439
-#, fuzzy
-msgid "last"
-msgstr "Colar"
-
-#: calendar/gui/getdate.y:440
-msgid "this"
-msgstr ""
-
-#: calendar/gui/getdate.y:441
-#, fuzzy
-msgid "next"
-msgstr "PrС_ximo"
+msgid "May"
+msgstr "Segunda-feira"
 
-#: calendar/gui/getdate.y:442
-msgid "first"
+#: calendar/gui/goto-dialog.glade.h:17
+msgid "November"
 msgstr ""
 
-#. { N_("second"),		tUNUMBER,	2 },
-#: calendar/gui/getdate.y:444
+#: calendar/gui/goto-dialog.glade.h:18
 #, fuzzy
-msgid "third"
+msgid "October"
 msgstr "Outro"
 
-#: calendar/gui/getdate.y:445
-#, fuzzy
-msgid "fourth"
-msgstr "Hora"
-
-#: calendar/gui/getdate.y:446
-msgid "fifth"
-msgstr ""
-
-#: calendar/gui/getdate.y:447
-msgid "sixth"
-msgstr ""
-
-#: calendar/gui/getdate.y:448
-msgid "seventh"
+#: calendar/gui/goto-dialog.glade.h:19
+msgid "September"
 msgstr ""
 
-#: calendar/gui/getdate.y:449
-msgid "eighth"
-msgstr ""
-
-#: calendar/gui/getdate.y:450
+#: calendar/gui/main.c:49
 #, fuzzy
-msgid "ninth"
-msgstr "Imprimir"
-
-#: calendar/gui/getdate.y:451
-#, fuzzy
-msgid "tenth"
-msgstr "Enviar"
-
-#: calendar/gui/getdate.y:452
-msgid "eleventh"
-msgstr ""
-
-#: calendar/gui/getdate.y:453
-msgid "twelfth"
-msgstr ""
-
-#: calendar/gui/getdate.y:454
-msgid "ago"
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:718 calendar/gui/gnome-cal.c:1474
-#: calendar/gui/gnome-cal.c:1530
-msgid "Reminder of your appointment at "
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:1152
-#, c-format
-msgid "Could not load the calendar in `%s'"
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:1163
-#, fuzzy, c-format
-msgid "Could not create a calendar in `%s'"
-msgstr "Criar um novo calendАrio"
-
-#: calendar/gui/gnome-cal.c:1174
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr ""
-
-#. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1479 calendar/gui/gnome-cal.c:1534
-#: mail/mail-search-dialogue.c:104
-msgid "Ok"
-msgstr "Ok"
-
-#: calendar/gui/goto.c:82
-msgid "Year:"
-msgstr "Ano:"
-
-#: calendar/gui/goto.c:270
-msgid "Go to date"
-msgstr ""
-
-#. Instructions
-#: calendar/gui/goto.c:281
-msgid ""
-"Please select the date you want to go to.\n"
-"When you click on a day, you will be taken\n"
-"to that date."
-msgstr ""
-
-#: calendar/gui/goto.c:318
-msgid "Go to today"
-msgstr ""
+msgid "Could not initialize GNOME"
+msgstr "NЦo se consegui inicializar Bonobo"
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "1st"
 msgstr ""
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "2nd"
 msgstr ""
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "3rd"
 msgstr ""
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "4th"
 msgstr ""
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "5th"
 msgstr ""
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "6th"
 msgstr ""
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "7th"
 msgstr ""
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "8th"
 msgstr ""
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "9th"
 msgstr ""
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "10th"
 msgstr ""
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "11th"
 msgstr ""
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "12th"
 msgstr ""
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "13th"
 msgstr ""
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "14th"
 msgstr ""
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "15th"
 msgstr ""
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "16th"
 msgstr ""
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "17th"
 msgstr ""
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "18th"
 msgstr ""
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "19th"
 msgstr ""
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "20th"
 msgstr ""
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "21st"
 msgstr ""
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "22nd"
 msgstr ""
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "23rd"
 msgstr ""
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "24th"
 msgstr ""
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "25th"
 msgstr ""
 
-#: 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 "Do"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Mo"
 msgstr "Sg"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Tu"
 msgstr "Te"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "We"
 msgstr "Qa"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Th"
 msgstr "Qi"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Fr"
 msgstr "Sx"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Sa"
 msgstr "SА"
 
-#: calendar/gui/print.c:936
+#: calendar/gui/print.c:941
 #, fuzzy
 msgid "Tasks"
 msgstr "_Tarefa"
 
 #. Day
-#: calendar/gui/print.c:1066
+#: calendar/gui/print.c:1071
 msgid "Current day (%a %b %d %Y)"
 msgstr ""
 
-#: 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 ""
 
-#: calendar/gui/print.c:1081
+#: calendar/gui/print.c:1086
 msgid "%a %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1092
+#: calendar/gui/print.c:1097
 #, fuzzy, c-format
 msgid "Current week (%s - %s)"
 msgstr "Ano corrente (%Y)"
 
 #. Month
-#: calendar/gui/print.c:1100
+#: calendar/gui/print.c:1105
 #, fuzzy
 msgid "Current month (%b %Y)"
 msgstr "MЙs corrente (%a %Y)"
 
 #. Year
-#: calendar/gui/print.c:1107
+#: calendar/gui/print.c:1112
 msgid "Current year (%Y)"
 msgstr "Ano corrente (%Y)"
 
-#: calendar/gui/print.c:1144
+#: calendar/gui/print.c:1149
 msgid "Print Calendar"
 msgstr "Imprimir calendАrio"
 
-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:962
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1001
 msgid "Print Preview"
 msgstr "Prever impressЦo"
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: calendar/gui/weekday-picker.c:351 widgets/misc/e-calendar-item.c:416
-msgid "MTWTFSS"
-msgstr ""
-
-#: calendar/gui/weekday-picker.c:353 calendar/gui/weekday-picker.c:443
+#: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
 msgid "SMTWTFS"
 msgstr ""
 
@@ -2726,60 +2737,61 @@ msgstr ""
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:182
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:227
+#: camel/camel-remote-store.c:243
+#: camel/providers/smtp/camel-smtp-transport.c:162
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:228
+#: camel/camel-remote-store.c:244
 msgid "(unknown host)"
 msgstr ""
 
-#: camel/camel-remote-store.c:452
+#: camel/camel-remote-store.c:483
 msgid "Server disconnected."
 msgstr ""
 
-#: camel/camel-service.c:120
+#: camel/camel-service.c:138
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:129
+#: camel/camel-service.c:147
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:138
+#: camel/camel-service.c:156
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:488
+#: camel/camel-service.c:526
 #, c-format
 msgid "No such host %s."
 msgstr ""
 
-#: camel/camel-service.c:491
+#: camel/camel-service.c:529
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr ""
 
-#: camel/camel-session.c:272
+#: camel/camel-session.c:297
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:360
+#: camel/camel-session.c:388
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2801,51 +2813,51 @@ msgstr ""
 msgid "Port number in URL `%s' is non-numeric"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-auth.c:127
+#: camel/providers/imap/camel-imap-auth.c:133
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
 "%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-auth.c:198
+#: camel/providers/imap/camel-imap-auth.c:205
 msgid "Bad authentication response from server."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:216
+#: camel/providers/imap/camel-imap-command.c:231
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:224
+#: camel/providers/imap/camel-imap-command.c:239
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:240 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:271
+#: camel/providers/imap/camel-imap-command.c:286
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:407
+#: camel/providers/imap/camel-imap-command.c:422
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:443
+#: camel/providers/imap/camel-imap-command.c:458
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:216
+#: 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:586
+#: camel/providers/imap/camel-imap-folder.c:532
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -2857,32 +2869,25 @@ msgstr ""
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:234
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:148
-#, fuzzy
-msgid "Password"
-msgstr "Esquecer _Senhas"
-
-#: camel/providers/imap/camel-imap-store.c:236
+#: camel/providers/imap/camel-imap-store.c:248
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:245
+#: camel/providers/imap/camel-imap-store.c:257
 msgid "Kerberos 4"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:247
+#: camel/providers/imap/camel-imap-store.c:259
 msgid ""
 "This option will connect to the IMAP server using Kerberos 4 authentication."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:333
+#: camel/providers/imap/camel-imap-store.c:345
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:359
+#: camel/providers/imap/camel-imap-store.c:373
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2890,7 +2895,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:539
+#: camel/providers/imap/camel-imap-store.c:564
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
@@ -2975,12 +2980,12 @@ msgid "Cannot append message to maildir folder: %s: %s"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:204
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-maildir-folder.c:207
+#: camel/providers/local/camel-maildir-folder.c:215
+#: camel/providers/local/camel-mbox-folder.c:317
 #: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:189
-#: camel/providers/local/camel-mh-folder.c:197
+#: camel/providers/local/camel-mh-folder.c:192
+#: camel/providers/local/camel-mh-folder.c:200
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -2988,14 +2993,14 @@ msgid ""
 msgstr ""
 
 #: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-mbox-folder.c:317
 #: camel/providers/local/camel-mh-folder.c:183
 #, fuzzy
 msgid "No such message"
 msgstr "Enviar a mensagem"
 
-#: camel/providers/local/camel-maildir-folder.c:213
-#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-maildir-folder.c:216
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "Invalid message contents"
 msgstr ""
 
@@ -3038,30 +3043,30 @@ msgstr ""
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:195
+#: camel/providers/local/camel-mbox-folder.c:201
 #, fuzzy, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "NЦo consigo abrir a localizaГЦo: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:251
+#: camel/providers/local/camel-mbox-folder.c:257
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:327
-#: camel/providers/local/camel-mbox-folder.c:357
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:333
+#: camel/providers/local/camel-mbox-folder.c:365
+#: camel/providers/local/camel-mbox-folder.c:378
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
 "  %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:358
+#: camel/providers/local/camel-mbox-folder.c:366
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:369
+#: camel/providers/local/camel-mbox-folder.c:379
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -3108,56 +3113,56 @@ msgstr ""
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:341
+#: camel/providers/local/camel-mbox-summary.c:343
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:475
-#: camel/providers/local/camel-mbox-summary.c:661
+#: camel/providers/local/camel-mbox-summary.c:477
+#: camel/providers/local/camel-mbox-summary.c:668
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:491
+#: camel/providers/local/camel-mbox-summary.c:493
 #, fuzzy, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "NЦo consigo abrir a localizaГЦo: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:512
-#: camel/providers/local/camel-mbox-summary.c:520
-#: camel/providers/local/camel-mbox-summary.c:691
-#: camel/providers/local/camel-mbox-summary.c:699
+#: camel/providers/local/camel-mbox-summary.c:514
+#: camel/providers/local/camel-mbox-summary.c:522
+#: camel/providers/local/camel-mbox-summary.c:701
+#: camel/providers/local/camel-mbox-summary.c:709
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:562
+#: camel/providers/local/camel-mbox-summary.c:565
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:579
+#: camel/providers/local/camel-mbox-summary.c:582
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:595
-#: camel/providers/local/camel-mbox-summary.c:748
+#: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-mbox-summary.c:759
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:604
+#: camel/providers/local/camel-mbox-summary.c:609
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:615
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:817
+#: camel/providers/local/camel-mbox-summary.c:830
 #, c-format
 msgid "Unknown error: %s"
 msgstr ""
@@ -3190,7 +3195,7 @@ msgstr ""
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:144
+#: camel/providers/nntp/camel-nntp-folder.c:115
 #, fuzzy, c-format
 msgid "Message %s not found."
 msgstr "Ficheiro nЦo encontrado"
@@ -3240,16 +3245,16 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:179
+#: camel/providers/pop3/camel-pop3-folder.c:180
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:273
+#: camel/providers/pop3/camel-pop3-folder.c:274
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:288
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr ""
@@ -3287,47 +3292,48 @@ msgstr ""
 msgid "Could not authenticate to KPOP server: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:335
+#: camel/providers/pop3/camel-pop3-store.c:337
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:389
+#: camel/providers/pop3/camel-pop3-store.c:391
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:408
+#: camel/providers/pop3/camel-pop3-store.c:410
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending username: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:411
-#: camel/providers/pop3/camel-pop3-store.c:448
+#: camel/providers/pop3/camel-pop3-store.c:413
+#: camel/providers/pop3/camel-pop3-store.c:450
 msgid "(Unknown)"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:438
+#: camel/providers/pop3/camel-pop3-store.c:440
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:446
+#: camel/providers/pop3/camel-pop3-store.c:448
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:555
+#: camel/providers/pop3/camel-pop3-store.c:557
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
+#: mail/mail-config-druid.glade.h:63
 #, fuzzy
 msgid "Sendmail"
 msgstr "Enviar"
@@ -3376,8 +3382,133 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
+#: 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
+#, c-format
+msgid "Welcome response error: %s: possibly non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:281
+#, fuzzy
+msgid "No authentication required"
+msgstr "AutenticaГЦo"
+
+#: camel/providers/smtp/camel-smtp-transport.c:283
+msgid ""
+"This option will connect to the SMTP server without using any kind of "
+"authentication. This should be fine for connecting to most SMTP servers."
+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 ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:294
+msgid ""
+"This option will connect to the SMTP server using CRAM-MD5 authentication."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:332
+#, c-format
+msgid "SMTP server %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:334
+#, c-format
+msgid "SMTP mail delivery via %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:359
+msgid "Cannot send message: sender address not defined."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:366
+msgid "Cannot send message: sender address not valid."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:380
+msgid "Cannot send message: no recipients defined."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:474
+#, c-format
+msgid "HELO request timed out: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:490
+#, c-format
+msgid "HELO response error: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:529
+#, c-format
+msgid "MAIL FROM request timed out: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:545
+#, c-format
+msgid "MAIL FROM response error: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:570
+#, c-format
+msgid "RCPT TO request timed out: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
+#, c-format
+msgid "RCPT TO response error: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:617
+#, c-format
+msgid "DATA request timed out: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:633
+#, c-format
+msgid "DATA response error: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:648
+#: camel/providers/smtp/camel-smtp-transport.c:666
+#, c-format
+msgid "DATA send timed out: message termination: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:682
+#, c-format
+msgid "DATA response error: message termination: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:706
+#, c-format
+msgid "RSET request timed out: %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:722
+#, c-format
+msgid "RSET response error: %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:745
+#, c-format
+msgid "QUIT request timed out: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#, c-format
+msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
 #: camel/providers/vee/camel-vee-provider.c:30
@@ -3413,87 +3544,87 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:144
+#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:155
 #, fuzzy
 msgid "attachment"
 msgstr "Anexo"
 
-#: composer/e-msg-composer-attachment-bar.c:417
-#: 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 "Anexar um ficheiro"
 
-#: composer/e-msg-composer-attachment-bar.c:464 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 "Remover"
 
-#: composer/e-msg-composer-attachment-bar.c:465
+#: composer/e-msg-composer-attachment-bar.c:461
 msgid "Remove selected items from the attachment list"
 msgstr "Remover items seleccionados da lista de anexos"
 
-#: composer/e-msg-composer-attachment-bar.c:496
+#: composer/e-msg-composer-attachment-bar.c:492
 msgid "Add attachment..."
 msgstr "Adicionar anexo..."
 
-#: composer/e-msg-composer-attachment-bar.c:497
+#: composer/e-msg-composer-attachment-bar.c:493
 msgid "Attach a file to the message"
 msgstr "Anexar um ficheiro Ю mensagem"
 
 #.
-#. * 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
 #, fuzzy
 msgid "Attachment properties"
 msgstr "Propriedades do alarme"
 
-#: po/tmp/e-msg-composer-attachment.glade.h:8
+#: composer/e-msg-composer-attachment.glade.h:8
 #, fuzzy
 msgid "File name:"
 msgstr "Nome completo:"
 
-#: po/tmp/e-msg-composer-attachment.glade.h:9
+#: composer/e-msg-composer-attachment.glade.h:9
 msgid "MIME type:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:290
-#: mail/mail-format.c:621
+#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:303
+#: mail/mail-format.c:626
 #, fuzzy
 msgid "From:"
 msgstr "De"
 
-#: composer/e-msg-composer-hdrs.c:238
+#: composer/e-msg-composer-hdrs.c:247
 msgid "Click here for the address book"
 msgstr "Pressione aqui para o livro de endereГos"
 
-#: composer/e-msg-composer-hdrs.c:291
+#: composer/e-msg-composer-hdrs.c:304
 #, fuzzy
 msgid "Enter the identity you wish to send this message from"
 msgstr "Introduza os receptores da mensagem"
 
-#: composer/e-msg-composer-hdrs.c:295 mail/mail-format.c:625
+#: composer/e-msg-composer-hdrs.c:308 mail/mail-format.c:630
 msgid "To:"
 msgstr "Para:"
 
-#: composer/e-msg-composer-hdrs.c:296
+#: composer/e-msg-composer-hdrs.c:309
 msgid "Enter the recipients of the message"
 msgstr "Introduza os receptores da mensagem"
 
-#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:627
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:632
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:301
+#: composer/e-msg-composer-hdrs.c:314
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Entre os endereГos que irЦo receber uma cСpia da mensagem"
 
-#: composer/e-msg-composer-hdrs.c:306
+#: composer/e-msg-composer-hdrs.c:319
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:307
+#: 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."
@@ -3501,97 +3632,97 @@ msgstr ""
 "Entre os endereГos que irЦo receber uma cСpia da mensagem sem conhecimento "
 "do receptor"
 
-#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:629
+#: composer/e-msg-composer-hdrs.c:326 mail/mail-format.c:634
 msgid "Subject:"
 msgstr "Assunto:"
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Enter the subject of the mail"
 msgstr "Introduza o assunto da carta"
 
-#: composer/e-msg-composer.c:429
+#: composer/e-msg-composer.c:430
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:599
+#: composer/e-msg-composer.c:600
 #, fuzzy
 msgid "Save as..."
 msgstr "Gravar como VCard"
 
-#: composer/e-msg-composer.c:610
+#: composer/e-msg-composer.c:611
 #, fuzzy, c-format
 msgid "Error saving file: %s"
 msgstr "Erro a gravar os atalhos."
 
-#: composer/e-msg-composer.c:630
+#: composer/e-msg-composer.c:631
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:652
+#: composer/e-msg-composer.c:653
 #, fuzzy
 msgid "Saving changes to message..."
 msgstr "Enviar uma nova mensagem"
 
-#: composer/e-msg-composer.c:654
+#: composer/e-msg-composer.c:655
 #, fuzzy
 msgid "Save changes to message..."
 msgstr "Enviar uma nova mensagem"
 
-#: composer/e-msg-composer.c:695
+#: composer/e-msg-composer.c:696
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:739 shell/e-shell-view-menu.c:170
+#: composer/e-msg-composer.c:741 shell/e-shell-view-menu.c:167
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:745
+#: 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:767
+#: composer/e-msg-composer.c:772
 msgid "Open file"
 msgstr "Abrir ficheiro"
 
-#: composer/e-msg-composer.c:893
+#: composer/e-msg-composer.c:898
 msgid "That file does not exist."
 msgstr ""
 
-#: composer/e-msg-composer.c:903
+#: composer/e-msg-composer.c:908
 msgid "That is not a regular file."
 msgstr ""
 
-#: composer/e-msg-composer.c:913
+#: composer/e-msg-composer.c:918
 msgid "That file exists but is not readable."
 msgstr ""
 
-#: composer/e-msg-composer.c:923
+#: composer/e-msg-composer.c:928
 msgid "That file appeared accesible but open(2) failed."
 msgstr ""
 
-#: composer/e-msg-composer.c:945
+#: 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:966
+#: composer/e-msg-composer.c:971
 msgid "An error occurred while reading the file."
 msgstr ""
 
-#: composer/e-msg-composer.c:1343
+#: composer/e-msg-composer.c:1350
 msgid "Compose a message"
 msgstr "Criar uma nova mensagem"
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1427
 msgid "Could not create composer window."
 msgstr ""
 
@@ -3606,16 +3737,31 @@ msgstr ""
 
 #: filter/filter-datespec.c:62
 #, fuzzy
+msgid "year"
+msgstr "Ano"
+
+#: filter/filter-datespec.c:62
+#, fuzzy
 msgid "years"
 msgstr "Ano"
 
 #: filter/filter-datespec.c:63
 #, fuzzy
+msgid "month"
+msgstr "MЙs"
+
+#: filter/filter-datespec.c:63
+#, fuzzy
 msgid "months"
 msgstr "MЙs"
 
 #: filter/filter-datespec.c:64
 #, fuzzy
+msgid "week"
+msgstr "Semana"
+
+#: filter/filter-datespec.c:64
+#, fuzzy
 msgid "weeks"
 msgstr "Semanas"
 
@@ -3626,16 +3772,31 @@ msgstr "DiasRascunhos"
 
 #: filter/filter-datespec.c:66
 #, fuzzy
+msgid "hour"
+msgstr "Hora"
+
+#: filter/filter-datespec.c:66
+#, fuzzy
 msgid "hours"
 msgstr "Horas"
 
 #: filter/filter-datespec.c:67
 #, fuzzy
+msgid "minute"
+msgstr "Minuto"
+
+#: filter/filter-datespec.c:67
+#, fuzzy
 msgid "minutes"
 msgstr "Minutos"
 
 #: filter/filter-datespec.c:68
 #, fuzzy
+msgid "second"
+msgstr " segundos"
+
+#: filter/filter-datespec.c:68
+#, fuzzy
 msgid "seconds"
 msgstr " segundos"
 
@@ -3685,6 +3846,10 @@ msgstr ""
 msgid "Compare against"
 msgstr ""
 
+#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
+msgid "now"
+msgstr ""
+
 #: filter/filter-datespec.c:690
 msgid "<click here to select a date>"
 msgstr ""
@@ -3707,7 +3872,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 ""
 
@@ -3746,260 +3911,271 @@ msgstr ""
 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"
 "%s"
 msgstr ""
 
-#: filter/filter-message-search.c:379 filter/filter-message-search.c:447
+#: filter/filter-message-search.c:380 filter/filter-message-search.c:448
 #, c-format
 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:520
+#: filter/filter-rule.c:530
 #, fuzzy
 msgid "Rule name: "
 msgstr "Nome completo:"
 
-#: filter/filter-rule.c:524
+#: filter/filter-rule.c:534
 #, fuzzy
 msgid "Untitled"
 msgstr "(Sem tМtulo)"
 
-#: filter/filter-rule.c:540
+#: filter/filter-rule.c:550
 msgid "If"
 msgstr ""
 
-#: filter/filter-rule.c:557
+#: filter/filter-rule.c:567
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:561
+#: filter/filter-rule.c:571
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:566
+#: filter/filter-rule.c:576
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:577
+#: filter/filter-rule.c:587
 msgid "Add criterion"
 msgstr ""
 
-#: filter/filter-rule.c:583
+#: filter/filter-rule.c:593
 #, fuzzy
 msgid "Remove criterion"
 msgstr "Remover grupo"
 
-#: mail/folder-browser.c:465 po/tmp/filter.glade.h:8
-#: po/tmp/mail-config.glade.h:9
-msgid "Edit"
+#: filter/filter-system-flag.c:63
+#, fuzzy
+msgid "Replied to"
+msgstr "Reponder para todos"
+
+#. { _("Deleted"), "Deleted" },
+#. { _("Draft"), "Draft" },
+#: filter/filter-system-flag.c:66
+msgid "Important"
 msgstr ""
 
-#: po/tmp/filter.glade.h:10
+#: filter/filter-system-flag.c:67
+#, fuzzy
+msgid "Read"
+msgstr "Remover"
+
+#: filter/filter.glade.h:10
 #, fuzzy
 msgid "Edit VFolders"
 msgstr "_Pastas"
 
-#: 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
 #, fuzzy
 msgid "Virtual Folders"
 msgstr "_Pastas"
 
-#: po/tmp/filter.glade.h:16
+#: filter/filter.glade.h:16
 #, fuzzy
 msgid "vFolder Sources"
 msgstr "Adicionar Fonte"
 
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
+#, fuzzy
+msgid "after"
+msgstr "Data"
+
+#: 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
+#, fuzzy
+msgid "contains"
+msgstr "_AcГУes"
+
+#: filter/libfilter-i18n.h:7
 #, fuzzy
 msgid "Copy to Folder"
 msgstr "Ir para a _pasta..."
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:8
 #, fuzzy
 msgid "Date received"
 msgstr "Receber"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:9
 #, fuzzy
 msgid "Date sent"
 msgstr "Data"
 
-#: filter/libfilter-i18n.h:8
-msgid "Expression"
-msgstr ""
-
-#: filter/libfilter-i18n.h:9
-#, fuzzy
-msgid "Forward to Address"
-msgstr "Enviar esta mensagem"
-
-#: filter/libfilter-i18n.h:10
-#, fuzzy
-msgid "Message Body"
-msgstr "SituaГЦo das mensagens"
-
 #: filter/libfilter-i18n.h:11
-#, fuzzy
-msgid "Message Header"
-msgstr "SituaГЦo das mensagens"
+msgid "does not contain"
+msgstr ""
 
 #: filter/libfilter-i18n.h:12
-msgid "Message was received"
+msgid "does not end with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:13
-#, fuzzy
-msgid "Message was sent"
-msgstr "SituaГЦo das mensagens"
+msgid "does not exist"
+msgstr ""
 
 #: filter/libfilter-i18n.h:14
 #, fuzzy
-msgid "Move to Folder"
-msgstr "Ir para a _pasta..."
+msgid "does not sound like"
+msgstr "Ficheiro nЦo encontrado"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not start with"
+msgstr ""
 
 #: filter/libfilter-i18n.h:16
-msgid "Recipients"
+msgid "ends with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:17
-msgid "Regex Match"
+msgid "exists"
 msgstr ""
 
 #: filter/libfilter-i18n.h:18
-#, fuzzy
-msgid "Sender"
-msgstr "Enviar"
+msgid "Expression"
+msgstr ""
 
 #: filter/libfilter-i18n.h:19
 #, fuzzy
-msgid "Set Status"
-msgstr "SituaГЦo online"
+msgid "Forward to Address"
+msgstr "Enviar esta mensagem"
 
 #: filter/libfilter-i18n.h:20
-#, fuzzy
-msgid "Source"
-msgstr "Fontes"
+msgid "is"
+msgstr ""
 
 #: filter/libfilter-i18n.h:21
-msgid "Specific header"
+msgid "is greater than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:22
-#, fuzzy
-msgid "Status"
-msgstr "SАb"
+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 "Assunto"
+#, fuzzy
+msgid "Message Body"
+msgstr "SituaГЦo das mensagens"
 
 #: filter/libfilter-i18n.h:25
 #, fuzzy
-msgid "after"
-msgstr "Data"
+msgid "Message Header"
+msgstr "SituaГЦo das mensagens"
 
 #: filter/libfilter-i18n.h:26
-msgid "before"
+msgid "Message was received"
 msgstr ""
 
 #: filter/libfilter-i18n.h:27
 #, fuzzy
-msgid "contains"
-msgstr "_AcГУes"
+msgid "Message was sent"
+msgstr "SituaГЦo das mensagens"
 
 #: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr ""
+#, fuzzy
+msgid "Move to Folder"
+msgstr "Ir para a _pasta..."
 
 #: filter/libfilter-i18n.h:29
-msgid "does not end with"
+msgid "on or after"
 msgstr ""
 
 #: filter/libfilter-i18n.h:30
-msgid "does not exist"
+msgid "on or before"
 msgstr ""
 
-#: filter/libfilter-i18n.h:31
-#, fuzzy
-msgid "does not sound like"
-msgstr "Ficheiro nЦo encontrado"
-
 #: filter/libfilter-i18n.h:32
-msgid "does not start with"
+msgid "Recipients"
 msgstr ""
 
 #: filter/libfilter-i18n.h:33
-msgid "ends with"
+msgid "Regex Match"
 msgstr ""
 
 #: filter/libfilter-i18n.h:34
-msgid "exists"
-msgstr ""
+#, fuzzy
+msgid "Sender"
+msgstr "Enviar"
 
 #: filter/libfilter-i18n.h:35
-msgid "is greater than"
-msgstr ""
+#, fuzzy
+msgid "Set Status"
+msgstr "SituaГЦo online"
 
 #: filter/libfilter-i18n.h:36
-msgid "is less than"
+msgid "sounds like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:37
-msgid "is not"
-msgstr ""
+#, fuzzy
+msgid "Source"
+msgstr "Fontes"
 
 #: filter/libfilter-i18n.h:38
-msgid "is"
+msgid "Specific header"
 msgstr ""
 
 #: filter/libfilter-i18n.h:39
-msgid "on or after"
+msgid "starts with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr ""
+#, fuzzy
+msgid "Status"
+msgstr "SАb"
 
 #: filter/libfilter-i18n.h:41
-msgid "sounds like"
+msgid "Stop Processing"
 msgstr ""
 
 #: filter/libfilter-i18n.h:42
-msgid "starts with"
-msgstr ""
+msgid "Subject"
+msgstr "Assunto"
 
 #: filter/libfilter-i18n.h:43
 msgid "was after"
@@ -4031,143 +4207,223 @@ msgstr ""
 msgid "Edit VFolder Rule"
 msgstr ""
 
-#: mail/component-factory.c:227
+#: mail/component-factory.c:277
 msgid "Cannot initialize Evolution's mail component."
 msgstr "NЦo consigo inicializar o componente de mail do Evolution."
 
-#: mail/component-factory.c:266
+#: 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:16
+#: mail/folder-browser.c:223 ui/evolution-event-editor.xml.h:88
+#: ui/evolution-message-composer.xml.h:19
 #, fuzzy
 msgid "Save"
 msgstr "SА"
 
-#: 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
 #, fuzzy
 msgid "Subject contains"
 msgstr "Assunto"
 
-#: 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:453
+#: mail/folder-browser.c:643
 msgid "VFolder on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:454
+#: mail/folder-browser.c:644
 msgid "VFolder on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:455
+#: mail/folder-browser.c:645
 msgid "VFolder on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:457
+#: mail/folder-browser.c:647
 msgid "Filter on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:458
+#: mail/folder-browser.c:648
 #, fuzzy
 msgid "Filter on Sender"
 msgstr "Ficheiro nЦo encontrado"
 
-#: mail/folder-browser.c:459
+#: mail/folder-browser.c:649
 msgid "Filter on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:460 mail/folder-browser.c:544
+#: mail/folder-browser.c:650 mail/folder-browser.c:779
 msgid "Filter on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:14
+#: mail/folder-browser.c:655
+msgid "Show all hidden"
+msgstr ""
+
+#: mail/folder-browser.c:657
+msgid "Hide selected"
+msgstr ""
+
+#. could use another mask, but not enough api do to it
+#: mail/folder-browser.c:660
+msgid "Hide read"
+msgstr ""
+
+#: mail/folder-browser.c:661
+#, fuzzy
+msgid "Hide deleted"
+msgstr "Apagar"
+
+#: mail/folder-browser.c:663 mail/folder-browser.c:790
+#, fuzzy
+msgid "Hide Subject"
+msgstr "Assunto"
+
+#: mail/folder-browser.c:665 mail/folder-browser.c:796
+#, fuzzy
+msgid "Hide from Sender"
+msgstr "Ficheiro nЦo encontrado"
+
+#: mail/folder-browser.c:670 ui/evolution-message-composer.xml.h:15
 #, fuzzy
 msgid "Open"
 msgstr "_Abrir"
 
-#: mail/folder-browser.c:466
+#: mail/folder-browser.c:672
 msgid "Save As..."
 msgstr ""
 
-#: mail/folder-browser.c:467 mail/mail-view.c:163
-#: po/tmp/evolution-addressbook.xml.h:13 po/tmp/evolution-calendar.xml.h:23
-#: po/tmp/evolution-mail.xml.h:28
+#: 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 "Imprimir"
 
-#: mail/folder-browser.c:469
+#: mail/folder-browser.c:675
 #, fuzzy
 msgid "Reply to Sender"
 msgstr "Reponder para todos"
 
-#: mail/folder-browser.c:470 mail/mail-view.c:156
-#: po/tmp/evolution-mail.xml.h:34
+#: mail/folder-browser.c:676 mail/mail-view.c:141 ui/evolution-mail.xml.h:38
 msgid "Reply to All"
 msgstr "Reponder para todos"
 
-#: mail/folder-browser.c:471 mail/mail-view.c:159
-#: 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:472 po/tmp/evolution-mail.xml.h:18
+#: mail/folder-browser.c:678 ui/evolution-mail.xml.h:18
 msgid "Forward inline"
 msgstr ""
 
-#: mail/folder-browser.c:474
+#: mail/folder-browser.c:680
 msgid "Mark as Read"
 msgstr ""
 
-#: mail/folder-browser.c:475
+#: mail/folder-browser.c:681
 msgid "Mark as Unread"
 msgstr ""
 
-#: mail/folder-browser.c:477
+#: mail/folder-browser.c:683
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "Ir para a _pasta..."
 
-#: mail/folder-browser.c:478
+#: mail/folder-browser.c:684
 #, fuzzy
 msgid "Copy to Folder..."
 msgstr "Ir para a _pasta..."
 
-#: mail/folder-browser.c:480
+#: mail/folder-browser.c:686
 #, fuzzy
 msgid "Undelete"
 msgstr "Apagar"
 
 #. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
 #. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:484
+#: mail/folder-browser.c:690
 msgid "Apply Filters"
 msgstr ""
 
-#: mail/folder-browser.c:486 po/tmp/evolution-mail.xml.h:10
+#: mail/folder-browser.c:692 ui/evolution-mail.xml.h:10
 #, fuzzy
 msgid "Create Rule From Message"
 msgstr "Mensagens de correio em rascunho"
 
-#: mail/folder-browser.c:546
+#: mail/folder-browser.c:693 ui/evolution-mail.xml.h:21
+#, fuzzy
+msgid "Hide Messages"
+msgstr "Encontrar mensagens"
+
+#: mail/folder-browser.c:781
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
+#: mail/folder-browser.c:787
+#, fuzzy, c-format
+msgid "Hide Subject \"%s\""
+msgstr "Assunto"
+
+#: 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 "NЦo se consegui inicializar Bonobo"
+
+#: mail/local-config.glade.h:7
+#, fuzzy
+msgid "Mailbox Format"
+msgstr "F_ormato"
+
+#: mail/local-config.glade.h:8
+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
+#, fuzzy
+msgid "mbox"
+msgstr "Correio novo"
+
+#: mail/local-config.glade.h:12
+#, fuzzy
+msgid "mh"
+msgstr "h"
+
 #: mail/mail-autofilter.c:71
 #, fuzzy, c-format
 msgid "Mail to %s"
@@ -4220,96 +4476,330 @@ 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
+#, fuzzy
+msgid "Forwarded message:\n"
+msgstr "Enviar esta mensagem"
+
+#: mail/mail-callbacks.c:611
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:554
+#: mail/mail-callbacks.c:613
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "Criar uma nova mensagem"
 
-#: mail/mail-callbacks.c:665
+#: mail/mail-callbacks.c:748
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:699 mail/mail-display.c:72
+#: mail/mail-callbacks.c:781 mail/mail-display.c:79
 msgid "Overwrite file?"
 msgstr ""
 
-#: mail/mail-callbacks.c:703 mail/mail-display.c:76
+#: mail/mail-callbacks.c:785 mail/mail-display.c:83
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
 
-#: mail/mail-callbacks.c:748
+#: mail/mail-callbacks.c:830
 msgid "Save Message As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:750
+#: mail/mail-callbacks.c:832
 msgid "Save Messages As..."
 msgstr ""
 
-#: mail/mail-callbacks.c:877
+#: mail/mail-callbacks.c:916
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:922
+#: mail/mail-callbacks.c:961
 #, fuzzy
 msgid "Print Message"
 msgstr "Encontrar mensagens"
 
-#: mail/mail-callbacks.c:969
+#: 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 "Nenhuma InformaГЦo"
+
+#: mail/mail-config-druid.glade.h:8
+msgid "Account Management"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:9
+#, fuzzy
+msgid "Account Properties"
+msgstr "Propriedades do alarme"
+
+#: mail/mail-config-druid.glade.h:11
+#, fuzzy
+msgid "Advanced"
+msgstr "Adicionar..."
+
+#: mail/mail-config-druid.glade.h:12
+#, fuzzy
+msgid "Authentication"
+msgstr "AutenticaГЦo"
+
+#: mail/mail-config-druid.glade.h:13
+#, fuzzy
+msgid "Authentication Type:"
+msgstr "AutenticaГЦo"
+
+#: 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 "Apagar"
+
+#: mail/mail-config-druid.glade.h:26
+msgid "Delete mail from server"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:27
+#, fuzzy
+msgid "Done"
+msgstr "Nenhuma"
+
+#: mail/mail-config-druid.glade.h:28
+#, fuzzy
+msgid "E-Mail Address:"
+msgstr "EndereГo de correio:"
+
+#: mail/mail-config-druid.glade.h:30
+#, fuzzy
+msgid "Email Address:"
+msgstr "EndereГo de correio:"
+
+#: mail/mail-config-druid.glade.h:31
+#, fuzzy
+msgid "Evolution Mail Configuration"
+msgstr "ConfiguraГЦo do correio"
+
+#: mail/mail-config-druid.glade.h:32
+#, fuzzy
+msgid "Full Name:"
+msgstr "Nome completo:"
+
+#: mail/mail-config-druid.glade.h:35
+#, fuzzy
+msgid "Hostname:"
+msgstr "Utilizador:"
+
+#: mail/mail-config-druid.glade.h:36
+msgid "IMAP"
+msgstr ""
+
+#: 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
+msgid "Kerberos"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:40
+#, fuzzy
+msgid "Mail"
+msgstr "_Correio"
+
+#: mail/mail-config-druid.glade.h:41
+#, fuzzy
+msgid "Mail Account"
+msgstr "мcone_s pequenos"
+
+#: mail/mail-config-druid.glade.h:42
 msgid "Mail Configuration"
 msgstr "ConfiguraГЦo do correio"
 
-#: po/tmp/mail-config-druid.glade.h:8
+#: mail/mail-config-druid.glade.h:43
 #, fuzzy
-msgid "Mail Source"
-msgstr "atalhos principais"
+msgid "Mail Configuration Druid"
+msgstr "ConfiguraГЦo do correio"
 
-#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
-msgid "Mail Transport"
-msgstr "Transporte de correio"
+#: 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 "Novo"
+
+#: mail/mail-config-druid.glade.h:48
+#, fuzzy
+msgid "Optional"
+msgstr "_OpГУes"
+
+#: mail/mail-config-druid.glade.h:49 mail/mail-config-gui.c:485
+msgid "Organization:"
+msgstr "OrganizaГЦo:"
+
+#: mail/mail-config-druid.glade.h:50
+msgid "Outgoing Mail Server"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:51
+#, fuzzy
+msgid "Password:"
+msgstr "Esquecer _Senhas"
+
+#: 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:10
-msgid "Welcome to the Evolution Mail configuration wizard!\n"
+#: mail/mail-config-druid.glade.h:55
+msgid "Remember my password"
 msgstr ""
 
-#: po/tmp/mail-config-druid.glade.h:14
+#: mail/mail-config-druid.glade.h:56 mail/mail-format.c:628
+#, fuzzy
+msgid "Reply-To:"
+msgstr "Responder"
+
+#: mail/mail-config-druid.glade.h:57
+#, fuzzy
+msgid "Reply-to:"
+msgstr "Responder"
+
+#: mail/mail-config-druid.glade.h:58
+#, fuzzy
+msgid "Required"
+msgstr "Pessoas _NecessЦrias"
+
+#: mail/mail-config-druid.glade.h:60
+#, fuzzy
+msgid "Save password"
+msgstr "Gravar como VCard"
+
+#: mail/mail-config-druid.glade.h:61
+#, fuzzy
+msgid "Select signature file"
+msgstr "Ficheiro com assinatura:"
+
+#: mail/mail-config-druid.glade.h:62
+#, fuzzy
+msgid "Sending Email"
+msgstr "Enviar"
+
+#: mail/mail-config-druid.glade.h:64
+#, fuzzy
+msgid "Server Configuration"
+msgstr "ConfiguraГЦo do correio"
+
+#: mail/mail-config-druid.glade.h:65
+msgid "Server Timeouts"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:66
+#, fuzzy
+msgid "Server Type: "
+msgstr "Servidor:"
+
+#: mail/mail-config-druid.glade.h:67
+msgid "Server requires authentication"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:68
+#, fuzzy
+msgid "Servers"
+msgstr "Servidor:"
+
+#: mail/mail-config-druid.glade.h:69 mail/mail-config-gui.c:496
+msgid "Signature file:"
+msgstr "Ficheiro com assinatura:"
+
+#: mail/mail-config-druid.glade.h:70
+#, fuzzy
+msgid "Signature:"
+msgstr "Ficheiro com assinatura:"
+
+#: mail/mail-config-druid.glade.h:71 mail/mail-config.glade.h:20
+msgid "Sources"
+msgstr "Fontes"
+
+#: mail/mail-config-druid.glade.h:72
+msgid "This server requires a secure connection (SSL)"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:73
+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 "Nenhuma InformaГЦo"
+
+#: mail/mail-config-druid.glade.h:77 mail/mail-config-gui.c:928
+msgid "Username:"
+msgstr "Utilizador:"
+
+#: 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 "Minutos"
+
 #: mail/mail-config-gui.c:433
 msgid ""
 "Enter your name and email address to be used in outgoing mail. You may also, "
@@ -4325,15 +4815,7 @@ msgstr "Nome completo:"
 msgid "Email address:"
 msgstr "EndereГo de correio:"
 
-#: mail/mail-config-gui.c:485
-msgid "Organization:"
-msgstr "OrganizaГЦo:"
-
-#: mail/mail-config-gui.c:496
-msgid "Signature file:"
-msgstr "Ficheiro com assinatura:"
-
-#: 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 ""
 
@@ -4341,26 +4823,10 @@ msgstr ""
 msgid "Server:"
 msgstr "Servidor:"
 
-#: mail/mail-config-gui.c:928
-msgid "Username:"
-msgstr "Utilizador:"
-
-#: mail/mail-config-gui.c:934
-msgid "Path:"
-msgstr "Caminho"
-
-#: mail/mail-config-gui.c:943
-msgid "Authentication:"
-msgstr "AutenticaГЦo"
-
 #: 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 ""
@@ -4374,7 +4840,7 @@ msgstr ""
 msgid "Mail source type:"
 msgstr "Fontes de correio"
 
-#: 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"
@@ -4401,6 +4867,14 @@ msgstr ""
 msgid "Mail transport type:"
 msgstr "Transporte de correio"
 
+#: 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 ""
@@ -4450,535 +4924,449 @@ msgstr ""
 msgid "Query authorization at \"%s\""
 msgstr ""
 
-#: po/tmp/mail-config.glade.h:7
+#: mail/mail-config.glade.h:7
 msgid "Address"
 msgstr "EndereГo"
 
-#: 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
 #, fuzzy
 msgid "Mail Sources"
 msgstr "atalhos principais"
 
-#: po/tmp/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
+msgid "Mail Transport"
+msgstr "Transporte de correio"
+
+#: mail/mail-config.glade.h:13
 msgid "Mark message as seen [ms]: "
 msgstr ""
 
-#: po/tmp/mail-config.glade.h:14
+#: mail/mail-config.glade.h:14
 #, fuzzy
 msgid "News Servers"
 msgstr "Servidor:"
 
-#: po/tmp/mail-config.glade.h:15
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "News Sources"
 msgstr "Fontes"
 
-#: po/tmp/mail-config.glade.h:16
+#: mail/mail-config.glade.h:16
 msgid "Organization"
 msgstr "OrganizaГЦo"
 
-#: po/tmp/mail-config.glade.h:18
+#: mail/mail-config.glade.h:18
 msgid "Send messages in HTML format"
 msgstr "Enviar mensagem em formato HTML"
 
-#: po/tmp/mail-config.glade.h:20
-msgid "Sources"
-msgstr "Fontes"
-
-#: mail/mail-crypto.c:350 mail/mail-crypto.c:452 mail/mail-crypto.c:629
+#: 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."
 msgstr ""
 
-#: mail/mail-crypto.c:354 mail/mail-crypto.c:456 mail/mail-crypto.c:634
+#: mail/mail-crypto.c:357 mail/mail-crypto.c:462 mail/mail-crypto.c:640
+#: mail/mail-crypto.c:785
 msgid "No password provided."
 msgstr ""
 
-#: mail/mail-crypto.c:360 mail/mail-crypto.c:463 mail/mail-crypto.c:640
+#: mail/mail-crypto.c:363 mail/mail-crypto.c:469 mail/mail-crypto.c:646
+#: mail/mail-crypto.c:792 mail/mail-crypto.c:942
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: mail/mail-crypto.c:625
+#: mail/mail-crypto.c:631 mail/mail-crypto.c:777 mail/mail-crypto.c:936
 msgid "No GPG/PGP program available."
 msgstr ""
 
-#: mail/mail-display.c:90
+#: mail/mail-crypto.c:953
+#, fuzzy, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "Criar um novo calendАrio"
+
+#: mail/mail-display.c:98
 #, c-format
 msgid ""
 "Could not open file %s:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-display.c:113
+#: mail/mail-display.c:131
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-display.c:218
+#: mail/mail-display.c:229
 #, fuzzy
 msgid "Save Attachment"
 msgstr "Anexo"
 
-#: mail/mail-display.c:258
+#: mail/mail-display.c:269
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/mail-display.c:300
+#: mail/mail-display.c:311
 msgid "Save to Disk..."
 msgstr ""
 
-#: mail/mail-display.c:302
+#: mail/mail-display.c:313
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/mail-display.c:304
+#: mail/mail-display.c:315
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:328
+#: mail/mail-display.c:339
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:351
+#: mail/mail-display.c:362
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:355
+#: mail/mail-display.c:366
 msgid "Hide"
 msgstr ""
 
-#: mail/mail-format.c:500
+#: mail/mail-format.c:503
 #, fuzzy, c-format
 msgid "%s attachment"
 msgstr "Adicionar anexo"
 
-#: mail/mail-format.c:623
-#, fuzzy
-msgid "Reply-To:"
-msgstr "Responder"
-
-#: mail/mail-format.c:845
+#: mail/mail-format.c:851
 msgid "No GPG/PGP support available in this copy of Evolution."
 msgstr ""
 
-#: mail/mail-format.c:857
+#: mail/mail-format.c:863
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:869
 #, fuzzy
 msgid "Encrypted message"
 msgstr "Enviar a mensagem"
 
-#: mail/mail-format.c:864
+#: mail/mail-format.c:870
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1470
+#: mail/mail-format.c:1450
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1482
+#: mail/mail-format.c:1462
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1486
+#: mail/mail-format.c:1466
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1520
+#: mail/mail-format.c:1500
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1525
+#: mail/mail-format.c:1505
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-format.c:1695
+#: mail/mail-format.c:1675
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr ""
 
-#: mail/mail-local.c:202
+#: mail/mail-local.c:204
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:206
+#: mail/mail-local.c:208
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:261
+#: mail/mail-local.c:251
+#, fuzzy
+msgid "Reconfiguring folder"
+msgstr "_Nova pasta"
+
+#: mail/mail-local.c:269
 #, fuzzy
 msgid "Closing current folder"
 msgstr "Fechar o calendАrio corrente"
 
-#: mail/mail-local.c:293
+#: mail/mail-local.c:295
 msgid "Renaming old folder and opening"
 msgstr ""
 
-#: mail/mail-local.c:314
+#: mail/mail-local.c:313
 #, fuzzy
 msgid "Creating new folder"
 msgstr "Criar um novo calendАrio"
 
-#: mail/mail-local.c:329
+#: mail/mail-local.c:327
 #, fuzzy
 msgid "Copying messages"
 msgstr "Encontrar mensagens"
 
-#: mail/mail-local.c:341
+#: 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:372
+#: 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:781
+#: mail/mail-local.c:787
 msgid "Registering local folder"
 msgstr ""
 
-#: mail/mail-local.c:783
+#: mail/mail-local.c:789
 msgid "Register local folder"
 msgstr ""
 
-#: mail/mail-ops.c:79
+#: mail/mail-local.c:894
+#, c-format
+msgid ""
+"Unable to register folder '%s':\n"
+"%s"
+msgstr ""
+
+#: mail/mail-mt.c:85
+#, c-format
+msgid ""
+"Error while '%s':\n"
+"%s"
+msgstr ""
+
+#: mail/mail-mt.c:87
+#, c-format
+msgid ""
+"Error while performing operation:\n"
+"%s"
+msgstr ""
+
+#: mail/mail-mt.c:356 mail/mail-mt.c:385
+#, fuzzy
+msgid "Working"
+msgstr "Seg"
+
+#: mail/mail-ops.c:88
 #, c-format
 msgid "Fetching email from %s"
 msgstr ""
 
-#: mail/mail-ops.c:81
+#: mail/mail-ops.c:90
 #, c-format
 msgid "Fetch email from %s"
 msgstr ""
 
-#: mail/mail-ops.c:331
+#: mail/mail-ops.c:335
 #, c-format
 msgid "There is no new mail at %s."
 msgstr ""
 
-#: 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:538
+#: mail/mail-ops.c:551
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:543
-msgid "Sending a message without a subject"
-msgstr ""
-
-#: mail/mail-ops.c:546
-#, fuzzy, c-format
-msgid "Send \"%s\""
-msgstr "Segundos"
-
-#: mail/mail-ops.c:549
-msgid "Send a message without a subject"
-msgstr ""
+#: mail/mail-ops.c:553
+#, fuzzy
+msgid "Sending message"
+msgstr "Mensagens enviadas"
 
-#: mail/mail-ops.c:720
+#: mail/mail-ops.c:669
 msgid "Sending queue"
 msgstr ""
 
-#: mail/mail-ops.c:722
+#: mail/mail-ops.c:671
 msgid "Send queue"
 msgstr ""
 
-#: mail/mail-ops.c:858 mail/mail-ops.c:865
+#: mail/mail-ops.c:804 mail/mail-ops.c:811
 #, c-format
 msgid "Appending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:862 mail/mail-ops.c:868
+#: mail/mail-ops.c:808 mail/mail-ops.c:814
 msgid "Appending a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:940
-#, c-format
-msgid "Expunging \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:942
-#, c-format
-msgid "Expunge \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1001
+#: mail/mail-ops.c:897
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:899
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1006
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1008
+#: mail/mail-ops.c:904
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1039
+#: mail/mail-ops.c:935
 #, fuzzy
 msgid "Moving"
 msgstr "Seg"
 
-#: mail/mail-ops.c:1042
+#: mail/mail-ops.c:938
 #, fuzzy
 msgid "Copying"
 msgstr "Copiar"
 
-#: mail/mail-ops.c:1062
+#: mail/mail-ops.c:958
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1141
-#, c-format
-msgid "Marking messages in folder \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1144
-#, c-format
-msgid "Mark messages in folder \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1175
-#, c-format
-msgid "Marking message %d of %d"
-msgstr ""
-
-#: mail/mail-ops.c:1295
+#: mail/mail-ops.c:1033
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1297
-#, c-format
-msgid "Scan folders in \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1366 mail/subscribe-dialog.c:339
+#: mail/mail-ops.c:1099 mail/subscribe-dialog.c:341
 #, fuzzy
 msgid "(No description)"
 msgstr "Nenhuma descriГЦo"
 
-#: mail/mail-ops.c:1432
-#, c-format
-msgid "Attaching messages from folder \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1435
-#, c-format
-msgid "Attach messages from \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1535
-#, fuzzy, c-format
-msgid "Forwarding messages \"%s\""
-msgstr "Enviar esta mensagem"
-
-#: mail/mail-ops.c:1539
-msgid "Forwarding a message without a subject"
-msgstr ""
-
-#: mail/mail-ops.c:1542
-#, fuzzy, c-format
-msgid "Forward message \"%s\""
-msgstr "Enviar esta mensagem"
-
-#: mail/mail-ops.c:1546
-msgid "Forward a message without a subject"
-msgstr ""
-
-#: mail/mail-ops.c:1593
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1610
-msgid ""
-"Failed to generate mime part from message while generating forwarded message."
-msgstr ""
-
-#: mail/mail-ops.c:1665
+#: mail/mail-ops.c:1164
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-ops.c:1679
-#, fuzzy
-msgid "Forwarded message:\n"
-msgstr "Enviar esta mensagem"
-
-#: mail/mail-ops.c:1748
-#, c-format
-msgid "Loading \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1750
-#, c-format
-msgid "Load \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1853
-#, c-format
-msgid "Creating \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1855
-#, c-format
-msgid "Create \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1903
-msgid "Exception while reporting result to shell component listener."
-msgstr ""
-
-#: mail/mail-ops.c:1949
+#: mail/mail-ops.c:1205 mail/mail-ops.c:1274
 #, fuzzy, c-format
-msgid "Synchronizing \"%s\""
-msgstr "Sincronizar"
+msgid "Opening folder %s"
+msgstr "Abrir ficheiro"
 
-#: mail/mail-ops.c:1951
-#, fuzzy, c-format
-msgid "Synchronize \"%s\""
+#: mail/mail-ops.c:1336
+#, fuzzy
+msgid "Synchronising folder"
 msgstr "Sincronizar"
 
-#: mail/mail-ops.c:2015
-#, c-format
-msgid "Displaying message UID \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:2018
-msgid "Clearing message display"
+#: mail/mail-ops.c:1386
+msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:2021
-#, c-format
-msgid "Display message UID \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:2024
-msgid "Clear message display"
-msgstr ""
-
-#: mail/mail-ops.c:2137
-#, c-format
-msgid "Opening messages from folder \"%s\""
-msgstr ""
+#: mail/mail-ops.c:1434
+#, fuzzy, c-format
+msgid "Retrieving message %s"
+msgstr "Enviar esta mensagem"
 
-#: mail/mail-ops.c:2140
-#, c-format
-msgid "Open messages from \"%s\""
-msgstr ""
+#: mail/mail-ops.c:1497
+#, fuzzy
+msgid "Retrieving messages"
+msgstr "Encontrar mensagens"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:1507
 #, c-format
-msgid "Loading %s Folder"
+msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:2246
+#: mail/mail-ops.c:1655
 #, c-format
-msgid "Load %s Folder"
+msgid "Loading %s Folder for %s"
 msgstr ""
 
-#: mail/mail-ops.c:2310
+#: mail/mail-ops.c:1657
 #, c-format
-msgid "Viewing messages from folder \"%s\""
+msgid "Load %s Folder for %s"
 msgstr ""
 
-#: mail/mail-ops.c:2313
-#, c-format
-msgid "View messages from \"%s\""
-msgstr ""
+#: mail/mail-ops.c:1823
+#, fuzzy
+msgid "Saving messages"
+msgstr "Encontrar mensagens"
 
-#: mail/mail-ops.c:2339
+#: mail/mail-ops.c:1902
 #, c-format
-msgid "Retrieving message %d of %d (uid \"%s\")"
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
 msgstr ""
 
-#: mail/mail-ops.c:2428
+#: mail/mail-ops.c:1915
 #, c-format
-msgid "Saving messages from folder \"%s\""
+msgid "Saving message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:2431
+#: mail/mail-ops.c:1929
 #, fuzzy, c-format
-msgid "Save messages from folder \"%s\""
-msgstr "Gravar a mensagem na pasta especificada"
-
-#: mail/mail-ops.c:2474
-#, c-format
-msgid "Saving message %d of %d (uid \"%s\")"
-msgstr ""
+msgid ""
+"Error saving messages to: %s:\n"
+" %s"
+msgstr "Erro a gravar os atalhos."
 
 #: mail/mail-search-dialogue.c:104
 msgid "Cancel"
 msgstr ""
 
-#: mail/mail-summary.c:105 mail/mail-threads.c:728
+#: mail/mail-summary.c:110 mail/mail-threads.c:729
 msgid "Incomplete message written on pipe!"
 msgstr ""
 
-#: mail/mail-threads.c:301
+#: mail/mail-threads.c:302
 #, c-format
 msgid ""
 "Error while preparing to %s:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-threads.c:675
+#: mail/mail-threads.c:676
 #, c-format
 msgid ""
 "Error while `%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-threads.c:732
+#: mail/mail-threads.c:733
 msgid "Error reading commands from dispatching thread."
 msgstr ""
 
-#: mail/mail-threads.c:797
+#: mail/mail-threads.c:798
 msgid "Corrupted message from dispatching thread?"
 msgstr ""
 
-#: mail/mail-threads.c:916
+#: mail/mail-threads.c:917
 #, fuzzy
 msgid "Could not create dialog box."
 msgstr "NЦo se consegui inicializar Bonobo"
 
-#: mail/mail-threads.c:927
+#: mail/mail-threads.c:928
 msgid "User cancelled query."
 msgstr ""
 
@@ -4988,136 +5376,150 @@ msgid "Couldn't create temporary mbox `%s': %s"
 msgstr ""
 
 #. Get all uids of source
-#: mail/mail-tools.c:239
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Examining %s"
 msgstr ""
 
-#: mail/mail-tools.c:269
+#: mail/mail-tools.c:271
 #, c-format
 msgid ""
 "Could not read UID cache file \"%s\". You may receive duplicate messages."
 msgstr ""
 
-#. Info
-#: mail/mail-tools.c:290
+#: mail/mail-tools.c:300
 #, c-format
 msgid "Retrieving message %d of %d"
 msgstr ""
 
 #. Append it to dest
-#: mail/mail-tools.c:303
+#: mail/mail-tools.c:315
 #, c-format
 msgid "Writing message %d of %d"
 msgstr ""
 
-#: mail/mail-tools.c:332
+#: mail/mail-tools.c:347
 #, c-format
 msgid "Saving changes to %s"
 msgstr ""
 
-#: mail/mail-tools.c:369
+#: mail/mail-tools.c:381
 #, fuzzy, c-format
 msgid "[%s] (forwarded message)"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-tools.c:379
+#: mail/mail-tools.c:391
 msgid "Fwd: (no subject)"
 msgstr ""
 
-#: mail/mail-tools.c:418
+#: mail/mail-tools.c:427
 #, fuzzy, c-format
 msgid "Forwarded message - %s"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-tools.c:420
+#: mail/mail-tools.c:429
 #, fuzzy
 msgid "Forwarded message (no subject)"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-tools.c:523
+#: mail/mail-tools.c:530
 #, fuzzy, c-format
 msgid ""
 "Cannot open location `%s':\n"
 "%s"
 msgstr "NЦo consigo abrir a localizaГЦo: %s"
 
-#: mail/mail-vfolder.c:147
+#: mail/mail-vfolder.c:149
 #, fuzzy
 msgid "VFolders"
 msgstr "_Pastas"
 
-#: mail/mail-vfolder.c:296
+#: mail/mail-vfolder.c:298
 #, fuzzy
 msgid "New VFolder"
 msgstr "_Nova pasta"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:33
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:37
 msgid "Reply"
 msgstr "Responder"
 
-#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:38
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
 #, fuzzy
 msgid "Reply to the sender of this message"
 msgstr "Responder ao emissor desta mensagem"
 
-#: mail/mail-view.c:156 po/tmp/evolution-mail.xml.h:37
+#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
 msgid "Reply to all recipients of this message"
 msgstr "Reponder a todos receptores da mensagem"
 
-#: mail/mail-view.c:159 po/tmp/evolution-mail.xml.h:19
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:19
 #, fuzzy
 msgid "Forward this message"
 msgstr "Enviar esta mensagem"
 
-#: mail/mail-view.c:163 po/tmp/evolution-mail.xml.h:32
+#: mail/mail-view.c:148 ui/evolution-mail.xml.h:36
 #, fuzzy
 msgid "Print the selected message"
 msgstr "Imprimir a mensagem seleccionada"
 
-#: mail/mail-view.c:165 po/tmp/evolution-mail.xml.h:12
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:12
 #, fuzzy
 msgid "Delete this message"
 msgstr "Enviar esta mensagem"
 
-#: mail/message-list.c:572
+#: mail/message-list.c:590
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:575
+#: mail/message-list.c:593
 #, fuzzy
 msgid "Seen"
 msgstr "Enviar"
 
-#: mail/message-list.c:578
+#: mail/message-list.c:596
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:846
+#: mail/message-list.c:881
 #, c-format
 msgid "[ %s ]"
 msgstr ""
 
 #. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:858 mail/message-list.c:873
+#: mail/message-list.c:893 mail/message-list.c:909
 #, c-format
 msgid "%s, et al."
 msgstr ""
 
-#: mail/message-list.c:860 mail/message-list.c:875
+#: mail/message-list.c:896 mail/message-list.c:912
 msgid "<unknown>"
 msgstr ""
 
-#: mail/message-list.c:2068
-msgid "Rebuilding message view"
+#: mail/message-list.c:965
+msgid "?"
+msgstr "?"
+
+#: mail/message-list.c:972
+msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:2070
-#, fuzzy
-msgid "Rebuild message view"
-msgstr "Encontrar mensagens"
+#: mail/message-list.c:981
+msgid "Yesterday %l:%M %p"
+msgstr ""
+
+#: mail/message-list.c:993
+msgid "%a %l:%M %p"
+msgstr ""
+
+#: mail/message-list.c:1001
+msgid "%b %d %l:%M %p"
+msgstr ""
+
+#: mail/message-list.c:1003
+msgid "%b %d %Y"
+msgstr ""
 
 #: mail/subscribe-dialog.c:139
 msgid "Display folders starting with:"
@@ -5133,27 +5535,27 @@ msgstr ""
 msgid "Get store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:282
+#: mail/subscribe-dialog.c:283
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:286
+#: mail/subscribe-dialog.c:287
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:290
+#: mail/subscribe-dialog.c:291
 #, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:293
+#: mail/subscribe-dialog.c:294
 #, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr ""
 
-#: shell/e-setup.c:112 shell/e-setup.c:183
+#: shell/e-setup.c:112 shell/e-setup.c:185
 msgid "Evolution installation"
 msgstr "InstalaГЦo do Evolution"
 
@@ -5170,25 +5572,25 @@ msgstr ""
 "Carregue em \\\"OK\\\" para instalar os ficheiros de utilizador do Evolution "
 "em"
 
-#: shell/e-setup.c:155
+#: shell/e-setup.c:157
 msgid "Could not update files correctly"
 msgstr ""
 
-#: shell/e-setup.c:158 shell/e-setup.c:224
+#: shell/e-setup.c:160 shell/e-setup.c:228
 msgid "Evolution files successfully installed."
 msgstr "Ficheiros do Evolution instalados com sucesso"
 
-#: shell/e-setup.c:187
+#: shell/e-setup.c:189
 msgid "This seems to be the first time you run Evolution."
 msgstr "Esta parece ser a primeira vez que estА a correr o Evolution."
 
-#: shell/e-setup.c:188
+#: shell/e-setup.c:190
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 "Carregue em \\\"OK\\\" para instalar os ficheiros de utilizador do Evolution "
 "em"
 
-#: shell/e-setup.c:205
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -5196,14 +5598,14 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: shell/e-setup.c:220
+#: shell/e-setup.c:224
 #, c-format
 msgid ""
 "Cannot copy files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:245
+#: shell/e-setup.c:249
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -5211,7 +5613,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:257
+#: shell/e-setup.c:261
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -5241,7 +5643,7 @@ msgid ""
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:291
+#: shell/e-shell-folder-selection-dialog.c:297
 #, fuzzy
 msgid "New..."
 msgstr "Novo"
@@ -5250,30 +5652,26 @@ msgstr "Novo"
 msgid "(Untitled)"
 msgstr "(Sem tМtulo)"
 
-#. you might have to call gnome_dialog_run() on the
-#. * dialog returned here, I don't remember...
-#.
-#: shell/e-shell-view-menu.c:114
+#: shell/e-shell-view-menu.c:111
 msgid "Bug buddy was not found in your $PATH."
 msgstr "O Bug buddy nЦo foi encontrado no seu $PATH."
 
-#. same as above
-#: shell/e-shell-view-menu.c:120
+#: shell/e-shell-view-menu.c:117
 msgid "Bug buddy could not be run."
 msgstr "NЦo consegui correr o Bub buddy"
 
-#: shell/e-shell-view-menu.c:172
+#: shell/e-shell-view-menu.c:169
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:174
+#: shell/e-shell-view-menu.c:171
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
 "within the GNOME desktop environment."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:335
+#: shell/e-shell-view-menu.c:332
 msgid "Go to folder..."
 msgstr "Ir para a _pasta..."
 
@@ -5377,9 +5775,8 @@ msgstr "Remover este atalho da barra de atalhos"
 msgid "Error saving shortcuts."
 msgstr "Erro a gravar os atalhos."
 
-#: po/tmp/evolution-event-editor.xml.h:125
-#: po/tmp/evolution-message-composer.xml.h:43 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
 #, fuzzy
 msgid "_View"
 msgstr "_Novo"
@@ -5443,8 +5840,8 @@ msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
-"Over the last month and a half, our focus has been on making\n"
-"Evolution usable. Many of the Evolution developers are now using\n"
+"Over the time since the past release, our focus has been on making\n"
+"Evolution usable.  Many of the Evolution developers are now using\n"
 "Evolution to read their mail full time. You could too. (Just\n"
 "be sure to keep a backup.)\n"
 "\n"
@@ -5478,1196 +5875,1218 @@ msgstr ""
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Falhou a inicializaГЦo do sistema de componentes Bonobo."
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-addressbook-ldap.xml.h:6
-msgid "N_ew Directory Server"
-msgstr ""
-
-#: po/tmp/evolution-addressbook-ldap.xml.h:7
-msgid "_Actions"
-msgstr "_AcГУes"
-
-#: po/tmp/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:7
 msgid "Create a new contact"
 msgstr "Criar um novo contacto"
 
-#: po/tmp/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete a contact"
 msgstr "Apagar um contacto"
 
-#: 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 "Encontrar"
 
-#: po/tmp/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:11
 msgid "Find a contact"
 msgstr "Encontrar um contacto"
 
-#: 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 "Novo"
 
-#: po/tmp/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:14
 msgid "Print contacts"
 msgstr "Imprimir contactos"
 
-#: 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
 #, fuzzy
 msgid "View all contacts"
 msgstr "Encontrar um contacto"
 
-#: po/tmp/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "_Addressbook Configuration..."
+msgstr "ConfiguraГЦo do co_rreio..."
+
+#: ui/evolution-addressbook.xml.h:20
 #, fuzzy
 msgid "_Print Contacts..."
 msgstr "Imprimir contactos"
 
-#: po/tmp/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:21
 msgid "_Search for contacts"
 msgstr ""
 
-#: po/tmp/evolution-addressbook.xml.h:21
-#: po/tmp/evolution-event-editor.xml.h:123
+#: ui/evolution-addressbook.xml.h:22 ui/evolution-event-editor.xml.h:123
 msgid "_Tools"
 msgstr "_Ferramentas"
 
 #.
-#. * 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 Dias"
 
-#: po/tmp/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:7
 #, fuzzy
 msgid "Alter preferences"
 msgstr "PreferЙncias"
 
-#: po/tmp/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:8
 #, fuzzy
 msgid "Ca_lendar"
 msgstr "Novo Ca_lendАrio"
 
-#: po/tmp/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:9
 #, fuzzy
 msgid "Calendar Preferences..."
 msgstr "PreferЙncias"
 
-#: 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 "Criar um novo calendАrio"
 
-#: po/tmp/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:12
 msgid "Day"
 msgstr "Dia"
 
-#: 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 "Ir para"
 
-#: po/tmp/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to a specific date"
 msgstr "Ir para uma data especМfica"
 
-#: 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 "MЙs"
 
-#: 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 "Abrir um calendАrio"
 
-#: 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 "Imprimir este calendАrio"
 
-#: 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 "Mostrar 1 dia"
 
-#: po/tmp/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:27
 msgid "Show 1 month"
 msgstr "Mostrar 1 mЙs"
 
-#: po/tmp/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:28
 msgid "Show 1 week"
 msgstr "Mostrar 1 semana"
 
-#: po/tmp/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr "Mostrar a semana de trabalho"
 
-#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:414
+#: ui/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:413
 msgid "Today"
 msgstr "Hoje"
 
-#: po/tmp/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:31
 msgid "Week"
 msgstr "Semana"
 
-#: 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 "_Novo"
 
-#: po/tmp/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:33
 #, fuzzy
 msgid "_Open Calendar"
 msgstr "Abrir Ca_lendАrio"
 
-#: po/tmp/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:34
 #, fuzzy
 msgid "_Print this calendar"
 msgstr "Imprimir este calendАrio"
 
-#: po/tmp/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:35
 #, fuzzy
-msgid "_Save Calendar As"
-msgstr "Guardar CalendАrio como"
+msgid "_Save As..."
+msgstr "Gravar na _pasta..."
 
-#: po/tmp/evolution-contact-editor.xml.h:7
+#: ui/evolution-contact-editor.xml.h:7
 msgid "Delete this item"
 msgstr "Apagar este item"
 
-#: po/tmp/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:8
 #, fuzzy
 msgid "Delete..."
 msgstr "Apagar"
 
-#: 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
 #, fuzzy
 msgid "Print En_velope..."
 msgstr "Imprimir..."
 
-#: 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 "Imprimir este item"
 
-#: 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 "Imprimir..."
 
-#: po/tmp/evolution-contact-editor.xml.h:13
-#: po/tmp/evolution-event-editor.xml.h:89
-#: po/tmp/evolution-message-composer.xml.h:18
+#: ui/evolution-contact-editor.xml.h:13 ui/evolution-event-editor.xml.h:89
+#: ui/evolution-message-composer.xml.h:21
 #, fuzzy
 msgid "Save _As..."
 msgstr "Gravar na _pasta..."
 
-#: 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
 #, fuzzy
 msgid "Save and Close"
 msgstr "Guardar CalendАrio como"
 
-#: 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
 #, fuzzy
 msgid "Send _message to contact..."
 msgstr "Enviar mensagem em formato HTML"
 
-#: po/tmp/evolution-contact-editor.xml.h:19
-#: po/tmp/evolution-event-editor.xml.h:110
-#: po/tmp/evolution-message-composer.xml.h:38
-#: 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
 #, fuzzy
 msgid "_File"
 msgstr "_Pasta"
 
-#: po/tmp/evolution-contact-editor.xml.h:20
+#: ui/evolution-contact-editor.xml.h:20
 #, fuzzy
 msgid "_Print..."
 msgstr "Imprimir..."
 
-#: po/tmp/evolution-contact-editor.xml.h:21
-#: po/tmp/evolution-event-editor.xml.h:121
-#: po/tmp/evolution-message-composer.xml.h:42
+#: 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 "_AcГУes"
 
-#: po/tmp/evolution-event-editor.xml.h:9
+#: ui/evolution-event-editor.xml.h:9
 #, fuzzy
 msgid "C_lear"
 msgstr "Carro"
 
-#: po/tmp/evolution-event-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:10
 #, fuzzy
 msgid "C_ut"
 msgstr "Cortar"
 
-#: po/tmp/evolution-event-editor.xml.h:11
+#: ui/evolution-event-editor.xml.h:11
 #, fuzzy
 msgid "Clear"
 msgstr "Carro"
 
-#: 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
 #, fuzzy
 msgid "Close this appointment"
 msgstr "Novo compromisso"
 
-#: 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 "Copiar"
 
-#: 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 "Cortar"
 
-#: 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
 #, fuzzy
 msgid "FIXME: Define Print _Styles"
 msgstr "Pedido de _encontro"
 
-#: 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
 #, fuzzy
 msgid "FIXME: Save Attac_hments..."
 msgstr "Adicionar anexo..."
 
-#: 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
 #, fuzzy
 msgid "FIXME: Task _Request"
 msgstr "_Pedido de tarefa"
 
-#: po/tmp/evolution-event-editor.xml.h:46
+#: ui/evolution-event-editor.xml.h:46
 #, fuzzy
 msgid "FIXME: _Contact"
 msgstr "_Contacto"
 
-#: 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
 #, fuzzy
 msgid "FIXME: _Formatting"
 msgstr "_Contacto"
 
-#: 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
 #, fuzzy
 msgid "FIXME: _Journal Entry"
 msgstr "_Entrada diАria?"
 
-#: 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 "Mensagem de _correio"
 
-#: 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
 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 "_Compromisso"
 
-#: 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:10
+#: ui/evolution-event-editor.xml.h:66 ui/evolution-message-composer.xml.h:11
 msgid "F_ormat"
 msgstr "F_ormato"
 
-#: 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 "Ir para o prСximo item"
 
-#: po/tmp/evolution-event-editor.xml.h:71
+#: ui/evolution-event-editor.xml.h:71
 msgid "Go to the previous item"
 msgstr "Ir para o item anterior"
 
-#: po/tmp/evolution-event-editor.xml.h:72
+#: ui/evolution-event-editor.xml.h:72
 #, fuzzy
 msgid "Modify the file's properties"
 msgstr "Propriedades"
 
-#: po/tmp/evolution-event-editor.xml.h:73
+#: ui/evolution-event-editor.xml.h:73
 #, fuzzy
 msgid "N_ext"
 msgstr "PrС_ximo"
 
-#: po/tmp/evolution-event-editor.xml.h:75
+#: ui/evolution-event-editor.xml.h:75
 msgid "Paste"
 msgstr "Colar"
 
-#: po/tmp/evolution-event-editor.xml.h:76
+#: ui/evolution-event-editor.xml.h:76
 #, fuzzy
 msgid "Paste the clipboard"
 msgstr "Colar item da Аrea de transferЙncia"
 
-#: po/tmp/evolution-event-editor.xml.h:77
+#: ui/evolution-event-editor.xml.h:77
 msgid "Pre_vious"
 msgstr "An_terior"
 
-#: po/tmp/evolution-event-editor.xml.h:78
+#: ui/evolution-event-editor.xml.h:78
 #, fuzzy
 msgid "Previous"
 msgstr "An_terior"
 
-#: po/tmp/evolution-event-editor.xml.h:79
+#: ui/evolution-event-editor.xml.h:79
 #, fuzzy
 msgid "Print S_etup..."
 msgstr "Imprimir..."
 
-#: po/tmp/evolution-event-editor.xml.h:80
+#: ui/evolution-event-editor.xml.h:80
 #, fuzzy
 msgid "Print Setup"
 msgstr "Imprimir"
 
-#: po/tmp/evolution-event-editor.xml.h:83
+#: ui/evolution-event-editor.xml.h:83
 #, fuzzy
 msgid "Properties"
 msgstr "Propriedades do alarme"
 
-#: po/tmp/evolution-event-editor.xml.h:84
+#: ui/evolution-event-editor.xml.h:84
 #, fuzzy
 msgid "Redo"
 msgstr "Remover"
 
-#: 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
 #, fuzzy
 msgid "Replace"
 msgstr "Responder"
 
-#: 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:21
+#: ui/evolution-event-editor.xml.h:92 ui/evolution-message-composer.xml.h:24
 #, fuzzy
 msgid "Save the current file"
 msgstr "Ficheiro com assinatura:"
 
-#: 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
 #, fuzzy
 msgid "Select All"
 msgstr "Reponder para todos"
 
-#: po/tmp/evolution-event-editor.xml.h:100
+#: ui/evolution-event-editor.xml.h:100
 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 "Anular"
 
-#: po/tmp/evolution-event-editor.xml.h:103
+#: ui/evolution-event-editor.xml.h:103
 #, fuzzy
 msgid "Undo the last action"
 msgstr "Anular a Зltima operaГЦo"
 
-#: po/tmp/evolution-event-editor.xml.h:104
-#: po/tmp/evolution-message-composer.xml.h:34
+#: 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:35
+#: ui/evolution-event-editor.xml.h:105 ui/evolution-message-composer.xml.h:39
 #, fuzzy
 msgid "_Close"
 msgstr "Cores"
 
-#: po/tmp/evolution-event-editor.xml.h:106
+#: ui/evolution-event-editor.xml.h:106
 #, fuzzy
 msgid "_Copy"
 msgstr "Copiar"
 
-#: po/tmp/evolution-event-editor.xml.h:107
-#: po/tmp/evolution-message-composer.xml.h:36
+#: 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:37
-#: 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
 #, fuzzy
 msgid "_Edit"
 msgstr "Editar..."
 
-#: po/tmp/evolution-event-editor.xml.h:111
+#: ui/evolution-event-editor.xml.h:111
 #, fuzzy
 msgid "_Find..."
 msgstr "Encontrar"
 
-#: po/tmp/evolution-event-editor.xml.h:112
+#: ui/evolution-event-editor.xml.h:112
 #, fuzzy
 msgid "_Forms"
 msgstr "_Pasta"
 
-#: po/tmp/evolution-event-editor.xml.h:113
-#: po/tmp/evolution-message-composer.xml.h:39 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 "_Inserir"
 
-#: po/tmp/evolution-event-editor.xml.h:115
+#: ui/evolution-event-editor.xml.h:115
 msgid "_Object"
 msgstr "_Objecto"
 
-#: po/tmp/evolution-event-editor.xml.h:116
+#: ui/evolution-event-editor.xml.h:116
 #, fuzzy
 msgid "_Paste"
 msgstr "Colar"
 
-#: po/tmp/evolution-event-editor.xml.h:117
+#: ui/evolution-event-editor.xml.h:117
 #, fuzzy
 msgid "_Print"
 msgstr "Imprimir"
 
-#: po/tmp/evolution-event-editor.xml.h:118
+#: ui/evolution-event-editor.xml.h:118
 #, fuzzy
 msgid "_Properties..."
 msgstr "Propriedades do alarme"
 
-#: 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 "_Ferramentas"
 
-#: po/tmp/evolution-event-editor.xml.h:124
+#: ui/evolution-event-editor.xml.h:124
 #, fuzzy
 msgid "_Undo"
 msgstr "Anular"
 
 #.
-#. * 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
 #, fuzzy
 msgid "Compose"
 msgstr "Cores"
 
-#: po/tmp/evolution-mail.xml.h:7
+#: ui/evolution-mail.xml.h:7
 #, fuzzy
 msgid "Compose a new message"
 msgstr "Criar uma nova mensagem"
 
-#: po/tmp/evolution-mail.xml.h:9
+#: ui/evolution-mail.xml.h:9
 #, fuzzy
 msgid "Copy message to a new folder"
 msgstr "Gravar a mensagem na pasta especificada"
 
-#: 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
 #, fuzzy
 msgid "F_older"
 msgstr "_Pastas"
 
-#: 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 "Esquecer _Senhas"
 
-#: po/tmp/evolution-mail.xml.h:20
+#: ui/evolution-mail.xml.h:20
 #, fuzzy
 msgid "Get Mail"
 msgstr "_Correio"
 
-#: po/tmp/evolution-mail.xml.h:21
-msgid "Mail _Filters"
-msgstr ""
+#: ui/evolution-mail.xml.h:22
+#, fuzzy
+msgid "Hide _Deleted messages"
+msgstr "Imprimir a mensagem seleccionada"
+
+#: ui/evolution-mail.xml.h:23
+#, fuzzy
+msgid "Hide _Read messages"
+msgstr "Novas mensagens de correio"
 
-#: po/tmp/evolution-mail.xml.h:22
-msgid "Manage Subscriptions"
+#: ui/evolution-mail.xml.h:24
+#, fuzzy
+msgid "Hide _Selected messages"
+msgstr "Imprimir a mensagem seleccionada"
+
+#: ui/evolution-mail.xml.h:25
+#, fuzzy
+msgid "Mail _Filters..."
+msgstr "DruМda dos _filtros"
+
+#: ui/evolution-mail.xml.h:26
+msgid "Manage Subscriptions..."
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:23
+#: ui/evolution-mail.xml.h:27
 msgid "Mar_k As Read"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:28
 msgid "Mark As U_nread"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:29
 #, fuzzy
 msgid "Move"
 msgstr "Sg"
 
-#: po/tmp/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:30
 #, fuzzy
 msgid "Move message to a new folder"
 msgstr "Gravar a mensagem na pasta especificada"
 
-#: po/tmp/evolution-mail.xml.h:27
+#: ui/evolution-mail.xml.h:31
 msgid "Previews the message to be printed"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:29
+#: ui/evolution-mail.xml.h:33
 #, fuzzy
 msgid "Print Preview of message..."
 msgstr "Prever impressЦo"
 
-#: po/tmp/evolution-mail.xml.h:30
+#: ui/evolution-mail.xml.h:34
 msgid "Print message to the printer"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:31
+#: ui/evolution-mail.xml.h:35
 #, fuzzy
 msgid "Print message..."
 msgstr "Encontrar mensagens"
 
-#: po/tmp/evolution-mail.xml.h:35
+#: ui/evolution-mail.xml.h:39
 #, fuzzy
 msgid "Reply to _All"
 msgstr "Reponder para todos"
 
-#: po/tmp/evolution-mail.xml.h:36
+#: ui/evolution-mail.xml.h:40
 #, fuzzy
 msgid "Reply to _Sender"
 msgstr "Reponder para todos"
 
-#: po/tmp/evolution-mail.xml.h:39 po/tmp/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:43 ui/evolution-subscribe.xml.h:12
 #, fuzzy
 msgid "Select _All"
 msgstr "Reponder para todos"
 
-#: po/tmp/evolution-mail.xml.h:40
+#: ui/evolution-mail.xml.h:44
 msgid "Send queued mail and retrieve new mail"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:41
+#: ui/evolution-mail.xml.h:45
+#, fuzzy
+msgid "Show _All messages"
+msgstr "Novas mensagens de correio"
+
+#: ui/evolution-mail.xml.h:46
 msgid "Threaded Message list"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:42
+#: ui/evolution-mail.xml.h:47
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:48
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:49
 msgid "View Raw Message Source"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:50
 msgid "_Apply Filters"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:51
 #, fuzzy
 msgid "_Configure Folder"
 msgstr "_Nova pasta"
 
-#: po/tmp/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:52
 #, fuzzy
 msgid "_Copy to Folder..."
 msgstr "Ir para a _pasta..."
 
-#: po/tmp/evolution-mail.xml.h:49
+#: ui/evolution-mail.xml.h:54
 #, fuzzy
 msgid "_Edit Message"
 msgstr "Mensagem de _correio"
 
-#: po/tmp/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:55
 msgid "_Expunge"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:56
 msgid "_Filter on Subject"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:57
 msgid "_Forward"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:53 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:54
+#: ui/evolution-mail.xml.h:59
 #, fuzzy
-msgid "_Mail Configuration"
-msgstr "ConfiguraГЦo do correio"
+msgid "_Mail Configuration..."
+msgstr "ConfiguraГЦo do co_rreio..."
 
-#: po/tmp/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:60
 #, fuzzy
 msgid "_Message"
 msgstr "Mensagem de _correio"
 
-#: po/tmp/evolution-mail.xml.h:56
+#: ui/evolution-mail.xml.h:61
 #, fuzzy
 msgid "_Move to Folder..."
 msgstr "Ir para a _pasta..."
 
-#: po/tmp/evolution-mail.xml.h:57
+#: ui/evolution-mail.xml.h:62
 #, fuzzy
 msgid "_Open in New Window"
 msgstr "еbrir em nova janela"
 
-#: po/tmp/evolution-mail.xml.h:58
+#: ui/evolution-mail.xml.h:63
 #, fuzzy
 msgid "_Print Message"
 msgstr "Encontrar mensagens"
 
-#: po/tmp/evolution-mail.xml.h:59
+#: ui/evolution-mail.xml.h:64
 msgid "_Save Message As..."
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:60
+#: ui/evolution-mail.xml.h:65
 #, fuzzy
 msgid "_Source"
 msgstr "Fontes"
 
-#: po/tmp/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:66
 msgid "_Threaded"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:67
 #, fuzzy
 msgid "_Undelete"
 msgstr "Apagar"
 
-#: po/tmp/evolution-mail.xml.h:63
+#: ui/evolution-mail.xml.h:68
 msgid "_VFolder on Subject"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:64
-msgid "_Virtual Folder Editor"
-msgstr ""
+#: ui/evolution-mail.xml.h:69
+#, fuzzy
+msgid "_Virtual Folder Editor..."
+msgstr "_Pastas"
 
 #.
-#. * 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 "Anexar"
 
-#: po/tmp/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:9
 #, fuzzy
 msgid "Close the current file"
 msgstr "Fechar o calendАrio corrente"
 
-#: po/tmp/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Encrypt this message with PGP"
+msgstr "Enviar a mensagem"
+
+#: ui/evolution-message-composer.xml.h:12
 msgid "HTML"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:13
 #, fuzzy
 msgid "Insert a file as text into the message"
 msgstr "Anexar um ficheiro Ю mensagem"
 
-#: po/tmp/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:14
 msgid "Insert text file..."
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:16
 #, fuzzy
 msgid "Open a file"
 msgstr "Abrir ficheiro"
 
-#: po/tmp/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:17
+msgid "PGP Encrypt"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:18
+msgid "PGP Sign"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:20
 #, fuzzy
 msgid "Save As"
 msgstr "Guardar CalendАrio como"
 
-#: po/tmp/evolution-message-composer.xml.h:19
+#: ui/evolution-message-composer.xml.h:22
 #, fuzzy
 msgid "Save in _folder... (FIXME)"
 msgstr "Gravar na _pasta..."
 
-#: po/tmp/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:23
 #, fuzzy
 msgid "Save in folder..."
 msgstr "Gravar na _pasta..."
 
-#: po/tmp/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "Gravar a mensagem na pasta especificada"
 
-#: po/tmp/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "Enviar"
 
-#: po/tmp/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:30
 #, fuzzy
 msgid "Send the mail in HTML format"
 msgstr "Enviar mensagem em formato HTML"
 
-#: po/tmp/evolution-message-composer.xml.h:28
+#: ui/evolution-message-composer.xml.h:31
 #, fuzzy
 msgid "Send the message later"
 msgstr "Enviar a mensagem"
 
-#: po/tmp/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:32
 #, fuzzy
 msgid "Send the message now"
 msgstr "Enviar a mensagem"
 
-#: po/tmp/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:33
 #, fuzzy
 msgid "Send this message now"
 msgstr "Enviar esta mensagem"
 
-#: po/tmp/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:34
 #, fuzzy
 msgid "Show / hide attachments"
 msgstr "Ver/esconder anexos"
 
-#: po/tmp/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:35
 #, fuzzy
 msgid "Show _attachments"
 msgstr "Ver _anexos"
 
-#: po/tmp/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:36
 #, fuzzy
 msgid "Show attachments"
 msgstr "Ver _anexos"
 
-#: po/tmp/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Sign this message with your PGP key"
+msgstr "Enviar esta mensagem"
+
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Insert text file... (FIXME)"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:45
 #, fuzzy
 msgid "_Open..."
 msgstr "_Abrir"
 
+#: 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 "Mostrar uma pasta diferente"
 
-#: po/tmp/evolution.xml.h:7
+#: ui/evolution.xml.h:7
 #, fuzzy
 msgid "E_xit"
 msgstr "PrС_ximo"
 
-#: po/tmp/evolution.xml.h:8
+#: ui/evolution.xml.h:8
 #, fuzzy
 msgid "Evolution bar _shortcut"
 msgstr "Atalho para _barra do Evolution"
 
-#: 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
 msgid "Getting _Started"
 msgstr "_ComeГando"
 
-#: po/tmp/evolution.xml.h:11
+#: ui/evolution.xml.h:11
 msgid "Show information about Evolution"
 msgstr ""
 
-#: po/tmp/evolution.xml.h:12
+#: ui/evolution.xml.h:12
 #, fuzzy
 msgid "Show the _Folder Bar"
 msgstr "Mostrar a barra de pastas"
 
-#: po/tmp/evolution.xml.h:13
+#: ui/evolution.xml.h:13
 #, fuzzy
 msgid "Show the _Shortcut Bar"
 msgstr "Mostrar a barra de atalhos"
 
-#: 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 ""
 
-#: po/tmp/evolution.xml.h:16
+#: ui/evolution.xml.h:16
 #, fuzzy
 msgid "Toggle whether to show the folder bar"
 msgstr "Mostrar a barra de pastas"
 
-#: po/tmp/evolution.xml.h:17
+#: ui/evolution.xml.h:17
 #, fuzzy
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Mostrar a barra de atalhos"
 
-#: po/tmp/evolution.xml.h:18
+#: ui/evolution.xml.h:18
 #, fuzzy
 msgid "Using the C_ontact Manager"
 msgstr "Usando o programa de C_orreio"
 
-#: po/tmp/evolution.xml.h:19
+#: ui/evolution.xml.h:19
 msgid "Using the _Calendar"
 msgstr "Usando o _CalendАrio"
 
-#: po/tmp/evolution.xml.h:20
+#: ui/evolution.xml.h:20
 msgid "Using the _Mailer"
 msgstr "Usando o programa de C_orreio"
 
-#: po/tmp/evolution.xml.h:21
+#: ui/evolution.xml.h:21
 #, fuzzy
 msgid "_About Evolution..."
 msgstr "Evolution"
 
-#: po/tmp/evolution.xml.h:22
+#: ui/evolution.xml.h:22
 #, fuzzy
 msgid "_Appointment (FIXME)"
 msgstr "_Compromisso"
 
-#: po/tmp/evolution.xml.h:23
+#: ui/evolution.xml.h:23
 #, fuzzy
 msgid "_Contact (FIXME)"
 msgstr "_Contacto"
 
-#: po/tmp/evolution.xml.h:26
+#: ui/evolution.xml.h:26
 msgid "_Folder"
 msgstr "_Pasta"
 
-#: po/tmp/evolution.xml.h:27
+#: ui/evolution.xml.h:27
 #, fuzzy
 msgid "_Go to Folder..."
 msgstr "Ir para a _pasta..."
 
-#: po/tmp/evolution.xml.h:29
+#: ui/evolution.xml.h:29
 #, fuzzy
 msgid "_Index"
 msgstr "мnd_ice de ajuda"
 
-#: po/tmp/evolution.xml.h:30
+#: ui/evolution.xml.h:30
 #, fuzzy
 msgid "_Mail message (FIXME)"
 msgstr "Mensagem de _correio"
 
-#: 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 ""
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2470
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
 msgid "%A, %B %d, %Y"
 msgstr ""
 
@@ -6747,29 +7166,35 @@ msgstr "Hora de _fim de _encontro"
 msgid "All Attendees"
 msgstr ""
 
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: widgets/misc/e-calendar-item.c:421
+msgid "MTWTFSS"
+msgstr ""
+
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
+#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
 msgid "%B %Y"
 msgstr ""
 
-#: widgets/misc/e-clipped-label.c:107
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-dateedit.c:408
+#: widgets/misc/e-dateedit.c:407
 #, fuzzy
 msgid "Now"
 msgstr "Novo"
 
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1249 widgets/misc/e-dateedit.c:1308
-#: widgets/misc/e-dateedit.c:1487
+#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
+#: widgets/misc/e-dateedit.c:1486
 msgid "%H:%M"
 msgstr ""
 
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1252 widgets/misc/e-dateedit.c:1311
-#: widgets/misc/e-dateedit.c:1490
+#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
+#: widgets/misc/e-dateedit.c:1489
 msgid "%I:%M %p"
 msgstr ""
 
@@ -6778,6 +7203,109 @@ msgstr ""
 msgid "Group %i"
 msgstr "Grupo %i"
 
+#~ msgid "Headings:"
+#~ msgstr "CabeГalhos:"
+
+#~ msgid "Empty days:"
+#~ msgstr "Dias vazios:"
+
+#~ msgid "Appointments:"
+#~ msgstr "Compromissos:"
+
+#, fuzzy
+#~ msgid "may"
+#~ msgstr "Dia"
+
+#, fuzzy
+#~ msgid "sunday"
+#~ msgstr "Domingo"
+
+#, fuzzy
+#~ msgid "monday"
+#~ msgstr "Segunda-feira"
+
+#, fuzzy
+#~ msgid "tuesday"
+#~ msgstr "Domingo"
+
+#, fuzzy
+#~ msgid "thur"
+#~ msgstr "Outro"
+
+#, fuzzy
+#~ msgid "thurs"
+#~ msgstr "Outro"
+
+#, fuzzy
+#~ msgid "friday"
+#~ msgstr "PrimАrio"
+
+#, fuzzy
+#~ msgid "today"
+#~ msgstr "Hoje"
+
+#, fuzzy
+#~ msgid "last"
+#~ msgstr "Colar"
+
+#, fuzzy
+#~ msgid "next"
+#~ msgstr "PrС_ximo"
+
+#, fuzzy
+#~ msgid "third"
+#~ msgstr "Outro"
+
+#, fuzzy
+#~ msgid "fourth"
+#~ msgstr "Hora"
+
+#, fuzzy
+#~ msgid "ninth"
+#~ msgstr "Imprimir"
+
+#, fuzzy
+#~ msgid "tenth"
+#~ msgstr "Enviar"
+
+#~ msgid "Year:"
+#~ msgstr "Ano:"
+
+#, fuzzy
+#~ msgid "Mail Source"
+#~ msgstr "atalhos principais"
+
+#, fuzzy
+#~ msgid "Send \"%s\""
+#~ msgstr "Segundos"
+
+#, fuzzy
+#~ msgid "Forward message \"%s\""
+#~ msgstr "Enviar esta mensagem"
+
+#, fuzzy
+#~ msgid "Synchronize \"%s\""
+#~ msgstr "Sincronizar"
+
+#, fuzzy
+#~ msgid "Save messages from folder \"%s\""
+#~ msgstr "Gravar a mensagem na pasta especificada"
+
+#, fuzzy
+#~ msgid "Rebuild message view"
+#~ msgstr "Encontrar mensagens"
+
+#~ msgid "_Actions"
+#~ msgstr "_AcГУes"
+
+#, fuzzy
+#~ msgid "_Save Calendar As"
+#~ msgstr "Guardar CalendАrio como"
+
+#, fuzzy
+#~ msgid "_Mail Configuration"
+#~ msgstr "ConfiguraГЦo do correio"
+
 #, fuzzy
 #~ msgid "FIXME: _Appointment"
 #~ msgstr "_Compromisso"
@@ -6785,9 +7313,6 @@ msgstr "Grupo %i"
 #~ msgid "Insert a file as an attachment"
 #~ msgstr "Inserir ficheiro como anexo"
 
-#~ msgid "_New Contact"
-#~ msgstr "_Novo Contacto"
-
 #~ msgid "Gnome Calendar"
 #~ msgstr "CalendАrio do Gnome"
 
@@ -6829,9 +7354,6 @@ msgstr "Grupo %i"
 #~ msgid "Second"
 #~ msgstr "Segundo"
 
-#~ msgid "?"
-#~ msgstr "?"
-
 #~ msgid "Cut selected item into clipboard"
 #~ msgstr "Cortar item seleccionado para a Аrea de transferЙncia"
 
@@ -6856,12 +7378,6 @@ msgstr "Grupo %i"
 #~ msgid "Check for new mail"
 #~ msgstr "Verificar novo correio"
 
-#~ msgid "_Filter Druid ..."
-#~ msgstr "DruМda dos _filtros"
-
-#~ msgid "_Mail Configuration ..."
-#~ msgstr "ConfiguraГЦo do co_rreio..."
-
 #~ msgid "Mail Component: I could not initialize Bonobo"
 #~ msgstr "Component de correio: NЦo consegui inicializar Bonobo"
 
@@ -6959,15 +7475,6 @@ msgstr "Grupo %i"
 #~ msgid "Executive Summary"
 #~ msgstr "SumАrio executivo"
 
-#~ msgid "Inbox"
-#~ msgstr "Correio novo"
-
-#~ msgid "New mail messages"
-#~ msgstr "Novas mensagens de correio"
-
-#~ msgid "Sent mail messages"
-#~ msgstr "Mensagens enviadas"
-
 #~ msgid "Your contacts list"
 #~ msgstr "A sua lista de contactos"
 
diff --git a/po/ru.po b/po/ru.po
index 769d094e1b..d482997261 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: E-volution\n"
-"POT-Creation-Date: 2000-12-21 12:06+0300\n"
+"POT-Creation-Date: 2001-01-06 00:11+0100\n"
 "PO-Revision-Date: 2000-12-21 12:07+03:00\n"
 "Last-Translator: Valek Filippov <frob@df.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -285,10 +285,10 @@ msgstr ""
 #: addressbook/backend/ebook/load-pine-addressbook.c:17
 #: addressbook/backend/ebook/test-client-list.c:18
 #: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1020
+#: addressbook/conduit/address-conduit.c:1083
 #: addressbook/gui/component/addressbook-factory.c:38
 #: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:53
+#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "Не удалось инициализировать Bonobo"
 
@@ -411,53 +411,36 @@ msgstr ""
 "При попытке получить список Пилотов\n"
 "от демона gnome-pilot возникла ошибка"
 
-#: addressbook/conduit/address-conduit.c:191
+#: addressbook/conduit/address-conduit.c:195
 msgid "Cursor could not be loaded\n"
 msgstr "Курсор не может быть загружен\n"
 
-#: addressbook/conduit/address-conduit.c:204
+#: addressbook/conduit/address-conduit.c:208
 msgid "EBook not loaded\n"
 msgstr "EBook не загружена\n"
 
-#: addressbook/conduit/address-conduit.c:604
+#: addressbook/conduit/address-conduit.c:646
 #: calendar/conduits/calendar/calendar-conduit.c:730
 #: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat server"
 msgstr "Не удалось запустить сервер wombat"
 
-#: addressbook/conduit/address-conduit.c:605
+#: addressbook/conduit/address-conduit.c:647
 #: calendar/conduits/calendar/calendar-conduit.c:731
 #: calendar/conduits/todo/todo-conduit.c:546
 msgid "Could not start wombat"
 msgstr "Не удалось запустить wombat"
 
-#: addressbook/conduit/address-conduit.c:637
-#: addressbook/conduit/address-conduit.c:640
+#: addressbook/conduit/address-conduit.c:679
+#: addressbook/conduit/address-conduit.c:682
 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 "Удалить контакт?"
 
@@ -471,7 +454,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 "Удалить"
 
@@ -485,12 +468,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 "Добавить"
 
@@ -531,7 +515,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 "Первый эл.адрес"
 
@@ -548,7 +532,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 "Категории..."
 
@@ -565,7 +549,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 "Общее"
 
@@ -610,143 +595,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 "Почтовый индекс:"
 
@@ -760,10 +745,13 @@ msgid "Check Full Name"
 msgstr "Проверить полное имя"
 
 #: addressbook/contact-editor/fullname-strings.h:8
+#, fuzzy
 msgid ""
 "\n"
 "Mr.\n"
 "Mrs.\n"
+"Ms.\n"
+"Miss\n"
 "Dr.\n"
 msgstr ""
 "\n"
@@ -771,7 +759,7 @@ msgstr ""
 "г-жа.\n"
 "д-р.\n"
 
-#: addressbook/contact-editor/fullname-strings.h:13
+#: addressbook/contact-editor/fullname-strings.h:15
 msgid ""
 "\n"
 "Sr.\n"
@@ -789,44 +777,49 @@ msgstr ""
 "III\n"
 "Esq.\n"
 
-#: addressbook/contact-editor/fullname-strings.h:21
+#: addressbook/contact-editor/fullname-strings.h:23
 msgid "_First:"
 msgstr "Имя:"
 
-#: addressbook/contact-editor/fullname-strings.h:22
+#: addressbook/contact-editor/fullname-strings.h:24
 msgid "_Title:"
 msgstr "Заголовок:"
 
-#: addressbook/contact-editor/fullname-strings.h:23
+#: addressbook/contact-editor/fullname-strings.h:25
 msgid "_Middle:"
 msgstr "Отчество:"
 
-#: addressbook/contact-editor/fullname-strings.h:24
+#: addressbook/contact-editor/fullname-strings.h:26
 msgid "_Last:"
 msgstr "Фамилия:"
 
-#: addressbook/contact-editor/fullname-strings.h:25
+#: addressbook/contact-editor/fullname-strings.h:27
 msgid "_Suffix:"
 msgstr "Суффикс:"
 
-#: addressbook/gui/component/addressbook.c:263
+#: addressbook/gui/component/addressbook.c:231
 msgid "As _Minicards"
 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/gui/component/addressbook.c:269
-#: 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:386
+#: addressbook/gui/component/addressbook.c:374
+#, fuzzy, c-format
+msgid "Enter password for %s"
+msgstr "%sПожалуйста, введите пароль IMAP для %s@%s"
+
+#: addressbook/gui/component/addressbook.c:402
 msgid "Unable to open addressbook"
 msgstr "Не удалось открыть адресную книгу"
 
-#: addressbook/gui/component/addressbook.c:391
+#: 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"
@@ -846,77 +839,207 @@ msgstr ""
 "использовать LDAP, вам надо скачать и установить \n"
 "OpenLDAP и перекомпилировать и установить evolution.\n"
 
-#: addressbook/gui/component/addressbook.c:501 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:503 mail/folder-browser.c:138
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 msgid "Advanced..."
 msgstr "Расширенные..."
 
-#: addressbook/gui/component/addressbook.c:533
+#: addressbook/gui/component/addressbook.c:560
 msgid "Any field contains"
 msgstr "Любое поле содержит"
 
-#: addressbook/gui/component/addressbook.c:534
+#: addressbook/gui/component/addressbook.c:561
 msgid "Name contains"
 msgstr "Имя содержит"
 
-#: addressbook/gui/component/addressbook.c:535
+#: addressbook/gui/component/addressbook.c:562
 msgid "Email contains"
 msgstr "Эл.адрес содержит"
 
-#: addressbook/gui/component/addressbook.c:621
+#: addressbook/gui/component/addressbook.c:648
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, который будет показывать программа просмотра папок"
 
-#: addressbook/gui/component/e-ldap-storage.c:88
-msgid "External Directories"
-msgstr "Внешние каталоги"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/e-msg-composer-attachment.glade.h:7
-#: po/tmp/ldap-server-dialog.glade.h:6
-msgid "Description:"
-msgstr "Описание:"
+#: addressbook/gui/component/addressbook-storage.c:95
+#, fuzzy
+msgid "Other Contacts"
+msgstr "Удалить контакт?"
 
-#: po/tmp/ldap-server-dialog.glade.h:7
-msgid "LDAP Server:"
+#: addressbook/gui/component/addressbook-config.c:139
+#, fuzzy
+msgid "LDAP Server"
 msgstr "Сервер LDAP:"
 
-#: po/tmp/ldap-server-dialog.glade.h:8
+#: 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
 msgid "Name:"
 msgstr "Имя:"
 
-#: po/tmp/ldap-server-dialog.glade.h:9
-msgid "Port Number:"
-msgstr "Номер порта:"
+#: addressbook/gui/component/addressbook-config.c:617
+#: composer/e-msg-composer-attachment.glade.h:7
+msgid "Description:"
+msgstr "Описание:"
 
-#: po/tmp/ldap-server-dialog.glade.h:10
-msgid "Root DN:"
+#: 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 "Имя:"
+
+#: 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
@@ -925,119 +1048,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 "a"
 
-#: po/tmp/alphabet.glade.h:8
+#: addressbook/gui/widgets/alphabet.glade.h:8
 msgid "b"
 msgstr "b"
 
-#: po/tmp/alphabet.glade.h:9
+#: addressbook/gui/widgets/alphabet.glade.h:9
 msgid "c"
 msgstr "c"
 
-#: po/tmp/alphabet.glade.h:10
+#: addressbook/gui/widgets/alphabet.glade.h:10
 msgid "d"
 msgstr "d"
 
-#: po/tmp/alphabet.glade.h:11
+#: addressbook/gui/widgets/alphabet.glade.h:11
 msgid "e"
 msgstr "e"
 
-#: po/tmp/alphabet.glade.h:12
+#: addressbook/gui/widgets/alphabet.glade.h:12
 msgid "f"
 msgstr "f"
 
-#: po/tmp/alphabet.glade.h:13
+#: addressbook/gui/widgets/alphabet.glade.h:13
 msgid "g"
 msgstr "g"
 
-#: po/tmp/alphabet.glade.h:14
+#: addressbook/gui/widgets/alphabet.glade.h:14
 msgid "h"
 msgstr "h"
 
-#: po/tmp/alphabet.glade.h:15
+#: addressbook/gui/widgets/alphabet.glade.h:15
 msgid "i"
 msgstr "i"
 
-#: po/tmp/alphabet.glade.h:16
+#: addressbook/gui/widgets/alphabet.glade.h:16
 msgid "j"
 msgstr "j"
 
-#: po/tmp/alphabet.glade.h:17
+#: addressbook/gui/widgets/alphabet.glade.h:17
 msgid "k"
 msgstr "k"
 
-#: po/tmp/alphabet.glade.h:18
+#: addressbook/gui/widgets/alphabet.glade.h:18
 msgid "l"
 msgstr "l"
 
-#: po/tmp/alphabet.glade.h:19
+#: addressbook/gui/widgets/alphabet.glade.h:19
 msgid "m"
 msgstr "m"
 
-#: po/tmp/alphabet.glade.h:20
+#: addressbook/gui/widgets/alphabet.glade.h:20
 msgid "n"
 msgstr "n"
 
-#: po/tmp/alphabet.glade.h:21
+#: addressbook/gui/widgets/alphabet.glade.h:21
 msgid "o"
 msgstr "o"
 
-#: po/tmp/alphabet.glade.h:22
+#: addressbook/gui/widgets/alphabet.glade.h:22
 msgid "p"
 msgstr "p"
 
-#: po/tmp/alphabet.glade.h:23
+#: addressbook/gui/widgets/alphabet.glade.h:23
 msgid "q"
 msgstr "q"
 
-#: po/tmp/alphabet.glade.h:24
+#: addressbook/gui/widgets/alphabet.glade.h:24
 msgid "r"
 msgstr "r"
 
-#: po/tmp/alphabet.glade.h:25
+#: addressbook/gui/widgets/alphabet.glade.h:25
 msgid "s"
 msgstr "s"
 
-#: po/tmp/alphabet.glade.h:26
+#: addressbook/gui/widgets/alphabet.glade.h:26
 msgid "t"
 msgstr "t"
 
-#: po/tmp/alphabet.glade.h:27
+#: addressbook/gui/widgets/alphabet.glade.h:27
 msgid "u"
 msgstr "u"
 
-#: po/tmp/alphabet.glade.h:28
+#: addressbook/gui/widgets/alphabet.glade.h:28
 msgid "v"
 msgstr "v"
 
-#: po/tmp/alphabet.glade.h:29
+#: addressbook/gui/widgets/alphabet.glade.h:29
 msgid "w"
 msgstr "w"
 
-#: po/tmp/alphabet.glade.h:30
+#: addressbook/gui/widgets/alphabet.glade.h:30
 msgid "x"
 msgstr "x"
 
-#: po/tmp/alphabet.glade.h:31
+#: addressbook/gui/widgets/alphabet.glade.h:31
 msgid "y"
 msgstr "y"
 
-#: po/tmp/alphabet.glade.h:32
+#: addressbook/gui/widgets/alphabet.glade.h:32
 msgid "z"
 msgstr "z"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:451
-#: addressbook/gui/widgets/e-minicard.c:338
+#: addressbook/gui/widgets/e-minicard.c:374
 msgid "Save as VCard"
 msgstr "Сохранить как VCard"
 
@@ -1060,174 +1183,175 @@ 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 "10 pt. Tahoma"
 
-#: po/tmp/e-contact-print.glade.h:7
+#: addressbook/printing/e-contact-print.glade.h:7
 msgid "8 pt. Tahoma"
 msgstr "8 pt. Tahoma"
 
-#: 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 "метка26"
 
@@ -1262,118 +1386,156 @@ msgstr "Средство настройки для кондуита заданий Evolution.\n"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Невозможно прочесть блок приложения заданий Пилота"
 
-#: calendar/gui/calendar-commands.c:60
-msgid "Outline:"
-msgstr "Контур:"
+#.
+#. * 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:"
-msgstr "Пустые дни:"
+#.
+#. * 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:"
-msgstr "Подсвеченные дни:"
+#.
+#. * 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/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Кондуит календаря Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Evolution component for handling the calendar."
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:65
-msgid "Day numbers:"
-msgstr "Числа дней:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+msgid "Factory for the Calendar Summary component."
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:66
-msgid "Current day's number:"
-msgstr "Число текущего дня:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#, fuzzy
+msgid "Factory for the Evolution calendar component."
+msgstr "Средство настройки для кондуита календаря Evolution.\n"
 
-#: calendar/gui/calendar-commands.c:67
-msgid "To-Do item that is not yet due:"
-msgstr "Задания, для которых срок выполнения не настал:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+msgid "Factory for the calendar iTip view control"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:68
-msgid "To-Do item that is due today:"
-msgstr "Задания, которые должны быть выполнены сегодня:"
+#: 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:69
-msgid "To-Do item that is overdue:"
-msgstr "Просроченные задания:"
+#: 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:354
+#: 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:2498
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
 #. 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 "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time,
 #. in 12-hour format.
-#: calendar/gui/calendar-model.c: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 "%a %m/%d/%Y %I:%M:%S %p"
 
-#: 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"
@@ -1385,7 +1547,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"
@@ -1393,27 +1555,27 @@ msgstr "%m/%d/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c: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"
@@ -1423,14 +1585,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, %B %d, %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, который будет показывать календарь"
@@ -1448,372 +1633,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:1476 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 "appointment"
-msgstr "встреча"
-
-#: calendar/gui/dialogs/delete-comp.c:61
-msgid "task"
-msgstr "задание"
+#: calendar/gui/dialogs/delete-comp.c:62
+#, fuzzy, c-format
+msgid "Are you sure you want to delete the appointment `%s'?"
+msgstr "Вы уверены что вы хотите удалить %s \"%s\"?"
 
 #: calendar/gui/dialogs/delete-comp.c:65
-msgid "journal entry"
-msgstr "журнальная запись"
+#, fuzzy
+msgid "Are you sure you want to delete this untitled appointment?"
+msgstr "Вы уверены что хотите удалить этот %s?"
+
+#: calendar/gui/dialogs/delete-comp.c:71
+#, fuzzy, c-format
+msgid "Are you sure you want to delete the task `%s'?"
+msgstr "Вы уверены что вы хотите удалить %s \"%s\"?"
 
 #: calendar/gui/dialogs/delete-comp.c:74
-#, c-format
-msgid "Are you sure you want to delete the %s `%s'?"
+#, fuzzy
+msgid "Are you sure you want to delete this untitled task?"
+msgstr "Вы уверены что хотите удалить этот %s?"
+
+#: calendar/gui/dialogs/delete-comp.c:80
+#, fuzzy, c-format
+msgid "Are you sure you want to delete the journal entry `%s'?"
 msgstr "Вы уверены что вы хотите удалить %s \"%s\"?"
 
-#: calendar/gui/dialogs/delete-comp.c:77
-#, c-format
-msgid "Are you sure you want to delete this %s?"
+#: calendar/gui/dialogs/delete-comp.c:83
+#, fuzzy
+msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "Вы уверены что хотите удалить этот %s?"
 
 #.
-#. * 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 "диалог редактора заданий"
 
@@ -1821,26 +2024,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 "Хотите сохранить изменения?"
 
@@ -1860,14 +2063,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:165
-#: 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 "Удалить задание"
@@ -1879,62 +2074,62 @@ msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1209
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1211
 #: calendar/gui/e-week-view-main-item.c:325
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1223
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1225
 #: calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1236
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1238
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c: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 "п.п."
 
-#: calendar/gui/e-day-view.c:2944 calendar/gui/e-day-view.c:2951
-#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3167
-#: calendar/gui/e-week-view.c:3174 calendar/gui/e-week-view.c:3183
+#: calendar/gui/e-day-view.c:2948 calendar/gui/e-day-view.c:2955
+#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3169
+#: calendar/gui/e-week-view.c:3176 calendar/gui/e-week-view.c:3185
 msgid "New appointment..."
 msgstr "Новая встреча..."
 
-#: calendar/gui/e-day-view.c:2948 calendar/gui/e-day-view.c:2955
-#: calendar/gui/e-week-view.c:3171 calendar/gui/e-week-view.c:3178
+#: calendar/gui/e-day-view.c:2952 calendar/gui/e-day-view.c:2959
+#: calendar/gui/e-week-view.c:3173 calendar/gui/e-week-view.c:3180
 msgid "Edit this appointment..."
 msgstr "Правка этой встречи..."
 
-#: calendar/gui/e-day-view.c:2949 calendar/gui/e-week-view.c:3172
-#: po/tmp/evolution-event-editor.xml.h:20
+#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3174
+#: ui/evolution-event-editor.xml.h:20
 msgid "Delete this appointment"
 msgstr "Удалить эту встречу"
 
-#: calendar/gui/e-day-view.c:2956 calendar/gui/e-week-view.c:3179
+#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3181
 msgid "Make this appointment movable"
 msgstr "Сделать эту встречу перемещаемой"
 
-#: calendar/gui/e-day-view.c:2957 calendar/gui/e-week-view.c:3180
+#: calendar/gui/e-day-view.c:2961 calendar/gui/e-week-view.c:3182
 msgid "Delete this occurrence"
 msgstr "Удалить этот случай"
 
-#: calendar/gui/e-day-view.c:2958 calendar/gui/e-week-view.c:3181
+#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3183
 msgid "Delete all occurrences"
 msgstr "Удалить все случаи"
 
@@ -1946,442 +2141,473 @@ 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 "метка26"
 
-#: 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
 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
 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
 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 ""
 "Эта встреча имеет правила повторения, которые не могут быть отредактированы "
 "в Evolution."
 
-#: 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 "%a %b %d %Y"
 
-#: calendar/gui/gnome-cal.c:720 calendar/gui/gnome-cal.c:1484
-#: calendar/gui/gnome-cal.c:1540
-msgid "Reminder of your appointment at "
-msgstr "Напоминание о вашей встрече в "
-
-#: calendar/gui/gnome-cal.c:1158
+#: calendar/gui/gnome-cal.c:676
 #, c-format
 msgid "Could not load the calendar in `%s'"
 msgstr "Невозможно загрузить календарь в \"%s\""
 
-#: calendar/gui/gnome-cal.c:1169
+#: calendar/gui/gnome-cal.c:687
 #, c-format
 msgid "Could not create a calendar in `%s'"
 msgstr "Не удалось создать календарь в \"%s\""
 
-#: calendar/gui/gnome-cal.c:1180
+#: 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:1489 calendar/gui/gnome-cal.c:1544
-#: 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.c:82
-msgid "Year:"
-msgstr "Год:"
+#: calendar/gui/goto-dialog.glade.h:7
+msgid "August"
+msgstr ""
 
-#: calendar/gui/goto.c:270
-msgid "Go to date"
-msgstr "Перейти к дате"
+#: calendar/gui/goto-dialog.glade.h:8
+msgid "December"
+msgstr ""
 
-#. Instructions
-#: calendar/gui/goto.c:281
-msgid ""
-"Please select the date you want to go to.\n"
-"When you click on a day, you will be taken\n"
-"to that date."
+#: calendar/gui/goto-dialog.glade.h:9
+msgid "February"
 msgstr ""
-"Пожалуйста выберите дату, к которой Вы хотите\n"
-"перейти. Когда Вы щелкнете кнопкой мыши на\n"
-"нужном дне, Вы перейдете к этой дате."
 
-#: calendar/gui/goto.c:318
-msgid "Go to today"
+#: 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/main.c:48
+#: 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 "Cб"
 
-#: 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:962
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1001
 msgid "Print Preview"
 msgstr "Просмотр печати"
 
@@ -2477,61 +2703,61 @@ msgstr "Невозможно загрузить %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Невозможно загрузить %s: нет инициализационного кода в модуле."
 
-#: camel/camel-remote-store.c:182
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr "%s сервер %s"
 
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s сервис для %s на %s"
 
-#: camel/camel-remote-store.c:227
+#: camel/camel-remote-store.c:243
 #: camel/providers/smtp/camel-smtp-transport.c:162
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Не удалось подключиться к %s (порт %d): %s"
 
-#: camel/camel-remote-store.c:228
+#: camel/camel-remote-store.c:244
 msgid "(unknown host)"
 msgstr "(неизвестный хост)"
 
-#: camel/camel-remote-store.c:452
+#: camel/camel-remote-store.c:483
 msgid "Server disconnected."
 msgstr "Сервер отключен."
 
-#: camel/camel-service.c:120
+#: camel/camel-service.c:138
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL \"%s\" нуждается в компоненте имени пользователя"
 
-#: camel/camel-service.c:129
+#: camel/camel-service.c:147
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL \\\"%s\\\" нуждается в компоненте хоста"
 
-#: camel/camel-service.c:138
+#: camel/camel-service.c:156
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL \\\"%s\\\" нуждается в компоненте пути"
 
-#: camel/camel-service.c:488
+#: camel/camel-service.c:526
 #, c-format
 msgid "No such host %s."
 msgstr "Нет такого хоста %s."
 
-#: camel/camel-service.c:491
+#: camel/camel-service.c:529
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr "Временно невозможно найти имя хоста %s."
 
-#: camel/camel-session.c:272
+#: camel/camel-session.c:297
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Провайдер для протокола \"%s\" не доступен"
 
-#: camel/camel-session.c:360
+#: camel/camel-session.c:388
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2555,7 +2781,7 @@ msgstr "Строка URL \"%s\" содержит недопустимый протокол"
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "Номер порта в URL \"%s\" не является числом"
 
-#: camel/providers/imap/camel-imap-auth.c:127
+#: camel/providers/imap/camel-imap-auth.c:133
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
@@ -2564,44 +2790,44 @@ msgstr ""
 "Не удалось получить билет Kerberos:\n"
 "%s"
 
-#: camel/providers/imap/camel-imap-auth.c:198
+#: camel/providers/imap/camel-imap-auth.c:205
 msgid "Bad authentication response from server."
 msgstr "Отрицательный ответ идентификации от сервера."
 
-#: camel/providers/imap/camel-imap-command.c:226
+#: camel/providers/imap/camel-imap-command.c:231
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Неожиданный ответ от сервера IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:234
+#: camel/providers/imap/camel-imap-command.c:239
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Сбой команды IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:235 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:240 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "Неизвестная ошибка"
 
-#: camel/providers/imap/camel-imap-command.c:281
+#: camel/providers/imap/camel-imap-command.c:286
 msgid "Server response ended too soon."
 msgstr "Ответ сервера закончился слишком рано."
 
-#: camel/providers/imap/camel-imap-command.c:417
+#: camel/providers/imap/camel-imap-command.c:422
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Ответ IMAP сервера не содержит информации об %s"
 
-#: camel/providers/imap/camel-imap-command.c:453
+#: camel/providers/imap/camel-imap-command.c:458
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Неожиданный ответ \"OK\" от IMAP сервера: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:217
+#: camel/providers/imap/camel-imap-folder.c:196
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Невозможно загрузить итог для %s"
 
-#: camel/providers/imap/camel-imap-folder.c:574
+#: camel/providers/imap/camel-imap-folder.c:532
 msgid "Could not find message body in FETCH response."
 msgstr "Невозможно найти тело сообщения в ответе FETCH."
 
@@ -2613,34 +2839,29 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Для чтения и хранения почты на серверах IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:234
-#: camel/providers/pop3/camel-pop3-store.c:148
-msgid "Password"
-msgstr "Пароль"
-
-#: camel/providers/imap/camel-imap-store.c:236
+#: camel/providers/imap/camel-imap-store.c:248
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Подключение к IMAP серверу будет производиться с использованием "
 "незашифрованного пароля."
 
-#: camel/providers/imap/camel-imap-store.c:245
+#: camel/providers/imap/camel-imap-store.c:257
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/providers/imap/camel-imap-store.c:247
+#: camel/providers/imap/camel-imap-store.c:259
 msgid ""
 "This option will connect to the IMAP server using Kerberos 4 authentication."
 msgstr ""
 "Подключение к IMAP серверу будет производиться с использованием для "
 "идентификации протокола Kerberos 4."
 
-#: camel/providers/imap/camel-imap-store.c:333
+#: camel/providers/imap/camel-imap-store.c:345
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sПожалуйста, введите пароль IMAP для %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:359
+#: camel/providers/imap/camel-imap-store.c:373
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2651,7 +2872,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:539
+#: camel/providers/imap/camel-imap-store.c:564
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Невозможно создать каталог %s: %s"
@@ -2737,12 +2958,12 @@ msgid "Cannot append message to maildir folder: %s: %s"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:204
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-maildir-folder.c:207
+#: camel/providers/local/camel-maildir-folder.c:215
+#: camel/providers/local/camel-mbox-folder.c:317
 #: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:189
-#: camel/providers/local/camel-mh-folder.c:197
+#: camel/providers/local/camel-mh-folder.c:192
+#: camel/providers/local/camel-mh-folder.c:200
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -2752,13 +2973,13 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-mbox-folder.c:317
 #: camel/providers/local/camel-mh-folder.c:183
 msgid "No such message"
 msgstr "Нет такого сообщения"
 
-#: camel/providers/local/camel-maildir-folder.c:213
-#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-maildir-folder.c:216
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "Invalid message contents"
 msgstr "Неправильное содержимое сообщения"
 
@@ -2807,19 +3028,19 @@ msgstr ""
 msgid "not a maildir directory"
 msgstr "не является почтовым каталог"
 
-#: camel/providers/local/camel-mbox-folder.c:195
+#: camel/providers/local/camel-mbox-folder.c:201
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Не удалось открыть почтовый ящик: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:251
+#: camel/providers/local/camel-mbox-folder.c:257
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Невозможно присоединить сообщение к файлу mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:327
-#: camel/providers/local/camel-mbox-folder.c:357
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:333
+#: camel/providers/local/camel-mbox-folder.c:365
+#: camel/providers/local/camel-mbox-folder.c:378
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -2828,11 +3049,11 @@ msgstr ""
 "Невозможно получить сообщение: %s из папки %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:358
+#: camel/providers/local/camel-mbox-folder.c:366
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Видимо папка невостановимо испорчена."
 
-#: camel/providers/local/camel-mbox-folder.c:369
+#: camel/providers/local/camel-mbox-folder.c:379
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Сбой в конструкции сообщения: почтовый ящик поврежден?"
 
@@ -2885,56 +3106,56 @@ msgstr "Не удалось открыть папку: %s: итог с позиции %ld: %s"
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Фатальная ошибка почтового анализатора возле позиции %ld в папке %s"
 
-#: camel/providers/local/camel-mbox-summary.c:341
+#: camel/providers/local/camel-mbox-summary.c:343
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "Не удалось суммировать папку: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:475
-#: camel/providers/local/camel-mbox-summary.c:661
+#: camel/providers/local/camel-mbox-summary.c:477
+#: camel/providers/local/camel-mbox-summary.c:668
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr "Не удалось открыть папку для суммаризации: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:491
+#: camel/providers/local/camel-mbox-summary.c:493
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Не удалось открыть временный почтовый ящик: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:512
-#: camel/providers/local/camel-mbox-summary.c:520
-#: camel/providers/local/camel-mbox-summary.c:691
-#: camel/providers/local/camel-mbox-summary.c:699
+#: camel/providers/local/camel-mbox-summary.c:514
+#: camel/providers/local/camel-mbox-summary.c:522
+#: camel/providers/local/camel-mbox-summary.c:701
+#: camel/providers/local/camel-mbox-summary.c:709
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Несовпадение папки и итога, даже после синхронизации"
 
-#: camel/providers/local/camel-mbox-summary.c:562
+#: camel/providers/local/camel-mbox-summary.c:565
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Ошибка записи во временный почтовый ящик: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:579
+#: camel/providers/local/camel-mbox-summary.c:582
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Сбой записи во временный почтовый ящик: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:595
-#: camel/providers/local/camel-mbox-summary.c:748
+#: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-mbox-summary.c:759
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Невозможно закрыть исходную папку %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:604
+#: camel/providers/local/camel-mbox-summary.c:609
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Невозможно закрыть временную папку: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:615
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Не удалось переименовать папку: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:817
+#: camel/providers/local/camel-mbox-summary.c:830
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Неизвестная ошибка: %s"
@@ -2950,16 +3171,87 @@ msgstr "Невозможно добавить сообщение к папке mh: %s: %s"
 msgid "`%s' is not a directory."
 msgstr "\"%s\" не является каталогом."
 
-#: camel/providers/pop3/camel-pop3-folder.c:179
+#: camel/providers/nntp/camel-nntp-auth.c:41
+#, fuzzy, c-format
+msgid "Please enter the NNTP password for %s@%s"
+msgstr "%sПожалуйста, введите пароль IMAP для %s@%s"
+
+#: camel/providers/nntp/camel-nntp-auth.c:62
+msgid "Server rejected username"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-auth.c:68
+msgid "Failed to send username to server"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-auth.c:77
+msgid "Server rejected username/password"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:115
+#, fuzzy, c-format
+msgid "Message %s not found."
+msgstr "Сообщение было отправлено"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#, fuzzy
+msgid "Could not get group list from server."
+msgstr "Не удалось запустить сервер wombat"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:94
+#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#, fuzzy, c-format
+msgid "Unable to load grouplist file for %s: %s"
+msgstr "Невозможно проверить файл блокировки для %s: %s"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#, fuzzy, c-format
+msgid "Unable to save grouplist file for %s: %s"
+msgstr "Сбой при сохранении почты во временном файле %s: %s"
+
+#: camel/providers/nntp/camel-nntp-provider.c:38
+msgid "USENET news"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-provider.c:40
+msgid "This is a provider for reading from and posting toUSENET newsgroups."
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:226
+#, fuzzy, c-format
+msgid "Could not open directory for news server: %s"
+msgstr "Невозможно создать каталог %s: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:288
+#, c-format
+msgid "USENET News via %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:295
+#, fuzzy
+msgid ""
+"This option will authenticate with the NNTP server using a plaintext "
+"password."
+msgstr ""
+"Подключение к IMAP серверу будет производиться с использованием "
+"незашифрованного пароля."
+
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:500
+#, fuzzy, c-format
+msgid "Unable to open or create .newsrc file for %s: %s"
+msgstr "Не удалось создать файл блокировки для %s: %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:180
 msgid "Could not open folder: message listing was incomplete."
 msgstr "Не удалось открыть папку: список сообщений был неполон."
 
-#: camel/providers/pop3/camel-pop3-folder.c:273
+#: camel/providers/pop3/camel-pop3-folder.c:274
 #, c-format
 msgid "No message with uid %s"
 msgstr "Нет сообщения с uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:288
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Не удалось получить сообщение с POP сервера %s: %s"
@@ -3008,17 +3300,17 @@ msgstr ""
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Не удалось идентифицироваться на KPOP сервере: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:335
+#: camel/providers/pop3/camel-pop3-store.c:337
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Не удалось подключиться к POP серверу на %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:389
+#: camel/providers/pop3/camel-pop3-store.c:391
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sПожалуйста, введите POP3 пароль для %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:408
+#: camel/providers/pop3/camel-pop3-store.c:410
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3027,12 +3319,12 @@ msgstr ""
 "Не удалось подключиться к POP серверу.\n"
 "Ошибка отправки имени пользователя: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:411
-#: camel/providers/pop3/camel-pop3-store.c:448
+#: camel/providers/pop3/camel-pop3-store.c:413
+#: camel/providers/pop3/camel-pop3-store.c:450
 msgid "(Unknown)"
 msgstr "(Неизвестное)"
 
-#: camel/providers/pop3/camel-pop3-store.c:438
+#: camel/providers/pop3/camel-pop3-store.c:440
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -3040,7 +3332,7 @@ msgstr ""
 "Не удалось подключиться к POP серверу.\n"
 "Не поддерживается затребованный механизм идентификации."
 
-#: camel/providers/pop3/camel-pop3-store.c:446
+#: camel/providers/pop3/camel-pop3-store.c:448
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3049,12 +3341,13 @@ msgstr ""
 "Не удалось подключиться к POP серверу.\n"
 "Ошибка отправки пароля: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:555
+#: camel/providers/pop3/camel-pop3-store.c:557
 #, c-format
 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"
 
@@ -3103,8 +3396,14 @@ 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."
+#, fuzzy
+msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 "Для доставки почты с помощью подключения к удаленному почтовому узлу по "
 "протоколу SMTP."
@@ -3128,6 +3427,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"
 
@@ -3265,82 +3565,82 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:149
+#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:155
 msgid "attachment"
 msgstr "вложение"
 
-#: composer/e-msg-composer-attachment-bar.c:417
-#: 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:464 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:465
+#: composer/e-msg-composer-attachment-bar.c:461
 msgid "Remove selected items from the attachment list"
 msgstr "Удалить выбранные элементы из списка вложений"
 
-#: composer/e-msg-composer-attachment-bar.c:496
+#: composer/e-msg-composer-attachment-bar.c:492
 msgid "Add attachment..."
 msgstr "Добавить вложение..."
 
-#: composer/e-msg-composer-attachment-bar.c:497
+#: 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: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
+#: 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
 msgid "Enter the identity you wish to send this message from"
 msgstr "Введите именование, от которого вы хотите отправить это сообщение"
 
-#: composer/e-msg-composer-hdrs.c:296 mail/mail-format.c:630
+#: 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:632
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:632
 msgid "Cc:"
 msgstr "Копия:"
 
-#: 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 "Скр.копия:"
 
-#: 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."
@@ -3348,11 +3648,11 @@ msgstr ""
 "Введите адресатов, которые получат копию сообщения не попав в список "
 "получателей."
 
-#: composer/e-msg-composer-hdrs.c:314 mail/mail-format.c:634
+#: 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 "Введите тему письма"
 
@@ -3392,11 +3692,11 @@ msgstr "Сохранить изменения в сообщении..."
 msgid "Error saving composition to 'Drafts': %s"
 msgstr "Ошибка сохранения сочинения в \"Черновиках\": %s"
 
-#: composer/e-msg-composer.c:740 shell/e-shell-view-menu.c:170
+#: composer/e-msg-composer.c:741 shell/e-shell-view-menu.c:167
 msgid "Evolution"
 msgstr "Эволюция"
 
-#: composer/e-msg-composer.c:746
+#: composer/e-msg-composer.c:747
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3406,27 +3706,27 @@ msgstr ""
 "\n"
 "Вы хотите сохранить изменения?"
 
-#: 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 "Файл выглядит доступным, но произошел сбой open(2)."
 
-#: 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?"
@@ -3434,15 +3734,15 @@ msgstr ""
 "Файл очень большой (больше 100К).\n"
 "Вы уверены, что хотите вставить его?"
 
-#: 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 "Невозможно создать окно редактора."
 
@@ -3586,7 +3886,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 "Правка фильтров"
 
@@ -3623,7 +3923,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"
@@ -3632,44 +3932,44 @@ msgstr ""
 "Ошибка в регулярном выражении \"%s\":\n"
 "%s"
 
-#: filter/filter-message-search.c:379 filter/filter-message-search.c:447
+#: filter/filter-message-search.c:380 filter/filter-message-search.c:448
 #, c-format
 msgid "Failed to perform regex search on message header: %s"
 msgstr "Сбой выполнения поиска рег.выражения в заголовке сообщения: %s"
 
-#: 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 "Удалить критерий"
 
@@ -3677,14 +3977,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 "Важное"
@@ -3693,191 +3987,186 @@ 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
 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 "cуществует"
 
 #: filter/libfilter-i18n.h:18
-msgid "Sender"
-msgstr "Отправитель"
+msgid "Expression"
+msgstr "Выражение"
 
 #: filter/libfilter-i18n.h:19
-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
-msgid "Status"
-msgstr "Состояние"
+msgid "is less than"
+msgstr "меньше чем"
 
 #: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
-msgstr "Остановить обработку"
+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 "не заканчивается на"
+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 "cуществует"
+msgid "Sender"
+msgstr "Отправитель"
 
 #: filter/libfilter-i18n.h:35
-msgid "is greater than"
-msgstr "больше чем"
+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"
-msgstr "является"
+msgid "Specific header"
+msgstr "Специфический заголовок"
 
 #: filter/libfilter-i18n.h:39
-msgid "on or after"
-msgstr "на или после"
+msgid "starts with"
+msgstr "начинается с"
 
 #: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr "на или до"
+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"
@@ -3907,173 +4196,210 @@ msgstr "Добавить правило вирт.папки"
 msgid "Edit VFolder Rule"
 msgstr "Правка правила вирт.папки"
 
-#: mail/component-factory.c:227
+#: mail/component-factory.c:277
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Невозможно инициализировать почтовый компонент \"Эволюции\"."
 
-#: mail/component-factory.c:266
+#: 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:690
+#: 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
 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
 msgid "Hide read"
 msgstr "Скрыть прочитанные"
 
-#: mail/folder-browser.c:584
+#: mail/folder-browser.c:661
 msgid "Hide deleted"
 msgstr "Скрыть удаленные"
 
-#: mail/folder-browser.c:586 mail/folder-browser.c:701
+#: mail/folder-browser.c:663 mail/folder-browser.c:790
 msgid "Hide Subject"
 msgstr "Скрыть тему"
 
-#: mail/folder-browser.c:588 mail/folder-browser.c:707
+#: mail/folder-browser.c:665 mail/folder-browser.c:796
 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:163
-#: 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:156
-#: 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:159
-#: 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
 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
 msgid "Hide Messages"
 msgstr "Скрыть сообщения"
 
-#: mail/folder-browser.c:692
+#: mail/folder-browser.c:781
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Фильтр по списку рассылки (%s)"
 
-#: mail/folder-browser.c:698
+#: mail/folder-browser.c:787
 #, c-format
 msgid "Hide Subject \"%s\""
 msgstr "Скрыть тему \"%s\""
 
-#: mail/folder-browser.c:704
+#: mail/folder-browser.c:793
 #, c-format
 msgid "Hide from Sender <%s>"
 msgstr "Скрыть отправителя <%s>"
 
+#.
+#. * 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
+#, fuzzy
+msgid "mh"
+msgstr "h"
+
 #: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
@@ -4134,7 +4460,7 @@ 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?"
@@ -4142,19 +4468,23 @@ msgstr ""
 "Это сообщение не имеет темы.\n"
 "Послать его?"
 
-#: 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
 msgid "Move message(s) to"
 msgstr "Переместить сообщение в"
 
-#: mail/mail-callbacks.c:554
+#: mail/mail-callbacks.c:613
 msgid "Copy message(s) to"
 msgstr "Скопировать сообщения в"
 
-#: mail/mail-callbacks.c:665
+#: mail/mail-callbacks.c:748
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4162,11 +4492,11 @@ msgstr ""
 "Вы можете править только сообщения\n"
 "сохраненные в папке \"Черновики\"."
 
-#: mail/mail-callbacks.c:699 mail/mail-display.c:73
+#: mail/mail-callbacks.c:781 mail/mail-display.c:79
 msgid "Overwrite file?"
 msgstr "Переписать файл?"
 
-#: mail/mail-callbacks.c:703 mail/mail-display.c:77
+#: mail/mail-callbacks.c:785 mail/mail-display.c:83
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -4174,15 +4504,15 @@ msgstr ""
 "Файл с таким названием уже существует.\n"
 "Переписать его?"
 
-#: mail/mail-callbacks.c:748
+#: mail/mail-callbacks.c:830
 msgid "Save Message As..."
 msgstr "Сохранить сообщение как..."
 
-#: mail/mail-callbacks.c:750
+#: mail/mail-callbacks.c:832
 msgid "Save Messages As..."
 msgstr "Сохранить сообщения как..."
 
-#: mail/mail-callbacks.c:877
+#: mail/mail-callbacks.c:916
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4191,57 +4521,278 @@ msgstr ""
 "Ошибка при загрузке информации фильтра:\n"
 "%s"
 
-#: mail/mail-callbacks.c:922
+#: mail/mail-callbacks.c:961
 msgid "Print Message"
 msgstr "Печать сообщения"
 
-#: mail/mail-callbacks.c:969
+#: 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 "IMAPv4"
+
+#: 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"
-msgstr "Передача почты"
+#: mail/mail-config-druid.glade.h:44
+msgid "Make this my default account"
+msgstr ""
 
-#: po/tmp/mail-config-druid.glade.h:10
-msgid "Welcome to the Evolution Mail configuration wizard!\n"
-msgstr "Добро пожаловать к помощнику по настройке почты в Evolution!\n"
+#: mail/mail-config-druid.glade.h:46
+#, fuzzy
+msgid "News"
+msgstr "Новый"
 
-#: po/tmp/mail-config-druid.glade.h:11
-msgid "By filling in some information about your email\n"
-msgstr "Введя некоторую информацию о параметрах вашей электронной\n"
+#: 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:12
-msgid "settings, you can start sending and receiving email\n"
-msgstr "почты, вы сможете начать ее отправку и приём\n"
+#: mail/mail-config-druid.glade.h:51
+#, fuzzy
+msgid "Password:"
+msgstr "Пароль"
+
+#: mail/mail-config-druid.glade.h:53
+msgid "Plain Text"
+msgstr ""
 
-#: po/tmp/mail-config-druid.glade.h:13
-msgid "right away. Click Next to continue."
-msgstr "Нажмите \"Далее\" для продолжения."
+#: mail/mail-config-druid.glade.h:54
+msgid "Receiving Email"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:55
+#, fuzzy
+msgid "Remember my password"
+msgstr "Запомнить этот пароль"
 
-#: po/tmp/mail-config-druid.glade.h:14
+#: 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 ""
-"Ваши почтовые настройки закончены.\n"
-"Нажмите \"Завершить\" для сохранения ваших новых установок"
+
+#: 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
+#, fuzzy
+msgid "Welcome to the Evolution Mail Configuration Druid.\n"
+msgstr "Добро пожаловать к помощнику по настройке почты в Evolution!\n"
+
+#: mail/mail-config-druid.glade.h:81
+#, fuzzy
+msgid "minute(s)"
+msgstr "минуты"
 
 #: mail/mail-config-gui.c:433
 msgid ""
@@ -4261,15 +4812,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 "Файл подписи"
 
@@ -4277,26 +4820,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 "Не удалять сообщения с сервера"
@@ -4309,7 +4836,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"
@@ -4345,6 +4872,20 @@ msgstr ""
 msgid "Mail transport type:"
 msgstr "Тип передачи почты:"
 
+#: mail/mail-config-gui.c:1183
+#, fuzzy
+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 ""
+"Выберите вид используемого вами почтового сервера и введите соответствующую "
+"информацию о нем.\n"
+"\n"
+"Если сервер требует идентификации, то щелкните на кнопке \"Определить "
+"поддерживаемые типы...\" после ввода остальной информации."
+
 #: mail/mail-config-gui.c:1233
 msgid "Add Identity"
 msgstr "Добавить именование"
@@ -4393,42 +4934,42 @@ msgstr "Запрос возможностей авторизации от \"%s\""
 msgid "Query authorization at \"%s\""
 msgstr "Запрос авторизации от \"%s\""
 
-#: 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
 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."
@@ -4440,21 +4981,21 @@ msgid "No password provided."
 msgstr "Пароль не предоставлен."
 
 #: mail/mail-crypto.c:363 mail/mail-crypto.c:469 mail/mail-crypto.c:646
-#: mail/mail-crypto.c:792 mail/mail-crypto.c:923
+#: mail/mail-crypto.c:792 mail/mail-crypto.c:942
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Не удалось создать канал к GPG/PGP: %s"
 
-#: mail/mail-crypto.c:631 mail/mail-crypto.c:777 mail/mail-crypto.c:917
+#: mail/mail-crypto.c:631 mail/mail-crypto.c:777 mail/mail-crypto.c:936
 msgid "No GPG/PGP program available."
 msgstr "Недоступна программа GPG/PGP."
 
-#: mail/mail-crypto.c:945
+#: mail/mail-crypto.c:953
 #, c-format
 msgid "Couldn't create temp file: %s"
 msgstr "Не удалось создать временный файл: %s"
 
-#: mail/mail-display.c:92
+#: mail/mail-display.c:98
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -4463,55 +5004,51 @@ msgstr ""
 "Невозможно открыть файл %s:\n"
 "%s"
 
-#: mail/mail-display.c:125
+#: mail/mail-display.c:131
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Невозможно записать данные: %s"
 
-#: mail/mail-display.c:223
+#: mail/mail-display.c:229
 msgid "Save Attachment"
 msgstr "Сохранить вложение"
 
-#: mail/mail-display.c:263
+#: mail/mail-display.c:269
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Не удалось создать временный каталог: %s"
 
-#: mail/mail-display.c:305
+#: mail/mail-display.c:311
 msgid "Save to Disk..."
 msgstr "Сохранить на диске..."
 
-#: mail/mail-display.c:307
+#: mail/mail-display.c:313
 #, c-format
 msgid "Open in %s..."
 msgstr "Открыть в %s..."
 
-#: mail/mail-display.c:309
+#: mail/mail-display.c:315
 msgid "View Inline"
 msgstr "Встроенный просмотр"
 
-#: mail/mail-display.c:333
+#: mail/mail-display.c:339
 msgid "External Viewer"
 msgstr "Внешняя программа просмотра"
 
-#: mail/mail-display.c:356
+#: mail/mail-display.c:362
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Встроенный просмотр (через %s)"
 
-#: mail/mail-display.c:360
+#: mail/mail-display.c:366
 msgid "Hide"
 msgstr "Скрыть"
 
-#: mail/mail-format.c:505
+#: mail/mail-format.c:503
 #, c-format
 msgid "%s attachment"
 msgstr "%s вложение"
 
-#: mail/mail-format.c:628
-msgid "Reply-To:"
-msgstr "Ответить:"
-
 #: mail/mail-format.c:851
 msgid "No GPG/PGP support available in this copy of Evolution."
 msgstr "Поддержка GPG/PGP недоступна в этой копии Evolution."
@@ -4557,338 +5094,255 @@ msgstr ""
 msgid "On %s, %s wrote:\n"
 msgstr "%s, %s написал:\n"
 
-#: mail/mail-local.c:203
+#: mail/mail-local.c:204
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Изменение папки \"%s\" в формат \"%s\""
 
-#: mail/mail-local.c:207
+#: mail/mail-local.c:208
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Изменить папку \"%s\" в формат \"%s\""
 
-#: 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
 msgid "Registering local folder"
 msgstr "Регистрация локальной папки"
 
-#: mail/mail-local.c:784
+#: mail/mail-local.c:789
 msgid "Register local folder"
 msgstr "Зарегистрировать локальную папку"
 
-#: mail/mail-ops.c:79
+#: mail/mail-local.c:894
+#, fuzzy, c-format
+msgid ""
+"Unable to register folder '%s':\n"
+"%s"
+msgstr ""
+"Не удалось создать папку \"%s\":\n"
+"%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:\n"
+"%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 "Получение почты c %s"
 
-#: mail/mail-ops.c:81
+#: mail/mail-ops.c:90
 #, c-format
 msgid "Fetch email from %s"
 msgstr "Получить почту c %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:538
+#: mail/mail-ops.c:551
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Отправка \"%s\""
 
-#: mail/mail-ops.c:543
-msgid "Sending a message without a subject"
-msgstr "Отправка сообщения без темы"
-
-#: mail/mail-ops.c:546
-#, c-format
-msgid "Send \"%s\""
-msgstr "Послать \"%s\""
-
-#: mail/mail-ops.c:549
-msgid "Send a message without a subject"
-msgstr "Послать сообщение без темы"
+#: mail/mail-ops.c:553
+#, fuzzy
+msgid "Sending message"
+msgstr "Отправить это сообщение сейчас"
 
-#: mail/mail-ops.c:720
+#: mail/mail-ops.c:669
 msgid "Sending queue"
 msgstr "Отправка очереди"
 
-#: mail/mail-ops.c:722
+#: mail/mail-ops.c:671
 msgid "Send queue"
 msgstr "Отправить очередь"
 
-#: mail/mail-ops.c:858 mail/mail-ops.c:865
+#: mail/mail-ops.c:804 mail/mail-ops.c:811
 #, c-format
 msgid "Appending \"%s\""
 msgstr "Присоединение \"%s\""
 
-#: mail/mail-ops.c:862 mail/mail-ops.c:868
+#: mail/mail-ops.c:808 mail/mail-ops.c:814
 msgid "Appending a message without a subject"
 msgstr "Присоединение сообщения без темы"
 
-#: mail/mail-ops.c:940
-#, c-format
-msgid "Expunging \"%s\""
-msgstr "Вычеркивание \"%s\""
-
-#: mail/mail-ops.c:942
-#, c-format
-msgid "Expunge \"%s\""
-msgstr "Вычеркнуть \"%s\""
-
-#: mail/mail-ops.c:1001
+#: mail/mail-ops.c:897
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Перемещение сообщений из \"%s\" в \"%s\""
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:899
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Копирование сообщений из \"%s\" в \"%s\""
 
-#: mail/mail-ops.c:1006
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Переместить сообщения из \"%s\" в \"%s\""
 
-#: mail/mail-ops.c:1008
+#: mail/mail-ops.c:904
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Скопировать сообщения из \"%s\" в \"%s\""
 
-#: mail/mail-ops.c:1039
+#: mail/mail-ops.c:935
 msgid "Moving"
 msgstr "Перемещение"
 
-#: mail/mail-ops.c:1042
+#: mail/mail-ops.c:938
 msgid "Copying"
 msgstr "Копирование"
 
-#: mail/mail-ops.c:1062
+#: mail/mail-ops.c:958
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s сообщения %d из %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1141
-#, c-format
-msgid "Marking messages in folder \"%s\""
-msgstr "Помечание сообщений в папке \"%s\""
-
-#: mail/mail-ops.c:1144
-#, c-format
-msgid "Mark messages in folder \"%s\""
-msgstr "Пометить сообщения в папке \"%s\""
-
-#: mail/mail-ops.c:1175
-#, c-format
-msgid "Marking message %d of %d"
-msgstr "Помечание сообщений в папке %d из %d"
-
-#: mail/mail-ops.c:1295
+#: mail/mail-ops.c:1033
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Считывание папок в \"%s\""
 
-#: mail/mail-ops.c:1297
-#, c-format
-msgid "Scan folders in \"%s\""
-msgstr "Считать папки в \"%s\""
-
-#: mail/mail-ops.c:1366 mail/subscribe-dialog.c:339
+#: mail/mail-ops.c:1099 mail/subscribe-dialog.c:341
 msgid "(No description)"
 msgstr "(Нет описания)"
 
-#: mail/mail-ops.c:1432
-#, c-format
-msgid "Attaching messages from folder \"%s\""
-msgstr "Присоединение сообщений из папки \"%s\""
-
-#: mail/mail-ops.c:1435
-#, c-format
-msgid "Attach messages from \"%s\""
-msgstr "Присоединить сообщения из \"%s\""
-
-#: mail/mail-ops.c:1535
-#, c-format
-msgid "Forwarding messages \"%s\""
-msgstr "Пересылка сообщений \"%s\""
-
-#: mail/mail-ops.c:1539
-msgid "Forwarding a message without a subject"
-msgstr "Пересылка сообщения без темы"
-
-#: mail/mail-ops.c:1542
-#, c-format
-msgid "Forward message \"%s\""
-msgstr "Переслать сообщение \"%s\""
-
-#: mail/mail-ops.c:1546
-msgid "Forward a message without a subject"
-msgstr "Переслать сообщение без темы"
-
-#: mail/mail-ops.c:1593
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Перемещение сообщения номер %d из %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1610
-msgid ""
-"Failed to generate mime part from message while generating forwarded message."
-msgstr ""
-"Не удалось создать mime-часть из сообщения при создании пересылаемого "
-"сообщения."
-
-#: mail/mail-ops.c:1665
+#: mail/mail-ops.c:1164
 msgid "Forwarded messages"
 msgstr "Пересланные сообщения"
 
-#: mail/mail-ops.c:1679
-msgid "Forwarded message:\n"
-msgstr "Пересланное сообщение:\n"
-
-#: mail/mail-ops.c:1748
-#, c-format
-msgid "Loading \"%s\""
-msgstr "Загрузка \"%s\""
-
-#: mail/mail-ops.c:1750
-#, c-format
-msgid "Load \"%s\""
-msgstr "Загрузить \"%s\""
-
-#: mail/mail-ops.c:1853
-#, c-format
-msgid "Creating \"%s\""
-msgstr "Создание \"%s\""
-
-#: mail/mail-ops.c:1855
-#, c-format
-msgid "Create \"%s\""
-msgstr "Создать \"%s\""
-
-#: mail/mail-ops.c:1903
-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:1949
-#, c-format
-msgid "Synchronizing \"%s\""
+#: mail/mail-ops.c:1336
+#, fuzzy
+msgid "Synchronising folder"
 msgstr "Синхронизация \"%s\""
 
-#: mail/mail-ops.c:1951
-#, c-format
-msgid "Synchronize \"%s\""
-msgstr "Синхронизовать \"%s\""
-
-#: mail/mail-ops.c:2015
-#, c-format
-msgid "Displaying message UID \"%s\""
-msgstr "Показать UID сообщения \"%s\""
-
-#: mail/mail-ops.c:2018
-msgid "Clearing message display"
-msgstr "Очистка отображения сообщения"
-
-#: mail/mail-ops.c:2021
-#, c-format
-msgid "Display message UID \"%s\""
-msgstr "Показать UID сообщения \"%s\""
+#: mail/mail-ops.c:1386
+#, fuzzy
+msgid "Expunging folder"
+msgstr "Вычеркивание \"%s\""
 
-#: mail/mail-ops.c:2024
-msgid "Clear message display"
-msgstr "Очистить отображение сообщения"
+#: mail/mail-ops.c:1434
+#, fuzzy, c-format
+msgid "Retrieving message %s"
+msgstr "Получение сообщения %d из %d"
 
-#: mail/mail-ops.c:2137
-#, c-format
-msgid "Opening messages from folder \"%s\""
-msgstr "Открытие сообщений из папки \"%s\""
+#: mail/mail-ops.c:1497
+#, fuzzy
+msgid "Retrieving messages"
+msgstr "Получение сообщения %d из %d"
 
-#: mail/mail-ops.c:2140
+#: mail/mail-ops.c:1507
 #, c-format
-msgid "Open messages from \"%s\""
-msgstr "Открыть сообщения из \"%s\""
+msgid "Retrieving message number %d of %d (uid \"%s\")"
+msgstr "Перемещение сообщения номер %d из %d (uid \"%s\")"
 
-#: mail/mail-ops.c:2244
-#, c-format
-msgid "Loading %s Folder"
+#: mail/mail-ops.c:1655
+#, fuzzy, c-format
+msgid "Loading %s Folder for %s"
 msgstr "Загрузка папки %s"
 
-#: mail/mail-ops.c:2246
-#, c-format
-msgid "Load %s Folder"
+#: mail/mail-ops.c:1657
+#, fuzzy, c-format
+msgid "Load %s Folder for %s"
 msgstr "Загрузить папку %s"
 
-#: mail/mail-ops.c:2310
-#, c-format
-msgid "Viewing messages from folder \"%s\""
-msgstr "Просмотр сообщений из папки \"%s\""
-
-#: mail/mail-ops.c:2313
-#, c-format
-msgid "View messages from \"%s\""
-msgstr "Просмотреть сообщения из  \"%s\""
-
-#: mail/mail-ops.c:2346
-#, c-format
-msgid "Retrieving message %d of %d (uid \"%s\")"
-msgstr "Перемещение сообщения %d из %d (uid  \"%s\")"
-
-#: mail/mail-ops.c:2437
-#, c-format
-msgid "Saving messages from folder \"%s\""
-msgstr "Сохранение сообщений из папки \"%s\""
+#: mail/mail-ops.c:1823
+#, fuzzy
+msgid "Saving messages"
+msgstr "Копирование сообщений"
 
-#: mail/mail-ops.c:2440
-#, 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"
 
-#: mail/mail-ops.c:2483
+#: mail/mail-ops.c:1915
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Сохранение сообщения %d из %d (uid  \"%s\")"
 
+#: 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 "Отмена"
 
-#: mail/mail-summary.c:105 mail/mail-threads.c:729
+#: mail/mail-summary.c:110 mail/mail-threads.c:729
 msgid "Incomplete message written on pipe!"
 msgstr "Неполное сообщение записано в канал!"
 
@@ -4932,12 +5386,12 @@ msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Не удалось создать временный mbox \"%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."
@@ -4945,41 +5399,41 @@ msgstr ""
 "Не удалось прочесть UID кэш-файл \"%s\". Вы можете получить дубликаты "
 "сообщений."
 
-#: 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:343
+#: mail/mail-tools.c:347
 #, c-format
 msgid "Saving changes to %s"
 msgstr "Сохранение изменений в %s"
 
-#: mail/mail-tools.c:380
+#: mail/mail-tools.c:381
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (пересланное сообщение)"
 
-#: mail/mail-tools.c:390
+#: mail/mail-tools.c:391
 msgid "Fwd: (no subject)"
 msgstr "Пересл.: (нет темы)"
 
-#: mail/mail-tools.c:429
+#: mail/mail-tools.c:427
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Пересланное сообщение - %s"
 
-#: mail/mail-tools.c:431
+#: mail/mail-tools.c:429
 msgid "Forwarded message (no subject)"
 msgstr "Пересланное сообщение (без темы)"
 
-#: mail/mail-tools.c:534
+#: mail/mail-tools.c:530
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
@@ -4988,74 +5442,94 @@ msgstr ""
 "Невозможно открыть положение \"%s\":\n"
 "%s"
 
-#: mail/mail-vfolder.c:147
+#: mail/mail-vfolder.c:149
 msgid "VFolders"
 msgstr "Вирт.папки"
 
-#: mail/mail-vfolder.c:296
+#: mail/mail-vfolder.c:298
 msgid "New VFolder"
 msgstr "Новая вирт.папка"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:153 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:153 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:156 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:159 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:163 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:165 po/tmp/evolution-mail.xml.h:12
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:12
 msgid "Delete this message"
 msgstr "Удалить это сообщение"
 
-#: mail/message-list.c:575
+#: mail/message-list.c:590
 msgid "Unseen"
 msgstr "Непрочитанное"
 
-#: mail/message-list.c:578
+#: mail/message-list.c:593
 msgid "Seen"
 msgstr "Прочитанное"
 
-#: mail/message-list.c:581
+#: mail/message-list.c:596
 msgid "Answered"
 msgstr "Отвечено"
 
-#: mail/message-list.c:849
+#: mail/message-list.c:881
 #, c-format
 msgid "[ %s ]"
 msgstr "[ %s ]"
 
 #. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:861 mail/message-list.c:876
+#: mail/message-list.c:893 mail/message-list.c:909
 #, c-format
 msgid "%s, et al."
 msgstr "%s, и т.д."
 
-#: mail/message-list.c:863 mail/message-list.c:878
+#: mail/message-list.c:896 mail/message-list.c:912
 msgid "<unknown>"
 msgstr "<неизвестное>"
 
-#: mail/message-list.c:2253
-msgid "Rebuilding message view"
-msgstr "Перестроение окна сообщения"
+#: mail/message-list.c:965
+msgid "?"
+msgstr ""
+
+#: mail/message-list.c:972
+#, fuzzy
+msgid "Today %l:%M %p"
+msgstr "%I:%M %p"
+
+#: mail/message-list.c:981
+msgid "Yesterday %l:%M %p"
+msgstr ""
+
+#: mail/message-list.c:993
+#, fuzzy
+msgid "%a %l:%M %p"
+msgstr "%I:%M %p"
 
-#: mail/message-list.c:2255
-msgid "Rebuild message view"
-msgstr "Перестроить окно сообщения"
+#: mail/message-list.c:1001
+#, fuzzy
+msgid "%b %d %l:%M %p"
+msgstr "%a %m/%d/%Y %I:%M:%S %p"
+
+#: mail/message-list.c:1003
+#, fuzzy
+msgid "%b %d %Y"
+msgstr "%a %d %Y"
 
 #: mail/subscribe-dialog.c:139
 msgid "Display folders starting with:"
@@ -5071,27 +5545,27 @@ msgstr ""
 msgid "Get store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:282
+#: mail/subscribe-dialog.c:283
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Подписывание на папку \"%s\""
 
-#: mail/subscribe-dialog.c:286
+#: mail/subscribe-dialog.c:287
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Отписывание от папки \"%s\""
 
-#: mail/subscribe-dialog.c:290
+#: mail/subscribe-dialog.c:291
 #, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr "Подписать на папку \"%s\""
 
-#: mail/subscribe-dialog.c:293
+#: mail/subscribe-dialog.c:294
 #, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr "Отписаться от папки \"%s\""
 
-#: shell/e-setup.c:112 shell/e-setup.c:183
+#: shell/e-setup.c:112 shell/e-setup.c:185
 msgid "Evolution installation"
 msgstr "Установка Evolution"
 
@@ -5108,25 +5582,25 @@ msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Пожалуйста нажмите \"Ок\", чтобы установить файлы или \"Отмена\" для выхода."
 
-#: shell/e-setup.c:155
+#: shell/e-setup.c:157
 msgid "Could not update files correctly"
 msgstr "Невозможно обновить файлы корректно"
 
-#: shell/e-setup.c:158 shell/e-setup.c:224
+#: shell/e-setup.c:160 shell/e-setup.c:228
 msgid "Evolution files successfully installed."
 msgstr "Файлы Evolution успешно установлены."
 
-#: shell/e-setup.c:187
+#: shell/e-setup.c:189
 msgid "This seems to be the first time you run Evolution."
 msgstr "Похоже вы запустили \"Эволюцию\" в первые."
 
-#: shell/e-setup.c:188
+#: shell/e-setup.c:190
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 "Пожалуйста нажмите \"Ок\", чтобы установить пользовательские файлы "
 "\"Эволюции\" в"
 
-#: shell/e-setup.c:205
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -5137,7 +5611,7 @@ msgstr ""
 "%s\n"
 "Ошибка: %s"
 
-#: shell/e-setup.c:220
+#: shell/e-setup.c:224
 #, c-format
 msgid ""
 "Cannot copy files into\n"
@@ -5146,7 +5620,7 @@ msgstr ""
 "Невозможно скопировать файлы в\n"
 "\"%s\"."
 
-#: shell/e-setup.c:245
+#: shell/e-setup.c:249
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -5157,7 +5631,7 @@ msgstr ""
 "Пожалуйста, переместите его, чтобы позволить\n"
 "установить файлы пользователя Evolution."
 
-#: shell/e-setup.c:257
+#: shell/e-setup.c:261
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -5201,23 +5675,19 @@ msgstr "Новая..."
 msgid "(Untitled)"
 msgstr "(Без заголовка)"
 
-#. you might have to call gnome_dialog_run() on the
-#. * dialog returned here, I don't remember...
-#.
-#: shell/e-shell-view-menu.c:114
+#: shell/e-shell-view-menu.c:111
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug-buddy не был найден в вашем $PATH."
 
-#. same as above
-#: shell/e-shell-view-menu.c:120
+#: shell/e-shell-view-menu.c:117
 msgid "Bug buddy could not be run."
 msgstr "Bug-buddy не может быть запущен."
 
-#: shell/e-shell-view-menu.c:172
+#: shell/e-shell-view-menu.c:169
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:174
+#: shell/e-shell-view-menu.c:171
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -5227,7 +5697,7 @@ msgstr ""
 "ведения календарей и контактной информации для\n"
 "групповой работы в среде GNOME."
 
-#: shell/e-shell-view-menu.c:335
+#: shell/e-shell-view-menu.c:332
 msgid "Go to folder..."
 msgstr "Перейти к папке..."
 
@@ -5327,9 +5797,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 "Просмотр"
 
@@ -5447,1135 +5916,1117 @@ msgstr "Отключено."
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Не удалось инициализировать компонентную систему Bonobo."
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-addressbook-ldap.xml.h:6
-msgid "N_ew Directory Server"
-msgstr "Новый сервер каталогов"
-
-#: po/tmp/evolution-addressbook-ldap.xml.h:7
-msgid "_Actions"
-msgstr "Действия"
-
-#: 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
+#, fuzzy
+msgid "_Addressbook Configuration..."
+msgstr "Настройка почты"
+
+#: ui/evolution-addressbook.xml.h:20
 msgid "_Print Contacts..."
 msgstr "Напечатать контакты..."
 
-#: po/tmp/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:21
 msgid "_Search for contacts"
 msgstr "Поиск контактов"
 
-#: po/tmp/evolution-addressbook.xml.h:21
-#: 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 "Дамп XML"
 
-#: po/tmp/evolution-event-editor.xml.h:22
+#: ui/evolution-event-editor.xml.h:22
 msgid "Dump the UI Xml description"
 msgstr "Дамп XML описания интерфейса"
 
-#: po/tmp/evolution-event-editor.xml.h:23
+#: ui/evolution-event-editor.xml.h:23
 msgid "FIXME: Address _Book..."
 msgstr "FIXME: Адресная книга..."
 
-#: po/tmp/evolution-event-editor.xml.h:24
+#: ui/evolution-event-editor.xml.h:24
 msgid "FIXME: Ch_oose Form..."
 msgstr "FIXME: Выбрать форму..."
 
-#: po/tmp/evolution-event-editor.xml.h:25
+#: ui/evolution-event-editor.xml.h:25
 msgid "FIXME: Chec_k Names"
 msgstr "FIXME: Проверка имен"
 
-#: po/tmp/evolution-event-editor.xml.h:26
+#: ui/evolution-event-editor.xml.h:26
 msgid "FIXME: Cop_y to Folder..."
 msgstr "FIXME: Скопировать в папку..."
 
-#: 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 "FIXME: Определить стиль печати"
 
-#: po/tmp/evolution-event-editor.xml.h:29
+#: ui/evolution-event-editor.xml.h:29
 msgid "FIXME: Desi_gn This Form"
 msgstr "FIXME: Конструкция этой формы"
 
-#: po/tmp/evolution-event-editor.xml.h:30
+#: ui/evolution-event-editor.xml.h:30
 msgid "FIXME: Fi_rst Item in Folder"
 msgstr "FIXME: Первый элемент в папке"
 
-#: po/tmp/evolution-event-editor.xml.h:31
+#: ui/evolution-event-editor.xml.h:31
 msgid "FIXME: For_ward"
 msgstr "FIXME: Переслать"
 
-#: po/tmp/evolution-event-editor.xml.h:32
+#: ui/evolution-event-editor.xml.h:32
 msgid "FIXME: Forward as v_Calendar"
 msgstr "FIXME: Переслать как v_Calendar"
 
-#: po/tmp/evolution-event-editor.xml.h:33
+#: ui/evolution-event-editor.xml.h:33
 msgid "FIXME: Help"
 msgstr "FIXME: Справка"
 
-#: po/tmp/evolution-event-editor.xml.h:34
+#: ui/evolution-event-editor.xml.h:34
 msgid "FIXME: In_complete Task"
 msgstr "FIXME: Невыполненное задание"
 
-#: po/tmp/evolution-event-editor.xml.h:35
+#: ui/evolution-event-editor.xml.h:35
 msgid "FIXME: Insert File"
 msgstr "FIXME: Вставить файл"
 
-#: po/tmp/evolution-event-editor.xml.h:36
+#: ui/evolution-event-editor.xml.h:36
 msgid "FIXME: It_em..."
 msgstr "FIXME: Элемент..."
 
-#: po/tmp/evolution-event-editor.xml.h:37
+#: ui/evolution-event-editor.xml.h:37
 msgid "FIXME: Paste _Special... "
 msgstr "FIXME: Специальная вставка..."
 
-#: po/tmp/evolution-event-editor.xml.h:38
+#: ui/evolution-event-editor.xml.h:38
 msgid "FIXME: Print Pre_view"
 msgstr "FIXME: Просмотр печати"
 
-#: 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 "FIXME: Повторение..."
 
-#: po/tmp/evolution-event-editor.xml.h:42
+#: ui/evolution-event-editor.xml.h:42
 msgid "FIXME: S_end"
 msgstr "FIXME: Послать"
 
-#: po/tmp/evolution-event-editor.xml.h:43
+#: ui/evolution-event-editor.xml.h:43
 msgid "FIXME: Save Attac_hments..."
 msgstr "FIXME: Сохранить вложение..."
 
-#: po/tmp/evolution-event-editor.xml.h:44
+#: ui/evolution-event-editor.xml.h:44
 msgid "FIXME: Script _Debugger"
 msgstr "FIXME: Отладчик скрипта"
 
-#: po/tmp/evolution-event-editor.xml.h:45
+#: ui/evolution-event-editor.xml.h:45
 msgid "FIXME: Task _Request"
 msgstr "FIXME: Запрос задачи"
 
-#: po/tmp/evolution-event-editor.xml.h:46
+#: ui/evolution-event-editor.xml.h:46
 msgid "FIXME: _Contact"
 msgstr "FIXME: Контакт"
 
-#: po/tmp/evolution-event-editor.xml.h:47
+#: ui/evolution-event-editor.xml.h:47
 msgid "FIXME: _Customize..."
 msgstr "FIXME: Настройка..."
 
-#: po/tmp/evolution-event-editor.xml.h:48
+#: ui/evolution-event-editor.xml.h:48
 msgid "FIXME: _File..."
 msgstr "FIXME: файл..."
 
-#: po/tmp/evolution-event-editor.xml.h:49
+#: ui/evolution-event-editor.xml.h:49
 msgid "FIXME: _Font..."
 msgstr "FIXME: Шрифт..."
 
-#: po/tmp/evolution-event-editor.xml.h:50
+#: ui/evolution-event-editor.xml.h:50
 msgid "FIXME: _Formatting"
 msgstr "FIXME: Форматирование"
 
-#: po/tmp/evolution-event-editor.xml.h:51
+#: ui/evolution-event-editor.xml.h:51
 msgid "FIXME: _Item"
 msgstr "FIXME: Элемент"
 
-#: po/tmp/evolution-event-editor.xml.h:52
+#: ui/evolution-event-editor.xml.h:52
 msgid "FIXME: _Journal Entry"
 msgstr "FIXME: Журнальная запись"
 
-#: po/tmp/evolution-event-editor.xml.h:53
+#: ui/evolution-event-editor.xml.h:53
 msgid "FIXME: _Last Item in Folder"
 msgstr "FIXME: Последний элемент в папке"
 
-#: po/tmp/evolution-event-editor.xml.h:54
+#: ui/evolution-event-editor.xml.h:54
 msgid "FIXME: _Mail Message"
 msgstr "FIXME: Правка сообщения"
 
-#: po/tmp/evolution-event-editor.xml.h:55
+#: ui/evolution-event-editor.xml.h:55
 msgid "FIXME: _Memo Style"
 msgstr "FIXME: Стиль памятки"
 
-#: po/tmp/evolution-event-editor.xml.h:56
+#: ui/evolution-event-editor.xml.h:56
 msgid "FIXME: _Move to Folder..."
 msgstr "FIXME: Переместить в папку..."
 
-#: po/tmp/evolution-event-editor.xml.h:57
+#: ui/evolution-event-editor.xml.h:57
 msgid "FIXME: _New Appointment"
 msgstr "FIXME: Новая встреча"
 
-#: po/tmp/evolution-event-editor.xml.h:58
+#: ui/evolution-event-editor.xml.h:58
 msgid "FIXME: _Note"
 msgstr "FIXME: Запись"
 
-#: po/tmp/evolution-event-editor.xml.h:59
+#: ui/evolution-event-editor.xml.h:59
 msgid "FIXME: _Object..."
 msgstr "FIXME: Объект..."
 
-#: po/tmp/evolution-event-editor.xml.h:60
+#: ui/evolution-event-editor.xml.h:60
 msgid "FIXME: _Paragraph..."
 msgstr "FIXME: Абзац..."
 
-#: po/tmp/evolution-event-editor.xml.h:61
+#: ui/evolution-event-editor.xml.h:61
 msgid "FIXME: _Spelling..."
 msgstr "FIXME: Правописание..."
 
-#: po/tmp/evolution-event-editor.xml.h:62
+#: ui/evolution-event-editor.xml.h:62
 msgid "FIXME: _Standard"
 msgstr "FIXME: Стандартная"
 
-#: po/tmp/evolution-event-editor.xml.h:63
+#: ui/evolution-event-editor.xml.h:63
 msgid "FIXME: _Task"
 msgstr "FIXME: Задача"
 
-#: po/tmp/evolution-event-editor.xml.h:64
+#: ui/evolution-event-editor.xml.h:64
 msgid "FIXME: _Unread Item"
 msgstr "FIXME: Непрочитанный элемент"
 
-#: 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
 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
-msgid "Mail _Filters"
+#: ui/evolution-mail.xml.h:25
+#, fuzzy
+msgid "Mail _Filters..."
 msgstr "Почтовые фильтры"
 
-#: po/tmp/evolution-mail.xml.h:26
-msgid "Manage Subscriptions"
+#: 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
 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
-msgid "_Mail Configuration"
+#: 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
-msgid "_Virtual Folder Editor"
+#: 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 "Сохранить в папке... (FIXME)"
 
-#: 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 "Вставить текстовый файл... (FIXME)"
 
-#: 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
 msgid "Evolution bar _shortcut"
 msgstr "Строка ярлыков Evolution"
 
-#: 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
 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
 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 "О программе..."
 
-#: po/tmp/evolution.xml.h:22
+#: ui/evolution.xml.h:22
 msgid "_Appointment (FIXME)"
 msgstr "Встреча (FIXME)"
 
-#: po/tmp/evolution.xml.h:23
+#: ui/evolution.xml.h:23
 msgid "_Contact (FIXME)"
 msgstr "Контакт (FIXME)"
 
-#: 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 "Почтовое сообщение (FIXME)"
 
-#: 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 "Задание (FIXME)"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2470
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
 msgid "%A, %B %d, %Y"
 msgstr "%A, %B %d, %Y"
 
@@ -6657,16 +7108,16 @@ msgstr "Все сопровождение"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:416
+#: widgets/misc/e-calendar-item.c:421
 msgid "MTWTFSS"
 msgstr "ПВСЧПСВ"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
+#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-clipped-label.c:107
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
@@ -6690,3 +7141,202 @@ msgstr "%I:%M %p"
 #, c-format
 msgid "Group %i"
 msgstr "Группа %i"
+
+#~ msgid "categories"
+#~ msgstr "категории"
+
+#~ msgid "Item(s) belong to these categories:"
+#~ msgstr "Элементы принадлежащие этим категориям:"
+
+#~ msgid "Available Categories:"
+#~ msgstr "Доступные категории:"
+
+#~ msgid "External Directories"
+#~ msgstr "Внешние каталоги"
+
+#~ msgid "Port Number:"
+#~ msgstr "Номер порта:"
+
+#~ msgid "Outline:"
+#~ msgstr "Контур:"
+
+#~ msgid "Headings:"
+#~ msgstr "Заголовки:"
+
+#~ msgid "Empty days:"
+#~ msgstr "Пустые дни:"
+
+#~ msgid "Appointments:"
+#~ msgstr "Встречи:"
+
+#~ msgid "Highlighted day:"
+#~ msgstr "Подсвеченные дни:"
+
+#~ msgid "Day numbers:"
+#~ msgstr "Числа дней:"
+
+#~ msgid "Current day's number:"
+#~ msgstr "Число текущего дня:"
+
+#~ msgid "To-Do item that is not yet due:"
+#~ msgstr "Задания, для которых срок выполнения не настал:"
+
+#~ msgid "To-Do item that is due today:"
+#~ msgstr "Задания, которые должны быть выполнены сегодня:"
+
+#~ msgid "To-Do item that is overdue:"
+#~ msgstr "Просроченные задания:"
+
+#~ msgid "appointment"
+#~ msgstr "встреча"
+
+#~ msgid "task"
+#~ msgstr "задание"
+
+#~ msgid "journal entry"
+#~ msgstr "журнальная запись"
+
+#~ msgid "Year:"
+#~ msgstr "Год:"
+
+#~ msgid ""
+#~ "Please select the date you want to go to.\n"
+#~ "When you click on a day, you will be taken\n"
+#~ "to that date."
+#~ msgstr ""
+#~ "Пожалуйста выберите дату, к которой Вы хотите\n"
+#~ "перейти. Когда Вы щелкнете кнопкой мыши на\n"
+#~ "нужном дне, Вы перейдете к этой дате."
+
+#~ msgid "Deleted"
+#~ msgstr "Удаленное"
+
+#~ msgid "Draft"
+#~ msgstr "Черновик"
+
+#~ msgid "Mail Source"
+#~ msgstr "Источник почты"
+
+#~ msgid "By filling in some information about your email\n"
+#~ msgstr "Введя некоторую информацию о параметрах вашей электронной\n"
+
+#~ msgid "settings, you can start sending and receiving email\n"
+#~ msgstr "почты, вы сможете начать ее отправку и приём\n"
+
+#~ msgid "right away. Click Next to continue."
+#~ msgstr "Нажмите \"Далее\" для продолжения."
+
+#~ msgid ""
+#~ "Your email configuration is now complete.\n"
+#~ "Click \"Finish\" to save your new settings"
+#~ msgstr ""
+#~ "Ваши почтовые настройки закончены.\n"
+#~ "Нажмите \"Завершить\" для сохранения ваших новых установок"
+
+#~ 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\""
+
+#~ msgid "Marking messages in folder \"%s\""
+#~ msgstr "Помечание сообщений в папке \"%s\""
+
+#~ msgid "Mark messages in folder \"%s\""
+#~ msgstr "Пометить сообщения в папке \"%s\""
+
+#~ msgid "Marking message %d of %d"
+#~ msgstr "Помечание сообщений в папке %d из %d"
+
+#~ 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 ""
+#~ "Failed to generate mime part from message while generating forwarded message."
+#~ msgstr ""
+#~ "Не удалось создать mime-часть из сообщения при создании пересылаемого "
+#~ "сообщения."
+
+#~ 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 "Displaying message UID \"%s\""
+#~ msgstr "Показать UID сообщения \"%s\""
+
+#~ msgid "Clearing message display"
+#~ msgstr "Очистка отображения сообщения"
+
+#~ msgid "Display message UID \"%s\""
+#~ msgstr "Показать UID сообщения \"%s\""
+
+#~ msgid "Clear message display"
+#~ msgstr "Очистить отображение сообщения"
+
+#~ msgid "Opening messages from folder \"%s\""
+#~ msgstr "Открытие сообщений из папки \"%s\""
+
+#~ msgid "Open messages from \"%s\""
+#~ msgstr "Открыть сообщения из \"%s\""
+
+#~ msgid "Viewing messages from folder \"%s\""
+#~ msgstr "Просмотр сообщений из папки \"%s\""
+
+#~ msgid "View messages from \"%s\""
+#~ msgstr "Просмотреть сообщения из  \"%s\""
+
+#~ msgid "Retrieving message %d of %d (uid \"%s\")"
+#~ msgstr "Перемещение сообщения %d из %d (uid  \"%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 "Перестроить окно сообщения"
+
+#~ msgid "N_ew Directory Server"
+#~ msgstr "Новый сервер каталогов"
+
+#~ msgid "_Actions"
+#~ msgstr "Действия"
diff --git a/po/sl.po b/po/sl.po
index 0cca635b01..e981ceeaf8 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,10 +2,11 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Andraz Tori <andraz.tori1@guest.arnes.si> 2000
 #
+#: camel/providers/smtp/camel-smtp-transport.c:287
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2000-12-13 16:26-0600\n"
+"POT-Creation-Date: 2001-01-06 00:11+0100\n"
 "PO-Revision-Date: 2000-07-28 03:15+0200\n"
 "Last-Translator: Andraz Tori <andraz.tori1@guest.arnes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -303,10 +304,10 @@ msgstr ""
 #: addressbook/backend/ebook/load-pine-addressbook.c:17
 #: addressbook/backend/ebook/test-client-list.c:18
 #: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:991
+#: addressbook/conduit/address-conduit.c:1083
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1136
-#: calendar/conduits/todo/todo-conduit.c:945 calendar/gui/main.c:54
+#: calendar/conduits/calendar/calendar-conduit.c:1151
+#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "Nisem mogel inicializirati Bonoba"
 
@@ -429,53 +430,36 @@ msgstr ""
 "Ob prena╧anju seznama pilotov s gnome-pilot\n"
 "daemona se je zgodila napaka"
 
-#: addressbook/conduit/address-conduit.c:197
+#: addressbook/conduit/address-conduit.c:195
 msgid "Cursor could not be loaded\n"
 msgstr "Kazalec se ni mogel nalo╬iti\n"
 
-#: addressbook/conduit/address-conduit.c:210
+#: addressbook/conduit/address-conduit.c:208
 msgid "EBook not loaded\n"
 msgstr "EKnjiga ni nalo╬ena\n"
 
-#: addressbook/conduit/address-conduit.c:583
-#: calendar/conduits/calendar/calendar-conduit.c:715
-#: calendar/conduits/todo/todo-conduit.c:523
+#: addressbook/conduit/address-conduit.c:646
+#: calendar/conduits/calendar/calendar-conduit.c:730
+#: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat server"
 msgstr "Nisem mogel pognati stre╬nika wombat"
 
-#: addressbook/conduit/address-conduit.c:584
-#: calendar/conduits/calendar/calendar-conduit.c:716
-#: calendar/conduits/todo/todo-conduit.c:524
+#: addressbook/conduit/address-conduit.c:647
+#: calendar/conduits/calendar/calendar-conduit.c:731
+#: calendar/conduits/todo/todo-conduit.c:546
 msgid "Could not start wombat"
 msgstr "Nisem mogel pognati programa wombat"
 
-#: addressbook/conduit/address-conduit.c:616
-#: addressbook/conduit/address-conduit.c:619
+#: addressbook/conduit/address-conduit.c:679
+#: addressbook/conduit/address-conduit.c:682
 msgid "Could not read pilot's Address application block"
 msgstr "Nisem mogel prebrati Pilotovega adresarja"
 
 #.
-#. * 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 "kategorije"
-
-#: addressbook/contact-editor/categories-strings.h:8
-msgid "Item(s) belong to these categories:"
-msgstr "Predmet(i) pripada(jo) tem kategorijam:"
-
-#: addressbook/contact-editor/categories-strings.h:9
-msgid "Available Categories:"
-msgstr "Dostopne kategorije:"
-
-#.
-#. * 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 "Zbri╧i stik?"
 
@@ -489,7 +473,7 @@ msgid "_Add"
 msgstr "_Dodaj"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:48
+#: ui/evolution-event-editor.xml.h:108 ui/evolution-mail.xml.h:53
 msgid "_Delete"
 msgstr "_Zbri╧i"
 
@@ -503,12 +487,13 @@ msgid "New phone type"
 msgstr "Nov tip telefona"
 
 #.
-#. * 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 "Dodaj"
 
@@ -549,7 +534,7 @@ msgid "_Mobile"
 msgstr "_Prenosni telefon"
 
 #: 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 "prvi e-naslov"
 
@@ -566,7 +551,7 @@ msgid "C_ontacts..."
 msgstr "_Stiki..."
 
 #: 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 "Ka_tegorije..."
 
@@ -583,7 +568,8 @@ msgid "_Address..."
 msgstr "_Naslov..."
 
 #: 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 "Splo╧no"
 
@@ -628,143 +614,143 @@ msgid "No_tes:"
 msgstr "Opom_be:"
 
 #: 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 "Podrobnosti"
 
-#: addressbook/contact-editor/e-contact-editor.c:1266
+#: addressbook/contact-editor/e-contact-editor.c:1274
 msgid "Assistant"
 msgstr "PomoХnik"
 
-#: 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 "Slu╬ba"
 
-#: addressbook/contact-editor/e-contact-editor.c:1268
+#: addressbook/contact-editor/e-contact-editor.c:1276
 msgid "Business 2"
 msgstr "Slu╬ba"
 
-#: addressbook/contact-editor/e-contact-editor.c:1269
+#: addressbook/contact-editor/e-contact-editor.c:1277
 msgid "Business Fax"
 msgstr "Slu╬beni faks"
 
-#: addressbook/contact-editor/e-contact-editor.c:1270
+#: addressbook/contact-editor/e-contact-editor.c:1278
 msgid "Callback"
 msgstr "Povratni klic"
 
-#: addressbook/contact-editor/e-contact-editor.c:1271
+#: addressbook/contact-editor/e-contact-editor.c:1279
 msgid "Car"
 msgstr "Avto"
 
-#: addressbook/contact-editor/e-contact-editor.c:1272
+#: addressbook/contact-editor/e-contact-editor.c:1280
 msgid "Company"
 msgstr "Podjetje"
 
-#: 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 "Doma"
 
-#: addressbook/contact-editor/e-contact-editor.c:1274
+#: addressbook/contact-editor/e-contact-editor.c:1282
 msgid "Home 2"
 msgstr "Doma 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1275
+#: addressbook/contact-editor/e-contact-editor.c:1283
 msgid "Home Fax"
 msgstr "DomaХi faks"
 
-#: 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 "Prenosni telefon"
 
-#: 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 "Drugo"
 
-#: addressbook/contact-editor/e-contact-editor.c:1279
+#: addressbook/contact-editor/e-contact-editor.c:1287
 msgid "Other Fax"
 msgstr "Drugi faks"
 
-#: addressbook/contact-editor/e-contact-editor.c:1280
+#: addressbook/contact-editor/e-contact-editor.c:1288
 msgid "Pager"
 msgstr "Pozivnik"
 
-#: addressbook/contact-editor/e-contact-editor.c:1281
+#: addressbook/contact-editor/e-contact-editor.c:1289
 msgid "Primary"
 msgstr "Prvi"
 
-#: addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/contact-editor/e-contact-editor.c:1290
 msgid "Radio"
 msgstr "Radijo"
 
-#: addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/contact-editor/e-contact-editor.c:1291
 msgid "Telex"
 msgstr "Teleks"
 
-#: 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 "E-naslov 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1330
+#: addressbook/contact-editor/e-contact-editor.c:1338
 msgid "Email 3"
 msgstr "E-naslov 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 "Naslov _2:"
 
-#: po/tmp/fulladdr.glade.h:7
+#: addressbook/contact-editor/fulladdr.glade.h:7
 msgid "Canada"
 msgstr "Kanada"
 
-#: po/tmp/fulladdr.glade.h:8
+#: addressbook/contact-editor/fulladdr.glade.h:8
 msgid "Check Address"
 msgstr "Preveri naslov"
 
-#: po/tmp/fulladdr.glade.h:9
+#: addressbook/contact-editor/fulladdr.glade.h:9
 msgid "Countr_y:"
 msgstr "Dr╬a_va:"
 
-#: po/tmp/fulladdr.glade.h:10
+#: addressbook/contact-editor/fulladdr.glade.h:10
 msgid "Finland"
 msgstr "Finska"
 
-#: po/tmp/fulladdr.glade.h:11
+#: addressbook/contact-editor/fulladdr.glade.h:11
 msgid "USA"
 msgstr "ZDA"
 
-#: po/tmp/fulladdr.glade.h:12
+#: addressbook/contact-editor/fulladdr.glade.h:12
 msgid "_Address:"
 msgstr "_Naslov:"
 
-#: po/tmp/fulladdr.glade.h:13
+#: addressbook/contact-editor/fulladdr.glade.h:13
 msgid "_City:"
 msgstr "_Mesto:"
 
-#: po/tmp/fulladdr.glade.h:14
+#: addressbook/contact-editor/fulladdr.glade.h:14
 msgid "_PO Box:"
 msgstr "_Po╧tni predal:"
 
-#: po/tmp/fulladdr.glade.h:15
+#: addressbook/contact-editor/fulladdr.glade.h:15
 msgid "_State/Province:"
 msgstr "_Dr╬ava/Provinca:"
 
-#: po/tmp/fulladdr.glade.h:16
+#: addressbook/contact-editor/fulladdr.glade.h:16
 msgid "_ZIP Code:"
 msgstr "_Po╧tna ╧tevilka:"
 
@@ -778,10 +764,13 @@ msgid "Check Full Name"
 msgstr "Preveri polno ime"
 
 #: addressbook/contact-editor/fullname-strings.h:8
+#, fuzzy
 msgid ""
 "\n"
 "Mr.\n"
 "Mrs.\n"
+"Ms.\n"
+"Miss\n"
 "Dr.\n"
 msgstr ""
 "\n"
@@ -789,7 +778,7 @@ msgstr ""
 "G.\n"
 "Dr.\n"
 
-#: addressbook/contact-editor/fullname-strings.h:13
+#: addressbook/contact-editor/fullname-strings.h:15
 msgid ""
 "\n"
 "Sr.\n"
@@ -807,44 +796,49 @@ msgstr ""
 "III\n"
 "Esq.\n"
 
-#: addressbook/contact-editor/fullname-strings.h:21
+#: addressbook/contact-editor/fullname-strings.h:23
 msgid "_First:"
 msgstr "_Ime:"
 
-#: addressbook/contact-editor/fullname-strings.h:22
+#: addressbook/contact-editor/fullname-strings.h:24
 msgid "_Title:"
 msgstr "_Naziv:"
 
-#: addressbook/contact-editor/fullname-strings.h:23
+#: addressbook/contact-editor/fullname-strings.h:25
 msgid "_Middle:"
 msgstr "_Drugo ime:"
 
-#: addressbook/contact-editor/fullname-strings.h:24
+#: addressbook/contact-editor/fullname-strings.h:26
 msgid "_Last:"
 msgstr "_Priimek:"
 
-#: addressbook/contact-editor/fullname-strings.h:25
+#: addressbook/contact-editor/fullname-strings.h:27
 msgid "_Suffix:"
 msgstr "P_ripona:"
 
-#: addressbook/gui/component/addressbook.c:263
+#: addressbook/gui/component/addressbook.c:231
 msgid "As _Minicards"
 msgstr "Kot _minivizitke"
 
 #.
-#. * 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:269
-#: po/tmp/evolution-addressbook.xml.h:6
+#: addressbook/gui/component/addressbook.c:237
+#: ui/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr "Kot tabelo"
 
-#: addressbook/gui/component/addressbook.c:386
+#: addressbook/gui/component/addressbook.c:374
+#, fuzzy, c-format
+msgid "Enter password for %s"
+msgstr "Prosim vpi╧ite geslo NNTP za %s@%s"
+
+#: addressbook/gui/component/addressbook.c:402
 msgid "Unable to open addressbook"
 msgstr "Kliknite tu za odprtje adresarja"
 
-#: addressbook/gui/component/addressbook.c:391
+#: addressbook/gui/component/addressbook.c:407
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -864,82 +858,213 @@ msgstr ""
 "stre╬nika. хe ╬elite dostopati do LDAP morate nalo╬iti in \n"
 "namestiti OpenLDAP in ponovno prevesti in namestiti evolution. \n"
 
-#: addressbook/gui/component/addressbook.c:501 mail/folder-browser.c:136
+#: addressbook/gui/component/addressbook.c:528 mail/folder-browser.c:219
 #, fuzzy
 msgid "Show All"
 msgstr "Ka╬i"
 
-#: addressbook/gui/component/addressbook.c:503 mail/folder-browser.c:138
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 #, fuzzy
 msgid "Advanced..."
 msgstr "Dodaj..."
 
-#: addressbook/gui/component/addressbook.c:533
+#: addressbook/gui/component/addressbook.c:560
 #, fuzzy
 msgid "Any field contains"
 msgstr "Telo vsebuje"
 
-#: addressbook/gui/component/addressbook.c:534
+#: addressbook/gui/component/addressbook.c:561
 #, fuzzy
 msgid "Name contains"
 msgstr "vsebuje"
 
-#: addressbook/gui/component/addressbook.c:535
+#: addressbook/gui/component/addressbook.c:562
 #, fuzzy
 msgid "Email contains"
 msgstr "vsebuje"
 
-#: addressbook/gui/component/addressbook.c:621
+#: addressbook/gui/component/addressbook.c:648
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, ki naj ga prika╬e brskalnik map"
 
-#: addressbook/gui/component/e-ldap-storage.c:88
-msgid "External Directories"
-msgstr "Zunanji imeniki"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/e-msg-composer-attachment.glade.h:7
-#: po/tmp/ldap-server-dialog.glade.h:6
-msgid "Description:"
-msgstr "Opis:"
+#: addressbook/gui/component/addressbook-storage.c:95
+#, fuzzy
+msgid "Other Contacts"
+msgstr "_Nov stik"
 
-#: po/tmp/ldap-server-dialog.glade.h:7
-msgid "LDAP Server:"
+#: addressbook/gui/component/addressbook-config.c:139
+#, fuzzy
+msgid "LDAP Server"
 msgstr "LDAP stre╬nik:"
 
-#: po/tmp/ldap-server-dialog.glade.h:8
-msgid "Name:"
-msgstr "Ime:"
+#: addressbook/gui/component/addressbook-config.c:141
+#, fuzzy
+msgid "File"
+msgstr "_Datoteka"
+
+#: addressbook/gui/component/addressbook-config.c:144
+#, fuzzy
+msgid "Unknown addressbook type"
+msgstr "Kliknite tu za odprtje adresarja"
+
+#: 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 "Geslo"
+
+#: addressbook/gui/component/addressbook-config.c:157
+msgid "SASL"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:160
+#, fuzzy
+msgid "Unknown auth type"
+msgstr "Neznana napaka"
+
+#: addressbook/gui/component/addressbook-config.c:169
+#, fuzzy
+msgid "Base"
+msgstr "Prilepi"
+
+#: addressbook/gui/component/addressbook-config.c:171
+#, fuzzy
+msgid "One"
+msgstr "Lastnik:"
+
+#: addressbook/gui/component/addressbook-config.c:173
+#, fuzzy
+msgid "Subtree"
+msgstr "NaroХi"
+
+#: addressbook/gui/component/addressbook-config.c:176
+msgid "Unknown scope type"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:309
+msgid "Bind DN:"
+msgstr ""
 
-#: po/tmp/ldap-server-dialog.glade.h:9
-msgid "Port Number:"
-msgstr "╘tevilka vrat:"
+#: addressbook/gui/component/addressbook-config.c:311
+#: mail/mail-config-gui.c:968
+msgid "Remember this password"
+msgstr ""
 
-#: po/tmp/ldap-server-dialog.glade.h:10
+#: addressbook/gui/component/addressbook-config.c:360
+#: mail/mail-config-druid.glade.h:34
+#, fuzzy
+msgid "Host:"
+msgstr "Ur"
+
+#: addressbook/gui/component/addressbook-config.c:361
+#, fuzzy
+msgid "Port:"
+msgstr "Prioriteta:"
+
+#: addressbook/gui/component/addressbook-config.c:364
 msgid "Root DN:"
 msgstr "Korenski DN:"
 
+#: addressbook/gui/component/addressbook-config.c:384
+#, fuzzy
+msgid "Search Scope:"
+msgstr "I╧Хi"
+
+#: addressbook/gui/component/addressbook-config.c:438
+#: mail/mail-config-druid.glade.h:14 mail/mail-config-gui.c:943
+msgid "Authentication:"
+msgstr "Avtentikacija:"
+
+#: addressbook/gui/component/addressbook-config.c:455
+#: mail/mail-config-druid.glade.h:52 mail/mail-config-gui.c:934
+msgid "Path:"
+msgstr "Pot:"
+
+#: addressbook/gui/component/addressbook-config.c:460
+#, fuzzy
+msgid "Create path if it doesn't exist."
+msgstr "Datoteka ne obstaja."
+
+#: addressbook/gui/component/addressbook-config.c:593
+#, fuzzy
+msgid "Edit Addressbook"
+msgstr "Shranite v adresarju"
+
+#: addressbook/gui/component/addressbook-config.c:595
+#, fuzzy
+msgid "Add Addressbook"
+msgstr "Shranite v adresarju"
+
+#: 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
+msgid "Name:"
+msgstr "Ime:"
+
+#: addressbook/gui/component/addressbook-config.c:617
+#: composer/e-msg-composer-attachment.glade.h:7
+msgid "Description:"
+msgstr "Opis:"
+
+#: addressbook/gui/component/addressbook-config.glade.h:7
+#, fuzzy
+msgid "Addressbook Sources"
+msgstr "Dodaj izvor"
+
+#: 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 "Zbri╧i"
+
+#: 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 "Uredi"
+
+#: addressbook/gui/component/addressbook-config.glade.h:10
+msgid "Name"
+msgstr "Ime"
+
+#: addressbook/gui/component/addressbook-config.glade.h:11
+#, fuzzy
+msgid "URI"
+msgstr "URL"
+
 #.
-#. * 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 "Poi╧Хi..."
 
-#: po/tmp/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "Message Recipients"
 msgstr "Prejemniki sporoХila"
 
-#: po/tmp/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "Select Names"
 msgstr "Izberi imena"
 
-#: 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 "Izberi ime s seznama:"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:147
@@ -948,119 +1073,119 @@ msgid "Search"
 msgstr "I╧Хi"
 
 #.
-#. * 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 "a"
 
-#: po/tmp/alphabet.glade.h:8
+#: addressbook/gui/widgets/alphabet.glade.h:8
 msgid "b"
 msgstr "b"
 
-#: po/tmp/alphabet.glade.h:9
+#: addressbook/gui/widgets/alphabet.glade.h:9
 msgid "c"
 msgstr "c"
 
-#: po/tmp/alphabet.glade.h:10
+#: addressbook/gui/widgets/alphabet.glade.h:10
 msgid "d"
 msgstr "d"
 
-#: po/tmp/alphabet.glade.h:11
+#: addressbook/gui/widgets/alphabet.glade.h:11
 msgid "e"
 msgstr "e"
 
-#: po/tmp/alphabet.glade.h:12
+#: addressbook/gui/widgets/alphabet.glade.h:12
 msgid "f"
 msgstr "f"
 
-#: po/tmp/alphabet.glade.h:13
+#: addressbook/gui/widgets/alphabet.glade.h:13
 msgid "g"
 msgstr "g"
 
-#: calendar/cal-util/timeutil.c:100 po/tmp/alphabet.glade.h:14
+#: addressbook/gui/widgets/alphabet.glade.h:14
 msgid "h"
 msgstr "h"
 
-#: po/tmp/alphabet.glade.h:15
+#: addressbook/gui/widgets/alphabet.glade.h:15
 msgid "i"
 msgstr "i"
 
-#: po/tmp/alphabet.glade.h:16
+#: addressbook/gui/widgets/alphabet.glade.h:16
 msgid "j"
 msgstr "j"
 
-#: po/tmp/alphabet.glade.h:17
+#: addressbook/gui/widgets/alphabet.glade.h:17
 msgid "k"
 msgstr "k"
 
-#: po/tmp/alphabet.glade.h:18
+#: addressbook/gui/widgets/alphabet.glade.h:18
 msgid "l"
 msgstr "l"
 
-#: po/tmp/alphabet.glade.h:19
+#: addressbook/gui/widgets/alphabet.glade.h:19
 msgid "m"
 msgstr "m"
 
-#: po/tmp/alphabet.glade.h:20
+#: addressbook/gui/widgets/alphabet.glade.h:20
 msgid "n"
 msgstr "n"
 
-#: po/tmp/alphabet.glade.h:21
+#: addressbook/gui/widgets/alphabet.glade.h:21
 msgid "o"
 msgstr "o"
 
-#: po/tmp/alphabet.glade.h:22
+#: addressbook/gui/widgets/alphabet.glade.h:22
 msgid "p"
 msgstr "p"
 
-#: po/tmp/alphabet.glade.h:23
+#: addressbook/gui/widgets/alphabet.glade.h:23
 msgid "q"
 msgstr "q"
 
-#: po/tmp/alphabet.glade.h:24
+#: addressbook/gui/widgets/alphabet.glade.h:24
 msgid "r"
 msgstr "r"
 
-#: po/tmp/alphabet.glade.h:25
+#: addressbook/gui/widgets/alphabet.glade.h:25
 msgid "s"
 msgstr "s"
 
-#: po/tmp/alphabet.glade.h:26
+#: addressbook/gui/widgets/alphabet.glade.h:26
 msgid "t"
 msgstr "t"
 
-#: po/tmp/alphabet.glade.h:27
+#: addressbook/gui/widgets/alphabet.glade.h:27
 msgid "u"
 msgstr "u"
 
-#: po/tmp/alphabet.glade.h:28
+#: addressbook/gui/widgets/alphabet.glade.h:28
 msgid "v"
 msgstr "v"
 
-#: po/tmp/alphabet.glade.h:29
+#: addressbook/gui/widgets/alphabet.glade.h:29
 msgid "w"
 msgstr "w"
 
-#: po/tmp/alphabet.glade.h:30
+#: addressbook/gui/widgets/alphabet.glade.h:30
 msgid "x"
 msgstr "x"
 
-#: po/tmp/alphabet.glade.h:31
+#: addressbook/gui/widgets/alphabet.glade.h:31
 msgid "y"
 msgstr "y"
 
-#: po/tmp/alphabet.glade.h:32
+#: addressbook/gui/widgets/alphabet.glade.h:32
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:417
-#: addressbook/gui/widgets/e-minicard.c:338
+#: addressbook/gui/widgets/e-addressbook-view.c:451
+#: addressbook/gui/widgets/e-minicard.c:374
 msgid "Save as VCard"
 msgstr "Shrani kot vVizitko"
 
@@ -1083,189 +1208,178 @@ msgstr ""
 "хe ╬elite ustvariti nov stik, dvojno kliknite tu.."
 
 #.
-#. * 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 "10 pik Tahoma"
 
-#: po/tmp/e-contact-print.glade.h:7
+#: addressbook/printing/e-contact-print.glade.h:7
 msgid "8 pt. Tahoma"
 msgstr "8 pik Tahoma"
 
-#: po/tmp/e-contact-print.glade.h:8
+#: addressbook/printing/e-contact-print.glade.h:8
 msgid "Blank forms at end:"
 msgstr "Prazni obrazci na koncu:"
 
-#: po/tmp/e-contact-print.glade.h:9
+#: addressbook/printing/e-contact-print.glade.h:9
 msgid "Body"
 msgstr "Telo"
 
-#: po/tmp/e-contact-print.glade.h:10
+#: addressbook/printing/e-contact-print.glade.h:10
 msgid "Bottom:"
 msgstr "Spodaj:"
 
-#: po/tmp/e-contact-print.glade.h:11
+#: addressbook/printing/e-contact-print.glade.h:11
 msgid "Dimensions:"
 msgstr "Mere:"
 
-#: po/tmp/e-contact-print.glade.h:12
+#: addressbook/printing/e-contact-print.glade.h:12
 msgid "Font..."
 msgstr "Pisava..."
 
-#: po/tmp/e-contact-print.glade.h:13
+#: addressbook/printing/e-contact-print.glade.h:13
 msgid "Fonts"
 msgstr "Pisave"
 
-#: po/tmp/e-contact-print.glade.h:14
+#: addressbook/printing/e-contact-print.glade.h:14
 msgid "Footer:"
 msgstr "Noga:"
 
-#: po/tmp/e-contact-print.glade.h:15
+#: addressbook/printing/e-contact-print.glade.h:15
 msgid "Format"
 msgstr "Oblika izpisa"
 
-#: po/tmp/e-contact-print.glade.h:16
+#: addressbook/printing/e-contact-print.glade.h:16
 msgid "Header"
 msgstr "Glava"
 
-#: po/tmp/e-contact-print.glade.h:17
+#: addressbook/printing/e-contact-print.glade.h:17
 msgid "Header/Footer"
 msgstr "Glava/noga"
 
-#: po/tmp/e-contact-print.glade.h:18
+#: addressbook/printing/e-contact-print.glade.h:18
 msgid "Headings"
 msgstr "Zaglavja"
 
-#: po/tmp/e-contact-print.glade.h:19
+#: addressbook/printing/e-contact-print.glade.h:19
 msgid "Headings for each letter"
 msgstr "Zaglavja za vsako Хrko"
 
-#: po/tmp/e-contact-print.glade.h:20
+#: addressbook/printing/e-contact-print.glade.h:20
 msgid "Height:"
 msgstr "Vi╧ina:"
 
-#: po/tmp/e-contact-print.glade.h:21
+#: addressbook/printing/e-contact-print.glade.h:21
 msgid "Immediately follow each other"
 msgstr "Si sledijo takoj"
 
-#: po/tmp/e-contact-print.glade.h:22
+#: addressbook/printing/e-contact-print.glade.h:22
 msgid "Include:"
 msgstr "VkljuХi:"
 
-#: po/tmp/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23
 msgid "Landscape"
 msgstr "Le╬eХe"
 
-#: po/tmp/e-contact-print.glade.h:24
+#: addressbook/printing/e-contact-print.glade.h:24
 msgid "Left:"
 msgstr "Levo:"
 
-#: po/tmp/e-contact-print.glade.h:25
+#: addressbook/printing/e-contact-print.glade.h:25
 msgid "Letter tabs on side"
 msgstr "Uhlji Хrk ob strani"
 
-#: po/tmp/e-contact-print.glade.h:26
+#: addressbook/printing/e-contact-print.glade.h:26
 msgid "Margins"
 msgstr "Robovi"
 
-#: po/tmp/e-contact-print.glade.h:27
+#: addressbook/printing/e-contact-print.glade.h:27
 msgid "Number of columns:"
 msgstr "╘tevilo stolpcev:"
 
-#: po/tmp/e-contact-print.glade.h:28
+#: addressbook/printing/e-contact-print.glade.h:28
 msgid "Options"
 msgstr "Mo╬nosti"
 
-#: po/tmp/e-contact-print.glade.h:29
+#: addressbook/printing/e-contact-print.glade.h:29
 msgid "Orientation"
 msgstr "Usmerjenost"
 
-#: po/tmp/e-contact-print.glade.h:30
+#: addressbook/printing/e-contact-print.glade.h:30
 msgid "Page"
 msgstr "Stran"
 
-#: po/tmp/e-contact-print.glade.h:31
+#: addressbook/printing/e-contact-print.glade.h:31
 msgid "Page Setup:"
 msgstr "Nastavitev strani:"
 
-#: po/tmp/e-contact-print.glade.h:32
+#: addressbook/printing/e-contact-print.glade.h:32
 msgid "Paper"
 msgstr "Papir"
 
-#: po/tmp/e-contact-print.glade.h:33
+#: addressbook/printing/e-contact-print.glade.h:33
 msgid "Paper source:"
 msgstr "Izvor papirja:"
 
-#: po/tmp/e-contact-print.glade.h:34
+#: addressbook/printing/e-contact-print.glade.h:34
 msgid "Portrait"
 msgstr "PokonХno"
 
-#: po/tmp/e-contact-print.glade.h:35
+#: addressbook/printing/e-contact-print.glade.h:35
 msgid "Preview:"
 msgstr "Predogled:"
 
-#: po/tmp/e-contact-print.glade.h:36
+#: addressbook/printing/e-contact-print.glade.h:36
 msgid "Print using gray shading"
 msgstr "Tiskaj z uporabo sivinskega senХenja"
 
-#: po/tmp/e-contact-print.glade.h:37
+#: addressbook/printing/e-contact-print.glade.h:37
 msgid "Reverse on even pages"
 msgstr "Obratno na sodih straneh"
 
-#: po/tmp/e-contact-print.glade.h:38
+#: addressbook/printing/e-contact-print.glade.h:38
 msgid "Right:"
 msgstr "Desno:"
 
-#: po/tmp/e-contact-print.glade.h:39
+#: addressbook/printing/e-contact-print.glade.h:39
 msgid "Sections:"
 msgstr "Sekcije:"
 
-#: po/tmp/e-contact-print.glade.h:40
+#: addressbook/printing/e-contact-print.glade.h:40
 msgid "Shading"
 msgstr "SenХenje"
 
-#: po/tmp/e-contact-print.glade.h:41
+#: addressbook/printing/e-contact-print.glade.h:41
 msgid "Size:"
 msgstr "Velikost:"
 
-#: po/tmp/e-contact-print.glade.h:42
+#: addressbook/printing/e-contact-print.glade.h:42
 msgid "Start on a new page"
 msgstr "ZaХni na novi strani"
 
-#: po/tmp/e-contact-print.glade.h:43
+#: addressbook/printing/e-contact-print.glade.h:43
 msgid "Style name:"
 msgstr "Ime stila:"
 
-#: po/tmp/e-contact-print.glade.h:44
+#: addressbook/printing/e-contact-print.glade.h:44
 msgid "Top:"
 msgstr "Zgoraj:"
 
-#: 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 "Tip:"
 
-#: po/tmp/e-contact-print.glade.h:46
+#: addressbook/printing/e-contact-print.glade.h:46
 msgid "Width:"
 msgstr "╘irina:"
 
-#: po/tmp/e-contact-print.glade.h:47
+#: addressbook/printing/e-contact-print.glade.h:47
 msgid "label26"
 msgstr "oznaХba26"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:550
-#: calendar/gui/e-week-view.c:288 calendar/gui/print.c:605
-msgid "am"
-msgstr "dop"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:553
-#: calendar/gui/e-week-view.c:291 calendar/gui/print.c:604
-msgid "pm"
-msgstr "pop"
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 msgid "Evolution Calendar Conduit"
 msgstr "Evolucijin koledarski veznik"
@@ -1274,13 +1388,13 @@ msgstr "Evolucijin koledarski veznik"
 msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr "Nastavitveno orodje za Evolucijin koledarski veznik.\n"
 
-#: calendar/conduits/calendar/calendar-conduit.c:671
-#: calendar/conduits/todo/todo-conduit.c:479
+#: calendar/conduits/calendar/calendar-conduit.c:686
+#: calendar/conduits/todo/todo-conduit.c:501
 msgid "Error while communicating with calendar server"
 msgstr "Napaka ob komuniciranju s koledarskim stre╬nikom"
 
-#: calendar/conduits/calendar/calendar-conduit.c:770
-#: calendar/conduits/calendar/calendar-conduit.c:773
+#: calendar/conduits/calendar/calendar-conduit.c:785
+#: calendar/conduits/calendar/calendar-conduit.c:788
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nisem mogel prebrati Pilotovega koledarja"
 
@@ -1292,123 +1406,162 @@ msgstr "Evolucijin veznik za-opravit"
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr "Nastavitveno orodje za Evolucijin za-opravit veznik.\n"
 
-#: calendar/conduits/todo/todo-conduit.c:578
-#: calendar/conduits/todo/todo-conduit.c:581
+#: calendar/conduits/todo/todo-conduit.c:600
+#: calendar/conduits/todo/todo-conduit.c:603
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nisem mogel prebrati Pilotovega seznama za-opravit"
 
-#: calendar/gui/calendar-commands.c:60
-msgid "Outline:"
-msgstr "Obroba:"
+#.
+#. * 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 "Zaglavja:"
+#: 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:"
-msgstr "Prazni dnevi:"
+#.
+#. * 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 "Zmenki:"
+#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:7
+#, fuzzy
+msgid "Calendar Server"
+msgstr "Koledar"
 
-#: calendar/gui/calendar-commands.c:64
-msgid "Highlighted day:"
-msgstr "Osvetljen dan:"
+#.
+#. * 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
+#, fuzzy
+msgid "Evolution calendar executive summary component."
+msgstr "Ne morem inicializirati Evolution komponente za povzemanje po╧te."
 
-#: calendar/gui/calendar-commands.c:65
-msgid "Day numbers:"
-msgstr "╘tevilke dni:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Evolucijin koledarski veznik"
 
-#: calendar/gui/calendar-commands.c:66
-msgid "Current day's number:"
-msgstr "╘tevilka trenutnega dne:"
+#: 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:"
-msgstr "Predmet za-opravit, ki ╧e ni na vrsti:"
+#: 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:"
-msgstr "Predmet za-opravit, ki je na vrsti danes:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#, fuzzy
+msgid "Factory for the Evolution calendar component."
+msgstr "Nastavitveno orodje za Evolucijin koledarski veznik.\n"
 
-#: calendar/gui/calendar-commands.c:69
-msgid "To-Do item that is overdue:"
-msgstr "Predmet za-opravit, ki je ╬e pretekel:"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+msgid "Factory for the calendar iTip view control"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:354
+#: 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 "Opomin na zmenek ob "
+
+#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:8
+msgid "Snooze"
+msgstr "Podalj╧ek spanja"
+
+#. 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 "V redu"
+
+#: calendar/gui/calendar-commands.c:229
 msgid "File not found"
 msgstr "Datoteke ni mogoХe najti"
 
-#: calendar/gui/calendar-commands.c:378
+#: calendar/gui/calendar-commands.c:253
 msgid "Open calendar"
 msgstr "Odpri koledar"
 
-#: calendar/gui/calendar-commands.c:417
+#: calendar/gui/calendar-commands.c:295
 msgid "Save calendar"
 msgstr "Shrani koledar"
 
+#: 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:282
+#: 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:2498
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:286 calendar/gui/calendar-model.c:736
+#: calendar/gui/calendar-model.c:288 calendar/gui/calendar-model.c:738
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time,
 #. in 12-hour format.
-#: calendar/gui/calendar-model.c:290 calendar/gui/calendar-model.c:739
+#: calendar/gui/calendar-model.c:292 calendar/gui/calendar-model.c:741
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:344 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 "Javno"
 
-#: calendar/gui/calendar-model.c:347 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 "Osebno"
 
-#: calendar/gui/calendar-model.c:350 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 "Zaupno"
 
-#: calendar/gui/calendar-model.c:353 calendar/gui/calendar-model.c:521
+#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:523
 msgid "Unknown"
 msgstr "Neznano"
 
-#: calendar/gui/calendar-model.c:441
+#: calendar/gui/calendar-model.c:443
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:441
+#: calendar/gui/calendar-model.c:443
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:445
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:445
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:515
+#: calendar/gui/calendar-model.c:517
 msgid "Transparent"
 msgstr "Prozorno"
 
-#: calendar/gui/calendar-model.c:518
+#: calendar/gui/calendar-model.c:520
 msgid "Opaque"
 msgstr "Prosojno"
 
-#: calendar/gui/calendar-model.c:744
+#: calendar/gui/calendar-model.c:746
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1420,35 +1573,35 @@ msgstr ""
 "%s"
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:845 calendar/gui/calendar-model.c:893
+#: 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:1274 widgets/misc/e-dateedit.c:1455
+#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
 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:863
+#: 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:866
+#: 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:870
+#: 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:873
+#: calendar/gui/calendar-model.c:875
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
-#: calendar/gui/calendar-model.c:993
+#: calendar/gui/calendar-model.c:995
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1458,14 +1611,37 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1033
+#: calendar/gui/calendar-model.c:1035
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Vrednost v procentih mora biti med vkljuХno 0 in 100"
 
-#: calendar/gui/calendar-model.c:1073
+#: calendar/gui/calendar-model.c:1075
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "Prioriteta mora biti med vkljuХno 1 in 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 "Napaka ob nalaganju datoteke %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 "Natisni _koledar"
+
 #: calendar/gui/control-factory.c:125
 msgid "The URI that the calendar will display"
 msgstr "URI, ki naj ga prika╬e brskalnik map"
@@ -1483,350 +1659,402 @@ msgid "No summary available."
 msgstr "Povzetek ni na voljo."
 
 #.
-#. * 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 "Zapri"
 
-#: po/tmp/alarm-notify.glade.h:7
+#: calendar/gui/dialogs/alarm-notify.glade.h:7
 msgid "Edit appointment"
 msgstr "Uredi zmenek"
 
-#: calendar/gui/gnome-cal.c:1466 po/tmp/alarm-notify.glade.h:8
-msgid "Snooze"
-msgstr "Podalj╧ek spanja"
-
-#: po/tmp/alarm-notify.glade.h:9
+#: calendar/gui/dialogs/alarm-notify.glade.h:9
 msgid "Snooze time (minutes)"
 msgstr "хas podalj╧ka spanja (minut)"
 
 #.
-#. * 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 minut"
 
-#: po/tmp/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "10 minutes"
 msgstr "10 minut"
 
-#: po/tmp/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "12 hour (am/pm)"
 msgstr "12 urna (dop./pop.)"
 
-#: po/tmp/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "15 minutes"
 msgstr "15 minut"
 
-#: po/tmp/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "24 hour"
 msgstr "24 urna"
 
-#: po/tmp/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "30 minutes"
 msgstr "30 minut"
 
-#: po/tmp/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "60 minutes"
 msgstr "60 minut"
 
-#: po/tmp/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Alarms timeout after"
 msgstr "Alarmi preteХejo po"
 
-#: po/tmp/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Audio Alarms"
 msgstr "ZvoХni alarmi"
 
-#: po/tmp/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Beep when alarm windows appear."
 msgstr "Pozvoni, ko se poka╬ejo okna alarmov"
 
-#: po/tmp/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Calendar"
 msgstr "Koledar"
 
-#: po/tmp/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Calendar Preferences"
 msgstr "Nastavitve koledarja"
 
-#: po/tmp/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Colors"
 msgstr "Barve"
 
-#: po/tmp/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Compress weekends"
 msgstr "SkrХi vikende"
 
-#: po/tmp/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Date navigator options"
 msgstr "Mo╬nosti navigatorja datumov"
 
-#: po/tmp/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Defaults"
 msgstr "Privzeto"
 
-#: po/tmp/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Display options"
 msgstr "Poka╬i mo╬nosti"
 
-#: po/tmp/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Due Date"
 msgstr "Do datuma"
 
-#: po/tmp/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "Enable snoozing for"
 msgstr "OmogoХi podalj╧anje spanja za"
 
-#: po/tmp/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "End of day:"
 msgstr "Konec dneva:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:26
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "First day of week:"
 msgstr "Prvi dan tedna:"
 
-#: 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 "pet"
 
-#: 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 "petek"
 
-#: po/tmp/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Highlight"
 msgstr "Osvetlji:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "Items Due Today"
 msgstr "Predmeti z dana╧njim rokom"
 
-#: po/tmp/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "Items Due Today:"
 msgstr "Predmeti z rokom danes:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Items Not Yet Due"
 msgstr "Predmeti z rokom v prihodnosti"
 
-#: po/tmp/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Items Not Yet Due:"
 msgstr "Predmeti z rokom v prihodnosti:"
 
-#: 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 "pon"
 
-#: 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 "ponedeljek"
 
-#: po/tmp/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "Overdue Items"
 msgstr "Predmeti s prekoraХenim rokom"
 
-#: po/tmp/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Overdue Items:"
 msgstr "Predmeti s prekoraХenim rokom:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Pick a color"
 msgstr "Izberi barvo"
 
-#: 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 "Prioriteta"
 
-#: po/tmp/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Remind me of all appointments"
 msgstr "Opomni me na vse zmenke"
 
-#: po/tmp/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Reminders"
 msgstr "Opozorila"
 
-#: 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 "sob"
 
-#: 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 "sobota"
 
-#: po/tmp/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Show"
 msgstr "Ka╬i"
 
-#: po/tmp/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "Show appointment end times"
 msgstr "Ka╬i Хase koncev zmenkov"
 
-#: po/tmp/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Show week numbers"
 msgstr "Ka╬i ╧tevilke tednov"
 
-#: po/tmp/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "Start of day:"
 msgstr "ZaХetek dneva:"
 
 #. 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 "ned"
 
-#: 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 "nedeljo"
 
-#: po/tmp/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "TaskPad"
 msgstr "Naloge"
 
-#: 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 "Хet"
 
-#: 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 "Хetrtek"
 
-#: po/tmp/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "Time Until Due"
 msgstr "хas do preteka"
 
-#: po/tmp/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "Time divisions:"
 msgstr "хasovne delitve"
 
-#: po/tmp/cal-prefs-dialog.glade.h:55
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "Time format:"
 msgstr "Oblika izpisa Хasa"
 
-#: 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 "tor"
 
-#: 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 "torek"
 
-#: po/tmp/cal-prefs-dialog.glade.h:58
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "Visual Alarms"
 msgstr "Vidni alarmi"
 
-#: 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 "sre"
 
-#: 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 "sreda"
 
-#: po/tmp/cal-prefs-dialog.glade.h:61
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "Work week"
 msgstr "Delavni teden"
 
-#: po/tmp/cal-prefs-dialog.glade.h:62
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "minutes before they occur."
 msgstr "minut preden se zgodijo"
 
-#: po/tmp/cal-prefs-dialog.glade.h:63
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "seconds."
 msgstr "sekundah."
 
+#: calendar/gui/dialogs/delete-comp.c:62
+#, fuzzy, c-format
+msgid "Are you sure you want to delete the appointment `%s'?"
+msgstr ""
+"Ste prepriХani, da \n"
+"╬elite izbrisati ta stik?"
+
+#: calendar/gui/dialogs/delete-comp.c:65
+#, fuzzy
+msgid "Are you sure you want to delete this untitled appointment?"
+msgstr ""
+"Ste prepriХani, da \n"
+"╬elite izbrisati ta stik?"
+
+#: calendar/gui/dialogs/delete-comp.c:71
+#, fuzzy, c-format
+msgid "Are you sure you want to delete the task `%s'?"
+msgstr ""
+"Ste prepriХani, da \n"
+"╬elite izbrisati ta stik?"
+
+#: calendar/gui/dialogs/delete-comp.c:74
+#, fuzzy
+msgid "Are you sure you want to delete this untitled task?"
+msgstr ""
+"Ste prepriХani, da \n"
+"╬elite izbrisati ta stik?"
+
+#: calendar/gui/dialogs/delete-comp.c:80
+#, fuzzy, c-format
+msgid "Are you sure you want to delete the journal entry `%s'?"
+msgstr ""
+"Ste prepriХani, da \n"
+"╬elite izbrisati ta stik?"
+
+#: calendar/gui/dialogs/delete-comp.c:83
+#, fuzzy
+msgid "Are you sure want to delete this untitled journal entry?"
+msgstr ""
+"Ste prepriХani, da \n"
+"╬elite izbrisati ta stik?"
+
 #.
-#. * 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 "% konХa_no:"
 
-#: po/tmp/task-editor-dialog.glade.h:7
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
 msgid "C_lassification:"
 msgstr "_Uvrstitev"
 
-#: po/tmp/task-editor-dialog.glade.h:9
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
 msgid "Cancelled"
 msgstr "Preklicano"
 
-#: po/tmp/task-editor-dialog.glade.h:10
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
 msgid "Completed"
 msgstr "KonХano"
 
-#: po/tmp/task-editor-dialog.glade.h:12
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
 msgid "Date Completed:"
 msgstr "KonХano dne:"
 
-#: po/tmp/task-editor-dialog.glade.h:14
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
 msgid "High"
 msgstr "Visoka"
 
-#: po/tmp/task-editor-dialog.glade.h:15
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
 msgid "In Progress"
 msgstr "V teku"
 
-#: po/tmp/task-editor-dialog.glade.h:16
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
 msgid "Low"
 msgstr "Nizka"
 
 #. 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
-#: widgets/misc/e-dateedit.c:422 widgets/misc/e-dateedit.c:1331
-#: widgets/misc/e-dateedit.c:1446
+#: 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 "Brez"
 
-#: po/tmp/task-editor-dialog.glade.h:18
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
 msgid "Normal"
 msgstr "ObiХajna"
 
-#: po/tmp/task-editor-dialog.glade.h:19
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
 msgid "Not Started"
 msgstr "Ni priХeto"
 
-#: po/tmp/task-editor-dialog.glade.h:22
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
 msgid "S_ummary"
 msgstr "_Povzetek"
 
-#: po/tmp/task-editor-dialog.glade.h:23
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
 msgid "Sta_rt Date:"
 msgstr "Datum _priХetka:"
 
-#: po/tmp/task-editor-dialog.glade.h:24
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
 msgid "Task"
 msgstr "Naloga"
 
-#: 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 "_Stiki..."
 
-#: po/tmp/task-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
 msgid "_Due Date:"
 msgstr "_Do datuma:"
 
-#: po/tmp/task-editor-dialog.glade.h:28
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
 msgid "_Priority:"
 msgstr "_Prioriteta:"
 
-#: po/tmp/task-editor-dialog.glade.h:29
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
 msgid "_Status:"
 msgstr "_Stanje:"
 
-#: po/tmp/task-editor-dialog.glade.h:30
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
 msgid "task-editor-dialog"
 msgstr "dialog-urejevalnik-dogodkov"
 
@@ -1834,26 +2062,26 @@ msgstr "dialog-urejevalnik-dogodkov"
 msgid "Edit Task"
 msgstr "Uredi nalogo"
 
-#: 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 "Ni povzetka"
 
-#: 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 "Zmenek - %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 "Naloga - %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 "Vpis v dnevniku - %s"
 
-#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3277
+#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3250
 #, fuzzy
 msgid "Do you want to save changes?"
 msgstr "Shranil bom spremembe sporoХila"
@@ -1874,14 +2102,6 @@ msgstr "OznaХi kot opravljeno"
 msgid "Mark the task complete"
 msgstr "OznaХi nalogo kot opravljeno"
 
-#: calendar/gui/e-calendar-table.c:342 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:479 mail/mail-view.c:165
-#: 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 "Zbri╧i"
-
 #: calendar/gui/e-calendar-table.c:343
 msgid "Delete the task"
 msgstr "Zbri╧i nalogo"
@@ -1893,50 +2113,62 @@ msgstr "%02i deljenj minute"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1208
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1211
 #: calendar/gui/e-week-view-main-item.c:325
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1222
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1225
 #: calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1235
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1238
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view.c:2941 calendar/gui/e-day-view.c:2948
-#: calendar/gui/e-day-view.c:2957 calendar/gui/e-week-view.c:3165
-#: calendar/gui/e-week-view.c:3172 calendar/gui/e-week-view.c:3181
+#. 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:610
+msgid "am"
+msgstr "dop"
+
+#. 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:609
+msgid "pm"
+msgstr "pop"
+
+#: calendar/gui/e-day-view.c:2948 calendar/gui/e-day-view.c:2955
+#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3169
+#: calendar/gui/e-week-view.c:3176 calendar/gui/e-week-view.c:3185
 msgid "New appointment..."
 msgstr "Nov zmenek..."
 
-#: calendar/gui/e-day-view.c:2945 calendar/gui/e-day-view.c:2952
-#: calendar/gui/e-week-view.c:3169 calendar/gui/e-week-view.c:3176
+#: calendar/gui/e-day-view.c:2952 calendar/gui/e-day-view.c:2959
+#: calendar/gui/e-week-view.c:3173 calendar/gui/e-week-view.c:3180
 msgid "Edit this appointment..."
 msgstr "Uredi ta zmenek..."
 
-#: calendar/gui/e-day-view.c:2946 calendar/gui/e-week-view.c:3170
-#: po/tmp/evolution-event-editor.xml.h:20
+#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3174
+#: ui/evolution-event-editor.xml.h:20
 msgid "Delete this appointment"
 msgstr "Zbri╧i ta zmenek"
 
-#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3177
+#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3181
 msgid "Make this appointment movable"
 msgstr "Naredi zmenek prestavljiv"
 
-#: calendar/gui/e-day-view.c:2954 calendar/gui/e-week-view.c:3178
+#: calendar/gui/e-day-view.c:2961 calendar/gui/e-week-view.c:3182
 msgid "Delete this occurrence"
 msgstr "Zbri╧i to pojavitev"
 
-#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3179
+#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3183
 msgid "Delete all occurrences"
 msgstr "Zbri╧i vse pojavitve"
 
@@ -1948,661 +2180,489 @@ 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 "_Celodnevni dogodek"
 
-#: po/tmp/event-editor-dialog.glade.h:8
+#: calendar/gui/event-editor-dialog.glade.h:8
 msgid "Appointment Basics"
 msgstr "Osnove zmenkov"
 
-#: po/tmp/event-editor-dialog.glade.h:9
+#: calendar/gui/event-editor-dialog.glade.h:9
 msgid "Classification"
 msgstr "Uvrstitev"
 
-#: po/tmp/event-editor-dialog.glade.h:10
+#: calendar/gui/event-editor-dialog.glade.h:10
 msgid "Custom recurrence"
 msgstr "Ponovitev po meri"
 
-#: po/tmp/event-editor-dialog.glade.h:11
+#: calendar/gui/event-editor-dialog.glade.h:11
 msgid "Days"
 msgstr "Dni"
 
-#: po/tmp/event-editor-dialog.glade.h:13
+#: calendar/gui/event-editor-dialog.glade.h:13
 msgid "Every"
 msgstr "Vsak"
 
-#: po/tmp/event-editor-dialog.glade.h:14
+#: calendar/gui/event-editor-dialog.glade.h:14
 msgid "Exceptions"
 msgstr "Izjeme"
 
-#: po/tmp/event-editor-dialog.glade.h:16
+#: calendar/gui/event-editor-dialog.glade.h:16
 msgid "Hours"
 msgstr "Ur"
 
-#: po/tmp/event-editor-dialog.glade.h:17
+#: calendar/gui/event-editor-dialog.glade.h:17
 msgid "Mail _to:"
 msgstr "Po╧lji po╧to _za:"
 
-#: po/tmp/event-editor-dialog.glade.h:18
+#: calendar/gui/event-editor-dialog.glade.h:18
 msgid "Minutes"
 msgstr "Minut"
 
-#: po/tmp/event-editor-dialog.glade.h:19
+#: calendar/gui/event-editor-dialog.glade.h:19
 msgid "Modify"
 msgstr "Spremeni"
 
-#: po/tmp/event-editor-dialog.glade.h:20
+#: calendar/gui/event-editor-dialog.glade.h:20
 msgid "No recurrence"
 msgstr "Ni ponovitev"
 
-#: po/tmp/event-editor-dialog.glade.h:21
+#: calendar/gui/event-editor-dialog.glade.h:21
 #, fuzzy
 msgid "Preview"
 msgstr "Predogled:"
 
-#: po/tmp/event-editor-dialog.glade.h:22
+#: calendar/gui/event-editor-dialog.glade.h:22
 msgid "Pri_vate"
 msgstr "Pri_vatno"
 
-#: po/tmp/event-editor-dialog.glade.h:23
+#: calendar/gui/event-editor-dialog.glade.h:23
 msgid "Pu_blic"
 msgstr "_Javno"
 
-#: po/tmp/event-editor-dialog.glade.h:24
+#: calendar/gui/event-editor-dialog.glade.h:24
 msgid "Recurrence"
 msgstr "Ponovitev"
 
-#: po/tmp/event-editor-dialog.glade.h:25
+#: calendar/gui/event-editor-dialog.glade.h:25
 msgid "Recurrence Rule"
 msgstr "Pravilo ponovitev"
 
-#: po/tmp/event-editor-dialog.glade.h:26
+#: calendar/gui/event-editor-dialog.glade.h:26
 msgid "Reminder"
 msgstr "Opozorilo"
 
-#: po/tmp/event-editor-dialog.glade.h:27
+#: calendar/gui/event-editor-dialog.glade.h:27
 msgid "Simple recurrence"
 msgstr "Enostavna ponovitev"
 
-#: po/tmp/event-editor-dialog.glade.h:28
+#: calendar/gui/event-editor-dialog.glade.h:28
 msgid "Su_mmary:"
 msgstr "_Povzetek:"
 
-#: po/tmp/event-editor-dialog.glade.h:29
+#: calendar/gui/event-editor-dialog.glade.h:29
 msgid "Time"
 msgstr "хas"
 
-#: po/tmp/event-editor-dialog.glade.h:30
+#: calendar/gui/event-editor-dialog.glade.h:30
 msgid "_Audio"
 msgstr "_Zvok"
 
-#: po/tmp/event-editor-dialog.glade.h:31
+#: calendar/gui/event-editor-dialog.glade.h:31
 msgid "_Confidential"
 msgstr "_Zaupno"
 
-#: po/tmp/event-editor-dialog.glade.h:32
+#: calendar/gui/event-editor-dialog.glade.h:32
 msgid "_Display"
 msgstr "_Prikaz"
 
-#: po/tmp/event-editor-dialog.glade.h:33
+#: calendar/gui/event-editor-dialog.glade.h:33
 msgid "_End time:"
 msgstr "_хas konca"
 
-#: po/tmp/event-editor-dialog.glade.h:34
+#: calendar/gui/event-editor-dialog.glade.h:34
 msgid "_Mail"
 msgstr "_Po╧lji po╧to"
 
-#: po/tmp/event-editor-dialog.glade.h:35
+#: calendar/gui/event-editor-dialog.glade.h:35
 msgid "_Program"
 msgstr "_Program"
 
-#: po/tmp/event-editor-dialog.glade.h:36
+#: calendar/gui/event-editor-dialog.glade.h:36
 msgid "_Run program:"
 msgstr "_Po╬eni program:"
 
-#: po/tmp/event-editor-dialog.glade.h:37
+#: calendar/gui/event-editor-dialog.glade.h:37
 msgid "_Start time:"
 msgstr "_хas priХetka:"
 
-#: po/tmp/event-editor-dialog.glade.h:38
+#: calendar/gui/event-editor-dialog.glade.h:38
 msgid "_Starting date:"
 msgstr "Datum _priХetka:"
 
-#: po/tmp/event-editor-dialog.glade.h:39
+#: calendar/gui/event-editor-dialog.glade.h:39
 msgid "day(s)"
 msgstr "dni"
 
-#: po/tmp/event-editor-dialog.glade.h:40
+#: calendar/gui/event-editor-dialog.glade.h:40
 msgid "event-editor-dialog"
 msgstr "dialog-urejevalec-dogodkov"
 
-#: po/tmp/event-editor-dialog.glade.h:41
+#: calendar/gui/event-editor-dialog.glade.h:41
 msgid "for"
 msgstr "za"
 
-#: po/tmp/event-editor-dialog.glade.h:42
+#: calendar/gui/event-editor-dialog.glade.h:42
 msgid "forever"
 msgstr "vseskozi"
 
-#: po/tmp/event-editor-dialog.glade.h:43
+#: calendar/gui/event-editor-dialog.glade.h:43
 msgid "label21"
 msgstr "oznaХba21"
 
-#: po/tmp/event-editor-dialog.glade.h:44
+#: calendar/gui/event-editor-dialog.glade.h:44
 msgid "month(s)"
 msgstr "mesec"
 
-#: po/tmp/event-editor-dialog.glade.h:45
+#: calendar/gui/event-editor-dialog.glade.h:45
 msgid "until"
 msgstr "do"
 
-#: po/tmp/event-editor-dialog.glade.h:46
+#: calendar/gui/event-editor-dialog.glade.h:46
 msgid "week(s)"
 msgstr "tednov"
 
-#: po/tmp/event-editor-dialog.glade.h:47
+#: calendar/gui/event-editor-dialog.glade.h:47
 msgid "year(s)"
 msgstr "let"
 
-#: calendar/gui/event-editor.c:329
+#: calendar/gui/event-editor.c:325
 msgid "Edit Appointment"
 msgstr "Uredi zmenek"
 
-#: calendar/gui/event-editor.c:407
+#: calendar/gui/event-editor.c:403
 msgid "on"
 msgstr "na"
 
-#: calendar/gui/event-editor.c:432 calendar/gui/getdate.y:424
-#: filter/filter-datespec.c:65
+#: calendar/gui/event-editor.c:428 filter/filter-datespec.c:65
 msgid "day"
 msgstr "dan"
 
-#: calendar/gui/event-editor.c:559
+#: calendar/gui/event-editor.c:555
 #, fuzzy
 msgid "on the"
 msgstr "mesec"
 
-#: calendar/gui/event-editor.c:566
+#: calendar/gui/event-editor.c:562
 #, fuzzy
 msgid "th"
 msgstr "4."
 
-#: calendar/gui/event-editor.c:722
+#: calendar/gui/event-editor.c:716
 #, fuzzy
 msgid "occurrences"
 msgstr "pojavitve"
 
-#: calendar/gui/event-editor.c:839
+#: calendar/gui/event-editor.c:833
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor.c:3079 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 "%a %d %b %Y"
 
-#: calendar/gui/getdate.y:391
-msgid "january"
-msgstr "januar"
+#: calendar/gui/gnome-cal.c:676
+#, c-format
+msgid "Could not load the calendar in `%s'"
+msgstr "Nisem mogel nalo╬iti koledarja v `%s'"
 
-#: calendar/gui/getdate.y:392
-msgid "february"
-msgstr "februar"
+#: calendar/gui/gnome-cal.c:687
+#, c-format
+msgid "Could not create a calendar in `%s'"
+msgstr "Nisem mogel ustvariti koledarja v `%s'"
 
-#: calendar/gui/getdate.y:393
-msgid "march"
-msgstr "marec"
+#: calendar/gui/gnome-cal.c:698
+#, c-format
+msgid "The method required to load `%s' is not supported"
+msgstr "Metoda potrebna za nalo╬itev `%s' ni podprta"
 
-#: calendar/gui/getdate.y:394
-msgid "april"
+#.
+#. * 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
+#, fuzzy
+msgid "April"
 msgstr "april"
 
-#: calendar/gui/getdate.y:395
-msgid "may"
-msgstr "maj"
-
-#: calendar/gui/getdate.y:396
-msgid "june"
-msgstr "junij"
-
-#: calendar/gui/getdate.y:397
-msgid "july"
-msgstr "julij"
-
-#: calendar/gui/getdate.y:398
-msgid "august"
+#: calendar/gui/goto-dialog.glade.h:7
+#, fuzzy
+msgid "August"
 msgstr "avgust"
 
-#: calendar/gui/getdate.y:399
-msgid "september"
-msgstr "september"
-
-#: calendar/gui/getdate.y:400
-msgid "sept"
-msgstr "sept"
-
-#: calendar/gui/getdate.y:401
-msgid "october"
-msgstr "oktober"
-
-#: calendar/gui/getdate.y:402
-msgid "november"
-msgstr "november"
-
-#: calendar/gui/getdate.y:403
-msgid "december"
+#: calendar/gui/goto-dialog.glade.h:8
+#, fuzzy
+msgid "December"
 msgstr "december"
 
-#: calendar/gui/getdate.y:404
-msgid "sunday"
-msgstr "nedelja"
-
-#: calendar/gui/getdate.y:405
-msgid "monday"
-msgstr "ponedeljek"
-
-#: calendar/gui/getdate.y:406
-msgid "tuesday"
-msgstr "torek"
-
-#: calendar/gui/getdate.y:407
-msgid "tues"
-msgstr "tor"
-
-#: calendar/gui/getdate.y:408
-msgid "wednesday"
-msgstr "sreda"
-
-#: calendar/gui/getdate.y:409
-msgid "wednes"
-msgstr "sre"
-
-#: calendar/gui/getdate.y:410
-msgid "thursday"
-msgstr "Хetrtek"
-
-#: calendar/gui/getdate.y:411
-msgid "thur"
-msgstr "Хet"
-
-#: calendar/gui/getdate.y:412
-msgid "thurs"
-msgstr "Хet"
-
-#: calendar/gui/getdate.y:413
-msgid "friday"
-msgstr "petek"
-
-#: calendar/gui/getdate.y:414
-msgid "saturday"
-msgstr "sobota"
-
-#: calendar/gui/getdate.y:420 filter/filter-datespec.c:62
-msgid "year"
-msgstr "leto"
-
-#: calendar/gui/getdate.y:421 filter/filter-datespec.c:63
-msgid "month"
-msgstr "mesec"
-
-#: calendar/gui/getdate.y:422
-msgid "fortnight"
-msgstr "╧tirinajst dni"
-
-#: calendar/gui/getdate.y:423 filter/filter-datespec.c:64
-msgid "week"
-msgstr "teden"
-
-#: calendar/gui/getdate.y:425 filter/filter-datespec.c:66
-msgid "hour"
-msgstr "ura"
-
-#: calendar/gui/getdate.y:426 filter/filter-datespec.c:67
-msgid "minute"
-msgstr "minuta"
-
-#: calendar/gui/getdate.y:427
-msgid "min"
-msgstr "min"
-
-#: calendar/gui/getdate.y:428 filter/filter-datespec.c:68
-msgid "second"
-msgstr "sekunda"
-
-#: calendar/gui/getdate.y:429
-msgid "sec"
-msgstr "sek"
-
-#: calendar/gui/getdate.y:435
-msgid "tomorrow"
-msgstr "jutri"
-
-#: calendar/gui/getdate.y:436
-msgid "yesterday"
-msgstr "vХeraj"
-
-#: calendar/gui/getdate.y:437
-msgid "today"
-msgstr "danes"
-
-#: calendar/gui/getdate.y:438 filter/filter-datespec.c:533
-#: filter/filter-datespec.c:693
-msgid "now"
-msgstr "sedaj"
-
-#: calendar/gui/getdate.y:439
-msgid "last"
-msgstr "zadnji"
-
-#: calendar/gui/getdate.y:440
-msgid "this"
-msgstr "ta"
-
-#: calendar/gui/getdate.y:441
-msgid "next"
-msgstr "naslednji"
-
-#: calendar/gui/getdate.y:442
-msgid "first"
-msgstr "prvi"
-
-#. { N_("second"),		tUNUMBER,	2 },
-#: calendar/gui/getdate.y:444
-msgid "third"
-msgstr "tretji"
-
-#: calendar/gui/getdate.y:445
-msgid "fourth"
-msgstr "Хetrti"
-
-#: calendar/gui/getdate.y:446
-msgid "fifth"
-msgstr "peti"
-
-#: calendar/gui/getdate.y:447
-msgid "sixth"
-msgstr "╧esti"
-
-#: calendar/gui/getdate.y:448
-msgid "seventh"
-msgstr "sedmi"
-
-#: calendar/gui/getdate.y:449
-msgid "eighth"
-msgstr "osmi"
-
-#: calendar/gui/getdate.y:450
-msgid "ninth"
-msgstr "deveti"
-
-#: calendar/gui/getdate.y:451
-msgid "tenth"
-msgstr "deseti"
-
-#: calendar/gui/getdate.y:452
-msgid "eleventh"
-msgstr "enajsti"
+#: calendar/gui/goto-dialog.glade.h:9
+#, fuzzy
+msgid "February"
+msgstr "februar"
 
-#: calendar/gui/getdate.y:453
-msgid "twelfth"
-msgstr "dvanajsti"
+#: calendar/gui/goto-dialog.glade.h:10
+#, fuzzy
+msgid "Go To Date"
+msgstr "Pojdi na datum"
 
-#: calendar/gui/getdate.y:454
-msgid "ago"
-msgstr "nazaj"
+#: calendar/gui/goto-dialog.glade.h:11
+#, fuzzy
+msgid "Go To Today"
+msgstr "Pojdi na danes"
 
-#: calendar/gui/gnome-cal.c:718 calendar/gui/gnome-cal.c:1474
-#: calendar/gui/gnome-cal.c:1530
-msgid "Reminder of your appointment at "
-msgstr "Opomin na zmenek ob "
+#: calendar/gui/goto-dialog.glade.h:12
+#, fuzzy
+msgid "January"
+msgstr "januar"
 
-#: calendar/gui/gnome-cal.c:1152
-#, c-format
-msgid "Could not load the calendar in `%s'"
-msgstr "Nisem mogel nalo╬iti koledarja v `%s'"
+#: calendar/gui/goto-dialog.glade.h:13
+#, fuzzy
+msgid "July"
+msgstr "julij"
 
-#: calendar/gui/gnome-cal.c:1163
-#, c-format
-msgid "Could not create a calendar in `%s'"
-msgstr "Nisem mogel ustvariti koledarja v `%s'"
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "June"
+msgstr "junij"
 
-#: calendar/gui/gnome-cal.c:1174
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr "Metoda potrebna za nalo╬itev `%s' ni podprta"
+#: calendar/gui/goto-dialog.glade.h:15
+#, fuzzy
+msgid "March"
+msgstr "marec"
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1479 calendar/gui/gnome-cal.c:1534
-#: mail/mail-search-dialogue.c:104
-msgid "Ok"
-msgstr "V redu"
+#: calendar/gui/goto-dialog.glade.h:16
+#, fuzzy
+msgid "May"
+msgstr "ponedeljek"
 
-#: calendar/gui/goto.c:82
-msgid "Year:"
-msgstr "Leto:"
+#: calendar/gui/goto-dialog.glade.h:17
+#, fuzzy
+msgid "November"
+msgstr "november"
 
-#: calendar/gui/goto.c:270
-msgid "Go to date"
-msgstr "Pojdi na datum"
+#: calendar/gui/goto-dialog.glade.h:18
+#, fuzzy
+msgid "October"
+msgstr "oktober"
 
-#. Instructions
-#: calendar/gui/goto.c:281
-msgid ""
-"Please select the date you want to go to.\n"
-"When you click on a day, you will be taken\n"
-"to that date."
-msgstr ""
-"Prosim izberite datum na katerega hoХete iti.\n"
-"Ko klikente na dan boste samodejno ╧li\n"
-"na ta datum."
+#: calendar/gui/goto-dialog.glade.h:19
+#, fuzzy
+msgid "September"
+msgstr "september"
 
-#: calendar/gui/goto.c:318
-msgid "Go to today"
-msgstr "Pojdi na danes"
+#: calendar/gui/main.c:49
+#, fuzzy
+msgid "Could not initialize GNOME"
+msgstr "Nisem mogel inicializirati Bonoba"
 
-#: 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 "ne"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Mo"
 msgstr "po"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Tu"
 msgstr "to"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "We"
 msgstr "sr"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Th"
 msgstr "Хe"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Fr"
 msgstr "pe"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Sa"
 msgstr "so"
 
-#: calendar/gui/print.c:936
+#: calendar/gui/print.c:941
 msgid "Tasks"
 msgstr "Naloge"
 
 #. Day
-#: calendar/gui/print.c:1066
+#: calendar/gui/print.c:1071
 msgid "Current day (%a %b %d %Y)"
 msgstr "Trenuten dan (%b %a %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 %d %b"
 
-#: 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 "Trenutni teden (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1100
+#: calendar/gui/print.c:1105
 msgid "Current month (%b %Y)"
 msgstr "Trenutni mesec (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1107
+#: calendar/gui/print.c:1112
 msgid "Current year (%Y)"
 msgstr "Trenutno leto (%Y)"
 
-#: calendar/gui/print.c:1144
+#: calendar/gui/print.c:1149
 msgid "Print Calendar"
 msgstr "Natisni _koledar"
 
-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:962
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1001
 msgid "Print Preview"
 msgstr "Predogled tiskanja"
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: calendar/gui/weekday-picker.c:351 widgets/misc/e-calendar-item.c:416
-msgid "MTWTFSS"
-msgstr "PTSхPSN"
-
-#: calendar/gui/weekday-picker.c:353 calendar/gui/weekday-picker.c:443
+#: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
 msgid "SMTWTFS"
 msgstr "PTSхPSN"
 
@@ -2694,60 +2754,61 @@ msgstr "Nisem mogel nalo╬iti %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Nisem mogel nalo╬iti %s: V modulu ni inicializacijske kode."
 
-#: camel/camel-remote-store.c:182
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr "stre╬nik %s %s"
 
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "storitev %s za %s na %s"
 
-#: camel/camel-remote-store.c:227
+#: camel/camel-remote-store.c:243
+#: camel/providers/smtp/camel-smtp-transport.c:162
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Nisem se mogel povezati z %s (vrata %d): %s"
 
-#: camel/camel-remote-store.c:228
+#: camel/camel-remote-store.c:244
 msgid "(unknown host)"
 msgstr "(neznan gostitelj)"
 
-#: camel/camel-remote-store.c:452
+#: camel/camel-remote-store.c:483
 msgid "Server disconnected."
 msgstr ""
 
-#: camel/camel-service.c:120
+#: camel/camel-service.c:138
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' potrebuje komponento uporabni╧kega imena"
 
-#: camel/camel-service.c:129
+#: camel/camel-service.c:147
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' potrebuje komponento gostitelja"
 
-#: camel/camel-service.c:138
+#: camel/camel-service.c:156
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' potrebuje komponento poti"
 
-#: camel/camel-service.c:488
+#: camel/camel-service.c:526
 #, c-format
 msgid "No such host %s."
 msgstr "Ni tak╧nega gostitelja %s."
 
-#: camel/camel-service.c:491
+#: camel/camel-service.c:529
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr "Trenutno ne morem poizvedeti po gostitelju %s."
 
-#: camel/camel-session.c:272
+#: camel/camel-session.c:297
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Noben nuditelj za protokol '%s' ni dostopen"
 
-#: camel/camel-session.c:360
+#: camel/camel-session.c:388
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2771,53 +2832,53 @@ msgstr "URL niz '%s' vsebuje neveljaven protokol"
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "╘tevilka vrat v URL '%s' ni numeriХna"
 
-#: camel/providers/imap/camel-imap-auth.c:127
+#: camel/providers/imap/camel-imap-auth.c:133
 #, fuzzy, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
 "%s"
 msgstr "Nisem mogel ustvariti cevi: %s"
 
-#: camel/providers/imap/camel-imap-auth.c:198
+#: camel/providers/imap/camel-imap-auth.c:205
 #, fuzzy
 msgid "Bad authentication response from server."
 msgstr "NepriХakovan odgovor stre╬nika IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:216
+#: camel/providers/imap/camel-imap-command.c:231
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "NepriХakovan odgovor stre╬nika IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:224
+#: camel/providers/imap/camel-imap-command.c:239
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP ukaz ni uspel: %s"
 
-#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:240 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "Neznana napaka"
 
-#: camel/providers/imap/camel-imap-command.c:271
+#: camel/providers/imap/camel-imap-command.c:286
 #, fuzzy
 msgid "Server response ended too soon."
 msgstr "odgovor IMAP stre╬nika ni vseboval podatkov %s"
 
-#: camel/providers/imap/camel-imap-command.c:407
+#: camel/providers/imap/camel-imap-command.c:422
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "odgovor IMAP stre╬nika ni vseboval podatkov %s"
 
-#: camel/providers/imap/camel-imap-command.c:443
+#: camel/providers/imap/camel-imap-command.c:458
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "NepriХakovan OK odgovor stre╬nika IMAP: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:216
+#: camel/providers/imap/camel-imap-folder.c:196
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Nisem mogel nalo╬iti povzetka za %s"
 
-#: camel/providers/imap/camel-imap-folder.c:586
+#: camel/providers/imap/camel-imap-folder.c:532
 msgid "Could not find message body in FETCH response."
 msgstr "Nisem mogel najti telesa sporoХila v FETCH odgovoru."
 
@@ -2829,32 +2890,26 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Za branje in hranjenje po╧te na IMAP stre╬nikih."
 
-#: camel/providers/imap/camel-imap-store.c:234
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:148
-msgid "Password"
-msgstr "Geslo"
-
-#: camel/providers/imap/camel-imap-store.c:236
+#: camel/providers/imap/camel-imap-store.c:248
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Ta mo╬nost se bo povezala z IMAP stre╬nikom z ne╧ifriranim geslom."
 
-#: camel/providers/imap/camel-imap-store.c:245
+#: camel/providers/imap/camel-imap-store.c:257
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/providers/imap/camel-imap-store.c:247
+#: camel/providers/imap/camel-imap-store.c:259
 msgid ""
 "This option will connect to the IMAP server using Kerberos 4 authentication."
 msgstr ""
 "Ta mo╬nost se bo povezala z IMAP stre╬nikom s Kerberos 4 avtentifikacijo."
 
-#: camel/providers/imap/camel-imap-store.c:333
+#: camel/providers/imap/camel-imap-store.c:345
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sProsim vpi╧ite IMAP geslo za %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:359
+#: camel/providers/imap/camel-imap-store.c:373
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2865,7 +2920,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:539
+#: camel/providers/imap/camel-imap-store.c:564
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Nisem mogel ustvariti imenika %s: %s"
@@ -2955,12 +3010,12 @@ msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Ne morem dodati sporoХila v mh mapo: %s"
 
 #: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:204
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-maildir-folder.c:207
+#: camel/providers/local/camel-maildir-folder.c:215
+#: camel/providers/local/camel-mbox-folder.c:317
 #: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:189
-#: camel/providers/local/camel-mh-folder.c:197
+#: camel/providers/local/camel-mh-folder.c:192
+#: camel/providers/local/camel-mh-folder.c:200
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -2970,14 +3025,14 @@ msgstr ""
 "  %s"
 
 #: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-mbox-folder.c:317
 #: camel/providers/local/camel-mh-folder.c:183
 #, fuzzy
 msgid "No such message"
 msgstr "Ni tak╧nega gostitelja %s."
 
-#: camel/providers/local/camel-maildir-folder.c:213
-#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-maildir-folder.c:216
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "Invalid message contents"
 msgstr ""
 
@@ -3025,19 +3080,19 @@ msgstr "Nisem mogel zbrisati mape `%s': %s"
 msgid "not a maildir directory"
 msgstr "Krajevni po╧tni imenik %s"
 
-#: camel/providers/local/camel-mbox-folder.c:195
+#: camel/providers/local/camel-mbox-folder.c:201
 #, fuzzy, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Nisem mogel odpreti zaХasnega po╧tnega predala: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:251
+#: camel/providers/local/camel-mbox-folder.c:257
 #, fuzzy, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Ne morem pripeti sporoХila mbox datoteki: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:327
-#: camel/providers/local/camel-mbox-folder.c:357
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:333
+#: camel/providers/local/camel-mbox-folder.c:365
+#: camel/providers/local/camel-mbox-folder.c:378
 #, fuzzy, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -3046,11 +3101,11 @@ msgstr ""
 "Ne morem dobiti sporoХila: %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:358
+#: camel/providers/local/camel-mbox-folder.c:366
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:369
+#: camel/providers/local/camel-mbox-folder.c:379
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -3103,59 +3158,59 @@ msgstr "Nisem mogel odpreti mape: seznam sporoХil je bil nepopoln."
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:341
+#: camel/providers/local/camel-mbox-summary.c:343
 #, fuzzy, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr "Ne morem razvejiti %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:475
-#: camel/providers/local/camel-mbox-summary.c:661
+#: camel/providers/local/camel-mbox-summary.c:477
+#: camel/providers/local/camel-mbox-summary.c:668
 #, fuzzy, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
 "Nisem mogel odpreti imenika `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-summary.c:491
+#: camel/providers/local/camel-mbox-summary.c:493
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Nisem mogel odpreti zaХasnega po╧tnega predala: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:512
-#: camel/providers/local/camel-mbox-summary.c:520
-#: camel/providers/local/camel-mbox-summary.c:691
-#: camel/providers/local/camel-mbox-summary.c:699
+#: camel/providers/local/camel-mbox-summary.c:514
+#: camel/providers/local/camel-mbox-summary.c:522
+#: camel/providers/local/camel-mbox-summary.c:701
+#: camel/providers/local/camel-mbox-summary.c:709
 #, fuzzy
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Povzetek se ne ujema, prekinjam sinhronizacijo"
 
-#: camel/providers/local/camel-mbox-summary.c:562
+#: camel/providers/local/camel-mbox-summary.c:565
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Napaka ob pisanju v zaХasni po╧tni predal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:579
+#: camel/providers/local/camel-mbox-summary.c:582
 #, fuzzy, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Napaka ob pisanju v zaХasni po╧tni predal: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:595
-#: camel/providers/local/camel-mbox-summary.c:748
+#: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-mbox-summary.c:759
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Nisem mogel zapreti izvorne mape %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:604
+#: camel/providers/local/camel-mbox-summary.c:609
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Nisem mogel zapreti zaХasne mape: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:615
+#: camel/providers/local/camel-mbox-summary.c:620
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nisem mogel preimenovati mape: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:817
+#: camel/providers/local/camel-mbox-summary.c:830
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Neznana napaka: %s"
@@ -3188,7 +3243,7 @@ msgstr "Nisem uspel poslati uporabni╧kega imena stre╬niku"
 msgid "Server rejected username/password"
 msgstr "Stre╬nik je zavrnil uporabni╧ko ime/geslo"
 
-#: camel/providers/nntp/camel-nntp-folder.c:144
+#: camel/providers/nntp/camel-nntp-folder.c:115
 #, c-format
 msgid "Message %s not found."
 msgstr "SporoХilo %s ni bilo najdeno."
@@ -3239,16 +3294,16 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Ne morem odpreti ali ustvariti .newsrc datoteke za %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:179
+#: camel/providers/pop3/camel-pop3-folder.c:180
 msgid "Could not open folder: message listing was incomplete."
 msgstr "Nisem mogel odpreti mape: seznam sporoХil je bil nepopoln."
 
-#: camel/providers/pop3/camel-pop3-folder.c:273
+#: camel/providers/pop3/camel-pop3-folder.c:274
 #, c-format
 msgid "No message with uid %s"
 msgstr "Ni sporoХila z uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:288
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Nisem uspel prenesti sporoХila z POP stre╬nika %s: %s"
@@ -3296,17 +3351,17 @@ msgstr ""
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Nisem se mogel avtentificirati do stre╬nika KPOP: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:335
+#: camel/providers/pop3/camel-pop3-store.c:337
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Nisem se mogel povezati s stre╬nikom POP na %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:389
+#: camel/providers/pop3/camel-pop3-store.c:391
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sProsim vpi╧ite POP3 geslo za %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:408
+#: camel/providers/pop3/camel-pop3-store.c:410
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3315,12 +3370,12 @@ msgstr ""
 "Nisem se mogel povezati s stre╬nikom POP.\n"
 "Napaka ob po╧iljanju uporabni╧kega imena: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:411
-#: camel/providers/pop3/camel-pop3-store.c:448
+#: camel/providers/pop3/camel-pop3-store.c:413
+#: camel/providers/pop3/camel-pop3-store.c:450
 msgid "(Unknown)"
 msgstr "(Neznana)"
 
-#: camel/providers/pop3/camel-pop3-store.c:438
+#: camel/providers/pop3/camel-pop3-store.c:440
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -3328,7 +3383,7 @@ msgstr ""
 "Ne morem se povezati s stre╬nikom POP.\n"
 "Ni podpore za zahtevan avtentifikacijski mehanizm."
 
-#: camel/providers/pop3/camel-pop3-store.c:446
+#: camel/providers/pop3/camel-pop3-store.c:448
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3337,12 +3392,13 @@ msgstr ""
 "Nisem se mogel povezati s stre╬nikom POP.\n"
 "Napaka ob po╧iljanju gesla: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:555
+#: camel/providers/pop3/camel-pop3-store.c:557
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ni tak╧ne mape `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
+#: mail/mail-config-druid.glade.h:63
 msgid "Sendmail"
 msgstr "Program sendmail"
 
@@ -3392,12 +3448,144 @@ msgstr "program sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Dostava po╧te preko programa 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."
+#, fuzzy
+msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 "Za dostavo po╧te preko povezave z oddaljenim po╧tnim razdelilcem z uporabo "
 "SMTP"
 
+#: camel/providers/smtp/camel-smtp-transport.c:187
+#, c-format
+msgid "Welcome response error: %s: possibly non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:281
+#, fuzzy
+msgid "No authentication required"
+msgstr "Avtentikacija:"
+
+#: camel/providers/smtp/camel-smtp-transport.c:283
+#, fuzzy
+msgid ""
+"This option will connect to the SMTP server without using any kind of "
+"authentication. This should be fine for connecting to most SMTP servers."
+msgstr ""
+"Ta mo╬nost se bo povezala s stre╬nikom POP z ne╧ifriranim geslom. To je v "
+"veХini edina mo╬nost, ki jo stre╬niki POP podpirajo."
+
+#: 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 ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:294
+#, fuzzy
+msgid ""
+"This option will connect to the SMTP server using CRAM-MD5 authentication."
+msgstr ""
+"Ta mo╬nost se bo povezala z IMAP stre╬nikom s Kerberos 4 avtentifikacijo."
+
+#: camel/providers/smtp/camel-smtp-transport.c:332
+#, fuzzy, c-format
+msgid "SMTP server %s"
+msgstr "stre╬nik %s %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:334
+#, fuzzy, c-format
+msgid "SMTP mail delivery via %s"
+msgstr "Dostava po╧te preko programa sendmail"
+
+#: camel/providers/smtp/camel-smtp-transport.c:359
+msgid "Cannot send message: sender address not defined."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:366
+msgid "Cannot send message: sender address not valid."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:380
+msgid "Cannot send message: no recipients defined."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:474
+#, c-format
+msgid "HELO request timed out: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:490
+#, c-format
+msgid "HELO response error: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:529
+#, c-format
+msgid "MAIL FROM request timed out: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:545
+#, c-format
+msgid "MAIL FROM response error: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:570
+#, fuzzy, c-format
+msgid "RCPT TO request timed out: %s: mail not sent"
+msgstr ""
+"Nisem mogel ustvariti cevi do programa sendmail: %s: po╧ta ni bila poslana"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
+#, fuzzy, c-format
+msgid "RCPT TO response error: %s: mail not sent"
+msgstr "Nisem mogel izvr╧iti %s: po╧ta ni bila poslana."
+
+#: camel/providers/smtp/camel-smtp-transport.c:617
+#, fuzzy, c-format
+msgid "DATA request timed out: %s: mail not sent"
+msgstr "Nisem mogel izvr╧iti %s: po╧ta ni bila poslana."
+
+#: camel/providers/smtp/camel-smtp-transport.c:633
+#, fuzzy, c-format
+msgid "DATA response error: %s: mail not sent"
+msgstr "Nisem mogel vejiti programa sendmail: %s: po╧ta ni bila poslana"
+
+#: camel/providers/smtp/camel-smtp-transport.c:648
+#: camel/providers/smtp/camel-smtp-transport.c:666
+#, fuzzy, c-format
+msgid "DATA send timed out: message termination: %s: mail not sent"
+msgstr "program sendmail je zakljuХil s signalom %s: po╧ta ni bila poslana."
+
+#: camel/providers/smtp/camel-smtp-transport.c:682
+#, c-format
+msgid "DATA response error: message termination: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:706
+#, c-format
+msgid "RSET request timed out: %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:722
+#, fuzzy, c-format
+msgid "RSET response error: %s"
+msgstr "Neznana napaka: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:745
+#, c-format
+msgid "QUIT request timed out: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#, c-format
+msgid "QUIT response error: %s: non-fatal"
+msgstr ""
+
 #: camel/providers/vee/camel-vee-provider.c:30
 msgid "Virtual folder email provider"
 msgstr "Nuditelj virutalne mape e-po╧te"
@@ -3431,82 +3619,82 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:144
+#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:155
 msgid "attachment"
 msgstr "priloga"
 
-#: composer/e-msg-composer-attachment-bar.c:417
-#: 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 "Prilo╬i datoteko"
 
-#: composer/e-msg-composer-attachment-bar.c:464 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 "Odstrani"
 
-#: composer/e-msg-composer-attachment-bar.c:465
+#: composer/e-msg-composer-attachment-bar.c:461
 msgid "Remove selected items from the attachment list"
 msgstr "Odstrani izbrane predmete iz seznama prilog"
 
-#: composer/e-msg-composer-attachment-bar.c:496
+#: composer/e-msg-composer-attachment-bar.c:492
 msgid "Add attachment..."
 msgstr "Dodaj prilogo..."
 
-#: composer/e-msg-composer-attachment-bar.c:497
+#: composer/e-msg-composer-attachment-bar.c:493
 msgid "Attach a file to the message"
 msgstr "Prilo╬i datoteko k sporoХilu"
 
 #.
-#. * 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 "Lastnosti priloge"
 
-#: po/tmp/e-msg-composer-attachment.glade.h:8
+#: composer/e-msg-composer-attachment.glade.h:8
 msgid "File name:"
 msgstr "Ime datoteke:"
 
-#: po/tmp/e-msg-composer-attachment.glade.h:9
+#: composer/e-msg-composer-attachment.glade.h:9
 msgid "MIME type:"
 msgstr "MIME tip:"
 
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:290
-#: mail/mail-format.c:621
+#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:303
+#: mail/mail-format.c:626
 msgid "From:"
 msgstr "Od:"
 
-#: composer/e-msg-composer-hdrs.c:238
+#: composer/e-msg-composer-hdrs.c:247
 msgid "Click here for the address book"
 msgstr "Kliknite tu za adresar"
 
-#: composer/e-msg-composer-hdrs.c:291
+#: composer/e-msg-composer-hdrs.c:304
 msgid "Enter the identity you wish to send this message from"
 msgstr "Vnesite identiteto s katero ╬elite poslati to sporoХilo"
 
-#: composer/e-msg-composer-hdrs.c:295 mail/mail-format.c:625
+#: composer/e-msg-composer-hdrs.c:308 mail/mail-format.c:630
 msgid "To:"
 msgstr "Za:"
 
-#: composer/e-msg-composer-hdrs.c:296
+#: composer/e-msg-composer-hdrs.c:309
 msgid "Enter the recipients of the message"
 msgstr "Vnesite prejemnike sporoХila"
 
-#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:627
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:632
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:301
+#: composer/e-msg-composer-hdrs.c:314
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Vnesite naslove, ki bodo prejeli, karbonske kopije sporoХila"
 
-#: composer/e-msg-composer-hdrs.c:306
+#: composer/e-msg-composer-hdrs.c:319
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:307
+#: 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."
@@ -3514,15 +3702,15 @@ msgstr ""
 "Vnesite naslove, ki bodo prejeli karbonske kopije sporoХila, a  se ne bodo "
 "pojavili v seznamu prejemnikov sporoХila."
 
-#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:629
+#: composer/e-msg-composer-hdrs.c:326 mail/mail-format.c:634
 msgid "Subject:"
 msgstr "Zadeva:"
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Enter the subject of the mail"
 msgstr "Vnesite zadevo sproХila"
 
-#: composer/e-msg-composer.c:429
+#: composer/e-msg-composer.c:430
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -3531,38 +3719,38 @@ msgstr ""
 "Nisem mogel odpreti datoteke s podpisom %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:599
+#: composer/e-msg-composer.c:600
 msgid "Save as..."
 msgstr "Shrani kot..."
 
-#: composer/e-msg-composer.c:610
+#: composer/e-msg-composer.c:611
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Napak ob shranjevanju datoteke: %s"
 
-#: composer/e-msg-composer.c:630
+#: composer/e-msg-composer.c:631
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Napaka ob nalaganju datoteke %s"
 
-#: composer/e-msg-composer.c:652
+#: composer/e-msg-composer.c:653
 msgid "Saving changes to message..."
 msgstr "Shranjujem spremembe sporoХila..."
 
-#: composer/e-msg-composer.c:654
+#: composer/e-msg-composer.c:655
 msgid "Save changes to message..."
 msgstr "Shranjujem spremembe sporoХila..."
 
-#: composer/e-msg-composer.c:695
+#: composer/e-msg-composer.c:696
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr "Napaka ob shranjevanju kompozicije v 'Osnutki': %s"
 
-#: composer/e-msg-composer.c:739 shell/e-shell-view-menu.c:170
+#: composer/e-msg-composer.c:741 shell/e-shell-view-menu.c:167
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:745
+#: composer/e-msg-composer.c:747
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3572,27 +3760,27 @@ msgstr ""
 "\n"
 "╝elite shraniti spremembe?"
 
-#: composer/e-msg-composer.c:767
+#: composer/e-msg-composer.c:772
 msgid "Open file"
 msgstr "Odpri datoteko"
 
-#: composer/e-msg-composer.c:893
+#: composer/e-msg-composer.c:898
 msgid "That file does not exist."
 msgstr "Datoteka ne obstaja."
 
-#: composer/e-msg-composer.c:903
+#: composer/e-msg-composer.c:908
 msgid "That is not a regular file."
 msgstr "To ni obiХajna datoteka."
 
-#: composer/e-msg-composer.c:913
+#: composer/e-msg-composer.c:918
 msgid "That file exists but is not readable."
 msgstr "Ta datoteka obstaja a ni berljiva."
 
-#: composer/e-msg-composer.c:923
+#: composer/e-msg-composer.c:928
 msgid "That file appeared accesible but open(2) failed."
 msgstr "Datoteka se je zdela dostopna a open(2) ni uspel."
 
-#: composer/e-msg-composer.c:945
+#: composer/e-msg-composer.c:950
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3600,15 +3788,15 @@ msgstr ""
 "Datoteka je zelo velika (Хez 100K).\n"
 "Ste prepriХani,da jo ╬elite vstaviti?"
 
-#: composer/e-msg-composer.c:966
+#: composer/e-msg-composer.c:971
 msgid "An error occurred while reading the file."
 msgstr "Ob branju datoteke se je zgodila napaka."
 
-#: composer/e-msg-composer.c:1343
+#: composer/e-msg-composer.c:1350
 msgid "Compose a message"
 msgstr "Sestavi novo sporoХilo"
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1427
 msgid "Could not create composer window."
 msgstr "Nisem mogel ustvariti okna skladatelja."
 
@@ -3622,14 +3810,26 @@ msgid "Sear_ch"
 msgstr "I╧Хi"
 
 #: filter/filter-datespec.c:62
+msgid "year"
+msgstr "leto"
+
+#: filter/filter-datespec.c:62
 msgid "years"
 msgstr "let"
 
 #: filter/filter-datespec.c:63
+msgid "month"
+msgstr "mesec"
+
+#: filter/filter-datespec.c:63
 msgid "months"
 msgstr "mesecev"
 
 #: filter/filter-datespec.c:64
+msgid "week"
+msgstr "teden"
+
+#: filter/filter-datespec.c:64
 msgid "weeks"
 msgstr "tedenov"
 
@@ -3638,14 +3838,26 @@ msgid "days"
 msgstr "dni"
 
 #: filter/filter-datespec.c:66
+msgid "hour"
+msgstr "ura"
+
+#: filter/filter-datespec.c:66
 msgid "hours"
 msgstr "ur"
 
 #: filter/filter-datespec.c:67
+msgid "minute"
+msgstr "minuta"
+
+#: filter/filter-datespec.c:67
 msgid "minutes"
 msgstr "minut"
 
 #: filter/filter-datespec.c:68
+msgid "second"
+msgstr "sekunda"
+
+#: filter/filter-datespec.c:68
 msgid "seconds"
 msgstr " sekund"
 
@@ -3703,6 +3915,10 @@ msgstr "Хas, relatievn trenutnemu"
 msgid "Compare against"
 msgstr "Primerjaj z"
 
+#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
+msgid "now"
+msgstr "sedaj"
+
 #: filter/filter-datespec.c:690
 msgid "<click here to select a date>"
 msgstr "<kliknite tukaj za izbiro datuma>"
@@ -3726,7 +3942,7 @@ msgstr ""
 msgid "outgoing"
 msgstr "Grupiranje"
 
-#: 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 "Uredi filtre"
 
@@ -3763,7 +3979,7 @@ msgstr "Vnesite URI mape"
 msgid "<click here to select a folder>"
 msgstr "<kliknite tukaj za izbiro mape>"
 
-#: filter/filter-input.c:184
+#: filter/filter-input.c:185
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -3772,239 +3988,250 @@ msgstr ""
 "Napaka v regularnem izrazu '%s':\n"
 "%s"
 
-#: filter/filter-message-search.c:379 filter/filter-message-search.c:447
+#: filter/filter-message-search.c:380 filter/filter-message-search.c:448
 #, c-format
 msgid "Failed to perform regex search on message header: %s"
 msgstr ""
 
-#: filter/filter-part.c:456
+#: filter/filter-part.c:467
 msgid "Test"
 msgstr "Preizkus"
 
-#: filter/filter-rule.c:520
+#: filter/filter-rule.c:530
 msgid "Rule name: "
 msgstr "Ime pravila: "
 
-#: filter/filter-rule.c:524
+#: filter/filter-rule.c:534
 msgid "Untitled"
 msgstr "Neimenovan"
 
-#: filter/filter-rule.c:540
+#: filter/filter-rule.c:550
 msgid "If"
 msgstr "хe"
 
-#: filter/filter-rule.c:557
+#: filter/filter-rule.c:567
 msgid "Execute actions"
 msgstr "Izvr╧i dejanja"
 
-#: filter/filter-rule.c:561
+#: filter/filter-rule.c:571
 msgid "if all criteria are met"
 msgstr "Хe je zado╧Хeno vsem pogojem"
 
-#: filter/filter-rule.c:566
+#: filter/filter-rule.c:576
 msgid "if any criteria are met"
 msgstr "Хe je zaddo╧Хeno kateremukoli pogoju"
 
-#: filter/filter-rule.c:577
+#: filter/filter-rule.c:587
 msgid "Add criterion"
 msgstr "Dodaj pogoj"
 
-#: filter/filter-rule.c:583
+#: filter/filter-rule.c:593
 msgid "Remove criterion"
 msgstr "Odstrani pogoj"
 
-#: mail/folder-browser.c:465 po/tmp/filter.glade.h:8
-#: po/tmp/mail-config.glade.h:9
-msgid "Edit"
-msgstr "Uredi"
+#: filter/filter-system-flag.c:63
+#, fuzzy
+msgid "Replied to"
+msgstr "Odgovori vsem"
+
+#. { _("Deleted"), "Deleted" },
+#. { _("Draft"), "Draft" },
+#: filter/filter-system-flag.c:66
+msgid "Important"
+msgstr ""
 
-#: po/tmp/filter.glade.h:10
+#: filter/filter-system-flag.c:67
+#, fuzzy
+msgid "Read"
+msgstr "Obnovi"
+
+#: filter/filter.glade.h:10
 msgid "Edit VFolders"
 msgstr "Uredi vMape"
 
-#: po/tmp/filter.glade.h:11
+#: filter/filter.glade.h:11
 msgid "Filter Rules"
 msgstr "Pravila filtriranja"
 
-#: po/tmp/filter.glade.h:12
+#: filter/filter.glade.h:12
 #, fuzzy
 msgid "Incoming"
 msgstr ""
 "Prihodna\n"
 "Odhodna\n"
 
-#: po/tmp/filter.glade.h:13
+#: filter/filter.glade.h:13
 #, fuzzy
 msgid "Outgoing"
 msgstr "Obroba:"
 
-#: po/tmp/filter.glade.h:15
+#: filter/filter.glade.h:15
 msgid "Virtual Folders"
 msgstr "Virtualne mape"
 
-#: po/tmp/filter.glade.h:16
+#: filter/filter.glade.h:16
 msgid "vFolder Sources"
 msgstr "Viri vMap"
 
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
+msgid "after"
+msgstr "po"
+
+#: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr "Pripi╧i barvo"
 
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:4
 msgid "Assign Score"
 msgstr "Pripi╧i toХke"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:5
+msgid "before"
+msgstr "pred"
+
+#: filter/libfilter-i18n.h:6
+msgid "contains"
+msgstr "vsebuje"
+
+#: filter/libfilter-i18n.h:7
 msgid "Copy to Folder"
 msgstr "Kopiraj v mapo"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "Sprejeto dne"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "Poslano dne"
 
-#: filter/libfilter-i18n.h:8
-msgid "Expression"
-msgstr "Izraz"
-
-#: filter/libfilter-i18n.h:9
-msgid "Forward to Address"
-msgstr "Posreduj na naslove"
-
-#: filter/libfilter-i18n.h:10
-msgid "Message Body"
-msgstr "Jedro sporoХila"
-
 #: filter/libfilter-i18n.h:11
-#, fuzzy
-msgid "Message Header"
-msgstr "Jedro sporoХila"
+msgid "does not contain"
+msgstr "ne vsebuje"
 
 #: filter/libfilter-i18n.h:12
-msgid "Message was received"
-msgstr "SporoХilo je bilo sprejeto"
+msgid "does not end with"
+msgstr "se ne konХa z"
 
 #: filter/libfilter-i18n.h:13
-msgid "Message was sent"
-msgstr "SporoХilo je bilo poslano"
+msgid "does not exist"
+msgstr "ne obstaja"
 
 #: filter/libfilter-i18n.h:14
-msgid "Move to Folder"
-msgstr "Prestavi v mapo"
+msgid "does not sound like"
+msgstr "ne zveni kot"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not start with"
+msgstr "se ne zaХne z"
 
 #: filter/libfilter-i18n.h:16
-msgid "Recipients"
-msgstr "Prejemniki"
+msgid "ends with"
+msgstr "se konХa z"
 
 #: filter/libfilter-i18n.h:17
-msgid "Regex Match"
-msgstr ""
+msgid "exists"
+msgstr "obstaja"
 
 #: filter/libfilter-i18n.h:18
-msgid "Sender"
-msgstr "Po╧iljatelj"
+msgid "Expression"
+msgstr "Izraz"
 
 #: filter/libfilter-i18n.h:19
-#, fuzzy
-msgid "Set Status"
-msgstr "Stanje priklopa"
+msgid "Forward to Address"
+msgstr "Posreduj na naslove"
 
 #: filter/libfilter-i18n.h:20
-msgid "Source"
-msgstr "Vir"
+msgid "is"
+msgstr "je"
 
 #: filter/libfilter-i18n.h:21
-msgid "Specific header"
-msgstr "DoloХena glava"
+msgid "is greater than"
+msgstr "je veХje"
 
 #: filter/libfilter-i18n.h:22
-#, fuzzy
-msgid "Status"
-msgstr "_Stanje:"
+msgid "is less than"
+msgstr "je manj╧e"
 
 #: filter/libfilter-i18n.h:23
-msgid "Stop Processing"
-msgstr "Prenehaj z obdelavo"
+msgid "is not"
+msgstr "ni"
 
 #: filter/libfilter-i18n.h:24
-msgid "Subject"
-msgstr "Zadeva"
+msgid "Message Body"
+msgstr "Jedro sporoХila"
 
 #: filter/libfilter-i18n.h:25
-msgid "after"
-msgstr "po"
+#, fuzzy
+msgid "Message Header"
+msgstr "Jedro sporoХila"
 
 #: filter/libfilter-i18n.h:26
-msgid "before"
-msgstr "pred"
+msgid "Message was received"
+msgstr "SporoХilo je bilo sprejeto"
 
 #: filter/libfilter-i18n.h:27
-msgid "contains"
-msgstr "vsebuje"
+msgid "Message was sent"
+msgstr "SporoХilo je bilo poslano"
 
 #: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr "ne vsebuje"
+msgid "Move to Folder"
+msgstr "Prestavi v mapo"
 
 #: filter/libfilter-i18n.h:29
-msgid "does not end with"
-msgstr "se ne konХa z"
+msgid "on or after"
+msgstr "na ali po"
 
 #: filter/libfilter-i18n.h:30
-msgid "does not exist"
-msgstr "ne obstaja"
-
-#: filter/libfilter-i18n.h:31
-msgid "does not sound like"
-msgstr "ne zveni kot"
+msgid "on or before"
+msgstr "na ali pred"
 
 #: filter/libfilter-i18n.h:32
-msgid "does not start with"
-msgstr "se ne zaХne z"
+msgid "Recipients"
+msgstr "Prejemniki"
 
 #: filter/libfilter-i18n.h:33
-msgid "ends with"
-msgstr "se konХa z"
+msgid "Regex Match"
+msgstr ""
 
 #: filter/libfilter-i18n.h:34
-msgid "exists"
-msgstr "obstaja"
+msgid "Sender"
+msgstr "Po╧iljatelj"
 
 #: filter/libfilter-i18n.h:35
-msgid "is greater than"
-msgstr "je veХje"
+#, fuzzy
+msgid "Set Status"
+msgstr "Stanje priklopa"
 
 #: filter/libfilter-i18n.h:36
-msgid "is less than"
-msgstr "je manj╧e"
+msgid "sounds like"
+msgstr "zveni kot"
 
 #: filter/libfilter-i18n.h:37
-msgid "is not"
-msgstr "ni"
+msgid "Source"
+msgstr "Vir"
 
 #: filter/libfilter-i18n.h:38
-msgid "is"
-msgstr "je"
+msgid "Specific header"
+msgstr "DoloХena glava"
 
 #: filter/libfilter-i18n.h:39
-msgid "on or after"
-msgstr "na ali po"
+msgid "starts with"
+msgstr "se zaХne z"
 
 #: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr "na ali pred"
+#, fuzzy
+msgid "Status"
+msgstr "_Stanje:"
 
 #: filter/libfilter-i18n.h:41
-msgid "sounds like"
-msgstr "zveni kot"
+msgid "Stop Processing"
+msgstr "Prenehaj z obdelavo"
 
 #: filter/libfilter-i18n.h:42
-msgid "starts with"
-msgstr "se zaХne z"
+msgid "Subject"
+msgstr "Zadeva"
 
 #: filter/libfilter-i18n.h:43
 msgid "was after"
@@ -4034,140 +4261,223 @@ msgstr "Dodaj pravilo vMape"
 msgid "Edit VFolder Rule"
 msgstr "Uredi pravilo vMape"
 
-#: mail/component-factory.c:227
+#: mail/component-factory.c:277
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Ne morem inicializirati Evolution komponente za po╧to."
 
-#: mail/component-factory.c:266
+#: mail/component-factory.c:316
 msgid "Cannot register storage with shell"
 msgstr "Ne morem registrirati shrambe z lupino"
 
-#: mail/folder-browser.c:140 po/tmp/evolution-event-editor.xml.h:88
-#: po/tmp/evolution-message-composer.xml.h:16
+#: mail/folder-browser.c:223 ui/evolution-event-editor.xml.h:88
+#: ui/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "Shrani"
 
-#: mail/folder-browser.c:153
+#: mail/folder-browser.c:236
 msgid "Body or subject contains"
 msgstr "Telo ali zadeva vsebuje"
 
-#: mail/folder-browser.c:154
+#: mail/folder-browser.c:237
 msgid "Body contains"
 msgstr "Telo vsebuje"
 
-#: mail/folder-browser.c:155
+#: mail/folder-browser.c:238
 msgid "Subject contains"
 msgstr "Zadeva vsebuje"
 
-#: mail/folder-browser.c:156
+#: mail/folder-browser.c:239
 msgid "Body does not contain"
 msgstr "Telo ne vsebuje"
 
-#: mail/folder-browser.c:157
+#: mail/folder-browser.c:240
 msgid "Subject does not contain"
 msgstr "Zadeva ne vsebuje"
 
-#: mail/folder-browser.c:453
+#: mail/folder-browser.c:643
 msgid "VFolder on Subject"
 msgstr "vMapa glede na Zadevo"
 
-#: mail/folder-browser.c:454
+#: mail/folder-browser.c:644
 msgid "VFolder on Sender"
 msgstr "vMapa glede na Po╧iljatelja"
 
-#: mail/folder-browser.c:455
+#: mail/folder-browser.c:645
 msgid "VFolder on Recipients"
 msgstr "vMapa glede na Prejemnika"
 
-#: mail/folder-browser.c:457
+#: mail/folder-browser.c:647
 msgid "Filter on Subject"
 msgstr "Filter glede na Zadevo"
 
-#: mail/folder-browser.c:458
+#: mail/folder-browser.c:648
 msgid "Filter on Sender"
 msgstr "Filter glede na Po╧iljatelja"
 
-#: mail/folder-browser.c:459
+#: mail/folder-browser.c:649
 msgid "Filter on Recipients"
 msgstr "Filter glede na Prejemnike"
 
-#: mail/folder-browser.c:460 mail/folder-browser.c:544
+#: mail/folder-browser.c:650 mail/folder-browser.c:779
 msgid "Filter on Mailing List"
 msgstr "Filter glede na Po╧tni seznam"
 
-#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:14
+#: mail/folder-browser.c:655
+#, fuzzy
+msgid "Show all hidden"
+msgstr "Ka╬i"
+
+#: mail/folder-browser.c:657
+#, fuzzy
+msgid "Hide selected"
+msgstr "Zbrisano"
+
+#. could use another mask, but not enough api do to it
+#: mail/folder-browser.c:660
+#, fuzzy
+msgid "Hide read"
+msgstr "Skrij"
+
+#: mail/folder-browser.c:661
+#, fuzzy
+msgid "Hide deleted"
+msgstr "Zbrisano"
+
+#: mail/folder-browser.c:663 mail/folder-browser.c:790
+#, fuzzy
+msgid "Hide Subject"
+msgstr "Zadeva"
+
+#: mail/folder-browser.c:665 mail/folder-browser.c:796
+#, fuzzy
+msgid "Hide from Sender"
+msgstr "Filter glede na Po╧iljatelja"
+
+#: mail/folder-browser.c:670 ui/evolution-message-composer.xml.h:15
 #, fuzzy
 msgid "Open"
 msgstr "_Odpri"
 
-#: mail/folder-browser.c:466
+#: mail/folder-browser.c:672
 #, fuzzy
 msgid "Save As..."
 msgstr "Shrani _kot..."
 
-#: mail/folder-browser.c:467 mail/mail-view.c:163
-#: po/tmp/evolution-addressbook.xml.h:13 po/tmp/evolution-calendar.xml.h:23
-#: po/tmp/evolution-mail.xml.h:28
+#: 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 "Natisni"
 
-#: mail/folder-browser.c:469
+#: mail/folder-browser.c:675
 msgid "Reply to Sender"
 msgstr "Odgovori po╧iljatelju"
 
-#: mail/folder-browser.c:470 mail/mail-view.c:156
-#: po/tmp/evolution-mail.xml.h:34
+#: mail/folder-browser.c:676 mail/mail-view.c:141 ui/evolution-mail.xml.h:38
 msgid "Reply to All"
 msgstr "Odgovori vsem"
 
-#: mail/folder-browser.c:471 mail/mail-view.c:159
-#: 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 "Posreduj naprej"
 
-#: mail/folder-browser.c:472 po/tmp/evolution-mail.xml.h:18
+#: mail/folder-browser.c:678 ui/evolution-mail.xml.h:18
 #, fuzzy
 msgid "Forward inline"
 msgstr "Pojdi po Хasu naprej"
 
-#: mail/folder-browser.c:474
+#: mail/folder-browser.c:680
 msgid "Mark as Read"
 msgstr "OznaХi kot prebrano"
 
-#: mail/folder-browser.c:475
+#: mail/folder-browser.c:681
 msgid "Mark as Unread"
 msgstr "OznaХi kot neprebrano"
 
-#: mail/folder-browser.c:477
+#: mail/folder-browser.c:683
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "Prestavi v mapo"
 
-#: mail/folder-browser.c:478
+#: mail/folder-browser.c:684
 #, fuzzy
 msgid "Copy to Folder..."
 msgstr "Kopiraj v mapo"
 
-#: mail/folder-browser.c:480
+#: mail/folder-browser.c:686
 #, fuzzy
 msgid "Undelete"
 msgstr "Zbri╧i"
 
 #. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
 #. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:484
+#: mail/folder-browser.c:690
 msgid "Apply Filters"
 msgstr "Uveljavi filtre"
 
-#: mail/folder-browser.c:486 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:546
+#: mail/folder-browser.c:693 ui/evolution-mail.xml.h:21
+#, fuzzy
+msgid "Hide Messages"
+msgstr "Uredi sporoХilo"
+
+#: mail/folder-browser.c:781
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filter glede na Po╧tni seznam (%s)"
 
+#: mail/folder-browser.c:787
+#, fuzzy, c-format
+msgid "Hide Subject \"%s\""
+msgstr "Zadeva je %s"
+
+#: 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 "Dobi shrambo za \"%s\""
+
+#: mail/local-config.glade.h:7
+#, fuzzy
+msgid "Mailbox Format"
+msgstr "Povzetek po╧tnega predala"
+
+#: mail/local-config.glade.h:8
+#, fuzzy
+msgid "New store format:"
+msgstr "Tip izvora noviХk:"
+
+#: 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
+#, fuzzy
+msgid "mh"
+msgstr "h"
+
 #: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
@@ -4228,7 +4538,7 @@ msgstr "Niste nastavili metode prena╧anja po╧te"
 msgid "You have no Outbox configured"
 msgstr "Nimate nastavljenega Izhodnega po╧tnega predala"
 
-#: mail/mail-callbacks.c:246
+#: mail/mail-callbacks.c:244
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -4236,19 +4546,24 @@ msgstr ""
 "To poroХilo nima 'zadeve'.\n"
 "ResniХno po╧lji?"
 
-#: mail/mail-callbacks.c:291
+#: mail/mail-callbacks.c:312
 msgid "You must specify recipients in order to send this message."
 msgstr "Navesti morate naslovnike, Хe ╬eliti poslati sporoХilo."
 
-#: mail/mail-callbacks.c:552
+#: mail/mail-callbacks.c:530
+#, fuzzy
+msgid "Forwarded message:\n"
+msgstr "Posredovano sporoХilo %s"
+
+#: mail/mail-callbacks.c:611
 msgid "Move message(s) to"
 msgstr "Prestavi sporoХilo(a) v"
 
-#: mail/mail-callbacks.c:554
+#: mail/mail-callbacks.c:613
 msgid "Copy message(s) to"
 msgstr "Kopiraj sporoХilo(a) v"
 
-#: mail/mail-callbacks.c:665
+#: mail/mail-callbacks.c:748
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4256,11 +4571,11 @@ msgstr ""
 "Urejate lahko le sporoХila shranjena\n"
 "v mapi Osnutki."
 
-#: mail/mail-callbacks.c:699 mail/mail-display.c:72
+#: mail/mail-callbacks.c:781 mail/mail-display.c:79
 msgid "Overwrite file?"
 msgstr "Prepi╧i datoteko?"
 
-#: mail/mail-callbacks.c:703 mail/mail-display.c:76
+#: mail/mail-callbacks.c:785 mail/mail-display.c:83
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -4268,17 +4583,17 @@ msgstr ""
 "Mapa z enakim imenom ╬e obstaja.\n"
 "Naj jo prepi╧em?"
 
-#: mail/mail-callbacks.c:748
+#: mail/mail-callbacks.c:830
 #, fuzzy
 msgid "Save Message As..."
 msgstr "Shrani kot..."
 
-#: mail/mail-callbacks.c:750
+#: mail/mail-callbacks.c:832
 #, fuzzy
 msgid "Save Messages As..."
 msgstr "Shrani kot..."
 
-#: mail/mail-callbacks.c:877
+#: mail/mail-callbacks.c:916
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4287,45 +4602,276 @@ msgstr ""
 "Napaka ob nalaganju podatkov o filtrih:\n"
 " %s"
 
-#: mail/mail-callbacks.c:922
+#: mail/mail-callbacks.c:961
 msgid "Print Message"
 msgstr "Natisni sporoХilo"
 
-#: mail/mail-callbacks.c:969
+#: mail/mail-callbacks.c:1008
 msgid "Printing of message failed"
 msgstr "Tiskanje sporoХila ni uspelo"
 
 #.
-#. * 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 "Ni podatkov"
+
+#: mail/mail-config-druid.glade.h:8
+msgid "Account Management"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:9
+#, fuzzy
+msgid "Account Properties"
+msgstr "Lastnosti priloge"
+
+#: mail/mail-config-druid.glade.h:11
+#, fuzzy
+msgid "Advanced"
+msgstr "Dodaj..."
+
+#: mail/mail-config-druid.glade.h:12
+#, fuzzy
+msgid "Authentication"
+msgstr "Avtentikacija:"
+
+#: mail/mail-config-druid.glade.h:13
+#, fuzzy
+msgid "Authentication Type:"
+msgstr "Avtentikacija:"
+
+#: 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 "Privzeto"
+
+#: mail/mail-config-druid.glade.h:26
+#, fuzzy
+msgid "Delete mail from server"
+msgstr "Ne zbri╧i sporoХil s stre╬nika"
+
+#: mail/mail-config-druid.glade.h:27
+#, fuzzy
+msgid "Done"
+msgstr "Brez"
+
+#: mail/mail-config-druid.glade.h:28
+#, fuzzy
+msgid "E-Mail Address:"
+msgstr "E-po╧tni naslov:"
+
+#: mail/mail-config-druid.glade.h:30
+#, fuzzy
+msgid "Email Address:"
+msgstr "E-po╧tni naslov:"
+
+#: mail/mail-config-druid.glade.h:31
+#, fuzzy
+msgid "Evolution Mail Configuration"
+msgstr "Nastavitev _po╧te"
+
+#: mail/mail-config-druid.glade.h:32
+#, fuzzy
+msgid "Full Name:"
+msgstr "Polno ime:"
+
+#: mail/mail-config-druid.glade.h:35
+#, fuzzy
+msgid "Hostname:"
+msgstr "Uporabni╧ko ime:"
+
+#: mail/mail-config-druid.glade.h:36
+#, fuzzy
+msgid "IMAP"
+msgstr "IMAPv4"
+
+#: mail/mail-config-druid.glade.h:37
 msgid "Identity"
 msgstr "Identiteta"
 
-#: 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 "_Po╧lji po╧to"
+
+#: mail/mail-config-druid.glade.h:41
+#, fuzzy
+msgid "Mail Account"
+msgstr "vsebuje"
+
+#: mail/mail-config-druid.glade.h:42
 msgid "Mail Configuration"
 msgstr "Nastavitev _po╧te"
 
-#: po/tmp/mail-config-druid.glade.h:8
-msgid "Mail Source"
-msgstr "Izvor po╧te"
+#: mail/mail-config-druid.glade.h:43
+#, fuzzy
+msgid "Mail Configuration Druid"
+msgstr "Nastavitev _po╧te"
 
-#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
-msgid "Mail Transport"
-msgstr "Prenos Po╧te"
+#: 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 "Nov"
 
-#: po/tmp/mail-config-druid.glade.h:10
-msgid "Welcome to the Evolution Mail configuration wizard!\n"
+#: mail/mail-config-druid.glade.h:48
+#, fuzzy
+msgid "Optional"
+msgstr "Mo╬nosti"
+
+#: mail/mail-config-druid.glade.h:49 mail/mail-config-gui.c:485
+msgid "Organization:"
+msgstr "Organizacija:"
+
+#: mail/mail-config-druid.glade.h:50
+msgid "Outgoing Mail Server"
 msgstr ""
 
-#: po/tmp/mail-config-druid.glade.h:14
+#: mail/mail-config-druid.glade.h:51
+#, fuzzy
+msgid "Password:"
+msgstr "Geslo"
+
+#: mail/mail-config-druid.glade.h:53
+msgid "Plain Text"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:54
+msgid "Receiving Email"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:55
+msgid "Remember my password"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:56 mail/mail-format.c:628
+msgid "Reply-To:"
+msgstr "Odgovori-na:"
+
+#: mail/mail-config-druid.glade.h:57
+#, fuzzy
+msgid "Reply-to:"
+msgstr "Odgovori-na:"
+
+#: mail/mail-config-druid.glade.h:58
+#, fuzzy
+msgid "Required"
+msgstr "_Potrebni ljudje"
+
+#: mail/mail-config-druid.glade.h:60
+#, fuzzy
+msgid "Save password"
+msgstr "Shrani kot vVizitko"
+
+#: mail/mail-config-druid.glade.h:61
+#, fuzzy
+msgid "Select signature file"
+msgstr "Datoteka s podpisom:"
+
+#: mail/mail-config-druid.glade.h:62
+#, fuzzy
+msgid "Sending Email"
+msgstr "Program sendmail"
+
+#: mail/mail-config-druid.glade.h:64
+#, fuzzy
+msgid "Server Configuration"
+msgstr "Nastavitev _po╧te"
+
+#: mail/mail-config-druid.glade.h:65
+msgid "Server Timeouts"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:66
+#, fuzzy
+msgid "Server Type: "
+msgstr "Stre╬nik:"
+
+#: mail/mail-config-druid.glade.h:67
+msgid "Server requires authentication"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:68
+#, fuzzy
+msgid "Servers"
+msgstr "Stre╬nik:"
+
+#: mail/mail-config-druid.glade.h:69 mail/mail-config-gui.c:496
+msgid "Signature file:"
+msgstr "Datoteka s podpisom:"
+
+#: mail/mail-config-druid.glade.h:70
+#, fuzzy
+msgid "Signature:"
+msgstr "Datoteka s podpisom:"
+
+#: mail/mail-config-druid.glade.h:71 mail/mail-config.glade.h:20
+msgid "Sources"
+msgstr "Viri"
+
+#: 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 "Tip:"
+
+#: 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 ""
-"Nastavljanje va╧e e-po╧te je sedaj gotovo.\n"
-"Kliknite \"KonХaj\" za shranitev nastavitev"
+
+#: mail/mail-config-druid.glade.h:76
+#, fuzzy
+msgid "User Information"
+msgstr "Ni podatkov"
+
+#: mail/mail-config-druid.glade.h:77 mail/mail-config-gui.c:928
+msgid "Username:"
+msgstr "Uporabni╧ko ime:"
+
+#: 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 "minut"
 
 #: mail/mail-config-gui.c:433
 msgid ""
@@ -4345,15 +4891,7 @@ msgstr "Polno ime:"
 msgid "Email address:"
 msgstr "E-po╧tni naslov:"
 
-#: mail/mail-config-gui.c:485
-msgid "Organization:"
-msgstr "Organizacija:"
-
-#: mail/mail-config-gui.c:496
-msgid "Signature file:"
-msgstr "Datoteka s podpisom:"
-
-#: 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 "Datoteka s podpisom"
 
@@ -4361,26 +4899,10 @@ msgstr "Datoteka s podpisom"
 msgid "Server:"
 msgstr "Stre╬nik:"
 
-#: mail/mail-config-gui.c:928
-msgid "Username:"
-msgstr "Uporabni╧ko ime:"
-
-#: mail/mail-config-gui.c:934
-msgid "Path:"
-msgstr "Pot:"
-
-#: mail/mail-config-gui.c:943
-msgid "Authentication:"
-msgstr "Avtentikacija:"
-
 #: mail/mail-config-gui.c:956
 msgid "Detect supported types..."
 msgstr "Ugotovi podprte tipe..."
 
-#: 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 "Ne zbri╧i sporoХil s stre╬nika"
@@ -4393,7 +4915,7 @@ msgstr "Preveri nastavitve"
 msgid "Mail source type:"
 msgstr "Tip izvora po╧te:"
 
-#: 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"
@@ -4429,6 +4951,20 @@ msgstr ""
 msgid "Mail transport type:"
 msgstr "Tip prenosa po╧te:"
 
+#: mail/mail-config-gui.c:1183
+#, fuzzy
+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 ""
+"Izberite vrsto po╧tnega stre╬nika, ki ga uporabljate, in nastavite zanj  "
+"potrebne podatke.\n"
+"\n"
+"хe stre╬nik potrebuje avtentifikacijo, lako kliknete na gumb \"Ugotovi "
+"podprte tipe...\" potem, ko boste vnesli ostale podatke."
+
 #: mail/mail-config-gui.c:1233
 msgid "Add Identity"
 msgstr "Dodaj identiteto"
@@ -4477,60 +5013,68 @@ msgstr "Poizvedujem o mo╬nostih avtentifikacije pri \"%s\""
 msgid "Query authorization at \"%s\""
 msgstr "Poizvedi o mo╬nostih avtentifikacije pri \"%s\""
 
-#: po/tmp/mail-config.glade.h:7
+#: mail/mail-config.glade.h:7
 msgid "Address"
 msgstr "Naslov"
 
-#: po/tmp/mail-config.glade.h:10
+#: mail/mail-config.glade.h:10
 msgid "Identities"
 msgstr "Identitete"
 
-#: po/tmp/mail-config.glade.h:11
+#: mail/mail-config.glade.h:11
 msgid "Mail Sources"
 msgstr "Izvori po╧te"
 
-#: po/tmp/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
+msgid "Mail Transport"
+msgstr "Prenos Po╧te"
+
+#: mail/mail-config.glade.h:13
 msgid "Mark message as seen [ms]: "
 msgstr "OznaХi sporoХilo kot viden [ms]:"
 
-#: po/tmp/mail-config.glade.h:14
+#: mail/mail-config.glade.h:14
 msgid "News Servers"
 msgstr "NoviХarski stre╬niki"
 
-#: po/tmp/mail-config.glade.h:15
+#: mail/mail-config.glade.h:15
 msgid "News Sources"
 msgstr "Viri novic"
 
-#: po/tmp/mail-config.glade.h:16
+#: mail/mail-config.glade.h:16
 msgid "Organization"
 msgstr "Organizacija"
 
-#: po/tmp/mail-config.glade.h:18
+#: mail/mail-config.glade.h:18
 msgid "Send messages in HTML format"
 msgstr "Po╧iljaj sporoХila v HTML obliki"
 
-#: po/tmp/mail-config.glade.h:20
-msgid "Sources"
-msgstr "Viri"
-
-#: mail/mail-crypto.c:350 mail/mail-crypto.c:452 mail/mail-crypto.c:629
+#: 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."
 msgstr "Prosim vpi╧ite svojo PGP/GPG geslo za dostop do kljuХa"
 
-#: mail/mail-crypto.c:354 mail/mail-crypto.c:456 mail/mail-crypto.c:634
+#: mail/mail-crypto.c:357 mail/mail-crypto.c:462 mail/mail-crypto.c:640
+#: mail/mail-crypto.c:785
 msgid "No password provided."
 msgstr "Geslo ni bilo dano."
 
-#: mail/mail-crypto.c:360 mail/mail-crypto.c:463 mail/mail-crypto.c:640
+#: mail/mail-crypto.c:363 mail/mail-crypto.c:469 mail/mail-crypto.c:646
+#: mail/mail-crypto.c:792 mail/mail-crypto.c:942
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Nisem mogel ustvariti cevi do GPG/PGP: %s"
 
-#: mail/mail-crypto.c:625
+#: mail/mail-crypto.c:631 mail/mail-crypto.c:777 mail/mail-crypto.c:936
 msgid "No GPG/PGP program available."
 msgstr "GPG/PGP program ni na voljo."
 
-#: mail/mail-display.c:90
+#: mail/mail-crypto.c:953
+#, fuzzy, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "Nisem mogel ustvariti cevi: %s"
+
+#: mail/mail-display.c:98
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -4539,127 +5083,128 @@ msgstr ""
 "Nisem mogel odpreti datoteke: %s:\n"
 "%s"
 
-#: mail/mail-display.c:113
+#: mail/mail-display.c:131
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nisem model pisati podatkov: %s"
 
-#: mail/mail-display.c:218
+#: mail/mail-display.c:229
 msgid "Save Attachment"
 msgstr "Shrani prilogo"
 
-#: mail/mail-display.c:258
+#: mail/mail-display.c:269
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nisem mogel ustvariti zaХasnega imenika: %s"
 
-#: mail/mail-display.c:300
+#: mail/mail-display.c:311
 msgid "Save to Disk..."
 msgstr "Shrani na disk..."
 
-#: mail/mail-display.c:302
+#: mail/mail-display.c:313
 #, c-format
 msgid "Open in %s..."
 msgstr "Odpri v %s..."
 
-#: mail/mail-display.c:304
+#: mail/mail-display.c:315
 msgid "View Inline"
 msgstr "Poglej vsebino"
 
-#: mail/mail-display.c:328
+#: mail/mail-display.c:339
 msgid "External Viewer"
 msgstr "Zunanji pregledovalec"
 
-#: mail/mail-display.c:351
+#: mail/mail-display.c:362
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Poglej vsebino (z %s)"
 
-#: mail/mail-display.c:355
+#: mail/mail-display.c:366
 msgid "Hide"
 msgstr "Skrij"
 
-#: mail/mail-format.c:500
+#: mail/mail-format.c:503
 #, c-format
 msgid "%s attachment"
 msgstr "%s priloga"
 
-#: mail/mail-format.c:623
-msgid "Reply-To:"
-msgstr "Odgovori-na:"
-
-#: mail/mail-format.c:845
+#: mail/mail-format.c:851
 msgid "No GPG/PGP support available in this copy of Evolution."
 msgstr "V tej razliХici Evolucije GPG/PGP podpora ni prisotna."
 
-#: mail/mail-format.c:857
+#: mail/mail-format.c:863
 msgid "Encrypted message not displayed"
 msgstr "╘ifrirano sporoХilo ni prikazano"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:869
 msgid "Encrypted message"
 msgstr "╘ifrirano sporoХilo"
 
-#: mail/mail-format.c:864
+#: mail/mail-format.c:870
 msgid "Click icon to decrypt."
 msgstr "Kliknite ikono za de╧ifriranje."
 
-#: mail/mail-format.c:1470
+#: mail/mail-format.c:1450
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Kazalec na FTP povezavo (%s)"
 
-#: mail/mail-format.c:1482
+#: mail/mail-format.c:1462
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Kazalec na krajevno datoteko (%s) veljaven na stre╬niku \"%s\""
 
-#: mail/mail-format.c:1486
+#: mail/mail-format.c:1466
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Kazalec na lokalno datoteko (%s)"
 
-#: mail/mail-format.c:1520
+#: mail/mail-format.c:1500
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Kazalec na neznane zunanje podatke (tip \"%s\")"
 
-#: mail/mail-format.c:1525
+#: mail/mail-format.c:1505
 msgid "Malformed external-body part."
 msgstr "NapaХno oblikovano dodatno telo sporoХila."
 
-#: mail/mail-format.c:1695
+#: mail/mail-format.c:1675
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr ""
 
-#: mail/mail-local.c:202
+#: mail/mail-local.c:204
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Spreminjam obliko zapisa mape iz \"%s\" v \"%s\""
 
-#: mail/mail-local.c:206
+#: mail/mail-local.c:208
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Spremeni obliko zapisa mape iz \"%s\" v \"%s\""
 
-#: mail/mail-local.c:261
+#: mail/mail-local.c:251
+#, fuzzy
+msgid "Reconfiguring folder"
+msgstr "_Nastavi mapo"
+
+#: mail/mail-local.c:269
 msgid "Closing current folder"
 msgstr "Zapiram trenutno mapo"
 
-#: mail/mail-local.c:293
+#: mail/mail-local.c:295
 msgid "Renaming old folder and opening"
 msgstr "Preimenujem in odpiram staro mapo"
 
-#: mail/mail-local.c:314
+#: mail/mail-local.c:313
 msgid "Creating new folder"
 msgstr "Ustvari novo mapo"
 
-#: mail/mail-local.c:329
+#: mail/mail-local.c:327
 msgid "Copying messages"
 msgstr "Kopiram sporoХilo"
 
-#: mail/mail-local.c:341
+#: mail/mail-local.c:348
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -4668,7 +5213,7 @@ msgstr ""
 "Nisem mogel shraniti meta podatkov mape; verjetno ne boste veХ mogli odpreti "
 "te mape: %s"
 
-#: mail/mail-local.c:372
+#: mail/mail-local.c:379
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -4676,307 +5221,216 @@ msgstr ""
 "хe ne morete veХ odpreti tega po╧tnega predala, potem\n"
 "ga boste morda morali popraviti roХno."
 
-#: mail/mail-local.c:781
+#: mail/mail-local.c:787
 #, fuzzy
 msgid "Registering local folder"
 msgstr "Ustvari novo mapo"
 
-#: mail/mail-local.c:783
+#: mail/mail-local.c:789
 #, fuzzy
 msgid "Register local folder"
 msgstr "Ustvari novo mapo"
 
-#: mail/mail-ops.c:79
+#: mail/mail-local.c:894
+#, fuzzy, c-format
+msgid ""
+"Unable to register folder '%s':\n"
+"%s"
+msgstr "Nisem mogel shraniti datoteke s seznamom skupin za %s: %s"
+
+#: mail/mail-mt.c:85
+#, fuzzy, c-format
+msgid ""
+"Error while '%s':\n"
+"%s"
+msgstr ""
+"Napaka ob '%s':\n"
+"%s"
+
+#: mail/mail-mt.c:87
+#, fuzzy, c-format
+msgid ""
+"Error while performing operation:\n"
+"%s"
+msgstr ""
+"Napaka ob pripravljanju na %s:\n"
+"%s"
+
+#: mail/mail-mt.c:356 mail/mail-mt.c:385
+#, fuzzy
+msgid "Working"
+msgstr "Prestavljam"
+
+#: mail/mail-ops.c:88
 #, c-format
 msgid "Fetching email from %s"
 msgstr "Pobiram po╧to iz %s"
 
-#: mail/mail-ops.c:81
+#: mail/mail-ops.c:90
 #, c-format
 msgid "Fetch email from %s"
 msgstr "Poberi po╧to iz %s"
 
-#: mail/mail-ops.c:331
+#: mail/mail-ops.c:335
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "Ni nove po╧te na %s."
 
-#: mail/mail-ops.c:401
+#: mail/mail-ops.c:405
 msgid "Filtering email on demand"
 msgstr "Filtriram po╧to na zahtevo"
 
-#: mail/mail-ops.c:403
+#: mail/mail-ops.c:407
 msgid "Filter email on demand"
 msgstr "Fitriraj po╧to na zahtevo"
 
-#: mail/mail-ops.c:538
+#: mail/mail-ops.c:551
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Po╧iljam \"%s\""
 
-#: mail/mail-ops.c:543
-msgid "Sending a message without a subject"
-msgstr "Po╧iljam sporoХilo brez navedene zadeve"
-
-#: mail/mail-ops.c:546
-#, c-format
-msgid "Send \"%s\""
-msgstr "Po╧lji \"%s\""
-
-#: mail/mail-ops.c:549
-msgid "Send a message without a subject"
-msgstr "Po╧lji sporoХilo brez navedene zadeve"
+#: mail/mail-ops.c:553
+#, fuzzy
+msgid "Sending message"
+msgstr "Po╧lji to sporoХilo"
 
-#: mail/mail-ops.c:720
+#: mail/mail-ops.c:669
 msgid "Sending queue"
 msgstr "Po╧iljam vrsto"
 
-#: mail/mail-ops.c:722
+#: mail/mail-ops.c:671
 msgid "Send queue"
 msgstr "Po╧lji vrsto"
 
-#: mail/mail-ops.c:858 mail/mail-ops.c:865
+#: mail/mail-ops.c:804 mail/mail-ops.c:811
 #, c-format
 msgid "Appending \"%s\""
 msgstr "Dodajam \"%s\""
 
-#: mail/mail-ops.c:862 mail/mail-ops.c:868
+#: mail/mail-ops.c:808 mail/mail-ops.c:814
 msgid "Appending a message without a subject"
 msgstr "Dodajam sporoХilo brez navedene zadeve"
 
-#: mail/mail-ops.c:940
-#, c-format
-msgid "Expunging \"%s\""
-msgstr "UniХujem \"%s\""
-
-#: mail/mail-ops.c:942
-#, c-format
-msgid "Expunge \"%s\""
-msgstr "UniХi \"%s\""
-
-#: mail/mail-ops.c:1001
+#: mail/mail-ops.c:897
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Prestavljam sporoХila iz \"%s\" v \"%s\""
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:899
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Kopiram sporoХila iz \"%s\" v \"%s\""
 
-#: mail/mail-ops.c:1006
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Prestavi sporoХilo iz \"%s\" v \"%s\""
 
-#: mail/mail-ops.c:1008
+#: mail/mail-ops.c:904
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Kopiraj sporoХilo iz \"%s\" v \"%s\""
 
-#: mail/mail-ops.c:1039
+#: mail/mail-ops.c:935
 msgid "Moving"
 msgstr "Prestavljam"
 
-#: mail/mail-ops.c:1042
+#: mail/mail-ops.c:938
 msgid "Copying"
 msgstr "Kopiram"
 
-#: mail/mail-ops.c:1062
+#: mail/mail-ops.c:958
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s sporoХilo %d od %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1141
-#, c-format
-msgid "Marking messages in folder \"%s\""
-msgstr "Izbiram sporoХila v mapi \"%s\""
-
-#: mail/mail-ops.c:1144
-#, c-format
-msgid "Mark messages in folder \"%s\""
-msgstr "Izberi sporoХila v mapi \"%s\""
-
-#: mail/mail-ops.c:1175
-#, c-format
-msgid "Marking message %d of %d"
-msgstr "Izbiram sporoХilo %d od %d"
-
-#: mail/mail-ops.c:1295
+#: mail/mail-ops.c:1033
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Osve╬ujem mape v \"%s\""
 
-#: mail/mail-ops.c:1297
-#, c-format
-msgid "Scan folders in \"%s\""
-msgstr "Osve╬i mape v \"%s\""
-
-#: mail/mail-ops.c:1366 mail/subscribe-dialog.c:339
+#: mail/mail-ops.c:1099 mail/subscribe-dialog.c:341
 msgid "(No description)"
 msgstr "(ni opisa)"
 
-#: mail/mail-ops.c:1432
-#, c-format
-msgid "Attaching messages from folder \"%s\""
-msgstr "Prilagam sporoХilo iz mape \"%s\""
-
-#: mail/mail-ops.c:1435
-#, c-format
-msgid "Attach messages from \"%s\""
-msgstr "Prilo╬i sporoХilo iz mape \"%s\""
-
-#: mail/mail-ops.c:1535
-#, c-format
-msgid "Forwarding messages \"%s\""
-msgstr "Posredujem sporoХilo \"%s\""
-
-#: mail/mail-ops.c:1539
-msgid "Forwarding a message without a subject"
-msgstr "Posredujem sporoХilo brez navedene zadeve"
-
-#: mail/mail-ops.c:1542
-#, c-format
-msgid "Forward message \"%s\""
-msgstr "Posreduj sporoХilo \"%s\""
-
-#: mail/mail-ops.c:1546
-msgid "Forward a message without a subject"
-msgstr "Posreduj sporoХilo brez navedene zadeve"
-
-#: mail/mail-ops.c:1593
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr "Prena╧am sporoХilo ╧tevilka %d od %d (uid \"%s\")"
-
-#: mail/mail-ops.c:1610
-msgid ""
-"Failed to generate mime part from message while generating forwarded message."
-msgstr ""
-"Nisem uspel generirati mime dela iz sporoХila med generiranjem posredovanega "
-"sporoХila."
-
-#: mail/mail-ops.c:1665
+#: mail/mail-ops.c:1164
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Posredovano sporoХilo %s"
 
-#: mail/mail-ops.c:1679
-#, fuzzy
-msgid "Forwarded message:\n"
-msgstr "Posredovano sporoХilo %s"
-
-#: mail/mail-ops.c:1748
-#, c-format
-msgid "Loading \"%s\""
-msgstr "Nalagam \"%s\""
-
-#: mail/mail-ops.c:1750
-#, c-format
-msgid "Load \"%s\""
-msgstr "Nalo╬i \"%s\""
-
-#: mail/mail-ops.c:1853
-#, c-format
-msgid "Creating \"%s\""
-msgstr "Ustvarjam \"%s\""
-
-#: mail/mail-ops.c:1855
-#, c-format
-msgid "Create \"%s\""
-msgstr "Ustvari \"%s\""
-
-#: mail/mail-ops.c:1903
-msgid "Exception while reporting result to shell component listener."
-msgstr "Izjema med sporoХanjem rezultatov lupini"
+#: mail/mail-ops.c:1205 mail/mail-ops.c:1274
+#, fuzzy, c-format
+msgid "Opening folder %s"
+msgstr "Osve╬ujem mape v \"%s\""
 
-#: mail/mail-ops.c:1949
-#, c-format
-msgid "Synchronizing \"%s\""
+#: mail/mail-ops.c:1336
+#, fuzzy
+msgid "Synchronising folder"
 msgstr "Uskljajujem \"%s\""
 
-#: mail/mail-ops.c:1951
-#, c-format
-msgid "Synchronize \"%s\""
-msgstr "Uskladi \"%s\""
-
-#: mail/mail-ops.c:2015
-#, c-format
-msgid "Displaying message UID \"%s\""
-msgstr "Prikazujem sporoХilo z UID \"%s\""
-
-#: mail/mail-ops.c:2018
-msgid "Clearing message display"
-msgstr "хistim prikazano sporoХilo"
-
-#: mail/mail-ops.c:2021
-#, c-format
-msgid "Display message UID \"%s\""
-msgstr "Prika╬i sporoХilo z UID \"%s\""
+#: mail/mail-ops.c:1386
+#, fuzzy
+msgid "Expunging folder"
+msgstr "UniХujem \"%s\""
 
-#: mail/mail-ops.c:2024
-msgid "Clear message display"
-msgstr "хisti prikaz sporoХila"
+#: mail/mail-ops.c:1434
+#, fuzzy, c-format
+msgid "Retrieving message %s"
+msgstr "Prena╧am sporoХilo : %s"
 
-#: mail/mail-ops.c:2137
-#, c-format
-msgid "Opening messages from folder \"%s\""
-msgstr "Odpiram sporoХila iz  mape \"%s\""
+#: mail/mail-ops.c:1497
+#, fuzzy
+msgid "Retrieving messages"
+msgstr "Prena╧am sporoХilo : %s"
 
-#: mail/mail-ops.c:2140
+#: mail/mail-ops.c:1507
 #, c-format
-msgid "Open messages from \"%s\""
-msgstr "Odpri sporoХilo iz \"%s\""
+msgid "Retrieving message number %d of %d (uid \"%s\")"
+msgstr "Prena╧am sporoХilo ╧tevilka %d od %d (uid \"%s\")"
 
-#: mail/mail-ops.c:2244
-#, c-format
-msgid "Loading %s Folder"
+#: mail/mail-ops.c:1655
+#, fuzzy, c-format
+msgid "Loading %s Folder for %s"
 msgstr "Nalagam mapo %s "
 
-#: mail/mail-ops.c:2246
-#, c-format
-msgid "Load %s Folder"
+#: mail/mail-ops.c:1657
+#, fuzzy, c-format
+msgid "Load %s Folder for %s"
 msgstr "Nalo╬i mapo %s"
 
-#: mail/mail-ops.c:2310
-#, c-format
-msgid "Viewing messages from folder \"%s\""
-msgstr "Gledam sporoХilo iz mape \"%s\""
-
-#: mail/mail-ops.c:2313
-#, c-format
-msgid "View messages from \"%s\""
-msgstr "Glej sporoХilo iz \"%s\""
-
-#: mail/mail-ops.c:2339
-#, c-format
-msgid "Retrieving message %d of %d (uid \"%s\")"
-msgstr "Prena╧am sporoХilo %d od %d (uid \"%s\")"
-
-#: mail/mail-ops.c:2428
-#, fuzzy, c-format
-msgid "Saving messages from folder \"%s\""
-msgstr "Prilagam sporoХilo iz mape \"%s\""
+#: mail/mail-ops.c:1823
+#, fuzzy
+msgid "Saving messages"
+msgstr "Kopiram sporoХilo"
 
-#: mail/mail-ops.c:2431
+#: mail/mail-ops.c:1902
 #, fuzzy, c-format
-msgid "Save messages from folder \"%s\""
-msgstr "Odpiram sporoХila iz  mape \"%s\""
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
+msgstr "Nisem mogel shraniti datoteke s seznamom skupin za %s: %s"
 
-#: mail/mail-ops.c:2474
+#: mail/mail-ops.c:1915
 #, fuzzy, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Prena╧am sporoХilo %d od %d (uid \"%s\")"
 
+#: mail/mail-ops.c:1929
+#, fuzzy, c-format
+msgid ""
+"Error saving messages to: %s:\n"
+" %s"
+msgstr "Napak ob shranjevanju datoteke: %s"
+
 #: mail/mail-search-dialogue.c:104
 msgid "Cancel"
 msgstr "PrekliХi"
 
-#: mail/mail-summary.c:105 mail/mail-threads.c:728
+#: mail/mail-summary.c:110 mail/mail-threads.c:729
 msgid "Incomplete message written on pipe!"
 msgstr "V cev je bilo zapisano nepopolno sporoХilo!"
 
-#: mail/mail-threads.c:301
+#: mail/mail-threads.c:302
 #, c-format
 msgid ""
 "Error while preparing to %s:\n"
@@ -4985,7 +5439,7 @@ msgstr ""
 "Napaka ob pripravljanju na %s:\n"
 "%s"
 
-#: mail/mail-threads.c:675
+#: mail/mail-threads.c:676
 #, c-format
 msgid ""
 "Error while `%s':\n"
@@ -4994,19 +5448,19 @@ msgstr ""
 "Napaka ob '%s':\n"
 "%s"
 
-#: mail/mail-threads.c:732
+#: mail/mail-threads.c:733
 msgid "Error reading commands from dispatching thread."
 msgstr "Napaka ob branju ukazov iz razpo╧iljalne niti."
 
-#: mail/mail-threads.c:797
+#: mail/mail-threads.c:798
 msgid "Corrupted message from dispatching thread?"
 msgstr "Prispelo pokvarjeno sporoХilo iz razpo╧iljalne niti?"
 
-#: mail/mail-threads.c:916
+#: mail/mail-threads.c:917
 msgid "Could not create dialog box."
 msgstr "Nisem mogel ustvariti dialoga."
 
-#: mail/mail-threads.c:927
+#: mail/mail-threads.c:928
 msgid "User cancelled query."
 msgstr "Uporabnik je preklical poizvedbo."
 
@@ -5016,12 +5470,12 @@ msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Nisem mogel ustvariti zaХasnega po╧tnega predala `%s': %s"
 
 #. Get all uids of source
-#: mail/mail-tools.c:239
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Examining %s"
 msgstr "PreuХujem %s"
 
-#: mail/mail-tools.c:269
+#: mail/mail-tools.c:271
 #, c-format
 msgid ""
 "Could not read UID cache file \"%s\". You may receive duplicate messages."
@@ -5029,42 +5483,41 @@ msgstr ""
 "Nisem mogel prebrati UID medpomnilne datoteke \"%s\". Morda boste "
 "dobilipodvojeno sporoХilo."
 
-#. Info
-#: mail/mail-tools.c:290
+#: mail/mail-tools.c:300
 #, c-format
 msgid "Retrieving message %d of %d"
 msgstr "Prena╧am sporoХilo %d od %d"
 
 #. Append it to dest
-#: mail/mail-tools.c:303
+#: mail/mail-tools.c:315
 #, c-format
 msgid "Writing message %d of %d"
 msgstr "Pi╧em sporoХilo %d od %d"
 
-#: mail/mail-tools.c:332
+#: mail/mail-tools.c:347
 #, c-format
 msgid "Saving changes to %s"
 msgstr "Shranjujem spremembe pri %s"
 
-#: mail/mail-tools.c:369
+#: mail/mail-tools.c:381
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (posredovano sporoХilo)"
 
-#: mail/mail-tools.c:379
+#: mail/mail-tools.c:391
 msgid "Fwd: (no subject)"
 msgstr "Posreduj: (ni zadeve)"
 
-#: mail/mail-tools.c:418
+#: mail/mail-tools.c:427
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Posredovano sporoХilo %s"
 
-#: mail/mail-tools.c:420
+#: mail/mail-tools.c:429
 msgid "Forwarded message (no subject)"
 msgstr "Posredovano sporoХilo (brez navedene zadeve)"
 
-#: mail/mail-tools.c:523
+#: mail/mail-tools.c:530
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
@@ -5073,75 +5526,95 @@ msgstr ""
 "Nisem mogel odpreti URIja `%s':\n"
 "%s"
 
-#: mail/mail-vfolder.c:147
+#: mail/mail-vfolder.c:149
 msgid "VFolders"
 msgstr "vMape"
 
-#: mail/mail-vfolder.c:296
+#: mail/mail-vfolder.c:298
 msgid "New VFolder"
 msgstr "Nova vMapa"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:33
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:37
 msgid "Reply"
 msgstr "Odgovori"
 
-#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:38
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
 msgid "Reply to the sender of this message"
 msgstr "Odgovori po╧iljatelju tega sporoХila"
 
-#: mail/mail-view.c:156 po/tmp/evolution-mail.xml.h:37
+#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
 msgid "Reply to all recipients of this message"
 msgstr "Odgovori vsem prejemnikom tega sporoХila"
 
-#: mail/mail-view.c:159 po/tmp/evolution-mail.xml.h:19
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:19
 msgid "Forward this message"
 msgstr "SporoХilo posreduj naprej"
 
-#: mail/mail-view.c:163 po/tmp/evolution-mail.xml.h:32
+#: mail/mail-view.c:148 ui/evolution-mail.xml.h:36
 msgid "Print the selected message"
 msgstr "Natisni izbrano sporoХilo"
 
-#: mail/mail-view.c:165 po/tmp/evolution-mail.xml.h:12
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:12
 msgid "Delete this message"
 msgstr "Zbri╧i to sporХilo"
 
-#: mail/message-list.c:572
+#: mail/message-list.c:590
 msgid "Unseen"
 msgstr "Nevideno"
 
-#: mail/message-list.c:575
+#: mail/message-list.c:593
 msgid "Seen"
 msgstr "Videno"
 
-#: mail/message-list.c:578
+#: mail/message-list.c:596
 msgid "Answered"
 msgstr "Odgovorjeno"
 
-#: mail/message-list.c:846
+#: mail/message-list.c:881
 #, c-format
 msgid "[ %s ]"
 msgstr ""
 
 #. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:858 mail/message-list.c:873
+#: mail/message-list.c:893 mail/message-list.c:909
 #, c-format
 msgid "%s, et al."
 msgstr ""
 
-#: mail/message-list.c:860 mail/message-list.c:875
+#: mail/message-list.c:896 mail/message-list.c:912
 #, fuzzy
 msgid "<unknown>"
 msgstr "Neznano"
 
-#: mail/message-list.c:2068
-msgid "Rebuilding message view"
-msgstr "Obnavljam pogled sporoХil"
+#: mail/message-list.c:965
+msgid "?"
+msgstr "?"
 
-#: mail/message-list.c:2070
-msgid "Rebuild message view"
-msgstr "Obnovi pogled sporoХil"
+#: mail/message-list.c:972
+#, fuzzy
+msgid "Today %l:%M %p"
+msgstr "%I:%M %p"
+
+#: mail/message-list.c:981
+msgid "Yesterday %l:%M %p"
+msgstr ""
+
+#: mail/message-list.c:993
+#, fuzzy
+msgid "%a %l:%M %p"
+msgstr "%I:%M %p"
+
+#: mail/message-list.c:1001
+#, fuzzy
+msgid "%b %d %l:%M %p"
+msgstr "%a %d/%m/%Y %I:%M:%S %p"
+
+#: mail/message-list.c:1003
+#, fuzzy
+msgid "%b %d %Y"
+msgstr "%a %d %Y"
 
 #: mail/subscribe-dialog.c:139
 msgid "Display folders starting with:"
@@ -5157,27 +5630,27 @@ msgstr "Dobivam shrambo za \"%s\""
 msgid "Get store for \"%s\""
 msgstr "Dobi shrambo za \"%s\""
 
-#: mail/subscribe-dialog.c:282
+#: mail/subscribe-dialog.c:283
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "NaroХam se na mapo \"%s\""
 
-#: mail/subscribe-dialog.c:286
+#: mail/subscribe-dialog.c:287
 #, fuzzy, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Preklicujem naroХnino na mapo \"%s\""
 
-#: mail/subscribe-dialog.c:290
+#: mail/subscribe-dialog.c:291
 #, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr "NaroХi se na mapo \"%s\""
 
-#: mail/subscribe-dialog.c:293
+#: mail/subscribe-dialog.c:294
 #, fuzzy, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr "PrekliХi naroХnono na mapo \"%s\""
 
-#: shell/e-setup.c:112 shell/e-setup.c:183
+#: shell/e-setup.c:112 shell/e-setup.c:185
 msgid "Evolution installation"
 msgstr "Namestitev Evolucije"
 
@@ -5194,25 +5667,25 @@ msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Prosim kliknite \"V redu\" za namestitev datotek ali \"PrekliХi\" za izhod"
 
-#: shell/e-setup.c:155
+#: shell/e-setup.c:157
 msgid "Could not update files correctly"
 msgstr "Nisem mogel pravilno prenoviti datotek"
 
-#: shell/e-setup.c:158 shell/e-setup.c:224
+#: shell/e-setup.c:160 shell/e-setup.c:228
 msgid "Evolution files successfully installed."
 msgstr "Evolucijine datoteke so se uspe╧no namestile."
 
-#: shell/e-setup.c:187
+#: shell/e-setup.c:189
 msgid "This seems to be the first time you run Evolution."
 msgstr "Izgleda, da je tokrat va╧ prvi zagon Evolucije."
 
-#: shell/e-setup.c:188
+#: shell/e-setup.c:190
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 "Prosim kliknite \"V redu\" za namestitev Evolucijinih uporabni╧kih datotek "
 "pod"
 
-#: shell/e-setup.c:205
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -5223,7 +5696,7 @@ msgstr ""
 "%s\n"
 "Napaka: %s"
 
-#: shell/e-setup.c:220
+#: shell/e-setup.c:224
 #, c-format
 msgid ""
 "Cannot copy files into\n"
@@ -5232,7 +5705,7 @@ msgstr ""
 "Ne morem kopirati datotek v\n"
 "`%s'."
 
-#: shell/e-setup.c:245
+#: shell/e-setup.c:249
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -5243,7 +5716,7 @@ msgstr ""
 "Prosim premestite jo, da se lahko namestitev\n"
 "Evolucijinih uporabni╧kih datotek nadaljuje."
 
-#: shell/e-setup.c:257
+#: shell/e-setup.c:261
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -5279,7 +5752,7 @@ msgstr ""
 "Tip izbrane mape ni veljaven za zahtevano\n"
 "operacijo."
 
-#: shell/e-shell-folder-selection-dialog.c:291
+#: shell/e-shell-folder-selection-dialog.c:297
 msgid "New..."
 msgstr "Nova..."
 
@@ -5287,23 +5760,19 @@ msgstr "Nova..."
 msgid "(Untitled)"
 msgstr "(Neimenovana)"
 
-#. you might have to call gnome_dialog_run() on the
-#. * dialog returned here, I don't remember...
-#.
-#: shell/e-shell-view-menu.c:114
+#: shell/e-shell-view-menu.c:111
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Program 'Bug buddy' ni bil najden v va╧i poti ($PATH)."
 
-#. same as above
-#: shell/e-shell-view-menu.c:120
+#: shell/e-shell-view-menu.c:117
 msgid "Bug buddy could not be run."
 msgstr "Programa 'Bug buddy' ni bilo mogoХe pognati."
 
-#: shell/e-shell-view-menu.c:172
+#: shell/e-shell-view-menu.c:169
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr "Avtorske pravice pridr╬ane 1999,2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:174
+#: shell/e-shell-view-menu.c:171
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -5313,7 +5782,7 @@ msgstr ""
 "GNOME za delo v skupinah, za po╧to, koledar in \n"
 "urejanje stikov."
 
-#: shell/e-shell-view-menu.c:335
+#: shell/e-shell-view-menu.c:332
 msgid "Go to folder..."
 msgstr "Pojdi v mapo..."
 
@@ -5413,9 +5882,8 @@ msgstr "Odstrani to bli╬njico iz vrstice bli╬njic"
 msgid "Error saving shortcuts."
 msgstr "Napaka ob shranjevanju bli╬njic."
 
-#: po/tmp/evolution-event-editor.xml.h:125
-#: po/tmp/evolution-message-composer.xml.h:43 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 "_Pogled"
 
@@ -5472,12 +5940,13 @@ msgid "The specified type is not supported in this storage"
 msgstr "Izbran tip ni podprt v tem hranilniku"
 
 #: shell/main.c:74
+#, fuzzy
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
-"Over the last month and a half, our focus has been on making\n"
-"Evolution usable. Many of the Evolution developers are now using\n"
+"Over the time since the past release, our focus has been on making\n"
+"Evolution usable.  Many of the Evolution developers are now using\n"
 "Evolution to read their mail full time. You could too. (Just\n"
 "be sure to keep a backup.)\n"
 "\n"
@@ -5532,1135 +6001,1155 @@ msgstr "IzkljuХeno"
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Ne morem inicializirati komponentnega sistema Bonobo."
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-addressbook-ldap.xml.h:6
-msgid "N_ew Directory Server"
-msgstr "N_ov stre╬nik imenikov"
-
-#: po/tmp/evolution-addressbook-ldap.xml.h:7
-msgid "_Actions"
-msgstr "_Dejanja"
-
-#: po/tmp/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:7
 msgid "Create a new contact"
 msgstr "Ustvari nov stik"
 
-#: po/tmp/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete a contact"
 msgstr "Zbri╧i stik"
 
-#: 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 "Poi╧Хi"
 
-#: po/tmp/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:11
 msgid "Find a contact"
 msgstr "Poi╧Хi stik"
 
-#: 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 "Nov"
 
-#: po/tmp/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:14
 msgid "Print contacts"
 msgstr "Natisni stike"
 
-#: po/tmp/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:15
 msgid "Stop"
 msgstr "Ustavi"
 
-#: po/tmp/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:16
 msgid "Stop Loading"
 msgstr "Ustavi nalaganje"
 
-#: po/tmp/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:17
 msgid "View All"
 msgstr "Glej vse"
 
-#: po/tmp/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:18
 msgid "View all contacts"
 msgstr "Glej vse stike"
 
-#: po/tmp/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "_Addressbook Configuration..."
+msgstr "Nastavitev _Po╧te..."
+
+#: ui/evolution-addressbook.xml.h:20
 msgid "_Print Contacts..."
 msgstr "_Natisni stike..."
 
-#: po/tmp/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:21
 msgid "_Search for contacts"
 msgstr "_I╧Хi po kontaktih"
 
-#: po/tmp/evolution-addressbook.xml.h:21
-#: po/tmp/evolution-event-editor.xml.h:123
+#: ui/evolution-addressbook.xml.h:22 ui/evolution-event-editor.xml.h:123
 msgid "_Tools"
 msgstr "_Orodja"
 
 #.
-#. * 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 dni"
 
-#: po/tmp/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:7
 msgid "Alter preferences"
 msgstr "Alternativne nastavitve"
 
-#: po/tmp/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:8
 #, fuzzy
 msgid "Ca_lendar"
 msgstr "Koledar"
 
-#: po/tmp/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:9
 msgid "Calendar Preferences..."
 msgstr "Nastavitve koledarja..."
 
-#: po/tmp/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:10
 msgid "Create a new appointment"
 msgstr "Ustvari nov zmenek"
 
-#: po/tmp/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:11
 msgid "Create a new calendar"
 msgstr "Ustvari nov koledar"
 
-#: po/tmp/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:12
 msgid "Day"
 msgstr "Dan"
 
-#: po/tmp/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:13
 msgid "Go back in time"
 msgstr "Pojdi po Хasu nazaj"
 
-#: po/tmp/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:14
 msgid "Go forward in time"
 msgstr "Pojdi po Хasu naprej"
 
-#: po/tmp/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to"
 msgstr "Pojdi na"
 
-#: po/tmp/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to a specific date"
 msgstr "Pojdi na doloХen datum"
 
-#: po/tmp/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:17
 msgid "Go to present time"
 msgstr "Pojdi na sedanjost"
 
-#: po/tmp/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Mesec"
 
-#: 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 "Naprej"
 
-#: po/tmp/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:21
 msgid "Open a calendar"
 msgstr "Odpri koledar"
 
-#: po/tmp/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:22
 msgid "Prev"
 msgstr "Nazaj"
 
-#: po/tmp/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:24
 msgid "Print this calendar"
 msgstr "Natisni ta koledar"
 
-#: po/tmp/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:25
 #, fuzzy
 msgid "Save calendar as something else"
 msgstr "Shrani koledar kot nekaj drugega"
 
-#: po/tmp/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 day"
 msgstr "Ka╬i en dan"
 
-#: po/tmp/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:27
 msgid "Show 1 month"
 msgstr "Ka╬i en mesec"
 
-#: po/tmp/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:28
 msgid "Show 1 week"
 msgstr "Ka╬i en teden"
 
-#: po/tmp/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr "Poka╬i delavni teden"
 
-#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:414
+#: ui/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:413
 msgid "Today"
 msgstr "Danes"
 
-#: po/tmp/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:31
 msgid "Week"
 msgstr "Teden"
 
-#: 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 "_Nova"
 
-#: po/tmp/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:33
 msgid "_Open Calendar"
 msgstr "Odpri ko_ledar"
 
-#: po/tmp/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:34
 msgid "_Print this calendar"
 msgstr "_Natisni ta koledar"
 
-#: po/tmp/evolution-calendar.xml.h:35
-msgid "_Save Calendar As"
-msgstr "_Shrani koledar kot"
+#: ui/evolution-calendar.xml.h:35
+#, fuzzy
+msgid "_Save As..."
+msgstr "Shrani _kot..."
 
-#: po/tmp/evolution-contact-editor.xml.h:7
+#: ui/evolution-contact-editor.xml.h:7
 msgid "Delete this item"
 msgstr "Zbri╧i ta predmet"
 
-#: po/tmp/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:8
 #, fuzzy
 msgid "Delete..."
 msgstr "Zbri╧i"
 
-#: po/tmp/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-editor.xml.h:9
 #, fuzzy
 msgid "Help"
 msgstr "_PomoХ"
 
-#: po/tmp/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:10
 #, fuzzy
 msgid "Print En_velope..."
 msgstr "Nas_tavi tiskanje..."
 
-#: 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 "Natisni ta predmet"
 
-#: 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 "Natisni..."
 
-#: po/tmp/evolution-contact-editor.xml.h:13
-#: po/tmp/evolution-event-editor.xml.h:89
-#: po/tmp/evolution-message-composer.xml.h:18
+#: 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 "Shrani _kot..."
 
-#: 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 "Shrani in zapri"
 
-#: 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 "Shrani stik in zapri dialog"
 
-#: 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 "Glej pomoХ na liniji"
 
-#: po/tmp/evolution-contact-editor.xml.h:18
+#: ui/evolution-contact-editor.xml.h:18
 #, fuzzy
 msgid "Send _message to contact..."
 msgstr "FIXME: Novo sporoХilo za stik"
 
-#: po/tmp/evolution-contact-editor.xml.h:19
-#: po/tmp/evolution-event-editor.xml.h:110
-#: po/tmp/evolution-message-composer.xml.h:38
-#: 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 "_Datoteka"
 
-#: po/tmp/evolution-contact-editor.xml.h:20
+#: ui/evolution-contact-editor.xml.h:20
 #, fuzzy
 msgid "_Print..."
 msgstr "Natisni..."
 
-#: po/tmp/evolution-contact-editor.xml.h:21
-#: po/tmp/evolution-event-editor.xml.h:121
-#: po/tmp/evolution-message-composer.xml.h:42
+#: ui/evolution-contact-editor.xml.h:21 ui/evolution-event-editor.xml.h:121
+#: ui/evolution-message-composer.xml.h:46
 msgid "_Save"
 msgstr "_Shrani"
 
 #.
-#. * 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 "O tem programu"
 
-#: po/tmp/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:7
 msgid "About..."
 msgstr "O..."
 
-#: po/tmp/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:8
 msgid "Actio_ns"
 msgstr "_Dejanja"
 
-#: po/tmp/evolution-event-editor.xml.h:9
+#: ui/evolution-event-editor.xml.h:9
 msgid "C_lear"
 msgstr "х_isti"
 
-#: po/tmp/evolution-event-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:10
 msgid "C_ut"
 msgstr "_Izre╬i"
 
-#: po/tmp/evolution-event-editor.xml.h:11
+#: ui/evolution-event-editor.xml.h:11
 msgid "Clear"
 msgstr "PoХisti"
 
-#: po/tmp/evolution-event-editor.xml.h:12
+#: ui/evolution-event-editor.xml.h:12
 msgid "Clear the selection"
 msgstr "PoХisti izbiro"
 
-#: po/tmp/evolution-event-editor.xml.h:14
+#: ui/evolution-event-editor.xml.h:14
 msgid "Close this appointment"
 msgstr "Zapri ta zmenek"
 
-#: 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 "Kopiraj"
 
-#: po/tmp/evolution-event-editor.xml.h:16
+#: ui/evolution-event-editor.xml.h:16
 msgid "Copy the selection"
 msgstr "Kopiraj izbrano"
 
-#: po/tmp/evolution-event-editor.xml.h:17
+#: ui/evolution-event-editor.xml.h:17
 msgid "Cut"
 msgstr "Izre╬i"
 
-#: po/tmp/evolution-event-editor.xml.h:18
+#: ui/evolution-event-editor.xml.h:18
 msgid "Cut the selection"
 msgstr "Izre╬i izbrano"
 
-#: po/tmp/evolution-event-editor.xml.h:21
+#: ui/evolution-event-editor.xml.h:21
 msgid "Dump XML"
 msgstr "Shrani kot XML"
 
-#: po/tmp/evolution-event-editor.xml.h:22
+#: ui/evolution-event-editor.xml.h:22
 msgid "Dump the UI Xml description"
 msgstr "Shranio Xml opis uporabni╧kega vmesnika"
 
-#: po/tmp/evolution-event-editor.xml.h:23
+#: ui/evolution-event-editor.xml.h:23
 msgid "FIXME: Address _Book..."
 msgstr "FIXME: A_dresar..."
 
-#: po/tmp/evolution-event-editor.xml.h:24
+#: ui/evolution-event-editor.xml.h:24
 msgid "FIXME: Ch_oose Form..."
 msgstr "FIXME: Izberi izmed..."
 
-#: po/tmp/evolution-event-editor.xml.h:25
+#: ui/evolution-event-editor.xml.h:25
 msgid "FIXME: Chec_k Names"
 msgstr "FIXME: Preve_ri imena"
 
-#: po/tmp/evolution-event-editor.xml.h:26
+#: ui/evolution-event-editor.xml.h:26
 msgid "FIXME: Cop_y to Folder..."
 msgstr "FIXME: Kopiraj v mapo..."
 
-#: po/tmp/evolution-event-editor.xml.h:27
+#: ui/evolution-event-editor.xml.h:27
 msgid "FIXME: D_esign a Form..."
 msgstr "FIXME: _Oblikuj obrazec..."
 
-#: po/tmp/evolution-event-editor.xml.h:28
+#: ui/evolution-event-editor.xml.h:28
 msgid "FIXME: Define Print _Styles"
 msgstr "FIXME: DoloХi _sloge tiskanja"
 
-#: po/tmp/evolution-event-editor.xml.h:29
+#: ui/evolution-event-editor.xml.h:29
 msgid "FIXME: Desi_gn This Form"
 msgstr "FIXME: Obli_kuj ta obrazec"
 
-#: po/tmp/evolution-event-editor.xml.h:30
+#: ui/evolution-event-editor.xml.h:30
 msgid "FIXME: Fi_rst Item in Folder"
 msgstr "FIXME: P_rvi predmet v mapi"
 
-#: po/tmp/evolution-event-editor.xml.h:31
+#: ui/evolution-event-editor.xml.h:31
 msgid "FIXME: For_ward"
 msgstr "FIXME: _Posreduj naprej"
 
-#: po/tmp/evolution-event-editor.xml.h:32
+#: ui/evolution-event-editor.xml.h:32
 msgid "FIXME: Forward as v_Calendar"
 msgstr "FIXME: Posreduj naprej kot v_Koledar"
 
-#: po/tmp/evolution-event-editor.xml.h:33
+#: ui/evolution-event-editor.xml.h:33
 msgid "FIXME: Help"
 msgstr "FIXME: PomoХ"
 
-#: po/tmp/evolution-event-editor.xml.h:34
+#: ui/evolution-event-editor.xml.h:34
 msgid "FIXME: In_complete Task"
 msgstr "FIXME: Do_konХana naloga"
 
-#: po/tmp/evolution-event-editor.xml.h:35
+#: ui/evolution-event-editor.xml.h:35
 msgid "FIXME: Insert File"
 msgstr "FIXME: Vstavi datoteko"
 
-#: po/tmp/evolution-event-editor.xml.h:36
+#: ui/evolution-event-editor.xml.h:36
 msgid "FIXME: It_em..."
 msgstr "FIXME: Pr_edmet..."
 
-#: po/tmp/evolution-event-editor.xml.h:37
+#: ui/evolution-event-editor.xml.h:37
 msgid "FIXME: Paste _Special... "
 msgstr "FIXME: Prilepi po_sebno..."
 
-#: po/tmp/evolution-event-editor.xml.h:38
+#: ui/evolution-event-editor.xml.h:38
 msgid "FIXME: Print Pre_view"
 msgstr "FIXME: Predogled tiskanja"
 
-#: po/tmp/evolution-event-editor.xml.h:39
+#: ui/evolution-event-editor.xml.h:39
 msgid "FIXME: Pu_blish Form As..."
 msgstr "FIXME: O_bjavi obrazec kot..."
 
-#: po/tmp/evolution-event-editor.xml.h:40
+#: ui/evolution-event-editor.xml.h:40
 msgid "FIXME: Publish _Form..."
 msgstr "FIXME: Ob_javi obrazec..."
 
-#: po/tmp/evolution-event-editor.xml.h:41
+#: ui/evolution-event-editor.xml.h:41
 msgid "FIXME: Rec_urrence..."
 msgstr "FIXME: Ponovitve..."
 
-#: po/tmp/evolution-event-editor.xml.h:42
+#: ui/evolution-event-editor.xml.h:42
 msgid "FIXME: S_end"
 msgstr "FIXME: Po╧lji"
 
-#: po/tmp/evolution-event-editor.xml.h:43
+#: ui/evolution-event-editor.xml.h:43
 msgid "FIXME: Save Attac_hments..."
 msgstr "FIXME: Dodaj prilogo..."
 
-#: po/tmp/evolution-event-editor.xml.h:44
+#: ui/evolution-event-editor.xml.h:44
 msgid "FIXME: Script _Debugger"
 msgstr "FIXME: Razhro╧Хevalnik skript"
 
-#: po/tmp/evolution-event-editor.xml.h:45
+#: ui/evolution-event-editor.xml.h:45
 msgid "FIXME: Task _Request"
 msgstr "FIXME: Zahteva po _nalogi"
 
-#: po/tmp/evolution-event-editor.xml.h:46
+#: ui/evolution-event-editor.xml.h:46
 msgid "FIXME: _Contact"
 msgstr "FIXME: _Stik"
 
-#: po/tmp/evolution-event-editor.xml.h:47
+#: ui/evolution-event-editor.xml.h:47
 msgid "FIXME: _Customize..."
 msgstr "FIXME: _Po meri..."
 
-#: po/tmp/evolution-event-editor.xml.h:48
+#: ui/evolution-event-editor.xml.h:48
 msgid "FIXME: _File..."
 msgstr "FIXME: _Datoteka..."
 
-#: po/tmp/evolution-event-editor.xml.h:49
+#: ui/evolution-event-editor.xml.h:49
 msgid "FIXME: _Font..."
 msgstr "FIXME: _Pisava..."
 
-#: po/tmp/evolution-event-editor.xml.h:50
+#: ui/evolution-event-editor.xml.h:50
 msgid "FIXME: _Formatting"
 msgstr "FIXME: _Oblikovanje"
 
-#: po/tmp/evolution-event-editor.xml.h:51
+#: ui/evolution-event-editor.xml.h:51
 msgid "FIXME: _Item"
 msgstr "FIXME: _Predmet"
 
-#: po/tmp/evolution-event-editor.xml.h:52
+#: ui/evolution-event-editor.xml.h:52
 msgid "FIXME: _Journal Entry"
 msgstr "FIXME: _Vpis v dnevniku"
 
-#: po/tmp/evolution-event-editor.xml.h:53
+#: ui/evolution-event-editor.xml.h:53
 msgid "FIXME: _Last Item in Folder"
 msgstr "FIXME: _Zadnji predmet v mapi"
 
-#: po/tmp/evolution-event-editor.xml.h:54
+#: ui/evolution-event-editor.xml.h:54
 msgid "FIXME: _Mail Message"
 msgstr "FIXME: _Po╧lji sporoХilo"
 
-#: po/tmp/evolution-event-editor.xml.h:55
+#: ui/evolution-event-editor.xml.h:55
 msgid "FIXME: _Memo Style"
 msgstr "FIXME: V slogu zabele╬ka"
 
-#: po/tmp/evolution-event-editor.xml.h:56
+#: ui/evolution-event-editor.xml.h:56
 msgid "FIXME: _Move to Folder..."
 msgstr "FIXME: Prestavi v mapo..."
 
-#: po/tmp/evolution-event-editor.xml.h:57
+#: ui/evolution-event-editor.xml.h:57
 msgid "FIXME: _New Appointment"
 msgstr "FIXME: _Nov zmenek"
 
-#: po/tmp/evolution-event-editor.xml.h:58
+#: ui/evolution-event-editor.xml.h:58
 msgid "FIXME: _Note"
 msgstr "FIXME: _Opomba"
 
-#: po/tmp/evolution-event-editor.xml.h:59
+#: ui/evolution-event-editor.xml.h:59
 msgid "FIXME: _Object..."
 msgstr "FIXME: _Zadeva..."
 
-#: po/tmp/evolution-event-editor.xml.h:60
+#: ui/evolution-event-editor.xml.h:60
 msgid "FIXME: _Paragraph..."
 msgstr "FIXME: _Odstavek..."
 
-#: po/tmp/evolution-event-editor.xml.h:61
+#: ui/evolution-event-editor.xml.h:61
 msgid "FIXME: _Spelling..."
 msgstr "FIXME: _хrkovanje..."
 
-#: po/tmp/evolution-event-editor.xml.h:62
+#: ui/evolution-event-editor.xml.h:62
 msgid "FIXME: _Standard"
 msgstr "FIXME: _ObiХajno"
 
-#: po/tmp/evolution-event-editor.xml.h:63
+#: ui/evolution-event-editor.xml.h:63
 msgid "FIXME: _Task"
 msgstr "FIXME: _Naloga"
 
-#: po/tmp/evolution-event-editor.xml.h:64
+#: ui/evolution-event-editor.xml.h:64
 msgid "FIXME: _Unread Item"
 msgstr "FIXME: _Neprebran predmet"
 
-#: po/tmp/evolution-event-editor.xml.h:65
+#: ui/evolution-event-editor.xml.h:65
 msgid "FIXME: what goes here?"
 msgstr "FIXME: kaj pride sem?"
 
-#: po/tmp/evolution-event-editor.xml.h:66
-#: po/tmp/evolution-message-composer.xml.h:10
+#: ui/evolution-event-editor.xml.h:66 ui/evolution-message-composer.xml.h:11
 msgid "F_ormat"
 msgstr "O_blikuj izpis"
 
-#: po/tmp/evolution-event-editor.xml.h:68
+#: ui/evolution-event-editor.xml.h:68
 msgid "Find Again"
 msgstr "Poi╧Хi znova"
 
-#: po/tmp/evolution-event-editor.xml.h:69
+#: ui/evolution-event-editor.xml.h:69
 msgid "Find _Again"
 msgstr "Poi╧Хi znova"
 
-#: po/tmp/evolution-event-editor.xml.h:70
+#: ui/evolution-event-editor.xml.h:70
 msgid "Go to the next item"
 msgstr "Pojdi na naslednji predmet"
 
-#: po/tmp/evolution-event-editor.xml.h:71
+#: ui/evolution-event-editor.xml.h:71
 msgid "Go to the previous item"
 msgstr "Pojdi na prej╧nji predmet"
 
-#: po/tmp/evolution-event-editor.xml.h:72
+#: ui/evolution-event-editor.xml.h:72
 msgid "Modify the file's properties"
 msgstr "Spremeni lastnosti datoteke"
 
-#: po/tmp/evolution-event-editor.xml.h:73
+#: ui/evolution-event-editor.xml.h:73
 msgid "N_ext"
 msgstr "Napr_ej"
 
-#: po/tmp/evolution-event-editor.xml.h:75
+#: ui/evolution-event-editor.xml.h:75
 msgid "Paste"
 msgstr "Prilepi"
 
-#: po/tmp/evolution-event-editor.xml.h:76
+#: ui/evolution-event-editor.xml.h:76
 msgid "Paste the clipboard"
 msgstr "Prilepi odlo╬i╧Хe"
 
-#: po/tmp/evolution-event-editor.xml.h:77
+#: ui/evolution-event-editor.xml.h:77
 msgid "Pre_vious"
 msgstr "P_rej╧nji"
 
-#: po/tmp/evolution-event-editor.xml.h:78
+#: ui/evolution-event-editor.xml.h:78
 msgid "Previous"
 msgstr "Prej╧nji"
 
-#: po/tmp/evolution-event-editor.xml.h:79
+#: ui/evolution-event-editor.xml.h:79
 msgid "Print S_etup..."
 msgstr "Nas_tavi tiskanje..."
 
-#: po/tmp/evolution-event-editor.xml.h:80
+#: ui/evolution-event-editor.xml.h:80
 msgid "Print Setup"
 msgstr "Nastavitev tiskanja"
 
-#: po/tmp/evolution-event-editor.xml.h:83
+#: ui/evolution-event-editor.xml.h:83
 msgid "Properties"
 msgstr "Lastnosti"
 
-#: po/tmp/evolution-event-editor.xml.h:84
+#: ui/evolution-event-editor.xml.h:84
 msgid "Redo"
 msgstr "Obnovi"
 
-#: po/tmp/evolution-event-editor.xml.h:85
+#: ui/evolution-event-editor.xml.h:85
 msgid "Redo the undone action"
 msgstr "Obnovi razveljavljeno dejanje"
 
-#: po/tmp/evolution-event-editor.xml.h:86
+#: ui/evolution-event-editor.xml.h:86
 msgid "Replace"
 msgstr "Zamenjaj"
 
-#: po/tmp/evolution-event-editor.xml.h:87
+#: ui/evolution-event-editor.xml.h:87
 msgid "Replace a string"
 msgstr "Zamenjaj niz"
 
-#: 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 "Shrani zmenek in zapri dialog"
 
-#: po/tmp/evolution-event-editor.xml.h:92
-#: po/tmp/evolution-message-composer.xml.h:21
+#: ui/evolution-event-editor.xml.h:92 ui/evolution-message-composer.xml.h:24
 msgid "Save the current file"
 msgstr "Shrani trenutno datoteko"
 
-#: po/tmp/evolution-event-editor.xml.h:93
+#: ui/evolution-event-editor.xml.h:93
 #, fuzzy
 msgid "Schedule Meeting"
 msgstr "FIXME: NaХrtuj sestanek"
 
-#: po/tmp/evolution-event-editor.xml.h:94
+#: ui/evolution-event-editor.xml.h:94
 #, fuzzy
 msgid "Schedule _Meeting"
 msgstr "FIXME: _NaХrtuj sestanek"
 
-#: po/tmp/evolution-event-editor.xml.h:95
+#: ui/evolution-event-editor.xml.h:95
 msgid "Schedule some sort of a meeting"
 msgstr "NaХrtuj nek tip sestanka"
 
-#: po/tmp/evolution-event-editor.xml.h:96
+#: ui/evolution-event-editor.xml.h:96
 msgid "Search again for the same string"
 msgstr "I╧Хi enak niz znova"
 
-#: po/tmp/evolution-event-editor.xml.h:97
+#: ui/evolution-event-editor.xml.h:97
 msgid "Search for a string"
 msgstr "I╧Хi niz"
 
-#: po/tmp/evolution-event-editor.xml.h:99
+#: ui/evolution-event-editor.xml.h:99
 msgid "Select All"
 msgstr "Izberi vse"
 
-#: po/tmp/evolution-event-editor.xml.h:100
+#: ui/evolution-event-editor.xml.h:100
 msgid "Select everything"
 msgstr "Izberi vse"
 
-#: 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 "Nastavi lastnosti strani za va╧ trenutni tiskalnik"
 
-#: po/tmp/evolution-event-editor.xml.h:102
+#: ui/evolution-event-editor.xml.h:102
 msgid "Undo"
 msgstr "Razveljavi"
 
-#: po/tmp/evolution-event-editor.xml.h:103
+#: ui/evolution-event-editor.xml.h:103
 msgid "Undo the last action"
 msgstr "Razveljavi zadnje dejanje"
 
-#: po/tmp/evolution-event-editor.xml.h:104
-#: po/tmp/evolution-message-composer.xml.h:34
+#: ui/evolution-event-editor.xml.h:104 ui/evolution-message-composer.xml.h:38
 msgid "_About..."
 msgstr "_O..."
 
-#: po/tmp/evolution-event-editor.xml.h:105
-#: po/tmp/evolution-message-composer.xml.h:35
+#: ui/evolution-event-editor.xml.h:105 ui/evolution-message-composer.xml.h:39
 msgid "_Close"
 msgstr "_Zapri"
 
-#: po/tmp/evolution-event-editor.xml.h:106
+#: ui/evolution-event-editor.xml.h:106
 msgid "_Copy"
 msgstr "_Kopiraj"
 
-#: po/tmp/evolution-event-editor.xml.h:107
-#: po/tmp/evolution-message-composer.xml.h:36
+#: ui/evolution-event-editor.xml.h:107 ui/evolution-message-composer.xml.h:40
 msgid "_Debug"
 msgstr "_Razhro╧Хuj"
 
-#: po/tmp/evolution-event-editor.xml.h:109
-#: po/tmp/evolution-message-composer.xml.h:37
-#: 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 "_Uredi"
 
-#: po/tmp/evolution-event-editor.xml.h:111
+#: ui/evolution-event-editor.xml.h:111
 msgid "_Find..."
 msgstr "_Poi╧Хi"
 
-#: po/tmp/evolution-event-editor.xml.h:112
+#: ui/evolution-event-editor.xml.h:112
 msgid "_Forms"
 msgstr "_Obrazci"
 
-#: po/tmp/evolution-event-editor.xml.h:113
-#: po/tmp/evolution-message-composer.xml.h:39 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 "_PomoХ"
 
-#: po/tmp/evolution-event-editor.xml.h:114
+#: ui/evolution-event-editor.xml.h:114
 msgid "_Insert"
 msgstr "Vstavi"
 
-#: po/tmp/evolution-event-editor.xml.h:115
+#: ui/evolution-event-editor.xml.h:115
 msgid "_Object"
 msgstr "_Predmet"
 
-#: po/tmp/evolution-event-editor.xml.h:116
+#: ui/evolution-event-editor.xml.h:116
 msgid "_Paste"
 msgstr "_Prilepi"
 
-#: po/tmp/evolution-event-editor.xml.h:117
+#: ui/evolution-event-editor.xml.h:117
 msgid "_Print"
 msgstr "_Natisni"
 
-#: po/tmp/evolution-event-editor.xml.h:118
+#: ui/evolution-event-editor.xml.h:118
 msgid "_Properties..."
 msgstr "_Lastnosti..."
 
-#: po/tmp/evolution-event-editor.xml.h:119
+#: ui/evolution-event-editor.xml.h:119
 msgid "_Redo"
 msgstr "Obnovi"
 
-#: po/tmp/evolution-event-editor.xml.h:120
+#: ui/evolution-event-editor.xml.h:120
 msgid "_Replace..."
 msgstr "_Zamenjaj..."
 
-#: po/tmp/evolution-event-editor.xml.h:122
+#: ui/evolution-event-editor.xml.h:122
 msgid "_Toolbars"
 msgstr "_Orodjarne"
 
-#: po/tmp/evolution-event-editor.xml.h:124
+#: ui/evolution-event-editor.xml.h:124
 msgid "_Undo"
 msgstr "_Razveljavi"
 
 #.
-#. * 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 "Sestavi"
 
-#: po/tmp/evolution-mail.xml.h:7
+#: ui/evolution-mail.xml.h:7
 msgid "Compose a new message"
 msgstr "Sestavi novo sporoХilo"
 
-#: po/tmp/evolution-mail.xml.h:9
+#: ui/evolution-mail.xml.h:9
 msgid "Copy message to a new folder"
 msgstr "Prestavi sporoХilo v novo mapo"
 
-#: 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 "_Mapa"
 
-#: po/tmp/evolution-mail.xml.h:14
+#: ui/evolution-mail.xml.h:14
 msgid "Fi_lter on Sender"
 msgstr "Filtriraj glede na Po╧iljatelja"
 
-#: po/tmp/evolution-mail.xml.h:15
+#: ui/evolution-mail.xml.h:15
 msgid "Filter on Rec_ipients"
 msgstr "Filtriraj glede na Prejemnike"
 
-#: po/tmp/evolution-mail.xml.h:16
+#: ui/evolution-mail.xml.h:16
 msgid "Forget _Passwords"
 msgstr "Pozabi _gesla"
 
-#: po/tmp/evolution-mail.xml.h:20
+#: ui/evolution-mail.xml.h:20
 msgid "Get Mail"
 msgstr "Poberi po╧to"
 
-#: po/tmp/evolution-mail.xml.h:21
+#: ui/evolution-mail.xml.h:22
+#, fuzzy
+msgid "Hide _Deleted messages"
+msgstr "Zbri╧i sporХilo"
+
+#: ui/evolution-mail.xml.h:23
 #, fuzzy
-msgid "Mail _Filters"
+msgid "Hide _Read messages"
+msgstr "Posredovano sporoХilo %s"
+
+#: ui/evolution-mail.xml.h:24
+#, fuzzy
+msgid "Hide _Selected messages"
+msgstr "Natisni izbrano sporoХilo"
+
+#: ui/evolution-mail.xml.h:25
+#, fuzzy
+msgid "Mail _Filters..."
 msgstr "Po╧lji _filtre ..."
 
-#: po/tmp/evolution-mail.xml.h:22
+#: ui/evolution-mail.xml.h:26
 #, fuzzy
-msgid "Manage Subscriptions"
+msgid "Manage Subscriptions..."
 msgstr "Uredi naroХnine..."
 
-#: po/tmp/evolution-mail.xml.h:23
+#: ui/evolution-mail.xml.h:27
 msgid "Mar_k As Read"
 msgstr "OznaХi _kot prebrano"
 
-#: po/tmp/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:28
 msgid "Mark As U_nread"
 msgstr "OznaХi kot _neprebrano"
 
-#: po/tmp/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:29
 msgid "Move"
 msgstr "Prestavi"
 
-#: po/tmp/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:30
 msgid "Move message to a new folder"
 msgstr "Prestavi sporoХilo v novo mapo"
 
-#: po/tmp/evolution-mail.xml.h:27
+#: ui/evolution-mail.xml.h:31
 msgid "Previews the message to be printed"
 msgstr "Predogled sporoХika, ki bo natisnjeno"
 
-#: po/tmp/evolution-mail.xml.h:29
+#: ui/evolution-mail.xml.h:33
 msgid "Print Preview of message..."
 msgstr "Predogled tiskanja sporoХila"
 
-#: po/tmp/evolution-mail.xml.h:30
+#: ui/evolution-mail.xml.h:34
 msgid "Print message to the printer"
 msgstr "Natisni sporoХilo na tiskalniku"
 
-#: po/tmp/evolution-mail.xml.h:31
+#: ui/evolution-mail.xml.h:35
 msgid "Print message..."
 msgstr "Natisni sporoХilo..."
 
-#: po/tmp/evolution-mail.xml.h:35
+#: ui/evolution-mail.xml.h:39
 msgid "Reply to _All"
 msgstr "Odgovori _vsem"
 
-#: po/tmp/evolution-mail.xml.h:36
+#: ui/evolution-mail.xml.h:40
 msgid "Reply to _Sender"
 msgstr "Odgovori po╧iljatelju"
 
-#: po/tmp/evolution-mail.xml.h:39 po/tmp/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:43 ui/evolution-subscribe.xml.h:12
 msgid "Select _All"
 msgstr "Izberi vse"
 
-#: po/tmp/evolution-mail.xml.h:40
+#: ui/evolution-mail.xml.h:44
 msgid "Send queued mail and retrieve new mail"
 msgstr "Po╧lji po╧to v vrsti in sprejmi novo po╧to"
 
-#: po/tmp/evolution-mail.xml.h:41
+#: ui/evolution-mail.xml.h:45
+#, fuzzy
+msgid "Show _All messages"
+msgstr "Ka╬i"
+
+#: ui/evolution-mail.xml.h:46
 msgid "Threaded Message list"
 msgstr "_Niten seznam sporoХil"
 
-#: po/tmp/evolution-mail.xml.h:42
+#: ui/evolution-mail.xml.h:47
 msgid "VFolder on Se_nder"
 msgstr "vMapa glede na _Po╧iljatelja"
 
-#: po/tmp/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:48
 msgid "VFolder on _Recipients"
 msgstr "vMapa glede na _Sprejemnike"
 
-#: po/tmp/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:49
 msgid "View Raw Message Source"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:50
 msgid "_Apply Filters"
 msgstr "_Uveljavi filtre"
 
-#: po/tmp/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:51
 msgid "_Configure Folder"
 msgstr "_Nastavi mapo"
 
-#: po/tmp/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:52
 #, fuzzy
 msgid "_Copy to Folder..."
 msgstr "_Kopiraj v mapo"
 
-#: po/tmp/evolution-mail.xml.h:49
+#: ui/evolution-mail.xml.h:54
 msgid "_Edit Message"
 msgstr "_Uredi sporoХilo"
 
-#: po/tmp/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:55
 msgid "_Expunge"
 msgstr "_UniХi"
 
-#: po/tmp/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:56
 msgid "_Filter on Subject"
 msgstr "Filtriraj glede na _Zadevo"
 
-#: po/tmp/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:57
 msgid "_Forward"
 msgstr "Posreduj _naprej"
 
-#: po/tmp/evolution-mail.xml.h:53 po/tmp/evolution-subscribe.xml.h:17
+#: ui/evolution-mail.xml.h:58 ui/evolution-subscribe.xml.h:17
 msgid "_Invert Selection"
 msgstr "_Obrni izbor"
 
-#: po/tmp/evolution-mail.xml.h:54
-#, fuzzy
-msgid "_Mail Configuration"
-msgstr "Nastavitev _po╧te"
+#: ui/evolution-mail.xml.h:59
+msgid "_Mail Configuration..."
+msgstr "Nastavitev _Po╧te..."
 
-#: po/tmp/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:60
 msgid "_Message"
 msgstr "_SporoХilo"
 
-#: po/tmp/evolution-mail.xml.h:56
+#: ui/evolution-mail.xml.h:61
 #, fuzzy
 msgid "_Move to Folder..."
 msgstr "_Prestavi v mapo"
 
-#: po/tmp/evolution-mail.xml.h:57
+#: ui/evolution-mail.xml.h:62
 msgid "_Open in New Window"
 msgstr "_Odpri v novem oknu"
 
-#: po/tmp/evolution-mail.xml.h:58
+#: ui/evolution-mail.xml.h:63
 msgid "_Print Message"
 msgstr "_Natisni sporoХilo"
 
-#: po/tmp/evolution-mail.xml.h:59
+#: ui/evolution-mail.xml.h:64
 #, fuzzy
 msgid "_Save Message As..."
 msgstr "Shrani kot..."
 
-#: po/tmp/evolution-mail.xml.h:60
+#: ui/evolution-mail.xml.h:65
 #, fuzzy
 msgid "_Source"
 msgstr "Vir"
 
-#: po/tmp/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:66
 msgid "_Threaded"
 msgstr "_Niteno"
 
-#: po/tmp/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:67
 #, fuzzy
 msgid "_Undelete"
 msgstr "_Zbri╧i"
 
-#: po/tmp/evolution-mail.xml.h:63
+#: ui/evolution-mail.xml.h:68
 msgid "_VFolder on Subject"
 msgstr "vMapa glede na _Zadevo"
 
-#: po/tmp/evolution-mail.xml.h:64
+#: ui/evolution-mail.xml.h:69
 #, fuzzy
-msgid "_Virtual Folder Editor"
+msgid "_Virtual Folder Editor..."
 msgstr "Urejevalnik _virtualnih map..."
 
 #.
-#. * 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 "Prilo╬i"
 
-#: po/tmp/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:9
 #, fuzzy
 msgid "Close the current file"
 msgstr "Shrani trenutno datoteko"
 
-#: po/tmp/evolution-message-composer.xml.h:11
+#: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Encrypt this message with PGP"
+msgstr "╘ifrirano sporoХilo"
+
+#: ui/evolution-message-composer.xml.h:12
 msgid "HTML"
 msgstr "HTML"
 
-#: po/tmp/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:13
 msgid "Insert a file as text into the message"
 msgstr "Vstavi datoteko v sporoХilo kot besedilo"
 
-#: po/tmp/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:14
 #, fuzzy
 msgid "Insert text file..."
 msgstr "_Vstavi datoteko z besedilom... (FIXME)"
 
-#: po/tmp/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:16
 #, fuzzy
 msgid "Open a file"
 msgstr "Odpri datoteko"
 
-#: po/tmp/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:17
+msgid "PGP Encrypt"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:18
+msgid "PGP Sign"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:20
 #, fuzzy
 msgid "Save As"
 msgstr "Shrani _kot"
 
-#: po/tmp/evolution-message-composer.xml.h:19
+#: ui/evolution-message-composer.xml.h:22
 #, fuzzy
 msgid "Save in _folder... (FIXME)"
 msgstr "Shrani v _mapo..."
 
-#: po/tmp/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:23
 #, fuzzy
 msgid "Save in folder..."
 msgstr "Shrani v _mapo..."
 
-#: po/tmp/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:25
 #, fuzzy
 msgid "Save the current file with a different name"
 msgstr "Shrani trenutno datoteko"
 
-#: po/tmp/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "Shrani sporoХilo v izbrano mapo"
 
-#: po/tmp/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:27
 #, fuzzy
 msgid "Send"
 msgstr "Po╧iljatelj"
 
-#: po/tmp/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:28
 #, fuzzy
 msgid "Send _Later"
 msgstr "Po╧iljatelj"
 
-#: po/tmp/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:29
 #, fuzzy
 msgid "Send _later"
 msgstr "Po╧iljatelj"
 
-#: po/tmp/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr "Po╧lji po╧to v HTML obliki"
 
-#: po/tmp/evolution-message-composer.xml.h:28
+#: ui/evolution-message-composer.xml.h:31
 #, fuzzy
 msgid "Send the message later"
 msgstr "Po╧lji to sporoХilo"
 
-#: po/tmp/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:32
 #, fuzzy
 msgid "Send the message now"
 msgstr "Po╧lji to sporoХilo"
 
-#: po/tmp/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:33
 #, fuzzy
 msgid "Send this message now"
 msgstr "Po╧lji to sporoХilo"
 
-#: po/tmp/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:34
 #, fuzzy
 msgid "Show / hide attachments"
 msgstr "Ka╬i/skrij priloge"
 
-#: po/tmp/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show _attachments"
 msgstr "Ka╬i priloge"
 
-#: po/tmp/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:36
 #, fuzzy
 msgid "Show attachments"
 msgstr "Ka╬i priloge"
 
-#: po/tmp/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Sign this message with your PGP key"
+msgstr "Po╧iljam sporoХilo brez navedene zadeve"
+
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Insert text file... (FIXME)"
 msgstr "_Vstavi datoteko z besedilom... (FIXME)"
 
-#: po/tmp/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:45
 #, fuzzy
 msgid "_Open..."
 msgstr "Odpri..."
 
+#: 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 "Dodaj mapo na seznam naroХenih map"
 
-#: po/tmp/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:9
 msgid "Refresh List"
 msgstr "Osve╬i seznam"
 
-#: po/tmp/evolution-subscribe.xml.h:10
+#: ui/evolution-subscribe.xml.h:10
 msgid "Refresh List of Folders"
 msgstr "Osve╬i seznam map"
 
-#: po/tmp/evolution-subscribe.xml.h:11
+#: ui/evolution-subscribe.xml.h:11
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Odstrani mapo iz seznama naroХenih map"
 
-#: po/tmp/evolution-subscribe.xml.h:13
+#: ui/evolution-subscribe.xml.h:13
 msgid "Subscribe"
 msgstr "NaroХi"
 
-#: po/tmp/evolution-subscribe.xml.h:14
+#: ui/evolution-subscribe.xml.h:14
 msgid "Unsubscribe"
 msgstr "Prekini naroХnino"
 
 #.
-#. * 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 "Poka╬i drugo mapo"
 
-#: po/tmp/evolution.xml.h:7
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "_Izhod"
 
-#: po/tmp/evolution.xml.h:8
+#: ui/evolution.xml.h:8
 msgid "Evolution bar _shortcut"
 msgstr "Evolution vrstica z bli╬njicami"
 
-#: po/tmp/evolution.xml.h:9
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Izhod iz programa"
 
-#: po/tmp/evolution.xml.h:10
+#: ui/evolution.xml.h:10
 msgid "Getting _Started"
 msgstr "Kako _zaХeti"
 
-#: po/tmp/evolution.xml.h:11
+#: ui/evolution.xml.h:11
 msgid "Show information about Evolution"
 msgstr "Ka╬i podatke o Evoluciji"
 
-#: po/tmp/evolution.xml.h:12
+#: ui/evolution.xml.h:12
 msgid "Show the _Folder Bar"
 msgstr "Ka╬i vrstico z _mapami"
 
-#: po/tmp/evolution.xml.h:13
+#: ui/evolution.xml.h:13
 msgid "Show the _Shortcut Bar"
 msgstr "Ka╬i vrstico z bli╬njicami"
 
-#: po/tmp/evolution.xml.h:14
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "Submit _Bug Report"
 msgstr "_Po╧lji poroХilo o hro╧Хu"
 
-#: po/tmp/evolution.xml.h:15
+#: ui/evolution.xml.h:15
 #, fuzzy
 msgid "Submit bug report using Bug Buddy."
 msgstr "Po╧lji poroХilo o hro╧Хu z uporabo progama Bug buddy"
 
-#: po/tmp/evolution.xml.h:16
+#: ui/evolution.xml.h:16
 msgid "Toggle whether to show the folder bar"
 msgstr "Preklopi prikaz vrstice z mapami"
 
-#: po/tmp/evolution.xml.h:17
+#: ui/evolution.xml.h:17
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Preklopi prikaz vrstice z bli╬njicami"
 
-#: po/tmp/evolution.xml.h:18
+#: ui/evolution.xml.h:18
 msgid "Using the C_ontact Manager"
 msgstr "Uporaba upravljalnika _stikov"
 
-#: po/tmp/evolution.xml.h:19
+#: ui/evolution.xml.h:19
 msgid "Using the _Calendar"
 msgstr "Uporaba _koledarja"
 
-#: po/tmp/evolution.xml.h:20
+#: ui/evolution.xml.h:20
 msgid "Using the _Mailer"
 msgstr "Uporaba _po╧te"
 
-#: po/tmp/evolution.xml.h:21
+#: ui/evolution.xml.h:21
 msgid "_About Evolution..."
 msgstr "_O Evoluciji..."
 
-#: po/tmp/evolution.xml.h:22
+#: ui/evolution.xml.h:22
 msgid "_Appointment (FIXME)"
 msgstr "_Zmenek (FIXME)"
 
-#: po/tmp/evolution.xml.h:23
+#: ui/evolution.xml.h:23
 msgid "_Contact (FIXME)"
 msgstr "_Kontakt (FIXME)"
 
-#: po/tmp/evolution.xml.h:26
+#: ui/evolution.xml.h:26
 msgid "_Folder"
 msgstr "_Mapa"
 
-#: po/tmp/evolution.xml.h:27
+#: ui/evolution.xml.h:27
 msgid "_Go to Folder..."
 msgstr "Pojdi v _mapo..."
 
-#: po/tmp/evolution.xml.h:29
+#: ui/evolution.xml.h:29
 msgid "_Index"
 msgstr "_Kazalo"
 
-#: po/tmp/evolution.xml.h:30
+#: ui/evolution.xml.h:30
 msgid "_Mail message (FIXME)"
 msgstr "_Po╧lji sporoХilo (FIXME)"
 
-#: po/tmp/evolution.xml.h:32
+#: ui/evolution.xml.h:32
 msgid "_Settings"
 msgstr "_Nastavitve"
 
-#: po/tmp/evolution.xml.h:33
+#: ui/evolution.xml.h:33
 msgid "_Task (FIXME)"
 msgstr "_Naloga (FIXME)"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2470
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B %Y"
 
@@ -6740,28 +7229,34 @@ msgstr "хas zakljuХka sestanka:"
 msgid "All Attendees"
 msgstr "Vsi udele╬eni"
 
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: widgets/misc/e-calendar-item.c:421
+msgid "MTWTFSS"
+msgstr "PTSхPSN"
+
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
+#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-clipped-label.c:107
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-dateedit.c:408
+#: widgets/misc/e-dateedit.c:407
 msgid "Now"
 msgstr "Sedaj"
 
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1249 widgets/misc/e-dateedit.c:1308
-#: widgets/misc/e-dateedit.c:1487
+#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
+#: widgets/misc/e-dateedit.c:1486
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1252 widgets/misc/e-dateedit.c:1311
-#: widgets/misc/e-dateedit.c:1490
+#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
+#: widgets/misc/e-dateedit.c:1489
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
@@ -6770,12 +7265,291 @@ msgstr "%I:%M %p"
 msgid "Group %i"
 msgstr "Skupina %i"
 
+#~ msgid "categories"
+#~ msgstr "kategorije"
+
+#~ msgid "Item(s) belong to these categories:"
+#~ msgstr "Predmet(i) pripada(jo) tem kategorijam:"
+
+#~ msgid "Available Categories:"
+#~ msgstr "Dostopne kategorije:"
+
+#~ msgid "External Directories"
+#~ msgstr "Zunanji imeniki"
+
+#~ msgid "Port Number:"
+#~ msgstr "╘tevilka vrat:"
+
+#~ msgid "Outline:"
+#~ msgstr "Obroba:"
+
+#~ msgid "Headings:"
+#~ msgstr "Zaglavja:"
+
+#~ msgid "Empty days:"
+#~ msgstr "Prazni dnevi:"
+
+#~ msgid "Appointments:"
+#~ msgstr "Zmenki:"
+
+#~ msgid "Highlighted day:"
+#~ msgstr "Osvetljen dan:"
+
+#~ msgid "Day numbers:"
+#~ msgstr "╘tevilke dni:"
+
+#~ msgid "Current day's number:"
+#~ msgstr "╘tevilka trenutnega dne:"
+
+#~ msgid "To-Do item that is not yet due:"
+#~ msgstr "Predmet za-opravit, ki ╧e ni na vrsti:"
+
+#~ msgid "To-Do item that is due today:"
+#~ msgstr "Predmet za-opravit, ki je na vrsti danes:"
+
+#~ msgid "To-Do item that is overdue:"
+#~ msgstr "Predmet za-opravit, ki je ╬e pretekel:"
+
+#~ msgid "may"
+#~ msgstr "maj"
+
+#~ msgid "sept"
+#~ msgstr "sept"
+
+#~ msgid "sunday"
+#~ msgstr "nedelja"
+
+#~ msgid "monday"
+#~ msgstr "ponedeljek"
+
+#~ msgid "tuesday"
+#~ msgstr "torek"
+
+#~ msgid "tues"
+#~ msgstr "tor"
+
+#~ msgid "wednesday"
+#~ msgstr "sreda"
+
+#~ msgid "wednes"
+#~ msgstr "sre"
+
+#~ msgid "thursday"
+#~ msgstr "Хetrtek"
+
+#~ msgid "thur"
+#~ msgstr "Хet"
+
+#~ msgid "thurs"
+#~ msgstr "Хet"
+
+#~ msgid "friday"
+#~ msgstr "petek"
+
+#~ msgid "saturday"
+#~ msgstr "sobota"
+
+#~ msgid "fortnight"
+#~ msgstr "╧tirinajst dni"
+
+#~ msgid "min"
+#~ msgstr "min"
+
+#~ msgid "sec"
+#~ msgstr "sek"
+
+#~ msgid "tomorrow"
+#~ msgstr "jutri"
+
+#~ msgid "yesterday"
+#~ msgstr "vХeraj"
+
+#~ msgid "today"
+#~ msgstr "danes"
+
+#~ msgid "last"
+#~ msgstr "zadnji"
+
+#~ msgid "this"
+#~ msgstr "ta"
+
+#~ msgid "next"
+#~ msgstr "naslednji"
+
+#~ msgid "first"
+#~ msgstr "prvi"
+
+#~ msgid "third"
+#~ msgstr "tretji"
+
+#~ msgid "fourth"
+#~ msgstr "Хetrti"
+
+#~ msgid "fifth"
+#~ msgstr "peti"
+
+#~ msgid "sixth"
+#~ msgstr "╧esti"
+
+#~ msgid "seventh"
+#~ msgstr "sedmi"
+
+#~ msgid "eighth"
+#~ msgstr "osmi"
+
+#~ msgid "ninth"
+#~ msgstr "deveti"
+
+#~ msgid "tenth"
+#~ msgstr "deseti"
+
+#~ msgid "eleventh"
+#~ msgstr "enajsti"
+
+#~ msgid "twelfth"
+#~ msgstr "dvanajsti"
+
+#~ msgid "ago"
+#~ msgstr "nazaj"
+
+#~ msgid "Year:"
+#~ msgstr "Leto:"
+
 #~ msgid ""
-#~ "Are you sure you want\n"
-#~ "to delete this contact?"
+#~ "Please select the date you want to go to.\n"
+#~ "When you click on a day, you will be taken\n"
+#~ "to that date."
 #~ msgstr ""
-#~ "Ste prepriХani, da \n"
-#~ "╬elite izbrisati ta stik?"
+#~ "Prosim izberite datum na katerega hoХete iti.\n"
+#~ "Ko klikente na dan boste samodejno ╧li\n"
+#~ "na ta datum."
+
+#~ msgid "Mail Source"
+#~ msgstr "Izvor po╧te"
+
+#~ msgid ""
+#~ "Your email configuration is now complete.\n"
+#~ "Click \"Finish\" to save your new settings"
+#~ msgstr ""
+#~ "Nastavljanje va╧e e-po╧te je sedaj gotovo.\n"
+#~ "Kliknite \"KonХaj\" za shranitev nastavitev"
+
+#~ msgid "Send \"%s\""
+#~ msgstr "Po╧lji \"%s\""
+
+#~ msgid "Send a message without a subject"
+#~ msgstr "Po╧lji sporoХilo brez navedene zadeve"
+
+#~ msgid "Expunge \"%s\""
+#~ msgstr "UniХi \"%s\""
+
+#~ msgid "Marking messages in folder \"%s\""
+#~ msgstr "Izbiram sporoХila v mapi \"%s\""
+
+#~ msgid "Mark messages in folder \"%s\""
+#~ msgstr "Izberi sporoХila v mapi \"%s\""
+
+#~ msgid "Marking message %d of %d"
+#~ msgstr "Izbiram sporoХilo %d od %d"
+
+#~ msgid "Scan folders in \"%s\""
+#~ msgstr "Osve╬i mape v \"%s\""
+
+#~ msgid "Attaching messages from folder \"%s\""
+#~ msgstr "Prilagam sporoХilo iz mape \"%s\""
+
+#~ msgid "Attach messages from \"%s\""
+#~ msgstr "Prilo╬i sporoХilo iz mape \"%s\""
+
+#~ msgid "Forwarding messages \"%s\""
+#~ msgstr "Posredujem sporoХilo \"%s\""
+
+#~ msgid "Forwarding a message without a subject"
+#~ msgstr "Posredujem sporoХilo brez navedene zadeve"
+
+#~ msgid "Forward message \"%s\""
+#~ msgstr "Posreduj sporoХilo \"%s\""
+
+#~ msgid "Forward a message without a subject"
+#~ msgstr "Posreduj sporoХilo brez navedene zadeve"
+
+#~ msgid ""
+#~ "Failed to generate mime part from message while generating forwarded message."
+#~ msgstr ""
+#~ "Nisem uspel generirati mime dela iz sporoХila med generiranjem posredovanega "
+#~ "sporoХila."
+
+#~ msgid "Loading \"%s\""
+#~ msgstr "Nalagam \"%s\""
+
+#~ msgid "Load \"%s\""
+#~ msgstr "Nalo╬i \"%s\""
+
+#~ msgid "Creating \"%s\""
+#~ msgstr "Ustvarjam \"%s\""
+
+#~ msgid "Create \"%s\""
+#~ msgstr "Ustvari \"%s\""
+
+#~ msgid "Exception while reporting result to shell component listener."
+#~ msgstr "Izjema med sporoХanjem rezultatov lupini"
+
+#~ msgid "Synchronize \"%s\""
+#~ msgstr "Uskladi \"%s\""
+
+#~ msgid "Displaying message UID \"%s\""
+#~ msgstr "Prikazujem sporoХilo z UID \"%s\""
+
+#~ msgid "Clearing message display"
+#~ msgstr "хistim prikazano sporoХilo"
+
+#~ msgid "Display message UID \"%s\""
+#~ msgstr "Prika╬i sporoХilo z UID \"%s\""
+
+#~ msgid "Clear message display"
+#~ msgstr "хisti prikaz sporoХila"
+
+#~ msgid "Opening messages from folder \"%s\""
+#~ msgstr "Odpiram sporoХila iz  mape \"%s\""
+
+#~ msgid "Open messages from \"%s\""
+#~ msgstr "Odpri sporoХilo iz \"%s\""
+
+#~ msgid "Viewing messages from folder \"%s\""
+#~ msgstr "Gledam sporoХilo iz mape \"%s\""
+
+#~ msgid "View messages from \"%s\""
+#~ msgstr "Glej sporoХilo iz \"%s\""
+
+#~ msgid "Retrieving message %d of %d (uid \"%s\")"
+#~ msgstr "Prena╧am sporoХilo %d od %d (uid \"%s\")"
+
+#, fuzzy
+#~ msgid "Saving messages from folder \"%s\""
+#~ msgstr "Prilagam sporoХilo iz mape \"%s\""
+
+#, fuzzy
+#~ msgid "Save messages from folder \"%s\""
+#~ msgstr "Odpiram sporoХila iz  mape \"%s\""
+
+#~ msgid "Rebuilding message view"
+#~ msgstr "Obnavljam pogled sporoХil"
+
+#~ msgid "Rebuild message view"
+#~ msgstr "Obnovi pogled sporoХil"
+
+#~ msgid "N_ew Directory Server"
+#~ msgstr "N_ov stre╬nik imenikov"
+
+#~ msgid "_Actions"
+#~ msgstr "_Dejanja"
+
+#~ msgid "_Save Calendar As"
+#~ msgstr "_Shrani koledar kot"
+
+#, fuzzy
+#~ msgid "_Mail Configuration"
+#~ msgstr "Nastavitev _po╧te"
 
 #~ msgid "window2"
 #~ msgstr "okno2"
@@ -6811,9 +7585,6 @@ msgstr "Skupina %i"
 #~ msgid "Due Date:"
 #~ msgstr "Do datuma:"
 
-#~ msgid "Priority:"
-#~ msgstr "Prioriteta:"
-
 #~ msgid "Item Comments:"
 #~ msgstr "Komentarji predmeta:"
 
@@ -6930,9 +7701,6 @@ msgstr "Skupina %i"
 #~ msgid "MH folders may not be nested."
 #~ msgstr "MH mape ne morejo biti gnezdene"
 
-#~ msgid "Deleted"
-#~ msgstr "Zbrisano"
-
 #~ msgid "Draft"
 #~ msgstr "Osnutek"
 
@@ -6948,9 +7716,6 @@ msgstr "Skupina %i"
 #~ msgid "matches regex"
 #~ msgstr "ustreza regularnemu izrazu"
 
-#~ msgid "Cannot initialize Evolution's mail summary component."
-#~ msgstr "Ne morem inicializirati Evolution komponente za povzemanje po╧te."
-
 #~ msgid "Cannot initialize Evolution's mail storage hash."
 #~ msgstr "Ne morem inicializirati Evolution komponente za razpr╧eno shrambo."
 
@@ -6963,15 +7728,9 @@ msgstr "Skupina %i"
 #~ msgid "Open in New Window"
 #~ msgstr "Odpri v novem oknu"
 
-#~ msgid "Edit Message"
-#~ msgstr "Uredi sporoХilo"
-
 #~ msgid "Forward Message"
 #~ msgstr "SporoХilo posreduj naprej"
 
-#~ msgid "Delete Message"
-#~ msgstr "Zbri╧i sporХilo"
-
 #~ msgid "Move Message"
 #~ msgstr "Prestavi sporoХilo"
 
@@ -7001,9 +7760,6 @@ msgstr "Skupina %i"
 #~ msgid " (XXX unread)"
 #~ msgstr " (XXX neprebran)"
 
-#~ msgid "Mailbox summary"
-#~ msgstr "Povzetek po╧tnega predala"
-
 #~ msgid "Don't know protocol to open URI `%s'"
 #~ msgstr "Ne poznam protokola za odpiranje URIja `%s'"
 
@@ -7013,18 +7769,12 @@ msgstr "Skupina %i"
 #~ msgid "Thread message list"
 #~ msgstr "Niten seznam sporoХil"
 
-#~ msgid "_New Contact"
-#~ msgstr "_Nov stik"
-
 #~ msgid "New Ca_lendar"
 #~ msgstr "Nov Ko_ledar"
 
 #~ msgid "_New appointment..."
 #~ msgstr "_Nov zmenek..."
 
-#~ msgid "_Mail Configuration..."
-#~ msgstr "Nastavitev _Po╧te..."
-
 #~ msgid "_Create New Folder..."
 #~ msgstr "_Ustvari novo mapo..."
 
@@ -7034,9 +7784,6 @@ msgstr "Skupina %i"
 #~ msgid "Bad storage URL (no server): %s"
 #~ msgstr "Neveljaven URL shrambe (ni stre╬nika): %s"
 
-#~ msgid "Retrieving messages : %s"
-#~ msgstr "Prena╧am sporoХilo : %s"
-
 #~ msgid "FIXME: _Appointment"
 #~ msgstr "FIXME: _Zmenek"
 
@@ -7163,9 +7910,6 @@ msgstr "Skupina %i"
 #~ msgid "S_ubject:"
 #~ msgstr "Z_adeva:"
 
-#~ msgid "Owner:"
-#~ msgstr "Lastnik:"
-
 #~ msgid ""
 #~ "Not Started\n"
 #~ "In Progress\n"
@@ -7210,12 +7954,6 @@ msgstr "Skupina %i"
 #~ msgid "% Complete"
 #~ msgstr "% konХano"
 
-#~ msgid "URL"
-#~ msgstr "URL"
-
-#~ msgid "?"
-#~ msgstr "?"
-
 #~ msgid "FIXME: Ca_lendar..."
 #~ msgstr "FIXME: Ko_kedar..."
 
@@ -7357,9 +8095,6 @@ msgstr "Skupina %i"
 #~ msgid "Select recipients' addresses"
 #~ msgstr "Izberi naslove prejemnikov"
 
-#~ msgid "Name"
-#~ msgstr "Ime"
-
 #~ msgid "To: >>"
 #~ msgstr "Za: >>"
 
diff --git a/po/sv.po b/po/sv.po
index 2316a0172d..7936aa5a51 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -4,13 +4,13 @@
 # Richard Hult <rhult@codefactory.se>, 2000.
 # Christian Rose <menthos@menthos.com>, 2000.
 #
-# $Id: sv.po,v 1.52 2001/01/03 22:47:02 menthos Exp $
+# $Id: sv.po,v 1.53 2001/01/09 12:42:06 kmaraas Exp $
 #
 #: camel/providers/smtp/camel-smtp-transport.c:287
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2001-01-03 23:42+0100\n"
+"POT-Creation-Date: 2001-01-06 00:11+0100\n"
 "PO-Revision-Date: 2001-01-03 23:43+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -460,27 +460,10 @@ msgid "Could not read pilot's Address application block"
 msgstr "Kunde inte lДsa pilotens adressprogramblock"
 
 #.
-#. * 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 "kategorier"
-
-#: addressbook/contact-editor/categories-strings.h:8
-msgid "Item(s) belong to these categories:"
-msgstr "Element(en) tillhЖr dessa kategorier:"
-
-#: addressbook/contact-editor/categories-strings.h:9
-msgid "Available Categories:"
-msgstr "TillgДngliga kategorier:"
-
-#.
-#. * 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 "Ta bort kontakten?"
 
@@ -494,7 +477,7 @@ msgid "_Add"
 msgstr "_LДgg till"
 
 #: 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 "_Ta bort"
 
@@ -508,12 +491,13 @@ msgid "New phone type"
 msgstr "Ny telefontyp"
 
 #.
-#. * 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/addressbook-config.glade.h:6 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 "LДgg till"
 
@@ -571,7 +555,7 @@ msgid "C_ontacts..."
 msgstr "_Kontakter..."
 
 #: 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 "Ka_tegorier..."
 
@@ -588,7 +572,8 @@ msgid "_Address..."
 msgstr "_Adress..."
 
 #: 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 "AllmДnt"
 
@@ -633,7 +618,7 @@ msgid "No_tes:"
 msgstr "An_teckningar:"
 
 #: 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 "Detaljer"
 
@@ -689,7 +674,7 @@ msgstr "Mobil"
 
 #: addressbook/contact-editor/e-contact-editor.c:1286
 #: addressbook/contact-editor/e-contact-editor.c:1381
-#: po/tmp/mail-config.glade.h:17
+#: mail/mail-config.glade.h:17
 msgid "Other"
 msgstr "Annat"
 
@@ -726,50 +711,50 @@ msgid "Email 3"
 msgstr "E-post 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 "Adress _2:"
 
-#: po/tmp/fulladdr.glade.h:7
+#: addressbook/contact-editor/fulladdr.glade.h:7
 msgid "Canada"
 msgstr "Kanada"
 
-#: po/tmp/fulladdr.glade.h:8
+#: addressbook/contact-editor/fulladdr.glade.h:8
 msgid "Check Address"
 msgstr "Kontrollera adress"
 
-#: po/tmp/fulladdr.glade.h:9
+#: addressbook/contact-editor/fulladdr.glade.h:9
 msgid "Countr_y:"
 msgstr "_Land:"
 
-#: po/tmp/fulladdr.glade.h:10
+#: addressbook/contact-editor/fulladdr.glade.h:10
 msgid "Finland"
 msgstr "Finland"
 
-#: po/tmp/fulladdr.glade.h:11
+#: addressbook/contact-editor/fulladdr.glade.h:11
 msgid "USA"
 msgstr "USA"
 
-#: po/tmp/fulladdr.glade.h:12
+#: addressbook/contact-editor/fulladdr.glade.h:12
 msgid "_Address:"
 msgstr "_Adress:"
 
-#: po/tmp/fulladdr.glade.h:13
+#: addressbook/contact-editor/fulladdr.glade.h:13
 msgid "_City:"
 msgstr "_Ort:"
 
-#: po/tmp/fulladdr.glade.h:14
+#: addressbook/contact-editor/fulladdr.glade.h:14
 msgid "_PO Box:"
 msgstr "_Box:"
 
-#: po/tmp/fulladdr.glade.h:15
+#: addressbook/contact-editor/fulladdr.glade.h:15
 msgid "_State/Province:"
 msgstr "Del_stat/Provins:"
 
-#: po/tmp/fulladdr.glade.h:16
+#: addressbook/contact-editor/fulladdr.glade.h:16
 msgid "_ZIP Code:"
 msgstr "_Postnummer:"
 
@@ -836,24 +821,29 @@ msgstr "_Efternamn:"
 msgid "_Suffix:"
 msgstr "_Suffix:"
 
-#: addressbook/gui/component/addressbook.c:230
+#: addressbook/gui/component/addressbook.c:231
 msgid "As _Minicards"
 msgstr "Som _minikort"
 
 #.
-#. * 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 "Som _tabell"
 
-#: addressbook/gui/component/addressbook.c:347
+#: addressbook/gui/component/addressbook.c:374
+#, fuzzy, c-format
+msgid "Enter password for %s"
+msgstr "Var vДnlig och ange NNTP-lЖsenordet fЖr %s@%s"
+
+#: addressbook/gui/component/addressbook.c:402
 msgid "Unable to open addressbook"
 msgstr "Kan inte Жppna adressboken"
 
-#: 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"
@@ -874,27 +864,27 @@ msgstr ""
 "vill kunna anvДnda LDAP mЕste du hДmta och installera\n"
 "OpenLDAP och kompilera om och installera Evolution.\n"
 
-#: addressbook/gui/component/addressbook.c:473 mail/folder-browser.c:178
+#: addressbook/gui/component/addressbook.c:528 mail/folder-browser.c:219
 msgid "Show All"
 msgstr "Visa alla"
 
-#: addressbook/gui/component/addressbook.c:475 mail/folder-browser.c:180
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 msgid "Advanced..."
 msgstr "Avancerat..."
 
-#: addressbook/gui/component/addressbook.c:505
+#: addressbook/gui/component/addressbook.c:560
 msgid "Any field contains"
 msgstr "NЕgot fДlt innehЕller"
 
-#: addressbook/gui/component/addressbook.c:506
+#: addressbook/gui/component/addressbook.c:561
 msgid "Name contains"
 msgstr "Namnet innehЕller"
 
-#: addressbook/gui/component/addressbook.c:507
+#: addressbook/gui/component/addressbook.c:562
 msgid "Email contains"
 msgstr "E-postadressen innehЕller"
 
-#: addressbook/gui/component/addressbook.c:593
+#: addressbook/gui/component/addressbook.c:648
 msgid "The URI that the Folder Browser will display"
 msgstr "URI:n som mappblДddraren kommer att visa"
 
@@ -959,6 +949,7 @@ msgid "Remember this password"
 msgstr "Kom ihЕg detta lЖsenord"
 
 #: addressbook/gui/component/addressbook-config.c:360
+#: mail/mail-config-druid.glade.h:34
 msgid "Host:"
 msgstr "VДrd:"
 
@@ -975,12 +966,12 @@ msgid "Search Scope:"
 msgstr "SЖkomfattning:"
 
 #: addressbook/gui/component/addressbook-config.c:438
-#: mail/mail-config-gui.c:943
+#: mail/mail-config-druid.glade.h:14 mail/mail-config-gui.c:943
 msgid "Authentication:"
 msgstr "Autentisering:"
 
 #: addressbook/gui/component/addressbook-config.c:455
-#: mail/mail-config-gui.c:934
+#: mail/mail-config-druid.glade.h:52 mail/mail-config-gui.c:934
 msgid "Path:"
 msgstr "SЖkvДg:"
 
@@ -988,15 +979,15 @@ msgstr "SЖkvДg:"
 msgid "Create path if it doesn't exist."
 msgstr "Skapa sЖkvДgen om den inte finns."
 
-#: addressbook/gui/component/addressbook-config.c:589
+#: addressbook/gui/component/addressbook-config.c:593
 msgid "Edit Addressbook"
 msgstr "Redigera adressbok"
 
-#: addressbook/gui/component/addressbook-config.c:591
+#: addressbook/gui/component/addressbook-config.c:595
 msgid "Add Addressbook"
 msgstr "LДgg till adressbok"
 
-#: addressbook/gui/component/addressbook-config.c:607
+#: addressbook/gui/component/addressbook-config.c:611
 msgid ""
 "Select the kind of addressbook you have, and enter the relevant information "
 "about it."
@@ -1004,59 +995,63 @@ msgstr ""
 "Markera den typ av adressbok du har och ange den relevanta informationen om "
 "den."
 
-#: addressbook/gui/component/addressbook-config.c:612
+#: addressbook/gui/component/addressbook-config.c:616
+#: mail/mail-config-druid.glade.h:45
 msgid "Name:"
 msgstr "Namn:"
 
-#: addressbook/gui/component/addressbook-config.c:613
-#: po/tmp/e-msg-composer-attachment.glade.h:7
+#: addressbook/gui/component/addressbook-config.c:617
+#: composer/e-msg-composer-attachment.glade.h:7
 msgid "Description:"
 msgstr "Beskrivning:"
 
-#: po/tmp/addressbook-config.glade.h:7
+#: addressbook/gui/component/addressbook-config.glade.h:7
 msgid "Addressbook Sources"
 msgstr "AdressbokskДllor"
 
-#: calendar/gui/e-calendar-table.c:342 filter/libfilter-i18n.h:10
-#: mail/folder-browser.c:644 mail/mail-view.c:150
-#: po/tmp/addressbook-config.glade.h:8 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
+#: 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 "Ta bort"
 
-#: mail/folder-browser.c:630 po/tmp/addressbook-config.glade.h:9
-#: po/tmp/filter.glade.h:8 po/tmp/mail-config.glade.h:9
+#: 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 "Redigera"
 
-#: po/tmp/addressbook-config.glade.h:10
+#: addressbook/gui/component/addressbook-config.glade.h:10
 msgid "Name"
 msgstr "Namn"
 
-#: po/tmp/addressbook-config.glade.h:11
+#: addressbook/gui/component/addressbook-config.glade.h:11
 msgid "URI"
 msgstr "URI"
 
 #.
-#. * 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 "SЖk..."
 
-#: po/tmp/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 msgid "Message Recipients"
 msgstr "Mottagare"
 
-#: po/tmp/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "Select Names"
 msgstr "Markera namn"
 
-#: 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 "VДlj namn frЕn listan:"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:147
@@ -1065,114 +1060,114 @@ msgid "Search"
 msgstr "SЖk"
 
 #.
-#. * 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 "a"
 
-#: po/tmp/alphabet.glade.h:8
+#: addressbook/gui/widgets/alphabet.glade.h:8
 msgid "b"
 msgstr "b"
 
-#: po/tmp/alphabet.glade.h:9
+#: addressbook/gui/widgets/alphabet.glade.h:9
 msgid "c"
 msgstr "c"
 
-#: po/tmp/alphabet.glade.h:10
+#: addressbook/gui/widgets/alphabet.glade.h:10
 msgid "d"
 msgstr "d"
 
-#: po/tmp/alphabet.glade.h:11
+#: addressbook/gui/widgets/alphabet.glade.h:11
 msgid "e"
 msgstr "e"
 
-#: po/tmp/alphabet.glade.h:12
+#: addressbook/gui/widgets/alphabet.glade.h:12
 msgid "f"
 msgstr "f"
 
-#: po/tmp/alphabet.glade.h:13
+#: addressbook/gui/widgets/alphabet.glade.h:13
 msgid "g"
 msgstr "g"
 
-#: po/tmp/alphabet.glade.h:14
+#: addressbook/gui/widgets/alphabet.glade.h:14
 msgid "h"
 msgstr "h"
 
-#: po/tmp/alphabet.glade.h:15
+#: addressbook/gui/widgets/alphabet.glade.h:15
 msgid "i"
 msgstr "i"
 
-#: po/tmp/alphabet.glade.h:16
+#: addressbook/gui/widgets/alphabet.glade.h:16
 msgid "j"
 msgstr "j"
 
-#: po/tmp/alphabet.glade.h:17
+#: addressbook/gui/widgets/alphabet.glade.h:17
 msgid "k"
 msgstr "k"
 
-#: po/tmp/alphabet.glade.h:18
+#: addressbook/gui/widgets/alphabet.glade.h:18
 msgid "l"
 msgstr "l"
 
-#: po/tmp/alphabet.glade.h:19
+#: addressbook/gui/widgets/alphabet.glade.h:19
 msgid "m"
 msgstr "m"
 
-#: po/tmp/alphabet.glade.h:20
+#: addressbook/gui/widgets/alphabet.glade.h:20
 msgid "n"
 msgstr "n"
 
-#: po/tmp/alphabet.glade.h:21
+#: addressbook/gui/widgets/alphabet.glade.h:21
 msgid "o"
 msgstr "o"
 
-#: po/tmp/alphabet.glade.h:22
+#: addressbook/gui/widgets/alphabet.glade.h:22
 msgid "p"
 msgstr "p"
 
-#: po/tmp/alphabet.glade.h:23
+#: addressbook/gui/widgets/alphabet.glade.h:23
 msgid "q"
 msgstr "q"
 
-#: po/tmp/alphabet.glade.h:24
+#: addressbook/gui/widgets/alphabet.glade.h:24
 msgid "r"
 msgstr "r"
 
-#: po/tmp/alphabet.glade.h:25
+#: addressbook/gui/widgets/alphabet.glade.h:25
 msgid "s"
 msgstr "s"
 
-#: po/tmp/alphabet.glade.h:26
+#: addressbook/gui/widgets/alphabet.glade.h:26
 msgid "t"
 msgstr "t"
 
-#: po/tmp/alphabet.glade.h:27
+#: addressbook/gui/widgets/alphabet.glade.h:27
 msgid "u"
 msgstr "u"
 
-#: po/tmp/alphabet.glade.h:28
+#: addressbook/gui/widgets/alphabet.glade.h:28
 msgid "v"
 msgstr "v"
 
-#: po/tmp/alphabet.glade.h:29
+#: addressbook/gui/widgets/alphabet.glade.h:29
 msgid "w"
 msgstr "w"
 
-#: po/tmp/alphabet.glade.h:30
+#: addressbook/gui/widgets/alphabet.glade.h:30
 msgid "x"
 msgstr "x"
 
-#: po/tmp/alphabet.glade.h:31
+#: addressbook/gui/widgets/alphabet.glade.h:31
 msgid "y"
 msgstr "y"
 
-#: po/tmp/alphabet.glade.h:32
+#: addressbook/gui/widgets/alphabet.glade.h:32
 msgid "z"
 msgstr "z"
 
@@ -1200,174 +1195,175 @@ msgstr ""
 "Dubbelklicka hДr fЖr att skapa en ny kontakt."
 
 #.
-#. * 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 "10 pt. Tahoma"
 
-#: po/tmp/e-contact-print.glade.h:7
+#: addressbook/printing/e-contact-print.glade.h:7
 msgid "8 pt. Tahoma"
 msgstr "8 pt. Tahoma"
 
-#: po/tmp/e-contact-print.glade.h:8
+#: addressbook/printing/e-contact-print.glade.h:8
 msgid "Blank forms at end:"
 msgstr "Tomma blanketter vid slutet:"
 
-#: po/tmp/e-contact-print.glade.h:9
+#: addressbook/printing/e-contact-print.glade.h:9
 msgid "Body"
 msgstr "Meddelandetext"
 
-#: po/tmp/e-contact-print.glade.h:10
+#: addressbook/printing/e-contact-print.glade.h:10
 msgid "Bottom:"
 msgstr "Underst:"
 
-#: po/tmp/e-contact-print.glade.h:11
+#: addressbook/printing/e-contact-print.glade.h:11
 msgid "Dimensions:"
 msgstr "Dimensioner:"
 
-#: po/tmp/e-contact-print.glade.h:12
+#: addressbook/printing/e-contact-print.glade.h:12
 msgid "Font..."
 msgstr "Typsnitt..."
 
-#: po/tmp/e-contact-print.glade.h:13
+#: addressbook/printing/e-contact-print.glade.h:13
 msgid "Fonts"
 msgstr "Typsnitt"
 
-#: po/tmp/e-contact-print.glade.h:14
+#: addressbook/printing/e-contact-print.glade.h:14
 msgid "Footer:"
 msgstr "Sidfot:"
 
-#: po/tmp/e-contact-print.glade.h:15
+#: addressbook/printing/e-contact-print.glade.h:15
 msgid "Format"
 msgstr "Format"
 
-#: po/tmp/e-contact-print.glade.h:16
+#: addressbook/printing/e-contact-print.glade.h:16
 msgid "Header"
 msgstr "Rubrik"
 
-#: po/tmp/e-contact-print.glade.h:17
+#: addressbook/printing/e-contact-print.glade.h:17
 msgid "Header/Footer"
 msgstr "Rubrik/sidfot"
 
-#: po/tmp/e-contact-print.glade.h:18
+#: addressbook/printing/e-contact-print.glade.h:18
 msgid "Headings"
 msgstr "Rubriker"
 
-#: po/tmp/e-contact-print.glade.h:19
+#: addressbook/printing/e-contact-print.glade.h:19
 msgid "Headings for each letter"
 msgstr "Rubriker fЖr varje brev"
 
-#: po/tmp/e-contact-print.glade.h:20
+#: addressbook/printing/e-contact-print.glade.h:20
 msgid "Height:"
 msgstr "HЖjd:"
 
-#: po/tmp/e-contact-print.glade.h:21
+#: addressbook/printing/e-contact-print.glade.h:21
 msgid "Immediately follow each other"
 msgstr "FЖlj omedelbart efter varandra"
 
-#: po/tmp/e-contact-print.glade.h:22
+#: addressbook/printing/e-contact-print.glade.h:22
 msgid "Include:"
 msgstr "Inkludera:"
 
-#: po/tmp/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23
 msgid "Landscape"
 msgstr "Liggande"
 
-#: po/tmp/e-contact-print.glade.h:24
+#: addressbook/printing/e-contact-print.glade.h:24
 msgid "Left:"
 msgstr "VДnster:"
 
-#: po/tmp/e-contact-print.glade.h:25
+#: addressbook/printing/e-contact-print.glade.h:25
 msgid "Letter tabs on side"
 msgstr "Brevflikar pЕ sidan"
 
-#: po/tmp/e-contact-print.glade.h:26
+#: addressbook/printing/e-contact-print.glade.h:26
 msgid "Margins"
 msgstr "Marginaler"
 
-#: po/tmp/e-contact-print.glade.h:27
+#: addressbook/printing/e-contact-print.glade.h:27
 msgid "Number of columns:"
 msgstr "Antal kolumner:"
 
-#: po/tmp/e-contact-print.glade.h:28
+#: addressbook/printing/e-contact-print.glade.h:28
 msgid "Options"
 msgstr "Alternativ"
 
-#: po/tmp/e-contact-print.glade.h:29
+#: addressbook/printing/e-contact-print.glade.h:29
 msgid "Orientation"
 msgstr "Orientering"
 
-#: po/tmp/e-contact-print.glade.h:30
+#: addressbook/printing/e-contact-print.glade.h:30
 msgid "Page"
 msgstr "Sida"
 
-#: po/tmp/e-contact-print.glade.h:31
+#: addressbook/printing/e-contact-print.glade.h:31
 msgid "Page Setup:"
 msgstr "SidinstДllningar:"
 
-#: po/tmp/e-contact-print.glade.h:32
+#: addressbook/printing/e-contact-print.glade.h:32
 msgid "Paper"
 msgstr "Papper"
 
-#: po/tmp/e-contact-print.glade.h:33
+#: addressbook/printing/e-contact-print.glade.h:33
 msgid "Paper source:"
 msgstr "PapperskДlla:"
 
-#: po/tmp/e-contact-print.glade.h:34
+#: addressbook/printing/e-contact-print.glade.h:34
 msgid "Portrait"
 msgstr "StЕende"
 
-#: po/tmp/e-contact-print.glade.h:35
+#: addressbook/printing/e-contact-print.glade.h:35
 msgid "Preview:"
 msgstr "FЖrhandsgranska:"
 
-#: po/tmp/e-contact-print.glade.h:36
+#: addressbook/printing/e-contact-print.glade.h:36
 msgid "Print using gray shading"
 msgstr "Skriv ut med grЕ skuggning"
 
-#: po/tmp/e-contact-print.glade.h:37
+#: addressbook/printing/e-contact-print.glade.h:37
 msgid "Reverse on even pages"
 msgstr "VДnd jДmna sidor"
 
-#: po/tmp/e-contact-print.glade.h:38
+#: addressbook/printing/e-contact-print.glade.h:38
 msgid "Right:"
 msgstr "HЖger:"
 
-#: po/tmp/e-contact-print.glade.h:39
+#: addressbook/printing/e-contact-print.glade.h:39
 msgid "Sections:"
 msgstr "Sektioner:"
 
-#: po/tmp/e-contact-print.glade.h:40
+#: addressbook/printing/e-contact-print.glade.h:40
 msgid "Shading"
 msgstr "Skuggning"
 
-#: po/tmp/e-contact-print.glade.h:41
+#: addressbook/printing/e-contact-print.glade.h:41
 msgid "Size:"
 msgstr "Storlek:"
 
-#: po/tmp/e-contact-print.glade.h:42
+#: addressbook/printing/e-contact-print.glade.h:42
 msgid "Start on a new page"
 msgstr "BЖrja pЕ en ny sida"
 
-#: po/tmp/e-contact-print.glade.h:43
+#: addressbook/printing/e-contact-print.glade.h:43
 msgid "Style name:"
 msgstr "Stil:"
 
-#: po/tmp/e-contact-print.glade.h:44
+#: addressbook/printing/e-contact-print.glade.h:44
 msgid "Top:"
 msgstr "жverst:"
 
-#: 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 "Typ:"
 
-#: po/tmp/e-contact-print.glade.h:46
+#: addressbook/printing/e-contact-print.glade.h:46
 msgid "Width:"
 msgstr "Bredd:"
 
-#: po/tmp/e-contact-print.glade.h:47
+#: addressbook/printing/e-contact-print.glade.h:47
 msgid "label26"
 msgstr "label26"
 
@@ -1402,6 +1398,77 @@ msgstr "Konfigurationsverktyg fЖr evolutions att-gЖra-kanal.\n"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunde inte lДsa pilotens att-gЖra-programblock"
 
+#.
+#. * 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/GNOME_Evolution_Calendar_Control.oaf.in.h:7
+msgid "Factory for the sample Calendar control"
+msgstr ""
+
+#.
+#. * 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/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:7
+#, fuzzy
+msgid "Calendar Server"
+msgstr "Kalender"
+
+#.
+#. * 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
+#, fuzzy
+msgid "Evolution calendar executive summary component."
+msgstr "Kan inte initiera Evolutions komponent fЖr e-postsammanfattning."
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Evolutions kalenderkanal"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
+msgid "Evolution component for handling the calendar."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
+msgid "Factory for the Calendar Summary component."
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#, fuzzy
+msgid "Factory for the Evolution calendar component."
+msgstr "Konfigurationsverktyg fЖr evolutions kalenderkanal.\n"
+
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+msgid "Factory for the calendar iTip view control"
+msgstr ""
+
+#: 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 "PЕminnelse om ditt mЖte den "
+
+#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:8
+msgid "Snooze"
+msgstr "Slumra"
+
+#. 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 "Ok"
+
 #: calendar/gui/calendar-commands.c:229
 msgid "File not found"
 msgstr "Filen hittades inte"
@@ -1440,15 +1507,18 @@ msgstr "%a %Y-%m-%d %H.%M.%S"
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %Y-%m-%d %I.%M.%S %p"
 
-#: calendar/gui/calendar-model.c:346 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 "Publikt"
 
-#: calendar/gui/calendar-model.c:349 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 "Privat"
 
-#: calendar/gui/calendar-model.c:352 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 "Konfidentiellt"
 
@@ -1538,6 +1608,29 @@ msgstr "ProcentvДrdet mЕste vara mellan 0 och 100"
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "Prioriteten mЕste vara mellan 1 och 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 "Fel vid inlДsning av filen: %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 "Skriv ut kalender"
+
 #: calendar/gui/control-factory.c:125
 msgid "The URI that the calendar will display"
 msgstr "URI:t som kalendern kommer att visa"
@@ -1555,262 +1648,271 @@ msgid "No summary available."
 msgstr "Ingen sammanfattning finns tillgДnglig."
 
 #.
-#. * 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 "StДng"
 
-#: po/tmp/alarm-notify.glade.h:7
+#: calendar/gui/dialogs/alarm-notify.glade.h:7
 msgid "Edit appointment"
 msgstr "Redigera mЖte"
 
-#: po/tmp/alarm-notify.glade.h:8
-msgid "Snooze"
-msgstr "Slumra"
-
-#: po/tmp/alarm-notify.glade.h:9
+#: calendar/gui/dialogs/alarm-notify.glade.h:9
 msgid "Snooze time (minutes)"
 msgstr "Slumringstid (minuter)"
 
 #.
-#. * 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 minuter"
 
-#: po/tmp/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 msgid "10 minutes"
 msgstr "10 minuter"
 
-#: po/tmp/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 msgid "12 hour (am/pm)"
 msgstr "12 timmar (fm/em)"
 
-#: po/tmp/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "15 minutes"
 msgstr "15 minuter"
 
-#: po/tmp/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 msgid "24 hour"
 msgstr "24 timmar"
 
-#: po/tmp/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "30 minutes"
 msgstr "30 minuter"
 
-#: po/tmp/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "60 minutes"
 msgstr "60 minuter"
 
-#: po/tmp/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Alarms timeout after"
 msgstr "Ljudalarm stДngs av efter"
 
-#: po/tmp/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Audio Alarms"
 msgstr "Ljudalarm"
 
-#: po/tmp/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Beep when alarm windows appear."
 msgstr "Pip nДr alarmfЖnster visas."
 
-#: po/tmp/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Calendar"
 msgstr "Kalender"
 
-#: po/tmp/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Calendar Preferences"
 msgstr "KalenderinstДllningar"
 
-#: po/tmp/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Colors"
 msgstr "FДrger"
 
-#: po/tmp/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 msgid "Compress weekends"
 msgstr "Tryck ihop helger"
 
-#: po/tmp/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid "Date navigator options"
 msgstr "Alternativ fЖr datumnavigerare"
 
-#: po/tmp/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Defaults"
 msgstr "StandardvДrden"
 
-#: po/tmp/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Display options"
 msgstr "Visningsalternativ"
 
-#: po/tmp/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Due Date"
 msgstr "FЖrfallodatum"
 
-#: po/tmp/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "Enable snoozing for"
 msgstr "Aktivera slummer i"
 
-#: po/tmp/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 msgid "End of day:"
 msgstr "Dagen slutar:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:26
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "First day of week:"
 msgstr "FЖrsta dagen i veckan:"
 
-#: 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 "fre"
 
-#: calendar/gui/event-editor.c:433 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 "fredag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "Highlight"
 msgstr "Markera"
 
-#: po/tmp/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "Items Due Today"
 msgstr "objekt som ska ha utfЖrts idag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 msgid "Items Due Today:"
 msgstr "Objekt som ska ha utfЖrts idag:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Items Not Yet Due"
 msgstr "objekt som inte ska utfЖras Дn"
 
-#: po/tmp/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Items Not Yet Due:"
 msgstr "Obejkt som inte ska utfЖras Дn:"
 
-#: 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 "mЕn"
 
-#: calendar/gui/event-editor.c:429 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 "mЕndag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 msgid "Overdue Items"
 msgstr "objekt som skulle ha utfЖrts"
 
-#: po/tmp/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Overdue Items:"
 msgstr "Objekt som skulle ha utfЖrts:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Pick a color"
 msgstr "VДlj en fДrg"
 
-#: filter/libfilter-i18n.h:31 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 "Prioritet"
 
-#: po/tmp/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "Remind me of all appointments"
 msgstr "PЕminn mig om alla mЖten"
 
-#: po/tmp/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "Reminders"
 msgstr "PЕminnare"
 
-#: 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 "lЖr"
 
-#: calendar/gui/event-editor.c:434 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 "lЖrdag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 msgid "Show"
 msgstr "Visa"
 
-#: po/tmp/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "Show appointment end times"
 msgstr "Visa sluttiderna pЕ mЖten"
 
-#: po/tmp/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Show week numbers"
 msgstr "Visa veckonummer"
 
-#: po/tmp/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "Start of day:"
 msgstr "Dagen startar:"
 
 #. 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 "sЖn"
 
-#: calendar/gui/event-editor.c:435 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 "sЖndag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "TaskPad"
 msgstr "Uppgiftsyta"
 
-#: 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 "tor"
 
-#: calendar/gui/event-editor.c:432 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 "torsdag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "Time Until Due"
 msgstr "Tid till fЖrfallodatum"
 
-#: po/tmp/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "Time divisions:"
 msgstr "Tidsdivisioner:"
 
-#: po/tmp/cal-prefs-dialog.glade.h:55
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "Time format:"
 msgstr "Tidsformat:"
 
-#: 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 "tis"
 
-#: calendar/gui/event-editor.c:430 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 "tisdag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:58
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "Visual Alarms"
 msgstr "Visuella alarm"
 
-#: 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 "ons"
 
-#: calendar/gui/event-editor.c:431 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 "onsdag"
 
-#: po/tmp/cal-prefs-dialog.glade.h:61
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "Work week"
 msgstr "Arbetsvecka"
 
-#: po/tmp/cal-prefs-dialog.glade.h:62
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "minutes before they occur."
 msgstr "minuter innan de sker."
 
-#: po/tmp/cal-prefs-dialog.glade.h:63
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "seconds."
 msgstr "sekunder."
 
@@ -1842,90 +1944,91 @@ msgid "Are you sure want to delete this untitled journal entry?"
 msgstr "дr du sДker pЕ att du vill ta bort denna namnlЖsa dagbokspost?"
 
 #.
-#. * 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 "% fДrdig_t:"
 
-#: po/tmp/task-editor-dialog.glade.h:7
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
 msgid "C_lassification:"
 msgstr "K_lassifikation:"
 
-#: po/tmp/task-editor-dialog.glade.h:9
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
 msgid "Cancelled"
 msgstr "Avbruten"
 
-#: po/tmp/task-editor-dialog.glade.h:10
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
 msgid "Completed"
 msgstr "FДrdigt"
 
-#: po/tmp/task-editor-dialog.glade.h:12
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
 msgid "Date Completed:"
 msgstr "Datum utfЖrt:"
 
-#: po/tmp/task-editor-dialog.glade.h:14
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
 msgid "High"
 msgstr "HЖg"
 
-#: po/tmp/task-editor-dialog.glade.h:15
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
 msgid "In Progress"
 msgstr "PЕgЕr"
 
-#: po/tmp/task-editor-dialog.glade.h:16
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
 msgid "Low"
 msgstr "LЕg"
 
 #. 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 "Ingen"
 
-#: po/tmp/task-editor-dialog.glade.h:18
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
 msgid "Normal"
 msgstr "Normal"
 
-#: po/tmp/task-editor-dialog.glade.h:19
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
 msgid "Not Started"
 msgstr "Inte startad"
 
-#: po/tmp/task-editor-dialog.glade.h:22
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
 msgid "S_ummary"
 msgstr "S_ammanfattning"
 
-#: po/tmp/task-editor-dialog.glade.h:23
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
 msgid "Sta_rt Date:"
 msgstr "Sta_rtdatum:"
 
-#: po/tmp/task-editor-dialog.glade.h:24
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
 msgid "Task"
 msgstr "Uppgift"
 
-#: 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 "_Kontakter..."
 
-#: po/tmp/task-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
 msgid "_Due Date:"
 msgstr "FЖrfallo_datum:"
 
-#: po/tmp/task-editor-dialog.glade.h:28
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
 msgid "_Priority:"
 msgstr "_Prioritet:"
 
-#: po/tmp/task-editor-dialog.glade.h:29
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
 msgid "_Status:"
 msgstr "_Status:"
 
-#: po/tmp/task-editor-dialog.glade.h:30
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
 msgid "task-editor-dialog"
 msgstr "task-editor-dialog"
 
@@ -2026,7 +2129,7 @@ msgid "Edit this appointment..."
 msgstr "Redigera detta mЖte..."
 
 #: 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 "Ta bort detta mЖte"
 
@@ -2050,162 +2153,162 @@ 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 "He_ldagsarrangemang"
 
-#: po/tmp/event-editor-dialog.glade.h:8
+#: calendar/gui/event-editor-dialog.glade.h:8
 msgid "Appointment Basics"
 msgstr "GrundlДggande mЖtessaker"
 
-#: po/tmp/event-editor-dialog.glade.h:9
+#: calendar/gui/event-editor-dialog.glade.h:9
 msgid "Classification"
 msgstr "Klassifikation"
 
-#: po/tmp/event-editor-dialog.glade.h:10
+#: calendar/gui/event-editor-dialog.glade.h:10
 msgid "Custom recurrence"
 msgstr "Anpassad upprepning"
 
-#: po/tmp/event-editor-dialog.glade.h:11
+#: calendar/gui/event-editor-dialog.glade.h:11
 msgid "Days"
 msgstr "dag"
 
-#: po/tmp/event-editor-dialog.glade.h:13
+#: calendar/gui/event-editor-dialog.glade.h:13
 msgid "Every"
 msgstr "Var"
 
-#: po/tmp/event-editor-dialog.glade.h:14
+#: calendar/gui/event-editor-dialog.glade.h:14
 msgid "Exceptions"
 msgstr "Undantag"
 
-#: po/tmp/event-editor-dialog.glade.h:16
+#: calendar/gui/event-editor-dialog.glade.h:16
 msgid "Hours"
 msgstr "timme"
 
-#: po/tmp/event-editor-dialog.glade.h:17
+#: calendar/gui/event-editor-dialog.glade.h:17
 msgid "Mail _to:"
 msgstr "E-posta _till:"
 
-#: po/tmp/event-editor-dialog.glade.h:18
+#: calendar/gui/event-editor-dialog.glade.h:18
 msgid "Minutes"
 msgstr "minut"
 
-#: po/tmp/event-editor-dialog.glade.h:19
+#: calendar/gui/event-editor-dialog.glade.h:19
 msgid "Modify"
 msgstr "дndra"
 
-#: po/tmp/event-editor-dialog.glade.h:20
+#: calendar/gui/event-editor-dialog.glade.h:20
 msgid "No recurrence"
 msgstr "Ingen upprepning"
 
-#: po/tmp/event-editor-dialog.glade.h:21
+#: calendar/gui/event-editor-dialog.glade.h:21
 msgid "Preview"
 msgstr "FЖrhandsgranska"
 
-#: po/tmp/event-editor-dialog.glade.h:22
+#: calendar/gui/event-editor-dialog.glade.h:22
 msgid "Pri_vate"
 msgstr "Pri_vat"
 
-#: po/tmp/event-editor-dialog.glade.h:23
+#: calendar/gui/event-editor-dialog.glade.h:23
 msgid "Pu_blic"
 msgstr "Pu_blikt"
 
-#: po/tmp/event-editor-dialog.glade.h:24
+#: calendar/gui/event-editor-dialog.glade.h:24
 msgid "Recurrence"
 msgstr "Upprepning"
 
-#: po/tmp/event-editor-dialog.glade.h:25
+#: calendar/gui/event-editor-dialog.glade.h:25
 msgid "Recurrence Rule"
 msgstr "Upprepningsregel"
 
-#: po/tmp/event-editor-dialog.glade.h:26
+#: calendar/gui/event-editor-dialog.glade.h:26
 msgid "Reminder"
 msgstr "PЕminnare"
 
-#: po/tmp/event-editor-dialog.glade.h:27
+#: calendar/gui/event-editor-dialog.glade.h:27
 msgid "Simple recurrence"
 msgstr "Enkel upprepning"
 
-#: po/tmp/event-editor-dialog.glade.h:28
+#: calendar/gui/event-editor-dialog.glade.h:28
 msgid "Su_mmary:"
 msgstr "Sa_mmanfattning:"
 
-#: po/tmp/event-editor-dialog.glade.h:29
+#: calendar/gui/event-editor-dialog.glade.h:29
 msgid "Time"
 msgstr "Tid"
 
-#: po/tmp/event-editor-dialog.glade.h:30
+#: calendar/gui/event-editor-dialog.glade.h:30
 msgid "_Audio"
 msgstr "_Ljud"
 
-#: po/tmp/event-editor-dialog.glade.h:31
+#: calendar/gui/event-editor-dialog.glade.h:31
 msgid "_Confidential"
 msgstr "_Konfidentiellt"
 
-#: po/tmp/event-editor-dialog.glade.h:32
+#: calendar/gui/event-editor-dialog.glade.h:32
 msgid "_Display"
 msgstr "_Visa"
 
-#: po/tmp/event-editor-dialog.glade.h:33
+#: calendar/gui/event-editor-dialog.glade.h:33
 msgid "_End time:"
 msgstr "Slutti_d:"
 
-#: po/tmp/event-editor-dialog.glade.h:34
+#: calendar/gui/event-editor-dialog.glade.h:34
 msgid "_Mail"
 msgstr "_E-post"
 
-#: po/tmp/event-editor-dialog.glade.h:35
+#: calendar/gui/event-editor-dialog.glade.h:35
 msgid "_Program"
 msgstr "_Program"
 
-#: po/tmp/event-editor-dialog.glade.h:36
+#: calendar/gui/event-editor-dialog.glade.h:36
 msgid "_Run program:"
 msgstr "_KЖr program:"
 
-#: po/tmp/event-editor-dialog.glade.h:37
+#: calendar/gui/event-editor-dialog.glade.h:37
 msgid "_Start time:"
 msgstr "_Starttid:"
 
-#: po/tmp/event-editor-dialog.glade.h:38
+#: calendar/gui/event-editor-dialog.glade.h:38
 msgid "_Starting date:"
 msgstr "_Startdatum:"
 
-#: po/tmp/event-editor-dialog.glade.h:39
+#: calendar/gui/event-editor-dialog.glade.h:39
 msgid "day(s)"
 msgstr "dag"
 
-#: po/tmp/event-editor-dialog.glade.h:40
+#: calendar/gui/event-editor-dialog.glade.h:40
 msgid "event-editor-dialog"
 msgstr "event-editor-dialog"
 
-#: po/tmp/event-editor-dialog.glade.h:41
+#: calendar/gui/event-editor-dialog.glade.h:41
 msgid "for"
 msgstr "i"
 
-#: po/tmp/event-editor-dialog.glade.h:42
+#: calendar/gui/event-editor-dialog.glade.h:42
 msgid "forever"
 msgstr "fЖr alltid"
 
-#: po/tmp/event-editor-dialog.glade.h:43
+#: calendar/gui/event-editor-dialog.glade.h:43
 msgid "label21"
 msgstr "label21"
 
-#: po/tmp/event-editor-dialog.glade.h:44
+#: calendar/gui/event-editor-dialog.glade.h:44
 msgid "month(s)"
 msgstr "mЕnad"
 
-#: po/tmp/event-editor-dialog.glade.h:45
+#: calendar/gui/event-editor-dialog.glade.h:45
 msgid "until"
 msgstr "till"
 
-#: po/tmp/event-editor-dialog.glade.h:46
+#: calendar/gui/event-editor-dialog.glade.h:46
 msgid "week(s)"
 msgstr "vecka"
 
-#: po/tmp/event-editor-dialog.glade.h:47
+#: calendar/gui/event-editor-dialog.glade.h:47
 msgid "year(s)"
 msgstr "Еr"
 
@@ -2257,6 +2360,80 @@ msgstr "Kunde inte skapa en kalender i \"%s\""
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoden som krДvs fЖr att lДsa in \"%s\" stЖds inte"
 
+#.
+#. * 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
+#, fuzzy
+msgid "April"
+msgstr "april"
+
+#: calendar/gui/goto-dialog.glade.h:7
+#, fuzzy
+msgid "August"
+msgstr "augusti"
+
+#: calendar/gui/goto-dialog.glade.h:8
+#, fuzzy
+msgid "December"
+msgstr "december"
+
+#: calendar/gui/goto-dialog.glade.h:9
+#, fuzzy
+msgid "February"
+msgstr "februari"
+
+#: calendar/gui/goto-dialog.glade.h:10
+#, fuzzy
+msgid "Go To Date"
+msgstr "GЕ till datum"
+
+#: calendar/gui/goto-dialog.glade.h:11
+#, fuzzy
+msgid "Go To Today"
+msgstr "GЕ till idag"
+
+#: calendar/gui/goto-dialog.glade.h:12
+#, fuzzy
+msgid "January"
+msgstr "januari"
+
+#: calendar/gui/goto-dialog.glade.h:13
+#, fuzzy
+msgid "July"
+msgstr "juli"
+
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "June"
+msgstr "juni"
+
+#: calendar/gui/goto-dialog.glade.h:15
+#, fuzzy
+msgid "March"
+msgstr "mars"
+
+#: calendar/gui/goto-dialog.glade.h:16
+#, fuzzy
+msgid "May"
+msgstr "mЕndag"
+
+#: calendar/gui/goto-dialog.glade.h:17
+#, fuzzy
+msgid "November"
+msgstr "november"
+
+#: calendar/gui/goto-dialog.glade.h:18
+#, fuzzy
+msgid "October"
+msgstr "oktober"
+
+#: calendar/gui/goto-dialog.glade.h:19
+#, fuzzy
+msgid "September"
+msgstr "september"
+
 #: calendar/gui/main.c:49
 msgid "Could not initialize GNOME"
 msgstr "Kunde inte initiera GNOME"
@@ -2449,7 +2626,7 @@ msgstr "Aktuellt Еr (%Y)"
 msgid "Print Calendar"
 msgstr "Skriv ut kalender"
 
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:980
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1001
 msgid "Print Preview"
 msgstr "FЖrhandsgranska"
 
@@ -2668,7 +2845,7 @@ msgstr "OvДntat OK-svar frЕn IMAP-servern: %s"
 msgid "Could not load summary for %s"
 msgstr "Kunde inte lДsa in sammanfattning fЖr %s"
 
-#: camel/providers/imap/camel-imap-folder.c:533
+#: camel/providers/imap/camel-imap-folder.c:532
 msgid "Could not find message body in FETCH response."
 msgstr "Kunde inte hitta meddelandetext i FETCH-svaret."
 
@@ -3183,6 +3360,7 @@ msgid "No such folder `%s'."
 msgstr "Det finns ingen mapp \"%s\"."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
+#: mail/mail-config-druid.glade.h:63
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -3232,8 +3410,14 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "E-postleverans via programmet sendmail"
 
+#: camel/providers/smtp/camel-smtp-provider.c:34
+#: mail/mail-config-druid.glade.h:59
+msgid "SMTP"
+msgstr "SMTP"
+
 #: camel/providers/smtp/camel-smtp-provider.c:36
-msgid "For delivering mail by connecting to a remote mailhub using SMTP."
+#, fuzzy
+msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr ""
 "FЖr leverans av e-post genom anslutning till ett fjДrr-epostnav som anvДnder "
 "SMTP."
@@ -3257,6 +3441,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"
 
@@ -3399,11 +3584,11 @@ msgid "attachment"
 msgstr "bilaga"
 
 #: composer/e-msg-composer-attachment-bar.c:413
-#: po/tmp/evolution-message-composer.xml.h:7
+#: ui/evolution-message-composer.xml.h:7
 msgid "Attach a file"
 msgstr "Bifoga en fil"
 
-#: composer/e-msg-composer-attachment-bar.c:460 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 "Ta bort"
@@ -3421,18 +3606,18 @@ msgid "Attach a file to the message"
 msgstr "Bifoga en fil till meddelandet"
 
 #.
-#. * 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 "Egenskaper hos bilagan"
 
-#: po/tmp/e-msg-composer-attachment.glade.h:8
+#: composer/e-msg-composer-attachment.glade.h:8
 msgid "File name:"
 msgstr "Filnamn:"
 
-#: po/tmp/e-msg-composer-attachment.glade.h:9
+#: composer/e-msg-composer-attachment.glade.h:9
 msgid "MIME type:"
 msgstr "MIME-typ:"
 
@@ -3715,7 +3900,7 @@ msgstr "inkommande"
 msgid "outgoing"
 msgstr "utgЕende"
 
-#: 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 "Redigera filter"
 
@@ -3809,14 +3994,8 @@ msgstr "Ta bort villkor"
 msgid "Replied to"
 msgstr "Svarade till"
 
-#: filter/filter-system-flag.c:64
-msgid "Deleted"
-msgstr "Borttagen"
-
-#: filter/filter-system-flag.c:65
-msgid "Draft"
-msgstr "Mall"
-
+#. { _("Deleted"), "Deleted" },
+#. { _("Draft"), "Draft" },
 #: filter/filter-system-flag.c:66
 msgid "Important"
 msgstr "Viktigt"
@@ -3825,27 +4004,27 @@ msgstr "Viktigt"
 msgid "Read"
 msgstr "LДs"
 
-#: po/tmp/filter.glade.h:10
+#: filter/filter.glade.h:10
 msgid "Edit VFolders"
 msgstr "Redigera virtuella mappar"
 
-#: po/tmp/filter.glade.h:11
+#: filter/filter.glade.h:11
 msgid "Filter Rules"
 msgstr "Filterregler"
 
-#: po/tmp/filter.glade.h:12
+#: filter/filter.glade.h:12
 msgid "Incoming"
 msgstr "Inkommande"
 
-#: po/tmp/filter.glade.h:13
+#: filter/filter.glade.h:13
 msgid "Outgoing"
 msgstr "UtgЕende"
 
-#: po/tmp/filter.glade.h:15
+#: filter/filter.glade.h:15
 msgid "Virtual Folders"
 msgstr "Virtuella mappar"
 
-#: po/tmp/filter.glade.h:16
+#: filter/filter.glade.h:16
 msgid "vFolder Sources"
 msgstr "KДllor fЖr virtuella mappar"
 
@@ -4034,173 +4213,210 @@ msgstr "LДgg till regel fЖr virtuell mapp"
 msgid "Edit VFolder Rule"
 msgstr "Redigera regel fЖr virtuell mapp"
 
-#: mail/component-factory.c:239
+#: mail/component-factory.c:277
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan inte initiera Evolutions e-postkomponent."
 
-#: mail/component-factory.c:278
+#: mail/component-factory.c:316
 msgid "Cannot register storage with shell"
 msgstr "Kan inte registrera lagring hos skal"
 
-#: mail/folder-browser.c:182 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 "Spara"
 
-#: mail/folder-browser.c:195
+#: mail/folder-browser.c:236
 msgid "Body or subject contains"
 msgstr "Meddelandetexten eller Дmnet innehЕller"
 
-#: mail/folder-browser.c:196
+#: mail/folder-browser.c:237
 msgid "Body contains"
 msgstr "Meddelandetexten innehЕller"
 
-#: mail/folder-browser.c:197
+#: mail/folder-browser.c:238
 msgid "Subject contains"
 msgstr "дmnesraden innehЕller"
 
-#: mail/folder-browser.c:198
+#: mail/folder-browser.c:239
 msgid "Body does not contain"
 msgstr "Meddelandetexten innehЕller inte"
 
-#: mail/folder-browser.c:199
+#: mail/folder-browser.c:240
 msgid "Subject does not contain"
 msgstr "дmnesraden innehЕller inte"
 
-#: mail/folder-browser.c:602
+#: mail/folder-browser.c:643
 msgid "VFolder on Subject"
 msgstr "Virtuell mapp pЕ Дmnesrad"
 
-#: mail/folder-browser.c:603
+#: mail/folder-browser.c:644
 msgid "VFolder on Sender"
 msgstr "Virtuell mapp pЕ avsДndare"
 
-#: mail/folder-browser.c:604
+#: mail/folder-browser.c:645
 msgid "VFolder on Recipients"
 msgstr "Virtuell mapp pЕ mottagare"
 
-#: mail/folder-browser.c:606
+#: mail/folder-browser.c:647
 msgid "Filter on Subject"
 msgstr "Filtrera pЕ Дmnesrad"
 
-#: mail/folder-browser.c:607
+#: mail/folder-browser.c:648
 msgid "Filter on Sender"
 msgstr "Filtrera pЕ avsДndare"
 
-#: mail/folder-browser.c:608
+#: mail/folder-browser.c:649
 msgid "Filter on Recipients"
 msgstr "Filtrera pЕ mottagare"
 
-#: mail/folder-browser.c:609 mail/folder-browser.c:738
+#: mail/folder-browser.c:650 mail/folder-browser.c:779
 msgid "Filter on Mailing List"
 msgstr "Filtrera pЕ sДndlista"
 
-#: mail/folder-browser.c:614
+#: mail/folder-browser.c:655
 msgid "Show all hidden"
 msgstr "Visa alla gЖmda"
 
-#: mail/folder-browser.c:616
+#: mail/folder-browser.c:657
 msgid "Hide selected"
 msgstr "GЖm markerade"
 
 #. could use another mask, but not enough api do to it
-#: mail/folder-browser.c:619
+#: mail/folder-browser.c:660
 msgid "Hide read"
 msgstr "GЖm lДsta"
 
-#: mail/folder-browser.c:620
+#: mail/folder-browser.c:661
 msgid "Hide deleted"
 msgstr "GЖm borttagna"
 
-#: mail/folder-browser.c:622 mail/folder-browser.c:749
+#: mail/folder-browser.c:663 mail/folder-browser.c:790
 msgid "Hide Subject"
 msgstr "GЖm Дmnesrad"
 
-#: mail/folder-browser.c:624 mail/folder-browser.c:755
+#: mail/folder-browser.c:665 mail/folder-browser.c:796
 msgid "Hide from Sender"
 msgstr "GЖm fЖr avsДndaren"
 
-#: mail/folder-browser.c:629 po/tmp/evolution-message-composer.xml.h:15
+#: mail/folder-browser.c:670 ui/evolution-message-composer.xml.h:15
 msgid "Open"
 msgstr "жppna"
 
-#: mail/folder-browser.c:631
+#: mail/folder-browser.c:672
 msgid "Save As..."
 msgstr "Spara som..."
 
-#: mail/folder-browser.c:632 mail/mail-view.c:148
-#: 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 "Skriv ut"
 
-#: mail/folder-browser.c:634
+#: mail/folder-browser.c:675
 msgid "Reply to Sender"
 msgstr "Svara till avsДndaren"
 
-#: mail/folder-browser.c:635 mail/mail-view.c:141
-#: 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 "Svara till alla"
 
-#: mail/folder-browser.c:636 mail/mail-view.c:144
-#: 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 "Vidarebefordra"
 
-#: mail/folder-browser.c:637 po/tmp/evolution-mail.xml.h:18
+#: mail/folder-browser.c:678 ui/evolution-mail.xml.h:18
 msgid "Forward inline"
 msgstr "Vidarebefordra inuti"
 
-#: mail/folder-browser.c:639
+#: mail/folder-browser.c:680
 msgid "Mark as Read"
 msgstr "Markera som lДst"
 
-#: mail/folder-browser.c:640
+#: mail/folder-browser.c:681
 msgid "Mark as Unread"
 msgstr "Markera som olДst"
 
-#: mail/folder-browser.c:642
+#: mail/folder-browser.c:683
 msgid "Move to Folder..."
 msgstr "Flytta till mapp..."
 
-#: mail/folder-browser.c:643
+#: mail/folder-browser.c:684
 msgid "Copy to Folder..."
 msgstr "Kopiera till mapp..."
 
-#: mail/folder-browser.c:645
+#: mail/folder-browser.c:686
 msgid "Undelete"
 msgstr "еngra borttagning"
 
 #. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
 #. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:649
+#: mail/folder-browser.c:690
 msgid "Apply Filters"
 msgstr "TillДmpa filter"
 
-#: mail/folder-browser.c:651 po/tmp/evolution-mail.xml.h:10
+#: mail/folder-browser.c:692 ui/evolution-mail.xml.h:10
 msgid "Create Rule From Message"
 msgstr "Skapa regel frЕn meddelande"
 
-#: mail/folder-browser.c:652 po/tmp/evolution-mail.xml.h:21
+#: mail/folder-browser.c:693 ui/evolution-mail.xml.h:21
 msgid "Hide Messages"
 msgstr "GЖm meddelanden"
 
-#: mail/folder-browser.c:740
+#: mail/folder-browser.c:781
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtrera pЕ sДndlista (%s)"
 
-#: mail/folder-browser.c:746
+#: mail/folder-browser.c:787
 #, c-format
 msgid "Hide Subject \"%s\""
 msgstr "GЖm Дmnesraden \"%s\""
 
-#: mail/folder-browser.c:752
+#: mail/folder-browser.c:793
 #, c-format
 msgid "Hide from Sender <%s>"
 msgstr "GЖm fЖr avsДndaren <%s>"
 
+#.
+#. * 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 "HДmta lagringsutrymme fЖr \"%s\""
+
+#: mail/local-config.glade.h:7
+#, fuzzy
+msgid "Mailbox Format"
+msgstr "BrevlЕdesammanfattning"
+
+#: mail/local-config.glade.h:8
+#, fuzzy
+msgid "New store format:"
+msgstr "Typ av diskussionsgruppskДlla:"
+
+#: 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
+#, fuzzy
+msgid "mh"
+msgstr "h"
+
 #: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
@@ -4269,23 +4485,23 @@ msgstr ""
 "Detta meddelande har ingen Дmnesrad.\n"
 "Vill du verkligen skicka?"
 
-#: mail/mail-callbacks.c:289
+#: mail/mail-callbacks.c:312
 msgid "You must specify recipients in order to send this message."
 msgstr "Du mЕste ange mottagare fЖr att kunna skicka detta meddelande."
 
-#: mail/mail-callbacks.c:509
+#: mail/mail-callbacks.c:530
 msgid "Forwarded message:\n"
 msgstr "Vidarebefordrat meddelande:\n"
 
-#: mail/mail-callbacks.c:590
+#: mail/mail-callbacks.c:611
 msgid "Move message(s) to"
 msgstr "Flytta meddelande(n) till"
 
-#: mail/mail-callbacks.c:592
+#: mail/mail-callbacks.c:613
 msgid "Copy message(s) to"
 msgstr "Kopiera meddelande(n) till"
 
-#: mail/mail-callbacks.c:727
+#: mail/mail-callbacks.c:748
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4293,11 +4509,11 @@ msgstr ""
 "Du kan bara redigera meddelanden\n"
 "som du sparat i mappen Drafts."
 
-#: mail/mail-callbacks.c:760 mail/mail-display.c:79
+#: mail/mail-callbacks.c:781 mail/mail-display.c:79
 msgid "Overwrite file?"
 msgstr "Skriv Жver fil?"
 
-#: mail/mail-callbacks.c:764 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?"
@@ -4305,15 +4521,15 @@ msgstr ""
 "Det finns redan en fil med det namnet.\n"
 "Ska den skrivas Жver?"
 
-#: mail/mail-callbacks.c:809
+#: mail/mail-callbacks.c:830
 msgid "Save Message As..."
 msgstr "Spara meddelande som..."
 
-#: mail/mail-callbacks.c:811
+#: mail/mail-callbacks.c:832
 msgid "Save Messages As..."
 msgstr "Spara meddelanden som..."
 
-#: mail/mail-callbacks.c:895
+#: mail/mail-callbacks.c:916
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4322,45 +4538,266 @@ msgstr ""
 "Fel vid lДsning av filterinformation:\n"
 "%s"
 
-#: mail/mail-callbacks.c:940
+#: mail/mail-callbacks.c:961
 msgid "Print Message"
 msgstr "Skriv ut meddelande"
 
-#: mail/mail-callbacks.c:987
+#: mail/mail-callbacks.c:1008
 msgid "Printing of message failed"
 msgstr "Utskrift av meddelande misslyckades"
 
 #.
-#. * 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
+#, fuzzy
+msgid "Account"
+msgstr "Konton"
+
+#: mail/mail-config-druid.glade.h:7
+msgid "Account Information"
+msgstr "Kontoinformation"
+
+#: mail/mail-config-druid.glade.h:8
+msgid "Account Management"
+msgstr "Kontohantering"
+
+#: mail/mail-config-druid.glade.h:9
+#, fuzzy
+msgid "Account Properties"
+msgstr "Egenskaper hos bilagan"
+
+#: mail/mail-config-druid.glade.h:11
+#, fuzzy
+msgid "Advanced"
+msgstr "Avancerat..."
+
+#: mail/mail-config-druid.glade.h:12
+#, fuzzy
+msgid "Authentication"
+msgstr "Autentisering:"
+
+#: mail/mail-config-druid.glade.h:13
+#, fuzzy
+msgid "Authentication Type:"
+msgstr "Autentisering:"
+
+#: mail/mail-config-druid.glade.h:15
+msgid "Automatically check mail every "
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:17
+#, fuzzy
+msgid "Congratulations, your mail configuration is complete.\n"
+msgstr "Gratulerar, din e-postkonfiguration Дr fДrdig."
+
+#: mail/mail-config-druid.glade.h:23
+msgid "DIGEST-MD5"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:24
+msgid "Default"
+msgstr "Standard"
+
+#: mail/mail-config-druid.glade.h:26
+#, fuzzy
+msgid "Delete mail from server"
+msgstr "Ta inte bort meddelanden frЕn servern"
+
+#: mail/mail-config-druid.glade.h:27
+msgid "Done"
+msgstr "Klar"
+
+#: mail/mail-config-druid.glade.h:28
+#, fuzzy
+msgid "E-Mail Address:"
+msgstr "E-postadress:"
+
+#: mail/mail-config-druid.glade.h:30
+msgid "Email Address:"
+msgstr "E-postadress:"
+
+#: mail/mail-config-druid.glade.h:31
+msgid "Evolution Mail Configuration"
+msgstr "Evolution e-postkonfiguration"
+
+#: mail/mail-config-druid.glade.h:32
+msgid "Full Name:"
+msgstr "FullstДndigt namn:"
+
+#: mail/mail-config-druid.glade.h:35
+#, fuzzy
+msgid "Hostname:"
+msgstr "VДrd:"
+
+#: mail/mail-config-druid.glade.h:36
+msgid "IMAP"
+msgstr "IMAP"
+
+#: mail/mail-config-druid.glade.h:37
 msgid "Identity"
 msgstr "Identitet"
 
-#: 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
+msgid "Mail"
+msgstr "E-post"
+
+#: mail/mail-config-druid.glade.h:41
+#, fuzzy
+msgid "Mail Account"
+msgstr "Konton"
+
+#: mail/mail-config-druid.glade.h:42
 msgid "Mail Configuration"
 msgstr "E-postkonfiguration"
 
-#: po/tmp/mail-config-druid.glade.h:8
-msgid "Mail Source"
-msgstr "E-postkДlla"
+#: mail/mail-config-druid.glade.h:43
+msgid "Mail Configuration Druid"
+msgstr "E-postkonfigurationsguide"
 
-#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
-msgid "Mail Transport"
-msgstr "E-posttransport"
+#: mail/mail-config-druid.glade.h:44
+msgid "Make this my default account"
+msgstr "GЖr detta till mitt standardkonto"
 
-#: po/tmp/mail-config-druid.glade.h:10
-msgid "Welcome to the Evolution Mail configuration wizard!\n"
-msgstr "VДlkommen till Evolutions guide fЖr e-postkonfiguration!\n"
+#: mail/mail-config-druid.glade.h:46
+msgid "News"
+msgstr "Diskussionsgrupper"
+
+#: mail/mail-config-druid.glade.h:48
+msgid "Optional"
+msgstr "Valfri"
+
+#: mail/mail-config-druid.glade.h:49 mail/mail-config-gui.c:485
+msgid "Organization:"
+msgstr "Organisation:"
+
+#: mail/mail-config-druid.glade.h:50
+msgid "Outgoing Mail Server"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:51
+msgid "Password:"
+msgstr "LЖsenord:"
+
+#: mail/mail-config-druid.glade.h:53
+msgid "Plain Text"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:54
+msgid "Receiving Email"
+msgstr "Tar emot e-post"
+
+#: mail/mail-config-druid.glade.h:55
+#, fuzzy
+msgid "Remember my password"
+msgstr "Kom ihЕg detta lЖsenord"
+
+#: mail/mail-config-druid.glade.h:56 mail/mail-format.c:628
+msgid "Reply-To:"
+msgstr "Svara-Till:"
+
+#: mail/mail-config-druid.glade.h:57
+msgid "Reply-to:"
+msgstr "Svara-till:"
+
+#: mail/mail-config-druid.glade.h:58
+msgid "Required"
+msgstr "KrДvs"
+
+#: mail/mail-config-druid.glade.h:60
+#, fuzzy
+msgid "Save password"
+msgstr "Spara som VCard"
+
+#: mail/mail-config-druid.glade.h:61
+#, fuzzy
+msgid "Select signature file"
+msgstr "Signaturfil:"
+
+#: mail/mail-config-druid.glade.h:62
+msgid "Sending Email"
+msgstr "Skickar e-post"
+
+#: mail/mail-config-druid.glade.h:64
+msgid "Server Configuration"
+msgstr "Serverkonfiguration"
+
+#: mail/mail-config-druid.glade.h:65
+#, fuzzy
+msgid "Server Timeouts"
+msgstr "Servertyp: "
+
+#: mail/mail-config-druid.glade.h:66
+msgid "Server Type: "
+msgstr "Servertyp: "
+
+#: mail/mail-config-druid.glade.h:67
+#, fuzzy
+msgid "Server requires authentication"
+msgstr "SMTP-servern krДver autentisering"
+
+#: mail/mail-config-druid.glade.h:68
+#, fuzzy
+msgid "Servers"
+msgstr "Server:"
+
+#: mail/mail-config-druid.glade.h:69 mail/mail-config-gui.c:496
+msgid "Signature file:"
+msgstr "Signaturfil:"
 
-#: po/tmp/mail-config-druid.glade.h:14
+#: mail/mail-config-druid.glade.h:70
+#, fuzzy
+msgid "Signature:"
+msgstr "Signaturfil:"
+
+#: mail/mail-config-druid.glade.h:71 mail/mail-config.glade.h:20
+msgid "Sources"
+msgstr "KДllor"
+
+#: mail/mail-config-druid.glade.h:72
+#, fuzzy
+msgid "This server requires a secure connection (SSL)"
+msgstr "SMTP-servern krДver autentisering"
+
+#: mail/mail-config-druid.glade.h:73
+#, fuzzy
+msgid "Type"
+msgstr "Typ:"
+
+#: 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 ""
-"Din e-postkonfiguration Дr nu klar.\n"
-"Klicka pЕ \"SlutfЖr\" fЖr att spara dina nya instДllningar"
+
+#: mail/mail-config-druid.glade.h:76
+#, fuzzy
+msgid "User Information"
+msgstr "Ingen information"
+
+#: mail/mail-config-druid.glade.h:77 mail/mail-config-gui.c:928
+msgid "Username:"
+msgstr "AnvДndarnamn:"
+
+#: mail/mail-config-druid.glade.h:78
+#, fuzzy
+msgid "Welcome to the Evolution Mail Configuration Druid.\n"
+msgstr "VДlkommen till Evolutions guide fЖr e-postkonfiguration!\n"
+
+#: mail/mail-config-druid.glade.h:81
+#, fuzzy
+msgid "minute(s)"
+msgstr "minuter"
 
 #: mail/mail-config-gui.c:433
 msgid ""
@@ -4379,15 +4816,7 @@ msgstr "FullstДndigt namn:"
 msgid "Email address:"
 msgstr "E-postadress:"
 
-#: mail/mail-config-gui.c:485
-msgid "Organization:"
-msgstr "Organisation:"
-
-#: mail/mail-config-gui.c:496
-msgid "Signature file:"
-msgstr "Signaturfil:"
-
-#: 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 "Signaturfil"
 
@@ -4395,10 +4824,6 @@ msgstr "Signaturfil"
 msgid "Server:"
 msgstr "Server:"
 
-#: mail/mail-config-gui.c:928
-msgid "Username:"
-msgstr "AnvДndarnamn:"
-
 #: mail/mail-config-gui.c:956
 msgid "Detect supported types..."
 msgstr "Detektera vilka typer som stЖds..."
@@ -4415,7 +4840,7 @@ msgstr "Testa instДllningarna"
 msgid "Mail source type:"
 msgstr "Typ av e-postkДlla:"
 
-#: 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"
@@ -4451,6 +4876,20 @@ msgstr ""
 msgid "Mail transport type:"
 msgstr "Typ av e-posttransport:"
 
+#: mail/mail-config-gui.c:1183
+#, fuzzy
+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 ""
+"VДlj den typ av e-postserver som du har och ange den relevanta informationen "
+"om den.\n"
+"\n"
+"Om servern krДver autentisering kan du klicka pЕ knappen \"Detektera vilka "
+"typer som stЖds...\" nДr du har angett den andra informationen."
+
 #: mail/mail-config-gui.c:1233
 msgid "Add Identity"
 msgstr "LДgg till identitet"
@@ -4499,42 +4938,42 @@ msgstr "FrЕgar efter autentiseringsmЖjligheterna hos \"%s\""
 msgid "Query authorization at \"%s\""
 msgstr "FrЕga efter autentisering hos \"%s\""
 
-#: po/tmp/mail-config.glade.h:7
+#: mail/mail-config.glade.h:7
 msgid "Address"
 msgstr "Adress"
 
-#: po/tmp/mail-config.glade.h:10
+#: mail/mail-config.glade.h:10
 msgid "Identities"
 msgstr "Identiteter"
 
-#: po/tmp/mail-config.glade.h:11
+#: mail/mail-config.glade.h:11
 msgid "Mail Sources"
 msgstr "E-postkДllor"
 
-#: po/tmp/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
+msgid "Mail Transport"
+msgstr "E-posttransport"
+
+#: mail/mail-config.glade.h:13
 msgid "Mark message as seen [ms]: "
 msgstr "Markera meddelanden som lДsta [ms]: "
 
-#: po/tmp/mail-config.glade.h:14
+#: mail/mail-config.glade.h:14
 msgid "News Servers"
 msgstr "Diskussionsgruppsservrar"
 
-#: po/tmp/mail-config.glade.h:15
+#: mail/mail-config.glade.h:15
 msgid "News Sources"
 msgstr "DiskussionsgruppskДllor"
 
-#: po/tmp/mail-config.glade.h:16
+#: mail/mail-config.glade.h:16
 msgid "Organization"
 msgstr "Organisation"
 
-#: po/tmp/mail-config.glade.h:18
+#: mail/mail-config.glade.h:18
 msgid "Send messages in HTML format"
 msgstr "Skicka meddelanden som HTML"
 
-#: po/tmp/mail-config.glade.h:20
-msgid "Sources"
-msgstr "KДllor"
-
 #: 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."
@@ -4614,10 +5053,6 @@ msgstr "GЖm"
 msgid "%s attachment"
 msgstr "%s-bilaga"
 
-#: mail/mail-format.c:628
-msgid "Reply-To:"
-msgstr "Svara-Till:"
-
 #: mail/mail-format.c:851
 msgid "No GPG/PGP support available in this copy of Evolution."
 msgstr "Det finns inget stЖd fЖr GPG/PGP i denna kopia av Evolution."
@@ -4727,6 +5162,29 @@ msgstr ""
 "Kan inte registrera mappen \"%s\":\n"
 "%s"
 
+#: mail/mail-mt.c:85
+#, fuzzy, c-format
+msgid ""
+"Error while '%s':\n"
+"%s"
+msgstr ""
+"Fel vid \"%s\":\n"
+"%s"
+
+#: mail/mail-mt.c:87
+#, fuzzy, c-format
+msgid ""
+"Error while performing operation:\n"
+"%s"
+msgstr ""
+"Fel vid fЖrberedelse av %s:\n"
+"%s"
+
+#: mail/mail-mt.c:356 mail/mail-mt.c:385
+#, fuzzy
+msgid "Working"
+msgstr "Flyttar"
+
 #: mail/mail-ops.c:88
 #, c-format
 msgid "Fetching email from %s"
@@ -4750,168 +5208,141 @@ msgstr "Filtrerar e-post vid behov"
 msgid "Filter email on demand"
 msgstr "Filtrera e-post vid behov"
 
-#: mail/mail-ops.c:544
+#: mail/mail-ops.c:551
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Skickar \"%s\""
 
-#: mail/mail-ops.c:549
-msgid "Sending a message without a subject"
-msgstr "Skickar ett meddelande utan en Дmnesrad"
-
-#: mail/mail-ops.c:552
-#, c-format
-msgid "Send \"%s\""
-msgstr "Skicka \"%s\""
-
-#: mail/mail-ops.c:555
-msgid "Send a message without a subject"
-msgstr "Skicka ett meddelande utan en Дmnesrad"
+#: mail/mail-ops.c:553
+#, fuzzy
+msgid "Sending message"
+msgstr "Skicka detta meddelande nu"
 
-#: mail/mail-ops.c:725
+#: mail/mail-ops.c:669
 msgid "Sending queue"
 msgstr "Skickar kЖ"
 
-#: mail/mail-ops.c:727
+#: mail/mail-ops.c:671
 msgid "Send queue"
 msgstr "Skicka kЖ"
 
-#: mail/mail-ops.c:860 mail/mail-ops.c:867
+#: mail/mail-ops.c:804 mail/mail-ops.c:811
 #, c-format
 msgid "Appending \"%s\""
 msgstr "TillДgger \"%s\""
 
-#: mail/mail-ops.c:864 mail/mail-ops.c:870
+#: mail/mail-ops.c:808 mail/mail-ops.c:814
 msgid "Appending a message without a subject"
 msgstr "TillДgger ett meddelande utan en Дmnesrad"
 
-#: mail/mail-ops.c:953
+#: mail/mail-ops.c:897
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Flyttar meddelanden frЕn \"%s\" till \"%s\""
 
-#: mail/mail-ops.c:955
+#: mail/mail-ops.c:899
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Kopierar meddelanden frЕn \"%s\" till \"%s\""
 
-#: mail/mail-ops.c:958
+#: mail/mail-ops.c:902
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Flytta meddelanden frЕn \"%s\" till \"%s\""
 
-#: mail/mail-ops.c:960
+#: mail/mail-ops.c:904
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Kopiera meddelanden frЕn \"%s\" till \"%s\""
 
-#: mail/mail-ops.c:991
+#: mail/mail-ops.c:935
 msgid "Moving"
 msgstr "Flyttar"
 
-#: mail/mail-ops.c:994
+#: mail/mail-ops.c:938
 msgid "Copying"
 msgstr "Kopierar"
 
-#: mail/mail-ops.c:1014
+#: mail/mail-ops.c:958
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s meddelande %d av %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1093
-#, c-format
-msgid "Marking messages in folder \"%s\""
-msgstr "MДrker meddelanden i mappen \"%s\""
-
-#: mail/mail-ops.c:1096
-#, c-format
-msgid "Mark messages in folder \"%s\""
-msgstr "MДrk meddelanden i mappen \"%s\""
-
-#: mail/mail-ops.c:1127
-#, c-format
-msgid "Marking message %d of %d"
-msgstr "MДrker meddelande %d av %d"
-
-#: mail/mail-ops.c:1256
+#: mail/mail-ops.c:1033
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "GenomsЖker mappar i \"%s\""
 
-#: mail/mail-ops.c:1258
-#, c-format
-msgid "Scan folders in \"%s\""
-msgstr "GenomsЖk mappar i \"%s\""
-
-#: mail/mail-ops.c:1327 mail/subscribe-dialog.c:341
+#: mail/mail-ops.c:1099 mail/subscribe-dialog.c:341
 msgid "(No description)"
 msgstr "(Ingen beskrivning)"
 
-#: mail/mail-ops.c:1415
+#: mail/mail-ops.c:1164
 msgid "Forwarded messages"
 msgstr "Vidarebefordrade meddelanden"
 
-#: mail/mail-ops.c:1453 mail/mail-ops.c:1523
+#: mail/mail-ops.c:1205 mail/mail-ops.c:1274
 #, c-format
 msgid "Opening folder %s"
 msgstr "жppnar mappen %s"
 
-#: mail/mail-ops.c:1599
-#, c-format
-msgid "Creating \"%s\""
-msgstr "Skapar \"%s\""
-
-#: mail/mail-ops.c:1601
-#, c-format
-msgid "Create \"%s\""
-msgstr "Skapa \"%s\""
+#: mail/mail-ops.c:1336
+#, fuzzy
+msgid "Synchronising folder"
+msgstr "Omkonfigurerar mapp"
 
-#: mail/mail-ops.c:1649
-msgid "Exception while reporting result to shell component listener."
-msgstr "Undantag vid rapportering av resultat till skalkomponentslyssnaren."
+#: mail/mail-ops.c:1386
+#, fuzzy
+msgid "Expunging folder"
+msgstr "жppnar mappen %s"
 
-#: mail/mail-ops.c:1787
+#: mail/mail-ops.c:1434
 #, c-format
 msgid "Retrieving message %s"
 msgstr "HДmtar meddelande %s"
 
-#: mail/mail-ops.c:1850
+#: mail/mail-ops.c:1497
 msgid "Retrieving messages"
 msgstr "HДmtar meddelanden"
 
-#: mail/mail-ops.c:1860
+#: mail/mail-ops.c:1507
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "HДmtar meddelande nummer %d av %d (uid \"%s\")"
 
-#: mail/mail-ops.c:2008
+#: mail/mail-ops.c:1655
 #, c-format
 msgid "Loading %s Folder for %s"
 msgstr "LДser in mappen %s fЖr %s"
 
-#: mail/mail-ops.c:2010
+#: mail/mail-ops.c:1657
 #, c-format
 msgid "Load %s Folder for %s"
 msgstr "LДs in mappen %s fЖr %s"
 
-#: mail/mail-ops.c:2179
-#, c-format
-msgid "Saving messages from folder \"%s\""
-msgstr "Sparar meddelanden frЕn mappen \"%s\""
+#: mail/mail-ops.c:1823
+#, fuzzy
+msgid "Saving messages"
+msgstr "Kopierar meddelanden"
 
-#: mail/mail-ops.c:2182
-#, c-format
-msgid "Save messages from folder \"%s\""
-msgstr "Spara meddelanden frЕn mappen \"%s\""
+#: mail/mail-ops.c:1902
+#, fuzzy, c-format
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
+msgstr "Kan inte spara grupplistefilen fЖr %s: %s"
 
-#: mail/mail-ops.c:2225
+#: mail/mail-ops.c:1915
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Sparar meddelande %d av %d (uid \"%s\")"
 
-#: mail/mail-search-dialogue.c:104
-msgid "Ok"
-msgstr "Ok"
+#: mail/mail-ops.c:1929
+#, fuzzy, c-format
+msgid ""
+"Error saving messages to: %s:\n"
+" %s"
+msgstr "Fel vid sparande av filen: %s"
 
 #: mail/mail-search-dialogue.c:104
 msgid "Cancel"
@@ -5027,27 +5458,27 @@ msgstr "Ny virtuell mapp"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 po/tmp/evolution-mail.xml.h:37
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:37
 msgid "Reply"
 msgstr "Svara"
 
-#: mail/mail-view.c:138 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 "Svara till avsДndaren av det hДr meddelandet"
 
-#: mail/mail-view.c:141 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 "Svara till alla mottagare av det hДr meddelandet"
 
-#: mail/mail-view.c:144 po/tmp/evolution-mail.xml.h:19
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:19
 msgid "Forward this message"
 msgstr "Vidarebefordra detta meddelande"
 
-#: mail/mail-view.c:148 po/tmp/evolution-mail.xml.h:36
+#: mail/mail-view.c:148 ui/evolution-mail.xml.h:36
 msgid "Print the selected message"
 msgstr "Skriv ut det markerade meddelandet"
 
-#: mail/mail-view.c:150 po/tmp/evolution-mail.xml.h:12
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:12
 msgid "Delete this message"
 msgstr "Ta bort detta meddelande"
 
@@ -5102,14 +5533,6 @@ msgstr "%d %b %I:%M"
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:2347
-msgid "Rebuilding message view"
-msgstr "Bygger om meddelandevyn"
-
-#: mail/message-list.c:2349
-msgid "Rebuild message view"
-msgstr "Bygg om meddelandevyn"
-
 #: mail/subscribe-dialog.c:139
 msgid "Display folders starting with:"
 msgstr "Visa mappar som bЖrjar med:"
@@ -5376,9 +5799,8 @@ msgstr "Ta bort denna genvДg frЕn genvДgsraden"
 msgid "Error saving shortcuts."
 msgstr "Fel vid sparande av genvДgar."
 
-#: 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 "_Visa"
 
@@ -5496,1120 +5918,1105 @@ msgstr "StДng av."
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kan inte initiera Bonobo-komponentsystemet."
 
-#: po/tmp/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:7
 msgid "Create a new contact"
 msgstr "Skapa en ny kontakt"
 
-#: po/tmp/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete a contact"
 msgstr "Ta bort en kontakt"
 
-#: 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 "SЖk"
 
-#: po/tmp/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:11
 msgid "Find a contact"
 msgstr "SЖk efter en kontakt"
 
-#: 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 "Ny"
 
-#: po/tmp/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:14
 msgid "Print contacts"
 msgstr "Skriv ut kontakter"
 
-#: po/tmp/evolution-addressbook.xml.h:15
+#: ui/evolution-addressbook.xml.h:15
 msgid "Stop"
 msgstr "Stopp"
 
-#: po/tmp/evolution-addressbook.xml.h:16
+#: ui/evolution-addressbook.xml.h:16
 msgid "Stop Loading"
 msgstr "Stoppa inlДsning"
 
-#: po/tmp/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:17
 msgid "View All"
 msgstr "Visa alla"
 
-#: po/tmp/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:18
 msgid "View all contacts"
 msgstr "Visa alla kontakter"
 
-#: po/tmp/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:19
 msgid "_Addressbook Configuration..."
 msgstr "_Adressbokskonfiguration..."
 
-#: po/tmp/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:20
 msgid "_Print Contacts..."
 msgstr "Skriv _ut kontakter..."
 
-#: po/tmp/evolution-addressbook.xml.h:21
+#: ui/evolution-addressbook.xml.h:21
 msgid "_Search for contacts"
 msgstr "_SЖk kontakter"
 
-#: 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 "_Verktyg"
 
 #.
-#. * 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 dagar"
 
-#: po/tmp/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:7
 msgid "Alter preferences"
 msgstr "дndra instДllningar"
 
-#: po/tmp/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:8
 msgid "Ca_lendar"
 msgstr "Ka_lender"
 
-#: po/tmp/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:9
 msgid "Calendar Preferences..."
 msgstr "InstДllningar fЖr kalendern..."
 
-#: po/tmp/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:10
 msgid "Create a new appointment"
 msgstr "Skapa ett nytt mЖte"
 
-#: po/tmp/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:11
 msgid "Create a new calendar"
 msgstr "Skapa en ny kalender"
 
-#: po/tmp/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:12
 msgid "Day"
 msgstr "Dag"
 
-#: po/tmp/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:13
 msgid "Go back in time"
 msgstr "GЕ bakЕt i tiden"
 
-#: po/tmp/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:14
 msgid "Go forward in time"
 msgstr "GЕ framЕt i tiden"
 
-#: po/tmp/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to"
 msgstr "GЕ till"
 
-#: po/tmp/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to a specific date"
 msgstr "GЕ till ett specifikt datum"
 
-#: po/tmp/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:17
 msgid "Go to present time"
 msgstr "GЕ till nuvarande tid"
 
-#: po/tmp/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "MЕnad"
 
-#: 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 "NДsta"
 
-#: po/tmp/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:21
 msgid "Open a calendar"
 msgstr "жppna en kalender"
 
-#: po/tmp/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:22
 msgid "Prev"
 msgstr "FЖreg"
 
-#: po/tmp/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:24
 msgid "Print this calendar"
 msgstr "Skriv ut denna kalender"
 
-#: po/tmp/evolution-calendar.xml.h:25
+#: ui/evolution-calendar.xml.h:25
 msgid "Save calendar as something else"
 msgstr "Spara kalender som nЕgot annat"
 
-#: po/tmp/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:26
 msgid "Show 1 day"
 msgstr "Visa 1 dag"
 
-#: po/tmp/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:27
 msgid "Show 1 month"
 msgstr "Visa 1 mЕnad"
 
-#: po/tmp/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:28
 msgid "Show 1 week"
 msgstr "Visa 1 vecka"
 
-#: po/tmp/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr "Visa arbetsveckan"
 
-#: 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 "Idag"
 
-#: po/tmp/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:31
 msgid "Week"
 msgstr "Vecka"
 
-#: 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 "_Ny"
 
-#: po/tmp/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:33
 msgid "_Open Calendar"
 msgstr "_жppna kalender"
 
-#: po/tmp/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:34
 msgid "_Print this calendar"
 msgstr "Skriv _ut denna kalender"
 
-#: po/tmp/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:35
 msgid "_Save As..."
 msgstr "_Spara som..."
 
-#: po/tmp/evolution-contact-editor.xml.h:7
+#: ui/evolution-contact-editor.xml.h:7
 msgid "Delete this item"
 msgstr "Ta bort detta objekt"
 
-#: po/tmp/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:8
 msgid "Delete..."
 msgstr "Ta bort..."
 
-#: po/tmp/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Help"
 msgstr "HjДlp"
 
-#: po/tmp/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:10
 msgid "Print En_velope..."
 msgstr "Skriv ut ku_vert..."
 
-#: 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 "Skriv ut detta objekt"
 
-#: 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 "Skriv ut..."
 
-#: 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 "Spara so_m..."
 
-#: 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 "Spara och stДng"
 
-#: 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 "Spara kontakten och stДng dialogrutan"
 
-#: po/tmp/evolution-contact-editor.xml.h:16
+#: ui/evolution-contact-editor.xml.h:16
 msgid "Se_nd contact to other..."
 msgstr "Skicka kontakte_n till annan..."
 
-#: 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 "Se online-hjДlpen"
 
-#: po/tmp/evolution-contact-editor.xml.h:18
+#: ui/evolution-contact-editor.xml.h:18
 msgid "Send _message to contact..."
 msgstr "Skicka _meddelande till kontakt..."
 
-#: 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 "_Arkiv"
 
-#: po/tmp/evolution-contact-editor.xml.h:20
+#: ui/evolution-contact-editor.xml.h:20
 msgid "_Print..."
 msgstr "Skriv _ut..."
 
-#: 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 "_Spara"
 
 #.
-#. * 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 "Om detta program"
 
-#: po/tmp/evolution-event-editor.xml.h:7
+#: ui/evolution-event-editor.xml.h:7
 msgid "About..."
 msgstr "Om..."
 
-#: po/tmp/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:8
 msgid "Actio_ns"
 msgstr "_еtgДrder"
 
-#: po/tmp/evolution-event-editor.xml.h:9
+#: ui/evolution-event-editor.xml.h:9
 msgid "C_lear"
 msgstr "_TЖm"
 
-#: po/tmp/evolution-event-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:10
 msgid "C_ut"
 msgstr "Klipp _ut"
 
-#: po/tmp/evolution-event-editor.xml.h:11
+#: ui/evolution-event-editor.xml.h:11
 msgid "Clear"
 msgstr "TЖm"
 
-#: po/tmp/evolution-event-editor.xml.h:12
+#: ui/evolution-event-editor.xml.h:12
 msgid "Clear the selection"
 msgstr "TЖm markeringen"
 
-#: po/tmp/evolution-event-editor.xml.h:14
+#: ui/evolution-event-editor.xml.h:14
 msgid "Close this appointment"
 msgstr "StДng detta mЖte"
 
-#: 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 "Kopiera"
 
-#: po/tmp/evolution-event-editor.xml.h:16
+#: ui/evolution-event-editor.xml.h:16
 msgid "Copy the selection"
 msgstr "Koiera markeringen"
 
-#: po/tmp/evolution-event-editor.xml.h:17
+#: ui/evolution-event-editor.xml.h:17
 msgid "Cut"
 msgstr "Klipp ut"
 
-#: po/tmp/evolution-event-editor.xml.h:18
+#: ui/evolution-event-editor.xml.h:18
 msgid "Cut the selection"
 msgstr "Klipp ut markeringen"
 
-#: po/tmp/evolution-event-editor.xml.h:21
+#: ui/evolution-event-editor.xml.h:21
 msgid "Dump XML"
 msgstr "Kasta XML"
 
-#: po/tmp/evolution-event-editor.xml.h:22
+#: ui/evolution-event-editor.xml.h:22
 msgid "Dump the UI Xml description"
 msgstr "Kasta anvДndargrДnssnittsbeskrivningen i XML"
 
-#: po/tmp/evolution-event-editor.xml.h:23
+#: ui/evolution-event-editor.xml.h:23
 msgid "FIXME: Address _Book..."
 msgstr "FIXME: Adress_bok..."
 
-#: po/tmp/evolution-event-editor.xml.h:24
+#: ui/evolution-event-editor.xml.h:24
 msgid "FIXME: Ch_oose Form..."
 msgstr "FIXME: V_Дlj formulДr..."
 
-#: po/tmp/evolution-event-editor.xml.h:25
+#: ui/evolution-event-editor.xml.h:25
 msgid "FIXME: Chec_k Names"
 msgstr "FIXME: _Kontrollera namn"
 
-#: po/tmp/evolution-event-editor.xml.h:26
+#: ui/evolution-event-editor.xml.h:26
 msgid "FIXME: Cop_y to Folder..."
 msgstr "FIXME: Kopier_a till mapp..."
 
-#: po/tmp/evolution-event-editor.xml.h:27
+#: ui/evolution-event-editor.xml.h:27
 msgid "FIXME: D_esign a Form..."
 msgstr "FIXME: Ut_forma ett formulДr..."
 
-#: po/tmp/evolution-event-editor.xml.h:28
+#: ui/evolution-event-editor.xml.h:28
 msgid "FIXME: Define Print _Styles"
 msgstr "FIXME: Ange utskrifts_stiler"
 
-#: po/tmp/evolution-event-editor.xml.h:29
+#: ui/evolution-event-editor.xml.h:29
 msgid "FIXME: Desi_gn This Form"
 msgstr "FIXME: _Utforma detta formulДr"
 
-#: po/tmp/evolution-event-editor.xml.h:30
+#: ui/evolution-event-editor.xml.h:30
 msgid "FIXME: Fi_rst Item in Folder"
 msgstr "FIXME: FЖ_rsta objektet i mappen"
 
-#: po/tmp/evolution-event-editor.xml.h:31
+#: ui/evolution-event-editor.xml.h:31
 msgid "FIXME: For_ward"
 msgstr "FIXME: _Vidarebefordra"
 
-#: po/tmp/evolution-event-editor.xml.h:32
+#: ui/evolution-event-editor.xml.h:32
 msgid "FIXME: Forward as v_Calendar"
 msgstr "FIXME: Vidarebefordra som v_Calendar"
 
-#: po/tmp/evolution-event-editor.xml.h:33
+#: ui/evolution-event-editor.xml.h:33
 msgid "FIXME: Help"
 msgstr "FIXME: HjДlp"
 
-#: po/tmp/evolution-event-editor.xml.h:34
+#: ui/evolution-event-editor.xml.h:34
 msgid "FIXME: In_complete Task"
 msgstr "FIXME: Oav_slutad uppgift"
 
-#: po/tmp/evolution-event-editor.xml.h:35
+#: ui/evolution-event-editor.xml.h:35
 msgid "FIXME: Insert File"
 msgstr "FIXME: Infoga fil"
 
-#: po/tmp/evolution-event-editor.xml.h:36
+#: ui/evolution-event-editor.xml.h:36
 msgid "FIXME: It_em..."
 msgstr "FIXME: Obj_ekt..."
 
-#: po/tmp/evolution-event-editor.xml.h:37
+#: ui/evolution-event-editor.xml.h:37
 msgid "FIXME: Paste _Special... "
 msgstr "FIXME: Klistra in _special... "
 
-#: po/tmp/evolution-event-editor.xml.h:38
+#: ui/evolution-event-editor.xml.h:38
 msgid "FIXME: Print Pre_view"
 msgstr "FIXME: FЖrhands_granska"
 
-#: po/tmp/evolution-event-editor.xml.h:39
+#: ui/evolution-event-editor.xml.h:39
 msgid "FIXME: Pu_blish Form As..."
 msgstr "FIXME: Pu_blicera formulДr som..."
 
-#: po/tmp/evolution-event-editor.xml.h:40
+#: ui/evolution-event-editor.xml.h:40
 msgid "FIXME: Publish _Form..."
 msgstr "FIXME: Publicera _formulДr..."
 
-#: po/tmp/evolution-event-editor.xml.h:41
+#: ui/evolution-event-editor.xml.h:41
 msgid "FIXME: Rec_urrence..."
 msgstr "FIXME: _Upprepning..."
 
-#: po/tmp/evolution-event-editor.xml.h:42
+#: ui/evolution-event-editor.xml.h:42
 msgid "FIXME: S_end"
 msgstr "FIXME: S_kicka"
 
-#: po/tmp/evolution-event-editor.xml.h:43
+#: ui/evolution-event-editor.xml.h:43
 msgid "FIXME: Save Attac_hments..."
 msgstr "FIXME: Spara bilagor..."
 
-#: po/tmp/evolution-event-editor.xml.h:44
+#: ui/evolution-event-editor.xml.h:44
 msgid "FIXME: Script _Debugger"
 msgstr "FIXME: Skri_ptfelsЖkare"
 
-#: po/tmp/evolution-event-editor.xml.h:45
+#: ui/evolution-event-editor.xml.h:45
 msgid "FIXME: Task _Request"
 msgstr "FIXME: Uppgifts_begДran"
 
-#: po/tmp/evolution-event-editor.xml.h:46
+#: ui/evolution-event-editor.xml.h:46
 msgid "FIXME: _Contact"
 msgstr "FIXME: _Kontakt"
 
-#: po/tmp/evolution-event-editor.xml.h:47
+#: ui/evolution-event-editor.xml.h:47
 msgid "FIXME: _Customize..."
 msgstr "FIXME: _Anpassa..."
 
-#: po/tmp/evolution-event-editor.xml.h:48
+#: ui/evolution-event-editor.xml.h:48
 msgid "FIXME: _File..."
 msgstr "FIXME: _Fil..."
 
-#: po/tmp/evolution-event-editor.xml.h:49
+#: ui/evolution-event-editor.xml.h:49
 msgid "FIXME: _Font..."
 msgstr "FIXME: _Typsnitt..."
 
-#: po/tmp/evolution-event-editor.xml.h:50
+#: ui/evolution-event-editor.xml.h:50
 msgid "FIXME: _Formatting"
 msgstr "FIXME: _Formatering"
 
-#: po/tmp/evolution-event-editor.xml.h:51
+#: ui/evolution-event-editor.xml.h:51
 msgid "FIXME: _Item"
 msgstr "FIXME: Objek_t"
 
-#: po/tmp/evolution-event-editor.xml.h:52
+#: ui/evolution-event-editor.xml.h:52
 msgid "FIXME: _Journal Entry"
 msgstr "FIXME: _Dagbokspost"
 
-#: po/tmp/evolution-event-editor.xml.h:53
+#: ui/evolution-event-editor.xml.h:53
 msgid "FIXME: _Last Item in Folder"
 msgstr "FIXME: _Sista objektet i mappen"
 
-#: po/tmp/evolution-event-editor.xml.h:54
+#: ui/evolution-event-editor.xml.h:54
 msgid "FIXME: _Mail Message"
 msgstr "FIXME: _Posta meddelande"
 
-#: po/tmp/evolution-event-editor.xml.h:55
+#: ui/evolution-event-editor.xml.h:55
 msgid "FIXME: _Memo Style"
 msgstr "FIXME: _Minneslappsstil"
 
-#: po/tmp/evolution-event-editor.xml.h:56
+#: ui/evolution-event-editor.xml.h:56
 msgid "FIXME: _Move to Folder..."
 msgstr "FIXME: _Flytta till mapp..."
 
-#: po/tmp/evolution-event-editor.xml.h:57
+#: ui/evolution-event-editor.xml.h:57
 msgid "FIXME: _New Appointment"
 msgstr "FIXME: _Nytt mЖte"
 
-#: po/tmp/evolution-event-editor.xml.h:58
+#: ui/evolution-event-editor.xml.h:58
 msgid "FIXME: _Note"
 msgstr "FIXME: _Anteckning"
 
-#: po/tmp/evolution-event-editor.xml.h:59
+#: ui/evolution-event-editor.xml.h:59
 msgid "FIXME: _Object..."
 msgstr "FIXME: _Objekt..."
 
-#: po/tmp/evolution-event-editor.xml.h:60
+#: ui/evolution-event-editor.xml.h:60
 msgid "FIXME: _Paragraph..."
 msgstr "FIXME: St_ycke..."
 
-#: po/tmp/evolution-event-editor.xml.h:61
+#: ui/evolution-event-editor.xml.h:61
 msgid "FIXME: _Spelling..."
 msgstr "FIXME: _Stavning..."
 
-#: po/tmp/evolution-event-editor.xml.h:62
+#: ui/evolution-event-editor.xml.h:62
 msgid "FIXME: _Standard"
 msgstr "FIXME: _Standard"
 
-#: po/tmp/evolution-event-editor.xml.h:63
+#: ui/evolution-event-editor.xml.h:63
 msgid "FIXME: _Task"
 msgstr "FIXME: _Uppgift"
 
-#: po/tmp/evolution-event-editor.xml.h:64
+#: ui/evolution-event-editor.xml.h:64
 msgid "FIXME: _Unread Item"
 msgstr "FIXME: _OlДst objekt"
 
-#: po/tmp/evolution-event-editor.xml.h:65
+#: ui/evolution-event-editor.xml.h:65
 msgid "FIXME: what goes here?"
 msgstr "FIXME: vad ska vi stoppa hДr?"
 
-#: 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 "F_ormat"
 
-#: po/tmp/evolution-event-editor.xml.h:68
+#: ui/evolution-event-editor.xml.h:68
 msgid "Find Again"
 msgstr "SЖk igen"
 
-#: po/tmp/evolution-event-editor.xml.h:69
+#: ui/evolution-event-editor.xml.h:69
 msgid "Find _Again"
 msgstr "SЖk ige_n..."
 
-#: po/tmp/evolution-event-editor.xml.h:70
+#: ui/evolution-event-editor.xml.h:70
 msgid "Go to the next item"
 msgstr "GЕ till nДsta objekt"
 
-#: po/tmp/evolution-event-editor.xml.h:71
+#: ui/evolution-event-editor.xml.h:71
 msgid "Go to the previous item"
 msgstr "GЕ till fЖregЕende objekt"
 
-#: po/tmp/evolution-event-editor.xml.h:72
+#: ui/evolution-event-editor.xml.h:72
 msgid "Modify the file's properties"
 msgstr "дndra filens egenskaper"
 
-#: po/tmp/evolution-event-editor.xml.h:73
+#: ui/evolution-event-editor.xml.h:73
 msgid "N_ext"
 msgstr "N_Дsta"
 
-#: po/tmp/evolution-event-editor.xml.h:75
+#: ui/evolution-event-editor.xml.h:75
 msgid "Paste"
 msgstr "Klistra in"
 
-#: po/tmp/evolution-event-editor.xml.h:76
+#: ui/evolution-event-editor.xml.h:76
 msgid "Paste the clipboard"
 msgstr "Klistra in frЕn urklipp"
 
-#: po/tmp/evolution-event-editor.xml.h:77
+#: ui/evolution-event-editor.xml.h:77
 msgid "Pre_vious"
 msgstr "FЖre_gЕende"
 
-#: po/tmp/evolution-event-editor.xml.h:78
+#: ui/evolution-event-editor.xml.h:78
 msgid "Previous"
 msgstr "FЖregЕende"
 
-#: po/tmp/evolution-event-editor.xml.h:79
+#: ui/evolution-event-editor.xml.h:79
 msgid "Print S_etup..."
 msgstr "Skrivar_instДllning..."
 
-#: po/tmp/evolution-event-editor.xml.h:80
+#: ui/evolution-event-editor.xml.h:80
 msgid "Print Setup"
 msgstr "SkrivarinstДllningar"
 
-#: po/tmp/evolution-event-editor.xml.h:83
+#: ui/evolution-event-editor.xml.h:83
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: po/tmp/evolution-event-editor.xml.h:84
+#: ui/evolution-event-editor.xml.h:84
 msgid "Redo"
 msgstr "GЖr om"
 
-#: po/tmp/evolution-event-editor.xml.h:85
+#: ui/evolution-event-editor.xml.h:85
 msgid "Redo the undone action"
 msgstr "GЖr om den Еngrade ЕtgДrden"
 
-#: po/tmp/evolution-event-editor.xml.h:86
+#: ui/evolution-event-editor.xml.h:86
 msgid "Replace"
 msgstr "ErsДtt"
 
-#: po/tmp/evolution-event-editor.xml.h:87
+#: ui/evolution-event-editor.xml.h:87
 msgid "Replace a string"
 msgstr "ErsДtt en strДng"
 
-#: 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 "Spara mЖtet och stДng dialogrutan"
 
-#: 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 "Spara aktuell fil"
 
-#: po/tmp/evolution-event-editor.xml.h:93
+#: ui/evolution-event-editor.xml.h:93
 msgid "Schedule Meeting"
 msgstr "Boka mЖte"
 
-#: po/tmp/evolution-event-editor.xml.h:94
+#: ui/evolution-event-editor.xml.h:94
 msgid "Schedule _Meeting"
 msgstr "Boka _mЖte"
 
-#: po/tmp/evolution-event-editor.xml.h:95
+#: ui/evolution-event-editor.xml.h:95
 msgid "Schedule some sort of a meeting"
 msgstr "Boka nЕgon typ av mЖte"
 
-#: po/tmp/evolution-event-editor.xml.h:96
+#: ui/evolution-event-editor.xml.h:96
 msgid "Search again for the same string"
 msgstr "SЖk igen efter samma strДng"
 
-#: po/tmp/evolution-event-editor.xml.h:97
+#: ui/evolution-event-editor.xml.h:97
 msgid "Search for a string"
 msgstr "SЖk efter en strДng"
 
-#: po/tmp/evolution-event-editor.xml.h:99
+#: ui/evolution-event-editor.xml.h:99
 msgid "Select All"
 msgstr "Markera allt"
 
-#: po/tmp/evolution-event-editor.xml.h:100
+#: ui/evolution-event-editor.xml.h:100
 msgid "Select everything"
 msgstr "Markera alltihop"
 
-#: 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 "StДll in sidinstДllningarna fЖr din aktuella skrivare"
 
-#: po/tmp/evolution-event-editor.xml.h:102
+#: ui/evolution-event-editor.xml.h:102
 msgid "Undo"
 msgstr "еngra"
 
-#: po/tmp/evolution-event-editor.xml.h:103
+#: ui/evolution-event-editor.xml.h:103
 msgid "Undo the last action"
 msgstr "еngra den senaste ЕtgДrden"
 
-#: 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 "_Om..."
 
-#: 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 "S_tДng"
 
-#: po/tmp/evolution-event-editor.xml.h:106
+#: ui/evolution-event-editor.xml.h:106
 msgid "_Copy"
 msgstr "_Kopiera"
 
-#: 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 "Fels_Жk"
 
-#: 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 "R_edigera"
 
-#: po/tmp/evolution-event-editor.xml.h:111
+#: ui/evolution-event-editor.xml.h:111
 msgid "_Find..."
 msgstr "_SЖk..."
 
-#: po/tmp/evolution-event-editor.xml.h:112
+#: ui/evolution-event-editor.xml.h:112
 msgid "_Forms"
 msgstr "_FormulДr"
 
-#: 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 "_HjДlp"
 
-#: po/tmp/evolution-event-editor.xml.h:114
+#: ui/evolution-event-editor.xml.h:114
 msgid "_Insert"
 msgstr "_Infoga"
 
-#: po/tmp/evolution-event-editor.xml.h:115
+#: ui/evolution-event-editor.xml.h:115
 msgid "_Object"
 msgstr "_Objekt"
 
-#: po/tmp/evolution-event-editor.xml.h:116
+#: ui/evolution-event-editor.xml.h:116
 msgid "_Paste"
 msgstr "Klistra _in"
 
-#: po/tmp/evolution-event-editor.xml.h:117
+#: ui/evolution-event-editor.xml.h:117
 msgid "_Print"
 msgstr "Skriv _ut"
 
-#: po/tmp/evolution-event-editor.xml.h:118
+#: ui/evolution-event-editor.xml.h:118
 msgid "_Properties..."
 msgstr "_Egenskaper..."
 
-#: po/tmp/evolution-event-editor.xml.h:119
+#: ui/evolution-event-editor.xml.h:119
 msgid "_Redo"
 msgstr "_GЖr om"
 
-#: po/tmp/evolution-event-editor.xml.h:120
+#: ui/evolution-event-editor.xml.h:120
 msgid "_Replace..."
 msgstr "_ErsДtt..."
 
-#: po/tmp/evolution-event-editor.xml.h:122
+#: ui/evolution-event-editor.xml.h:122
 msgid "_Toolbars"
 msgstr "_Verktygsrader"
 
-#: po/tmp/evolution-event-editor.xml.h:124
+#: ui/evolution-event-editor.xml.h:124
 msgid "_Undo"
 msgstr "_еngra"
 
 #.
-#. * 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 "Skriv"
 
-#: po/tmp/evolution-mail.xml.h:7
+#: ui/evolution-mail.xml.h:7
 msgid "Compose a new message"
 msgstr "Skriv ett nytt meddelande"
 
-#: po/tmp/evolution-mail.xml.h:9
+#: ui/evolution-mail.xml.h:9
 msgid "Copy message to a new folder"
 msgstr "Kopiera meddelandet till en ny mapp"
 
-#: 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 "Ma_pp"
 
-#: po/tmp/evolution-mail.xml.h:14
+#: ui/evolution-mail.xml.h:14
 msgid "Fi_lter on Sender"
 msgstr "Fi_ltrera pЕ avsДndare"
 
-#: po/tmp/evolution-mail.xml.h:15
+#: ui/evolution-mail.xml.h:15
 msgid "Filter on Rec_ipients"
 msgstr "Filtrera pЕ _mottagare"
 
-#: po/tmp/evolution-mail.xml.h:16
+#: ui/evolution-mail.xml.h:16
 msgid "Forget _Passwords"
 msgstr "GlЖm _lЖsenord"
 
-#: po/tmp/evolution-mail.xml.h:20
+#: ui/evolution-mail.xml.h:20
 msgid "Get Mail"
 msgstr "HДmta e-post"
 
-#: po/tmp/evolution-mail.xml.h:22
+#: ui/evolution-mail.xml.h:22
 msgid "Hide _Deleted messages"
 msgstr "GЖm _borttagna meddelanden"
 
-#: po/tmp/evolution-mail.xml.h:23
+#: ui/evolution-mail.xml.h:23
 msgid "Hide _Read messages"
 msgstr "GЖm _lДsta meddelanden"
 
-#: po/tmp/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:24
 msgid "Hide _Selected messages"
 msgstr "GЖm _markerade meddelanden"
 
-#: po/tmp/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:25
 msgid "Mail _Filters..."
 msgstr "E-post_filter..."
 
-#: po/tmp/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:26
 msgid "Manage Subscriptions..."
 msgstr "Hantera prenumerationer..."
 
-#: po/tmp/evolution-mail.xml.h:27
+#: ui/evolution-mail.xml.h:27
 msgid "Mar_k As Read"
 msgstr "Mar_kera som lДst"
 
-#: po/tmp/evolution-mail.xml.h:28
+#: ui/evolution-mail.xml.h:28
 msgid "Mark As U_nread"
 msgstr "Markera som _olДst"
 
-#: po/tmp/evolution-mail.xml.h:29
+#: ui/evolution-mail.xml.h:29
 msgid "Move"
 msgstr "Flytta"
 
-#: po/tmp/evolution-mail.xml.h:30
+#: ui/evolution-mail.xml.h:30
 msgid "Move message to a new folder"
 msgstr "Flytta meddelandet till en ny mapp"
 
-#: po/tmp/evolution-mail.xml.h:31
+#: ui/evolution-mail.xml.h:31
 msgid "Previews the message to be printed"
 msgstr "FЖrhandsgranskar meddelandet som ska skrivas ut"
 
-#: po/tmp/evolution-mail.xml.h:33
+#: ui/evolution-mail.xml.h:33
 msgid "Print Preview of message..."
 msgstr "FЖrhandsgranska meddelande..."
 
-#: po/tmp/evolution-mail.xml.h:34
+#: ui/evolution-mail.xml.h:34
 msgid "Print message to the printer"
 msgstr "Skriv ut meddelande pЕ skrivaren"
 
-#: po/tmp/evolution-mail.xml.h:35
+#: ui/evolution-mail.xml.h:35
 msgid "Print message..."
 msgstr "Skriv ut meddelande..."
 
-#: po/tmp/evolution-mail.xml.h:39
+#: ui/evolution-mail.xml.h:39
 msgid "Reply to _All"
 msgstr "Svara till _alla"
 
-#: po/tmp/evolution-mail.xml.h:40
+#: ui/evolution-mail.xml.h:40
 msgid "Reply to _Sender"
 msgstr "Svara till av_sДndaren"
 
-#: 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 "Markera _alla"
 
-#: po/tmp/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:44
 msgid "Send queued mail and retrieve new mail"
 msgstr "Skicka kЖlagd e-post och hДmta ny e-post"
 
-#: po/tmp/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:45
 msgid "Show _All messages"
 msgstr "Visa _alla meddelanden"
 
-#: po/tmp/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:46
 msgid "Threaded Message list"
 msgstr "TrЕdad meddelandelista"
 
-#: po/tmp/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:47
 msgid "VFolder on Se_nder"
 msgstr "Virtuell mapp pЕ avsД_ndare"
 
-#: po/tmp/evolution-mail.xml.h:48
+#: ui/evolution-mail.xml.h:48
 msgid "VFolder on _Recipients"
 msgstr "Virtuell mapp pЕ mottaga_re"
 
-#: po/tmp/evolution-mail.xml.h:49
+#: ui/evolution-mail.xml.h:49
 msgid "View Raw Message Source"
 msgstr "Visa rЕ meddelandekДlla"
 
-#: po/tmp/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:50
 msgid "_Apply Filters"
 msgstr "TillДmp_a filter"
 
-#: po/tmp/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:51
 msgid "_Configure Folder"
 msgstr "_Konfigura mapp"
 
-#: po/tmp/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:52
 msgid "_Copy to Folder..."
 msgstr "_Kopiera till mapp..."
 
-#: po/tmp/evolution-mail.xml.h:54
+#: ui/evolution-mail.xml.h:54
 msgid "_Edit Message"
 msgstr "R_edigera meddelande"
 
-#: po/tmp/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:55
 msgid "_Expunge"
 msgstr "V_erkstДll tЖmning"
 
-#: po/tmp/evolution-mail.xml.h:56
+#: ui/evolution-mail.xml.h:56
 msgid "_Filter on Subject"
 msgstr "_Filtrera pЕ Дmne"
 
-#: po/tmp/evolution-mail.xml.h:57
+#: ui/evolution-mail.xml.h:57
 msgid "_Forward"
 msgstr "Vidarebe_fordra"
 
-#: 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 "Om_vДnd markering"
 
-#: po/tmp/evolution-mail.xml.h:59
+#: ui/evolution-mail.xml.h:59
 msgid "_Mail Configuration..."
 msgstr "_E-postkonfiguration..."
 
-#: po/tmp/evolution-mail.xml.h:60
+#: ui/evolution-mail.xml.h:60
 msgid "_Message"
 msgstr "_Meddelande"
 
-#: po/tmp/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:61
 msgid "_Move to Folder..."
 msgstr "_Flytta till mapp..."
 
-#: po/tmp/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:62
 msgid "_Open in New Window"
 msgstr "_жppna i nytt fЖnster"
 
-#: po/tmp/evolution-mail.xml.h:63
+#: ui/evolution-mail.xml.h:63
 msgid "_Print Message"
 msgstr "Skriv _ut meddelande"
 
-#: po/tmp/evolution-mail.xml.h:64
+#: ui/evolution-mail.xml.h:64
 msgid "_Save Message As..."
 msgstr "Spara meddelande so_m..."
 
-#: po/tmp/evolution-mail.xml.h:65
+#: ui/evolution-mail.xml.h:65
 msgid "_Source"
 msgstr "_KДlla"
 
-#: po/tmp/evolution-mail.xml.h:66
+#: ui/evolution-mail.xml.h:66
 msgid "_Threaded"
 msgstr "_TrЕdat"
 
-#: po/tmp/evolution-mail.xml.h:67
+#: ui/evolution-mail.xml.h:67
 msgid "_Undelete"
 msgstr "_еngra borttagning"
 
-#: po/tmp/evolution-mail.xml.h:68
+#: ui/evolution-mail.xml.h:68
 msgid "_VFolder on Subject"
 msgstr "_Virtuell mapp pЕ Дmne"
 
-#: po/tmp/evolution-mail.xml.h:69
+#: ui/evolution-mail.xml.h:69
 msgid "_Virtual Folder Editor..."
 msgstr "Editor fЖr _virtuella mappar..."
 
 #.
-#. * 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 "Bifoga"
 
-#: po/tmp/evolution-message-composer.xml.h:9
+#: ui/evolution-message-composer.xml.h:9
 msgid "Close the current file"
 msgstr "StДng aktuell fil"
 
-#: po/tmp/evolution-message-composer.xml.h:10
+#: ui/evolution-message-composer.xml.h:10
 msgid "Encrypt this message with PGP"
 msgstr "Kryptera detta meddelande med 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 "Infoga en fil som text i meddelandet"
 
-#: po/tmp/evolution-message-composer.xml.h:14
+#: ui/evolution-message-composer.xml.h:14
 msgid "Insert text file..."
 msgstr "Infoga textfil..."
 
-#: po/tmp/evolution-message-composer.xml.h:16
+#: ui/evolution-message-composer.xml.h:16
 msgid "Open a file"
 msgstr "жppna en fil"
 
-#: po/tmp/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:17
 msgid "PGP Encrypt"
 msgstr "PGP-kryptera"
 
-#: po/tmp/evolution-message-composer.xml.h:18
+#: ui/evolution-message-composer.xml.h:18
 msgid "PGP Sign"
 msgstr "PGP-signera"
 
-#: po/tmp/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:20
 msgid "Save As"
 msgstr "Spara som"
 
-#: po/tmp/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:22
 msgid "Save in _folder... (FIXME)"
 msgstr "Spara i map_p... (FIXME)"
 
-#: po/tmp/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "Spara i mapp..."
 
-#: 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 "Spara aktuell fil med ett annat namn"
 
-#: po/tmp/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "Spara meddelandet i angiven mapp"
 
-#: po/tmp/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "Skicka"
 
-#: po/tmp/evolution-message-composer.xml.h:28
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr "Skicka senar_e"
 
-#: po/tmp/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr "Skicka senar_e"
 
-#: po/tmp/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr "Skicka brevet i HTML-format"
 
-#: po/tmp/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:31
 msgid "Send the message later"
 msgstr "Skicka meddelandet senare"
 
-#: po/tmp/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:32
 msgid "Send the message now"
 msgstr "Skicka meddelandet nu"
 
-#: po/tmp/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:33
 msgid "Send this message now"
 msgstr "Skicka detta meddelande nu"
 
-#: po/tmp/evolution-message-composer.xml.h:34
+#: ui/evolution-message-composer.xml.h:34
 msgid "Show / hide attachments"
 msgstr "Visa/gЖm bilaga"
 
-#: po/tmp/evolution-message-composer.xml.h:35
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show _attachments"
 msgstr "Visa _bilagor"
 
-#: po/tmp/evolution-message-composer.xml.h:36
+#: ui/evolution-message-composer.xml.h:36
 msgid "Show attachments"
 msgstr "Visa bilagor"
 
-#: po/tmp/evolution-message-composer.xml.h:37
+#: ui/evolution-message-composer.xml.h:37
 msgid "Sign this message with your PGP key"
 msgstr "Signera detta meddelande med din PGP-nyckel"
 
-#: po/tmp/evolution-message-composer.xml.h:44
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Insert text file... (FIXME)"
 msgstr "_Infoga textfil... (FIXME)"
 
-#: po/tmp/evolution-message-composer.xml.h:45
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Open..."
 msgstr "_жppna..."
 
-#: po/tmp/evolution-message-composer.xml.h:47
+#: ui/evolution-message-composer.xml.h:47
 msgid "_Security"
 msgstr "_SДkerhet"
 
 #.
-#. * 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 "LДgg till mapp till din lista Жver prenumererade mappar"
 
-#: po/tmp/evolution-subscribe.xml.h:9
+#: ui/evolution-subscribe.xml.h:9
 msgid "Refresh List"
 msgstr "Uppdatera lista"
 
-#: po/tmp/evolution-subscribe.xml.h:10
+#: ui/evolution-subscribe.xml.h:10
 msgid "Refresh List of Folders"
 msgstr "Uppdatera listan med mappar"
 
-#: po/tmp/evolution-subscribe.xml.h:11
+#: ui/evolution-subscribe.xml.h:11
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Ta bort mapp frЕn din lista Жver prenumererade mappar"
 
-#: po/tmp/evolution-subscribe.xml.h:13
+#: ui/evolution-subscribe.xml.h:13
 msgid "Subscribe"
 msgstr "Prenumerera"
 
-#: po/tmp/evolution-subscribe.xml.h:14
+#: ui/evolution-subscribe.xml.h:14
 msgid "Unsubscribe"
 msgstr "SДg upp prenumeration"
 
 #.
-#. * 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 "Visa en annan mapp"
 
-#: po/tmp/evolution.xml.h:7
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "_Avsluta"
 
-#: po/tmp/evolution.xml.h:8
+#: ui/evolution.xml.h:8
 msgid "Evolution bar _shortcut"
 msgstr "Evolution-genvДg fЖr _rader"
 
-#: po/tmp/evolution.xml.h:9
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Avlsuta programmet"
 
-#: po/tmp/evolution.xml.h:10
+#: ui/evolution.xml.h:10
 msgid "Getting _Started"
 msgstr "Komma i _gЕng"
 
-#: po/tmp/evolution.xml.h:11
+#: ui/evolution.xml.h:11
 msgid "Show information about Evolution"
 msgstr "Visa information om Evolution"
 
-#: po/tmp/evolution.xml.h:12
+#: ui/evolution.xml.h:12
 msgid "Show the _Folder Bar"
 msgstr "Visa _mappraden"
 
-#: po/tmp/evolution.xml.h:13
+#: ui/evolution.xml.h:13
 msgid "Show the _Shortcut Bar"
 msgstr "Visa _genvДgsraden"
 
-#: po/tmp/evolution.xml.h:14
+#: ui/evolution.xml.h:14
 msgid "Submit _Bug Report"
 msgstr "Skicka _felrapport"
 
-#: po/tmp/evolution.xml.h:15
+#: ui/evolution.xml.h:15
 msgid "Submit bug report using Bug Buddy."
 msgstr "Skicka felrapport med Bug-Buddy."
 
-#: po/tmp/evolution.xml.h:16
+#: ui/evolution.xml.h:16
 msgid "Toggle whether to show the folder bar"
 msgstr "VДxla om mappraden ska visas"
 
-#: po/tmp/evolution.xml.h:17
+#: ui/evolution.xml.h:17
 msgid "Toggle whether to show the shortcut bar"
 msgstr "VДxla om genvДgsraden ska visas"
 
-#: po/tmp/evolution.xml.h:18
+#: ui/evolution.xml.h:18
 msgid "Using the C_ontact Manager"
 msgstr "AnvДnda k_ontakthanteraren"
 
-#: po/tmp/evolution.xml.h:19
+#: ui/evolution.xml.h:19
 msgid "Using the _Calendar"
 msgstr "AnvДnda _kalendern"
 
-#: po/tmp/evolution.xml.h:20
+#: ui/evolution.xml.h:20
 msgid "Using the _Mailer"
 msgstr "AnvДnda _e-postdelen"
 
-#: po/tmp/evolution.xml.h:21
+#: ui/evolution.xml.h:21
 msgid "_About Evolution..."
 msgstr "_Om Evolution..."
 
-#: po/tmp/evolution.xml.h:22
+#: ui/evolution.xml.h:22
 msgid "_Appointment (FIXME)"
 msgstr "_MЖte (FIXME)"
 
-#: po/tmp/evolution.xml.h:23
+#: ui/evolution.xml.h:23
 msgid "_Contact (FIXME)"
 msgstr "_Kontakt (FIXME)"
 
-#: po/tmp/evolution.xml.h:26
+#: ui/evolution.xml.h:26
 msgid "_Folder"
 msgstr "_Mapp"
 
-#: po/tmp/evolution.xml.h:27
+#: ui/evolution.xml.h:27
 msgid "_Go to Folder..."
 msgstr "_GЕ till mapp..."
 
-#: po/tmp/evolution.xml.h:29
+#: ui/evolution.xml.h:29
 msgid "_Index"
 msgstr "_Index"
 
-#: po/tmp/evolution.xml.h:30
+#: ui/evolution.xml.h:30
 msgid "_Mail message (FIXME)"
 msgstr "_Posta meddelande (FIXME)"
 
-#: po/tmp/evolution.xml.h:32
+#: ui/evolution.xml.h:32
 msgid "_Settings"
 msgstr "_InstДllningar"
 
-#: po/tmp/evolution.xml.h:33
+#: ui/evolution.xml.h:33
 msgid "_Task (FIXME)"
 msgstr "_Uppgift (FIXME)"
 
@@ -6707,7 +7114,7 @@ msgstr "MTOTFLS"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-clipped-label.c:107
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
@@ -6732,6 +7139,73 @@ msgstr "%I.%M %p"
 msgid "Group %i"
 msgstr "Grupp %i"
 
+#~ msgid "categories"
+#~ msgstr "kategorier"
+
+#~ msgid "Item(s) belong to these categories:"
+#~ msgstr "Element(en) tillhЖr dessa kategorier:"
+
+#~ msgid "Available Categories:"
+#~ msgstr "TillgДngliga kategorier:"
+
+#~ msgid "Deleted"
+#~ msgstr "Borttagen"
+
+#~ msgid "Draft"
+#~ msgstr "Mall"
+
+#~ msgid "Mail Source"
+#~ msgstr "E-postkДlla"
+
+#~ msgid ""
+#~ "Your email configuration is now complete.\n"
+#~ "Click \"Finish\" to save your new settings"
+#~ msgstr ""
+#~ "Din e-postkonfiguration Дr nu klar.\n"
+#~ "Klicka pЕ \"SlutfЖr\" fЖr att spara dina nya instДllningar"
+
+#~ msgid "Sending a message without a subject"
+#~ msgstr "Skickar ett meddelande utan en Дmnesrad"
+
+#~ msgid "Send \"%s\""
+#~ msgstr "Skicka \"%s\""
+
+#~ msgid "Send a message without a subject"
+#~ msgstr "Skicka ett meddelande utan en Дmnesrad"
+
+#~ msgid "Marking messages in folder \"%s\""
+#~ msgstr "MДrker meddelanden i mappen \"%s\""
+
+#~ msgid "Mark messages in folder \"%s\""
+#~ msgstr "MДrk meddelanden i mappen \"%s\""
+
+#~ msgid "Marking message %d of %d"
+#~ msgstr "MДrker meddelande %d av %d"
+
+#~ msgid "Scan folders in \"%s\""
+#~ msgstr "GenomsЖk mappar i \"%s\""
+
+#~ msgid "Creating \"%s\""
+#~ msgstr "Skapar \"%s\""
+
+#~ msgid "Create \"%s\""
+#~ msgstr "Skapa \"%s\""
+
+#~ msgid "Exception while reporting result to shell component listener."
+#~ msgstr "Undantag vid rapportering av resultat till skalkomponentslyssnaren."
+
+#~ msgid "Saving messages from folder \"%s\""
+#~ msgstr "Sparar meddelanden frЕn mappen \"%s\""
+
+#~ msgid "Save messages from folder \"%s\""
+#~ msgstr "Spara meddelanden frЕn mappen \"%s\""
+
+#~ msgid "Rebuilding message view"
+#~ msgstr "Bygger om meddelandevyn"
+
+#~ msgid "Rebuild message view"
+#~ msgstr "Bygg om meddelandevyn"
+
 #~ msgid "External Directories"
 #~ msgstr "Externa kataloger"
 
@@ -6768,9 +7242,6 @@ msgstr "Grupp %i"
 #~ msgid "To-Do item that is overdue:"
 #~ msgstr "Att-gЖra-objekt som skulle ha utfЖrts:"
 
-#~ msgid "Reminder of your appointment at "
-#~ msgstr "PЕminnelse om ditt mЖte den "
-
 #~ msgid "Expunging \"%s\""
 #~ msgstr "TЖmmer \"%s\""
 
@@ -6858,9 +7329,6 @@ msgstr "Grupp %i"
 #~ msgid "Year:"
 #~ msgstr "еr:"
 
-#~ msgid "Go to date"
-#~ msgstr "GЕ till datum"
-
 #~ msgid ""
 #~ "Please select the date you want to go to.\n"
 #~ "When you click on a day, you will be taken\n"
@@ -6870,54 +7338,18 @@ msgstr "Grupp %i"
 #~ "NДr du klickar pЕ en dag kommer du att tas\n"
 #~ "till det datumet."
 
-#~ msgid "Go to today"
-#~ msgstr "GЕ till idag"
-
 #~ msgid "_Mail Configuration"
 #~ msgstr "_E-postkonfiguration"
 
 #~ msgid "_Save Calendar As"
 #~ msgstr "_Spara kalendern som"
 
-#~ msgid "january"
-#~ msgstr "januari"
-
-#~ msgid "february"
-#~ msgstr "februari"
-
-#~ msgid "march"
-#~ msgstr "mars"
-
-#~ msgid "april"
-#~ msgstr "april"
-
 #~ msgid "may"
 #~ msgstr "maj"
 
-#~ msgid "june"
-#~ msgstr "juni"
-
-#~ msgid "july"
-#~ msgstr "juli"
-
-#~ msgid "august"
-#~ msgstr "augusti"
-
-#~ msgid "september"
-#~ msgstr "september"
-
 #~ msgid "sept"
 #~ msgstr "sept"
 
-#~ msgid "october"
-#~ msgstr "oktober"
-
-#~ msgid "november"
-#~ msgstr "november"
-
-#~ msgid "december"
-#~ msgstr "december"
-
 #~ msgid "sunday"
 #~ msgstr "sЖndag"
 
@@ -7087,9 +7519,6 @@ msgstr "Grupp %i"
 #~ msgid "Flagged"
 #~ msgstr "Flaggad"
 
-#~ msgid "Cannot initialize Evolution's mail summary component."
-#~ msgstr "Kan inte initiera Evolutions komponent fЖr e-postsammanfattning."
-
 #~ msgid "Cannot initialize Evolution's mail storage hash."
 #~ msgstr "Kan inte initiera Evolutions hashfunktion fЖr e-postlagring."
 
@@ -7105,15 +7534,6 @@ msgstr "Grupp %i"
 #~ msgid "matches regex"
 #~ msgstr "matchar reguljДra uttrycket"
 
-#~ msgid "Account Information"
-#~ msgstr "Kontoinformation"
-
-#~ msgid "Account Management"
-#~ msgstr "Kontohantering"
-
-#~ msgid "Accounts"
-#~ msgstr "Konton"
-
 #~ msgid "Add Optional Fields..."
 #~ msgstr "LДgg till valfria fДlt..."
 
@@ -7123,51 +7543,12 @@ msgstr "Grupp %i"
 #~ msgid "Browse..."
 #~ msgstr "BlДddra..."
 
-#~ msgid "Congratulations, your mail configuration is complete."
-#~ msgstr "Gratulerar, din e-postkonfiguration Дr fДrdig."
-
-#~ msgid "Default"
-#~ msgstr "Standard"
-
-#~ msgid "Done"
-#~ msgstr "Klar"
-
 #~ msgid "Edit Mail Configuration Settings"
 #~ msgstr "Redigera e-postkonfigurationsinstДllningar"
 
-#~ msgid "Email Address:"
-#~ msgstr "E-postadress:"
-
-#~ msgid "Evolution Mail Configuration"
-#~ msgstr "Evolution e-postkonfiguration"
-
-#~ msgid "Full Name:"
-#~ msgstr "FullstДndigt namn:"
-
-#~ msgid "IMAP"
-#~ msgstr "IMAP"
-
-#~ msgid "Mail"
-#~ msgstr "E-post"
-
-#~ msgid "Mail Configuration Druid"
-#~ msgstr "E-postkonfigurationsguide"
-
-#~ msgid "Make this my default account"
-#~ msgstr "GЖr detta till mitt standardkonto"
-
-#~ msgid "News"
-#~ msgstr "Diskussionsgrupper"
-
-#~ msgid "Optional"
-#~ msgstr "Valfri"
-
 #~ msgid "Optional Information"
 #~ msgstr "Valfri information"
 
-#~ msgid "Password:"
-#~ msgstr "LЖsenord:"
-
 #~ msgid ""
 #~ "Please enter information about your incoming mail server below. If you don't "
 #~ "know what"
@@ -7192,36 +7573,12 @@ msgstr "Grupp %i"
 #~ msgid "Preferred type: "
 #~ msgstr "Typ som fЖredras: "
 
-#~ msgid "Receiving Email"
-#~ msgstr "Tar emot e-post"
-
 #~ msgid "Receiving Mail"
 #~ msgstr "Tar emot e-post"
 
-#~ msgid "Reply-to:"
-#~ msgstr "Svara-till:"
-
-#~ msgid "Required"
-#~ msgstr "KrДvs"
-
-#~ msgid "SMTP"
-#~ msgstr "SMTP"
-
-#~ msgid "SMTP server requires authentication"
-#~ msgstr "SMTP-servern krДver autentisering"
-
-#~ msgid "Sending Email"
-#~ msgstr "Skickar e-post"
-
 #~ msgid "Sending Mail"
 #~ msgstr "Skickar e-post"
 
-#~ msgid "Server Configuration"
-#~ msgstr "Serverkonfiguration"
-
-#~ msgid "Server Type: "
-#~ msgstr "Servertyp: "
-
 #~ msgid ""
 #~ "You are almost done with the mail configuration process. The identity, "
 #~ "incoming"
@@ -7351,9 +7708,6 @@ msgstr "Grupp %i"
 #~ msgid "View message sources from \"%s\""
 #~ msgstr "Visa meddelandekДllor frЕn \"%s\""
 
-#~ msgid "Mailbox summary"
-#~ msgstr "BrevlЕdesammanfattning"
-
 #~ msgid "Threading message list"
 #~ msgstr "TrЕdar meddelandelista"
 
diff --git a/po/tr.po b/po/tr.po
index 23d8d8299e..ad17aaad18 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -2,10 +2,11 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Fatih Demir <kabalak@gmx.net>, 2000.
 #
+#: camel/providers/smtp/camel-smtp-transport.c:287
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.3.1\n"
-"POT-Creation-Date: 2000-12-13 16:26-0600\n"
+"POT-Creation-Date: 2001-01-06 00:11+0100\n"
 "PO-Revision-Date: 2000-08-05 10:53+0200\n"
 "Last-Translator: Fatih Demir <kabalak@gmx.net>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -246,10 +247,10 @@ msgstr ""
 #: addressbook/backend/ebook/load-pine-addressbook.c:17
 #: addressbook/backend/ebook/test-client-list.c:18
 #: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:991
+#: addressbook/conduit/address-conduit.c:1083
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1136
-#: calendar/conduits/todo/todo-conduit.c:945 calendar/gui/main.c:54
+#: calendar/conduits/calendar/calendar-conduit.c:1151
+#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo'yu baЧlatamadЩm"
 
@@ -368,54 +369,37 @@ msgid ""
 "pilot list from the gnome-pilot daemon"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:197
+#: addressbook/conduit/address-conduit.c:195
 msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:210
+#: addressbook/conduit/address-conduit.c:208
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:583
-#: calendar/conduits/calendar/calendar-conduit.c:715
-#: calendar/conduits/todo/todo-conduit.c:523
+#: addressbook/conduit/address-conduit.c:646
+#: calendar/conduits/calendar/calendar-conduit.c:730
+#: calendar/conduits/todo/todo-conduit.c:545
 msgid "Could not start wombat server"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:584
-#: calendar/conduits/calendar/calendar-conduit.c:716
-#: calendar/conduits/todo/todo-conduit.c:524
+#: addressbook/conduit/address-conduit.c:647
+#: calendar/conduits/calendar/calendar-conduit.c:731
+#: calendar/conduits/todo/todo-conduit.c:546
 #, fuzzy
 msgid "Could not start wombat"
 msgstr "Bonobo'yu baЧlatamadЩm"
 
-#: addressbook/conduit/address-conduit.c:616
-#: addressbook/conduit/address-conduit.c:619
+#: addressbook/conduit/address-conduit.c:679
+#: addressbook/conduit/address-conduit.c:682
 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 "tЭrler"
-
-#: addressbook/contact-editor/categories-strings.h:8
-msgid "Item(s) belong to these categories:"
-msgstr "Bu tЭrlere ait olan birimler :"
-
-#: addressbook/contact-editor/categories-strings.h:9
-msgid "Available Categories:"
-msgstr "Varolan tЭrler :"
-
-#.
-#. * 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
 #, fuzzy
 msgid "Delete Contact?"
 msgstr "TanЩПЩ sil"
@@ -430,7 +414,7 @@ msgid "_Add"
 msgstr "_Ekle"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:48
+#: ui/evolution-event-editor.xml.h:108 ui/evolution-mail.xml.h:53
 msgid "_Delete"
 msgstr "_Sil"
 
@@ -444,12 +428,13 @@ msgid "New phone type"
 msgstr "Yeni telefon tipi"
 
 #.
-#. * 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 "Ekle"
 
@@ -490,7 +475,7 @@ msgid "_Mobile"
 msgstr "_Cep"
 
 #: 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 "Ilk ePosta adresi"
 
@@ -507,7 +492,7 @@ msgid "C_ontacts..."
 msgstr "_TanЩk ..."
 
 #: 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 "TЭ_rler ..."
 
@@ -525,7 +510,8 @@ msgid "_Address..."
 msgstr "Adres"
 
 #: 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 "Genel"
 
@@ -570,148 +556,148 @@ msgid "No_tes:"
 msgstr "_Notlar :"
 
 #: 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 "Ince konular"
 
-#: addressbook/contact-editor/e-contact-editor.c:1266
+#: addressbook/contact-editor/e-contact-editor.c:1274
 msgid "Assistant"
 msgstr "YardЩmcЩ"
 
-#: 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 "Meslek"
 
-#: addressbook/contact-editor/e-contact-editor.c:1268
+#: addressbook/contact-editor/e-contact-editor.c:1276
 msgid "Business 2"
 msgstr "2.nci Meslek"
 
-#: addressbook/contact-editor/e-contact-editor.c:1269
+#: addressbook/contact-editor/e-contact-editor.c:1277
 msgid "Business Fax"
 msgstr "Mesleki Faks"
 
-#: addressbook/contact-editor/e-contact-editor.c:1270
+#: addressbook/contact-editor/e-contact-editor.c:1278
 msgid "Callback"
 msgstr "Geri arama"
 
-#: addressbook/contact-editor/e-contact-editor.c:1271
+#: addressbook/contact-editor/e-contact-editor.c:1279
 msgid "Car"
 msgstr "Araba"
 
-#: addressbook/contact-editor/e-contact-editor.c:1272
+#: addressbook/contact-editor/e-contact-editor.c:1280
 msgid "Company"
 msgstr "чirket"
 
-#: 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 "Ev"
 
-#: addressbook/contact-editor/e-contact-editor.c:1274
+#: addressbook/contact-editor/e-contact-editor.c:1282
 msgid "Home 2"
 msgstr "2.nci ev"
 
-#: addressbook/contact-editor/e-contact-editor.c:1275
+#: addressbook/contact-editor/e-contact-editor.c:1283
 msgid "Home Fax"
 msgstr "Ev faksЩ"
 
-#: 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 "Cep"
 
-#: 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 "BaЧka"
 
-#: addressbook/contact-editor/e-contact-editor.c:1279
+#: addressbook/contact-editor/e-contact-editor.c:1287
 msgid "Other Fax"
 msgstr "BaЧka faks"
 
-#: addressbook/contact-editor/e-contact-editor.c:1280
+#: addressbook/contact-editor/e-contact-editor.c:1288
 msgid "Pager"
 msgstr "Haberleyici"
 
-#: addressbook/contact-editor/e-contact-editor.c:1281
+#: addressbook/contact-editor/e-contact-editor.c:1289
 msgid "Primary"
 msgstr "Ilk"
 
-#: addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/contact-editor/e-contact-editor.c:1290
 msgid "Radio"
 msgstr "Radyo"
 
-#: addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/contact-editor/e-contact-editor.c:1291
 msgid "Telex"
 msgstr "Teleks"
 
-#: 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.nci ePosta adresi"
 
-#: addressbook/contact-editor/e-contact-editor.c:1330
+#: addressbook/contact-editor/e-contact-editor.c:1338
 msgid "Email 3"
 msgstr "3.ncЭ ePosta adresi"
 
 #.
-#. * 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
 #, fuzzy
 msgid "Address _2:"
 msgstr "Adres :"
 
-#: 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
 #, fuzzy
 msgid "Check Address"
 msgstr "Adres"
 
-#: 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
 #, fuzzy
 msgid "Finland"
 msgstr "Bul"
 
-#: 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
 #, fuzzy
 msgid "_Address:"
 msgstr "Adres :"
 
-#: po/tmp/fulladdr.glade.h:13
+#: addressbook/contact-editor/fulladdr.glade.h:13
 #, fuzzy
 msgid "_City:"
 msgstr "_DoПum gЭnЭ :"
 
-#: 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 ""
 
@@ -725,10 +711,13 @@ msgid "Check Full Name"
 msgstr "Tam ismi kontrol et"
 
 #: addressbook/contact-editor/fullname-strings.h:8
+#, fuzzy
 msgid ""
 "\n"
 "Mr.\n"
 "Mrs.\n"
+"Ms.\n"
+"Miss\n"
 "Dr.\n"
 msgstr ""
 "\n"
@@ -736,7 +725,7 @@ msgstr ""
 "Bn.\n"
 "Dr.\n"
 
-#: addressbook/contact-editor/fullname-strings.h:13
+#: addressbook/contact-editor/fullname-strings.h:15
 msgid ""
 "\n"
 "Sr.\n"
@@ -754,44 +743,49 @@ msgstr ""
 "III.\n"
 "Esq.\n"
 
-#: addressbook/contact-editor/fullname-strings.h:21
+#: addressbook/contact-editor/fullname-strings.h:23
 msgid "_First:"
 msgstr "_Ad :"
 
-#: addressbook/contact-editor/fullname-strings.h:22
+#: addressbook/contact-editor/fullname-strings.h:24
 msgid "_Title:"
 msgstr "э_styazЩ :"
 
-#: addressbook/contact-editor/fullname-strings.h:23
+#: addressbook/contact-editor/fullname-strings.h:25
 msgid "_Middle:"
 msgstr "_Orta eki :"
 
-#: addressbook/contact-editor/fullname-strings.h:24
+#: addressbook/contact-editor/fullname-strings.h:26
 msgid "_Last:"
 msgstr "_Soyad :"
 
-#: addressbook/contact-editor/fullname-strings.h:25
+#: addressbook/contact-editor/fullname-strings.h:27
 msgid "_Suffix:"
 msgstr "S_onek :"
 
-#: addressbook/gui/component/addressbook.c:263
+#: addressbook/gui/component/addressbook.c:231
 msgid "As _Minicards"
 msgstr "_Ufak kartlar olarak"
 
 #.
-#. * 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:269
-#: po/tmp/evolution-addressbook.xml.h:6
+#: addressbook/gui/component/addressbook.c:237
+#: ui/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr "гi_zgiye olarak"
 
-#: addressbook/gui/component/addressbook.c:386
+#: addressbook/gui/component/addressbook.c:374
+#, c-format
+msgid "Enter password for %s"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:402
 msgid "Unable to open addressbook"
 msgstr "Adres defterini aГamadЩm"
 
-#: addressbook/gui/component/addressbook.c:391
+#: addressbook/gui/component/addressbook.c:407
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
@@ -811,83 +805,214 @@ msgstr ""
 "eriЧmeye uПraЧtЩn. LDAp'i kullanmak istiyorsan, OpenLDAP'i\n"
 "yЭkleyip, Evolution'u yeniden denetleyip yeniden yЭklemek zorundasЩn.\n"
 
-#: addressbook/gui/component/addressbook.c:501 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:503 mail/folder-browser.c:138
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 #, fuzzy
 msgid "Advanced..."
 msgstr "Ekle ..."
 
-#: addressbook/gui/component/addressbook.c:533
+#: addressbook/gui/component/addressbook.c:560
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:534
+#: addressbook/gui/component/addressbook.c:561
 msgid "Name contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:535
+#: addressbook/gui/component/addressbook.c:562
 #, fuzzy
 msgid "Email contains"
 msgstr "_Ufak ikonalar"
 
-#: addressbook/gui/component/addressbook.c:621
+#: addressbook/gui/component/addressbook.c:648
 msgid "The URI that the Folder Browser will display"
 msgstr "Dizin Gezginini gЖsterecek olan URI"
 
-#: addressbook/gui/component/e-ldap-storage.c:88
-msgid "External Directories"
+#: addressbook/gui/component/addressbook-storage.c:95
+#, fuzzy
+msgid "Other Contacts"
+msgstr "_Yeni tanЩk"
+
+#: addressbook/gui/component/addressbook-config.c:139
+#, fuzzy
+msgid "LDAP Server"
+msgstr "LDAP Sunucusu :"
+
+#: addressbook/gui/component/addressbook-config.c:141
+#, fuzzy
+msgid "File"
+msgstr "_Dosya"
+
+#: addressbook/gui/component/addressbook-config.c:144
+#, fuzzy
+msgid "Unknown addressbook type"
+msgstr "Adres defterini aГamadЩm"
+
+#: addressbook/gui/component/addressbook-config.c:153
+msgid "None (anonymous mode)"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/e-msg-composer-attachment.glade.h:7
-#: po/tmp/ldap-server-dialog.glade.h:6
-msgid "Description:"
-msgstr "AnlatЩm :"
+#: 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
+#, fuzzy
+msgid "Password"
+msgstr "_ParolalarЩ unut"
 
-#: po/tmp/ldap-server-dialog.glade.h:7
-msgid "LDAP Server:"
-msgstr "LDAP Sunucusu :"
+#: addressbook/gui/component/addressbook-config.c:157
+msgid "SASL"
+msgstr ""
 
-#: po/tmp/ldap-server-dialog.glade.h:8
-msgid "Name:"
-msgstr "Isim :"
+#: addressbook/gui/component/addressbook-config.c:160
+#, fuzzy
+msgid "Unknown auth type"
+msgstr "Bilinmeyen hata"
+
+#: addressbook/gui/component/addressbook-config.c:169
+#, fuzzy
+msgid "Base"
+msgstr "YapЩЧtЩr"
+
+#: addressbook/gui/component/addressbook-config.c:171
+msgid "One"
+msgstr ""
 
-#: po/tmp/ldap-server-dialog.glade.h:9
-msgid "Port Number:"
-msgstr "KapЩ no. :"
+#: addressbook/gui/component/addressbook-config.c:173
+#, fuzzy
+msgid "Subtree"
+msgstr "Kaynak ekle"
+
+#: 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 ""
 
-#: po/tmp/ldap-server-dialog.glade.h:10
+#: addressbook/gui/component/addressbook-config.c:360
+#: mail/mail-config-druid.glade.h:34
+#, fuzzy
+msgid "Host:"
+msgstr "Saat"
+
+#: addressbook/gui/component/addressbook-config.c:361
+#, fuzzy
+msgid "Port:"
+msgstr "жnem :"
+
+#: addressbook/gui/component/addressbook-config.c:364
 msgid "Root DN:"
 msgstr "KЖk DN :"
 
+#: addressbook/gui/component/addressbook-config.c:384
+#, fuzzy
+msgid "Search Scope:"
+msgstr "Ara ..."
+
+#: addressbook/gui/component/addressbook-config.c:438
+#: mail/mail-config-druid.glade.h:14 mail/mail-config-gui.c:943
+msgid "Authentication:"
+msgstr "DoПrulama :"
+
+#: addressbook/gui/component/addressbook-config.c:455
+#: mail/mail-config-druid.glade.h:52 mail/mail-config-gui.c:934
+msgid "Path:"
+msgstr "Dizin :"
+
+#: addressbook/gui/component/addressbook-config.c:460
+#, fuzzy
+msgid "Create path if it doesn't exist."
+msgstr "BЖyle bir dosya yok ."
+
+#: addressbook/gui/component/addressbook-config.c:593
+#, fuzzy
+msgid "Edit Addressbook"
+msgstr "Adres defterini aГamadЩm"
+
+#: addressbook/gui/component/addressbook-config.c:595
+#, fuzzy
+msgid "Add Addressbook"
+msgstr "Adres defterini aГamadЩm"
+
+#: 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
+msgid "Name:"
+msgstr "Isim :"
+
+#: addressbook/gui/component/addressbook-config.c:617
+#: composer/e-msg-composer-attachment.glade.h:7
+msgid "Description:"
+msgstr "AnlatЩm :"
+
+#: addressbook/gui/component/addressbook-config.glade.h:7
+#, fuzzy
+msgid "Addressbook Sources"
+msgstr "Kaynak ekle"
+
+#: 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 "Sil"
+
+#: 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
+#, fuzzy
+msgid "Edit"
+msgstr "_DeПiЧtir"
+
+#: addressbook/gui/component/addressbook-config.glade.h:10
+msgid "Name"
+msgstr "Isim"
+
+#: 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
 #, fuzzy
 msgid "Find..."
 msgstr "Bul"
 
-#: po/tmp/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:7
 #, fuzzy
 msgid "Message Recipients"
 msgstr "AlЩcЩlar listesi :"
 
-#: po/tmp/select-names.glade.h:8
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 #, fuzzy
 msgid "Select Names"
 msgstr "Stil adЩ :"
 
-#: po/tmp/select-names.glade.h:9
-msgid "Select name from List:"
-msgstr ""
+#: addressbook/gui/component/select-names/select-names.glade.h:9
+#, fuzzy
+msgid "Select name from:"
+msgstr "Stil adЩ :"
 
 #: addressbook/gui/search/e-addressbook-search-dialog.c:147
 #: mail/mail-search-dialogue.c:104
@@ -896,119 +1021,119 @@ msgid "Search"
 msgstr "Ara ..."
 
 #.
-#. * 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 "a"
 
-#: po/tmp/alphabet.glade.h:8
+#: addressbook/gui/widgets/alphabet.glade.h:8
 msgid "b"
 msgstr "b"
 
-#: po/tmp/alphabet.glade.h:9
+#: addressbook/gui/widgets/alphabet.glade.h:9
 msgid "c"
 msgstr "c"
 
-#: po/tmp/alphabet.glade.h:10
+#: addressbook/gui/widgets/alphabet.glade.h:10
 msgid "d"
 msgstr "d"
 
-#: po/tmp/alphabet.glade.h:11
+#: addressbook/gui/widgets/alphabet.glade.h:11
 msgid "e"
 msgstr "e"
 
-#: po/tmp/alphabet.glade.h:12
+#: addressbook/gui/widgets/alphabet.glade.h:12
 msgid "f"
 msgstr "f"
 
-#: po/tmp/alphabet.glade.h:13
+#: addressbook/gui/widgets/alphabet.glade.h:13
 msgid "g"
 msgstr "g"
 
-#: calendar/cal-util/timeutil.c:100 po/tmp/alphabet.glade.h:14
+#: addressbook/gui/widgets/alphabet.glade.h:14
 msgid "h"
 msgstr "h"
 
-#: po/tmp/alphabet.glade.h:15
+#: addressbook/gui/widgets/alphabet.glade.h:15
 msgid "i"
 msgstr "i"
 
-#: po/tmp/alphabet.glade.h:16
+#: addressbook/gui/widgets/alphabet.glade.h:16
 msgid "j"
 msgstr "j"
 
-#: po/tmp/alphabet.glade.h:17
+#: addressbook/gui/widgets/alphabet.glade.h:17
 msgid "k"
 msgstr "k"
 
-#: po/tmp/alphabet.glade.h:18
+#: addressbook/gui/widgets/alphabet.glade.h:18
 msgid "l"
 msgstr "l"
 
-#: po/tmp/alphabet.glade.h:19
+#: addressbook/gui/widgets/alphabet.glade.h:19
 msgid "m"
 msgstr "m"
 
-#: po/tmp/alphabet.glade.h:20
+#: addressbook/gui/widgets/alphabet.glade.h:20
 msgid "n"
 msgstr "n"
 
-#: po/tmp/alphabet.glade.h:21
+#: addressbook/gui/widgets/alphabet.glade.h:21
 msgid "o"
 msgstr "o"
 
-#: po/tmp/alphabet.glade.h:22
+#: addressbook/gui/widgets/alphabet.glade.h:22
 msgid "p"
 msgstr "p"
 
-#: po/tmp/alphabet.glade.h:23
+#: addressbook/gui/widgets/alphabet.glade.h:23
 msgid "q"
 msgstr "q"
 
-#: po/tmp/alphabet.glade.h:24
+#: addressbook/gui/widgets/alphabet.glade.h:24
 msgid "r"
 msgstr "r"
 
-#: po/tmp/alphabet.glade.h:25
+#: addressbook/gui/widgets/alphabet.glade.h:25
 msgid "s"
 msgstr "s"
 
-#: po/tmp/alphabet.glade.h:26
+#: addressbook/gui/widgets/alphabet.glade.h:26
 msgid "t"
 msgstr "t"
 
-#: po/tmp/alphabet.glade.h:27
+#: addressbook/gui/widgets/alphabet.glade.h:27
 msgid "u"
 msgstr "u"
 
-#: po/tmp/alphabet.glade.h:28
+#: addressbook/gui/widgets/alphabet.glade.h:28
 msgid "v"
 msgstr "v"
 
-#: po/tmp/alphabet.glade.h:29
+#: addressbook/gui/widgets/alphabet.glade.h:29
 msgid "w"
 msgstr "w"
 
-#: po/tmp/alphabet.glade.h:30
+#: addressbook/gui/widgets/alphabet.glade.h:30
 msgid "x"
 msgstr "x"
 
-#: po/tmp/alphabet.glade.h:31
+#: addressbook/gui/widgets/alphabet.glade.h:31
 msgid "y"
 msgstr "y"
 
-#: po/tmp/alphabet.glade.h:32
+#: addressbook/gui/widgets/alphabet.glade.h:32
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:417
-#: addressbook/gui/widgets/e-minicard.c:338
+#: addressbook/gui/widgets/e-addressbook-view.c:451
+#: addressbook/gui/widgets/e-minicard.c:374
 msgid "Save as VCard"
 msgstr "VCard olarak kaydet"
 
@@ -1032,189 +1157,178 @@ msgstr ""
 "Buraya Гift-tЩklayarak bir tanЩk birimini yarat."
 
 #.
-#. * 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 "10 punto Tahoma"
 
-#: po/tmp/e-contact-print.glade.h:7
+#: addressbook/printing/e-contact-print.glade.h:7
 msgid "8 pt. Tahoma"
 msgstr "8 punto Tahoma"
 
-#: po/tmp/e-contact-print.glade.h:8
+#: addressbook/printing/e-contact-print.glade.h:8
 msgid "Blank forms at end:"
 msgstr "Sonda boЧ formlar olsun :"
 
-#: po/tmp/e-contact-print.glade.h:9
+#: addressbook/printing/e-contact-print.glade.h:9
 msgid "Body"
 msgstr "IГerik"
 
-#: po/tmp/e-contact-print.glade.h:10
+#: addressbook/printing/e-contact-print.glade.h:10
 msgid "Bottom:"
 msgstr "Alt :"
 
-#: po/tmp/e-contact-print.glade.h:11
+#: addressbook/printing/e-contact-print.glade.h:11
 msgid "Dimensions:"
 msgstr "Ebatlar :"
 
-#: po/tmp/e-contact-print.glade.h:12
+#: addressbook/printing/e-contact-print.glade.h:12
 msgid "Font..."
 msgstr "YazЩ tipi ..."
 
-#: po/tmp/e-contact-print.glade.h:13
+#: addressbook/printing/e-contact-print.glade.h:13
 msgid "Fonts"
 msgstr "YazЩ tipleri"
 
-#: po/tmp/e-contact-print.glade.h:14
+#: addressbook/printing/e-contact-print.glade.h:14
 msgid "Footer:"
 msgstr "Son :"
 
-#: po/tmp/e-contact-print.glade.h:15
+#: addressbook/printing/e-contact-print.glade.h:15
 msgid "Format"
 msgstr "чekil"
 
-#: po/tmp/e-contact-print.glade.h:16
+#: addressbook/printing/e-contact-print.glade.h:16
 msgid "Header"
 msgstr "BaЧlЩk"
 
-#: po/tmp/e-contact-print.glade.h:17
+#: addressbook/printing/e-contact-print.glade.h:17
 msgid "Header/Footer"
 msgstr "BaЧlЩk/son"
 
-#: po/tmp/e-contact-print.glade.h:18
+#: addressbook/printing/e-contact-print.glade.h:18
 msgid "Headings"
 msgstr "BaЧlЩklar"
 
-#: po/tmp/e-contact-print.glade.h:19
+#: addressbook/printing/e-contact-print.glade.h:19
 msgid "Headings for each letter"
 msgstr "Her bir mektup iГin ЭstyazЩ"
 
-#: po/tmp/e-contact-print.glade.h:20
+#: addressbook/printing/e-contact-print.glade.h:20
 msgid "Height:"
 msgstr "YЭkseklik :"
 
-#: po/tmp/e-contact-print.glade.h:21
+#: addressbook/printing/e-contact-print.glade.h:21
 msgid "Immediately follow each other"
 msgstr "PeЧpeЧe"
 
-#: po/tmp/e-contact-print.glade.h:22
+#: addressbook/printing/e-contact-print.glade.h:22
 msgid "Include:"
 msgstr "IГer :"
 
-#: po/tmp/e-contact-print.glade.h:23
+#: addressbook/printing/e-contact-print.glade.h:23
 msgid "Landscape"
 msgstr "Manzara"
 
-#: po/tmp/e-contact-print.glade.h:24
+#: addressbook/printing/e-contact-print.glade.h:24
 msgid "Left:"
 msgstr "Sol :"
 
-#: po/tmp/e-contact-print.glade.h:25
+#: addressbook/printing/e-contact-print.glade.h:25
 msgid "Letter tabs on side"
 msgstr "Mektup tab'lerinin tarafa koy"
 
-#: po/tmp/e-contact-print.glade.h:26
+#: addressbook/printing/e-contact-print.glade.h:26
 msgid "Margins"
 msgstr "Kenarlar"
 
-#: po/tmp/e-contact-print.glade.h:27
+#: addressbook/printing/e-contact-print.glade.h:27
 msgid "Number of columns:"
 msgstr "SЭtunlarЩn sayЩsЩ :"
 
-#: po/tmp/e-contact-print.glade.h:28
+#: addressbook/printing/e-contact-print.glade.h:28
 msgid "Options"
 msgstr "SeГenekler"
 
-#: po/tmp/e-contact-print.glade.h:29
+#: addressbook/printing/e-contact-print.glade.h:29
 msgid "Orientation"
 msgstr "Taraflama"
 
-#: po/tmp/e-contact-print.glade.h:30
+#: addressbook/printing/e-contact-print.glade.h:30
 msgid "Page"
 msgstr "Sayfa"
 
-#: po/tmp/e-contact-print.glade.h:31
+#: addressbook/printing/e-contact-print.glade.h:31
 msgid "Page Setup:"
 msgstr "Sayfa _kurulumu :"
 
-#: po/tmp/e-contact-print.glade.h:32
+#: addressbook/printing/e-contact-print.glade.h:32
 msgid "Paper"
 msgstr "KaПЩt"
 
-#: po/tmp/e-contact-print.glade.h:33
+#: addressbook/printing/e-contact-print.glade.h:33
 msgid "Paper source:"
 msgstr "KaПЩt kaynaПЩ :"
 
-#: po/tmp/e-contact-print.glade.h:34
+#: addressbook/printing/e-contact-print.glade.h:34
 msgid "Portrait"
 msgstr "Portre"
 
-#: po/tmp/e-contact-print.glade.h:35
+#: addressbook/printing/e-contact-print.glade.h:35
 msgid "Preview:"
 msgstr "жnizleme :"
 
-#: po/tmp/e-contact-print.glade.h:36
+#: addressbook/printing/e-contact-print.glade.h:36
 msgid "Print using gray shading"
 msgstr "Gri gЖlgelemeyi kullanarak yazdЩrt"
 
-#: po/tmp/e-contact-print.glade.h:37
+#: addressbook/printing/e-contact-print.glade.h:37
 msgid "Reverse on even pages"
 msgstr "Ikili sayfalarЩ ters Гevir"
 
-#: po/tmp/e-contact-print.glade.h:38
+#: addressbook/printing/e-contact-print.glade.h:38
 msgid "Right:"
 msgstr "SaП :"
 
-#: po/tmp/e-contact-print.glade.h:39
+#: addressbook/printing/e-contact-print.glade.h:39
 msgid "Sections:"
 msgstr "BЖlЭmler :"
 
-#: po/tmp/e-contact-print.glade.h:40
+#: addressbook/printing/e-contact-print.glade.h:40
 msgid "Shading"
 msgstr "GЖlgeleme"
 
-#: po/tmp/e-contact-print.glade.h:41
+#: addressbook/printing/e-contact-print.glade.h:41
 msgid "Size:"
 msgstr "Boyut :"
 
-#: po/tmp/e-contact-print.glade.h:42
+#: addressbook/printing/e-contact-print.glade.h:42
 msgid "Start on a new page"
 msgstr "Yeni bir sayfayla baЧla"
 
-#: po/tmp/e-contact-print.glade.h:43
+#: addressbook/printing/e-contact-print.glade.h:43
 msgid "Style name:"
 msgstr "Stil adЩ :"
 
-#: po/tmp/e-contact-print.glade.h:44
+#: addressbook/printing/e-contact-print.glade.h:44
 msgid "Top:"
 msgstr "эst :"
 
-#: 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 "Tip :"
 
-#: po/tmp/e-contact-print.glade.h:46
+#: addressbook/printing/e-contact-print.glade.h:46
 msgid "Width:"
 msgstr "En :"
 
-#: po/tmp/e-contact-print.glade.h:47
+#: addressbook/printing/e-contact-print.glade.h:47
 msgid "label26"
 msgstr "yafta26"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:550
-#: calendar/gui/e-week-view.c:288 calendar/gui/print.c:605
-msgid "am"
-msgstr " Ж.Ж."
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:553
-#: calendar/gui/e-week-view.c:291 calendar/gui/print.c:604
-msgid "pm"
-msgstr " Ж.s"
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 #, fuzzy
 msgid "Evolution Calendar Conduit"
@@ -1224,13 +1338,13 @@ msgstr "Evolution ГubuПu _kЩsayolu"
 msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:671
-#: calendar/conduits/todo/todo-conduit.c:479
+#: calendar/conduits/calendar/calendar-conduit.c:686
+#: calendar/conduits/todo/todo-conduit.c:501
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:770
-#: calendar/conduits/calendar/calendar-conduit.c:773
+#: calendar/conduits/calendar/calendar-conduit.c:785
+#: calendar/conduits/calendar/calendar-conduit.c:788
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
@@ -1243,129 +1357,167 @@ msgstr "Evolution ГubuПu _kЩsayolu"
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:578
-#: calendar/conduits/todo/todo-conduit.c:581
+#: calendar/conduits/todo/todo-conduit.c:600
+#: calendar/conduits/todo/todo-conduit.c:603
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:60
-msgid "Outline:"
-msgstr "DЩЧlЩm :"
+#.
+#. * 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 "BaЧlЩklar :"
+#: 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:"
-msgstr "BoЧ gЭnler :"
+#.
+#. * 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 "T_oplantЩlar :"
+#: calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in.h:7
+#, fuzzy
+msgid "Calendar Server"
+msgstr "Yeni _takvim"
 
-#: calendar/gui/calendar-commands.c:64
-msgid "Highlighted day:"
-msgstr "жne getirilmiЧ gЭn :"
+#.
+#. * 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 "GЭn sayЩsЩ :"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#, fuzzy
+msgid "Evolution calendar iTip/iMip viewer"
+msgstr "Evolution ГubuПu _kЩsayolu"
 
-#: calendar/gui/calendar-commands.c:66
-msgid "Current day's number:"
-msgstr "чu anki gЭnЭn numarasЩ :"
+#: 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:"
-msgstr "Daha geГmemiЧ \"YapЩlacak\" birimi :"
+#: 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:"
-msgstr "BugЭn geГecek olan \"YapЩlacak\" birimi :"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
+#, fuzzy
+msgid "Factory for the Evolution calendar component."
+msgstr "Evolution'in ePosta parГasЩnЩ baЧlatamadЩm ."
 
-#: calendar/gui/calendar-commands.c:69
-msgid "To-Do item that is overdue:"
-msgstr "ZamanЩ geГmiЧ \"YapЩlacak\" birimi :"
+#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+msgid "Factory for the calendar iTip view control"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:354
+#: 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 "ToplantЩ anЩtlayЩcЩsЩ :"
+
+#: calendar/gui/alarm-notify.c:876 calendar/gui/dialogs/alarm-notify.glade.h:8
+msgid "Snooze"
+msgstr "Ikaz et"
+
+#. 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 "Oldu"
+
+#: calendar/gui/calendar-commands.c:229
 msgid "File not found"
 msgstr "Dosya bulunamadЩ"
 
-#: calendar/gui/calendar-commands.c:378
+#: calendar/gui/calendar-commands.c:253
 msgid "Open calendar"
 msgstr "Takvimi aГ"
 
-#: calendar/gui/calendar-commands.c:417
+#: calendar/gui/calendar-commands.c:295
 msgid "Save calendar"
 msgstr "Takvimi kaydet"
 
+#: 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:282
+#: 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:2498
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 #, fuzzy
 msgid "%a %m/%d/%Y"
 msgstr "%a %b %d %Y"
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:286 calendar/gui/calendar-model.c:736
+#: 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:290 calendar/gui/calendar-model.c:739
+#: 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:344 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:347 po/tmp/task-editor-dialog.glade.h:20
+#: calendar/gui/calendar-model.c:349
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
 #, fuzzy
 msgid "Private"
 msgstr "YazdЩr"
 
-#: calendar/gui/calendar-model.c:350 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:353 calendar/gui/calendar-model.c:521
+#: calendar/gui/calendar-model.c:355 calendar/gui/calendar-model.c:523
 #, fuzzy
 msgid "Unknown"
 msgstr "Bilinmeyen hata"
 
-#: calendar/gui/calendar-model.c:441
+#: calendar/gui/calendar-model.c:443
 msgid "N"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:441
+#: calendar/gui/calendar-model.c:443
 #, fuzzy
 msgid "S"
 msgstr "Paz."
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:445
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:445
 #, fuzzy
 msgid "W"
 msgstr "гarЧ."
 
-#: calendar/gui/calendar-model.c:515
+#: calendar/gui/calendar-model.c:517
 #, fuzzy
 msgid "Transparent"
 msgstr "ePosta transferi"
 
-#: calendar/gui/calendar-model.c:518
+#: calendar/gui/calendar-model.c:520
 msgid "Opaque"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:744
+#: calendar/gui/calendar-model.c:746
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1374,49 +1526,72 @@ msgid ""
 msgstr ""
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:845 calendar/gui/calendar-model.c:893
+#: 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:1274 widgets/misc/e-dateedit.c:1455
+#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
 msgstr ""
 
 #. 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:863
+#: calendar/gui/calendar-model.c:865
 msgid "%I:%M:%S %p%n"
 msgstr ""
 
 #. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:866
+#: calendar/gui/calendar-model.c:868
 msgid "%H:%M:%S%n"
 msgstr ""
 
 #. 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:870
+#: calendar/gui/calendar-model.c:872
 msgid "%I:%M %p%n"
 msgstr ""
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:873
+#: calendar/gui/calendar-model.c:875
 msgid "%H:%M%n"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:993
+#: calendar/gui/calendar-model.c:995
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1033
+#: calendar/gui/calendar-model.c:1035
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1073
+#: calendar/gui/calendar-model.c:1075
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr ""
 
+#: calendar/gui/calendar-summary.c:81
+#, fuzzy
+msgid "%A, %e %B %Y"
+msgstr "%a %b %d %Y"
+
+#: calendar/gui/calendar-summary.c:224
+#, fuzzy
+msgid "<b>Error loading calendar</b>"
+msgstr "`%s' dosyasЩnЩ yЭklerken hata oldu"
+
+#: 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 "Takvimi yazdЩr"
+
 #: calendar/gui/control-factory.c:125
 msgid "The URI that the calendar will display"
 msgstr "Takvimin gЖsterecek olduПu URI"
@@ -1435,391 +1610,428 @@ msgid "No summary available."
 msgstr "Toplama yok"
 
 #.
-#. * 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 "Kapat"
 
-#: po/tmp/alarm-notify.glade.h:7
+#: calendar/gui/dialogs/alarm-notify.glade.h:7
 msgid "Edit appointment"
 msgstr "ToplantЩyЩ deПiЧtir"
 
-#: calendar/gui/gnome-cal.c:1466 po/tmp/alarm-notify.glade.h:8
-msgid "Snooze"
-msgstr "Ikaz et"
-
-#: po/tmp/alarm-notify.glade.h:9
+#: calendar/gui/dialogs/alarm-notify.glade.h:9
 msgid "Snooze time (minutes)"
 msgstr "Ikaz zamanЩ ( dakika )"
 
 #.
-#. * 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
 #, fuzzy
 msgid "05 minutes"
 msgstr "dakika"
 
-#: po/tmp/cal-prefs-dialog.glade.h:7
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 #, fuzzy
 msgid "10 minutes"
 msgstr "dakika"
 
-#: po/tmp/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 #, fuzzy
 msgid "12 hour (am/pm)"
 msgstr "12 saat (Ж.Ж./Ж.s.)"
 
-#: po/tmp/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 #, fuzzy
 msgid "15 minutes"
 msgstr "dakika"
 
-#: po/tmp/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 #, fuzzy
 msgid "24 hour"
 msgstr "24 saat"
 
-#: po/tmp/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 #, fuzzy
 msgid "30 minutes"
 msgstr "dakika"
 
-#: po/tmp/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #, fuzzy
 msgid "60 minutes"
 msgstr "dakika"
 
-#: po/tmp/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 #, fuzzy
 msgid "Alarms timeout after"
 msgstr "Sedai ikazlarЩ kapatma zamanЩ"
 
-#: po/tmp/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 #, fuzzy
 msgid "Audio Alarms"
 msgstr "Ikazlar"
 
-#: 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
 #, fuzzy
 msgid "Calendar"
 msgstr "Yeni _takvim"
 
-#: po/tmp/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #, fuzzy
 msgid "Calendar Preferences"
 msgstr "Ayarlar"
 
-#: po/tmp/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 msgid "Colors"
 msgstr "Renkler"
 
-#: 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 "Ince ayarlar"
 
-#: po/tmp/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 #, fuzzy
 msgid "Display options"
 msgstr "\"YapЩlacak\" stil seГenekleri :"
 
-#: po/tmp/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 msgid "Due Date"
 msgstr "Tarihe gЖre"
 
-#: po/tmp/cal-prefs-dialog.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #, fuzzy
 msgid "Enable snoozing for"
 msgstr "IkazlamayЩ aГ :"
 
-#: 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 "Cum"
 
-#: 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
 #, fuzzy
 msgid "Friday"
 msgstr "cuma"
 
-#: po/tmp/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 #, fuzzy
 msgid "Highlight"
 msgstr "жne getirilmiЧ gЭn :"
 
-#: po/tmp/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #, fuzzy
 msgid "Items Due Today"
 msgstr "BugЭn zamanЩ dolacak birimleri \"gЖzЖnЭne\" ser"
 
-#: 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 "P.t"
 
-#: 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 "Pazartesi"
 
-#: po/tmp/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #, fuzzy
 msgid "Overdue Items"
 msgstr "ZamanЩ geГmiЧ birimleri \"gЖzЖnЭne\" ser"
 
-#: 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 "жnem"
 
-#: po/tmp/cal-prefs-dialog.glade.h:40
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
 msgid "Remind me of all appointments"
 msgstr "ToplantЩ anЩtlayЩcЩsЩ :"
 
-#: 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 "C.t"
 
-#: 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
 #, fuzzy
 msgid "Saturday"
 msgstr "cumartesi"
 
-#: 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
 #, fuzzy
 msgid "Show appointment end times"
 msgstr "ToplantЩ - %s"
 
-#: po/tmp/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #, fuzzy
 msgid "Show week numbers"
 msgstr "2 haftayЩ Жster"
 
-#: 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 "Paz"
 
-#: 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 "Pazar"
 
-#: 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 "Per"
 
-#: 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
 #, fuzzy
 msgid "Thursday"
 msgstr "perЧembe"
 
-#: po/tmp/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "Time Until Due"
 msgstr "GeГmesine kalan zaman"
 
-#: po/tmp/cal-prefs-dialog.glade.h:54
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 #, fuzzy
 msgid "Time divisions:"
 msgstr "%02i dakika bЖlmeleri"
 
-#: po/tmp/cal-prefs-dialog.glade.h:55
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 #, fuzzy
 msgid "Time format:"
 msgstr "Zaman Чekli"
 
-#: 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 "Sal"
 
-#: 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
 #, fuzzy
 msgid "Tuesday"
 msgstr "salЩ"
 
-#: po/tmp/cal-prefs-dialog.glade.h:58
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 #, fuzzy
 msgid "Visual Alarms"
 msgstr "Ikazlar"
 
-#: 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 "гar"
 
-#: 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
 #, fuzzy
 msgid "Wednesday"
 msgstr "ГarЧamba"
 
-#: po/tmp/cal-prefs-dialog.glade.h:61
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 #, fuzzy
 msgid "Work week"
 msgstr "Hafta"
 
-#: 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
 #, fuzzy
 msgid "seconds."
 msgstr " saniye"
 
+#: calendar/gui/dialogs/delete-comp.c:62
+#, c-format
+msgid "Are you sure you want to delete the appointment `%s'?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:65
+msgid "Are you sure you want to delete this untitled appointment?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:71
+#, c-format
+msgid "Are you sure you want to delete the task `%s'?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:74
+msgid "Are you sure you want to delete this untitled task?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:80
+#, c-format
+msgid "Are you sure you want to delete the journal entry `%s'?"
+msgstr ""
+
+#: calendar/gui/dialogs/delete-comp.c:83
+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
 #, fuzzy
 msgid "Cancelled"
 msgstr "Iptal"
 
-#: po/tmp/task-editor-dialog.glade.h:10
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
 #, fuzzy
 msgid "Completed"
 msgstr "Yaz"
 
-#: po/tmp/task-editor-dialog.glade.h:12
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
 #, fuzzy
 msgid "Date Completed:"
 msgstr "Birim anlatЩmЩ :"
 
-#: po/tmp/task-editor-dialog.glade.h:14
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
 #, fuzzy
 msgid "High"
 msgstr "YЭkseklik :"
 
-#: 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
 #, fuzzy
 msgid "Low"
 msgstr "Чimdi"
 
 #. 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
-#: widgets/misc/e-dateedit.c:422 widgets/misc/e-dateedit.c:1331
-#: widgets/misc/e-dateedit.c:1446
+#: 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 "Yok"
 
-#: po/tmp/task-editor-dialog.glade.h:18
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
 #, fuzzy
 msgid "Normal"
 msgstr "чekil"
 
-#: 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
 #, fuzzy
 msgid "S_ummary"
 msgstr "Toplama"
 
-#: 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
 #, fuzzy
 msgid "Task"
 msgstr "GЖrev - %s"
 
-#: po/tmp/task-editor-dialog.glade.h:25
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
 msgid "URL:"
 msgstr ""
 
-#: po/tmp/task-editor-dialog.glade.h:26
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
 #, fuzzy
 msgid "_Contacts..."
 msgstr "_TanЩk ..."
 
-#: po/tmp/task-editor-dialog.glade.h:27
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
 #, fuzzy
 msgid "_Due Date:"
 msgstr "Bu tarihe kadar :"
 
-#: po/tmp/task-editor-dialog.glade.h:28
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
 #, fuzzy
 msgid "_Priority:"
 msgstr "жnem :"
 
-#: po/tmp/task-editor-dialog.glade.h:29
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
 #, fuzzy
 msgid "_Status:"
 msgstr "_ZЩpzak :"
 
-#: po/tmp/task-editor-dialog.glade.h:30
+#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
 msgid "task-editor-dialog"
 msgstr ""
 
@@ -1827,26 +2039,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 "Toplama yok"
 
-#: 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 "ToplantЩ - %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 "GЖrev - %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 "GЭnlЭk birimi - %s"
 
-#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3277
+#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3250
 msgid "Do you want to save changes?"
 msgstr ""
 
@@ -1867,14 +2079,6 @@ msgstr ""
 msgid "Mark the task complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:342 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:479 mail/mail-view.c:165
-#: 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 "Sil"
-
 #: calendar/gui/e-calendar-table.c:343
 #, fuzzy
 msgid "Delete the task"
@@ -1887,7 +2091,7 @@ msgstr "%02i dakika bЖlmeleri"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1208
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1211
 #: calendar/gui/e-week-view-main-item.c:325
 #, fuzzy
 msgid "%A %d %B"
@@ -1895,7 +2099,7 @@ msgstr "%a %b %d %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1222
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1225
 #: calendar/gui/e-week-view-main-item.c:334
 #, fuzzy
 msgid "%a %d %b"
@@ -1903,36 +2107,48 @@ msgstr "%a %b %d %Y"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1235
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1238
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2941 calendar/gui/e-day-view.c:2948
-#: calendar/gui/e-day-view.c:2957 calendar/gui/e-week-view.c:3165
-#: calendar/gui/e-week-view.c:3172 calendar/gui/e-week-view.c:3181
+#. 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: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:609
+msgid "pm"
+msgstr " Ж.s"
+
+#: calendar/gui/e-day-view.c:2948 calendar/gui/e-day-view.c:2955
+#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3169
+#: calendar/gui/e-week-view.c:3176 calendar/gui/e-week-view.c:3185
 msgid "New appointment..."
 msgstr "Yeni toplantЩ ..."
 
-#: calendar/gui/e-day-view.c:2945 calendar/gui/e-day-view.c:2952
-#: calendar/gui/e-week-view.c:3169 calendar/gui/e-week-view.c:3176
+#: calendar/gui/e-day-view.c:2952 calendar/gui/e-day-view.c:2959
+#: calendar/gui/e-week-view.c:3173 calendar/gui/e-week-view.c:3180
 msgid "Edit this appointment..."
 msgstr "Bu toplantЩyЩ deПiЧtir .."
 
-#: calendar/gui/e-day-view.c:2946 calendar/gui/e-week-view.c:3170
-#: po/tmp/evolution-event-editor.xml.h:20
+#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3174
+#: ui/evolution-event-editor.xml.h:20
 msgid "Delete this appointment"
 msgstr "Bu toplantЩyЩ sil"
 
-#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3177
+#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3181
 msgid "Make this appointment movable"
 msgstr "Bu toplantЩyЩ taЧЩnabilir yap"
 
-#: calendar/gui/e-day-view.c:2954 calendar/gui/e-week-view.c:3178
+#: calendar/gui/e-day-view.c:2961 calendar/gui/e-week-view.c:3182
 msgid "Delete this occurrence"
 msgstr "Bu oluЧumu sil"
 
-#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3179
+#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3183
 msgid "Delete all occurrences"
 msgstr "Yekin oluЧumlarЩ sil"
 
@@ -1944,689 +2160,517 @@ msgid "%d %B"
 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/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
 #, fuzzy
 msgid "Appointment Basics"
 msgstr "T_oplantЩlar :"
 
-#: 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
 #, fuzzy
 msgid "Custom recurrence"
 msgstr "GeliЧ kurallarЩnЩ ayarla"
 
-#: po/tmp/event-editor-dialog.glade.h:11
+#: calendar/gui/event-editor-dialog.glade.h:11
 msgid "Days"
 msgstr "GЭn"
 
-#: 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
 #, fuzzy
 msgid "Exceptions"
 msgstr "SeГenekler"
 
-#: po/tmp/event-editor-dialog.glade.h:16
+#: calendar/gui/event-editor-dialog.glade.h:16
 msgid "Hours"
 msgstr "Saat"
 
-#: po/tmp/event-editor-dialog.glade.h:17
+#: calendar/gui/event-editor-dialog.glade.h:17
 #, fuzzy
 msgid "Mail _to:"
 msgstr "ePosta kaynaПЩ"
 
-#: po/tmp/event-editor-dialog.glade.h:18
+#: calendar/gui/event-editor-dialog.glade.h:18
 msgid "Minutes"
 msgstr "Dakika"
 
-#: po/tmp/event-editor-dialog.glade.h:19
+#: calendar/gui/event-editor-dialog.glade.h:19
 #, fuzzy
 msgid "Modify"
 msgstr "Pazartesi"
 
-#: po/tmp/event-editor-dialog.glade.h:20
+#: calendar/gui/event-editor-dialog.glade.h:20
 #, fuzzy
 msgid "No recurrence"
 msgstr "GeliЧ kurallarЩnЩ ayarla"
 
-#: po/tmp/event-editor-dialog.glade.h:21
+#: calendar/gui/event-editor-dialog.glade.h:21
 #, fuzzy
 msgid "Preview"
 msgstr "жnizleme :"
 
-#: po/tmp/event-editor-dialog.glade.h:22
+#: calendar/gui/event-editor-dialog.glade.h:22
 #, fuzzy
 msgid "Pri_vate"
 msgstr "GeГerli yap"
 
-#: 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
 #, fuzzy
 msgid "Recurrence"
 msgstr "ABY : GeliЧler ..."
 
-#: po/tmp/event-editor-dialog.glade.h:25
+#: calendar/gui/event-editor-dialog.glade.h:25
 #, fuzzy
 msgid "Recurrence Rule"
 msgstr "GeliЧ kurallarЩnЩ ayarla"
 
-#: 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
 #, fuzzy
 msgid "Simple recurrence"
 msgstr "GeliЧ kurallarЩnЩ ayarla"
 
-#: po/tmp/event-editor-dialog.glade.h:28
+#: calendar/gui/event-editor-dialog.glade.h:28
 #, fuzzy
 msgid "Su_mmary:"
 msgstr "Toplama :"
 
-#: po/tmp/event-editor-dialog.glade.h:29
+#: calendar/gui/event-editor-dialog.glade.h:29
 #, fuzzy
 msgid "Time"
 msgstr "Kalan zaman"
 
-#: po/tmp/event-editor-dialog.glade.h:30
+#: calendar/gui/event-editor-dialog.glade.h:30
 #, fuzzy
 msgid "_Audio"
 msgstr "_Ekle"
 
-#: 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
 #, fuzzy
 msgid "_Display"
 msgstr "Zaman gЖsterimi"
 
-#: po/tmp/event-editor-dialog.glade.h:33
+#: calendar/gui/event-editor-dialog.glade.h:33
 #, fuzzy
 msgid "_End time:"
 msgstr "ToplantЩ bitiЧ saati :"
 
-#: po/tmp/event-editor-dialog.glade.h:34
+#: calendar/gui/event-editor-dialog.glade.h:34
 #, fuzzy
 msgid "_Mail"
 msgstr "_Cep"
 
-#: 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
 #, fuzzy
 msgid "_Start time:"
 msgstr "ToplantЩ baЧlama saati :"
 
-#: 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
 #, fuzzy
 msgid "day(s)"
 msgstr "gЭn"
 
-#: 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
 #, fuzzy
 msgid "for"
 msgstr "dЭrdЭncЭ"
 
-#: 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
 #, fuzzy
 msgid "label21"
 msgstr "yafta1"
 
-#: po/tmp/event-editor-dialog.glade.h:44
+#: calendar/gui/event-editor-dialog.glade.h:44
 #, fuzzy
 msgid "month(s)"
 msgstr "ay"
 
-#: 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
 #, fuzzy
 msgid "week(s)"
 msgstr "hafta"
 
-#: po/tmp/event-editor-dialog.glade.h:47
+#: calendar/gui/event-editor-dialog.glade.h:47
 #, fuzzy
 msgid "year(s)"
 msgstr "yЩl"
 
-#: calendar/gui/event-editor.c:329
+#: calendar/gui/event-editor.c:325
 msgid "Edit Appointment"
 msgstr "ToplantЩyЩ deПiЧtir"
 
-#: calendar/gui/event-editor.c:407
+#: calendar/gui/event-editor.c:403
 #, fuzzy
 msgid "on"
 msgstr "P.t"
 
-#: calendar/gui/event-editor.c:432 calendar/gui/getdate.y:424
-#: filter/filter-datespec.c:65
+#: calendar/gui/event-editor.c:428 filter/filter-datespec.c:65
 msgid "day"
 msgstr "gЭn"
 
-#: calendar/gui/event-editor.c:559
+#: calendar/gui/event-editor.c:555
 #, fuzzy
 msgid "on the"
 msgstr "Ay"
 
-#: calendar/gui/event-editor.c:566
+#: calendar/gui/event-editor.c:562
 #, fuzzy
 msgid "th"
 msgstr "4.ncЭ"
 
-#: calendar/gui/event-editor.c:722
+#: calendar/gui/event-editor.c:716
 #, fuzzy
 msgid "occurrences"
 msgstr "Yekin oluЧumlarЩ sil"
 
-#: calendar/gui/event-editor.c:839
+#: calendar/gui/event-editor.c:833
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor.c:3079 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 "%a %b %d %Y"
 
-#: calendar/gui/getdate.y:391
-msgid "january"
-msgstr "ocak"
+#: calendar/gui/gnome-cal.c:676
+#, c-format
+msgid "Could not load the calendar in `%s'"
+msgstr ""
 
-#: calendar/gui/getdate.y:392
-msgid "february"
-msgstr "Чubat"
+#: calendar/gui/gnome-cal.c:687
+#, fuzzy, c-format
+msgid "Could not create a calendar in `%s'"
+msgstr "Diyalog kutusunu yaratamadЩm ."
 
-#: calendar/gui/getdate.y:393
-msgid "march"
-msgstr "mart"
+#: calendar/gui/gnome-cal.c:698
+#, c-format
+msgid "The method required to load `%s' is not supported"
+msgstr ""
 
-#: calendar/gui/getdate.y:394
-msgid "april"
+#.
+#. * 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
+#, fuzzy
+msgid "April"
 msgstr "nisan"
 
-#: calendar/gui/getdate.y:395
-msgid "may"
-msgstr "mayЩs"
-
-#: calendar/gui/getdate.y:396
-msgid "june"
-msgstr "haziran"
-
-#: calendar/gui/getdate.y:397
-msgid "july"
-msgstr "temmuz"
-
-#: calendar/gui/getdate.y:398
-msgid "august"
+#: calendar/gui/goto-dialog.glade.h:7
+#, fuzzy
+msgid "August"
 msgstr "aПustos"
 
-#: calendar/gui/getdate.y:399
-msgid "september"
-msgstr "eylЭl"
-
-#: calendar/gui/getdate.y:400
-msgid "sept"
-msgstr "eylЭl"
-
-#: calendar/gui/getdate.y:401
-msgid "october"
-msgstr "ekim"
-
-#: calendar/gui/getdate.y:402
-msgid "november"
-msgstr "kasЩm"
-
-#: calendar/gui/getdate.y:403
-msgid "december"
+#: calendar/gui/goto-dialog.glade.h:8
+#, fuzzy
+msgid "December"
 msgstr "aralЩk"
 
-#: calendar/gui/getdate.y:404
-msgid "sunday"
-msgstr "pazar"
-
-#: calendar/gui/getdate.y:405
-msgid "monday"
-msgstr "pazartesi"
-
-#: calendar/gui/getdate.y:406
-msgid "tuesday"
-msgstr "salЩ"
-
-#: calendar/gui/getdate.y:407
-msgid "tues"
-msgstr "salЩ"
-
-#: calendar/gui/getdate.y:408
-msgid "wednesday"
-msgstr "ГarЧamba"
-
-#: calendar/gui/getdate.y:409
-msgid "wednes"
-msgstr "ГЧb."
-
-#: calendar/gui/getdate.y:410
-msgid "thursday"
-msgstr "perЧembe"
-
-#: calendar/gui/getdate.y:411
-msgid "thur"
-msgstr "pЧb."
-
-#: calendar/gui/getdate.y:412
-msgid "thurs"
-msgstr "perЧ."
-
-#: calendar/gui/getdate.y:413
-msgid "friday"
-msgstr "cuma"
-
-#: calendar/gui/getdate.y:414
-msgid "saturday"
-msgstr "cumartesi"
-
-#: calendar/gui/getdate.y:420 filter/filter-datespec.c:62
-msgid "year"
-msgstr "yЩl"
-
-#: calendar/gui/getdate.y:421 filter/filter-datespec.c:63
-msgid "month"
-msgstr "ay"
-
-#: calendar/gui/getdate.y:422
-msgid "fortnight"
-msgstr "geceleyin"
-
-#: calendar/gui/getdate.y:423 filter/filter-datespec.c:64
-msgid "week"
-msgstr "hafta"
-
-#: calendar/gui/getdate.y:425 filter/filter-datespec.c:66
-msgid "hour"
-msgstr "saat"
-
-#: calendar/gui/getdate.y:426 filter/filter-datespec.c:67
-msgid "minute"
-msgstr "dakika"
-
-#: calendar/gui/getdate.y:427
-msgid "min"
-msgstr "dak."
-
-#: calendar/gui/getdate.y:428 filter/filter-datespec.c:68
-msgid "second"
-msgstr "saniye"
-
-#: calendar/gui/getdate.y:429
-msgid "sec"
-msgstr "san."
-
-#: calendar/gui/getdate.y:435
-msgid "tomorrow"
-msgstr "yarЩn"
-
-#: calendar/gui/getdate.y:436
-msgid "yesterday"
-msgstr "dЭn"
-
-#: calendar/gui/getdate.y:437
-msgid "today"
-msgstr "bugЭn"
-
-#: calendar/gui/getdate.y:438 filter/filter-datespec.c:533
-#: filter/filter-datespec.c:693
-msgid "now"
-msgstr "Чimdi"
-
-#: calendar/gui/getdate.y:439
-msgid "last"
-msgstr "son"
-
-#: calendar/gui/getdate.y:440
-msgid "this"
-msgstr "bu"
-
-#: calendar/gui/getdate.y:441
-msgid "next"
-msgstr "ileri"
-
-#: calendar/gui/getdate.y:442
-msgid "first"
-msgstr "ilk"
-
-#. { N_("second"),		tUNUMBER,	2 },
-#: calendar/gui/getdate.y:444
-msgid "third"
-msgstr "ЭГЭncЭ"
-
-#: calendar/gui/getdate.y:445
-msgid "fourth"
-msgstr "dЭrdЭncЭ"
-
-#: calendar/gui/getdate.y:446
-msgid "fifth"
-msgstr "beЧinci"
-
-#: calendar/gui/getdate.y:447
-msgid "sixth"
-msgstr "altЩncЩ"
-
-#: calendar/gui/getdate.y:448
-msgid "seventh"
-msgstr "yedinci"
-
-#: calendar/gui/getdate.y:449
-msgid "eighth"
-msgstr "sekizinci"
-
-#: calendar/gui/getdate.y:450
-msgid "ninth"
-msgstr "dokuzuncu"
-
-#: calendar/gui/getdate.y:451
-msgid "tenth"
-msgstr "onuncu"
-
-#: calendar/gui/getdate.y:452
-msgid "eleventh"
-msgstr "onbirinci"
+#: calendar/gui/goto-dialog.glade.h:9
+#, fuzzy
+msgid "February"
+msgstr "Чubat"
 
-#: calendar/gui/getdate.y:453
-msgid "twelfth"
-msgstr "onikinci"
+#: calendar/gui/goto-dialog.glade.h:10
+#, fuzzy
+msgid "Go To Date"
+msgstr "Tarihe git"
 
-#: calendar/gui/getdate.y:454
-msgid "ago"
-msgstr "Жnce"
+#: calendar/gui/goto-dialog.glade.h:11
+#, fuzzy
+msgid "Go To Today"
+msgstr "BugЭne git"
 
-#: calendar/gui/gnome-cal.c:718 calendar/gui/gnome-cal.c:1474
-#: calendar/gui/gnome-cal.c:1530
-msgid "Reminder of your appointment at "
-msgstr "ToplantЩ anЩtlayЩcЩsЩ :"
+#: calendar/gui/goto-dialog.glade.h:12
+#, fuzzy
+msgid "January"
+msgstr "ocak"
 
-#: calendar/gui/gnome-cal.c:1152
-#, c-format
-msgid "Could not load the calendar in `%s'"
-msgstr ""
+#: calendar/gui/goto-dialog.glade.h:13
+#, fuzzy
+msgid "July"
+msgstr "temmuz"
 
-#: calendar/gui/gnome-cal.c:1163
-#, fuzzy, c-format
-msgid "Could not create a calendar in `%s'"
-msgstr "Diyalog kutusunu yaratamadЩm ."
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "June"
+msgstr "haziran"
 
-#: calendar/gui/gnome-cal.c:1174
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr ""
+#: calendar/gui/goto-dialog.glade.h:15
+#, fuzzy
+msgid "March"
+msgstr "mart"
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1479 calendar/gui/gnome-cal.c:1534
-#: mail/mail-search-dialogue.c:104
-msgid "Ok"
-msgstr "Oldu"
+#: calendar/gui/goto-dialog.glade.h:16
+#, fuzzy
+msgid "May"
+msgstr "Pazartesi"
 
-#: calendar/gui/goto.c:82
-msgid "Year:"
-msgstr "YЩl :"
+#: calendar/gui/goto-dialog.glade.h:17
+#, fuzzy
+msgid "November"
+msgstr "kasЩm"
 
-#: calendar/gui/goto.c:270
-msgid "Go to date"
-msgstr "Tarihe git"
+#: calendar/gui/goto-dialog.glade.h:18
+#, fuzzy
+msgid "October"
+msgstr "ekim"
 
-#. Instructions
-#: calendar/gui/goto.c:281
-msgid ""
-"Please select the date you want to go to.\n"
-"When you click on a day, you will be taken\n"
-"to that date."
-msgstr ""
-"Gitmek istediПin tarihi belirt.\n"
-"Bir gЭne tЩkladЩПЩn zaman, o tarihe\n"
-"gideceksin."
+#: calendar/gui/goto-dialog.glade.h:19
+#, fuzzy
+msgid "September"
+msgstr "eylЭl"
 
-#: calendar/gui/goto.c:318
-msgid "Go to today"
-msgstr "BugЭne git"
+#: calendar/gui/main.c:49
+#, fuzzy
+msgid "Could not initialize GNOME"
+msgstr "Bonobo'yu baЧlatamadЩm"
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "1st"
 msgstr "1.nci"
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "2nd"
 msgstr "2.nci"
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "3rd"
 msgstr "3.ncЭ"
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "4th"
 msgstr "4.ncЭ"
 
-#: calendar/gui/print.c:288
+#: calendar/gui/print.c:293
 msgid "5th"
 msgstr "5.nci"
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "6th"
 msgstr "6.ncЩ"
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "7th"
 msgstr "7.nci"
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "8th"
 msgstr "8.nci"
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "9th"
 msgstr "8.ncu"
 
-#: calendar/gui/print.c:289
+#: calendar/gui/print.c:294
 msgid "10th"
 msgstr "10.ncu"
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "11th"
 msgstr "11.nci"
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "12th"
 msgstr "12.nci"
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "13th"
 msgstr "13.ncЭ"
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "14th"
 msgstr "14.ncЭ"
 
-#: calendar/gui/print.c:290
+#: calendar/gui/print.c:295
 msgid "15th"
 msgstr "15.nci"
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "16th"
 msgstr "16.ncЩ"
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "17th"
 msgstr "17.nci"
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "18th"
 msgstr "18.nci"
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "19th"
 msgstr "19.ncu"
 
-#: calendar/gui/print.c:291
+#: calendar/gui/print.c:296
 msgid "20th"
 msgstr "20.nci"
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "21st"
 msgstr "21.nci"
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "22nd"
 msgstr "22.nci"
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "23rd"
 msgstr "23.ncЭ"
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "24th"
 msgstr "24.ncЭ"
 
-#: calendar/gui/print.c:292
+#: calendar/gui/print.c:297
 msgid "25th"
 msgstr "25.nci"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "26th"
 msgstr "26.ncЩ"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "27th"
 msgstr "27.nci"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "28th"
 msgstr "28.nci"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "29th"
 msgstr "29.ncu"
 
-#: calendar/gui/print.c:293
+#: calendar/gui/print.c:298
 msgid "30th"
 msgstr "39.ncu"
 
-#: calendar/gui/print.c:294
+#: calendar/gui/print.c:299
 msgid "31st"
 msgstr "31.nci"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Su"
 msgstr "Paz."
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Mo"
 msgstr "P.tesi"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Tu"
 msgstr "SalЩ"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "We"
 msgstr "гarЧ."
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Th"
 msgstr "PerЧ."
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Fr"
 msgstr "Cuma"
 
-#: calendar/gui/print.c:350
+#: calendar/gui/print.c:355
 msgid "Sa"
 msgstr "C.tesi"
 
-#: calendar/gui/print.c:936
+#: calendar/gui/print.c:941
 #, fuzzy
 msgid "Tasks"
 msgstr "GЖrev - %s"
 
 #. Day
-#: calendar/gui/print.c:1066
+#: calendar/gui/print.c:1071
 msgid "Current day (%a %b %d %Y)"
 msgstr "geГerli gЭn ( %a %b %d %Y )"
 
-#: calendar/gui/print.c:1080 calendar/gui/print.c:1084
+#: calendar/gui/print.c:1085 calendar/gui/print.c:1089
 #, fuzzy
 msgid "%a %b %d"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1081
+#: calendar/gui/print.c:1086
 #, fuzzy
 msgid "%a %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1092
+#: calendar/gui/print.c:1097
 #, fuzzy, c-format
 msgid "Current week (%s - %s)"
 msgstr "GeГerli hafta ( %s %s %d - %s %d %d )"
 
 #. Month
-#: calendar/gui/print.c:1100
+#: calendar/gui/print.c:1105
 #, fuzzy
 msgid "Current month (%b %Y)"
 msgstr "GeГerli ay ( %a %Y )"
 
 #. Year
-#: calendar/gui/print.c:1107
+#: calendar/gui/print.c:1112
 msgid "Current year (%Y)"
 msgstr "GeГerli yЩl ( %Y )"
 
-#: calendar/gui/print.c:1144
+#: calendar/gui/print.c:1149
 msgid "Print Calendar"
 msgstr "Takvimi yazdЩr"
 
-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:962
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1001
 msgid "Print Preview"
 msgstr "YazdЩrma Жnizlemesi"
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: calendar/gui/weekday-picker.c:351 widgets/misc/e-calendar-item.c:416
-msgid "MTWTFSS"
-msgstr ""
-
-#: calendar/gui/weekday-picker.c:353 calendar/gui/weekday-picker.c:443
+#: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
 msgid "SMTWTFS"
 msgstr ""
 
@@ -2717,60 +2761,61 @@ msgstr ""
 msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: camel/camel-remote-store.c:182
+#: camel/camel-remote-store.c:191
 #, c-format
 msgid "%s server %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:186
+#: camel/camel-remote-store.c:195
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:227
+#: camel/camel-remote-store.c:243
+#: camel/providers/smtp/camel-smtp-transport.c:162
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:228
+#: camel/camel-remote-store.c:244
 msgid "(unknown host)"
 msgstr ""
 
-#: camel/camel-remote-store.c:452
+#: camel/camel-remote-store.c:483
 msgid "Server disconnected."
 msgstr ""
 
-#: camel/camel-service.c:120
+#: camel/camel-service.c:138
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:129
+#: camel/camel-service.c:147
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:138
+#: camel/camel-service.c:156
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:488
+#: camel/camel-service.c:526
 #, c-format
 msgid "No such host %s."
 msgstr ""
 
-#: camel/camel-service.c:491
+#: camel/camel-service.c:529
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr ""
 
-#: camel/camel-session.c:272
+#: camel/camel-session.c:297
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:360
+#: camel/camel-session.c:388
 #, fuzzy, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2795,51 +2840,51 @@ msgstr ""
 msgid "Port number in URL `%s' is non-numeric"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-auth.c:127
+#: camel/providers/imap/camel-imap-auth.c:133
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
 "%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-auth.c:198
+#: camel/providers/imap/camel-imap-auth.c:205
 msgid "Bad authentication response from server."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:216
+#: camel/providers/imap/camel-imap-command.c:231
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:224
+#: camel/providers/imap/camel-imap-command.c:239
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:240 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "Bilinmeyen hata"
 
-#: camel/providers/imap/camel-imap-command.c:271
+#: camel/providers/imap/camel-imap-command.c:286
 msgid "Server response ended too soon."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:407
+#: camel/providers/imap/camel-imap-command.c:422
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:443
+#: camel/providers/imap/camel-imap-command.c:458
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:216
+#: 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:586
+#: camel/providers/imap/camel-imap-folder.c:532
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -2851,32 +2896,25 @@ msgstr ""
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:234
-#: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:148
-#, fuzzy
-msgid "Password"
-msgstr "_ParolalarЩ unut"
-
-#: camel/providers/imap/camel-imap-store.c:236
+#: camel/providers/imap/camel-imap-store.c:248
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:245
+#: camel/providers/imap/camel-imap-store.c:257
 msgid "Kerberos 4"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:247
+#: camel/providers/imap/camel-imap-store.c:259
 msgid ""
 "This option will connect to the IMAP server using Kerberos 4 authentication."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:333
+#: camel/providers/imap/camel-imap-store.c:345
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:359
+#: camel/providers/imap/camel-imap-store.c:373
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2884,7 +2922,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:539
+#: camel/providers/imap/camel-imap-store.c:564
 #, fuzzy, c-format
 msgid "Could not create directory %s: %s"
 msgstr ""
@@ -2974,12 +3012,12 @@ msgid "Cannot append message to maildir folder: %s: %s"
 msgstr ""
 
 #: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-maildir-folder.c:204
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-maildir-folder.c:207
+#: camel/providers/local/camel-maildir-folder.c:215
+#: camel/providers/local/camel-mbox-folder.c:317
 #: camel/providers/local/camel-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:189
-#: camel/providers/local/camel-mh-folder.c:197
+#: camel/providers/local/camel-mh-folder.c:192
+#: camel/providers/local/camel-mh-folder.c:200
 #, fuzzy, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -2987,14 +3025,14 @@ msgid ""
 msgstr "Yerel kaydЩ kuramadЩm -- %s"
 
 #: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-mbox-folder.c:317
 #: camel/providers/local/camel-mh-folder.c:183
 #, fuzzy
 msgid "No such message"
 msgstr "Iletiyi gЖnder"
 
-#: camel/providers/local/camel-maildir-folder.c:213
-#: camel/providers/local/camel-mh-folder.c:198
+#: camel/providers/local/camel-maildir-folder.c:216
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "Invalid message contents"
 msgstr ""
 
@@ -3037,19 +3075,19 @@ msgstr ""
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:195
+#: camel/providers/local/camel-mbox-folder.c:201
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:251
+#: camel/providers/local/camel-mbox-folder.c:257
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:327
-#: camel/providers/local/camel-mbox-folder.c:357
-#: camel/providers/local/camel-mbox-folder.c:368
+#: camel/providers/local/camel-mbox-folder.c:333
+#: camel/providers/local/camel-mbox-folder.c:365
+#: camel/providers/local/camel-mbox-folder.c:378
 #, fuzzy, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -3058,11 +3096,11 @@ msgstr ""
 "%s dizinini yaratamadЩm\n"
 " "
 
-#: camel/providers/local/camel-mbox-folder.c:358
+#: camel/providers/local/camel-mbox-folder.c:366
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:369
+#: camel/providers/local/camel-mbox-folder.c:379
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
@@ -3111,58 +3149,58 @@ msgstr ""
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:341
+#: camel/providers/local/camel-mbox-summary.c:343
 #, c-format
 msgid "Cannot summarise folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:475
-#: camel/providers/local/camel-mbox-summary.c:661
+#: camel/providers/local/camel-mbox-summary.c:477
+#: camel/providers/local/camel-mbox-summary.c:668
 #, c-format
 msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:491
+#: camel/providers/local/camel-mbox-summary.c:493
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:512
-#: camel/providers/local/camel-mbox-summary.c:520
-#: camel/providers/local/camel-mbox-summary.c:691
-#: camel/providers/local/camel-mbox-summary.c:699
+#: camel/providers/local/camel-mbox-summary.c:514
+#: camel/providers/local/camel-mbox-summary.c:522
+#: camel/providers/local/camel-mbox-summary.c:701
+#: camel/providers/local/camel-mbox-summary.c:709
 msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:562
+#: camel/providers/local/camel-mbox-summary.c:565
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:579
+#: camel/providers/local/camel-mbox-summary.c:582
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:595
-#: camel/providers/local/camel-mbox-summary.c:748
+#: camel/providers/local/camel-mbox-summary.c:600
+#: camel/providers/local/camel-mbox-summary.c:759
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-summary.c:604
+#: camel/providers/local/camel-mbox-summary.c:609
 #, fuzzy, c-format
 msgid "Could not close temp folder: %s"
 msgstr ""
 "%s dizinini yaratamadЩm\n"
 " "
 
-#: camel/providers/local/camel-mbox-summary.c:615
+#: camel/providers/local/camel-mbox-summary.c:620
 #, fuzzy, c-format
 msgid "Could not rename folder: %s"
 msgstr "Diyalog kutusunu yaratamadЩm ."
 
-#: camel/providers/local/camel-mbox-summary.c:817
+#: camel/providers/local/camel-mbox-summary.c:830
 #, fuzzy, c-format
 msgid "Unknown error: %s"
 msgstr "Bilinmeyen hata"
@@ -3195,7 +3233,7 @@ msgstr ""
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:144
+#: camel/providers/nntp/camel-nntp-folder.c:115
 #, fuzzy, c-format
 msgid "Message %s not found."
 msgstr "Dosya bulunamadЩ"
@@ -3245,16 +3283,16 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:179
+#: camel/providers/pop3/camel-pop3-folder.c:180
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:273
+#: camel/providers/pop3/camel-pop3-folder.c:274
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:287
+#: camel/providers/pop3/camel-pop3-folder.c:288
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr ""
@@ -3292,48 +3330,49 @@ msgstr ""
 msgid "Could not authenticate to KPOP server: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:335
+#: camel/providers/pop3/camel-pop3-store.c:337
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:389
+#: camel/providers/pop3/camel-pop3-store.c:391
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:408
+#: camel/providers/pop3/camel-pop3-store.c:410
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending username: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:411
-#: camel/providers/pop3/camel-pop3-store.c:448
+#: camel/providers/pop3/camel-pop3-store.c:413
+#: camel/providers/pop3/camel-pop3-store.c:450
 #, fuzzy
 msgid "(Unknown)"
 msgstr "Bilinmeyen hata"
 
-#: camel/providers/pop3/camel-pop3-store.c:438
+#: camel/providers/pop3/camel-pop3-store.c:440
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:446
+#: camel/providers/pop3/camel-pop3-store.c:448
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:555
+#: camel/providers/pop3/camel-pop3-store.c:557
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
+#: mail/mail-config-druid.glade.h:63
 #, fuzzy
 msgid "Sendmail"
 msgstr "GЖnder"
@@ -3383,8 +3422,133 @@ msgstr "ePosta'yЩ al"
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
+#: 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
+#, c-format
+msgid "Welcome response error: %s: possibly non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:281
+#, fuzzy
+msgid "No authentication required"
+msgstr "DoПrulama :"
+
+#: camel/providers/smtp/camel-smtp-transport.c:283
+msgid ""
+"This option will connect to the SMTP server without using any kind of "
+"authentication. This should be fine for connecting to most SMTP servers."
+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 ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:294
+msgid ""
+"This option will connect to the SMTP server using CRAM-MD5 authentication."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:332
+#, c-format
+msgid "SMTP server %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:334
+#, c-format
+msgid "SMTP mail delivery via %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:359
+msgid "Cannot send message: sender address not defined."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:366
+msgid "Cannot send message: sender address not valid."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:380
+msgid "Cannot send message: no recipients defined."
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:474
+#, c-format
+msgid "HELO request timed out: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:490
+#, c-format
+msgid "HELO response error: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:529
+#, c-format
+msgid "MAIL FROM request timed out: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:545
+#, c-format
+msgid "MAIL FROM response error: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:570
+#, c-format
+msgid "RCPT TO request timed out: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
+#, c-format
+msgid "RCPT TO response error: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:617
+#, c-format
+msgid "DATA request timed out: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:633
+#, c-format
+msgid "DATA response error: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:648
+#: camel/providers/smtp/camel-smtp-transport.c:666
+#, c-format
+msgid "DATA send timed out: message termination: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:682
+#, c-format
+msgid "DATA response error: message termination: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:706
+#, c-format
+msgid "RSET request timed out: %s"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:722
+#, fuzzy, c-format
+msgid "RSET response error: %s"
+msgstr "Bilinmeyen hata"
+
+#: camel/providers/smtp/camel-smtp-transport.c:745
+#, c-format
+msgid "QUIT request timed out: %s: non-fatal"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#, c-format
+msgid "QUIT response error: %s: non-fatal"
 msgstr ""
 
 #: camel/providers/vee/camel-vee-provider.c:30
@@ -3421,85 +3585,85 @@ msgid "%.1fG"
 msgstr "%.1f milyar bayt"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:144
+#: composer/e-msg-composer-attachment-bar.c:324 mail/mail-display.c:155
 #, fuzzy
 msgid "attachment"
 msgstr "Eklem ekle"
 
-#: composer/e-msg-composer-attachment-bar.c:417
-#: 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 "Bir dosya ekle"
 
-#: composer/e-msg-composer-attachment-bar.c:464 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 "Sil"
 
-#: composer/e-msg-composer-attachment-bar.c:465
+#: composer/e-msg-composer-attachment-bar.c:461
 msgid "Remove selected items from the attachment list"
 msgstr "SeГili birimleri eklemler listesinden sil"
 
-#: composer/e-msg-composer-attachment-bar.c:496
+#: composer/e-msg-composer-attachment-bar.c:492
 msgid "Add attachment..."
 msgstr "Eklem ekle ..."
 
-#: composer/e-msg-composer-attachment-bar.c:497
+#: composer/e-msg-composer-attachment-bar.c:493
 msgid "Attach a file to the message"
 msgstr "Iletiyi bir dosya ekle"
 
 #.
-#. * 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 "Eklem Жzellikleri"
 
-#: po/tmp/e-msg-composer-attachment.glade.h:8
+#: composer/e-msg-composer-attachment.glade.h:8
 msgid "File name:"
 msgstr "Dosya adЩ :"
 
-#: po/tmp/e-msg-composer-attachment.glade.h:9
+#: composer/e-msg-composer-attachment.glade.h:9
 msgid "MIME type:"
 msgstr "MIME tЭrЭ :"
 
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:290
-#: mail/mail-format.c:621
+#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:303
+#: mail/mail-format.c:626
 #, fuzzy
 msgid "From:"
 msgstr "GЖnderen"
 
-#: composer/e-msg-composer-hdrs.c:238
+#: composer/e-msg-composer-hdrs.c:247
 msgid "Click here for the address book"
 msgstr "Adres defteri iГin buraya tЩkla"
 
-#: composer/e-msg-composer-hdrs.c:291
+#: composer/e-msg-composer-hdrs.c:304
 #, fuzzy
 msgid "Enter the identity you wish to send this message from"
 msgstr "Iletinin gЖnderildiПi kiЧiler"
 
-#: composer/e-msg-composer-hdrs.c:295 mail/mail-format.c:625
+#: composer/e-msg-composer-hdrs.c:308 mail/mail-format.c:630
 msgid "To:"
 msgstr "Gn:"
 
-#: composer/e-msg-composer-hdrs.c:296
+#: composer/e-msg-composer-hdrs.c:309
 msgid "Enter the recipients of the message"
 msgstr "Iletinin gЖnderildiПi kiЧiler"
 
-#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:627
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:632
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:301
+#: composer/e-msg-composer-hdrs.c:314
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Iletinin kopyasЩnЩn gЖnderilecek olunduПu adresler"
 
-#: composer/e-msg-composer-hdrs.c:306
+#: composer/e-msg-composer-hdrs.c:319
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:307
+#: 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."
@@ -3507,82 +3671,82 @@ msgstr ""
 "Iletinin \"kЭr\" kopyalarЩnЩn gЖnderilecek olunduПu adresleri ver ; bunlar "
 "kendilerini iletinin gЖnderildiПi kiЧiler arasЩn da gЖrmeyecektir ."
 
-#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:629
+#: composer/e-msg-composer-hdrs.c:326 mail/mail-format.c:634
 msgid "Subject:"
 msgstr "Konu :"
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:327
 msgid "Enter the subject of the mail"
 msgstr "Iletinin konusunu ver"
 
-#: composer/e-msg-composer.c:429
+#: composer/e-msg-composer.c:430
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:599
+#: composer/e-msg-composer.c:600
 msgid "Save as..."
 msgstr "FarklЩ kaydet ..."
 
-#: composer/e-msg-composer.c:610
+#: composer/e-msg-composer.c:611
 #, c-format
 msgid "Error saving file: %s"
 msgstr "`%s' dosyasЩnЩ kaydederken hata oldu"
 
-#: composer/e-msg-composer.c:630
+#: composer/e-msg-composer.c:631
 #, c-format
 msgid "Error loading file: %s"
 msgstr "`%s' dosyasЩnЩ yЭklerken hata oldu"
 
-#: composer/e-msg-composer.c:652
+#: composer/e-msg-composer.c:653
 #, fuzzy
 msgid "Saving changes to message..."
 msgstr "Iletiyi kaydet"
 
-#: composer/e-msg-composer.c:654
+#: composer/e-msg-composer.c:655
 #, fuzzy
 msgid "Save changes to message..."
 msgstr "Iletiyi kaydet"
 
-#: composer/e-msg-composer.c:695
+#: composer/e-msg-composer.c:696
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:739 shell/e-shell-view-menu.c:170
+#: composer/e-msg-composer.c:741 shell/e-shell-view-menu.c:167
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:745
+#: 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:767
+#: composer/e-msg-composer.c:772
 msgid "Open file"
 msgstr "DosyayЩ aГ"
 
-#: composer/e-msg-composer.c:893
+#: composer/e-msg-composer.c:898
 msgid "That file does not exist."
 msgstr "BЖyle bir dosya yok ."
 
-#: composer/e-msg-composer.c:903
+#: composer/e-msg-composer.c:908
 msgid "That is not a regular file."
 msgstr "Bu normal bir dosya deПildir ."
 
-#: composer/e-msg-composer.c:913
+#: composer/e-msg-composer.c:918
 msgid "That file exists but is not readable."
 msgstr "Bu dosya vardЩr ama okunabilir deПil ."
 
-#: composer/e-msg-composer.c:923
+#: composer/e-msg-composer.c:928
 msgid "That file appeared accesible but open(2) failed."
 msgstr "Bu dosya eriЧilebilinir gibiydi amma open(2)-ГaПrЩsЩ baЧarЩsЩz oldu ."
 
-#: composer/e-msg-composer.c:945
+#: composer/e-msg-composer.c:950
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3590,15 +3754,15 @@ msgstr ""
 "Bu dosya Гok bЭyЭk ( 100 KB'den bЭyЭk ! ) .\n"
 "Bu dosyayЩ iГermekten emin misin ?"
 
-#: composer/e-msg-composer.c:966
+#: composer/e-msg-composer.c:971
 msgid "An error occurred while reading the file."
 msgstr "DosyayЩ okurken bir hata oldu ."
 
-#: composer/e-msg-composer.c:1343
+#: composer/e-msg-composer.c:1350
 msgid "Compose a message"
 msgstr "Bir ileti yaz"
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1427
 #, fuzzy
 msgid "Could not create composer window."
 msgstr "Diyalog kutusunu yaratamadЩm ."
@@ -3614,16 +3778,28 @@ msgid "Sear_ch"
 msgstr "Ara ..."
 
 #: filter/filter-datespec.c:62
+msgid "year"
+msgstr "yЩl"
+
+#: filter/filter-datespec.c:62
 #, fuzzy
 msgid "years"
 msgstr "yЩl"
 
 #: filter/filter-datespec.c:63
+msgid "month"
+msgstr "ay"
+
+#: filter/filter-datespec.c:63
 #, fuzzy
 msgid "months"
 msgstr "ay"
 
 #: filter/filter-datespec.c:64
+msgid "week"
+msgstr "hafta"
+
+#: filter/filter-datespec.c:64
 #, fuzzy
 msgid "weeks"
 msgstr "hafta"
@@ -3634,16 +3810,28 @@ msgid "days"
 msgstr "gЭn"
 
 #: filter/filter-datespec.c:66
+msgid "hour"
+msgstr "saat"
+
+#: filter/filter-datespec.c:66
 #, fuzzy
 msgid "hours"
 msgstr "saat"
 
 #: filter/filter-datespec.c:67
+msgid "minute"
+msgstr "dakika"
+
+#: filter/filter-datespec.c:67
 #, fuzzy
 msgid "minutes"
 msgstr "dakika"
 
 #: filter/filter-datespec.c:68
+msgid "second"
+msgstr "saniye"
+
+#: filter/filter-datespec.c:68
 #, fuzzy
 msgid "seconds"
 msgstr " saniye"
@@ -3695,6 +3883,10 @@ msgstr ""
 msgid "Compare against"
 msgstr ""
 
+#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
+msgid "now"
+msgstr "Чimdi"
+
 #: filter/filter-datespec.c:690
 #, fuzzy
 msgid "<click here to select a date>"
@@ -3721,7 +3913,7 @@ msgstr ""
 msgid "outgoing"
 msgstr "Kitle"
 
-#: filter/filter-editor.c:456 po/tmp/filter.glade.h:9
+#: filter/filter-editor.c:456 filter/filter.glade.h:9
 #, fuzzy
 msgid "Edit Filters"
 msgstr "Filtralarla oyna"
@@ -3761,269 +3953,279 @@ msgstr ""
 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"
 "%s"
 msgstr ""
 
-#: filter/filter-message-search.c:379 filter/filter-message-search.c:447
+#: filter/filter-message-search.c:380 filter/filter-message-search.c:448
 #, c-format
 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:520
+#: filter/filter-rule.c:530
 #, fuzzy
 msgid "Rule name: "
 msgstr "Dosya adЩ :"
 
-#: filter/filter-rule.c:524
+#: filter/filter-rule.c:534
 #, fuzzy
 msgid "Untitled"
 msgstr "( Isimsiz )"
 
-#: filter/filter-rule.c:540
+#: filter/filter-rule.c:550
 #, fuzzy
 msgid "If"
 msgstr "f"
 
-#: filter/filter-rule.c:557
+#: filter/filter-rule.c:567
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:561
+#: filter/filter-rule.c:571
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:566
+#: filter/filter-rule.c:576
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:577
+#: filter/filter-rule.c:587
 msgid "Add criterion"
 msgstr ""
 
-#: filter/filter-rule.c:583
+#: filter/filter-rule.c:593
 msgid "Remove criterion"
 msgstr ""
 
-#: mail/folder-browser.c:465 po/tmp/filter.glade.h:8
-#: po/tmp/mail-config.glade.h:9
+#: filter/filter-system-flag.c:63
 #, fuzzy
-msgid "Edit"
-msgstr "_DeПiЧtir"
+msgid "Replied to"
+msgstr "Hepsine cevapla"
+
+#. { _("Deleted"), "Deleted" },
+#. { _("Draft"), "Draft" },
+#: filter/filter-system-flag.c:66
+msgid "Important"
+msgstr ""
 
-#: po/tmp/filter.glade.h:10
+#: filter/filter-system-flag.c:67
+#, fuzzy
+msgid "Read"
+msgstr "Radyo"
+
+#: filter/filter.glade.h:10
 #, fuzzy
 msgid "Edit VFolders"
 msgstr "Filtralarla oyna"
 
-#: po/tmp/filter.glade.h:11
+#: filter/filter.glade.h:11
 #, fuzzy
 msgid "Filter Rules"
 msgstr "Filtra"
 
-#: 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
 #, fuzzy
 msgid "Outgoing"
 msgstr "DЩЧlЩm :"
 
-#: po/tmp/filter.glade.h:15
+#: filter/filter.glade.h:15
 #, fuzzy
 msgid "Virtual Folders"
 msgstr "_Sanal Dizin SihirbazЩ ..."
 
-#: po/tmp/filter.glade.h:16
+#: filter/filter.glade.h:16
 #, fuzzy
 msgid "vFolder Sources"
 msgstr "Kaynak ekle"
 
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
+#, fuzzy
+msgid "after"
+msgstr "Tarih"
+
+#: 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
+#, fuzzy
+msgid "contains"
+msgstr "E_ylemler"
+
+#: filter/libfilter-i18n.h:7
 #, fuzzy
 msgid "Copy to Folder"
 msgstr "ABY : Dizine _kopyala ..."
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:8
 #, fuzzy
 msgid "Date received"
 msgstr "AlЩndЩ"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:9
 #, fuzzy
 msgid "Date sent"
 msgstr "Tarih"
 
-#: filter/libfilter-i18n.h:8
-#, fuzzy
-msgid "Expression"
-msgstr "_Meslek :"
-
-#: filter/libfilter-i18n.h:9
-#, fuzzy
-msgid "Forward to Address"
-msgstr "Bu iletiyi ilet"
-
-#: filter/libfilter-i18n.h:10
-#, fuzzy
-msgid "Message Body"
-msgstr "Ileti(leri) buraya taЧЩ "
-
 #: filter/libfilter-i18n.h:11
-#, fuzzy
-msgid "Message Header"
-msgstr "BaЧlЩk"
+msgid "does not contain"
+msgstr ""
 
 #: filter/libfilter-i18n.h:12
-msgid "Message was received"
+msgid "does not end with"
 msgstr ""
 
 #: filter/libfilter-i18n.h:13
 #, fuzzy
-msgid "Message was sent"
-msgstr "_Yekin iletilei gЖrЭnmЭЧ olarak iЧaretle"
+msgid "does not exist"
+msgstr "BЖyle bir dosya yok ."
 
 #: filter/libfilter-i18n.h:14
 #, fuzzy
-msgid "Move to Folder"
-msgstr "ABY : Dizine _taЧЩ ..."
+msgid "does not sound like"
+msgstr "Dosya bulunamadЩ"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not start with"
+msgstr ""
 
 #: filter/libfilter-i18n.h:16
-#, fuzzy
-msgid "Recipients"
-msgstr "AlЩcЩlar listesi :"
+msgid "ends with"
+msgstr ""
 
 #: filter/libfilter-i18n.h:17
-msgid "Regex Match"
-msgstr ""
+#, fuzzy
+msgid "exists"
+msgstr "Ileri"
 
 #: filter/libfilter-i18n.h:18
 #, fuzzy
-msgid "Sender"
-msgstr "GЖnder"
+msgid "Expression"
+msgstr "_Meslek :"
 
 #: filter/libfilter-i18n.h:19
 #, fuzzy
-msgid "Set Status"
-msgstr "BaПlЩ olma durumu"
+msgid "Forward to Address"
+msgstr "Bu iletiyi ilet"
 
 #: filter/libfilter-i18n.h:20
 #, fuzzy
-msgid "Source"
-msgstr "Kaynak ekle"
+msgid "is"
+msgstr "i"
 
 #: filter/libfilter-i18n.h:21
-msgid "Specific header"
+msgid "is greater than"
 msgstr ""
 
 #: filter/libfilter-i18n.h:22
-#, fuzzy
-msgid "Status"
-msgstr "C.t"
+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 "Konu"
+#, fuzzy
+msgid "Message Body"
+msgstr "Ileti(leri) buraya taЧЩ "
 
 #: filter/libfilter-i18n.h:25
 #, fuzzy
-msgid "after"
-msgstr "Tarih"
+msgid "Message Header"
+msgstr "BaЧlЩk"
 
 #: filter/libfilter-i18n.h:26
-msgid "before"
+msgid "Message was received"
 msgstr ""
 
 #: filter/libfilter-i18n.h:27
 #, fuzzy
-msgid "contains"
-msgstr "E_ylemler"
+msgid "Message was sent"
+msgstr "_Yekin iletilei gЖrЭnmЭЧ olarak iЧaretle"
 
 #: filter/libfilter-i18n.h:28
-msgid "does not contain"
-msgstr ""
+#, fuzzy
+msgid "Move to Folder"
+msgstr "ABY : Dizine _taЧЩ ..."
 
 #: filter/libfilter-i18n.h:29
-msgid "does not end with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:30
 #, fuzzy
-msgid "does not exist"
-msgstr "BЖyle bir dosya yok ."
+msgid "on or after"
+msgstr "Tarihe git"
 
-#: filter/libfilter-i18n.h:31
-#, fuzzy
-msgid "does not sound like"
-msgstr "Dosya bulunamadЩ"
+#: filter/libfilter-i18n.h:30
+msgid "on or before"
+msgstr ""
 
 #: filter/libfilter-i18n.h:32
-msgid "does not start with"
-msgstr ""
+#, fuzzy
+msgid "Recipients"
+msgstr "AlЩcЩlar listesi :"
 
 #: filter/libfilter-i18n.h:33
-msgid "ends with"
+msgid "Regex Match"
 msgstr ""
 
 #: filter/libfilter-i18n.h:34
 #, fuzzy
-msgid "exists"
-msgstr "Ileri"
+msgid "Sender"
+msgstr "GЖnder"
 
 #: filter/libfilter-i18n.h:35
-msgid "is greater than"
-msgstr ""
+#, fuzzy
+msgid "Set Status"
+msgstr "BaПlЩ olma durumu"
 
 #: filter/libfilter-i18n.h:36
-msgid "is less than"
+msgid "sounds like"
 msgstr ""
 
 #: filter/libfilter-i18n.h:37
-msgid "is not"
-msgstr ""
+#, fuzzy
+msgid "Source"
+msgstr "Kaynak ekle"
 
 #: filter/libfilter-i18n.h:38
-#, fuzzy
-msgid "is"
-msgstr "i"
+msgid "Specific header"
+msgstr ""
 
 #: filter/libfilter-i18n.h:39
-#, fuzzy
-msgid "on or after"
-msgstr "Tarihe git"
+msgid "starts with"
+msgstr ""
 
 #: filter/libfilter-i18n.h:40
-msgid "on or before"
-msgstr ""
+#, fuzzy
+msgid "Status"
+msgstr "C.t"
 
 #: filter/libfilter-i18n.h:41
-msgid "sounds like"
+msgid "Stop Processing"
 msgstr ""
 
 #: filter/libfilter-i18n.h:42
-msgid "starts with"
-msgstr ""
+msgid "Subject"
+msgstr "Konu"
 
 #: filter/libfilter-i18n.h:43
 msgid "was after"
@@ -4057,147 +4259,229 @@ msgstr ""
 msgid "Edit VFolder Rule"
 msgstr "Filtralarla oyna"
 
-#: mail/component-factory.c:227
+#: mail/component-factory.c:277
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolution'in ePosta parГasЩnЩ baЧlatamadЩm ."
 
-#: mail/component-factory.c:266
+#: 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:16
+#: mail/folder-browser.c:223 ui/evolution-event-editor.xml.h:88
+#: ui/evolution-message-composer.xml.h:19
 #, fuzzy
 msgid "Save"
 msgstr "C.tesi"
 
-#: 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
 #, fuzzy
 msgid "Subject contains"
 msgstr "Konu"
 
-#: 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:453
+#: mail/folder-browser.c:643
 msgid "VFolder on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:454
+#: mail/folder-browser.c:644
 msgid "VFolder on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:455
+#: mail/folder-browser.c:645
 msgid "VFolder on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:457
+#: mail/folder-browser.c:647
 msgid "Filter on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:458
+#: mail/folder-browser.c:648
 #, fuzzy
 msgid "Filter on Sender"
 msgstr "Dosya bulunamadЩ"
 
-#: mail/folder-browser.c:459
+#: mail/folder-browser.c:649
 msgid "Filter on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:460 mail/folder-browser.c:544
+#: mail/folder-browser.c:650 mail/folder-browser.c:779
 msgid "Filter on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:14
+#: mail/folder-browser.c:655
+#, fuzzy
+msgid "Show all hidden"
+msgstr "Bu sЩralamada gЖster"
+
+#: mail/folder-browser.c:657
+msgid "Hide selected"
+msgstr ""
+
+#. could use another mask, but not enough api do to it
+#: mail/folder-browser.c:660
+#, fuzzy
+msgid "Hide read"
+msgstr "BaЧlЩk"
+
+#: mail/folder-browser.c:661
+#, fuzzy
+msgid "Hide deleted"
+msgstr "Sil"
+
+#: mail/folder-browser.c:663 mail/folder-browser.c:790
+#, fuzzy
+msgid "Hide Subject"
+msgstr "Konu"
+
+#: mail/folder-browser.c:665 mail/folder-browser.c:796
+#, fuzzy
+msgid "Hide from Sender"
+msgstr "Dosya bulunamadЩ"
+
+#: mail/folder-browser.c:670 ui/evolution-message-composer.xml.h:15
 #, fuzzy
 msgid "Open"
 msgstr "_AГ ..."
 
-#: mail/folder-browser.c:466
+#: mail/folder-browser.c:672
 #, fuzzy
 msgid "Save As..."
 msgstr "FarklЩ kaydet ..."
 
-#: mail/folder-browser.c:467 mail/mail-view.c:163
-#: po/tmp/evolution-addressbook.xml.h:13 po/tmp/evolution-calendar.xml.h:23
-#: po/tmp/evolution-mail.xml.h:28
+#: 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 "YazdЩr"
 
-#: mail/folder-browser.c:469
+#: mail/folder-browser.c:675
 #, fuzzy
 msgid "Reply to Sender"
 msgstr "Hepsine cevapla"
 
-#: mail/folder-browser.c:470 mail/mail-view.c:156
-#: po/tmp/evolution-mail.xml.h:34
+#: mail/folder-browser.c:676 mail/mail-view.c:141 ui/evolution-mail.xml.h:38
 msgid "Reply to All"
 msgstr "Hepsine cevapla"
 
-#: mail/folder-browser.c:471 mail/mail-view.c:159
-#: 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 "Ilet"
 
-#: mail/folder-browser.c:472 po/tmp/evolution-mail.xml.h:18
+#: mail/folder-browser.c:678 ui/evolution-mail.xml.h:18
 #, fuzzy
 msgid "Forward inline"
 msgstr "Zamanda ileri git"
 
-#: mail/folder-browser.c:474
+#: mail/folder-browser.c:680
 #, fuzzy
 msgid "Mark as Read"
 msgstr "ABY : _OkunmamЩЧ olarak iЧaretle"
 
-#: mail/folder-browser.c:475
+#: mail/folder-browser.c:681
 #, fuzzy
 msgid "Mark as Unread"
 msgstr "ABY : _OkunmamЩЧ olarak iЧaretle"
 
-#: mail/folder-browser.c:477
+#: mail/folder-browser.c:683
 #, fuzzy
 msgid "Move to Folder..."
 msgstr "Dizinde git ..."
 
-#: mail/folder-browser.c:478
+#: mail/folder-browser.c:684
 #, fuzzy
 msgid "Copy to Folder..."
 msgstr "Dizinde git ..."
 
-#: mail/folder-browser.c:480
+#: mail/folder-browser.c:686
 #, fuzzy
 msgid "Undelete"
 msgstr "Sil"
 
 #. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
 #. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:484
+#: mail/folder-browser.c:690
 #, fuzzy
 msgid "Apply Filters"
 msgstr "Filtra"
 
-#: mail/folder-browser.c:486 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:546
+#: mail/folder-browser.c:693 ui/evolution-mail.xml.h:21
+#, fuzzy
+msgid "Hide Messages"
+msgstr "Iletiyi gЖnder"
+
+#: mail/folder-browser.c:781
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
+#: mail/folder-browser.c:787
+#, fuzzy, c-format
+msgid "Hide Subject \"%s\""
+msgstr "Konu"
+
+#: 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 "Bonobo'yu baЧlatamadЩm"
+
+#: mail/local-config.glade.h:7
+#, fuzzy
+msgid "Mailbox Format"
+msgstr "чekil"
+
+#: mail/local-config.glade.h:8
+#, fuzzy
+msgid "New store format:"
+msgstr "Yeni telefon tipi"
+
+#: 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
+#, fuzzy
+msgid "mh"
+msgstr "h"
+
 #: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
@@ -4256,7 +4540,7 @@ 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?"
@@ -4264,92 +4548,330 @@ msgstr ""
 "Bu iletinin konusu yok .\n"
 "Vallahi mi gЖndereyim ?"
 
-#: 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
+#, fuzzy
+msgid "Forwarded message:\n"
+msgstr "Bu iletiyi ilet"
+
+#: mail/mail-callbacks.c:611
 msgid "Move message(s) to"
 msgstr "Ileti(leri) buraya taЧЩ "
 
-#: mail/mail-callbacks.c:554
+#: mail/mail-callbacks.c:613
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "Ileti(leri) buraya taЧЩ "
 
-#: mail/mail-callbacks.c:665
+#: mail/mail-callbacks.c:748
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:699 mail/mail-display.c:72
+#: mail/mail-callbacks.c:781 mail/mail-display.c:79
 msgid "Overwrite file?"
 msgstr ""
 
-#: mail/mail-callbacks.c:703 mail/mail-display.c:76
+#: mail/mail-callbacks.c:785 mail/mail-display.c:83
 #, fuzzy
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr "AynЩ isimli bir klasЖr zaten var"
 
-#: mail/mail-callbacks.c:748
+#: mail/mail-callbacks.c:830
 #, fuzzy
 msgid "Save Message As..."
 msgstr "Iletiyi kaydet"
 
-#: mail/mail-callbacks.c:750
+#: mail/mail-callbacks.c:832
 #, fuzzy
 msgid "Save Messages As..."
 msgstr "Iletiyi kaydet"
 
-#: mail/mail-callbacks.c:877
+#: mail/mail-callbacks.c:916
 #, fuzzy, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr "`%s' dosyasЩnЩ yЭklerken hata oldu"
 
-#: mail/mail-callbacks.c:922
+#: mail/mail-callbacks.c:961
 #, fuzzy
 msgid "Print Message"
 msgstr "Iletiyi gЖnder"
 
-#: mail/mail-callbacks.c:969
+#: 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 "Bilgi yok"
+
+#: mail/mail-config-druid.glade.h:8
+msgid "Account Management"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:9
+#, fuzzy
+msgid "Account Properties"
+msgstr "Eklem Жzellikleri"
+
+#: mail/mail-config-druid.glade.h:11
+#, fuzzy
+msgid "Advanced"
+msgstr "Ekle ..."
+
+#: mail/mail-config-druid.glade.h:12
+#, fuzzy
+msgid "Authentication"
+msgstr "DoПrulama :"
+
+#: mail/mail-config-druid.glade.h:13
+#, fuzzy
+msgid "Authentication Type:"
+msgstr "DoПrulama :"
+
+#: 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 "Ince ayarlar"
+
+#: mail/mail-config-druid.glade.h:26
+#, fuzzy
+msgid "Delete mail from server"
+msgstr "Ileti tasarЩlayЩcЩsЩndan ГЩk"
+
+#: mail/mail-config-druid.glade.h:27
+#, fuzzy
+msgid "Done"
+msgstr "Yok"
+
+#: mail/mail-config-druid.glade.h:28
+#, fuzzy
+msgid "E-Mail Address:"
+msgstr "ePosta adresi : "
+
+#: mail/mail-config-druid.glade.h:30
+#, fuzzy
+msgid "Email Address:"
+msgstr "ePosta adresi : "
+
+#: mail/mail-config-druid.glade.h:31
+#, fuzzy
+msgid "Evolution Mail Configuration"
+msgstr "ePosta ayarlamasЩ"
+
+#: mail/mail-config-druid.glade.h:32
+#, fuzzy
+msgid "Full Name:"
+msgstr "Tam ismi :"
+
+#: mail/mail-config-druid.glade.h:35
+#, fuzzy
+msgid "Hostname:"
+msgstr "KullanЩcЩ adЩ :"
+
+#: mail/mail-config-druid.glade.h:36
+msgid "IMAP"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:37
 msgid "Identity"
 msgstr "Kimlik"
 
-#: 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
+msgid "Kerberos"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:40
+#, fuzzy
+msgid "Mail"
+msgstr "_Cep"
+
+#: mail/mail-config-druid.glade.h:41
+#, fuzzy
+msgid "Mail Account"
+msgstr "_Ufak ikonalar"
+
+#: mail/mail-config-druid.glade.h:42
 msgid "Mail Configuration"
 msgstr "ePosta ayarlamasЩ"
 
-#: po/tmp/mail-config-druid.glade.h:8
-msgid "Mail Source"
-msgstr "ePosta kaynaПЩ"
+#: mail/mail-config-druid.glade.h:43
+#, fuzzy
+msgid "Mail Configuration Druid"
+msgstr "ePosta ayarlamasЩ"
 
-#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
-msgid "Mail Transport"
-msgstr "ePosta transferi"
+#: 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 "Yeni"
+
+#: mail/mail-config-druid.glade.h:48
+#, fuzzy
+msgid "Optional"
+msgstr "SeГenekler"
+
+#: mail/mail-config-druid.glade.h:49 mail/mail-config-gui.c:485
+msgid "Organization:"
+msgstr "жrgЭt : "
+
+#: mail/mail-config-druid.glade.h:50
+msgid "Outgoing Mail Server"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:51
+#, fuzzy
+msgid "Password:"
+msgstr "_ParolalarЩ unut"
 
-#: po/tmp/mail-config-druid.glade.h:10
-msgid "Welcome to the Evolution Mail configuration wizard!\n"
+#: mail/mail-config-druid.glade.h:53
+msgid "Plain Text"
 msgstr ""
 
-#: po/tmp/mail-config-druid.glade.h:14
+#: mail/mail-config-druid.glade.h:54
+msgid "Receiving Email"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:55
+msgid "Remember my password"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:56 mail/mail-format.c:628
+#, fuzzy
+msgid "Reply-To:"
+msgstr "Cevapla"
+
+#: mail/mail-config-druid.glade.h:57
+#, fuzzy
+msgid "Reply-to:"
+msgstr "Cevapla"
+
+#: mail/mail-config-druid.glade.h:58
+#, fuzzy
+msgid "Required"
+msgstr "_Gerekli kiЧiler"
+
+#: mail/mail-config-druid.glade.h:60
+#, fuzzy
+msgid "Save password"
+msgstr "VCard olarak kaydet"
+
+#: mail/mail-config-druid.glade.h:61
+#, fuzzy
+msgid "Select signature file"
+msgstr "Imza dosyasЩ : "
+
+#: mail/mail-config-druid.glade.h:62
+#, fuzzy
+msgid "Sending Email"
+msgstr "GЖnder"
+
+#: mail/mail-config-druid.glade.h:64
+#, fuzzy
+msgid "Server Configuration"
+msgstr "ePosta ayarlamasЩ"
+
+#: mail/mail-config-druid.glade.h:65
+msgid "Server Timeouts"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:66
+#, fuzzy
+msgid "Server Type: "
+msgstr "Sunucu :"
+
+#: mail/mail-config-druid.glade.h:67
+msgid "Server requires authentication"
+msgstr ""
+
+#: mail/mail-config-druid.glade.h:68
+#, fuzzy
+msgid "Servers"
+msgstr "Sunucu :"
+
+#: mail/mail-config-druid.glade.h:69 mail/mail-config-gui.c:496
+msgid "Signature file:"
+msgstr "Imza dosyasЩ : "
+
+#: mail/mail-config-druid.glade.h:70
+#, fuzzy
+msgid "Signature:"
+msgstr "Imza dosyasЩ : "
+
+#: mail/mail-config-druid.glade.h:71 mail/mail-config.glade.h:20
+#, fuzzy
+msgid "Sources"
+msgstr "Kaynak ekle"
+
+#: 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 "Tip :"
+
+#: 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 "Bilgi yok"
+
+#: mail/mail-config-druid.glade.h:77 mail/mail-config-gui.c:928
+msgid "Username:"
+msgstr "KullanЩcЩ adЩ :"
+
+#: 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 "dakika"
+
 #: mail/mail-config-gui.c:433
 msgid ""
 "Enter your name and email address to be used in outgoing mail. You may also, "
@@ -4368,15 +4890,7 @@ msgstr "Tam ismi :"
 msgid "Email address:"
 msgstr "ePosta adresi : "
 
-#: mail/mail-config-gui.c:485
-msgid "Organization:"
-msgstr "жrgЭt : "
-
-#: mail/mail-config-gui.c:496
-msgid "Signature file:"
-msgstr "Imza dosyasЩ : "
-
-#: 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 "Imza DosyasЩ"
 
@@ -4384,26 +4898,10 @@ msgstr "Imza DosyasЩ"
 msgid "Server:"
 msgstr "Sunucu :"
 
-#: mail/mail-config-gui.c:928
-msgid "Username:"
-msgstr "KullanЩcЩ adЩ :"
-
-#: mail/mail-config-gui.c:934
-msgid "Path:"
-msgstr "Dizin :"
-
-#: mail/mail-config-gui.c:943
-msgid "Authentication:"
-msgstr "DoПrulama :"
-
 #: mail/mail-config-gui.c:956
 msgid "Detect supported types..."
 msgstr "Desteklenen tЭrleri dene ..."
 
-#: mail/mail-config-gui.c:968
-msgid "Remember this password"
-msgstr ""
-
 #: mail/mail-config-gui.c:991
 #, fuzzy
 msgid "Don't delete messages from server"
@@ -4418,7 +4916,7 @@ msgstr "AyarlarЩ dene"
 msgid "Mail source type:"
 msgstr "ePosta kaynaПЩ"
 
-#: 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"
@@ -4454,6 +4952,19 @@ msgstr ""
 msgid "Mail transport type:"
 msgstr "ePosta transferi"
 
+#: mail/mail-config-gui.c:1183
+#, fuzzy
+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 ""
+"ePosta sunucusunun tЭrЭnЭ seГ ve gerekli bilgileri de verebilirsin. \n"
+"\n"
+"Sunucu bir tanЩmlama bekliyorsa o zaman \"Desteklenen tЭrleri dene ...\" "
+"basmasЩna ЖbЭr bilgiler verdikten sonra basabilirsin ."
+
 #: mail/mail-config-gui.c:1233
 msgid "Add Identity"
 msgstr "Kimlik ekle"
@@ -4502,85 +5013,92 @@ msgstr ""
 msgid "Query authorization at \"%s\""
 msgstr ""
 
-#: po/tmp/mail-config.glade.h:7
+#: mail/mail-config.glade.h:7
 msgid "Address"
 msgstr "Adres"
 
-#: po/tmp/mail-config.glade.h:10
+#: mail/mail-config.glade.h:10
 #, fuzzy
 msgid "Identities"
 msgstr "Kimlik"
 
-#: po/tmp/mail-config.glade.h:11
+#: mail/mail-config.glade.h:11
 #, fuzzy
 msgid "Mail Sources"
 msgstr "ePosta kaynaПЩ"
 
-#: po/tmp/mail-config.glade.h:13
+#: mail/mail-config.glade.h:12
+msgid "Mail Transport"
+msgstr "ePosta transferi"
+
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "Mark message as seen [ms]: "
 msgstr "_Yekin iletilei gЖrЭnmЭЧ olarak iЧaretle"
 
-#: po/tmp/mail-config.glade.h:14
+#: mail/mail-config.glade.h:14
 #, fuzzy
 msgid "News Servers"
 msgstr "Haber suncusu ekle"
 
-#: po/tmp/mail-config.glade.h:15
+#: mail/mail-config.glade.h:15
 #, fuzzy
 msgid "News Sources"
 msgstr "Kaynak ekle"
 
-#: po/tmp/mail-config.glade.h:16
+#: mail/mail-config.glade.h:16
 #, fuzzy
 msgid "Organization"
 msgstr "жrgЭt : "
 
-#: po/tmp/mail-config.glade.h:18
+#: mail/mail-config.glade.h:18
 #, fuzzy
 msgid "Send messages in HTML format"
 msgstr "ePostayЩ HTML Чeklinde gЖnder"
 
-#: po/tmp/mail-config.glade.h:20
-#, fuzzy
-msgid "Sources"
-msgstr "Kaynak ekle"
-
-#: mail/mail-crypto.c:350 mail/mail-crypto.c:452 mail/mail-crypto.c:629
+#: 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."
 msgstr ""
 
-#: mail/mail-crypto.c:354 mail/mail-crypto.c:456 mail/mail-crypto.c:634
+#: mail/mail-crypto.c:357 mail/mail-crypto.c:462 mail/mail-crypto.c:640
+#: mail/mail-crypto.c:785
 msgid "No password provided."
 msgstr ""
 
-#: mail/mail-crypto.c:360 mail/mail-crypto.c:463 mail/mail-crypto.c:640
+#: mail/mail-crypto.c:363 mail/mail-crypto.c:469 mail/mail-crypto.c:646
+#: mail/mail-crypto.c:792 mail/mail-crypto.c:942
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: mail/mail-crypto.c:625
+#: mail/mail-crypto.c:631 mail/mail-crypto.c:777 mail/mail-crypto.c:936
 msgid "No GPG/PGP program available."
 msgstr ""
 
-#: mail/mail-display.c:90
+#: mail/mail-crypto.c:953
+#, fuzzy, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "Diyalog kutusunu yaratamadЩm ."
+
+#: mail/mail-display.c:98
 #, c-format
 msgid ""
 "Could not open file %s:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-display.c:113
+#: mail/mail-display.c:131
 #, fuzzy, c-format
 msgid "Could not write data: %s"
 msgstr "Diyalog kutusunu yaratamadЩm ."
 
-#: mail/mail-display.c:218
+#: mail/mail-display.c:229
 #, fuzzy
 msgid "Save Attachment"
 msgstr "ABY : Eklem _ekle ..."
 
-#: mail/mail-display.c:258
+#: mail/mail-display.c:269
 #, fuzzy, c-format
 msgid "Could not create temporary directory: %s"
 msgstr ""
@@ -4588,462 +5106,365 @@ msgstr ""
 "\n"
 "Hata : %s"
 
-#: mail/mail-display.c:300
+#: mail/mail-display.c:311
 #, fuzzy
 msgid "Save to Disk..."
 msgstr "FarklЩ kaydet ..."
 
-#: mail/mail-display.c:302
+#: mail/mail-display.c:313
 #, fuzzy, c-format
 msgid "Open in %s..."
 msgstr "_AГ ..."
 
-#: mail/mail-display.c:304
+#: mail/mail-display.c:315
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:328
+#: mail/mail-display.c:339
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:351
+#: mail/mail-display.c:362
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:355
+#: mail/mail-display.c:366
 #, fuzzy
 msgid "Hide"
 msgstr "BaЧlЩk"
 
-#: mail/mail-format.c:500
+#: mail/mail-format.c:503
 #, fuzzy, c-format
 msgid "%s attachment"
 msgstr "Eklem ekle"
 
-#: mail/mail-format.c:623
-#, fuzzy
-msgid "Reply-To:"
-msgstr "Cevapla"
-
-#: mail/mail-format.c:845
+#: mail/mail-format.c:851
 msgid "No GPG/PGP support available in this copy of Evolution."
 msgstr ""
 
-#: mail/mail-format.c:857
+#: mail/mail-format.c:863
 #, fuzzy
 msgid "Encrypted message not displayed"
 msgstr "Konu dizimini ayЩrtЩrken bir ileti bozuk mu cЩktЩ ?"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:869
 #, fuzzy
 msgid "Encrypted message"
 msgstr "Iletiyi gЖnder"
 
-#: mail/mail-format.c:864
+#: mail/mail-format.c:870
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1470
+#: mail/mail-format.c:1450
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1482
+#: mail/mail-format.c:1462
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1486
+#: mail/mail-format.c:1466
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1520
+#: mail/mail-format.c:1500
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1525
+#: mail/mail-format.c:1505
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-format.c:1695
+#: mail/mail-format.c:1675
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr ""
 
-#: mail/mail-local.c:202
+#: mail/mail-local.c:204
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:206
+#: mail/mail-local.c:208
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:261
+#: mail/mail-local.c:251
+msgid "Reconfiguring folder"
+msgstr ""
+
+#: mail/mail-local.c:269
 msgid "Closing current folder"
 msgstr ""
 
-#: mail/mail-local.c:293
+#: mail/mail-local.c:295
 msgid "Renaming old folder and opening"
 msgstr ""
 
-#: mail/mail-local.c:314
+#: mail/mail-local.c:313
 #, fuzzy
 msgid "Creating new folder"
 msgstr "Yeni bir dizini yarat"
 
-#: mail/mail-local.c:329
+#: mail/mail-local.c:327
 #, fuzzy
 msgid "Copying messages"
 msgstr "Bir ileti yaz"
 
-#: mail/mail-local.c:341
+#: 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:372
+#: 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:781
+#: mail/mail-local.c:787
 msgid "Registering local folder"
 msgstr ""
 
-#: mail/mail-local.c:783
+#: mail/mail-local.c:789
 #, fuzzy
 msgid "Register local folder"
 msgstr "Yeni bir dizini yarat"
 
-#: mail/mail-ops.c:79
+#: mail/mail-local.c:894
+#, fuzzy, c-format
+msgid ""
+"Unable to register folder '%s':\n"
+"%s"
+msgstr "Diyalog kutusunu yaratamadЩm ."
+
+#: mail/mail-mt.c:85
+#, c-format
+msgid ""
+"Error while '%s':\n"
+"%s"
+msgstr ""
+
+#: mail/mail-mt.c:87
+#, fuzzy, c-format
+msgid ""
+"Error while performing operation:\n"
+"%s"
+msgstr "`%s' dosyasЩnЩ yЭklerken hata oldu"
+
+#: mail/mail-mt.c:356 mail/mail-mt.c:385
+#, fuzzy
+msgid "Working"
+msgstr "P.t"
+
+#: mail/mail-ops.c:88
 #, fuzzy, c-format
 msgid "Fetching email from %s"
 msgstr "ePosta'yЩ alЩyorum"
 
-#: mail/mail-ops.c:81
+#: mail/mail-ops.c:90
 #, fuzzy, c-format
 msgid "Fetch email from %s"
 msgstr "ePosta'yЩ alЩyorum"
 
-#: mail/mail-ops.c:331
+#: mail/mail-ops.c:335
 #, c-format
 msgid "There is no new mail at %s."
 msgstr ""
 
-#: 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:538
+#: mail/mail-ops.c:551
 #, fuzzy, c-format
 msgid "Sending \"%s\""
 msgstr "BaЧlЩklar"
 
-#: mail/mail-ops.c:543
-msgid "Sending a message without a subject"
-msgstr ""
-
-#: mail/mail-ops.c:546
-#, fuzzy, c-format
-msgid "Send \"%s\""
-msgstr "Saniye"
-
-#: mail/mail-ops.c:549
+#: mail/mail-ops.c:553
 #, fuzzy
-msgid "Send a message without a subject"
-msgstr "Iletiyi faklЩ bir isim altЩnda kaydet"
+msgid "Sending message"
+msgstr "Bu iletiyi gЖnder"
 
-#: mail/mail-ops.c:720
+#: mail/mail-ops.c:669
 msgid "Sending queue"
 msgstr ""
 
-#: mail/mail-ops.c:722
+#: mail/mail-ops.c:671
 msgid "Send queue"
 msgstr ""
 
-#: mail/mail-ops.c:858 mail/mail-ops.c:865
+#: mail/mail-ops.c:804 mail/mail-ops.c:811
 #, c-format
 msgid "Appending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:862 mail/mail-ops.c:868
+#: mail/mail-ops.c:808 mail/mail-ops.c:814
 msgid "Appending a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:940
-#, c-format
-msgid "Expunging \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:942
-#, fuzzy, c-format
-msgid "Expunge \"%s\""
-msgstr "_Temizle"
-
-#: mail/mail-ops.c:1001
+#: mail/mail-ops.c:897
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:899
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1006
+#: mail/mail-ops.c:902
 #, fuzzy, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Ileti(leri) buraya taЧЩ "
 
-#: mail/mail-ops.c:1008
+#: mail/mail-ops.c:904
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1039
+#: mail/mail-ops.c:935
 #, fuzzy
 msgid "Moving"
 msgstr "P.t"
 
-#: mail/mail-ops.c:1042
+#: mail/mail-ops.c:938
 #, fuzzy
 msgid "Copying"
 msgstr "Kopyala"
 
-#: mail/mail-ops.c:1062
+#: mail/mail-ops.c:958
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1141
-#, fuzzy, c-format
-msgid "Marking messages in folder \"%s\""
-msgstr "Iletiyi yeni bir dizine taЧЩ"
-
-#: mail/mail-ops.c:1144
-#, fuzzy, c-format
-msgid "Mark messages in folder \"%s\""
-msgstr "Iletiyi yeni bir dizine taЧЩ"
-
-#: mail/mail-ops.c:1175
-#, c-format
-msgid "Marking message %d of %d"
-msgstr ""
-
-#: mail/mail-ops.c:1295
+#: mail/mail-ops.c:1033
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1297
-#, c-format
-msgid "Scan folders in \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1366 mail/subscribe-dialog.c:339
+#: mail/mail-ops.c:1099 mail/subscribe-dialog.c:341
 #, fuzzy
 msgid "(No description)"
 msgstr "AnlatЩm :"
 
-#: mail/mail-ops.c:1432
-#, c-format
-msgid "Attaching messages from folder \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1435
-#, fuzzy, c-format
-msgid "Attach messages from \"%s\""
-msgstr "Ileti tasarЩlayЩcЩsЩndan ГЩk"
-
-#: mail/mail-ops.c:1535
-#, fuzzy, c-format
-msgid "Forwarding messages \"%s\""
-msgstr "Bu iletiyi ilet"
-
-#: mail/mail-ops.c:1539
-msgid "Forwarding a message without a subject"
-msgstr ""
-
-#: mail/mail-ops.c:1542
-#, fuzzy, c-format
-msgid "Forward message \"%s\""
-msgstr "Bu iletiyi ilet"
-
-#: mail/mail-ops.c:1546
-msgid "Forward a message without a subject"
-msgstr ""
-
-#: mail/mail-ops.c:1593
-#, c-format
-msgid "Retrieving message number %d of %d (uid \"%s\")"
-msgstr ""
-
-#: mail/mail-ops.c:1610
-msgid ""
-"Failed to generate mime part from message while generating forwarded message."
-msgstr ""
-
-#: mail/mail-ops.c:1665
+#: mail/mail-ops.c:1164
 #, fuzzy
 msgid "Forwarded messages"
 msgstr "Bu iletiyi ilet"
 
-#: mail/mail-ops.c:1679
-#, fuzzy
-msgid "Forwarded message:\n"
-msgstr "Bu iletiyi ilet"
-
-#: mail/mail-ops.c:1748
+#: mail/mail-ops.c:1205 mail/mail-ops.c:1274
 #, fuzzy, c-format
-msgid "Loading \"%s\""
-msgstr "BaЧlЩklar"
-
-#: mail/mail-ops.c:1750
-#, c-format
-msgid "Load \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1853
-#, c-format
-msgid "Creating \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1855
-#, c-format
-msgid "Create \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:1903
-msgid "Exception while reporting result to shell component listener."
+msgid "Opening folder %s"
 msgstr ""
+"%s dizinini yaratamadЩm\n"
+" "
 
-#: mail/mail-ops.c:1949
-#, c-format
-msgid "Synchronizing \"%s\""
+#: mail/mail-ops.c:1336
+msgid "Synchronising folder"
 msgstr ""
 
-#: mail/mail-ops.c:1951
-#, c-format
-msgid "Synchronize \"%s\""
+#: mail/mail-ops.c:1386
+msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:2015
-#, c-format
-msgid "Displaying message UID \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:2018
-#, fuzzy
-msgid "Clearing message display"
-msgstr "Zaman gЖsterimi"
-
-#: mail/mail-ops.c:2021
-#, c-format
-msgid "Display message UID \"%s\""
-msgstr ""
+#: mail/mail-ops.c:1434
+#, fuzzy, c-format
+msgid "Retrieving message %s"
+msgstr "Bu iletiyi ilet"
 
-#: mail/mail-ops.c:2024
+#: mail/mail-ops.c:1497
 #, fuzzy
-msgid "Clear message display"
-msgstr "GЖsterim renkler"
-
-#: mail/mail-ops.c:2137
-#, c-format
-msgid "Opening messages from folder \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:2140
-#, c-format
-msgid "Open messages from \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:2244
-#, c-format
-msgid "Loading %s Folder"
-msgstr ""
-
-#: mail/mail-ops.c:2246
-#, c-format
-msgid "Load %s Folder"
-msgstr ""
+msgid "Retrieving messages"
+msgstr "Bir ileti yaz"
 
-#: mail/mail-ops.c:2310
+#: mail/mail-ops.c:1507
 #, c-format
-msgid "Viewing messages from folder \"%s\""
+msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:2313
-#, c-format
-msgid "View messages from \"%s\""
-msgstr ""
+#: mail/mail-ops.c:1655
+#, fuzzy, c-format
+msgid "Loading %s Folder for %s"
+msgstr "Na_sЩl baЧlarЩm"
 
-#: mail/mail-ops.c:2339
+#: mail/mail-ops.c:1657
 #, c-format
-msgid "Retrieving message %d of %d (uid \"%s\")"
+msgid "Load %s Folder for %s"
 msgstr ""
 
-#: mail/mail-ops.c:2428
-#, fuzzy, c-format
-msgid "Saving messages from folder \"%s\""
-msgstr "Iletiyi yeni bir dizine taЧЩ"
+#: mail/mail-ops.c:1823
+#, fuzzy
+msgid "Saving messages"
+msgstr "Bir ileti yaz"
 
-#: mail/mail-ops.c:2431
+#: mail/mail-ops.c:1902
 #, fuzzy, c-format
-msgid "Save messages from folder \"%s\""
-msgstr "Iletiyi yeni bir dizine taЧЩ"
+msgid ""
+"Unable to create output file: %s\n"
+" %s"
+msgstr "Diyalog kutusunu yaratamadЩm ."
 
-#: mail/mail-ops.c:2474
+#: mail/mail-ops.c:1915
 #, 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' dosyasЩnЩ kaydederken hata oldu"
+
 #: mail/mail-search-dialogue.c:104
 msgid "Cancel"
 msgstr "Iptal"
 
-#: mail/mail-summary.c:105 mail/mail-threads.c:728
+#: mail/mail-summary.c:110 mail/mail-threads.c:729
 msgid "Incomplete message written on pipe!"
 msgstr "TЭnellemeden bozuk bir ileti geldi !"
 
-#: mail/mail-threads.c:301
+#: mail/mail-threads.c:302
 #, c-format
 msgid ""
 "Error while preparing to %s:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-threads.c:675
+#: mail/mail-threads.c:676
 #, c-format
 msgid ""
 "Error while `%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-threads.c:732
+#: mail/mail-threads.c:733
 msgid "Error reading commands from dispatching thread."
 msgstr "Konu dizimini komutalarla okurken hata oldu ."
 
-#: mail/mail-threads.c:797
+#: mail/mail-threads.c:798
 msgid "Corrupted message from dispatching thread?"
 msgstr "Konu dizimini ayЩrtЩrken bir ileti bozuk mu cЩktЩ ?"
 
-#: mail/mail-threads.c:916
+#: mail/mail-threads.c:917
 msgid "Could not create dialog box."
 msgstr "Diyalog kutusunu yaratamadЩm ."
 
-#: mail/mail-threads.c:927
+#: mail/mail-threads.c:928
 msgid "User cancelled query."
 msgstr "SorgulamayЩ kullanЩcЩ durdurdu ."
 
@@ -5053,133 +5474,150 @@ msgid "Couldn't create temporary mbox `%s': %s"
 msgstr ""
 
 #. Get all uids of source
-#: mail/mail-tools.c:239
+#: mail/mail-tools.c:241
 #, c-format
 msgid "Examining %s"
 msgstr ""
 
-#: mail/mail-tools.c:269
+#: mail/mail-tools.c:271
 #, c-format
 msgid ""
 "Could not read UID cache file \"%s\". You may receive duplicate messages."
 msgstr ""
 
-#. Info
-#: mail/mail-tools.c:290
+#: mail/mail-tools.c:300
 #, c-format
 msgid "Retrieving message %d of %d"
 msgstr ""
 
 #. Append it to dest
-#: mail/mail-tools.c:303
+#: mail/mail-tools.c:315
 #, c-format
 msgid "Writing message %d of %d"
 msgstr ""
 
-#: mail/mail-tools.c:332
+#: mail/mail-tools.c:347
 #, c-format
 msgid "Saving changes to %s"
 msgstr ""
 
-#: mail/mail-tools.c:369
+#: mail/mail-tools.c:381
 #, fuzzy, c-format
 msgid "[%s] (forwarded message)"
 msgstr "Bu iletiyi ilet"
 
-#: mail/mail-tools.c:379
+#: mail/mail-tools.c:391
 msgid "Fwd: (no subject)"
 msgstr ""
 
-#: mail/mail-tools.c:418
+#: mail/mail-tools.c:427
 #, fuzzy, c-format
 msgid "Forwarded message - %s"
 msgstr "Bu iletiyi ilet"
 
-#: mail/mail-tools.c:420
+#: mail/mail-tools.c:429
 #, fuzzy
 msgid "Forwarded message (no subject)"
 msgstr "Bu iletiyi ilet"
 
-#: mail/mail-tools.c:523
+#: mail/mail-tools.c:530
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-vfolder.c:147
+#: mail/mail-vfolder.c:149
 #, fuzzy
 msgid "VFolders"
 msgstr "Dizinler"
 
-#: mail/mail-vfolder.c:296
+#: mail/mail-vfolder.c:298
 #, fuzzy
 msgid "New VFolder"
 msgstr "_Dizin"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:33
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:37
 msgid "Reply"
 msgstr "Cevapla"
 
-#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:38
+#: mail/mail-view.c:138 ui/evolution-mail.xml.h:42
 msgid "Reply to the sender of this message"
 msgstr "Iletiyi gЖnderene cevap ver"
 
-#: mail/mail-view.c:156 po/tmp/evolution-mail.xml.h:37
+#: mail/mail-view.c:141 ui/evolution-mail.xml.h:41
 msgid "Reply to all recipients of this message"
 msgstr "Iletinin yekin alЩcЩlarЩna cevap ver"
 
-#: mail/mail-view.c:159 po/tmp/evolution-mail.xml.h:19
+#: mail/mail-view.c:144 ui/evolution-mail.xml.h:19
 msgid "Forward this message"
 msgstr "Bu iletiyi ilet"
 
-#: mail/mail-view.c:163 po/tmp/evolution-mail.xml.h:32
+#: mail/mail-view.c:148 ui/evolution-mail.xml.h:36
 msgid "Print the selected message"
 msgstr "SeГili iletiyi yazdЩr"
 
-#: mail/mail-view.c:165 po/tmp/evolution-mail.xml.h:12
+#: mail/mail-view.c:150 ui/evolution-mail.xml.h:12
 msgid "Delete this message"
 msgstr "Bu iletiyi sil"
 
-#: mail/message-list.c:572
+#: mail/message-list.c:590
 #, fuzzy
 msgid "Unseen"
 msgstr "yedinci"
 
-#: mail/message-list.c:575
+#: mail/message-list.c:593
 #, fuzzy
 msgid "Seen"
 msgstr "GЖnder"
 
-#: mail/message-list.c:578
+#: mail/message-list.c:596
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:846
+#: mail/message-list.c:881
 #, c-format
 msgid "[ %s ]"
 msgstr ""
 
 #. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:858 mail/message-list.c:873
+#: mail/message-list.c:893 mail/message-list.c:909
 #, c-format
 msgid "%s, et al."
 msgstr ""
 
-#: mail/message-list.c:860 mail/message-list.c:875
+#: mail/message-list.c:896 mail/message-list.c:912
 msgid "<unknown>"
 msgstr ""
 
-#: mail/message-list.c:2068
-msgid "Rebuilding message view"
+#: mail/message-list.c:965
+msgid "?"
+msgstr "?"
+
+#: mail/message-list.c:972
+msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:2070
-msgid "Rebuild message view"
+#: mail/message-list.c:981
+msgid "Yesterday %l:%M %p"
 msgstr ""
 
+#: mail/message-list.c:993
+#, fuzzy
+msgid "%a %l:%M %p"
+msgstr "%a %b %d %Y"
+
+#: mail/message-list.c:1001
+msgid "%b %d %l:%M %p"
+msgstr ""
+
+#: mail/message-list.c:1003
+#, fuzzy
+msgid "%b %d %Y"
+msgstr "%a %b %d %Y"
+
 #: mail/subscribe-dialog.c:139
 msgid "Display folders starting with:"
 msgstr ""
@@ -5194,27 +5632,27 @@ msgstr "Na_sЩl baЧlarЩm"
 msgid "Get store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:282
+#: mail/subscribe-dialog.c:283
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:286
+#: mail/subscribe-dialog.c:287
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:290
+#: mail/subscribe-dialog.c:291
 #, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:293
+#: mail/subscribe-dialog.c:294
 #, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr ""
 
-#: shell/e-setup.c:112 shell/e-setup.c:183
+#: shell/e-setup.c:112 shell/e-setup.c:185
 msgid "Evolution installation"
 msgstr "Evolution yЭklenmesi"
 
@@ -5229,24 +5667,24 @@ msgstr ""
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr "\"Oldu\"'ya tЩklayЩp, Evolution kullanЩcЩ dosyalarЩnЩ"
 
-#: shell/e-setup.c:155
+#: shell/e-setup.c:157
 #, fuzzy
 msgid "Could not update files correctly"
 msgstr "Diyalog kutusunu yaratamadЩm ."
 
-#: shell/e-setup.c:158 shell/e-setup.c:224
+#: shell/e-setup.c:160 shell/e-setup.c:228
 msgid "Evolution files successfully installed."
 msgstr "Evolution dosyalarЩ baЧarЩlЩ yЭklendi."
 
-#: shell/e-setup.c:187
+#: shell/e-setup.c:189
 msgid "This seems to be the first time you run Evolution."
 msgstr "Bu Evolution'i ilk ГalЩЧtЩrmana benziyor ."
 
-#: shell/e-setup.c:188
+#: shell/e-setup.c:190
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr "\"Oldu\"'ya tЩklayЩp, Evolution kullanЩcЩ dosyalarЩnЩ"
 
-#: shell/e-setup.c:205
+#: shell/e-setup.c:209
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -5257,7 +5695,7 @@ msgstr ""
 "\n"
 "Hata : %s"
 
-#: shell/e-setup.c:220
+#: shell/e-setup.c:224
 #, c-format
 msgid ""
 "Cannot copy files into\n"
@@ -5266,7 +5704,7 @@ msgstr ""
 "DosyalarЩ `%s''ye\n"
 "kopyalayamadЩm ."
 
-#: shell/e-setup.c:245
+#: shell/e-setup.c:249
 #, fuzzy, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -5277,7 +5715,7 @@ msgstr ""
 "Evolution kullanЩcЩ dosyalarЩnЩn yЭklenmesi\n"
 "iГin o'nu sil."
 
-#: shell/e-setup.c:257
+#: shell/e-setup.c:261
 #, fuzzy, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -5313,7 +5751,7 @@ msgstr ""
 "Belirtilen eylem iГin bu seГili klasЖr tipi \n"
 "geГerli deПildir ."
 
-#: shell/e-shell-folder-selection-dialog.c:291
+#: shell/e-shell-folder-selection-dialog.c:297
 msgid "New..."
 msgstr "Yeni ..."
 
@@ -5321,23 +5759,19 @@ msgstr "Yeni ..."
 msgid "(Untitled)"
 msgstr "( Isimsiz )"
 
-#. you might have to call gnome_dialog_run() on the
-#. * dialog returned here, I don't remember...
-#.
-#: shell/e-shell-view-menu.c:114
+#: shell/e-shell-view-menu.c:111
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug-buddy $PATH dizinlenmende bulunamadЩ."
 
-#. same as above
-#: shell/e-shell-view-menu.c:120
+#: shell/e-shell-view-menu.c:117
 msgid "Bug buddy could not be run."
 msgstr "Bug-buddy ГalЩЧtЩrЩlЩnamadЩ."
 
-#: shell/e-shell-view-menu.c:172
+#: shell/e-shell-view-menu.c:169
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr "Tel'if hakkЩ (C) 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:174
+#: shell/e-shell-view-menu.c:171
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -5347,7 +5781,7 @@ msgstr ""
 "takvim ve tanЩklar yЖnetim uygulamasЩ\n"
 "idir."
 
-#: shell/e-shell-view-menu.c:335
+#: shell/e-shell-view-menu.c:332
 msgid "Go to folder..."
 msgstr "Dizinde git ..."
 
@@ -5450,9 +5884,8 @@ msgstr "Bu kЩsayolu kЩsayol ГubuПundan sil"
 msgid "Error saving shortcuts."
 msgstr "KЩsayollarЩ kaydederken hata oldu."
 
-#: po/tmp/evolution-event-editor.xml.h:125
-#: po/tmp/evolution-message-composer.xml.h:43 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 "_GЖster"
 
@@ -5510,12 +5943,13 @@ msgid "The specified type is not supported in this storage"
 msgstr "Bu kayЩtta belirtilen tip desteklenmiyor"
 
 #: shell/main.c:74
+#, fuzzy
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
-"Over the last month and a half, our focus has been on making\n"
-"Evolution usable. Many of the Evolution developers are now using\n"
+"Over the time since the past release, our focus has been on making\n"
+"Evolution usable.  Many of the Evolution developers are now using\n"
 "Evolution to read their mail full time. You could too. (Just\n"
 "be sure to keep a backup.)\n"
 "\n"
@@ -5568,1197 +6002,1217 @@ msgstr ""
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobo parГalar sistemini baЧlatamadЩm."
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#: po/tmp/evolution-addressbook-ldap.xml.h:6
-msgid "N_ew Directory Server"
-msgstr "Yeni _dizin sunucusu"
-
-#: po/tmp/evolution-addressbook-ldap.xml.h:7
-msgid "_Actions"
-msgstr "E_ylemler"
-
-#: po/tmp/evolution-addressbook.xml.h:7
+#: ui/evolution-addressbook.xml.h:7
 msgid "Create a new contact"
 msgstr "Yeni bir tanЩk birimi yarat"
 
-#: po/tmp/evolution-addressbook.xml.h:9
+#: ui/evolution-addressbook.xml.h:9
 msgid "Delete a contact"
 msgstr "TanЩПЩ sil"
 
-#: 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 "Bul"
 
-#: po/tmp/evolution-addressbook.xml.h:11
+#: ui/evolution-addressbook.xml.h:11
 msgid "Find a contact"
 msgstr "Bir tanЩПЩ bul"
 
-#: 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 "Yeni"
 
-#: po/tmp/evolution-addressbook.xml.h:14
+#: ui/evolution-addressbook.xml.h:14
 msgid "Print contacts"
 msgstr "TanЩklarЩy azdЩrt"
 
-#: 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
 #, fuzzy
 msgid "Stop Loading"
 msgstr "GЖlgeleme"
 
-#: po/tmp/evolution-addressbook.xml.h:17
+#: ui/evolution-addressbook.xml.h:17
 #, fuzzy
 msgid "View All"
 msgstr "_GЖster"
 
-#: po/tmp/evolution-addressbook.xml.h:18
+#: ui/evolution-addressbook.xml.h:18
 #, fuzzy
 msgid "View all contacts"
 msgstr "Bir tanЩПЩ bul"
 
-#: po/tmp/evolution-addressbook.xml.h:19
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "_Addressbook Configuration..."
+msgstr "_ePosta ayarlarЩ ..."
+
+#: ui/evolution-addressbook.xml.h:20
 #, fuzzy
 msgid "_Print Contacts..."
 msgstr "TanЩklarЩy azdЩrt"
 
-#: po/tmp/evolution-addressbook.xml.h:20
+#: ui/evolution-addressbook.xml.h:21
 msgid "_Search for contacts"
 msgstr ""
 
-#: po/tmp/evolution-addressbook.xml.h:21
-#: po/tmp/evolution-event-editor.xml.h:123
+#: ui/evolution-addressbook.xml.h:22 ui/evolution-event-editor.xml.h:123
 msgid "_Tools"
 msgstr "_гerezler"
 
 #.
-#. * 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 gЭn"
 
-#: po/tmp/evolution-calendar.xml.h:7
+#: ui/evolution-calendar.xml.h:7
 #, fuzzy
 msgid "Alter preferences"
 msgstr "Ayarlar"
 
-#: po/tmp/evolution-calendar.xml.h:8
+#: ui/evolution-calendar.xml.h:8
 #, fuzzy
 msgid "Ca_lendar"
 msgstr "Yeni _takvim"
 
-#: po/tmp/evolution-calendar.xml.h:9
+#: ui/evolution-calendar.xml.h:9
 #, fuzzy
 msgid "Calendar Preferences..."
 msgstr "Ayarlar"
 
-#: po/tmp/evolution-calendar.xml.h:10
+#: ui/evolution-calendar.xml.h:10
 msgid "Create a new appointment"
 msgstr "Yeni bir toplantЩ"
 
-#: po/tmp/evolution-calendar.xml.h:11
+#: ui/evolution-calendar.xml.h:11
 msgid "Create a new calendar"
 msgstr "Yeni bir takvimi yarat"
 
-#: po/tmp/evolution-calendar.xml.h:12
+#: ui/evolution-calendar.xml.h:12
 msgid "Day"
 msgstr "GЭn"
 
-#: po/tmp/evolution-calendar.xml.h:13
+#: ui/evolution-calendar.xml.h:13
 msgid "Go back in time"
 msgstr "Zamanda geri git"
 
-#: po/tmp/evolution-calendar.xml.h:14
+#: ui/evolution-calendar.xml.h:14
 msgid "Go forward in time"
 msgstr "Zamanda ileri git"
 
-#: po/tmp/evolution-calendar.xml.h:15
+#: ui/evolution-calendar.xml.h:15
 msgid "Go to"
 msgstr "Git"
 
-#: po/tmp/evolution-calendar.xml.h:16
+#: ui/evolution-calendar.xml.h:16
 msgid "Go to a specific date"
 msgstr "Belirli bir tarihe git"
 
-#: po/tmp/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:17
 msgid "Go to present time"
 msgstr "чimdiki zamana git"
 
-#: po/tmp/evolution-calendar.xml.h:18
+#: ui/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Ay"
 
-#: 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 "Ileri"
 
-#: po/tmp/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:21
 msgid "Open a calendar"
 msgstr "Bir takvimi aГ"
 
-#: po/tmp/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:22
 msgid "Prev"
 msgstr "Geri"
 
-#: po/tmp/evolution-calendar.xml.h:24
+#: ui/evolution-calendar.xml.h:24
 msgid "Print this calendar"
 msgstr "Bu takvimi yazdЩrt"
 
-#: 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 gЭnЭ gЖster"
 
-#: po/tmp/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:27
 msgid "Show 1 month"
 msgstr "1 ayЩ gЖster"
 
-#: po/tmp/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:28
 msgid "Show 1 week"
 msgstr "2 haftayЩ Жster"
 
-#: po/tmp/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr "гalЩЧma haftasЩnЩ gЖster"
 
-#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:414
+#: ui/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:413
 msgid "Today"
 msgstr "BugЭn"
 
-#: po/tmp/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:31
 msgid "Week"
 msgstr "Hafta"
 
-#: 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 "_Yeni"
 
-#: po/tmp/evolution-calendar.xml.h:33
+#: ui/evolution-calendar.xml.h:33
 #, fuzzy
 msgid "_Open Calendar"
 msgstr "_Takvimi aГ"
 
-#: po/tmp/evolution-calendar.xml.h:34
+#: ui/evolution-calendar.xml.h:34
 #, fuzzy
 msgid "_Print this calendar"
 msgstr "Bu takvimi yazdЩrt"
 
-#: po/tmp/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:35
 #, fuzzy
-msgid "_Save Calendar As"
-msgstr "Takvimi farklЩ kaydet"
+msgid "_Save As..."
+msgstr "FarklЩ kaydet ..."
 
-#: po/tmp/evolution-contact-editor.xml.h:7
+#: ui/evolution-contact-editor.xml.h:7
 msgid "Delete this item"
 msgstr "Bu birimi sil"
 
-#: po/tmp/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-editor.xml.h:8
 #, fuzzy
 msgid "Delete..."
 msgstr "Sil"
 
-#: po/tmp/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-editor.xml.h:9
 #, fuzzy
 msgid "Help"
 msgstr "_Bark"
 
-#: po/tmp/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-editor.xml.h:10
 #, fuzzy
 msgid "Print En_velope..."
 msgstr "YazdЩr ..."
 
-#: 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 "Bu birimi yazdЩrt"
 
-#: 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 "YazdЩr ..."
 
-#: po/tmp/evolution-contact-editor.xml.h:13
-#: po/tmp/evolution-event-editor.xml.h:89
-#: po/tmp/evolution-message-composer.xml.h:18
+#: ui/evolution-contact-editor.xml.h:13 ui/evolution-event-editor.xml.h:89
+#: ui/evolution-message-composer.xml.h:21
 #, fuzzy
 msgid "Save _As..."
 msgstr "FarklЩ kaydet ..."
 
-#: 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 "Kaydet ve kapat"
 
-#: po/tmp/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-editor.xml.h:15
 #, fuzzy
 msgid "Save the contact and close the dialog box"
 msgstr "ToplantЩyЩ kaydet ve diyaloПu kapat"
 
-#: 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 "YardЩma bak"
 
-#: po/tmp/evolution-contact-editor.xml.h:18
+#: ui/evolution-contact-editor.xml.h:18
 #, fuzzy
 msgid "Send _message to contact..."
 msgstr "ABY : TanЩПa yeni bir _ileti"
 
-#: po/tmp/evolution-contact-editor.xml.h:19
-#: po/tmp/evolution-event-editor.xml.h:110
-#: po/tmp/evolution-message-composer.xml.h:38
-#: 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 "_Dosya"
 
-#: po/tmp/evolution-contact-editor.xml.h:20
+#: ui/evolution-contact-editor.xml.h:20
 #, fuzzy
 msgid "_Print..."
 msgstr "YazdЩr ..."
 
-#: po/tmp/evolution-contact-editor.xml.h:21
-#: po/tmp/evolution-event-editor.xml.h:121
-#: po/tmp/evolution-message-composer.xml.h:42
+#: ui/evolution-contact-editor.xml.h:21 ui/evolution-event-editor.xml.h:121
+#: ui/evolution-message-composer.xml.h:46
 #, fuzzy
 msgid "_Save"
 msgstr "_FarklЩ kaydet ..."
 
 #.
-#. * 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
 #, fuzzy
 msgid "About..."
 msgstr "YazЩ tipi ..."
 
-#: po/tmp/evolution-event-editor.xml.h:8
+#: ui/evolution-event-editor.xml.h:8
 msgid "Actio_ns"
 msgstr "E_ylemler"
 
-#: po/tmp/evolution-event-editor.xml.h:9
+#: ui/evolution-event-editor.xml.h:9
 #, fuzzy
 msgid "C_lear"
 msgstr "Araba"
 
-#: po/tmp/evolution-event-editor.xml.h:10
+#: ui/evolution-event-editor.xml.h:10
 #, fuzzy
 msgid "C_ut"
 msgstr "Kes"
 
-#: po/tmp/evolution-event-editor.xml.h:11
+#: ui/evolution-event-editor.xml.h:11
 #, fuzzy
 msgid "Clear"
 msgstr "Araba"
 
-#: 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
 #, fuzzy
 msgid "Close this appointment"
 msgstr "Bu toplantЩyЩ sil"
 
-#: 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 "Kopyala"
 
-#: 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 "Kes"
 
-#: 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 "ABY : Adres _defteri ..."
 
-#: po/tmp/evolution-event-editor.xml.h:24
+#: ui/evolution-event-editor.xml.h:24
 msgid "FIXME: Ch_oose Form..."
 msgstr "ABY : SeГme _formu ..."
 
-#: po/tmp/evolution-event-editor.xml.h:25
+#: ui/evolution-event-editor.xml.h:25
 msgid "FIXME: Chec_k Names"
 msgstr "ABY : Isimleri gЖzden g_eГir"
 
-#: po/tmp/evolution-event-editor.xml.h:26
+#: ui/evolution-event-editor.xml.h:26
 msgid "FIXME: Cop_y to Folder..."
 msgstr "ABY : Dizine _kopyala ..."
 
-#: po/tmp/evolution-event-editor.xml.h:27
+#: ui/evolution-event-editor.xml.h:27
 msgid "FIXME: D_esign a Form..."
 msgstr "ABY : _Bir formu dЭzenle ..."
 
-#: po/tmp/evolution-event-editor.xml.h:28
+#: ui/evolution-event-editor.xml.h:28
 #, fuzzy
 msgid "FIXME: Define Print _Styles"
 msgstr "ABY : YazdЩrma _stilini belirle"
 
-#: po/tmp/evolution-event-editor.xml.h:29
+#: ui/evolution-event-editor.xml.h:29
 msgid "FIXME: Desi_gn This Form"
 msgstr "ABY : Bu formu _dЭzenle"
 
-#: po/tmp/evolution-event-editor.xml.h:30
+#: ui/evolution-event-editor.xml.h:30
 msgid "FIXME: Fi_rst Item in Folder"
 msgstr "ABY : Dizindeki _ilk birim"
 
-#: po/tmp/evolution-event-editor.xml.h:31
+#: ui/evolution-event-editor.xml.h:31
 msgid "FIXME: For_ward"
 msgstr "ABY : _Ilet"
 
-#: po/tmp/evolution-event-editor.xml.h:32
+#: ui/evolution-event-editor.xml.h:32
 msgid "FIXME: Forward as v_Calendar"
 msgstr "ABY : v_Calendat Чeklinde ilet"
 
-#: po/tmp/evolution-event-editor.xml.h:33
+#: ui/evolution-event-editor.xml.h:33
 msgid "FIXME: Help"
 msgstr "ABY : YardЩm"
 
-#: po/tmp/evolution-event-editor.xml.h:34
+#: ui/evolution-event-editor.xml.h:34
 #, fuzzy
 msgid "FIXME: In_complete Task"
 msgstr "ABY : _GЖrev"
 
-#: po/tmp/evolution-event-editor.xml.h:35
+#: ui/evolution-event-editor.xml.h:35
 #, fuzzy
 msgid "FIXME: Insert File"
 msgstr "ABY : Dosya iГer ..."
 
-#: po/tmp/evolution-event-editor.xml.h:36
+#: ui/evolution-event-editor.xml.h:36
 msgid "FIXME: It_em..."
 msgstr "ABY : Bi_rim ..."
 
-#: po/tmp/evolution-event-editor.xml.h:37
+#: ui/evolution-event-editor.xml.h:37
 #, fuzzy
 msgid "FIXME: Paste _Special... "
 msgstr "ABY : ж_zel yapЩЧtЩr ..."
 
-#: po/tmp/evolution-event-editor.xml.h:38
+#: ui/evolution-event-editor.xml.h:38
 msgid "FIXME: Print Pre_view"
 msgstr "ABY : YazdЩrma Жnizlemesi"
 
-#: po/tmp/evolution-event-editor.xml.h:39
+#: ui/evolution-event-editor.xml.h:39
 msgid "FIXME: Pu_blish Form As..."
 msgstr "ABY : Formu far_klЩ aГikla ..."
 
-#: po/tmp/evolution-event-editor.xml.h:40
+#: ui/evolution-event-editor.xml.h:40
 msgid "FIXME: Publish _Form..."
 msgstr "ABY : _Formu aГЩkla ..."
 
-#: po/tmp/evolution-event-editor.xml.h:41
+#: ui/evolution-event-editor.xml.h:41
 msgid "FIXME: Rec_urrence..."
 msgstr "ABY : _Kaynaklar ..."
 
-#: po/tmp/evolution-event-editor.xml.h:42
+#: ui/evolution-event-editor.xml.h:42
 msgid "FIXME: S_end"
 msgstr "ABY : GЖ_nder"
 
-#: po/tmp/evolution-event-editor.xml.h:43
+#: ui/evolution-event-editor.xml.h:43
 msgid "FIXME: Save Attac_hments..."
 msgstr "ABY : Eklem _ekle ..."
 
-#: po/tmp/evolution-event-editor.xml.h:44
+#: ui/evolution-event-editor.xml.h:44
 msgid "FIXME: Script _Debugger"
 msgstr "ABY : Denetlem ГЖ_zЭmleyicisi"
 
-#: po/tmp/evolution-event-editor.xml.h:45
+#: ui/evolution-event-editor.xml.h:45
 msgid "FIXME: Task _Request"
 msgstr "ABY : GЖrev _isteПi"
 
-#: po/tmp/evolution-event-editor.xml.h:46
+#: ui/evolution-event-editor.xml.h:46
 msgid "FIXME: _Contact"
 msgstr "ABY : _TanЩk"
 
-#: po/tmp/evolution-event-editor.xml.h:47
+#: ui/evolution-event-editor.xml.h:47
 msgid "FIXME: _Customize..."
 msgstr "ABY : _жzelleЧtir ..."
 
-#: po/tmp/evolution-event-editor.xml.h:48
+#: ui/evolution-event-editor.xml.h:48
 msgid "FIXME: _File..."
 msgstr "ABY : _Dosya ..."
 
-#: po/tmp/evolution-event-editor.xml.h:49
+#: ui/evolution-event-editor.xml.h:49
 msgid "FIXME: _Font..."
 msgstr "ABY : _YazЩ tipi ..."
 
-#: po/tmp/evolution-event-editor.xml.h:50
+#: ui/evolution-event-editor.xml.h:50
 #, fuzzy
 msgid "FIXME: _Formatting"
 msgstr "ABY : __чekillendirme"
 
-#: po/tmp/evolution-event-editor.xml.h:51
+#: ui/evolution-event-editor.xml.h:51
 msgid "FIXME: _Item"
 msgstr "ABY : _Birim"
 
-#: po/tmp/evolution-event-editor.xml.h:52
+#: ui/evolution-event-editor.xml.h:52
 msgid "FIXME: _Journal Entry"
 msgstr "ABY : GЭ_nlЭk birimi"
 
-#: po/tmp/evolution-event-editor.xml.h:53
+#: ui/evolution-event-editor.xml.h:53
 msgid "FIXME: _Last Item in Folder"
 msgstr "ABY : Dizindeki _son birim"
 
-#: po/tmp/evolution-event-editor.xml.h:54
+#: ui/evolution-event-editor.xml.h:54
 msgid "FIXME: _Mail Message"
 msgstr "ABY : e_Posta iletisi"
 
-#: po/tmp/evolution-event-editor.xml.h:55
+#: ui/evolution-event-editor.xml.h:55
 msgid "FIXME: _Memo Style"
 msgstr "ABY : _AnЩ stili"
 
-#: po/tmp/evolution-event-editor.xml.h:56
+#: ui/evolution-event-editor.xml.h:56
 msgid "FIXME: _Move to Folder..."
 msgstr "ABY : Dizine _taЧЩ ..."
 
-#: po/tmp/evolution-event-editor.xml.h:57
+#: ui/evolution-event-editor.xml.h:57
 msgid "FIXME: _New Appointment"
 msgstr "ABY : _Yeni toplantЩ"
 
-#: po/tmp/evolution-event-editor.xml.h:58
+#: ui/evolution-event-editor.xml.h:58
 msgid "FIXME: _Note"
 msgstr "ABY : _Not"
 
-#: po/tmp/evolution-event-editor.xml.h:59
+#: ui/evolution-event-editor.xml.h:59
 msgid "FIXME: _Object..."
 msgstr "ABY : _Nesne ..."
 
-#: po/tmp/evolution-event-editor.xml.h:60
+#: ui/evolution-event-editor.xml.h:60
 msgid "FIXME: _Paragraph..."
 msgstr "ABY : _FЩkra ..."
 
-#: po/tmp/evolution-event-editor.xml.h:61
+#: ui/evolution-event-editor.xml.h:61
 msgid "FIXME: _Spelling..."
 msgstr "ABY : _Imla ..."
 
-#: po/tmp/evolution-event-editor.xml.h:62
+#: ui/evolution-event-editor.xml.h:62
 msgid "FIXME: _Standard"
 msgstr "ABY : _Vasat"
 
-#: po/tmp/evolution-event-editor.xml.h:63
+#: ui/evolution-event-editor.xml.h:63
 msgid "FIXME: _Task"
 msgstr "ABY : _GЖrev"
 
-#: po/tmp/evolution-event-editor.xml.h:64
+#: ui/evolution-event-editor.xml.h:64
 msgid "FIXME: _Unread Item"
 msgstr "ABY : _OkunmamЩЧ birim"
 
-#: 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:10
+#: ui/evolution-event-editor.xml.h:66 ui/evolution-message-composer.xml.h:11
 msgid "F_ormat"
 msgstr "чeki_l"
 
-#: 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 "Ilerideki birime git"
 
-#: po/tmp/evolution-event-editor.xml.h:71
+#: ui/evolution-event-editor.xml.h:71
 msgid "Go to the previous item"
 msgstr "Gerideki birime git"
 
-#: po/tmp/evolution-event-editor.xml.h:72
+#: ui/evolution-event-editor.xml.h:72
 #, fuzzy
 msgid "Modify the file's properties"
 msgstr "\"YapЩlacak\"'lar listesi Жzellikler"
 
-#: po/tmp/evolution-event-editor.xml.h:73
+#: ui/evolution-event-editor.xml.h:73
 #, fuzzy
 msgid "N_ext"
 msgstr "Ileri"
 
-#: po/tmp/evolution-event-editor.xml.h:75
+#: ui/evolution-event-editor.xml.h:75
 msgid "Paste"
 msgstr "YapЩЧtЩr"
 
-#: po/tmp/evolution-event-editor.xml.h:76
+#: ui/evolution-event-editor.xml.h:76
 #, fuzzy
 msgid "Paste the clipboard"
 msgstr "Birimi arabellekten yapЩЧtЩr"
 
-#: po/tmp/evolution-event-editor.xml.h:77
+#: ui/evolution-event-editor.xml.h:77
 msgid "Pre_vious"
 msgstr "_Geri"
 
-#: po/tmp/evolution-event-editor.xml.h:78
+#: ui/evolution-event-editor.xml.h:78
 #, fuzzy
 msgid "Previous"
 msgstr "_Geri"
 
-#: po/tmp/evolution-event-editor.xml.h:79
+#: ui/evolution-event-editor.xml.h:79
 #, fuzzy
 msgid "Print S_etup..."
 msgstr "YazdЩr ..."
 
-#: po/tmp/evolution-event-editor.xml.h:80
+#: ui/evolution-event-editor.xml.h:80
 #, fuzzy
 msgid "Print Setup"
 msgstr "Sayfa _kurulumu"
 
-#: po/tmp/evolution-event-editor.xml.h:83
+#: ui/evolution-event-editor.xml.h:83
 #, fuzzy
 msgid "Properties"
 msgstr "жzellikler ..."
 
-#: po/tmp/evolution-event-editor.xml.h:84
+#: ui/evolution-event-editor.xml.h:84
 #, fuzzy
 msgid "Redo"
 msgstr "Radyo"
 
-#: 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
 #, fuzzy
 msgid "Replace"
 msgstr "Cevapla"
 
-#: 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 "ToplantЩyЩ kaydet ve diyaloПu kapat"
 
-#: po/tmp/evolution-event-editor.xml.h:92
-#: po/tmp/evolution-message-composer.xml.h:21
+#: ui/evolution-event-editor.xml.h:92 ui/evolution-message-composer.xml.h:24
 #, fuzzy
 msgid "Save the current file"
 msgstr "Imza dosyasЩ : "
 
-#: 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
 #, fuzzy
 msgid "Select All"
 msgstr "Hepsine cevapla"
 
-#: po/tmp/evolution-event-editor.xml.h:100
+#: ui/evolution-event-editor.xml.h:100
 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:34
+#: ui/evolution-event-editor.xml.h:104 ui/evolution-message-composer.xml.h:38
 #, fuzzy
 msgid "_About..."
 msgstr "_Evolution bilgisi ..."
 
-#: po/tmp/evolution-event-editor.xml.h:105
-#: po/tmp/evolution-message-composer.xml.h:35
+#: ui/evolution-event-editor.xml.h:105 ui/evolution-message-composer.xml.h:39
 #, fuzzy
 msgid "_Close"
 msgstr "Kapat"
 
-#: po/tmp/evolution-event-editor.xml.h:106
+#: ui/evolution-event-editor.xml.h:106
 #, fuzzy
 msgid "_Copy"
 msgstr "Kopyala"
 
-#: po/tmp/evolution-event-editor.xml.h:107
-#: po/tmp/evolution-message-composer.xml.h:36
+#: 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:37
-#: 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 "_DeПiЧtir"
 
-#: po/tmp/evolution-event-editor.xml.h:111
+#: ui/evolution-event-editor.xml.h:111
 #, fuzzy
 msgid "_Find..."
 msgstr "Bul"
 
-#: po/tmp/evolution-event-editor.xml.h:112
+#: ui/evolution-event-editor.xml.h:112
 msgid "_Forms"
 msgstr "_чekiller"
 
-#: po/tmp/evolution-event-editor.xml.h:113
-#: po/tmp/evolution-message-composer.xml.h:39 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 "_Bark"
 
-#: po/tmp/evolution-event-editor.xml.h:114
+#: ui/evolution-event-editor.xml.h:114
 msgid "_Insert"
 msgstr "_IГer"
 
-#: po/tmp/evolution-event-editor.xml.h:115
+#: ui/evolution-event-editor.xml.h:115
 msgid "_Object"
 msgstr "_Nesne"
 
-#: po/tmp/evolution-event-editor.xml.h:116
+#: ui/evolution-event-editor.xml.h:116
 #, fuzzy
 msgid "_Paste"
 msgstr "YapЩЧtЩr"
 
-#: po/tmp/evolution-event-editor.xml.h:117
+#: ui/evolution-event-editor.xml.h:117
 #, fuzzy
 msgid "_Print"
 msgstr "YazdЩr"
 
-#: po/tmp/evolution-event-editor.xml.h:118
+#: ui/evolution-event-editor.xml.h:118
 #, fuzzy
 msgid "_Properties..."
 msgstr "жzellikler ..."
 
-#: po/tmp/evolution-event-editor.xml.h:119
+#: ui/evolution-event-editor.xml.h:119
 #, fuzzy
 msgid "_Redo"
 msgstr "Radyo"
 
-#: po/tmp/evolution-event-editor.xml.h:120
+#: ui/evolution-event-editor.xml.h:120
 #, fuzzy
 msgid "_Replace..."
 msgstr "_AГ ..."
 
-#: po/tmp/evolution-event-editor.xml.h:122
+#: ui/evolution-event-editor.xml.h:122
 msgid "_Toolbars"
 msgstr "_AraГ ГubuklarЩ"
 
-#: po/tmp/evolution-event-editor.xml.h:124
+#: ui/evolution-event-editor.xml.h:124
 #, fuzzy
 msgid "_Undo"
 msgstr "_GЖnder"
 
 #.
-#. * 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 "Yaz"
 
-#: po/tmp/evolution-mail.xml.h:7
+#: ui/evolution-mail.xml.h:7
 msgid "Compose a new message"
 msgstr "Yeni bir ePosta iletisini yaz"
 
-#: po/tmp/evolution-mail.xml.h:9
+#: ui/evolution-mail.xml.h:9
 #, fuzzy
 msgid "Copy message to a new folder"
 msgstr "Iletiyi yeni bir dizine taЧЩ"
 
-#: 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
 #, fuzzy
 msgid "F_older"
 msgstr "_Dizin"
 
-#: 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 "_ParolalarЩ unut"
 
-#: po/tmp/evolution-mail.xml.h:20
+#: ui/evolution-mail.xml.h:20
 #, fuzzy
 msgid "Get Mail"
 msgstr "ePosta'yЩ al"
 
-#: po/tmp/evolution-mail.xml.h:21
+#: ui/evolution-mail.xml.h:22
+#, fuzzy
+msgid "Hide _Deleted messages"
+msgstr "SeГili iletiyi yazdЩr"
+
+#: ui/evolution-mail.xml.h:23
+#, fuzzy
+msgid "Hide _Read messages"
+msgstr "Bu iletiyi ilet"
+
+#: ui/evolution-mail.xml.h:24
+#, fuzzy
+msgid "Hide _Selected messages"
+msgstr "SeГili iletiyi yazdЩr"
+
+#: ui/evolution-mail.xml.h:25
 #, fuzzy
-msgid "Mail _Filters"
+msgid "Mail _Filters..."
 msgstr "ePosta _filtralarЩ ..."
 
-#: po/tmp/evolution-mail.xml.h:22
+#: ui/evolution-mail.xml.h:26
 #, fuzzy
-msgid "Manage Subscriptions"
+msgid "Manage Subscriptions..."
 msgstr "AnlatЩm :"
 
-#: po/tmp/evolution-mail.xml.h:23
+#: ui/evolution-mail.xml.h:27
 msgid "Mar_k As Read"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:24
+#: ui/evolution-mail.xml.h:28
 #, fuzzy
 msgid "Mark As U_nread"
 msgstr "ABY : _OkunmamЩЧ olarak iЧaretle"
 
-#: po/tmp/evolution-mail.xml.h:25
+#: ui/evolution-mail.xml.h:29
 msgid "Move"
 msgstr "TaЧЩ"
 
-#: po/tmp/evolution-mail.xml.h:26
+#: ui/evolution-mail.xml.h:30
 msgid "Move message to a new folder"
 msgstr "Iletiyi yeni bir dizine taЧЩ"
 
-#: po/tmp/evolution-mail.xml.h:27
+#: ui/evolution-mail.xml.h:31
 msgid "Previews the message to be printed"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:29
+#: ui/evolution-mail.xml.h:33
 #, fuzzy
 msgid "Print Preview of message..."
 msgstr "YazdЩrma Жnizlemesi"
 
-#: po/tmp/evolution-mail.xml.h:30
+#: ui/evolution-mail.xml.h:34
 msgid "Print message to the printer"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:31
+#: ui/evolution-mail.xml.h:35
 #, fuzzy
 msgid "Print message..."
 msgstr "YazdЩr ..."
 
-#: po/tmp/evolution-mail.xml.h:35
+#: ui/evolution-mail.xml.h:39
 #, fuzzy
 msgid "Reply to _All"
 msgstr "Hepsine cevapla"
 
-#: po/tmp/evolution-mail.xml.h:36
+#: ui/evolution-mail.xml.h:40
 #, fuzzy
 msgid "Reply to _Sender"
 msgstr "Hepsine cevapla"
 
-#: po/tmp/evolution-mail.xml.h:39 po/tmp/evolution-subscribe.xml.h:12
+#: ui/evolution-mail.xml.h:43 ui/evolution-subscribe.xml.h:12
 #, fuzzy
 msgid "Select _All"
 msgstr "Hepsine cevapla"
 
-#: po/tmp/evolution-mail.xml.h:40
+#: ui/evolution-mail.xml.h:44
 msgid "Send queued mail and retrieve new mail"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:41
+#: ui/evolution-mail.xml.h:45
+#, fuzzy
+msgid "Show _All messages"
+msgstr "Bu iletiyi ilet"
+
+#: ui/evolution-mail.xml.h:46
 #, fuzzy
 msgid "Threaded Message list"
 msgstr "Iletilerin k_onu listesi"
 
-#: po/tmp/evolution-mail.xml.h:42
+#: ui/evolution-mail.xml.h:47
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:43
+#: ui/evolution-mail.xml.h:48
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:44
+#: ui/evolution-mail.xml.h:49
 msgid "View Raw Message Source"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:45
+#: ui/evolution-mail.xml.h:50
 #, fuzzy
 msgid "_Apply Filters"
 msgstr "Filtra"
 
-#: po/tmp/evolution-mail.xml.h:46
+#: ui/evolution-mail.xml.h:51
 msgid "_Configure Folder"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:47
+#: ui/evolution-mail.xml.h:52
 #, fuzzy
 msgid "_Copy to Folder..."
 msgstr "Dizine _git ..."
 
-#: po/tmp/evolution-mail.xml.h:49
+#: ui/evolution-mail.xml.h:54
 #, fuzzy
 msgid "_Edit Message"
 msgstr "Iletiyi gЖnder"
 
-#: po/tmp/evolution-mail.xml.h:50
+#: ui/evolution-mail.xml.h:55
 msgid "_Expunge"
 msgstr "_Temizle"
 
-#: po/tmp/evolution-mail.xml.h:51
+#: ui/evolution-mail.xml.h:56
 msgid "_Filter on Subject"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:52
+#: ui/evolution-mail.xml.h:57
 #, fuzzy
 msgid "_Forward"
 msgstr "Ilet"
 
-#: po/tmp/evolution-mail.xml.h:53 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:54
+#: ui/evolution-mail.xml.h:59
 #, fuzzy
-msgid "_Mail Configuration"
-msgstr "ePosta ayarlamasЩ"
+msgid "_Mail Configuration..."
+msgstr "_ePosta ayarlarЩ ..."
 
-#: po/tmp/evolution-mail.xml.h:55
+#: ui/evolution-mail.xml.h:60
 #, fuzzy
 msgid "_Message"
 msgstr "Iletiyi kaydet"
 
-#: po/tmp/evolution-mail.xml.h:56
+#: ui/evolution-mail.xml.h:61
 #, fuzzy
 msgid "_Move to Folder..."
 msgstr "ABY : Dizine _taЧЩ ..."
 
-#: po/tmp/evolution-mail.xml.h:57
+#: ui/evolution-mail.xml.h:62
 msgid "_Open in New Window"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:58
+#: ui/evolution-mail.xml.h:63
 #, fuzzy
 msgid "_Print Message"
 msgstr "Iletiyi gЖnder"
 
-#: po/tmp/evolution-mail.xml.h:59
+#: ui/evolution-mail.xml.h:64
 #, fuzzy
 msgid "_Save Message As..."
 msgstr "_FarklЩ kaydet ..."
 
-#: po/tmp/evolution-mail.xml.h:60
+#: ui/evolution-mail.xml.h:65
 #, fuzzy
 msgid "_Source"
 msgstr "Kaynak ekle"
 
-#: po/tmp/evolution-mail.xml.h:61
+#: ui/evolution-mail.xml.h:66
 msgid "_Threaded"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:62
+#: ui/evolution-mail.xml.h:67
 #, fuzzy
 msgid "_Undelete"
 msgstr "_Sil"
 
-#: po/tmp/evolution-mail.xml.h:63
+#: ui/evolution-mail.xml.h:68
 msgid "_VFolder on Subject"
 msgstr ""
 
-#: po/tmp/evolution-mail.xml.h:64
+#: ui/evolution-mail.xml.h:69
 #, fuzzy
-msgid "_Virtual Folder Editor"
+msgid "_Virtual Folder Editor..."
 msgstr "_Sanal Dizin SihirbazЩ ..."
 
 #.
-#. * 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 "Ekle"
 
-#: 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:11
+#: ui/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "Encrypt this message with PGP"
+msgstr "Iletiyi gЖnder"
+
+#: ui/evolution-message-composer.xml.h:12
 msgid "HTML"
 msgstr "HTML"
 
-#: po/tmp/evolution-message-composer.xml.h:12
+#: ui/evolution-message-composer.xml.h:13
 msgid "Insert a file as text into the message"
 msgstr "Bir dosyayЩ metin olarak ekle"
 
-#: po/tmp/evolution-message-composer.xml.h:13
+#: ui/evolution-message-composer.xml.h:14
 #, fuzzy
 msgid "Insert text file..."
 msgstr "_Metin dosyasЩnЩ iГer ... ( ABY )"
 
-#: po/tmp/evolution-message-composer.xml.h:15
+#: ui/evolution-message-composer.xml.h:16
 #, fuzzy
 msgid "Open a file"
 msgstr "DosyayЩ aГ"
 
-#: po/tmp/evolution-message-composer.xml.h:17
+#: ui/evolution-message-composer.xml.h:17
+msgid "PGP Encrypt"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:18
+msgid "PGP Sign"
+msgstr ""
+
+#: ui/evolution-message-composer.xml.h:20
 #, fuzzy
 msgid "Save As"
 msgstr "FarklЩ kaydet ..."
 
-#: po/tmp/evolution-message-composer.xml.h:19
+#: ui/evolution-message-composer.xml.h:22
 #, fuzzy
 msgid "Save in _folder... (FIXME)"
 msgstr "_Dizinde kaydet ..."
 
-#: po/tmp/evolution-message-composer.xml.h:20
+#: ui/evolution-message-composer.xml.h:23
 #, fuzzy
 msgid "Save in folder..."
 msgstr "_Dizinde kaydet ..."
 
-#: po/tmp/evolution-message-composer.xml.h:22
+#: ui/evolution-message-composer.xml.h:25
 #, fuzzy
 msgid "Save the current file with a different name"
 msgstr "Iletiyi faklЩ bir isim altЩnda kaydet"
 
-#: po/tmp/evolution-message-composer.xml.h:23
+#: ui/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "Iletiyi belirlenen dizinde kaydet"
 
-#: po/tmp/evolution-message-composer.xml.h:24
+#: ui/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "GЖnder"
 
-#: po/tmp/evolution-message-composer.xml.h:25
+#: ui/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:26
+#: ui/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:27
+#: ui/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr "ePostayЩ HTML Чeklinde gЖnder"
 
-#: po/tmp/evolution-message-composer.xml.h:28
+#: ui/evolution-message-composer.xml.h:31
 #, fuzzy
 msgid "Send the message later"
 msgstr "Iletiyi gЖnder"
 
-#: po/tmp/evolution-message-composer.xml.h:29
+#: ui/evolution-message-composer.xml.h:32
 #, fuzzy
 msgid "Send the message now"
 msgstr "Iletiyi gЖnder"
 
-#: po/tmp/evolution-message-composer.xml.h:30
+#: ui/evolution-message-composer.xml.h:33
 #, fuzzy
 msgid "Send this message now"
 msgstr "Bu iletiyi gЖnder"
 
-#: po/tmp/evolution-message-composer.xml.h:31
+#: ui/evolution-message-composer.xml.h:34
 #, fuzzy
 msgid "Show / hide attachments"
 msgstr "Eklemleri gЖster/gizle"
 
-#: po/tmp/evolution-message-composer.xml.h:32
+#: ui/evolution-message-composer.xml.h:35
 msgid "Show _attachments"
 msgstr "_Eklemleri gЖster"
 
-#: po/tmp/evolution-message-composer.xml.h:33
+#: ui/evolution-message-composer.xml.h:36
 #, fuzzy
 msgid "Show attachments"
 msgstr "_Eklemleri gЖster"
 
-#: po/tmp/evolution-message-composer.xml.h:40
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Sign this message with your PGP key"
+msgstr "Iletiyi faklЩ bir isim altЩnda kaydet"
+
+#: ui/evolution-message-composer.xml.h:44
 msgid "_Insert text file... (FIXME)"
 msgstr "_Metin dosyasЩnЩ iГer ... ( ABY )"
 
-#: po/tmp/evolution-message-composer.xml.h:41
+#: ui/evolution-message-composer.xml.h:45
 msgid "_Open..."
 msgstr "_AГ ..."
 
+#: 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 "DeПiЧik bir dizini gЖster"
 
-#: po/tmp/evolution.xml.h:7
+#: ui/evolution.xml.h:7
 #, fuzzy
 msgid "E_xit"
 msgstr "гЩ_k ..."
 
-#: po/tmp/evolution.xml.h:8
+#: ui/evolution.xml.h:8
 msgid "Evolution bar _shortcut"
 msgstr "Evolution ГubuПu _kЩsayolu"
 
-#: 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 "Na_sЩl baЧlarЩm"
 
-#: po/tmp/evolution.xml.h:11
+#: ui/evolution.xml.h:11
 msgid "Show information about Evolution"
 msgstr "Evolution hakkЩnda bilgi gЖster"
 
-#: po/tmp/evolution.xml.h:12
+#: ui/evolution.xml.h:12
 #, fuzzy
 msgid "Show the _Folder Bar"
 msgstr "Dizinler ГubuПunu gЖsterir"
 
-#: po/tmp/evolution.xml.h:13
+#: ui/evolution.xml.h:13
 #, fuzzy
 msgid "Show the _Shortcut Bar"
 msgstr "KЩsayol ГubuПunu gЖsterir"
 
-#: po/tmp/evolution.xml.h:14
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "Submit _Bug Report"
 msgstr "_Hata raporunu gЖnder"
 
-#: po/tmp/evolution.xml.h:15
+#: ui/evolution.xml.h:15
 #, fuzzy
 msgid "Submit bug report using Bug Buddy."
 msgstr "bug-buddy desteПiyle bir hata raporunu gЖnder"
 
-#: po/tmp/evolution.xml.h:16
+#: ui/evolution.xml.h:16
 #, fuzzy
 msgid "Toggle whether to show the folder bar"
 msgstr "Dizinler ГubuПunu gЖsterir"
 
-#: po/tmp/evolution.xml.h:17
+#: ui/evolution.xml.h:17
 #, fuzzy
 msgid "Toggle whether to show the shortcut bar"
 msgstr "KЩsayol ГubuПunu gЖsterir"
 
-#: po/tmp/evolution.xml.h:18
+#: ui/evolution.xml.h:18
 #, fuzzy
 msgid "Using the C_ontact Manager"
 msgstr "Ta_nЩklar yЖneticisini nasЩl kullanЩrЩm"
 
-#: po/tmp/evolution.xml.h:19
+#: ui/evolution.xml.h:19
 #, fuzzy
 msgid "Using the _Calendar"
 msgstr "_Takvimi nasЩl kullanЩrЩm"
 
-#: po/tmp/evolution.xml.h:20
+#: ui/evolution.xml.h:20
 #, fuzzy
 msgid "Using the _Mailer"
 msgstr "_ePosta bЖlЭmЭnЭ nasЩl kullanЩrЩm"
 
-#: po/tmp/evolution.xml.h:21
+#: ui/evolution.xml.h:21
 msgid "_About Evolution..."
 msgstr "_Evolution bilgisi ..."
 
-#: po/tmp/evolution.xml.h:22
+#: ui/evolution.xml.h:22
 msgid "_Appointment (FIXME)"
 msgstr "T_oplantЩ"
 
-#: po/tmp/evolution.xml.h:23
+#: ui/evolution.xml.h:23
 msgid "_Contact (FIXME)"
 msgstr "_TanЩk"
 
-#: po/tmp/evolution.xml.h:26
+#: ui/evolution.xml.h:26
 msgid "_Folder"
 msgstr "_Dizin"
 
-#: po/tmp/evolution.xml.h:27
+#: ui/evolution.xml.h:27
 #, fuzzy
 msgid "_Go to Folder..."
 msgstr "Dizine _git ..."
 
-#: po/tmp/evolution.xml.h:29
+#: ui/evolution.xml.h:29
 #, fuzzy
 msgid "_Index"
 msgstr "_IГer"
 
-#: po/tmp/evolution.xml.h:30
+#: ui/evolution.xml.h:30
 msgid "_Mail message (FIXME)"
 msgstr "e_Posta iletisi"
 
-#: po/tmp/evolution.xml.h:32
+#: ui/evolution.xml.h:32
 #, fuzzy
 msgid "_Settings"
 msgstr "AyarlarЩ dene"
 
-#: po/tmp/evolution.xml.h:33
+#: ui/evolution.xml.h:33
 msgid "_Task (FIXME)"
 msgstr "_GЖrev"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2470
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2471
 #, fuzzy
 msgid "%A, %B %d, %Y"
 msgstr "%a %b %d %Y"
@@ -6839,29 +7293,35 @@ msgstr "ToplantЩ bitiЧ saati :"
 msgid "All Attendees"
 msgstr "Yekin ziyaretciler"
 
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: widgets/misc/e-calendar-item.c:421
+msgid "MTWTFSS"
+msgstr ""
+
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
+#: widgets/misc/e-calendar-item.c:1053 widgets/misc/e-calendar-item.c:2734
 msgid "%B %Y"
 msgstr ""
 
-#: widgets/misc/e-clipped-label.c:107
+#: widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-dateedit.c:408
+#: widgets/misc/e-dateedit.c:407
 #, fuzzy
 msgid "Now"
 msgstr "Yeni"
 
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1249 widgets/misc/e-dateedit.c:1308
-#: widgets/misc/e-dateedit.c:1487
+#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
+#: widgets/misc/e-dateedit.c:1486
 msgid "%H:%M"
 msgstr ""
 
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1252 widgets/misc/e-dateedit.c:1311
-#: widgets/misc/e-dateedit.c:1490
+#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
+#: widgets/misc/e-dateedit.c:1489
 msgid "%I:%M %p"
 msgstr ""
 
@@ -6870,6 +7330,223 @@ msgstr ""
 msgid "Group %i"
 msgstr "Kitle %i"
 
+#~ msgid "categories"
+#~ msgstr "tЭrler"
+
+#~ msgid "Item(s) belong to these categories:"
+#~ msgstr "Bu tЭrlere ait olan birimler :"
+
+#~ msgid "Available Categories:"
+#~ msgstr "Varolan tЭrler :"
+
+#~ msgid "Port Number:"
+#~ msgstr "KapЩ no. :"
+
+#~ msgid "Outline:"
+#~ msgstr "DЩЧlЩm :"
+
+#~ msgid "Headings:"
+#~ msgstr "BaЧlЩklar :"
+
+#~ msgid "Empty days:"
+#~ msgstr "BoЧ gЭnler :"
+
+#~ msgid "Appointments:"
+#~ msgstr "T_oplantЩlar :"
+
+#~ msgid "Highlighted day:"
+#~ msgstr "жne getirilmiЧ gЭn :"
+
+#~ msgid "Day numbers:"
+#~ msgstr "GЭn sayЩsЩ :"
+
+#~ msgid "Current day's number:"
+#~ msgstr "чu anki gЭnЭn numarasЩ :"
+
+#~ msgid "To-Do item that is not yet due:"
+#~ msgstr "Daha geГmemiЧ \"YapЩlacak\" birimi :"
+
+#~ msgid "To-Do item that is due today:"
+#~ msgstr "BugЭn geГecek olan \"YapЩlacak\" birimi :"
+
+#~ msgid "To-Do item that is overdue:"
+#~ msgstr "ZamanЩ geГmiЧ \"YapЩlacak\" birimi :"
+
+#~ msgid "may"
+#~ msgstr "mayЩs"
+
+#~ msgid "sept"
+#~ msgstr "eylЭl"
+
+#~ msgid "sunday"
+#~ msgstr "pazar"
+
+#~ msgid "monday"
+#~ msgstr "pazartesi"
+
+#~ msgid "tuesday"
+#~ msgstr "salЩ"
+
+#~ msgid "tues"
+#~ msgstr "salЩ"
+
+#~ msgid "wednesday"
+#~ msgstr "ГarЧamba"
+
+#~ msgid "wednes"
+#~ msgstr "ГЧb."
+
+#~ msgid "thursday"
+#~ msgstr "perЧembe"
+
+#~ msgid "thur"
+#~ msgstr "pЧb."
+
+#~ msgid "thurs"
+#~ msgstr "perЧ."
+
+#~ msgid "friday"
+#~ msgstr "cuma"
+
+#~ msgid "saturday"
+#~ msgstr "cumartesi"
+
+#~ msgid "fortnight"
+#~ msgstr "geceleyin"
+
+#~ msgid "min"
+#~ msgstr "dak."
+
+#~ msgid "sec"
+#~ msgstr "san."
+
+#~ msgid "tomorrow"
+#~ msgstr "yarЩn"
+
+#~ msgid "yesterday"
+#~ msgstr "dЭn"
+
+#~ msgid "today"
+#~ msgstr "bugЭn"
+
+#~ msgid "last"
+#~ msgstr "son"
+
+#~ msgid "this"
+#~ msgstr "bu"
+
+#~ msgid "next"
+#~ msgstr "ileri"
+
+#~ msgid "first"
+#~ msgstr "ilk"
+
+#~ msgid "third"
+#~ msgstr "ЭГЭncЭ"
+
+#~ msgid "fourth"
+#~ msgstr "dЭrdЭncЭ"
+
+#~ msgid "fifth"
+#~ msgstr "beЧinci"
+
+#~ msgid "sixth"
+#~ msgstr "altЩncЩ"
+
+#~ msgid "seventh"
+#~ msgstr "yedinci"
+
+#~ msgid "eighth"
+#~ msgstr "sekizinci"
+
+#~ msgid "ninth"
+#~ msgstr "dokuzuncu"
+
+#~ msgid "tenth"
+#~ msgstr "onuncu"
+
+#~ msgid "eleventh"
+#~ msgstr "onbirinci"
+
+#~ msgid "twelfth"
+#~ msgstr "onikinci"
+
+#~ msgid "ago"
+#~ msgstr "Жnce"
+
+#~ msgid "Year:"
+#~ msgstr "YЩl :"
+
+#~ msgid ""
+#~ "Please select the date you want to go to.\n"
+#~ "When you click on a day, you will be taken\n"
+#~ "to that date."
+#~ msgstr ""
+#~ "Gitmek istediПin tarihi belirt.\n"
+#~ "Bir gЭne tЩkladЩПЩn zaman, o tarihe\n"
+#~ "gideceksin."
+
+#~ msgid "Mail Source"
+#~ msgstr "ePosta kaynaПЩ"
+
+#, fuzzy
+#~ msgid "Send \"%s\""
+#~ msgstr "Saniye"
+
+#, fuzzy
+#~ msgid "Expunge \"%s\""
+#~ msgstr "_Temizle"
+
+#, fuzzy
+#~ msgid "Marking messages in folder \"%s\""
+#~ msgstr "Iletiyi yeni bir dizine taЧЩ"
+
+#, fuzzy
+#~ msgid "Mark messages in folder \"%s\""
+#~ msgstr "Iletiyi yeni bir dizine taЧЩ"
+
+#, fuzzy
+#~ msgid "Attach messages from \"%s\""
+#~ msgstr "Ileti tasarЩlayЩcЩsЩndan ГЩk"
+
+#, fuzzy
+#~ msgid "Forward message \"%s\""
+#~ msgstr "Bu iletiyi ilet"
+
+#, fuzzy
+#~ msgid "Loading \"%s\""
+#~ msgstr "BaЧlЩklar"
+
+#, fuzzy
+#~ msgid "Clearing message display"
+#~ msgstr "Zaman gЖsterimi"
+
+#, fuzzy
+#~ msgid "Clear message display"
+#~ msgstr "GЖsterim renkler"
+
+#, fuzzy
+#~ msgid "Saving messages from folder \"%s\""
+#~ msgstr "Iletiyi yeni bir dizine taЧЩ"
+
+#, fuzzy
+#~ msgid "Save messages from folder \"%s\""
+#~ msgstr "Iletiyi yeni bir dizine taЧЩ"
+
+#~ msgid "N_ew Directory Server"
+#~ msgstr "Yeni _dizin sunucusu"
+
+#~ msgid "_Actions"
+#~ msgstr "E_ylemler"
+
+#, fuzzy
+#~ msgid "_Save Calendar As"
+#~ msgstr "Takvimi farklЩ kaydet"
+
+#, fuzzy
+#~ msgid "_Mail Configuration"
+#~ msgstr "ePosta ayarlamasЩ"
+
 #~ msgid "FIXME: _Appointment"
 #~ msgstr "ABY : _ToplantЩ"
 
@@ -6921,9 +7598,6 @@ msgstr "Kitle %i"
 #~ msgid "FIXME: Next"
 #~ msgstr "ABY : Ileri"
 
-#~ msgid "_New Contact"
-#~ msgstr "_Yeni tanЩk"
-
 #~ msgid "window2"
 #~ msgstr "pencere2"
 
@@ -6957,9 +7631,6 @@ msgstr "Kitle %i"
 #~ msgid "'s calendar"
 #~ msgstr "'in takvimi"
 
-#~ msgid "?"
-#~ msgstr "?"
-
 #~ msgid "FIXME: _Delete"
 #~ msgstr "ABY : _Sil"
 
@@ -7079,9 +7750,6 @@ msgstr "Kitle %i"
 #~ msgid "Select recipients' addresses"
 #~ msgstr "GЖnderilecek adresleri belirle"
 
-#~ msgid "Name"
-#~ msgstr "Isim"
-
 #~ msgid "To: >>"
 #~ msgstr "Gn : >>"
 
@@ -7118,9 +7786,6 @@ msgstr "Kitle %i"
 #~ msgid "_vFolder Editor ..."
 #~ msgstr "_sanal klasЖrler editЖrЭ ..."
 
-#~ msgid "_Mail Configuration ..."
-#~ msgstr "_ePosta ayarlarЩ ..."
-
 #~ msgid "Currently pending operations:"
 #~ msgstr "чu an geГerli olan eylemler :"
 
@@ -7161,9 +7826,6 @@ msgstr "Kitle %i"
 #~ msgid "Available fields"
 #~ msgstr "Varolan birimler"
 
-#~ msgid "Show in this order"
-#~ msgstr "Bu sЩralamada gЖster"
-
 #~ msgid "label2"
 #~ msgstr "yafta2"
 
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 "Перебудувати в╕дображення пов╕домлень"