Updated Norwegian (bokmål) translation.

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

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

svn path=/trunk/; revision=7317

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 "ðÅÒÅÂÕÄÕ×ÁÔÉ ×¦ÄÏÂÒÁÖÅÎÎÑ ÐÏצÄÏÍÌÅÎØ"